projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix parsing
[pspp]
/
src
/
output
/
spv
/
spv-css-parser.c
diff --git
a/src/output/spv/spv-css-parser.c
b/src/output/spv/spv-css-parser.c
index c3a7118ccc9c84a393254f94696092a957970145..4eaef8d612ae2e7f185bd7e2341401e76ecff908 100644
(file)
--- a/
src/output/spv/spv-css-parser.c
+++ b/
src/output/spv/spv-css-parser.c
@@
-22,6
+22,7
@@
#include <string.h>
#include "libpspp/str.h"
#include <string.h>
#include "libpspp/str.h"
+#include "output/options.h"
#include "output/pivot-table.h"
#include "spv.h"
#include "output/pivot-table.h"
#include "spv.h"
@@
-114,7
+115,13
@@
static void
css_decode_key_value (const char *key, const char *value,
struct font_style *font)
{
css_decode_key_value (const char *key, const char *value,
struct font_style *font)
{
- if (!strcmp (key, "font-weight"))
+ if (!strcmp (key, "color"))
+ {
+ struct cell_color color;
+ if (parse_color__ (value, &color))
+ font->fg[0] = font->bg[0] = color;
+ }
+ else if (!strcmp (key, "font-weight"))
font->bold = !strcmp (value, "bold");
else if (!strcmp (key, "font-style"))
font->italic = !strcmp (value, "italic");
font->bold = !strcmp (value, "bold");
else if (!strcmp (key, "font-style"))
font->italic = !strcmp (value, "italic");
@@
-126,9
+133,9
@@
css_decode_key_value (const char *key, const char *value,
font->typeface = xstrdup (value);
}
else if (!strcmp (key, "font-size"))
font->typeface = xstrdup (value);
}
else if (!strcmp (key, "font-size"))
- font->size = atoi (value);
+ font->size = atoi (value)
* 3 / 4
;
- /*
fg_color,
bg_color */
+ /* bg_color */
}
}