diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-06-01 22:56:55 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-06-01 22:56:55 -0400 |
| commit | 5268af35fbb4744b50d63784df98e7253bf0d5fc (patch) | |
| tree | bbde23eee1c4623c11a22b77fceaa2fc59ef9292 /lib | |
| parent | debian/changelog (2.4.1-1) (diff) | |
| parent | update: changelog, version (2.4.2) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v2/hub.rb | 5 | ||||
| -rw-r--r-- | lib/sisu/v2/texpdf_format.rb | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb index b182a31e..443d0734 100644 --- a/lib/sisu/v2/hub.rb +++ b/lib/sisu/v2/hub.rb @@ -156,7 +156,10 @@ module SiSU else #print "not processed --> ", fns, "\n" end else - Operations.new(@opt).not_found unless @req =~/^conf$/ + if @req !~/^conf$/ \ + and @opt.fns !~/http:\/\// + Operations.new(@opt).not_found + end end elsif FileTest.file?(put) if @opt.mod.inspect !~/harvest/ #decide whether should permit harvest in single operation diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb index 32ac7aa5..b53864ec 100644 --- a/lib/sisu/v2/texpdf_format.rb +++ b/lib/sisu/v2/texpdf_format.rb @@ -632,10 +632,9 @@ module SiSU_TeX_Pdf case @tex2pdf when /xe/ <<WOK -\\usepackage{babel} -\\usepackage{ucs} -\\usepackage{fontspec} -\\usepackage{xunicode} +\\usepackage{polyglossia, ucs, fontspec, xltxtra, xunicode} +\\setmainlanguage{#{tex_head_lang}} +\\setotherlanguage{english} WOK when /pdf/ if @md.file_encoding =~ /iso-?8859/i #% iso8859 @@ -669,7 +668,7 @@ WOK multicol=(@md.book_idx ? '\usepackage{multicol}' : '') <<WOK #{tex_head_info} -\\documentclass[#{d[:fontsize]},#{d[:papertype]},#{tex_head_lang},titlepage]{scrartcl} %with titlepage +\\documentclass[#{d[:fontsize]},#{d[:papertype]},titlepage]{scrartcl} %with titlepage \\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm} \\setlength{\\oddsidemargin}{#{d[:oddsidemargin]}} \\setlength{\\evensidemargin}{#{d[:evensidemargin]}} \\setlength{\\topmargin}{#{d[:topmargin]}} \\setlength{\\headheight}{#{d[:headheight]}} @@ -682,7 +681,7 @@ WOK def tex_head_paper_landscape(d) <<WOK #{tex_head_info} -\\documentclass[#{d[:fontsize]},#{d[:papertype]},#{tex_head_lang},landscape,titlepage,twocolumn]{scrartcl} %with titlepage +\\documentclass[#{d[:fontsize]},#{d[:papertype]},landscape,titlepage,twocolumn]{scrartcl} %with titlepage \\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm} \\setlength{\\oddsidemargin}{#{d[:oddsidemargin]}} \\setlength{\\evensidemargin}{#{d[:evensidemargin]}} \\setlength{\\topmargin}{#{d[:topmargin]}} \\setlength{\\headheight}{#{d[:headheight]}} @@ -695,7 +694,7 @@ WOK def tex_head_paper_portrait_dvi(d) <<WOK #{tex_head_info} -\\documentclass[#{d[:fontsize]},#{d[:papertype]},#{tex_head_lang},titlepage]{scrartcl} %with titlepage +\\documentclass[#{d[:fontsize]},#{d[:papertype]},titlepage]{scrartcl} %with titlepage \\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm} \\setlength{\\oddsidemargin}{#{d[:oddsidemargin]}} \\setlength{\\evensidemargin}{#{d[:evensidemargin]}} \\setlength{\\topmargin}{#{d[:topmargin]}} \\setlength{\\headheight}{#{d[:headheight]}} @@ -1279,6 +1278,7 @@ WOK end url=@md.fnb.gsub(/(?:\\)*([$&~%_#}{^])/,'\\\\\1') <<WOK +\\begin{english}[variant=british] \\subsection*{Information on this document copy and an unofficial List of Some web related information and sources} \\addcontentsline{toc}{section}{Information on this document copy and an unofficial List of Some web related information and sources} \\\\ @@ -1303,6 +1303,7 @@ WOK \\\\ #{sitename} found at: \\begin{scriptsize}#{site}\\end{scriptsize}\\subsubsection*{Links that may be of interest at #{@vz.txt_home} and elsewhere:} \\addcontentsline{toc}{subsection}{Links that may be of interest} +\\end{english} WOK end def mail_tail #not retested, the old mail_tail is commented out and appended to this program |