want to get rid of the last style= attributes, suggested by bentley@

[mandoc.git] / roff_int.h

diff --git a/roff_int.h b/roff_int.h
index 8cde310e71983c19aba7953fb7e8d7c6e8851040..d033f86aceec42e7b2f53f563d714422d0125884 100644 (file)
--- a/roff_int.h
+++ b/roff_int.h
@@ -1,7 +1,7 @@
-/*     $Id: roff_int.h,v 1.12 2018/12/30 00:49:56 schwarze Exp $       */
+/*     $Id: roff_int.h,v 1.16 2019/01/05 00:36:50 schwarze Exp $       */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -39,7 +39,7 @@ struct        roff_man {
        struct roff_node *last_es; /* The most recent Es node. */
        int               quick;   /* Abort parse early. */
        int               flags;   /* Parse flags. */
        struct roff_node *last_es; /* The most recent Es node. */
        int               quick;   /* Abort parse early. */
        int               flags;   /* Parse flags. */

-#define        MDOC_LITERAL     (1 << 1)  /* In a literal scope. */
+#define        ROFF_NOFILL      (1 << 1)  /* Fill mode switched off. */

 #define        MDOC_PBODY       (1 << 2)  /* In the document body. */
 #define        MDOC_NEWLINE     (1 << 3)  /* First macro/text in a line. */
 #define        MDOC_PHRASE      (1 << 4)  /* In a Bl -column phrase. */
 #define        MDOC_PBODY       (1 << 2)  /* In the document body. */
 #define        MDOC_NEWLINE     (1 << 3)  /* First macro/text in a line. */
 #define        MDOC_PHRASE      (1 << 4)  /* In a Bl -column phrase. */


@@ -54,7 +54,7 @@ struct        roff_man {
 #define        MDOC_PHRASEQF    (1 << 13) /* Quote first word encountered. */
 #define        MDOC_PHRASEQL    (1 << 14) /* Quote last word of this phrase. */
 #define        MDOC_PHRASEQN    (1 << 15) /* Quote first word of the next phrase. */
 #define        MDOC_PHRASEQF    (1 << 13) /* Quote first word encountered. */
 #define        MDOC_PHRASEQL    (1 << 14) /* Quote last word of this phrase. */
 #define        MDOC_PHRASEQN    (1 << 15) /* Quote first word of the next phrase. */

-#define        MAN_LITERAL       MDOC_LITERAL
+#define        ROFF_NONOFILL    (1 << 16) /* Temporarily suspend no-fill mode. */

 #define        MAN_NEWLINE       MDOC_NEWLINE
        enum roff_sec     lastsec; /* Last section seen. */
        enum roff_sec     lastnamed; /* Last standard section seen. */
 #define        MAN_NEWLINE       MDOC_NEWLINE
        enum roff_sec     lastsec; /* Last section seen. */
        enum roff_sec     lastnamed; /* Last standard section seen. */


@@ -80,6 +80,7 @@ struct ohash   *roffhash_alloc(enum roff_tok, enum roff_tok);
 enum roff_tok    roffhash_find(struct ohash *, const char *, size_t);
 void             roffhash_free(struct ohash *);
 
 enum roff_tok    roffhash_find(struct ohash *, const char *, size_t);
 void             roffhash_free(struct ohash *);
 

+void             roff_state_reset(struct roff_man *);

 void             roff_validate(struct roff_man *);
 
 /*
 void             roff_validate(struct roff_man *);
 
 /*