* src/libs/libgroff/glyphuni.cpp (glyph_to_unicode_list): Use entry

for \-.
Remove commented out entries for \' and \` (there are no such glyph
names).

* src/libs/libgroff/uniglyph.cpp (unicode_to_glyph_list): Remove
commented out entries for \' and \`.


* */*: s/legal/valid/ where appropriate.

12 files changed, 29 insertions, 29 deletions

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 3a4253fb..2d05b6b9 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -207,7 +207,7 @@ o Addtion of font "styles" to om.tmac, plus changes to the FAMILY
   and FT macros to manage them.  New section in the doc appendices
   on adding fonts and managing the new font styles.
 
-o Mom now uses a "fallback font" whenever there's an illegal call
+o Mom now uses a "fallback font" whenever there's an invalid call
   to FAMILY.
 
 o RW and EW now affect only the font in effect.  A change of family
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index 13a8c540..d4c2497e 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -201,13 +201,13 @@ requires a unit of measure; points is assumed.
 Release 1.1.6-b
 ---------------
 
-Added a SHIM macro that calculates and moves to the next "legal"
+Added a SHIM macro that calculates and moves to the next "valid"
 baseline during document processing (useful if user starts playing
 around with spacing/leading on a page and needs to get the leading
 back on track).
 
 Fixed handling of DOCHEADER OFF <distance> so that the first line of
-running text falls on a "legal" baseline when <distance> is given.
+running text falls on a "valid" baseline when <distance> is given.
 
 Release 1.1.6-a
 ---------------
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
index a6badbc4..26a1787c 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -206,7 +206,7 @@ for how to get a list of valid colour names.)
 <strong>XCOLOR</strong> is similar to <strong>NEWCOLOR</strong> in
 that it tells <strong>mom</strong> to initialize a colour, but it's
 easier to use.  All you have to do is pass it, as an argument, the
-legal name of one of the 256 pre-defined X colours.  The name must
+valid name of one of the 256 pre-defined X colours.  The name must
 be all one word, and, breaking with <strong>mom</strong> policy, it
 must be entered in lower case.
 <p>
diff --git a/contrib/mom/momdoc/definitions.html b/contrib/mom/momdoc/definitions.html
index 80542afa..0ab4df15 100644
--- a/contrib/mom/momdoc/definitions.html
+++ b/contrib/mom/momdoc/definitions.html
@@ -102,7 +102,7 @@ at the current
 
 <dt><a name="TERMS_DISCRETIONARYHYPHEN"><em>Discretionary hyphen</em></a>
 <dd>A symbol inserted between two syllables of a word that indicates to a
-typesetting program the legal hyphenation points in the word.  Normally,
+typesetting program the valid hyphenation points in the word.  Normally,
 if hyphenation is turned on, groff knows where to hyphenate words.
 However, hyphenation being what it is (in English, at any rate),
 groff doesn't always get it right.  Discretionary hyphens make sure
diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/docelement.html
index 0ce950a3..714a3070 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -1274,12 +1274,12 @@ optional arguments: the character you want deposited at the line
 break, the number of times you want the character repeated, and a
 vertical adjustment factor.
 <p>
-The first argument is any legal groff character (e.g. <kbd>*</kbd>
+The first argument is any valid groff character (e.g. <kbd>*</kbd>
 [an asterisk], <kbd>\(dg</kbd> [a dagger], <kbd>\f(ZD\N'141\fP</kbd>
 [an arbitrary character from Zapf Dingbats], <kbd>\l'4P'</kbd>
 [a 4-pica long rule]).  <strong>Mom</strong> sets the character
 centred on the current line length.  (See &quot;man groff_char&quot;
-for a list of all legal groff characters.)
+for a list of all valid groff characters.)
 <p>
 The second argument is the number of times to repeat the character.
 <p>
@@ -1971,7 +1971,7 @@ precede each item you want in the list with <strong>ITEM</strong>.
 <strong>Mom</strong> takes care of everything else with respect to
 setting the item appropriate to the list you're in.
 <p>
-In document processing, it is legal to have list items that contain
+In document processing, it is valid to have list items that contain
 multiple paragraphs.  Simply issue a
 <a href="#PP">PP</a>
 request for each paragraph <em>following</em> the first item.
@@ -2939,7 +2939,7 @@ which takes, as its single argument, the separator you want.  For
 safety and consistency's sake, ALWAYS enclose the argument in
 double-quotes.
 <p>
-The separator can be composed of any legal groff character, or any
+The separator can be composed of any valid groff character, or any
 combination of characters. <strong>A word of caution:</strong> when
 using a separator, <strong>mom</strong> doesn't insert a space
 after the separator.  Hence, if you want the space (you probably
@@ -3980,7 +3980,7 @@ macro to do this is <strong>ENDNOTE_LINENUMBER_SEPARATOR</strong>,
 which takes, as its single argument, the separator you want.
 (If the argument contains spaces, don't forget to enclose the
 argument in double-quotes.)  The separator can be composed of
-any legal groff character, or any combination of characters.
+any valid groff character, or any combination of characters.
 For example, to get a colon separator after the line number in
 line-numbered endnotes, you'd do
 <p>
diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/docprocessing.html
index 6f64d68d..ac1354e8 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -1780,7 +1780,7 @@ argument.
 This starts the document 1.5 inches from the top of the page PLUS
 whatever spacing adjustment <strong>mom</strong> has to make in
 order to ensure that the first baseline of running text falls on a
-&quot;legal&quot; baseline (i.e. one that ensures that the bottom
+&quot;valid&quot; baseline (i.e. one that ensures that the bottom
 margin of the first page falls where it should).  The distance is
 measured from the top edge of the paper to the
 <a href="definitions.html#TERMS_BASELINE">baseline</a>
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
index 9409aab9..5e3ead6c 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -571,13 +571,13 @@ Groff's basic mechanism for inline font control is the escape
 </table>
 <p>
 <strong>\f[&lt;</strong>font&gt;<strong>]</strong> can be used with
-any legal font style registered with groff.  (See
+any valid font style registered with groff.  (See
 <a href="appendices.html#STYLE_EXTENSIONS">here</a>
 for a list of pre-registered font styles provided by
 <strong>mom</strong>).
 <p>
 <strong>\f[&lt;</strong>font&gt;<strong>]</strong> can also take a
-complete legal family+font name combo.  This is especially useful
+complete valid family+font name combo.  This is especially useful
 should you need to change both family and font inline.  For example,
 if your prevailing family and font are Times Roman and you want a
 few words in Courier Bold Italic, you could do this:
diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html
index ab8eeb19..e056ba1d 100644
--- a/contrib/mom/momdoc/reserved.html
+++ b/contrib/mom/momdoc/reserved.html
@@ -186,10 +186,10 @@ TYPESIZE    Diverts SIZESPECS routine so it doesn't print
 
 #ABORT_FT_ERRORS        Abort on FT errors? (toggle)
 #ALD                    ALD value
-#ARGS_TO_LIST           Tells LIST whether LIST was invoked with a legal
+#ARGS_TO_LIST           Tells LIST whether LIST was invoked with a valid
                         arg; controls LIST OFF processing
 #ARGS_TO_SQ             Tells SMARTQUOTES whether it was invoked with a
-                        legal arg; controls SMARTQUOTES OFF
+                        valid arg; controls SMARTQUOTES OFF
                         processing
 #AUTOLEAD_FACTOR        Using FACTOR arg to AUTOLEAD? (toggle)
 #AUTO_LEAD              Using autolead? (toggle)
@@ -908,14 +908,14 @@ Q_NOFIT              Handles spacing of quotes when quote does not fit on
                      the page
 QUIT_LISTS           Exit lists cleanly and completely
 SET_LIST_INDENT      Restore indent of a prev. level of list
-SHIM                 Advance to next "legal" baseline
+SHIM                 Advance to next "valid" baseline
 TERMINATE            .em that ensures deferred footnotes get output
                      on final pages
 TRAPS                Sets hdrftr traps; optionally adjusts #DOC_LEAD
                      to fill page to #B_MARGIN
 TYPEWRITER           Sets family (C), font (R) and point size (12)
                      for PRINTSTYLE TYPEWRITE
-VFP_CHECK            Trap-sprung macro 1 legal baseline higher than
+VFP_CHECK            Trap-sprung macro 1 valid baseline higher than
                      where FOOTER will be sprung; checks whether
                      there is, in fact, just enough room for
                      another line of running text to be added to
@@ -1190,7 +1190,7 @@ dc                         "mark" register for document columns
                            processed
 #FN_GAP                    When there are footnotes on a page, the
                            difference between where FOOTER will be
-                           sprung and the next legal baseline.
+                           sprung and the next valid baseline.
                            Used in VFP_CHECK.
 #FN_LEAD                   Lead in footnotes after FN_AUTOLEAD is
                            applied
@@ -1293,7 +1293,7 @@ dc                         "mark" register for document columns
 #L_MARGIN_DIFF             Difference between DOC_L_MARGIN and
                            L_MARGIN
 #LEFT_CAP_HEIGHT           Cap height of left string in headers/footers
-#LEGAL_BASELINE            Calculates vert. position of next legal
+#LEGAL_BASELINE            Calculates vert. position of next valid
                            baseline in SHIM
 #LETTER_STYLE              1=BUSINESS 2=PERSONAL
 #LINEBREAK                 Did we have a linebreak? (toggle)
@@ -1484,7 +1484,7 @@ dc                         "mark" register for document columns
                            (used for subhead spacing)
 #SH_NUM                    Subhead number
 #SHIM                      Amount of lead required to advance to
-                           next legal baseline
+                           next valid baseline
 #SILENT_BQUOTE_LN          "Silently" linenumber blockquotes? (toggle)
 #SILENT_QUOTE_LN           "Silently" linenumber quotes? (toggle)
 #SINGLE_SPACE              Is TYPEWRITE in single space mode? (toggle)
diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typesetting.html
index a161c5b4..5e129d67 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -690,7 +690,7 @@ For example, if you add the Garamond family, name the font files
 	GARAMONDBI
 </pre>
 
-GARAMOND then becomes a legal family name you can pass to
+GARAMOND then becomes a valid family name you can pass to
 <strong>FAMILY</strong>.  (You could, of course, shorten GARAMOND to just
 G, or GD.)  R, I, B, and BI after GARAMOND are the roman, italic,
 bold and bold-italic fonts respectively.
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index a745212e..569797e3 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -1798,7 +1798,7 @@ to make sure all indents are off before setting tabs.
 \#   color).  If <alias> is given, creates a string of <alias name>
 \#   that references the x color name of the first argument.
 \# *Notes:
-\#   The color name must be a legal color name from rgb.txt, and
+\#   The color name must be a valid color name from rgb.txt, and
 \#   must be given entirely in lower case, all one word.
 \#
 .MAC XCOLOR END
@@ -6528,12 +6528,12 @@ the macro whose style is to be changed.
 \# *Argument:
 \#   None
 \# *Function:
-\#   Advances to the next "legal" baseline.
+\#   Advances to the next "valid" baseline.
 \# *Notes:
 \#   If a user plays around with spacing in a doc (say, with ALD),
 \#   it isn't easy to get mom back on track so she can achieve
 \#   perfectly flush bottom margins.  Any time SHIM is used, it
-\#   ensures that the next output line falls on a legal baseline.
+\#   ensures that the next output line falls on a valid baseline.
 \#
 \# First, a little convenience macro
 \#
@@ -9871,7 +9871,7 @@ Default is OFF.
 .          el \{\
 .\" This seems to be the only way to get the baseline of quotes that start
 .\" at the top of the page to fall on the first line of the "grid" (i.e on
-.\" the first legal baseline of the page).
+.\" the first valid baseline of the page).
 .             ie \\n[#Q_TOP]=\\n[#PAGE_TOP] \{\
 .                if \\n[#QUOTE]=1 \{\
 .                   rn P_QUOTE Q_TEMP
diff --git a/contrib/pdfmark/pdfmark.ms b/contrib/pdfmark/pdfmark.ms
index 0e9f0747..c7a7ef9d 100644
--- a/contrib/pdfmark/pdfmark.ms
+++ b/contrib/pdfmark/pdfmark.ms
@@ -1397,7 +1397,7 @@ even if they would otherwise be interpreted as such.
 It is also useful when the argument list to
 .CW pdfhref
 contains special characters \(em any special character,
-which is not legal in a
+which is not valid in a
 .CW groff
 macro name, will cause a parsing error, if
 .CW pdfhref
diff --git a/contrib/pdfmark/pdfroff.sh b/contrib/pdfmark/pdfroff.sh
index 03bed4e1..b99872f2 100644
--- a/contrib/pdfmark/pdfroff.sh
+++ b/contrib/pdfmark/pdfroff.sh
@@ -3,7 +3,7 @@
 #
 # Function: Format PDF Output from groff Markup
 #
-# Copyright (C) 2005, Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, Free Software Foundation, Inc.
 # Written by Keith Marshall (keith.d.marshall@ntlworld.com)
 # 
 # This file is part of groff.
@@ -297,7 +297,7 @@
 #
 #     Those standard options which expect an argument, but are specified with
 #     an intervening space, between flag and argument, must be reparsed, so we
-#     can trap illegal use of '-T dev', or missing input files.
+#     can trap invalid use of '-T dev', or missing input files.
 #
       -[dfFILmMnoPrTwW])
            OPTNAME="$1"
@@ -569,4 +569,4 @@
   $SAY >&2 ". done"
 #
 # ------------------------------------------------------------------------------
-# $RCSfile: pdfroff.sh,v $ $Revision: 1.7 $: end of file
+# $RCSfile: pdfroff.sh,v $ $Revision: 1.8 $: end of file