From be1ea5149ad461769c559c26ad9670625c67673d Mon Sep 17 00:00:00 2001 From: Bjarni Ingi Gislason Date: Mon, 2 Apr 2018 16:32:19 +0000 Subject: [PATCH] tmac/groff_ms.7.man: Change bold '[' and ']' to roman and other tidying Input file is groff_ms.7.man mandoc: groff_ms.7.man:1181:2: WARNING: skipping paragraph macro: LP empty ####### Test nr. 17: Change - to \- if it means a minus sign. 247:FPS Point size next footnote \[rs]n[PS]-2 ##### Test nr. 20: Use a macro to change to the italic font, instead of \fI [1], if possible. The macros have the italic corrections, but "\c" removes them or add the italic corrections. [1] man-pages(7) 945:\&.DS I [\fIindent\fP] \&.ID T{ ##### Test nr. 30: Surround a block of comments with the macros ".ig" and "..". The .\" (\#) at the beginning of each line is then not needed. Makes it easier to add and remove text and adjust length of lines. NO PATCH 10:.\" ==================================================================== 11:.\" Legal Terms 12:.\" ==================================================================== 13:.\" 14:.\" Copyright (C) 1989-2014 Free Software Foundation, Inc. 15:.\" 16:.\" Permission is granted to make and distribute verbatim copies of this 17:.\" manual provided the copyright notice and this permission notice are 18:.\" preserved on all copies. 19:.\" 20:.\" Permission is granted to copy and distribute modified versions of 21:.\" this manual under the conditions for verbatim copying, provided that 22:.\" the entire resulting derived work is distributed under the terms of 23:.\" a permission notice identical to this one. 24:.\" 25:.\" Permission is granted to copy and distribute translations of this 26:.\" manual into another language, under the above conditions for 27:.\" modified versions, except that this permission notice may be 28:.\" included in translations approved by the Free Software Foundation 29:.\" instead of in the original English. 1804:.\" Local Variables: 1805:.\" mode: nroff 1806:.\" End: 1807:.\" vim: set filetype=groff: ##### Test nr. 40: Add a comma before "and", "or", or "nor" if a series contains three or more words 1708:The following conventions are used for names of macros, strings and ##### Extra changes Arguments to the macro ".TP" (uses '.itc'): Change '[' and ']' from bold to roman. Use '\!' and '\c' to use two input lines as a one line of arguments. Signed-off-by: Bjarni Ingi Gislason --- tmac/groff_ms.7.man | 85 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 22 deletions(-) diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man index 138b0e1d..de3ba059 100644 --- a/tmac/groff_ms.7.man +++ b/tmac/groff_ms.7.man @@ -244,7 +244,7 @@ _ FL Footnote length next footnote \[rs]n[LL]*5/6 FI Footnote indent next footnote 2n FF Footnote format next footnote 0 -FPS Point size next footnote \[rs]n[PS]-2 +FPS Point size next footnote \[rs]n[PS]\-2 FVS Vert.\& spacing next footnote \[rs]n[FPS]+2 FPD Para.\& spacing next footnote \[rs]n[PD]/2 _ @@ -276,7 +276,10 @@ Use the following macros to create a cover page for your document in the order shown. . .TP -.B .RP [no] +\#.B .RP [no] +\!.B .RP \c +\# The next argument must be longer than the indent from .TP (8n) +.RB [ no ]\ \ \ \ \ \" Specifies the report format for your document. . The report format creates a separate cover page. @@ -305,7 +308,10 @@ on page\~1 of the document. The default is to suppress the header. . .TP -.BI ".DA [" xxx ] +\#.BI ".DA [" xxx ] +\!.B .DA \c +\# The next argument must be longer than the indent from .TP (8n) +.RI [ xxx ]\ \ \ \ \" (optional) Print the current date, or the arguments to the macro if any, on the title page (if specified) @@ -315,7 +321,10 @@ This is the default for .IR nroff . . .TP -.BI ".ND [" xxx ] +\#.BI ".ND [" xxx ] +\!.B .ND \c +\# The next argument must be longer than the indent from .TP (8n) +.RI [ xxx ]\ \ \ \ \" (optional) Print the current date, or the arguments to the macro if any, on the title page (if specified) @@ -348,7 +357,10 @@ Specifies the author's institution. You can specify multiple institutions. . .TP -.B .AB [no] +\#.B .AB [no] +\!.B .AB \c +\# The next argument must be longer than the indent from .TP (8n) +.RB [ no ]\ \ \ \ \ \" Begins the abstract. . The default is to print the word @@ -426,7 +438,7 @@ or .PP The .B XP -macro produces an exdented paragraph. +macro produces an extended paragraph. . The first line of the paragraph begins at the left margin, @@ -667,7 +679,10 @@ the change becomes effective with the next use of the new alias is defined. . .TP -.BI .SH\ [ xx ] +\#.BI .SH\ [ xx ] +\!.B .SH \c +\# The next argument must be longer than the indent from .TP (8n) +.RI [ xx ]\ \ \ \ \ \" Unnumbered subheading. The use of the optional .I xx @@ -717,7 +732,9 @@ macros provide a variety of methods to highlight or emphasize text: . .TP -.B ".B [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\#.B ".B [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\!.B .B \c +.RI [ txt " [" post " [" pre ]]] Sets its first argument in .BR "bold type" . . @@ -752,7 +769,9 @@ prints all text following in bold until the next highlighting, paragraph, or heading macro. . .TP -.B ".R [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\#.B ".R [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\!.B .R \c +.RI [ txt " [" post " [" pre ]]] Sets its first argument in roman (or regular) type. . @@ -761,7 +780,9 @@ It operates similarly to the macro otherwise. . .TP -.B ".I [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\#.B ".I [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\!.B .I \c +.RI [ txt " [" post " [" pre ]]] Sets its first argument in .IR "italic type" . It operates similarly to the @@ -769,7 +790,9 @@ It operates similarly to the macro otherwise. . .TP -.B ".CW [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\#.B ".CW [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\!.B .CW \c +.RI [ txt " [" post " [" pre ]]] Sets its first argument in a constant width face. . It operates similarly to the @@ -777,7 +800,9 @@ It operates similarly to the macro otherwise. . .TP -.B ".BI [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\#.B ".BI [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]" +\!.B .BI \c +.RI [ txt " [" post " [" pre ]]] Sets its first argument in bold italic type. . It operates similarly to the @@ -785,14 +810,19 @@ It operates similarly to the macro otherwise. . .TP -.BI ".BX [" txt ] +\#.BI ".BX [" txt ] +\!.B .BX \c +\# The next argument must be longer than the indent from .TP (8n) +.RI [ txt ]\ \ \ \ \" Prints its argument and draws a box around it. . If you want to box a string that contains spaces, use a digit-width space (\[rs]0). . .TP -.BI ".UL [" txt " [" post ]] +\#.BI ".UL [" txt " [" post ]] +\!.B .UL \c +.RI [ txt " [" post ]] Prints its first argument with an underline. . If you specify a second argument, @@ -874,7 +904,9 @@ macro handles duties for all lists. Its syntax is as follows: . .TP -.BI ".IP [" marker " [" width ]] +\#.BI ".IP [" marker " [" width ]] +\!.B .IP \c +.RI [ marker " [" width ]] . .IP The @@ -942,7 +974,7 @@ Display macro Type of display With keep No keep _ \&.DS L \&.LD Left-justified. -\&.DS I [\fIindent\fP] \&.ID T{ +\&.DS I [\,\fIindent\/\fP] \&.ID T{ Indented (default indent in the \fBDI\fP register). T} \&.DS B \&.BD T{ @@ -1057,7 +1089,9 @@ Mark text meant for preprocessors by enclosing it in pairs of tags as follows: . .TP -.BR ".TS [H]" " and " .TE +\#.BR ".TS [H]" " and " .TE +\!.B .TS \c +.RB [ H "] and " \&.TE Denotes a table, to be processed by the .I tbl preprocessor. @@ -1093,7 +1127,11 @@ or by using a graphics program such as .IR xfig . . .TP -.BR ".EQ [\fI\,align\/\fP]" " and " .EN +\#.BR ".EQ [\fI\,align\/\fP]" " and " .EN +\!.B .EQ \c +\!.RI [ align "] and "\c +\# The next argument must be longer than the indent from .TP (8n) +.B .EN\ \ \ \ \ \ \ \" Denotes an equation, to be processed by the .I eqn preprocessor. @@ -1178,8 +1216,8 @@ Like\~1, without an indent. 3 Like\~1, but prints the footnote number as a hanging paragraph. . -.LP .RE +.LP You can use footnotes safely within keeps and displays, but avoid using numbered footnotes within floating keeps. . @@ -1240,7 +1278,8 @@ The syntax for these macros is as follows: .RS . .IP -.B ".OH '\fIleft\/\fP'\,\fIcenter\/\fP'\,\fIright\/\fP'" +\#.B ".OH '\fIleft\/\fP'\,\fIcenter\/\fP'\,\fIright\/\fP'" +.BI ".OH '" left ' center ' right ' .RE . .IP @@ -1324,7 +1363,9 @@ Single-column mode. Two-column mode. . .TP -.BI ".MC [" width " [" gutter ]] +\#.BI ".MC [" width " [" gutter ]] +\!.B .MC \c +.RI [ width " [" gutter ]] Multi-column mode. . If you specify no arguments, it is equivalent to the @@ -1705,7 +1746,7 @@ produces an n with a tilde over it. .SH "NAMING CONVENTIONS" .\" ==================================================================== . -The following conventions are used for names of macros, strings and +The following conventions are used for names of macros, strings, and number registers. . External names available to documents that use the -- 2.16.2