Add conversion from mensural to CMN #3852

lpugin · 2024-11-05T11:21:46Z

This PR introduces a new converter from mensural to CMN (supported by the CESR) together with some other improvements to the CMME importer and options for handling mensural notation.

Refactoring of the mensural notation cast-off

The cast-off of mensural notation has been re-written and makes Verovio more flexible. Previously, system and page begins would be inserted only at places where a barLine would occur at all voices. This was requiring barLine elements to be inserted, sometimes artificially, with still a limited number of possible break points.

With the implementation of this PR, system and page begins will be inserted wherever all voices align, meaning at any point where all voices have either a note or a rest.

Options

Duration equivalence

The new --duration-equivalence specifies the level that is considered equivalent when aligning different (ternary or binary) mensural divisions and is similar to the integer valor. Previously, the level was fixed to brevis, but it can now be changed to semibrevis or minima. The brevis remains the default level.

One of the purpose of the --duration-equivalence option is to control how mensural notation can be aligned with CMN. With minima, a mensural minima will be considered equivalent to a half-note (a duration of 2 in MEI). With semibrevis, a mensural duration of semibrevis will be considered equivalent to a whole-note (a duration of 1 in MEI). With a tempus imperfectum and a prolatio minor (e.g., all binary divisions), the level of equivalence has makes no difference. However, with ternary divisions (tempus perfectum and/or prolatio major), some tuplets will be needed for aligning whole-notes and semibrevis with a level of minima and for aligning minima and half-notes with a level of semibrevis, respectively

[example will be added to the reference book]

Mensural responsive view

The PR introduces a new option to make rendering of mensural notation more flexible. One issue with the dynamic rendering of mensural data is the cast off of containers, such as ligature or editorial markup. Adding system of page begins within ligature or editorial markup would require some restructuring of the data - keeping some notes of a ligature in one system and others to the next system. That is not the normal way layout is performed in Verovio since the principle is to preserve the MEI tree. The new option --mensural-responsive-view is a way to focus only on the editorial markup version selected and to flatten the ligature in order to allow for system and page begins to be inserted wherever needed within editorial markup or ligature.

Users should be aware that calling GetMEI with the option will return the simplified version of the data, and not the original one.

[example will be added to the reference book]

Adjustments to the CMME importer

The PR adds the conversion of minimal metadata from the CMME GeneralData element to the MEI header. It is:

The Title => title
The Section => title@type="subordinate"
The Composer => composer

The PR as the support for the CMME ColorChange by applying the color (non-black) to note@color and rest@color.

The PR also forces the use of the --duration-equivalence option to minima when importing a CMME file. A warning is shown if the option was previously different - which is the case by default. This could potentially have side effects for subsequent calls since it is not set back to its original value. One way to improve this would be to set the option to minima by default, but that can be done after the merge of the PR and some additional testing with existing mensural data.

Finally the PR corrects the handling of the proportion in the CMME importer. They were previously applied to the data during the conversion, but this was wrong because CMME works the other way around. That is, the proportion is not coded in the note value but applied by the CMME processor - this is also why proportions are also used a tempo changes in some CMME data.

Converter from Mensural to CMN

The conversion is triggered by the --mensural-to-cmn option, which replaces --mensural-to-measure.

Meter signatures

Mensur signs are converted into CMN meter signatures of 3/2, 4/2 or 6/2, with 3/2 for tempus perfectum and prolatio major, and 4/2 for tempus imperfectum and prolatio minor. 6/2 is applied for the other two combinations.

The meter signature is arbitrarily determined by the top voice when voices have conflicting meter signatures. Also, a meter signature change is introduced when all voices have a mensur sign at the position and that the resulting meter signature is actually different from the previous one.

The mensur signs are not preserved as such. However, a MEI <dir> is inserted with a textual transcription, with:

A sign (C or O) with r for a reversed orientation
A dash (|)
A dot (.)
A figure (x) or a proportion (x/x) for @num w/o @numbase respectively.

The <dir> is placed with tstamp="0.0" when occurring at the beginning of a measure, or with a @startid of the previous note or rest when occurring within the measure.

Clefs

Clef are all converted to G-2, G-2 with ottava bassa or F-2 clef. When no clef is given, a C-3 is used since this is the most neutral clef ambitus-wise.

Warning

Clef changes are currently ignored.

Proportions

Proportions are converted into tuplets. A tuplet that matches the proportion can be used when notes do not need to be cut across several bars. Otherwise, the tuplet proportion need to be adjusted according to the proportion of the note part that goes in one bar and the other. The result is more or less legible but always mathematically correct.

Mensural MEI file

<?xml version="1.0" encoding="UTF-8"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.0">
   <meiHead>
      <fileDesc>
         <titleStmt>
            <title>[Proportional example]</title>
            <composer>John Dygon</composer>
         </titleStmt>
         <pubStmt>
            <date isodate="2024-11-07-17:13:01" />
         </pubStmt>
      </fileDesc>
      <encodingDesc>
         <appInfo>
            <application xml:id="verovio" version="4.4.0-dev-3524038-dirty">
               <name>Verovio (4.4.0-dev-3524038-dirty)</name>
            </application>
         </appInfo>
         <projectDesc>
            <p>MEI encoded with Verovio</p>
            <p>Converted from CMME XML</p>
         </projectDesc>
      </encodingDesc>
   </meiHead>
   <music>
      <body>
         <mdiv>
            <score>
               <scoreDef>
                  <staffGrp>
                     <grpSym symbol="bracket" />
                     <staffDef n="1" notationtype="mensural" lines="5">
                        <label>Discantus</label>
                        <mensur modusmaior="2" modusminor="2" prolatio="2" tempus="2" />
                     </staffDef>
                     <staffDef n="2" notationtype="mensural" lines="5">
                        <label>Tenor</label>
                        <mensur modusmaior="2" modusminor="2" prolatio="2" tempus="2" />
                     </staffDef>
                  </staffGrp>
               </scoreDef>
               <section type="MensuralMusic">
                  <staff n="1">
                     <layer n="1">
                        <clef shape="C" line="2" />
                        <mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" sign="O" loc="7" fontsize="small" />
                        <note dur="semibrevis" num="2" numbase="3" oct="3" pname="g" />
                        <dot />
                        <note dur="minima" oct="3" pname="a" />
                        <accid loc="1" ploc="b" oloc="3" accid="s" />
                        <note dur="minima" oct="3" pname="b" />
                        <note dur="minima" oct="4" pname="c" />
                        <note dur="minima" oct="4" pname="d" />
                        <note dur="semibrevis" oct="4" pname="e" />
                        <note dur="minima" oct="4" pname="c" />
                        <note dur="minima" oct="4" pname="f" />
                        <note dur="semiminima" oct="4" pname="g" />
                        <note dur="semiminima" oct="4" pname="a" />
                        <keySig>
                           <keyAccid oct="4" pname="b" loc="8" accid="f" />
                        </keySig>
                        <note dur="minima" oct="4" pname="b" stem.dir="down" />
                        <note dur="semibrevis" oct="4" pname="a" />
                        <note dur="minima" oct="4" pname="f" />
                        <note dur="minima" oct="4" pname="a" />
                        <note dur="semibrevis" oct="4" pname="g" />
                        <note dur="minima" oct="4" pname="f" />
                        <note dur="minima" oct="4" pname="e" />
                        <note dur="minima" oct="4" pname="d" />
                        <note dur="semibrevis" oct="4" pname="e" />
                        <note dur="semibrevis" oct="4" pname="d" />
                        <proport type="cmme_proportion" num="18" numbase="5" />
                        <ligature form="obliqua">
                           <note dur="semibrevis" oct="4" pname="a" color="red" stem.dir="up" stem.pos="left" />
                           <note dur="semibrevis" oct="4" pname="g" color="red" />
                        </ligature>
                        <ligature form="obliqua">
                           <note dur="semibrevis" oct="4" pname="f" color="red" stem.dir="up" stem.pos="left" />
                           <note dur="semibrevis" oct="4" pname="e" color="red" />
                        </ligature>
                        <ligature form="obliqua">
                           <note dur="semibrevis" oct="4" pname="f" color="red" stem.dir="up" stem.pos="left" />
                           <note dur="semibrevis" oct="4" pname="e" color="red" />
                        </ligature>
                        <note dur="semibrevis" oct="4" pname="c" color="red" />
                        <ligature form="obliqua">
                           <note dur="semibrevis" oct="4" pname="f" color="red" stem.dir="up" stem.pos="left" />
                           <note dur="semibrevis" oct="4" pname="e" color="red" />
                        </ligature>
                        <note dur="brevis" num="3" numbase="2" oct="4" pname="a" color="red" />
                        <note dur="semibrevis" num="2" numbase="3" oct="5" pname="c" color="red" />
                        <dot />
                        <note dur="minima" oct="4" pname="b" color="red" stem.dir="down" />
                        <ligature form="obliqua">
                           <note dur="semibrevis" oct="4" pname="a" color="red" stem.dir="up" stem.pos="left" />
                           <note dur="semibrevis" oct="4" pname="g" color="red" />
                        </ligature>
                        <note dur="semibrevis" oct="4" pname="f" color="red" />
                        <ligature form="obliqua">
                           <note dur="semibrevis" oct="4" pname="g" color="red" stem.dir="up" stem.pos="left" />
                           <note dur="semibrevis" oct="4" pname="f" color="red" />
                        </ligature>
                        <proport type="cmme_proportion" num="5" numbase="18" />
                        <note dur="longa" fermata="above" oct="4" pname="g" stem.dir="down" />
                        <barLine />
                     </layer>
                  </staff>
                  <staff n="2">
                     <layer n="1">
                        <clef shape="C" line="4" />
                        <keySig>
                           <keyAccid oct="3" pname="b" loc="5" accid="f" />
                        </keySig>
                        <mensur modusmaior="2" modusminor="2" prolatio="2" tempus="3" sign="O" loc="7" fontsize="small" />
                        <rest dur="minima" />
                        <note dur="semibrevis" oct="3" pname="g" />
                        <note dur="minima" oct="3" pname="f" />
                        <note dur="minima" oct="3" pname="g" />
                        <note dur="minima" oct="3" pname="a" />
                        <note dur="minima" oct="3" pname="b" />
                        <note dur="minima" oct="4" pname="c" />
                        <note dur="semibrevis" oct="3" pname="a" />
                        <note dur="semibrevis" oct="3" pname="d" />
                        <rest dur="minima" />
                        <note dur="semibrevis" num="2" numbase="3" oct="4" pname="d" />
                        <dot />
                        <note dur="minima" oct="4" pname="c" />
                        <note dur="minima" oct="3" pname="b" />
                        <note dur="semibrevis" oct="3" pname="a" />
                        <ligature form="recta">
                           <note dur="semibrevis" oct="3" pname="g" stem.dir="up" stem.pos="left" />
                           <note dur="semibrevis" oct="4" pname="c" />
                        </ligature>
                        <keySig>
                           <keyAccid oct="3" pname="b" loc="5" accid="f" />
                        </keySig>
                        <dot />
                        <note dur="semibrevis" oct="3" pname="b" />
                        <note dur="longa" num="6" numbase="5" oct="3" pname="a" stem.dir="down" />
                        <note dur="longa" oct="3" pname="g" stem.dir="down" />
                        <barLine />
                     </layer>
                  </staff>
               </section>
            </score>
         </mdiv>
      </body>
   </music>
</mei>

Converted MEI (cmn) file

<?xml version="1.0" encoding="UTF-8"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-basic.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://music-encoding.org/schema/5.0/mei-basic.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.0+basic">
   <meiHead>
      <fileDesc>
         <titleStmt>
            <title>[Proportional example]</title>
            <composer>John Dygon</composer>
         </titleStmt>
         <pubStmt>
            <date isodate="2024-11-07-17:13:01" />
         </pubStmt>
      </fileDesc>
   </meiHead>
   <music>
      <body>
         <mdiv>
            <score>
               <scoreDef>
                  <staffGrp symbol="bracket">
                     <staffDef n="1" lines="5" meter.count="6" meter.unit="2" clef.shape="G" clef.line="2">
                        <label>Discantus</label>
                     </staffDef>
                     <staffDef n="2" lines="5" meter.count="6" meter.unit="2" clef.shape="G" clef.line="2" clef.dis="8" clef.dis.place="below">
                        <label>Tenor</label>
                     </staffDef>
                  </staffGrp>
               </scoreDef>
               <section type="MensuralMusic">
                  <measure n="1">
                     <staff n="1">
                        <layer n="1">
                           <note dots="1" dur="1" oct="3" pname="g" />
                           <note dur="2" oct="3" pname="a" />
                           <note dur="2" oct="3" pname="b" />
                           <note dur="2" oct="4" pname="c" />
                        </layer>
                     </staff>
                     <staff n="2">
                        <layer n="1">
                           <rest dur="2" />
                           <note dur="1" oct="3" pname="g" />
                           <note dur="2" oct="3" pname="f" />
                           <note dur="2" oct="3" pname="g" />
                           <note dur="2" oct="3" pname="a" />
                        </layer>
                     </staff>
                     <dir type="mscore-staff-text" place="above" staff="1" tstamp="0">O</dir>
                     <dir type="mscore-staff-text" place="above" staff="2" tstamp="0">O</dir>
                  </measure>
                  <measure n="2">
                     <staff n="1">
                        <layer n="1">
                           <note dur="2" oct="4" pname="d" />
                           <note dur="1" oct="4" pname="e" />
                           <note dur="2" oct="4" pname="c" />
                           <note dur="2" oct="4" pname="f" />
                           <note dur="4" oct="4" pname="g" />
                           <note dur="4" oct="4" pname="a" />
                        </layer>
                     </staff>
                     <staff n="2">
                        <layer n="1">
                           <note dur="2" oct="3" pname="b" />
                           <note dur="2" oct="4" pname="c" />
                           <note dur="1" oct="3" pname="a" />
                           <note dur="1" oct="3" pname="d" />
                        </layer>
                     </staff>
                  </measure>
                  <measure n="3">
                     <staff n="1">
                        <layer n="1">
                           <note dur="2" oct="4" pname="b" />
                           <note dur="1" oct="4" pname="a" />
                           <note dur="2" oct="4" pname="f" />
                           <note dur="2" oct="4" pname="a" />
                           <note xml:id="nwvfeb" dur="2" oct="4" pname="g" />
                        </layer>
                     </staff>
                     <staff n="2">
                        <layer n="1">
                           <rest dur="2" />
                           <note dots="1" dur="1" oct="4" pname="d" />
                           <note dur="2" oct="4" pname="c" />
                           <note dur="2" oct="3" pname="b" />
                        </layer>
                     </staff>
                     <tie startid="#nwvfeb" endid="#n1vhrrw1" />
                  </measure>
                  <measure n="4">
                     <staff n="1">
                        <layer n="1">
                           <note xml:id="n1vhrrw1" dur="2" oct="4" pname="g" />
                           <note dur="2" oct="4" pname="f" />
                           <note dur="2" oct="4" pname="e" />
                           <note dur="2" oct="4" pname="d" />
                           <note dur="1" oct="4" pname="e" />
                        </layer>
                     </staff>
                     <staff n="2">
                        <layer n="1">
                           <note dur="1" oct="3" pname="a" />
                           <note xml:id="n17y24y7" dur="1" oct="3" pname="g" />
                           <note xml:id="n1fjwfa1" dur="1" oct="4" pname="c" />
                        </layer>
                     </staff>
                     <bracketSpan startid="#n17y24y7" endid="#n1fjwfa1" func="ligature" lform="solid" />
                  </measure>
                  <measure n="5">
                     <staff n="1">
                        <layer n="1">
                           <note dur="1" oct="4" pname="d" />
                           <tuplet num="18" numbase="5" bracket.visible="true" num.format="ratio">
                              <note xml:id="njqjjix" dur="1" oct="4" pname="a" color="red" />
                              <note xml:id="nmljcz9" dur="1" oct="4" pname="g" color="red" />
                              <note xml:id="n16a3qtu" dur="1" oct="4" pname="f" color="red" />
                              <note xml:id="ngv281" dur="1" oct="4" pname="e" color="red" />
                              <note xml:id="n1fpc4s5" dur="1" oct="4" pname="f" color="red" />
                              <note xml:id="nomptww" dur="1" oct="4" pname="e" color="red" />
                              <note dur="1" oct="4" pname="c" color="red" />
                           </tuplet>
                           <tuplet num="9" numbase="1" bracket.visible="false" num.format="ratio">
                              <note xml:id="n4ua71c" dur="2" oct="4" pname="f" color="red" />
                           </tuplet>
                        </layer>
                     </staff>
                     <staff n="2">
                        <layer n="1">
                           <note dur="1" oct="3" pname="b" />
                           <note xml:id="n1r43vz0" dur="breve" oct="3" pname="a" />
                        </layer>
                     </staff>
                     <bracketSpan startid="#njqjjix" endid="#nmljcz9" func="ligature" lform="solid" />
                     <bracketSpan startid="#n16a3qtu" endid="#ngv281" func="ligature" lform="solid" />
                     <bracketSpan startid="#n1fpc4s5" endid="#nomptww" func="ligature" lform="solid" />
                     <bracketSpan startid="#n4ua71c" endid="#nshczft" func="ligature" lform="solid" />
                     <tie startid="#n4ua71c" endid="#ny07vaa" color="red" />
                     <tie startid="#n1r43vz0" endid="#n1ia5t3e" />
                  </measure>
                  <measure n="6">
                     <staff n="1">
                        <layer n="1">
                           <tuplet num="9" numbase="4" bracket.visible="false" num.format="ratio">
                              <note xml:id="ny07vaa" dur="2" oct="4" pname="f" color="red" />
                           </tuplet>
                           <tuplet num="18" numbase="5" bracket.visible="true" num.format="ratio">
                              <note xml:id="nshczft" dur="1" oct="4" pname="e" color="red" />
                              <note dur="breve" oct="4" pname="a" color="red" />
                              <note dots="1" dur="1" oct="5" pname="c" color="red" />
                              <note dur="2" oct="4" pname="b" color="red" />
                              <note xml:id="n17kk27o" dur="1" oct="4" pname="a" color="red" />
                              <note xml:id="n1aedmca" dur="1" oct="4" pname="g" color="red" />
                              <note dur="1" oct="4" pname="f" color="red" />
                              <note xml:id="n6wkmr4" dur="1" oct="4" pname="g" color="red" />
                              <note xml:id="n1paq3u0" dur="1" oct="4" pname="f" color="red" />
                           </tuplet>
                        </layer>
                     </staff>
                     <staff n="2">
                        <layer n="1">
                           <note xml:id="n1ia5t3e" dots="1" dur="breve" oct="3" pname="a" />
                        </layer>
                     </staff>
                     <bracketSpan startid="#n17kk27o" endid="#n1aedmca" func="ligature" lform="solid" />
                     <bracketSpan startid="#n6wkmr4" endid="#n1paq3u0" func="ligature" lform="solid" />
                  </measure>
                  <measure n="7">
                     <staff n="1">
                        <layer n="1">
                           <note xml:id="n1isjjni" dots="1" dur="breve" oct="4" pname="g" />
                        </layer>
                     </staff>
                     <staff n="2">
                        <layer n="1">
                           <note xml:id="nb9ic71" dots="1" dur="breve" oct="3" pname="g" />
                        </layer>
                     </staff>
                     <tie startid="#n1isjjni" endid="#n1nh7jcw" />
                     <tie startid="#nb9ic71" endid="#n1xki01y" />
                  </measure>
                  <measure right="end" n="8">
                     <staff n="1">
                        <layer n="1">
                           <note xml:id="n1nh7jcw" dots="1" dur="breve" oct="4" pname="g" />
                        </layer>
                     </staff>
                     <staff n="2">
                        <layer n="1">
                           <note xml:id="n1xki01y" dots="1" dur="breve" oct="3" pname="g" />
                        </layer>
                     </staff>
                  </measure>
               </section>
            </score>
         </mdiv>
      </body>
   </music>
</mei>

Warning

The MEI produced with unconventional proportions can be problematic in MuseScore because of the limitation of MuseScore regarding the representation of the tuplets. It is expected for any tuplets to have a duration that can be represented with a group of base durations, which is not always the case with the MEI tuplets produced. As a result, even if the file will load and show properly in MuseScore, or even export properly to MEI, saving it as MuseScore file will corrupt it. This is not likely to be overcome.

Ligatures and coloration

Ligatures and coloration are both converted into bracketSpan, with a @lform="solid" for the ligatures.

Warning

Coloration on chords (used in mensural notation for faux bourdon) is not preserved. Also, when converting to MEI-Basic, the file is currently not valid because bracketSpan are not available in MEI-Basic.

Editorial markup

Editorial markup is ignored and dropped from the conversion. Only the selected reading is converted according to the use of --app-x-path-query or --choice-x-path-query parameters.

Example

The example above rendered with the new cast-off algorithm

Others

Add a new Object::CopyAttributesTo for copying all MEI (supported and unsupported) attributes from one object to another.
~~Need update to C++23~~

* Uses newly generated LibMEI module level static methods

* Only documents with only one layer by staff can be treated as mensural only (i.e., for mensural view, mensural cast-off and conversion to CMN)

* Add ObjectFactory::Create(ClassId)

* Drop two string values in MusicXML importer

* Drop two string values in MusicXML importer (cherry picked from commit fe2d5b1)

annplaksin · 2024-11-13T13:36:28Z

Isn't the CMME ColorChange addressing coloration? In that case, using @colored would make more sense instead of @color.
Or are you using @color to display coloration in Verovio?

lpugin · 2024-11-13T13:47:06Z

Isn't the CMME ColorChange addressing coloration?

Not quite. Coloration is addressed with Colored on Note, and we do use @colored for that. ColorChange is the change of color, e.g., a change of ink. Possible colors are black, red, yellow, green or blue.

annplaksin · 2024-11-13T13:56:27Z

Okay, I thought it might be special way to indicate longer sections of coloration in a piece. Then, everything is fine. 😁

(cherry picked from commit f96a142)

ahankinson · 2024-11-14T10:10:45Z

NB: By merging this Verovio will also be updated to C++23 (nb: @craigsapp for your previous message)

include/vrv/iocmme.h

src/iocmme.cpp

Co-authored-by: Andrew Hankinson <[email protected]>

lpugin · 2024-11-15T07:25:00Z

NB: By merging this Verovio will also be updated to C++23 (nb: @craigsapp for your previous message)

This is not the case any more. I dropped the C++23 dependency since it looks like it is a bit early to switch to it.

lpugin added 30 commits October 26, 2024 10:57

Scaffold ConvertMensuralToCmnDoc()

d0615eb

Scaffold ConvertToMensuralView functor and calling method

accf97d

Add a generic method Object::CopyAttributesTo

0b3b49e

* Uses newly generated LibMEI module level static methods

Use Object::CopyAttributesTo

7ea335e

Fix the formatting

c6c1cb2

Use CopyAttributesTo instead of Clone / ClearChildren

c087bf7

Add --mensural-reduced-view option

9d5c46d

Rename option to --mensural-responsive-view

f52e45e

Move call to Toolkit

fed6d71

Restrict mensural only docs

2472947

* Only documents with only one layer by staff can be treated as mensural only (i.e., for mensural view, mensural cast-off and conversion to CMN)

Re-implement ConvertToCastOffMensuralFunctor

f99bb4e

Add comments to the ConvertToUnCastOffMensural

e43fff5

Rename mesure to segment in ConvertToCastOffMensuralFunctor

1fd700b

Add mensural --duration-equality option

da4006b

Mark CMME documents as mensural only (internal)

a1a7158

Renam --mensural-to-measure to --mensural-to-cmn

bcf7644

Add ConvertToCmnDoc and corresponding functor (WIP)

3f087ae

Change the Factory to use the ClassId in the map

770b6e8

* Add ObjectFactory::Create(ClassId)

Make the MIDI Functor use --duration-equivalence

a4ea843

More WIP work on the mensural-to-cmn

2f8b3ec

Remove unused variables

24e045f

Infer prolatio and tempus in CMME importer when nothing explicit

0b23fd0

Fix modus maior with semibrevis and minima equivalence

94df881

More WIP work in the mensural to CMN converter

e7a8fa1

Cleanup

631d100

Fix formatting

b2ebb41

Use bracketSpanLog_FUNC type for bracketSpan@func

fe2d5b1

* Drop two string values in MusicXML importer

Process ligature in MensuralToCmn converter

3d9db7e

Use bracketSpanLog_FUNC type for bracketSpan@func

90819f6

* Drop two string values in MusicXML importer (cherry picked from commit fe2d5b1)

Add ligature and coloration brackets

91c2e89

Fix cast off of ligatures

810a786

lpugin marked this pull request as ready for review November 12, 2024 14:52

This was referenced Nov 12, 2024

A 'barLine' in the 'corr' element messes up the rendering in Verovio #2026

Open

alignment of CMN and mensuration? #840

Closed

lpugin added 6 commits November 13, 2024 15:59

Avoid crash on stem flags

e0f5ae1

Fix crashes with empty files

370873c

Cope with proportion encoded on note with num and numbase

ff6d77d

Fix CMME importer crash with chord within ligature

443f486

Prevent accids with the same aligner to crash

2212b12

(cherry picked from commit f96a142)

Fix formatting

ab04108

ahankinson approved these changes Nov 14, 2024

View reviewed changes

ahankinson reviewed Nov 14, 2024

View reviewed changes

include/vrv/iocmme.h Outdated Show resolved Hide resolved

ahankinson reviewed Nov 14, 2024

View reviewed changes

src/iocmme.cpp Outdated Show resolved Hide resolved

ahankinson reviewed Nov 14, 2024

View reviewed changes

src/iocmme.cpp Outdated Show resolved Hide resolved

lpugin and others added 5 commits November 14, 2024 11:15

Update src/iocmme.cpp

7740bae

Co-authored-by: Andrew Hankinson <[email protected]>

Update src/iocmme.cpp

fc476b6

Co-authored-by: Andrew Hankinson <[email protected]>

Update include/vrv/iocmme.h

1cf372c

Co-authored-by: Andrew Hankinson <[email protected]>

Remove dependency on C++23

b06d097

update

9c0b019

lpugin added 4 commits November 20, 2024 09:53

Post process proportion for handling heterogenous tempos changes

d92978b

Handle CMME files without initial mensur

345dba3

Reset tempo change with CMME Mensuration without it

c85b824

Distinct log messages for proportions as tempo changes

bbce956

ahankinson merged commit 0367c2b into develop Nov 21, 2024
9 checks passed

ahankinson mentioned this pull request Nov 21, 2024

Use range loops instead of iterator when possible #3862

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add conversion from mensural to CMN #3852

Add conversion from mensural to CMN #3852

lpugin commented Nov 5, 2024 •

edited

Loading

annplaksin commented Nov 13, 2024

lpugin commented Nov 13, 2024

annplaksin commented Nov 13, 2024

ahankinson commented Nov 14, 2024

lpugin commented Nov 15, 2024

Add conversion from mensural to CMN #3852

Add conversion from mensural to CMN #3852

Conversation

lpugin commented Nov 5, 2024 • edited Loading

Refactoring of the mensural notation cast-off

Options

Duration equivalence

Mensural responsive view

Adjustments to the CMME importer

Converter from Mensural to CMN

Meter signatures

Clefs

Proportions

Ligatures and coloration

Editorial markup

Example

Others

annplaksin commented Nov 13, 2024

lpugin commented Nov 13, 2024

annplaksin commented Nov 13, 2024

ahankinson commented Nov 14, 2024

lpugin commented Nov 15, 2024

lpugin commented Nov 5, 2024 •

edited

Loading