Make further modifications for mdoc rendering

Author: pyrmont

examples/ls.1

@@ -1,5 +1,5 @@
 .\"
-.\" Generated by predoc at 2025-09-19T02:26:42Z
+.\" Generated by predoc at 2025-09-20T14:45:08Z
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
 .\" The Regents of the University of California.  All rights reserved.

examples/mdoc.7

@@ -1,5 +1,5 @@
 .\"
-.\" Generated by predoc at 2025-09-19T02:26:42Z
+.\" Generated by predoc at 2025-09-20T14:45:08Z
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010, 2011, 2013-2020 Ingo Schwarze <schwarze@openbsd.org>
@@ -1083,7 +1083,7 @@ for a single page or
 for a range of pages,
 for example:
 .Bd -literal -offset indent
-\&.%P pp\&. 42\e(en47
+\&.%P pp\&. 42\e\*(lpen47
 .Ed
 .It Xo
 .Ic \&%Q  
@@ -1143,7 +1143,7 @@ Do not use this for postal addresses.
 .Pp
 Examples:
 .Bd -literal -offset indent
-\&.Ad \(lB0,$]
+\&.Ad \(lB0,$\(rB
 \&.Ad 0x00000000
 .Ed
 .It Xo
@@ -1961,7 +1961,7 @@ It is followed by a newline.
 .Pp
 Examples:
 .Bd -literal -offset indent
-\&.Dl % mandoc mdoc\&.7 \e(ba less
+\&.Dl % mandoc mdoc\&.7 \e\*(lpba less
 .Ed
 .Pp
 See also
@@ -1982,7 +1982,7 @@ Examples:
 \&.Do
 April is the cruellest month
 \&.Dc
-\e(em T\&.S\&. Eliot
+\e\*(lpem T\&.S\&. Eliot
 .Ed
 .Pp
 See also
@@ -1996,7 +1996,7 @@ Encloses its arguments in “typographic” double-quotes.
 Examples:
 .Bd -literal -offset indent
 \&.Dq April is the cruellest month
-\e(em T\&.S\&. Eliot
+\e\*(lpem T\&.S\&. Eliot
 .Ed
 .Pp
 See also
@@ -2146,7 +2146,7 @@ The
 argument is used as the enclosure tail,
 for example,
 specifying
-.Ql "\e(rq"
+.Ql "\e\*(lprq"
 will emulate
 .Ic \&Dc .
 .It Xo
@@ -2233,7 +2233,7 @@ The
 argument is used as the enclosure head,
 for example,
 specifying
-.Ql "\e(lq"
+.Ql "\e\*(lplq"
 will emulate
 .Ic \&Do .
 .It Xo
@@ -3862,7 +3862,7 @@ function definition or include directive.
 Examples:
 .Bd -literal -offset indent
 \&.Vt unsigned char
-\&.Vt extern const char * const sys_signame\(lB] ;
+\&.Vt extern const char * const sys_signame\(lB\(rB ;
 .Ed
 .Pp
 For parameters in function prototypes,
@@ -3932,14 +3932,14 @@ its name as an argument to another macro.
 For example,
 .Ql "\&.Op Fl O Ar file"
 produces
-.Ql "\(lB-O file]" .
+.Ql "\(lB-O file\(rB" .
 To prevent a macro call and render the macro name literally,
 escape it by prepending a zero-width space,
 .Ql "\e&" .
 For example,
 .Ql "Op \e&Fl O"
 produces
-.Ql "\(lBFl O]" .
+.Ql "\(lBFl O\(rB" .
 If a macro is not callable but its name appears as an argument
 to another macro,
 it is interpreted as opaque text.
@@ -3971,18 +3971,18 @@ and (optionally)
 .Ic \&Bl
 contain a head.
 .Bd -literal -offset indent
-\&.Yo \(lB-arg \(lBparm\&.\&.\&.]] \(lBhead\&.\&.\&.]
-\(lBbody\&.\&.\&.]
+\&.Yo \(lB-arg \(lBparm\&.\&.\&.\(rB\(rB \(lBhead\&.\&.\&.\(rB
+\(lBbody\&.\&.\&.\(rB
 \&.Yc
 .Ed
 .Bl -column "     " "        " "      " "             "
 .It Xo
 .Em Macro
-.Ta\c
+.Ta
 .Em Callable
-.Ta\c
+.Ta
 .Em Parsed
-.Ta\c
+.Ta
 .Em Scope
 .Xc
 .It Xo
@@ -4086,17 +4086,17 @@ in
 .Fl column )
 has multiple heads.
 .Bd -literal -offset indent
-\&.Yo \(lB-arg \(lBparm\&.\&.\&.]] \(lBhead\&.\&.\&. \(lBTa head\&.\&.\&.]]
-\(lBbody\&.\&.\&.]
+\&.Yo \(lB-arg \(lBparm\&.\&.\&.\(rB\(rB \(lBhead\&.\&.\&. \(lBTa head\&.\&.\&.\(rB\(rB
+\(lBbody\&.\&.\&.\(rB
 .Ed
 .Bl -column "     " "        " "      " "                         "
 .It Xo
 .Em Macro
-.Ta\c
+.Ta
 .Em Callable
-.Ta\c
+.Ta
 .Em Parsed
-.Ta\c
+.Ta
 .Em Scope
 .Xc
 .It Xo
@@ -4176,20 +4176,20 @@ a head (\c
 and/or tail (\c
 .Ic \&Ec ) .
 .Bd -literal -offset indent
-\&.Yo \(lB-arg \(lBparm\&.\&.\&.]] \(lBhead\&.\&.\&.]
-\(lBbody\&.\&.\&.]
-\&.Yc \(lBtail\&.\&.\&.]
+\&.Yo \(lB-arg \(lBparm\&.\&.\&.\(rB\(rB \(lBhead\&.\&.\&.\(rB
+\(lBbody\&.\&.\&.\(rB
+\&.Yc \(lBtail\&.\&.\&.\(rB
 
-\&.Yo \(lB-arg \(lBparm\&.\&.\&.]] \(lBhead\&.\&.\&.] \(lBbody\&.\&.\&.] Yc \(lBtail\&.\&.\&.]
+\&.Yo \(lB-arg \(lBparm\&.\&.\&.\(rB\(rB \(lBhead\&.\&.\&.\(rB \(lBbody\&.\&.\&.\(rB Yc \(lBtail\&.\&.\&.\(rB
 .Ed
 .Bl -column "     " "        " "      " "              "
 .It Xo
 .Em Macro
-.Ta\c
+.Ta
 .Em Callable
-.Ta\c
+.Ta
 .Em Parsed
-.Ta\c
+.Ta
 .Em Scope
 .Xc
 .It Xo
@@ -4438,14 +4438,14 @@ closed by
 Like block full-implicit,
 but with single-line scope closed by the end of the line.
 .Bd -literal -offset indent
-\&.Yo \(lB-arg \(lBval\&.\&.\&.]] \(lBbody\&.\&.\&.] \(lBres\&.\&.\&.]
+\&.Yo \(lB-arg \(lBval\&.\&.\&.\(rB\(rB \(lBbody\&.\&.\&.\(rB \(lBres\&.\&.\&.\(rB
 .Ed
 .Bl -column "     " "        " "      "
 .It Xo
 .Em Macro
-.Ta\c
+.Ta
 .Em Callable
-.Ta\c
+.Ta
 .Em Parsed
 .Xc
 .It Xo
@@ -4566,11 +4566,11 @@ but no heads.
 .Bl -column "     " "        " "      " "                   "
 .It Xo
 .Em Macro
-.Ta\c
+.Ta
 .Em Callable
-.Ta\c
+.Ta
 .Em Parsed
-.Ta\c
+.Ta
 .Em Scope
 .Xc
 .It Xo
@@ -4595,20 +4595,20 @@ If a number (or inequality)
 of arguments is (n),
 then the macro accepts an arbitrary number of arguments.
 .Bd -literal -offset indent
-\&.Yo \(lB-arg \(lBval\&.\&.\&.]] \(lBargs\&.\&.\&.] \(lBres\&.\&.\&.]
+\&.Yo \(lB-arg \(lBval\&.\&.\&.\(rB\(rB \(lBargs\&.\&.\&.\(rB \(lBres\&.\&.\&.\(rB
 
-\&.Yo \(lB-arg \(lBval\&.\&.\&.]] \(lBargs\&.\&.\&.] Yc\&.\&.\&.
+\&.Yo \(lB-arg \(lBval\&.\&.\&.\(rB\(rB \(lBargs\&.\&.\&.\(rB Yc\&.\&.\&.
 
-\&.Yo \(lB-arg \(lBval\&.\&.\&.]] arg0 arg1 argN
+\&.Yo \(lB-arg \(lBval\&.\&.\&.\(rB\(rB arg0 arg1 argN
 .Ed
 .Bl -column "     " "        " "      " "         "
 .It Xo
 .Em Macro
-.Ta\c
+.Ta
 .Em Callable
-.Ta\c
+.Ta
 .Em Parsed
-.Ta\c
+.Ta
 .Em Arguments
 .Xc
 .It Xo
@@ -5267,12 +5267,12 @@ Spacing is suppressed after opening delimiters and before closing
 delimiters.
 For example,
 .Bd -literal -offset indent
-\&.Aq ( \(lB word ] ) \&.
+\&.Aq \*(lp \(lB word \(rB \*(rp \&.
 .Ed
 .Pp
 renders as:
 .Bd -literal -offset indent
-(\(lB⟨word⟩])\&.
+\*(lp\(lB⟨word⟩\(rB\*(rp\&.
 .Ed
 .Pp
 Opening delimiters are:
@@ -5328,12 +5328,12 @@ and resume their scope when more arguments follow that are not
 delimiters.
 For example,
 .Bd -literal -offset indent
-\&.Fl a ( b | c \e*(Ba d ) e
+\&.Fl a \*(lp b | c \e*\*(lpBa d \*(rp e
 .Ed
 .Pp
 renders as:
 .Bd -literal -offset indent
--a (-b | -c | -d) -e
+-a \*(lp-b | -c | -d\*(rp -e
 .Ed
 .Pp
 This applies to both opening and closing delimiters,
@@ -5348,7 +5348,7 @@ vertical bar
 .Pp
 As a special case,
 the predefined string
-.Ql "\e*(Ba"
+.Ql "\e*\*(lpBa"
 is handled and rendered in the same way as a plain
 .Ql "|"
 character.

examples/rmdir.1

@@ -1,5 +1,5 @@
 .\"
-.\" Generated by predoc at 2025-09-19T02:26:42Z
+.\" Generated by predoc at 2025-09-20T14:45:08Z
 .\"
 .\" Copyright (c) 1990, 1993
 .\" The Regents of the University of California.  All rights reserved.

lib/mdoc.janet

@@ -8,13 +8,14 @@
 (def- sq 39)
 (def- po 40)
 (def- pc 41)
+(def- cm 44)
 (def- ms 45)
 (def- fs 46)
 (def- bo 91)
 (def- bs 92)
 (def- bc 93)
 
-(def- trail-delims ".,:;?!)")
+(def- trail-delims ".,:;)]?!")
 (def- macros [
   "Ac" "Ad" "An" "Ao" "Ap" "Aq" "Ar" "At" "Bc" "Bd" "Bf" "Bk" "Bl" "Bo" "Bq"
   "Brc" "Bro" "Brq" "Bsx" "Bt" "Bx" "Cd" "Cm" "D1" "Db" "Dc" "Dd" "Dl" "Do"
@@ -54,7 +55,8 @@
 
 (defn- buffer-esc [b s &opt inline?]
   (def escapes
-    {bo "\\(lB" bs "\\e" dq "\\(dq" fs "\\&." sq "\\(aq"})
+    {bc "\\(rB" bo "\\(lB" bs "\\e" dq "\\(dq" fs "\\&." pc "\\*(rp"
+     po "\\*(lp" sq "\\(aq"})
   (var i 0)
   (while (def ch (get s i))
     (buffer/push b (get escapes ch ch))
@@ -281,6 +283,7 @@
   (when (and cont-output?
              (ending-nl? b)
              (not (string/has-suffix? "Xo\n" b))
+             (not (string/has-suffix? "Ta\n" b))
              (not (string/check-set trail-delims (string/slice b -3 -2))))
     (buffer/popn b 1)
     (buffer/push b "\\c\n"))

man/man1/predoc.1

@@ -1,5 +1,5 @@
 .\"
-.\" Generated by predoc at 2025-09-19T02:26:42Z
+.\" Generated by predoc at 2025-09-20T14:45:08Z
 .\"
 .Dd September 13, 2025
 .Dt PREDOC 1

man/man7/predoc.7

@@ -1,5 +1,5 @@
 .\"
-.\" Generated by predoc at 2025-09-19T02:26:42Z
+.\" Generated by predoc at 2025-09-20T14:45:08Z
 .\"
 .Dd September 13, 2025
 .Dt PREDOC 7
@@ -118,7 +118,7 @@ the frontmatter must include a
 The other elements are optional.
 .Bd -literal -offset indent
 ---
-Title: EXAMPLE(7)
+Title: EXAMPLE\*(lp7\*(rp
 Authors: Jane Smith <jane@example\&.org>
 Date: 2025-01-01
 Project: Example
@@ -758,7 +758,7 @@ to the command.
 An optional is denoted by
 .Ql "\(lB"
 and
-.Ql "]"
+.Ql "\(rB"
 enclosing arguments and/or options.
 An optional will only be parsed if its contents are some combination
 of arguments,
@@ -768,7 +768,7 @@ and
 .Ql "|" .
 .Bd -literal -offset indent
 Begin the training program using **train**
-\(lB**--coop** | **--location** _location_]\&.
+\(lB**--coop** | **--location** _location_\(rB\&.
 .Ed
 .Pp
 An optional cannot be nested in other inline elements.
@@ -902,7 +902,7 @@ An external cross-reference is denoted by a Predoc inline marker
 on either side of the text.
 The text must end in a number in parentheses.
 .Bd -literal -offset indent
-The image translators work for `construct(1)`\&.
+The image translators work for `construct\*(lp1\*(rp`\&.
 .Ed
 .Pp
 A cross-reference cannot be nested in other inline elements.
@@ -1026,16 +1026,16 @@ request.
 A link is denoted by
 .Ql "\(lB"
 and
-.Ql "]"
+.Ql "\(rB"
 on either side of the linked text.
 The URL must immediately following the
-.Ql "]"
+.Ql "\(rB"
 and be surrounded by
-.Ql "("
+.Ql "\*(lp"
 and
-.Ql ")" .
+.Ql "\*(rp" .
 .Bd -literal -offset indent
-I know \(lBkung fu](https://example\&.org)\&.
+I know \(lBkung fu\(rB\*(lphttps://example\&.org\*(rp\&.
 .Ed
 .Pp
 A link can be nested in emphasis text and strong text.