aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2008-12-31 00:35:00 -0500
committerRalph Amissah <ralph@amissah.com>2008-12-31 00:35:00 -0500
commit18cd3a196105b02b93ab5ec3f7a79c681f798554 (patch)
treec5897878a7930a80af5e4212d7313f5259c683c0
parentMerge branch 'upstream' into debian/sid (diff)
parentlatex/pdf tilde mark (bug in texlive, missing (at this instant) provide worka... (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG16
-rw-r--r--lib/sisu/v0/texpdf.rb1
-rw-r--r--lib/sisu/v0/texpdf_format.rb12
3 files changed, 24 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3c799700..1a343a70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,11 +9,21 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.70.4.orig.tar.gz (2008-12-31:52/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.4.orig.tar.gz
+ sisu_0.70.4.orig.tar.gz
+ sisu_0.70.4-1.dsc
+ sisu_0.70.4-1.diff.gz
+
+ * latex/pdf tilde mark (bug in texlive, missing (at this instant) provide
+ workaround), similar to issue with "bullet" noted in sisu 0.70.1
+ [may be necessary to do an inventory of special characters?]
+
%% sisu_0.70.3.orig.tar.gz (2008-12-24:51/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.3.orig.tar.gz
- sisu_0.70.3.orig.tar.gz
- sisu_0.70.3-1.dsc
- sisu_0.70.3-1.diff.gz
+ adb3dbe85004a6bc10443d60029b6a2b0a11b9f7aad10a170f5b278f0a73d5e4 1546917 sisu_0.70.3.orig.tar.gz
+ 1e4e5d84c410ef635c0a97542ad0ed12e47ec1e06178975804571c9c43f9040b 1159 sisu_0.70.3-1.dsc
+ 09c0192dc4f7e89c352bb5e15c24e2c0ca42cace 147188 sisu_0.70.3-1.diff.gz
* html and css, cosmetic changes (and the closing of a tag)
diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb
index abafb30f..1cad7ca5 100644
--- a/lib/sisu/v0/texpdf.rb
+++ b/lib/sisu/v0/texpdf.rb
@@ -545,6 +545,7 @@ module SiSU_TeX
\\makeatother
\\makeatother
\\chardef\\txtbullet="2022
+\\chardef\\tilde="7E
% \\sloppy
\\begin{document}
WOK
diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb
index 2efec5c4..e156c67a 100644
--- a/lib/sisu/v0/texpdf_format.rb
+++ b/lib/sisu/v0/texpdf_format.rb
@@ -1103,7 +1103,8 @@ WOK
while string =~/(http:\/\/\S+?)(?:<=tilde>\S+)+/ #tilde in urls \href treated differently from text
string.gsub!(/(http:\/\/\S+?)(?:<=tilde>(\S+))+/,'\1~\2')
end
- string.gsub!(/<=tilde>/,'{$\sim$}')
+ string.gsub!(/<=tilde>/,'{$\tilde$}')
+ #string.gsub!(/<=tilde>/,'{$\sim$}')
string.gsub!(/<=pipe>/,'{\textbar}')
string.gsub!(/<=caret>/,'{\^{~}}')
#string.gsub!(/<=caret>/,'\^{}')
@@ -1211,6 +1212,12 @@ WOK
else string.gsub!(/&/,'<=amp>')
#else string.gsub!(/(\s+&\s+)/,' and ')
end
+ if @@flag_code;
+ string.gsub!(/\\~(\\\{)/,'{$\tilde$}\1')
+ string.gsub!(/(\\\})\\~/,'\1{$\tilde$}')
+ string.gsub!(/\\~(\[)/,'{$\tilde$}\1')
+ string.gsub!(/(\])\\~/,'\1{$\tilde$}')
+ end
string.gsub!(/§/u,'\S') #latex: space between next character not preserved? #string.gsub!(/§ /,'\S ')
string.gsub!(/£/u,'\pounds')
string.gsub!(/&\S+?;/,' ')
@@ -1283,7 +1290,8 @@ WOK
while string =~/(http:\/\/\S+?)(?:<=tilde>\S+)+/ #tilde in urls \href treated differently from text
string.gsub!(/(http:\/\/\S+?)(?:<=tilde>(\S+))+/,'\1~\2')
end
- string.gsub!(/<=tilde>/,'{$\sim$}')
+ string.gsub!(/<=tilde>/,'{$\tilde$}')
+ #string.gsub!(/<=tilde>/,'{$\sim$}')
string.gsub!(/<=pipe>/,'{\textbar}')
string.gsub!(/<=caret>/,'{\^{~}}')
#string.gsub!(/<=caret>/,'\^{}')