Support for some more chord types.

diff --git a/ChangeLog b/ChangeLog
index 52d95b5a74077d7377dab73dc93756c28ba00157..aa1f686b0d05abde71b903a0c4811d68c6a1219d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ All changes, unless specified otherwise, made by Jelmer Vernooij
 <jelmer@samba.org>.
 
 0.4.2:
+ * Support for some more types of data
  * Fix bugs when reading odd combinations of symbols (multiple 
         coda symbols, etc)
  * Add ptbdict utility

diff --git a/ptb.c b/ptb.c
index 042de293814714bd1408077388ddb4156c16400e..8ce3e9de45a03fadadb1e61d13f7e062d489f4b8 100644 (file)
--- a/ptb.c
+++ b/ptb.c
@@ -753,12 +753,12 @@ static int handle_CChordText (struct ptbf *bf, const char *section, struct ptb_l
        ptb_assert_0(bf, chordtext->properties 
                           & ~CHORDTEXT_PROPERTY_NOCHORD
                           & ~CHORDTEXT_PROPERTY_PARENTHESES
-                          & ~0xc0 /*FIXME*/
-                          & ~CHORDTEXT_PROPERTY_FORMULA_M
-                          & ~CHORDTEXT_PROPERTY_FORMULA_MAJ7);
+                          & ~0x0F /* Formula */
+                          & ~0xC0 /*FIXME*/);
        ptb_data(bf, &chordtext->additions, 1);
        ptb_assert_0(bf, chordtext->additions 
-                          & ~CHORDTEXT_ADD_9);
+                          & ~CHORDTEXT_ADD_9
+                          & ~CHORDTEXT_PLUS_5);
        ptb_data(bf, &chordtext->alterations, 1);
        ptb_data(bf, &chordtext->VII, 1);
        ptb_assert_0(bf, chordtext->VII & ~CHORDTEXT_VII);

diff --git a/ptb.h b/ptb.h
index 2c303089d5f0ad8889486850948c796c86d48aa1..eb49400a14a74c337857ec844dd1e0a900692ae4 100644 (file)
--- a/ptb.h
+++ b/ptb.h
@@ -188,9 +188,21 @@ struct ptb_chordtext {
 #define CHORDTEXT_PROPERTY_NOCHORD                     0x10
 #define CHORDTEXT_PROPERTY_PARENTHESES         0x20
 #define CHORDTEXT_PROPERTY_FORMULA_M           0x01
+#define CHORDTEXT_PROPERTY_FORMULA_PLUS                0x02
+#define CHORDTEXT_PROPERTY_FORMULA_MIN         0x02
+#define CHORDTEXT_PROPERTY_FORMULA_5           0x04
+#define CHORDTEXT_PROPERTY_FORMULA_6           0x05
+#define CHORDTEXT_PROPERTY_FORMULA_M6          0x06
+#define CHORDTEXT_PROPERTY_FORMULA_7           0x07
 #define CHORDTEXT_PROPERTY_FORMULA_MAJ7                0x08
+#define CHORDTEXT_PROPERTY_FORMULA_M7          0x09
+#define CHORDTEXT_PROPERTY_FORMULA_PLUS7       0x0A
+#define CHORDTEXT_PROPERTY_FORMULA_MIN7                0x0B
+#define CHORDTEXT_PROPERTY_FORMULA_MMAJ7       0x0C
+#define CHORDTEXT_PROPERTY_FORMULA_M7B5                0x0D
        uint8_t properties;
        uint8_t offset;
+#define CHORDTEXT_PLUS_5                                       0x02
 #define CHORDTEXT_ADD_9                                                0x40
        uint8_t additions;
        uint8_t alterations;