cmXScore.h/c : Completed note, metronome, section label, color, and pedal parsing. Added per measure time sorted note list.

app/cmXScore.c

@@ -17,22 +17,35 @@ cmXsH_t cmXsNullHandle = cmSTATIC_NULL_HANDLE;
 
 enum
 {
-  kRestXsFl    = 0x0001,
-  kGraceXsFl   = 0x0002,
-  kDotXsFl     = 0x0004
+  kSectionXsFl   = 0x0001,  // rvalue holds section number
+  kBarXsFl       = 0x0002,
+  kRestXsFl      = 0x0004,
+  kGraceXsFl     = 0x0008,
+  kDotXsFl       = 0x0010,
+  kChordXsFl     = 0x0020,
+  kDynXsFl       = 0x0040,
+  kEvenXsFl      = 0x0080,
+  kTempoXsFl     = 0x0100,
+  kPedalDnXsFl   = 0x0200,
+  kPedalUpXsFl   = 0x0400,
+  kPedalUpDnXsFl = 0x0800,
+  kMetronomeXsFl = 0x1000  // duration holds BPM 
 };
 
 
+
 typedef struct cmXsNote_str
 {
-  unsigned flags;
-  unsigned pitch;     // midi pitch
-  unsigned duration;  // duration in ticks
-  unsigned rvalue;    // 1/type = rythmic value (1/4=quarter note, 1/8=eighth note, ...)
-  struct cmXsNote_str* link;
-  
+  unsigned             flags;    // See k???XsFl 
+  unsigned             pitch;    // midi pitch
+  unsigned             tick;     // 
+  unsigned             duration; // duration in ticks
+  unsigned             rvalue;   // 1/type = rythmic value (1/4=quarter note, 1/8=eighth note, ...)
+  struct cmXsNote_str* mlink;    // measure note list 
+  struct cmXsNote_str* slink;    // time sorted event list
 } cmXsNote_t;
 
+
 typedef struct cmXsVoice_str
 {
   unsigned              id;    // Voice id
@@ -49,6 +62,7 @@ typedef struct cmXsMeas_str
   unsigned             beat_type;
   
   cmXsVoice_t*         voiceL;  // List of voices in this measure   
+  cmXsNote_t*          noteL;   // List of time sorted notes in this measure
   
   struct cmXsMeas_str* link;    // Link to other measures in this part.
 } cmXsMeas_t;
@@ -92,12 +106,9 @@ cmXsRC_t _cmXScoreFinalize( cmXScore_t* p )
   return rc;
 }
 
-cmXsRC_t _cmXScoreMissingNode( cmXScore_t* p, const cmChar_t* label, const cmXmlAttr_t* attr )
+cmXsRC_t _cmXScoreMissingNode( cmXScore_t* p, const cmXmlNode_t* parent, const cmChar_t* label )
 {
-  if( attr == NULL )
-    return cmErrMsg(&p->err,kSyntaxErrorXsRC,"Missing XML node '%s'.",label);
-
-  return cmErrMsg(&p->err,kSyntaxErrorXsRC,"Missing XML node '%s' - Attribute:%s=%s",label,attr->label,attr->value);
+  return cmErrMsg(&p->err,kSyntaxErrorXsRC,"Missing XML node '%s'. Parent line:%i",label,parent->line);
 }
 
 cmXsRC_t _cmXScoreMissingAttribute( cmXScore_t* p, const cmXmlNode_t* np, const cmChar_t* attrLabel )
@@ -105,6 +116,55 @@ cmXsRC_t _cmXScoreMissingAttribute( cmXScore_t* p, const cmXmlNode_t* np, const
   return cmErrMsg(&p->err,kSyntaxErrorXsRC,"Missing XML attribute '%s' from node '%s'.",attrLabel,np->label);
 }
 
+cmXsVoice_t* _cmXScoreIdToVoice( cmXsMeas_t* meas, unsigned voiceId )
+{
+  cmXsVoice_t* v = meas->voiceL;
+  for(; v!=NULL; v=v->link)
+    if( v->id == voiceId )
+      return v;
+
+  return NULL;
+}
+
+cmXsRC_t _cmXScorePushNote( cmXScore_t* p, cmXsMeas_t* meas, unsigned voiceId, cmXsNote_t* note )
+{
+  cmXsVoice_t* v;
+
+  // get the voice recd
+  if((v = _cmXScoreIdToVoice(meas,voiceId)) == NULL)
+  {
+    // the voice recd doesn't exist for this voiceId - allocate one
+    v = cmLhAllocZ(p->lhH,cmXsVoice_t,1);
+    v->id = voiceId;
+
+    // add the voice record to the meas->voiceL
+    if( meas->voiceL == NULL )
+      meas->voiceL = v;
+    else
+    {
+      cmXsVoice_t* vp =  meas->voiceL;
+      while( vp->link!=NULL )
+        vp = vp->link;
+
+      vp->link = v;      
+    }
+  }
+
+  // add the note record to the end of meas->voiceL
+  if( v->noteL == NULL )
+    v->noteL = note;
+  else
+  {
+    cmXsNote_t* n = v->noteL;
+    while( n->mlink != NULL )
+      n = n->mlink;
+
+    n->mlink = note;
+  }
+
+  return kOkXsRC;
+}
+
 cmXsRC_t _cmXScoreParsePartList( cmXScore_t* p )
 {
   cmXsRC_t           rc          = kOkXsRC;
@@ -113,7 +173,7 @@ cmXsRC_t _cmXScoreParsePartList( cmXScore_t* p )
 
   // find the 'part-list'
   if((xnp = cmXmlSearch( cmXmlRoot(p->xmlH), "part-list", NULL, 0)) == NULL )
-    return _cmXScoreMissingNode(p,"part-list",NULL);
+    return _cmXScoreMissingNode(p,cmXmlRoot(p->xmlH),"part-list");
   
   const cmXmlNode_t* cnp = xnp->children;
 
@@ -152,10 +212,10 @@ cmXsRC_t  _cmXScoreParsePitch( cmXScore_t* p, const cmXmlNode_t* nnp, unsigned*
   const cmChar_t* step   = NULL;
 
   if((step = cmXmlNodeValue(nnp,"pitch","step",NULL)) == NULL )
-    return _cmXScoreMissingNode(p,"step",NULL);
+    return _cmXScoreMissingNode(p,nnp,"step");
   
   if((rc = cmXmlNodeUInt( nnp,&octave,"pitch","octave",NULL)) != kOkXmlRC )
-    return _cmXScoreMissingNode(p,"octave",NULL);
+    return _cmXScoreMissingNode(p,nnp,"octave");
   
   cmXmlNodeDouble( nnp,&alter,"pitch","alter",NULL);
 
@@ -171,7 +231,7 @@ cmXsRC_t  _cmXScoreParsePitch( cmXScore_t* p, const cmXmlNode_t* nnp, unsigned*
   return rc;  
 }
 
-unsigned _cmXScoreParseNoteType( const cmXmlNode_t* nnp )
+unsigned _cmXScoreParseNoteRValue( cmXScore_t* p, const cmXmlNode_t* nnp, const cmChar_t* label )
 {
   typedef struct map_str
   {
@@ -181,118 +241,206 @@ unsigned _cmXScoreParseNoteType( const cmXmlNode_t* nnp )
 
   map_t mapV[] =
   {
-    { 1, "whole" },
-    { 2, "half"  },
-    { 4, "quarter" },
-    { 8, "eighth" },
-    { 16,"16th"},
-    { 32,"32nd"},
-    { 64,"64th"},
-    {128,"128th"},
-    {0,""}
+    {   1, "whole"   },
+    {   2, "half"    },
+    {   4, "quarter" },
+    {   8, "eighth"  },
+    {  16, "16th"    },
+    {  32, "32nd"    },
+    {  64, "64th"    },
+    { 128, "128th"   },
+    {   0, ""        }
   };
 
-  if( cmXmlNodeHasChild(nnp,"type") )
-  {
-    const cmChar_t* str;
-    if((str = cmXmlNodeValue(nnp,"type",NULL)) == NULL)
-    {
-      unsigned i;
-      for(i=0; mapV[i].rvalue!=0; ++i)
-        if( cmTextCmp(mapV[i].label,str) == 0 )
-          return mapV[i].rvalue;
-    }
-
-  }
-
+  const cmChar_t* str;
+  if((str = cmXmlNodeValue(nnp,label,NULL)) == NULL)
+    return 0;
+  
+  unsigned i;
+  for(i=0; mapV[i].rvalue!=0; ++i)
+    if( cmTextCmp(mapV[i].label,str) == 0 )
+      return mapV[i].rvalue;
+  
   return 0;
 }
 
-cmXsVoice_t* _cmXScoreIdToVoice( cmXsMeas_t* meas, unsigned voiceId )
+cmXsRC_t  _cmXScoreParseColor( cmXScore_t* p, const cmXmlNode_t* nnp, cmXsNote_t* note )
 {
-  cmXsVoice_t* v = meas->voiceL;
-  for(; v!=NULL; v=v->link)
-    if( v->id == voiceId )
-      return v;
-
-  return NULL;
-}
+  cmXsRC_t rc = kOkXsRC;
+  const cmXmlAttr_t* a;
 
-cmXsRC_t _cmXScorePushNote( cmXScore_t* p, cmXsMeas_t* meas, unsigned voiceId, cmXsNote_t* note )
-{
-  cmXsVoice_t* v;
-  if((v = _cmXScoreIdToVoice(meas,voiceId)) == NULL)
+   typedef struct map_str
   {
-    v = cmLhAllocZ(p->lhH,cmXsVoice_t,1);
-    v->id = voiceId;
-    
-    if( meas->voiceL == NULL )
-      meas->voiceL = v;
-    else
-    {
-      cmXsVoice_t* vp =  meas->voiceL;
-      while( vp->link!=NULL )
-        vp = vp->link;
-
-      vp->link = v;      
-    }
-  }
+    unsigned        value;
+    const cmChar_t* label;
+  } map_t;
 
-  if( v->noteL == NULL )
-    v->noteL = note;
-  else
+  map_t mapV[] =
   {
-    cmXsNote_t* n = v->noteL;
-    while( n != NULL )
-      n = n->link;
+    { kEvenXsFl,                         "#0000FF" },
+    { kTempoXsFl,                        "#00FF00" },
+    { kDynXsFl,                          "#FF0000" },
+    { kTempoXsFl | kEvenXsFl,            "#00FFFF" },
+    { kDynXsFl   | kEvenXsFl,            "#FF00FF" },    
+    { kDynXsFl   | kTempoXsFl,           "#FF7F00" },
+    { kTempoXsFl | kEvenXsFl | kDynXsFl, "#996633" },
+    { 0, "" }
+  };
+  
+  if((a = cmXmlFindAttrib(nnp, "color" )) != NULL )
+  {
+    unsigned i;
+    for(i=0; mapV[i].value != 0; ++i)
+      if( cmTextCmp(a->value,mapV[i].label) == 0 )
+      {
+        note->flags += mapV[i].value;
+        break;
+      }
 
-    n->link = note;
+    if( mapV[i].value == 0 )
+      rc = cmErrMsg(&p->err,kSyntaxErrorXsRC,"The note color '%s' was not found.",a->value);
   }
 
-  return kOkXsRC;
+  return rc;
 }
 
-cmXsRC_t _cmXScoreParseNote(cmXScore_t* p, cmXsMeas_t* meas, const cmXmlNode_t* nnp)
+cmXsRC_t _cmXScoreParseNote(cmXScore_t* p, cmXsMeas_t* meas, const cmXmlNode_t* nnp, unsigned* tickRef )
 {
   cmXsRC_t    rc   = kOkXsRC;
-  
   cmXsNote_t* note = cmLhAllocZ(p->lhH,cmXsNote_t,1);
-  unsigned voiceId;
+  unsigned    voiceId;
 
   // get the voice id for this node
   if( cmXmlNodeUInt(nnp,&voiceId,"voice",NULL) != kOkXmlRC )
-    return _cmXScoreMissingNode(p,"voice",NULL);
+    return _cmXScoreMissingNode(p,nnp,"voice");
 
-  
   // if this note has a pitch
-  if( cmXmlNodeHasChild(nnp,"pitch") )
+  if( cmXmlNodeHasChild(nnp,"pitch",NULL) )
     if((rc = _cmXScoreParsePitch(p,nnp,&note->pitch)) != kOkXsRC )
       return rc;
 
+  // get the note duration
+  cmXmlNodeUInt(nnp,&note->duration,"duration",NULL);
+  
   // is 'rest'
-  if( cmXmlNodeHasChild(nnp,"rest") )
+  if( cmXmlNodeHasChild(nnp,"rest",NULL) )
     note->flags |= kRestXsFl;
 
   // is 'grace'
-  if( cmXmlNodeHasChild(nnp,"grace") )
+  if( cmXmlNodeHasChild(nnp,"grace",NULL) )
     note->flags |= kGraceXsFl;
 
   // is 'dot'
-  if( cmXmlNodeHasChild(nnp,"dot") )
+  if( cmXmlNodeHasChild(nnp,"dot",NULL) )
     note->flags |= kDotXsFl;
 
-  if((note->rvalue =  _cmXScoreParseNoteType(nnp)) == 0 )
-    return _cmXScoreMissingNode(nnp,"type",NULL);
+  // is 'chord'
+  if( cmXmlNodeHasChild(nnp,"chord",NULL) )
+    note->flags |= kChordXsFl;
+
+  // set color coded flags
+  if((rc = _cmXScoreParseColor(p, nnp, note )) != kOkXsRC )
+    return rc;
+  
+  // get the note's rythmic value
+  if((note->rvalue =  _cmXScoreParseNoteRValue(p,nnp,"type")) == 0 )
+    return _cmXScoreMissingNode(p,nnp,"type");
+
+  note->tick = *tickRef;
+
+  if( cmIsNotFlag(note->flags,kChordXsFl) )
+    *tickRef += note->duration;
+  
+  return _cmXScorePushNote(p, meas, voiceId, note );
+}
+
+cmXsRC_t _cmXScorePushNonNote( cmXScore_t* p, cmXsMeas_t* meas, unsigned tick, unsigned duration, unsigned rvalue, unsigned flags )
+{
+  cmXsNote_t* note    = cmLhAllocZ(p->lhH,cmXsNote_t,1);
+  unsigned    voiceId = 0;    // non-note's are always assigned to voiceId=0;
+  
+  note->tick     = tick;
+  note->flags    = flags;
+  note->rvalue   = rvalue;
+  note->duration = duration;
+  
+  return _cmXScorePushNote(p, meas, voiceId, note );
+}
+
+cmXsRC_t  _cmXScoreParseDirection(cmXScore_t* p, cmXsMeas_t* meas, const cmXmlNode_t* dnp, unsigned tick)
+{
+  const cmXmlNode_t* np = NULL;
+  const cmXmlAttr_t* a = NULL;
+  unsigned           flags    = 0;
+  int                offset   = 0;
+  unsigned           rvalue   = 0;
+  unsigned           duration = 0;
+
+  
+  cmXmlNodeInt(dnp, &offset, "offset", NULL );
+   
+ 
+  // if this is a metronome direction
+  if((np = cmXmlSearch( dnp, "metronome", NULL, 0)) != NULL )
+  {
+    
+    if( cmXmlNodeUInt(np,&duration,"per-minute",NULL) != kOkXmlRC )
+      return cmErrMsg(&p->err,kSyntaxErrorXsRC,"The 'per-minute' metronome value is missing on line %i.",np->line);
+
+    if((rvalue = _cmXScoreParseNoteRValue(p,np,"beat-unit")) == 0 )
+      return cmErrMsg(&p->err,kSyntaxErrorXsRC,"The 'beat-unit' metronome value is missing on line %i.",np->line);
+
+    flags = kMetronomeXsFl;
+  }
+  else
+
+  // if this is a pedal direction
+  if((np = cmXmlSearch( dnp, "pedal",NULL,0)) != NULL )
+  {
     
+    if((a = cmXmlFindAttrib(np,"type")) == NULL )
+      return _cmXScoreMissingAttribute(p, np, "type" );
+
+    if( cmTextCmp(a->value,"start") == 0 )
+      flags = kPedalDnXsFl;
+    else
+      if( cmTextCmp(a->value,"change") == 0 )
+        flags = kPedalUpDnXsFl;
+      else
+        if( cmTextCmp(a->value,"stop") == 0 )
+          flags = kPedalUpXsFl;
+        else
+          return cmErrMsg(&p->err,kSyntaxErrorXsRC,"Unrecognized pedal type:'%s'.",cmStringNullGuard(a->value));
+  }
+  else
+  
+  // if this is a 'words' direction
+  if((np = cmXmlSearch( dnp, "words", NULL, 0)) != NULL )
+  {
+    if((a = cmXmlFindAttrib(np,"enclosure")) != NULL && cmTextCmp(a->value,"rectangle")==0 )
+    {
+      if( cmXmlNodeUInt(np,&rvalue,NULL) != kOkXsRC )
+        return cmErrMsg(&p->err,kSyntaxErrorXsRC,"Error reading section number on line %i.",np->line);
+
+      printf("rvalue=%i\n",rvalue);
+      
+      flags = kSectionXsFl;
+    }
+  }
+
+  return _cmXScorePushNonNote(p,meas,tick+offset,duration,rvalue,flags);            
+      
 }
 
+
 cmXsRC_t _cmXScoreParseMeasure(cmXScore_t* p, cmXsPart_t* pp, const cmXmlNode_t* mnp)
 {
-  cmXsRC_t rc = kOkXsRC;
+  cmXsRC_t           rc   = kOkXsRC;
+  const cmXmlNode_t* np   = NULL;  
+  unsigned           tick = 0;
 
   // allocate the 'measure' record
   cmXsMeas_t* meas = cmLhAllocZ(p->lhH,cmXsMeas_t,1);
-  const cmXmlNode_t* np;
 
   // get measure number
   if( cmXmlAttrUInt(mnp,"number", &meas->number) != kOkXmlRC )
@@ -305,30 +453,50 @@ cmXsRC_t _cmXScoreParseMeasure(cmXScore_t* p, cmXsPart_t* pp, const cmXmlNode_t*
     cmXsMeas_t* m = pp->measL;
     while( m->link != NULL )
       m = m->link;
-    m->link = meas;
+    
+    m->link       = meas;
   }
   
   // get measure attributes node
   if((np = cmXmlSearch(mnp,"attributes",NULL,0)) == NULL)
-    return rc; // (this measure does not have any attributes)
+    return rc;                  // (this measure does not have any attributes)
+
 
   cmXmlNodeUInt(np,&meas->divisions,"divisions",NULL);
-  cmXmlNodeUInt(np,&meas->beats,"time","beats",NULL);
+  cmXmlNodeUInt(np,&meas->beats,    "time","beats",NULL);
   cmXmlNodeUInt(np,&meas->beat_type,"time","beat-type",NULL);
 
-  int tick = 0;
+  // store the bar line
+  if((rc = _cmXScorePushNonNote(p,meas,tick,0,0,kBarXsFl)) != kOkXsRC )
+    return rc;
+
   
   np = mnp->children;
-  for(; np!=NULL; np=np->sibling)
-    if( cmTextCmp(np->label,"note") )
+
+  // for each child of the 'meas' XML node
+  for(; rc==kOkXsRC && np!=NULL; np=np->sibling)
+  {
+    // if this is a 'note' node
+    if( cmTextCmp(np->label,"note") == 0 )
     {
-      rc = _cmXScoreParseNote(p,meas,mnp);
+      rc = _cmXScoreParseNote(p,meas,np,&tick);
     }
     else
-      if( cmTextCmp(np->label,"backup") )
+      // if this is a 'backup' node
+      if( cmTextCmp(np->label,"backup") == 0 )
       {
+        unsigned backup;
+        cmXmlNodeUInt(np,&backup,"duration",NULL);
+        tick -= backup;
       }
+      else
+        // if this is a 'direction' node
+        if( cmTextCmp(np->label,"direction") == 0 )
+        {
+          rc = _cmXScoreParseDirection(p,meas,np,tick);
+        }
   
+  }
   
   return rc;
 }
@@ -341,7 +509,7 @@ cmXsRC_t _cmXScoreParsePart( cmXScore_t* p, cmXsPart_t* pp )
   
   // find the 'part'
   if((xnp = cmXmlSearch( cmXmlRoot(p->xmlH), "part", &partAttr, 1)) == NULL )
-    return _cmXScoreMissingNode(p,"part",&partAttr);
+    return cmErrMsg(&p->err,kSyntaxErrorXsRC,"The part '%s' was not found.",pp->idStr);
 
   // for each child of this part - find each measure
   const cmXmlNode_t* cnp = xnp->children;
@@ -353,6 +521,58 @@ cmXsRC_t _cmXScoreParsePart( cmXScore_t* p, cmXsPart_t* pp )
   return rc;
 }
 
+cmXsNote_t*  _cmXScoreInsertSortedNote( cmXsNote_t* s0, cmXsNote_t* np )
+{
+  if( s0 == NULL )
+    return np;
+
+  if( np->tick < s0->tick )
+  {
+    np->slink = s0;
+    return np;
+  }
+
+  cmXsNote_t* s1 = s0;
+  cmXsNote_t* s2 = s0->slink;
+
+  while( s2 != NULL )
+  {
+    if( s2->tick > np->tick )
+    {
+      s1->slink = np;
+      np->slink = s2;
+      return s0;
+    }
+    
+    s1 = s2;
+    s2 = s2->slink;
+  }
+
+  s1->slink = np;
+  
+  return s0;
+}
+
+void _cmXScoreSort( cmXScore_t* p )
+{
+  cmXsPart_t* pp = p->partL;
+  for(; pp!=NULL; pp=pp->link)
+  {
+    cmXsMeas_t* mp = pp->measL;
+    for(; mp!=NULL; mp=mp->link)
+    {   
+      // for each voice in this measure
+      cmXsVoice_t* vp = mp->voiceL;
+      for(; vp!=NULL; vp=vp->link)
+      {
+        cmXsNote_t* np = vp->noteL;
+        for(; np!=NULL; np=np->mlink)
+          mp->noteL = _cmXScoreInsertSortedNote(mp->noteL,np);        
+      }      
+    }
+  }
+}
+
 cmXsRC_t cmXScoreInitialize( cmCtx_t* ctx, cmXsH_t* hp, const cmChar_t* xmlFn )
 {
   cmXsRC_t rc = kOkXsRC;
@@ -379,11 +599,14 @@ cmXsRC_t cmXScoreInitialize( cmCtx_t* ctx, cmXsH_t* hp, const cmChar_t* xmlFn )
   if((rc = _cmXScoreParsePartList( p )) != kOkXsRC )
     goto errLabel;
 
+  // parse each score 'part'
   cmXsPart_t* pp = p->partL;
   for(; pp!=NULL; pp=pp->link)
     if((rc = _cmXScoreParsePart(p,pp)) != kOkXsRC )
       goto errLabel;
 
+  // fill in the note->slink chain to link the notes in each measure in time order
+  _cmXScoreSort(p); 
   
  errLabel:
   if( rc != kOkXsRC )
@@ -408,15 +631,37 @@ cmXsRC_t cmXScoreFinalize( cmXsH_t* hp )
 
   hp->h = NULL;
 
-  return rc;
-  
+  return rc;  
 }
 
 
 bool     cmXScoreIsValid( cmXsH_t h )
 { return h.h != NULL; }
 
-void     cmXScoreReport( cmXsH_t h, cmRpt_t* rpt )
+void _cmXScoreReportNote( cmRpt_t* rpt, const cmXsNote_t* note )
+{
+  const cmChar_t* B = cmIsFlag(note->flags,kBarXsFl)       ? "|" : "-";
+  const cmChar_t* R = cmIsFlag(note->flags,kRestXsFl)      ? "R" : "-";
+  const cmChar_t* G = cmIsFlag(note->flags,kGraceXsFl)     ? "G" : "-";
+  const cmChar_t* D = cmIsFlag(note->flags,kDotXsFl)       ? "D" : "-";
+  const cmChar_t* C = cmIsFlag(note->flags,kChordXsFl)     ? "C" : "-";
+  const cmChar_t* e = cmIsFlag(note->flags,kEvenXsFl)      ? "e" : "-";
+  const cmChar_t* d = cmIsFlag(note->flags,kDynXsFl)       ? "d" : "-";
+  const cmChar_t* t = cmIsFlag(note->flags,kTempoXsFl)     ? "t" : "-";
+  const cmChar_t* P = cmIsFlag(note->flags,kPedalDnXsFl)   ? "V" : "-";
+  P = cmIsFlag(note->flags,kPedalUpXsFl)   ? "^" : P;
+  P = cmIsFlag(note->flags,kPedalUpDnXsFl) ? "X" : P;
+  const cmChar_t* N = note->pitch==0 ? " " : cmMidiToSciPitch( note->pitch, NULL, 0 );
+  cmRptPrintf(rpt,"      %5i %5i %2i %3s %s%s%s%s%s%s%s%s%s",note->tick,note->duration,note->rvalue,N,B,R,G,D,C,e,d,t,P);
+
+  if( cmIsFlag(note->flags,kSectionXsFl) )
+    cmRptPrintf(rpt," %i",note->rvalue);
+
+  printf("\n");
+  
+}
+
+void  cmXScoreReport( cmXsH_t h, cmRpt_t* rpt, bool sortFl )
 {
   cmXScore_t* p = _cmXScoreHandleToPtr(h);
 
@@ -427,9 +672,31 @@ void     cmXScoreReport( cmXsH_t h, cmRpt_t* rpt )
 
     const cmXsMeas_t* meas = pp->measL;
     for(; meas!=NULL; meas=meas->link)
+    {
       cmRptPrintf(rpt,"  %i : div:%i beat:%i beat-type:%i\n",meas->number,meas->divisions,meas->beats,meas->beat_type);
-  }
-  
+
+      if( sortFl )
+      {
+        const cmXsNote_t* note = meas->noteL;
+        for(; note!=NULL; note=note->slink)
+          _cmXScoreReportNote(rpt,note);        
+      }
+      else
+      {
+      
+        const cmXsVoice_t* v = meas->voiceL;
+        for(; v!=NULL; v=v->link)
+        {        
+          const cmXsNote_t* note = v->noteL;
+          
+          cmRptPrintf(rpt,"    voice:%i\n",v->id);
+          
+          for(; note!=NULL; note=note->mlink)
+            _cmXScoreReportNote(rpt,note);
+        }
+      }      
+    }
+  }  
 }
 
 
@@ -441,7 +708,7 @@ cmXsRC_t cmXScoreTest( cmCtx_t* ctx, const cmChar_t* fn )
   if((rc = cmXScoreInitialize( ctx, &h, fn)) != kOkXsRC )
     return cmErrMsg(&ctx->err,rc,"XScore alloc failed.");
 
-  cmXScoreReport(h,&ctx->rpt);
+  cmXScoreReport(h,&ctx->rpt,true);
   
   return cmXScoreFinalize(&h);
 

app/cmXScore.h

@@ -7,11 +7,11 @@ extern "C" {
 
   enum
   {
-  kOkXsRC = cmOkRC,
+    kOkXsRC = cmOkRC,
     kXmlFailXsRC,
     kLHeapFailXsRC,
     kSyntaxErrorXsRC
-    };
+  };
 
   typedef cmRC_t     cmXsRC_t;
   typedef cmHandle_t cmXsH_t;
@@ -25,14 +25,16 @@ extern "C" {
   //       b. Emacs C-x <RET> f utf-8 <RET>
   //
   // 2) Replace "DoletSibelius Unknown Symbol Index" with "DoletSibelius unknownSymIdx"
-  
+  //
+  // 3) How to assigned dynamic markings.
+  // 4) Tempo syntax is inconsistent.
 
   cmXsRC_t cmXScoreInitialize( cmCtx_t* ctx, cmXsH_t* hp, const cmChar_t* xmlFn );
   cmXsRC_t cmXScoreFinalize( cmXsH_t* hp );
 
   bool     cmXScoreIsValid( cmXsH_t h );
 
-  void     cmXScoreReport( cmXsH_t h, cmRpt_t* rpt );
+  void     cmXScoreReport( cmXsH_t h, cmRpt_t* rpt, bool sortFl );
 
   cmXsRC_t cmXScoreTest( cmCtx_t* ctx, const cmChar_t* fn );