[Groff-commit] GNU troff branch, master, updated. f64b964b306322b7f02e07d4be58a6adbb0a0ecd

[Werner Lemberg]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU troff".

http://git.sv.gnu.org/gitweb/?p=groff.git;a=commitdiff;h=f64b964b306322b7f02e07d4be58a6adbb0a0ecd

The branch, master has been updated
       via  f64b964b306322b7f02e07d4be58a6adbb0a0ecd (commit)
       via  036d485327976f5c0e40064dc7e27372ac52863f (commit)
      from  dcdf54071d1369e724cffe2e2cfbf0461a3611d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f64b964b306322b7f02e07d4be58a6adbb0a0ecd
Author: Werner Lemberg <address@hidden>
Date:   Sun Jan 5 21:24:09 2014 +0100

    * groff/tmac/groff_man.man: Minor typos, formatting, reordering.

commit 036d485327976f5c0e40064dc7e27372ac52863f
Author: Werner Lemberg <address@hidden>
Date:   Sun Jan 5 20:35:33 2014 +0100

    Revert recent changes to `an-ext.tmac' and `groff_man.man'.
    
    * groff/tmac/an-ext.tmac (.FONT): Remove.  This doesn't belong into
    this file.
    
    * groff/tmac/groff_man.man: Reset to state previous to 2014-01-04.
    Useful changes will be re-committed in smaller, logical chunks.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   23 ++++++-
 tmac/an-ext.tmac   |   24 +-------
 tmac/groff_man.man |  173 +++++++++++++++++++++++++++++-----------------------
 3 files changed, 117 insertions(+), 103 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc5cd83..af6efd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,31 @@
-2013-12-23  Bernd Warken  <address@hidden>
+2014-01-05  Bernd Warken  <address@hidden>
+           Werner LEMBERG  <address@hidden>
+
+       * groff/tmac/groff_man.man: Minor typos, formatting, reordering.
+
+2014-01-05  Werner LEMBERG  <address@hidden>
+
+       Revert recent changes to `an-ext.tmac' and `groff_man.man'.
+
+       * groff/tmac/an-ext.tmac (.FONT): Remove.  This doesn't belong into
+       this file.
+
+       * groff/tmac/groff_man.man: Reset to state previous to 2014-01-04. 
+       Useful changes will be re-committed in smaller, logical chunks.
+
+2014-01-05  Bernd Warken  <address@hidden>
 
        * groff/tmac/an-ext.tmac: in .FONT change variable name `result'
        to `an_ext_FONT_result'.
 
-2013-12-23  Bernd Warken  <address@hidden>
+2014-01-04  Bernd Warken  <address@hidden>
 
        * groff/tmac/an-ext.tmac: add new request .FONT for using
        different font names on a single line.
 
        * groff/tmac/groff_man.man: put under GPL2, reordered and enhanced.
 
-2013-01-02  Deri James  <address@hidden>
+2014-01-02  Deri James  <address@hidden>
 
        * src/devices/gropdf/gropdf.pl: gropdf use to fail when handling
        output from preconv, now works.
@@ -1519,7 +1534,7 @@ Version 1.22 released
 
        * doc/webpage.ms: Fix rendering of title image.
 
-Copyright 2011-2013
+Copyright 2011-2014
   Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
diff --git a/tmac/an-ext.tmac b/tmac/an-ext.tmac
index 8ff6361..3816025 100644
--- a/tmac/an-ext.tmac
+++ b/tmac/an-ext.tmac
@@ -3,9 +3,9 @@
 .\" Written by Eric S. Raymond <address@hidden>
 .\"            Werner Lemberg <address@hidden>
 .\"
-.\" Version 2014-Jan-05
+.\" Version 2012-Mar-05
 .\"
-.\" Copyright (C) 2007, 2009, 2012, 2014 Free Software Foundation, Inc.
+.\" Copyright (C) 2007, 2009, 2012 Free Software Foundation, Inc.
 .\" You may freely use, modify and/or distribute this file.
 .\"
 .\"
@@ -181,26 +181,6 @@
 ..
 .
 .
-.\" .FONT (<font name> <text> [<font name> <text> ...])
-.\" Print in different fonts, e.g. using the font names R, I, B, CR, CI, CB
-.de FONT
-.  if (\\n[.$] = 0) \{\
-.       nop \&\f[P]\&
-.       return
-.  \}
-.  ds an_ext_FONT_result \&
-.  while (\\n[.$] >= 2) \{\
-.       as an_ext_FONT_result \,\f[\\$1]\\$2
-.       if !"\\$1"P" .as an_ext_FONT_result \f[P]
-.       shift 2
-.  \}
-.  if (\\n[.$] = 1) .as an_ext_FONT_result \,\f[\\$1]
-.  nh
-.  nop \\*[an_ext_FONT_result]\&
-.  hy
-..
-.
-.
 .\" Start example.
 .de EX
 .  nr mE \\n(.f
diff --git a/tmac/groff_man.man b/tmac/groff_man.man
index b21e675..84e5bca 100644
--- a/tmac/groff_man.man
+++ b/tmac/groff_man.man
@@ -1,25 +1,21 @@
 .ig
 Copyright (C) 1999-2005, 2007-2009, 2011, 2014
-  Free Software Foundation, Inc.
+Free Software Foundation, Inc.
 
-Last Update: 4 Jan 2014
+Permission is granted to make and distribute verbatim copies of this
+manual provided the copyright notice and this permission notice are
+preserved on all copies.
 
-This file is part of `GNU groff'.
+Permission is granted to copy and distribute modified versions of this
+manual under the conditions for verbatim copying, provided that the
+entire resulting derived work is distributed under the terms of a
+permission notice identical to this one.
 
-  `GNU groff' is free software: you can redistribute it and/or modify it
-under the terms of the `GNU General Public License' as published by the
-`Free Software Foundation', either version 2 of the License, or (at your
-option) any later version.
-
-  `GNU groff' is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the `GNU
-General Public License' for more details.
-
-  You should have received a copy of the 'GNU General Public License`
-along with `groff', see the files `COPYING' and `LICENSE' in the top
-directory of the `groff' source package.  If not, see
-<http://www.gnu.org/licenses/>.
+Permission is granted to copy and distribute translations of this
+manual into another language, under the above conditions for modified
+versions, except that this permission notice may be included in
+translations approved by the Free Software Foundation instead of in
+the original English.
 ..
 .
 .
@@ -135,7 +131,7 @@ consistent indentation.
 Set line length.
 .
 If this option is not given,
-the line length is set to respect any value set by a prior `.ll' request,
+the line length is set to respect any value set by a prior `.ll' request
 (which
 .I must
 be in effect when the `.TH' macro is invoked),
@@ -184,6 +180,7 @@ Enumeration of pages start with
 .I nnn
 rather than with\~1.
 .
+.
 .TP
 .BI \-rS xx
 Base document font size is
@@ -221,7 +218,7 @@ This section describes the available macros for manual 
pages.
 .
 For further customization, put additional macros and requests into the
 file
-.B man.local
+.BR man.local ,
 which is loaded immediately after the
 .B man
 package.
@@ -234,7 +231,7 @@ package.
 Example/End Example.
 .
 After
-.BR EX ,
+.BR .EX ,
 filling is disabled and the font is set to constant-width.
 .
 This is useful for formatting code, command, and
@@ -244,6 +241,7 @@ The
 .B EE
 macro restores filling and restores the previous font.
 .
+.
 .IP
 These macros are defined on many (but not all) legacy Unix systems
 running classic troff.
@@ -264,10 +262,10 @@ The indentation is set to
 .I nnn
 if that argument is supplied (the default unit is `n' if omitted),
 otherwise it is set to the previous indentation value specified with
-.BR TP ,
-.BR IP ,
+.BR .TP ,
+.BR .IP ,
 or
-.B HP
+.B .HP
 (or to the default value if none of them have been used yet).
 .
 Font size and face are reset to its default values.
@@ -279,6 +277,7 @@ and
 .B .RE
 to set the left margin temporarily to the current indentation):
 .
+.
 .RS
 .HP 4
 This is a paragraph following an invocation of the
@@ -289,6 +288,7 @@ As you can see, it produces a paragraph where all lines but 
the first
 are indented.
 .RE
 .
+.
 .IP
 Use of this presentation-level macro is deprecated.
 .
@@ -311,26 +311,32 @@ The indentation is set to
 .I nnn
 if that argument is supplied (the default unit is `n' if omitted),
 otherwise it is set to the previous indentation value specified with
-.BR TP ,
-.BR IP ,
+.BR .TP ,
+.BR .IP ,
 or
-.B HP
+.B .HP
 (or to the default value if none of them have been used yet).
 .
 Font size and face of the paragraph (but not the designator) are reset
 to its default values.
 .
+.
 .IP
 To start an indented paragraph with a particular indentation but
 without a designator, use `""' (two doublequotes) as the second
 argument.
 .
+.
 .IP
 For example, the following paragraphs were all set up with bullets as
 the designator, using `.IP\ \\(bu\ 4'.
 .
-The whole block has been enclosed with `.RS' and `.RE' to set the left
-margin temporarily to the current indentation value.
+The whole block has been enclosed with
+.B .RS
+and
+.B .RE
+to set the left margin temporarily to the current indentation value.
+.
 .
 .RS
 .IP \(bu 4
@@ -339,12 +345,14 @@ is one of the three macros used in the
 .B man
 package to format lists.
 .
+.
 .IP \(bu 4
 .B HP
 is another.
 .
 This macro produces a paragraph with a left hanging indentation.
 .
+.
 .IP \(bu 4
 .B TP
 is another.
@@ -383,9 +391,9 @@ restoring the previous left margin.
 If no argument is given, it moves one level back.
 .
 The first level (i.e., no call to
-.B RS
+.B .RS
 yet) has number\~1, and each call to
-.B RS
+.B .RS
 increases the level by\~1.
 .
 .
@@ -395,10 +403,10 @@ This macro moves the left margin to the right by the value
 .I nnn
 if specified (default unit is `n'); otherwise it is set to the
 previous indentation value specified with
-.BR TP ,
-.BR IP ,
+.BR .TP ,
+.BR .IP ,
 or
-.B HP
+.B .HP
 (or to the default value if none of them have been used yet).
 .
 The indentation value is then set to the default.
@@ -415,10 +423,10 @@ macro can be nested.
 Set up an unnumbered section heading sticking out to the left.
 .
 Prints out all the text following
-.B SH
+.B .SH
 up to the end of the line (or the text in the next input line if there
 is no argument to
-.BR SH )
+.BR .SH )
 in bold face
 (or the font specified by the string
 .BR HF ),
@@ -433,10 +441,10 @@ text is reset to the default values.
 Set up a secondary, unnumbered section heading.
 .
 Prints out all the text following
-.B SS
+.B .SS
 up to the end of the line (or the text in the next input line if there
 is no argument to
-.BR SS )
+.BR .SS )
 in bold face
 (or the font specified by the string
 .BR HF ),
@@ -478,9 +486,11 @@ active).
 .I extra3
 is centered in the header line.
 .
+.
 .IP
 For HTML output, headers and footers are completely suppressed.
 .
+.
 .IP
 Additionally, this macro starts a new page; the new line number is\~1
 again (except if the `-rC1' option is given on the command line) --
@@ -501,12 +511,13 @@ The indentation is set to
 .I nnn
 if that argument is supplied (the default unit is `n' if omitted),
 otherwise it is set to the previous indentation value specified with
-.BR TP ,
-.BR IP ,
+.BR .TP ,
+.BR .IP ,
 or
-.B HP
+.B .HP
 (or to the default value if none of them have been used yet).
 .
+.
 .IP
 The first input line of text following this macro is interpreted as a
 string to be printed flush-left, as it is appropriate for a label.
@@ -525,6 +536,7 @@ Note that neither font shape nor font size of the label is 
set to a
 default value; on the other hand, the rest of the text has default
 font settings.
 .
+.
 .IP
 The
 .B TP
@@ -535,13 +547,21 @@ macro is the macro used for the explanations you are just 
reading.
 .B .TQ
 The
 .B TQ
-macro sets up header continuation for a .TP macro.
+macro sets up header continuation for a
+.B TP
+macro.
 .
 With it, you can stack up any number of labels (such as in a
 glossary, or list of commands) before beginning the indented
 paragraph.
 .
-For an example, look just past the next paragraph.
+For an example, look up the documentation of the
+.BR LP ,
+.BR PP ,
+and
+.BR P
+macros.
+.
 .
 .IP
 This macro is not defined on legacy Unix systems running classic
@@ -604,10 +624,12 @@ The text must be on the same line as the macro call.
 .
 Thus
 .
+.
 .RS
 .IP
 \&.BI this "word and" that
 .
+.
 .PP
 would cause `this' and `that' to appear in bold face, while `word and'
 appears in italics.
@@ -623,19 +645,6 @@ The text must be on the same line as the macro call.
 .
 .
 .TP
-.FONT B .FONT I " <font name> <text> " R [ I "<font name> <text> ..." R ]
-Use different font names on a single line.
-.
-Useful font names include
-.BR R ,
-.BR I ,
-.BR B ,
-.BR CR ,
-.BR CI ,
-.BR CB .
-.
-.
-.TP
 .BI .I " \fR[\fPtext\fR]\fP"
 Causes
 .I text
@@ -701,6 +710,7 @@ file of a
 .BR groff
 installation.
 .
+.
 .PP
 Using these macros helps ensure that you get hyperlinks when your
 manual page is rendered in a browser or other program that is
@@ -714,9 +724,9 @@ Web-enabled.
 Wrap an email address.
 .
 The argument of
-.B MT
+.B .MT
 is the address; text following, until
-.BR ME ,
+.BR .ME ,
 is a name to be associated with the address.
 .
 Any argument to the
@@ -725,21 +735,24 @@ macro is pasted to the end of the link text.
 .
 On a device that is not a browser,
 .
+.
 .RS
 .IP
 .EX
 contact
-\&.UR address@hidden:fubar.net
+\&.MT address@hidden:fubar.net
 Fred Foonly
-\&.UE
+\&.ME
 for more information
 .EE
 .RE
 .
+.
 .IP
 usually displays like this: \[lq]contact Fred Foonly
 <address@hidden:fubar.net> for more information\[rq].
 .
+.
 .IP
 The use of
 .B \e:
@@ -754,9 +767,9 @@ be omitted.
 Wrap a World Wide Web hyperlink.
 .
 The argument to
-.B UR
+.B .UR
 is the URL; thereafter, lines until
-.B UE
+.B .UE
 are collected and used as the link text.
 .
 Any argument to the
@@ -765,6 +778,7 @@ macro is pasted to the end of the text.
 .
 On a device that is not a browser,
 .
+.
 .RS
 .IP
 .EX
@@ -776,10 +790,12 @@ given as an example
 .EE
 .RE
 .
+.
 .IP
 usually displays like this: \[lq]this is a link to some random
 site <http://\:randomsite.org/\:fubar>, given as an example\[rq].
 .
+.
 .IP
 The use of
 .B \e:
@@ -800,6 +816,7 @@ file of a
 .BR groff
 installation.
 .
+.
 .PP
 These macros are a convenience for authors.
 They also assist automated translation tools and help browsers in
@@ -823,7 +840,7 @@ Begin synopsis.
 Takes a single argument, the name of a command.
 .
 Text following, until closed by
-.BR YS ,
+.BR .YS ,
 is set with a hanging indentation with the width of
 .I command
 plus a space.
@@ -836,9 +853,11 @@ This produces the traditional look of a Unix command 
synopsis.
 This macro restores normal indentation at the end of a command
 synopsis.
 .
+.
 .PP
 Here is a real example:
 .
+.
 .IP
 .EX
 \&.SY groff
@@ -863,9 +882,11 @@ Here is a real example:
 \&.YS
 .EE
 .
+.
 .PP
 produces the following output:
 .
+.
 .RS
 .PP
 .SY groff
@@ -890,6 +911,7 @@ produces the following output:
 .YS
 .RE
 .
+.
 .PP
 If necessary, you might use
 .B br
@@ -904,7 +926,7 @@ You can insert plain text as well; this looks like the 
traditional
 .
 The default indentation is 7.2n in troff mode and 7n in nroff mode
 except for
-.B grohtml
+.BR grohtml ,
 which ignores indentation.
 .
 .
@@ -932,9 +954,10 @@ Set tabs every 0.5\~inches.
 .
 Since this macro is always called during a
 .B TH
-request, it makes sense to call it only if the tab positions have been
+macro, it makes sense to call it only if the tab positions have been
 changed.
 .
+.
 .IP
 Use of this presentation-level macro is deprecated.
 .
@@ -942,7 +965,7 @@ It translates poorly to HTML, under which exact whitespace 
control
 and tabbing are not readily available.
 .
 Thus, information or distinctions that you use
-.B DT
+.B .DT
 to express are likely to be lost.
 .
 If you feel tempted to use it, you should probably be composing a
@@ -950,6 +973,7 @@ table using
 .BR @address@hidden (@MAN1EXT@)
 markup instead.
 .
+.
 .TP
 .BI .PD " \fR[\fPnnn\fR]\fP"
 Adjust the empty space before a new paragraph or section.
@@ -971,6 +995,7 @@ and
 and
 .BR HP .
 .
+.
 .IP
 Use of this presentation-level macro is deprecated.
 .
@@ -978,7 +1003,7 @@ It translates poorly to HTML, under which exact control of
 inter-paragraph spacing is not readily available.
 .
 Thus, information or distinctions that you use
-.B PD
+.B .PD
 to express are likely to be lost.
 .
 .
@@ -1092,7 +1117,7 @@ render it to HTML.
 Troff requests make implicit assumptions about things like character
 and page sizes that may break in an HTML environment; also, many of
 these viewers don't interpret the full troff vocabulary, a problem
-which can lead to portions of your text being silently dropped.
+that can lead to portions of your text being silently dropped.
 .
 .
 .PP
@@ -1101,10 +1126,10 @@ entirely in the requests described on this page.
 .
 Further, it is best to completely avoid those we have described as
 `presentation-level'
-.RB ( HP ,
-.BR PD ,
+.RB ( .HP ,
+.BR .PD ,
 and
-.BR DT ).
+.BR .DT ).
 .
 .
 .PP
@@ -1168,6 +1193,7 @@ portability to legacy Unix systems are encouraged to copy 
these
 definitions into their pages, and maintainers of troff
 or its workalikes are encouraged to re-use them.
 .
+.
 .IP
 Note that the definitions for these macros are read after the call of
 .BR TH ,
@@ -1222,13 +1248,6 @@ Eric S. Raymond
 he also wrote the portability advice.
 .
 .
-.PP
-It was put under GPL2 and ordered and extended by
-.MT address@hidden
-Bernd Warken
-.ME .
-.
-.
 .\" ----------------------------------------------------------------------
 .\" ### Emacs settings:
 .\" Local Variables:


hooks/post-receive
-- 
GNU troff