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

Timestamp:

2018-02-13T10:38:29+13:00 (6 years ago)

Author:

kjdon

Message:

After () in a regex, {} signifys quantifiers. eg (xx){2,4} - 2-4 occurrences. In later perl versions, it is illegal to have an unescaped { after a ) in a regex. If you actually want to match { you need to escape it. So I have escaped all { following ) in regex

File:

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

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

@@ -369 +369 @@
     $text =~ s~\\(?:clearemptydoublepage|newpage)~~g;
     ### counters, contents, environments, labels, etc ###
-    $text =~ s~\\(?:addcontentsline){.*?}\{.*?}\{.*}~~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;
@@ -378 +378 @@
     $text =~ s~<([ou])l>\s*</li>\s*~<$1l>~g;
     }
-    $text =~ s~\\(?:label|begin|end){.*?}\s*\n?~ ~g; # remove tag and contents
+    $text =~ s~\\(?:label|begin|end)\{.*?}\s*\n?~ ~g; # remove tag and contents
     $text =~ s~\\(?:tableofcontents|listoffigures)~ ~g;
     ### font sizes/styles ###
@@ -689 +689 @@
 
     # remove {} around a single character (eg \'{e})
-    $text =~ s!(\\[`'="^~\.]){(\w)}!{$1$2}!g;  # for emacs indenting... `]);
+    $text =~ s!(\\[`'="^~\.])\{(\w)}!{$1$2}!g;  # for emacs indenting... `]);
 
     ## only in bibtex... not in latex proper?!
@@ -697 +697 @@
     # remove {} around a single character for special 1 letter commands -
     # need to insert a space. Eg \v{s}  ->  {\v s}
-    $text =~ s~(\\[uvcH]){(\w)}~{$1 $2}~g;
+    $text =~ s~(\\[uvcH])\{(\w)}~{$1 $2}~g;
 
     # only do if the text contains a '\' character.