From d2ad46d7b764f5f15a6a25e2ab3fdd66cd036f22 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 28 Aug 2013 18:14:10 -0400
Subject: v4 v5: pdf (latex) tables, bugfix (fasttrack)

---
 data/doc/sisu/CHANGELOG_v4   | 2 ++
 data/doc/sisu/CHANGELOG_v5   | 2 ++
 lib/sisu/v4/texpdf_format.rb | 3 ++-
 lib/sisu/v5/texpdf_format.rb | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 2f004ba7..078bc2bb 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -37,6 +37,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz
 * vim syntax, sisu.vim, fix typo
   * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
 
+* pdf (latex) tables, bugfix
+
 %% 4.2.0.orig.tar.xz (2013-08-25:33/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index f405b03f..650a7044 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -37,6 +37,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz
 * vim syntax, sisu.vim, fix typo
   * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
 
+* pdf (latex) tables, bugfix
+
 %% 5.0.13.orig.tar.xz (2013-08-25:33/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1
diff --git a/lib/sisu/v4/texpdf_format.rb b/lib/sisu/v4/texpdf_format.rb
index c154fc2b..b010bb08 100644
--- a/lib/sisu/v4/texpdf_format.rb
+++ b/lib/sisu/v4/texpdf_format.rb
@@ -116,7 +116,8 @@ module SiSU_TeX_Pdf
       "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#{dob.ocn}}{#{show_ocn}}\\end{tiny}}}" #ocn object citation numbering
     end
     def table_special_characters(r)
-      r=r.gsub(/#{Mx[:tc_p]}|$/u,'&').
+      r=r.gsub(/#{Mx[:tc_p]}/mu,'&').
+        gsub(/#{Mx[:tc_c]}/m,'\\\\\\').
         gsub(/%/,'\%').
         gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\begin{bfseries}\1 \end{bfseries}').
         gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\emph{\1}').
diff --git a/lib/sisu/v5/texpdf_format.rb b/lib/sisu/v5/texpdf_format.rb
index 9e71e128..172dfa56 100644
--- a/lib/sisu/v5/texpdf_format.rb
+++ b/lib/sisu/v5/texpdf_format.rb
@@ -116,7 +116,8 @@ module SiSU_TeX_Pdf
       "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#{dob.ocn}}{#{show_ocn}}\\end{tiny}}}" #ocn object citation numbering
     end
     def table_special_characters(r)
-      r=r.gsub(/#{Mx[:tc_p]}|$/u,'&').
+      r=r.gsub(/#{Mx[:tc_p]}/mu,'&').
+        gsub(/#{Mx[:tc_c]}/m,'\\\\\\').
         gsub(/%/,'\%').
         gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\begin{bfseries}\1 \end{bfseries}').
         gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\emph{\1}').
-- 
cgit v1.2.3