[groff] 01/01: src/utils/hpftodit/*: Improve the license information.

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit c012e48e5068ab838780e197f5770fb601db936e
Author: Bernd Warken <address@hidden>
Date:   Thu Sep 18 04:05:07 2014 +0200

    src/utils/hpftodit/*: Improve the license information.
---
 src/utils/hpftodit/Makefile.sub |    5 +-
 src/utils/hpftodit/hpftodit.cpp |    3 +-
 src/utils/hpftodit/hpftodit.man |  148 +++++++++++++++++++++++++++++----------
 src/utils/hpftodit/hpuni.cpp    |    2 +-
 4 files changed, 113 insertions(+), 45 deletions(-)

diff --git a/src/utils/hpftodit/Makefile.sub b/src/utils/hpftodit/Makefile.sub
index ef982d3..657e4df 100644
--- a/src/utils/hpftodit/Makefile.sub
+++ b/src/utils/hpftodit/Makefile.sub
@@ -2,10 +2,7 @@
 #
 # File position: <groff-source>/src/utils/hpftodit/Makefile.sub
 #
-# Copyright (C) 2014
-#   Free Software Foundation, Inc.
-#
-# Last update: 2 Sep 2014
+# Copyright (C) 2014  Free Software Foundation, Inc.
 #
 # This file is part of `font utf8' which is part of `groff'.
 #
diff --git a/src/utils/hpftodit/hpftodit.cpp b/src/utils/hpftodit/hpftodit.cpp
index 9b000aa..069608d 100644
--- a/src/utils/hpftodit/hpftodit.cpp
+++ b/src/utils/hpftodit/hpftodit.cpp
@@ -1,6 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1994, 2000, 2001, 2003, 2004, 2009
-     Free Software Foundation, Inc.
+/* Copyright (C) 1994-2014  Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
 This file is part of groff.
diff --git a/src/utils/hpftodit/hpftodit.man b/src/utils/hpftodit/hpftodit.man
index e15ace8..202f1bf 100644
--- a/src/utils/hpftodit/hpftodit.man
+++ b/src/utils/hpftodit/hpftodit.man
@@ -1,7 +1,15 @@
 .tr ~
-.ig
-Copyright (C) 1994-2000, 2001, 2003, 2004, 2009, 2014
-  Free Software Foundation, Inc.
+.TH HPFTODIT @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.SH NAME
+hpftodit \- create font description files for use with groff \-Tlj4
+.
+.
+.\" --------------------------------------------------------------------
+.\" Legal Terms
+.\" --------------------------------------------------------------------
+.
+.de co
+Copyright (C) 1994-2014  Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -18,6 +26,11 @@ versions, except that this permission notice may be included 
in
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
+.\" --------------------------------------------------------------------
+.\" Definitions
+.\" --------------------------------------------------------------------
+.
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
@@ -28,12 +41,9 @@ the original English.
 .ie \\n(.$>2 \&\\$1\f(CR\\$2\fP\\$3
 .el \&\f(CR\\$1\fP\\$2
 ..
+.
 .tr ~
-.TH HPFTODIT @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
-.\" --------------------------------------------------------------------------
-.SH NAME
-.\" --------------------------------------------------------------------------
-hpftodit \- create font description files for use with groff \-Tlj4
+.
 .\" --------------------------------------------------------------------------
 .SH SYNOPSIS
 .\" --------------------------------------------------------------------------
@@ -51,9 +61,12 @@ hpftodit \- create font description files for use with groff 
\-Tlj4
 It is possible to have whitespace between the
 .B \-i
 option and its parameter.
+.
+.
 .\" --------------------------------------------------------------------------
 .SH DESCRIPTION
 .\" --------------------------------------------------------------------------
+.
 .B hpftodit
 creates a font file for use with a Hewlett-Packard LaserJet~4\(enseries
 (or newer) printer with
@@ -71,6 +84,8 @@ m u c1 c2 \fR.\|.\|. [
 .CW #
 .I comment
 ]
+.
+.
 .LP
 where
 .I m
@@ -81,6 +96,7 @@ and
 .IR c1 ,
 .IR c2 ", .\|.\|."
 are the groff names of the character.
+.
 The values can be separated by any whitespace; the Unicode value must
 use uppercase digits A\^\(en\^F, and must be without a leading
 .CW ` 0x ',
@@ -91,22 +107,29 @@ Unicode values corresponding to composite glyphs are 
decomposed; e.g.,
 .CW ` u00C0 '
 becomes
 .CW ` u0041_0300 '.
+.
 The name for a glyph without a groff name may be given as
 .CW u \fIXXXX\fP
 if the glyph corresponds to a Unicode value, or as an unnamed glyph
 .CW ` --- '.
+.
 If the given Unicode value is in the Private Use Area
 (0xE000\^\(en\^0xF8FF), the glyph is included as an unnamed glyph.
+.
 Refer to
 .BR groff_diff (@MAN1EXT@)
 for additional information about unnamed glyphs and how to access them.
+.
+.
 .LP
 Blank lines and lines beginning with
 .CW ` # '
 are ignored.
+.
 A
 .CW ` # '
 following one or more groff names begins a comment.
+.
 Because
 .CW ` # '
 is a valid groff name, it must appear first in a list of
@@ -125,9 +148,12 @@ rather than
 which will treat the first
 .CW ` # '
 as the beginning of the comment.
+.
+.
 .LP
 .I font
 is the name of the groff font file.
+.
 The groff font file is written to
 .IR font ;
 if
@@ -135,6 +161,8 @@ if
 is specified as
 .CW ` - ',
 the output is written to the standard output.
+.
+.
 .LP
 The
 .B \-s
@@ -145,6 +173,7 @@ if
 .B troff
 should search it whenever
 a character is not found in the current font).
+.
 If the font is special,
 it should be listed in the
 .B fonts
@@ -152,6 +181,8 @@ command in the DESC file;
 if it is not special, there is no need to list it, since
 .B troff
 can automatically mount it when it's first used.
+.
+.
 .LP
 If the
 .B \-i
@@ -162,24 +193,31 @@ a left italic correction and a subscript correction
 for each character
 (the significance of these parameters is explained in
 .BR groff_font (@MAN5EXT@)).
+.
+.
 .\" --------------------------------------------------------------------------
 .SH OPTIONS
 .\" --------------------------------------------------------------------------
+.
 .TP
 .B \-a
 Include characters in the TFM file that are not included in the map
 file.
+.
 A glyph with corresponding Unicode value is given the name
 .RI u XXXX ;
 a glyph without a Unicode value is included as an unnamed glyph
 \&`\-\^\-\^\-'.
+.
 A glyph with a Unicode value in the Private Use Area
 (0xE000\^\(en\^0xF8FF) also is included as an unnamed glyph.
+.
 .IP
-This option provides a simple means of adding Unicode-named and unnamed
-glyphs to a font without including them in the map file, but it affords
-little control over which glyphs are placed in a regular font and which
-are placed in a special font.
+This option provides a simple means of adding Unicode-named and
+unnamed glyphs to a font without including them in the map file, but
+it affords little control over which glyphs are placed in a regular
+font and which are placed in a special font.
+.
 The presence or absence of the
 .B \-s
 option has some effect on which glyphs are included: without the
@@ -189,35 +227,46 @@ glyphs; with the
 .B \-s
 option, only the \(lqmathematical\(rq symbol sets
 are searched.
+.
 Nonetheless, restricting the symbol sets searched isn't very
 selective\(emmany glyphs are placed in both regular and special fonts.
+.
 Normally, the
 .B \-a
 option should be used only as a last resort.
-.\" --------------------------------------------------------------------------
+.
+.
 .TP
 .B \-d
-Dump information about the TFM file to the standard output; this option
-can be useful for ensuring that a TFM file is a proper match for a font,
-and that the contents of the TFM file are suitable.
-The information includes the values of important TFM tags, and a listing
-(by MSL number for Intellifont TFM files or by Unicode value for
-TrueType TFM files) of the glyphs included in the TFM file.
-The unit of measure `DU' for some tags indicates design units; there are
-8782 design units per em for Intellifont fonts, and 2048 design units
-per em for TrueType fonts.
+Dump information about the TFM file to the standard output; this
+option can be useful for ensuring that a TFM file is a proper match
+for a font, and that the contents of the TFM file are suitable.
+.
+The information includes the values of important TFM tags, and a
+listing (by MSL number for Intellifont TFM files or by Unicode value
+for TrueType TFM files) of the glyphs included in the TFM file.
+.
+The unit of measure `DU' for some tags indicates design units; there
+are 8782 design units per em for Intellifont fonts, and 2048 design
+units per em for TrueType fonts.
+.
 Note that the accessibility of a glyph depends on its inclusion in a
-symbol set; some TFM files list many glyphs but only a few symbol sets.
+symbol set; some TFM files list many glyphs but only a few symbol
+sets.
+.
 .IP
 The glyph listing includes the glyph index within the TFM file, the MSL
 or Unicode value, and the symbol set and character code that will be
 used to print the glyph.
+.
 If
 .I map_file
 is given,
 groff names are given for matching glyphs.
+.
 If only the glyph index and MSL or Unicode value are given, the glyph
 does not appear in any supported symbol set and cannot be printed.
+.
 .IP
 With the
 .B \-d
@@ -226,67 +275,80 @@ option,
 is optional, and
 .I font
 is ignored if given.
-.\" --------------------------------------------------------------------------
+.
 .TP
 .B \-q
 Suppress warnings about characters in the map file that were not found
 in the TFM file.
+.
 Warnings never are given for unnamed glyphs or by glyphs named by their
 Unicode values.
+.
 This option is useful when sending the output of
 .B hpftodit
 to the standard output.
-.\" --------------------------------------------------------------------------
+.
 .TP
 .B \-v
 Print the
 .B hpftodit
 version number.
-.\" --------------------------------------------------------------------------
+.
 .TP
 .B \-s
 The font is special.
+.
 This option adds the
 .B special
 command to the font file, and affects the order in which HP symbol sets
 are searched for each glyph.
+.
 Without the
 .B \-s
-option, the \(lqtext\(rq sets are searched before
-the \(lqmathematical\(rq symbol sets.
+option, the \[lq]text\[rq] sets are searched before
+the \[lq]mathematical\[rq] symbol sets.
 With the
 .B \-s
 option, the search order is reversed.
-.\" --------------------------------------------------------------------------
+.
 .TP
 .BI \-i n
-Generate an italic correction for each character so that the character's
-width plus the character's italic correction is equal to
+Generate an italic correction for each character so that the
+character\[aq]s width plus the character's italic correction is equal
+to
 .I n
 thousandths of an em plus the amount by which the right edge of the
 character's bounding is to the right of the character's origin.
+.
 If this would result in a negative italic correction, use a zero italic
 correction instead.
+.
 .IP
-Also generate a subscript correction equal to the
-product of the tangent of the slant of the font and
-four fifths of the x-height of the font.
+Also generate a subscript correction equal to the product of the
+tangent of the slant of the font and four fifths of the x-height of
+the font.
+.
 If this would result in a subscript correction greater than the italic
 correction, use a subscript correction equal to the italic correction
 instead.
+.
 .IP
-Also generate a left italic correction for each character
-equal to
+Also generate a left italic correction for each character equal to
 .I n
 thousandths of an em plus the amount by which the left edge of the
 character's bounding box is to the left of the character's origin.
+.
 The left italic correction may be negative.
+.
 .IP
 This option normally is needed only with italic or oblique fonts;
 a value of 50 (0.05 em) usually is a reasonable choice.
+.
+.
 .\" --------------------------------------------------------------------------
 .SH FILES
 .\" --------------------------------------------------------------------------
+.
 .ad 0
 .TP \w'address@hidden@/devlj4/generate/\fP\,\fI*\/\fP.map'u+2n
 .B @FONTDIR@/devlj4/DESC
@@ -298,15 +360,25 @@ Font description file for font
 .TP
 .BI @FONTDIR@/devlj4/generate/ * .map
 Symbol mapping files
-.\" --------------------------------------------------------------------------
+.
+.
+.\" --------------------------------------------------------------------
 .SH "SEE ALSO"
-.\" --------------------------------------------------------------------------
+.\" --------------------------------------------------------------------
+.
 .BR groff (@MAN1EXT@),
 .BR groff_diff (@MAN1EXT@),
 .BR grolj4 (@MAN1EXT@),
 .BR groff_font (@MAN5EXT@),
 .BR lj4_font (@MAN5EXT@)
 .
+.
+.\" --------------------------------------------------------------------
+.SH "COPYING"
+.\" --------------------------------------------------------------------
+.co
+.
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
diff --git a/src/utils/hpftodit/hpuni.cpp b/src/utils/hpftodit/hpuni.cpp
index f5d9384..6622e28 100644
--- a/src/utils/hpftodit/hpuni.cpp
+++ b/src/utils/hpftodit/hpuni.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 2003, 2004, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2014  Free Software Foundation, Inc.
      Written by Jeff Conrad (address@hidden)
 
 This file is part of groff.