[Groff-commit] groff ./ChangeLog font/devcp1047/R.proto font/d...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/02/23 20:07:25

Modified files:
        .              : ChangeLog 
        font/devcp1047 : R.proto 
        font/devlatin1 : R.proto 
        src/libs/libgroff: glyphuni.cpp uniglyph.cpp 
        src/preproc/preconv: preconv.cpp 
        tmac           : html.tmac 

Log message:
        Remove all remaining traces from the `shc' glyph.
        
        * src/libs/libgroff/glyphuni.cpp (glyph_to_unicode_list),
        src/libs/libgroff/uniglyph.cpp (unicode_to_glyph_list): Remove
        entry for `shc'.
        
        * font/devlatin1/R.proto, font/devcp1046/R.proto: Replace `shc'
        entry with unnamed glyph.
        
        * tmac/html/tmac: Remove `shc' entry from call to `.cflags'.
        
        * src/preproc/preconv/preconv.cpp (unicode_entity): Handle U+00AD
        specially.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.911&tr2=1.912&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/font/devcp1047/R.proto.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/font/devlatin1/R.proto.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/libs/libgroff/glyphuni.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/libs/libgroff/uniglyph.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/preproc/preconv/preconv.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/tmac/html.tmac.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.911 groff/ChangeLog:1.912
--- groff/ChangeLog:1.911       Thu Feb 23 20:00:46 2006
+++ groff/ChangeLog     Thu Feb 23 20:07:25 2006
@@ -1,9 +1,25 @@
+2006-02-22  Werner LEMBERG  <address@hidden>
+
+       Remove all remaining traces from the `shc' glyph.
+
+       * src/libs/libgroff/glyphuni.cpp (glyph_to_unicode_list),
+       src/libs/libgroff/uniglyph.cpp (unicode_to_glyph_list): Remove
+       entry for `shc'.
+
+       * font/devlatin1/R.proto, font/devcp1046/R.proto: Replace `shc'
+       entry with unnamed glyph.
+
+       * tmac/html/tmac: Remove `shc' entry from call to `.cflags'.
+
+       * src/preproc/preconv/preconv.cpp (unicode_entity): Handle U+00AD
+       specially.
+
 2006-02-22  Bruno Haible  <address@hidden>
 
-       Concretize the glyph datatype.
+       Concretize the `glyph' datatype.
 
-       * src/include/font.h (struct glyph): Remove class.
-       (struct glyph): Renamed from struct glyphinfo.
+       * src/include/font.h (glyph): Remove class.
+       (glyph): Renamed from struct `glyphinfo'.
        (glyph_to_index): New inline function.
        (glyph_to_name): Make extern, not inline.
        (glyph_to_number): Update.
@@ -80,8 +96,8 @@
 
 2006-02-15  Bruno Haible  <address@hidden>
 
-       * src/include/font.h (struct glyphinfo): New class.
-       (struct glyph): Change internal representation.
+       * src/include/font.h (glyphinfo): New class.
+       (glyph): Change internal representation.
        Change constructor signature.
        New method glyph::glyph_number().
        (glyph::glyph, glyph glyph::undefined_glyph, glyph::glyph_index,
@@ -176,7 +192,7 @@
        font::copy_entry, font::add_kern, font::hash_kern): Change argument
        type to glyph_t.
 
-       * src/libs/libgroff/font.cpp (struct font_kern_list): Change members
+       * src/libs/libgroff/font.cpp (font_kern_list): Change members
        type and constructor argument types to glyph_t.
        (font::contains, font::get_width, font::get_height, font::get_depth,
        font::get_character_type, font::get_kern, font::get_skew,
Index: groff/font/devcp1047/R.proto
diff -u groff/font/devcp1047/R.proto:1.11 groff/font/devcp1047/R.proto:1.12
--- groff/font/devcp1047/R.proto:1.11   Tue Apr 15 06:29:53 2003
+++ groff/font/devcp1047/R.proto        Thu Feb 23 20:07:25 2006
@@ -253,7 +253,7 @@
 *Y     "
 I      24      0       0311
 *I     "
-shc    24      0       0312
+---    24      0       0312
 ^o     24      0       0313
 :o     24      0       0314
 `o     24      0       0315
Index: groff/font/devlatin1/R.proto
diff -u groff/font/devlatin1/R.proto:1.12 groff/font/devlatin1/R.proto:1.13
--- groff/font/devlatin1/R.proto:1.12   Tue Apr 15 06:29:54 2003
+++ groff/font/devlatin1/R.proto        Thu Feb 23 20:07:25 2006
@@ -231,7 +231,7 @@
 Fo     24      0       0253
 no     24      0       0254
 tno    "
-shc    24      0       0255
+---    24      0       0255
 rg     24      0       0256
 a-     24      0       0257
 de     24      0       0260
Index: groff/src/libs/libgroff/glyphuni.cpp
diff -u groff/src/libs/libgroff/glyphuni.cpp:1.8 
groff/src/libs/libgroff/glyphuni.cpp:1.9
--- groff/src/libs/libgroff/glyphuni.cpp:1.8    Wed Feb 22 15:30:52 2006
+++ groff/src/libs/libgroff/glyphuni.cpp        Thu Feb 23 20:07:25 2006
@@ -173,7 +173,8 @@
   { "Fo", "00AB" },
   { "no", "00AC" },
   { "tno", "00AC" },
-  { "shc", "00AD" },
+// The soft hypen U+00AD is meaningful only in the input file,
+// not in the output.
   { "rg", "00AE" },
   { "a-", "00AF" },
   { "de", "00B0" },
Index: groff/src/libs/libgroff/uniglyph.cpp
diff -u groff/src/libs/libgroff/uniglyph.cpp:1.4 
groff/src/libs/libgroff/uniglyph.cpp:1.5
--- groff/src/libs/libgroff/uniglyph.cpp:1.4    Thu May 26 21:02:00 2005
+++ groff/src/libs/libgroff/uniglyph.cpp        Thu Feb 23 20:07:25 2006
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 2002, 2003, 2004
+/* Copyright (C) 2002, 2003, 2004, 2006
    Free Software Foundation, Inc.
      Written by Werner Lemberg <address@hidden>
 
@@ -231,7 +231,8 @@
   { "00AB", "Fo" },
   { "00AC", "no" },
 //{ "00AC", "tno" },
-  { "00AD", "shc" },
+  // In groff, U+00AD is an input character only; it is not mapped to
+  // a glyph but to `\%'.
   { "00AE", "rg" },
   { "00AF", "a-" },
   { "00B0", "de" },
Index: groff/src/preproc/preconv/preconv.cpp
diff -u groff/src/preproc/preconv/preconv.cpp:1.10 
groff/src/preproc/preconv/preconv.cpp:1.11
--- groff/src/preproc/preconv/preconv.cpp:1.10  Sat Jan 21 12:27:44 2006
+++ groff/src/preproc/preconv/preconv.cpp       Thu Feb 23 20:07:25 2006
@@ -397,8 +397,16 @@
 {
   if (u < 0x80)
     putchar(u);
-  else
-    printf("\\[u%04X]", u);
+  else {
+    // Handle soft hyphen specially -- it is an input character only,
+    // not a glyph.
+    if (u == 0xAD) {
+      putchar('\\');
+      putchar('%');
+    }
+    else
+      printf("\\[u%04X]", u);
+  }
 }
 
 // ---------------------------------------------------------
Index: groff/tmac/html.tmac
diff -u groff/tmac/html.tmac:1.18 groff/tmac/html.tmac:1.19
--- groff/tmac/html.tmac:1.18   Thu Oct  7 11:56:33 2004
+++ groff/tmac/html.tmac        Thu Feb 23 20:07:25 2006
@@ -32,7 +32,7 @@
 ..
 .
 .\" avoid line breaks after hyphen-like characters.
-.cflags 0 -\[hy]\[em]\[en]\[shc]
+.cflags 0 -\[hy]\[em]\[en]
 .
 .\" Now set any characters defined in devps/S but not in devhtml to nul --
 .\" these are generated by eqn but not used by grohtml.  grops generated