*/*.3: Align arguments properly to the right of the opening `('.

This involves a little stunt roff, but we'll manage somehow.

diff --git a/codec/url.3 b/codec/url.3
index 7f6bcf055c2f3f6a76131b53e3135c553871f167..f68bf33ef24fceafda488792e90253208aeda5f9 100644 (file)
--- a/codec/url.3
+++ b/codec/url.3
@@ -23,8 +23,9 @@ url \- manipulation of form-urlencoded strings
 .B "#include <mLib/url.h>"
 
 .BI "void url_initenc(url_ectx *" ctx );
-.BI "void url_enc(url_ectx *" ctx ", dstr *" d ,
-.BI "             const char *" name ", const char *" value );
+.ds mT \fBvoid url_enc(
+.BI "\*(mTurl_ectx *" ctx ", dstr *" d ,
+.BI "\h'\w'\*(mT'u'const char *" name ", const char *" value );
 
 .BI "void url_initdec(url_dctx *" ctx ", const char *" p );
 .BI "int url_dec(url_dctx *" ctx ", dstr *" n ", dstr *" v );

diff --git a/sel/bres.3 b/sel/bres.3
index ca58165afa6e9577874600e2affd2b2ea2cb1d7e..0a0dd7a20ceb706d2fac1c5ad8d270dc47562582 100644 (file)
--- a/sel/bres.3
+++ b/sel/bres.3
@@ -11,12 +11,14 @@ bres \- background name resolver
 .nf
 .B "#include <mLib/bres.h>"
 
-.BI "void bres_byname(bres_client *" rc ", const char *" name ,
-.BI "                 void (*" func ")(struct hostent *" h ", void *" p ),
-.BI "                 void *" p );
-.BI "void bres_byaddr(bres_client *" rc ", struct inaddr " addr ,
-.BI "                 void (*" func ")(struct hostent *" h ", void *" p ),
-.BI "                 void *" p );
+.ds mT \fBvoid bres_byname(
+.BI "\*(mTbres_client *" rc ", const char *" name ,
+.BI "\h'\w'\*(mT'u'void (*" func ")(struct hostent *" h ", void *" p ),
+.BI "\h'\w'\*(mT'u'void *" p );
+.ds mT \fBvoid bres_byaddr(
+.BI "\*(mTbres_client *" rc ", struct inaddr " addr ,
+.BI "\h'\w'\*(mT'u'void (*" func ")(struct hostent *" h ", void *" p ),
+.BI "\h'\w'\*(mT'u'void *" p );
 .BI "void bres_abort(bres_client *" rc );
 .BI "void bres_exec(const char *" file );
 .BI "void bres_init(sel_state *" sel );

diff --git a/sel/conn.3 b/sel/conn.3
index 1c9119313f1e2e8b0b62b7b9ba85397ee8e0238f..60008e5b2c39ae70e2fc33d763235b8b2e49c831 100644 (file)
--- a/sel/conn.3
+++ b/sel/conn.3
@@ -9,14 +9,16 @@ conn \- selector for nonblocking connections
 .nf
 .B "#include <mLib/conn.h>"
 
-.BI "int conn_fd(conn *" c ", sel_state *" s ", int " fd ,
-.BI "            void (*" func ")(int " fd ", void *" p ),
-.BI "            void *" p );
+.ds mT \fBint conn_fd(
+.BI "\*(mTconn *" c ", sel_state *" s ", int " fd ,
+.BI "\h'\w'\*(mT'u'void (*" func ")(int " fd ", void *" p ),
+.BI "\h'\w'\*(mT'u'void *" p );
 
-.BI "int conn_init(conn *" c ", sel_state *" s ", int " fd ,
-.BI "              struct sockaddr *" dst ", int " dsz ,
-.BI "              void (*" func ")(int " fd ", void *" p ),
-.BI "              void *" p );
+.ds mT \fBint conn_init(
+.BI "\*(mTconn *" c ", sel_state *" s ", int " fd ,
+.BI "\h'\w'\*(mT'u'struct sockaddr *" dst ", int " dsz ,
+.BI "\h'\w'\*(mT'u'void (*" func ")(int " fd ", void *" p ),
+.BI "\h'\w'\*(mT'u'void *" p );
 
 .BI "void conn_kill(conn *" c );
 .fi

diff --git a/sel/ident.3 b/sel/ident.3
index 5247bd487daf0ecc3199add6b25a710c914bcab5..c6c14f52f54a99306f355c229c6e3c5d81f47d85 100644 (file)
--- a/sel/ident.3
+++ b/sel/ident.3
@@ -10,14 +10,16 @@ ident \- identd (RFC931) client
 .B "#include <mLib/ident>"
 
 .BI "void ident_abort(ident_request *" rq );
-.BI "void ident(ident_request *" rq ", sel_state *" s ,
-.BI "           const struct sockaddr_in *" local ,
-.BI "           const struct sockaddr_in *" remote ,
-.BI "           void (*" func ")(ident_reply *" i ", void *" p ),
-.BI "           void *" p );
-.BI "void ident_socket(ident_request *" rq ", sel_state *" s ", int " sk ,
-.BI "                  void (*" func ")(ident_reply *" i ", void *" p ),
-.BI "                  void *" p );
+.ds mT \fBvoid ident(
+.BI "\*(mTident_request *" rq ", sel_state *" s ,
+.BI "\h'\w'\*(mT'u'const struct sockaddr_in *" local ,
+.BI "\h'\w'\*(mT'u'const struct sockaddr_in *" remote ,
+.BI "\h'\w'\*(mT'u'void (*" func ")(ident_reply *" i ", void *" p ),
+.BI "\h'\w'\*(mT'u'void *" p );
+.ds mT \fBvoid ident_socket(
+.BI "\*(mTident_request *" rq ", sel_state *" s ", int " sk ,
+.BI "\h'\w'\*(mT'u'void (*" func ")(ident_reply *" i ", void *" p ),
+.BI "\h'\w'\*(mT'u'void *" p );
 .fi
 .SH "DESCRIPTION"
 The

diff --git a/sel/sel.3 b/sel/sel.3
index a1f86a5e5f02180110cc175137de2af3bf9fce97..0442b374ec8dd9e44fa1421ee8e969212a8e5f9c 100644 (file)
--- a/sel/sel.3
+++ b/sel/sel.3
@@ -19,23 +19,26 @@ sel \- low level interface for waiting for I/O
 
 .BI "void sel_init(sel_state *" s );
 
-.BI "void sel_initfile(sel_state *" s ", sel_file *" f ,
-.BI "                  int " fd ", unsigned " mode ,
-.BI "                  void (*" func ")(int " fd ", unsigned " mode ", void *" p ),
-.BI "                  void *" p );
+.ds mT \fBvoid sel_initfile(
+.BI "\*(mTsel_state *" s ", sel_file *" f ,
+.BI "\h'\w'\*(mT'u'int " fd ", unsigned " mode ,
+.BI "\h'\w'\*(mT'u'void (*" func ")(int " fd ", unsigned " mode ", void *" p ),
+.BI "\h'\w'\*(mT'u'void *" p );
 .BI "void sel_addfile(sel_file *" f );
 .BI "void sel_force(sel_file *" f );
 .BI "void sel_rmfile(sel_file *" f );
 
-.BI "void sel_addtimer(sel_state *" s ", sel_timer *" t ,
-.BI "                  struct timeval *" tv ,
-.BI "                  void (*" func ")(struct timeval *" tv ", void *" p ),
-.BI "                  void *" p );
+.ds mT \fBvoid sel_addtimer(
+.BI "\*(mTsel_state *" s ", sel_timer *" t ,
+.BI "\h'\w'\*(mT'u'struct timeval *" tv ,
+.BI "\h'\w'\*(mT'u'void (*" func ")(struct timeval *" tv ", void *" p ),
+.BI "\h'\w'\*(mT'u'void *" p );
 .BI "void sel_rmtimer(sel_timer *" t );
 
-.BI "void sel_addhook(sel_state *" s ", sel_hook *" h ,
-.BI "                 sel_hookfn " before ", sel_hookfn " after ,
-.BI "                 void *" p );
+.ds mT \fBvoid sel_addhook(
+.BI "\*(mTsel_state *" s ", sel_hook *" h ,
+.BI "\h'\w'\*(mT'u'sel_hookfn " before ", sel_hookfn " after ,
+.BI "\h'\w'\*(mT'u'void *" p );
 .BI "void sel_rmhook(sel_hook *" h );
 
 .BI "int sel_fdmerge(fd_set *" dest ", fd_set *" fd ", int " maxfd );

diff --git a/sel/selbuf.3 b/sel/selbuf.3
index cdf561b0f0a06a9142b36983205f2430c5b10ee0..a7043660399e03897c13c7f820c907acd5e05961 100644 (file)
--- a/sel/selbuf.3
+++ b/sel/selbuf.3
@@ -14,8 +14,9 @@ selbuf \- line-buffering input selector
 .BI "void selbuf_enable(selbuf *" b );
 .BI "void selbuf_disable(selbuf *" b );
 .BI "void selbuf_setsize(selbuf *" b ", size_t " sz );
-.BI "void selbuf_init(selbuf *" b ", sel_state *" s ", int " fd ,
-.BI "                 lbuf_func *" func ", void *" p );
+.ds mT \fBvoid selbuf_init(
+.BI "\*(mTselbuf *" b ", sel_state *" s ", int " fd ,
+.BI "\h'\w'\*(mT'u'lbuf_func *" func ", void *" p );
 .BI "void selbuf_destroy(selbuf *" b );
 .fi
 .SH DESCRIPTION

diff --git a/sel/selpk.3 b/sel/selpk.3
index f0a56eeca8a511cfd1ad9af273e60e46cf449b7a..1c8e6b1d68a2a87305f0f80001444402a3900f4f 100644 (file)
--- a/sel/selpk.3
+++ b/sel/selpk.3
@@ -14,8 +14,9 @@ selpk \- packet-buffering input selector
 .BI "void selpk_enable(selpk *" pk );
 .BI "void selpk_disable(selpk *" pk );
 .BI "void selpk_want(selpk *" pk ", size_t " sz );
-.BI "void selpk_init(selpk *" pk ", sel_state *" s ", int " fd ,
-.BI "                pkbuf_func *" func ", void *" p );
+.ds mT \fBvoid selpk_init(
+.BI "\*(mTselpk *" pk ", sel_state *" s ", int " fd ,
+.BI "\h'\w'\*(mT'u'pkbuf_func *" func ", void *" p );
 .BI "void selpk_destroy(selpk *" b );
 .fi
 .SH DESCRIPTION

diff --git a/sel/sig.3 b/sel/sig.3
index a176e129db45ea88025c2462407cb410153eb0ca..f9effa993a69fd69d44365bc1bf8f55df5eb665b 100644 (file)
--- a/sel/sig.3
+++ b/sel/sig.3
@@ -9,8 +9,9 @@ sig \- more controlled signal handling
 .nf
 .B "#include <mLib/sig.h>"
 
-.BI "void sig_add(sig *" s ", int " n ,
-.BI "             void (*" proc ")(int " n ", void *" p "), void *" p );
+.ds mT \fBvoid sig_add(
+.BI "\*(mTsig *" s ", int " n ,
+.BI "\h'\w'\*(mT'u'void (*" proc ")(int " n ", void *" p "), void *" p );
 .BI "void sig_remove(sig *" s );
 .BI "void sig_init(sel_state *" s );
 .fi

diff --git a/struct/sym.3 b/struct/sym.3
index 80cb91309ec9ee2192d97cd8e4de498269cf7dab..c566017e1063938a2d0ed12f34cf9ebfe726062a 100644 (file)
--- a/struct/sym.3
+++ b/struct/sym.3
@@ -32,9 +32,10 @@ sym \- symbol table manager
 .BI "void sym_create(sym_table *" t );
 .BI "void sym_destroy(sym_table *" t );
 
-.BI "void *sym_find(sym_table *" t ,
-.BI "               const char *" n ", long " l ,
-.BI "               size_t " sz ", unsigned *" f );
+.ds mT \fBvoid *sym_find(
+.BI "\*(mTsym_table *" t ,
+.BI "\h'\w'\*(mT'u'const char *" n ", long " l ,
+.BI "\h'\w'\*(mT'u'size_t " sz ", unsigned *" f );
 .BI "void sym_remove(sym_table *" t ", void *" b );
 
 .BI "const char *SYM_NAME(const void *" p );

diff --git a/sys/fdflags.3 b/sys/fdflags.3
index 81f3d83367071b321f42fe55e92a71ac40ba2a8d..3fd51fc2c73d81612d7906275bdcf64dc4b12b2c 100644 (file)
--- a/sys/fdflags.3
+++ b/sys/fdflags.3
@@ -19,9 +19,10 @@ fdflags \- set file and file descriptor flags
 .nf
 .B "#include <mLib/fdflags.h>"
 
-.BI "int fdflags(int " fd ,
-.BI "            unsigned " fbic ", unsigned " fxor ,
-.BI "            unsigned " fdbic ", unsigned " fdxor );
+.ds mT \fBint fdflags(
+.BI "\*(mTint " fd ,
+.BI "\h'\w'\*(mT'u'unsigned " fbic ", unsigned " fxor ,
+.BI "\h'\w'\*(mT'u'unsigned " fdbic ", unsigned " fdxor );
 .fi
 .SH "DESCRIPTION"
 .B fdflags

diff --git a/test/testrig.3 b/test/testrig.3
index 5a5e9cab594ab240b23770c0e21abba7675ef0f0..77cdfcedfbb36225b12b3a03c2d6575a9dbe8814 100644 (file)
--- a/test/testrig.3
+++ b/test/testrig.3
@@ -19,12 +19,14 @@ testrig \- generic test rig
 .nf
 .B "#include <mLib/testrig.h>"
 
-.BI "int test_do(const test_suite " suite [],
-.BI "            FILE *" fp ,
-.BI "            test_results *" results );
-.BI "void test_run(int " argc ", char *" argv [],
-.BI "              const test_chunk " chunk [],
-.BI "              const char *" def );
+.ds mT \fBint test_do(
+.BI "\*(mTconst test_suite " suite [],
+.BI "\h'\w'\*(mT'u'FILE *" fp ,
+.BI "\h'\w'\*(mT'u'test_results *" results );
+.ds mT \fBvoid test_run(
+.BI "\*(mTint " argc ", char *" argv [],
+.BI "\h'\w'\*(mT'u'const test_chunk " chunk [],
+.BI "\h'\w'\*(mT'u'const char *" def );
 .fi
 .SH DESCRIPTION
 .SS Structure

diff --git a/trace/trace.3 b/trace/trace.3
index 0a708bd0b83b637b7c34ba068291d0a8424f33e5..b541cb8c83f4cdc7d018733e78def4920745ea28 100644 (file)
--- a/trace/trace.3
+++ b/trace/trace.3
@@ -17,18 +17,22 @@ trace \- configurable tracing output
 .B "#include <mLib/trace.h>"
 
 .BI "void trace(unsigned " l ", const char *" f ", ...);"
-.BI "void trace_block(unsigned " l ", const char *" s ,
-.BI "                 const void *" b ", size_t " sz );
+.ds mT \fBvoid trace_block(
+.BI "\*(mTunsigned " l ", const char *" s ,
+.BI "\h'\w'\*(mT'u'const void *" b ", size_t " sz );
 
 .BI "void trace_on(FILE *" fp ", unsigned " l );
-.BI "void trace_custom(void (*" func ")(const char *" buf ,
-.BI "                               size_t " sz ", void *" v ),
-.BI "                  void *" v );
+.ds mT \fBvoid trace_custom(
+.ds mU \*(mTvoid (*\fIfunc\fB)(
+.BI "\*(mUconst char *" buf ,
+.BI "\h'\w'\*(mU'u'size_t " sz ", void *" v ),
+.BI "\h'\w'\*(mT'u'void *" v );
 .BI "void trace_level(unsigned " l );
 .BI "unsigned tracing(void);"
 
-.BI "unsigned traceopt(const trace_opt *" t ", const char *" p ,
-.BI "                  unsigned " f ", unsigned " bad );
+.ds mT \fBunsigned traceopt(
+.BI "\*(mTconst trace_opt *" t ", const char *" p ,
+.BI "\h'\w'\*(mT'u'unsigned " f ", unsigned " bad );
 
 .BI T( statements\fR... )
 .BI "IF_TRACING(unsigned " l ", " statements\fR... )

diff --git a/ui/mdwopt.3 b/ui/mdwopt.3
index 11111aa3da1ec50a04a75d91f6eab85df94a3357..7afd2d27f5f5d1851e595b9274f340c0c6337dbc 100644 (file)
--- a/ui/mdwopt.3
+++ b/ui/mdwopt.3
@@ -7,20 +7,23 @@ mdwopt \- command-line option parser
 .nf
 .B "#include <mLib/mdwopt.h>"
 
-.BI "int mdwopt(int " argc ", char *const *" argv ,
-.BI "           const char *" shortopt ,
-.BI "           const struct option *" longopt ", int *" longind ,
-.BI "           mdwopt_data *" data ", int " flags );
+.ds mT \fBint mdwopt(
+.BI "\*(mTint " argc ", char *const *" argv ,
+.BI "\h'\w'\*(mT'u'const char *" shortopt ,
+.BI "\h'\w'\*(mT'u'const struct option *" longopt ", int *" longind ,
+.BI "\h'\w'\*(mT'u'mdwopt_data *" data ", int " flags );
 
 .BI "int getopt(int " argc ", char *const *" argv ", const char *" o );
 
-.BI "int getopt_long(int " argc ", char *const *" argv ,
-.BI "                const char * "shortopt ,
-.BI "                const struct option *" longopt ", int *" longind );
+.ds mT \fBint getopt_long(
+.BI "\*(mTint " argc ", char *const *" argv ,
+.BI "\h'\w'\*(mT'u'const char * "shortopt ,
+.BI "\h'\w'\*(mT'u'const struct option *" longopt ", int *" longind );
 
-.BI "int getopt_long_only(int " argc ", char *const *" argv ,
-.BI "                    const char * "shortopt ,
-.BI "                    const struct option *" longopt ", int *" longind );
+.ds mT \fBint getopt_long_only(
+.BI "\*(mTint " argc ", char *const *" argv ,
+.BI "\h'\w'\*(mT'u'const char * "shortopt ,
+.BI "\h'\w'\*(mT'u'const struct option *" longopt ", int *" longind );
 .fi
 .SH "OVERVIEW"
 The