diff --git a/sxpipe-melt/gl_number.pl b/sxpipe-melt/gl_number.pl index ab6d077d62ea05a8348241aefd11fabb6872fbf6..6cc4defb1450dc71080a2db2075d67a7edac19d0 100755 --- a/sxpipe-melt/gl_number.pl +++ b/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]