[Groff-commit] groff ChangeLog NEWS doc/groff.texinfo man/grof...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     09/02/21 07:40:23

Modified files:
        .              : ChangeLog NEWS 
        doc            : groff.texinfo 
        man            : groff_diff.man 
        src/roff/troff : input.cpp troff.h troff.man 

Log message:
        Add a new `file' warning category.
        
        * src/roff/troff/troff.h (warning_type): Add WARN_FILE.
        * src/roff/troff/input.cpp (DEFAULT_WARNING_MASK): Include
        WARN_FILE.
        (warning_table): Add `file' category.
        (macro_source): Convert error on missing macro file to a
        warning.
        * NEWS, doc/groff.texinfo (I/O, Warnings), man/groff_diff.man,
        src/roff/troff/troff.man: Document new warning category.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1196&r2=1.1197
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.257&r2=1.258
http://cvs.savannah.gnu.org/viewcvs/groff/doc/groff.texinfo?cvsroot=groff&r1=1.283&r2=1.284
http://cvs.savannah.gnu.org/viewcvs/groff/man/groff_diff.man?cvsroot=groff&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/input.cpp?cvsroot=groff&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/troff.h?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/troff.man?cvsroot=groff&r1=1.67&r2=1.68

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1196
retrieving revision 1.1197
diff -u -b -r1.1196 -r1.1197
--- ChangeLog   18 Feb 2009 09:58:41 -0000      1.1196
+++ ChangeLog   21 Feb 2009 07:40:21 -0000      1.1197
@@ -1,4 +1,18 @@
-2009-09-18  Werner LEMBERG  <address@hidden>
+2009-02-21  Colin Watson  <address@hidden>
+           Werner Lemberg  <address@hidden>
+
+       Add a new `file' warning category.
+
+       * src/roff/troff/troff.h (warning_type): Add WARN_FILE.
+       * src/roff/troff/input.cpp (DEFAULT_WARNING_MASK): Include
+       WARN_FILE.
+       (warning_table): Add `file' category.
+       (macro_source): Convert error on missing macro file to a
+       warning.
+       * NEWS, doc/groff.texinfo (I/O, Warnings), man/groff_diff.man,
+       src/roff/troff/troff.man: Document new warning category.
+
+2009-02-18  Werner LEMBERG  <address@hidden>
 
        * doc/groff.texinfo: Improve documentation of `lsm' request.
 

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- NEWS        14 Feb 2009 17:21:36 -0000      1.257
+++ NEWS        21 Feb 2009 07:40:22 -0000      1.258
@@ -20,6 +20,10 @@
   registers `lsn' and `lss' hold the number of removed leading spaces and
   the corresponding horizontal space, respectively.
 
+o There is a new warning category `file', enabled by default.  The `mso'
+  request emits warnings in this category when the requested macro file does
+  not exist.
+
 
 VERSION 1.20.1
 ==============

Index: doc/groff.texinfo
===================================================================
RCS file: /cvsroot/groff/groff/doc/groff.texinfo,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- doc/groff.texinfo   18 Feb 2009 09:58:42 -0000      1.283
+++ doc/groff.texinfo   21 Feb 2009 07:40:22 -0000      1.284
@@ -13132,6 +13132,8 @@
 the the @option{-m} command line option.  If the file name to be
 included has the form @address@hidden and it isn't found,
 @code{mso} tries to include @address@hidden and vice versa.
+If the file does not exist, a warning of type @samp{file} is emitted.
address@hidden, for information about warnings.
 @endDefreq
 
 @DefreqList {trf, file}
@@ -14182,6 +14184,11 @@
 @itemx 524288
 Color related warnings.
 
address@hidden file
address@hidden 1048576
+Missing files.  The @code{mso} request gives this warning when the
+requested macro file does not exist.  This is enabled by default.
+
 @item all
 All warnings except @samp{di}, @samp{mac} and @samp{reg}.  It is
 intended that this covers all warnings that are useful with traditional

Index: man/groff_diff.man
===================================================================
RCS file: /cvsroot/groff/groff/man/groff_diff.man,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- man/groff_diff.man  14 Feb 2009 17:21:37 -0000      1.71
+++ man/groff_diff.man  21 Feb 2009 07:40:22 -0000      1.72
@@ -1797,6 +1797,12 @@
 .BI tmac. name
 instead and vice versa.
 .
+A warning of type
+.B file
+is generated if
+.I file
+can't be loaded, and the request is ignored.
+.
 .TP
 .BI .nop \ anything
 Execute

Index: src/roff/troff/input.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/input.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/roff/troff/input.cpp    14 Feb 2009 17:21:38 -0000      1.58
+++ src/roff/troff/input.cpp    21 Feb 2009 07:40:22 -0000      1.59
@@ -59,7 +59,7 @@
 #ifndef DEFAULT_WARNING_MASK
 // warnings that are enabled by default
 #define DEFAULT_WARNING_MASK \
-     (WARN_CHAR|WARN_NUMBER|WARN_BREAK|WARN_SPACE|WARN_FONT)
+     (WARN_CHAR|WARN_NUMBER|WARN_BREAK|WARN_SPACE|WARN_FONT|WARN_FILE)
 #endif
 
 // initial size of buffer for reading names; expanded as necessary
@@ -7367,7 +7367,7 @@
       a_delete path;
     }
     else
-      error("can't find macro file `%1'", nm.contents());
+      warning(WARN_FILE, "can't find macro file `%1'", nm.contents());
     tok.next();
   }
 }
@@ -8153,6 +8153,7 @@
   { "reg", WARN_REG },
   { "ig", WARN_IG },
   { "color", WARN_COLOR },
+  { "file", WARN_FILE },
   { "all", WARN_TOTAL & ~(WARN_DI | WARN_MAC | WARN_REG) },
   { "w", WARN_TOTAL },
   { "default", DEFAULT_WARNING_MASK },

Index: src/roff/troff/troff.h
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/troff.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/roff/troff/troff.h      5 Jan 2009 20:11:13 -0000       1.13
+++ src/roff/troff/troff.h      21 Feb 2009 07:40:23 -0000      1.14
@@ -75,11 +75,12 @@
   WARN_SPACE = 0200000,
   WARN_FONT = 0400000,
   WARN_IG =  01000000,
-  WARN_COLOR = 02000000
+  WARN_COLOR = 02000000,
+  WARN_FILE = 04000000
   // change WARN_TOTAL if you add more warning types
 };
 
-const int WARN_TOTAL = 03777777;
+const int WARN_TOTAL = 07777777;
 
 int warning(warning_type, const char *,
            const errarg & = empty_errarg,

Index: src/roff/troff/troff.man
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/troff.man,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/roff/troff/troff.man    5 Jan 2009 20:33:55 -0000       1.67
+++ src/roff/troff/troff.man    21 Feb 2009 07:40:23 -0000      1.68
@@ -334,6 +334,7 @@
 address@hidden@address@hidden@address@hidden
 address@hidden@address@hidden@address@hidden
 address@hidden@address@hidden@address@hidden
+@@@address@hidden@file
 .TE
 .
 .P
@@ -385,6 +386,14 @@
 character is ignored.
 .
 .TP
+.BR file "\t1048576"
+Indicates a missing file for the
+.B mso
+request.
+.
+Enabled by default.
+.
+.TP
 .BR font "\t131072"
 Non-existent fonts.
 .