spv: Support underlining in table styles.

diff --git a/doc/dev/spv-file-format.texi b/doc/dev/spv-file-format.texi
index 614a3483ce5913e76badb942e518eff6c975aa66..e001d9e5906e84b3580b642ebe8e7f48d1c97be8 100644 (file)
--- a/doc/dev/spv-file-format.texi
+++ b/doc/dev/spv-file-format.texi
@@ -3660,6 +3660,7 @@ style
    :font-size?
    :font-style=(regular | italic)?
    :font-weight=(regular | bold)?
+   :font-underline=(none | underline)?
    :labelLocationVertical=(positive | negative | center)?
    :margin-bottom=dimension?
    :margin-left=dimension?

diff --git a/src/output/spv/spv-table-look.c b/src/output/spv/spv-table-look.c
index 178c8ae5bfcb8505ca7641a4d609671110489868..d297c13981cbaa22bdb2ba4adf1d374a9ed00bb9 100644 (file)
--- a/src/output/spv/spv-table-look.c
+++ b/src/output/spv/spv-table-look.c
@@ -158,7 +158,9 @@ spv_table_look_decode (const struct spvsx_table_properties *in,
         a->font_style.bold = s->font_weight == SPVSX_FONT_WEIGHT_BOLD;
       if (s->font_style)
         a->font_style.italic = s->font_style == SPVSX_FONT_STYLE_ITALIC;
-      a->font_style.underline = false;
+      if (s->font_underline)
+        a->font_style.underline
+          = s->font_underline == SPVSX_FONT_UNDERLINE_UNDERLINE;
       if (s->color >= 0)
         a->font_style.fg[0] = optional_color (
           s->color, (struct cell_color) CELL_COLOR_BLACK);

diff --git a/src/output/spv/structure-xml.grammar b/src/output/spv/structure-xml.grammar
index 67e83a1be1230ef272cd35de06a58cfc0e9b3453..09288e8c7ee3aaa1abcf6c6c330f50a719e1b68d 100644 (file)
--- a/src/output/spv/structure-xml.grammar
+++ b/src/output/spv/structure-xml.grammar
@@ -96,6 +96,7 @@ style
    :font-size?
    :font-style=(regular | italic)?
    :font-weight=(regular | bold)?
+   :font-underline=(none | underline)?
    :labelLocationVertical=(positive | negative | center)?
    :margin-bottom=dimension?
    :margin-left=dimension?