[Groff-commit] groff ./ChangeLog src/libs/libgroff/font.cpp sr...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/02/11 17:44:14

Modified files:
        .              : ChangeLog 
        src/libs/libgroff: font.cpp 
        src/roff/troff : input.cpp 

Log message:
        * src/roff/troff/input.cpp (font::name_to_index): Never return a
        negative value.
        * src/libs/libgroff/font.cpp (font::load): Remove failure tests for
        font::name_to_index.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.896&tr2=1.897&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/libs/libgroff/font.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/roff/troff/input.cpp.diff?tr1=1.26&tr2=1.27&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.896 groff/ChangeLog:1.897
--- groff/ChangeLog:1.896       Sat Feb 11 08:54:47 2006
+++ groff/ChangeLog     Sat Feb 11 17:44:14 2006
@@ -1,3 +1,10 @@
+2006-02-11  Bruno Haible  <address@hidden>
+
+       * src/roff/troff/input.cpp (font::name_to_index): Never return a
+       negative value.
+       * src/libs/libgroff/font.cpp (font::load): Remove failure tests for
+       font::name_to_index.
+
 2006-02-10  Werner LEMBERG  <address@hidden>
 
        * doc/groff.texinfo (Assigning Formats): Number registers are always
Index: groff/src/libs/libgroff/font.cpp
diff -u groff/src/libs/libgroff/font.cpp:1.7 
groff/src/libs/libgroff/font.cpp:1.8
--- groff/src/libs/libgroff/font.cpp:1.7        Thu May 26 21:02:00 2005
+++ groff/src/libs/libgroff/font.cpp    Sat Feb 11 17:44:14 2006
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -677,15 +678,7 @@
          return 0;
        }
        int i1 = name_to_index(c1);
-       if (i1 < 0) {
-         t.error("invalid character `%1'", c1);
-         return 0;
-       }
        int i2 = name_to_index(c2);
-       if (i2 < 0) {
-         t.error("invalid character `%1'", c2);
-         return 0;
-       }
        add_kern(i1, i2, n);
       }
     }
@@ -715,10 +708,6 @@
            return 0;
          }
          int idx = name_to_index(nm);
-         if (idx < 0) {
-           t.error("invalid character `%1'", nm);
-           return 0;
-         }
          copy_entry(idx, last_index);
        }
        else {
@@ -778,10 +767,6 @@
          }
          else {
            last_index = name_to_index(nm);
-           if (last_index < 0) {
-             t.error("invalid character `%1'", nm);
-             return 0;
-           }
            add_entry(last_index, metric);
            copy_entry(number_to_index(metric.code), last_index);
          }
Index: groff/src/roff/troff/input.cpp
diff -u groff/src/roff/troff/input.cpp:1.26 groff/src/roff/troff/input.cpp:1.27
--- groff/src/roff/troff/input.cpp:1.26 Thu Jun 16 09:47:49 2005
+++ groff/src/roff/troff/input.cpp      Sat Feb 11 17:44:14 2006
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -8203,7 +8204,7 @@
   else
     ci = get_charinfo(symbol(nm));
   if (ci == 0)
-    return -1;
+    abort();
   else
     return ci->get_index();
 }