bwarken pushed a commit to branch master in repository groff. commit 244d1ff6f3de5fadd134f1c3fa5166a28847e897 Author: Bernd Warken <groff-bernd.warken...@web.de> Date: Thu Sep 18 03:37:52 2014 +0200
src/roff/troff/*: Improve the license information. --- ChangeLog | 4 + src/roff/troff/Makefile.sub | 5 +- src/roff/troff/charinfo.h | 3 +- src/roff/troff/column.cpp | 3 +- src/roff/troff/dictionary.cpp | 3 +- src/roff/troff/dictionary.h | 3 +- src/roff/troff/div.cpp | 3 +- src/roff/troff/div.h | 3 +- src/roff/troff/env.cpp | 3 +- src/roff/troff/env.h | 4 +- src/roff/troff/hvunits.h | 3 +- src/roff/troff/input.cpp | 3 +- src/roff/troff/input.h | 2 +- src/roff/troff/mtsm.cpp | 2 +- src/roff/troff/mtsm.h | 2 +- src/roff/troff/node.cpp | 4 +- src/roff/troff/node.h | 4 +- src/roff/troff/number.cpp | 3 +- src/roff/troff/reg.cpp | 3 +- src/roff/troff/reg.h | 3 +- src/roff/troff/request.h | 4 +- src/roff/troff/token.h | 3 +- src/roff/troff/troff.h | 3 +- src/roff/troff/troff.man | 129 +++++++++++++++++++++-------------------- 24 files changed, 92 insertions(+), 110 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4265d4..2c05771 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-09-18 Bernd Warken <groff-bernd.warken...@web.de> + * src/roff/troff/*: Improve the license information. + +2014-09-18 Bernd Warken <groff-bernd.warken...@web.de> + * src/roff/nroff/*: Improve the license information. 2014-09-18 Bernd Warken <groff-bernd.warken...@web.de> diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub index 6cca5dc..e3b09a1 100644 --- a/src/roff/troff/Makefile.sub +++ b/src/roff/troff/Makefile.sub @@ -2,10 +2,7 @@ # # File position: <groff-source>/src/roff/troff/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/roff/troff/charinfo.h b/src/roff/troff/charinfo.h index 4624aa3..f3cc999 100644 --- a/src/roff/troff/charinfo.h +++ b/src/roff/troff/charinfo.h @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2006, 2009, 2010 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/column.cpp b/src/roff/troff/column.cpp index 051a323..20ed3f9 100644 --- a/src/roff/troff/column.cpp +++ b/src/roff/troff/column.cpp @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/dictionary.cpp b/src/roff/troff/dictionary.cpp index 0965c4e..538531a 100644 --- a/src/roff/troff/dictionary.cpp +++ b/src/roff/troff/dictionary.cpp @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2004, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/dictionary.h b/src/roff/troff/dictionary.h index 0607a3f..422a58e 100644 --- a/src/roff/troff/dictionary.h +++ b/src/roff/troff/dictionary.h @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/div.cpp b/src/roff/troff/div.cpp index df7c979..bf62d62 100644 --- a/src/roff/troff/div.cpp +++ b/src/roff/troff/div.cpp @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2004, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/div.h b/src/roff/troff/div.h index ce12e19..5861656 100644 --- a/src/roff/troff/div.h +++ b/src/roff/troff/div.h @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2004, 2005, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp index 6d722f5..9fbd592 100644 --- a/src/roff/troff/env.cpp +++ b/src/roff/troff/env.cpp @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989-1992, 2000-2006, 2009, 2011 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/env.h b/src/roff/troff/env.h index 6161aab..484be40 100644 --- a/src/roff/troff/env.h +++ b/src/roff/troff/env.h @@ -1,7 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2004, 2005, - 2006, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/hvunits.h b/src/roff/troff/hvunits.h index 5804171..665ea9c 100644 --- a/src/roff/troff/hvunits.h +++ b/src/roff/troff/hvunits.h @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp index b71f27e..1909c8b 100644 --- a/src/roff/troff/input.cpp +++ b/src/roff/troff/input.cpp @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989-1992, 2000-2011 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/input.h b/src/roff/troff/input.h index 89c3777..76b2b56 100644 --- a/src/roff/troff/input.h +++ b/src/roff/troff/input.h @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 2001, 2004, 2006, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2001-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/mtsm.cpp b/src/roff/troff/mtsm.cpp index f13a6be..0fd2d33 100644 --- a/src/roff/troff/mtsm.cpp +++ b/src/roff/troff/mtsm.cpp @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 2003, 2004, 2009, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2003-2014 Free Software Foundation, Inc. Written by Gaius Mulley (ga...@glam.ac.uk) This file is part of groff. diff --git a/src/roff/troff/mtsm.h b/src/roff/troff/mtsm.h index 2da5560..11722d3 100644 --- a/src/roff/troff/mtsm.h +++ b/src/roff/troff/mtsm.h @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 2003, 2004, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2003-2014 Free Software Foundation, Inc. * * mtsm.h * diff --git a/src/roff/troff/node.cpp b/src/roff/troff/node.cpp index 311a5cd..3eca523 100644 --- a/src/roff/troff/node.cpp +++ b/src/roff/troff/node.cpp @@ -1,7 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2008, 2009, 2010 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/node.h b/src/roff/troff/node.h index 393e18d..bf3e154 100644 --- a/src/roff/troff/node.h +++ b/src/roff/troff/node.h @@ -1,7 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004,\ - 2006, 2009, 2010 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/number.cpp b/src/roff/troff/number.cpp index 1f4c6ee..268834b 100644 --- a/src/roff/troff/number.cpp +++ b/src/roff/troff/number.cpp @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989-1992, 2001, 2002, 2004, 2009, 2012 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/reg.cpp b/src/roff/troff/reg.cpp index 78f6781..9fd5662 100644 --- a/src/roff/troff/reg.cpp +++ b/src/roff/troff/reg.cpp @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2004, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/reg.h b/src/roff/troff/reg.h index 51671ab..49e4b77 100644 --- a/src/roff/troff/reg.h +++ b/src/roff/troff/reg.h @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2003, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/request.h b/src/roff/troff/request.h index 90d2961..64599f2 100644 --- a/src/roff/troff/request.h +++ b/src/roff/troff/request.h @@ -1,7 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2004, 2008, - 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/token.h b/src/roff/troff/token.h index 19842f0..87414bf 100644 --- a/src/roff/troff/token.h +++ b/src/roff/troff/token.h @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2004, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/troff.h b/src/roff/troff/troff.h index 79f4089..6f65d68 100644 --- a/src/roff/troff/troff.h +++ b/src/roff/troff/troff.h @@ -1,6 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2004, 2009 - Free Software Foundation, Inc. +/* Copyright (C) 1989-2014 Free Software Foundation, Inc. Written by James Clark (j...@jclark.com) This file is part of groff. diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man index 6e38908..1921e59 100644 --- a/src/roff/troff/troff.man +++ b/src/roff/troff/troff.man @@ -1,16 +1,17 @@ '\" t -.ig -troff.man - -This file is part of groff, the GNU roff type-setting system. - -Copyright (C) 1989, 2000-2003, 2007-2009, 2014 - Free Software Foundation, Inc. - -written by James Clark +.TH @G@TROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" +.SH NAME +@g@troff \- the troff processor of the groff text formatting system +. +.\" troff.man -> troff.1 +. +. +.\" Legal Terms +.de co +Copyright (C) 1989-2014 Free Software Foundation, Inc. -modified by Werner Lemberg <w...@gnu.org> - Bernd Warken <groff-bernd.warken...@web.de> +This file is part of groff, the GNU roff type-setting system, which +is a GNU free software project.. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -22,14 +23,16 @@ A copy of the Free Documentation License is included as a file called FDL in the main directory of the groff source package. .. . -.\" -------------------------------------------------------------------- -.\" Title -.\" -------------------------------------------------------------------- -. -.TH @G@TROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" -.SH NAME -@g@troff \- the troff processor of the groff text formatting system -. +.de au +This file was originally written by James Clark, it was modified by +.MT w...@gnu.org +Werner Lemberg +.ME +and +.MT groff-bernd.warken...@web.de +Bernd Warken +.ME . +.. . .\" -------------------------------------------------------------------- .SH SYNOPSIS @@ -59,10 +62,11 @@ FDL in the main directory of the groff source package. . This manual page describes the GNU version of .BR troff . +. It is part of the groff document formatting system. . -It is functionally compatible with UNIX troff, but has many extensions, -see +It is functionally compatible with UNIX troff, but has many +extensions, see .BR \%groff_diff (@MAN7EXT@). Usually it should be invoked using the .BR groff (@MAN1EXT@) @@ -73,6 +77,7 @@ appropriate order and with the appropriate options. .\" -------------------------------------------------------------------- .SH OPTIONS .\" -------------------------------------------------------------------- +. It is possible to have whitespace between a command line option and its parameter. . @@ -89,7 +94,7 @@ Print a backtrace with each warning or error message. This backtrace should help track down the cause of the error. . The line numbers given in the backtrace may not always be correct, for -.BR @g@troff 's +.BR @g@troff \[aq]s idea of line numbers gets confused by .B as or @@ -121,8 +126,9 @@ must be a one letter name. .B \-E Inhibit all error messages of .BR @g@troff . -Note that this doesn't affect messages output to standard error by macro -packages using the +. +Note that this doesn\[aq]t affect messages output to standard error by +macro packages using the .B tm or .B tm1 @@ -144,6 +150,7 @@ for subdirectories is the name of the device) and there for the .B DESC file and font files. +. .I dir is scanned before all other font directories. . @@ -154,17 +161,21 @@ processed. . .TP .BI \-I dir -This option may be used to add a directory to the search path for files -(both those on the command line and those named in +This option may be used to add a directory to the search path for +files (both those on the command line and those named in .B \&.psbb requests). +. The search path is initialized with the current directory. +. This option may be specified more than once; the directories are then searched in the order specified (but before the current directory). -If you want to make the current directory be read before other directories, -add +. +If you want to make the current directory be read before other +directories, add .B \-I.\& at the appropriate place. +. .IP No directory search is performed for files with an absolute file name. . @@ -172,7 +183,8 @@ No directory search is performed for files with an absolute file name. .BI \-m name Read in the file .IB name .tmac\fR. -If it isn't found, try +. +If it isn\[aq]t found, try .BI tmac. name instead. . @@ -216,6 +228,7 @@ means print every page up to .IB n \- means print every page from .IR n . +. .B @g@troff will exit after printing the last page in the list. . @@ -236,7 +249,7 @@ can be any troff numeric expression. . .TP .B \-R -Don't load +Don\[aq]t load .B troffrc and .BR troffrc-end . @@ -262,8 +275,8 @@ This will enable the following requests: .BR sy , and .BR pi . -For security reasons, these potentially dangerous requests are disabled -otherwise. +For security reasons, these potentially dangerous requests are +disabled otherwise. . It will also add the current directory to the macro search path. . @@ -275,6 +288,7 @@ Print the version number. .BI \-w name Enable warning .IR name . +. Available warnings are described in the section .I WARNINGS below. @@ -290,6 +304,7 @@ options are allowed. .BI \-W name Inhibit warning .IR name . +. Multiple .B \-W options are allowed. @@ -478,6 +493,7 @@ Dubious syntax in numeric expressions. .TP .BR tab "\t2048" Inappropriate use of a tab character. +. Either use of a tab character where a number was expected, or use of tab character in an unquoted macro argument. . @@ -491,6 +507,7 @@ All warnings except .BR mac , and .BR reg . +. It is intended that this covers all warnings that are useful with traditional macro packages. . @@ -508,6 +525,7 @@ All warnings. .B GROFF_TMAC_PATH A colon separated list of directories in which to search for macro files. +. .B @g@troff will scan directories given in the .B \-M @@ -529,6 +547,7 @@ Default device. A colon separated list of directories in which to search for the .BI dev name directory. +. .B @g@troff will scan directories given in the .B \-F @@ -568,6 +587,8 @@ Font file for font .I F of device .IR name . +. +. .P Note that .B troffrc @@ -587,37 +608,6 @@ necessary. . . .\" -------------------------------------------------------------------- -.SH AUTHOR -.\" -------------------------------------------------------------------- -. -Copyright (C) 1989, 2001, 2002, 2003, 2007, 2008, 2009 -Free Software Foundation, Inc. -. -.P -This document is distributed under the terms of the FDL (GNU Free -Documentation License) version 1.3 or later. -. -You should have received a copy of the FDL on your system, it is also -available on-line at the -.UR http://\:www.gnu.org/\:copyleft/\:fdl.html -GNU copyleft site -.UE . -This document was written by James Clark, with modifications from -.MT w...@gnu.org -Werner Lemberg -.ME -and -.MT groff-bernd.warken...@web.de -Bernd Warken -.ME . -. -.P -This document is part of -.IR groff , -the GNU roff distribution. -. -. -.\" -------------------------------------------------------------------- .SH "SEE ALSO" .\" -------------------------------------------------------------------- . @@ -635,6 +625,7 @@ A description of the language, including a short but complete reference of all predefined requests, registers, and escapes of plain .IR groff . +. From the command line, this is called by .RS .IP @@ -661,6 +652,7 @@ and other .I roff systems, including pointers to further related documentation. . +. .P The .I groff info @@ -669,6 +661,17 @@ cf.\& .BR info (@MAN1EXT@), presents all groff documentation within a single document. . +. +.\" -------------------------------------------------------------------- +.SH COPYING +.\" -------------------------------------------------------------------- +.co +.\" -------------------------------------------------------------------- +.SH AUTHORS +.\" -------------------------------------------------------------------- +.au +. +. .\" -------------------------------------------------------------------- .\" Emacs variables .\" -------------------------------------------------------------------- _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit