summaryrefslogtreecommitdiff
path: root/usr.bin/mandoc/roff.c
AgeCommit message (Collapse)Author
2015-05-31Implement the roff(7) `r' (register exists) conditional.Ingo Schwarze
Missing feature found by Markus <Waldeck at gmx dot de> in Debian's bash(1) manual page.
2015-05-01Setting the "last" member of struct roff_node was done at an extremelyIngo Schwarze
weird place. Move it to the obviously correct place. Surprisingly, this didn't cause any misformatting in the test suite or in any base system manuals, but i cannot believe the code was really correct for all conceivable input, and it would be very hard to verify. At the very least, it cannot have worked for man(7).
2015-04-23Unify mdoc_deroff() and man_deroff() into a common function deroff().Ingo Schwarze
No functional change except that for mdoc(7), it now skips leading escape sequences just like it already did for man(7). Escape sequences rarely occur in mdoc(7) code and if they do, skipping them is an improvement in this context. Minus 30 lines of code.
2015-04-19Unify trickier node handling functions.Ingo Schwarze
* man_elem_alloc() -> roff_elem_alloc() * man_block_alloc() -> roff_block_alloc() The functions mdoc_elem_alloc() and mdoc_block_alloc() remain for now because they need to do mdoc(7)-specific argument processing.
2015-04-19Unify some node handling functions that use TOKEN_NONE.Ingo Schwarze
* mdoc_word_alloc(), man_word_alloc() -> roff_word_alloc() * mdoc_word_append(), man_word_append() -> roff_word_append() * mdoc_addspan(), man_addspan() -> roff_addtbl() * mdoc_addeqn(), man_addeqn() -> roff_addeqn() Minus 50 lines of code, no functional change.
2015-04-19Unify node handling functions:Ingo Schwarze
* node_alloc() for mdoc and man_node_alloc() -> roff_node_alloc() * node_append() for mdoc and man_node_append() -> roff_node_append() * mdoc_head_alloc() and man_head_alloc() -> roff_head_alloc() * mdoc_body_alloc() and man_body_alloc() -> roff_body_alloc() * mdoc_node_unlink() and man_node_unlink() -> roff_node_unlink() * mdoc_node_free() and man_node_free() -> roff_node_free() * mdoc_node_delete() and man_node_delete() -> roff_node_delete() Minus 130 lines of code, no functional change.
2015-04-18Unify {mdoc,man}_{alloc,reset,free}() into roff_man_{alloc,reset,free}().Ingo Schwarze
Minus 80 lines of code, no functional change. Written on the train from Koeln to Wolfsburg returning from p2k15.
2015-04-04Don't allow breaking the output line after hyphens following escapeIngo Schwarze
sequences. Improves tic(1), sxpm(1), and a few Perl manuals. Quirk found by naddy@ in milter-greylist(8).
2015-02-21Escape quotes when expanding macro arguments.Ingo Schwarze
This fixes a bug naddy@ found in plan9/rc(1).
2015-02-17Cope with another one of the many kinds of DocBook stupidity:Ingo Schwarze
Instead of just using .br, DocBook sometimes fiddles with the utterly unportable internal register \n[an-break-flag] that is only available in the GNU implementation of man(7) and then arms an input line trap to call the equally unportable internal macro .an-trap that, in the GNU implementation, inspects that variable; all the world is GNU, isn't it? Since naddy@ reports that quite a few ports manuals suffer from this insanity, let's just translate it to the intended .br. Et ceterum censeo DocBookem esse delendam.
2015-02-17Let .it accept numerical expressions, not just numerical constants.Ingo Schwarze
For .it, ignore scaling units in roff_getnum(). Inside parentheses, skip whitespace after a sign in roff_getnum(). Parse and ignore unary plus in roff_getnum(). As a bonus, get rid of the only call to mandoc_strntoi() in roff.c.
2015-02-06replace the last legacy generic message type, "argument count wrong",Ingo Schwarze
by more specific messages, improving diagnostics for .cc .tr .Bl -column
2015-01-30correctly handle table layout lines starting with a dotIngo Schwarze
2015-01-28* Polish tbl(7) error reporting.Ingo Schwarze
* Do not print out macro names in tbl(7) data blocks. * Like with GNU tbl, let empty tables cause a blank line. * Avoid producing empty tables in -Tman.
2015-01-28For now, it can't be helped that mandoc tbl(7) ignores high-level macros,Ingo Schwarze
but stop throwing away their arguments. This fixes information loss in a handful of Xenocara manuals, at the price of a small amount of formatting noise creeping through.
2015-01-24Strangely, ignoring the roff(7) .na request was implemented in the man(7)Ingo Schwarze
parser. Simplify the code by moving it into the roff(7) parser, also making it work for mdoc(7).
2015-01-23While ignoring the .ta (set tab stops) and .ti (temp indent) requestsIngo Schwarze
is sometimes harmless, it often causes seriously ugly output, so flag these requests as unsupported rather than ignoring them. Discussed with naddy@.
2015-01-23Wonders of roff(7): Integer numbers in numerical expressions can carryIngo Schwarze
scaling units, and some manuals (e.g. in devel/grcs) actually use that, so let's support it. Missing feature reported by naddy@.
2015-01-22Slightly improve \w width measurements:Ingo Schwarze
Count special characters with the same width as ASCII characters and treat all other escape sequences as if they had a width of 0. Certainly not perfect, but a bit better. For example, GNU RCS ci(1) needs this; reported by naddy@.
2015-01-21pass empty request lines through to tbl(7); sometimes, they end a layoutIngo Schwarze
2015-01-20Split the -Werror message level into -Werror (broken manual, probablyIngo Schwarze
using mandoc is better than using groff) and -Wunsupp (manual using unsupported low-level roff(7) feature, probably using groff is better than using mandoc). Once this feature is complete, it is intended to help porting, making the decision whether to USE_GROFF easier. As a first step, distinguish four classes of roff(7) requests: 1. Supported (currently 24 requests) 2. Currently ignored because unimportant (120) -> no message 3. Ignored for good because insecure (14) -> -Werror 4. Currently unsupported (68) -> these trigger the new -Wunsupp messages
2015-01-16Parse and ignore .IX (generate index entry) macros because pod2man(1)Ingo Schwarze
emits them, by default without defining them, relying on the roff(7) quirk that undefined macros have no effect. This cures 1996 mandoc ERRORs in src/gnu.
2015-01-14downgrade ".so with absolute path" from FATAL to ERROR;Ingo Schwarze
allows to get rid of ROFF_ERR
2015-01-07Bugfix: When the invocation of a user-defined macro follows a roffIngo Schwarze
conditional request on the same input line, don't skip the first few bytes of its content.
2015-01-01Fix a buffer overrun triggered by a trailing backslash at EOF inIngo Schwarze
an unclosed conditional body. If the memory contained the byte sequence "\}" after the end of the buffer before the next NUL, this could even write beyond the end of the buffer, specifically '&' to the location of the '}'. Found by jsg@ with afl.
2014-12-28improve previous: do the size check up front to avoid leaking memoryIngo Schwarze
2014-12-25Reduce memory and time consumption on certain malformed input filesIngo Schwarze
by limiting the length of expanded input lines during the (usually recursive) expansion of user defined strings. Resource hogging found by jsg@ with afl.
2014-12-18Don't let the modulo operator divide by zero.Ingo Schwarze
Found by jsg@ with afl.
2014-12-16Ignore mdoc(7) and man(7) macros inside tbl(7) code because theyIngo Schwarze
would abort the table in an unclean way, causing assertion failures found by jsg@.
2014-12-16When a string comparison condition contains no mismatching characterIngo Schwarze
but ends without the final delimiter, the parse point was advanced one character too far and the invalid pointer returned to the caller of roff_parseln(). Later use could potentially advance the pointer even further and maybe even write to it. Fixing a buffer overrun found by jsg@ with afl (the most severe so far).
2014-12-16When a numerical condition errors out after consuming at least oneIngo Schwarze
character of input, treat it as false, do not retry it as a string comparison condition. This also fixes a read buffer overrun that happened when the numerical condition advanced to the end of the input line before erroring out, found by jsg@ with afl.
2014-12-15Empty conditions count as false.Ingo Schwarze
When negated, they still count as false. Found when investigating crashes jsg@ found with afl. Not completely fixing the crashes yet.
2014-11-19Support the ".if v" conditional operator (vroff mode, always false)Ingo Schwarze
for groff compatibility because pod2man(1) uses it that way. Weirdly, groff documents it as "for compatibility with other troff versions" but neither Heirloom nor Plan 9 have it. Issue reported by giovanni@ via sthen@.
2014-11-01Use struct buf in libroff, it is very natural thereIngo Schwarze
and reduces the number of arguments of many functions. While here, sprinkle some KNF. No functional change.
2014-10-28Make the character table available to libroff so it can check theIngo Schwarze
validity of character escape names and warn about unknown ones. This requires mchars_spec2cp() to report unknown names again. Fortunately, that doesn't require changing the calling code because according to groff, invalid character escapes should not produce output anyway, and now that we warn about them, that's fine.
2014-10-25With the current architecture, we can't support inline equationsIngo Schwarze
inside tables, sorry. So don't even try to parse tbl(7) blocks for eqn(7) delimiters. Broken table layout found in glPixelMap(3) while investigating a bug report by Theo Buehler <theo at math dot ethz dot ch>.
2014-10-25Report arguments to .EQ as an error, and simplify the code:Ingo Schwarze
* drop trivial wrapper function roff_openeqn() * drop unused first arg of function eqn_alloc() * drop usused member "name" of struct eqn_node
2014-10-20protect the roff parser from dividing by zero;Ingo Schwarze
issue found and patch written by kristaps@
2014-10-20correctly parse spacing around in-line equationsIngo Schwarze
at the beginning and at the end of input lines; issue reported by kristaps@
2014-10-20correct spacing before inline equationsIngo Schwarze
2014-10-16oops, don't escape the first token of inline equationsIngo Schwarze
2014-10-16Implement in-line equations, much needed by Xenocara manuals.Ingo Schwarze
Put the steering into the roff parser rather than into the mdoc parser such that it works for all macro languages and on both text and macro lines. Line breaks and blank characters generated before and after in-line equations are not perfect yet, but let's do one thing at a time.
2014-09-07Parse and ignore the .pl (page length) request;Ingo Schwarze
Daniel Levai reports that Slackware Linux uses this.
2014-09-06Simplify by handling empty request lines at the one logical placeIngo Schwarze
in the roff parser instead of in three other places in other parsers. No functional change.
2014-09-06Move main format autodetection from the parser dispatcher to theIngo Schwarze
roff parser where .Dd and .TH are already detected, anyway. This improves robustness because it correctly handles whitespace or an alternate control character before Dd. In the parser dispatcher, provide a fallback looking ahead in the input buffer instead of always assuming man(7). This corrects autodetection when Dd is preceded by other macros or macro-like handled requests like .ll. Triggered by reports from Daniel Levai about issues on Slackware Linux.
2014-08-19libroff depends on libmandoc and so libmandoc should be included first.Daniel Dickman
this change makes the code slightly more portable by removing a gcc extension (incomplete enum types) which is not part of ISO C. ok schwarze@
2014-08-08mention requests and macros in more messagesIngo Schwarze
2014-08-08Dynamically allocate the stack of roff(7) .ie condition valuesIngo Schwarze
and thus get rid of the last useless fatal error.
2014-08-08better name and wording for the last two non-generic errorsIngo Schwarze
2014-07-07Clean up ERROR messages related to document structure and macros:Ingo Schwarze
Hierarchical naming and mention macro names in messages.