merge OpenBSD commit by jmc@:

[mandoc.git] / mandoc.h

diff --git a/mandoc.h b/mandoc.h
index 4d80b6b51c63b5f4fe8c8eebf3b94b030404c870..9837ff2ae9dff07b10534c2ba89981c0803754f0 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,6 +1,6 @@
-/* $Id: mandoc.h,v 1.270 2021/06/02 18:28:19 schwarze Exp $ */
+/* $Id: mandoc.h,v 1.274 2021/08/14 13:53:08 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2012-2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012-2021 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -72,6 +72,7 @@ enum  mandocerr {
        MANDOCERR_DELIM_NB, /* no blank before trailing delimiter: macro ... */
        MANDOCERR_FI_SKIP, /* fill mode already enabled, skipping: fi */
        MANDOCERR_NF_SKIP, /* fill mode already disabled, skipping: nf */
        MANDOCERR_DELIM_NB, /* no blank before trailing delimiter: macro ... */
        MANDOCERR_FI_SKIP, /* fill mode already enabled, skipping: fi */
        MANDOCERR_NF_SKIP, /* fill mode already disabled, skipping: nf */

+       MANDOCERR_TEXT_LONG, /* input text line longer than 80 bytes */

        MANDOCERR_DASHDASH, /* verbatim "--", maybe consider using \(em */
        MANDOCERR_FUNC, /* function name without markup: name() */
        MANDOCERR_SPACE_EOL, /* whitespace at end of input line */
        MANDOCERR_DASHDASH, /* verbatim "--", maybe consider using \(em */
        MANDOCERR_FUNC, /* function name without markup: name() */
        MANDOCERR_SPACE_EOL, /* whitespace at end of input line */


@@ -244,6 +245,8 @@ enum        mandocerr {
        MANDOCERR_TBLOPT_EQN, /* eqn delim option in tbl: arg */
        MANDOCERR_TBLLAYOUT_MOD, /* unsupported tbl layout modifier: m */
        MANDOCERR_TBLMACRO, /* ignoring macro in table: macro */
        MANDOCERR_TBLOPT_EQN, /* eqn delim option in tbl: arg */
        MANDOCERR_TBLLAYOUT_MOD, /* unsupported tbl layout modifier: m */
        MANDOCERR_TBLMACRO, /* ignoring macro in table: macro */

+       MANDOCERR_TBL_TMAN, /* skipping tbl in -Tman mode */
+       MANDOCERR_EQN_TMAN, /* skipping eqn in -Tman mode */

 
        MANDOCERR_BADARG, /* ===== start of bad invocations ===== */
 
 
        MANDOCERR_BADARG, /* ===== start of bad invocations ===== */
 


@@ -254,6 +257,7 @@ enum        mandocerr {
        MANDOCERR_BADVAL_BAD, /* bad argument value */
        MANDOCERR_BADVAL_DUPE, /* duplicate argument value */
        MANDOCERR_TAG, /* no such tag */
        MANDOCERR_BADVAL_BAD, /* bad argument value */
        MANDOCERR_BADVAL_DUPE, /* duplicate argument value */
        MANDOCERR_TAG, /* no such tag */

+       MANDOCERR_MAN_TMARKDOWN, /* -Tmarkdown unsupported for man(7) input */

 
        MANDOCERR_SYSERR, /* ===== start of system errors ===== */
 
 
        MANDOCERR_SYSERR, /* ===== start of system errors ===== */
 


@@ -288,7 +292,9 @@ enum        mandoc_esc {
        ESCAPE_FONTITALIC, /* italic font mode */
        ESCAPE_FONTBI, /* bold italic font mode */
        ESCAPE_FONTROMAN, /* roman font mode */
        ESCAPE_FONTITALIC, /* italic font mode */
        ESCAPE_FONTBI, /* bold italic font mode */
        ESCAPE_FONTROMAN, /* roman font mode */

-       ESCAPE_FONTCW, /* constant width font mode */
+       ESCAPE_FONTCR, /* constant width font mode */
+       ESCAPE_FONTCB, /* constant width bold font mode */
+       ESCAPE_FONTCI, /* constant width italic font mode */

        ESCAPE_FONTPREV, /* previous font mode */
        ESCAPE_NUMBERED, /* a numbered glyph */
        ESCAPE_UNICODE, /* a unicode codepoint */
        ESCAPE_FONTPREV, /* previous font mode */
        ESCAPE_NUMBERED, /* a numbered glyph */
        ESCAPE_UNICODE, /* a unicode codepoint */