Support some more fields.

diff --git a/ptb.c b/ptb.c
index 93ccb93d4752a59f4731f4c03a9c592f201e05c2..2f83fdebfe485a2a6e41112bdc6db5c5e62be8cf 100644 (file)
--- a/ptb.c
+++ b/ptb.c
@@ -565,7 +565,9 @@ static ssize_t ptb_data_file(struct ptbf *bf)
        ptb_data_font(bf, &bf->chord_name_font);
        ptb_data_font(bf, &bf->default_font);
 
-       ptb_data_unknown(bf, 12, "FIXME");
+       ptb_data_uint32(bf, &bf->staff_line_space);
+       ptb_data_uint32(bf, &bf->fade_in);
+       ptb_data_uint32(bf, &bf->fade_out);
        return 0;
 }
 

diff --git a/ptb.h b/ptb.h
index 2eee305a1df4c09d6c9b7e9a02490d6b5e257cbd..ebeecbbc9a05f88ceac39f620414a62598335cf2 100644 (file)
--- a/ptb.h
+++ b/ptb.h
@@ -494,6 +494,9 @@ struct ptbf {
        struct ptb_font default_font;
        struct ptb_font chord_name_font;
        struct ptb_font tablature_font;
+       uint32_t staff_line_space; /* amount of space between lines on tab staff */
+       uint32_t fade_in; /* amount of fade-in at start of song */
+       uint32_t fade_out; /* amount of fade-out at end of song */
 };
 
 extern struct ptbf *ptb_read_file(const char *ptb);

diff --git a/ptb2xml.c b/ptb2xml.c
index 26d9cdd8663c84f68073bed6f9e1ab2c3c9ffa0c..747b5aeb909fc5dd06081320c710d389f1e803cd 100644 (file)
--- a/ptb2xml.c
+++ b/ptb2xml.c
@@ -429,8 +429,6 @@ xmlNodePtr xml_write_floatingtexts(struct ptb_floatingtext *floatingtexts)
        while(floatingtext) {
                xmlNodePtr xfloatingtext = SMART_ADD_CHILD_STRING(xfloatingtexts, "floatingtext", floatingtext->text);
                
-               SMART_ADD_PROP_INT(xfloatingtext, "offset", floatingtext->offset);
-
                switch(floatingtext->alignment) {
                case ALIGN_LEFT:
                        SMART_ADD_CHILD_STRING(xfloatingtext, "alignment", "left");

diff --git a/ptbinfo.c b/ptbinfo.c
index cdf7c1531dfb5aa5546f447ba45ea41dd783bb74..c481ade0f061f78ad991137abad21ae5a46cf7dd 100644 (file)
--- a/ptbinfo.c
+++ b/ptbinfo.c
@@ -226,7 +226,6 @@ void write_font(struct ptb_font *font)
 void write_floatingtext(struct ptb_floatingtext *ft)
 {
        printf("\tText: %s\n", ft->text);
-       printf("\tOffset: %d\n", ft->offset);
        printf("\tAlignment: ");
        switch (ft->alignment & (ALIGN_LEFT|ALIGN_CENTER|ALIGN_RIGHT)) {
        case ALIGN_LEFT: printf("Left");break;