[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff/src roff/troff/input.cpp libs/libgroff/na...
From: |
Werner LEMBERG |
Subject: |
[Groff-commit] groff/src roff/troff/input.cpp libs/libgroff/na... |
Date: |
Wed, 16 Jan 2008 06:41:39 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Werner LEMBERG <wl> 08/01/16 06:41:39
Modified files:
src/roff/troff : input.cpp
src/libs/libgroff: nametoindex.cpp
Log message:
name_to_glyph() exists two times. Explain this.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/input.cpp?cvsroot=groff&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/groff/src/libs/libgroff/nametoindex.cpp?cvsroot=groff&r1=1.10&r2=1.11
Patches:
Index: roff/troff/input.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/input.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- roff/troff/input.cpp 21 Oct 2007 08:13:17 -0000 1.48
+++ roff/troff/input.cpp 16 Jan 2008 06:41:39 -0000 1.49
@@ -1,6 +1,6 @@
// -*- C++ -*-
/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007
+ 2006, 2007, 2008
Free Software Foundation, Inc.
Written by James Clark (address@hidden)
@@ -8326,6 +8326,11 @@
}
}
+// This overrides the same function from libgroff; while reading font
+// definition files it puts single-letter glyph names into `charset_table'
+// and converts glyph names of the form `\x' (`x' a single letter) into `x'.
+// Consequently, symbol("x") refers to glyph name `\x', not `x'.
+
glyph *name_to_glyph(const char *nm)
{
charinfo *ci;
Index: libs/libgroff/nametoindex.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/libs/libgroff/nametoindex.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libs/libgroff/nametoindex.cpp 23 Feb 2006 20:00:47 -0000 1.10
+++ libs/libgroff/nametoindex.cpp 16 Jan 2008 06:41:39 -0000 1.11
@@ -1,5 +1,6 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2006
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2006,
+ 2008
Free Software Foundation, Inc.
Written by James Clark (address@hidden)
@@ -145,6 +146,8 @@
return indexer.numbered_char_glyph(n);
}
+// troff overrides this function with its own version.
+
glyph *name_to_glyph(const char *s)
{
assert(s != 0 && s[0] != '\0' && s[0] != ' ');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff/src roff/troff/input.cpp libs/libgroff/na...,
Werner LEMBERG <=