From 08e7ac5d6dee8626969223b055fdf44ab1fc964c Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 28 Oct 2020 22:29:40 -0700 Subject: [PATCH] spv: Support underlining in table styles. --- doc/dev/spv-file-format.texi | 1 + src/output/spv/spv-table-look.c | 4 +++- src/output/spv/structure-xml.grammar | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/dev/spv-file-format.texi b/doc/dev/spv-file-format.texi index 614a3483ce..e001d9e590 100644 --- 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 178c8ae5bf..d297c13981 100644 --- 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 67e83a1be1..09288e8c7e 100644 --- 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? -- 2.30.2