aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-06-01 18:30:23 -0400
committerRalph Amissah <ralph@amissah.com>2010-06-01 18:30:23 -0400
commit236a63e8a17f944cb2a9edbbd99f4e959308d903 (patch)
tree4459d6171d0e72fad72f10e1da59e9f8aface35b
parentsha256 (2.4.1) (diff)
texpdf, start using polyglossia (xelatex) (instead of babel)
-rw-r--r--data/doc/sisu/v2/sisu_user_txt/sisu_markup.txt (renamed from data/doc/sisu/v2/on_sisu_markup/sisu_markup.txt)0
-rw-r--r--lib/sisu/v2/texpdf_format.rb15
2 files changed, 8 insertions, 7 deletions
diff --git a/data/doc/sisu/v2/on_sisu_markup/sisu_markup.txt b/data/doc/sisu/v2/sisu_user_txt/sisu_markup.txt
index 0af080c5..0af080c5 100644
--- a/data/doc/sisu/v2/on_sisu_markup/sisu_markup.txt
+++ b/data/doc/sisu/v2/sisu_user_txt/sisu_markup.txt
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