MàJ l10n-check et règles

[Nicolas Bertolissio <nico.bertol@wanadoo.fr>]

Bonjour,

Les nouvelles versions sont dispo.

journal des modification :
Changes: 
 l10n-check (0.2.12) unstable; urgency=low
 .
   * fix unitialized value when parsing po header
   * allow on-line comments after each value

Changes: 
 l10n-check-rules (0.8) unstable; urgency=low
 .
   * to pass lintian tests:
     - change field `Build-Depends:' into `Build-Depends-Indep:'
     - fix copyright file
   * add english sample rules
   * (fr) use more general regex

Les rustines sont attachée, pour les règles, c'est à applique sur le
répertoire.


Nicolas
-- 

--- l10n-check_0.2.11	Fri Feb  8 00:00:00 2002
+++ l10n-check_0.2.12	Tue Feb 12 00:00:00 2002
@@ -194,10 +194,10 @@
 	while (<RULEFILE>) {
 		s/^\s*//;						# remove head spaces
 		s/\s*$//;						# remove tail spaces
-		s/^#.*$//;						# remove comment
+		s/^#.*//;						# remove comment
 
 		next if /^$/;						# skip empty line
-		my ($f, $n, $v) = /(\w+)\s*(\d*)\s*=\s*"(.*)"$/;	# get field name, choice number and value
+		my ($f, $n, $v) = /(\w+)\s*(\d*)\s*=\s*"(.*)"/;		# get field name, choice number and value
 
 		suicide "$filename\:$.: unknown field name `$_'"
 			unless grep(/$f/, @FIELDS);			# stop if unknown field name:
@@ -504,7 +504,8 @@
 				$l = $_ unless ($l || $c);			# all is string if no tag found
 				$c = '' unless $c;				# no tag
 				$r = '' unless $r;				# nothing more
-				my (@l) = parse_line($l) unless $ignore_po_header;	# parse line if not in po header
+				my @l = ($l);
+				@l = parse_line($l) unless $ignore_po_header;	# parse line if not in po header
 				push (@comments, @l);				# add checked string
 				$fixed .= pop @comments;
 				$fixed .=	     $c;			# add start tag

diff -u rules-fr_0.7/common.rules rules-fr_0.8/common.rules
--- rules-fr_0.7/common.rules	Wed Feb  6 00:00:00 2002
+++ rules-fr_0.8/common.rules	Tue Feb 12 00:00:00 2002
@@ -19,7 +19,7 @@
 hint	= "Franglisme, cf. FAQ § 2.13.4"
 fix	= "complètement"
 
-rule = "(?<=\s)(e-?)?mail"
+rule = "\b(e-?)?mail"
 hint	= "courrier, courriel ou courrier électronique : en français, cf. FAQ § 2.13.3"
 fix 0	= "courriel"
 fix 1	= "courrier"
@@ -108,11 +108,11 @@
 hint = "« bibliothèques » en français, cf. FAQ § 2.13.4"
 fix  = "bibliothèques"
 
-rule = "(?<=\s)log?(?=\s)"
+rule = "\blog\b"
 hint = "« journal », en français"
 fix  = "journal"
 
-rule = "(?<=\s)logs(?=\s)"
+rule = "\blogs\b"
 hint = "« journaux », en français"
 fix  = "journaux"
 
@@ -121,11 +121,11 @@
 fix 0 = "analyseur lexical"
 fix 1 = "analyseur"
 
-rule = "(?i)(?<= [ld])e (?=[aeiou])"
+rule = "(?i)(?<=\s[ld])e\s+(?=[aeiou])"
 hint = "Élision devant la voyelle"
 fix  = "'"
 
-rule = "(?i)(?<= qu)e (?=[aeiou])"
+rule = "(?i)(?<=\squ)e\s+(?=[aeiou])"
 hint = "Élision devant la voyelle"
 fix  = "'"
 
@@ -135,6 +135,7 @@
 post_hint   = "Pluriel"
 post_insert = "s"
 
-rule = "(?<=\s)(\w+\s+)(?=\1)"
+rule = "\b(\w+)\s+(?=\1\b)"	# début de mot, mot, espace, suivit de : même mot, fin de mot
 hint = "Doublon"
-fix  = ""
+fix  = ""			# supprimer la correspondance
+
diff -u rules-fr_0.7/ddts.rules rules-fr_0.8/ddts.rules
--- rules-fr_0.7/ddts.rules	Sun Feb  3 00:00:00 2002
+++ rules-fr_0.8/ddts.rules	Tue Feb 12 00:00:00 2002
@@ -1,10 +1,10 @@
 # comments
 comment = "comment"
 	start = "^#"
-	stop  = "(.$)"
+	stop  = ".$"
 comment = "original"
 	start = "^Description:"
-	stop  = "^Description-fr:"
+	stop  = "^Description-.*?:"
 
 # rules for text files
 
diff -u rules-fr_0.7/po.rules rules-fr_0.8/po.rules
--- rules-fr_0.7/po.rules	Sun Feb  3 00:00:00 2002
+++ rules-fr_0.8/po.rules	Tue Feb 12 00:00:00 2002
@@ -1,8 +1,8 @@
 # comment rules
 comment = "comment"
 	start = "^#"
-	stop  = ".*$"
-comment = "english"
+	stop  = ".$"
+comment = "anglais"
 	start = "id \""
 	stop  = "str \""
 comment = "empty"
diff -u rules-fr_0.7/template.rules rules-fr_0.8/template.rules
--- rules-fr_0.7/template.rules	Mon Feb  4 00:00:00 2002
+++ rules-fr_0.8/template.rules	Tue Feb 12 00:00:00 2002
@@ -1,19 +1,10 @@
 # comments
 comment = "comment"
 	start = "^#"
-	stop  = "(.$)"
-comment = "description"
-	start = "^Description:"
-	stop  = "^Description-fr:"
-comment = "template"
-	start = "^Template:"
-	stop  = "^\w+-fr:"
-comment = "choices"
-	start = "^Choices:"
-	stop  = "^\w+-fr:"
-comment = "default"
-	start = "^Default:"
-	stop  = "^\w+-fr:"
+	stop  = ".$"
+comment = "anglais"
+	start = "^\w+?:"	# début de ligne, mot, :
+	stop  = "^\w+?-.*?:"	# début de ligne, mot, -, extension de langue, :
 
 # rules for text files
 
diff -u rules-fr_0.7/wml.rules rules-fr_0.8/wml.rules
--- rules-fr_0.7/wml.rules	Sun Feb  3 00:00:00 2002
+++ rules-fr_0.8/wml.rules	Tue Feb 12 00:00:00 2002
@@ -1,7 +1,7 @@
 # comment rules
 comment = "comment"
 	start = "^#"
-	stop  = ".*$"
+	stop  = ".$"
 comment = "tag"
 	start = "<"
 	stop  = ">"