Changeset 4b2eef6

Timestamp:

Mar 15, 2016, 3:21:54 PM (8 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Children:

0147aef

Parents:

fc1429d

git-author:

Karl Ramm <kcr@1ts.org> (03/13/16 12:52:17)

git-committer:

Karl Ramm <kcr@1ts.org> (03/15/16 15:21:54)

Message:

implement @roman style from zwgc

File:

• fmtext.c (modified) (2 diffs)

fmtext.c

@@ -557 +557 @@
   const struct {
     const char *tag;
-    const char mask;
+    enum {SET,  MASK} mode;
+    const char val;
   } TAGS[] = {
-    {"", 0},
-    {"@", 0},
-    {"@bold", OWL_FMTEXT_ATTR_BOLD},
-    {"@b", OWL_FMTEXT_ATTR_BOLD},
-    {"@italic", OWL_FMTEXT_ATTR_UNDERLINE},
-    {"@i", OWL_FMTEXT_ATTR_UNDERLINE},
+    {"", MASK, 0},
+    {"@", MASK, 0},
+    {"@bold", MASK, OWL_FMTEXT_ATTR_BOLD},
+    {"@b", MASK, OWL_FMTEXT_ATTR_BOLD},
+    {"@italic", MASK, OWL_FMTEXT_ATTR_UNDERLINE},
+    {"@i", MASK, OWL_FMTEXT_ATTR_UNDERLINE},
+    {"@roman", SET, OWL_FMTEXT_ATTR_NONE},
     {NULL, 0},
   };
@@ -575 +577 @@
   for (i = 0; TAGS[i].tag != NULL; i++) {
     if (!strcasecmp(tree->label, TAGS[i].tag)) {
-      attr |= TAGS[i].mask;
+      if (TAGS[i].mode == MASK) {
+        attr |= TAGS[i].val;
+      } else if (TAGS[i].mode == SET) {
+        attr = TAGS[i].val;
+      }
       handled = true;
       break;