git-svn-id: https://scm.gforge.inria.fr/authscm/cfourrie/svn/lingwb/MElt/trunk@5712 dc05b511-7f1d-0410-9f1c-d6f32a2df9e4

sxpipe-melt/gl_number.pl

@@ -278,19 +278,15 @@ while (<>) {
     s/($num_left_ctxt\s*)([0-9]+\s*[A-Za-e])([\s\"\½,;\.:\)]|$)/$1\{$2\} _NUM$3/go;
     s/(?<=\s)([0-9]*[Il][0-9\.,\s]*[0-9][0-9\.,\s]*?)(\s*$num_right_ctxt)/\{$1\} _NUM$2/go;
     s/(?<=[^0-9\{])([0-9]*[0-9\.,\s]+[Il])(\s*$num_right_ctxt)/\{$1\} _NUM$2/go;
-    
+
     if ($less_splits) {
-      while (s/(?<=[,\.\-\/\­ ])($multinumL)(\s*[,\.\-\/\­])([^0-9]|$)/\{$1\}_NUM$2$3/go) {
-      } 
-      s/(?<=[,\.\-\/\­ ])($multinum)(\s*)(?=[,\.\-\/\­ ])/\{$1\}_NUM$2/go; # 2
-      while (s/(?<=[,\.\-\/\­ ])($multinum)(\s*[,\.\-\­\/])([^0-9]|\s+$)/\{$1\}_NUM$2$3/go) {
-      }
+      while (s/(?<=[,\.\-\/\­\$€¥£ ])($multinumL)(\s*[,\.\-\/\­])([^0-9]|$)/\{$1\}_NUM$2$3/go) {} 
+      s/(?<=[,\.\-\/\­\$€¥£ ])($multinum)(\s*)(?=[,\.\-\/\­ ])/\{$1\}_NUM$2/go; # 2
+      while (s/(?<=[,\.\-\/\­\$€¥£ ])($multinum)(\s*[,\.\-\­\/])([^0-9]|\s+$)/\{$1\}_NUM$2$3/go) {}
     } else {
-      while (s/(?<=[^0-9\{])($multinumL)(\s*[,\.\-\/\­])([^0-9]|$)/\{$1\}_NUM$2$3/go) {
-      } 
+      while (s/(?<=[^0-9\{])($multinumL)(\s*[,\.\-\/\­])([^0-9]|$)/\{$1\}_NUM$2$3/go) {} 
       s/(?<=[^0-9\{])($multinum)(\s*)(?=[^0-9\-\­\/,\.\}])/\{$1\}_NUM$2/go; # 2
-      while (s/(?<=[^0-9\{])($multinum)(\s*[,\.\-\­\/])([^0-9]|\s+$)/\{$1\}_NUM$2$3/go) {
-      }
+      while (s/(?<=[^0-9\{])($multinum)(\s*[,\.\-\­\/])([^0-9]|\s+$)/\{$1\}_NUM$2$3/go) {}
     } 
     # REGROUPE AVEC LE PRECEDENT   s/(?<=[^0-9\{])($multinum) +$/\{$1\}_NUM/go; # 2 [fin de ligne]