[abcp] r104 committed - [No log message]

[codesite...@google.com]

Revision: 104
Author: rdentato
Date: Sun Oct 25 07:02:28 2009
Log: [No log message]
http://code.google.com/p/abcp/source/detail?r=104

Modified:
/trunk/src/abcpnote.pmx
/trunk/src/abcpscan.pmx

=======================================
--- /trunk/src/abcpnote.pmx Sun Mar 15 08:15:38 2009
+++ /trunk/src/abcpnote.pmx Sun Oct 25 07:02:28 2009
@@ -216,7 +216,7 @@
unsigned short abcNoteMidi(abcScanner *scn)
{
if (abcToken(scn) != T_NOTE) return 0;
- return abcNote2Midi(*abcTokenStart(scn,5),
+ return abcNote2Midi(*abcTokenStart(scn,2),
abcNoteOctave(scn)+1,
(int)(abcNoteCents(scn)/100.0));
}
=======================================
--- /trunk/src/abcpscan.pmx Sat Apr 4 00:34:52 2009
+++ /trunk/src/abcpscan.pmx Sun Oct 25 07:02:28 2009
@@ -118,6 +118,7 @@
static void getnewline(abcScanner *scn)
{
int c;
+ int escaped=0;

scn->line = chsCpy(scn->line,"\b");
scn->ln_logical = scn->lnumber+1;
@@ -157,6 +158,7 @@

STATE(STR) : switch((c=nextchar(scn))) {
case EOF : GOTO(EOL);
+ case '\n': GOTO(EOL);
case '"' : GOTO(LINE);
default : GOTO(STR);
} ;
@@ -171,7 +173,7 @@

scn->cur = scn->line;

- _dbgmsg("line: <<%s>>\n",scn->line);
+ dbgmsg("line: <<%s>>\n",scn->line);
}

/* **************** */