[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.6-17-gb56cd3b



The following commit has been merged in the master branch:
commit b56cd3b5d5b1a3a45a1f5d6a0f43536f5afb3a99
Author: Russ Allbery <rra@debian.org>
Date:   Sun Mar 18 22:18:18 2012 -0700

    Detect hyphen used as minus sign after \f[C]
    
    * checks/manpages{,.desc}:
      + [RA] Detect hyphen used as minus sign following a groff \f[C] font
        change.  Thanks, Iustin Pop.  (Closes: #664471)

diff --git a/checks/manpages b/checks/manpages
index d3e9c2b..9fb3f57 100644
--- a/checks/manpages
+++ b/checks/manpages
@@ -290,13 +290,14 @@ foreach my $file (@{$info->sorted_index}) {
             # Catch hyphens used as minus signs by looking for ones at the
             # beginning of a word, but don't generate false positives on \s-1
             # (small font), \*(-- (pod2man long dash), or things like \h'-1'.
-            # Ignoring hyphens contained in draft mode (.eo).
+            # Ignoring hyphens contained in draft mode (.eo).  Do catch
+            # hyphens after \f[C], a groff font change.
             $draft_mode = 1 if $line =~ /^\.\s*eo/;
             $draft_mode = 0 if $line =~ /^\.\s*ec/;
             if (not $draft_mode
                 and $line =~ /^(
                                 ([^\.].*)?
-                                [\s\'\"\`\(\[]
+                                [\s\'\"\`\(\[\]]
                                 (?<! \\s | \*\( | \(- | \w\' )
                                )?
                               (--?\w+)/ox) {
diff --git a/debian/changelog b/debian/changelog
index cbb0071..743ee0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
     + [NT] Remove "manual" lazy loads of data files.
   * checks/manpages{,.desc}:
     + [NT] Remove old tags.
+    + [RA] Detect hyphen used as minus sign following a groff \f[C] font
+      change.  Thanks, Iustin Pop.  (Closes: #664471)
   * checks/menus{,.desc}:
     + [NT] Remove "manual" lazy load of data file.
     + [NT] Remove old tags.
diff --git a/t/tests/manpages-general/debian/include.3 b/t/tests/manpages-general/debian/include.3
index 11d0089..9cc411e 100644
--- a/t/tests/manpages-general/debian/include.3
+++ b/t/tests/manpages-general/debian/include.3
@@ -12,6 +12,7 @@ and `-' (nope, that's fine) are bad news.  So is
 (--bar)
 "--baz"
 and '--foo'.
+So is \f[C]--foo\f[P].
 .\" Draft Mode example from sinfo man page from slurm-llnl.  Draft mode
 .\" disables the normal operation of the backslash character, so we can't
 .\" tell users to use \- inside draft mode.  These hyphens should
diff --git a/t/tests/manpages-general/tags b/t/tests/manpages-general/tags
index 9e4315b..0fe73f1 100644
--- a/t/tests/manpages-general/tags
+++ b/t/tests/manpages-general/tags
@@ -22,6 +22,7 @@ I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:1
 I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:12
 I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:13
 I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:14
+I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:15
 I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:9
 I: manpages-general: spelling-error-in-manpage usr/X11R6/man/man1/rstartd.1x.gz speling spelling
 I: manpages-general: spelling-error-in-manpage usr/share/man/man1/program.1.gz speling spelling

-- 
Debian package checker


Reply to: