summaryrefslogtreecommitdiff
path: root/usr.bin/mandoc
AgeCommit message (Collapse)Author
2013-05-18Should termp_xx_pre() ever get called for a macro it cannot handle,Ingo Schwarze
use abort(3), just like in the three other comparable cases in this file, instead of ignoring the problem and causing a null pointer access. Cosmetical issue reported by Ulrich Spoerlein <uqs@spoerlein.net> found by Coverity Scan CID 976115. No functional change.
2013-05-18Remove the variable sz because it's invariantly == 0,Ingo Schwarze
along with the dead code testing whether it's positive. Reported by Ulrich Spoerlein <uqs@spoerlein.net>, found by Coverity Scan CID 975717. While here, remove the now unused **params array as well, which Coverity apparently missed, at least it wasn't reported...
2013-05-18Even though the size of a pointer should not depend on the type of theIngo Schwarze
data pointed to, pass the size of the right pointer type to calloc; cosmetic issue reported by Ulrich Spoerlein <uqs@spoerlein.net> found in Coverity Scan CID 978734. No binary change - ok cmp(1).
2013-03-26bits for octeon (will format as OCTEON in Dt);Jason McIntyre
2013-03-06legancy -> legacy; From: Chris HettrickJason McIntyre
2013-01-05In literal mode (.nf), each input line must be kept togetherIngo Schwarze
on the same output line, even if it is longer than the output width. This commit fixes a bug allowing an overly long last line of an indented block (.RS) to be broken even in literal mode. The bug was found using the sudo_plugin(4) manual provided by millert@. I introduced the bug in rev. 1.84 during the g2k12 Budapest hackathon.
2012-12-31Rewrite indentation handling for nested lists in a more systematic wayIngo Schwarze
to fix multiple issues reported by Todd Miller; thanks! Specifically, - avoid double indentation after .Bd inside .Bl - set up correct indentation after .Bl inside .Bl - set up correct indentation after .Dl and .D1 inside .Bl While here, also - set up correct indentation *inside* .Dl and .D1 inside .Bl.
2012-12-04remove some unnecessary sys/param.h inclusionsTheo de Raadt
2012-11-19Do not crash on stray .Ta macros found outside column lists.Ingo Schwarze
Problem reported by jmc@, thanks.
2012-11-19sync usage(), and tidy up the output a little; ok schwarzeJason McIntyre
2012-11-19In -Tman mode, support automatic word keeps in the SYNOPSISIngo Schwarze
just like in -Tascii mode; requested by millert@. While here, do not escape the blank characters terminating man(7) macros; this is becoming more important as we use more keeps now. Note that -Tman still does not support .nr nS.
2012-11-18Make the generated man(7) code more portable by using .PDIngo Schwarze
instead of .sp -1v, which for example Solaris nroff handles poorly. Problem report and patch by millert@, with the print_word chunk tweaked by me.
2012-11-18Correct indentation for lists and displays inside lists.Ingo Schwarze
Inspired by a diff from millert@, but implemented rather differently and with slightly better functionality. In particular, this one respects -offset and -width arguments found in the input file.
2012-11-18Fix four small whitespace issues related to trailing punctuationIngo Schwarze
reported by Nicolas Joly <njoly at pasteur dot fr>: - add EOS spacing after trailing punctuation after .Cd, .Fc, and .Lb - suppress spacing before trailing punctuation after .Fd
2012-11-17Cleanup naming of local variables to make the code easier on the eye:Ingo Schwarze
Settle for "struct man *man", "struct mdoc *mdoc", "struct meta *meta" and avoid the confusing "*m" which was sometimes this, sometimes that. No functional change. ok kristaps@ some time ago
2012-11-16Warn about unknown volume or arch in Dt macro arguments;Ingo Schwarze
patch written by Nicolas Joly <njoly at pasteur dot fr>.
2012-11-16Two more macros (.Ap and .In) do trailing delimiter handling.Ingo Schwarze
This fixes the end of sentence spacing in open(2) and in about 150 pages in the NetBSD base system. Reported by Nicolas Joly <njoly a pasteur point fr>, merci!
2012-11-16Improve formatting of badly nested font blocks.Ingo Schwarze
The basic idea is to already pop the font at the end marker instead of allowing it to linger until the final end of the block. This requires a few preliminaries: * For each block, save a pointer to the previous font to be used in case the block breaks another and gets extended. * That requires making node information writable during rendering. * Now fonts may get popped in the wrong order; hence, after the stack has already been rewound further by some block that began earlier, ignore popping a font that was put on the stack later. * To be able to exploit all this for font blocks, tie processing to their body, not their block, which is more logical anyway. Triggered by florian@ reporting vaguely similar issues with list blocks.
2012-11-16Fix a crash triggered by .Bl -tag .It Xo .El .Sh found by florian@.Ingo Schwarze
* When allocating a body end marker, copy the pointer to the normalized block information from the body block, avoiding the risk of subsequent null pointer derefence. * When inserting the body end marker into the syntax tree, do not try to copy that pointer from the parent block, because not being a direkt child of the block it belongs to is the whole point of a body end marker. * Even non-callable blocks (like Bd and Bl) can break other blocks; when this happens, postpone closing them out in the usual way.
2012-08-12.Sq should use curly right quotes in HTML output to match its curlyMatthew Dempsky
left quotes. Also, properly reinitialize the styles attribute string buffer for each column in a table so that the attributes don't accumulate. tweak and ok schwarze
2012-07-29Disable hyphenation and, for nroff, disable justification which isTodd C. Miller
consistent with how mdoc behaves (and produces more readable manuals). OK schwarze@
2012-07-29The '-' before the flags needs to be quoted to prevent nroffTodd C. Miller
from putting a line break between the '-' and the flag character. OK schwarze@
2012-07-29Use "\\ " not "\\~" as the non-breaking space as historic nroffTodd C. Miller
doesn't support the latter. OK schwarze@
2012-07-29Implement .PD for -Tascii.Ingo Schwarze
Reminded about the missing feature by millert@. This reduces mandoc/groff differences in base by 25%. ok millert@
2012-07-18Drop empty .IP such that is does not cause additional vertical spacing.Ingo Schwarze
Issue first reported by naddy@ in rsync(1).
2012-07-18Drop .sp and .br right after .SH and .SS.Ingo Schwarze
Fixes vertical spacing after "OPTIONS" in gcc(1). Issue first reported by naddy@ in rsync(1).
2012-07-18Let a trailing .Ns macro take effectIngo Schwarze
even on an input line containing a partial implicit macro. Fixes horizontal spacing in vi(1), ddb(4), and ppp(8).
2012-07-18Fix handling of paragraph macros inside lists:Ingo Schwarze
* When they are trailing the last item, move them outside the list. * When they are trailing any other none-compact item, drop them. Improves formatting of 40 pages, e.g. grep(1), ksh(1), netstat(1), ath(4), bsd.port.mk(5), pf.conf(5), mount(8), crypto(9).
2012-07-18The mdoc(7) \*(Ba predefined string actually forces roman font;Ingo Schwarze
that's stupid because it may break enclosing font changes, but let's do the same for groff bug compatibility. --> Never use \*(Ba, use just plain "|"! <-- Also, predefined strings are already expanded by the roff(7) parser, so the mdoc(7) parser has to look for the expanded string. Formatting improvements in ksh(1), less(1), atan2(3), hostapd.conf(5), snmpd.conf(5), and mknod(8).
2012-07-16Always fix the man(7) subsection header (.SS) indent to 3n,Ingo Schwarze
do not let it depend on the default indent provided by -Oindent. By default, this doesn't change anything because 7 / 2 = 3; in -Omdoc mode, it makes man(7) output the same as mdoc(7) output.
2012-07-16Release polishing: finally fix the perl(1) SYNOPSIS.Ingo Schwarze
In flush-left mode of both man(7) and mdoc(7), when an output line is broken at the position of a literal tab, the tab indents the following line. Reminded by deraadt@ in Pest, Ujlipotvaros, Csanady utza.
2012-07-16Two fixes regarding -Tman .sp:Ingo Schwarze
* Keep height argument on the same line (it got printed to the output). * For .El .sp, avoid the weird .sp -1v .PP .sp output sequence.
2012-07-16Several -mdoc parser improvements related to vertical spacing:Ingo Schwarze
* So far, .Pp and .Lp were removed before paragraph type blocks. * Now also remove .br before paragraph type blocks. * Treat .Lp as a paragraph like .Pp, so remove .Pp, .Lp, .br before it. * Do not treat .sp as a paragraph, don't remove anything before it. * After .Sh, .Ss, .Pp, and .Lp, remove .Pp, .Lp, .sp, .br, and blank lines. * After .sp and .br, remove .br.
2012-07-14Translate blank input lines to .sp just like in mdoc(7),Ingo Schwarze
and ignore .sp after .PP. This fixes vertical spacing for blank lines after .PP and for .sp after .PP.
2012-07-14In -Tman .Bl -compact, skip the blank line only before the first itemIngo Schwarze
of the first list in a section, not before every item of the first list.
2012-07-13Adjust -Tman SYNOPSIS .Nm indentation using .HP; requested by millert@.Ingo Schwarze
There are still lots of ugly line breaks, to be fixed later.
2012-07-13If the tag in .Bl -tag .It would leave exactly one blank before theIngo Schwarze
body of the item, mdoc(7) breaks the line, whereas the .TP used to translate this to man(7) does not. Thus, insert an explicit roff(7) line break in this place. To be able to correctly count the characters, do not pass font escapes an the like through print_word().
2012-07-13In -man -Tascii, support .sp with negative argument.Ingo Schwarze
In -mdoc -Tman, improve the framework to control vertical spacing. Use both to support .Bl -compact (surprisingly hard to get right).
2012-07-12The post_nm() validation function crashed when the first .Nm child nodeIngo Schwarze
was a non-text node. Fix this by rewriting post_nm() to always set the meta name to UNKNOWN when the name is missing or unusable. While here, make MANDOCERR_NONAME an ERROR, as it usually renders the page content unintelligible. Bug reported by Maxim <Belooussov at gmail dot com>, thanks.
2012-07-12Do not crash in -Tman on:Ingo Schwarze
* .Fn with exactly one argument * .Bl -hang without a -width Now all 3776 base manuals build without crashing.
2012-07-11Polish -Tman .Rs support.Ingo Schwarze
All mdoc(7) macros are now supported by -Tman.
2012-07-11fix position and formatting of %UIngo Schwarze
2012-07-11Basic implementation of -Tman .Bl -column using tbl(7).Ingo Schwarze
In the end, this turned out to be surprisingly simple; of course, getting identical output will be quite hard, so there is no way to quickly set up unit tests.
2012-07-10basic implementation of -Tman .Bl -tagIngo Schwarze
while here, do some minor outflags cleanup
2012-07-10multiple fixes to -Tascii .HP rendering:Ingo Schwarze
* do not add an excessive blank line before the block * in literal mode, start a new line after the tag getting this to work requires some general (print_man_node) fixes: * in literal mode, break the output line at the end of each input line, not just after those input lines ending in text * but don't break it when there was no output on the line * and adjust the margins after the .HP tag these general fixes require an adjustment to -Tascii .TP rendering: * set up NOBREAK mode before the body, not after the head finally, based on all this, implement -Tman .Bl -hang in terms of .HP
2012-07-10Remove a hack that was intended for groff-1.15 bug compatibility:Ingo Schwarze
When the width of a tag in .Bl -hang was exactly one character shorter than the maximum length that would fit, the following text would have a negative hang of one character (i.e., hang to the left). That bug is no longer present in groff-1.21, so relax mandoc, too.
2012-07-10* implement -Tman .Bl -item -inset -diag -ohang -dash -hyphen -enum .ItIngo Schwarze
* fix -Tman .Bl -bullet .It * adjust the -Tascii .Bl -bullet -dash -hyphen .It default and minimum width to new groff standards, it changed from 4n (in groff 1.15) to 2n (in groff 1.21) * same for -Tascii -enum, it changed from 5n to 2n * use -hang formatting for -Tascii -enum -width 2n * for -Tascii -enum, the default is -width 3n
2012-07-09fix -Tascii .Fd line breakingIngo Schwarze
and implement -Tman .Fd
2012-07-09implement -Tman .Eo and .EcIngo Schwarze
2012-07-09Implement -Tman .Bf.Ingo Schwarze
To get the spacing right, * avoid man(7) code line breaks at places where no spacing is allowed * allow spacing right after .Sm on * allow spacing after empty .Fl at the end of an input line