projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use rsvg-convert instead of GIMP for converting SVG to PNG.
[pspp]
/
src
/
output
/
spv
/
spv.c
diff --git
a/src/output/spv/spv.c
b/src/output/spv/spv.c
index 2085d183e64124244dd3993fe9892661c52b586f..4547e967945a3c776cdcd97b9b9f6398de43694e 100644
(file)
--- a/
src/output/spv/spv.c
+++ b/
src/output/spv/spv.c
@@
-282,17
+282,18
@@
decode_container_text (const struct spvsx_container_text *ct)
{
struct font_style *font_style = xmalloc (sizeof *font_style);
char *text = decode_embedded_html (ct->html->node_.raw, font_style);
{
struct font_style *font_style = xmalloc (sizeof *font_style);
char *text = decode_embedded_html (ct->html->node_.raw, font_style);
+
struct pivot_value *value = xmalloc (sizeof *value);
*value = (struct pivot_value) {
struct pivot_value *value = xmalloc (sizeof *value);
*value = (struct pivot_value) {
- .font_style = font_style,
- .type = PIVOT_VALUE_TEXT,
.text = {
.text = {
+ .type = PIVOT_VALUE_TEXT,
.local = text,
.c = text,
.id = text,
.user_provided = true,
},
};
.local = text,
.c = text,
.id = text,
.user_provided = true,
},
};
+ pivot_value_ex_rw (value)->font_style = font_style;
struct output_item *item = text_item_create_value (TEXT_ITEM_LOG,
value, NULL);
struct output_item *item = text_item_create_value (TEXT_ITEM_LOG,
value, NULL);
@@
-673,6
+674,10
@@
spv_decode_children (struct zip_reader *zip, const char *structure_member,
{
const struct spvsx_container *container
= spvsx_cast_container (node);
{
const struct spvsx_container *container
= spvsx_cast_container (node);
+
+ if (container->page_break_before_present)
+ group_item_add_child (parent, page_break_item_create ());
+
child = spv_decode_container (zip, container);
}
else if (spvsx_is_heading (node))
child = spv_decode_container (zip, container);
}
else if (spvsx_is_heading (node))
@@
-834,7
+839,6
@@
spv_read (const char *filename, struct output_item **outp,
if (psp)
*psp = NULL;
if (psp)
*psp = NULL;
- struct spv_reader *spv = xzalloc (sizeof *spv);
struct zip_reader *zip;
char *error = zip_reader_create (filename, &zip);
if (error)
struct zip_reader *zip;
char *error = zip_reader_create (filename, &zip);
if (error)