Changeset 32129 for main

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

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• BibTexPlugin.pm (modified) (2 diffs)
• LaTeXPlugin.pm (modified) (4 diffs)
• MediaWikiPlugin.pm (modified) (3 diffs)

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

@@ -704 +704 @@
            
     # remove {} around a single character (eg \'{e})
-    $text =~ s@(\\[`'="^~\.]){(\w)}@{$1$2}@g; #`
+    $text =~ s@(\\[`'="^~\.])\{(\w)}@{$1$2}@g; #`
 
     # \, is another way of doing cedilla \c
@@ -711 +711 @@
     # 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. 

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. 

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

@@ -278 +278 @@
         while(my $line = <INPUT>){
                     # comment out the body element because we change the body to div
-                    $line =~ s/^(\s*)body(\s*){(\s*)$/$1\/*body$2*\/{$3/isg;
+                    $line =~ s/^(\s*)body(\s*)\{(\s*)$/$1\/*body$2*\/{$3/isg;
                     
                     if($line =~ m/^(.+)\{/i || $line =~ m/^(\s)*#/i){                    
@@ -504 +504 @@
         my $update_extra_dm = 0;        
         
-        if( $about_package =~ /\S/ && $about_package =~ m/_content_(\s*){/ && $about_package =~ m/$mainpage_toc/){  
+        if( $about_package =~ /\S/ && $about_package =~ m/_content_(\s*)\{/ && $about_package =~ m/$mainpage_toc/){  
        print $outhandle "_content_ macro already changed!!!!\n";
     }
@@ -527 +527 @@
           # check if there is a content macro   
           my $content_macro_existed = 0;
-          $content_macro_existed = ($about_package =~ /(\s*|\n)_content_(\s*){/);
+          $content_macro_existed = ($about_package =~ /(\s*|\n)_content_(\s*)\{/);
             
           # if there is one
           # append a new section div for toc to the end of the document section                    
           if($content_macro_existed ==1) {
-            $about_package =~ /(\s*|\n)_content_(\s*){(.|\n)*?}/;
+            $about_package =~ /(\s*|\n)_content_(\s*)\{(.|\n)*?}/;
             my $content_macro = $&;                          
             my $new_content_macro = $content_macro;