[abcp commit] r87 - in trunk: . src test

[codesite...@google.com]

Author: rdentato
Date: Sun Mar 8 14:52:24 2009
New Revision: 87

Modified:
trunk/abcp.ppr
trunk/src/abcp.h
trunk/src/abcpfield.pmx
trunk/test/a11.txt

Log:

Modified: trunk/abcp.ppr
==============================================================================
--- trunk/abcp.ppr (original)
+++ trunk/abcp.ppr Sun Mar 8 14:52:24 2009
@@ -90,12 +90,13 @@
14=test\a3.txt
15=test\a2.txt
16=src\abcpfield.pmx
+17=test\a11.txt
[Selected Project Files]
Main=
-Selected=src\abcpfield.pmx
+Selected=test\a11.txt
[examples\abcdump\abcdump.c]
-TopLine=184
-Caret=20,194
+TopLine=267
+Caret=48,290
[src\abcpscan.pmx]
TopLine=249
Caret=41,257
@@ -103,13 +104,13 @@
TopLine=61
Caret=35,87
[src\abcp.h]
-TopLine=168
-Caret=44,190
+TopLine=328
+Caret=1,373
[examples\explicit\explicit.c]
TopLine=133
Caret=10,158
[src\abcpcommon.c]
-TopLine=9
+TopLine=4
Caret=1,38
[test\a10.txt]
TopLine=1
@@ -118,8 +119,8 @@
TopLine=1
Caret=47,12
[src\abcpkey.pmx]
-TopLine=16
-Caret=18,33
+TopLine=230
+Caret=1,244
[examples\crdnotes\makefile]
TopLine=1
Caret=1,23
@@ -142,5 +143,8 @@
TopLine=1
Caret=1,1
[src\abcpfield.pmx]
-TopLine=38
-Caret=2,61
+TopLine=121
+Caret=17,154
+[test\a11.txt]
+TopLine=1
+Caret=7,9

Modified: trunk/src/abcp.h
==============================================================================
--- trunk/src/abcp.h (original)
+++ trunk/src/abcp.h Sun Mar 8 14:52:24 2009
@@ -370,6 +370,5 @@
int abcMeterBeatsNth(abcScanner *scn,int k);
int abcMeterUnits(abcScanner *scn);

-#define abcMeterBeats(s) abcMeterBeatsNth(s,0)

#endif

Modified: trunk/src/abcpfield.pmx
==============================================================================
--- trunk/src/abcpfield.pmx (original)
+++ trunk/src/abcpfield.pmx Sun Mar 8 14:52:24 2009
@@ -144,6 +144,16 @@
return units;
}

+int abcMeterBeats(abcScanner *scn)
+{
+ if (abcToken(scn) != T_FIELD || abcField(scn) != 'M') return 0;
+
+ if (!abcTestFlag(scn,ABC_F_FIELDSCANNED))
+ abc_meter(scn);
+
+ return beatsum;
+}
+
int abcMeterBeatsNth(abcScanner *scn, int k)
{
if (abcToken(scn) != T_FIELD || abcField(scn) != 'M') return 0;

Modified: trunk/test/a11.txt
==============================================================================
--- trunk/test/a11.txt (original)
+++ trunk/test/a11.txt Sun Mar 8 14:52:24 2009
@@ -4,4 +4,6 @@
M: (3+2)/4
M: 1+2+1/8
M: 3
-M: 12+3+1 / 7
\ No newline at end of file
+M: 12+3+1 / 7
+M: 0/4
+M: 2/0
\ No newline at end of file