DDMAL · yinanazhou · Jul 5, 2023 · Jun 2, 2023 · Jun 2, 2023 · Jun 2, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,18 @@
 # Changelog
 
 ## [unreleased]
+* Support for `space` within `beam`
+
+## [3.16.0] - 2023-07-03
 * Support for rectangular tone clusters (@eNote-GmbH)
 * Support for delayed turns on chords (@eNote-GmbH)
+* Support for `pgHead@func` and `pgFoot@func` instead of `pgHead2` and `pgFoot2`
+* Support for `ending@lform` and `ending@label`
+* Update key signature handling according to the latest changes in MEI
 * Improve endpoint location for spanning slurs (@eNote-GmbH)
 * Improve layout for inner slurs in cross-staff situations (@eNote-GmbH)
 * Fix validity of MEI output by ensuring correct element order
+* Option --neume-as-note to render neumes as CMWN notes
 * Option --octave-no-spanning-parentheses to prevent () in spanning octave displacements (@eNote-GmbH)
 
 ## [3.15.0] - 2023-03-01

diff --git a/Verovio.podspec b/Verovio.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = 'Verovio'
-  s.version        = '3.16.0-dev'
+  s.version        = '3.17.0-dev'
   s.license        = { :type => 'LGPL' }
   s.homepage       = 'https://www.verovio.org/index.xhtml'
   s.authors        = { 'Contributors List' => 'https://github.com/rism-digital/verovio/graphs/contributors' }

diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
diff --git a/bindings/iOS/all.h b/bindings/iOS/all.h
@@ -74,6 +74,8 @@
 #import <VerovioFramework/devicecontext.h>
 #import <VerovioFramework/devicecontextbase.h>
 #import <VerovioFramework/dir.h>
+#import <VerovioFramework/div.h>
+#import <VerovioFramework/divline.h>
 #import <VerovioFramework/doc.h>
 #import <VerovioFramework/docselection.h>
 #import <VerovioFramework/dot.h>
@@ -138,6 +140,7 @@
 #import <VerovioFramework/libmei.h>
 #import <VerovioFramework/ligature.h>
 #import <VerovioFramework/linkinginterface.h>
+#import <VerovioFramework/liquescent.h>
 #import <VerovioFramework/lv.h>
 #import <VerovioFramework/mdiv.h>
 #import <VerovioFramework/measure.h>
@@ -170,9 +173,7 @@
 #import <VerovioFramework/pb.h>
 #import <VerovioFramework/pedal.h>
 #import <VerovioFramework/pgfoot.h>
-#import <VerovioFramework/pgfoot2.h>
 #import <VerovioFramework/pghead.h>
-#import <VerovioFramework/pghead2.h>
 #import <VerovioFramework/phrase.h>
 #import <VerovioFramework/pitchinflection.h>
 #import <VerovioFramework/pitchinterface.h>
@@ -186,6 +187,7 @@
 #import <VerovioFramework/reg.h>
 #import <VerovioFramework/reh.h>
 #import <VerovioFramework/rend.h>
+#import <VerovioFramework/repeatmark.h>
 #import <VerovioFramework/resetfunctor.h>
 #import <VerovioFramework/resources.h>
 #import <VerovioFramework/rest.h>
@@ -226,6 +228,7 @@
 #import <VerovioFramework/text.h>
 #import <VerovioFramework/textdirinterface.h>
 #import <VerovioFramework/textelement.h>
+#import <VerovioFramework/textlayoutelement.h>
 #import <VerovioFramework/tie.h>
 #import <VerovioFramework/timeinterface.h>
 #import <VerovioFramework/timemap.h>

diff --git a/bindings/java/pom.xml b/bindings/java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.rism.verovio</groupId>
   <artifactId>VerovioToolkit</artifactId>
-  <version>3.16.0-dev</version>
+  <version>3.17.0-dev</version>
   <packaging>jar</packaging>
 
   <name>VerovioToolkit</name>

diff --git a/bindings/python/.pypi-version b/bindings/python/.pypi-version
@@ -1,3 +1,3 @@
 # dummy file used by setup.py for counting revisions when publishing to test.pypi
 # counting can be reset by making a change to this file
-3.16.0
+3.17.0
diff --git a/codemeta.json b/codemeta.json
@@ -4,8 +4,8 @@
   "identifier": "Verovio",
   "name": "Verovio",
   "description": "Verovio is a fast, portable and lightweight open-source library for engraving Music Encoding Initiative (MEI) music scores into SVG.",
-  "softwareVersion": "3.16.0-dev",
-  "datePublished": "2023-03-01",
+  "softwareVersion": "3.17.0-dev",
+  "datePublished": "2023-07-03",
   "license": "https://www.gnu.org/licenses/lgpl-3.0",
   "programmingLanguage": [{
     "@type": "ComputerLanguage",

diff --git a/data/Bravura.css b/data/Bravura.css
diff --git a/data/Bravura.xml b/data/Bravura.xml
@@ -809,6 +809,7 @@
   <g c="EB9D" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" n="staffPosLower6" />
   <g c="EB9E" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" n="staffPosLower7" />
   <g c="EB9F" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" n="staffPosLower8" />
+  <g c="EBA6" x="0.0" y="0.0" w="148.0" h="786.0" h-a-x="149" n="luteDurationDoubleWhole" />
   <g c="EBA7" x="0.0" y="0.0" w="36.0" h="790.0" h-a-x="36" n="luteDurationWhole" />
   <g c="EBA8" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" n="luteDurationHalf" />
   <g c="EBA9" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" n="luteDurationQuarter" />

diff --git a/data/Bravura/EBA6.xml b/data/Bravura/EBA6.xml
@@ -0,0 +1 @@
+<symbol id="EBA6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 663c-3 3 -4 7 -4 11c0 5 2 11 6 14l112 94l6 3c2 1 4 1 6 1c10 0 18 -8 18 -18v-750c0 -10 -8 -18 -18 -18s-18 8 -18 18v712l-82 -70c-4 -2 -8 -4 -12 -4c-5 0 -10 2 -14 7z" /></symbol>
diff --git a/data/Leipzig.css b/data/Leipzig.css
diff --git a/data/Leipzig.xml b/data/Leipzig.xml
@@ -572,6 +572,7 @@
   <g c="E049" x="0.0" y="-73.0" w="537.0" h="653.0" h-a-x="537" n="codaSquare" />
   <g c="E503" x="0.0" y="73.0" w="95.0" h="94.0" h-a-x="95" n="repeatBarUpperDot" />
   <g c="E505" x="0.0" y="-166.0" w="95.0" h="94.0" h-a-x="95" n="repeatBarLowerDot" />
+  <g c="EBA6" x="-82.0" y="0.0" w="174.0" h="791.0" h-a-x="92" n="luteDurationDoubleWhole" />
   <g c="E0A5" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="314" n="noteheadNull" />
   <g c="E940" x="-209.0" y="-209.0" w="418.0" h="418.0" h-a-x="0" n="mensuralCombStemDiagonal" />
   <g c="E905" x="0.0" y="-500.0" w="526.0" h="1000.0" h-a-x="526" n="mensuralCclef" />

diff --git a/data/Leipzig/EBA6.xml b/data/Leipzig/EBA6.xml
@@ -0,0 +1 @@
+<symbol id="EBA6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-82 763c11 4 128 23 137 26c7 2 12 2 14 2c15 0 16 -15 16 -35v-7c0 -94 -4 -76 -5 -259v-43c0 -99 2 -259 2 -292c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -23 497 -23 725c0 1 0 6 -1 16c0 4 -2 5 -5 5c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10 c-2 24 -2 37 -2 38z" /></symbol>
diff --git a/emscripten/npm/package.json b/emscripten/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "verovio",
-  "version": "3.16.0-alpha",
+  "version": "3.17.0-alpha",
   "description": "This is the stable version of the verovio package",
   "main": "dist/verovio-toolkit-wasm.js",
   "exports": {

diff --git a/fonts/supported.xml b/fonts/supported.xml
@@ -2834,7 +2834,7 @@
         <!--<glyph glyph-code="EBA3" smufl-name="luteBarlineStartRepeat" />-->
         <!--<glyph glyph-code="EBA4" smufl-name="luteBarlineEndRepeat" />-->
         <!--<glyph glyph-code="EBA5" smufl-name="luteBarlineFinal" />-->
-        <!--<glyph glyph-code="EBA6" smufl-name="luteDurationDoubleWhole" />-->
+        <glyph glyph-code="EBA6" smufl-name="luteDurationDoubleWhole" />
         <glyph glyph-code="EBA7" smufl-name="luteDurationWhole" />
         <glyph glyph-code="EBA8" smufl-name="luteDurationHalf" />
         <glyph glyph-code="EBA9" smufl-name="luteDurationQuarter" />

diff --git a/include/vrv/adjustyposfunctor.h b/include/vrv/adjustyposfunctor.h
@@ -38,6 +38,7 @@ class AdjustYPosFunctor : public DocFunctor {
      * Functor interface
      */
     ///@{
+    FunctorCode VisitDiv(Div *div) override;
     FunctorCode VisitStaffAlignment(StaffAlignment *staffAlignment) override;
     FunctorCode VisitSystem(System *system) override;
     ///@}

diff --git a/include/vrv/alignfunctor.h b/include/vrv/alignfunctor.h
@@ -108,6 +108,7 @@ class AlignMeasuresFunctor : public DocFunctor {
      * Functor interface
      */
     ///@{
+    FunctorCode VisitDiv(Div *div) override;
     FunctorCode VisitMeasure(Measure *measure) override;
     FunctorCode VisitScoreDef(ScoreDef *scoreDef) override;
     FunctorCode VisitSection(Section *section) override;
@@ -159,6 +160,7 @@ class AlignVerticallyFunctor : public DocFunctor {
      * Functor interface
      */
     ///@{
+    FunctorCode VisitDiv(Div *div) override;
     FunctorCode VisitFig(Fig *fig) override;
     FunctorCode VisitMeasure(Measure *measure) override;
     FunctorCode VisitPageEnd(Page *page) override;
@@ -188,7 +190,7 @@ class AlignVerticallyFunctor : public DocFunctor {
     int m_cumulatedShift;
     // The sum of justification factors per page
     int m_justificationSum;
-    // The page width
+    // The page width - used for setting the horizontal position of <rend> withing text layout elements
     int m_pageWidth;
 };
 

diff --git a/include/vrv/castofffunctor.h b/include/vrv/castofffunctor.h
@@ -49,6 +49,7 @@ class CastOffSystemsFunctor : public DocFunctor {
      * Functor interface
      */
     ///@{
+    FunctorCode VisitDiv(Div *div) override;
     FunctorCode VisitEditorialElement(EditorialElement *editorialElement) override;
     FunctorCode VisitEnding(Ending *ending) override;
     FunctorCode VisitMeasure(Measure *measure) override;
@@ -183,6 +184,7 @@ class CastOffEncodingFunctor : public DocFunctor {
      * Functor interface
      */
     ///@{
+    FunctorCode VisitDiv(Div *div) override;
     FunctorCode VisitEditorialElement(EditorialElement *editorialElement) override;
     FunctorCode VisitEnding(Ending *ending) override;
     FunctorCode VisitMeasure(Measure *measure) override;
@@ -296,6 +298,7 @@ class CastOffToSelectionFunctor : public DocFunctor {
      * Functor interface
      */
     ///@{
+    FunctorCode VisitDiv(Div *div) override;
     FunctorCode VisitEditorialElement(EditorialElement *editorialElement) override;
     FunctorCode VisitMeasure(Measure *measure) override;
     FunctorCode VisitPageElement(PageElement *pageElement) override;

diff --git a/include/vrv/comparison.h b/include/vrv/comparison.h
@@ -380,6 +380,32 @@ class AttVisibilityComparison : public ClassIdComparison {
     data_BOOLEAN m_isVisible;
 };
 
+//----------------------------------------------------------------------------
+// AttFormeworkComparison
+//----------------------------------------------------------------------------
+
+/**
+ * This class evaluates if the object is of a certain ClassId and has a @func of value func.
+ */
+class AttFormeworkComparison : public ClassIdComparison {
+
+public:
+    AttFormeworkComparison(ClassId classId, data_PGFUNC func) : ClassIdComparison(classId) { m_func = func; }
+
+    bool operator()(const Object *object) override
+    {
+        if (!MatchesType(object)) return false;
+        // This should not happen, but just in case
+        if (!object->HasAttClass(ATT_FORMEWORK)) return false;
+        const AttFormework *element = dynamic_cast<const AttFormework *>(object);
+        assert(element);
+        return (element->GetFunc() == m_func);
+    }
+
+private:
+    data_PGFUNC m_func;
+};
+
 //----------------------------------------------------------------------------
 // CrossAlignmentReferenceComparison
 //----------------------------------------------------------------------------

diff --git a/include/vrv/convertfunctor.h b/include/vrv/convertfunctor.h
@@ -38,6 +38,7 @@ class ConvertToPageBasedFunctor : public Functor {
      * Functor interface
      */
     ///@{
+    FunctorCode VisitDiv(Div *div) override;
     FunctorCode VisitEditorialElement(EditorialElement *editorialElement) override;
     FunctorCode VisitEditorialElementEnd(EditorialElement *editorialElement) override;
     FunctorCode VisitEnding(Ending *ending) override;

diff --git a/include/vrv/div.h b/include/vrv/div.h
@@ -0,0 +1,111 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        div.h
+// Author:      Laurent Pugin
+// Created:     2023
+// Copyright (c) Authors and others. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __VRV_DIV_H__
+#define __VRV_DIV_H__
+
+#include "textlayoutelement.h"
+
+namespace vrv {
+
+//----------------------------------------------------------------------------
+// Div
+//----------------------------------------------------------------------------
+
+/**
+ * This class represents an MEI Div.
+ * The current implementation accepts rend as child of div, which is not valid
+ * See https://github.com/music-encoding/music-encoding/issues/1189
+ */
+class Div : public TextLayoutElement {
+public:
+    /**
+     * @name Constructors, destructors, and other standard methods
+     * Reset method resets all attribute classes
+     */
+    ///@{
+    Div();
+    virtual ~Div();
+    void Reset() override;
+    std::string GetClassName() const override { return "Div"; }
+    ///@}
+
+    /**
+     * @name Get and set the inline drawing flag
+     */
+    ///@{
+    bool GetDrawingInline() const { return m_drawingInline; }
+    void SetDrawingInline(bool drawingInline) { m_drawingInline = drawingInline; }
+    ///@}
+
+    /**
+     * @name Get the X and Y drawing position
+     */
+    ///@{
+    int GetDrawingX() const override;
+    int GetDrawingY() const override;
+    ///@}
+
+    /**
+     * @name Get and set the X and Y drawing relative positions
+     */
+    ///@{
+    int GetDrawingXRel() const { return m_drawingXRel; }
+    virtual void SetDrawingXRel(int drawingXRel);
+    void CacheXRel(bool restore = false);
+    int GetDrawingYRel() const { return m_drawingYRel; }
+    virtual void SetDrawingYRel(int drawingYRel);
+    void CacheYRel(bool restore = false);
+    ///@}
+
+    /**
+     * Overriden to get the appropriate margin
+     */
+    int GetTotalHeight(const Doc *doc) const override;
+
+    int GetTotalWidth(const Doc *doc) const override;
+
+    //----------//
+    // Functors //
+    //----------//
+
+    /**
+     * Interface for class functor visitation
+     */
+    ///@{
+    FunctorCode Accept(Functor &functor) override;
+    FunctorCode Accept(ConstFunctor &functor) const override;
+    FunctorCode AcceptEnd(Functor &functor) override;
+    FunctorCode AcceptEnd(ConstFunctor &functor) const override;
+    ///@}
+
+private:
+    //
+public:
+    //
+private:
+    /**
+     * The Y drawing relative position of the object.
+     * It is re-computed everytime the object is drawn and it is not stored in the file.
+     */
+    int m_drawingYRel;
+
+    /**
+     * The X drawing relative position of the object.
+     * It is re-computed everytime the object is drawn and it is not stored in the file.
+     */
+    int m_drawingXRel;
+
+    /**
+     * A flag indicating that the div should be displayed inline
+     */
+    bool m_drawingInline;
+};
+
+} // namespace vrv
+
+#endif