Support some additional fields

diff --git a/ptb.c b/ptb.c
index 4eacf73a42f634697b11b7617c279a12050265f8..042de293814714bd1408077388ddb4156c16400e 100644 (file)
--- a/ptb.c
+++ b/ptb.c
@@ -718,6 +718,7 @@ static int handle_CLineData (struct ptbf *bf, const char *section, struct ptb_li
                           & ~LINEDATA_PROPERTY_GHOST_NOTE
                           & ~LINEDATA_PROPERTY_PULLOFF_FROM
                           & ~LINEDATA_PROPERTY_HAMMERON_FROM
+                          & ~LINEDATA_PROPERTY_DEST_NOWHERE
                           & ~LINEDATA_PROPERTY_TIE
                           & ~LINEDATA_PROPERTY_NATURAL_HARMONIC
                           & ~LINEDATA_PROPERTY_MUTED);
@@ -829,7 +830,9 @@ static int handle_CPosition (struct ptbf *bf, const char *section, struct ptb_li
        ptb_assert_0(bf, position->properties 
                           & ~POSITION_PROPERTY_IN_SINGLE_BEAM
                           & ~POSITION_PROPERTY_IN_DOUBLE_BEAM
+                          & ~POSITION_PROPERTY_IN_TRIPLE_BEAM
                           & ~POSITION_PROPERTY_FIRST_IN_BEAM
+                          & ~POSITION_PROPERTY_MIDDLE_IN_BEAM
                           & ~POSITION_PROPERTY_LAST_IN_BEAM);
        ptb_data(bf, &position->dots, 1);
        ptb_assert_0(bf, position->dots &~ POSITION_DOTS_1 

diff --git a/ptb.h b/ptb.h
index 1ed1a81f0b80c75ac925daaadcb5948a77e48721..2c303089d5f0ad8889486850948c796c86d48aa1 100644 (file)
--- a/ptb.h
+++ b/ptb.h
@@ -214,8 +214,10 @@ struct ptb_position {
        uint8_t dots;
 #define POSITION_PROPERTY_IN_SINGLE_BEAM               0x0080
 #define POSITION_PROPERTY_IN_DOUBLE_BEAM               0x0100
+#define POSITION_PROPERTY_IN_TRIPLE_BEAM               0x0200
 #define POSITION_PROPERTY_FIRST_IN_BEAM                0x0400
-#define POSITION_PROPERTY_LAST_IN_BEAM                 0x2000
+#define POSITION_PROPERTY_LAST_IN_BEAM                 0x1000
+#define POSITION_PROPERTY_MIDDLE_IN_BEAM               0x2000
        uint16_t properties;
        uint8_t let_ring;
        uint8_t fermenta;
@@ -276,6 +278,7 @@ struct ptb_linedata {
 #define LINEDATA_PROPERTY_MUTED                                        0x02
 #define LINEDATA_PROPERTY_HAMMERON_FROM                        0x08
 #define LINEDATA_PROPERTY_PULLOFF_FROM                 0x10
+#define LINEDATA_PROPERTY_DEST_NOWHERE                 0x20
 #define LINEDATA_PROPERTY_NATURAL_HARMONIC             0x40
 #define LINEDATA_PROPERTY_GHOST_NOTE                   0x80
        uint8_t properties;

diff --git a/tests/Makefile b/tests/Makefile
index 6a95887c237dbdbec6ec6466d0318b8a3ca748f3..18012277349127b544cedb4f1f9e3579afa95a86 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,7 +1,7 @@
 PTB_TESTFILES = $(wildcard *.ptb)
 
 %.info: %.ptb ../ptbinfo
-       ../ptbinfo "$<" > "$@"
+       ../ptbinfo "$<" > "$@" 2>"$*.errors"
 
 %.ly: %.ptb ../ptb2ly
        ../ptb2ly "$<"