Index: main.c
===================================================================
RCS file: /cvs/src/libexec/tradcpp/main.c,v
retrieving revision 1.5
diff -u -p -r1.5 main.c
--- main.c 23 Aug 2019 04:38:55 -0000 1.5
+++ main.c 21 Sep 2022 00:13:37 -0000
@@ -963,7 +963,8 @@ usage(const char *progname, const char *
va_end(ap);
fprintf(stderr, "\n");
- fprintf(stderr, "usage: %s [options] [infile [outfile]]\n", progname);
+ fprintf(stderr, "usage: %s [option ...] [infile [outfile]]\n",
+ progname);
fprintf(stderr, "Common options:\n");
fprintf(stderr, " -C Retain comments\n");
fprintf(stderr, " -Dmacro[=def] Predefine macro\n");
Index: tradcpp.1
===================================================================
RCS file: /cvs/src/libexec/tradcpp/tradcpp.1,v
retrieving revision 1.5
diff -u -p -r1.5 tradcpp.1
--- tradcpp.1 2 Sep 2018 08:28:05 -0000 1.5
+++ tradcpp.1 21 Sep 2022 00:13:37 -0000
@@ -35,8 +35,8 @@
.Nd traditional (K&R-style) C macro preprocessor
.Sh SYNOPSIS
.Nm tradcpp
-.Op Fl options
-.Op Ar input-file Op Ar output-file
+.Op Ar option ...
+.Op Ar infile Op Ar outfile
.Sh DESCRIPTION
The
.Nm
@@ -70,25 +70,30 @@ Many of the options are not yet implemen
.\" The option lists have been sorted in what I hope is a sensible
.\" order. Please don't arbitrarily alphabetize them.
.Ss Common Options
-.Bl -tag -width bubblebabble
+.Bl -tag -width Ds
.It Fl C
Retain comments in output.
-.It Fl Dmacro[=expansion]
-Provide a definition for the named macro.
-If no expansion is provided, the value
-.Dq 1
+.It Fl D Ns Ar macro Ns Op = Ns Ar expansion
+Provide a definition for the named
+.Ar macro .
+If no
+.Ar expansion
+is provided, the value
+.Ql 1
is used.
Note that like many Unix compilers,
.Nm
-does not accept a space between the
-.Dq D
+does not accept a space between
+.Fl D
and the macro name.
-.It Fl Ipath
-Add the specified path to the main list of include directories.
+.It Fl I Ns Ar path
+Add the specified
+.Ar path
+to the main list of include directories.
Note that like many Unix compilers,
.Nm
-does not accept a space between the
-.Dq I
+does not accept a space between
+.Fl I
and the directory name.
.It Fl nostdinc
Do not search the standard system include directories.
@@ -96,12 +101,13 @@ Do not search the standard system includ
Suppress line number information in the output.
Currently line number information is not generated at all and this
option has no effect.
-.It Fl Umacro
-Remove any existing definition for the named macro.
+.It Fl U Ns Ar macro
+Remove any existing definition for the named
+.Ar macro .
Note that like many Unix compilers,
.Nm
-does not accept a space between the
-.Dq U
+does not accept a space between
+.Fl U
and the macro name.
.It Fl undef
Remove all predefined macros.
@@ -109,36 +115,36 @@ Remove all predefined macros.
.Ss Warning Options
Warning options can be disabled or enabled by inserting, or not, the
string
-.Dq no-
-between the
-.Dq W
+.Ql no-
+between
+.Fl W
and the warning name.
Herein the
-.Dq Fl Wno-
+.Ql Fl W Ns Cm no-
form is shown for options that are enabled by default.
-.Bl -tag -width bubblebabble
-.It Fl Wall
+.Bl -tag -width Ds
+.It Fl W Ns Cm all
Turn on all warnings.
The option
-.Fl Wno-all
+.Fl W Ns Cm no-all
disables only the warnings that are disabled by default.
.It Fl w
Turn off all warnings.
-.It Fl Werror
+.It Fl W Ns Cm error
Make warnings into fatal errors.
-.It Fl Wcomment
+.It Fl W Ns Cm comment
Warn about nested comments.
-.It Fl Wno-endif-labels
+.It Fl W Ns Cm no-endif-labels
Don't warn about symbols attached to #endif directives.
(The warning is currently not implemented.)
-.It Fl Wundef
+.It Fl W Ns Cm undef
Warn about undefined symbols appearing in #if and #elif expressions.
-.It Fl Wunused-macros
+.It Fl W Ns Cm unused-macros
Warn about macros that are defined and never used.
Not implemented.
.El
.Ss Depend Options
-.Bl -tag -width bubblebabble
+.Bl -tag -width Ds
.It Fl M
Generate dependency information for
.Xr make 1
@@ -163,7 +169,9 @@ Like
but skip system headers.
Not implemented.
.It Fl MF Ar file
-Send dependency output to the named file instead of the default
+Send dependency output to the named
+.Ar file
+instead of the default
location.
Not implemented.
.It Fl MG
@@ -181,7 +189,9 @@ Same as
.Fl MT
except that any
.Xr make 1
-metacharacters appearing in the target are escaped.
+metacharacters appearing in the
+.Ar target
+are escaped.
.It Fl MT Ar target
Set the name of the
.Xr make 1
@@ -194,9 +204,11 @@ with the suffix for object files, normal
.\" (The current operating mode framework doesn't support that.)
.El
.Ss More Include Path Options
-.Bl -tag -width bubblebabble
+.Bl -tag -width Ds
.It Fl idirafter Ar path
-Add the specified path to the
+Add the specified
+.Ar path
+to the
.Dq afterwards
include path.
This path is searched after all directories specified with
@@ -224,7 +236,7 @@ to the list of directories searched for
with quotes.
This list is not searched for include directives written with angle
brackets.
-.It Fl iremap Ar string:replacement
+.It Fl iremap Ar string : Ns Ar replacement
Substitute
.Ar replacement
for
@@ -244,7 +256,7 @@ Add
.Ar path
to the list of system include directories.
This list is searched after the list given with
-.Ar I .
+.Fl I .
Files found on this path are treated as system headers.
.It Fl iwithprefix Ar dir
Splice
@@ -260,7 +272,7 @@ but adds the result as if it were specif
.Fl I .
.El
.Ss Diagnostic Options
-.Bl -tag -width bubblebabble
+.Bl -tag -width Ds
.It Fl debuglog Ar file
Write a trace of actions and operations to
.Ar file
@@ -291,29 +303,30 @@ Output a trace of the include tree as it
Not implemented.
.El
.Ss Other Options
-.Bl -tag -width bubblebabble
+.Bl -tag -width Ds
.It Fl CC
Retain comments in output.
Same as
.Fl C ,
accepted for compatibility with
.Xr gcc 1 .
-.It Fl fdollars-in-identifiers , Fl fno-dollars-in-identifiers
+.It Fl f Ns Cm dollars-in-identifiers , Fl f Ns Cm no-dollars-in-identifiers
Enable
.Pq or disable, respectively
the use of the dollar sign in identifiers.
Not implemented.
-.It Fl ftabstop=num
+.It Fl f Ns Cm tabstop Ns = Ns Ar num
Set the tab width to the specified value, for reporting column
positions in diagnostics.
The default is 8.
Not implemented.
-.It Fl std=standard
+.It Fl std Ns = Ns Ar standard
Ask
.Nm
-to conform to the named standard.
+to conform to the named
+.Ar standard .
The default, and the only supported value, is
-.Dq krc .
+.Cm krc .
.It Fl traditional
This option is accepted for compatibility with
.Xr gcc 1
@@ -323,9 +336,9 @@ Adjust the preprocessor for the given la
The only values accepted for
.Ar lang
are
-.Dq assembler-with-cpp
+.Cm assembler-with-cpp
and
-.Dq c ,
+.Cm c ,
neither of which have any effect on the behavior of
.Nm .
.El
