Changeset 31780 for main/trunk/greenstone2/perllib/plugins/LaTeXPlugin.pm

Timestamp:

2017-07-07T19:19:14+12:00 (7 years ago)

Author:

ak19

Message:

When testing GS3.08's GLI on Ubuntu v 16.04, found its perl v 5.22.1 issued warnings about unescaped left brace in regex. As per ​https://unix.stackexchange.com/questions/238539/automake-error-unescaped-left-brace-in-regex-is-deprecated, in even later versions of perl, this counts as a syntax error rather than resulting in a warning. So making the minimum number of changes that allowed perl to parse the plugins and open GLI successfully, without issuing warnings on perl 5.22.1 on this Ubuntu 16.04.

File:

• main/trunk/greenstone2/perllib/plugins/LaTeXPlugin.pm (modified) (8 diffs)

main/trunk/greenstone2/perllib/plugins/LaTeXPlugin.pm

@@ -166 +166 @@
 
     ###### process latex for the main text ######
-    $$textref =~ s/^.*?\\begin{document}//s;
-    $$textref =~ s/\\end{document}.*?$//s;
+    $$textref =~ s/^.*?\\begin\{document}//s;
+    $$textref =~ s/\\end\{document}.*?$//s;
     $$textref = $self->process_latex("-html",$$textref);
     $doc_obj->add_utf8_text($cursection, $$textref);
@@ -318 +318 @@
     return "<br/>" . $tabbing . "<br/>\n";
     }
-    $text =~ s@\\begin{tabbing}(.*?)\\end{tabbing}@do_tabbing($1)@ges;
+    $text =~ s@\\begin\{tabbing}(.*?)\\end\{tabbing}@do_tabbing($1)@ges;
     sub do_tabular {
     my $tabular=shift;
@@ -324 +324 @@
     $tabular =~ s~[\\][\\]\s*~</td></tr>\n <tr><td>~g;
     $tabular =~ s~\\hline~~g; # for now...
-    $tabular =~ s~<td>\s*\\multicolumn{(\d+)}{.*?}~<td colspan="$1">~g;
+    $tabular =~ s~<td>\s*\\multicolumn\{(\d+)}\{.*?}~<td colspan="$1">~g;
     return "<table border=\"1\">\n <tr><td>"
         . $tabular . "</td></tr></table>\n";
     }
-    $text =~ s@\\begin{tabular}(?:\[.*?\])?{.*?}(.*?)\\end{tabular} @
+    $text =~ s@\\begin\{tabular}(?:\[.*?\])?{.*?}(.*?)\\end\{tabular} @
             do_tabular($1)  @xges;
 
@@ -344 +344 @@
 
     # is this an amstext environment, or just custom for that input file?
-    $text =~ s@\\begin{(algorithm)}(.*?)\\end{\1}@remove_equals($2)@ges;
+    $text =~ s@\\begin\{(algorithm)}(.*?)\\end\{\1}@remove_equals($2)@ges;
 
     # convert latex-style accented characters.
@@ -369 +369 @@
     $text =~ s~\\(?:clearemptydoublepage|newpage)~~g;
     ### counters, contents, environments, labels, etc ###
-    $text =~ s~\\(?:addcontentsline){.*?}{.*?}{.*}~~g;
-    $text =~ s~\s*\\begin{itemize}\s*~\n<ul>\n~g;
-    $text =~ s~\s*\\end{itemize}\s*~</li></ul>\n~g;
-    $text =~ s~\s*\\begin{enumerate}\s*~<ol>\n~g;
-    $text =~ s~\s*\\end{enumerate}\s*~</li></ol>\n~g;
+    $text =~ s~\\(?:addcontentsline){.*?}\{.*?}\{.*}~~g;
+    $text =~ s~\s*\\begin\{itemize}\s*~\n<ul>\n~g;
+    $text =~ s~\s*\\end\{itemize}\s*~</li></ul>\n~g;
+    $text =~ s~\s*\\begin\{enumerate}\s*~<ol>\n~g;
+    $text =~ s~\s*\\end\{enumerate}\s*~</li></ol>\n~g;
     if ($text =~ s~\s*\\item~</li>\n<li>~g) {
     # (count for first list item)
@@ -388 +388 @@
     $text =~ s~{\\tt\s*(.*?)}~<tt>$1</tt>~g;
     $text =~ s~\\(?:texttt|tt|ttseries)\s*{(.*?)}~<tt>$1</tt>~g;
-    $text =~ s~\\emph{(.*?)}~<em>$1</em>~g;
+    $text =~ s~\\emph\{(.*?)}~<em>$1</em>~g;
     $text =~ s~{\\(?:em|it)\s*(.*?)}~<em>$1</em>~g;
     $text =~ s~{\\(?:bf|bfseries)\s*(.*?)}~<strong>$1</strong>~g;
@@ -429 +429 @@
 
     # quoted { } chars
-    $text =~ s~\\{~{~g;
+    $text =~ s~\\\{~{~g;
     $text =~ s~\\}~}~g;
 
@@ -479 +479 @@
     $text =~ s~\\cup\b~ U ~g;
 
-    $text =~ s~\\frac\s*{(.+?)}{(.+?)}~math_fraction($1,$2)~ge;
+    $text =~ s~\\frac\s*{(.+?)}\{(.+?)}~math_fraction($1,$2)~ge;
 
     if ($html_markup) {
-    $text =~ s~\^{(.*?)}~<sup>$1</sup>~g;  # a^b superscript
+    $text =~ s~\^\{(.*?)}~<sup>$1</sup>~g;  # a^b superscript
     $text =~ s~\^([^\{])~<sup>$1</sup>~g;
-    $text =~ s~\_{(.*?)}~<sub>$1</sub>~g;  # a_b subscript
+    $text =~ s~\_\{(.*?)}~<sub>$1</sub>~g;  # a_b subscript
     $text =~ s~\_([^\{])~<sub>$1</sub>~g;