* man/groff.man: Fix URL of CSTR 54.

* man/groff_char.man: Normalize character set names as defined
by IANA.  Based on a patch from Axel Kielhorn.

* src/preproc/refer/label.y: Undo change from 2007-09-19.

2 files changed, 21 insertions, 21 deletions

diff --git a/man/groff.man b/man/groff.man
index 3ab37ea3..183d906c 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -2,7 +2,7 @@
 .ig
 groff.man
 
-Last update: 15 Sep 2007
+Last update: 23 Sep 2007
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -3958,7 +3958,7 @@ pointers to further documentation.
 .
 .TP
 .I [CSTR\~#54]
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:54.ps
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz
 Nroff/\:Troff User's Manual by Osanna & Kernighan
 .UE
 \[em] the bible for classical troff.
diff --git a/man/groff_char.man b/man/groff_char.man
index f326061b..2d4a45e4 100644
--- a/man/groff_char.man
+++ b/man/groff_char.man
@@ -17,9 +17,9 @@ groff_char(7)
 This file is part of groff (GNU roff).
 
 File position: <groff_src_top>/man/groff_char.man
-Last update: 21 Feb 2006
+Last update: 23 Sep 2006
 
-Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2006
+Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2006, 2007
   Free Software Foundation, Inc.
 written by Werner Lemberg <wl@gnu.org>
 with additions by Bernd Warken <bwarken@mayn.de>
@@ -358,7 +358,7 @@ FDL in the main directory of the groff source package.
 .
 This manual page lists the standard
 .B groff
-glyph names and the default input mapping, \%latin-1.
+glyph names and the default input mapping, \%latin1.
 .
 The glyphs in this document look different depending
 on which output device was chosen (with option
@@ -382,7 +382,7 @@ for further glyphs.
 On ASCII platforms, input character codes in the range 0 to 127 (decimal)
 represent the usual \%7-bit ASCII characters, while codes between 127
 and 255 are interpreted as the corresponding characters in the
-.I \%Latin-1
+.I \%latin1
 .RI ( \%ISO-8859-1 )
 code set by default.
 .
@@ -395,14 +395,14 @@ either for internal use or for special input purposes.
 .
 On EBCDIC platforms, only code page
 .B cp1047
-is supported (which contains the same characters as \%Latin-1; the
+is supported (which contains the same characters as \%latin1; the
 input encoding file is called \f(CWcp1047.tmac\fP).
 .
 Again, some input characters are reserved for internal and special purposes.
 .
 It is rather straightforward (for the experienced user) to set up other
 \%8-bit encodings like
-.IR \%Latin-2 ;
+.IR \%latin2 ;
 since
 .B groff
 uses Unicode in the next major version, no additional encodings
@@ -460,7 +460,7 @@ keyboard, or by a groff escape sequence.
 .TP
 .I "Input code"
 applies to glyphs which can be input with a single character, and
-gives the ISO \%Latin-1 decimal code of that input character.
+gives the ISO \%latin1 decimal code of that input character.
 .
 Note that this code is equivalent to the lowest 256 Unicode characters,
 including \%7-bit ASCII in the range 0 to\ 127.
@@ -484,7 +484,7 @@ is the glyph name used in composite glyph names.
 These are the basic glyphs having 7-bit ASCII code values assigned.
 .
 They are identical to the printable characters of the
-character standards \%ISO-8859-1 (\%Latin-1) and Unicode (range
+character standards \%ISO-8859-1 (\%latin1) and Unicode (range
 .IR "C0 Controls and Basic Latin" ).
 .
 The glyph names used in composite glyph names are `u0020' up to `u007E'.
@@ -524,31 +524,31 @@ themselves; the only exceptions are the following characters:
 .
 .TP
 .B \`
-the ISO \%Latin-1 `Grave Accent' (code\ 96) prints as `, a left single
+the ISO \%latin1 `Grave Accent' (code\ 96) prints as `, a left single
 quotation mark; the original character can be obtained with `\f(CW\e`\fP'.
 .
 .
 .TP
 .B \*(aq
-the ISO \%Latin-1 `Apostrophe' (code\ 39) prints as ', a right single
+the ISO \%latin1 `Apostrophe' (code\ 39) prints as ', a right single
 quotation mark; the original character can be obtained with `\f(CW\e(aq\fP'.
 .
 .
 .TP
 .B -
-the ISO \%Latin-1 `Hyphen, Minus Sign' (code\ 45) prints as a hyphen; a
+the ISO \%latin1 `Hyphen, Minus Sign' (code\ 45) prints as a hyphen; a
 minus sign can be obtained with `\f(CW\e-\fP'.
 .
 .
 .TP
 .B ~
-the ISO \%Latin-1 `Tilde' (code\ 126) is reduced in size to be usable as
+the ISO \%latin1 `Tilde' (code\ 126) is reduced in size to be usable as
 a diacritic; a larger glyph can be obtained with `\f(CW\e(ti\fP'.
 .
 .
 .TP
 .B ^
-the ISO \%Latin-1 `Circumflex Accent' (code\ 94) is reduced in size to be
+the ISO \%latin1 `Circumflex Accent' (code\ 94) is reduced in size to be
 usable as a diacritic; a larger glyph can be obtained with `\f(CW\e(ha\fP'.
 .
 .
@@ -603,10 +603,10 @@ usable as a diacritic; a larger glyph can be obtained with `\f(CW\e(ha\fP'.
 .\" --------------------------------------------------------------------
 .
 They are interpreted as printable characters according to the
-.I Latin-1
-.RI ( iso-8859-1 )
+.I latin1
+.RI ( ISO-8859-1 )
 code set, being identical to the Unicode range
-.IR "C1 Controls and Latin-1 Supplement" .
+.IR "C1 Controls and Latin1 Supplement" .
 .
 .
 .P
@@ -617,7 +617,7 @@ characters.
 .TP
 160
 .
-the ISO \%Latin-1
+the ISO \%latin1
 .I no-break space
 is mapped to `\f(CW\e~\fP', the stretchable space character.
 .
@@ -637,7 +637,7 @@ The remaining ranges (\%161\-172, \%174\-255)
 are printable characters that print as themselves.
 .
 Although they can be specified directly with the keyboard on systems
-with a \%Latin-1 code page, it is better to use their glyph names;
+with a \%latin1 code page, it is better to use their glyph names;
 see next section.
 .
 .P
@@ -750,7 +750,7 @@ sequences.
 describes how these escape sequences look.
 .
 Glyph names can consist of quite arbitrary characters from the
-ASCII or \%Latin-1 code set, not only alphanumeric characters.
+ASCII or \%latin1 code set, not only alphanumeric characters.
 .
 Here some examples:
 .