Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for lyrics on chords #1338

Merged
merged 4 commits into from
Mar 11, 2020
Merged

Conversation

rettinghaus
Copy link
Contributor

closes #1337

src/iomei.cpp Outdated Show resolved Hide resolved
src/syl.cpp Show resolved Hide resolved
@craigsapp
Copy link
Contributor

Looks great!:

Screen Shot 2020-03-10 at 7 17 06 PM

with the test data from issue #1337:

<?xml version="1.0" encoding="UTF-8"?>
<?xml-model href="https://music-encoding.org/schema/4.0.0/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/4.0.0/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="4.0.0">
 <meiHead>
  <fileDesc>
   <titleStmt>
    <title />
   </titleStmt>
   <pubStmt />
  </fileDesc>
  <encodingDesc>
   <appInfo>
    <application isodate="2020-03-10T09:58:50" version="2.6.0-dev-606fd3b">
     <name>Verovio</name>
     <p>Transcoded from Humdrum</p>
    </application>
   </appInfo>
  </encodingDesc>
  <workList>
   <work>
    <title />
   </work>
  </workList>
 </meiHead>
 <music>
  <body>
   <mdiv xml:id="mdiv-0000001255711147">
    <score xml:id="score-0000000208786641">
     <scoreDef xml:id="scoredef-0000001905825959">
      <staffGrp xml:id="staffgrp-0000000952426229">
       <staffDef xml:id="staffdef-0000000920969044" n="1" lines="5">
        <clef xml:id="clef-0000000033375364" shape="G" line="2" />
       </staffDef>
      </staffGrp>
     </scoreDef>
     <section xml:id="section-L1F1">
      <measure xml:id="measure-L1">
       <staff xml:id="staff-0000001332919464" n="1">
        <layer xml:id="layer-L1F1N1" n="1">
         <note xml:id="note-L2F1" dur="2" oct="4" pname="c" accid.ges="n">
          <verse xml:id="verse-L2F2" n="1">
           <syl xml:id="syl-L2F2">one</syl>
          </verse>
         </note>
        </layer>
       </staff>
      </measure>
      <measure xml:id="measure-L3">
       <staff xml:id="staff-L3F1N1" n="1">
        <layer xml:id="layer-L3F1N1" n="1">
         <chord xml:id="chord-L4F1" dur="2">
          <note xml:id="note-L4F1S1" oct="4" pname="e" accid.ges="n" />
          <note xml:id="note-L4F1S2" oct="4" pname="c" accid.ges="n" />
          <verse xml:id="verse-L4F2" n="1">
           <syl xml:id="syl-L4F2">two</syl>
          </verse>
         </chord>
        </layer>
       </staff>
      </measure>
      <measure xml:id="measure-L5" right="end">
       <staff xml:id="staff-L5F1N1" n="1">
        <layer xml:id="layer-L5F1N1" n="1">
         <note xml:id="note-L6F1" dur="2" oct="4" pname="c" accid.ges="n">
          <verse xml:id="verse-L6F2" n="1">
           <syl xml:id="syl-L6F2">three</syl>
          </verse>
         </note>
        </layer>
       </staff>
      </measure>
     </section>
    </score>
   </mdiv>
  </body>
 </music>
</mei>

@lpugin lpugin merged commit bc91248 into rism-digital:develop Mar 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement chord/verse
4 participants