Changeset 3156

Timestamp:

2002-06-18T14:01:26+12:00 (22 years ago)

Author:

jrm21

Message:

Added a few extra accented characters, and recognise some bibtex-specific macros.

File:

• trunk/gsdl/perllib/plugins/BibTexPlug.pm (modified) (5 diffs)

trunk/gsdl/perllib/plugins/BibTexPlug.pm

@@ -249 +249 @@
         use utf8;
         if ($fullname =~ /\w+, \w+/) {
-           $doc_obj->add_utf8_metadata ($cursection, "Author", $fullname);
+            $doc_obj->add_utf8_metadata ($cursection, "Author", $fullname);
+        } else {
         }
         }
@@ -458 +459 @@
 #      ',s' => chr(0xc5).chr(0xa1),
 #      ',S' => chr(0xc5).chr(0xa5),
-     # breve
      # double acute
      # ring
@@ -493 +493 @@
     my %special_utf8_chars = 
     (
+     # breve
+     'u g' => chr(0xc4).chr(0x9f),
+     'u G' => chr(0xc4).chr(0x9e),
+     'u i' => chr(0xc4).chr(0xad),
+     'u I' => chr(0xc4).chr(0xac),
+     'u o' => chr(0xc5).chr(0x8f),
+     'u O' => chr(0xc5).chr(0x8e),
+     'u u' => chr(0xc5).chr(0xad),
+     'u U' => chr(0xc5).chr(0xac),
      # caron
+     'v c' => chr(0xc4).chr(0x8d),
+     'v C' => chr(0xc4).chr(0x8c),
      'v n' => chr(0xc5).chr(0x88),
      'v N' => chr(0xc5).chr(0x87),
      'v s' => chr(0xc5).chr(0xa1),
      'v S' => chr(0xc5).chr(0xa5),
+     'v z' => chr(0xc5).chr(0xbe),
+     'v Z' => chr(0xc5).chr(0xbd),
      # cedilla
      'c c' => chr(0xc3).chr(0xa7),
@@ -543 +556 @@
 
     # remove {} around a single character (eg \'{e})
-    $text =~ s@(\\[`'="\.]){(\w)}@$1$2@g;
+    $text =~ s@(\\[`'="\.]){(\w)}@{$1$2}@g;
 
     # remove {} around a single character for special 1 letter commands -
     # need to insert a space. Eg \v{s}  ->  {\v s}
-    $text =~ s@(\\[vcH]){(\w)}@{$1 $2}@;
-
+    $text =~ s@(\\[uvcH]){(\w)}@{$1 $2}@g;
     # this is slow (go through whole hash for each substitution!) so
     # only do if the text contains a '\' character. 
@@ -563 +575 @@
     }
     # remove latex commands
-    $text =~ s@\\noopsort{[^}]+\}@@g;
-    $text =~ s@\\\w+{([^}]*)}@$1@g; # all other commands
+    # commands with optional arguments...
+    $text =~ s@\\\w+(\[.*?\])?\s*@@g;
+    # $text =~ s@\\noopsort{[^}]+\}@@g;
+    # $text =~ s@\\\w+{(([^}]*[^\\])*)}@$1@g; # all other commands
     
     # remove latex groupings { } (but not \{ or \} )