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

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     08/01/16 16:08:49

Modified files:
        .              : ChangeLog NEWS 
        doc            : groff.texinfo 
        man            : groff_diff.man 
        src/libs/libgroff: font.cpp 

Log message:
        * src/libs/libgroff/font.cpp (font::contains, font::get_code):
        Handle single-letter names correctly.
        
        * doc/groff.texinfo, man/groff_diff.man: Extend documentation of \^
        and \|.
        * NEWS: Updated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1123&r2=1.1124
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.245&r2=1.246
http://cvs.savannah.gnu.org/viewcvs/groff/doc/groff.texinfo?cvsroot=groff&r1=1.261&r2=1.262
http://cvs.savannah.gnu.org/viewcvs/groff/man/groff_diff.man?cvsroot=groff&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/groff/src/libs/libgroff/font.cpp?cvsroot=groff&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1123
retrieving revision 1.1124
diff -u -b -r1.1123 -r1.1124
--- ChangeLog   15 Jan 2008 06:24:40 -0000      1.1123
+++ ChangeLog   16 Jan 2008 16:08:47 -0000      1.1124
@@ -1,3 +1,16 @@
+2008-01-16  Werner LEMBERG  <address@hidden>
+
+       * src/libs/libgroff/font.cpp (font::contains, font::get_code):
+       Handle single-letter names correctly.
+
+       * doc/groff.texinfo, man/groff_diff.man: Extend documentation of \^
+       and \|.
+       * NEWS: Updated.
+
+2008-01-15  Werner LEMBERG  <address@hidden>
+
+       * man/groff_font.man: Revised.
+
 2008-01-14  Werner LEMBERG  <address@hidden>
 
        * man/groff.man: Mention glyph and characters.
@@ -1093,7 +1106,7 @@
 
 2006-10-26  Werner LEMBERG  <address@hidden>
 
-       Add `\%^' escape to handle the parameters to a macro as a string
+       Add `\$^' escape to handle the parameters to a macro as a string
        argument.
 
        * src/roff/troff/input.h (DOUBLE_QUOTE): New special character.
@@ -1106,7 +1119,7 @@
        Update constructor and all callers.
        (decode_args): Store discarded double quotes.
        (interpolate_args): Handle DOUBLE_QUOTE.
-       Add `\%^' escape.
+       Add `\$^' escape.
        (get_copy, token::next, composite_glyph_name): Handle DOUBLE_QUOTE.
 
        * tmac/trace.tmac: Trace .nr, .ds, .ds1, .as, .as1.

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -b -r1.245 -r1.246
--- NEWS        6 Dec 2007 17:18:21 -0000       1.245
+++ NEWS        16 Jan 2008 16:08:48 -0000      1.246
@@ -1,4 +1,4 @@
-    Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+    Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
       Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
@@ -69,6 +69,14 @@
 o A new read-only number register `.O' is available which returns the
   current suppression level as set by the `\O' escape.
   
+o The space width emitted by the `\|' and `\^' escape sequences can be
+  controlled on a per-font basis.  If there is a glyph named `\|' or `\^',
+  respectively (note the leading backslash), defined in the current font
+  file, use this glyph's width instead of the default value.
+
+  This behaviour is not new, but hasn't been documented before.
+
+  
 Nroff
 -----
 

Index: doc/groff.texinfo
===================================================================
RCS file: /cvsroot/groff/groff/doc/groff.texinfo,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -b -r1.261 -r1.262
--- doc/groff.texinfo   12 Jan 2008 22:31:33 -0000      1.261
+++ doc/groff.texinfo   16 Jan 2008 16:08:48 -0000      1.262
@@ -11485,11 +11485,19 @@
 @Defesc {\\|, , , }
 A 1/address@hidden em space.  Ignored for TTY output devices (rounded to
 zero).
+
+However, if there is a glyph defined in the current font file with name
address@hidden|} (note the leading backslash), the width of this glyph is used
+instead (even for TTYs).
 @endDefesc
 
 @Defesc {\\^, , , }
 A 1/address@hidden em space.  Ignored for TTY output devices (rounded to
 zero).
+
+However, if there is a glyph defined in the current font file with name
address@hidden (note the leading backslash), the width of this glyph is used
+instead (even for TTYs).
 @endDefesc
 
 @Defesc {\\0, , , }

Index: man/groff_diff.man
===================================================================
RCS file: /cvsroot/groff/groff/man/groff_diff.man,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- man/groff_diff.man  15 Jan 2008 06:24:41 -0000      1.67
+++ man/groff_diff.man  16 Jan 2008 16:08:48 -0000      1.68
@@ -3161,6 +3161,19 @@
 .BR \[rs]~ .
 .
 .P
+The space width emitted by the
+.B \[rs]|
+and
+.B \[rs]^
+escape sequences can be controlled on a per-font basis.
+If there is a glyph named
+.B \[rs]|
+or
+.BR \[rs]^ ,
+respectively (note the leading backslash), defined in the current font file,
+use this glyph's width instead of the default value.
+.
+.P
 It is now possible to have whitespace between the first and second dot
 (or the name of the ending macro) to end a macro definition.
 .

Index: src/libs/libgroff/font.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/libs/libgroff/font.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/libs/libgroff/font.cpp  12 Jul 2006 19:31:09 -0000      1.15
+++ src/libs/libgroff/font.cpp  16 Jan 2008 16:08:48 -0000      1.16
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
-                 2006
+                 2006, 2008
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -292,6 +292,12 @@
       // Unicode character?
       if (check_unicode_name(nm))
        return 1;
+      // If `nm' is a single letter `x', the glyph name is `\x'.
+      char buf[] = { '\\', '\0', '\0' };
+      if (nm[1] == '\0') {
+       buf[1] = nm[0];
+        nm = buf;
+      }
       // groff glyph name that maps to Unicode?
       const char *unicode = glyph_name_to_unicode(nm);
       if (unicode != NULL && strchr(unicode, '_') == NULL)
@@ -573,6 +579,12 @@
        char *ignore;
        return (int)strtol(nm + 1, &ignore, 16);
       }
+      // If `nm' is a single letter `x', the glyph name is `\x'.
+      char buf[] = { '\\', '\0', '\0' };
+      if (nm[1] == '\0') {
+       buf[1] = nm[0];
+        nm = buf;
+      }
       // groff glyphs that map to Unicode?
       const char *unicode = glyph_name_to_unicode(nm);
       if (unicode != NULL && strchr(unicode, '_') == NULL) {