From 6dbda1115e5a920d71bb0bb3632396ac94cf201a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 29 Jan 2021 11:02:56 +0100
Subject: [PATCH 001/403] Experimental improvement

* Does not work with the JS toolkit - page castoff
---
 include/vrv/measure.h  |  4 ++++
 include/vrv/scoredef.h |  2 ++
 src/doc.cpp            | 16 +++++++++++-----
 src/measure.cpp        | 24 ++++++++++++++++++------
 src/page.cpp           |  2 +-
 src/scoredef.cpp       |  6 +++++-
 src/toolkit.cpp        |  5 +++++
 7 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index 2c62b6e167f..153b183d2ba 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -431,6 +431,10 @@ class Measure : public Object,
     mutable MeasureAligner m_measureAligner;
 
     TimestampAligner m_timestampAligner;
+                    
+    int m_cachedCastOffOverflow;
+    int m_cachedCastOffDrawingXRel;
+    int m_cachedCastOffWidth;
 
 protected:
     /**
diff --git a/include/vrv/scoredef.h b/include/vrv/scoredef.h
index 0e2d7dce180..ee8a38e35a8 100644
--- a/include/vrv/scoredef.h
+++ b/include/vrv/scoredef.h
@@ -218,6 +218,8 @@ class ScoreDef : public ScoreDefElement,
     //
 public:
     bool m_setAsDrawing;
+                     
+    int m_cacheCastOffWidth;
     //
 private:
     /** Flags for indicating whether labels need to be drawn or not */
diff --git a/src/doc.cpp b/src/doc.cpp
index 1f1c3324f99..78c1ccc5e0f 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -849,10 +849,16 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
     }
 
     this->SetCurrentScoreDefDoc();
-
+    
     Page *contentPage = this->SetDrawingPage(0);
     assert(contentPage);
-    contentPage->LayOutHorizontally();
+
+    Measure *firstMeasure = vrv_cast<Measure *>(contentPage->FindDescendantByType(MEASURE));
+    if (!firstMeasure || firstMeasure->m_cachedCastOffWidth == VRV_UNSET) {
+        LogMessage("Doing Horizontal Layout");
+        contentPage->LayOutHorizontally();
+        LogMessage("Horizontal Layout Done");
+    }
 
     System *contentSystem = vrv_cast<System *>(contentPage->DetachChild(0));
     assert(contentSystem);
@@ -869,10 +875,10 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
     else {
         CastOffSystemsParams castOffSystemsParams(contentSystem, contentPage, currentSystem, this, smart);
         castOffSystemsParams.m_systemWidth
-            = this->m_drawingPageContentWidth - currentSystem->m_systemLeftMar - currentSystem->m_systemRightMar;
-        castOffSystemsParams.m_shift = -contentSystem->GetDrawingLabelsWidth();
+        = this->m_drawingPageContentWidth;// - currentSystem->m_systemLeftMar - currentSystem->m_systemRightMar;
+        castOffSystemsParams.m_shift = 0; //-contentSystem->GetDrawingLabelsWidth();
         castOffSystemsParams.m_currentScoreDefWidth
-            = contentPage->m_drawingScoreDef.GetDrawingWidth() + contentSystem->GetDrawingAbbrLabelsWidth();
+        = 0; //contentPage->m_drawingScoreDef.GetDrawingWidth() + contentSystem->GetDrawingAbbrLabelsWidth();
 
         Functor castOffSystems(&Object::CastOffSystems);
         Functor castOffSystemsEnd(&Object::CastOffSystemsEnd);
diff --git a/src/measure.cpp b/src/measure.cpp
index 3e794e6daca..d2a480fb7b9 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -119,6 +119,10 @@ void Measure::Reset()
     m_xAbs = VRV_UNSET;
     m_xAbs2 = VRV_UNSET;
     m_drawingXRel = 0;
+    
+    m_cachedCastOffOverflow = VRV_UNSET;
+    m_cachedCastOffDrawingXRel = VRV_UNSET;
+    m_cachedCastOffWidth = VRV_UNSET;
 
     // by default, we have a single barLine on the right (none on the left)
     m_rightBarLine.SetForm(this->GetRight());
@@ -918,9 +922,17 @@ int Measure::CastOffSystems(FunctorParams *functorParams)
 {
     CastOffSystemsParams *params = vrv_params_cast<CastOffSystemsParams *>(functorParams);
     assert(params);
-
-    // Check if the measure has some overlfowing control elements
-    int overflow = this->GetDrawingOverflow();
+    
+    if (m_cachedCastOffWidth == VRV_UNSET) {
+        // Check if the measure has some overlfowing control elements
+        m_cachedCastOffOverflow = this->GetDrawingOverflow();
+        m_cachedCastOffWidth = this->GetWidth();
+        m_cachedCastOffDrawingXRel = this->m_drawingXRel;
+        
+    }
+    int overflow = this->m_cachedCastOffOverflow;
+    int width = this->m_cachedCastOffWidth;
+    int drawingXRel = this->m_cachedCastOffDrawingXRel;
 
     if (params->m_currentSystem->GetChildCount() > 0) {
         // We have overflowing content (dir, dynam, tempo) larger than 5 units, keep it as pending
@@ -933,16 +945,16 @@ int Measure::CastOffSystems(FunctorParams *functorParams)
             return FUNCTOR_SIBLINGS;
         }
         // Break it if necessary
-        else if (this->m_drawingXRel + this->GetWidth() + params->m_currentScoreDefWidth - params->m_shift
+        else if (drawingXRel + width + params->m_currentScoreDefWidth - params->m_shift
             > params->m_systemWidth) {
             params->m_currentSystem = new System();
             params->m_page->AddChild(params->m_currentSystem);
-            params->m_shift = this->m_drawingXRel;
+            params->m_shift = drawingXRel;
             for (Object *oneOfPendingObjects : params->m_pendingObjects) {
                 if (oneOfPendingObjects->Is(MEASURE)) {
                     Measure *firstPendingMesure = vrv_cast<Measure *>(oneOfPendingObjects);
                     assert(firstPendingMesure);
-                    params->m_shift = firstPendingMesure->m_drawingXRel;
+                    params->m_shift = firstPendingMesure->m_cachedCastOffDrawingXRel;
                     // it has to be first measure
                     break;
                 }
diff --git a/src/page.cpp b/src/page.cpp
index 6280bf501a2..721176ab1d6 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -242,7 +242,7 @@ void Page::LayOutHorizontally()
     Functor alignVerticallyEnd(&Object::AlignVerticallyEnd);
     AlignVerticallyParams alignVerticallyParams(doc, &alignVertically, &alignVerticallyEnd);
     this->Process(&alignVertically, &alignVerticallyParams, &alignVerticallyEnd);
-
+    
     // Unless duration-based spacing is disabled, set the X position of each Alignment.
     // Does non-linear spacing based on the duration space between two Alignment objects.
     if (!doc->GetOptions()->m_evenNoteSpacing.GetValue()) {
diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index 0fb8fa4f151..e91007544a7 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -167,6 +167,7 @@ void ScoreDef::Reset()
     m_drawLabels = false;
     m_drawingWidth = 0;
     m_setAsDrawing = false;
+    m_cacheCastOffWidth = VRV_UNSET;
 }
 
 bool ScoreDef::IsSupportedChild(Object *child)
@@ -417,7 +418,10 @@ int ScoreDef::CastOffSystems(FunctorParams *functorParams)
     // the initial one - for this to be corrected, we would need two parameters, one for the current initial
     // scoreDef and one for the current that will be the initial one at the next system
     // Also, the abbr label (width) changes would not be taken into account
-    params->m_currentScoreDefWidth = this->GetDrawingWidth() + params->m_contentSystem->GetDrawingAbbrLabelsWidth();
+    if (m_cacheCastOffWidth == VRV_UNSET) {
+        m_cacheCastOffWidth = this->GetDrawingWidth() + params->m_contentSystem->GetDrawingAbbrLabelsWidth();
+    }
+    params->m_currentScoreDefWidth = m_cacheCastOffWidth;
 
     return FUNCTOR_SIBLINGS;
 }
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index c7d3be535b5..8b4851671ba 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -694,6 +694,11 @@ bool Toolkit::LoadData(const std::string &data)
             }
             // LogElapsedTimeStart();
             m_doc.CastOffDoc();
+            
+            //m_options->m_pageWidth.SetValue(1000);
+            
+            //m_doc.UnCastOffDoc();
+            //m_doc.CastOffDoc();
             // LogElapsedTimeEnd("layout");
         }
     }

From 81c1f4c45e68cdce079ea80346256ac347297f2b Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Thu, 30 Sep 2021 15:54:50 +0100
Subject: [PATCH 002/403] Verovio MIDI output for tablature

---
 include/vrv/course.h |  6 ++-
 include/vrv/tabgrp.h |  5 +++
 include/vrv/tuning.h | 11 +++++
 src/course.cpp       | 10 ++++-
 src/iomei.cpp        |  8 +++-
 src/layerelement.cpp |  9 ++++-
 src/note.cpp         | 10 ++++-
 src/tabgrp.cpp       | 19 +++++++++
 src/tuning.cpp       | 95 ++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 166 insertions(+), 7 deletions(-)

diff --git a/include/vrv/course.h b/include/vrv/course.h
index ff6623905de..f82c1aff8c6 100644
--- a/include/vrv/course.h
+++ b/include/vrv/course.h
@@ -20,7 +20,11 @@ namespace vrv {
 /**
  * This class models the MEI <course> element.
  */
-class Course : public Object, public AttNNumberLike {
+class Course : public Object,
+               public AttAccidental,
+               public AttNNumberLike,
+               public AttOctave,
+               public AttPitch {
 public:
     /**
      * @name Constructors, destructors, and other standard methods
diff --git a/include/vrv/tabgrp.h b/include/vrv/tabgrp.h
index 4607a1deff4..2a0f9f7f28e 100644
--- a/include/vrv/tabgrp.h
+++ b/include/vrv/tabgrp.h
@@ -45,6 +45,11 @@ class TabGrp : public LayerElement, public DurationInterface {
      * Add an element to a element.
      */
     virtual bool IsSupportedChild(Object *object);
+    
+    /**
+     * See Object::CalcOnsetOffsetEnd
+     */
+    virtual int CalcOnsetOffsetEnd(FunctorParams *functorParams) override;
 
 protected:
     //
diff --git a/include/vrv/tuning.h b/include/vrv/tuning.h
index e41d7af16ab..cb5284267f0 100644
--- a/include/vrv/tuning.h
+++ b/include/vrv/tuning.h
@@ -44,6 +44,17 @@ class Tuning : public Object, public AttCourseLog {
      * Return the line for a the tuning and a given course and a notation type
      */
     int CalcPitchPos(int course, data_NOTATIONTYPE notationType, int lines);
+    
+    /**
+     * Calclate the MIDI pitch number for course/fret
+     * 
+     * @param[in] course
+     * @param[in] fret
+     * @param[in] notationType, used to default tuning if not otherwise specified
+     * 
+     * @return MIDI pitch
+     */
+    int CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType);
 
 protected:
     //
diff --git a/src/course.cpp b/src/course.cpp
index c478f76ebe7..a2fa53011f0 100644
--- a/src/course.cpp
+++ b/src/course.cpp
@@ -21,10 +21,13 @@ namespace vrv {
 
 static ClassRegistrar<Course> s_factory("course", COURSE);
 
-Course::Course() : Object("course-"), AttNNumberLike()
+Course::Course() : Object("course-")
 {
+    RegisterAttClass(ATT_ACCIDENTAL);
     RegisterAttClass(ATT_NNUMBERLIKE);
-
+    RegisterAttClass(ATT_OCTAVE);
+    RegisterAttClass(ATT_PITCH);
+    
     Reset();
 }
 
@@ -33,7 +36,10 @@ Course::~Course() {}
 void Course::Reset()
 {
     Object::Reset();
+    ResetAccidental();
     ResetNNumberLike();
+    ResetOctave();
+    ResetPitch();
 }
 
 bool Course::IsSupportedChild(Object *child)
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 44187cf2cb3..25afd02a887 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -1178,7 +1178,10 @@ void MEIOutput::WriteCourse(pugi::xml_node currentNode, Course *course)
     assert(course);
 
     WriteXmlId(currentNode, course);
+    course->WriteAccidental(currentNode);
     course->WriteNNumberLike(currentNode);
+    course->WriteOctave(currentNode);
+    course->WritePitch(currentNode);
 }
 
 void MEIOutput::WriteMeasure(pugi::xml_node currentNode, Measure *measure)
@@ -4035,8 +4038,11 @@ bool MEIInput::ReadCourse(Object *parent, pugi::xml_node course)
     SetMeiUuid(course, vrvCourse);
 
     parent->AddChild(vrvCourse);
+    vrvCourse->ReadAccidental(course);
     vrvCourse->ReadNNumberLike(course);
-
+    vrvCourse->ReadOctave(course);
+    vrvCourse->ReadPitch(course);
+    
     ReadUnsupportedAttr(course, vrvCourse);
 
     return true;
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 84dcf255f9f..6d5823e690e 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -2102,6 +2102,7 @@ int LayerElement::CalcOnsetOffset(FunctorParams *functorParams)
         if (note->IsGraceNote()) return FUNCTOR_CONTINUE;
 
         Chord *chord = note->IsChordTone();
+        TabGrp *tabGrp = note->IsTabGrpNote();
 
         // If the note has a @dur or a @dur.ges, take it into account
         // This means that overwriting only @dots or @dots.ges will not be taken into account
@@ -2109,6 +2110,10 @@ int LayerElement::CalcOnsetOffset(FunctorParams *functorParams)
             incrementScoreTime = chord->GetAlignmentDuration(
                 params->m_currentMensur, params->m_currentMeterSig, true, params->m_notationType);
         }
+        else if (tabGrp && !note->HasDur() && !note->HasDurGes()) {
+            incrementScoreTime = tabGrp->GetAlignmentDuration(
+                params->m_currentMensur, params->m_currentMeterSig, true, params->m_notationType);
+        }
         else {
             incrementScoreTime = note->GetAlignmentDuration(
                 params->m_currentMensur, params->m_currentMeterSig, true, params->m_notationType);
@@ -2131,8 +2136,8 @@ int LayerElement::CalcOnsetOffset(FunctorParams *functorParams)
         storeNote->SetScoreTimeOffset(params->m_currentScoreTime + incrementScoreTime);
         storeNote->SetRealTimeOffsetSeconds(params->m_currentRealTimeSeconds + realTimeIncrementSeconds);
 
-        // increase the currentTime accordingly, but only if not in a chord - checkit with note->IsChordTone()
-        if (!(note->IsChordTone())) {
+        // increase the currentTime accordingly, but only if not in a chord or tabGrp - checkit with note->IsChordTone() or note->IsTabGrpNote() 
+        if (!(note->IsChordTone()) && !(note->IsTabGrpNote())) {
             params->m_currentScoreTime += incrementScoreTime;
             params->m_currentRealTimeSeconds += realTimeIncrementSeconds;
         }
diff --git a/src/note.cpp b/src/note.cpp
index fab30c60e3f..5da3d81defd 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -32,6 +32,7 @@
 #include "tabgrp.h"
 #include "tie.h"
 #include "transposition.h"
+#include "tuning.h"
 #include "verse.h"
 #include "vrv.h"
 
@@ -1256,7 +1257,7 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
     if (note->HasPnum()) {
         pitch = note->GetPnum();
     }
-    else {
+    else if (note->HasPname() || note->HasPnameGes()){
         // calc pitch
         int midiBase = 0;
         data_PITCHNAME pname = note->GetPname();
@@ -1282,6 +1283,13 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
 
         pitch = midiBase + (oct + 1) * 12;
     }
+    else if (note->HasTabCourse()) {
+        // tablature
+        Staff* staff = vrv_cast<Staff *>(note->GetFirstAncestor(STAFF));
+        assert(staff);
+        if (staff->m_drawingTuning)
+            pitch = staff->m_drawingTuning->CalcPitchNumber(note->GetTabCourse(), note->GetTabFret(), staff->m_drawingNotationType);
+    }
 
     // We do store the MIDIPitch in the note even with a sameas
     this->SetMIDIPitch(pitch);
diff --git a/src/tabgrp.cpp b/src/tabgrp.cpp
index d12c8a05627..762b23f8f37 100644
--- a/src/tabgrp.cpp
+++ b/src/tabgrp.cpp
@@ -14,6 +14,7 @@
 //----------------------------------------------------------------------------
 
 #include "editorial.h"
+#include "functorparams.h"
 #include "note.h"
 #include "tabdursym.h"
 
@@ -57,4 +58,22 @@ bool TabGrp::IsSupportedChild(Object *child)
     return true;
 }
 
+int TabGrp::CalcOnsetOffsetEnd(FunctorParams *functorParams)
+{
+    CalcOnsetOffsetParams *params = vrv_params_cast<CalcOnsetOffsetParams *>(functorParams);
+    assert(params);
+
+    LayerElement *element = this->ThisOrSameasAsLink();
+
+    double incrementScoreTime = element->GetAlignmentDuration(
+        params->m_currentMensur, params->m_currentMeterSig, true, params->m_notationType);
+    incrementScoreTime = incrementScoreTime / (DUR_MAX / DURATION_4);
+    double realTimeIncrementSeconds = incrementScoreTime * 60.0 / params->m_currentTempo;
+
+    params->m_currentScoreTime += incrementScoreTime;
+    params->m_currentRealTimeSeconds += realTimeIncrementSeconds;
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/tuning.cpp b/src/tuning.cpp
index 3a201a8d107..3a78541aa6c 100644
--- a/src/tuning.cpp
+++ b/src/tuning.cpp
@@ -10,9 +10,11 @@
 //----------------------------------------------------------------------------
 
 #include <assert.h>
+#include <string>
 
 //----------------------------------------------------------------------------
 
+#include "comparison.h"
 #include "course.h"
 #include "editorial.h"
 
@@ -65,4 +67,97 @@ int Tuning::CalcPitchPos(int course, data_NOTATIONTYPE notationType, int lines)
     }
 }
 
+int Tuning::CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType)
+{
+    // Use <tuning><course>s, if available
+    // else use @tuning.standard, if available
+    // else use @notationType
+    
+    // Do we have the tuning for this course?
+    AttNNumberLikeComparison cnc(COURSE, std::to_string(course));
+    Course* const courseTuning{vrv_cast<Course*>(FindDescendantByComparison(&cnc))};
+    
+    if (courseTuning && courseTuning->HasPname() && courseTuning->HasOct()) {
+
+        // Distance in semitones from the octave's starting C to the given note
+        int midiBase{0};
+        switch (courseTuning->GetPname()) {
+            case PITCHNAME_c: midiBase = 0; break;
+            case PITCHNAME_d: midiBase = 2; break;
+            case PITCHNAME_e: midiBase = 4; break;
+            case PITCHNAME_f: midiBase = 5; break;
+            case PITCHNAME_g: midiBase = 7; break;
+            case PITCHNAME_a: midiBase = 9; break;
+            case PITCHNAME_b: midiBase = 11; break;
+            case PITCHNAME_NONE: break;
+        }
+
+        const int octave{courseTuning->GetOct()};
+        
+        // As this does not represent historical notation of any kind the only
+        // accidentals we should ever see are "s" and "f"
+        const int alter{(courseTuning->HasAccid())
+            ? (courseTuning->GetAccid() == ACCIDENTAL_WRITTEN_s)
+                ? 1
+                : (courseTuning->GetAccid() == ACCIDENTAL_WRITTEN_f)
+                ? -1
+                : 0
+            : 0};
+            
+        return (octave + 1) * 12 + midiBase + alter + fret; // MIDI note C4 = 60
+    }
+
+    // no <tuning><course> specified, fall back to @tuning.standard
+    // TODO what other values for @tuning.standard will there be?
+    
+    //                                  E4  B3  G3  D3  A2  E2
+    static const int guitarPitch[]     {64, 59, 55, 50, 45, 40}; // modern guitar
+    
+    //                                  E4  B3  G3  D3  A2  D2
+    static const int guitarDropDPitch[]{64, 59, 55, 50, 45, 38}; // modern guitar drop D
+    
+    //                                  G4  D4  A3  F3  C3  G2
+    static const int lutePitch[]       {67, 62, 57, 53, 48, 43}; // 6 course renaissance lute
+
+    const int* pitch{nullptr};
+    int pitchSize{0};
+    
+    switch (GetTuningStandard()) {
+    case COURSETUNING_guitar_drop_D:
+        pitch = guitarDropDPitch;
+        pitchSize = sizeof(guitarDropDPitch);
+        break;
+
+    case COURSETUNING_lute_renaissance_6:
+        pitch = lutePitch;
+        pitchSize = sizeof(lutePitch);
+        break;
+    
+    case COURSETUNING_NONE:
+        [[fallthrough]];
+
+    default:
+        // @tuning.standard is not specified, use @notationType
+        
+        if (    notationType == NOTATIONTYPE_tab_lute_french || 
+                notationType == NOTATIONTYPE_tab_lute_italian ||
+                notationType == NOTATIONTYPE_tab_lute_german
+           ) {
+            // lute tablature, assume 6 course renaissance lute
+            pitch = lutePitch;
+            pitchSize = sizeof(lutePitch);
+        }
+        else {
+            // assume modern guitar
+            pitch = guitarPitch;
+            pitchSize = sizeof(guitarPitch);
+        }
+        break;
+    }
+    
+    return (course > 0 && course <= pitchSize)
+        ? pitch[course - 1] + fret
+        : 0;
+}
+
 } // namespace vrv

From dc9fb88b091d217655beb2046b87122d50a3b218 Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Sat, 2 Oct 2021 18:44:10 +0100
Subject: [PATCH 003/403] Feedback from code review.

---
 src/course.cpp |   4 +-
 src/note.cpp   |  10 +++--
 src/tuning.cpp | 113 +++++++++++++++++++++++--------------------------
 3 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/src/course.cpp b/src/course.cpp
index a2fa53011f0..9859c84868e 100644
--- a/src/course.cpp
+++ b/src/course.cpp
@@ -21,13 +21,13 @@ namespace vrv {
 
 static ClassRegistrar<Course> s_factory("course", COURSE);
 
-Course::Course() : Object("course-")
+Course::Course() : Object("course-"), AttAccidental(), AttNNumberLike(), AttOctave(), AttPitch()
 {
     RegisterAttClass(ATT_ACCIDENTAL);
     RegisterAttClass(ATT_NNUMBERLIKE);
     RegisterAttClass(ATT_OCTAVE);
     RegisterAttClass(ATT_PITCH);
-    
+
     Reset();
 }
 
diff --git a/src/note.cpp b/src/note.cpp
index 5da3d81defd..1c16dd9dc7c 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1257,7 +1257,7 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
     if (note->HasPnum()) {
         pitch = note->GetPnum();
     }
-    else if (note->HasPname() || note->HasPnameGes()){
+    else if (note->HasPname() || note->HasPnameGes()) {
         // calc pitch
         int midiBase = 0;
         data_PITCHNAME pname = note->GetPname();
@@ -1285,10 +1285,12 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
     }
     else if (note->HasTabCourse()) {
         // tablature
-        Staff* staff = vrv_cast<Staff *>(note->GetFirstAncestor(STAFF));
+        Staff *staff = vrv_cast<Staff *>(note->GetFirstAncestor(STAFF));
         assert(staff);
-        if (staff->m_drawingTuning)
-            pitch = staff->m_drawingTuning->CalcPitchNumber(note->GetTabCourse(), note->GetTabFret(), staff->m_drawingNotationType);
+        if (staff->m_drawingTuning) {
+            pitch = staff->m_drawingTuning->CalcPitchNumber(
+                note->GetTabCourse(), note->GetTabFret(), staff->m_drawingNotationType);
+        }
     }
 
     // We do store the MIDIPitch in the note even with a sameas
diff --git a/src/tuning.cpp b/src/tuning.cpp
index 3a78541aa6c..1d02740834b 100644
--- a/src/tuning.cpp
+++ b/src/tuning.cpp
@@ -72,15 +72,15 @@ int Tuning::CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType
     // Use <tuning><course>s, if available
     // else use @tuning.standard, if available
     // else use @notationType
-    
+
     // Do we have the tuning for this course?
     AttNNumberLikeComparison cnc(COURSE, std::to_string(course));
-    Course* const courseTuning{vrv_cast<Course*>(FindDescendantByComparison(&cnc))};
-    
+    Course *courseTuning = vrv_cast<Course *>(FindDescendantByComparison(&cnc));
+
     if (courseTuning && courseTuning->HasPname() && courseTuning->HasOct()) {
 
         // Distance in semitones from the octave's starting C to the given note
-        int midiBase{0};
+        int midiBase = 0;
         switch (courseTuning->GetPname()) {
             case PITCHNAME_c: midiBase = 0; break;
             case PITCHNAME_d: midiBase = 2; break;
@@ -92,72 +92,67 @@ int Tuning::CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType
             case PITCHNAME_NONE: break;
         }
 
-        const int octave{courseTuning->GetOct()};
-        
+        const int octave = courseTuning->GetOct();
+
         // As this does not represent historical notation of any kind the only
         // accidentals we should ever see are "s" and "f"
-        const int alter{(courseTuning->HasAccid())
-            ? (courseTuning->GetAccid() == ACCIDENTAL_WRITTEN_s)
-                ? 1
-                : (courseTuning->GetAccid() == ACCIDENTAL_WRITTEN_f)
-                ? -1
-                : 0
-            : 0};
-            
+        int alter = 0;
+        if (courseTuning->HasAccid()) {
+            if (courseTuning->GetAccid() == ACCIDENTAL_WRITTEN_s)
+                alter = 1;
+            else if (courseTuning->GetAccid() == ACCIDENTAL_WRITTEN_f)
+                alter = -1;
+        }
+
         return (octave + 1) * 12 + midiBase + alter + fret; // MIDI note C4 = 60
     }
 
     // no <tuning><course> specified, fall back to @tuning.standard
     // TODO what other values for @tuning.standard will there be?
-    
-    //                                  E4  B3  G3  D3  A2  E2
-    static const int guitarPitch[]     {64, 59, 55, 50, 45, 40}; // modern guitar
-    
-    //                                  E4  B3  G3  D3  A2  D2
-    static const int guitarDropDPitch[]{64, 59, 55, 50, 45, 38}; // modern guitar drop D
-    
-    //                                  G4  D4  A3  F3  C3  G2
-    static const int lutePitch[]       {67, 62, 57, 53, 48, 43}; // 6 course renaissance lute
-
-    const int* pitch{nullptr};
-    int pitchSize{0};
-    
+
+    //                                 E4  B3  G3  D3  A2  E2
+    static const int guitarPitch[] = { 64, 59, 55, 50, 45, 40 }; // modern guitar
+
+    //                                      E4  B3  G3  D3  A2  D2
+    static const int guitarDropDPitch[] = { 64, 59, 55, 50, 45, 38 }; // modern guitar drop D
+
+    //                               G4  D4  A3  F3  C3  G2
+    static const int lutePitch[] = { 67, 62, 57, 53, 48, 43 }; // 6 course renaissance lute
+
+    const int *pitch = nullptr;
+    int pitchSize = 0;
+
     switch (GetTuningStandard()) {
-    case COURSETUNING_guitar_drop_D:
-        pitch = guitarDropDPitch;
-        pitchSize = sizeof(guitarDropDPitch);
-        break;
-
-    case COURSETUNING_lute_renaissance_6:
-        pitch = lutePitch;
-        pitchSize = sizeof(lutePitch);
-        break;
-    
-    case COURSETUNING_NONE:
-        [[fallthrough]];
-
-    default:
-        // @tuning.standard is not specified, use @notationType
-        
-        if (    notationType == NOTATIONTYPE_tab_lute_french || 
-                notationType == NOTATIONTYPE_tab_lute_italian ||
-                notationType == NOTATIONTYPE_tab_lute_german
-           ) {
-            // lute tablature, assume 6 course renaissance lute
+        case COURSETUNING_guitar_drop_D:
+            pitch = guitarDropDPitch;
+            pitchSize = sizeof(guitarDropDPitch);
+            break;
+
+        case COURSETUNING_lute_renaissance_6:
             pitch = lutePitch;
             pitchSize = sizeof(lutePitch);
-        }
-        else {
-            // assume modern guitar
-            pitch = guitarPitch;
-            pitchSize = sizeof(guitarPitch);
-        }
-        break;
+            break;
+
+        case COURSETUNING_NONE: [[fallthrough]];
+
+        default:
+            // @tuning.standard is not specified, use @notationType
+
+            if (notationType == NOTATIONTYPE_tab_lute_french || notationType == NOTATIONTYPE_tab_lute_italian
+                || notationType == NOTATIONTYPE_tab_lute_german) {
+                // lute tablature, assume 6 course renaissance lute
+                pitch = lutePitch;
+                pitchSize = sizeof(lutePitch);
+            }
+            else {
+                // assume modern guitar
+                pitch = guitarPitch;
+                pitchSize = sizeof(guitarPitch);
+            }
+            break;
     }
-    
-    return (course > 0 && course <= pitchSize)
-        ? pitch[course - 1] + fret
-        : 0;
+
+    return (course > 0 && course <= pitchSize) ? pitch[course - 1] + fret : 0;
 }
 
 } // namespace vrv

From 99aa6bde0da454cb6cb768b4e918fdbc4cc0ad37 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 2 Oct 2021 14:12:36 -0400
Subject: [PATCH 004/403] Fix clang-formatting

---
 include/vrv/course.h | 6 +-----
 include/vrv/tabgrp.h | 2 +-
 include/vrv/tuning.h | 6 +++---
 src/iomei.cpp        | 2 +-
 src/layerelement.cpp | 3 ++-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/include/vrv/course.h b/include/vrv/course.h
index 2b844524ad6..98cc355a0cc 100644
--- a/include/vrv/course.h
+++ b/include/vrv/course.h
@@ -20,11 +20,7 @@ namespace vrv {
 /**
  * This class models the MEI <course> element.
  */
-class Course : public Object,
-               public AttAccidental,
-               public AttNNumberLike,
-               public AttOctave,
-               public AttPitch {
+class Course : public Object, public AttAccidental, public AttNNumberLike, public AttOctave, public AttPitch {
 public:
     /**
      * @name Constructors, destructors, and other standard methods
diff --git a/include/vrv/tabgrp.h b/include/vrv/tabgrp.h
index 93c8e3a7fb1..f41cb6f0973 100644
--- a/include/vrv/tabgrp.h
+++ b/include/vrv/tabgrp.h
@@ -44,7 +44,7 @@ class TabGrp : public LayerElement, public DurationInterface {
      * Add an element to a element.
      */
     virtual bool IsSupportedChild(Object *object);
-    
+
     /**
      * See Object::CalcOnsetOffsetEnd
      */
diff --git a/include/vrv/tuning.h b/include/vrv/tuning.h
index c715dd13d4b..052f48147f0 100644
--- a/include/vrv/tuning.h
+++ b/include/vrv/tuning.h
@@ -43,14 +43,14 @@ class Tuning : public Object, public AttCourseLog {
      * Return the line for a the tuning and a given course and a notation type
      */
     int CalcPitchPos(int course, data_NOTATIONTYPE notationType, int lines);
-    
+
     /**
      * Calclate the MIDI pitch number for course/fret
-     * 
+     *
      * @param[in] course
      * @param[in] fret
      * @param[in] notationType, used to default tuning if not otherwise specified
-     * 
+     *
      * @return MIDI pitch
      */
     int CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType);
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 5968c393dc0..1d810c2bdf1 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -4185,7 +4185,7 @@ bool MEIInput::ReadCourse(Object *parent, pugi::xml_node course)
     vrvCourse->ReadNNumberLike(course);
     vrvCourse->ReadOctave(course);
     vrvCourse->ReadPitch(course);
-    
+
     ReadUnsupportedAttr(course, vrvCourse);
 
     return true;
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index b555156dfa7..b1e3c38eab4 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -2338,7 +2338,8 @@ int LayerElement::CalcOnsetOffset(FunctorParams *functorParams)
         storeNote->SetScoreTimeOffset(params->m_currentScoreTime + incrementScoreTime);
         storeNote->SetRealTimeOffsetSeconds(params->m_currentRealTimeSeconds + realTimeIncrementSeconds);
 
-        // increase the currentTime accordingly, but only if not in a chord or tabGrp - checkit with note->IsChordTone() or note->IsTabGrpNote() 
+        // increase the currentTime accordingly, but only if not in a chord or tabGrp - checkit with note->IsChordTone()
+        // or note->IsTabGrpNote()
         if (!(note->IsChordTone()) && !(note->IsTabGrpNote())) {
             params->m_currentScoreTime += incrementScoreTime;
             params->m_currentRealTimeSeconds += realTimeIncrementSeconds;

From 42854421cf258841e546fdc2934bc84305109843 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 2 Oct 2021 15:32:57 -0400
Subject: [PATCH 005/403] Adding comments blocks [skip-ci]

---
 include/vrv/course.h | 4 ++++
 include/vrv/tabgrp.h | 4 ++++
 include/vrv/tuning.h | 4 ++++
 src/course.cpp       | 4 ++++
 src/tabgrp.cpp       | 4 ++++
 src/tuning.cpp       | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/include/vrv/course.h b/include/vrv/course.h
index 98cc355a0cc..dd947080994 100644
--- a/include/vrv/course.h
+++ b/include/vrv/course.h
@@ -39,6 +39,10 @@ class Course : public Object, public AttAccidental, public AttNNumberLike, publi
      */
     virtual bool IsSupportedChild(Object *object);
 
+    //----------//
+    // Functors //
+    //----------//
+
 protected:
     //
 private:
diff --git a/include/vrv/tabgrp.h b/include/vrv/tabgrp.h
index f41cb6f0973..85cb32716bf 100644
--- a/include/vrv/tabgrp.h
+++ b/include/vrv/tabgrp.h
@@ -45,6 +45,10 @@ class TabGrp : public LayerElement, public DurationInterface {
      */
     virtual bool IsSupportedChild(Object *object);
 
+    //----------//
+    // Functors //
+    //----------//
+
     /**
      * See Object::CalcOnsetOffsetEnd
      */
diff --git a/include/vrv/tuning.h b/include/vrv/tuning.h
index 052f48147f0..dce88719dee 100644
--- a/include/vrv/tuning.h
+++ b/include/vrv/tuning.h
@@ -55,6 +55,10 @@ class Tuning : public Object, public AttCourseLog {
      */
     int CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType);
 
+    //----------//
+    // Functors //
+    //----------//
+
 protected:
     //
 private:
diff --git a/src/course.cpp b/src/course.cpp
index 8e4a7d2bde2..037e8c8cd46 100644
--- a/src/course.cpp
+++ b/src/course.cpp
@@ -48,4 +48,8 @@ bool Course::IsSupportedChild(Object *child)
     return false;
 }
 
+//----------------------------------------------------------------------------
+// Functor methods
+//----------------------------------------------------------------------------
+
 } // namespace vrv
diff --git a/src/tabgrp.cpp b/src/tabgrp.cpp
index e57b339cf63..bf0d6fdf633 100644
--- a/src/tabgrp.cpp
+++ b/src/tabgrp.cpp
@@ -58,6 +58,10 @@ bool TabGrp::IsSupportedChild(Object *child)
     return true;
 }
 
+//----------------------------------------------------------------------------
+// Functor methods
+//----------------------------------------------------------------------------
+
 int TabGrp::CalcOnsetOffsetEnd(FunctorParams *functorParams)
 {
     CalcOnsetOffsetParams *params = vrv_params_cast<CalcOnsetOffsetParams *>(functorParams);
diff --git a/src/tuning.cpp b/src/tuning.cpp
index f6a529e9226..aa4ebf05c6d 100644
--- a/src/tuning.cpp
+++ b/src/tuning.cpp
@@ -155,4 +155,8 @@ int Tuning::CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType
     return (course > 0 && course <= pitchSize) ? pitch[course - 1] + fret : 0;
 }
 
+//----------------------------------------------------------------------------
+// Functor methods
+//----------------------------------------------------------------------------
+
 } // namespace vrv

From 9a66730e2f92a9077bde23e7a9e75600305bec61 Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Mon, 4 Oct 2021 16:59:00 +0100
Subject: [PATCH 006/403] Fix conflicts course.cpp note.cpp

---
 src/course.cpp |  2 +-
 src/note.cpp   | 54 ++++++++++++--------------------------------------
 2 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/src/course.cpp b/src/course.cpp
index 037e8c8cd46..26a1d9d02da 100644
--- a/src/course.cpp
+++ b/src/course.cpp
@@ -21,7 +21,7 @@ namespace vrv {
 
 static const ClassRegistrar<Course> s_factory("course", COURSE);
 
-Course::Course() : Object("course-"), AttAccidental(), AttNNumberLike(), AttOctave(), AttPitch()
+Course::Course() : Object(COURSE, "course-"), AttAccidental(), AttNNumberLike(), AttOctave(), AttPitch()
 {
     RegisterAttClass(ATT_ACCIDENTAL);
     RegisterAttClass(ATT_NNUMBERLIKE);
diff --git a/src/note.cpp b/src/note.cpp
index a05cea6803a..eb9a98bd74a 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -578,7 +578,7 @@ void Note::CalcMIDIPitch(int shift)
     if (this->HasPnum()) {
         m_MIDIPitch = this->GetPnum();
     }
-    else {
+    else if (this->HasPname() || this->HasPnameGes()) {
         int midiBase = 0;
         data_PITCHNAME pname = this->GetPname();
         if (this->HasPnameGes()) pname = this->GetPnameGes();
@@ -604,6 +604,18 @@ void Note::CalcMIDIPitch(int shift)
 
         m_MIDIPitch = midiBase + (oct + 1) * 12;
     }
+    else if (this->HasTabCourse()) {
+        // tablature
+        Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
+        assert(staff);
+        if (staff->m_drawingTuning) {
+            m_MIDIPitch = staff->m_drawingTuning->CalcPitchNumber(
+                this->GetTabCourse(), this->GetTabFret(), staff->m_drawingNotationType);
+        }
+    }
+    else {
+        m_MIDIPitch = 0;
+    }
 }
 
 double Note::GetScoreTimeOnset() const
@@ -1307,46 +1319,6 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    int pitch = 0;
-    if (note->HasPnum()) {
-        pitch = note->GetPnum();
-    }
-    else if (note->HasPname() || note->HasPnameGes()) {
-        // calc pitch
-        int midiBase = 0;
-        data_PITCHNAME pname = note->GetPname();
-        if (note->HasPnameGes()) pname = note->GetPnameGes();
-        switch (pname) {
-            case PITCHNAME_c: midiBase = 0; break;
-            case PITCHNAME_d: midiBase = 2; break;
-            case PITCHNAME_e: midiBase = 4; break;
-            case PITCHNAME_f: midiBase = 5; break;
-            case PITCHNAME_g: midiBase = 7; break;
-            case PITCHNAME_a: midiBase = 9; break;
-            case PITCHNAME_b: midiBase = 11; break;
-            case PITCHNAME_NONE: break;
-        }
-        int oct = note->GetOct();
-        if (note->HasOctGes()) oct = note->GetOctGes();
-
-        // Check for accidentals
-        midiBase += note->GetChromaticAlteration();
-
-        // Adjustment for transposition intruments
-        midiBase += params->m_transSemi;
-
-        pitch = midiBase + (oct + 1) * 12;
-    }
-    else if (note->HasTabCourse()) {
-        // tablature
-        Staff *staff = vrv_cast<Staff *>(note->GetFirstAncestor(STAFF));
-        assert(staff);
-        if (staff->m_drawingTuning) {
-            pitch = staff->m_drawingTuning->CalcPitchNumber(
-                note->GetTabCourse(), note->GetTabFret(), staff->m_drawingNotationType);
-        }
-    }
-
     int channel = params->m_midiChannel;
     int velocity = MIDI_VELOCITY;
     if (this->HasVel()) velocity = this->GetVel();

From cf8cf9b001e0ccc104d81eea340421f6664b3134 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 4 Oct 2021 15:11:58 -0400
Subject: [PATCH 007/403] Adding lute.baroque.d.minor

---
 libmei/attconverter.cpp | 2 ++
 libmei/atttypes.h       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/libmei/attconverter.cpp b/libmei/attconverter.cpp
index cf63c7b13bf..425f9011e11 100644
--- a/libmei/attconverter.cpp
+++ b/libmei/attconverter.cpp
@@ -1089,6 +1089,7 @@ std::string AttConverter::CoursetuningToStr(data_COURSETUNING data) const
         case COURSETUNING_guitar_open_A: value = "guitar.open.A"; break;
         case COURSETUNING_lute_renaissance_6: value = "lute.renaissance.6"; break;
         case COURSETUNING_lute_baroque_d_major: value = "lute.baroque.d.major"; break;
+        case COURSETUNING_lute_baroque_d_minor: value = "lute.baroque.d.minor"; break;
         default:
             LogWarning("Unknown value '%d' for data.COURSETUNING", data);
             value = "";
@@ -1106,6 +1107,7 @@ data_COURSETUNING AttConverter::StrToCoursetuning(const std::string &value, bool
     if (value == "guitar.open.A") return COURSETUNING_guitar_open_A;
     if (value == "lute.renaissance.6") return COURSETUNING_lute_renaissance_6;
     if (value == "lute.baroque.d.major") return COURSETUNING_lute_baroque_d_major;
+    if (value == "lute.baroque.d.minor") return COURSETUNING_lute_baroque_d_minor;
     if (logWarning && !value.empty())
         LogWarning("Unsupported value '%s' for data.COURSETUNING", value.c_str());
     return COURSETUNING_NONE;
diff --git a/libmei/atttypes.h b/libmei/atttypes.h
index a7e02e90b11..cb4c8abd463 100644
--- a/libmei/atttypes.h
+++ b/libmei/atttypes.h
@@ -526,6 +526,7 @@ enum data_COURSETUNING {
     COURSETUNING_guitar_open_A,
     COURSETUNING_lute_renaissance_6,
     COURSETUNING_lute_baroque_d_major,
+    COURSETUNING_lute_baroque_d_minor,
     COURSETUNING_MAX
 };
 

From d417bb7156ba678092830684a57c7dc0d1c8fda4 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 21 Dec 2021 08:12:16 +0100
Subject: [PATCH 008/403] Store attribute

---
 include/vrv/scoredefinterface.h | 1 +
 src/durationinterface.cpp       | 1 +
 src/iomei.cpp                   | 2 ++
 src/scoredefinterface.cpp       | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/include/vrv/scoredefinterface.h b/include/vrv/scoredefinterface.h
index 7803dd98908..bad027bb0f1 100644
--- a/include/vrv/scoredefinterface.h
+++ b/include/vrv/scoredefinterface.h
@@ -28,6 +28,7 @@ namespace vrv {
  * It is not an abstract class but should not be instanciated directly.
  */
 class ScoreDefInterface : public Interface,
+                          public AttDurationDefault,
                           public AttLyricStyle,
                           public AttMeasureNumbers,
                           public AttMidiTempo,
diff --git a/src/durationinterface.cpp b/src/durationinterface.cpp
index c9b1041600f..8fcf757b294 100644
--- a/src/durationinterface.cpp
+++ b/src/durationinterface.cpp
@@ -176,6 +176,7 @@ bool DurationInterface::IsLastInBeam(LayerElement *noteOrRest)
 
 int DurationInterface::GetActualDur() const
 {
+    if (!this->HasDur()) return DURATION_NONE;
     // maxima (-1) is a mensural only value
     if (this->GetDur() == DURATION_maxima) return DUR_MX;
     return (this->GetDur() & DUR_MENSURAL_MASK);
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 6eda889aaa2..390997a19f7 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -2684,6 +2684,7 @@ void MEIOutput::WriteScoreDefInterface(pugi::xml_node element, ScoreDefInterface
 {
     assert(interface);
 
+    interface->WriteDurationDefault(element);
     interface->WriteLyricStyle(element);
     interface->WriteMidiTempo(element);
     interface->WriteMultinumMeasures(element);
@@ -6472,6 +6473,7 @@ bool MEIInput::ReadPositionInterface(pugi::xml_node element, PositionInterface *
 
 bool MEIInput::ReadScoreDefInterface(pugi::xml_node element, ScoreDefInterface *interface)
 {
+    interface->ReadDurationDefault(element);
     interface->ReadLyricStyle(element);
     interface->ReadMidiTempo(element);
     interface->ReadMultinumMeasures(element);
diff --git a/src/scoredefinterface.cpp b/src/scoredefinterface.cpp
index cbcaeff255c..6dc79e4ed18 100644
--- a/src/scoredefinterface.cpp
+++ b/src/scoredefinterface.cpp
@@ -25,6 +25,7 @@ namespace vrv {
 
 ScoreDefInterface::ScoreDefInterface()
     : Interface()
+    , AttDurationDefault()
     , AttLyricStyle()
     , AttMeasureNumbers()
     , AttMidiTempo()
@@ -33,6 +34,7 @@ ScoreDefInterface::ScoreDefInterface()
     , AttSpacing()
     , AttSystems()
 {
+    RegisterInterfaceAttClass(ATT_DURATIONDEFAULT);
     RegisterInterfaceAttClass(ATT_LYRICSTYLE);
     RegisterInterfaceAttClass(ATT_MEASURENUMBERS);
     RegisterInterfaceAttClass(ATT_METERSIGDEFAULTLOG);
@@ -50,6 +52,7 @@ ScoreDefInterface::~ScoreDefInterface() {}
 
 void ScoreDefInterface::Reset()
 {
+    ResetDurationDefault();
     ResetLyricStyle();
     ResetMeasureNumbers();
     ResetMidiTempo();

From 2f4dccbfee45e4b0d61b7864e2defd2fc7520c63 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 22 Dec 2021 12:00:46 +0100
Subject: [PATCH 009/403] Start 3.9.0

---
 CHANGELOG.md                  | 2 ++
 Verovio.podspec               | 2 +-
 bindings/java/pom.xml         | 2 +-
 bindings/python/.pypi-version | 2 +-
 codemeta.json                 | 4 ++--
 emscripten/npm/package.json   | 2 +-
 include/vrv/vrvdef.h          | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d44ee6626f7..6568331de8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [unreleased]
+
+## [3.8.0] - 2021-12-22
 * Support for figured-bass extenders on `f` without `@tstamp` or `@startid` 
 * Improved page-based MEI output with validation with a customized MEI Schema
 * Improved layout with beams and control events (ornaments, fingering, etc.) (@eNote-GmBH)
diff --git a/Verovio.podspec b/Verovio.podspec
index b48756c9589..d01fc92b6e8 100644
--- a/Verovio.podspec
+++ b/Verovio.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = 'Verovio'
-  s.version        = '3.8.0-dev'
+  s.version        = '3.9.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/bindings/java/pom.xml b/bindings/java/pom.xml
index 6beede06abb..50722b56275 100644
--- a/bindings/java/pom.xml
+++ b/bindings/java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.rism.verovio</groupId>
   <artifactId>VerovioToolkit</artifactId>
-  <version>3.8.0-dev</version>
+  <version>3.9.0-dev</version>
   <packaging>jar</packaging>
 
   <name>VerovioToolkit</name>
diff --git a/bindings/python/.pypi-version b/bindings/python/.pypi-version
index 39f5337d849..c92119a1aeb 100644
--- 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.8.0
+3.9.0
diff --git a/codemeta.json b/codemeta.json
index a42291a209c..932b21f48e1 100644
--- 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.8.0-dev",
-  "datePublished": "2021-11-22",
+  "softwareVersion": "3.9.0-dev",
+  "datePublished": "2021-12-22",
   "license": "https://www.gnu.org/licenses/lgpl-3.0",
   "programmingLanguage": [{
     "@type": "ComputerLanguage",
diff --git a/emscripten/npm/package.json b/emscripten/npm/package.json
index 8332c206fa6..c95f25acb33 100644
--- a/emscripten/npm/package.json
+++ b/emscripten/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "verovio",
-  "version": "3.6.0",
+  "version": "3.9.0",
   "description": "This is the stable version of the verovio package",
   "main": "index.js",
   "keywords": [
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 5980fa35555..3aa640f3942 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -36,7 +36,7 @@ namespace vrv {
 //----------------------------------------------------------------------------
 
 #define VERSION_MAJOR 3
-#define VERSION_MINOR 8
+#define VERSION_MINOR 9
 #define VERSION_REVISION 0
 // Adds "-dev" in the version number - should be set to false for releases
 #define VERSION_DEV true

From 14e6db0571ea94f2bf04937442b717c7eb8bd7ac Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 22 Dec 2021 12:08:14 +0100
Subject: [PATCH 010/403] remove changelog duplicate [skip-ci]

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6568331de8f..9ded37a5e26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,6 @@
 * Improved layout with beams and control events (ornaments, fingering, etc.) (@eNote-GmBH)
 * Improve enharmonic tie overlap with accidentals (@eNote-GmBH)
 * Improved Plaine and Easie validation output with error codes and values
-* Improved adjacent note tie and enharmonic tie overlap (eNote-GmBH)
 * Additional parameters to the getMEI method for exporting selected content (@eNote-GmBH)
 * Option --multi-rest-thickness to control the thickness of measure rests (@eNote-GmBH)
 

From b06edc559c6476889e0dec38a793f97d39073823 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Wed, 10 Nov 2021 10:55:40 +0100
Subject: [PATCH 011/403] use short int

---
 include/vrv/iomusxml.h | 26 ++++++------
 src/iomusxml.cpp       | 90 +++++++++++++++++++++---------------------
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index e4c91917145..9504b6f79e7 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -64,26 +64,26 @@ namespace musicxml {
 
     class OpenSlur {
     public:
-        OpenSlur(const std::string &measureNum, const int &number)
+        OpenSlur(const std::string &measureNum, const short int &number)
         {
             m_measureNum = measureNum;
             m_number = number;
         }
 
         std::string m_measureNum;
-        int m_number;
+        short int m_number;
     };
 
     class CloseSlur {
     public:
-        CloseSlur(const std::string &measureNum, const int &number)
+        CloseSlur(const std::string &measureNum, const short int &number)
         {
             m_measureNum = measureNum;
             m_number = number;
         }
 
         std::string m_measureNum;
-        int m_number;
+        short int m_number;
     };
 
     class OpenSpanner {
@@ -191,16 +191,16 @@ class MusicXmlInput : public Input {
      * @name Top level methods for reading MusicXML part and measure elements.
      */
     ///@{
-    bool ReadMusicXmlPart(pugi::xml_node node, Section *section, int nbStaves, int staffOffset);
+    bool ReadMusicXmlPart(pugi::xml_node node, Section *section, short int nbStaves, const short int staffOffset);
     bool ReadMusicXmlMeasure(
-        pugi::xml_node node, Section *section, Measure *measure, int nbStaves, int staffOffset, int index);
+        pugi::xml_node node, Section *section, Measure *measure, short int nbStaves, const short int staffOffset, int index);
     ///@}
 
     /*
      * Methods for reading the first MusicXML attributes element as MEI staffDef.
      * Returns the number of staves in the part.
      */
-    int ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp, int staffOffset);
+    int ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp, const short int staffOffset);
 
     /*
      * @name Methods for reading the content of a MusicXML measure.
@@ -209,12 +209,12 @@ class MusicXmlInput : public Input {
     void ReadMusicXmlAttributes(pugi::xml_node, Section *section, Measure *measure, const std::string &measureNum);
     void ReadMusicXmlBackup(pugi::xml_node, Measure *measure, const std::string &measureNum);
     void ReadMusicXmlBarLine(pugi::xml_node, Measure *measure, const std::string &measureNum);
-    void ReadMusicXmlDirection(pugi::xml_node, Measure *measure, const std::string &measureNum, const int staffOffset);
+    void ReadMusicXmlDirection(pugi::xml_node, Measure *measure, const std::string &measureNum, const short int staffOffset);
     void ReadMusicXmlFigures(pugi::xml_node, Measure *measure, const std::string &measureNum);
     void ReadMusicXmlForward(pugi::xml_node, Measure *measure, const std::string &measureNum);
     void ReadMusicXmlHarmony(pugi::xml_node, Measure *measure, const std::string &measureNum);
     void ReadMusicXmlNote(
-        pugi::xml_node, Measure *measure, const std::string &measureNum, const int staffOffset, Section *section);
+        pugi::xml_node, Measure *measure, const std::string &measureNum, const short int staffOffset, Section *section);
     void ReadMusicXmlPrint(pugi::xml_node, Section *section);
     void ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Layer *layer, bool isChord);
     void ReadMusicXmlTupletStart(const pugi::xml_node &node, const pugi::xml_node &tupletStart, Layer *layer);
@@ -267,13 +267,13 @@ class MusicXmlInput : public Input {
     /*
      * Returns the appropriate first layer of a staff.
      */
-    Layer *SelectLayer(int staffNb, Measure *measure);
+    Layer *SelectLayer(short int staffNb, Measure *measure);
 
     /*
      * Returns the layer with @n=layerNb on the staff.
      * Creates the layer if not found.
      */
-    Layer *SelectLayer(int layerNb, Staff *staff);
+    Layer *SelectLayer(short int layerNb, Staff *staff);
 
     /*
      * @name Methods for converting the content of MusicXML attributes.
@@ -323,8 +323,8 @@ class MusicXmlInput : public Input {
     ///@{
     void OpenTie(Note *note, Tie *tie);
     void CloseTie(Note *note);
-    void OpenSlur(Measure *measure, int number, Slur *slur);
-    void CloseSlur(Measure *measure, int number, LayerElement *element);
+    void OpenSlur(Measure *measure, short int number, Slur *slur);
+    void CloseSlur(Measure *measure, short int number, LayerElement *element);
     ///@}
 
     /*
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 5c412915235..bdc5e437274 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -401,7 +401,7 @@ Layer *MusicXmlInput::SelectLayer(pugi::xml_node node, Measure *measure)
     if (m_isLayerInitialized) return m_currentLayer;
 
     // Find voice number of node
-    int layerNum = (node.child("voice")) ? node.child("voice").text().as_int() : 1;
+    short int layerNum = (node.child("voice")) ? node.child("voice").text().as_int() : 1;
     if (layerNum < 1) {
         LogWarning("MusicXML import: Layer %d cannot be found", layerNum);
         layerNum = 1;
@@ -417,7 +417,7 @@ Layer *MusicXmlInput::SelectLayer(pugi::xml_node node, Measure *measure)
     }
 
     // if not, take staff info of node element
-    int staffNum = (node.child("staff")) ? node.child("staff").text().as_int() : 1;
+    short int staffNum = (node.child("staff")) ? node.child("staff").text().as_int() : 1;
     if ((staffNum < 1) || (staffNum > measure->GetChildCount(STAFF))) {
         LogWarning("MusicXML import: Staff %d cannot be found", staffNum);
         staffNum = 1;
@@ -430,7 +430,7 @@ Layer *MusicXmlInput::SelectLayer(pugi::xml_node node, Measure *measure)
     return m_currentLayer;
 }
 
-Layer *MusicXmlInput::SelectLayer(int staffNum, Measure *measure)
+Layer *MusicXmlInput::SelectLayer(short int staffNum, Measure *measure)
 {
     staffNum--;
     Staff *staff = vrv_cast<Staff *>(measure->GetChild(staffNum, STAFF));
@@ -439,7 +439,7 @@ Layer *MusicXmlInput::SelectLayer(int staffNum, Measure *measure)
     return SelectLayer(-1, staff);
 }
 
-Layer *MusicXmlInput::SelectLayer(int layerNum, Staff *staff)
+Layer *MusicXmlInput::SelectLayer(short int layerNum, Staff *staff)
 {
     Layer *layer = NULL;
     // no layer specified, return the first one (if any)
@@ -526,7 +526,7 @@ void MusicXmlInput::CloseTie(Note *note)
     }
 }
 
-void MusicXmlInput::OpenSlur(Measure *measure, int number, Slur *slur)
+void MusicXmlInput::OpenSlur(Measure *measure, short int number, Slur *slur)
 {
     // try to match open slur with slur stops within that measure
     for (auto iter = m_slurStopStack.begin(); iter != m_slurStopStack.end(); ++iter) {
@@ -541,7 +541,7 @@ void MusicXmlInput::OpenSlur(Measure *measure, int number, Slur *slur)
     m_slurStack.push_back({ slur, openSlur });
 }
 
-void MusicXmlInput::CloseSlur(Measure *measure, int number, LayerElement *element)
+void MusicXmlInput::CloseSlur(Measure *measure, short int number, LayerElement *element)
 {
     // try to match slur stop to open slurs by slur number
     std::vector<std::pair<Slur *, musicxml::OpenSlur>>::reverse_iterator riter;
@@ -691,9 +691,9 @@ void MusicXmlInput::PrintMetronome(pugi::xml_node metronome, Tempo *tempo)
                 // find separator or use end() if there is no separator
                 const auto separator = std::find_if(iter, metronomeElements.end(),
                     [](const auto pair) { return pair.first == MetronomeElements::SEPARATOR; });
-                const int dotCount = (int)std::count_if(
+                const short int dotCount = (int)std::count_if(
                     iter, separator, [](const auto pair) { return pair.first == MetronomeElements::BEAT_UNIT_DOT; });
-                for (int i = 0; i < dotCount; i++) {
+                for (short int i = 0; i < dotCount; i++) {
                     verovioText += L"\xE1E7"; // SMUFL augmentation dot
                 }
                 // set @mmUnit and @mmDots attributes only based on the first beat-unit in the sequence
@@ -833,7 +833,7 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
     m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
     m_staffGrpStack.push_back(staffGrp);
 
-    int staffOffset = 0;
+    short int staffOffset = 0;
     m_octDis.push_back(0);
 
     pugi::xpath_node scoreMidiBpm = root.select_node("/score-partwise/part[1]/measure[1]/sound[@tempo][1]");
@@ -988,7 +988,7 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
             // create the staffDef(s)
             StaffGrp *partStaffGrp = new StaffGrp();
             partStaffGrp->SetUuid(partId.c_str());
-            const int nbStaves
+            const short int nbStaves
                 = ReadMusicXmlPartAttributesAsStaffDef(partFirstMeasure.node(), partStaffGrp, staffOffset);
             // if we have more than one staff in the part we create a new staffGrp
             if (nbStaves > 1) {
@@ -1201,13 +1201,13 @@ void MusicXmlInput::ReadMusicXmlTitle(pugi::xml_node root)
     app.append_attribute("version").set_value(GetVersion().c_str());
 }
 
-int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp, int staffOffset)
+int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp, short int staffOffset)
 {
     assert(node);
     assert(staffGrp);
 
     // First get the number of staves in the part
-    int nbStaves = 1;
+    short int nbStaves = 1;
     pugi::xpath_node staves = node.select_node("attributes[1]/staves");
     if (staves) {
         nbStaves = staves.node().text().as_int();
@@ -1291,7 +1291,7 @@ int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, Sta
             if (!staffDetails) {
                 staffDetails = it->select_node("staff-details");
             }
-            int staffLines = staffDetails.node().select_node("staff-lines").node().text().as_int();
+            short int staffLines = staffDetails.node().select_node("staff-lines").node().text().as_int();
             if (staffLines) {
                 staffDef->SetLines(staffLines);
             }
@@ -1404,7 +1404,7 @@ void MusicXmlInput::ReadMusicXMLMeterSig(const pugi::xml_node &time, Object *par
     }
 }
 
-bool MusicXmlInput::ReadMusicXmlPart(pugi::xml_node node, Section *section, int nbStaves, int staffOffset)
+bool MusicXmlInput::ReadMusicXmlPart(pugi::xml_node node, Section *section, short int nbStaves, short int staffOffset)
 {
     assert(node);
     assert(section);
@@ -1471,7 +1471,7 @@ bool MusicXmlInput::ReadMusicXmlPart(pugi::xml_node node, Section *section, int
 }
 
 bool MusicXmlInput::ReadMusicXmlMeasure(
-    pugi::xml_node node, Section *section, Measure *measure, int nbStaves, int staffOffset, int index)
+    pugi::xml_node node, Section *section, Measure *measure, short int nbStaves, short int staffOffset, int index)
 {
     assert(node);
     assert(measure);
@@ -1636,7 +1636,7 @@ void MusicXmlInput::ReadMusicXmlAttributes(
     pugi::xml_node clef = node.child("clef");
     if (clef) {
         // check if we have a staff number
-        int staffNum = clef.attribute("number").as_int();
+        short int staffNum = clef.attribute("number").as_int();
         staffNum = (staffNum < 1) ? 1 : staffNum;
         Staff *staff = dynamic_cast<Staff *>(measure->GetChild(staffNum - 1, STAFF));
         assert(staff);
@@ -1772,7 +1772,7 @@ void MusicXmlInput::ReadMusicXmlBarLine(pugi::xml_node node, Measure *measure, c
     }
 
     // fermatas
-    int fermataCounter = 0;
+    short int fermataCounter = 0;
     for (pugi::xml_node xmlFermata : node.children("fermata")) {
         ++fermataCounter;
         Fermata *fermata = new Fermata();
@@ -1802,7 +1802,7 @@ void MusicXmlInput::ReadMusicXmlBarLine(pugi::xml_node node, Measure *measure, c
 }
 
 void MusicXmlInput::ReadMusicXmlDirection(
-    pugi::xml_node node, Measure *measure, const std::string &measureNum, const int staffOffset)
+    pugi::xml_node node, Measure *measure, const std::string &measureNum, const short int staffOffset)
 {
     assert(node);
     assert(measure);
@@ -1812,7 +1812,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
 
     const pugi::xml_node typeNode = node.child("direction-type");
     const pugi::xpath_node voice = node.select_node("voice");
-    const int offset = node.child("offset").text().as_int();
+    const short int offset = node.child("offset").text().as_int();
     const pugi::xml_node staffNode = node.child("staff");
     const pugi::xml_node soundNode = node.child("sound");
 
@@ -1823,7 +1823,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
     // Bracket
     pugi::xml_node bracket = typeNode.child("bracket");
     if (bracket) {
-        int voiceNumber = bracket.attribute("number").as_int();
+        short int voiceNumber = bracket.attribute("number").as_int();
         voiceNumber = (voiceNumber < 1) ? 1 : voiceNumber;
         if (HasAttributeWithValue(bracket, "type", "stop")) {
             if (m_bracketStack.empty()) {
@@ -1879,9 +1879,9 @@ void MusicXmlInput::ReadMusicXmlDirection(
     // Dashes (to be connected with previous <dir> or <dynam> as @extender and @tstamp2 attribute
     pugi::xpath_node dashes = typeNode.select_node("bracket|dashes");
     if (dashes) {
-        int dashesNumber = dashes.node().attribute("number").as_int();
+        short int dashesNumber = dashes.node().attribute("number").as_int();
         dashesNumber = (dashesNumber < 1) ? 1 : dashesNumber;
-        int staffNum = 1;
+        short int staffNum = 1;
         if (staffNode) staffNum = staffNode.text().as_int() + staffOffset;
         if (HasAttributeWithValue(dashes.node(), "type", "stop")) {
             std::vector<std::pair<ControlElement *, musicxml::OpenDashes>>::iterator iter = m_openDashesStack.begin();
@@ -1986,9 +1986,9 @@ void MusicXmlInput::ReadMusicXmlDirection(
 
             pugi::xpath_node extender = (words.end() - 1)->parent().next_sibling("direction-type").first_child();
             if (!strcmp(extender.node().name(), "bracket") || !strcmp(extender.node().name(), "dashes")) {
-                int extNumber = extender.node().attribute("number").as_int();
+                short int extNumber = extender.node().attribute("number").as_int();
                 extNumber = (extNumber < 1) ? 1 : extNumber;
-                int staffNum = staffNode.text().as_int() + staffOffset;
+                short int staffNum = staffNode.text().as_int() + staffOffset;
                 staffNum = (staffNum < 1) ? 1 : staffNum;
                 dir->SetExtender(BOOLEAN_true);
                 if (std::strncmp(extender.node().name(), "bracket", 7) == 0) {
@@ -2044,9 +2044,9 @@ void MusicXmlInput::ReadMusicXmlDirection(
         if (!dynamics.empty()) {
             pugi::xpath_node extender = (dynamics.end() - 1)->parent().next_sibling("direction-type").first_child();
             if (!strcmp(extender.node().name(), "bracket") || !strcmp(extender.node().name(), "dashes")) {
-                int extNumber = extender.node().attribute("number").as_int();
+                short int extNumber = extender.node().attribute("number").as_int();
                 extNumber = (extNumber < 1) ? 1 : extNumber;
-                int staffNum = staffNode.text().as_int() + staffOffset;
+                short int staffNum = staffNode.text().as_int() + staffOffset;
                 staffNum = (staffNum < 1) ? 1 : staffNum;
                 dynam->SetExtender(BOOLEAN_true);
                 if (std::strncmp(extender.node().name(), "bracket", 7) == 0) {
@@ -2065,7 +2065,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
     // Hairpins
     pugi::xpath_node_set wedges = node.select_nodes("direction-type/wedge");
     for (pugi::xpath_node_set::const_iterator wedge = wedges.begin(); wedge != wedges.end(); ++wedge) {
-        int hairpinNumber = wedge->node().attribute("number").as_int();
+        short int hairpinNumber = wedge->node().attribute("number").as_int();
         hairpinNumber = (hairpinNumber < 1) ? 1 : hairpinNumber;
         if (HasAttributeWithValue(wedge->node(), "type", "stop")) {
             // match wedge type=stop to open hairpin
@@ -2144,7 +2144,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
     // Ottava
     pugi::xml_node xmlShift = typeNode.child("octave-shift");
     if (xmlShift) {
-        const int staffNum = (!staffNode) ? 1 : staffNode.text().as_int() + staffOffset;
+        const short int staffNum = (!staffNode) ? 1 : staffNode.text().as_int() + staffOffset;
         if (HasAttributeWithValue(xmlShift, "type", "stop")) {
             m_octDis[staffNum] = 0;
             for (auto iter = m_controlElements.begin(); iter != m_controlElements.end(); ++iter) {
@@ -2169,7 +2169,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
             octave->SetColor(xmlShift.attribute("color").as_string());
             octave->SetDisPlace(octave->AttOctaveDisplacement::StrToStaffrelBasic(placeStr.c_str()));
             octave->SetN(xmlShift.attribute("number").as_string());
-            const int octDisNum = xmlShift.attribute("size") ? xmlShift.attribute("size").as_int() : 8;
+            const short int octDisNum = xmlShift.attribute("size") ? xmlShift.attribute("size").as_int() : 8;
             octave->SetDis(octave->AttOctaveDisplacement::StrToOctaveDis(std::to_string(octDisNum)));
             m_octDis[staffNum] = (octDisNum + 2) / 8;
             if (HasAttributeWithValue(xmlShift, "type", "up")) {
@@ -2231,7 +2231,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
     // Principal voice
     pugi::xml_node lead = typeNode.child("principal-voice");
     if (lead) {
-        int voiceNumber = lead.attribute("number").as_int();
+        short int voiceNumber = lead.attribute("number").as_int();
         voiceNumber = (voiceNumber < 1) ? 1 : voiceNumber;
         if (HasAttributeWithValue(lead, "type", "stop")) {
             const int measureDifference
@@ -2265,7 +2265,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
         const std::string lang = rehearsal.attribute("xml:lang") ? rehearsal.attribute("xml:lang").as_string() : "it";
         const std::string textStr = GetContent(rehearsal);
         reh->SetColor(rehearsal.attribute("color").as_string());
-        int staffNum = staffNode.text().as_int() + staffOffset;
+        short int staffNum = staffNode.text().as_int() + staffOffset;
         staffNum = (staffNum < 1) ? 1 : staffNum;
         reh->SetStaff(reh->AttStaffIdent::StrToXsdPositiveIntegerList(std::to_string(staffNum)));
         reh->SetLang(lang);
@@ -2427,7 +2427,7 @@ void MusicXmlInput::ReadMusicXmlHarmony(pugi::xml_node node, Measure *measure, c
 }
 
 void MusicXmlInput::ReadMusicXmlNote(
-    pugi::xml_node node, Measure *measure, const std::string &measureNum, const int staffOffset, Section *section)
+    pugi::xml_node node, Measure *measure, const std::string &measureNum, const short int staffOffset, Section *section)
 {
     assert(node);
     assert(measure);
@@ -2474,15 +2474,15 @@ void MusicXmlInput::ReadMusicXmlNote(
     bool beamStart = node.select_node("beam[@number='1'][text()='begin']");
     // tremolos
     pugi::xpath_node tremolo = notations.node().select_node("ornaments/tremolo");
-    int tremSlashNum = -1;
+    short int tremSlashNum = -1;
     if (tremolo) {
         if (HasAttributeWithValue(tremolo.node(), "type", "start")) {
             if (!isChord) {
                 FTrem *fTrem = new FTrem();
                 AddLayerElement(layer, fTrem);
                 m_elementStackMap.at(layer).push_back(fTrem);
-                int beamFloatNum = tremolo.node().text().as_int(); // number of floating beams
-                int beamAttachedNum = 0; // number of attached beams
+                short int beamFloatNum = tremolo.node().text().as_int(); // number of floating beams
+                short int beamAttachedNum = 0; // number of attached beams
                 while (beamStart && beamAttachedNum < 8) { // count number of (attached) beams, max 8
                     std::ostringstream o;
                     o << "beam[@number='" << ++beamAttachedNum + 1 << "'][text()='begin']";
@@ -2770,7 +2770,7 @@ void MusicXmlInput::ReadMusicXmlNote(
 
         // verse / syl
         for (pugi::xml_node lyric : node.children("lyric")) {
-            int lyricNumber = lyric.attribute("number").as_int();
+            short int lyricNumber = lyric.attribute("number").as_int();
             lyricNumber = (lyricNumber < 1) ? 1 : lyricNumber;
             Verse *verse = new Verse();
             verse->SetColor(lyric.attribute("color").as_string());
@@ -2782,7 +2782,7 @@ void MusicXmlInput::ReadMusicXmlNote(
                     // const std::string textColor = textNode.attribute("color").as_string();
                     const std::string textStyle = textNode.attribute("font-style").as_string();
                     const std::string textWeight = textNode.attribute("font-weight").as_string();
-                    int lineThrough = textNode.attribute("line-through").as_int();
+                    short int lineThrough = textNode.attribute("line-through").as_int();
                     const std::string lang = textNode.attribute("xml:lang").as_string();
                     std::string textStr = textNode.text().as_string();
 
@@ -2877,7 +2877,7 @@ void MusicXmlInput::ReadMusicXmlNote(
         pugi::xpath_node_set slurs = node.select_nodes("notations/slur");
         for (pugi::xpath_node_set::const_iterator it = slurs.begin(); it != slurs.end(); ++it) {
             pugi::xml_node slur = it->node();
-            int slurNumber = slur.attribute("number").as_int();
+            short int slurNumber = slur.attribute("number").as_int();
             slurNumber = (slurNumber < 1) ? 1 : slurNumber;
             if (HasAttributeWithValue(slur, "type", "stop")) {
                 CloseSlur(measure, slurNumber, note);
@@ -3071,7 +3071,7 @@ void MusicXmlInput::ReadMusicXmlNote(
             m_glissStack.push_back(gliss);
         }
         else if (!m_glissStack.empty()) {
-            int extNumber = xmlGlissando.attribute("number").as_int();
+            short int extNumber = xmlGlissando.attribute("number").as_int();
             std::vector<Gliss *>::iterator iter = m_glissStack.begin();
             while (iter != m_glissStack.end()) {
                 if ((atoi(((*iter)->GetN()).c_str()) == extNumber) && ((*iter)->GetType() == xmlGlissando.name())) {
@@ -3184,7 +3184,7 @@ void MusicXmlInput::ReadMusicXmlNote(
         }
     }
     if (!m_trillStack.empty() && notations.node().select_node("ornaments/wavy-line[@type='stop']")) {
-        int extNumber
+        short int extNumber
             = notations.node().select_node("ornaments/wavy-line[@type='stop']").node().attribute("number").as_int();
         std::vector<std::pair<Trill *, musicxml::OpenSpanner>>::iterator iter = m_trillStack.begin();
         while (iter != m_trillStack.end()) {
@@ -3244,7 +3244,7 @@ void MusicXmlInput::ReadMusicXmlNote(
     // arpeggio
     pugi::xpath_node xmlArpeggiate = notations.node().select_node("*[contains(name(), 'arpeggiate')]");
     if (xmlArpeggiate) {
-        int arpegN = xmlArpeggiate.node().attribute("number").as_int();
+        short int arpegN = xmlArpeggiate.node().attribute("number").as_int();
         arpegN = (arpegN < 1) ? 1 : arpegN;
         const std::string direction = xmlArpeggiate.node().attribute("direction").as_string();
         bool added = false;
@@ -3460,8 +3460,8 @@ void MusicXmlInput::ReadMusicXmlTupletStart(const pugi::xml_node &node, const pu
     Tuplet *tuplet = new Tuplet();
     AddLayerElement(layer, tuplet);
     m_elementStackMap.at(layer).push_back(tuplet);
-    int num = node.select_node("time-modification/actual-notes").node().text().as_int();
-    int numbase = node.select_node("time-modification/normal-notes").node().text().as_int();
+    short int num = node.select_node("time-modification/actual-notes").node().text().as_int();
+    short int numbase = node.select_node("time-modification/normal-notes").node().text().as_int();
     if (tupletStart.first_child()) {
         num = tupletStart.select_node("tuplet-actual/tuplet-number").node().text().as_int();
         numbase = tupletStart.select_node("tuplet-normal/tuplet-number").node().text().as_int();
@@ -3573,7 +3573,7 @@ Clef *MusicXmlInput::ConvertClef(const pugi::xml_node &clef)
         // clef octave change
         pugi::xml_node clefOctaveChange = clef.child("clef-octave-change");
         if (clefOctaveChange) {
-            int change = clefOctaveChange.text().as_int();
+            short int change = clefOctaveChange.text().as_int();
             switch (abs(change)) {
                 case 1: meiClef->SetDis(OCTAVE_DIS_8); break;
                 case 2: meiClef->SetDis(OCTAVE_DIS_15); break;
@@ -3601,7 +3601,7 @@ KeySig *MusicXmlInput::ConvertKey(const pugi::xml_node &key)
         keySig->SetUuid(key.attribute("id").as_string());
     }
     if (key.child("fifths")) {
-        int fifths = key.child("fifths").text().as_int();
+        short int fifths = key.child("fifths").text().as_int();
         std::string keySigStr;
         if (fifths < 0)
             keySigStr = StringFormat("%df", abs(fifths));

From a02aa6cdb638b4f1f3259d93e05a11dc8939d163 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Mon, 22 Nov 2021 22:25:52 +0100
Subject: [PATCH 012/403] fix formatting

---
 include/vrv/iomusxml.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 9504b6f79e7..987d48a515f 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -192,8 +192,8 @@ class MusicXmlInput : public Input {
      */
     ///@{
     bool ReadMusicXmlPart(pugi::xml_node node, Section *section, short int nbStaves, const short int staffOffset);
-    bool ReadMusicXmlMeasure(
-        pugi::xml_node node, Section *section, Measure *measure, short int nbStaves, const short int staffOffset, int index);
+    bool ReadMusicXmlMeasure(pugi::xml_node node, Section *section, Measure *measure, short int nbStaves,
+        const short int staffOffset, int index);
     ///@}
 
     /*
@@ -209,7 +209,8 @@ class MusicXmlInput : public Input {
     void ReadMusicXmlAttributes(pugi::xml_node, Section *section, Measure *measure, const std::string &measureNum);
     void ReadMusicXmlBackup(pugi::xml_node, Measure *measure, const std::string &measureNum);
     void ReadMusicXmlBarLine(pugi::xml_node, Measure *measure, const std::string &measureNum);
-    void ReadMusicXmlDirection(pugi::xml_node, Measure *measure, const std::string &measureNum, const short int staffOffset);
+    void ReadMusicXmlDirection(
+        pugi::xml_node, Measure *measure, const std::string &measureNum, const short int staffOffset);
     void ReadMusicXmlFigures(pugi::xml_node, Measure *measure, const std::string &measureNum);
     void ReadMusicXmlForward(pugi::xml_node, Measure *measure, const std::string &measureNum);
     void ReadMusicXmlHarmony(pugi::xml_node, Measure *measure, const std::string &measureNum);

From dae9a3525b26083c682d668f08981aa7d5f8a4e6 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Mon, 20 Dec 2021 11:20:06 +0100
Subject: [PATCH 013/403] add support for print-object on metronome

---
 src/iomusxml.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index bdc5e437274..cbc46645a9a 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2303,7 +2303,6 @@ void MusicXmlInput::ReadMusicXmlDirection(
     }
 
     // Tempo
-    pugi::xpath_node metronome = node.select_node("direction-type/metronome");
     if (containsTempo) {
         Tempo *tempo = new Tempo();
         if (!words.empty()) {
@@ -2314,6 +2313,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
         }
         tempo->SetPlace(tempo->AttPlacementRelStaff::StrToStaffrel(placeStr.c_str()));
         if (words.size() != 0) TextRendition(words, tempo);
+        pugi::xpath_node metronome = node.select_node("direction-type/metronome[not(@print-object='no')]");
         if (metronome) PrintMetronome(metronome.node(), tempo);
         if (soundNode.attribute("tempo")) {
             tempo->SetMidiBpm(soundNode.attribute("tempo").as_double());
@@ -2328,8 +2328,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
     }
 
     // other cases
-    if (!containsWords && !containsDynamics && !xmlCoda && !bracket && !lead && !metronome && !xmlSegno && !xmlShift
-        && !xmlPedal && wedges.empty() && !dashes && !rehearsal) {
+    if (!containsDynamics && !containsTempo && !containsWords && !xmlCoda && !bracket && !lead && !xmlSegno && !xmlShift && !xmlPedal && wedges.empty() && !dashes && !rehearsal) {
         LogWarning("MusicXML import: Unsupported direction-type '%s'", typeNode.first_child().name());
     }
 }

From 421ddfdd206b8a4c603247dca5a1461711715a60 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Mon, 20 Dec 2021 11:25:24 +0100
Subject: [PATCH 014/403] formatting

---
 src/iomusxml.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index cbc46645a9a..36719ff4210 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2328,7 +2328,8 @@ void MusicXmlInput::ReadMusicXmlDirection(
     }
 
     // other cases
-    if (!containsDynamics && !containsTempo && !containsWords && !xmlCoda && !bracket && !lead && !xmlSegno && !xmlShift && !xmlPedal && wedges.empty() && !dashes && !rehearsal) {
+    if (!containsDynamics && !containsTempo && !containsWords && !xmlCoda && !bracket && !lead && !xmlSegno && !xmlShift
+        && !xmlPedal && wedges.empty() && !dashes && !rehearsal) {
         LogWarning("MusicXML import: Unsupported direction-type '%s'", typeNode.first_child().name());
     }
 }

From 7ed8124f229bd64b9cadcca3a7c694264ebb5990 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 3 Jan 2022 10:57:26 +0100
Subject: [PATCH 015/403] Fix bug with key signature in PAE importer

---
 src/iopae.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iopae.cpp b/src/iopae.cpp
index 02b8437eb5c..950e26dd3df 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -4295,7 +4295,7 @@ bool PAEInput::ParseKeySig(KeySig *keySig, const std::string &paeStr, pae::Token
     }
 
     // Just in case
-    altNumber = std::min(6, altNumber);
+    altNumber = std::min(7, altNumber);
 
     if (alterationType != ACCIDENTAL_WRITTEN_NONE) {
         if (hasEnclosed == true) {

From 52733041d850e9ae683e388545b6f58c5f2b463b Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 3 Jan 2022 14:00:53 +0100
Subject: [PATCH 016/403] Store durDefault in interface

---
 include/vrv/durationinterface.h | 20 ++++++++++++++++++--
 src/durationinterface.cpp       | 19 +++++++++++++------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/include/vrv/durationinterface.h b/include/vrv/durationinterface.h
index d389760989f..c99bf1eb68d 100644
--- a/include/vrv/durationinterface.h
+++ b/include/vrv/durationinterface.h
@@ -45,7 +45,15 @@ class DurationInterface : public Interface,
     virtual ~DurationInterface();
     void Reset() override;
     InterfaceId IsInterface() const override { return INTERFACE_DURATION; }
-    ///@}SetDurationGes
+    ///@}
+
+    /**
+     * @name Set and get the default duration
+     */
+    ///@{
+    void SetDurDefault(data_DURATION dur) { m_durDefault = dur; }
+    data_DURATION GetDurDefault() const { return m_durDefault; }
+    ///@}
 
     /**
      * Returns the duration (in double) for the element.
@@ -101,10 +109,18 @@ class DurationInterface : public Interface,
     bool HasIdenticalDurationInterface(DurationInterface *otherDurationInterface);
 
 private:
-    //
+    /**
+     * Calculate the actual duration => translate mensural values
+     */
+    int CalcActualDur(data_DURATION dur) const;
+
 public:
     //
 private:
+    /**
+     * The default duration: extracted from scoreDef/staffDef and used when no duration attribute is given
+     */
+    data_DURATION m_durDefault;
 };
 
 } // namespace vrv
diff --git a/src/durationinterface.cpp b/src/durationinterface.cpp
index 8fcf757b294..4636e47b850 100644
--- a/src/durationinterface.cpp
+++ b/src/durationinterface.cpp
@@ -62,6 +62,8 @@ void DurationInterface::Reset()
     ResetDurationRatio();
     ResetFermataPresent();
     ResetStaffIdent();
+
+    m_durDefault = DURATION_NONE;
 }
 
 double DurationInterface::GetInterfaceAlignmentDuration(int num, int numBase)
@@ -176,17 +178,22 @@ bool DurationInterface::IsLastInBeam(LayerElement *noteOrRest)
 
 int DurationInterface::GetActualDur() const
 {
-    if (!this->HasDur()) return DURATION_NONE;
-    // maxima (-1) is a mensural only value
-    if (this->GetDur() == DURATION_maxima) return DUR_MX;
-    return (this->GetDur() & DUR_MENSURAL_MASK);
+    const data_DURATION dur = this->HasDur() ? this->GetDur() : this->GetDurDefault();
+    return this->CalcActualDur(dur);
 }
 
 int DurationInterface::GetActualDurGes() const
 {
+    const data_DURATION dur = this->HasDurGes() ? this->GetDurGes() : DURATION_NONE;
+    return this->CalcActualDur(dur);
+}
+
+int DurationInterface::CalcActualDur(data_DURATION dur) const
+{
+    if (dur == DURATION_NONE) return dur;
     // maxima (-1) is a mensural only value
-    if (this->GetDurGes() == DURATION_maxima) return DUR_MX;
-    return (this->GetDurGes() & DUR_MENSURAL_MASK);
+    if (dur == DURATION_maxima) return DUR_MX;
+    return (dur & DUR_MENSURAL_MASK);
 }
 
 int DurationInterface::GetNoteOrChordDur(LayerElement *element)

From 1270e8a21f58fa23aedfb2901921ea5af554c105 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 3 Jan 2022 15:12:15 +0100
Subject: [PATCH 017/403] Sort classes alphabetically

---
 include/vrv/functorparams.h | 218 ++++++++++++++++++------------------
 1 file changed, 109 insertions(+), 109 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 1ed431d09b9..0c52011d8d6 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -294,48 +294,6 @@ class AdjustDotsParams : public FunctorParams {
 
 // Use FunctorDocParams
 
-//----------------------------------------------------------------------------
-// AdjustGraceXPosParams
-//----------------------------------------------------------------------------
-
-/**
- * member 0: the maximum position
- * member 1: the upcoming maximum position (i.e., the min pos for the next element)
- * member 2: the cumulated shift on the previous aligners
- * member 3: the list of staffN in the top-level scoreDef
- * member 4: the flag indicating whereas the alignment is in a Measure or in a Grace
- * member 5: the pointer to the right ALIGNMENT_DEFAULT (if any)
- * member 6: the Doc
- * member 7: the Functor to be redirected to MeasureAligner and GraceAligner
- * member 8: the end Functor for redirection
- **/
-
-class AdjustGraceXPosParams : public FunctorParams {
-public:
-    AdjustGraceXPosParams(Doc *doc, Functor *functor, Functor *functorEnd, std::vector<int> staffNs)
-    {
-        m_graceMaxPos = 0;
-        m_graceUpcomingMaxPos = -VRV_UNSET;
-        m_graceCumulatedXShift = 0;
-        m_staffNs = staffNs;
-        m_isGraceAlignment = false;
-        m_rightDefaultAlignment = NULL;
-        m_doc = doc;
-        m_functor = functor;
-        m_functorEnd = functorEnd;
-        m_staffNs = staffNs;
-    }
-    int m_graceMaxPos;
-    int m_graceUpcomingMaxPos;
-    int m_graceCumulatedXShift;
-    std::vector<int> m_staffNs;
-    bool m_isGraceAlignment;
-    Alignment *m_rightDefaultAlignment;
-    Doc *m_doc;
-    Functor *m_functor;
-    Functor *m_functorEnd;
-};
-
 //----------------------------------------------------------------------------
 // AdjustFloatingPositionersParams
 //----------------------------------------------------------------------------
@@ -407,6 +365,48 @@ class AdjustFloatingPositionerGrpsParams : public FunctorParams {
     Doc *m_doc;
 };
 
+//----------------------------------------------------------------------------
+// AdjustGraceXPosParams
+//----------------------------------------------------------------------------
+
+/**
+ * member 0: the maximum position
+ * member 1: the upcoming maximum position (i.e., the min pos for the next element)
+ * member 2: the cumulated shift on the previous aligners
+ * member 3: the list of staffN in the top-level scoreDef
+ * member 4: the flag indicating whereas the alignment is in a Measure or in a Grace
+ * member 5: the pointer to the right ALIGNMENT_DEFAULT (if any)
+ * member 6: the Doc
+ * member 7: the Functor to be redirected to MeasureAligner and GraceAligner
+ * member 8: the end Functor for redirection
+ **/
+
+class AdjustGraceXPosParams : public FunctorParams {
+public:
+    AdjustGraceXPosParams(Doc *doc, Functor *functor, Functor *functorEnd, std::vector<int> staffNs)
+    {
+        m_graceMaxPos = 0;
+        m_graceUpcomingMaxPos = -VRV_UNSET;
+        m_graceCumulatedXShift = 0;
+        m_staffNs = staffNs;
+        m_isGraceAlignment = false;
+        m_rightDefaultAlignment = NULL;
+        m_doc = doc;
+        m_functor = functor;
+        m_functorEnd = functorEnd;
+        m_staffNs = staffNs;
+    }
+    int m_graceMaxPos;
+    int m_graceUpcomingMaxPos;
+    int m_graceCumulatedXShift;
+    std::vector<int> m_staffNs;
+    bool m_isGraceAlignment;
+    Alignment *m_rightDefaultAlignment;
+    Doc *m_doc;
+    Functor *m_functor;
+    Functor *m_functorEnd;
+};
+
 //----------------------------------------------------------------------------
 // AdjustHarmGrpsSpacingParams
 //----------------------------------------------------------------------------
@@ -1520,6 +1520,26 @@ class FindSpannedLayerElementsParams : public FunctorParams {
     std::vector<ClassId> m_classIds;
 };
 
+//----------------------------------------------------------------------------
+// GenerateFeaturesParams
+//----------------------------------------------------------------------------
+
+/**
+ * member 0: a pointer to the Doc
+ * member 1: a pointer to the FeatureExtractor to which extraction is delegated
+ **/
+
+class GenerateFeaturesParams : public FunctorParams {
+public:
+    GenerateFeaturesParams(Doc *doc, FeatureExtractor *extractor)
+    {
+        m_doc = doc;
+        m_extractor = extractor;
+    }
+    Doc *m_doc;
+    FeatureExtractor *m_extractor;
+};
+
 //----------------------------------------------------------------------------
 // GenerateMIDIParams
 //----------------------------------------------------------------------------
@@ -1598,26 +1618,6 @@ class GenerateTimemapParams : public FunctorParams {
     Functor *m_functor;
 };
 
-//----------------------------------------------------------------------------
-// GenerateFeaturesParams
-//----------------------------------------------------------------------------
-
-/**
- * member 0: a pointer to the Doc
- * member 1: a pointer to the FeatureExtractor to which extraction is delegated
- **/
-
-class GenerateFeaturesParams : public FunctorParams {
-public:
-    GenerateFeaturesParams(Doc *doc, FeatureExtractor *extractor)
-    {
-        m_doc = doc;
-        m_extractor = extractor;
-    }
-    Doc *m_doc;
-    FeatureExtractor *m_extractor;
-};
-
 //----------------------------------------------------------------------------
 // GetAlignmentLeftRightParams
 //----------------------------------------------------------------------------
@@ -1801,6 +1801,27 @@ class LayerElementsInTimeSpanParams : public FunctorParams {
     Layer *m_layer;
 };
 
+//----------------------------------------------------------------------------
+// PrepareCrossStaffParams
+//----------------------------------------------------------------------------
+
+/**
+ * member 0: a pointer to the current measure
+ **/
+
+class PrepareCrossStaffParams : public FunctorParams {
+public:
+    PrepareCrossStaffParams()
+    {
+        m_currentMeasure = NULL;
+        m_currentCrossStaff = NULL;
+        m_currentCrossLayer = NULL;
+    }
+    Measure *m_currentMeasure;
+    Staff *m_currentCrossStaff;
+    Layer *m_currentCrossLayer;
+};
+
 //----------------------------------------------------------------------------
 // PrepareDelayedTurnsParams
 //----------------------------------------------------------------------------
@@ -1869,27 +1890,6 @@ class PrepareFloatingGrpsParams : public FunctorParams {
     Doc *m_doc;
 };
 
-//----------------------------------------------------------------------------
-// PrepareCrossStaffParams
-//----------------------------------------------------------------------------
-
-/**
- * member 0: a pointer to the current measure
- **/
-
-class PrepareCrossStaffParams : public FunctorParams {
-public:
-    PrepareCrossStaffParams()
-    {
-        m_currentMeasure = NULL;
-        m_currentCrossStaff = NULL;
-        m_currentCrossLayer = NULL;
-    }
-    Measure *m_currentMeasure;
-    Staff *m_currentCrossStaff;
-    Layer *m_currentCrossLayer;
-};
-
 //----------------------------------------------------------------------------
 // PrepareLyricsParams
 //----------------------------------------------------------------------------
@@ -2025,6 +2025,20 @@ class PrepareRptParams : public FunctorParams {
     Doc *m_doc;
 };
 
+//----------------------------------------------------------------------------
+// PrepareSlursParams
+//----------------------------------------------------------------------------
+
+/**
+ * member 0: the doc
+ **/
+
+class PrepareSlursParams : public FunctorParams {
+public:
+    PrepareSlursParams(Doc *doc) { m_doc = doc; }
+    Doc *m_doc;
+};
+
 //----------------------------------------------------------------------------
 // PrepareTimePointingParams
 //----------------------------------------------------------------------------
@@ -2071,6 +2085,18 @@ class PrepareTimestampsParams : public FunctorParams {
     ListOfObjectBeatPairs m_tstamps;
 };
 
+//----------------------------------------------------------------------------
+// ReorderByXPosParams
+//----------------------------------------------------------------------------
+
+/**
+ * member 0: a pointer to the current object whose children we (may) reorder
+ **/
+class ReorderByXPosParams : public FunctorParams {
+public:
+    int modifications = 0;
+};
+
 //----------------------------------------------------------------------------
 // ReplaceDrawingValuesInStaffDefParams
 //----------------------------------------------------------------------------
@@ -2384,32 +2410,6 @@ class UnCastOffParams : public FunctorParams {
     System *m_currentSystem;
 };
 
-//----------------------------------------------------------------------------
-// ReorderByXPosParams
-//----------------------------------------------------------------------------
-
-/**
- * member 0: a pointer to the current object whose children we (may) reorder
- **/
-class ReorderByXPosParams : public FunctorParams {
-public:
-    int modifications = 0;
-};
-
-//----------------------------------------------------------------------------
-// PrepareSlursParams
-//----------------------------------------------------------------------------
-
-/**
- * member 0: the doc
- **/
-
-class PrepareSlursParams : public FunctorParams {
-public:
-    PrepareSlursParams(Doc *doc) { m_doc = doc; }
-    Doc *m_doc;
-};
-
 } // namespace vrv
 
 #endif

From f6dea2d27f7e0af94cf363b3aa23a44662976f39 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 4 Jan 2022 10:14:53 +0100
Subject: [PATCH 018/403] PrepareDuration functor

Transfer default duration from scoredef/staffdef into interface
---
 include/vrv/functorparams.h | 22 ++++++++++++++++++++++
 include/vrv/layerelement.h  |  5 +++++
 include/vrv/object.h        |  5 +++++
 include/vrv/score.h         |  5 +++++
 include/vrv/scoredef.h      |  6 +++++-
 include/vrv/staffdef.h      |  5 +++++
 src/doc.cpp                 |  6 ++++++
 src/layerelement.cpp        | 24 ++++++++++++++++++++++++
 src/score.cpp               | 13 +++++++++++++
 src/scoredef.cpp            | 11 +++++++++++
 src/staffdef.cpp            | 12 ++++++++++++
 11 files changed, 113 insertions(+), 1 deletion(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 0c52011d8d6..83f6a27e188 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1847,6 +1847,28 @@ class PrepareDelayedTurnsParams : public FunctorParams {
     std::map<LayerElement *, Turn *> m_delayedTurns;
 };
 
+//----------------------------------------------------------------------------
+// PrepareDurationParams
+//----------------------------------------------------------------------------
+
+/**
+ * member 0: the current scoredef default duration
+ * member 1: the current staffdef default durations
+ * member 2: the functor for redirection
+ **/
+
+class PrepareDurationParams : public FunctorParams {
+public:
+    PrepareDurationParams(Functor *functor)
+    {
+        m_durDefault = DURATION_NONE;
+        m_functor = functor;
+    }
+    data_DURATION m_durDefault;
+    std::map<int, data_DURATION> m_durDefaultForStaffN;
+    Functor *m_functor;
+};
+
 //----------------------------------------------------------------------------
 // PrepareFacsimileParams
 //----------------------------------------------------------------------------
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 5ed03fd4090..1f92dd8211a 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -398,6 +398,11 @@ class LayerElement : public Object,
      */
     int PrepareSlurs(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::PrepareDuration
+     */
+    int PrepareDuration(FunctorParams *functorParams) override;
+
 protected:
     /**
      * Helper to figure whether two chords are in fully in unison based on the locations of the notes.
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 506eddff1af..754e99eb879 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -1071,6 +1071,11 @@ class Object : public BoundingBox {
     virtual int PreparePlist(FunctorParams *functorParams);
     ///@}
 
+    /**
+     * Extract default duration from scoredef/staffdef
+     */
+    virtual int PrepareDuration(FunctorParams *) { return FUNCTOR_CONTINUE; }
+
     /**
      * Match start for TimePointingInterface elements (such as fermata or harm).
      */
diff --git a/include/vrv/score.h b/include/vrv/score.h
index 158f1caef29..2684a9f3046 100644
--- a/include/vrv/score.h
+++ b/include/vrv/score.h
@@ -116,6 +116,11 @@ class Score : public PageElement, public PageMilestoneInterface, public AttLabel
      */
     int ScoreDefOptimize(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::PrepareDuration
+     */
+    int PrepareDuration(FunctorParams *functorParams) override;
+
 private:
     /**
      * The score/scoreDef (first child of the score)
diff --git a/include/vrv/scoredef.h b/include/vrv/scoredef.h
index 3c4f449f8d6..5c360746cdb 100644
--- a/include/vrv/scoredef.h
+++ b/include/vrv/scoredef.h
@@ -234,7 +234,6 @@ class ScoreDef : public ScoreDefElement,
     int CastOffSystems(FunctorParams *functorParams) override;
 
     /**
-
      * See Object::CastOffEncoding
      */
     int CastOffEncoding(FunctorParams *functorParams) override;
@@ -249,6 +248,11 @@ class ScoreDef : public ScoreDefElement,
      */
     int JustifyX(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::PrepareDuration
+     */
+    int PrepareDuration(FunctorParams *functorParams) override;
+
 protected:
     /**
      * Filter the flat list and keep only StaffDef elements.
diff --git a/include/vrv/staffdef.h b/include/vrv/staffdef.h
index a0663c1b1ae..313f06f3b88 100644
--- a/include/vrv/staffdef.h
+++ b/include/vrv/staffdef.h
@@ -74,6 +74,11 @@ class StaffDef : public ScoreDefElement,
      */
     int SetStaffDefRedrawFlags(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::PrepareDuration
+     */
+    int PrepareDuration(FunctorParams *functorParams) override;
+
 private:
     //
 public:
diff --git a/src/doc.cpp b/src/doc.cpp
index 20f6dd4da51..0b107960946 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -512,6 +512,12 @@ void Doc::PrepareDrawing()
         this->Process(&resetDrawing, NULL);
     }
 
+    /************ Store default durations ************/
+
+    Functor prepareDuration(&Object::PrepareDuration);
+    PrepareDurationParams prepareDurationParams(&prepareDuration);
+    this->Process(&prepareDuration, &prepareDurationParams);
+
     /************ Resolve @startid / @endid ************/
 
     // Try to match all spanning elements (slur, tie, etc) by processing backwards
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index b1f288a4e5f..18402a4ac4a 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -2546,4 +2546,28 @@ int LayerElement::PrepareSlurs(FunctorParams *)
     return FUNCTOR_SIBLINGS;
 }
 
+int LayerElement::PrepareDuration(FunctorParams *functorParams)
+{
+    PrepareDurationParams *params = vrv_params_cast<PrepareDurationParams *>(functorParams);
+    assert(params);
+
+    DurationInterface *durInterface = this->GetDurationInterface();
+    if (durInterface) {
+        durInterface->SetDurDefault(params->m_durDefault);
+        // Check if there is a duration default for the staff
+        if (!params->m_durDefaultForStaffN.empty()) {
+            Layer *layer = NULL;
+            Staff *staff = this->GetCrossStaff(layer);
+            if (!staff) staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
+            assert(staff);
+
+            if (params->m_durDefaultForStaffN.count(staff->GetN()) > 0) {
+                durInterface->SetDurDefault(params->m_durDefaultForStaffN.at(staff->GetN()));
+            }
+        }
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/score.cpp b/src/score.cpp
index e0c7fc62522..e648ceddc3a 100644
--- a/src/score.cpp
+++ b/src/score.cpp
@@ -263,4 +263,17 @@ int Score::ScoreDefOptimize(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Score::PrepareDuration(FunctorParams *functorParams)
+{
+    PrepareDurationParams *params = vrv_params_cast<PrepareDurationParams *>(functorParams);
+    assert(params);
+
+    ScoreDef *scoreDef = this->GetScoreDef();
+    if (scoreDef) {
+        scoreDef->Process(params->m_functor, params);
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index 29dcc138c05..d2dd8bee259 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -610,4 +610,15 @@ int ScoreDef::JustifyX(FunctorParams *functorParams)
     return FUNCTOR_SIBLINGS;
 }
 
+int ScoreDef::PrepareDuration(FunctorParams *functorParams)
+{
+    PrepareDurationParams *params = vrv_params_cast<PrepareDurationParams *>(functorParams);
+    assert(params);
+
+    params->m_durDefaultForStaffN.clear();
+    params->m_durDefault = this->GetDurDefault();
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/staffdef.cpp b/src/staffdef.cpp
index 93c23c5ffe5..d0609cf871f 100644
--- a/src/staffdef.cpp
+++ b/src/staffdef.cpp
@@ -168,4 +168,16 @@ int StaffDef::SetStaffDefRedrawFlags(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int StaffDef::PrepareDuration(FunctorParams *functorParams)
+{
+    PrepareDurationParams *params = vrv_params_cast<PrepareDurationParams *>(functorParams);
+    assert(params);
+
+    if (this->HasDurDefault() && this->HasN()) {
+        params->m_durDefaultForStaffN[this->GetN()] = this->GetDurDefault();
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv

From 676b7be9c95091380ba72077611d4e258534706d Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 4 Jan 2022 20:52:10 +0100
Subject: [PATCH 019/403] minor refinements

---
 include/vrv/iomusxml.h | 7 ++++---
 src/iomusxml.cpp       | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 987d48a515f..818514e9306 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -64,7 +64,7 @@ namespace musicxml {
 
     class OpenSlur {
     public:
-        OpenSlur(const std::string &measureNum, const short int &number)
+        OpenSlur(const std::string &measureNum, short int number)
         {
             m_measureNum = measureNum;
             m_number = number;
@@ -76,7 +76,7 @@ namespace musicxml {
 
     class CloseSlur {
     public:
-        CloseSlur(const std::string &measureNum, const short int &number)
+        CloseSlur(const std::string &measureNum, short int number)
         {
             m_measureNum = measureNum;
             m_number = number;
@@ -200,7 +200,8 @@ class MusicXmlInput : public Input {
      * Methods for reading the first MusicXML attributes element as MEI staffDef.
      * Returns the number of staves in the part.
      */
-    int ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp, const short int staffOffset);
+    short int ReadMusicXmlPartAttributesAsStaffDef(
+        pugi::xml_node node, StaffGrp *staffGrp, const short int staffOffset);
 
     /*
      * @name Methods for reading the content of a MusicXML measure.
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 36719ff4210..3c972106ea7 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -691,7 +691,7 @@ void MusicXmlInput::PrintMetronome(pugi::xml_node metronome, Tempo *tempo)
                 // find separator or use end() if there is no separator
                 const auto separator = std::find_if(iter, metronomeElements.end(),
                     [](const auto pair) { return pair.first == MetronomeElements::SEPARATOR; });
-                const short int dotCount = (int)std::count_if(
+                const short int dotCount = (short int)std::count_if(
                     iter, separator, [](const auto pair) { return pair.first == MetronomeElements::BEAT_UNIT_DOT; });
                 for (short int i = 0; i < dotCount; i++) {
                     verovioText += L"\xE1E7"; // SMUFL augmentation dot
@@ -1201,7 +1201,8 @@ void MusicXmlInput::ReadMusicXmlTitle(pugi::xml_node root)
     app.append_attribute("version").set_value(GetVersion().c_str());
 }
 
-int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp, short int staffOffset)
+short int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(
+    pugi::xml_node node, StaffGrp *staffGrp, const short int staffOffset)
 {
     assert(node);
     assert(staffGrp);
@@ -1471,7 +1472,7 @@ bool MusicXmlInput::ReadMusicXmlPart(pugi::xml_node node, Section *section, shor
 }
 
 bool MusicXmlInput::ReadMusicXmlMeasure(
-    pugi::xml_node node, Section *section, Measure *measure, short int nbStaves, short int staffOffset, int index)
+    pugi::xml_node node, Section *section, Measure *measure, short int nbStaves, const short int staffOffset, int index)
 {
     assert(node);
     assert(measure);

From 5816abeb169dbaa20333f53c1b2971f949fe21bb Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 4 Jan 2022 21:51:59 +0100
Subject: [PATCH 020/403] update clang-format-check action

---
 .github/workflows/clang-format-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
index a2c62b746e3..d14f41c3ca2 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Run clang-format style check for C/C++ programs.
-        uses: jidicula/clang-format-action@v3.4.0
+        uses: jidicula/clang-format-action@v4.4.1
         with:
           clang-format-version: "11"
           check-path: ${{ matrix.path['check'] }}

From 7188b518d50dc0d6ec91b2d3ff5585fb94d7bdd2 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 5 Jan 2022 10:28:13 +0100
Subject: [PATCH 021/403] Handling of none duration

---
 include/vrv/attdef.h      |  3 ++-
 src/durationinterface.cpp |  4 +++-
 src/view_element.cpp      | 12 ++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/include/vrv/attdef.h b/include/vrv/attdef.h
index 47fd78d8f5a..f520195c9cb 100644
--- a/include/vrv/attdef.h
+++ b/include/vrv/attdef.h
@@ -38,6 +38,7 @@ typedef double data_VU;
  * These duration values are used for internal calculation and differ from the
  * MEI data.DURATION types (see below)
  */
+#define DUR_NONE -32
 #define DUR_MX -1 // maxima
 #define DUR_LG 0 // longa
 #define DUR_BR 1 // brevis
@@ -96,7 +97,7 @@ enum data_BEATRPT_REND {
  * MEI data.DURATION
  */
 enum data_DURATION {
-    DURATION_NONE = VRV_UNSET,
+    DURATION_NONE = DUR_NONE,
     DURATION_long = DUR_LG,
     DURATION_breve,
     DURATION_1,
diff --git a/src/durationinterface.cpp b/src/durationinterface.cpp
index 4636e47b850..72ebb5a6839 100644
--- a/src/durationinterface.cpp
+++ b/src/durationinterface.cpp
@@ -69,6 +69,7 @@ void DurationInterface::Reset()
 double DurationInterface::GetInterfaceAlignmentDuration(int num, int numBase)
 {
     int noteDur = this->GetDurGes() != DURATION_NONE ? this->GetActualDurGes() : this->GetActualDur();
+    if (noteDur == DUR_NONE) noteDur = DUR_4;
 
     if (this->HasNum()) num *= this->GetNum();
     if (this->HasNumbase()) numBase *= this->GetNumbase();
@@ -86,6 +87,7 @@ double DurationInterface::GetInterfaceAlignmentDuration(int num, int numBase)
 double DurationInterface::GetInterfaceAlignmentMensuralDuration(int num, int numBase, Mensur *currentMensur)
 {
     int noteDur = this->GetDurGes() != DURATION_NONE ? this->GetActualDurGes() : this->GetActualDur();
+    if (noteDur == DUR_NONE) noteDur = DUR_4;
 
     if (!currentMensur) {
         LogWarning("No current mensur for calculating duration");
@@ -190,7 +192,7 @@ int DurationInterface::GetActualDurGes() const
 
 int DurationInterface::CalcActualDur(data_DURATION dur) const
 {
-    if (dur == DURATION_NONE) return dur;
+    if (dur == DURATION_NONE) return DUR_NONE;
     // maxima (-1) is a mensural only value
     if (dur == DURATION_maxima) return DUR_MX;
     return (dur & DUR_MENSURAL_MASK);
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 404f9fd08cb..b6ce73f2316 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -1354,6 +1354,12 @@ void View::DrawNote(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     if (!(note->GetHeadVisible() == BOOLEAN_false)) {
         /************** Noteheads: **************/
         int drawingDur = note->GetDrawingDur();
+        if (drawingDur == DUR_NONE) {
+            if (note->IsInBeam() && !dc->Is(BBOX_DEVICE_CONTEXT)) {
+                LogWarning("Missing duration for note '%s'", note->GetUuid().c_str());
+            }
+            drawingDur = DUR_4;
+        }
         drawingDur = ((note->GetColored() == BOOLEAN_true) && drawingDur > DUR_1) ? (drawingDur + 1) : drawingDur;
 
         if (drawingDur < DUR_BR) {
@@ -1427,6 +1433,12 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
     const bool drawingCueSize = rest->GetDrawingCueSize();
     const int drawingDur = rest->GetActualDur();
+    if (drawingDur == DUR_NONE) {
+        if (!dc->Is(BBOX_DEVICE_CONTEXT)) {
+            LogWarning("Missing duration for rest '%s'", rest->GetUuid().c_str());
+        }
+        return;
+    }
     const wchar_t drawingGlyph = rest->GetRestGlyph();
 
     int x = element->GetDrawingX();

From a51e69974ae13d36c3ad534f8a933871e548498e Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 5 Jan 2022 11:51:06 +0100
Subject: [PATCH 022/403] Fix abc import

---
 include/vrv/doc.h   | 1 +
 include/vrv/ioabc.h | 2 +-
 src/ioabc.cpp       | 6 ++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index b65ed5394b4..84fdc82194e 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -408,6 +408,7 @@ class Doc : public Object {
     Score *GetCurrentScore();
     ScoreDef *GetCurrentScoreDef();
     void SetCurrentScore(Score *score);
+    bool HasCurrentScore() const { return m_currentScore != NULL; }
     ///@}
 
     //----------//
diff --git a/include/vrv/ioabc.h b/include/vrv/ioabc.h
index d54279e83ef..19e738e5283 100644
--- a/include/vrv/ioabc.h
+++ b/include/vrv/ioabc.h
@@ -102,7 +102,7 @@ class ABCInput : public Input {
     MeterSig *m_meter = NULL;
     Layer *m_layer = NULL;
 
-    data_DURATION m_durDefault; // todo: switch to MEI
+    data_DURATION m_durDefault;
     std::string m_ID;
     int m_unitDur;
     std::pair<data_BARRENDITION, data_BARRENDITION> m_barLines
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 6fc08d008c2..a9072bbd992 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -146,7 +146,7 @@ void ABCInput::parseABC(std::istream &infile)
         // create score
         assert(m_mdiv != NULL);
         Score *score = new Score();
-        if (!m_doc->GetCurrentScoreDef()->GetFirst(STAFFGRP)) {
+        if (!m_doc->HasCurrentScore() || !m_doc->GetCurrentScoreDef()->GetFirst(STAFFGRP)) {
             m_mdiv->AddChild(score);
 
             // create page head
@@ -185,6 +185,7 @@ void ABCInput::parseABC(std::istream &infile)
         if (m_durDefault == DURATION_NONE) {
             CalcUnitNoteLength();
         }
+        m_doc->GetCurrentScoreDef()->SetDurDefault(m_durDefault);
 
         // read music code
         m_layer = new Layer();
@@ -295,12 +296,10 @@ void ABCInput::CalcUnitNoteLength()
     if (!meterSig || !meterSig->HasUnit() || double(meterSig->GetTotalCount()) / double(meterSig->GetUnit()) >= 0.75) {
         m_unitDur = 8;
         m_durDefault = DURATION_8;
-        // m_doc->m_scoreDef.SetDurDefault(DURATION_8);
     }
     else {
         m_unitDur = 16;
         m_durDefault = DURATION_16;
-        // m_doc->m_scoreDef.SetDurDefault(DURATION_16);
     }
 }
 
@@ -744,7 +743,6 @@ void ABCInput::parseUnitNoteLength(const std::string &unitNoteLength)
         case 256: m_durDefault = DURATION_256; break;
         default: break;
     }
-    // m_doc->m_scoreDef.SetDurDefault(m_durDefault);
 }
 
 void ABCInput::parseMeter(const std::string &meterString)

From 7a8b9f2ca00c19ba2390b7fc0b5fe6f3bf42df0d Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Fri, 7 Jan 2022 10:25:28 +0100
Subject: [PATCH 023/403] Move entire content of last system for widow measures

---
 src/system.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/system.cpp b/src/system.cpp
index e1af18c094a..24889e0339a 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1007,23 +1007,24 @@ int System::CastOffPages(FunctorParams *functorParams)
     const int childCount = params->m_currentPage->GetChildCount();
     if ((systemMaxPerPage && systemMaxPerPage == childCount)
         || (childCount > 0 && (this->m_drawingYRel - this->GetHeight() - currentShift < 0))) {
-        // If this is last system in the list, it doesn't fit the page and it's leftover system (has just one last
-        // measure) - get measure out of that system and try adding it to the previous system
+        // If this is the last system in the list, it doesn't fit the page and it's leftover system (has just one
+        // measure) => add the system content to the previous system
         Object *nextSystem = params->m_contentPage->GetNext(this, SYSTEM);
-        if ((NULL == nextSystem) && (this == params->m_leftoverSystem)) {
-            Measure *measure = dynamic_cast<Measure *>(Relinquish(GetFirst(MEASURE)->GetIdx()));
-            System *lastSystem = dynamic_cast<System *>(params->m_currentPage->GetLast());
-            if (measure && lastSystem) lastSystem->AddChild(measure);
+        Object *lastSystem = params->m_currentPage->GetLast(SYSTEM);
+        if (!nextSystem && lastSystem && (this == params->m_leftoverSystem)) {
+            ArrayOfObjects *children = this->GetChildrenForModification();
+            for (Object *child : *children) {
+                child->MoveItselfTo(lastSystem);
+            }
             return FUNCTOR_SIBLINGS;
         }
-        else {
-            params->m_currentPage = new Page();
-            // Use VRV_UNSET value as a flag
-            params->m_pgHeadHeight = VRV_UNSET;
-            assert(params->m_doc->GetPages());
-            params->m_doc->GetPages()->AddChild(params->m_currentPage);
-            params->m_shift = this->m_drawingYRel - params->m_pageHeight;
-        }
+
+        params->m_currentPage = new Page();
+        // Use VRV_UNSET value as a flag
+        params->m_pgHeadHeight = VRV_UNSET;
+        assert(params->m_doc->GetPages());
+        params->m_doc->GetPages()->AddChild(params->m_currentPage);
+        params->m_shift = this->m_drawingYRel - params->m_pageHeight;
     }
 
     // First add all pending objects

From 5c99b2ec602e42e24d281ecb3c9c903fe7142f69 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Fri, 7 Jan 2022 12:55:35 +0100
Subject: [PATCH 024/403] Update clang-format-check action

---
 .github/workflows/clang-format-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
index a2c62b746e3..d14f41c3ca2 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Run clang-format style check for C/C++ programs.
-        uses: jidicula/clang-format-action@v3.4.0
+        uses: jidicula/clang-format-action@v4.4.1
         with:
           clang-format-version: "11"
           check-path: ${{ matrix.path['check'] }}

From c22e334f2f5ee2493d638954c1c332c7a8efcd5d Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Mon, 10 Jan 2022 10:04:21 +0100
Subject: [PATCH 025/403] use c++11 stoi

---
 src/iomusxml.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 3c972106ea7..0859ec2c20b 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2557,7 +2557,7 @@ void MusicXmlInput::ReadMusicXmlNote(
                 element = mRest;
                 if (cue) mRest->SetCue(BOOLEAN_true);
                 if (!stepStr.empty()) mRest->SetPloc(ConvertStepToPitchName(stepStr));
-                if (!octaveStr.empty()) mRest->SetOloc(atoi(octaveStr.c_str()));
+                if (!octaveStr.empty()) mRest->SetOloc(std::stoi(octaveStr));
                 if (!noteID.empty()) {
                     mRest->SetUuid(noteID);
                 }
@@ -2573,7 +2573,7 @@ void MusicXmlInput::ReadMusicXmlNote(
             if (dots > 0) rest->SetDots(dots);
             if (cue) rest->SetCue(BOOLEAN_true);
             if (!stepStr.empty()) rest->SetPloc(ConvertStepToPitchName(stepStr));
-            if (!octaveStr.empty()) rest->SetOloc(atoi(octaveStr.c_str()));
+            if (!octaveStr.empty()) rest->SetOloc(std::stoi(octaveStr));
             if (!noteID.empty()) {
                 rest->SetUuid(noteID);
             }
@@ -3075,7 +3075,7 @@ void MusicXmlInput::ReadMusicXmlNote(
             short int extNumber = xmlGlissando.attribute("number").as_int();
             std::vector<Gliss *>::iterator iter = m_glissStack.begin();
             while (iter != m_glissStack.end()) {
-                if ((atoi(((*iter)->GetN()).c_str()) == extNumber) && ((*iter)->GetType() == xmlGlissando.name())) {
+                if ((std::stoi((*iter)->GetN()) == extNumber) && ((*iter)->GetType() == xmlGlissando.name())) {
                     (*iter)->SetEndid(noteID);
                     iter = m_glissStack.erase(iter);
                 }
@@ -3190,7 +3190,7 @@ void MusicXmlInput::ReadMusicXmlNote(
         std::vector<std::pair<Trill *, musicxml::OpenSpanner>>::iterator iter = m_trillStack.begin();
         while (iter != m_trillStack.end()) {
             const int measureDifference = m_measureCounts.at(measure) - iter->second.m_lastMeasureCount;
-            if (atoi(((iter->first)->GetN()).c_str()) == extNumber) {
+            if (std::stoi((iter->first)->GetN()) == extNumber) {
                 (iter->first)
                     ->SetTstamp2(std::pair<int, double>(
                         measureDifference, (double)(m_durTotal) * (double)m_meterUnit / (double)(4 * m_ppq) + 1));

From 519fda114638ed24b36971191938f76dd455cd23 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 10 Jan 2022 12:59:18 +0100
Subject: [PATCH 026/403] Add emscripten cache ID to ci_build

---
 .github/workflows/ci_build.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 805817b34fb..61fa5dc99af 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -45,6 +45,7 @@ env:
   # emscripten
   EM_VERSION: latest
   EM_CACHE_FOLDER: "emsdk-cache"
+  EM_CACHE_ID: 1
 
   # gh-pages
   GH_PAGES_REPO: ${{ github.repository_owner }}/verovio.org # works from rism-digital and from forks
@@ -226,7 +227,7 @@ jobs:
           # path for cache
           path: ${{ env.EM_CACHE_FOLDER }}
           # key for cache
-          key: ${{ runner.os }}-emsdk-${{ env.EM_VERSION }}
+          key: ${{ runner.os }}-emsdk-${{ env.EM_VERSION }}-${{ env.EM_CACHE_ID }}
 
       - name: Set up emsdk
         uses: mymindstorm/setup-emsdk@v11
@@ -282,7 +283,7 @@ jobs:
           # path for cache
           path: ${{ env.EM_CACHE_FOLDER }}
           # key for cache
-          key: ${{ runner.os }}-emsdk-${{ env.EM_VERSION }}
+          key: ${{ runner.os }}-emsdk-${{ env.EM_VERSION }}-${{ env.EM_CACHE_ID }}
 
       # Install and/or activate emsdk
       - name: Set up emsdk

From f940eb0957dd0f530f0f86c05cbf6084e8755b72 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 10 Jan 2022 13:07:41 +0100
Subject: [PATCH 027/403] Fix mymindstorm/setup-emsdk version mis-match

---
 .github/workflows/ci_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 61fa5dc99af..efddf29c9c5 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -287,7 +287,7 @@ jobs:
 
       # Install and/or activate emsdk
       - name: Set up emsdk
-        uses: mymindstorm/setup-emsdk@v7
+        uses: mymindstorm/setup-emsdk@v11
         with:
           version: ${{ env.EM_VERSION }}
           actions-cache-folder: ${{ env.EM_CACHE_FOLDER }}

From cec3920827e35c1dbc93660abf52073cd4f90759 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 10 Jan 2022 13:36:45 +0100
Subject: [PATCH 028/403] Fix error message with corrupted duration in PAE

---
 src/iopae.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iopae.cpp b/src/iopae.cpp
index 950e26dd3df..5a5f14ac267 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -4552,7 +4552,7 @@ bool PAEInput::ParseDuration(
     durations.clear();
 
     if (paeStr.size() < 1 || paeStr.at(0) == '.') {
-        LogPAE(ERR_051_BARLINE, token);
+        LogPAE(ERR_052_DURATION, token);
         // Default to quarter note
         if (m_pedanticMode) return false;
         durations.push_back({ DURATION_4, 0 });

From 0a5f99aa23185c21589f2ff7b00c410db3f72748 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 11 Jan 2022 08:12:56 +0100
Subject: [PATCH 029/403] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ded37a5e26..9e0a1cd24fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [unreleased]
 
+## [3.8.1] - 2022-01-10
+* Fix bug in PAE importer for durations and for key signatures
+
 ## [3.8.0] - 2021-12-22
 * Support for figured-bass extenders on `f` without `@tstamp` or `@startid` 
 * Improved page-based MEI output with validation with a customized MEI Schema

From f0d7d6a9da8175e43fbab55170577d79ebd4de4b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 11 Jan 2022 08:14:48 +0100
Subject: [PATCH 030/403] Support for `beatRpt@beatdef`. Closes #2564

* Alignment still needs to be improved
---
 CHANGELOG.md          | 1 +
 include/vrv/beatrpt.h | 2 +-
 src/beatrpt.cpp       | 8 ++++++--
 src/iomei.cpp         | 2 ++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e0a1cd24fe..18b00e68502 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## [unreleased]
+* Support for `beatRpt@beatdef`
 
 ## [3.8.1] - 2022-01-10
 * Fix bug in PAE importer for durations and for key signatures
diff --git a/include/vrv/beatrpt.h b/include/vrv/beatrpt.h
index 4cd68856ac9..2f3ea25f940 100644
--- a/include/vrv/beatrpt.h
+++ b/include/vrv/beatrpt.h
@@ -22,7 +22,7 @@ namespace vrv {
 /**
  * This class models the MEI <beatRpt> element.
  */
-class BeatRpt : public LayerElement, public AttColor, public AttBeatRptVis {
+class BeatRpt : public LayerElement, public AttColor, public AttBeatRptLog, public AttBeatRptVis {
 public:
     /**
      * @name Constructors, destructors, reset and class name methods
diff --git a/src/beatrpt.cpp b/src/beatrpt.cpp
index 2ffc853c474..30a1119ccda 100644
--- a/src/beatrpt.cpp
+++ b/src/beatrpt.cpp
@@ -34,8 +34,9 @@ namespace vrv {
 
 static const ClassRegistrar<BeatRpt> s_factory("beatRpt", BEATRPT);
 
-BeatRpt::BeatRpt() : LayerElement(BEATRPT, "beatrpt-"), AttColor(), AttBeatRptVis()
+BeatRpt::BeatRpt() : LayerElement(BEATRPT, "beatrpt-"), AttColor(), AttBeatRptLog(), AttBeatRptVis()
 {
+    RegisterAttClass(ATT_BEATRPTLOG);
     RegisterAttClass(ATT_BEATRPTVIS);
     RegisterAttClass(ATT_COLOR);
     Reset();
@@ -46,6 +47,7 @@ BeatRpt::~BeatRpt() {}
 void BeatRpt::Reset()
 {
     LayerElement::Reset();
+    ResetBeatRptLog();
     ResetBeatRptVis();
     ResetColor();
 
@@ -54,7 +56,9 @@ void BeatRpt::Reset()
 
 double BeatRpt::GetBeatRptAlignmentDuration(int meterUnit) const
 {
-    return DUR_MAX / meterUnit;
+    double dur = DUR_MAX / meterUnit;
+    if (this->HasBeatdef()) dur *= this->GetBeatdef();
+    return dur;
 }
 
 void BeatRpt::SetScoreTimeOnset(double scoreTime)
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 6eda889aaa2..85190e64d4c 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -2087,6 +2087,7 @@ void MEIOutput::WriteBeatRpt(pugi::xml_node currentNode, BeatRpt *beatRpt)
 
     WriteLayerElement(currentNode, beatRpt);
     beatRpt->WriteColor(currentNode);
+    beatRpt->WriteBeatRptLog(currentNode);
     beatRpt->WriteBeatRptVis(currentNode);
 }
 
@@ -5660,6 +5661,7 @@ bool MEIInput::ReadBeatRpt(Object *parent, pugi::xml_node beatRpt)
     ReadLayerElement(beatRpt, vrvBeatRpt);
 
     vrvBeatRpt->ReadColor(beatRpt);
+    vrvBeatRpt->ReadBeatRptLog(beatRpt);
     vrvBeatRpt->ReadBeatRptVis(beatRpt);
 
     if (m_version < MEI_4_0_0) {

From ccbdfb415dd344370dbe605265ec72726becc473 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 11 Jan 2022 13:09:57 +0100
Subject: [PATCH 031/403] still use cstr as n may be empty

---
 src/iomusxml.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 0859ec2c20b..19b8d64ad9f 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -3075,7 +3075,7 @@ void MusicXmlInput::ReadMusicXmlNote(
             short int extNumber = xmlGlissando.attribute("number").as_int();
             std::vector<Gliss *>::iterator iter = m_glissStack.begin();
             while (iter != m_glissStack.end()) {
-                if ((std::stoi((*iter)->GetN()) == extNumber) && ((*iter)->GetType() == xmlGlissando.name())) {
+                if ((atoi(((*iter)->GetN()).c_str()) == extNumber) && ((*iter)->GetType() == xmlGlissando.name())) {
                     (*iter)->SetEndid(noteID);
                     iter = m_glissStack.erase(iter);
                 }
@@ -3190,7 +3190,7 @@ void MusicXmlInput::ReadMusicXmlNote(
         std::vector<std::pair<Trill *, musicxml::OpenSpanner>>::iterator iter = m_trillStack.begin();
         while (iter != m_trillStack.end()) {
             const int measureDifference = m_measureCounts.at(measure) - iter->second.m_lastMeasureCount;
-            if (std::stoi((iter->first)->GetN()) == extNumber) {
+            if (atoi(((iter->first)->GetN()).c_str()) == extNumber) {
                 (iter->first)
                     ->SetTstamp2(std::pair<int, double>(
                         measureDifference, (double)(m_durTotal) * (double)m_meterUnit / (double)(4 * m_ppq) + 1));

From 701cd2161d11ad670577ea3d52205633f0213d8c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 11 Jan 2022 15:28:40 +0100
Subject: [PATCH 032/403] Add input of tabGrp within Beam

---
 src/beam.cpp  | 3 +++
 src/iomei.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/beam.cpp b/src/beam.cpp
index 3e9725835ec..bdcab53d061 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1175,6 +1175,9 @@ bool Beam::IsSupportedChild(Object *child)
     else if (child->Is(SPACE)) {
         assert(dynamic_cast<Space *>(child));
     }
+    else if (child->Is(TABGRP)) {
+        assert(dynamic_cast<TabGrp *>(child));
+    }
     else if (child->Is(TUPLET)) {
         assert(dynamic_cast<Tuplet *>(child));
     }
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 96f72eb4e99..20fa5335133 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -3138,6 +3138,9 @@ bool MEIInput::IsAllowed(std::string element, Object *filterParent)
         else if (element == "space") {
             return true;
         }
+        else if (element == "tabGrp") {
+            return true;
+        }
         else if (element == "tuplet") {
             return true;
         }

From 527dc3f7ad185defbc5f9b7e2ab691cc8fbf88f2 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 11 Jan 2022 15:29:13 +0100
Subject: [PATCH 033/403] Basic rendering of beam in tablature

---
 include/vrv/beam.h       |  11 +-
 include/vrv/view.h       |   6 +
 src/beam.cpp             |  38 ++++++-
 src/drawinginterface.cpp |   8 +-
 src/layerelement.cpp     |   2 +-
 src/view_beam.cpp        |  11 +-
 src/view_tab.cpp         | 239 +++++++++++++++++++++++++++++++++++----
 7 files changed, 283 insertions(+), 32 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 834253aeeb1..a3cfad402d0 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -44,7 +44,7 @@ class BeamSegment {
     void Reset();
 
     void CalcBeam(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface,
-        data_BEAMPLACE place = BEAMPLACE_NONE, bool init = true);
+        data_BEAMPLACE place = BEAMPLACE_NONE, bool init = true, bool isTabBeam = false);
 
     /**
      *
@@ -79,7 +79,8 @@ class BeamSegment {
     // Helper to adjust beam positioning with regards to ledger lines (top and bottom of the staff)
     void AdjustBeamToLedgerLines(Doc *doc, Staff *staff, BeamDrawingInterface *beamInterface);
 
-    void CalcBeamInit(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
+    void CalcBeamInit(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place,
+        bool isTabBeam);
 
     bool CalcBeamSlope(
         Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, bool &shorten, int &step);
@@ -167,6 +168,12 @@ class Beam : public LayerElement,
      */
     const ArrayOfBeamElementCoords *GetElementCoords();
 
+    /**
+     * Return true if the beam has a tabGrp child.
+     * In that case, the ObjectList will only have tabGrp elements. See Beam::FilterList
+     */
+    bool IsTabBeam();
+
     //----------//
     // Functors //
     //----------//
diff --git a/include/vrv/view.h b/include/vrv/view.h
index 7213268b7a2..6c8aecb1748 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -602,6 +602,12 @@ class View {
     void DrawBeamSegment(DeviceContext *dc, BeamSegment *segment, BeamDrawingInterface *beamInterface, Layer *layer,
         Staff *staff, Measure *measure);
 
+    /**
+     * Internal method for drawing a BeamSegment in a tablature
+     */
+    void DrawTabBeamSegment(DeviceContext *dc, BeamSegment *segment, BeamDrawingInterface *beamInterface, Layer *layer,
+        Staff *staff, Measure *measure);
+
 public:
     /** Document */
     Doc *m_doc;
diff --git a/src/beam.cpp b/src/beam.cpp
index bdcab53d061..325245ea9af 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -28,6 +28,7 @@
 #include "smufl.h"
 #include "space.h"
 #include "staff.h"
+#include "tabgrp.h"
 #include "tuplet.h"
 #include "verticalaligner.h"
 #include "vrv.h"
@@ -80,8 +81,8 @@ void BeamSegment::InitCoordRefs(const ArrayOfBeamElementCoords *beamElementCoord
     m_beamElementCoordRefs = *beamElementCoords;
 }
 
-void BeamSegment::CalcBeam(
-    Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place, bool init)
+void BeamSegment::CalcBeam(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface,
+    data_BEAMPLACE place, bool init, bool isTabBeam)
 {
     assert(layer);
     assert(staff);
@@ -92,9 +93,11 @@ void BeamSegment::CalcBeam(
 
     // For recursive calls, avoid to re-init values
     if (init) {
-        this->CalcBeamInit(layer, staff, doc, beamInterface, place);
+        this->CalcBeamInit(layer, staff, doc, beamInterface, place, isTabBeam);
     }
 
+    if (isTabBeam) return;
+
     bool horizontal = beamInterface->IsHorizontal();
 
     // Beam@place has precedence - however, in some cases, CalcBeam is called recursively because we need to change the
@@ -112,7 +115,7 @@ void BeamSegment::CalcBeam(
     CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
     if (BEAMPLACE_mixed == beamInterface->m_drawingPlace) {
         if (!beamInterface->m_crossStaffContent && NeedToResetPosition(staff, doc, beamInterface)) {
-            CalcBeamInit(layer, staff, doc, beamInterface, place);
+            CalcBeamInit(layer, staff, doc, beamInterface, place, false);
             CalcBeamStemLength(staff, beamInterface->m_drawingPlace, horizontal);
             CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
         }
@@ -320,7 +323,7 @@ void BeamSegment::AdjustBeamToLedgerLines(Doc *doc, Staff *staff, BeamDrawingInt
 }
 
 void BeamSegment::CalcBeamInit(
-    Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place)
+    Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place, bool isTabBeam)
 {
     assert(layer);
     assert(staff);
@@ -374,6 +377,8 @@ void BeamSegment::CalcBeamInit(
     m_firstNoteOrChord = NULL;
     m_lastNoteOrChord = NULL;
 
+    if (isTabBeam) return;
+
     int yMax = m_verticalCenter;
     int yMin = m_verticalCenter;
     auto SetExtrema = [&yMax, &yMin](int currentY) {
@@ -1197,6 +1202,8 @@ void Beam::FilterList(ArrayOfObjects *childList)
     // Eventually, we also need to filter out grace notes properly (e.g., with sub-beams)
     ArrayOfObjects::iterator iter = childList->begin();
 
+    const bool isTabBeam = this->IsTabBeam();
+
     while (iter != childList->end()) {
         if (!(*iter)->IsLayerElement()) {
             // remove anything that is not an LayerElement (e.g. Verse, Syl, etc)
@@ -1208,6 +1215,15 @@ void Beam::FilterList(ArrayOfObjects *childList)
             iter = childList->erase(iter);
             continue;
         }
+        else if (isTabBeam) {
+            if (!(*iter)->Is(TABGRP)) {
+                iter = childList->erase(iter);
+            }
+            else {
+                ++iter;
+            }
+            continue;
+        }
         else {
             LayerElement *element = vrv_cast<LayerElement *>(*iter);
             assert(element);
@@ -1278,6 +1294,11 @@ const ArrayOfBeamElementCoords *Beam::GetElementCoords()
     return &m_beamElementCoords;
 }
 
+bool Beam::IsTabBeam()
+{
+    return (this->FindDescendantByType(TABGRP));
+}
+
 //----------------------------------------------------------------------------
 // BeamElementCoord
 //----------------------------------------------------------------------------
@@ -1516,7 +1537,8 @@ int Beam::AdjustBeams(FunctorParams *functorParams)
     AdjustBeamParams *params = vrv_params_cast<AdjustBeamParams *>(functorParams);
     assert(params);
 
-    if (this->HasSameas() || !this->GetChildCount() || m_beamSegment.m_beamElementCoordRefs.empty()) {
+    if (this->IsTabBeam() || this->HasSameas() || !this->GetChildCount()
+        || m_beamSegment.m_beamElementCoordRefs.empty()) {
         return FUNCTOR_CONTINUE;
     }
 
@@ -1553,6 +1575,8 @@ int Beam::AdjustBeamsEnd(FunctorParams *functorParams)
     AdjustBeamParams *params = vrv_params_cast<AdjustBeamParams *>(functorParams);
     assert(params);
 
+    if (this->IsTabBeam()) return FUNCTOR_CONTINUE;
+
     if (params->m_beam != this) return FUNCTOR_CONTINUE;
 
     if (m_drawingPlace == BEAMPLACE_mixed) return FUNCTOR_CONTINUE;
@@ -1588,6 +1612,8 @@ int Beam::CalcStem(FunctorParams *functorParams)
     CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
     assert(params);
 
+    if (this->IsTabBeam()) return FUNCTOR_CONTINUE;
+
     const ArrayOfObjects *beamChildren = this->GetList(this);
 
     // Should we assert this at the beginning?
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 259787ca106..8a6f29a0abc 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -183,8 +183,8 @@ void BeamDrawingInterface::InitCoords(ArrayOfObjects *childList, Staff *staff, d
             }
         }
 
-        // Skip rests
-        if (current->Is({ NOTE, CHORD })) {
+        // Skip rests and tabGrp
+        if (current->Is({ CHORD, NOTE })) {
             // Look at the stemDir to see if we have multiple stem Dir
             if (!m_hasMultipleStemDir) {
                 // At this stage, BeamCoord::m_stem is not necessary set, so we need to look at the Note / Chord
@@ -201,9 +201,13 @@ void BeamDrawingInterface::InitCoords(ArrayOfObjects *childList, Staff *staff, d
                     }
                 }
             }
+        }
+        // Skip rests
+        if (current->Is({ CHORD, NOTE, TABGRP })) {
             // keep the shortest dur in the beam
             m_shortestDur = std::max(currentDur, m_shortestDur);
         }
+
         // check if we have more than duration in the beam
         if (!m_changingDur && currentDur != lastDur) m_changingDur = true;
         lastDur = currentDur;
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index fbbaa4c78d2..1a0f327ab87 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -210,7 +210,7 @@ FTrem *LayerElement::IsInFTrem()
 
 Beam *LayerElement::IsInBeam()
 {
-    if (!this->Is({ CHORD, NOTE, STEM })) return NULL;
+    if (!this->Is({ CHORD, NOTE, TABGRP, STEM })) return NULL;
     Beam *beamParent = vrv_cast<Beam *>(this->GetFirstAncestor(BEAM));
     if (beamParent != NULL) {
         if (!this->IsGraceNote()) return beamParent;
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index a8de045c7f7..483889621c3 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -41,6 +41,8 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     Beam *beam = dynamic_cast<Beam *>(element);
     assert(beam);
 
+    const bool isTabBeam = beam->IsTabBeam();
+
     /******************************************************************/
     // initialization
 
@@ -56,7 +58,7 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     /******************************************************************/
     // Calculate the beam slope and position
 
-    beam->m_beamSegment.CalcBeam(layer, beam->m_beamStaff, m_doc, beam, beam->GetPlace());
+    beam->m_beamSegment.CalcBeam(layer, beam->m_beamStaff, m_doc, beam, beam->GetPlace(), true, isTabBeam);
 
     /******************************************************************/
     // Start the Beam graphic and draw the children
@@ -71,7 +73,12 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     /******************************************************************/
     // Draw the beamSegment
 
-    DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
+    if (isTabBeam) {
+        DrawTabBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
+    }
+    else {
+        DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
+    }
 
     dc->EndGraphic(element, this);
 }
diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 2ab42a5f16d..9072e74402d 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -142,28 +142,38 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 1.5;
     int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
     int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
-    int radius = m_doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, glyphSize, false) / 2;
-    x += radius;
-
-    int symc = 0;
-    switch (drawingDur) {
-        case DUR_2: symc = SMUFL_EBA7_luteDurationWhole; break;
-        case DUR_4: symc = SMUFL_EBA8_luteDurationHalf; break;
-        case DUR_8: symc = SMUFL_EBA9_luteDurationQuarter; break;
-        case DUR_16: symc = SMUFL_EBAA_luteDuration8th; break;
-        case DUR_32: symc = SMUFL_EBAB_luteDuration16th; break;
-        default: symc = SMUFL_EBA9_luteDurationQuarter;
+
+    // We only need to draw the stems
+    // Do we also need to draw the dots?
+    if (tabGrp->IsInBeam()) {
+        const int height = m_doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
+        DrawFilledRectangle(dc, x - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2, y,
+            x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2, y + height);
     }
+    else {
+        int radius = m_doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, glyphSize, false) / 2;
+        x += radius;
+
+        int symc = 0;
+        switch (drawingDur) {
+            case DUR_2: symc = SMUFL_EBA7_luteDurationWhole; break;
+            case DUR_4: symc = SMUFL_EBA8_luteDurationHalf; break;
+            case DUR_8: symc = SMUFL_EBA9_luteDurationQuarter; break;
+            case DUR_16: symc = SMUFL_EBAA_luteDuration8th; break;
+            case DUR_32: symc = SMUFL_EBAB_luteDuration16th; break;
+            default: symc = SMUFL_EBA9_luteDurationQuarter;
+        }
 
-    DrawSmuflCode(dc, x, y, symc, glyphSize, true);
+        DrawSmuflCode(dc, x, y, symc, glyphSize, true);
 
-    if (tabGrp->HasDots()) {
-        y += m_doc->GetDrawingUnit(glyphSize) * 0.5;
-        x += m_doc->GetDrawingUnit(glyphSize);
-        for (int i = 0; i < tabGrp->GetDots(); ++i) {
-            DrawDot(dc, x, y, glyphSize / 2);
-            // HARDCODED
-            x += m_doc->GetDrawingUnit(glyphSize) * 0.75;
+        if (tabGrp->HasDots()) {
+            y += m_doc->GetDrawingUnit(glyphSize) * 0.5;
+            x += m_doc->GetDrawingUnit(glyphSize);
+            for (int i = 0; i < tabGrp->GetDots(); ++i) {
+                DrawDot(dc, x, y, glyphSize / 2);
+                // HARDCODED
+                x += m_doc->GetDrawingUnit(glyphSize) * 0.75;
+            }
         }
     }
 
@@ -173,4 +183,195 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     dc->EndGraphic(tabDurSym, this);
 }
 
+void View::DrawTabBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDrawingInterface *beamInterface,
+    Layer *layer, Staff *staff, Measure *measure)
+{
+    assert(dc);
+    assert(beamSegment);
+    assert(beamInterface);
+    assert(layer);
+    assert(staff);
+    assert(measure);
+
+    // temporary coordinates
+    int x1, x2, y1, y2;
+
+    // temporary variables
+    int shiftY;
+
+    // loops
+    int i;
+
+    const ArrayOfBeamElementCoords *beamElementCoords = beamSegment->GetElementCoordRefs();
+
+    int elementCount = (int)beamElementCoords->size();
+    int last = elementCount - 1;
+
+    /******************************************************************/
+    // Draw the beam full bar
+
+    // Adjust the x position of the first and last element for taking into account the stem width
+    beamElementCoords->at(0)->m_x -= (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+    beamElementCoords->at(last)->m_x += (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+
+    // Shift direction
+    shiftY = (beamInterface->m_drawingPlace == BEAMPLACE_below) ? 1.0 : -1.0;
+
+    int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
+    int height = m_doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
+    int y = staff->GetDrawingY() + height;
+    y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 1.5;
+
+    x1 = beamElementCoords->at(0)->m_x;
+    x2 = beamElementCoords->at(last)->m_x;
+
+    // For acc and rit beam (see AttBeamingVis set
+    // s_y = 0 and s_y2 = 0 respectively
+
+    const int polygonHeight = beamInterface->m_beamWidthBlack * shiftY / 2;
+    DrawObliquePolygon(dc, x1, y, x2, y, polygonHeight);
+
+    /******************************************************************/
+    // Draw the beam for partial bars (if any)
+
+    // Map the indexes of the tabGrp since we need to ignore rests when drawing partials
+    // However, exception for the first and last element of a beam
+    std::vector<int> noteIndexes;
+    for (i = 0; i < elementCount; ++i) {
+        if (beamElementCoords->at(i)->m_element->Is(REST))
+            if (i > 0 && i < elementCount - 1) continue;
+        noteIndexes.push_back(i);
+    }
+    int noteCount = (int)noteIndexes.size();
+
+    if (noteCount > 0) {
+        int testDur = DUR_16;
+        int barY = beamInterface->m_beamWidth / 2;
+
+        if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
+            barY = -barY;
+        }
+
+        int fractBeamWidth = m_doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, glyphSize, beamInterface->m_cueSize);
+
+        // loop
+        while (testDur <= beamInterface->m_shortestDur) {
+            // true at the beginning of a beam or after a breakSec
+            bool start = true;
+
+            int idx = 0;
+
+            // all but the last one
+            for (i = 0; i < noteCount - 1; ++i) {
+                idx = noteIndexes.at(i);
+                int nextIdx = noteIndexes.at(i + 1);
+
+                bool breakSec = ((beamElementCoords->at(idx)->m_breaksec)
+                    && (testDur - DUR_8 >= beamElementCoords->at(idx)->m_breaksec));
+                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_NONE;
+                // partial is needed
+                if (beamElementCoords->at(idx)->m_dur >= (char)testDur) {
+                    // and for the next one too, but no break - through
+                    if ((beamElementCoords->at(nextIdx)->m_dur >= (char)testDur) && !breakSec) {
+                        beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_THROUGH;
+                    }
+                    // not needed for the next one or break
+                    else {
+                        // we are starting a beam or after a beam break - put it right
+                        if (start) {
+                            if ((idx != 0) && (beamElementCoords->at(idx - 1)->m_element->Is(REST))) {
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                            }
+                            else {
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_RIGHT;
+                            }
+                        }
+                        // or the previous one had no partial
+                        else if (beamElementCoords->at(noteIndexes.at(i - 1))->m_dur < (char)testDur) {
+                            // if we are at the full bar level, put it left
+                            if (testDur == DUR_16) {
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                            }
+                            // if the previous level underneath was a partial through, put it left
+                            else if (beamElementCoords->at(noteIndexes.at(i - 1))->m_partialFlags[testDur - 1 - DUR_8]
+                                == PARTIAL_THROUGH) {
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                            }
+                            // if the level underneath was not left (right or through), put it right
+                            else if (beamElementCoords->at(idx)->m_partialFlags[testDur - 1 - DUR_8] != PARTIAL_LEFT) {
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_RIGHT;
+                            }
+                            // it was put left before, put it left
+                            else {
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                            }
+                        }
+                    }
+                }
+                // we are not in a group
+                start = breakSec;
+            }
+            // last one
+            idx = (int)noteIndexes.back();
+            beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_NONE;
+            // partial is needed
+            if ((beamElementCoords->at(idx)->m_dur >= (char)testDur)) {
+                // and the previous one had no partial - put it left
+                if ((noteCount == 1) || (beamElementCoords->at(noteIndexes.at(i - 1))->m_dur < (char)testDur)
+                    || start) {
+                    beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                }
+            }
+
+            barY = beamInterface->m_beamWidth * (testDur - DUR_8) / 2;
+
+            // draw them
+            for (i = 0; i < noteCount; ++i) {
+                int barYPos = 0;
+                idx = noteIndexes.at(i);
+                if (BEAMPLACE_mixed == beamInterface->m_drawingPlace) {
+                    int elemIndex = idx;
+                    if (BEAMPLACE_NONE == beamElementCoords->at(idx)->m_partialFlagPlace) {
+                        if ((0 == i) || ((noteCount - 1) == i)
+                            || (beamElementCoords->at(noteIndexes.at(i - 1))->m_partialFlagPlace
+                                != beamElementCoords->at(noteIndexes.at(i + 1))->m_partialFlagPlace)) {
+                            continue;
+                        }
+                        elemIndex = i - 1;
+                    }
+                    barYPos
+                        = barY * ((BEAMPLACE_above == beamElementCoords->at(elemIndex)->m_partialFlagPlace) ? 1 : -1);
+                }
+                else {
+                    barYPos = shiftY * barY;
+                }
+                if (beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] == PARTIAL_THROUGH) {
+                    // through should never be set on the last one
+                    assert(i < noteCount - 1);
+                    if (i >= noteCount - 1) continue; // assert for debug and skip otherwise
+                    y1 = y + barYPos;
+                    y2 = y + barYPos;
+                    DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1,
+                        beamElementCoords->at(noteIndexes.at(i + 1))->m_x, y2, polygonHeight);
+                }
+                else if (beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] == PARTIAL_RIGHT) {
+                    y1 = y + barYPos;
+                    int x2 = beamElementCoords->at(idx)->m_x + fractBeamWidth;
+                    y2 = y + barYPos + beamSegment->m_beamSlope * (x2 - beamElementCoords->at(0)->m_x);
+                    DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1, x2, y2, polygonHeight);
+                }
+                else if (beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] == PARTIAL_LEFT) {
+                    y2 = y + barYPos;
+                    int x1 = beamElementCoords->at(idx)->m_x - fractBeamWidth;
+                    y1 = y + barYPos + beamSegment->m_beamSlope * (x1 - beamElementCoords->at(0)->m_x);
+                    DrawObliquePolygon(dc, x1, y1, beamElementCoords->at(idx)->m_x, y2, polygonHeight);
+                }
+            }
+
+            testDur += 1;
+
+        } // end of while
+    } // end of drawing partial bars
+}
+
 } // namespace vrv

From 62153688bb1db725668607d0d37bba7d9213185a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 11 Jan 2022 18:14:12 +0100
Subject: [PATCH 034/403] Refactor beam drawing in tablature

* Have specific CalcTabBeam and a common View::DrawBeamSegment
---
 include/vrv/beam.h             |   7 +-
 include/vrv/drawinginterface.h |   1 +
 include/vrv/view.h             |   6 --
 src/beam.cpp                   |  52 +++++++--
 src/drawinginterface.cpp       |   1 +
 src/view_beam.cpp              |  16 +--
 src/view_tab.cpp               | 191 ---------------------------------
 7 files changed, 57 insertions(+), 217 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index a3cfad402d0..857fc454dc6 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -44,7 +44,9 @@ class BeamSegment {
     void Reset();
 
     void CalcBeam(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface,
-        data_BEAMPLACE place = BEAMPLACE_NONE, bool init = true, bool isTabBeam = false);
+        data_BEAMPLACE place = BEAMPLACE_NONE, bool init = true);
+
+    void CalcTabBeam(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
 
     /**
      *
@@ -79,8 +81,7 @@ class BeamSegment {
     // Helper to adjust beam positioning with regards to ledger lines (top and bottom of the staff)
     void AdjustBeamToLedgerLines(Doc *doc, Staff *staff, BeamDrawingInterface *beamInterface);
 
-    void CalcBeamInit(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place,
-        bool isTabBeam);
+    void CalcBeamInit(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
 
     bool CalcBeamSlope(
         Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, bool &shorten, int &step);
diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index f99e32c126d..dd8eca9c700 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -156,6 +156,7 @@ class BeamDrawingInterface : public ObjectListInterface {
     int m_beamWidth;
     int m_beamWidthBlack;
     int m_beamWidthWhite;
+    int m_fractionSize;
 
     // position x for the stem (normal and cue-sized)
     int m_stemXAbove[2];
diff --git a/include/vrv/view.h b/include/vrv/view.h
index 6c8aecb1748..7213268b7a2 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -602,12 +602,6 @@ class View {
     void DrawBeamSegment(DeviceContext *dc, BeamSegment *segment, BeamDrawingInterface *beamInterface, Layer *layer,
         Staff *staff, Measure *measure);
 
-    /**
-     * Internal method for drawing a BeamSegment in a tablature
-     */
-    void DrawTabBeamSegment(DeviceContext *dc, BeamSegment *segment, BeamDrawingInterface *beamInterface, Layer *layer,
-        Staff *staff, Measure *measure);
-
 public:
     /** Document */
     Doc *m_doc;
diff --git a/src/beam.cpp b/src/beam.cpp
index 325245ea9af..866078356fb 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -81,8 +81,44 @@ void BeamSegment::InitCoordRefs(const ArrayOfBeamElementCoords *beamElementCoord
     m_beamElementCoordRefs = *beamElementCoords;
 }
 
-void BeamSegment::CalcBeam(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface,
-    data_BEAMPLACE place, bool init, bool isTabBeam)
+void BeamSegment::CalcTabBeam(
+    Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place)
+{
+    assert(layer);
+    assert(staff);
+    assert(doc);
+
+    // Calculate the y position of the beam - this currently need to be inline with the code in View::DrawTabGrp that
+    // draws the stems.
+    int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
+    beamInterface->m_fractionSize = glyphSize * 2 / 3;
+    int height = doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
+    int y = staff->GetDrawingY() + height;
+    y += doc->GetDrawingUnit(staff->m_drawingStaffSize) * 1.5;
+
+    assert(m_beamElementCoordRefs.size() > 0);
+
+    // For recursive calls, avoid to re-init values
+    this->CalcBeamInit(layer, staff, doc, beamInterface, place);
+
+    // Adjust the height and spacing of the beams
+    beamInterface->m_beamWidthBlack /= 2;
+    beamInterface->m_beamWidthWhite /= 2;
+    beamInterface->m_beamWidth = beamInterface->m_beamWidthBlack + beamInterface->m_beamWidthWhite;
+
+    beamInterface->m_drawingPlace = (place == BEAMPLACE_below) ? BEAMPLACE_below : BEAMPLACE_above;
+
+    for (auto coord : m_beamElementCoordRefs) {
+        // All notes and chords get their stem value stored
+        LayerElement *el = coord->m_element;
+        if (el->Is(TABGRP)) {
+            coord->m_yBeam = y;
+        }
+    }
+}
+
+void BeamSegment::CalcBeam(
+    Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place, bool init)
 {
     assert(layer);
     assert(staff);
@@ -93,10 +129,10 @@ void BeamSegment::CalcBeam(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInte
 
     // For recursive calls, avoid to re-init values
     if (init) {
-        this->CalcBeamInit(layer, staff, doc, beamInterface, place, isTabBeam);
+        this->CalcBeamInit(layer, staff, doc, beamInterface, place);
     }
 
-    if (isTabBeam) return;
+    beamInterface->m_fractionSize = staff->m_drawingStaffSize;
 
     bool horizontal = beamInterface->IsHorizontal();
 
@@ -115,7 +151,7 @@ void BeamSegment::CalcBeam(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInte
     CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
     if (BEAMPLACE_mixed == beamInterface->m_drawingPlace) {
         if (!beamInterface->m_crossStaffContent && NeedToResetPosition(staff, doc, beamInterface)) {
-            CalcBeamInit(layer, staff, doc, beamInterface, place, false);
+            CalcBeamInit(layer, staff, doc, beamInterface, place);
             CalcBeamStemLength(staff, beamInterface->m_drawingPlace, horizontal);
             CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
         }
@@ -323,7 +359,7 @@ void BeamSegment::AdjustBeamToLedgerLines(Doc *doc, Staff *staff, BeamDrawingInt
 }
 
 void BeamSegment::CalcBeamInit(
-    Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place, bool isTabBeam)
+    Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place)
 {
     assert(layer);
     assert(staff);
@@ -377,8 +413,6 @@ void BeamSegment::CalcBeamInit(
     m_firstNoteOrChord = NULL;
     m_lastNoteOrChord = NULL;
 
-    if (isTabBeam) return;
-
     int yMax = m_verticalCenter;
     int yMin = m_verticalCenter;
     auto SetExtrema = [&yMax, &yMin](int currentY) {
@@ -391,7 +425,7 @@ void BeamSegment::CalcBeamInit(
         BeamElementCoord *coord = m_beamElementCoordRefs.at(i);
         coord->m_yBeam = 0;
 
-        if (coord->m_element->Is({ CHORD, NOTE })) {
+        if (coord->m_element->Is({ CHORD, NOTE, TABGRP })) {
             if (!m_firstNoteOrChord) m_firstNoteOrChord = coord;
             m_lastNoteOrChord = coord;
             m_nbNotesOrChords++;
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 8a6f29a0abc..141ce8a2bd7 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -81,6 +81,7 @@ void BeamDrawingInterface::Reset()
     m_beamHasChord = false;
     m_hasMultipleStemDir = false;
     m_cueSize = false;
+    m_fractionSize = 100;
     m_crossStaffContent = NULL;
     m_crossStaffRel = STAFFREL_basic_NONE;
     m_shortestDur = 0;
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 483889621c3..2c1d0a21e84 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -58,7 +58,12 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     /******************************************************************/
     // Calculate the beam slope and position
 
-    beam->m_beamSegment.CalcBeam(layer, beam->m_beamStaff, m_doc, beam, beam->GetPlace(), true, isTabBeam);
+    if (isTabBeam) {
+        beam->m_beamSegment.CalcTabBeam(layer, beam->m_beamStaff, m_doc, beam, beam->GetPlace());
+    }
+    else {
+        beam->m_beamSegment.CalcBeam(layer, beam->m_beamStaff, m_doc, beam, beam->GetPlace());
+    }
 
     /******************************************************************/
     // Start the Beam graphic and draw the children
@@ -73,12 +78,7 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     /******************************************************************/
     // Draw the beamSegment
 
-    if (isTabBeam) {
-        DrawTabBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
-    }
-    else {
-        DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
-    }
+    DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
 
     dc->EndGraphic(element, this);
 }
@@ -291,7 +291,7 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
         }
 
         int fractBeamWidth
-            = m_doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, staff->m_drawingStaffSize, beamInterface->m_cueSize);
+            = m_doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, beamInterface->m_fractionSize, beamInterface->m_cueSize);
 
         // loop
         while (testDur <= beamInterface->m_shortestDur) {
diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 9072e74402d..47dfe04c8d1 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -183,195 +183,4 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     dc->EndGraphic(tabDurSym, this);
 }
 
-void View::DrawTabBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDrawingInterface *beamInterface,
-    Layer *layer, Staff *staff, Measure *measure)
-{
-    assert(dc);
-    assert(beamSegment);
-    assert(beamInterface);
-    assert(layer);
-    assert(staff);
-    assert(measure);
-
-    // temporary coordinates
-    int x1, x2, y1, y2;
-
-    // temporary variables
-    int shiftY;
-
-    // loops
-    int i;
-
-    const ArrayOfBeamElementCoords *beamElementCoords = beamSegment->GetElementCoordRefs();
-
-    int elementCount = (int)beamElementCoords->size();
-    int last = elementCount - 1;
-
-    /******************************************************************/
-    // Draw the beam full bar
-
-    // Adjust the x position of the first and last element for taking into account the stem width
-    beamElementCoords->at(0)->m_x -= (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
-    beamElementCoords->at(last)->m_x += (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
-
-    // Shift direction
-    shiftY = (beamInterface->m_drawingPlace == BEAMPLACE_below) ? 1.0 : -1.0;
-
-    int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
-    int height = m_doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
-    int y = staff->GetDrawingY() + height;
-    y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 1.5;
-
-    x1 = beamElementCoords->at(0)->m_x;
-    x2 = beamElementCoords->at(last)->m_x;
-
-    // For acc and rit beam (see AttBeamingVis set
-    // s_y = 0 and s_y2 = 0 respectively
-
-    const int polygonHeight = beamInterface->m_beamWidthBlack * shiftY / 2;
-    DrawObliquePolygon(dc, x1, y, x2, y, polygonHeight);
-
-    /******************************************************************/
-    // Draw the beam for partial bars (if any)
-
-    // Map the indexes of the tabGrp since we need to ignore rests when drawing partials
-    // However, exception for the first and last element of a beam
-    std::vector<int> noteIndexes;
-    for (i = 0; i < elementCount; ++i) {
-        if (beamElementCoords->at(i)->m_element->Is(REST))
-            if (i > 0 && i < elementCount - 1) continue;
-        noteIndexes.push_back(i);
-    }
-    int noteCount = (int)noteIndexes.size();
-
-    if (noteCount > 0) {
-        int testDur = DUR_16;
-        int barY = beamInterface->m_beamWidth / 2;
-
-        if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
-            barY = -barY;
-        }
-
-        int fractBeamWidth = m_doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, glyphSize, beamInterface->m_cueSize);
-
-        // loop
-        while (testDur <= beamInterface->m_shortestDur) {
-            // true at the beginning of a beam or after a breakSec
-            bool start = true;
-
-            int idx = 0;
-
-            // all but the last one
-            for (i = 0; i < noteCount - 1; ++i) {
-                idx = noteIndexes.at(i);
-                int nextIdx = noteIndexes.at(i + 1);
-
-                bool breakSec = ((beamElementCoords->at(idx)->m_breaksec)
-                    && (testDur - DUR_8 >= beamElementCoords->at(idx)->m_breaksec));
-                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_NONE;
-                // partial is needed
-                if (beamElementCoords->at(idx)->m_dur >= (char)testDur) {
-                    // and for the next one too, but no break - through
-                    if ((beamElementCoords->at(nextIdx)->m_dur >= (char)testDur) && !breakSec) {
-                        beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_THROUGH;
-                    }
-                    // not needed for the next one or break
-                    else {
-                        // we are starting a beam or after a beam break - put it right
-                        if (start) {
-                            if ((idx != 0) && (beamElementCoords->at(idx - 1)->m_element->Is(REST))) {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
-                            }
-                            else {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_RIGHT;
-                            }
-                        }
-                        // or the previous one had no partial
-                        else if (beamElementCoords->at(noteIndexes.at(i - 1))->m_dur < (char)testDur) {
-                            // if we are at the full bar level, put it left
-                            if (testDur == DUR_16) {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
-                            }
-                            // if the previous level underneath was a partial through, put it left
-                            else if (beamElementCoords->at(noteIndexes.at(i - 1))->m_partialFlags[testDur - 1 - DUR_8]
-                                == PARTIAL_THROUGH) {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
-                            }
-                            // if the level underneath was not left (right or through), put it right
-                            else if (beamElementCoords->at(idx)->m_partialFlags[testDur - 1 - DUR_8] != PARTIAL_LEFT) {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_RIGHT;
-                            }
-                            // it was put left before, put it left
-                            else {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
-                            }
-                        }
-                    }
-                }
-                // we are not in a group
-                start = breakSec;
-            }
-            // last one
-            idx = (int)noteIndexes.back();
-            beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_NONE;
-            // partial is needed
-            if ((beamElementCoords->at(idx)->m_dur >= (char)testDur)) {
-                // and the previous one had no partial - put it left
-                if ((noteCount == 1) || (beamElementCoords->at(noteIndexes.at(i - 1))->m_dur < (char)testDur)
-                    || start) {
-                    beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
-                }
-            }
-
-            barY = beamInterface->m_beamWidth * (testDur - DUR_8) / 2;
-
-            // draw them
-            for (i = 0; i < noteCount; ++i) {
-                int barYPos = 0;
-                idx = noteIndexes.at(i);
-                if (BEAMPLACE_mixed == beamInterface->m_drawingPlace) {
-                    int elemIndex = idx;
-                    if (BEAMPLACE_NONE == beamElementCoords->at(idx)->m_partialFlagPlace) {
-                        if ((0 == i) || ((noteCount - 1) == i)
-                            || (beamElementCoords->at(noteIndexes.at(i - 1))->m_partialFlagPlace
-                                != beamElementCoords->at(noteIndexes.at(i + 1))->m_partialFlagPlace)) {
-                            continue;
-                        }
-                        elemIndex = i - 1;
-                    }
-                    barYPos
-                        = barY * ((BEAMPLACE_above == beamElementCoords->at(elemIndex)->m_partialFlagPlace) ? 1 : -1);
-                }
-                else {
-                    barYPos = shiftY * barY;
-                }
-                if (beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] == PARTIAL_THROUGH) {
-                    // through should never be set on the last one
-                    assert(i < noteCount - 1);
-                    if (i >= noteCount - 1) continue; // assert for debug and skip otherwise
-                    y1 = y + barYPos;
-                    y2 = y + barYPos;
-                    DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1,
-                        beamElementCoords->at(noteIndexes.at(i + 1))->m_x, y2, polygonHeight);
-                }
-                else if (beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] == PARTIAL_RIGHT) {
-                    y1 = y + barYPos;
-                    int x2 = beamElementCoords->at(idx)->m_x + fractBeamWidth;
-                    y2 = y + barYPos + beamSegment->m_beamSlope * (x2 - beamElementCoords->at(0)->m_x);
-                    DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1, x2, y2, polygonHeight);
-                }
-                else if (beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] == PARTIAL_LEFT) {
-                    y2 = y + barYPos;
-                    int x1 = beamElementCoords->at(idx)->m_x - fractBeamWidth;
-                    y1 = y + barYPos + beamSegment->m_beamSlope * (x1 - beamElementCoords->at(0)->m_x);
-                    DrawObliquePolygon(dc, x1, y1, beamElementCoords->at(idx)->m_x, y2, polygonHeight);
-                }
-            }
-
-            testDur += 1;
-
-        } // end of while
-    } // end of drawing partial bars
-}
-
 } // namespace vrv

From fe76b0666ffecf653d1c6635032e44cd72622687 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 12 Jan 2022 10:58:27 +0100
Subject: [PATCH 035/403] Check BBox existence

and don't use note radii for tstamps
---
 src/layerelement.cpp | 4 +++-
 src/tie.cpp          | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index b1f288a4e5f..f7bb0fc4901 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1947,7 +1947,9 @@ int LayerElement::AdjustXPos(FunctorParams *functorParams)
         [this](const std::pair<LayerElement *, LayerElement *> &pair) { return pair.second == this; });
     if (it != params->m_measureTieEndpoints.end()) {
         const int minTieLength = params->m_doc->GetOptions()->m_tieMinLength.GetValue() * drawingUnit;
-        const int currentTieLength = it->second->GetContentLeft() - it->first->GetContentRight() - drawingUnit;
+        const int leftXPos = it->first->HasContentBB() ? it->first->GetContentRight() : it->first->GetDrawingX();
+        const int rightXPos = it->second->HasContentBB() ? it->second->GetContentLeft() : it->second->GetDrawingX();
+        const int currentTieLength = rightXPos - leftXPos - drawingUnit;
         if ((currentTieLength < minTieLength)
             && ((it->first->GetFirstAncestor(CHORD) != NULL) || (this->GetFirstAncestor(CHORD) != NULL)
                 || (it->first->FindDescendantByType(FLAG) != NULL))) {
diff --git a/src/tie.cpp b/src/tie.cpp
index 40b65c7feac..9f648f82a50 100644
--- a/src/tie.cpp
+++ b/src/tie.cpp
@@ -368,8 +368,8 @@ void Tie::CalculateXPosition(Doc *doc, Staff *staff, Chord *startParentChord, Ch
         isShortTie = true;
     }
 
-    int r1 = drawingUnit;
-    int r2 = r1;
+    int r1 = 0;
+    int r2 = 0;
     // the normal case
     if (spanningType == SPANNING_START_END) {
         if (startNote) {

From e240623a410a5a06c8b256999972ddfab1888e7f Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 11 Jan 2022 07:49:20 +0100
Subject: [PATCH 036/403] Disable order check for syllables

---
 src/view_control.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view_control.cpp b/src/view_control.cpp
index 4bb7dcd93ce..7ac6663fd99 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -187,7 +187,7 @@ void View::DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *s
         }
     }
     if (!start || !end) return;
-    if (!interface->IsOrdered(start, end)) {
+    if (!interface->IsOrdered(start, end) && !element->Is(SYL)) {
         // To avoid showing the same warning multiple times, display a warning only during actual drawing
         if (!dc->Is(BBOX_DEVICE_CONTEXT) && (m_currentPage == vrv_cast<Page *>(start->GetFirstAncestor(PAGE)))) {
             LogWarning("%s '%s' is ignored, since start '%s' does not occur temporally before end '%s'.",

From 49977baae7c8f8a496876c0c089d69786be1c744 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 11 Jan 2022 08:36:49 +0100
Subject: [PATCH 037/403] Handle multiple "syllabic" elements

within MusicXML lyric
---
 src/iomusxml.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 19b8d64ad9f..aa364e338d3 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2778,14 +2778,16 @@ void MusicXmlInput::ReadMusicXmlNote(
             // verse->SetPlace(verse->AttPlacementRelStaff::StrToStaffrelBasic(lyric.attribute("placement").as_string()));
             verse->SetLabel(lyric.attribute("name").as_string());
             verse->SetN(lyricNumber);
-            for (pugi::xml_node textNode : lyric.children("text")) {
-                if (!HasAttributeWithValue(lyric, "print-object", "no")) {
+            std::string syllabic = "single";
+            for (pugi::xml_node childNode : lyric.children()) {
+                if (!strcmp(childNode.name(), "syllabic")) syllabic = GetContent(childNode);
+                if (!strcmp(childNode.name(), "text") && !HasAttributeWithValue(lyric, "print-object", "no")) {
                     // const std::string textColor = textNode.attribute("color").as_string();
-                    const std::string textStyle = textNode.attribute("font-style").as_string();
-                    const std::string textWeight = textNode.attribute("font-weight").as_string();
-                    short int lineThrough = textNode.attribute("line-through").as_int();
-                    const std::string lang = textNode.attribute("xml:lang").as_string();
-                    std::string textStr = textNode.text().as_string();
+                    const std::string textStyle = childNode.attribute("font-style").as_string();
+                    const std::string textWeight = childNode.attribute("font-weight").as_string();
+                    int lineThrough = childNode.attribute("line-through").as_int();
+                    const std::string lang = childNode.attribute("xml:lang").as_string();
+                    std::string textStr = childNode.text().as_string();
 
                     // convert verse numbers to labels
                     std::regex labelSearch("^([^[:alpha:]]*\\d[^[:alpha:]]*)$");
@@ -2793,7 +2795,7 @@ void MusicXmlInput::ReadMusicXmlNote(
                     std::regex labelPrefixSearch("^([^[:alpha:]]*\\d[^[:alpha:]]*)[\\s\\u00A0]+");
                     std::smatch labelPrefixSearchMatches;
                     if (!textStr.empty() && std::regex_search(textStr, labelSearchMatches, labelSearch)
-                        && labelSearchMatches.ready() && textNode.next_sibling("elision")) {
+                        && labelSearchMatches.ready() && childNode.next_sibling("elision")) {
                         // entire textStr is a label (MusicXML from Finale)
 
                         Label *label = new Label();
@@ -2822,25 +2824,25 @@ void MusicXmlInput::ReadMusicXmlNote(
 
                     Syl *syl = new Syl();
                     syl->SetLang(lang.c_str());
-                    if (GetContentOfChild(lyric, "syllabic") == "single") {
+                    if (syllabic == "single") {
                         syl->SetWordpos(sylLog_WORDPOS_s);
                         syl->SetCon(sylLog_CON_s);
                     }
-                    else if (GetContentOfChild(lyric, "syllabic") == "begin") {
+                    else if (syllabic == "begin") {
                         syl->SetWordpos(sylLog_WORDPOS_i);
                         syl->SetCon(sylLog_CON_d);
                     }
-                    else if (GetContentOfChild(lyric, "syllabic") == "middle") {
+                    else if (syllabic == "middle") {
                         syl->SetWordpos(sylLog_WORDPOS_m);
                         syl->SetCon(sylLog_CON_d);
                     }
-                    else if (GetContentOfChild(lyric, "syllabic") == "end") {
+                    else if (syllabic == "end") {
                         syl->SetWordpos(sylLog_WORDPOS_t);
                         syl->SetCon(sylLog_CON_s);
                     }
 
                     // override @con if we have elisions or extensions
-                    if (textNode.next_sibling("elision")) {
+                    if (childNode.next_sibling("elision")) {
                         syl->SetCon(sylLog_CON_b);
                     }
                     else if (lyric.child("extend")) {

From b3a99202a7632bbeadcf5599f18a75458ee8e515 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 11 Jan 2022 14:24:52 +0100
Subject: [PATCH 038/403] Fix start and end at chords for syllables

---
 include/vrv/chord.h         |  5 +++++
 include/vrv/functorparams.h | 11 ++++++-----
 src/chord.cpp               | 11 +++++++++++
 src/doc.cpp                 |  4 ++--
 src/note.cpp                |  6 ++++--
 src/syl.cpp                 |  6 +++---
 6 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/include/vrv/chord.h b/include/vrv/chord.h
index e969abf5471..56431fc74d6 100644
--- a/include/vrv/chord.h
+++ b/include/vrv/chord.h
@@ -206,6 +206,11 @@ class Chord : public LayerElement,
      */
     int PrepareLayerElementParts(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::PrepareLyrics
+     */
+    int PrepareLyrics(FunctorParams *functorParams) override;
+
     /**
      * See Object::CalcOnsetOffsetEnd
      */
diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 1ed431d09b9..9a812203ce6 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1896,7 +1896,8 @@ class PrepareCrossStaffParams : public FunctorParams {
 
 /**
  * member 0: the current Syl
- * member 1: the last Note
+ * member 1: the last Note or Chord
+ * member 2: the penultimate Note or Chord
  **/
 
 class PrepareLyricsParams : public FunctorParams {
@@ -1904,12 +1905,12 @@ class PrepareLyricsParams : public FunctorParams {
     PrepareLyricsParams()
     {
         m_currentSyl = NULL;
-        m_lastNote = NULL;
-        m_lastButOneNote = NULL;
+        m_lastNoteOrChord = NULL;
+        m_penultimateNoteOrChord = NULL;
     }
     Syl *m_currentSyl;
-    Note *m_lastNote;
-    Note *m_lastButOneNote;
+    LayerElement *m_lastNoteOrChord;
+    LayerElement *m_penultimateNoteOrChord;
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/chord.cpp b/src/chord.cpp
index dc16eefa610..d9fcf865ab8 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -871,6 +871,17 @@ int Chord::PrepareLayerElementParts(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Chord::PrepareLyrics(FunctorParams *functorParams)
+{
+    PrepareLyricsParams *params = vrv_params_cast<PrepareLyricsParams *>(functorParams);
+    assert(params);
+
+    params->m_penultimateNoteOrChord = params->m_lastNoteOrChord;
+    params->m_lastNoteOrChord = this;
+
+    return FUNCTOR_CONTINUE;
+}
+
 int Chord::CalcOnsetOffsetEnd(FunctorParams *functorParams)
 {
     CalcOnsetOffsetParams *params = vrv_params_cast<CalcOnsetOffsetParams *>(functorParams);
diff --git a/src/doc.cpp b/src/doc.cpp
index 20f6dd4da51..21135df4731 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -1865,8 +1865,8 @@ int Doc::PrepareLyricsEnd(FunctorParams *functorParams)
     if (!params->m_currentSyl) {
         return FUNCTOR_STOP; // early return
     }
-    if (params->m_lastNote && (params->m_currentSyl->GetStart() != params->m_lastNote)) {
-        params->m_currentSyl->SetEnd(params->m_lastNote);
+    if (params->m_lastNoteOrChord && (params->m_currentSyl->GetStart() != params->m_lastNoteOrChord)) {
+        params->m_currentSyl->SetEnd(params->m_lastNoteOrChord);
     }
     else if (m_options->m_openControlEvents.GetValue()) {
         sylLog_WORDPOS wordpos = params->m_currentSyl->GetWordpos();
diff --git a/src/note.cpp b/src/note.cpp
index b25d53c04f2..395a5d8c192 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1273,8 +1273,10 @@ int Note::PrepareLyrics(FunctorParams *functorParams)
     PrepareLyricsParams *params = vrv_params_cast<PrepareLyricsParams *>(functorParams);
     assert(params);
 
-    params->m_lastButOneNote = params->m_lastNote;
-    params->m_lastNote = this;
+    if (!this->IsChordTone()) {
+        params->m_penultimateNoteOrChord = params->m_lastNoteOrChord;
+        params->m_lastNoteOrChord = this;
+    }
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/syl.cpp b/src/syl.cpp
index f3b72721cdf..7ec4c26d194 100644
--- a/src/syl.cpp
+++ b/src/syl.cpp
@@ -150,16 +150,16 @@ int Syl::PrepareLyrics(FunctorParams *functorParams)
         // The previous syl was an initial or median -> The note we just parsed is the end
         if ((params->m_currentSyl->GetWordpos() == sylLog_WORDPOS_i)
             || (params->m_currentSyl->GetWordpos() == sylLog_WORDPOS_m)) {
-            params->m_currentSyl->SetEnd(params->m_lastNote);
+            params->m_currentSyl->SetEnd(params->m_lastNoteOrChord);
             params->m_currentSyl->m_nextWordSyl = this;
         }
         // The previous syl was a underscore -> the previous but one was the end
         else if (params->m_currentSyl->GetCon() == sylLog_CON_u) {
-            if (params->m_currentSyl->GetStart() == params->m_lastButOneNote)
+            if (params->m_currentSyl->GetStart() == params->m_penultimateNoteOrChord)
                 LogWarning("Syllable with underline extender under one single note '%s'",
                     params->m_currentSyl->GetStart()->GetUuid().c_str());
             else
-                params->m_currentSyl->SetEnd(params->m_lastButOneNote);
+                params->m_currentSyl->SetEnd(params->m_penultimateNoteOrChord);
         }
     }
 

From b168c2979e3941258405a27d61a816512a53cdf5 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 12 Jan 2022 11:53:05 +0100
Subject: [PATCH 039/403] Add const

---
 src/iomusxml.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index aa364e338d3..ed014c1be53 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2785,7 +2785,7 @@ void MusicXmlInput::ReadMusicXmlNote(
                     // const std::string textColor = textNode.attribute("color").as_string();
                     const std::string textStyle = childNode.attribute("font-style").as_string();
                     const std::string textWeight = childNode.attribute("font-weight").as_string();
-                    int lineThrough = childNode.attribute("line-through").as_int();
+                    const int lineThrough = childNode.attribute("line-through").as_int();
                     const std::string lang = childNode.attribute("xml:lang").as_string();
                     std::string textStr = childNode.text().as_string();
 

From 4a0e1afd8a001a6928e7758e68841a8776df47a9 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 12 Jan 2022 12:27:34 +0100
Subject: [PATCH 040/403] Resolve rebase conflict

---
 src/iomusxml.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index ed014c1be53..f7c673e11f2 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2785,7 +2785,7 @@ void MusicXmlInput::ReadMusicXmlNote(
                     // const std::string textColor = textNode.attribute("color").as_string();
                     const std::string textStyle = childNode.attribute("font-style").as_string();
                     const std::string textWeight = childNode.attribute("font-weight").as_string();
-                    const int lineThrough = childNode.attribute("line-through").as_int();
+                    const short int lineThrough = childNode.attribute("line-through").as_int();
                     const std::string lang = childNode.attribute("xml:lang").as_string();
                     std::string textStr = childNode.text().as_string();
 

From 901621dba61827033047215b2d7a4476d11ec79e Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Wed, 12 Jan 2022 11:55:29 +0000
Subject: [PATCH 041/403] Implement MIDI for tablature

---
 include/vrv/functorparams.h |  9 +++++
 src/note.cpp                | 38 ++++++++++++++++++--
 src/staff.cpp               | 12 +++++++
 src/tuning.cpp              | 69 ++++++++++++++++++++++++++++++-------
 4 files changed, 113 insertions(+), 15 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 1ed431d09b9..8723ca523c3 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1534,6 +1534,14 @@ struct MIDINote {
 
 using MIDINoteSequence = std::list<MIDINote>;
 
+/**
+ * Helper struct for held notes in tablature
+ */
+struct MIDIHeldNote {
+    char m_pitch = 0;
+    double m_stoptime = 0;
+};
+
 /**
  * member 0: MidiFile*: the MidiFile we are writing to
  * member 1: int: the midi track number
@@ -1563,6 +1571,7 @@ class GenerateMIDIParams : public FunctorParams {
     double m_currentTempo;
     std::map<Note *, MIDINoteSequence> m_expandedNotes;
     Functor *m_functor;
+    std::vector<MIDIHeldNote> m_heldNotes; ///< Tablature held notes indexed by (course - 1)
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/note.cpp b/src/note.cpp
index 31147a6dc57..c610040dbd9 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1361,8 +1361,42 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
         this->CalcMIDIPitch(params->m_transSemi);
         char pitch = this->GetMIDIPitch();
 
-        params->m_midiFile->addNoteOn(params->m_midiTrack, starttime * tpq, channel, pitch, velocity);
-        params->m_midiFile->addNoteOff(params->m_midiTrack, stoptime * tpq, channel, pitch);
+        if (this->HasTabCourse() && this->GetTabCourse() >= 1) {
+            // Tablature 'rule of holds'.  A note on a course is held until the next note
+            // on that course is required, or until a default hold duration is reached.
+
+            const int course = this->GetTabCourse();
+            if (params->m_heldNotes.size() < static_cast<size_t>(course))
+                params->m_heldNotes.resize(course); // make room
+
+            // if a previously held note on this course is already sounding, end it now.
+            if (params->m_heldNotes[course - 1].m_pitch > 0)
+                params->m_heldNotes[course - 1].m_stoptime = starttime; // stop now
+
+            // end all previously held notes that have reached their stoptime
+            for (auto &held : params->m_heldNotes) {
+                if (held.m_pitch > 0 && held.m_stoptime <= starttime) {
+                    params->m_midiFile->addNoteOff(params->m_midiTrack, held.m_stoptime * tpq, channel, held.m_pitch);
+                    held.m_pitch = 0;
+                    held.m_stoptime = 0;
+                }
+            }
+
+            // start this note
+            params->m_midiFile->addNoteOn(params->m_midiTrack, starttime * tpq, channel, pitch, velocity);
+
+            // hold this note until the greater of its rhythm sign and the default duration.
+            // TODO optimize the default hold duration
+            const double defaultHoldTime = 4; // quarter notes
+            params->m_heldNotes[course - 1].m_pitch = pitch;
+            params->m_heldNotes[course - 1].m_stoptime = params->m_totalTime
+                + std::max(defaultHoldTime, this->GetScoreTimeOffset() + this->GetScoreTimeTiedDuration());
+        }
+        else {
+            const double stoptime = params->m_totalTime + this->GetScoreTimeOffset() + this->GetScoreTimeTiedDuration();
+            params->m_midiFile->addNoteOn(params->m_midiTrack, starttime * tpq, channel, pitch, velocity);
+            params->m_midiFile->addNoteOff(params->m_midiTrack, stoptime * tpq, channel, pitch);
+        }
     }
 
     return FUNCTOR_SIBLINGS;
diff --git a/src/staff.cpp b/src/staff.cpp
index e9e4b883b3e..50cbfba9df3 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -33,6 +33,8 @@
 #include "vrv.h"
 #include "zone.h"
 
+#include "MidiFile.h"
+
 namespace vrv {
 
 //----------------------------------------------------------------------------
@@ -713,6 +715,16 @@ int Staff::GenerateMIDI(FunctorParams *functorParams)
 
     params->m_expandedNotes.clear();
 
+    // Tablature: end any remaining held notes
+    for (auto &held : params->m_heldNotes) {
+        if (held.m_pitch > 0) {
+            params->m_midiFile->addNoteOff(params->m_midiTrack, held.m_stoptime * params->m_midiFile->getTPQ(),
+                params->m_midiChannel, held.m_pitch);
+        }
+    }
+
+    params->m_heldNotes.clear();
+
     return FUNCTOR_CONTINUE;
 }
 
diff --git a/src/tuning.cpp b/src/tuning.cpp
index aa4ebf05c6d..b84bbaf50c4 100644
--- a/src/tuning.cpp
+++ b/src/tuning.cpp
@@ -108,29 +108,72 @@ int Tuning::CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType
     }
 
     // no <tuning><course> specified, fall back to @tuning.standard
-    // TODO what other values for @tuning.standard will there be?
 
-    //                                 E4  B3  G3  D3  A2  E2
-    static const int guitarPitch[] = { 64, 59, 55, 50, 45, 40 }; // modern guitar
+    // modern guitar                           E4  B3  G3  D3  A2  E2
+    static const int guitarStandardPitch[] = { 64, 59, 55, 50, 45, 40 };
 
-    //                                      E4  B3  G3  D3  A2  D2
-    static const int guitarDropDPitch[] = { 64, 59, 55, 50, 45, 38 }; // modern guitar drop D
+    // modern guitar drop D                 E4  B3  G3  D3  A2  D2
+    static const int guitarDropDPitch[] = { 64, 59, 55, 50, 45, 38 };
 
-    //                               G4  D4  A3  F3  C3  G2
-    static const int lutePitch[] = { 67, 62, 57, 53, 48, 43 }; // 6 course renaissance lute
+    // modern guitar open D                 D4  A3  F#3 D3  A2  D2
+    static const int guitarOpenDPitch[] = { 62, 57, 54, 50, 45, 38 };
+
+    // modern guitar open G                 D4  B3  G3  D3  G2  D2
+    static const int guitarOpenGPitch[] = { 62, 59, 55, 50, 43, 38 };
+
+    // modern guitar open A                 E4  C#4 A3  E3  A2  E2
+    static const int guitarOpenAPitch[] = { 64, 61, 57, 52, 45, 40 };
+
+    // 6 course renaissance lute                 G4  D4  A3  F3  C3  G2
+    static const int luteRenaissance6Pitch[] = { 67, 62, 57, 53, 48, 43 };
+
+    // baroque lute D major                  F#4 D4  A3  F#3 D3  A2  G2  F#2 E2  D2  C#2 B1  A1
+    static const int luteBaroqueDMajor[] = { 66, 62, 57, 54, 50, 45, 43, 42, 40, 38, 37, 35, 33 };
+
+    // baroque lute D minor                  F4  D4  A3  F3  D3  A2  G2  F2  E2  D2  C2  B1  A1
+    static const int luteBaroqueDMinor[] = { 65, 62, 57, 53, 50, 45, 43, 41, 40, 38, 36, 35, 33 };
 
     const int *pitch = nullptr;
     int pitchSize = 0;
 
     switch (GetTuningStandard()) {
+        case COURSETUNING_guitar_standard:
+            pitch = guitarStandardPitch;
+            pitchSize = sizeof(guitarStandardPitch);
+            break;
         case COURSETUNING_guitar_drop_D:
             pitch = guitarDropDPitch;
             pitchSize = sizeof(guitarDropDPitch);
             break;
 
+        case COURSETUNING_guitar_open_D:
+            pitch = guitarOpenDPitch;
+            pitchSize = sizeof(guitarOpenDPitch);
+            break;
+
+        case COURSETUNING_guitar_open_G:
+            pitch = guitarOpenGPitch;
+            pitchSize = sizeof(guitarOpenGPitch);
+            break;
+
+        case COURSETUNING_guitar_open_A:
+            pitch = guitarOpenAPitch;
+            pitchSize = sizeof(guitarOpenAPitch);
+            break;
+
         case COURSETUNING_lute_renaissance_6:
-            pitch = lutePitch;
-            pitchSize = sizeof(lutePitch);
+            pitch = luteRenaissance6Pitch;
+            pitchSize = sizeof(luteRenaissance6Pitch);
+            break;
+
+        case COURSETUNING_lute_baroque_d_major:
+            pitch = luteBaroqueDMajor;
+            pitchSize = sizeof(luteBaroqueDMajor);
+            break;
+
+        case COURSETUNING_lute_baroque_d_minor:
+            pitch = luteBaroqueDMinor;
+            pitchSize = sizeof(luteBaroqueDMinor);
             break;
 
         case COURSETUNING_NONE: [[fallthrough]];
@@ -141,13 +184,13 @@ int Tuning::CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType
             if (notationType == NOTATIONTYPE_tab_lute_french || notationType == NOTATIONTYPE_tab_lute_italian
                 || notationType == NOTATIONTYPE_tab_lute_german) {
                 // lute tablature, assume 6 course renaissance lute
-                pitch = lutePitch;
-                pitchSize = sizeof(lutePitch);
+                pitch = luteRenaissance6Pitch;
+                pitchSize = sizeof(luteRenaissance6Pitch);
             }
             else {
                 // assume modern guitar
-                pitch = guitarPitch;
-                pitchSize = sizeof(guitarPitch);
+                pitch = guitarStandardPitch;
+                pitchSize = sizeof(guitarStandardPitch);
             }
             break;
     }

From 8b9a2e59545d23a8df8ec8834aa60f5e4ee808a2 Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Wed, 12 Jan 2022 12:47:31 +0000
Subject: [PATCH 042/403] Implement MusicXML tablature import.

---
 include/vrv/iomusxml.h |   7 +
 src/iomusxml.cpp       | 338 ++++++++++++++++++++++++++++++++---------
 2 files changed, 271 insertions(+), 74 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index e4c91917145..4fec151ccd6 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -430,6 +430,13 @@ class MusicXmlInput : public Input {
     static std::string ConvertFigureGlyph(const std::string &value);
     ///@}
 
+    /*
+     * @name Methods for converting between MusicXML <pitch> and MIDI note numbers.
+     */
+    ///@{
+    static int PitchToMidi(const std::string &step, int alter, int octave);
+    static void MidiToPitch(int midi, std::string &step, int &alter, int &octave);
+    ///@}
 private:
     /* octave offset */
     std::vector<int> m_octDis;
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 5c412915235..01edd1d68ad 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -26,6 +26,7 @@
 #include "chord.h"
 #include "clef.h"
 #include "comparison.h"
+#include "course.h"
 #include "dir.h"
 #include "doc.h"
 #include "dynam.h"
@@ -73,10 +74,13 @@
 #include "staffdef.h"
 #include "staffgrp.h"
 #include "syl.h"
+#include "tabdursym.h"
+#include "tabgrp.h"
 #include "tempo.h"
 #include "text.h"
 #include "tie.h"
 #include "trill.h"
+#include "tuning.h"
 #include "tuplet.h"
 #include "turn.h"
 #include "verse.h"
@@ -314,7 +318,7 @@ void MusicXmlInput::InsertClefIntoObject(
     }
     else {
         Object *parent = layerElement->GetParent();
-        if (parent->Is({ CHORD, FTREM })) {
+        if (parent->Is({ CHORD, FTREM, TABGRP })) {
             InsertClefIntoObject(parent->GetParent(), clef, parent, insertAfter);
         }
         else {
@@ -1270,7 +1274,11 @@ int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, Sta
                 if (nbStaves > 1) clef.node().remove_attribute("id");
             }
             Clef *meiClef = ConvertClef(clef.node());
-            if (meiClef) staffDef->AddChild(meiClef);
+            if (meiClef) {
+                staffDef->AddChild(meiClef);
+                // if TAB assume guitar tablature until we examine <staff-details>, if any
+                if (meiClef->GetShape() == CLEFSHAPE_TAB) staffDef->SetNotationtype(NOTATIONTYPE_tab_guitar);
+            }
 
             // key sig
             xpath = StringFormat("key[@number='%d']", i + 1);
@@ -1302,9 +1310,69 @@ int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, Sta
             if (!scaleStr.empty()) {
                 staffDef->SetScale(staffDef->AttScalable::StrToPercent(scaleStr + "%"));
             }
-            pugi::xpath_node staffTuning = staffDetails.node().select_node("staff-tuning");
-            if (staffTuning) {
-                staffDef->SetNotationtype(NOTATIONTYPE_tab);
+            // Tablature?
+            if (staffDetails.node().child("staff-tuning") || staffDef->GetNotationtype() == NOTATIONTYPE_tab_guitar) {
+                // tablature type.  MusicXML does not support German tablature.
+                if (HasAttributeWithValue(staffDetails.node(), "show-frets", "letters")) {
+                    staffDef->SetNotationtype(NOTATIONTYPE_tab_lute_french);
+                }
+                else {
+                    // Frets are notated with numbers.
+                    // Italian tablature if the top staff line has a lower pitch than the bottom line
+                    // else guitar tablature.
+                    pugi::xml_node topLine = staffDetails.node().find_child_by_attribute(
+                        "staff-tuning", "line", std::to_string(staffLines).c_str());
+                    pugi::xml_node botLine = staffDetails.node().find_child_by_attribute("staff-tuning", "line", "1");
+                    if (topLine && botLine
+                        && PitchToMidi(topLine.child("tuning-step").text().as_string(),
+                               topLine.child("tuning-alter").text().as_int(),
+                               topLine.child("tuning-octave").text().as_int())
+                            < PitchToMidi(botLine.child("tuning-step").text().as_string(),
+                                botLine.child("tuning-alter").text().as_int(),
+                                botLine.child("tuning-octave").text().as_int())) {
+                        staffDef->SetNotationtype(NOTATIONTYPE_tab_lute_italian);
+                    }
+                    else {
+                        staffDef->SetNotationtype(NOTATIONTYPE_tab_guitar);
+                    }
+                }
+
+                // MusicXML specifies the tuning of the staff rather than the instrument,
+                // but this will at least give the tuning of some of the courses.
+                // For French tablature MusicXML ought to allow zero and negative values
+                // of @line to give the tuning for diapasons: 0 => 7, -1 => 8 etc.  But it doesn't.
+                // However, we can add the tuning of diapasons as we encounter them in <note>s.
+                Tuning *tuning = new Tuning();
+                staffDef->AddChild(tuning);
+
+                for (pugi::xml_node staffTuning : staffDetails.node().children("staff-tuning")) {
+                    Course *courseTuning = new Course();
+                    tuning->AddChild(courseTuning);
+
+                    const int line = staffTuning.attribute("line").as_int();
+                    const std::string stepStr = staffTuning.child("tuning-step").text().as_string();
+                    const int alterNum = staffTuning.child("tuning-alter").text().as_int();
+                    const int octaveNum = staffTuning.child("tuning-octave").text().as_int();
+
+                    if (staffDef->GetNotationtype() == NOTATIONTYPE_tab_lute_italian) {
+                        // Italian tablature, line 1 is course 1
+                        courseTuning->SetN(std::to_string(line));
+                    }
+                    else {
+                        // guitar and French tablature, line 1 is course = staffLines (typically 6)
+                        courseTuning->SetN(std::to_string(staffLines - line + 1));
+                    }
+                    courseTuning->SetPname(ConvertStepToPitchName(stepStr));
+                    courseTuning->SetOct(octaveNum);
+
+                    if (alterNum != 0) {
+                        static_assert(
+                            static_cast<int>(ACCIDENTAL_WRITTEN_f) == static_cast<int>(ACCIDENTAL_GESTURAL_f));
+                        static_assert(
+                            static_cast<int>(ACCIDENTAL_WRITTEN_s) == static_cast<int>(ACCIDENTAL_GESTURAL_s));
+                        courseTuning->SetAccid(static_cast<data_ACCIDENTAL_WRITTEN>(ConvertAlterToAccid(alterNum)));
+                    }
+                }
             }
 
             // time
@@ -2438,6 +2506,20 @@ void MusicXmlInput::ReadMusicXmlNote(
 
     Staff *staff = vrv_cast<Staff *>(layer->GetFirstAncestor(STAFF));
     assert(staff);
+    // find staff's staffDef
+    // TODO Tablature: is this the correct way to find a staff's staffDef?
+    AttNIntegerComparison cnc(STAFFDEF, staff->GetN());
+    StaffDef *staffDef = vrv_cast<StaffDef *>(m_doc->GetCurrentScoreDef()->FindDescendantByComparison(&cnc));
+    bool isTablature = false;
+    Tuning *tuning = NULL;
+
+    if (staffDef) {
+        tuning = vrv_cast<Tuning *>(staffDef->FindDescendantByType(TUNING));
+        const data_NOTATIONTYPE notationType = staffDef->GetNotationtype();
+        isTablature = (notationType == NOTATIONTYPE_tab || notationType == NOTATIONTYPE_tab_guitar
+            || notationType == NOTATIONTYPE_tab_lute_italian || notationType == NOTATIONTYPE_tab_lute_french
+            || notationType == NOTATIONTYPE_tab_lute_german);
+    }
 
     bool isChord = node.child("chord");
 
@@ -2468,43 +2550,49 @@ void MusicXmlInput::ReadMusicXmlNote(
     const std::string typeStr = node.child("type").text().as_string();
     const int dots = (int)node.select_nodes("dot").size();
 
-    ReadMusicXmlBeamsAndTuplets(node, layer, isChord);
-
-    // beam start
-    bool beamStart = node.select_node("beam[@number='1'][text()='begin']");
-    // tremolos
-    pugi::xpath_node tremolo = notations.node().select_node("ornaments/tremolo");
     int tremSlashNum = -1;
-    if (tremolo) {
-        if (HasAttributeWithValue(tremolo.node(), "type", "start")) {
-            if (!isChord) {
-                FTrem *fTrem = new FTrem();
-                AddLayerElement(layer, fTrem);
-                m_elementStackMap.at(layer).push_back(fTrem);
-                int beamFloatNum = tremolo.node().text().as_int(); // number of floating beams
-                int beamAttachedNum = 0; // number of attached beams
-                while (beamStart && beamAttachedNum < 8) { // count number of (attached) beams, max 8
-                    std::ostringstream o;
-                    o << "beam[@number='" << ++beamAttachedNum + 1 << "'][text()='begin']";
-                    beamStart = node.select_node(o.str().c_str());
-                }
-                fTrem->SetBeams(beamFloatNum + beamAttachedNum);
-                fTrem->SetBeamsFloat(beamFloatNum);
-            }
-        }
-        else if (!HasAttributeWithValue(tremolo.node(), "type", "stop")) {
-            // this is default tremolo type in MusicXML
-            tremSlashNum = tremolo.node().text().as_int();
-            if (!isChord) {
-                BTrem *bTrem = new BTrem();
-                AddLayerElement(layer, bTrem);
-                m_elementStackMap.at(layer).push_back(bTrem);
-                if (HasAttributeWithValue(tremolo.node(), "type", "unmeasured")) {
-                    bTrem->SetForm(bTremLog_FORM_unmeas);
-                    tremSlashNum = 0;
+    pugi::xpath_node tremolo;
+
+    // TODO Tablature: support beams and tuplets.  Neither <beam> nor <tuple> support child <tabGrp>.
+    if (!isTablature) {
+        ReadMusicXmlBeamsAndTuplets(node, layer, isChord);
+
+        // beam start
+        bool beamStart = node.select_node("beam[@number='1'][text()='begin']");
+        // tremolos
+        tremolo = notations.node().select_node("ornaments/tremolo");
+
+        if (tremolo) {
+            if (HasAttributeWithValue(tremolo.node(), "type", "start")) {
+                if (!isChord) {
+                    FTrem *fTrem = new FTrem();
+                    AddLayerElement(layer, fTrem);
+                    m_elementStackMap.at(layer).push_back(fTrem);
+                    int beamFloatNum = tremolo.node().text().as_int(); // number of floating beams
+                    int beamAttachedNum = 0; // number of attached beams
+                    while (beamStart && beamAttachedNum < 8) { // count number of (attached) beams, max 8
+                        std::ostringstream o;
+                        o << "beam[@number='" << ++beamAttachedNum + 1 << "'][text()='begin']";
+                        beamStart = node.select_node(o.str().c_str());
+                    }
+                    fTrem->SetBeams(beamFloatNum + beamAttachedNum);
+                    fTrem->SetBeamsFloat(beamFloatNum);
                 }
-                else {
-                    bTrem->SetForm(bTremLog_FORM_meas);
+            }
+            else if (!HasAttributeWithValue(tremolo.node(), "type", "stop")) {
+                // this is default tremolo type in MusicXML
+                tremSlashNum = tremolo.node().text().as_int();
+                if (!isChord) {
+                    BTrem *bTrem = new BTrem();
+                    AddLayerElement(layer, bTrem);
+                    m_elementStackMap.at(layer).push_back(bTrem);
+                    if (HasAttributeWithValue(tremolo.node(), "type", "unmeasured")) {
+                        bTrem->SetForm(bTremLog_FORM_unmeas);
+                        tremSlashNum = 0;
+                    }
+                    else {
+                        bTrem->SetForm(bTremLog_FORM_meas);
+                    }
                 }
             }
         }
@@ -2564,23 +2652,35 @@ void MusicXmlInput::ReadMusicXmlNote(
             }
         }
         else {
-            Rest *rest = new Rest();
-            element = rest;
-            rest->SetColor(node.attribute("color").as_string());
-            rest->SetDur(ConvertTypeToDur(typeStr));
-            rest->SetDurPpq(duration);
-            if (dots > 0) rest->SetDots(dots);
-            if (cue) rest->SetCue(BOOLEAN_true);
-            if (!stepStr.empty()) rest->SetPloc(ConvertStepToPitchName(stepStr));
-            if (!octaveStr.empty()) rest->SetOloc(atoi(octaveStr.c_str()));
-            if (!noteID.empty()) {
-                rest->SetUuid(noteID);
-            }
-            // set @staff attribute, if existing and different from parent staff number
-            if (noteStaffNum > 0 && noteStaffNum + staffOffset != staff->GetN())
-                rest->SetStaff(
-                    rest->AttStaffIdent::StrToXsdPositiveIntegerList(std::to_string(noteStaffNum + staffOffset)));
-            AddLayerElement(layer, rest, duration);
+            if (isTablature) {
+                // rest
+                TabGrp *tabGrp = new TabGrp();
+                element = tabGrp;
+                tabGrp->SetDur(ConvertTypeToDur(typeStr));
+                tabGrp->SetDurPpq(duration);
+                if (dots > 0) tabGrp->SetDots(dots);
+                tabGrp->AddChild(new TabDurSym());
+                AddLayerElement(layer, tabGrp, duration);
+            }
+            else {
+                Rest *rest = new Rest();
+                element = rest;
+                rest->SetColor(node.attribute("color").as_string());
+                rest->SetDur(ConvertTypeToDur(typeStr));
+                rest->SetDurPpq(duration);
+                if (dots > 0) rest->SetDots(dots);
+                if (cue) rest->SetCue(BOOLEAN_true);
+                if (!stepStr.empty()) rest->SetPloc(ConvertStepToPitchName(stepStr));
+                if (!octaveStr.empty()) rest->SetOloc(atoi(octaveStr.c_str()));
+                if (!noteID.empty()) {
+                    rest->SetUuid(noteID);
+                }
+                // set @staff attribute, if existing and different from parent staff number
+                if (noteStaffNum > 0 && noteStaffNum + staffOffset != staff->GetN())
+                    rest->SetStaff(
+                        rest->AttStaffIdent::StrToXsdPositiveIntegerList(std::to_string(noteStaffNum + staffOffset)));
+                AddLayerElement(layer, rest, duration);
+            }
         }
     }
     else {
@@ -2635,9 +2735,9 @@ void MusicXmlInput::ReadMusicXmlNote(
             stemDir = STEMDIRECTION_up;
         }
 
-        // pitch and octave
+        // pitch and octave, optional, not needed for tablature
         pugi::xml_node pitch = node.child("pitch");
-        if (pitch) {
+        if (pitch && !isTablature) {
             const std::string stepStr = pitch.child("step").text().as_string();
             const std::string alterStr = pitch.child("alter").text().as_string();
             const int octaveNum = pitch.child("octave").text().as_int();
@@ -2685,7 +2785,21 @@ void MusicXmlInput::ReadMusicXmlNote(
         pugi::xpath_node nextNote = node.select_node("./following-sibling::note");
         if (nextNote.node().child("chord")) nextIsChord = true;
         Chord *chord = NULL;
-        if (nextIsChord) {
+        TabGrp *tabGrp = NULL;
+        if (isTablature) {
+            // create the tabGrp if we are starting a new tabGrp
+            if (m_elementStackMap.at(layer).empty() || !m_elementStackMap.at(layer).back()->Is(TABGRP)) {
+                tabGrp = new TabGrp();
+                tabGrp->SetDur(ConvertTypeToDur(typeStr));
+                tabGrp->SetDurPpq(duration);
+                if (dots > 0) tabGrp->SetDots(dots);
+                tabGrp->AddChild(new TabDurSym());
+                AddLayerElement(layer, tabGrp, duration);
+                m_elementStackMap.at(layer).push_back(tabGrp);
+                element = tabGrp;
+            }
+        }
+        else if (nextIsChord) {
             // create the chord if we are starting a new chord
             if (m_elementStackMap.at(layer).empty() || !m_elementStackMap.at(layer).back()->Is(CHORD)) {
                 chord = new Chord();
@@ -2716,7 +2830,7 @@ void MusicXmlInput::ReadMusicXmlNote(
             }
         }
         // If the current note is part of a chord.
-        if (nextIsChord || node.child("chord")) {
+        if (!isTablature && (nextIsChord || node.child("chord"))) {
             if (chord == NULL && m_elementStackMap.at(layer).size() > 0
                 && m_elementStackMap.at(layer).back()->Is(CHORD)) {
                 chord = dynamic_cast<Chord *>(m_elementStackMap.at(layer).back());
@@ -2749,7 +2863,7 @@ void MusicXmlInput::ReadMusicXmlNote(
         if (cue) note->SetCue(BOOLEAN_true);
 
         // set attributes to the note if we are not in a chord
-        if (m_elementStackMap.at(layer).empty() || !m_elementStackMap.at(layer).back()->Is(CHORD)) {
+        if (!isTablature && (m_elementStackMap.at(layer).empty() || !m_elementStackMap.at(layer).back()->Is(CHORD))) {
             if (!typeStr.empty()) note->SetDur(ConvertTypeToDur(typeStr));
             note->SetDurPpq(duration);
             if (dots > 0) note->SetDots(dots);
@@ -2864,6 +2978,7 @@ void MusicXmlInput::ReadMusicXmlNote(
                     verse->AddChild(syl);
                 }
             }
+            // TODO Tablature: <tabGrp> does not support child <verse>
             if (element->Is(CHORD) || element->Is(NOTE)) {
                 element->AddChild(verse);
             }
@@ -2933,13 +3048,61 @@ void MusicXmlInput::ReadMusicXmlNote(
 
         // technical
         for (pugi::xml_node technical : notations.node().children("technical")) {
-            // fingering is handled on the same level as breath marks, dynamics, etc. so we skip it here
-            if (technical.child("fingering")) continue;
-            if (technical.child("fret")) {
-                // set @tab.string and @tab.fret
-            }
-            else {
-                for (pugi::xml_node articulation : technical.children()) {
+            for (pugi::xml_node technicalChild : technical.children()) {
+                const std::string technicalChildName = technicalChild.name();
+
+                // fingering is handled on the same level as breath marks, dynamics, etc. so we skip it here
+                if (technicalChildName == "fingering") continue;
+                if (technicalChildName == "string") continue; // handled with fret
+
+                if (technicalChildName == "fret") {
+                    assert(isTablature);
+
+                    // set @tab.string and @tab.fret
+                    const int fret = technicalChild.text().as_int();
+                    const int course = technical.child("string").text().as_int();
+                    note->SetTabFret(fret);
+                    note->SetTabCourse(course);
+
+                    // Do we have the pitch for this note, if so do we have the tuning for this course?
+                    pugi::xml_node pitch = node.child("pitch");
+                    if (tuning && pitch) {
+                        AttNNumberLikeComparison cnc(COURSE, std::to_string(course));
+                        Course *courseTuning = vrv_cast<Course *>(tuning->FindDescendantByComparison(&cnc));
+
+                        if (!courseTuning) {
+                            // we have the note's pitch, but not the course's tuning, set it
+
+                            const int midi = PitchToMidi(pitch.child("step").text().as_string(),
+                                pitch.child("alter").text().as_int(),
+                                pitch.child("octave").text().as_int()); // note's midi note number
+
+                            // course's pitch
+                            std::string stepStr;
+                            int alterNum = 0;
+                            int octaveNum = 0;
+                            MidiToPitch(midi - fret, stepStr, alterNum, octaveNum);
+
+                            courseTuning = new Course();
+                            tuning->AddChild(courseTuning);
+
+                            courseTuning->SetN(std::to_string(course));
+                            courseTuning->SetPname(ConvertStepToPitchName(stepStr));
+                            courseTuning->SetOct(octaveNum);
+
+                            if (alterNum != 0) {
+                                static_assert(
+                                    static_cast<int>(ACCIDENTAL_WRITTEN_f) == static_cast<int>(ACCIDENTAL_GESTURAL_f));
+                                static_assert(
+                                    static_cast<int>(ACCIDENTAL_WRITTEN_s) == static_cast<int>(ACCIDENTAL_GESTURAL_s));
+                                courseTuning->SetAccid(
+                                    static_cast<data_ACCIDENTAL_WRITTEN>(ConvertAlterToAccid(alterNum)));
+                            }
+                        }
+                    }
+                }
+                else {
+                    pugi::xml_node articulation = technicalChild;
                     Artic *artic = new Artic();
                     artics.push_back(ConvertArticulations(articulation.name()));
                     if (artics.back() == ARTICULATION_NONE) {
@@ -2960,12 +3123,13 @@ void MusicXmlInput::ReadMusicXmlNote(
         // add the note to the layer or to the current container
         AddLayerElement(layer, note, duration);
 
-        // if we are ending a chord remove it from the stack
+        // if we are ending a chord or tabGrp remove it from the stack
         if (!nextIsChord) {
-            if (!m_elementStackMap.at(layer).empty() && m_elementStackMap.at(layer).back()->Is(CHORD)) {
+            const ClassId classId = isTablature ? TABGRP : CHORD;
+            if (!m_elementStackMap.at(layer).empty() && m_elementStackMap.at(layer).back()->Is(classId)) {
                 SetChordStaff(layer);
 
-                RemoveLastFromStack(CHORD, layer);
+                RemoveLastFromStack(classId, layer);
             }
         }
     }
@@ -3055,8 +3219,8 @@ void MusicXmlInput::ReadMusicXmlNote(
     pugi::xpath_node_set glissandi = notations.node().select_nodes("glissando|slide");
     for (pugi::xpath_node_set::const_iterator it = glissandi.begin(); it != glissandi.end(); ++it) {
         std::string noteID = m_ID;
-        // prevent from using chords
-        if (element->Is(CHORD)) noteID = "#" + element->GetChild(0)->GetUuid();
+        // prevent from using chords or tabGrps
+        if (element->Is(CHORD) || element->Is(TABGRP)) noteID = "#" + element->GetChild(0)->GetUuid();
         pugi::xml_node xmlGlissando = it->node();
         if (HasAttributeWithValue(xmlGlissando, "type", "start")) {
             Gliss *gliss = new Gliss();
@@ -3313,6 +3477,7 @@ void MusicXmlInput::ReadMusicXmlNote(
                 Chord *chord = dynamic_cast<Chord *>(element);
                 chord->SetBreaksec(breakSec);
             }
+            // TODO Tablature: support beams, <beam> does not support child <tabGrp>
         }
         else {
             RemoveLastFromStack(BEAM, layer);
@@ -4386,6 +4551,31 @@ void MusicXmlInput::SetChordStaff(Layer *layer)
     });
 }
 
+int MusicXmlInput::PitchToMidi(const std::string &step, int alter, int octave)
+{
+    if (step.empty() || step[0] < 'A' || step[0] > 'G') return 0;
+
+    // Distance in semitones from the octave's starting C to the given step
+    //                                 A   B  C  D  E  F  G
+    static const int octaveStart[] = { 9, 11, 0, 2, 4, 5, 7 };
+    const int semitones = octave * 12 + octaveStart[step[0] - 'A'] + alter; // semitones from C0
+    return semitones + 12; // MIDI note C4 = 60
+}
+
+void MusicXmlInput::MidiToPitch(int midi, std::string &step, int &alter, int &octave)
+{
+    const int semitones = midi - 12; // C0 = 0
+
+    // 12 notes in an octave.  Ignore enharmonics, prefer B flat over A sharp.
+    static const std::pair<const char *, int> octaveNotes[] = { { "C", 0 }, { "C", 1 }, { "D", 0 }, { "D", 1 },
+        { "E", 0 }, { "F", 0 }, { "F", 1 }, { "G", 0 }, { "G", 1 }, { "A", 0 }, { "B", -1 }, { "B", 0 } };
+    static_assert(sizeof(octaveNotes) / sizeof(octaveNotes[0]) == 12);
+
+    octave = semitones / 12;
+    step = octaveNotes[semitones % 12].first;
+    alter = octaveNotes[semitones % 12].second;
+}
+
 #endif // NO_MUSICXML_SUPPORT
 
 } // namespace vrv

From 5a57dec9fbb2dd4d7763919b474a837e9764b3e7 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Thu, 13 Jan 2022 10:33:59 +0100
Subject: [PATCH 043/403] move meter to staffDef

---
 src/ioabc.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index a9072bbd992..5863657452b 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -161,16 +161,16 @@ void ABCInput::parseABC(std::istream &infile)
                 staffDef->AddChild(m_clef);
                 m_clef = NULL;
             }
+            if (m_meter) {
+                staffDef->AddChild(m_meter);
+                m_meter = NULL;
+            }
             staffGrp->AddChild(staffDef);
             m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
             if (m_key) {
                 m_doc->GetCurrentScoreDef()->AddChild(m_key);
                 m_key = NULL;
             }
-            if (m_meter) {
-                m_doc->GetCurrentScoreDef()->AddChild(m_meter);
-                m_meter = NULL;
-            }
         }
 
         // create section
@@ -577,7 +577,6 @@ void ABCInput::parseKey(std::string &keyString)
     m_key = new KeySig();
     m_key->IsAttribute(true);
     m_clef = new Clef();
-    m_clef->IsAttribute(true);
     while (isspace(keyString[i])) ++i;
 
     // set key.pname
@@ -767,7 +766,6 @@ void ABCInput::parseMeter(const std::string &meterString)
         // this is a little "hack", until libMEI is fixed
         m_meter->SetCount({ atoi(meterCount.c_str()) });
         m_meter->SetUnit(atoi(&meterString[meterString.find('/') + 1]));
-        m_meter->IsAttribute(true);
     }
 }
 

From e4e11a0e9f43b128e0cd534c224dbd23824bd079 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Thu, 13 Jan 2022 11:05:51 +0100
Subject: [PATCH 044/403] add changes in dur.default

---
 src/ioabc.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 5863657452b..670f056d882 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -186,6 +186,7 @@ void ABCInput::parseABC(std::istream &infile)
             CalcUnitNoteLength();
         }
         m_doc->GetCurrentScoreDef()->SetDurDefault(m_durDefault);
+        m_durDefault = DURATION_NONE;
 
         // read music code
         m_layer = new Layer();
@@ -1555,6 +1556,13 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
             section->AddChild(scoreDef);
             m_meter = NULL;
         }
+        
+        if (m_durDefault != DURATION_NONE) {
+            ScoreDef *scoreDef = new ScoreDef();
+            scoreDef->SetDurDefault(m_durDefault);
+            section->AddChild(scoreDef);
+            m_durDefault = DURATION_NONE;
+        }
     }
 
     // by default, line-breaks in the code generate line-breaks in the score

From 5f2f22ea9f3a74ec15767267bdb846d504cb6d0d Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Thu, 13 Jan 2022 11:13:58 +0100
Subject: [PATCH 045/403] formatting

---
 src/ioabc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 670f056d882..52d65c43554 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -1556,7 +1556,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
             section->AddChild(scoreDef);
             m_meter = NULL;
         }
-        
+
         if (m_durDefault != DURATION_NONE) {
             ScoreDef *scoreDef = new ScoreDef();
             scoreDef->SetDurDefault(m_durDefault);

From 4fa203942367bed94eef610aead54673b9942f81 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 13 Jan 2022 12:31:24 +0100
Subject: [PATCH 046/403] Adjust warning

---
 src/view_element.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view_element.cpp b/src/view_element.cpp
index b6ce73f2316..ff5f1b32d5e 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -1356,7 +1356,7 @@ void View::DrawNote(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
         int drawingDur = note->GetDrawingDur();
         if (drawingDur == DUR_NONE) {
             if (note->IsInBeam() && !dc->Is(BBOX_DEVICE_CONTEXT)) {
-                LogWarning("Missing duration for note '%s'", note->GetUuid().c_str());
+                LogWarning("Missing duration for note '%s' in beam", note->GetUuid().c_str());
             }
             drawingDur = DUR_4;
         }

From 1ada3084ba595acaf8dc4fff7c1d065f07b9187a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 14 Jan 2022 07:59:47 +0100
Subject: [PATCH 047/403] Removing wrong ledgerline length adjustment. Fixes
 #2555

---
 src/note.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/note.cpp b/src/note.cpp
index 81a1994e9ce..975a707b89d 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1192,9 +1192,6 @@ int Note::CalcLedgerLines(FunctorParams *functorParams)
     const int extension = params->m_doc->GetDrawingLedgerLineExtension(staffSize, drawingCueSize);
     const int left = this->GetDrawingX() - extension - staffX;
     int right = this->GetDrawingX() + 2 * radius + extension - staffX;
-    if (this->GetDrawingDur() == DUR_MX) {
-        right += 2 * radius;
-    }
 
     if (linesAbove > 0) {
         staff->AddLedgerLineAbove(linesAbove, left, right, extension, drawingCueSize);

From 17fedcd27bc2585a38fcfaac16087d3036214697 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Fri, 14 Jan 2022 09:19:18 +0100
Subject: [PATCH 048/403] Use fallback duration for rests

---
 include/vrv/rest.h   |  3 +++
 src/rest.cpp         |  7 ++++++-
 src/view_element.cpp | 10 +++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/include/vrv/rest.h b/include/vrv/rest.h
index aa0f4b39011..1861145c8cc 100644
--- a/include/vrv/rest.h
+++ b/include/vrv/rest.h
@@ -79,7 +79,10 @@ class Rest : public LayerElement,
      * Get the SMuFL glyph or a rest considering its actual duration.
      * This is valid only for CMN and for duration shorter than half notes.
      */
+    ///@{
     wchar_t GetRestGlyph() const;
+    wchar_t GetRestGlyph(int duration) const;
+    ///@}
 
     //----------//
     // Functors //
diff --git a/src/rest.cpp b/src/rest.cpp
index 8d3bdc0e890..95cbef4f7a6 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -219,6 +219,11 @@ void Rest::AddChild(Object *child)
 }
 
 wchar_t Rest::GetRestGlyph() const
+{
+    return this->GetRestGlyph(this->GetActualDur());
+}
+
+wchar_t Rest::GetRestGlyph(const int duration) const
 {
     // If there is glyph.num, prioritize it
     if (HasGlyphNum()) {
@@ -231,7 +236,7 @@ wchar_t Rest::GetRestGlyph() const
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
-    switch (this->GetActualDur()) {
+    switch (duration) {
         case DUR_LG: return SMUFL_E4E1_restLonga; break;
         case DUR_BR: return SMUFL_E4E2_restDoubleWhole; break;
         case DUR_1: return SMUFL_E4E3_restWhole; break;
diff --git a/src/view_element.cpp b/src/view_element.cpp
index ff5f1b32d5e..ef50e7ca2b5 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -1432,17 +1432,17 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     if (rest->m_crossStaff) staff = rest->m_crossStaff;
 
     const bool drawingCueSize = rest->GetDrawingCueSize();
-    const int drawingDur = rest->GetActualDur();
+    int drawingDur = rest->GetActualDur();
     if (drawingDur == DUR_NONE) {
         if (!dc->Is(BBOX_DEVICE_CONTEXT)) {
             LogWarning("Missing duration for rest '%s'", rest->GetUuid().c_str());
         }
-        return;
+        drawingDur = DUR_4;
     }
-    const wchar_t drawingGlyph = rest->GetRestGlyph();
+    const wchar_t drawingGlyph = rest->GetRestGlyph(drawingDur);
 
-    int x = element->GetDrawingX();
-    int y = element->GetDrawingY();
+    const int x = element->GetDrawingX();
+    const int y = element->GetDrawingY();
 
     DrawSmuflCode(dc, x, y, drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
 

From a55c2f5fd74d9578074bb7430c41b10594547b08 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 14 Jan 2022 09:45:34 +0100
Subject: [PATCH 049/403] Update changelog [skip-ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18b00e68502..cbaeed5eddc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [unreleased]
 * Support for `beatRpt@beatdef`
+* Support for `scoreDef` and `staffDef` `@dur.default` (@eNote-GmBH)
 
 ## [3.8.1] - 2022-01-10
 * Fix bug in PAE importer for durations and for key signatures

From 6d9823600c1559a1a809dcf8245664fcaf65c052 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Fri, 14 Jan 2022 11:46:54 +0100
Subject: [PATCH 050/403] Refine beam intersection calculation

---
 include/vrv/boundingbox.h |  2 +-
 src/boundingbox.cpp       | 31 +++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/include/vrv/boundingbox.h b/include/vrv/boundingbox.h
index cf994bd7b54..96aa85dce70 100644
--- a/include/vrv/boundingbox.h
+++ b/include/vrv/boundingbox.h
@@ -167,7 +167,7 @@ class BoundingBox {
      * A segment of the beam that matches horizontal position of the bounding box is taken to find whether there is
      * intersection.
      */
-    int Intersects(BeamDrawingInterface *beamInterface, Accessor type, int additionalOffset = 0) const;
+    int Intersects(BeamDrawingInterface *beamInterface, Accessor type, int margin = 0) const;
 
     //----------------//
     // Static methods //
diff --git a/src/boundingbox.cpp b/src/boundingbox.cpp
index 9d3bde2fac6..76843d58de9 100644
--- a/src/boundingbox.cpp
+++ b/src/boundingbox.cpp
@@ -654,7 +654,7 @@ int BoundingBox::Intersects(FloatingCurvePositioner *curve, Accessor type, int m
     return 0;
 }
 
-int BoundingBox::Intersects(BeamDrawingInterface *beamInterface, Accessor type, int additionalOffset) const
+int BoundingBox::Intersects(BeamDrawingInterface *beamInterface, Accessor type, const int margin) const
 {
     assert(beamInterface);
     assert(!beamInterface->m_beamElementCoords.empty());
@@ -664,18 +664,21 @@ int BoundingBox::Intersects(BeamDrawingInterface *beamInterface, Accessor type,
     const Point beamRight(
         beamInterface->m_beamElementCoords.back()->m_x, beamInterface->m_beamElementCoords.back()->m_yBeam);
 
+    const int leftX = this->GetLeftBy(type) - margin;
+    const int rightX = this->GetRightBy(type) + margin;
+
     Point leftIntersection(0, 0);
     Point rightIntersection(0, 0);
     const double beamSlope = BoundingBox::CalcSlope(beamLeft, beamRight);
-    if (this->GetLeftBy(type) <= beamLeft.x) {
+    if (leftX <= beamLeft.x) {
         // BB does not overlap horizontally with beam (left side of the beam)
-        if (this->GetRightBy(type) < beamLeft.x) {
+        if (rightX < beamLeft.x) {
             return 0;
         }
         // BB overlaps with left side of the beam
-        else if (this->GetRightBy(type) < beamRight.x) {
+        else if (rightX < beamRight.x) {
             leftIntersection = beamLeft;
-            rightIntersection.x = this->GetRightBy(type);
+            rightIntersection.x = rightX;
             rightIntersection.y = beamLeft.y + beamSlope * (rightIntersection.x - beamLeft.x);
         }
         // BB covers the whole beam
@@ -685,10 +688,10 @@ int BoundingBox::Intersects(BeamDrawingInterface *beamInterface, Accessor type,
         }
     }
     else {
-        if (this->GetRightBy(type) > beamRight.x) {
+        if (rightX > beamRight.x) {
             // BB overlaps with right side of the beam
-            if (this->GetLeftBy(type) <= beamRight.x) {
-                leftIntersection.x = this->GetLeftBy(type);
+            if (leftX <= beamRight.x) {
+                leftIntersection.x = leftX;
                 leftIntersection.y = beamLeft.y + beamSlope * (leftIntersection.x - beamLeft.x);
                 rightIntersection = beamRight;
             }
@@ -699,9 +702,9 @@ int BoundingBox::Intersects(BeamDrawingInterface *beamInterface, Accessor type,
         }
         // BB is inside of the beam
         else {
-            leftIntersection.x = this->GetLeftBy(type);
+            leftIntersection.x = leftX;
             leftIntersection.y = beamLeft.y + beamSlope * (leftIntersection.x - beamLeft.x);
-            rightIntersection.x = this->GetRightBy(type);
+            rightIntersection.x = rightX;
             rightIntersection.y = beamLeft.y + beamSlope * (rightIntersection.x - beamLeft.x);
         }
     }
@@ -709,13 +712,13 @@ int BoundingBox::Intersects(BeamDrawingInterface *beamInterface, Accessor type,
     // calculate vertical overlap of the BB with beam section
     if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
         const int topY = std::max(leftIntersection.y, rightIntersection.y);
-        const int shift = topY - this->GetBottomBy(type);
-        if (shift > 0) return shift + additionalOffset;
+        const int shift = topY - this->GetBottomBy(type) + margin;
+        return std::max(shift, 0);
     }
     else if (beamInterface->m_drawingPlace == BEAMPLACE_below) {
         const int bottomY = std::min(leftIntersection.y, rightIntersection.y);
-        const int shift = bottomY - this->GetTopBy(type);
-        if (shift < 0) return shift - additionalOffset;
+        const int shift = bottomY - this->GetTopBy(type) - margin;
+        return std::min(shift, 0);
     }
 
     return 0;

From f8e8add6a50965b1f2982bb79d1ad2b538a3dee0 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 15 Dec 2021 14:25:47 +0200
Subject: [PATCH 051/403] Adjust incosistent beam slope

---
 src/beam.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 866078356fb..fc86cf96579 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -550,7 +550,7 @@ bool BeamSegment::CalcBeamSlope(
     }
     else {
         // A fourth or smaller - reduce to a short step
-        if (noteStep <= unit * 3) {
+        if (noteStep < unit * 3) {
             step = unit / 2;
             shortStep = true;
         }

From 0bc6bd95f1f1d322cd2edadb59a845b6e8601bf8 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 17 Dec 2021 19:00:14 +0200
Subject: [PATCH 052/403] Remove m_extendedToCenter variable

- removed m_extendedToCenter variable to avoid mismatch between note distance and beam slope
- beam still should be limited by vertical center of the staff, while allowing for steeper slopes for beams that need those
---
 include/vrv/beam.h |  1 -
 src/beam.cpp       | 25 +++++++------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 857fc454dc6..2f639023885 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -116,7 +116,6 @@ class BeamSegment {
 public:
     // values set by CalcBeam
     int m_nbNotesOrChords;
-    bool m_extendedToCenter; // the stem where extended to touch the center staff line
     double m_beamSlope; // the slope of the beam
     int m_verticalCenter;
     int m_ledgerLinesAbove;
diff --git a/src/beam.cpp b/src/beam.cpp
index fc86cf96579..f9eabbe1425 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -55,7 +55,6 @@ void BeamSegment::Reset()
 
     m_beamSlope = 0.0;
     m_verticalCenter = 0;
-    m_extendedToCenter = false;
     m_ledgerLinesAbove = 0;
     m_ledgerLinesBelow = 0;
     m_uniformStemLength = 0;
@@ -405,7 +404,6 @@ void BeamSegment::CalcBeamInit(
     int nbRests = 0;
 
     m_nbNotesOrChords = 0;
-    m_extendedToCenter = false;
     m_ledgerLinesAbove = 0;
     m_ledgerLinesBelow = 0;
 
@@ -525,11 +523,7 @@ bool BeamSegment::CalcBeamSlope(
     // Indicates if we have a short step of half a unit
     // This occurs with 8th and 16th only and with a reduced distance of 3 stave-spaces (6 units)
     bool shortStep = false;
-    if (m_extendedToCenter) {
-        step = unit / 2;
-        shortStep = true;
-    }
-    else if (m_nbNotesOrChords == 2) {
+    if (m_nbNotesOrChords == 2) {
         step = unit * 2;
         // Short distance
         if (dist <= unit * 6) {
@@ -1412,17 +1406,12 @@ void BeamElementCoord::SetDrawingStemDir(
 
     // Make sure the stem reaches the center of the staff
     // Mark the segment as extendedToCenter since we then want a reduced slope
-    if (interface->m_crossStaffContent || (BEAMPLACE_mixed == interface->m_drawingPlace)) {
-        segment->m_extendedToCenter = false;
-    }
-    else if (((stemDir == STEMDIRECTION_up) && (m_yBeam <= segment->m_verticalCenter))
-        || ((stemDir == STEMDIRECTION_down) && (segment->m_verticalCenter <= m_yBeam))) {
-        m_yBeam = segment->m_verticalCenter;
-        segment->m_extendedToCenter = true;
-        m_centered = false;
-    }
-    else {
-        segment->m_extendedToCenter = false;
+    if (!interface->m_crossStaffContent && (BEAMPLACE_mixed != interface->m_drawingPlace)) {
+        if (((stemDir == STEMDIRECTION_up) && (m_yBeam <= segment->m_verticalCenter))
+            || ((stemDir == STEMDIRECTION_down) && (segment->m_verticalCenter <= m_yBeam))) {
+            m_yBeam = segment->m_verticalCenter;
+            m_centered = false;
+        }
     }
 
     m_yBeam += m_overlapMargin;

From 4667a76fee6f521767aa3e0c83d6df059750b100 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 21 Dec 2021 18:48:47 +0200
Subject: [PATCH 053/403] Avoid steep sloves on beams with repeated notes

---
 src/beam.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/beam.cpp b/src/beam.cpp
index f9eabbe1425..f1bdbf158eb 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -552,6 +552,13 @@ bool BeamSegment::CalcBeamSlope(
         else if (noteStep <= unit * 4) {
             step = unit * 2;
         }
+        else if (m_nbNotesOrChords == 4) {
+            if ((m_beamElementCoordRefs.at(1)->m_yBeam == m_beamElementCoordRefs.at(2)->m_yBeam)
+                && ((m_firstNoteOrChord->m_yBeam == m_beamElementCoordRefs.at(1)->m_yBeam)
+                    || (m_lastNoteOrChord->m_yBeam == m_beamElementCoordRefs.at(2)->m_yBeam))) {
+                step = unit * 2;
+            }
+        }
     }
 
     // Prevent short step with values not shorter than a 16th

From 5aca23f7b22e18bb82955276916b57b2d40548f2 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 14 Dec 2021 13:20:31 +0100
Subject: [PATCH 054/403] Introduce MIDI chord sequence

---
 include/vrv/functorparams.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 3322be3035e..167453ef76b 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1554,6 +1554,16 @@ struct MIDINote {
 
 using MIDINoteSequence = std::list<MIDINote>;
 
+/**
+ * Helper struct to store chord sequences in MIDI output due to grace notes
+ */
+struct MIDIChord {
+    std::set<char> pitches;
+    double duration;
+};
+
+using MIDIChordSequence = std::list<MIDIChord>;
+
 /**
  * member 0: MidiFile*: the MidiFile we are writing to
  * member 1: int: the midi track number
@@ -1561,6 +1571,7 @@ using MIDINoteSequence = std::list<MIDINote>;
  * member 4: int: the semi tone transposition for the current track
  * member 5: double with the current tempo
  * member 6: expanded notes due to ornaments and tremolandi
+ * member 7: grace note sequence
  **/
 
 class GenerateMIDIParams : public FunctorParams {
@@ -1582,6 +1593,7 @@ class GenerateMIDIParams : public FunctorParams {
     int m_transSemi;
     double m_currentTempo;
     std::map<Note *, MIDINoteSequence> m_expandedNotes;
+    MIDIChordSequence m_graceNotes;
     Functor *m_functor;
 };
 

From 0f48fca8e3a0701132de89f4f718ad2032e6076d Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 14 Dec 2021 13:31:17 +0100
Subject: [PATCH 055/403] Store MIDI grace notes

---
 src/note.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/note.cpp b/src/note.cpp
index 975a707b89d..de1d63d6468 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1329,8 +1329,18 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    // For now just ignore grace notes
+    // Handle grace notes
     if (this->IsGraceNote()) {
+        this->CalcMIDIPitch(params->m_transSemi);
+        const char pitch = this->GetMIDIPitch();
+
+        double quarterDuration = 0.0;
+        const data_DURATION dur = this->GetDur();
+        if ((dur >= DURATION_long) && (dur <= DURATION_1024)) {
+            quarterDuration = pow(2.0, (DURATION_4 - dur));
+        }
+
+        params->m_graceNotes.push_back({ { pitch }, quarterDuration });
         return FUNCTOR_SIBLINGS;
     }
 

From 4c291f21663185cbb39383b6fa49d389b35461e6 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 15 Dec 2021 09:04:47 +0100
Subject: [PATCH 056/403] Play MIDI grace notes

---
 include/vrv/functorparams.h |  5 ++-
 include/vrv/note.h          | 10 +++++
 src/note.cpp                | 84 ++++++++++++++++++++++++++++++++-----
 3 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 167453ef76b..95af71cc7e7 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1571,7 +1571,9 @@ using MIDIChordSequence = std::list<MIDIChord>;
  * member 4: int: the semi tone transposition for the current track
  * member 5: double with the current tempo
  * member 6: expanded notes due to ornaments and tremolandi
- * member 7: grace note sequence
+ * member 7: deferred notes which start slightly later
+ * member 8: grace note sequence
+ * member 9: the functor
  **/
 
 class GenerateMIDIParams : public FunctorParams {
@@ -1593,6 +1595,7 @@ class GenerateMIDIParams : public FunctorParams {
     int m_transSemi;
     double m_currentTempo;
     std::map<Note *, MIDINoteSequence> m_expandedNotes;
+    std::map<Note *, double> m_deferredNotes;
     MIDIChordSequence m_graceNotes;
     Functor *m_functor;
 };
diff --git a/include/vrv/note.h b/include/vrv/note.h
index 67aaebf475e..44a8ccb6d3b 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -343,6 +343,16 @@ class Note : public LayerElement,
      */
     bool IsDotOverlappingWithFlag(Doc *doc, const int staffSize, bool isDotShifted);
 
+    /**
+     * Register deferred notes for MIDI
+     */
+    void DeferMIDINote(FunctorParams *functorParams, double shift, bool includeChordSiblings);
+
+    /**
+     * Create the MIDI output of the grace note sequence stored in params
+     */
+    void GenerateGraceNoteMIDI(FunctorParams *functorParams, double startTime, int tpq, int channel, int velocity);
+
 public:
     //
 private:
diff --git a/src/note.cpp b/src/note.cpp
index de1d63d6468..a4d1afecd82 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -740,6 +740,57 @@ bool Note::IsDotOverlappingWithFlag(Doc *doc, const int staffSize, bool isDotShi
     return dotMargin < 0;
 }
 
+void Note::DeferMIDINote(FunctorParams *functorParams, double shift, bool includeChordSiblings)
+{
+    GenerateMIDIParams *params = vrv_params_cast<GenerateMIDIParams *>(functorParams);
+    assert(params);
+
+    // Recursive call for chords
+    Chord *chord = this->IsChordTone();
+    if (chord && includeChordSiblings) {
+        const ArrayOfObjects *notes = chord->GetList(chord);
+        assert(notes);
+
+        for (Object *obj : *notes) {
+            Note *note = vrv_cast<Note *>(obj);
+            assert(note);
+            note->DeferMIDINote(functorParams, shift, false);
+        }
+        return;
+    }
+
+    // Register the shift
+    if (shift < this->GetScoreTimeDuration() + this->GetScoreTimeTiedDuration()) {
+        params->m_deferredNotes[this] = shift;
+    }
+}
+
+void Note::GenerateGraceNoteMIDI(FunctorParams *functorParams, double startTime, int tpq, int channel, int velocity)
+{
+    GenerateMIDIParams *params = vrv_params_cast<GenerateMIDIParams *>(functorParams);
+    assert(params);
+
+    // Unaccented grace notes have a duration of 27 ms
+    constexpr int ms = 27;
+    const double unaccGraceNoteDur = ms * params->m_currentTempo / 60000.0;
+    const double totalDur = unaccGraceNoteDur * params->m_graceNotes.size();
+    if (startTime >= totalDur) {
+        startTime -= totalDur;
+    }
+    else {
+        this->DeferMIDINote(functorParams, totalDur, true);
+    }
+
+    for (const MIDIChord &chord : params->m_graceNotes) {
+        const double stopTime = startTime + unaccGraceNoteDur;
+        for (char pitch : chord.pitches) {
+            params->m_midiFile->addNoteOn(params->m_midiTrack, startTime * tpq, channel, pitch, velocity);
+            params->m_midiFile->addNoteOff(params->m_midiTrack, stopTime * tpq, channel, pitch);
+        }
+        startTime = stopTime;
+    }
+}
+
 //----------------//
 // Static methods //
 //----------------//
@@ -1344,34 +1395,45 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    int channel = params->m_midiChannel;
+    const int channel = params->m_midiChannel;
     int velocity = MIDI_VELOCITY;
     if (this->HasVel()) velocity = this->GetVel();
 
-    double starttime = params->m_totalTime + this->GetScoreTimeOnset();
+    double startTime = params->m_totalTime + this->GetScoreTimeOnset();
+    const int tpq = params->m_midiFile->getTPQ();
 
-    int tpq = params->m_midiFile->getTPQ();
+    // Check if some grace notes must be performed
+    if (!params->m_graceNotes.empty()) {
+        this->GenerateGraceNoteMIDI(functorParams, startTime, tpq, channel, velocity);
+        params->m_graceNotes.clear();
+    }
+
+    // Check if note is deferred
+    if (params->m_deferredNotes.find(this) != params->m_deferredNotes.end()) {
+        startTime += params->m_deferredNotes.at(this);
+        params->m_deferredNotes.erase(this);
+    }
 
     // Check if note was expanded into sequence of short notes due to trills/tremolandi
     // Play either the expanded note sequence or a single note
     if (params->m_expandedNotes.find(this) != params->m_expandedNotes.end()) {
         for (const auto &midiNote : params->m_expandedNotes[this]) {
-            double stoptime = starttime + midiNote.duration;
+            const double stopTime = startTime + midiNote.duration;
 
-            params->m_midiFile->addNoteOn(params->m_midiTrack, starttime * tpq, channel, midiNote.pitch, velocity);
-            params->m_midiFile->addNoteOff(params->m_midiTrack, stoptime * tpq, channel, midiNote.pitch);
+            params->m_midiFile->addNoteOn(params->m_midiTrack, startTime * tpq, channel, midiNote.pitch, velocity);
+            params->m_midiFile->addNoteOff(params->m_midiTrack, stopTime * tpq, channel, midiNote.pitch);
 
-            starttime = stoptime;
+            startTime = stopTime;
         }
     }
     else {
-        double stoptime = params->m_totalTime + this->GetScoreTimeOffset() + this->GetScoreTimeTiedDuration();
+        const double stopTime = params->m_totalTime + this->GetScoreTimeOffset() + this->GetScoreTimeTiedDuration();
 
         this->CalcMIDIPitch(params->m_transSemi);
-        char pitch = this->GetMIDIPitch();
+        const char pitch = this->GetMIDIPitch();
 
-        params->m_midiFile->addNoteOn(params->m_midiTrack, starttime * tpq, channel, pitch, velocity);
-        params->m_midiFile->addNoteOff(params->m_midiTrack, stoptime * tpq, channel, pitch);
+        params->m_midiFile->addNoteOn(params->m_midiTrack, startTime * tpq, channel, pitch, velocity);
+        params->m_midiFile->addNoteOff(params->m_midiTrack, stopTime * tpq, channel, pitch);
     }
 
     return FUNCTOR_SIBLINGS;

From 3690665b4ef2db4d0afd70e2c60327d13f310bec Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 15 Dec 2021 09:41:37 +0100
Subject: [PATCH 057/403] Remove MIDI pitch cache

---
 include/vrv/functorparams.h |  4 ++--
 include/vrv/note.h          | 12 +++++-------
 src/btrem.cpp               |  3 +--
 src/featureextractor.cpp    |  5 +----
 src/note.cpp                | 25 ++++++-------------------
 src/toolkit.cpp             |  7 +++----
 6 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 95af71cc7e7..b07f2f0665f 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1548,7 +1548,7 @@ class GenerateFeaturesParams : public FunctorParams {
  * Helper struct to store note sequences which replace notes in MIDI output due to expanded ornaments and tremolandi
  */
 struct MIDINote {
-    char pitch;
+    int pitch;
     double duration;
 };
 
@@ -1558,7 +1558,7 @@ using MIDINoteSequence = std::list<MIDINote>;
  * Helper struct to store chord sequences in MIDI output due to grace notes
  */
 struct MIDIChord {
-    std::set<char> pitches;
+    std::set<int> pitches;
     double duration;
 };
 
diff --git a/include/vrv/note.h b/include/vrv/note.h
index 44a8ccb6d3b..5abe80b163d 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -219,16 +219,19 @@ class Note : public LayerElement,
     void SetScoreTimeOffset(double scoreTime);
     void SetRealTimeOffsetSeconds(double timeInSeconds);
     void SetScoreTimeTiedDuration(double timeInSeconds);
-    void CalcMIDIPitch(int shift);
     double GetScoreTimeOnset() const;
     double GetRealTimeOnsetMilliseconds() const;
     double GetScoreTimeOffset() const;
     double GetScoreTimeTiedDuration() const;
     double GetRealTimeOffsetMilliseconds() const;
     double GetScoreTimeDuration() const;
-    char GetMIDIPitch() const;
     ///@}
 
+    /**
+     * MIDI pitch
+     */
+    int GetMIDIPitch(int shift);
+
 public:
     //----------------//
     // Static methods //
@@ -411,11 +414,6 @@ class Note : public LayerElement,
      * indicate that it should not be written to MIDI output.
      */
     double m_scoreTimeTiedDuration;
-
-    /**
-     * The MIDI pitch of the note.
-     */
-    char m_MIDIPitch;
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/btrem.cpp b/src/btrem.cpp
index 5b23bd48a9c..d092d1e0351 100644
--- a/src/btrem.cpp
+++ b/src/btrem.cpp
@@ -86,8 +86,7 @@ int BTrem::GenerateMIDI(FunctorParams *functorParams)
     auto expandNote = [params, noteInQuarterDur](Object *obj) {
         Note *note = vrv_cast<Note *>(obj);
         assert(note);
-        note->CalcMIDIPitch(params->m_transSemi);
-        const char pitch = note->GetMIDIPitch();
+        const int pitch = note->GetMIDIPitch(params->m_transSemi);
         const double totalInQuarterDur = note->GetScoreTimeDuration() + note->GetScoreTimeTiedDuration();
         const int multiplicity = totalInQuarterDur / noteInQuarterDur;
         (params->m_expandedNotes)[note] = MIDINoteSequence(multiplicity, { pitch, noteInQuarterDur });
diff --git a/src/featureextractor.cpp b/src/featureextractor.cpp
index 29002bc448d..31feb75bc3d 100644
--- a/src/featureextractor.cpp
+++ b/src/featureextractor.cpp
@@ -60,10 +60,7 @@ void FeatureExtractor::Extract(Object *object, GenerateFeaturesParams *params)
         // Check if the note is tied to a previous one and skip it if yes
         if (note->GetScoreTimeTiedDuration() == -1.0) return;
 
-        note->CalcMIDIPitch(0);
-
         std::stringstream pitch;
-
         data_OCTAVE oct = note->GetOct();
         char octSign = (oct > 3) ? '\'' : ',';
         int signCount = (oct > 3) ? (oct - 3) : (4 - oct);
@@ -105,7 +102,7 @@ void FeatureExtractor::Extract(Object *object, GenerateFeaturesParams *params)
 
         // We have a previous note, so we can calculate an interval
         if (m_previousNote) {
-            std::string interval = StringFormat("%d", note->GetMIDIPitch() - m_previousNote->GetMIDIPitch());
+            std::string interval = StringFormat("%d", note->GetMIDIPitch(0) - m_previousNote->GetMIDIPitch(0));
             m_intervals << interval;
             jsonxx::Array intervalsIds;
             intervalsIds << m_previousNote->GetUuid();
diff --git a/src/note.cpp b/src/note.cpp
index a4d1afecd82..8b694814ea0 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -122,8 +122,6 @@ void Note::Reset()
     m_realTimeOnsetMilliseconds = 0;
     m_realTimeOffsetMilliseconds = 0;
     m_scoreTimeTiedDuration = 0.0;
-
-    m_MIDIPitch = -1;
 }
 
 bool Note::IsSupportedChild(Object *child)
@@ -554,10 +552,7 @@ bool Note::IsVisible() const
 
 bool Note::IsEnharmonicWith(Note *note)
 {
-    this->CalcMIDIPitch(0);
-    note->CalcMIDIPitch(0);
-
-    return (this->GetMIDIPitch() == note->GetMIDIPitch());
+    return (this->GetMIDIPitch(0) == note->GetMIDIPitch(0));
 }
 
 void Note::SetScoreTimeOnset(double scoreTime)
@@ -587,10 +582,10 @@ void Note::SetScoreTimeTiedDuration(double scoreTime)
     m_scoreTimeTiedDuration = scoreTime;
 }
 
-void Note::CalcMIDIPitch(int shift)
+int Note::GetMIDIPitch(int shift)
 {
     if (this->HasPnum()) {
-        m_MIDIPitch = this->GetPnum();
+        return this->GetPnum();
     }
     else if (this->HasPname() || this->HasPnameGes()) {
         int midiBase = 0;
@@ -616,7 +611,7 @@ void Note::CalcMIDIPitch(int shift)
         int oct = this->GetOct();
         if (this->HasOctGes()) oct = this->GetOctGes();
 
-        m_MIDIPitch = midiBase + (oct + 1) * 12;
+        return midiBase + (oct + 1) * 12;
     }
     else if (this->HasTabCourse()) {
         // tablature
@@ -662,11 +657,6 @@ double Note::GetScoreTimeDuration() const
     return this->GetScoreTimeOffset() - this->GetScoreTimeOnset();
 }
 
-char Note::GetMIDIPitch() const
-{
-    return m_MIDIPitch;
-}
-
 int Note::GetChromaticAlteration()
 {
     Accid *accid = this->GetDrawingAccid();
@@ -1382,8 +1372,7 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
 
     // Handle grace notes
     if (this->IsGraceNote()) {
-        this->CalcMIDIPitch(params->m_transSemi);
-        const char pitch = this->GetMIDIPitch();
+        const int pitch = this->GetMIDIPitch(params->m_transSemi);
 
         double quarterDuration = 0.0;
         const data_DURATION dur = this->GetDur();
@@ -1428,9 +1417,7 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
     }
     else {
         const double stopTime = params->m_totalTime + this->GetScoreTimeOffset() + this->GetScoreTimeTiedDuration();
-
-        this->CalcMIDIPitch(params->m_transSemi);
-        const char pitch = this->GetMIDIPitch();
+        const int pitch = this->GetMIDIPitch(params->m_transSemi);
 
         params->m_midiFile->addNoteOn(params->m_midiTrack, startTime * tpq, channel, pitch, velocity);
         params->m_midiFile->addNoteOff(params->m_midiTrack, stopTime * tpq, channel, pitch);
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index ab764099dbc..6d1a6689a41 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -1643,10 +1643,9 @@ std::string Toolkit::GetMIDIValuesForElement(const std::string &xmlId)
         }
         Note *note = vrv_cast<Note *>(element);
         assert(note);
-        int timeOfElement = this->GetTimeForElement(xmlId);
-        note->CalcMIDIPitch(0);
-        int pitchOfElement = note->GetMIDIPitch();
-        int durationOfElement = note->GetRealTimeOffsetMilliseconds() - note->GetRealTimeOnsetMilliseconds();
+        const int timeOfElement = this->GetTimeForElement(xmlId);
+        const int pitchOfElement = note->GetMIDIPitch(0);
+        const int durationOfElement = note->GetRealTimeOffsetMilliseconds() - note->GetRealTimeOnsetMilliseconds();
         o << "time" << timeOfElement;
         o << "pitch" << pitchOfElement;
         o << "duration" << durationOfElement;

From fbe27252f7f378c6907f475a06a6d0054f8a7f48 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 15 Dec 2021 10:17:28 +0100
Subject: [PATCH 058/403] Play MIDI grace chords

---
 include/vrv/chord.h |  5 +++++
 src/chord.cpp       | 29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/include/vrv/chord.h b/include/vrv/chord.h
index 56431fc74d6..1d7fcf624ed 100644
--- a/include/vrv/chord.h
+++ b/include/vrv/chord.h
@@ -226,6 +226,11 @@ class Chord : public LayerElement,
      */
     int AdjustCrossStaffContent(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::GenerateMIDI
+     */
+    int GenerateMIDI(FunctorParams *functorParams) override;
+
 protected:
     /**
      * The note locations w.r.t. each staff
diff --git a/src/chord.cpp b/src/chord.cpp
index d9fcf865ab8..db6480949dd 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -970,4 +970,33 @@ int Chord::AdjustCrossStaffContent(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Chord::GenerateMIDI(FunctorParams *functorParams)
+{
+    GenerateMIDIParams *params = vrv_params_cast<GenerateMIDIParams *>(functorParams);
+    assert(params);
+
+    // Handle grace chords
+    if (this->IsGraceNote()) {
+        std::set<int> pitches;
+        const ArrayOfObjects *notes = this->GetList(this);
+        assert(notes);
+        for (Object *obj : *notes) {
+            Note *note = vrv_cast<Note *>(obj);
+            assert(note);
+            pitches.insert(note->GetMIDIPitch(params->m_transSemi));
+        }
+
+        double quarterDuration = 0.0;
+        const data_DURATION dur = this->GetDur();
+        if ((dur >= DURATION_long) && (dur <= DURATION_1024)) {
+            quarterDuration = pow(2.0, (DURATION_4 - dur));
+        }
+
+        params->m_graceNotes.push_back({ pitches, quarterDuration });
+        return FUNCTOR_SIBLINGS;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv

From bab39729920c62dc7080ac18a573d82c6deecfc4 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 15 Dec 2021 13:41:37 +0100
Subject: [PATCH 059/403] Distinguish between accented and unaccented

---
 include/vrv/functorparams.h |  5 ++++-
 src/chord.cpp               |  7 +++++++
 src/note.cpp                | 31 +++++++++++++++++++++++--------
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index b07f2f0665f..047793820f2 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1573,7 +1573,8 @@ using MIDIChordSequence = std::list<MIDIChord>;
  * member 6: expanded notes due to ornaments and tremolandi
  * member 7: deferred notes which start slightly later
  * member 8: grace note sequence
- * member 9: the functor
+ * member 9: flag indicating whether the last grace note/chord was accented
+ * member 10: the functor
  **/
 
 class GenerateMIDIParams : public FunctorParams {
@@ -1586,6 +1587,7 @@ class GenerateMIDIParams : public FunctorParams {
         m_totalTime = 0.0;
         m_transSemi = 0;
         m_currentTempo = 120.0;
+        m_accentedGraceNote = false;
         m_functor = functor;
     }
     smf::MidiFile *m_midiFile;
@@ -1597,6 +1599,7 @@ class GenerateMIDIParams : public FunctorParams {
     std::map<Note *, MIDINoteSequence> m_expandedNotes;
     std::map<Note *, double> m_deferredNotes;
     MIDIChordSequence m_graceNotes;
+    bool m_accentedGraceNote;
     Functor *m_functor;
 };
 
diff --git a/src/chord.cpp b/src/chord.cpp
index db6480949dd..19ad58ecf65 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -24,6 +24,7 @@
 #include "elementpart.h"
 #include "fermata.h"
 #include "functorparams.h"
+#include "gracegrp.h"
 #include "horizontalaligner.h"
 #include "layer.h"
 #include "note.h"
@@ -993,6 +994,12 @@ int Chord::GenerateMIDI(FunctorParams *functorParams)
         }
 
         params->m_graceNotes.push_back({ pitches, quarterDuration });
+
+        bool accented = (this->GetGrace() == GRACE_acc);
+        GraceGrp *graceGrp = vrv_cast<GraceGrp *>(this->GetFirstAncestor(GRACEGRP));
+        if (graceGrp && (graceGrp->GetGrace() == GRACE_acc)) accented = true;
+        params->m_accentedGraceNote = accented;
+
         return FUNCTOR_SIBLINGS;
     }
 
diff --git a/src/note.cpp b/src/note.cpp
index 8b694814ea0..a4863855837 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -22,6 +22,7 @@
 #include "fermata.h"
 #include "functorparams.h"
 #include "glyph.h"
+#include "gracegrp.h"
 #include "layer.h"
 #include "ligature.h"
 #include "plica.h"
@@ -760,19 +761,27 @@ void Note::GenerateGraceNoteMIDI(FunctorParams *functorParams, double startTime,
     GenerateMIDIParams *params = vrv_params_cast<GenerateMIDIParams *>(functorParams);
     assert(params);
 
-    // Unaccented grace notes have a duration of 27 ms
-    constexpr int ms = 27;
-    const double unaccGraceNoteDur = ms * params->m_currentTempo / 60000.0;
-    const double totalDur = unaccGraceNoteDur * params->m_graceNotes.size();
-    if (startTime >= totalDur) {
-        startTime -= totalDur;
+    double graceNoteDur = 0.0;
+    if (params->m_accentedGraceNote && !params->m_graceNotes.empty()) {
+        const double totalDur = this->GetScoreTimeDuration() / 2.0;
+        this->DeferMIDINote(functorParams, totalDur, true);
+        graceNoteDur = totalDur / params->m_graceNotes.size();
     }
     else {
-        this->DeferMIDINote(functorParams, totalDur, true);
+        // Unaccented grace notes obtain a fixed duration of 27 ms
+        constexpr int ms = 27;
+        graceNoteDur = ms * params->m_currentTempo / 60000.0;
+        const double totalDur = graceNoteDur * params->m_graceNotes.size();
+        if (startTime >= totalDur) {
+            startTime -= totalDur;
+        }
+        else {
+            this->DeferMIDINote(functorParams, totalDur, true);
+        }
     }
 
     for (const MIDIChord &chord : params->m_graceNotes) {
-        const double stopTime = startTime + unaccGraceNoteDur;
+        const double stopTime = startTime + graceNoteDur;
         for (char pitch : chord.pitches) {
             params->m_midiFile->addNoteOn(params->m_midiTrack, startTime * tpq, channel, pitch, velocity);
             params->m_midiFile->addNoteOff(params->m_midiTrack, stopTime * tpq, channel, pitch);
@@ -1381,6 +1390,12 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
         }
 
         params->m_graceNotes.push_back({ { pitch }, quarterDuration });
+
+        bool accented = (this->GetGrace() == GRACE_acc);
+        GraceGrp *graceGrp = vrv_cast<GraceGrp *>(this->GetFirstAncestor(GRACEGRP));
+        if (graceGrp && (graceGrp->GetGrace() == GRACE_acc)) accented = true;
+        params->m_accentedGraceNote = accented;
+
         return FUNCTOR_SIBLINGS;
     }
 

From b282ea5189a7af5477791f24dba938b13380603a Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 15 Dec 2021 21:11:12 +0100
Subject: [PATCH 060/403] Handling of Nachschlag

---
 include/vrv/functorparams.h | 13 ++++++++-----
 include/vrv/gracegrp.h      | 11 +++++++++++
 include/vrv/object.h        |  1 +
 include/vrv/vrvdef.h        |  2 ++
 src/doc.cpp                 |  3 ++-
 src/gracegrp.cpp            | 37 +++++++++++++++++++++++++++++++++++++
 src/note.cpp                |  7 ++++---
 7 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 047793820f2..0e93a3a853a 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1570,11 +1570,12 @@ using MIDIChordSequence = std::list<MIDIChord>;
  * member 3: double: the score time from the start of the music to the start of the current measure
  * member 4: int: the semi tone transposition for the current track
  * member 5: double with the current tempo
- * member 6: expanded notes due to ornaments and tremolandi
- * member 7: deferred notes which start slightly later
- * member 8: grace note sequence
- * member 9: flag indicating whether the last grace note/chord was accented
- * member 10: the functor
+ * member 6: the last (non grace) note that was performed
+ * member 7: expanded notes due to ornaments and tremolandi
+ * member 8: deferred notes which start slightly later
+ * member 9: grace note sequence
+ * member 10: flag indicating whether the last grace note/chord was accented
+ * member 11: the functor
  **/
 
 class GenerateMIDIParams : public FunctorParams {
@@ -1587,6 +1588,7 @@ class GenerateMIDIParams : public FunctorParams {
         m_totalTime = 0.0;
         m_transSemi = 0;
         m_currentTempo = 120.0;
+        m_lastNote = NULL;
         m_accentedGraceNote = false;
         m_functor = functor;
     }
@@ -1596,6 +1598,7 @@ class GenerateMIDIParams : public FunctorParams {
     double m_totalTime;
     int m_transSemi;
     double m_currentTempo;
+    Note *m_lastNote;
     std::map<Note *, MIDINoteSequence> m_expandedNotes;
     std::map<Note *, double> m_deferredNotes;
     MIDIChordSequence m_graceNotes;
diff --git a/include/vrv/gracegrp.h b/include/vrv/gracegrp.h
index 5ad51db574a..a5eb580fb6e 100644
--- a/include/vrv/gracegrp.h
+++ b/include/vrv/gracegrp.h
@@ -36,6 +36,17 @@ class GraceGrp : public LayerElement, public AttColor, public AttGraced, public
      */
     bool IsSupportedChild(Object *object) override;
 
+    //----------//
+    // Functors //
+    //----------//
+
+    /**
+     * @name See Object::GenerateMIDIEnd
+     */
+    ///@{
+    int GenerateMIDIEnd(FunctorParams *functorParams) override;
+    ///@}
+
 protected:
     //
 private:
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 754e99eb879..e6a03d3aaae 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -1269,6 +1269,7 @@ class Object : public BoundingBox {
      */
     ///@{
     virtual int GenerateMIDI(FunctorParams *) { return FUNCTOR_CONTINUE; }
+    virtual int GenerateMIDIEnd(FunctorParams *) { return FUNCTOR_CONTINUE; }
     ///@}
 
     /**
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 3aa640f3942..d7961c0450f 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -65,6 +65,8 @@ enum MEIVersion { MEI_UNDEFINED = 0, MEI_2013, MEI_3_0_0, MEI_4_0_0, MEI_4_0_1,
 #define MIDI_VELOCITY 90
 #define MIDI_TEMPO 120
 
+#define UNACC_GRACENOTE_DUR 27 // in milliseconds
+
 //----------------------------------------------------------------------------
 // Object defines
 //----------------------------------------------------------------------------
diff --git a/src/doc.cpp b/src/doc.cpp
index b568ac73f51..f266071b504 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -382,6 +382,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
             filters.push_back(&matchLayer);
 
             Functor generateMIDI(&Object::GenerateMIDI);
+            Functor generateMIDIEnd(&Object::GenerateMIDIEnd);
             GenerateMIDIParams generateMIDIParams(midiFile, &generateMIDI);
             generateMIDIParams.m_midiChannel = midiChannel;
             generateMIDIParams.m_midiTrack = midiTrack;
@@ -389,7 +390,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
             generateMIDIParams.m_currentTempo = tempo;
 
             // LogDebug("Exporting track %d ----------------", midiTrack);
-            this->Process(&generateMIDI, &generateMIDIParams, NULL, &filters);
+            this->Process(&generateMIDI, &generateMIDIParams, &generateMIDIEnd, &filters);
         }
     }
 }
diff --git a/src/gracegrp.cpp b/src/gracegrp.cpp
index a3025b90e1f..f09f36bbe97 100644
--- a/src/gracegrp.cpp
+++ b/src/gracegrp.cpp
@@ -16,11 +16,16 @@
 #include "beam.h"
 #include "chord.h"
 #include "editorial.h"
+#include "functorparams.h"
 #include "note.h"
 #include "rest.h"
 #include "space.h"
 #include "vrv.h"
 
+//----------------------------------------------------------------------------
+
+#include "MidiFile.h"
+
 namespace vrv {
 
 //----------------------------------------------------------------------------
@@ -74,4 +79,36 @@ bool GraceGrp::IsSupportedChild(Object *child)
     return true;
 }
 
+int GraceGrp::GenerateMIDIEnd(FunctorParams *functorParams)
+{
+    GenerateMIDIParams *params = vrv_params_cast<GenerateMIDIParams *>(functorParams);
+    assert(params);
+
+    if (!params->m_graceNotes.empty() && (this->GetAttach() == graceGrpLog_ATTACH_pre) && !params->m_accentedGraceNote
+        && params->m_lastNote) {
+        double startTime = params->m_totalTime + params->m_lastNote->GetScoreTimeOffset();
+        const double graceNoteDur = UNACC_GRACENOTE_DUR * params->m_currentTempo / 60000.0;
+        const double totalDur = graceNoteDur * params->m_graceNotes.size();
+        startTime -= totalDur;
+        startTime = std::max(startTime, 0.0);
+
+        const int channel = params->m_midiChannel;
+        int velocity = MIDI_VELOCITY;
+        if (params->m_lastNote->HasVel()) velocity = params->m_lastNote->GetVel();
+        const int tpq = params->m_midiFile->getTPQ();
+
+        for (const MIDIChord &chord : params->m_graceNotes) {
+            const double stopTime = startTime + graceNoteDur;
+            for (char pitch : chord.pitches) {
+                params->m_midiFile->addNoteOn(params->m_midiTrack, startTime * tpq, channel, pitch, velocity);
+                params->m_midiFile->addNoteOff(params->m_midiTrack, stopTime * tpq, channel, pitch);
+            }
+            startTime = stopTime;
+        }
+
+        params->m_graceNotes.clear();
+    }
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/note.cpp b/src/note.cpp
index a4863855837..916b11d7e4c 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -768,9 +768,7 @@ void Note::GenerateGraceNoteMIDI(FunctorParams *functorParams, double startTime,
         graceNoteDur = totalDur / params->m_graceNotes.size();
     }
     else {
-        // Unaccented grace notes obtain a fixed duration of 27 ms
-        constexpr int ms = 27;
-        graceNoteDur = ms * params->m_currentTempo / 60000.0;
+        graceNoteDur = UNACC_GRACENOTE_DUR * params->m_currentTempo / 60000.0;
         const double totalDur = graceNoteDur * params->m_graceNotes.size();
         if (startTime >= totalDur) {
             startTime -= totalDur;
@@ -1438,6 +1436,9 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
         params->m_midiFile->addNoteOff(params->m_midiTrack, stopTime * tpq, channel, pitch);
     }
 
+    // Store reference, i.e. for Nachschlag
+    params->m_lastNote = this;
+
     return FUNCTOR_SIBLINGS;
 }
 

From ada6ad4b8065fba90640e82be7fa9dc0026a2aa6 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 16 Dec 2021 06:59:59 +0100
Subject: [PATCH 061/403] Add comment

---
 src/gracegrp.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gracegrp.cpp b/src/gracegrp.cpp
index f09f36bbe97..acef37dc2d8 100644
--- a/src/gracegrp.cpp
+++ b/src/gracegrp.cpp
@@ -84,6 +84,7 @@ int GraceGrp::GenerateMIDIEnd(FunctorParams *functorParams)
     GenerateMIDIParams *params = vrv_params_cast<GenerateMIDIParams *>(functorParams);
     assert(params);
 
+    // Handling of Nachschlag
     if (!params->m_graceNotes.empty() && (this->GetAttach() == graceGrpLog_ATTACH_pre) && !params->m_accentedGraceNote
         && params->m_lastNote) {
         double startTime = params->m_totalTime + params->m_lastNote->GetScoreTimeOffset();

From 6affb9ddd5d4efa4e50bd9b5fb450f9307b39173 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Fri, 14 Jan 2022 14:50:21 +0100
Subject: [PATCH 062/403] Avoid infinite sameas link recursion

---
 src/clef.cpp         |  6 +++---
 src/layerelement.cpp | 23 +++++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/clef.cpp b/src/clef.cpp
index 8c3c3e9caeb..6b8d0974eae 100644
--- a/src/clef.cpp
+++ b/src/clef.cpp
@@ -57,9 +57,9 @@ void Clef::Reset()
 
 int Clef::GetClefLocOffset() const
 {
-    if (this->HasSameasLink() && this->GetSameasLink()->Is(CLEF)) {
-        Clef *sameas = vrv_cast<Clef *>(this->GetSameasLink());
-        assert(sameas);
+    // Only resolve simple sameas links to avoid infinite recursion
+    Clef *sameas = dynamic_cast<Clef *>(this->GetSameasLink());
+    if (sameas && !sameas->HasSameasLink()) {
         return sameas->GetClefLocOffset();
     }
 
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 42f8efdc3a5..cf8b7e2c27e 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -625,12 +625,13 @@ double LayerElement::GetAlignmentDuration(
         return 0.0;
     }
 
-    if (this->HasSameasLink() && this->GetSameasLink()->IsLayerElement()) {
-        LayerElement *sameas = vrv_cast<LayerElement *>(this->GetSameasLink());
-        assert(sameas);
+    // Only resolve simple sameas links to avoid infinite recursion
+    LayerElement *sameas = dynamic_cast<LayerElement *>(this->GetSameasLink());
+    if (sameas && !sameas->HasSameasLink()) {
         return sameas->GetAlignmentDuration(mensur, meterSig, notGraceOnly, notationType);
     }
-    else if (this->HasInterface(INTERFACE_DURATION)) {
+
+    if (this->HasInterface(INTERFACE_DURATION)) {
         int num = 1;
         int numbase = 1;
         Tuplet *tuplet = dynamic_cast<Tuplet *>(this->GetFirstAncestor(TUPLET, MAX_TUPLET_DEPTH));
@@ -2489,9 +2490,10 @@ int LayerElement::GenerateMIDI(FunctorParams *functorParams)
 
     if (this->IsScoreDefElement()) return FUNCTOR_SIBLINGS;
 
-    if (this->HasSameasLink()) {
-        assert(this->GetSameasLink());
-        this->GetSameasLink()->Process(params->m_functor, functorParams);
+    // Only resolve simple sameas links to avoid infinite recursion
+    LayerElement *sameas = dynamic_cast<LayerElement *>(this->GetSameasLink());
+    if (sameas && !sameas->HasSameasLink()) {
+        sameas->Process(params->m_functor, functorParams);
     }
 
     return FUNCTOR_CONTINUE;
@@ -2504,9 +2506,10 @@ int LayerElement::GenerateTimemap(FunctorParams *functorParams)
 
     if (this->IsScoreDefElement()) return FUNCTOR_SIBLINGS;
 
-    if (this->HasSameasLink()) {
-        assert(this->GetSameasLink());
-        this->GetSameasLink()->Process(params->m_functor, functorParams);
+    // Only resolve simple sameas links to avoid infinite recursion
+    LayerElement *sameas = dynamic_cast<LayerElement *>(this->GetSameasLink());
+    if (sameas && !sameas->HasSameasLink()) {
+        sameas->Process(params->m_functor, functorParams);
     }
 
     return FUNCTOR_CONTINUE;

From 3916460a6400f159ea5f5fe089dd2894ae36ef2b Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Fri, 14 Jan 2022 16:24:01 +0100
Subject: [PATCH 063/403] Fix rebase issues

---
 src/note.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/note.cpp b/src/note.cpp
index 916b11d7e4c..d953d9ffc8f 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -583,10 +583,12 @@ void Note::SetScoreTimeTiedDuration(double scoreTime)
     m_scoreTimeTiedDuration = scoreTime;
 }
 
-int Note::GetMIDIPitch(int shift)
+int Note::GetMIDIPitch(const int shift)
 {
+    int pitch = 0;
+
     if (this->HasPnum()) {
-        return this->GetPnum();
+        pitch = this->GetPnum();
     }
     else if (this->HasPname() || this->HasPnameGes()) {
         int midiBase = 0;
@@ -606,26 +608,23 @@ int Note::GetMIDIPitch(int shift)
         // Check for accidentals
         midiBase += this->GetChromaticAlteration();
 
-        // Apply shift, i.e. from transposition instruments
-        midiBase += shift;
-
         int oct = this->GetOct();
         if (this->HasOctGes()) oct = this->GetOctGes();
 
-        return midiBase + (oct + 1) * 12;
+        pitch = midiBase + (oct + 1) * 12;
     }
     else if (this->HasTabCourse()) {
         // tablature
         Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
         assert(staff);
         if (staff->m_drawingTuning) {
-            m_MIDIPitch = staff->m_drawingTuning->CalcPitchNumber(
+            pitch = staff->m_drawingTuning->CalcPitchNumber(
                 this->GetTabCourse(), this->GetTabFret(), staff->m_drawingNotationType);
         }
     }
-    else {
-        m_MIDIPitch = 0;
-    }
+
+    // Apply shift, i.e. from transposition instruments
+    return pitch + shift;
 }
 
 double Note::GetScoreTimeOnset() const

From 739429e61e9fe1cf49b7b8b6fa357fc41ff4b004 Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Fri, 14 Jan 2022 15:47:39 +0000
Subject: [PATCH 064/403] MusicXML import tablature beams.

---
 src/iomusxml.cpp | 85 ++++++++++++++++++++++++------------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index f3f88117899..1ac67bda767 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2552,48 +2552,44 @@ void MusicXmlInput::ReadMusicXmlNote(
     const int dots = (int)node.select_nodes("dot").size();
 
     short int tremSlashNum = -1;
-    pugi::xpath_node tremolo;
-
-    // TODO Tablature: support beams and tuplets.  Neither <beam> nor <tuple> support child <tabGrp>.
-    if (!isTablature) {
-        ReadMusicXmlBeamsAndTuplets(node, layer, isChord);
-
-        // beam start
-        bool beamStart = node.select_node("beam[@number='1'][text()='begin']");
-        // tremolos
-        tremolo = notations.node().select_node("ornaments/tremolo");
-
-        if (tremolo) {
-            if (HasAttributeWithValue(tremolo.node(), "type", "start")) {
-                if (!isChord) {
-                    FTrem *fTrem = new FTrem();
-                    AddLayerElement(layer, fTrem);
-                    m_elementStackMap.at(layer).push_back(fTrem);
-                    int beamFloatNum = tremolo.node().text().as_int(); // number of floating beams
-                    int beamAttachedNum = 0; // number of attached beams
-                    while (beamStart && beamAttachedNum < 8) { // count number of (attached) beams, max 8
-                        std::ostringstream o;
-                        o << "beam[@number='" << ++beamAttachedNum + 1 << "'][text()='begin']";
-                        beamStart = node.select_node(o.str().c_str());
-                    }
-                    fTrem->SetBeams(beamFloatNum + beamAttachedNum);
-                    fTrem->SetBeamsFloat(beamFloatNum);
+
+    ReadMusicXmlBeamsAndTuplets(node, layer, isChord);
+
+    // beam start
+    bool beamStart = node.select_node("beam[@number='1'][text()='begin']");
+    // tremolos
+    pugi::xpath_node tremolo = notations.node().select_node("ornaments/tremolo");
+
+    if (tremolo) {
+        if (HasAttributeWithValue(tremolo.node(), "type", "start")) {
+            if (!isChord) {
+                FTrem *fTrem = new FTrem();
+                AddLayerElement(layer, fTrem);
+                m_elementStackMap.at(layer).push_back(fTrem);
+                int beamFloatNum = tremolo.node().text().as_int(); // number of floating beams
+                int beamAttachedNum = 0; // number of attached beams
+                while (beamStart && beamAttachedNum < 8) { // count number of (attached) beams, max 8
+                    std::ostringstream o;
+                    o << "beam[@number='" << ++beamAttachedNum + 1 << "'][text()='begin']";
+                    beamStart = node.select_node(o.str().c_str());
                 }
-            }
-            else if (!HasAttributeWithValue(tremolo.node(), "type", "stop")) {
-                // this is default tremolo type in MusicXML
-                tremSlashNum = tremolo.node().text().as_int();
-                if (!isChord) {
-                    BTrem *bTrem = new BTrem();
-                    AddLayerElement(layer, bTrem);
-                    m_elementStackMap.at(layer).push_back(bTrem);
-                    if (HasAttributeWithValue(tremolo.node(), "type", "unmeasured")) {
-                        bTrem->SetForm(bTremLog_FORM_unmeas);
-                        tremSlashNum = 0;
-                    }
-                    else {
-                        bTrem->SetForm(bTremLog_FORM_meas);
-                    }
+                fTrem->SetBeams(beamFloatNum + beamAttachedNum);
+                fTrem->SetBeamsFloat(beamFloatNum);
+            }
+        }
+        else if (!HasAttributeWithValue(tremolo.node(), "type", "stop")) {
+            // this is default tremolo type in MusicXML
+            tremSlashNum = tremolo.node().text().as_int();
+            if (!isChord) {
+                BTrem *bTrem = new BTrem();
+                AddLayerElement(layer, bTrem);
+                m_elementStackMap.at(layer).push_back(bTrem);
+                if (HasAttributeWithValue(tremolo.node(), "type", "unmeasured")) {
+                    bTrem->SetForm(bTremLog_FORM_unmeas);
+                    tremSlashNum = 0;
+                }
+                else {
+                    bTrem->SetForm(bTremLog_FORM_meas);
                 }
             }
         }
@@ -3480,7 +3476,10 @@ void MusicXmlInput::ReadMusicXmlNote(
                 Chord *chord = dynamic_cast<Chord *>(element);
                 chord->SetBreaksec(breakSec);
             }
-            // TODO Tablature: support beams, <beam> does not support child <tabGrp>
+            else if (element->Is(TABGRP)) {
+                TabGrp *tabGrp = vrv_cast<TabGrp *>(element);
+                tabGrp->SetBreaksec(breakSec);
+            }
         }
         else {
             RemoveLastFromStack(BEAM, layer);
@@ -3623,6 +3622,8 @@ void MusicXmlInput::ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Laye
 
 void MusicXmlInput::ReadMusicXmlTupletStart(const pugi::xml_node &node, const pugi::xml_node &tupletStart, Layer *layer)
 {
+    // TODO <tuplet> does not support child <tabGrp>
+
     if (!tupletStart) return;
 
     Tuplet *tuplet = new Tuplet();

From 8886fc0cef848d93519f8653f32aea5c4d347c67 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 17 Jan 2022 09:49:20 +0100
Subject: [PATCH 065/403] Add argument default

---
 include/vrv/note.h       | 2 +-
 src/featureextractor.cpp | 2 +-
 src/note.cpp             | 2 +-
 src/toolkit.cpp          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index 5abe80b163d..ae131487a7b 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -230,7 +230,7 @@ class Note : public LayerElement,
     /**
      * MIDI pitch
      */
-    int GetMIDIPitch(int shift);
+    int GetMIDIPitch(int shift = 0);
 
 public:
     //----------------//
diff --git a/src/featureextractor.cpp b/src/featureextractor.cpp
index 31feb75bc3d..788cdd1564d 100644
--- a/src/featureextractor.cpp
+++ b/src/featureextractor.cpp
@@ -102,7 +102,7 @@ void FeatureExtractor::Extract(Object *object, GenerateFeaturesParams *params)
 
         // We have a previous note, so we can calculate an interval
         if (m_previousNote) {
-            std::string interval = StringFormat("%d", note->GetMIDIPitch(0) - m_previousNote->GetMIDIPitch(0));
+            std::string interval = StringFormat("%d", note->GetMIDIPitch() - m_previousNote->GetMIDIPitch());
             m_intervals << interval;
             jsonxx::Array intervalsIds;
             intervalsIds << m_previousNote->GetUuid();
diff --git a/src/note.cpp b/src/note.cpp
index d953d9ffc8f..06b37c1a374 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -553,7 +553,7 @@ bool Note::IsVisible() const
 
 bool Note::IsEnharmonicWith(Note *note)
 {
-    return (this->GetMIDIPitch(0) == note->GetMIDIPitch(0));
+    return (this->GetMIDIPitch() == note->GetMIDIPitch());
 }
 
 void Note::SetScoreTimeOnset(double scoreTime)
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index 6d1a6689a41..d482e7360dd 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -1644,7 +1644,7 @@ std::string Toolkit::GetMIDIValuesForElement(const std::string &xmlId)
         Note *note = vrv_cast<Note *>(element);
         assert(note);
         const int timeOfElement = this->GetTimeForElement(xmlId);
-        const int pitchOfElement = note->GetMIDIPitch(0);
+        const int pitchOfElement = note->GetMIDIPitch();
         const int durationOfElement = note->GetRealTimeOffsetMilliseconds() - note->GetRealTimeOnsetMilliseconds();
         o << "time" << timeOfElement;
         o << "pitch" << pitchOfElement;

From d5f06e63734f74dd9a0e195830434019efd4252f Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 17 Jan 2022 10:23:07 +0100
Subject: [PATCH 066/403] Adjust type

---
 src/gracegrp.cpp | 2 +-
 src/note.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gracegrp.cpp b/src/gracegrp.cpp
index acef37dc2d8..d5611e15dd8 100644
--- a/src/gracegrp.cpp
+++ b/src/gracegrp.cpp
@@ -100,7 +100,7 @@ int GraceGrp::GenerateMIDIEnd(FunctorParams *functorParams)
 
         for (const MIDIChord &chord : params->m_graceNotes) {
             const double stopTime = startTime + graceNoteDur;
-            for (char pitch : chord.pitches) {
+            for (int pitch : chord.pitches) {
                 params->m_midiFile->addNoteOn(params->m_midiTrack, startTime * tpq, channel, pitch, velocity);
                 params->m_midiFile->addNoteOff(params->m_midiTrack, stopTime * tpq, channel, pitch);
             }
diff --git a/src/note.cpp b/src/note.cpp
index 06b37c1a374..9d409fa4eb2 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -779,7 +779,7 @@ void Note::GenerateGraceNoteMIDI(FunctorParams *functorParams, double startTime,
 
     for (const MIDIChord &chord : params->m_graceNotes) {
         const double stopTime = startTime + graceNoteDur;
-        for (char pitch : chord.pitches) {
+        for (int pitch : chord.pitches) {
             params->m_midiFile->addNoteOn(params->m_midiTrack, startTime * tpq, channel, pitch, velocity);
             params->m_midiFile->addNoteOff(params->m_midiTrack, stopTime * tpq, channel, pitch);
         }

From be01c453d961a9cc05ab90dfccabd36f29db1ec6 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 17 Jan 2022 12:32:30 +0100
Subject: [PATCH 067/403] FindStaff function

---
 include/vrv/layerelement.h |  8 ++++++++
 src/layerelement.cpp       | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 1f92dd8211a..6c52f85a487 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -29,6 +29,9 @@ class MeterSig;
 class Staff;
 class StaffAlignment;
 
+// Helper enums
+enum StaffSearch { ANCESTOR_ONLY = 0, RESOLVE_CROSSSTAFF };
+
 //----------------------------------------------------------------------------
 // LayerElement
 //----------------------------------------------------------------------------
@@ -179,6 +182,11 @@ class LayerElement : public Object,
      */
     Alignment *GetAlignment() const { return m_alignment; }
 
+    /**
+     * Find the ancestor or cross staff
+     */
+    Staff *FindStaff(StaffSearch strategy);
+
     /**
      * Look for a cross or a a parent LayerElement (note, chord, rest) with a cross staff.
      * Also set the corresponding m_crossLayer to layer if a cross staff is found.
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 42f8efdc3a5..aad4767da82 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -242,6 +242,18 @@ int LayerElement::GetOriginalLayerN()
     return layerN;
 }
 
+Staff *LayerElement::FindStaff(const StaffSearch strategy)
+{
+    Staff *staff = NULL;
+    if (strategy == RESOLVE_CROSSSTAFF) {
+        Layer *layer = NULL;
+        staff = this->GetCrossStaff(layer);
+    }
+    if (!staff) staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
+    assert(staff);
+    return staff;
+}
+
 Staff *LayerElement::GetCrossStaff(Layer *&layer) const
 {
     if (m_crossStaff) {

From 5b3c9d603fbf8c99871db295d836da8b073d0623 Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Fri, 14 Jan 2022 15:47:39 +0000
Subject: [PATCH 068/403] MusicXML import tablature beams.

---
 src/iomusxml.cpp | 85 ++++++++++++++++++++++++------------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index f3f88117899..1ac67bda767 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2552,48 +2552,44 @@ void MusicXmlInput::ReadMusicXmlNote(
     const int dots = (int)node.select_nodes("dot").size();
 
     short int tremSlashNum = -1;
-    pugi::xpath_node tremolo;
-
-    // TODO Tablature: support beams and tuplets.  Neither <beam> nor <tuple> support child <tabGrp>.
-    if (!isTablature) {
-        ReadMusicXmlBeamsAndTuplets(node, layer, isChord);
-
-        // beam start
-        bool beamStart = node.select_node("beam[@number='1'][text()='begin']");
-        // tremolos
-        tremolo = notations.node().select_node("ornaments/tremolo");
-
-        if (tremolo) {
-            if (HasAttributeWithValue(tremolo.node(), "type", "start")) {
-                if (!isChord) {
-                    FTrem *fTrem = new FTrem();
-                    AddLayerElement(layer, fTrem);
-                    m_elementStackMap.at(layer).push_back(fTrem);
-                    int beamFloatNum = tremolo.node().text().as_int(); // number of floating beams
-                    int beamAttachedNum = 0; // number of attached beams
-                    while (beamStart && beamAttachedNum < 8) { // count number of (attached) beams, max 8
-                        std::ostringstream o;
-                        o << "beam[@number='" << ++beamAttachedNum + 1 << "'][text()='begin']";
-                        beamStart = node.select_node(o.str().c_str());
-                    }
-                    fTrem->SetBeams(beamFloatNum + beamAttachedNum);
-                    fTrem->SetBeamsFloat(beamFloatNum);
+
+    ReadMusicXmlBeamsAndTuplets(node, layer, isChord);
+
+    // beam start
+    bool beamStart = node.select_node("beam[@number='1'][text()='begin']");
+    // tremolos
+    pugi::xpath_node tremolo = notations.node().select_node("ornaments/tremolo");
+
+    if (tremolo) {
+        if (HasAttributeWithValue(tremolo.node(), "type", "start")) {
+            if (!isChord) {
+                FTrem *fTrem = new FTrem();
+                AddLayerElement(layer, fTrem);
+                m_elementStackMap.at(layer).push_back(fTrem);
+                int beamFloatNum = tremolo.node().text().as_int(); // number of floating beams
+                int beamAttachedNum = 0; // number of attached beams
+                while (beamStart && beamAttachedNum < 8) { // count number of (attached) beams, max 8
+                    std::ostringstream o;
+                    o << "beam[@number='" << ++beamAttachedNum + 1 << "'][text()='begin']";
+                    beamStart = node.select_node(o.str().c_str());
                 }
-            }
-            else if (!HasAttributeWithValue(tremolo.node(), "type", "stop")) {
-                // this is default tremolo type in MusicXML
-                tremSlashNum = tremolo.node().text().as_int();
-                if (!isChord) {
-                    BTrem *bTrem = new BTrem();
-                    AddLayerElement(layer, bTrem);
-                    m_elementStackMap.at(layer).push_back(bTrem);
-                    if (HasAttributeWithValue(tremolo.node(), "type", "unmeasured")) {
-                        bTrem->SetForm(bTremLog_FORM_unmeas);
-                        tremSlashNum = 0;
-                    }
-                    else {
-                        bTrem->SetForm(bTremLog_FORM_meas);
-                    }
+                fTrem->SetBeams(beamFloatNum + beamAttachedNum);
+                fTrem->SetBeamsFloat(beamFloatNum);
+            }
+        }
+        else if (!HasAttributeWithValue(tremolo.node(), "type", "stop")) {
+            // this is default tremolo type in MusicXML
+            tremSlashNum = tremolo.node().text().as_int();
+            if (!isChord) {
+                BTrem *bTrem = new BTrem();
+                AddLayerElement(layer, bTrem);
+                m_elementStackMap.at(layer).push_back(bTrem);
+                if (HasAttributeWithValue(tremolo.node(), "type", "unmeasured")) {
+                    bTrem->SetForm(bTremLog_FORM_unmeas);
+                    tremSlashNum = 0;
+                }
+                else {
+                    bTrem->SetForm(bTremLog_FORM_meas);
                 }
             }
         }
@@ -3480,7 +3476,10 @@ void MusicXmlInput::ReadMusicXmlNote(
                 Chord *chord = dynamic_cast<Chord *>(element);
                 chord->SetBreaksec(breakSec);
             }
-            // TODO Tablature: support beams, <beam> does not support child <tabGrp>
+            else if (element->Is(TABGRP)) {
+                TabGrp *tabGrp = vrv_cast<TabGrp *>(element);
+                tabGrp->SetBreaksec(breakSec);
+            }
         }
         else {
             RemoveLastFromStack(BEAM, layer);
@@ -3623,6 +3622,8 @@ void MusicXmlInput::ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Laye
 
 void MusicXmlInput::ReadMusicXmlTupletStart(const pugi::xml_node &node, const pugi::xml_node &tupletStart, Layer *layer)
 {
+    // TODO <tuplet> does not support child <tabGrp>
+
     if (!tupletStart) return;
 
     Tuplet *tuplet = new Tuplet();

From a0bc703c618692a4b555bcbfe0ff63b261b6f1a0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 17 Jan 2022 15:55:38 +0100
Subject: [PATCH 069/403] Draw continuous staff lines for French and Italian
 tablature. Closes #2526

---
 src/view_page.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/view_page.cpp b/src/view_page.cpp
index 9e5cbb34582..f0cfee5c0c1 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -1224,9 +1224,12 @@ void View::DrawStaffLines(DeviceContext *dc, Staff *staff, Measure *measure, Sys
             y2 -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
         }
         else {
+            const bool isFrenchOrItalianTablature = (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_french
+                || staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_italian);
             SegmentedLine line(x1, x2);
-            // We do not need to do this during layout calculation - and only with tablature
-            if (!dc->Is(BBOX_DEVICE_CONTEXT) && staff->IsTablature()) {
+            // We do not need to do this during layout calculation - and only with tablature but not for French or
+            // Italian tablature
+            if (!dc->Is(BBOX_DEVICE_CONTEXT) && staff->IsTablature() && !isFrenchOrItalianTablature) {
                 Object fullLine;
                 fullLine.SetParent(system);
                 fullLine.UpdateContentBBoxY(y1 + (lineWidth / 2), y1 - (lineWidth / 2));

From 7d917bc403b93c86919567afc6e4f475e0e9785e Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 18 Jan 2022 09:35:36 +0100
Subject: [PATCH 070/403] Apply to resolve cross staff

---
 src/accid.cpp             |  6 ++----
 src/chord.cpp             | 15 +++------------
 src/horizontalaligner.cpp |  7 +------
 src/layer.cpp             | 16 ++--------------
 src/layerelement.cpp      | 26 ++++++--------------------
 src/note.cpp              |  5 +----
 src/slur.cpp              |  6 +-----
 7 files changed, 16 insertions(+), 65 deletions(-)

diff --git a/src/accid.cpp b/src/accid.cpp
index 0af3d0ba303..3999d5b26a1 100644
--- a/src/accid.cpp
+++ b/src/accid.cpp
@@ -121,11 +121,9 @@ std::wstring Accid::GetSymbolStr(const data_NOTATIONTYPE notationType) const
 
 void Accid::AdjustToLedgerLines(Doc *doc, LayerElement *element, int staffSize)
 {
-    Layer *layer = NULL;
-    Staff *staff = element->GetCrossStaff(layer);
-    if (!staff) staff = vrv_cast<Staff *>(element->GetFirstAncestor(STAFF));
-
+    Staff *staff = element->FindStaff(RESOLVE_CROSSSTAFF);
     Chord *chord = vrv_cast<Chord *>(this->GetFirstAncestor(CHORD));
+
     if (element->Is(NOTE) && chord && chord->HasAdjacentNotesInStaff(staff)) {
         const int horizontalMargin = 4 * doc->GetDrawingStemWidth(staffSize);
         const int drawingUnit = doc->GetDrawingUnit(staffSize);
diff --git a/src/chord.cpp b/src/chord.cpp
index d9fcf865ab8..22fb033ac14 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -535,10 +535,7 @@ std::list<Note *> Chord::GetAdjacentNotesList(Staff *staff, int loc)
         Note *note = vrv_cast<Note *>(obj);
         assert(note);
 
-        Layer *layer = NULL;
-        Staff *noteStaff = note->GetCrossStaff(layer);
-        if (!noteStaff) noteStaff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-        assert(noteStaff);
+        Staff *noteStaff = note->FindStaff(RESOLVE_CROSSSTAFF);
         if (noteStaff != staff) continue;
 
         const int locDiff = note->GetDrawingLoc() - loc;
@@ -747,10 +744,7 @@ MapOfNoteLocs Chord::CalcNoteLocations(NotePredicate predicate)
 
         if (predicate && !predicate(note)) continue;
 
-        Layer *layer = NULL;
-        Staff *staff = note->GetCrossStaff(layer);
-        if (!staff) staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-        assert(staff);
+        Staff *staff = note->FindStaff(RESOLVE_CROSSSTAFF);
 
         noteLocations[staff].insert(note->GetDrawingLoc());
     }
@@ -918,10 +912,7 @@ int Chord::AdjustCrossStaffContent(FunctorParams *functorParams)
     // Check if chord spreads across several staves
     std::list<Staff *> extremalStaves;
     for (Note *note : { this->GetTopNote(), this->GetBottomNote() }) {
-        Layer *layer = NULL;
-        Staff *staff = note->GetCrossStaff(layer);
-        if (!staff) staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-        assert(staff);
+        Staff *staff = note->FindStaff(RESOLVE_CROSSSTAFF);
         extremalStaves.push_back(staff);
     }
     assert(extremalStaves.size() == 2);
diff --git a/src/horizontalaligner.cpp b/src/horizontalaligner.cpp
index d0ba59e331e..c2aceeb0e8b 100644
--- a/src/horizontalaligner.cpp
+++ b/src/horizontalaligner.cpp
@@ -1339,12 +1339,7 @@ int AlignmentReference::AdjustLayersEnd(FunctorParams *functorParams)
     // Determine staff
     if (params->m_current.empty()) return FUNCTOR_CONTINUE;
     LayerElement *firstElem = params->m_current.at(0);
-    Layer *layer = NULL;
-    Staff *staff = firstElem->GetCrossStaff(layer);
-    if (!staff) {
-        staff = vrv_cast<Staff *>(firstElem->GetFirstAncestor(STAFF));
-    }
-    assert(staff);
+    Staff *staff = firstElem->FindStaff(RESOLVE_CROSSSTAFF);
 
     const int extension
         = params->m_doc->GetDrawingLedgerLineExtension(staff->m_drawingStaffSize, firstElem->GetDrawingCueSize());
diff --git a/src/layer.cpp b/src/layer.cpp
index 98235e6eb06..dd49cf7da61 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -307,13 +307,7 @@ std::set<int> Layer::GetLayersNForTimeSpanOf(LayerElement *element)
     Alignment *alignment = element->GetAlignment();
     assert(alignment);
 
-    Layer *layer = NULL;
-    Staff *staff = element->GetCrossStaff(layer);
-    if (!staff) {
-        staff = dynamic_cast<Staff *>(element->GetFirstAncestor(STAFF));
-    }
-    // At this stage we have the parent or the cross-staff
-    assert(staff);
+    Staff *staff = element->FindStaff(RESOLVE_CROSSSTAFF);
 
     return this->GetLayersNInTimeSpan(alignment->GetTime(), element->GetAlignmentDuration(), measure, staff->GetN());
 }
@@ -381,13 +375,7 @@ ListOfObjects Layer::GetLayerElementsForTimeSpanOf(LayerElement *element, bool e
         return {};
     }
 
-    Layer *layer = NULL;
-    Staff *staff = element->GetCrossStaff(layer);
-    if (!staff) {
-        staff = static_cast<Staff *>(element->GetFirstAncestor(STAFF));
-    }
-    // At this stage we have the parent or the cross-staff
-    assert(staff);
+    Staff *staff = element->FindStaff(RESOLVE_CROSSSTAFF);
 
     return GetLayerElementsInTimeSpan(time, duration, measure, staff->GetN(), excludeCurrent);
 }
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index aad4767da82..111f11457ee 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -282,11 +282,7 @@ data_STAFFREL_basic LayerElement::GetCrossStaffRel()
 
 void LayerElement::GetOverflowStaffAlignments(StaffAlignment *&above, StaffAlignment *&below)
 {
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    Layer *crossLayer = NULL;
-    Staff *crossStaff = this->GetCrossStaff(crossLayer);
-    if (crossStaff) staff = crossStaff;
-    assert(staff);
+    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
 
     // By default use the alignment of the staff
     above = staff->GetAlignment();
@@ -2375,21 +2371,15 @@ int LayerElement::FindSpannedLayerElements(FunctorParams *functorParams)
 
         // Skip elements aligned at start/end, but on a different staff
         if ((this->GetAlignment() == start->GetAlignment()) && !start->Is(TIMESTAMP_ATTR)) {
-            Layer *layer = NULL;
-            Staff *staff = this->GetCrossStaff(layer);
-            if (!staff) staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-            Staff *startStaff = start->GetCrossStaff(layer);
-            if (!startStaff) startStaff = vrv_cast<Staff *>(start->GetFirstAncestor(STAFF));
+            Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+            Staff *startStaff = start->FindStaff(RESOLVE_CROSSSTAFF);
             if (staff->GetN() != startStaff->GetN()) {
                 return FUNCTOR_CONTINUE;
             }
         }
         if ((this->GetAlignment() == end->GetAlignment()) && !end->Is(TIMESTAMP_ATTR)) {
-            Layer *layer = NULL;
-            Staff *staff = this->GetCrossStaff(layer);
-            if (!staff) staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-            Staff *endStaff = end->GetCrossStaff(layer);
-            if (!endStaff) endStaff = vrv_cast<Staff *>(end->GetFirstAncestor(STAFF));
+            Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+            Staff *endStaff = end->FindStaff(RESOLVE_CROSSSTAFF);
             if (staff->GetN() != endStaff->GetN()) {
                 return FUNCTOR_CONTINUE;
             }
@@ -2576,11 +2566,7 @@ int LayerElement::PrepareDuration(FunctorParams *functorParams)
         durInterface->SetDurDefault(params->m_durDefault);
         // Check if there is a duration default for the staff
         if (!params->m_durDefaultForStaffN.empty()) {
-            Layer *layer = NULL;
-            Staff *staff = this->GetCrossStaff(layer);
-            if (!staff) staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-            assert(staff);
-
+            Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
             if (params->m_durDefaultForStaffN.count(staff->GetN()) > 0) {
                 durInterface->SetDurDefault(params->m_durDefaultForStaffN.at(staff->GetN()));
             }
diff --git a/src/note.cpp b/src/note.cpp
index 975a707b89d..d29d4c622fc 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1062,10 +1062,7 @@ MapOfNoteLocs Note::CalcNoteLocations(NotePredicate predicate)
 {
     if (predicate && !predicate(this)) return {};
 
-    Layer *layer = NULL;
-    Staff *staff = this->GetCrossStaff(layer);
-    if (!staff) staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
 
     MapOfNoteLocs noteLocations;
     noteLocations[staff] = { this->GetDrawingLoc() };
diff --git a/src/slur.cpp b/src/slur.cpp
index f836b072574..9dba6d151e5 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -275,11 +275,7 @@ Staff *Slur::CalculateExtremalStaff(Staff *staff, int xMin, int xMax, char spann
     // The floating curve positioner of cross staff slurs should live in the upper/lower staff alignment
     // corresponding to whether the slur is curved above/below
     auto adaptStaff = [&extremalStaff, curveDir](LayerElement *element) {
-        Layer *elementLayer = NULL;
-        Staff *elementStaff = element->GetCrossStaff(elementLayer);
-        if (!elementStaff) elementStaff = vrv_cast<Staff *>(element->GetFirstAncestor(STAFF));
-        assert(elementStaff);
-
+        Staff *elementStaff = element->FindStaff(RESOLVE_CROSSSTAFF);
         if ((curveDir == curvature_CURVEDIR_above) && (elementStaff->GetN() < extremalStaff->GetN())) {
             extremalStaff = elementStaff;
         }

From 5c39e65feaf84ea763a1c84dddc27c6a9b74a451 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 10:05:01 +0100
Subject: [PATCH 071/403] Adjust positioning of tablature glyphs

---
 include/vrv/vrvdef.h |  2 +-
 src/view_tab.cpp     | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index d7961c0450f..d234364bbb6 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -614,7 +614,7 @@ enum { KEY_LEFT = 37, KEY_UP = 38, KEY_RIGHT = 39, KEY_DOWN = 40 };
 // Temporary - to be made an option?
 //----------------------------------------------------------------------------
 
-#define TABLATURE_STAFF_RATIO 1.3
+#define TABLATURE_STAFF_RATIO 1.75
 
 #define SUPER_SCRIPT_FACTOR 0.58
 #define SUPER_SCRIPT_POSITION -0.20 // lowered down from the midline
diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 47dfe04c8d1..693c525f875 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -105,12 +105,15 @@ void View::DrawTabNote(DeviceContext *dc, LayerElement *element, Layer *layer, S
     else {
 
         std::wstring fret = note->GetTabFretString(staff->m_drawingNotationType);
-        wchar_t code = (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_french) ? SMUFL_EBC0_luteFrenchFretA
-                                                                                      : SMUFL_EBE0_luteItalianFret0;
-        int radius = m_doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, glyphSize, false);
-        y -= (m_doc->GetGlyphHeight(code, glyphSize, drawingCueSize) / 2);
-        x += radius - (m_doc->GetGlyphWidth(code, glyphSize, drawingCueSize) / 2);
-
+        // Center for italian tablature
+        if (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_italian) {
+            y -= (m_doc->GetGlyphHeight(SMUFL_EBE0_luteItalianFret0, glyphSize, drawingCueSize) / 2);
+        }
+        // Above the line for french tablature
+        else if (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_french) {
+            y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) - m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize);
+        }
+        
         dc->SetFont(m_doc->GetDrawingSmuflFont(glyphSize, false));
         DrawSmuflString(dc, x, y, fret, HORIZONTALALIGNMENT_center, glyphSize);
         dc->ResetFont();
@@ -139,7 +142,13 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     int x = element->GetDrawingX();
     int y = element->GetDrawingY();
-    y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 1.5;
+    
+    double spacingRatio = 1.0;
+    if (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_french) {
+        spacingRatio = 2.0;
+    }
+    y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * spacingRatio;
+    
     int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
     int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
 
@@ -151,9 +160,6 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
             x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2, y + height);
     }
     else {
-        int radius = m_doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, glyphSize, false) / 2;
-        x += radius;
-
         int symc = 0;
         switch (drawingDur) {
             case DUR_2: symc = SMUFL_EBA7_luteDurationWhole; break;
@@ -170,7 +176,7 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
             y += m_doc->GetDrawingUnit(glyphSize) * 0.5;
             x += m_doc->GetDrawingUnit(glyphSize);
             for (int i = 0; i < tabGrp->GetDots(); ++i) {
-                DrawDot(dc, x, y, glyphSize / 2);
+                DrawDot(dc, x, y, glyphSize * 2 / 3);
                 // HARDCODED
                 x += m_doc->GetDrawingUnit(glyphSize) * 0.75;
             }

From f3095d2df184b7d575d72d34c7b87cb3e89577f8 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 10:05:47 +0100
Subject: [PATCH 072/403] Regenerate fonts with Leipzig 5.2.65

---
 data/Leipzig.xml                       |  46 ++---
 data/Leipzig/EBC0-luteFrenchFretA.xml  |   2 +-
 data/Leipzig/EBC1-luteFrenchFretB.xml  |   2 +-
 data/Leipzig/EBC2-luteFrenchFretC.xml  |   2 +-
 data/Leipzig/EBC3-luteFrenchFretD.xml  |   2 +-
 data/Leipzig/EBC4-luteFrenchFretE.xml  |   2 +-
 data/Leipzig/EBC5-luteFrenchFretF.xml  |   2 +-
 data/Leipzig/EBC6-luteFrenchFretG.xml  |   2 +-
 data/Leipzig/EBC7-luteFrenchFretH.xml  |   2 +-
 data/Leipzig/EBC8-luteFrenchFretI.xml  |   2 +-
 data/Leipzig/EBC9-luteFrenchFretK.xml  |   2 +-
 data/Leipzig/EBCA-luteFrenchFretL.xml  |   2 +-
 data/Leipzig/EBCB-luteFrenchFretM.xml  |   2 +-
 data/Leipzig/EBCC-luteFrenchFretN.xml  |   2 +-
 data/Leipzig/EBE0-luteItalianFret0.xml |   2 +-
 data/Leipzig/EBE1-luteItalianFret1.xml |   2 +-
 data/Leipzig/EBE2-luteItalianFret2.xml |   2 +-
 data/Leipzig/EBE3-luteItalianFret3.xml |   2 +-
 data/Leipzig/EBE4-luteItalianFret4.xml |   2 +-
 data/Leipzig/EBE5-luteItalianFret5.xml |   2 +-
 data/Leipzig/EBE6-luteItalianFret6.xml |   2 +-
 data/Leipzig/EBE7-luteItalianFret7.xml |   2 +-
 data/Leipzig/EBE8-luteItalianFret8.xml |   2 +-
 data/Leipzig/EBE9-luteItalianFret9.xml |   2 +-
 fonts/Leipzig.svg                      | 225 +++++++++++++++++--------
 25 files changed, 203 insertions(+), 114 deletions(-)

diff --git a/data/Leipzig.xml b/data/Leipzig.xml
index 6833f973d3b..05998076264 100644
--- a/data/Leipzig.xml
+++ b/data/Leipzig.xml
@@ -349,16 +349,16 @@
 	<g c="E91A" x="30.0" y="-240.0" w="450.0" h="480.0" />
 	<g c="E91F" x="-26.0" y="-266.0" w="532.0" h="532.0" />
 	<g c="E91D" x="-26.0" y="-266.0" w="532.0" h="532.0" />
-	<g c="EBE0" x="0.0" y="0.0" w="220.0" h="246.0" h-a-x="220" />
-	<g c="EBE1" x="1.0" y="-1.0" w="149.0" h="247.0" h-a-x="148" />
-	<g c="EBE2" x="-1.0" y="0.0" w="167.0" h="246.0" h-a-x="166" />
-	<g c="EBE3" x="0.0" y="0.0" w="166.0" h="246.0" h-a-x="166" />
-	<g c="EBE4" x="-1.0" y="0.0" w="199.0" h="246.0" h-a-x="198" />
-	<g c="EBE5" x="0.0" y="0.0" w="149.0" h="251.0" h-a-x="149" />
-	<g c="EBE6" x="0.0" y="0.0" w="176.0" h="246.0" h-a-x="176" />
-	<g c="EBE7" x="0.0" y="0.0" w="162.0" h="246.0" h-a-x="162" />
-	<g c="EBE8" x="0.0" y="0.0" w="188.0" h="246.0" h-a-x="188" />
-	<g c="EBE9" x="0.0" y="-0.2" w="179.0" h="246.2" h-a-x="179" />
+	<g c="EBE0" x="-3.0" y="-3.0" w="226.0" h="252.0" h-a-x="220" />
+	<g c="EBE1" x="-2.1" y="-4.0" w="155.1" h="253.0" h-a-x="148" />
+	<g c="EBE2" x="-3.9" y="-3.0" w="172.9" h="252.0" h-a-x="166" />
+	<g c="EBE3" x="-3.0" y="-3.0" w="172.0" h="252.0" h-a-x="166" />
+	<g c="EBE4" x="-4.0" y="-3.0" w="205.0" h="252.0" h-a-x="198" />
+	<g c="EBE5" x="-3.0" y="-3.0" w="155.0" h="257.0" h-a-x="149" />
+	<g c="EBE6" x="-3.0" y="-3.0" w="182.0" h="252.0" h-a-x="176" />
+	<g c="EBE7" x="-3.0" y="-3.0" w="168.0" h="252.0" h-a-x="162" />
+	<g c="EBE8" x="-3.0" y="-3.0" w="194.0" h="252.0" h-a-x="188" />
+	<g c="EBE9" x="-3.0" y="-3.2" w="185.0" h="252.2" h-a-x="179" />
 	<g c="EBA7" x="-82.0" y="0.0" w="170.0" h="641.0" h-a-x="92" />
 	<g c="EBA8" x="0.0" y="-1.0" w="404.0" h="646.0" h-a-x="403" />
 	<g c="EBAA" x="0.0" y="0.0" w="392.0" h="631.0" h-a-x="393" />
@@ -369,19 +369,19 @@
 	<g c="E24D" x="0.0" y="-950.0" w="277.0" h="1729.0" h-a-x="274" />
 	<g c="E24E" x="0.0" y="-779.0" w="280.0" h="1919.0" h-a-x="274" />
 	<g c="E24F" x="0.0" y="-1140.0" w="280.0" h="1919.0" h-a-x="274" />
-	<g c="EBC0" x="0.0" y="-10.0" w="335.0" h="241.0" h-a-x="335" />
-	<g c="EBC1" x="-36.0" y="-4.0" w="272.0" h="379.0" h-a-x="235" />
-	<g c="EBC2" x="-79.0" y="0.0" w="302.0" h="279.0" h-a-x="224" />
-	<g c="EBC3" x="-247.0" y="0.0" w="504.0" h="370.0" h-a-x="258" />
-	<g c="EBC4" x="0.0" y="0.0" w="222.0" h="333.0" h-a-x="221" />
-	<g c="EBC5" x="0.0" y="-97.0" w="254.0" h="451.0" h-a-x="253" />
-	<g c="EBC6" x="-91.0" y="-195.0" w="389.0" h="387.0" h-a-x="300" />
-	<g c="EBC7" x="-100.0" y="-46.0" w="349.0" h="398.0" h-a-x="249" />
-	<g c="EBC8" x="-54.0" y="-3.0" w="177.0" h="321.0" h-a-x="124" />
-	<g c="EBC9" x="-1.0" y="-2.0" w="188.0" h="443.0" h-a-x="187" />
-	<g c="EBCA" x="-81.0" y="0.0" w="278.0" h="423.0" h-a-x="196" />
-	<g c="EBCB" x="-136.0" y="-2.0" w="675.0" h="274.0" h-a-x="540" />
-	<g c="EBCC" x="-108.0" y="0.0" w="414.0" h="251.0" h-a-x="308" />
+	<g c="EBC0" x="-0.6" y="0.0" w="279.6" h="202.8" h-a-x="280" />
+	<g c="EBC1" x="-1.0" y="-0.0" w="227.6" h="313.2" h-a-x="227" />
+	<g c="EBC2" x="0.6" y="0.8" w="251.6" h="233.2" h-a-x="253" />
+	<g c="EBC3" x="0.2" y="0.4" w="413.2" h="306.0" h-a-x="413" />
+	<g c="EBC4" x="0.0" y="0.0" w="187.6" h="276.4" h-a-x="187" />
+	<g c="EBC5" x="0.0" y="0.0" w="211.8" h="355.0" h-a-x="212" />
+	<g c="EBC6" x="-0.2" y="-0.2" w="321.2" h="319.6" h-a-x="321" />
+	<g c="EBC7" x="0.0" y="0.0" w="289.0" h="328.0" h-a-x="289" />
+	<g c="EBC8" x="1.0" y="0.0" w="151.0" h="267.0" h-a-x="153" />
+	<g c="EBC9" x="0.0" y="0.0" w="161.0" h="355.0" h-a-x="160" />
+	<g c="EBCA" x="1.0" y="0.0" w="232.0" h="348.0" h-a-x="233" />
+	<g c="EBCB" x="-1.0" y="-1.0" w="550.0" h="229.2" h-a-x="549" />
+	<g c="EBCC" x="0.2" y="-0.2" w="341.2" h="210.8" h-a-x="341" />
 	<g c="E000" x="0.1" y="1.1" w="92.6" h="997.7" />
 	<g c="E645" x="-150.0" y="0.0" w="300.0" h="300.0" h-a-x="150" />
 	<g c="E0A5" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="314" />
diff --git a/data/Leipzig/EBC0-luteFrenchFretA.xml b/data/Leipzig/EBC0-luteFrenchFretA.xml
index 3fe5c95190b..fa6f1af4a25 100644
--- a/data/Leipzig/EBC0-luteFrenchFretA.xml
+++ b/data/Leipzig/EBC0-luteFrenchFretA.xml
@@ -1 +1 @@
-<symbol id="EBC0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M21 6c-13 10 -17 17 -18 20c-3 8 -3 17 -3 26v21c0 21 7 39 11 45c20 33 37 43 79 66c44 24 85 37 120 37c2 0 14 -2 21 -2c11 0 63 12 64 12v-5c0 -24 -6 -77 -6 -102c0 -57 16 -101 46 -134h-74c-4 10 -8 28 -11 56c-3 25 -7 43 -12 52c-21 -23 -40 -42 -58 -58 c-40 -34 -60 -39 -119 -39h-10c-14 0 -20 0 -30 5zM67 48c3 -4 10 -5 20 -5c28 0 78 14 102 35c29 26 43 48 43 67v9c0 10 0 17 -4 22c-3 4 -9 15 -16 16c-5 1 -11 1 -16 1c-16 0 -30 -4 -34 -5c-13 -3 -30 -11 -56 -30c-32 -23 -62 -48 -62 -74c0 -12 7 -24 23 -36z" /></symbol>
\ No newline at end of file
+<symbol id="EBC0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M186.601 129c0 1.65039 0.0234375 3.26562 0.0234375 4.90039c0 8.15625 -0.584961 14.7139 -2.22754 16.9033c-4.77539 6.36719 -10.8975 11.5977 -21.5967 11.5977c-12.377 0 -17.1211 -1.43555 -25.8789 -3.82324 c-9.25488 -2.52441 -24.0615 -10.2568 -43.3174 -23.3184c-10.2236 -6.93555 -20.9873 -15.1816 -29.626 -23.8213c-10.8789 -10.8789 -17.7783 -22.0332 -17.7783 -31.2383v-1.12012c0 -7.49512 0.143555 -12.0684 6.31738 -18.2422 c4.60645 -4.60645 11.3818 -8.43848 23.083 -8.43848c22.1777 0 47.5176 0.592773 78.3662 26.8135c3.80664 3.23633 7.25488 6.40918 10.3535 9.50781c15.8418 15.8418 22.2812 29.5859 22.2812 40.2793zM278.999 5c0 -2.68945 -2.30762 -4.99902 -4.99902 -4.99902 h-59.2002c-2.06445 0 -3.94434 1.39648 -4.6416 3.1377c-3.51562 8.78906 -6.69336 23.4072 -9.12109 46.0615c-1.71484 14.2891 -3.94043 25.6143 -6.28516 33.0283c-13.4121 -14.4375 -27.4883 -28.5713 -41.5176 -41.041 c-32.7334 -27.8242 -58.5205 -35.3867 -98.4346 -35.3867c-11.2695 0 -22.5957 1.40918 -34.7012 9.19141c-12.1035 7.78027 -20.6973 26.9805 -20.6973 39.6074c0 36.9863 12.1719 53.3662 16.126 58.9023c1.67383 2.34277 5.18652 6.34961 10.5225 11.6855 c10.6113 10.6113 28.1133 25.9609 49.4111 38.5215c14.291 8.42676 68.5244 31.0898 98.5391 31.0898c4.73828 0 12.2168 -1.59961 16.7998 -1.59961c5.25977 0 32.0234 5.59668 43.9258 8.17871c4.03418 0.875 5.07129 1.4209 7.27441 1.4209 c2.68945 0 4.99902 -2.30762 4.99902 -4.99902v-4c0 -19.7256 -4.7998 -62.0996 -4.7998 -81.5996c0 -44.6494 12.4473 -78.4775 35.5029 -103.84c0.864258 -0.950195 1.29688 -2.15527 1.29688 -3.36035z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC1-luteFrenchFretB.xml b/data/Leipzig/EBC1-luteFrenchFretB.xml
index 563e1d359c7..f54751de894 100644
--- a/data/Leipzig/EBC1-luteFrenchFretB.xml
+++ b/data/Leipzig/EBC1-luteFrenchFretB.xml
@@ -1 +1 @@
-<symbol id="EBC1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M69 199c102 0 167 -15 167 -105c0 -30 -14 -53 -43 -73c-24 -16 -46 -25 -68 -25h-2l-124 5c1 32 2 50 2 53c0 129 -12 236 -37 321h83c2 -4 4 -14 4 -29v-9c0 -29 -1 -64 -1 -90v-44v-4h19zM51 158v-133h62h1c18 0 33 8 45 23c13 14 19 32 19 54c0 23 -6 42 -20 57 c-14 14 -32 22 -53 22c-23 0 -42 -8 -54 -23z" /></symbol>
\ No newline at end of file
+<symbol id="EBC1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M116.8 148.001c-16.5664 0 -29.7793 -5.56348 -38.2012 -15.2148v-99.5869h45.4014c13.2275 0 24.3896 6.89258 32.0918 16.5195c0.0771484 0.0966797 0.157227 0.189453 0.242188 0.28125c9.40723 10.1299 13.8672 23.1201 13.8672 39.7998 c0 17.4912 -4.46094 31.2305 -14.5986 42.127c-10.3203 10.291 -23.3682 16.0742 -38.8027 16.0742zM78.5986 277.8c0 -22.3086 -0.799805 -50.1299 -0.799805 -72v-33.4004h10.2012c80.1406 0 138.599 -11.4727 138.599 -88.999 c0 -19.3984 -7.02637 -35.7627 -20.9609 -49.6973c-4.50879 -4.50879 -9.77441 -8.80273 -15.667 -12.8662c-19.6074 -13.0713 -38.1455 -20.8359 -57.1709 -20.8359l-1.59961 -0.00390625l-99.4033 4.00781c-2.58398 0.104492 -4.7959 2.35547 -4.7959 4.99512 c0 20.749 1.59961 29.7715 1.59961 42.4004c0 102.892 -9.59277 188.052 -29.3955 255.383c-0.135742 0.461914 -0.204102 0.939453 -0.204102 1.41699c0 2.68945 2.30762 4.99902 4.99902 4.99902h66.4004c1.90234 0 3.69531 -1.20605 4.47266 -2.76172 c2.30566 -4.61328 3.72559 -12.9824 3.72559 -25.4375v-7.2002z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC2-luteFrenchFretC.xml b/data/Leipzig/EBC2-luteFrenchFretC.xml
index 61402124cf0..f14b6fec755 100644
--- a/data/Leipzig/EBC2-luteFrenchFretC.xml
+++ b/data/Leipzig/EBC2-luteFrenchFretC.xml
@@ -1 +1 @@
-<symbol id="EBC2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M85 239c-13 0 -23 -17 -23 -30c0 -5 1 -9 2 -13l9 -66c5 -34 12 -60 21 -79c9 4 27 12 54 25c12 5 19 8 21 8c1 0 2 0 2 -1c0 -2 -1 -4 -2 -5l-38 -26c-19 -13 -48 -31 -88 -52l-25 101c-8 35 -14 67 -18 97h-1c-4 0 -13 -2 -28 -8c-21 -8 -35 -12 -43 -12 c-4 0 -7 1 -7 3c0 1 1 3 3 5c31 18 117 76 150 93l66 -11c47 -9 73 -16 81 -20c1 0 2 -1 2 -3c0 -3 -6 -20 -6 -24c-19 0 -110 14 -130 18h-2z" /></symbol>
\ No newline at end of file
+<symbol id="EBC2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247.398 182.6c0 -2.68945 -2.30762 -4.99902 -4.99902 -4.99902c-16.2461 0 -87.0928 10.9814 -104.494 14.4004h-1.10547c-7.91016 0 -13.4014 -12.207 -13.4014 -19.001c0 -3.55762 1.0791 -6.23242 1.55469 -9.7207l7.19238 -52.7471 c3.56738 -24.2559 8.41895 -43.1943 14.3818 -57.332c8.00391 3.57812 20.8232 9.39355 38.502 17.9043c7.04102 3.38965 15.4229 6.89453 18.9707 6.89453c0.0458984 0 0.400391 0.102539 0.955078 0.102539c2.45801 0 5.64355 -2.90918 5.64355 -5.90137 c0 -3.4209 -1.50977 -6.57715 -3.77832 -8.12988c-35.6797 -24.4131 -51.3916 -36.499 -101.295 -62.6982c-0.725586 -0.380859 -1.52539 -0.571289 -2.3252 -0.571289c-2.31738 0 -4.33887 1.7168 -4.85156 3.79199c-11.9365 48.2246 -26.6865 103.349 -33.8379 154.088 c-3.50293 -0.753906 -9.28125 -2.41406 -17.126 -5.55176c-16.9746 -6.46777 -28.3154 -9.92773 -36.1846 -9.92773c-4.24023 0 -10.5996 1.62012 -10.5996 7.39844c0 3.43652 2.27734 6.80859 4.88965 8.3252c28.9277 16.7979 95.0635 61.5615 120.219 74.5205 c0.716797 0.369141 1.50391 0.553711 2.29102 0.553711c0.276367 0 0.553711 -0.0224609 0.827148 -0.0683594l52.9189 -8.81934c36.7783 -7.04297 57.2969 -12.3232 65.4209 -16.1152c3.10742 -0.816406 5.03223 -4.00781 5.03223 -7.19629 c0 -3.69629 -4.80078 -16.9365 -4.80078 -19.2002z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC3-luteFrenchFretD.xml b/data/Leipzig/EBC3-luteFrenchFretD.xml
index a4bf118098e..11dfb08f562 100644
--- a/data/Leipzig/EBC3-luteFrenchFretD.xml
+++ b/data/Leipzig/EBC3-luteFrenchFretD.xml
@@ -1 +1 @@
-<symbol id="EBC3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M121 -0h-2c-27 0 -40 9 -56 17c-12 6 -39 26 -52 47c-6 9 -11 29 -11 42c0 47 7 90 21 129c-24 8 -59 17 -107 27c-58 11 -105 17 -141 17c-7 0 -12 -1 -16 -1c-3 0 -4 1 -4 2l4 10c6 20 9 47 10 70c1 7 2 10 3 10c9 -3 14 -6 24 -8l125 -40c93 -29 170 -51 228 -66 c44 -11 75 -33 94 -65c11 -19 16 -38 16 -59c0 -88 -66 -129 -136 -132zM54 227c-8 -17 -17 -57 -17 -88v-9c2 -28 18 -51 44 -70c20 -15 33 -16 53 -16c29 0 50 13 68 40c4 17 6 32 6 45c0 28 -9 48 -28 62c-12 9 -36 23 -72 32c-16 3 -28 4 -44 4h-3h-7z" /></symbol>
\ No newline at end of file
+<symbol id="EBC3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 182.001h-4.71582c-5.61426 -14.0156 -11.8857 -43.1748 -11.8857 -65.4004v-7.0166c1.15918 -15.5898 8.14746 -29.0996 20.2012 -41.1533c13.9413 -13.9448 31.1242 -22.8311 52.4004 -22.8311c16.0332 0 28.2695 5.13965 39.2207 16.0908 c10.5567 10.5567 17.3799 29.7745 17.3799 46.125v0.785156c0 21.1797 -9.44922 35.7607 -22.7627 45.5713c-9.0459 6.78418 -27.6777 17.7129 -55.7119 24.7432c-12.4785 2.33203 -33.001 2.98438 -34.126 3.08594zM8.39941 222.802 c-3.73926 0 -8.19824 2.13965 -8.19824 6.59863c0 0.632812 0.119141 1.26465 0.357422 1.86035l3.11621 7.79199c4.54785 15.2793 6.94629 36.5205 7.73047 54.5664c0.243164 5.59375 1.30762 12.7803 7.39453 12.7803c3.08008 0 6.40234 -1.99512 8.47168 -2.81055 c3.83496 -1.51172 6.90625 -2.72559 11.7148 -3.6875c0.183594 -0.0361328 0.364258 -0.0830078 0.542969 -0.140625l99.9648 -31.9893c74.3359 -23.1787 136.768 -37.5835 182.124 -52.7217c35.8223 -11.9561 67.9062 -36.7168 78.3105 -54.3457 c9.33311 -15.8139 13.4697 -32.0791 13.4697 -49.7041c0 -68.3848 -41.0693 -107.897 -103.982 -110.594c-0.0722656 -0.00292969 -0.143555 -0.00488281 -0.21582 -0.00488281h-1.60059c-29.5791 0 -43.1963 7.40625 -56.6367 14.126 c-7.2373 3.61914 -19.4033 12.165 -30.1455 22.9082c-5.07617 5.0752 -9.80566 10.6309 -13.4287 16.4658c-5.7002 8.6084 -9.58789 24.8477 -9.58789 36.2988c0 36.1631 5.11523 69.5273 15.3975 100.021c-18.6914 5.91211 -44.9824 12.5449 -80.1357 19.8682 c-46.2373 8.77051 -83.6094 13.5127 -111.862 13.5127c-4.87598 0 -8.3125 -0.799805 -12.8008 -0.799805z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC4-luteFrenchFretE.xml b/data/Leipzig/EBC4-luteFrenchFretE.xml
index 8319faa9c1f..07334e3fe75 100644
--- a/data/Leipzig/EBC4-luteFrenchFretE.xml
+++ b/data/Leipzig/EBC4-luteFrenchFretE.xml
@@ -1 +1 @@
-<symbol id="EBC4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M63 116c0 -32 23 -55 55 -55c12 0 29 7 49 21l53 40l-17 -43c-4 -1 -11 -7 -22 -20c-27 -32 -56 -54 -105 -59h-3c-12 0 -28 9 -45 26c-20 20 -28 35 -28 56c0 22 6 51 19 86c14 39 28 61 42 65c-1 4 -1 8 -1 12c0 35 33 83 62 88c1 -1 3 -10 7 -25 c-15 -9 -22 -19 -22 -31c0 -5 4 -15 12 -31c7 -12 5 -13 30 -13c21 0 44 13 70 39c1 -6 3 -14 3 -19c0 -11 -7 -20 -20 -27c-14 -20 -52 -47 -80 -47c-11 0 -21 3 -29 10c-19 0 -30 -53 -30 -73z" /></symbol>
\ No newline at end of file
+<symbol id="EBC4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 107.599c2.68945 0 4.99902 -2.30762 4.99902 -4.99902c0 -0.625977 -0.117188 -1.25195 -0.350586 -1.84277l-13.5996 -34.3994c-0.62793 -1.58984 -1.95996 -2.49805 -3.55566 -3.0498c-3.86328 -1.50488 -10.8779 -9.6123 -14.8682 -14.3281 c-21.0625 -24.9639 -58.8965 -48.9785 -87.8252 -48.9785h-2.39941c-12.5586 0 -30.9932 13.084 -39.6611 22.3936c-11.3145 12.1523 -23.7383 29.1719 -23.7383 48.2051c0 18.4951 4.95801 42.1279 15.4941 70.4951c8.16797 22.751 16.2881 38.71 25.3633 47.7861 c2.32812 2.32715 4.76562 4.23633 7.35742 5.61426c-0.202148 2.03711 -0.214844 3.96289 -0.214844 5.75v0.754883c0 20.5254 12.3271 44.5625 27.7812 60.0166c7.8125 7.8125 16.6553 13.7051 25.9629 15.3096c0.282227 0.0488281 0.568359 0.0732422 0.854492 0.0732422 c3.86816 0 5.19531 -4.1084 5.79492 -6.12598c1.46484 -4.92773 3.03418 -11.5742 4.63574 -17.5791c0.112305 -0.422852 0.168945 -0.858398 0.168945 -1.29395c0 -1.74902 -1.0332 -3.45215 -2.42773 -4.28906c-7.44922 -4.46973 -15.1729 -11.1357 -15.1729 -20.5117 c0 -1.03125 4.41602 -14.2207 10.3604 -24.8066c1.25879 -2.24316 2.05176 -3.46191 2.47266 -3.88281c0.609375 -0.609375 2.62402 -1.51074 15.7686 -1.51074c14.6572 0 32.0156 9.28711 52.4648 29.7354c0.975586 0.975586 2.25488 1.46387 3.53516 1.46387 c4.69922 0 4.96875 -4.57715 5.77734 -8.68262c0.749023 -3.80273 1.62109 -7.86035 1.62109 -11.5156c0 -11.9629 -8.74609 -20.4453 -17.5957 -25.4346c-13.3037 -18.1318 -43.1738 -38.7646 -67.4033 -38.7646c-8.9082 0 -17.4824 2.27246 -24.6016 7.69238 c-0.711914 -0.301758 -1.54785 -0.862305 -2.52148 -1.83496c-8.55762 -8.55762 -15.0771 -38.9395 -15.0771 -51.2588c0 -22.9434 16.0596 -39.001 39.001 -39.001c7.76465 0 20.6719 4.94922 36.2627 15.8496l42.3291 31.9453 c0.886719 0.669922 1.94727 1.00488 3.00781 1.00488z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC5-luteFrenchFretF.xml b/data/Leipzig/EBC5-luteFrenchFretF.xml
index 9597a3f3085..85918e4303c 100644
--- a/data/Leipzig/EBC5-luteFrenchFretF.xml
+++ b/data/Leipzig/EBC5-luteFrenchFretF.xml
@@ -1 +1 @@
-<symbol id="EBC5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 94v19h16c10 0 37 3 37 3c3 0 32 27 38 32c-5 38 -8 67 -8 86c0 80 35 120 104 120c45 0 67 -19 67 -64v-10c0 -60 -28 -83 -74 -106c-18 -9 -28 -18 -29 -23c0 -4 -1 -14 -2 -29c23 1 42 1 55 1c16 0 25 -1 29 -2v-18v-7c-5 0 -13 1 -23 1c-17 0 -52 -2 -52 -3 c-4 -23 -12 -166 -15 -190c-8 0 -21 -1 -32 -1c0 6 1 14 1 23c0 28 -2 61 -9 100l-11 58c-30 3 -57 4 -81 4h-10c0 0 -1 2 -1 6zM178 314c-25 -4 -41 -41 -41 -70c0 -7 1 -18 6 -33c4 -13 6 -22 6 -29c41 33 63 59 65 80v7c0 26 -12 41 -36 45z" /></symbol>
\ No newline at end of file
+<symbol id="EBC5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M128 225c15 13 41 40 43 55v5c0 19 -8 28 -24 31c-18 -5 -28 -31 -28 -51c0 -6 7 -31 9 -40zM168 173c14 0 28 0 28 -6v-20c0 -3 -2 -5 -5 -5h-18c-10 0 -30 0 -38 -1c-3 -19 -9 -115 -11 -136c0 -2 -2 -4 -5 -4c-8 0 -18 -1 -26 -1c-3 0 -5 2 -5 5c0 6 1 13 1 19 c0 22 -1 37 -7 68l-8 40c-22 2 -60 3 -61 3h-8c-2 0 -3 1 -4 3c0 1 -1 3 -1 7v15c0 3 2 5 5 5h12c7 0 25 2 29 2c4 3 19 17 26 23c-4 29 -6 52 -6 67c0 63 26 98 87 98c39 0 58 -17 58 -55c1 -2 1 -6 0 -8c0 -52 -25 -69 -60 -87c-9 -4 -15 -10 -18 -13c-1 -1 -3 -2 -3 -2 c0 -4 -1 -12 -1 -17h39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC6-luteFrenchFretG.xml b/data/Leipzig/EBC6-luteFrenchFretG.xml
index 21661830b6e..c59e8b060fb 100644
--- a/data/Leipzig/EBC6-luteFrenchFretG.xml
+++ b/data/Leipzig/EBC6-luteFrenchFretG.xml
@@ -1 +1 @@
-<symbol id="EBC6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42 81c0 -27 6 -33 28 -33c34 0 85 30 111 50c1 0 1 3 1 8c0 4 0 11 -1 21c-23 5 -45 7 -66 7c-26 0 -45 -4 -59 -12c-10 -6 -14 -19 -14 -41zM1 59c0 57 52 108 110 108c28 0 51 -4 71 -13c2 6 3 19 3 38h51l1 -27c0 -12 2 -18 3 -18s2 0 3 1c8 8 25 14 51 18 c2 -8 4 -16 4 -25c-15 -1 -32 -8 -51 -20c-1 -12 -1 -37 -1 -77c-1 -62 -8 -118 -34 -151c-20 -26 -38 -45 -53 -56l-30 -20c-12 -6 -35 -12 -50 -12c-18 0 -53 21 -105 62c-6 4 -16 6 -28 6h-16c-7 -1 -12 -1 -16 -1c-1 -2 -5 11 -5 12c0 6 37 6 78 7c9 0 26 -9 52 -26 c25 -18 42 -27 51 -27h1c31 0 56 25 74 77c12 34 18 63 18 87v74c-23 -19 -42 -34 -59 -45c-31 -21 -52 -31 -64 -31c-25 0 -59 34 -59 59z" /></symbol>
\ No newline at end of file
+<symbol id="EBC6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M116.199 225.6c0 -11.2432 1.61328 -16.2793 3.67578 -18.3418c1.81836 -1.81836 5.58301 -3.05859 13.7246 -3.05859c24.3242 0 63.7881 22.3799 84.5508 38.0498c0.0253906 0.755859 0.0507812 1.88672 0.0507812 3.35059 c0 2.65234 -0.452148 6.84082 -0.452148 12.667c-16.7266 3.36914 -32.7637 4.73438 -48.1494 4.73438c-20.3193 0 -34.5986 -3.16016 -44.7188 -8.94336c-6.33203 -3.79883 -8.68164 -12.2314 -8.68164 -28.458zM219.001 211.026 c-25.1074 -20.4629 -61.9219 -50.4902 -94.5811 -50.4902c-29.1387 0 -44.915 24.2773 -44.915 52.3271c0 21.5498 8.90625 45.2891 25.9395 62.3223c14.4121 14.4121 34.8936 24.2139 60.9561 24.2139c20.2949 0 37.6807 -2.57812 53.0898 -8.44922 c0.657227 5.2002 1.11035 13.2451 1.11035 23.4502c0 2.68945 2.30762 4.99902 4.99902 4.99902h40.8008c2.64258 0 4.89941 -2.21875 4.99512 -4.8125c0.268555 -7.24707 0.803711 -14.5303 0.803711 -21.7871c0 -2.64258 0.165039 -4.87598 0.375 -6.64941 c8.41797 5.87891 21.6113 9.64453 39.4609 12.3896c0.25293 0.0390625 0.508789 0.0585938 0.764648 0.0585938c2.3125 0 4.33203 -1.71191 4.84863 -3.78027c1.59766 -6.38477 3.35059 -13.2617 3.35059 -21.2188c0 -2.60254 -2.14746 -4.82031 -4.66406 -4.98828 c-10.165 -0.676758 -22.334 -5.3623 -36.2451 -13.8613c-0.000976562 -0.113281 -0.000976562 -0.228516 -0.000976562 -0.345703c0 -9.60156 0.978516 -17.8467 0.978516 -29.4629c0 -8.43945 -0.398438 -18.2852 -1.70117 -29.5215 c-8.07812 -69.6367 -24.3174 -127.102 -58.9062 -161.69c-20.0391 -20.0391 -46.1484 -32.0273 -79.374 -33.9209c-0.447266 -0.0253906 -0.901367 -0.0380859 -1.3623 -0.0380859c-17.7275 0 -45.5029 18.7656 -85.8437 50.5645 c-3.46094 2.21973 -10.5 3.86621 -19.4795 3.86621h-12.4482c-5.6582 -0.78418 -9.45215 -0.912109 -13.085 -0.912109c-5.22852 0 -6.18164 4.78711 -7.20605 7.69238c-1.01074 2.86719 -1.86035 4.36621 -1.86035 7.01855c0 1.94531 0.960938 3.5459 1.91602 4.50195 c3.80664 3.80664 9.78418 3.8623 17.1133 4.46484c11.8232 0.972656 32.6201 1.63184 48.3701 1.63184c9.82227 0 23.5039 -7.99121 44.333 -21.6113c0.0625 -0.0410156 0.124023 -0.0830078 0.18457 -0.126953c19.9131 -14.3369 33.3184 -20.6611 37.8818 -20.6611 h0.800781c10.7021 0 20.3242 4.08594 29.2764 13.0381c9.39941 9.39941 17.9932 24.3838 25.209 45.2314c9.48145 26.8613 14.1152 49.5645 14.1152 67.9316v48.626z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC7-luteFrenchFretH.xml b/data/Leipzig/EBC7-luteFrenchFretH.xml
index 698a557ddca..6c89618043b 100644
--- a/data/Leipzig/EBC7-luteFrenchFretH.xml
+++ b/data/Leipzig/EBC7-luteFrenchFretH.xml
@@ -1 +1 @@
-<symbol id="EBC7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M202 57c0 27 -20 48 -47 48c-10 0 -33 -13 -67 -39l-88 -66l-3 71c-2 28 -6 43 -14 43c-10 0 -21 -4 -33 -11l-29 -18l-21 24c39 11 80 20 89 50l25 80c13 39 29 69 48 90c6 1 21 3 44 11c20 7 35 12 44 12c35 0 52 -16 52 -48c0 -24 -20 -55 -60 -92 c-35 -33 -66 -55 -93 -68v-53l11 -13c24 10 58 41 80 54c17 10 38 16 61 16c32 0 48 -31 48 -68c0 -24 -10 -49 -35 -69l-72 -57l-40 7c24 8 46 23 68 44c21 21 32 38 32 52zM136 276c0 24 -2 37 -19 37c-44 0 -67 -53 -67 -102c0 -12 1 -22 3 -30c9 8 22 17 40 27 c30 16 43 27 43 68z" /></symbol>
\ No newline at end of file
+<symbol id="EBC7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 287c-35 0 -49 -43 -49 -77c0 -6 0 -11 1 -15c11 8 37 21 47 31c7 7 11 17 11 36c0 17 0 25 -10 25zM134 110c35 17 60 55 112 55c31 0 43 -30 43 -60c0 -22 -12 -44 -30 -59l-57 -45c-1 -1 -2 -1 -3 -1h-1l-32 5c-2 0 -4 3 -4 5s1 4 3 5c23 8 77 45 77 72 c0 19 -14 33 -33 33c-5 0 -24 -9 -51 -30l-70 -53c-1 -1 -2 -1 -3 -1c-3 0 -5 2 -5 5l-2 57c-1 18 -5 28 -7 30c-7 0 -14 -3 -23 -8l-24 -15c-1 0 -1 -1 -2 -1s-3 1 -4 2l-17 19c-1 1 -1 3 -1 4c0 5 7 5 11 6c26 7 54 14 60 35l20 64c11 32 24 56 40 74c1 1 2 2 4 2 c5 1 17 2 33 8s28 10 37 10c29 0 47 -14 47 -43c0 -19 -13 -42 -37 -66c-27 -27 -63 -54 -86 -66v-37zM71 128v0z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC8-luteFrenchFretI.xml b/data/Leipzig/EBC8-luteFrenchFretI.xml
index 5a4d00aaba0..06aaa70515a 100644
--- a/data/Leipzig/EBC8-luteFrenchFretI.xml
+++ b/data/Leipzig/EBC8-luteFrenchFretI.xml
@@ -1 +1 @@
-<symbol id="EBC8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M59 256c-15 0 -26 20 -26 34c0 18 15 28 34 28h1c17 0 30 -7 30 -27c0 -16 -4 -25 -18 -31c-8 -4 -15 -4 -21 -4zM4 1c0 14 -4 37 -4 52c0 20 3 45 7 74c-4 5 -11 8 -21 8c-7 0 -32 -3 -40 -3c4 4 6 12 6 24s3 20 6 23c3 -1 8 -1 17 -1c26 0 42 5 49 15l15 36 c25 -6 42 -9 50 -9c-9 -24 -22 -51 -40 -81c-3 -6 -5 -19 -5 -38v-7c0 -19 1 -32 15 -32c19 0 49 26 55 39c0 -4 9 -17 9 -21c0 -1 -1 -3 -2 -3c-4 -7 -17 -20 -38 -40l-41 -40z" /></symbol>
\ No newline at end of file
+<symbol id="EBC8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 113c0 6 4 7 4 20c0 10 2 23 10 23c3 0 5 -1 14 -1c19 0 30 4 35 10l11 28c1 2 3 3 5 3h1c20 -5 34 -7 39 -7c3 0 5 -2 5 -5v-2c-7 -19 -19 -41 -33 -65c-2 -3 -3 -13 -3 -28v-6c0 -13 0 -21 7 -21c10 0 34 17 39 29c1 2 3 3 5 3c3 0 5 -2 5 -5c1 -4 7 -11 7 -17 c0 -3 -1 -5 -3 -6c-17 -22 -42 -44 -63 -64c-1 -1 -3 -2 -4 -2l-31 4c-2 0 -4 2 -4 5c0 11 -3 29 -3 41c0 16 2 36 5 58c-2 2 -5 3 -11 3s-26 -3 -32 -3c-3 0 -5 2 -5 5zM100 209h-3c-15 0 -27 13 -27 27c0 17 15 31 32 31h1c16 0 29 -10 29 -26c0 -20 -13 -32 -32 -32z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC9-luteFrenchFretK.xml b/data/Leipzig/EBC9-luteFrenchFretK.xml
index bbc1d480de1..216d5fdfdb8 100644
--- a/data/Leipzig/EBC9-luteFrenchFretK.xml
+++ b/data/Leipzig/EBC9-luteFrenchFretK.xml
@@ -1 +1 @@
-<symbol id="EBC9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 24c-12 -19 -21 -21 -52 -24h-3c-6 0 -16 15 -23 15c-3 0 -5 -1 -6 -5l-2 -12h-4c-7 0 -11 3 -17 3c8 8 13 39 13 95l-1 48h-5c-5 0 -25 -2 -30 -2c-1 3 -2 6 -2 9c0 10 11 11 25 11h14c0 18 -3 93 -3 110c0 22 1 37 3 46c9 25 19 47 32 67c21 36 44 54 70 56h5 c4 0 16 -4 22 -12c0 0 20 -27 20 -42c0 -19 -17 -41 -52 -66c19 -4 47 -34 47 -56c0 -25 -24 -46 -43 -49l-52 -8c0 -5 -2 -22 -2 -29s1 -11 4 -11h1c20 0 65 5 83 6v-10c-1 -5 -3 -7 -6 -7h-1c-17 -1 -40 -4 -70 -9c-5 -1 -9 -4 -9 -9v-26l1 -88c2 -2 6 -3 8 -3 c3 0 12 7 30 20v-1c0 -6 5 -15 5 -17zM77 301v-5c3 4 16 16 39 36c21 19 32 33 32 42c0 2 0 5 -3 8c-11 14 -16 20 -20 20c-2 0 -6 0 -6 -1c-28 -28 -42 -61 -42 -100zM87 225c22 0 68 9 68 30c0 7 -4 14 -12 22c-10 11 -22 18 -37 23c-4 0 -13 -6 -28 -17z" /></symbol>
\ No newline at end of file
+<symbol id="EBC9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 183c14 1 45 6 45 19s-23 27 -35 31c-1 -1 -7 -4 -16 -11zM73 247c7 7 46 38 46 50v1c0 7 -12 16 -13 17h-2c-19 -19 -29 -42 -31 -68zM161 308c0 -19 -22 -39 -37 -52c14 -8 33 -28 33 -46c0 -22 -20 -41 -39 -44l-38 -6c0 -5 -1 -15 -1 -19v-4c15 0 48 4 65 5 c3 0 5 -2 5 -5v-8c0 -5 -4 -10 -9 -10h-1c-13 -1 -31 -4 -55 -8c-2 0 -3 -1 -3 -2v-79h1c2 1 16 11 22 15c1 1 2 1 3 1c3 0 5 -2 5 -5v-1c0 -3 4 -10 4 -14s-6 -10 -8 -12c-9 -9 -19 -10 -38 -12h-3c-9 0 -13 12 -19 12c-1 -5 0 -14 -6 -14h-3c-6 0 -9 3 -14 3 c-3 0 -5 2 -5 5c0 1 1 2 2 3s3 7 5 17c2 12 4 24 4 49l-1 31c-5 0 -19 -1 -23 -1c-5 0 -7 6 -7 12c0 12 13 14 23 14h8c0 17 -2 68 -2 83c0 18 1 29 3 37v1c7 20 15 39 26 55c13 22 33 44 60 46h4c6 0 17 -5 22 -12c0 0 17 -20 17 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBCA-luteFrenchFretL.xml b/data/Leipzig/EBCA-luteFrenchFretL.xml
index 9f67006d9c4..0a7ba912be2 100644
--- a/data/Leipzig/EBCA-luteFrenchFretL.xml
+++ b/data/Leipzig/EBCA-luteFrenchFretL.xml
@@ -1 +1 @@
-<symbol id="EBCA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M63 294v-12l5 -53l25 16c29 23 42 53 52 100c0 3 1 6 1 8c0 16 -10 27 -25 28h-3c-45 0 -55 -48 -55 -87zM8 32c0 23 4 65 4 92c0 14 -1 26 -3 37l-31 -21c-17 -10 -33 -15 -49 -15c-3.05208 0 -10 -1 -10 2c0 2 9 14 9 18c0 0 0 3 -1 5c15 2 32 7 49 19 c17 11 25 18 26 18l10 84c10 79 40 149 118 152h4c42 0 63 -24 63 -73c0 -26 -11 -52 -32 -77c-13 -15 -34 -34 -62 -54c-21 -15 -32 -25 -32 -28l-10 -110c1 -4 3 -6 6 -6c5 0 14 3 26 11s20 11 23 11c0 -1 6 -9 6 -10c-13 -13 -83 -70 -92 -87h-30c5 6 8 17 8 32z" /></symbol>
\ No newline at end of file
+<symbol id="EBCA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 87c4 0 10 -9 10 -13c0 -1 0 -2 -1 -3c-16 -16 -46 -40 -62 -56c-6 -6 -10 -11 -11 -13s-2 -2 -4 -2h-24c-3 0 -5 2 -5 5c0 1 0 2 1 3c3 3 5 11 5 22c0 20 3 54 3 74c0 8 0 15 -1 21c-16 -11 -37 -25 -60 -25h-4c-4 0 -9 1 -9 6s6 12 7 15c0 2 -1 3 -1 4c0 2 3 5 5 5 c11 2 24 5 37 14c9 7 14 9 19 13l7 65c8 60 32 126 100 126h3c38 0 55 -24 55 -63c0 -49 -42 -84 -77 -109c-12 -9 -20 -13 -24 -19l-8 -87h1c6 0 33 17 38 17zM182 287c0 10 -6 17 -15 18h-2c-32 0 -39 -35 -39 -65v-9l3 -34l13 8c22 17 32 39 40 76v6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBCB-luteFrenchFretM.xml b/data/Leipzig/EBCB-luteFrenchFretM.xml
index 6919026ea25..4bd0a492e65 100644
--- a/data/Leipzig/EBCB-luteFrenchFretM.xml
+++ b/data/Leipzig/EBCB-luteFrenchFretM.xml
@@ -1 +1 @@
-<symbol id="EBCB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-136 126c8 16 23 34 46 53c14 12 35 28 62 46c26 17 44 30 54 39c6 -15 11 -40 17 -76c7 -46 13 -75 16 -86l91 83c39 36 66 65 81 87l18 -119l8 -35l193 151c6 -18 13 -53 21 -107c7 -52 11 -80 13 -83c1 -1 2 -1 4 -1c3 0 10 4 22 12c11 8 19 11 23 11s6 -3 6 -8 l-43 -39c-25 -22 -49 -39 -70 -50l-8 87c-4 35 -9 64 -14 86c-91 -68 -158 -124 -200 -165c-4 11 -7 35 -10 70c-3 34 -7 57 -11 69c-22 -11 -53 -35 -93 -71l-89 -82c-2 15 -5 47 -9 94c-4 38 -9 69 -15 93h-2c-6 0 -17 -6 -35 -18c-19 -14 -31 -25 -35 -33z" /></symbol>
\ No newline at end of file
+<symbol id="EBCB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 101.4c-2.68945 0 -4.99902 2.30762 -4.99902 4.99902c0 0.767578 0.175781 1.53516 0.526367 2.2373c4.79883 9.59961 12.3809 19.7539 22.9521 30.3252c4.49805 4.49805 9.4668 9.00879 15.0703 13.6377c11.4033 9.77344 28.3721 22.6904 50.1162 37.1875 c20.6934 13.5293 34.998 23.8975 42.5918 30.7314c0.948242 0.853516 2.14453 1.28027 3.3418 1.28027c2.06445 0 3.94531 -1.39648 4.6416 -3.1377c5.12793 -12.8213 9.08496 -33.0137 13.9004 -61.9043c4.30176 -28.2686 8.14844 -48.5273 10.7344 -60.167 l66.5352 60.6855c9.31738 8.60156 17.7656 16.6924 25.3408 24.2676c17.6738 17.6729 30.5996 32.5703 38.7139 44.4697c0.874023 1.28223 2.50098 2.18555 4.13379 2.18555c2.47266 0 4.59375 -1.94141 4.94238 -4.24609l14.3721 -95.0146l4.60547 -20.1475 l148.203 115.951c0.901367 0.705078 1.98926 1.05762 3.07715 1.05762c2.17676 0 4.11621 -1.53516 4.74219 -3.41211c5.0166 -15.0518 10.5918 -43.1777 17.0117 -86.5156c4.71484 -35.0205 8.2793 -56.5254 9.30664 -62.5527 c2.0625 0.923828 7.07324 3.71777 14.085 8.38867c8.27246 6.00586 20.6045 9.81934 21.4434 9.80664c0 -0.0185547 -0.0605469 -0.0566406 -0.188477 -0.115234c6.30469 0 9.79883 -5.62109 9.79883 -11.3984c0 -1.36719 -0.59375 -2.75488 -1.64258 -3.70605 l-34.457 -31.251c-20.2344 -17.8066 -39.7021 -31.624 -56.9785 -40.6729c-0.724609 -0.379883 -1.52344 -0.569336 -2.32129 -0.569336c-2.56055 0 -4.75195 2.08008 -4.97754 4.53809l-6.39453 69.5439c-2.73926 23.9551 -6.06738 44.3535 -9.45898 60.6475 c-69.5195 -52.2119 -120.901 -95.3037 -153.276 -126.909c-0.970703 -0.947266 -2.23145 -1.4209 -3.49219 -1.4209c-2.125 0 -4.03711 1.46777 -4.69824 3.28516c-3.62891 9.98047 -5.87012 29.1289 -8.28125 57.2715c-1.94727 22.0615 -4.46777 38.2842 -6.93066 48.292 c-16.4873 -9.4502 -39.2832 -27.3691 -67.9043 -53.1289l-71.2002 -65.5996c-0.955078 -0.879883 -2.16992 -1.31934 -3.38574 -1.31934c-2.5 0 -4.6416 1.98242 -4.95508 4.33398c-1.62988 12.2285 -4.0127 37.7002 -7.2168 75.3369 c-2.94531 27.9893 -6.57227 51.1465 -10.833 69.3877c-3.82129 -1.36914 -11.6016 -5.41406 -22.9268 -12.959c-8.69141 -6.40723 -15.457 -11.9863 -20.0371 -16.5674c-3.29395 -3.29297 -5.41406 -6.08203 -6.3584 -7.97168 c-0.657227 -1.3125 -2.0127 -2.37598 -3.50977 -2.66797l-32.7998 -6.40039c-0.317383 -0.0615234 -0.640625 -0.0927734 -0.962891 -0.0927734z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBCC-luteFrenchFretN.xml b/data/Leipzig/EBCC-luteFrenchFretN.xml
index e15e9c8261d..bf448db58c5 100644
--- a/data/Leipzig/EBCC-luteFrenchFretN.xml
+++ b/data/Leipzig/EBCC-luteFrenchFretN.xml
@@ -1 +1 @@
-<symbol id="EBCC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-108 133c11 12 32 32 64 58c32 28 54 46 64 57c4 -12 9 -33 13 -64c5 -33 10 -60 16 -81c15 16 43 41 83 73c44 36 73 61 88 75c5 -20 12 -50 18 -90c7 -44 11 -69 12 -73l27 16c11 6 18 9 22 9s6 -1 7 -3l-53 -54c-26 -27 -48 -46 -66 -56c-4 29 -8 56 -11 80 c-5 34 -10 60 -15 79c-41 -30 -94 -83 -160 -159c-15 88 -22 143 -22 167c-4 0 -11 -4 -22 -12c-12 -9 -22 -17 -30 -26z" /></symbol>
\ No newline at end of file
+<symbol id="EBCC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330.8 100.199c4.38184 0 10.5986 -2.13574 10.5986 -7.39941c0 -1.26562 -0.476562 -2.53027 -1.42969 -3.50195l-49.9658 -50.9082c-17.7256 -17.7256 -33.041 -30.5537 -46.376 -37.9619c-0.751953 -0.417969 -1.58984 -0.626953 -2.42773 -0.626953 c-2.49316 0 -4.62891 1.97168 -4.95215 4.31152c-5.25781 38.1328 -11.416 87.7646 -18.875 119.353c-15.0859 -11.6533 -32.2412 -27.1016 -51.4629 -46.3232c-20.7949 -20.7949 -44.0166 -46.0059 -69.7314 -75.6172 c-0.939453 -1.08105 -2.37207 -1.72363 -3.77832 -1.72363c-2.44336 0 -4.54297 1.89648 -4.92773 4.15332c-10.751 63.0732 -16.4033 104.861 -17.4805 127.289c-11.5273 -6.55859 -25.2822 -17.8213 -33.0518 -26.5625 c-0.945312 -1.0625 -2.35547 -1.67969 -3.74023 -1.67969c-0.19043 0 -0.381836 0.0107422 -0.571289 0.0322266l-28 3.2002c-2.39941 0.274414 -4.42773 2.4375 -4.42773 4.9668c0 1.21191 0.4375 2.42285 1.31152 3.37695 c1.95117 2.12891 4.26367 4.54004 6.94922 7.22559c9.78516 9.78516 24.5469 23.2305 44.7178 39.623c16.1895 14.1641 39.7725 33.0928 50.7188 45.1348c0.951172 1.04688 2.33789 1.63867 3.70215 1.63867c2.17676 0 4.11621 -1.53516 4.74219 -3.41211 c3.34766 -10.043 7.37793 -27.0684 10.6084 -52.0879c3.33594 -22.0088 6.6709 -40.6104 10.4209 -55.7148c13.0459 12.8945 33.3633 30.6465 60.666 52.4883c35.1465 28.7568 58.3164 48.7363 70.1533 59.7842c0.958008 0.894531 2.18359 1.3418 3.40918 1.3418 c2.31348 0 4.33203 -1.71191 4.84961 -3.78027c4.02051 -16.083 9.65723 -40.2295 14.4873 -72.4287c3.94141 -24.7734 6.75195 -42.2393 8.28125 -51.2324c8.62207 5.10938 26.0996 17.042 35.582 17.042z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE0-luteItalianFret0.xml b/data/Leipzig/EBE0-luteItalianFret0.xml
index fd66643bc6c..0f2a8b89085 100644
--- a/data/Leipzig/EBE0-luteItalianFret0.xml
+++ b/data/Leipzig/EBE0-luteItalianFret0.xml
@@ -1 +1 @@
-<symbol id="EBE0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 123c0 40 18 71 35 91c25 21 36 32 76 32s50 -10 75 -31c21 -21 34 -52 34 -92s-16 -73 -33 -92c-21 -23 -40 -31 -79 -31h-1c-37 0 -54 8 -75 31c-17 19 -32 52 -32 92zM44 122c0 -32 6 -60 17 -77c10 -16 20 -30 48 -30s43 18 53 34c11 17 15 42 15 75s-4 58 -16 75 c-13 18 -19 30 -48 30c-30 0 -46 -20 -56 -36c-11 -17 -13 -38 -13 -71z" /></symbol>
\ No newline at end of file
+<symbol id="EBE0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M46.9994 122c0 -31.6546 6.02829 -59.1559 16.5208 -75.3716c9.92803 -15.8848 18.7864 -28.6289 45.4798 -28.6289c26.1589 0 40.2571 16.2734 50.4547 32.5895c10.4579 16.1622 14.5459 40.6011 14.5459 73.4111c0 32.8236 -4.07153 57.1476 -15.4534 73.2719 c-11.5721 16.0229 -16.8963 28.7287 -45.5472 28.7287c-27.6659 0 -42.7777 -17.5063 -53.4547 -34.5895c-10.4399 -16.1343 -12.5459 -36.4399 -12.5459 -69.4111zM-2.99941 123c0 40.9423 18.417 72.5943 35.7116 92.9409c1.0816 1.27247 2.67619 2.30745 3.90212 3.34154 c22.5969 19.0608 35.6405 29.717 74.3856 29.717c40.7644 0 53.134 -11.7138 76.9274 -31.7003c0.0665658 -0.0559153 0.131266 -0.115179 0.193878 -0.177791c21.6304 -21.6304 34.8781 -53.4598 34.8781 -94.1213c0 -44.2834 -18.2069 -78.6745 -38.5026 -98.9701 c-19.863 -19.863 -39.9728 -27.0293 -76.4969 -27.0293h-1c-34.2852 0 -52.5574 7.05298 -71.8206 26.3162c-20.7184 20.7184 -38.1788 54.682 -38.1788 99.6832z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE1-luteItalianFret1.xml b/data/Leipzig/EBE1-luteItalianFret1.xml
index 8f961af4c81..fc86101061b 100644
--- a/data/Leipzig/EBE1-luteItalianFret1.xml
+++ b/data/Leipzig/EBE1-luteItalianFret1.xml
@@ -1 +1 @@
-<symbol id="EBE1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 217c0 3 6 6 19 10c9 2 17 5 25 7l11 3c14 6 24 9 29 9c6 0 22 -5 22 -14c0 -8 0 -19 -1 -35s-2 -27 -2 -35v-8l2 -111v-9c0 -8 1 -12 2 -14c2 -4 2 -5 6 -6l18 -4c11 -2 18 -3 18 -6s-8 -4 -23 -4h-6h-48h-30l-17 -1c-9 0 -13 2 -13 4c0 3 5 5 15 6l24 4c5 2 8 6 9 12 c1 4 1 9 1 15v5l-1 158v3v1c0 9 -8 14 -15 14c-4 0 -10 -1 -19 -3c-8 -2 -15 -2 -20 -2h-5c-1 0 -1 0 -1 1z" /></symbol>
\ No newline at end of file
+<symbol id="EBE1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1.30977 212.912c-1.41382 0 -3.39737 1.98033 -3.39737 3.39737c0 0.38667 0.088179 0.64011 0.088179 0.690225c0 1.82277 0.928332 3.29656 2.01872 4.38695c3.17118 3.17118 9.26313 5.45433 19.095 8.47951c4.90221 1.50837 9.80738 2.56603 14.5117 3.99732 c7.07189 2.1516 14.183 4.01193 21.3811 5.97506c14.0485 6.01065 24.0361 9.16057 29.9929 9.16057c7.26384 0 24.9994 -5.55225 24.9994 -16.9994c0 -8.75675 -0.931436 -34.5712 -1.88928 -48.4439c-0.632443 -9.15987 -1.11072 -16.1558 -1.11072 -21.5561v-7.94555 l2 -111.054v-9c0 -9.32659 1.01343 -11.2529 2.34968 -14.0172c1.28293 -2.65403 0.402619 -2.32948 3.30524 -3.05514c6.80411 -1.51202 13.4558 -3.18221 20.4211 -4.43452c7.53715 -1.35512 13.3137 -1.85919 16.4037 -4.94926 c0.848666 -0.848666 1.52025 -2.1162 1.52025 -3.54387c0 -1.33328 -0.619167 -2.5443 -1.43139 -3.35653c-3.62724 -3.62724 -11.9128 -3.64289 -24.2452 -3.64289c-0.107305 0 -0.214916 1.18442e-06 -0.322833 1.18442e-06h-83.9112 c-5.66508 -0.33324 -11.4073 -1 -17.0888 -1c-7.12644 0 -11.875 0.923094 -14.4736 3.52164c-0.833434 0.833434 -1.52585 2.0391 -1.52585 3.47777c0 1.6481 0.75802 3.12625 1.81559 4.18382c2.95421 2.95421 8.24485 4.03202 15.7844 4.79069l23.5671 3.92785 c7.62797 3.25191 7.83285 12.2838 7.83285 24.0976v4.98087l-1 158.019v4c0 6.67177 -5.94482 11.0006 -12.0006 11.0006c-3.51967 0 -9.34253 -0.926483 -18.2688 -2.91009c-8.25978 -2.06495 -15.3671 -2.08992 -20.3635 -2.08992 c-0.123871 0 -0.246444 1.5352e-05 -0.367705 1.5352e-05h-5c-0.0501153 0 -0.303556 -0.088179 -0.690225 -0.088179z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE2-luteItalianFret2.xml b/data/Leipzig/EBE2-luteItalianFret2.xml
index f4fca180b72..658537028da 100644
--- a/data/Leipzig/EBE2-luteItalianFret2.xml
+++ b/data/Leipzig/EBE2-luteItalianFret2.xml
@@ -1 +1 @@
-<symbol id="EBE2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 6c0 -5 -5 -5 -13 -5h-50c-36 0 -67 0 -91 -1h-2c-3 0 -4 1 -5 1c-1 1 -1 1 -1 2c0 3 -5 9 1 16c6 6 20 19 21 20c35 32 45 44 54 54c28 30 41 70 41 89c0 20 -13 39 -34 39h-10c-21 0 -32 -6 -51 -21c-4 -3 -5 -3 -8 -3c-4 0 -5 3 -5 6s2 7 9 14c20 20 43 29 68 29 c41 0 79 -21 79 -60c0 -13 -6 -26 -17 -41c-6 -8 -15 -25 -31 -39l-45 -46c-21 -19 -23 -20 -23 -21c-1 -3 1 -5 1 -5h22l51 1c14 0 22 1 24 2c2 3 9 13 12 13c4 0 5 -2 5 -6z" /></symbol>
\ No newline at end of file
+<symbol id="EBE2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M87 248.999c40.5608 0 81.9994 -20.5017 81.9994 -62.9994c0 -13.9743 -6.44598 -27.5914 -17.5973 -42.7978c-9.15411 -12.2055 -18.1178 -25.8684 -31.3392 -39.3836c0 0 -44.9179 -45.9161 -44.9415 -45.94 c-0.0360394 -0.0360394 -0.0727707 -0.0709694 -0.110151 -0.10479c-9.04812 -8.18639 -14.5859 -13.0465 -17.9427 -15.9925c-2.37929 -2.08807 -4.34297 -3.09081 -4.34297 -4.44546c0 -0.119359 0.0103543 -0.231754 0.0279685 -0.336602 c6.72911 0 13.4582 -0.000534409 20.1873 -0.000534409l51.0593 1.00058c12.16 0 19.8895 1.017 22.0753 1.51372c1.6937 2.48891 4.94015 7.04395 8.03143 10.1352c1.48929 1.48929 3.14134 3.35105 5.89332 3.35105c2.14714 0 4.26322 -0.473588 5.82113 -2.03151 c1.96544 -1.96544 2.17828 -4.56794 2.17828 -6.9679c0 -0.0529648 -0.00139223 -0.10593 -0.0041767 -0.158834l-1.99623 -37.9284c-0.0594922 -6.37994 -5.99201 -7.94599 -12.0034 -7.94599c-1.30178 0 -2.64246 0.0337757 -3.99559 0.0337757h-50 c-35.9978 0 -66.9789 -0.00174341 -90.8742 -0.99738c-0.0419184 -0.0017466 -0.0838665 -0.0026199 -0.125815 -0.0026199h-2c-4.82697 0 -8.99941 1.66876 -8.99941 5.99941c-0.218042 2.45942 -1.89886 4.96481 -1.89886 8.62991 c0 2.69654 0.835286 6.54975 3.77695 9.49141c5.64272 5.64272 15.3719 14.3676 21.0985 20.0942c22.7972 20.8431 37.3098 35.4762 53.8285 53.8303c27.4438 29.4041 40.1949 68.9932 40.1949 86.9542c0 18.46 -11.7323 36.0006 -31.0006 36.0006h-10 c-20.2557 0 -30.3096 -5.48741 -49.2022 -20.4027c-4.16744 -3.12558 -6.64633 -3.59734 -9.79778 -3.59734c-5.33434 0 -7.99941 4.45552 -7.99941 8.99941c0 4.43645 2.78243 9.02565 9.87809 16.1213c20.5221 20.5221 44.3554 29.8781 70.1213 29.8781z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE3-luteItalianFret3.xml b/data/Leipzig/EBE3-luteItalianFret3.xml
index 48f84b3c34d..0700c87b51a 100644
--- a/data/Leipzig/EBE3-luteItalianFret3.xml
+++ b/data/Leipzig/EBE3-luteItalianFret3.xml
@@ -1 +1 @@
-<symbol id="EBE3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 13c0 6 5 9 15 9c5 0 11 -1 19 -4c8 -4 11 -3 13 -3c7 0 20 6 29 11c7 3 8 3 14 8c23 18 31 32 31 51c0 15 -6 26 -16 34c-9 7 -19 10 -30 10c-6 0 -12 -1 -18 -2c-10 -2 -9 -2 -9 -2l-15 -4c-3 0 -7 4 -7 7s7 7 19 12l15 7c35 21 37 30 39 49c1 9 0 17 -7 22 c-8 6 -13 10 -25 10c-13 0 -18 -1 -35 -10l-7 -3c-5 -4 -11 -6 -13 -6c-1 0 -2 0 -3 1s-2 1 -2 2c0 4 5 10 14 17c14 11 31 17 51 17c15 0 36 -4 47 -10c12 -7 24 -18 24 -30c0 -16 -15 -35 -48 -55c22 -1 37 -8 46 -15c15 -12 25 -24 25 -41c0 -22 -13 -49 -43 -69 c-22 -14 -26 -15 -43 -20c-18 -5 -36 -6 -52 -6c-18 0 -28 5 -28 13z" /></symbol>
\ No newline at end of file
+<symbol id="EBE3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M145.999 206c0 -21.589 -24.2937 -41.2395 -41.8466 -52.775c24.8193 -3.16322 36.9661 -11.9435 48.8951 -23.8725c9.64163 -9.64163 15.9514 -20.4636 15.9514 -34.3525c0 -17.9611 -8.18608 -38.7166 -26.1478 -56.6783 c-5.22496 -5.22496 -11.3273 -10.2441 -18.2422 -14.8541c-22.0307 -14.0195 -26.839 -15.3679 -43.8028 -20.3572c-18.3972 -5.11034 -36.6822 -6.10978 -52.8065 -6.10978c-12.7325 0 -22.2024 2.2669 -27.3393 7.40381 c-2.32806 2.32806 -3.66007 5.31475 -3.66007 8.5956c0 9.20231 8.46001 11.9994 17.9994 11.9994c5.41559 0 11.8063 -1.09736 20.0562 -4.19109c0.0970953 -0.0364107 0.192676 -0.0780247 0.286311 -0.124842c4.81861 -2.40931 7.28149 -2.81659 8.96553 -2.81659 c1.04633 0 1.66611 0.132522 2.69192 0.132522c5.68834 0 18.6947 5.70797 27.5431 10.6238c0.984545 0.54697 2.14935 0.929429 2.97915 1.27672c4.7487 1.98742 5.56735 2.24498 10.6311 6.46474c5.05039 3.95248 9.3383 7.6879 12.9402 11.2898 c12.5409 12.5409 16.907 23.3486 16.907 37.3455c0 24.7573 -19.3288 41.0006 -43.0006 41.0006c-6.91145 0 -21.5153 -2.64287 -26.2234 -3.89837l-15 -4c-0.254078 -0.0677541 -0.515344 -0.101631 -0.776611 -0.101631c-4.94713 0 -9.99941 5.05824 -9.99941 9.99941 c0 2.04589 1.12479 3.5264 2.27716 4.67878c3.2874 3.2874 9.56905 6.33938 18.5085 10.066l14.8033 6.90821c12.7391 7.65084 20.9397 13.6464 26.212 18.9186c8.93826 8.93826 9.95934 15.8086 11.2176 27.762c0.199293 1.79363 0.308637 3.49435 0.308637 5.09867 c0 7.06562 -2.3472 11.3286 -6.75797 14.6404c-7.6682 5.75758 -11.6876 8.92794 -22.5697 8.92794c-12.7577 0 -16.663 -0.687927 -33.5959 -9.65241c-2.16841 -1.14798 -4.5954 -1.98034 -6.85683 -2.94952c-5.41469 -4.23079 -11.3695 -6.39807 -14.5472 -6.39807 c-2.48393 0 -7.99941 2.28272 -7.99941 5.99941c0 7.3303 9.46566 14.9413 15.1482 19.3611c14.5228 11.4108 32.2311 17.6383 52.8512 17.6383c15.482 0 36.7456 -3.98959 48.5111 -10.4071c10.5741 -6.16822 25.4883 -17.6291 25.4883 -32.5923z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE4-luteItalianFret4.xml b/data/Leipzig/EBE4-luteItalianFret4.xml
index bc18da4ff7a..36e893c74fd 100644
--- a/data/Leipzig/EBE4-luteItalianFret4.xml
+++ b/data/Leipzig/EBE4-luteItalianFret4.xml
@@ -1 +1 @@
-<symbol id="EBE4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M21 62h-8c-9 0 -14 3 -14 7c0 3 4 7 10 15l142 156c4 4 7 6 12 6c7 0 12 -2 12 -7c0 0 0 -7 -3 -10l-142 -142c-1 -1 -4 -5 -4 -7s4 -1 8 -1h73c0 0 1 1 2 1h17c3 1 4 3 4 6l1 70c0 8 7 12 21 12c6 0 17 -3 17 -9v-71c0 -6 0 -8 6 -8c0 0 23 -3 23 -7 c0 -10 -3 -12 -14 -12c-2 0 -4 1 -5 1c-6 0 -9 -3 -9 -9v-16c1 -13 2 -20 6 -22c2 -1 0 -3 10 -5c8 -2 12 -3 12 -5c0 -3 -1 -5 -6 -5c-23 1 -38 2 -43 2s-12 0 -21 -1h-10c-3 0 -6 -1 -8 -1h-3c-4 0 -6 0 -6 4c0 2 3 4 9 7l13 4c4 2 6 4 7 7v41z" /></symbol>
\ No newline at end of file
+<symbol id="EBE4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M118 -1.99941c-2.5413 0 -5.33271 -1 -8 -1h-3c-0.587337 0 -1.22426 -0.0306072 -1.88533 -0.0306072c-1.77718 0 -3.72884 0.221205 -5.36061 1.85297c-1.43836 1.43836 -1.75348 3.34213 -1.75348 5.17705c0 1.84945 0.977486 3.26123 2.00752 4.29127 c1.90349 1.90349 4.69859 3.41683 8.64935 5.39221c0.147975 0.0739875 0.300812 0.13498 0.456803 0.182977c5.99451 1.84447 15.7112 3.08963 17.8863 8.65803v37.4485l-106.001 -0.972359h-8c-8.26364 0 -16.9994 2.31834 -16.9994 9.99941 c0 3.99237 2.95192 6.99517 6.34409 11.2999c1.28791 1.63437 2.67705 3.78641 4.43535 5.71807l142.096 156.106c4.15577 4.15577 8.11664 6.87583 14.1238 6.87583c7.23857 0 14.9994 -2.29158 14.9994 -9.99941c0 0 0.0144199 -0.241523 0.0144199 -0.663211 c0 -1.97145 -0.315176 -7.88077 -3.89251 -11.4581l-142 -142c-0.39664 -0.39664 -1.31355 -1.84419 -2.05166 -3.06038c1.25385 0.0685571 2.4736 0.181111 3.93034 0.181111h71.8157c0.680409 0.488995 1.73622 1 3.18429 1h16.4595 c1.17974 0.498129 1.54142 0.862722 1.54142 3.04376l0.999692 69.9568c0 11.8317 11.2352 14.9994 23.9994 14.9994c6.52169 0 19.9994 -3.01195 19.9994 -11.9994v-71c0 -5.07909 -0.787003 -5.00059 3.00059 -5.00059c0 0 25.9994 -1.60847 25.9994 -9.99941 c0 -4.79378 -0.560611 -8.71897 -3.31925 -11.4776c-3.15563 -3.15563 -7.78162 -3.5218 -13.6802 -3.5218c-2.22657 0 -3.65938 0.67535 -5.08123 0.999785c-4.521 -0.0241309 -5.91936 -1.44445 -5.91936 -6.00037v-15.8836 c0.908781 -11.7416 1.84429 -18.1835 4.34313 -19.4329c1.19235 -0.596177 1.79082 -1.71349 2.55949 -2.48216c0.298658 -0.298658 1.64983 -0.996972 6.82919 -2.29181c6.23073 -1.55768 10.3519 -2.13294 12.8674 -4.64841 c0.761056 -0.761056 1.40082 -1.93407 1.40082 -3.26109c0 -1.75654 -0.254894 -3.99812 -2.00309 -5.74632c-1.73384 -1.73384 -4.16955 -2.25309 -6.99632 -2.25309c-15.532 0 -31.085 2 -43 2c-4.99257 0 -11.8328 -2.19098e-05 -20.6664 -0.981529 c-0.110824 -0.0123138 -0.222206 -0.0184707 -0.333587 -0.0184707h-10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE5-luteItalianFret5.xml b/data/Leipzig/EBE5-luteItalianFret5.xml
index bed3b256945..bb0a7f7fbd8 100644
--- a/data/Leipzig/EBE5-luteItalianFret5.xml
+++ b/data/Leipzig/EBE5-luteItalianFret5.xml
@@ -1 +1 @@
-<symbol id="EBE5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 185c0 2 2 7 6 16c6 15 9 24 10 28c2 6 4 9 6 10c3 1 6 2 11 2c2 0 16 2 43 5c16 2 31 5 43 5c4 0 6 -4 6 -8c0 -12 -4 -23 -18 -24c-4 0 -7 -1 -8 -1l-48 -4c-10 -1 -16 -1 -19 -3c-6 -3 -7 -3 -8 -10c-1 -4 1 -6 14 -8c7 -1 14 -2 20 -4c25 -7 47 -16 61 -28 c17 -15 30 -33 30 -53c0 -32 -18 -58 -47 -78c-11 -8 -30 -17 -46 -23c-18 -6 -33 -7 -46 -7c-6 0 -9 2 -9 6c0 1 6 3 20 7c18 5 28 9 28 9c20 9 31 19 41 30c11 13 17 29 17 46c0 19 -6 34 -18 45c-10 10 -22 18 -44 24c-2 1 -9 2 -20 5c-17 4 -25 8 -25 13z" /></symbol>
\ No newline at end of file
+<symbol id="EBE5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -2.99941c-6.36094 0 -11.9994 2.5276 -11.9994 8.99941c0 1.33474 0.692379 2.08462 1.05652 2.44876c2.45825 2.45825 8.47519 3.8234 21.1364 7.44087c17.1554 4.76539 26.815 8.54848 27.6332 8.87271c19.3655 8.72423 29.0341 17.2416 39.8812 29.1734 c10.5617 12.482 16.2927 27.7874 16.2927 44.0643c0 18.5045 -5.99919 32.6829 -17.1219 42.8787c-9.67657 9.67657 -21.0616 17.3343 -42.6716 23.228c-5.35366 1.46009 -12.3406 2.913 -19.949 4.9861c-12.3519 2.90877 -20.3506 5.67392 -24.506 9.82933 c-1.64511 1.64511 -2.75138 3.72772 -2.75138 6.07794c0 3.39968 2.22443 8.14522 6.23535 17.1688c6.04583 15.1182 8.61928 23.8845 9.91884 27.7832c1.87005 5.61015 3.61258 10.4664 7.89324 11.8932c2.99915 0.999717 6.54203 2.15419 11.952 2.15419 l0.21889 0.0100674c1.12415 0.0709809 4.63378 0.494013 10.2018 1.17826c8.81906 1.08376 33.2751 3.8367 46.6527 5.80584c10.4889 1.54394 20.301 3.00583 28.9266 3.00583c5.93671 0 8.99941 -5.74455 8.99941 -10.9994c0 -13.472 -6.12911 -26.9994 -20.9994 -26.9994 c-3.42812 0 -5.16391 -0.948126 -7.85859 -0.998689c-18.0179 -1.50133 -36.1178 -3.02318 -54.072 -4.55053c-8.25461 -0.702209 -9.99305 -1.28145 -12.937 -2.73504c-2.16811 -1.07051 -3.26491 -1.70594 -3.68952 -2.13055 c-0.0257041 -0.0257041 -1.70263 -3.32985 -1.70263 -6.21497c0 -0.847385 4.16448 -2.24445 11.6868 -3.40173c6.97486 -0.996409 14.1004 -1.99249 20.4548 -4.10053c25.1581 -7.04944 47.5233 -16.122 62.1012 -28.6173 c15.753 -13.8997 31.0164 -33.5846 31.0164 -55.2512c0 -24.8488 -10.5204 -46.2169 -28.1848 -63.8813c-17.4873 -17.4873 -39.7427 -29.7961 -66.7584 -39.927c-0.0345648 -0.0129618 -0.0693214 -0.0252642 -0.10425 -0.0369072 c-18.3822 -6.12741 -33.7933 -7.15419 -46.952 -7.15419z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE6-luteItalianFret6.xml b/data/Leipzig/EBE6-luteItalianFret6.xml
index d2b50c3d637..24f00e73bb0 100644
--- a/data/Leipzig/EBE6-luteItalianFret6.xml
+++ b/data/Leipzig/EBE6-luteItalianFret6.xml
@@ -1 +1 @@
-<symbol id="EBE6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M88 -0c-51 0 -88 36 -88 87c0 40 20 76 62 110c20 17 66 49 95 49c3 0 5 -2 5 -4s0 -5 -1 -6s-3 -2 -5 -3c-19 -8 -37 -20 -54 -33c-45 -34 -62 -71 -62 -117c0 -35 17 -68 49 -68c17 0 25 3 39 13c7 5 9 24 9 40c0 30 -16 51 -46 51c-5 0 -15 -3 -20 -3c-3 0 -8 4 -8 6 c0 7 30 14 39 14c41 0 74 -23 74 -63c0 -21 -3 -39 -19 -53c-15 -14 -46 -20 -69 -20z" /></symbol>
\ No newline at end of file
+<symbol id="EBE6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M102 138.999c41.5302 0 76.9994 -23.4296 76.9994 -65.9994c0 -21.5221 -3.9846 -41.2214 -19.9536 -55.1943c-16.038 -14.9688 -47.6663 -20.8051 -71.0458 -20.8051c-52.5273 0 -90.9994 37.3419 -90.9994 89.9994c0 34.2408 14.352 65.5953 43.7022 94.9454 c5.8701 5.8701 12.2824 11.6159 19.3564 17.3424c20.1563 17.1329 66.2479 49.7116 96.9409 49.7116c4.1359 0 7.99941 -2.81745 7.99941 -6.99941c0 -0.591571 0.0812094 -1.44111 0.0812094 -2.4051c0 -1.81924 -0.289223 -4.04614 -1.9593 -5.71622 c-1.61729 -1.61729 -3.8716 -2.76598 -5.95493 -3.64317c-18.6396 -7.84825 -36.4625 -19.7095 -53.3601 -32.6312c-8.00357 -6.04714 -15.0912 -12.1759 -21.331 -18.4157c-28.3796 -28.3796 -39.4758 -59.1306 -39.4758 -96.1886 c0 -21.2827 6.52843 -41.5646 18.4909 -53.5271c7.18645 -7.18645 16.2986 -11.4735 27.5097 -11.4735c16.5621 0 23.4919 2.61059 37.2583 12.4437c5.69568 4.06834 7.74226 22.2106 7.74226 37.5569c0 28.4356 -14.4777 48.0006 -43.0006 48.0006 c-4.83073 0 -14.7758 -3 -20 -3c-3.39057 0 -6.48672 2.20297 -8.55013 4.26638c-1.08747 1.08747 -2.44929 2.44066 -2.44929 4.73303c0 2.06366 1.09146 3.64045 2.26299 4.81198c7.30205 7.30205 31.2167 12.1874 39.7364 12.1874z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE7-luteItalianFret7.xml b/data/Leipzig/EBE7-luteItalianFret7.xml
index 03666a5508a..265215a6c5d 100644
--- a/data/Leipzig/EBE7-luteItalianFret7.xml
+++ b/data/Leipzig/EBE7-luteItalianFret7.xml
@@ -1 +1 @@
-<symbol id="EBE7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M13 212c-13 0 -13 2 -13 14c0 13 1 19 13 19c7 0 27 -1 33 -1c14.667 0 29.7773 -0.444336 45.333 -0.444336c7.77832 0 15.667 0.111328 23.667 0.444336l36 2c8 0 11 -1 11 -8c0 -2 -16 -39 -19 -44l-76 -181c-4 -9 -12 -13 -15 -13c-5 0 -14 3 -14 7c0 1 0 2 1 6 l79 188v1c1 2 1 6 1 8c0 0 -3 3 -5 3z" /></symbol>
\ No newline at end of file
+<symbol id="EBE7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M115.001 202c0 1.74074 0.846645 3.51149 0.968316 6.57022c-0.834553 0.620516 -1.93898 1.43051 -1.93898 1.43051l-101.03 -1.00015c-6.01323 0 -10.2837 0.131807 -13.1879 3.03602c-2.5545 2.5545 -2.83328 5.97425 -2.83328 10.2175 c0 1.18474 0.0217328 2.43368 0.0217328 3.74591c0 7.7221 0.0403777 14.101 4.20464 18.2653c2.75799 2.75799 6.73796 3.73411 11.7948 3.73411c6.53019 0 26.3529 -1 33 -1c15.0338 0 30.1291 -0.444336 45.333 -0.444336c20.4401 0 40.0413 1.35868 59.4994 2.43968 c0.0558297 0.00310165 0.11173 0.00465247 0.16763 0.00465247c4.58104 0 8.58802 -0.0652331 11.4026 -2.87986c2.06451 -2.06451 2.59677 -4.91777 2.59677 -8.11956c0 -4.12021 -15.6827 -39.1114 -19.3119 -45.3498l-75.9463 -180.87 c-2.94735 -6.63153 -10.9711 -14.7791 -17.7412 -14.7791c-5.44442 0 -16.9994 2.76915 -16.9994 9.99941c0 0.686781 -0.147067 3.87762 1.23409 7.16443l78.7659 187.443v0.392654z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE8-luteItalianFret8.xml b/data/Leipzig/EBE8-luteItalianFret8.xml
index 77a1273e97f..a1cd24ab817 100644
--- a/data/Leipzig/EBE8-luteItalianFret8.xml
+++ b/data/Leipzig/EBE8-luteItalianFret8.xml
@@ -1 +1 @@
-<symbol id="EBE8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 56c0 18 4 34 24 48c11 8 19 13 29 16c7 2 15 1 15 5c0 1 -4 4 -10 7l-18 8c-19 13 -29 26 -29 44s13 33 31 45c17 11 36 17 57 17c22 0 43 -5 56 -13c15 -9 24 -23 24 -41s-10 -32 -32 -45c-2 -1 -10 -6 -14 -7c-5 -2 -8 -3 -8 -5c0 0 3 -3 9 -6c7 -3 14 -5 15 -6 c13 -8 25 -18 29 -24c5 -8 10 -21 10 -33c0 -21 -12 -39 -31 -51c-16 -11 -42 -15 -67 -15c-23 0 -44 2 -58 11c-17 10 -32 26 -32 45zM37 57c0 -14 7 -25 17 -34s22 -12 38 -12c17 0 27 4 38 12c11 9 20 19 20 34c0 11 -1 18 -5 22c-2 2 -5 8 -9 11s-7 5 -11 8 c-6 3 -11 4 -20 6c-11 2 -12 3 -18 3c-8 0 -21 -5 -35 -16c-10 -8 -15 -18 -15 -34zM49 192c0 -12 4 -24 17 -34c16 -13 24 -15 37 -15c12 0 25 5 35 17c8 10 9 21 9 32c0 13 -6 21 -14 30c-10 8 -21 13 -36 13s-27 -5 -36 -13c-10 -8 -12 -17 -12 -30z" /></symbol>
\ No newline at end of file
+<symbol id="EBE8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M51.9994 192c0 -9.69122 2.68532 -19.0747 11.0869 -27.4763c1.40654 -1.40654 2.98092 -2.79013 4.74053 -4.14367c15.7309 -12.7813 22.6559 -14.3806 35.1731 -14.3806c11.5056 0 24.3628 5.92241 32.6933 15.919c7.35835 9.19794 8.30728 19.2245 8.30728 30.0816 c0 11.8338 -5.22379 18.9676 -13.0721 27.8145c-9.56569 7.60375 -19.7537 12.186 -33.9285 12.186c-15.9695 0 -28.2493 -6.15498 -36.977 -14.8827c-6.55323 -6.55323 -8.02354 -13.8173 -8.02354 -25.1179zM39.9994 57c0 -13.044 6.96956 -23.6359 16.0059 -31.7686 c9.2866 -8.35794 20.3489 -11.232 35.9947 -11.232c20.102 0 32.3158 6.78876 43.166 17.639c7.11857 7.11857 11.8346 14.8845 11.8346 25.3616c0 11.0133 -1.22633 16.9831 -4.12191 19.8787c-3.09935 3.09935 -5.15338 8.07694 -8.67646 10.7192 c-3.8997 2.92478 -6.86386 4.90691 -10.7806 7.8357c-6.34884 3.13056 -19.0783 5.47325 -27.8988 7.43912c-3.63566 0.810295 -4.95356 1.12784 -8.52278 1.12784c-6.80358 0 -25.4377 -7.26339 -36.719 -18.5447c-6.83543 -6.83543 -10.2816 -15.2204 -10.2816 -28.4559z M-2.99941 56c0 15.1782 2.87248 29.6765 15.6899 42.4939c2.74316 2.74316 5.87686 5.36513 9.54716 7.93434c11.0552 8.04012 19.4469 13.3091 29.9347 16.4555c3.96942 1.13412 8.15864 1.29443 11.6582 2.17142c-6.54442 4.77272 -17.0529 8.64916 -25.0507 12.2037 c-0.163226 0.072545 -0.321282 0.160375 -0.471989 0.263491c-5.86208 4.01089 -10.9342 8.05325 -15.1843 12.3034c-9.7987 9.7987 -15.1228 20.7633 -15.1228 34.1743c0 21.1795 17.3036 37.4753 32.3711 47.5202c17.4388 11.2839 37.0392 17.4792 58.6284 17.4792 c29.3287 0 54.2945 -7.63584 68.771 -22.1124c9.04274 -9.04274 14.2284 -20.9093 14.2284 -34.887c0 -12.6511 -4.74303 -23.6187 -14.4509 -33.3266c-5.02871 -5.02871 -11.3483 -9.72221 -19.0229 -14.2572c-3.89967 -2.30435 -9.85301 -6.01003 -14.586 -7.27188 c-1.50316 -0.599945 -3.50577 -1.42757 -4.53201 -1.91363c3.28208 -2.38512 10.3078 -5.32418 14.6807 -6.91143c2.9579 -1.07365 5.08104 -1.45615 6.7373 -2.91981c9.73262 -6.01391 18.835 -13.0509 24.7146 -18.9305 c8.50479 -8.50479 15.4593 -24.2883 15.4593 -40.4689c0 -16.3424 -6.90542 -30.9377 -18.3913 -42.4236c-4.11893 -4.11893 -8.72311 -7.77416 -13.9103 -11.0503c-16.898 -11.6174 -43.4327 -15.5255 -68.6978 -15.5255c-23.0825 0 -44.6362 1.86811 -59.5709 11.4423 c-15.5417 9.15472 -33.4285 25.849 -33.4285 47.5571z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE9-luteItalianFret9.xml b/data/Leipzig/EBE9-luteItalianFret9.xml
index cc3f9f3f5ff..2d0fa809190 100644
--- a/data/Leipzig/EBE9-luteItalianFret9.xml
+++ b/data/Leipzig/EBE9-luteItalianFret9.xml
@@ -1 +1 @@
-<symbol id="EBE9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 171c0 20 9 37 25 51s41 24 63 24c26 0 54 -8 70 -26c15 -16 21 -38 21 -62c0 -6 -1 -17 -4 -31c-3 -13 -7 -23 -12 -31c-16 -27 -41 -50 -73 -70c-16 -10 -37 -18 -54 -24c-8 -3 -13 -2 -15 -2c-4 0 -6 4 -6 6c0 3 5 8 15 13c4 2 9 4 15 7c30 16 51 31 68 54 c18 25 28 54 28 83c0 18 -3 28 -11 42c-11 17 -25 28 -43 28c-17 0 -30 -8 -39 -21c-7 -11 -11 -21 -11 -37c0 -13 4 -20 10 -30c9 -12 18 -19 31 -19c5 0 10 1 16 2s11 2 15 2c2 0 3 -1 3 -3c0 -4 -4 -11 -15 -14c-9 -2 -17 -3 -22 -3c-20 0 -43 3 -55 15 c-13 12 -20 29 -20 46z" /></symbol>
\ No newline at end of file
+<symbol id="EBE9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M109 132.999c3.41418 0 5.99941 -2.58047 5.99941 -5.99941c0 -8.30426 -8.90271 -15.0516 -17.3451 -16.9277c-9.17045 -2.03788 -17.2844 -3.07176 -22.6543 -3.07176c-20.1432 0 -43.9297 2.68996 -57.0335 15.7937c-13.247 12.228 -20.9659 30.288 -20.9659 48.2057 c0 21.2944 10.6894 39.8402 26.0258 53.2595c16.5799 14.5074 42.1154 24.7399 64.9736 24.7399c26.6046 0 55.6606 -8.35346 72.1897 -26.9487c15.6938 -16.74 21.8097 -39.5771 21.8097 -64.0507c0 -6.3061 -1.03631 -17.4876 -4.07715 -31.6782 c-3.05489 -13.2379 -7.12531 -23.5065 -12.3403 -31.8506c-17.7025 -29.873 -43.5079 -51.9634 -73.993 -71.0166c-16.3703 -10.2314 -37.4682 -18.2402 -54.5326 -24.263c-5.22104 -1.95789 -9.42979 -2.34294 -12.3318 -2.34294 c-1.52019 0 -2.55487 0.151846 -3.72446 0.151846c-5.08589 0 -8.99941 4.62292 -8.99941 8.99941c0 2.71308 1.63305 4.92365 3.73597 7.02657c6.08035 6.08035 18.6085 10.9996 27.8514 15.621c29.5237 15.746 49.5195 29.4864 66.9755 53.1033 c17.6711 24.5432 27.4372 52.9492 27.4372 81.2492c0 17.607 -2.75619 26.7594 -10.5653 40.4404c-8.59035 13.2529 -22.1772 26.5602 -40.4353 26.5602c-16.4256 0 -28.7492 -8.46116 -36.4676 -19.6099c-6.82344 -10.7226 -10.533 -19.9402 -10.533 -35.3906 c0 -14.8027 7.45053 -27.4278 16.2003 -36.1777c6.4778 -6.4778 13.0667 -9.82293 21.8002 -9.82293c9.45771 0 21.5864 4 31 4z" /></symbol>
\ No newline at end of file
diff --git a/fonts/Leipzig.svg b/fonts/Leipzig.svg
index d670a3b0a15..23bfc1ee94a 100644
--- a/fonts/Leipzig.svg
+++ b/fonts/Leipzig.svg
@@ -2,11 +2,11 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20201107 at Tue Nov 23 15:17:13 2021
- By Klaus Rettinghaus
+Created by FontForge 20201107 at Tue Jan 18 09:38:40 2022
+ By Laurent Pugin
 Created by Etienne Darbellay, Jean-Francois Marti, Laurent Pugin, and Klaus Rettinghaus.
 This font is licensed under the SIL Open Font License \(http://scripts.sil.org/OFL\).
-Version 5.2.64
+Version 5.2.65
 </metadata>
 <defs>
 <font id="Leipzig" horiz-adv-x="1000" >
@@ -984,38 +984,83 @@ l284 285c-35 29 -81 47 -131 47c-80 0 -135 -31 -181 -108zM111 -154c36 -34 76 -50
 d="M480 266l26 -26l-84 -84c10 -12 19 -25 27 -38c-16 -13 -9 -8 -28 -22c-8 13 -16 25 -24 35l-288 -288c35 -29 81 -47 131 -47c78 0 129 34 177 110c17 -12 4 -3 33 -22c-41 -74 -120 -124 -210 -124c-60 0 -114 22 -156 58l-84 -84l-26 26l84 84c-36 42 -58 96 -58 156
 c0 132 108 240 240 240c61 0 114 -21 156 -58zM83 -131l289 289c-36 32 -78 46 -132 46c-113 0 -204 -91 -204 -204c0 -50 18 -96 47 -131z" />
     <glyph glyph-name="uniEBE0" unicode="&#xebe0;" horiz-adv-x="220" 
-d="M-0 123c0 40 18 71 35 91c25 21 36 32 76 32s50 -10 75 -31c21 -21 34 -52 34 -92s-16 -73 -33 -92c-21 -23 -40 -31 -79 -31h-1c-37 0 -54 8 -75 31c-17 19 -32 52 -32 92zM44 122c0 -32 6 -60 17 -77c10 -16 20 -30 48 -30s43 18 53 34c11 17 15 42 15 75s-4 58 -16 75
-c-13 18 -19 30 -48 30c-30 0 -46 -20 -56 -36c-11 -17 -13 -38 -13 -71z" />
+d="M46.9994 122c0 -31.6546 6.02829 -59.1559 16.5208 -75.3716c9.92803 -15.8848 18.7864 -28.6289 45.4798 -28.6289c26.1589 0 40.2571 16.2734 50.4547 32.5895c10.4579 16.1622 14.5459 40.6011 14.5459 73.4111c0 32.8236 -4.07153 57.1476 -15.4534 73.2719
+c-11.5721 16.0229 -16.8963 28.7287 -45.5472 28.7287c-27.6659 0 -42.7777 -17.5063 -53.4547 -34.5895c-10.4399 -16.1343 -12.5459 -36.4399 -12.5459 -69.4111zM-2.99941 123c0 40.9423 18.417 72.5943 35.7116 92.9409c1.0816 1.27247 2.67619 2.30745 3.90212 3.34154
+c22.5969 19.0608 35.6405 29.717 74.3856 29.717c40.7644 0 53.134 -11.7138 76.9274 -31.7003c0.0665658 -0.0559153 0.131266 -0.115179 0.193878 -0.177791c21.6304 -21.6304 34.8781 -53.4598 34.8781 -94.1213c0 -44.2834 -18.2069 -78.6745 -38.5026 -98.9701
+c-19.863 -19.863 -39.9728 -27.0293 -76.4969 -27.0293h-1c-34.2852 0 -52.5574 7.05298 -71.8206 26.3162c-20.7184 20.7184 -38.1788 54.682 -38.1788 99.6832z" />
     <glyph glyph-name="uniEBE1" unicode="&#xebe1;" horiz-adv-x="148" 
-d="M1 217c0 3 6 6 19 10c9 2 17 5 25 7l11 3c14 6 24 9 29 9c6 0 22 -5 22 -14c0 -8 0 -19 -1 -35s-2 -27 -2 -35v-8l2 -111v-9c0 -8 1 -12 2 -14c2 -4 2 -5 6 -6l18 -4c11 -2 18 -3 18 -6s-8 -4 -23 -4h-6h-48h-30l-17 -1c-9 0 -13 2 -13 4c0 3 5 5 15 6l24 4c5 2 8 6 9 12
-c1 4 1 9 1 15v5l-1 158v3v1c0 9 -8 14 -15 14c-4 0 -10 -1 -19 -3c-8 -2 -15 -2 -20 -2h-5c-1 0 -1 0 -1 1z" />
+d="M1.30977 212.912c-1.41382 0 -3.39737 1.98033 -3.39737 3.39737c0 0.38667 0.088179 0.64011 0.088179 0.690225c0 1.82277 0.928332 3.29656 2.01872 4.38695c3.17118 3.17118 9.26313 5.45433 19.095 8.47951c4.90221 1.50837 9.80738 2.56603 14.5117 3.99732
+c7.07189 2.1516 14.183 4.01193 21.3811 5.97506c14.0485 6.01065 24.0361 9.16057 29.9929 9.16057c7.26384 0 24.9994 -5.55225 24.9994 -16.9994c0 -8.75675 -0.931436 -34.5712 -1.88928 -48.4439c-0.632443 -9.15987 -1.11072 -16.1558 -1.11072 -21.5561v-7.94555
+l2 -111.054v-9c0 -9.32659 1.01343 -11.2529 2.34968 -14.0172c1.28293 -2.65403 0.402619 -2.32948 3.30524 -3.05514c6.80411 -1.51202 13.4558 -3.18221 20.4211 -4.43452c7.53715 -1.35512 13.3137 -1.85919 16.4037 -4.94926
+c0.848666 -0.848666 1.52025 -2.1162 1.52025 -3.54387c0 -1.33328 -0.619167 -2.5443 -1.43139 -3.35653c-3.62724 -3.62724 -11.9128 -3.64289 -24.2452 -3.64289c-0.107305 0 -0.214916 1.18442e-06 -0.322833 1.18442e-06h-83.9112
+c-5.66508 -0.33324 -11.4073 -1 -17.0888 -1c-7.12644 0 -11.875 0.923094 -14.4736 3.52164c-0.833434 0.833434 -1.52585 2.0391 -1.52585 3.47777c0 1.6481 0.75802 3.12625 1.81559 4.18382c2.95421 2.95421 8.24485 4.03202 15.7844 4.79069l23.5671 3.92785
+c7.62797 3.25191 7.83285 12.2838 7.83285 24.0976v4.98087l-1 158.019v4c0 6.67177 -5.94482 11.0006 -12.0006 11.0006c-3.51967 0 -9.34253 -0.926483 -18.2688 -2.91009c-8.25978 -2.06495 -15.3671 -2.08992 -20.3635 -2.08992
+c-0.123871 0 -0.246444 1.5352e-05 -0.367705 1.5352e-05h-5c-0.0501153 0 -0.303556 -0.088179 -0.690225 -0.088179z" />
     <glyph glyph-name="uniEBE2" unicode="&#xebe2;" horiz-adv-x="166" 
-d="M163 6c0 -5 -5 -5 -13 -5h-50c-36 0 -67 0 -91 -1h-2c-3 0 -4 1 -5 1c-1 1 -1 1 -1 2c0 3 -5 9 1 16c6 6 20 19 21 20c35 32 45 44 54 54c28 30 41 70 41 89c0 20 -13 39 -34 39h-10c-21 0 -32 -6 -51 -21c-4 -3 -5 -3 -8 -3c-4 0 -5 3 -5 6s2 7 9 14c20 20 43 29 68 29
-c41 0 79 -21 79 -60c0 -13 -6 -26 -17 -41c-6 -8 -15 -25 -31 -39l-45 -46c-21 -19 -23 -20 -23 -21c-1 -3 1 -5 1 -5h22l51 1c14 0 22 1 24 2c2 3 9 13 12 13c4 0 5 -2 5 -6z" />
+d="M87 248.999c40.5608 0 81.9994 -20.5017 81.9994 -62.9994c0 -13.9743 -6.44598 -27.5914 -17.5973 -42.7978c-9.15411 -12.2055 -18.1178 -25.8684 -31.3392 -39.3836c0 0 -44.9179 -45.9161 -44.9415 -45.94
+c-0.0360394 -0.0360394 -0.0727707 -0.0709694 -0.110151 -0.10479c-9.04812 -8.18639 -14.5859 -13.0465 -17.9427 -15.9925c-2.37929 -2.08807 -4.34297 -3.09081 -4.34297 -4.44546c0 -0.119359 0.0103543 -0.231754 0.0279685 -0.336602
+c6.72911 0 13.4582 -0.000534409 20.1873 -0.000534409l51.0593 1.00058c12.16 0 19.8895 1.017 22.0753 1.51372c1.6937 2.48891 4.94015 7.04395 8.03143 10.1352c1.48929 1.48929 3.14134 3.35105 5.89332 3.35105c2.14714 0 4.26322 -0.473588 5.82113 -2.03151
+c1.96544 -1.96544 2.17828 -4.56794 2.17828 -6.9679c0 -0.0529648 -0.00139223 -0.10593 -0.0041767 -0.158834l-1.99623 -37.9284c-0.0594922 -6.37994 -5.99201 -7.94599 -12.0034 -7.94599c-1.30178 0 -2.64246 0.0337757 -3.99559 0.0337757h-50
+c-35.9978 0 -66.9789 -0.00174341 -90.8742 -0.99738c-0.0419184 -0.0017466 -0.0838665 -0.0026199 -0.125815 -0.0026199h-2c-4.82697 0 -8.99941 1.66876 -8.99941 5.99941c-0.218042 2.45942 -1.89886 4.96481 -1.89886 8.62991
+c0 2.69654 0.835286 6.54975 3.77695 9.49141c5.64272 5.64272 15.3719 14.3676 21.0985 20.0942c22.7972 20.8431 37.3098 35.4762 53.8285 53.8303c27.4438 29.4041 40.1949 68.9932 40.1949 86.9542c0 18.46 -11.7323 36.0006 -31.0006 36.0006h-10
+c-20.2557 0 -30.3096 -5.48741 -49.2022 -20.4027c-4.16744 -3.12558 -6.64633 -3.59734 -9.79778 -3.59734c-5.33434 0 -7.99941 4.45552 -7.99941 8.99941c0 4.43645 2.78243 9.02565 9.87809 16.1213c20.5221 20.5221 44.3554 29.8781 70.1213 29.8781z" />
     <glyph glyph-name="uniEBE3" unicode="&#xebe3;" horiz-adv-x="166" 
-d="M0 13c0 6 5 9 15 9c5 0 11 -1 19 -4c8 -4 11 -3 13 -3c7 0 20 6 29 11c7 3 8 3 14 8c23 18 31 32 31 51c0 15 -6 26 -16 34c-9 7 -19 10 -30 10c-6 0 -12 -1 -18 -2c-10 -2 -9 -2 -9 -2l-15 -4c-3 0 -7 4 -7 7s7 7 19 12l15 7c35 21 37 30 39 49c1 9 0 17 -7 22
-c-8 6 -13 10 -25 10c-13 0 -18 -1 -35 -10l-7 -3c-5 -4 -11 -6 -13 -6c-1 0 -2 0 -3 1s-2 1 -2 2c0 4 5 10 14 17c14 11 31 17 51 17c15 0 36 -4 47 -10c12 -7 24 -18 24 -30c0 -16 -15 -35 -48 -55c22 -1 37 -8 46 -15c15 -12 25 -24 25 -41c0 -22 -13 -49 -43 -69
-c-22 -14 -26 -15 -43 -20c-18 -5 -36 -6 -52 -6c-18 0 -28 5 -28 13z" />
+d="M145.999 206c0 -21.589 -24.2937 -41.2395 -41.8466 -52.775c24.8193 -3.16322 36.9661 -11.9435 48.8951 -23.8725c9.64163 -9.64163 15.9514 -20.4636 15.9514 -34.3525c0 -17.9611 -8.18608 -38.7166 -26.1478 -56.6783
+c-5.22496 -5.22496 -11.3273 -10.2441 -18.2422 -14.8541c-22.0307 -14.0195 -26.839 -15.3679 -43.8028 -20.3572c-18.3972 -5.11034 -36.6822 -6.10978 -52.8065 -6.10978c-12.7325 0 -22.2024 2.2669 -27.3393 7.40381
+c-2.32806 2.32806 -3.66007 5.31475 -3.66007 8.5956c0 9.20231 8.46001 11.9994 17.9994 11.9994c5.41559 0 11.8063 -1.09736 20.0562 -4.19109c0.0970953 -0.0364107 0.192676 -0.0780247 0.286311 -0.124842c4.81861 -2.40931 7.28149 -2.81659 8.96553 -2.81659
+c1.04633 0 1.66611 0.132522 2.69192 0.132522c5.68834 0 18.6947 5.70797 27.5431 10.6238c0.984545 0.54697 2.14935 0.929429 2.97915 1.27672c4.7487 1.98742 5.56735 2.24498 10.6311 6.46474c5.05039 3.95248 9.3383 7.6879 12.9402 11.2898
+c12.5409 12.5409 16.907 23.3486 16.907 37.3455c0 24.7573 -19.3288 41.0006 -43.0006 41.0006c-6.91145 0 -21.5153 -2.64287 -26.2234 -3.89837l-15 -4c-0.254078 -0.0677541 -0.515344 -0.101631 -0.776611 -0.101631c-4.94713 0 -9.99941 5.05824 -9.99941 9.99941
+c0 2.04589 1.12479 3.5264 2.27716 4.67878c3.2874 3.2874 9.56905 6.33938 18.5085 10.066l14.8033 6.90821c12.7391 7.65084 20.9397 13.6464 26.212 18.9186c8.93826 8.93826 9.95934 15.8086 11.2176 27.762c0.199293 1.79363 0.308637 3.49435 0.308637 5.09867
+c0 7.06562 -2.3472 11.3286 -6.75797 14.6404c-7.6682 5.75758 -11.6876 8.92794 -22.5697 8.92794c-12.7577 0 -16.663 -0.687927 -33.5959 -9.65241c-2.16841 -1.14798 -4.5954 -1.98034 -6.85683 -2.94952c-5.41469 -4.23079 -11.3695 -6.39807 -14.5472 -6.39807
+c-2.48393 0 -7.99941 2.28272 -7.99941 5.99941c0 7.3303 9.46566 14.9413 15.1482 19.3611c14.5228 11.4108 32.2311 17.6383 52.8512 17.6383c15.482 0 36.7456 -3.98959 48.5111 -10.4071c10.5741 -6.16822 25.4883 -17.6291 25.4883 -32.5923z" />
     <glyph glyph-name="uniEBE4" unicode="&#xebe4;" horiz-adv-x="198" 
-d="M21 62h-8c-9 0 -14 3 -14 7c0 3 4 7 10 15l142 156c4 4 7 6 12 6c7 0 12 -2 12 -7c0 0 0 -7 -3 -10l-142 -142c-1 -1 -4 -5 -4 -7s4 -1 8 -1h73c0 0 1 1 2 1h17c3 1 4 3 4 6l1 70c0 8 7 12 21 12c6 0 17 -3 17 -9v-71c0 -6 0 -8 6 -8c0 0 23 -3 23 -7
-c0 -10 -3 -12 -14 -12c-2 0 -4 1 -5 1c-6 0 -9 -3 -9 -9v-16c1 -13 2 -20 6 -22c2 -1 0 -3 10 -5c8 -2 12 -3 12 -5c0 -3 -1 -5 -6 -5c-23 1 -38 2 -43 2s-12 0 -21 -1h-10c-3 0 -6 -1 -8 -1h-3c-4 0 -6 0 -6 4c0 2 3 4 9 7l13 4c4 2 6 4 7 7v41z" />
+d="M118 -1.99941c-2.5413 0 -5.33271 -1 -8 -1h-3c-0.587337 0 -1.22426 -0.0306072 -1.88533 -0.0306072c-1.77718 0 -3.72884 0.221205 -5.36061 1.85297c-1.43836 1.43836 -1.75348 3.34213 -1.75348 5.17705c0 1.84945 0.977486 3.26123 2.00752 4.29127
+c1.90349 1.90349 4.69859 3.41683 8.64935 5.39221c0.147975 0.0739875 0.300812 0.13498 0.456803 0.182977c5.99451 1.84447 15.7112 3.08963 17.8863 8.65803v37.4485l-106.001 -0.972359h-8c-8.26364 0 -16.9994 2.31834 -16.9994 9.99941
+c0 3.99237 2.95192 6.99517 6.34409 11.2999c1.28791 1.63437 2.67705 3.78641 4.43535 5.71807l142.096 156.106c4.15577 4.15577 8.11664 6.87583 14.1238 6.87583c7.23857 0 14.9994 -2.29158 14.9994 -9.99941c0 0 0.0144199 -0.241523 0.0144199 -0.663211
+c0 -1.97145 -0.315176 -7.88077 -3.89251 -11.4581l-142 -142c-0.39664 -0.39664 -1.31355 -1.84419 -2.05166 -3.06038c1.25385 0.0685571 2.4736 0.181111 3.93034 0.181111h71.8157c0.680409 0.488995 1.73622 1 3.18429 1h16.4595
+c1.17974 0.498129 1.54142 0.862722 1.54142 3.04376l0.999692 69.9568c0 11.8317 11.2352 14.9994 23.9994 14.9994c6.52169 0 19.9994 -3.01195 19.9994 -11.9994v-71c0 -5.07909 -0.787003 -5.00059 3.00059 -5.00059c0 0 25.9994 -1.60847 25.9994 -9.99941
+c0 -4.79378 -0.560611 -8.71897 -3.31925 -11.4776c-3.15563 -3.15563 -7.78162 -3.5218 -13.6802 -3.5218c-2.22657 0 -3.65938 0.67535 -5.08123 0.999785c-4.521 -0.0241309 -5.91936 -1.44445 -5.91936 -6.00037v-15.8836
+c0.908781 -11.7416 1.84429 -18.1835 4.34313 -19.4329c1.19235 -0.596177 1.79082 -1.71349 2.55949 -2.48216c0.298658 -0.298658 1.64983 -0.996972 6.82919 -2.29181c6.23073 -1.55768 10.3519 -2.13294 12.8674 -4.64841
+c0.761056 -0.761056 1.40082 -1.93407 1.40082 -3.26109c0 -1.75654 -0.254894 -3.99812 -2.00309 -5.74632c-1.73384 -1.73384 -4.16955 -2.25309 -6.99632 -2.25309c-15.532 0 -31.085 2 -43 2c-4.99257 0 -11.8328 -2.19098e-05 -20.6664 -0.981529
+c-0.110824 -0.0123138 -0.222206 -0.0184707 -0.333587 -0.0184707h-10z" />
     <glyph glyph-name="uniEBE5" unicode="&#xebe5;" horiz-adv-x="149" 
-d="M-0 185c0 2 2 7 6 16c6 15 9 24 10 28c2 6 4 9 6 10c3 1 6 2 11 2c2 0 16 2 43 5c16 2 31 5 43 5c4 0 6 -4 6 -8c0 -12 -4 -23 -18 -24c-4 0 -7 -1 -8 -1l-48 -4c-10 -1 -16 -1 -19 -3c-6 -3 -7 -3 -8 -10c-1 -4 1 -6 14 -8c7 -1 14 -2 20 -4c25 -7 47 -16 61 -28
-c17 -15 30 -33 30 -53c0 -32 -18 -58 -47 -78c-11 -8 -30 -17 -46 -23c-18 -6 -33 -7 -46 -7c-6 0 -9 2 -9 6c0 1 6 3 20 7c18 5 28 9 28 9c20 9 31 19 41 30c11 13 17 29 17 46c0 19 -6 34 -18 45c-10 10 -22 18 -44 24c-2 1 -9 2 -20 5c-17 4 -25 8 -25 13z" />
+d="M10 -2.99941c-6.36094 0 -11.9994 2.5276 -11.9994 8.99941c0 1.33474 0.692379 2.08462 1.05652 2.44876c2.45825 2.45825 8.47519 3.8234 21.1364 7.44087c17.1554 4.76539 26.815 8.54848 27.6332 8.87271c19.3655 8.72423 29.0341 17.2416 39.8812 29.1734
+c10.5617 12.482 16.2927 27.7874 16.2927 44.0643c0 18.5045 -5.99919 32.6829 -17.1219 42.8787c-9.67657 9.67657 -21.0616 17.3343 -42.6716 23.228c-5.35366 1.46009 -12.3406 2.913 -19.949 4.9861c-12.3519 2.90877 -20.3506 5.67392 -24.506 9.82933
+c-1.64511 1.64511 -2.75138 3.72772 -2.75138 6.07794c0 3.39968 2.22443 8.14522 6.23535 17.1688c6.04583 15.1182 8.61928 23.8845 9.91884 27.7832c1.87005 5.61015 3.61258 10.4664 7.89324 11.8932c2.99915 0.999717 6.54203 2.15419 11.952 2.15419
+l0.21889 0.0100674c1.12415 0.0709809 4.63378 0.494013 10.2018 1.17826c8.81906 1.08376 33.2751 3.8367 46.6527 5.80584c10.4889 1.54394 20.301 3.00583 28.9266 3.00583c5.93671 0 8.99941 -5.74455 8.99941 -10.9994c0 -13.472 -6.12911 -26.9994 -20.9994 -26.9994
+c-3.42812 0 -5.16391 -0.948126 -7.85859 -0.998689c-18.0179 -1.50133 -36.1178 -3.02318 -54.072 -4.55053c-8.25461 -0.702209 -9.99305 -1.28145 -12.937 -2.73504c-2.16811 -1.07051 -3.26491 -1.70594 -3.68952 -2.13055
+c-0.0257041 -0.0257041 -1.70263 -3.32985 -1.70263 -6.21497c0 -0.847385 4.16448 -2.24445 11.6868 -3.40173c6.97486 -0.996409 14.1004 -1.99249 20.4548 -4.10053c25.1581 -7.04944 47.5233 -16.122 62.1012 -28.6173
+c15.753 -13.8997 31.0164 -33.5846 31.0164 -55.2512c0 -24.8488 -10.5204 -46.2169 -28.1848 -63.8813c-17.4873 -17.4873 -39.7427 -29.7961 -66.7584 -39.927c-0.0345648 -0.0129618 -0.0693214 -0.0252642 -0.10425 -0.0369072
+c-18.3822 -6.12741 -33.7933 -7.15419 -46.952 -7.15419z" />
     <glyph glyph-name="uniEBE6" unicode="&#xebe6;" horiz-adv-x="176" 
-d="M88 -0c-51 0 -88 36 -88 87c0 40 20 76 62 110c20 17 66 49 95 49c3 0 5 -2 5 -4s0 -5 -1 -6s-3 -2 -5 -3c-19 -8 -37 -20 -54 -33c-45 -34 -62 -71 -62 -117c0 -35 17 -68 49 -68c17 0 25 3 39 13c7 5 9 24 9 40c0 30 -16 51 -46 51c-5 0 -15 -3 -20 -3c-3 0 -8 4 -8 6
-c0 7 30 14 39 14c41 0 74 -23 74 -63c0 -21 -3 -39 -19 -53c-15 -14 -46 -20 -69 -20z" />
+d="M102 138.999c41.5302 0 76.9994 -23.4296 76.9994 -65.9994c0 -21.5221 -3.9846 -41.2214 -19.9536 -55.1943c-16.038 -14.9688 -47.6663 -20.8051 -71.0458 -20.8051c-52.5273 0 -90.9994 37.3419 -90.9994 89.9994c0 34.2408 14.352 65.5953 43.7022 94.9454
+c5.8701 5.8701 12.2824 11.6159 19.3564 17.3424c20.1563 17.1329 66.2479 49.7116 96.9409 49.7116c4.1359 0 7.99941 -2.81745 7.99941 -6.99941c0 -0.591571 0.0812094 -1.44111 0.0812094 -2.4051c0 -1.81924 -0.289223 -4.04614 -1.9593 -5.71622
+c-1.61729 -1.61729 -3.8716 -2.76598 -5.95493 -3.64317c-18.6396 -7.84825 -36.4625 -19.7095 -53.3601 -32.6312c-8.00357 -6.04714 -15.0912 -12.1759 -21.331 -18.4157c-28.3796 -28.3796 -39.4758 -59.1306 -39.4758 -96.1886
+c0 -21.2827 6.52843 -41.5646 18.4909 -53.5271c7.18645 -7.18645 16.2986 -11.4735 27.5097 -11.4735c16.5621 0 23.4919 2.61059 37.2583 12.4437c5.69568 4.06834 7.74226 22.2106 7.74226 37.5569c0 28.4356 -14.4777 48.0006 -43.0006 48.0006
+c-4.83073 0 -14.7758 -3 -20 -3c-3.39057 0 -6.48672 2.20297 -8.55013 4.26638c-1.08747 1.08747 -2.44929 2.44066 -2.44929 4.73303c0 2.06366 1.09146 3.64045 2.26299 4.81198c7.30205 7.30205 31.2167 12.1874 39.7364 12.1874z" />
     <glyph glyph-name="uniEBE7" unicode="&#xebe7;" horiz-adv-x="162" 
-d="M13 212c-13 0 -13 2 -13 14c0 13 1 19 13 19c7 0 27 -1 33 -1c14.667 0 29.7773 -0.444336 45.333 -0.444336c7.77832 0 15.667 0.111328 23.667 0.444336l36 2c8 0 11 -1 11 -8c0 -2 -16 -39 -19 -44l-76 -181c-4 -9 -12 -13 -15 -13c-5 0 -14 3 -14 7c0 1 0 2 1 6
-l79 188v1c1 2 1 6 1 8c0 0 -3 3 -5 3z" />
+d="M115.001 202c0 1.74074 0.846645 3.51149 0.968316 6.57022c-0.834553 0.620516 -1.93898 1.43051 -1.93898 1.43051l-101.03 -1.00015c-6.01323 0 -10.2837 0.131807 -13.1879 3.03602c-2.5545 2.5545 -2.83328 5.97425 -2.83328 10.2175
+c0 1.18474 0.0217328 2.43368 0.0217328 3.74591c0 7.7221 0.0403777 14.101 4.20464 18.2653c2.75799 2.75799 6.73796 3.73411 11.7948 3.73411c6.53019 0 26.3529 -1 33 -1c15.0338 0 30.1291 -0.444336 45.333 -0.444336c20.4401 0 40.0413 1.35868 59.4994 2.43968
+c0.0558297 0.00310165 0.11173 0.00465247 0.16763 0.00465247c4.58104 0 8.58802 -0.0652331 11.4026 -2.87986c2.06451 -2.06451 2.59677 -4.91777 2.59677 -8.11956c0 -4.12021 -15.6827 -39.1114 -19.3119 -45.3498l-75.9463 -180.87
+c-2.94735 -6.63153 -10.9711 -14.7791 -17.7412 -14.7791c-5.44442 0 -16.9994 2.76915 -16.9994 9.99941c0 0.686781 -0.147067 3.87762 1.23409 7.16443l78.7659 187.443v0.392654z" />
     <glyph glyph-name="uniEBE8" unicode="&#xebe8;" horiz-adv-x="188" 
-d="M-0 56c0 18 4 34 24 48c11 8 19 13 29 16c7 2 15 1 15 5c0 1 -4 4 -10 7l-18 8c-19 13 -29 26 -29 44s13 33 31 45c17 11 36 17 57 17c22 0 43 -5 56 -13c15 -9 24 -23 24 -41s-10 -32 -32 -45c-2 -1 -10 -6 -14 -7c-5 -2 -8 -3 -8 -5c0 0 3 -3 9 -6c7 -3 14 -5 15 -6
-c13 -8 25 -18 29 -24c5 -8 10 -21 10 -33c0 -21 -12 -39 -31 -51c-16 -11 -42 -15 -67 -15c-23 0 -44 2 -58 11c-17 10 -32 26 -32 45zM37 57c0 -14 7 -25 17 -34s22 -12 38 -12c17 0 27 4 38 12c11 9 20 19 20 34c0 11 -1 18 -5 22c-2 2 -5 8 -9 11s-7 5 -11 8
-c-6 3 -11 4 -20 6c-11 2 -12 3 -18 3c-8 0 -21 -5 -35 -16c-10 -8 -15 -18 -15 -34zM49 192c0 -12 4 -24 17 -34c16 -13 24 -15 37 -15c12 0 25 5 35 17c8 10 9 21 9 32c0 13 -6 21 -14 30c-10 8 -21 13 -36 13s-27 -5 -36 -13c-10 -8 -12 -17 -12 -30z" />
+d="M51.9994 192c0 -9.69122 2.68532 -19.0747 11.0869 -27.4763c1.40654 -1.40654 2.98092 -2.79013 4.74053 -4.14367c15.7309 -12.7813 22.6559 -14.3806 35.1731 -14.3806c11.5056 0 24.3628 5.92241 32.6933 15.919c7.35835 9.19794 8.30728 19.2245 8.30728 30.0816
+c0 11.8338 -5.22379 18.9676 -13.0721 27.8145c-9.56569 7.60375 -19.7537 12.186 -33.9285 12.186c-15.9695 0 -28.2493 -6.15498 -36.977 -14.8827c-6.55323 -6.55323 -8.02354 -13.8173 -8.02354 -25.1179zM39.9994 57c0 -13.044 6.96956 -23.6359 16.0059 -31.7686
+c9.2866 -8.35794 20.3489 -11.232 35.9947 -11.232c20.102 0 32.3158 6.78876 43.166 17.639c7.11857 7.11857 11.8346 14.8845 11.8346 25.3616c0 11.0133 -1.22633 16.9831 -4.12191 19.8787c-3.09935 3.09935 -5.15338 8.07694 -8.67646 10.7192
+c-3.8997 2.92478 -6.86386 4.90691 -10.7806 7.8357c-6.34884 3.13056 -19.0783 5.47325 -27.8988 7.43912c-3.63566 0.810295 -4.95356 1.12784 -8.52278 1.12784c-6.80358 0 -25.4377 -7.26339 -36.719 -18.5447c-6.83543 -6.83543 -10.2816 -15.2204 -10.2816 -28.4559z
+M-2.99941 56c0 15.1782 2.87248 29.6765 15.6899 42.4939c2.74316 2.74316 5.87686 5.36513 9.54716 7.93434c11.0552 8.04012 19.4469 13.3091 29.9347 16.4555c3.96942 1.13412 8.15864 1.29443 11.6582 2.17142c-6.54442 4.77272 -17.0529 8.64916 -25.0507 12.2037
+c-0.163226 0.072545 -0.321282 0.160375 -0.471989 0.263491c-5.86208 4.01089 -10.9342 8.05325 -15.1843 12.3034c-9.7987 9.7987 -15.1228 20.7633 -15.1228 34.1743c0 21.1795 17.3036 37.4753 32.3711 47.5202c17.4388 11.2839 37.0392 17.4792 58.6284 17.4792
+c29.3287 0 54.2945 -7.63584 68.771 -22.1124c9.04274 -9.04274 14.2284 -20.9093 14.2284 -34.887c0 -12.6511 -4.74303 -23.6187 -14.4509 -33.3266c-5.02871 -5.02871 -11.3483 -9.72221 -19.0229 -14.2572c-3.89967 -2.30435 -9.85301 -6.01003 -14.586 -7.27188
+c-1.50316 -0.599945 -3.50577 -1.42757 -4.53201 -1.91363c3.28208 -2.38512 10.3078 -5.32418 14.6807 -6.91143c2.9579 -1.07365 5.08104 -1.45615 6.7373 -2.91981c9.73262 -6.01391 18.835 -13.0509 24.7146 -18.9305
+c8.50479 -8.50479 15.4593 -24.2883 15.4593 -40.4689c0 -16.3424 -6.90542 -30.9377 -18.3913 -42.4236c-4.11893 -4.11893 -8.72311 -7.77416 -13.9103 -11.0503c-16.898 -11.6174 -43.4327 -15.5255 -68.6978 -15.5255c-23.0825 0 -44.6362 1.86811 -59.5709 11.4423
+c-15.5417 9.15472 -33.4285 25.849 -33.4285 47.5571z" />
     <glyph glyph-name="uniEBE9" unicode="&#xebe9;" horiz-adv-x="179" 
-d="M-0 171c0 20 9 37 25 51s41 24 63 24c26 0 54 -8 70 -26c15 -16 21 -38 21 -62c0 -6 -1 -17 -4 -31c-3 -13 -7 -23 -12 -31c-16 -27 -41 -50 -73 -70c-16 -10 -37 -18 -54 -24c-8 -3 -13 -2 -15 -2c-4 0 -6 4 -6 6c0 3 5 8 15 13c4 2 9 4 15 7c30 16 51 31 68 54
-c18 25 28 54 28 83c0 18 -3 28 -11 42c-11 17 -25 28 -43 28c-17 0 -30 -8 -39 -21c-7 -11 -11 -21 -11 -37c0 -13 4 -20 10 -30c9 -12 18 -19 31 -19c5 0 10 1 16 2s11 2 15 2c2 0 3 -1 3 -3c0 -4 -4 -11 -15 -14c-9 -2 -17 -3 -22 -3c-20 0 -43 3 -55 15
-c-13 12 -20 29 -20 46z" />
+d="M109 132.999c3.41418 0 5.99941 -2.58047 5.99941 -5.99941c0 -8.30426 -8.90271 -15.0516 -17.3451 -16.9277c-9.17045 -2.03788 -17.2844 -3.07176 -22.6543 -3.07176c-20.1432 0 -43.9297 2.68996 -57.0335 15.7937c-13.247 12.228 -20.9659 30.288 -20.9659 48.2057
+c0 21.2944 10.6894 39.8402 26.0258 53.2595c16.5799 14.5074 42.1154 24.7399 64.9736 24.7399c26.6046 0 55.6606 -8.35346 72.1897 -26.9487c15.6938 -16.74 21.8097 -39.5771 21.8097 -64.0507c0 -6.3061 -1.03631 -17.4876 -4.07715 -31.6782
+c-3.05489 -13.2379 -7.12531 -23.5065 -12.3403 -31.8506c-17.7025 -29.873 -43.5079 -51.9634 -73.993 -71.0166c-16.3703 -10.2314 -37.4682 -18.2402 -54.5326 -24.263c-5.22104 -1.95789 -9.42979 -2.34294 -12.3318 -2.34294
+c-1.52019 0 -2.55487 0.151846 -3.72446 0.151846c-5.08589 0 -8.99941 4.62292 -8.99941 8.99941c0 2.71308 1.63305 4.92365 3.73597 7.02657c6.08035 6.08035 18.6085 10.9996 27.8514 15.621c29.5237 15.746 49.5195 29.4864 66.9755 53.1033
+c17.6711 24.5432 27.4372 52.9492 27.4372 81.2492c0 17.607 -2.75619 26.7594 -10.5653 40.4404c-8.59035 13.2529 -22.1772 26.5602 -40.4353 26.5602c-16.4256 0 -28.7492 -8.46116 -36.4676 -19.6099c-6.82344 -10.7226 -10.533 -19.9402 -10.533 -35.3906
+c0 -14.8027 7.45053 -27.4278 16.2003 -36.1777c6.4778 -6.4778 13.0667 -9.82293 21.8002 -9.82293c9.45771 0 21.5864 4 31 4z" />
     <glyph glyph-name="uniEBA7" unicode="&#xeba7;" horiz-adv-x="92" 
 d="M-82 613c12 4 35 8 70 14c38 6 61 10 67 12c7 2 12 2 14 2c7 0 11 -3 13 -9s3 -17 3 -33c0 -23 0 -42 -1 -58c-1 -11 -2 -78 -4 -201c-1 -85 -2 -146 -2 -185c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -15 347 -19 575c0 1 0 6 -1 16c0 4 -2 5 -5 5
 c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10c-2 24 -2 37 -2 38z" />
@@ -1070,48 +1115,92 @@ c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168
 c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 -111c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200
 c0 25 -4 42 -8 53zM248 -677c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM40 -753c20 3 36 6 47 9c128 36 169 90 169 177c0 24 -3 50 -8 79c-23 -44 -61 -90 -94 -121
 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88z" />
-    <glyph glyph-name="uniEBC0" unicode="&#xebc0;" horiz-adv-x="335" 
-d="M21 6c-13 10 -17 17 -18 20c-3 8 -3 17 -3 26v21c0 21 7 39 11 45c20 33 37 43 79 66c44 24 85 37 120 37c2 0 14 -2 21 -2c11 0 63 12 64 12v-5c0 -24 -6 -77 -6 -102c0 -57 16 -101 46 -134h-74c-4 10 -8 28 -11 56c-3 25 -7 43 -12 52c-21 -23 -40 -42 -58 -58
-c-40 -34 -60 -39 -119 -39h-10c-14 0 -20 0 -30 5zM67 48c3 -4 10 -5 20 -5c28 0 78 14 102 35c29 26 43 48 43 67v9c0 10 0 17 -4 22c-3 4 -9 15 -16 16c-5 1 -11 1 -16 1c-16 0 -30 -4 -34 -5c-13 -3 -30 -11 -56 -30c-32 -23 -62 -48 -62 -74c0 -12 7 -24 23 -36z" />
-    <glyph glyph-name="uniEBC1" unicode="&#xebc1;" horiz-adv-x="235" 
-d="M69 199c102 0 167 -15 167 -105c0 -30 -14 -53 -43 -73c-24 -16 -46 -25 -68 -25h-2l-124 5c1 32 2 50 2 53c0 129 -12 236 -37 321h83c2 -4 4 -14 4 -29v-9c0 -29 -1 -64 -1 -90v-44v-4h19zM51 158v-133h62h1c18 0 33 8 45 23c13 14 19 32 19 54c0 23 -6 42 -20 57
-c-14 14 -32 22 -53 22c-23 0 -42 -8 -54 -23z" />
-    <glyph glyph-name="uniEBC2" unicode="&#xebc2;" horiz-adv-x="224" 
-d="M85 239c-13 0 -23 -17 -23 -30c0 -5 1 -9 2 -13l9 -66c5 -34 12 -60 21 -79c9 4 27 12 54 25c12 5 19 8 21 8c1 0 2 0 2 -1c0 -2 -1 -4 -2 -5l-38 -26c-19 -13 -48 -31 -88 -52l-25 101c-8 35 -14 67 -18 97h-1c-4 0 -13 -2 -28 -8c-21 -8 -35 -12 -43 -12
-c-4 0 -7 1 -7 3c0 1 1 3 3 5c31 18 117 76 150 93l66 -11c47 -9 73 -16 81 -20c1 0 2 -1 2 -3c0 -3 -6 -20 -6 -24c-19 0 -110 14 -130 18h-2z" />
-    <glyph glyph-name="uniEBC3" unicode="&#xebc3;" horiz-adv-x="258" 
-d="M121 -0h-2c-27 0 -40 9 -56 17c-12 6 -39 26 -52 47c-6 9 -11 29 -11 42c0 47 7 90 21 129c-24 8 -59 17 -107 27c-58 11 -105 17 -141 17c-7 0 -12 -1 -16 -1c-3 0 -4 1 -4 2l4 10c6 20 9 47 10 70c1 7 2 10 3 10c9 -3 14 -6 24 -8l125 -40c93 -29 170 -51 228 -66
-c44 -11 75 -33 94 -65c11 -19 16 -38 16 -59c0 -88 -66 -129 -136 -132zM54 227c-8 -17 -17 -57 -17 -88v-9c2 -28 18 -51 44 -70c20 -15 33 -16 53 -16c29 0 50 13 68 40c4 17 6 32 6 45c0 28 -9 48 -28 62c-12 9 -36 23 -72 32c-16 3 -28 4 -44 4h-3h-7z" />
-    <glyph glyph-name="uniEBC4" unicode="&#xebc4;" horiz-adv-x="221" 
-d="M63 116c0 -32 23 -55 55 -55c12 0 29 7 49 21l53 40l-17 -43c-4 -1 -11 -7 -22 -20c-27 -32 -56 -54 -105 -59h-3c-12 0 -28 9 -45 26c-20 20 -28 35 -28 56c0 22 6 51 19 86c14 39 28 61 42 65c-1 4 -1 8 -1 12c0 35 33 83 62 88c1 -1 3 -10 7 -25
-c-15 -9 -22 -19 -22 -31c0 -5 4 -15 12 -31c7 -12 5 -13 30 -13c21 0 44 13 70 39c1 -6 3 -14 3 -19c0 -11 -7 -20 -20 -27c-14 -20 -52 -47 -80 -47c-11 0 -21 3 -29 10c-19 0 -30 -53 -30 -73z" />
-    <glyph glyph-name="uniEBC5" unicode="&#xebc5;" horiz-adv-x="253" 
-d="M0 94v19h16c10 0 37 3 37 3c3 0 32 27 38 32c-5 38 -8 67 -8 86c0 80 35 120 104 120c45 0 67 -19 67 -64v-10c0 -60 -28 -83 -74 -106c-18 -9 -28 -18 -29 -23c0 -4 -1 -14 -2 -29c23 1 42 1 55 1c16 0 25 -1 29 -2v-18v-7c-5 0 -13 1 -23 1c-17 0 -52 -2 -52 -3
-c-4 -23 -12 -166 -15 -190c-8 0 -21 -1 -32 -1c0 6 1 14 1 23c0 28 -2 61 -9 100l-11 58c-30 3 -57 4 -81 4h-10c0 0 -1 2 -1 6zM178 314c-25 -4 -41 -41 -41 -70c0 -7 1 -18 6 -33c4 -13 6 -22 6 -29c41 33 63 59 65 80v7c0 26 -12 41 -36 45z" />
-    <glyph glyph-name="uniEBC6" unicode="&#xebc6;" horiz-adv-x="300" 
-d="M42 81c0 -27 6 -33 28 -33c34 0 85 30 111 50c1 0 1 3 1 8c0 4 0 11 -1 21c-23 5 -45 7 -66 7c-26 0 -45 -4 -59 -12c-10 -6 -14 -19 -14 -41zM1 59c0 57 52 108 110 108c28 0 51 -4 71 -13c2 6 3 19 3 38h51l1 -27c0 -12 2 -18 3 -18s2 0 3 1c8 8 25 14 51 18
-c2 -8 4 -16 4 -25c-15 -1 -32 -8 -51 -20c-1 -12 -1 -37 -1 -77c-1 -62 -8 -118 -34 -151c-20 -26 -38 -45 -53 -56l-30 -20c-12 -6 -35 -12 -50 -12c-18 0 -53 21 -105 62c-6 4 -16 6 -28 6h-16c-7 -1 -12 -1 -16 -1c-1 -2 -5 11 -5 12c0 6 37 6 78 7c9 0 26 -9 52 -26
-c25 -18 42 -27 51 -27h1c31 0 56 25 74 77c12 34 18 63 18 87v74c-23 -19 -42 -34 -59 -45c-31 -21 -52 -31 -64 -31c-25 0 -59 34 -59 59z" />
-    <glyph glyph-name="uniEBC7" unicode="&#xebc7;" horiz-adv-x="249" 
-d="M202 57c0 27 -20 48 -47 48c-10 0 -33 -13 -67 -39l-88 -66l-3 71c-2 28 -6 43 -14 43c-10 0 -21 -4 -33 -11l-29 -18l-21 24c39 11 80 20 89 50l25 80c13 39 29 69 48 90c6 1 21 3 44 11c20 7 35 12 44 12c35 0 52 -16 52 -48c0 -24 -20 -55 -60 -92
-c-35 -33 -66 -55 -93 -68v-53l11 -13c24 10 58 41 80 54c17 10 38 16 61 16c32 0 48 -31 48 -68c0 -24 -10 -49 -35 -69l-72 -57l-40 7c24 8 46 23 68 44c21 21 32 38 32 52zM136 276c0 24 -2 37 -19 37c-44 0 -67 -53 -67 -102c0 -12 1 -22 3 -30c9 8 22 17 40 27
-c30 16 43 27 43 68z" />
-    <glyph glyph-name="uniEBC8" unicode="&#xebc8;" horiz-adv-x="124" 
-d="M59 256c-15 0 -26 20 -26 34c0 18 15 28 34 28h1c17 0 30 -7 30 -27c0 -16 -4 -25 -18 -31c-8 -4 -15 -4 -21 -4zM4 1c0 14 -4 37 -4 52c0 20 3 45 7 74c-4 5 -11 8 -21 8c-7 0 -32 -3 -40 -3c4 4 6 12 6 24s3 20 6 23c3 -1 8 -1 17 -1c26 0 42 5 49 15l15 36
-c25 -6 42 -9 50 -9c-9 -24 -22 -51 -40 -81c-3 -6 -5 -19 -5 -38v-7c0 -19 1 -32 15 -32c19 0 49 26 55 39c0 -4 9 -17 9 -21c0 -1 -1 -3 -2 -3c-4 -7 -17 -20 -38 -40l-41 -40z" />
-    <glyph glyph-name="uniEBC9" unicode="&#xebc9;" horiz-adv-x="187" 
-d="M131 24c-12 -19 -21 -21 -52 -24h-3c-6 0 -16 15 -23 15c-3 0 -5 -1 -6 -5l-2 -12h-4c-7 0 -11 3 -17 3c8 8 13 39 13 95l-1 48h-5c-5 0 -25 -2 -30 -2c-1 3 -2 6 -2 9c0 10 11 11 25 11h14c0 18 -3 93 -3 110c0 22 1 37 3 46c9 25 19 47 32 67c21 36 44 54 70 56h5
-c4 0 16 -4 22 -12c0 0 20 -27 20 -42c0 -19 -17 -41 -52 -66c19 -4 47 -34 47 -56c0 -25 -24 -46 -43 -49l-52 -8c0 -5 -2 -22 -2 -29s1 -11 4 -11h1c20 0 65 5 83 6v-10c-1 -5 -3 -7 -6 -7h-1c-17 -1 -40 -4 -70 -9c-5 -1 -9 -4 -9 -9v-26l1 -88c2 -2 6 -3 8 -3
-c3 0 12 7 30 20v-1c0 -6 5 -15 5 -17zM77 301v-5c3 4 16 16 39 36c21 19 32 33 32 42c0 2 0 5 -3 8c-11 14 -16 20 -20 20c-2 0 -6 0 -6 -1c-28 -28 -42 -61 -42 -100zM87 225c22 0 68 9 68 30c0 7 -4 14 -12 22c-10 11 -22 18 -37 23c-4 0 -13 -6 -28 -17z" />
-    <glyph glyph-name="uniEBCA" unicode="&#xebca;" horiz-adv-x="196" 
-d="M63 294v-12l5 -53l25 16c29 23 42 53 52 100c0 3 1 6 1 8c0 16 -10 27 -25 28h-3c-45 0 -55 -48 -55 -87zM8 32c0 23 4 65 4 92c0 14 -1 26 -3 37l-31 -21c-17 -10 -33 -15 -49 -15c-3.05208 0 -10 -1 -10 2c0 2 9 14 9 18c0 0 0 3 -1 5c15 2 32 7 49 19
-c17 11 25 18 26 18l10 84c10 79 40 149 118 152h4c42 0 63 -24 63 -73c0 -26 -11 -52 -32 -77c-13 -15 -34 -34 -62 -54c-21 -15 -32 -25 -32 -28l-10 -110c1 -4 3 -6 6 -6c5 0 14 3 26 11s20 11 23 11c0 -1 6 -9 6 -10c-13 -13 -83 -70 -92 -87h-30c5 6 8 17 8 32z" />
-    <glyph glyph-name="uniEBCB" unicode="&#xebcb;" horiz-adv-x="540" 
-d="M-136 126c8 16 23 34 46 53c14 12 35 28 62 46c26 17 44 30 54 39c6 -15 11 -40 17 -76c7 -46 13 -75 16 -86l91 83c39 36 66 65 81 87l18 -119l8 -35l193 151c6 -18 13 -53 21 -107c7 -52 11 -80 13 -83c1 -1 2 -1 4 -1c3 0 10 4 22 12c11 8 19 11 23 11s6 -3 6 -8
-l-43 -39c-25 -22 -49 -39 -70 -50l-8 87c-4 35 -9 64 -14 86c-91 -68 -158 -124 -200 -165c-4 11 -7 35 -10 70c-3 34 -7 57 -11 69c-22 -11 -53 -35 -93 -71l-89 -82c-2 15 -5 47 -9 94c-4 38 -9 69 -15 93h-2c-6 0 -17 -6 -35 -18c-19 -14 -31 -25 -35 -33z" />
-    <glyph glyph-name="uniEBCC" unicode="&#xebcc;" horiz-adv-x="308" 
-d="M-108 133c11 12 32 32 64 58c32 28 54 46 64 57c4 -12 9 -33 13 -64c5 -33 10 -60 16 -81c15 16 43 41 83 73c44 36 73 61 88 75c5 -20 12 -50 18 -90c7 -44 11 -69 12 -73l27 16c11 6 18 9 22 9s6 -1 7 -3l-53 -54c-26 -27 -48 -46 -66 -56c-4 29 -8 56 -11 80
-c-5 34 -10 60 -15 79c-41 -30 -94 -83 -160 -159c-15 88 -22 143 -22 167c-4 0 -11 -4 -22 -12c-12 -9 -22 -17 -30 -26z" />
+    <glyph glyph-name="uniEBC0" unicode="&#xebc0;" horiz-adv-x="280" 
+d="M186.601 129c0 1.65039 0.0234375 3.26562 0.0234375 4.90039c0 8.15625 -0.584961 14.7139 -2.22754 16.9033c-4.77539 6.36719 -10.8975 11.5977 -21.5967 11.5977c-12.377 0 -17.1211 -1.43555 -25.8789 -3.82324
+c-9.25488 -2.52441 -24.0615 -10.2568 -43.3174 -23.3184c-10.2236 -6.93555 -20.9873 -15.1816 -29.626 -23.8213c-10.8789 -10.8789 -17.7783 -22.0332 -17.7783 -31.2383v-1.12012c0 -7.49512 0.143555 -12.0684 6.31738 -18.2422
+c4.60645 -4.60645 11.3818 -8.43848 23.083 -8.43848c22.1777 0 47.5176 0.592773 78.3662 26.8135c3.80664 3.23633 7.25488 6.40918 10.3535 9.50781c15.8418 15.8418 22.2812 29.5859 22.2812 40.2793zM278.999 5c0 -2.68945 -2.30762 -4.99902 -4.99902 -4.99902
+h-59.2002c-2.06445 0 -3.94434 1.39648 -4.6416 3.1377c-3.51562 8.78906 -6.69336 23.4072 -9.12109 46.0615c-1.71484 14.2891 -3.94043 25.6143 -6.28516 33.0283c-13.4121 -14.4375 -27.4883 -28.5713 -41.5176 -41.041
+c-32.7334 -27.8242 -58.5205 -35.3867 -98.4346 -35.3867c-11.2695 0 -22.5957 1.40918 -34.7012 9.19141c-12.1035 7.78027 -20.6973 26.9805 -20.6973 39.6074c0 36.9863 12.1719 53.3662 16.126 58.9023c1.67383 2.34277 5.18652 6.34961 10.5225 11.6855
+c10.6113 10.6113 28.1133 25.9609 49.4111 38.5215c14.291 8.42676 68.5244 31.0898 98.5391 31.0898c4.73828 0 12.2168 -1.59961 16.7998 -1.59961c5.25977 0 32.0234 5.59668 43.9258 8.17871c4.03418 0.875 5.07129 1.4209 7.27441 1.4209
+c2.68945 0 4.99902 -2.30762 4.99902 -4.99902v-4c0 -19.7256 -4.7998 -62.0996 -4.7998 -81.5996c0 -44.6494 12.4473 -78.4775 35.5029 -103.84c0.864258 -0.950195 1.29688 -2.15527 1.29688 -3.36035z" />
+    <glyph glyph-name="uniEBC1" unicode="&#xebc1;" horiz-adv-x="227" 
+d="M116.8 148.001c-16.5664 0 -29.7793 -5.56348 -38.2012 -15.2148v-99.5869h45.4014c13.2275 0 24.3896 6.89258 32.0918 16.5195c0.0771484 0.0966797 0.157227 0.189453 0.242188 0.28125c9.40723 10.1299 13.8672 23.1201 13.8672 39.7998
+c0 17.4912 -4.46094 31.2305 -14.5986 42.127c-10.3203 10.291 -23.3682 16.0742 -38.8027 16.0742zM78.5986 277.8c0 -22.3086 -0.799805 -50.1299 -0.799805 -72v-33.4004h10.2012c80.1406 0 138.599 -11.4727 138.599 -88.999
+c0 -19.3984 -7.02637 -35.7627 -20.9609 -49.6973c-4.50879 -4.50879 -9.77441 -8.80273 -15.667 -12.8662c-19.6074 -13.0713 -38.1455 -20.8359 -57.1709 -20.8359l-1.59961 -0.00390625l-99.4033 4.00781c-2.58398 0.104492 -4.7959 2.35547 -4.7959 4.99512
+c0 20.749 1.59961 29.7715 1.59961 42.4004c0 102.892 -9.59277 188.052 -29.3955 255.383c-0.135742 0.461914 -0.204102 0.939453 -0.204102 1.41699c0 2.68945 2.30762 4.99902 4.99902 4.99902h66.4004c1.90234 0 3.69531 -1.20605 4.47266 -2.76172
+c2.30566 -4.61328 3.72559 -12.9824 3.72559 -25.4375v-7.2002z" />
+    <glyph glyph-name="uniEBC2" unicode="&#xebc2;" horiz-adv-x="253" 
+d="M247.398 182.6c0 -2.68945 -2.30762 -4.99902 -4.99902 -4.99902c-16.2461 0 -87.0928 10.9814 -104.494 14.4004h-1.10547c-7.91016 0 -13.4014 -12.207 -13.4014 -19.001c0 -3.55762 1.0791 -6.23242 1.55469 -9.7207l7.19238 -52.7471
+c3.56738 -24.2559 8.41895 -43.1943 14.3818 -57.332c8.00391 3.57812 20.8232 9.39355 38.502 17.9043c7.04102 3.38965 15.4229 6.89453 18.9707 6.89453c0.0458984 0 0.400391 0.102539 0.955078 0.102539c2.45801 0 5.64355 -2.90918 5.64355 -5.90137
+c0 -3.4209 -1.50977 -6.57715 -3.77832 -8.12988c-35.6797 -24.4131 -51.3916 -36.499 -101.295 -62.6982c-0.725586 -0.380859 -1.52539 -0.571289 -2.3252 -0.571289c-2.31738 0 -4.33887 1.7168 -4.85156 3.79199c-11.9365 48.2246 -26.6865 103.349 -33.8379 154.088
+c-3.50293 -0.753906 -9.28125 -2.41406 -17.126 -5.55176c-16.9746 -6.46777 -28.3154 -9.92773 -36.1846 -9.92773c-4.24023 0 -10.5996 1.62012 -10.5996 7.39844c0 3.43652 2.27734 6.80859 4.88965 8.3252c28.9277 16.7979 95.0635 61.5615 120.219 74.5205
+c0.716797 0.369141 1.50391 0.553711 2.29102 0.553711c0.276367 0 0.553711 -0.0224609 0.827148 -0.0683594l52.9189 -8.81934c36.7783 -7.04297 57.2969 -12.3232 65.4209 -16.1152c3.10742 -0.816406 5.03223 -4.00781 5.03223 -7.19629
+c0 -3.69629 -4.80078 -16.9365 -4.80078 -19.2002z" />
+    <glyph glyph-name="uniEBC3" unicode="&#xebc3;" horiz-adv-x="413" 
+d="M254 182.001h-4.71582c-5.61426 -14.0156 -11.8857 -43.1748 -11.8857 -65.4004v-7.0166c1.15918 -15.5898 8.14746 -29.0996 20.2012 -41.1533c13.9413 -13.9448 31.1242 -22.8311 52.4004 -22.8311c16.0332 0 28.2695 5.13965 39.2207 16.0908
+c10.5567 10.5567 17.3799 29.7745 17.3799 46.125v0.785156c0 21.1797 -9.44922 35.7607 -22.7627 45.5713c-9.0459 6.78418 -27.6777 17.7129 -55.7119 24.7432c-12.4785 2.33203 -33.001 2.98438 -34.126 3.08594zM8.39941 222.802
+c-3.73926 0 -8.19824 2.13965 -8.19824 6.59863c0 0.632812 0.119141 1.26465 0.357422 1.86035l3.11621 7.79199c4.54785 15.2793 6.94629 36.5205 7.73047 54.5664c0.243164 5.59375 1.30762 12.7803 7.39453 12.7803c3.08008 0 6.40234 -1.99512 8.47168 -2.81055
+c3.83496 -1.51172 6.90625 -2.72559 11.7148 -3.6875c0.183594 -0.0361328 0.364258 -0.0830078 0.542969 -0.140625l99.9648 -31.9893c74.3359 -23.1787 136.768 -37.5835 182.124 -52.7217c35.8223 -11.9561 67.9062 -36.7168 78.3105 -54.3457
+c9.33311 -15.8139 13.4697 -32.0791 13.4697 -49.7041c0 -68.3848 -41.0693 -107.897 -103.982 -110.594c-0.0722656 -0.00292969 -0.143555 -0.00488281 -0.21582 -0.00488281h-1.60059c-29.5791 0 -43.1963 7.40625 -56.6367 14.126
+c-7.2373 3.61914 -19.4033 12.165 -30.1455 22.9082c-5.07617 5.0752 -9.80566 10.6309 -13.4287 16.4658c-5.7002 8.6084 -9.58789 24.8477 -9.58789 36.2988c0 36.1631 5.11523 69.5273 15.3975 100.021c-18.6914 5.91211 -44.9824 12.5449 -80.1357 19.8682
+c-46.2373 8.77051 -83.6094 13.5127 -111.862 13.5127c-4.87598 0 -8.3125 -0.799805 -12.8008 -0.799805z" />
+    <glyph glyph-name="uniEBC4" unicode="&#xebc4;" horiz-adv-x="187" 
+d="M181 107.599c2.68945 0 4.99902 -2.30762 4.99902 -4.99902c0 -0.625977 -0.117188 -1.25195 -0.350586 -1.84277l-13.5996 -34.3994c-0.62793 -1.58984 -1.95996 -2.49805 -3.55566 -3.0498c-3.86328 -1.50488 -10.8779 -9.6123 -14.8682 -14.3281
+c-21.0625 -24.9639 -58.8965 -48.9785 -87.8252 -48.9785h-2.39941c-12.5586 0 -30.9932 13.084 -39.6611 22.3936c-11.3145 12.1523 -23.7383 29.1719 -23.7383 48.2051c0 18.4951 4.95801 42.1279 15.4941 70.4951c8.16797 22.751 16.2881 38.71 25.3633 47.7861
+c2.32812 2.32715 4.76562 4.23633 7.35742 5.61426c-0.202148 2.03711 -0.214844 3.96289 -0.214844 5.75v0.754883c0 20.5254 12.3271 44.5625 27.7812 60.0166c7.8125 7.8125 16.6553 13.7051 25.9629 15.3096c0.282227 0.0488281 0.568359 0.0732422 0.854492 0.0732422
+c3.86816 0 5.19531 -4.1084 5.79492 -6.12598c1.46484 -4.92773 3.03418 -11.5742 4.63574 -17.5791c0.112305 -0.422852 0.168945 -0.858398 0.168945 -1.29395c0 -1.74902 -1.0332 -3.45215 -2.42773 -4.28906c-7.44922 -4.46973 -15.1729 -11.1357 -15.1729 -20.5117
+c0 -1.03125 4.41602 -14.2207 10.3604 -24.8066c1.25879 -2.24316 2.05176 -3.46191 2.47266 -3.88281c0.609375 -0.609375 2.62402 -1.51074 15.7686 -1.51074c14.6572 0 32.0156 9.28711 52.4648 29.7354c0.975586 0.975586 2.25488 1.46387 3.53516 1.46387
+c4.69922 0 4.96875 -4.57715 5.77734 -8.68262c0.749023 -3.80273 1.62109 -7.86035 1.62109 -11.5156c0 -11.9629 -8.74609 -20.4453 -17.5957 -25.4346c-13.3037 -18.1318 -43.1738 -38.7646 -67.4033 -38.7646c-8.9082 0 -17.4824 2.27246 -24.6016 7.69238
+c-0.711914 -0.301758 -1.54785 -0.862305 -2.52148 -1.83496c-8.55762 -8.55762 -15.0771 -38.9395 -15.0771 -51.2588c0 -22.9434 16.0596 -39.001 39.001 -39.001c7.76465 0 20.6719 4.94922 36.2627 15.8496l42.3291 31.9453
+c0.886719 0.669922 1.94727 1.00488 3.00781 1.00488z" />
+    <glyph glyph-name="uniEBC5" unicode="&#xebc5;" horiz-adv-x="212" 
+d="M128 225c15 13 41 40 43 55v5c0 19 -8 28 -24 31c-18 -5 -28 -31 -28 -51c0 -6 7 -31 9 -40zM168 173c14 0 28 0 28 -6v-20c0 -3 -2 -5 -5 -5h-18c-10 0 -30 0 -38 -1c-3 -19 -9 -115 -11 -136c0 -2 -2 -4 -5 -4c-8 0 -18 -1 -26 -1c-3 0 -5 2 -5 5c0 6 1 13 1 19
+c0 22 -1 37 -7 68l-8 40c-22 2 -60 3 -61 3h-8c-2 0 -3 1 -4 3c0 1 -1 3 -1 7v15c0 3 2 5 5 5h12c7 0 25 2 29 2c4 3 19 17 26 23c-4 29 -6 52 -6 67c0 63 26 98 87 98c39 0 58 -17 58 -55c1 -2 1 -6 0 -8c0 -52 -25 -69 -60 -87c-9 -4 -15 -10 -18 -13c-1 -1 -3 -2 -3 -2
+c0 -4 -1 -12 -1 -17h39z" />
+    <glyph glyph-name="uniEBC6" unicode="&#xebc6;" horiz-adv-x="321" 
+d="M116.199 225.6c0 -11.2432 1.61328 -16.2793 3.67578 -18.3418c1.81836 -1.81836 5.58301 -3.05859 13.7246 -3.05859c24.3242 0 63.7881 22.3799 84.5508 38.0498c0.0253906 0.755859 0.0507812 1.88672 0.0507812 3.35059
+c0 2.65234 -0.452148 6.84082 -0.452148 12.667c-16.7266 3.36914 -32.7637 4.73438 -48.1494 4.73438c-20.3193 0 -34.5986 -3.16016 -44.7188 -8.94336c-6.33203 -3.79883 -8.68164 -12.2314 -8.68164 -28.458zM219.001 211.026
+c-25.1074 -20.4629 -61.9219 -50.4902 -94.5811 -50.4902c-29.1387 0 -44.915 24.2773 -44.915 52.3271c0 21.5498 8.90625 45.2891 25.9395 62.3223c14.4121 14.4121 34.8936 24.2139 60.9561 24.2139c20.2949 0 37.6807 -2.57812 53.0898 -8.44922
+c0.657227 5.2002 1.11035 13.2451 1.11035 23.4502c0 2.68945 2.30762 4.99902 4.99902 4.99902h40.8008c2.64258 0 4.89941 -2.21875 4.99512 -4.8125c0.268555 -7.24707 0.803711 -14.5303 0.803711 -21.7871c0 -2.64258 0.165039 -4.87598 0.375 -6.64941
+c8.41797 5.87891 21.6113 9.64453 39.4609 12.3896c0.25293 0.0390625 0.508789 0.0585938 0.764648 0.0585938c2.3125 0 4.33203 -1.71191 4.84863 -3.78027c1.59766 -6.38477 3.35059 -13.2617 3.35059 -21.2188c0 -2.60254 -2.14746 -4.82031 -4.66406 -4.98828
+c-10.165 -0.676758 -22.334 -5.3623 -36.2451 -13.8613c-0.000976562 -0.113281 -0.000976562 -0.228516 -0.000976562 -0.345703c0 -9.60156 0.978516 -17.8467 0.978516 -29.4629c0 -8.43945 -0.398438 -18.2852 -1.70117 -29.5215
+c-8.07812 -69.6367 -24.3174 -127.102 -58.9062 -161.69c-20.0391 -20.0391 -46.1484 -32.0273 -79.374 -33.9209c-0.447266 -0.0253906 -0.901367 -0.0380859 -1.3623 -0.0380859c-17.7275 0 -45.5029 18.7656 -85.8437 50.5645
+c-3.46094 2.21973 -10.5 3.86621 -19.4795 3.86621h-12.4482c-5.6582 -0.78418 -9.45215 -0.912109 -13.085 -0.912109c-5.22852 0 -6.18164 4.78711 -7.20605 7.69238c-1.01074 2.86719 -1.86035 4.36621 -1.86035 7.01855c0 1.94531 0.960938 3.5459 1.91602 4.50195
+c3.80664 3.80664 9.78418 3.8623 17.1133 4.46484c11.8232 0.972656 32.6201 1.63184 48.3701 1.63184c9.82227 0 23.5039 -7.99121 44.333 -21.6113c0.0625 -0.0410156 0.124023 -0.0830078 0.18457 -0.126953c19.9131 -14.3369 33.3184 -20.6611 37.8818 -20.6611
+h0.800781c10.7021 0 20.3242 4.08594 29.2764 13.0381c9.39941 9.39941 17.9932 24.3838 25.209 45.2314c9.48145 26.8613 14.1152 49.5645 14.1152 67.9316v48.626z" />
+    <glyph glyph-name="uniEBC7" unicode="&#xebc7;" horiz-adv-x="289" 
+d="M179 287c-35 0 -49 -43 -49 -77c0 -6 0 -11 1 -15c11 8 37 21 47 31c7 7 11 17 11 36c0 17 0 25 -10 25zM134 110c35 17 60 55 112 55c31 0 43 -30 43 -60c0 -22 -12 -44 -30 -59l-57 -45c-1 -1 -2 -1 -3 -1h-1l-32 5c-2 0 -4 3 -4 5s1 4 3 5c23 8 77 45 77 72
+c0 19 -14 33 -33 33c-5 0 -24 -9 -51 -30l-70 -53c-1 -1 -2 -1 -3 -1c-3 0 -5 2 -5 5l-2 57c-1 18 -5 28 -7 30c-7 0 -14 -3 -23 -8l-24 -15c-1 0 -1 -1 -2 -1s-3 1 -4 2l-17 19c-1 1 -1 3 -1 4c0 5 7 5 11 6c26 7 54 14 60 35l20 64c11 32 24 56 40 74c1 1 2 2 4 2
+c5 1 17 2 33 8s28 10 37 10c29 0 47 -14 47 -43c0 -19 -13 -42 -37 -66c-27 -27 -63 -54 -86 -66v-37zM71 128v0z" />
+    <glyph glyph-name="uniEBC8" unicode="&#xebc8;" horiz-adv-x="153" 
+d="M1 113c0 6 4 7 4 20c0 10 2 23 10 23c3 0 5 -1 14 -1c19 0 30 4 35 10l11 28c1 2 3 3 5 3h1c20 -5 34 -7 39 -7c3 0 5 -2 5 -5v-2c-7 -19 -19 -41 -33 -65c-2 -3 -3 -13 -3 -28v-6c0 -13 0 -21 7 -21c10 0 34 17 39 29c1 2 3 3 5 3c3 0 5 -2 5 -5c1 -4 7 -11 7 -17
+c0 -3 -1 -5 -3 -6c-17 -22 -42 -44 -63 -64c-1 -1 -3 -2 -4 -2l-31 4c-2 0 -4 2 -4 5c0 11 -3 29 -3 41c0 16 2 36 5 58c-2 2 -5 3 -11 3s-26 -3 -32 -3c-3 0 -5 2 -5 5zM100 209h-3c-15 0 -27 13 -27 27c0 17 15 31 32 31h1c16 0 29 -10 29 -26c0 -20 -13 -32 -32 -32z" />
+    <glyph glyph-name="uniEBC9" unicode="&#xebc9;" horiz-adv-x="160" 
+d="M80 183c14 1 45 6 45 19s-23 27 -35 31c-1 -1 -7 -4 -16 -11zM73 247c7 7 46 38 46 50v1c0 7 -12 16 -13 17h-2c-19 -19 -29 -42 -31 -68zM161 308c0 -19 -22 -39 -37 -52c14 -8 33 -28 33 -46c0 -22 -20 -41 -39 -44l-38 -6c0 -5 -1 -15 -1 -19v-4c15 0 48 4 65 5
+c3 0 5 -2 5 -5v-8c0 -5 -4 -10 -9 -10h-1c-13 -1 -31 -4 -55 -8c-2 0 -3 -1 -3 -2v-79h1c2 1 16 11 22 15c1 1 2 1 3 1c3 0 5 -2 5 -5v-1c0 -3 4 -10 4 -14s-6 -10 -8 -12c-9 -9 -19 -10 -38 -12h-3c-9 0 -13 12 -19 12c-1 -5 0 -14 -6 -14h-3c-6 0 -9 3 -14 3
+c-3 0 -5 2 -5 5c0 1 1 2 2 3s3 7 5 17c2 12 4 24 4 49l-1 31c-5 0 -19 -1 -23 -1c-5 0 -7 6 -7 12c0 12 13 14 23 14h8c0 17 -2 68 -2 83c0 18 1 29 3 37v1c7 20 15 39 26 55c13 22 33 44 60 46h4c6 0 17 -5 22 -12c0 0 17 -20 17 -35z" />
+    <glyph glyph-name="uniEBCA" unicode="&#xebca;" horiz-adv-x="233" 
+d="M163 87c4 0 10 -9 10 -13c0 -1 0 -2 -1 -3c-16 -16 -46 -40 -62 -56c-6 -6 -10 -11 -11 -13s-2 -2 -4 -2h-24c-3 0 -5 2 -5 5c0 1 0 2 1 3c3 3 5 11 5 22c0 20 3 54 3 74c0 8 0 15 -1 21c-16 -11 -37 -25 -60 -25h-4c-4 0 -9 1 -9 6s6 12 7 15c0 2 -1 3 -1 4c0 2 3 5 5 5
+c11 2 24 5 37 14c9 7 14 9 19 13l7 65c8 60 32 126 100 126h3c38 0 55 -24 55 -63c0 -49 -42 -84 -77 -109c-12 -9 -20 -13 -24 -19l-8 -87h1c6 0 33 17 38 17zM182 287c0 10 -6 17 -15 18h-2c-32 0 -39 -35 -39 -65v-9l3 -34l13 8c22 17 32 39 40 76v6z" />
+    <glyph glyph-name="uniEBCB" unicode="&#xebcb;" horiz-adv-x="549" 
+d="M4 101.4c-2.68945 0 -4.99902 2.30762 -4.99902 4.99902c0 0.767578 0.175781 1.53516 0.526367 2.2373c4.79883 9.59961 12.3809 19.7539 22.9521 30.3252c4.49805 4.49805 9.4668 9.00879 15.0703 13.6377c11.4033 9.77344 28.3721 22.6904 50.1162 37.1875
+c20.6934 13.5293 34.998 23.8975 42.5918 30.7314c0.948242 0.853516 2.14453 1.28027 3.3418 1.28027c2.06445 0 3.94531 -1.39648 4.6416 -3.1377c5.12793 -12.8213 9.08496 -33.0137 13.9004 -61.9043c4.30176 -28.2686 8.14844 -48.5273 10.7344 -60.167
+l66.5352 60.6855c9.31738 8.60156 17.7656 16.6924 25.3408 24.2676c17.6738 17.6729 30.5996 32.5703 38.7139 44.4697c0.874023 1.28223 2.50098 2.18555 4.13379 2.18555c2.47266 0 4.59375 -1.94141 4.94238 -4.24609l14.3721 -95.0146l4.60547 -20.1475
+l148.203 115.951c0.901367 0.705078 1.98926 1.05762 3.07715 1.05762c2.17676 0 4.11621 -1.53516 4.74219 -3.41211c5.0166 -15.0518 10.5918 -43.1777 17.0117 -86.5156c4.71484 -35.0205 8.2793 -56.5254 9.30664 -62.5527
+c2.0625 0.923828 7.07324 3.71777 14.085 8.38867c8.27246 6.00586 20.6045 9.81934 21.4434 9.80664c0 -0.0185547 -0.0605469 -0.0566406 -0.188477 -0.115234c6.30469 0 9.79883 -5.62109 9.79883 -11.3984c0 -1.36719 -0.59375 -2.75488 -1.64258 -3.70605
+l-34.457 -31.251c-20.2344 -17.8066 -39.7021 -31.624 -56.9785 -40.6729c-0.724609 -0.379883 -1.52344 -0.569336 -2.32129 -0.569336c-2.56055 0 -4.75195 2.08008 -4.97754 4.53809l-6.39453 69.5439c-2.73926 23.9551 -6.06738 44.3535 -9.45898 60.6475
+c-69.5195 -52.2119 -120.901 -95.3037 -153.276 -126.909c-0.970703 -0.947266 -2.23145 -1.4209 -3.49219 -1.4209c-2.125 0 -4.03711 1.46777 -4.69824 3.28516c-3.62891 9.98047 -5.87012 29.1289 -8.28125 57.2715c-1.94727 22.0615 -4.46777 38.2842 -6.93066 48.292
+c-16.4873 -9.4502 -39.2832 -27.3691 -67.9043 -53.1289l-71.2002 -65.5996c-0.955078 -0.879883 -2.16992 -1.31934 -3.38574 -1.31934c-2.5 0 -4.6416 1.98242 -4.95508 4.33398c-1.62988 12.2285 -4.0127 37.7002 -7.2168 75.3369
+c-2.94531 27.9893 -6.57227 51.1465 -10.833 69.3877c-3.82129 -1.36914 -11.6016 -5.41406 -22.9268 -12.959c-8.69141 -6.40723 -15.457 -11.9863 -20.0371 -16.5674c-3.29395 -3.29297 -5.41406 -6.08203 -6.3584 -7.97168
+c-0.657227 -1.3125 -2.0127 -2.37598 -3.50977 -2.66797l-32.7998 -6.40039c-0.317383 -0.0615234 -0.640625 -0.0927734 -0.962891 -0.0927734z" />
+    <glyph glyph-name="uniEBCC" unicode="&#xebcc;" horiz-adv-x="341" 
+d="M330.8 100.199c4.38184 0 10.5986 -2.13574 10.5986 -7.39941c0 -1.26562 -0.476562 -2.53027 -1.42969 -3.50195l-49.9658 -50.9082c-17.7256 -17.7256 -33.041 -30.5537 -46.376 -37.9619c-0.751953 -0.417969 -1.58984 -0.626953 -2.42773 -0.626953
+c-2.49316 0 -4.62891 1.97168 -4.95215 4.31152c-5.25781 38.1328 -11.416 87.7646 -18.875 119.353c-15.0859 -11.6533 -32.2412 -27.1016 -51.4629 -46.3232c-20.7949 -20.7949 -44.0166 -46.0059 -69.7314 -75.6172
+c-0.939453 -1.08105 -2.37207 -1.72363 -3.77832 -1.72363c-2.44336 0 -4.54297 1.89648 -4.92773 4.15332c-10.751 63.0732 -16.4033 104.861 -17.4805 127.289c-11.5273 -6.55859 -25.2822 -17.8213 -33.0518 -26.5625
+c-0.945312 -1.0625 -2.35547 -1.67969 -3.74023 -1.67969c-0.19043 0 -0.381836 0.0107422 -0.571289 0.0322266l-28 3.2002c-2.39941 0.274414 -4.42773 2.4375 -4.42773 4.9668c0 1.21191 0.4375 2.42285 1.31152 3.37695
+c1.95117 2.12891 4.26367 4.54004 6.94922 7.22559c9.78516 9.78516 24.5469 23.2305 44.7178 39.623c16.1895 14.1641 39.7725 33.0928 50.7188 45.1348c0.951172 1.04688 2.33789 1.63867 3.70215 1.63867c2.17676 0 4.11621 -1.53516 4.74219 -3.41211
+c3.34766 -10.043 7.37793 -27.0684 10.6084 -52.0879c3.33594 -22.0088 6.6709 -40.6104 10.4209 -55.7148c13.0459 12.8945 33.3633 30.6465 60.666 52.4883c35.1465 28.7568 58.3164 48.7363 70.1533 59.7842c0.958008 0.894531 2.18359 1.3418 3.40918 1.3418
+c2.31348 0 4.33203 -1.71191 4.84961 -3.78027c4.02051 -16.083 9.65723 -40.2295 14.4873 -72.4287c3.94141 -24.7734 6.75195 -42.2393 8.28125 -51.2324c8.62207 5.10938 26.0996 17.042 35.582 17.042z" />
     <glyph glyph-name="uniE000" unicode="&#xe000;" 
 d="M92 7c3 -5 -4 -8 -7 -4c-54 81 -70 151 -70 214c0 46 9 89 16 125c6 29 12 54 12 77c0 31 -10 56 -41 77c-2 2 -3 5 0 7c31 21 41 46 41 77c0 23 -6 49 -12 78c-7 36 -16 79 -16 125c0 63 16 133 70 214c3 4 10 1 7 -4c-38 -69 -50 -132 -50 -187c0 -46 9 -88 16 -126
 c6 -30 11 -58 11 -83c0 -39 -13 -72 -56 -97c43 -25 56 -58 56 -97c0 -25 -5 -53 -11 -83c-7 -38 -16 -80 -16 -126c0 -55 12 -118 50 -187z" />

From 809750aa2486dba339824cd27988bba22095e882 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 10:14:11 +0100
Subject: [PATCH 073/403] clang-format

---
 src/view_tab.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 693c525f875..8ccd6647721 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -111,9 +111,10 @@ void View::DrawTabNote(DeviceContext *dc, LayerElement *element, Layer *layer, S
         }
         // Above the line for french tablature
         else if (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_french) {
-            y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) - m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize);
+            y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize)
+                - m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize);
         }
-        
+
         dc->SetFont(m_doc->GetDrawingSmuflFont(glyphSize, false));
         DrawSmuflString(dc, x, y, fret, HORIZONTALALIGNMENT_center, glyphSize);
         dc->ResetFont();
@@ -142,13 +143,13 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     int x = element->GetDrawingX();
     int y = element->GetDrawingY();
-    
+
     double spacingRatio = 1.0;
     if (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_french) {
         spacingRatio = 2.0;
     }
     y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * spacingRatio;
-    
+
     int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
     int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
 

From 9cedccfbf54a43f93281e87e7192e6f613f824e8 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 11:03:18 +0100
Subject: [PATCH 074/403] Add helper on Staff for notation types

---
 include/vrv/staff.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index f3001ead092..5b75da2df6b 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -104,6 +104,9 @@ class Staff : public Object,
     bool IsMensural();
     bool IsNeume();
     bool IsTablature();
+    bool IsTabLuteFrench() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_french; }
+    bool IsTablatureGerman() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_german; }
+    bool IsTabLuteItalian() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_italian; }
     ///@}
 
     /**

From 43153e9228dcdc5666d3ae430eca10f2963051e5 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 11:03:56 +0100
Subject: [PATCH 075/403] Set the y position in tabDurSym

---
 src/layerelement.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index cf8b7e2c27e..da534e6cd49 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1431,6 +1431,15 @@ int LayerElement::SetAlignmentPitchPos(FunctorParams *functorParams)
         rest->SetDrawingLoc(loc);
         this->SetDrawingYRel(staffY->CalcPitchPosYRel(params->m_doc, loc));
     }
+    else if (this->Is(TABDURSYM)) {
+        int yRel = 0;
+        double spacingRatio = 1.0;
+        if (staffY->IsTabLuteFrench()) {
+            spacingRatio = 2.0;
+        }
+        yRel += params->m_doc->GetDrawingUnit(staffY->m_drawingStaffSize) * spacingRatio;
+        this->SetDrawingYRel(yRel);
+    }
 
     return FUNCTOR_CONTINUE;
 }

From 1b6fc784f8fde71b6599e9c2768c70235b080ac5 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 11:05:02 +0100
Subject: [PATCH 076/403] Use tabDurSym y position for beam or for drawing them

---
 src/beam.cpp     | 15 +++++++++++----
 src/view_tab.cpp |  6 ------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 866078356fb..d4a70b1dabc 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -92,13 +92,20 @@ void BeamSegment::CalcTabBeam(
     // draws the stems.
     int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
     beamInterface->m_fractionSize = glyphSize * 2 / 3;
-    int height = doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
-    int y = staff->GetDrawingY() + height;
-    y += doc->GetDrawingUnit(staff->m_drawingStaffSize) * 1.5;
 
     assert(m_beamElementCoordRefs.size() > 0);
 
-    // For recursive calls, avoid to re-init values
+    int y = staff->GetDrawingY();
+
+    // Get the y position of the first tabDurSym
+    assert(m_beamElementCoordRefs.at(0)->m_element);
+    LayerElement *tabDurSym
+        = vrv_cast<LayerElement *>(m_beamElementCoordRefs.at(0)->m_element->FindDescendantByType(TABDURSYM));
+    if (tabDurSym) y = tabDurSym->GetDrawingY();
+
+    const int height = doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
+    y += height;
+
     this->CalcBeamInit(layer, staff, doc, beamInterface, place);
 
     // Adjust the height and spacing of the beams
diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 8ccd6647721..b09cc05a07a 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -144,12 +144,6 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     int x = element->GetDrawingX();
     int y = element->GetDrawingY();
 
-    double spacingRatio = 1.0;
-    if (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_french) {
-        spacingRatio = 2.0;
-    }
-    y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * spacingRatio;
-
     int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
     int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
 

From dd0db080c1c870556170b4bb91d5ec70f40c03e5 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 11:05:27 +0100
Subject: [PATCH 077/403] Use notationtype staff helpers

---
 src/view_page.cpp | 3 +--
 src/view_tab.cpp  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/view_page.cpp b/src/view_page.cpp
index f0cfee5c0c1..b69a5cee6c0 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -1224,8 +1224,7 @@ void View::DrawStaffLines(DeviceContext *dc, Staff *staff, Measure *measure, Sys
             y2 -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
         }
         else {
-            const bool isFrenchOrItalianTablature = (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_french
-                || staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_italian);
+            const bool isFrenchOrItalianTablature = (staff->IsTabLuteFrench() || staff->IsTabLuteItalian());
             SegmentedLine line(x1, x2);
             // We do not need to do this during layout calculation - and only with tablature but not for French or
             // Italian tablature
diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index b09cc05a07a..d411bc54d82 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -106,11 +106,11 @@ void View::DrawTabNote(DeviceContext *dc, LayerElement *element, Layer *layer, S
 
         std::wstring fret = note->GetTabFretString(staff->m_drawingNotationType);
         // Center for italian tablature
-        if (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_italian) {
+        if (staff->IsTabLuteItalian()) {
             y -= (m_doc->GetGlyphHeight(SMUFL_EBE0_luteItalianFret0, glyphSize, drawingCueSize) / 2);
         }
         // Above the line for french tablature
-        else if (staff->m_drawingNotationType == NOTATIONTYPE_tab_lute_french) {
+        else if (staff->IsTabLuteFrench()) {
             y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize)
                 - m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize);
         }

From ee9048cc13fa286bcf1e3f2177aaa4e3826cb642 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 11:05:52 +0100
Subject: [PATCH 078/403] Adjust beam width according to the notation type

---
 src/beam.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/beam.cpp b/src/beam.cpp
index d4a70b1dabc..20c26d5a063 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -111,6 +111,13 @@ void BeamSegment::CalcTabBeam(
     // Adjust the height and spacing of the beams
     beamInterface->m_beamWidthBlack /= 2;
     beamInterface->m_beamWidthWhite /= 2;
+
+    // Adjust it further for tab.lute.french and tab.lute.italian
+    if (staff->IsTabLuteFrench() || staff->IsTabLuteItalian()) {
+        beamInterface->m_beamWidthBlack /= 2;
+        beamInterface->m_beamWidthWhite = beamInterface->m_beamWidthWhite * 2 / 3;
+    }
+
     beamInterface->m_beamWidth = beamInterface->m_beamWidthBlack + beamInterface->m_beamWidthWhite;
 
     beamInterface->m_drawingPlace = (place == BEAMPLACE_below) ? BEAMPLACE_below : BEAMPLACE_above;

From b98636713cc8326b14b4d37cd7064bbe68797ae6 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 11:12:04 +0100
Subject: [PATCH 079/403] Change german tablature helper name

---
 include/vrv/staff.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index 5b75da2df6b..df2d85cc7ba 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -105,7 +105,7 @@ class Staff : public Object,
     bool IsNeume();
     bool IsTablature();
     bool IsTabLuteFrench() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_french; }
-    bool IsTablatureGerman() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_german; }
+    bool IsTabLuteGerman() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_german; }
     bool IsTabLuteItalian() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_italian; }
     ///@}
 

From 090610888f3612bdfab0fb1ffd0307eb5f6e2583 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 18 Jan 2022 12:56:56 +0100
Subject: [PATCH 080/403] Improve adjustment for short slurs

Don't adjust endpoints individually then
---
 include/vrv/slur.h |  6 +++++-
 src/slur.cpp       | 29 +++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/include/vrv/slur.h b/include/vrv/slur.h
index 64fca90cbea..789a163db66 100644
--- a/include/vrv/slur.h
+++ b/include/vrv/slur.h
@@ -150,7 +150,8 @@ class Slur : public ControlElement,
     void FilterSpannedElements(FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin);
 
     // Calculate the vertical shift of the slur end points
-    std::pair<int, int> CalcEndPointShift(FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin);
+    std::pair<int, int> CalcEndPointShift(
+        FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin, int unit);
 
     // Calculate the horizontal control point offset
     std::tuple<bool, int, int> CalcControlPointOffset(
@@ -177,6 +178,9 @@ class Slur : public ControlElement,
     // Shift end points for collisions nearby
     void ShiftEndPoints(int &shiftLeft, int &shiftRight, double ratio, int intersection) const;
 
+    // Rebalance shifts to avoid awkward tilting of short slurs
+    void RebalanceShifts(int &shiftLeft, int &shiftRight, double distance, int unit) const;
+
     // Rotate the slope by a given number of degrees, but choose smaller angles if already close to the vertical axis
     // Choose doublingBound as the positive slope value where doubling has the same effect as rotating:
     // tan(atan(doublingBound) + degrees * PI / 180.0) ≈ 2.0 * doublingBound
diff --git a/src/slur.cpp b/src/slur.cpp
index f836b072574..4b4a3d8709c 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -312,6 +312,7 @@ void Slur::AdjustSlur(Doc *doc, FloatingCurvePositioner *curve, Staff *staff)
     BezierCurve bezier(points[0], points[1], points[2], points[3]);
     bezier.UpdateControlPointParams(curve->GetDir());
 
+    const int unit = doc->GetDrawingUnit(100);
     const int margin = doc->GetOptions()->m_slurMargin.GetValue() * doc->GetDrawingUnit(100);
 
     // STEP 1: Filter spanned elements and discard certain bounding boxes even though they collide
@@ -321,7 +322,7 @@ void Slur::AdjustSlur(Doc *doc, FloatingCurvePositioner *curve, Staff *staff)
     // Only collisions near the endpoints are taken into account.
     int endPointShiftLeft = 0;
     int endPointShiftRight = 0;
-    std::tie(endPointShiftLeft, endPointShiftRight) = this->CalcEndPointShift(curve, bezier, margin);
+    std::tie(endPointShiftLeft, endPointShiftRight) = this->CalcEndPointShift(curve, bezier, margin, unit);
     if ((endPointShiftLeft != 0) || (endPointShiftRight != 0)) {
         const int sign = (curve->GetDir() == curvature_CURVEDIR_above) ? 1 : -1;
         bezier.p1.y += sign * endPointShiftLeft;
@@ -406,7 +407,8 @@ void Slur::FilterSpannedElements(FloatingCurvePositioner *curve, const BezierCur
     }
 }
 
-std::pair<int, int> Slur::CalcEndPointShift(FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin)
+std::pair<int, int> Slur::CalcEndPointShift(
+    FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, const int margin, const int unit)
 {
     if (bezierCurve.p1.x >= bezierCurve.p2.x) return { 0, 0 };
 
@@ -443,6 +445,9 @@ std::pair<int, int> Slur::CalcEndPointShift(FloatingCurvePositioner *curve, cons
             this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioRight, intersectionRight);
         }
     }
+
+    this->RebalanceShifts(shiftLeft, shiftRight, dist, unit);
+
     return { shiftLeft, shiftRight };
 }
 
@@ -469,6 +474,26 @@ void Slur::ShiftEndPoints(int &shiftLeft, int &shiftRight, double ratio, int int
     }
 }
 
+void Slur::RebalanceShifts(int &shiftLeft, int &shiftRight, const double distance, const int unit) const
+{
+    // alpha is 1 for dist <= 4U, 0 for dist >= 8U, interpolated between 4U and 8U
+    double alpha = 0.0;
+    if (distance <= 4.0 * unit) {
+        alpha = 1.0;
+    }
+    else if (distance <= 8.0 * unit) {
+        alpha = 2.0 - distance / (4.0 * unit);
+    }
+
+    const int difference = std::abs(shiftLeft - shiftRight);
+    if (shiftLeft < shiftRight) {
+        shiftLeft += alpha * difference;
+    }
+    else {
+        shiftRight += alpha * difference;
+    }
+}
+
 std::tuple<bool, int, int> Slur::CalcControlPointOffset(
     FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin)
 {

From 1971274673414db7c6280a4603c637980043f54d Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Tue, 18 Jan 2022 12:08:38 +0000
Subject: [PATCH 081/403] Fix format.

---
 include/vrv/staff.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index 85a7e1ab9b8..bcbeca93305 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -247,11 +247,12 @@ class Staff : public Object,
      * See Object::GenerateMIDI
      */
     int GenerateMIDI(FunctorParams *functorParams) override;
-    
+
     /**
      * See Object::GenerateMIDIEnd
      */
     int GenerateMIDIEnd(FunctorParams *functorParams) override;
+
 private:
     /**
      * Add the ledger line dashes to the legderline array.

From 415195384af061c469dfc580fdc2fb5da8ce402a Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 18 Jan 2022 13:41:37 +0100
Subject: [PATCH 082/403] Minor improvement

---
 src/slur.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/slur.cpp b/src/slur.cpp
index 4b4a3d8709c..eb00694d5bd 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -313,7 +313,7 @@ void Slur::AdjustSlur(Doc *doc, FloatingCurvePositioner *curve, Staff *staff)
     bezier.UpdateControlPointParams(curve->GetDir());
 
     const int unit = doc->GetDrawingUnit(100);
-    const int margin = doc->GetOptions()->m_slurMargin.GetValue() * doc->GetDrawingUnit(100);
+    const int margin = doc->GetOptions()->m_slurMargin.GetValue() * unit;
 
     // STEP 1: Filter spanned elements and discard certain bounding boxes even though they collide
     this->FilterSpannedElements(curve, bezier, margin);
@@ -369,7 +369,7 @@ void Slur::AdjustSlur(Doc *doc, FloatingCurvePositioner *curve, Staff *staff)
     // STEP 5: Adjust the slur shape
     // Through the control point adjustments in step 3 and 4 it can happen that the slur looses its desired shape.
     // We correct the shape if the slur is too flat or not convex.
-    this->AdjustSlurShape(bezier, curve->GetDir(), doc->GetDrawingUnit(100));
+    this->AdjustSlurShape(bezier, curve->GetDir(), unit);
     curve->UpdatePoints(bezier);
 
     // Since we are going to redraw it, reset its bounding box

From 2d4884351aeb1767d975141e80e91334c0b4bf23 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 14:05:23 +0100
Subject: [PATCH 083/403] Adjust shortest beam duration for beam in tablabures

---
 src/view_beam.cpp | 54 +++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 2c1d0a21e84..1fa5aa5f03d 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -282,13 +282,18 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
     }
     int noteCount = (int)noteIndexes.size();
 
-    if (noteCount > 0) {
-        int testDur = DUR_16;
-        int barY = beamInterface->m_beamWidth;
+    int durRef = DUR_8;
+    int durRef2 = DUR_16;
+
+    if (staff->IsTabLuteFrench() || staff->IsTabLuteItalian()) {
+        durRef = DUR_4;
+        durRef2 = DUR_8;
+    }
 
-        if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
-            barY = -barY;
-        }
+    int barY = 0;
+
+    if (noteCount > 0) {
+        int testDur = durRef2;
 
         int fractBeamWidth
             = m_doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, beamInterface->m_fractionSize, beamInterface->m_cueSize);
@@ -299,6 +304,7 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
             bool start = true;
 
             int idx = 0;
+            barY += beamInterface->m_beamWidth;
 
             // all but the last one
             for (i = 0; i < noteCount - 1; ++i) {
@@ -306,43 +312,43 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
                 int nextIdx = noteIndexes.at(i + 1);
 
                 bool breakSec = ((beamElementCoords->at(idx)->m_breaksec)
-                    && (testDur - DUR_8 >= beamElementCoords->at(idx)->m_breaksec));
-                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_NONE;
+                    && (testDur - durRef >= beamElementCoords->at(idx)->m_breaksec));
+                beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_NONE;
                 // partial is needed
                 if (beamElementCoords->at(idx)->m_dur >= (char)testDur) {
                     // and for the next one too, but no break - through
                     if ((beamElementCoords->at(nextIdx)->m_dur >= (char)testDur) && !breakSec) {
-                        beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_THROUGH;
+                        beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_THROUGH;
                     }
                     // not needed for the next one or break
                     else {
                         // we are starting a beam or after a beam break - put it right
                         if (start) {
                             if ((idx != 0) && (beamElementCoords->at(idx - 1)->m_element->Is(REST))) {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_LEFT;
                             }
                             else {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_RIGHT;
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_RIGHT;
                             }
                         }
                         // or the previous one had no partial
                         else if (beamElementCoords->at(noteIndexes.at(i - 1))->m_dur < (char)testDur) {
                             // if we are at the full bar level, put it left
-                            if (testDur == DUR_16) {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                            if (testDur == durRef2) {
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_LEFT;
                             }
                             // if the previous level underneath was a partial through, put it left
-                            else if (beamElementCoords->at(noteIndexes.at(i - 1))->m_partialFlags[testDur - 1 - DUR_8]
+                            else if (beamElementCoords->at(noteIndexes.at(i - 1))->m_partialFlags[testDur - 1 - durRef]
                                 == PARTIAL_THROUGH) {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_LEFT;
                             }
                             // if the level underneath was not left (right or through), put it right
-                            else if (beamElementCoords->at(idx)->m_partialFlags[testDur - 1 - DUR_8] != PARTIAL_LEFT) {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_RIGHT;
+                            else if (beamElementCoords->at(idx)->m_partialFlags[testDur - 1 - durRef] != PARTIAL_LEFT) {
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_RIGHT;
                             }
                             // it was put left before, put it left
                             else {
-                                beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                                beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_LEFT;
                             }
                         }
                     }
@@ -352,18 +358,16 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
             }
             // last one
             idx = (int)noteIndexes.back();
-            beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_NONE;
+            beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_NONE;
             // partial is needed
             if ((beamElementCoords->at(idx)->m_dur >= (char)testDur)) {
                 // and the previous one had no partial - put it left
                 if ((noteCount == 1) || (beamElementCoords->at(noteIndexes.at(i - 1))->m_dur < (char)testDur)
                     || start) {
-                    beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] = PARTIAL_LEFT;
+                    beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] = PARTIAL_LEFT;
                 }
             }
 
-            barY = beamInterface->m_beamWidth * (testDur - DUR_8);
-
             // draw them
             for (i = 0; i < noteCount; ++i) {
                 int barYPos = 0;
@@ -384,7 +388,7 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
                 else {
                     barYPos = shiftY * barY;
                 }
-                if (beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] == PARTIAL_THROUGH) {
+                if (beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] == PARTIAL_THROUGH) {
                     // through should never be set on the last one
                     assert(i < noteCount - 1);
                     if (i >= noteCount - 1) continue; // assert for debug and skip otherwise
@@ -393,14 +397,14 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
                     DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1,
                         beamElementCoords->at(noteIndexes.at(i + 1))->m_x, y2, polygonHeight);
                 }
-                else if (beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] == PARTIAL_RIGHT) {
+                else if (beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] == PARTIAL_RIGHT) {
                     y1 = beamElementCoords->at(idx)->m_yBeam + barYPos;
                     int x2 = beamElementCoords->at(idx)->m_x + fractBeamWidth;
                     y2 = beamSegment->m_firstNoteOrChord->m_yBeam + barYPos
                         + beamSegment->m_beamSlope * (x2 - beamSegment->m_firstNoteOrChord->m_x);
                     DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1, x2, y2, polygonHeight);
                 }
-                else if (beamElementCoords->at(idx)->m_partialFlags[testDur - DUR_8] == PARTIAL_LEFT) {
+                else if (beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] == PARTIAL_LEFT) {
                     y2 = beamElementCoords->at(idx)->m_yBeam + barYPos;
                     int x1 = beamElementCoords->at(idx)->m_x - fractBeamWidth;
                     y1 = beamSegment->m_firstNoteOrChord->m_yBeam + barYPos

From 84a5cc46d40aff4fcf442120315e028708562a8b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 14:55:59 +0100
Subject: [PATCH 084/403] Remove scaling fret figures in guitar tablature

---
 src/view_tab.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index d411bc54d82..dc3ee367230 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -83,7 +83,7 @@ void View::DrawTabNote(DeviceContext *dc, LayerElement *element, Layer *layer, S
         TextDrawingParams params;
         params.m_x = x;
         params.m_y = y;
-        params.m_pointSize = m_doc->GetDrawingLyricFont(glyphSize)->GetPointSize() * 3 / 5;
+        params.m_pointSize = m_doc->GetDrawingLyricFont(glyphSize)->GetPointSize();
         fretTxt.SetPointSize(params.m_pointSize);
 
         dc->SetBrush(m_currentColour, AxSOLID);

From 24beb9fec88a55ab6afe5f560e7cb73a31462fdb Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 15:23:04 +0100
Subject: [PATCH 085/403] Add helper to get the staff notation size and avoid
 text scaling

---
 include/vrv/staff.h | 5 +++++
 src/beam.cpp        | 6 +++---
 src/staff.cpp       | 5 +++++
 src/view_page.cpp   | 3 ++-
 src/view_tab.cpp    | 4 ++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index df2d85cc7ba..54929b42275 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -91,6 +91,11 @@ class Staff : public Object,
      */
     void AdjustDrawingStaffSize();
 
+    /**
+     * Return the drawing staff size for staff notation, including for tablature staves
+     */
+    int GetDrawingStaffNotationSize();
+
     /**
      * Check if the staff is currently visible.
      * Looks for the parent system and its current drawing scoreDef
diff --git a/src/beam.cpp b/src/beam.cpp
index 20c26d5a063..700a14cb476 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -90,7 +90,7 @@ void BeamSegment::CalcTabBeam(
 
     // Calculate the y position of the beam - this currently need to be inline with the code in View::DrawTabGrp that
     // draws the stems.
-    int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
+    int glyphSize = staff->GetDrawingStaffNotationSize();
     beamInterface->m_fractionSize = glyphSize * 2 / 3;
 
     assert(m_beamElementCoordRefs.size() > 0);
@@ -114,8 +114,8 @@ void BeamSegment::CalcTabBeam(
 
     // Adjust it further for tab.lute.french and tab.lute.italian
     if (staff->IsTabLuteFrench() || staff->IsTabLuteItalian()) {
-        beamInterface->m_beamWidthBlack /= 2;
-        beamInterface->m_beamWidthWhite = beamInterface->m_beamWidthWhite * 2 / 3;
+        beamInterface->m_beamWidthBlack = beamInterface->m_beamWidthBlack * 2 / 5;
+        beamInterface->m_beamWidthWhite = beamInterface->m_beamWidthWhite * 3 / 5;
     }
 
     beamInterface->m_beamWidth = beamInterface->m_beamWidthBlack + beamInterface->m_beamWidthWhite;
diff --git a/src/staff.cpp b/src/staff.cpp
index e9e4b883b3e..7ddeb69176b 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -187,6 +187,11 @@ void Staff::AdjustDrawingStaffSize()
     }
 }
 
+int Staff::GetDrawingStaffNotationSize()
+{
+    return (this->IsTablature()) ? m_drawingStaffSize / TABLATURE_STAFF_RATIO : m_drawingStaffSize;
+}
+
 bool Staff::DrawingIsVisible()
 {
     System *system = vrv_cast<System *>(this->GetFirstAncestor(SYSTEM));
diff --git a/src/view_page.cpp b/src/view_page.cpp
index b69a5cee6c0..967c5b6600c 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -413,7 +413,8 @@ void View::DrawStaffDefLabels(DeviceContext *dc, Measure *measure, StaffGrp *sta
         int y = staff->GetDrawingY()
             - (staffDef->GetLines() * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
 
-        this->DrawLabels(dc, scoreDef, staffDef, x - space, y, abbreviations, staff->m_drawingStaffSize, 2 * space);
+        const int staffSize = staff->GetDrawingStaffNotationSize();
+        this->DrawLabels(dc, scoreDef, staffDef, x - space, y, abbreviations, staffSize, 2 * space);
     }
 }
 
diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index dc3ee367230..ec390c03fbd 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -66,7 +66,7 @@ void View::DrawTabNote(DeviceContext *dc, LayerElement *element, Layer *layer, S
     int x = element->GetDrawingX();
     int y = element->GetDrawingY();
 
-    int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
+    int glyphSize = staff->GetDrawingStaffNotationSize();
     bool drawingCueSize = false;
 
     if (staff->m_drawingNotationType == NOTATIONTYPE_tab_guitar) {
@@ -145,7 +145,7 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     int y = element->GetDrawingY();
 
     int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
-    int glyphSize = staff->m_drawingStaffSize / TABLATURE_STAFF_RATIO;
+    int glyphSize = staff->GetDrawingStaffNotationSize();
 
     // We only need to draw the stems
     // Do we also need to draw the dots?

From 03f493e7d037a3ee6a84deecf3748e06a116d286 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 16:05:59 +0100
Subject: [PATCH 086/403] Adjust size and placement for guitar tablature frets

---
 src/view_tab.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index ec390c03fbd..2e36934f352 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -74,26 +74,17 @@ void View::DrawTabNote(DeviceContext *dc, LayerElement *element, Layer *layer, S
         std::wstring fret = note->GetTabFretString(staff->m_drawingNotationType);
 
         FontInfo fretTxt;
-        // global styling for fret is missing
-        // if (!dc->UseGlobalStyling()) {
         fretTxt.SetFaceName("Times");
-        fretTxt.SetWeight(FONTWEIGHT_bold);
-        //}
 
         TextDrawingParams params;
         params.m_x = x;
         params.m_y = y;
-        params.m_pointSize = m_doc->GetDrawingLyricFont(glyphSize)->GetPointSize();
+        params.m_pointSize = m_doc->GetDrawingLyricFont(glyphSize)->GetPointSize() * 4 / 5;
         fretTxt.SetPointSize(params.m_pointSize);
 
         dc->SetBrush(m_currentColour, AxSOLID);
         dc->SetFont(&fretTxt);
 
-        // TextExtend extend;
-        // dc->GetTextExtent(fret, &extend, false);
-        // params.m_x -= (extend.m_width / 2);
-
-        params.m_x += (m_doc->GetTextGlyphWidth(L'0', &fretTxt, drawingCueSize));
         params.m_y -= (m_doc->GetTextGlyphHeight(L'0', &fretTxt, drawingCueSize) / 2);
 
         dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), HORIZONTALALIGNMENT_center);

From f80399094d0257340a780726c57dcb23386fa606 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 18 Jan 2022 16:06:45 +0100
Subject: [PATCH 087/403] Update Leipzig to version 5.2.66

---
 data/Leipzig.xml                          | 12 +++----
 data/Leipzig/EBA7-luteDurationWhole.xml   |  2 +-
 data/Leipzig/EBA8-luteDurationHalf.xml    |  2 +-
 data/Leipzig/EBA9-luteDurationQuarter.xml |  2 +-
 data/Leipzig/EBAA-luteDuration8th.xml     |  2 +-
 data/Leipzig/EBAB-luteDuration16th.xml    |  2 +-
 data/Leipzig/EBAC-luteDuration32nd.xml    |  2 +-
 fonts/Leipzig.svg                         | 43 ++++++++++++-----------
 8 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/data/Leipzig.xml b/data/Leipzig.xml
index 05998076264..0e3d521a796 100644
--- a/data/Leipzig.xml
+++ b/data/Leipzig.xml
@@ -359,12 +359,12 @@
 	<g c="EBE7" x="-3.0" y="-3.0" w="168.0" h="252.0" h-a-x="162" />
 	<g c="EBE8" x="-3.0" y="-3.0" w="194.0" h="252.0" h-a-x="188" />
 	<g c="EBE9" x="-3.0" y="-3.2" w="185.0" h="252.2" h-a-x="179" />
-	<g c="EBA7" x="-82.0" y="0.0" w="170.0" h="641.0" h-a-x="92" />
-	<g c="EBA8" x="0.0" y="-1.0" w="404.0" h="646.0" h-a-x="403" />
-	<g c="EBAA" x="0.0" y="0.0" w="392.0" h="631.0" h-a-x="393" />
-	<g c="EBA9" x="0.0" y="0.0" w="390.0" h="635.0" h-a-x="389" />
-	<g c="EBAB" x="0.0" y="0.0" w="392.0" h="636.0" h-a-x="392" />
-	<g c="EBAC" x="1.0" y="-1.0" w="385.0" h="704.0" h-a-x="381" />
+	<g c="EBA7" x="-82.0" y="0.0" w="174.0" h="791.0" h-a-x="92" />
+	<g c="EBA8" x="-1.0" y="0.0" w="405.0" h="795.0" h-a-x="403" />
+	<g c="EBAA" x="0.0" y="0.0" w="392.0" h="781.0" h-a-x="393" />
+	<g c="EBA9" x="0.0" y="0.0" w="390.0" h="785.0" h-a-x="389" />
+	<g c="EBAB" x="0.0" y="-1.0" w="392.0" h="787.0" h-a-x="392" />
+	<g c="EBAC" x="0.0" y="-1.0" w="386.0" h="854.0" h-a-x="381" />
 	<g c="E24C" x="0.0" y="-779.0" w="277.0" h="1729.0" h-a-x="274" />
 	<g c="E24D" x="0.0" y="-950.0" w="277.0" h="1729.0" h-a-x="274" />
 	<g c="E24E" x="0.0" y="-779.0" w="280.0" h="1919.0" h-a-x="274" />
diff --git a/data/Leipzig/EBA7-luteDurationWhole.xml b/data/Leipzig/EBA7-luteDurationWhole.xml
index df659f911b5..cb7c7fee76b 100644
--- a/data/Leipzig/EBA7-luteDurationWhole.xml
+++ b/data/Leipzig/EBA7-luteDurationWhole.xml
@@ -1 +1 @@
-<symbol id="EBA7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-82 613c12 4 35 8 70 14c38 6 61 10 67 12c7 2 12 2 14 2c7 0 11 -3 13 -9s3 -17 3 -33c0 -23 0 -42 -1 -58c-1 -11 -2 -78 -4 -201c-1 -85 -2 -146 -2 -185c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -15 347 -19 575c0 1 0 6 -1 16c0 4 -2 5 -5 5 c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10c-2 24 -2 37 -2 38z" /></symbol>
\ No newline at end of file
+<symbol id="EBA7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-82 763c12 4 35 8 70 14c38 6 61 10 67 12c7 2 12 2 14 2c7 0 11 -3 13 -9s3 -17 3 -33c0 -23 0 -42 -1 -58c-1 -11 -2.55285 -77.9923 -4 -201c-1 -85 2 -296 2 -335c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -23 496.965 -23 725c0 1 0 6 -1 16 c0 4 -2 5 -5 5c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10c-2 24 -2 37 -2 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA8-luteDurationHalf.xml b/data/Leipzig/EBA8-luteDurationHalf.xml
index e0c58831861..31a0c6c9a1a 100644
--- a/data/Leipzig/EBA8-luteDurationHalf.xml
+++ b/data/Leipzig/EBA8-luteDurationHalf.xml
@@ -1 +1 @@
-<symbol id="EBA8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 -0l9 621c0 9 1 15 2 19c2 3 6 5 12 5c0 0 12 -1 36 -4c79 -10 136 -17 172 -24c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5 -105 -7 -202c-2 -104 -8 -229 -19 -380z" /></symbol>
\ No newline at end of file
+<symbol id="EBA8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 1l10 770c0.128549 8.9984 1 15 2 19c2 3 6 5 12 5c0 0 12 -1 36 -4c79 -10 136 -17 172 -24c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5.13456 -104.997 -7 -202 c-2 -104 -9 -378 -20 -529z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA9-luteDurationQuarter.xml b/data/Leipzig/EBA9-luteDurationQuarter.xml
index 67e2edd4c84..29d4700aabc 100644
--- a/data/Leipzig/EBA9-luteDurationQuarter.xml
+++ b/data/Leipzig/EBA9-luteDurationQuarter.xml
@@ -1 +1 @@
-<symbol id="EBA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 -0l8 590v36c0 6 3 9 8 9l35 -5l80 -9c37 -5 72 -13 107 -25c46 -15 90 -36 132 -63c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -4 -63 -9 -187 c-5 -142 -8 -221 -11 -246h-44z" /></symbol>
\ No newline at end of file
+<symbol id="EBA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0l8 740v36c0 6 3 9 8 9l35 -5l80 -9c37 -5 72 -13 107 -25c46 -15 90 -36 132 -63c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -4.63296 -62.9761 -9 -187 c-5 -142 -8 -371 -11 -396h-44z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAA-luteDuration8th.xml b/data/Leipzig/EBAA-luteDuration8th.xml
index ac517af6788..9320a94523e 100644
--- a/data/Leipzig/EBAA-luteDuration8th.xml
+++ b/data/Leipzig/EBAA-luteDuration8th.xml
@@ -1 +1 @@
-<symbol id="EBAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 -0l8 590c0 2 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c0 0 1 -1 1 -3s1 -5 1 -10 s1 -10 1 -14c2 -15 3 -27 3 -35c0 -11 -2 -20 -4 -27c3 0 6 1 9 1c43 0 95 -11 155 -31l99 -36c44 -9 66 -32 66 -70c0 -11 0 -25 -3 -41c-2 -2 -4 -3 -6 -3c-3 0 -8 2 -14 6c-7 4 -10 6 -12 6c1 8 1 15 1 21c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31 c-11 0 -21 -1 -27 -2c-5 -36 -8 -80 -10 -138c-3 -73 -6 -120 -8 -141h-44z" /></symbol>
\ No newline at end of file
+<symbol id="EBAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M377 435c-10.2893 0 -30 5.49144 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -98 26 -125 26c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c1.65723 -1.6582 2 -7.52637 2 -13v-49c0 -11 2 -20 0 -27c3 0 6 1 9 1c43 0 91 -11 151 -31l99 -34 c44 -13 66 -34 66 -72c0 -11 -3 -26 -6 -42c-2 -2 -4 -3 -6 -3c-4.08008 0 -23.2266 5 -26 5c1 8 4 23 4 29c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31c-11 0 -23 -1 -29 -2c-5 -36 -3.61719 -80.0146 -6 -138c-3 -73 -8 -270 -10 -291h-44l8 740 c0.0216185 1.99971 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c0 0 -27 10.6258 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21c0 -11.5061 -9.94969 -66 -13 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAB-luteDuration16th.xml b/data/Leipzig/EBAB-luteDuration16th.xml
index 10baf86884f..3000b69b0b6 100644
--- a/data/Leipzig/EBAB-luteDuration16th.xml
+++ b/data/Leipzig/EBAB-luteDuration16th.xml
@@ -1 +1 @@
-<symbol id="EBAB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M392 83v-3c0 -10 0 -34 -5 -35c-4 0 -28 9 -31 9c1 8 1 15 1 21c0 14 -2 23 -8 27c-13 8 -47 20 -102 36c-68 20 -121 31 -159 31c-8 0 -17 -1 -27 -3c-1 -21 -3 -51 -7 -88l-10 -78l-44 1l8 589c1 4 1 8 1 13c0 0 -2 23 -2 24c0 6 3 9 12 9s31 -3 63 -10l87 -17 c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 25 -128 43l-117 11l3 -82h13c37 0 90 -13 160 -38c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19c0 -11 -13 -55 -14 -62 c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-1h-10c-6 0 -11 -1 -11 -7c0 -14 6 -38 6 -50c0 -10 -2 -18 -4 -25h10c44 0 98 -11 160 -36l105 -44c30 -8 45 -25 45 -50c0 -9 -4 -28 -11 -58h-1c-7 0 -25 11 -29 11 c2 10 4 24 5 33c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2c0 -3 -1 -8 -1 -17c0 -11 2 -58 2 -58c0 -3 -1 -4 -1 -5c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -36c45 -12 67 -37 67 -76z" /></symbol>
\ No newline at end of file
+<symbol id="EBAB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M392 226v-3c0 -10 -4 -44 -9 -45c-4 0 -28 9 -31 9c1 8 5 25 5 31c0 14 -2 23 -8 27c-13 8 -47 27 -102 43c-68 20 -121 24 -159 24c-8 0 -17 -1 -27 -3c-1 -21 -9.38086 -128.922 -11 -166l-6 -144l-44 1l8 740c0.0429688 4.0127 0 8 0 13c0 0 -1 23 -1 24c0 6 3 9 12 9 s31 -3 63 -10l87 -17c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 20 -128 38l-117 16l1 -82h15c37 0 90 -13 160 -38c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19 c0 -11 -13 -55 -14 -62c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-11c-6 0 -8 -1 -8 -7c0 -14 1 -38 1 -50c0 -10 0 -18 -2 -25h10c44 0 98 -11 160 -36l105 -43c30 -11 45 -26 45 -51c0 -9 -4 -28 -11 -58h-1 c-7 0 -25 9 -29 9c2 10 4 26 5 35c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2v-17v-65v-5c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -33c44.2412 -16.0879 67 -40 67 -79z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAC-luteDuration32nd.xml b/data/Leipzig/EBAC-luteDuration32nd.xml
index afc87eadddd..794441ef9c4 100644
--- a/data/Leipzig/EBAC-luteDuration32nd.xml
+++ b/data/Leipzig/EBAC-luteDuration32nd.xml
@@ -1 +1 @@
-<symbol id="EBAC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M50 388c0 -2 2 -35 2 -38v-6h10c41 0 90 -10 150 -32l103 -41c45 -8 66 -31 66 -69c0 -9 -1 -22 -4 -41c-2 -2 -4 -2 -6 -2c-4 0 -21 11 -26 11c1 9 1 17 1 23c0 14 -3 22 -8 25c-15 9 -49 22 -102 39c-68 22 -122 33 -161 33c-12 0 -20 -1 -24 -2l-1 -52h7 c44 0 97 -11 158 -35l101 -42c44 -9 67 -31 67 -69c0 -10 -1 -24 -4 -42c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 1 16 1 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 -1 -25 -3c-1 -105 -1 -162 -3 -178l-44 1l2 676c1 21 -2 27 13 27 c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28 9 -28 16c0 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1c36 0 91 -12 164 -36c81 -27 128 -52 141 -73 c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -18 1 -18 -8c0 -2 1 -7 2 -14c0 -6 1 -14 1 -19c0 -9 -1 -18 -4 -29h9c44 0 100 -13 167 -40l117 -51c27 -9 40 -24 40 -46 c-2 -16 -5 -34 -8 -52c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v29c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 -2 -14 -2 -20z" /></symbol>
\ No newline at end of file
+<symbol id="EBAC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M52 538v-54v-6h10c41 0 90 -10 150 -32l103 -37c45 -12 66 -35 66 -73c0 -9 -2 -31 -5 -50c-2 -2 -4 -2 -6 -2c-4 0 -22 11 -27 11c1 9 3 26 3 32c0 14 -3 22 -8 25c-15 9 -52 21 -105 38c-68 22 -119 34 -158 34c-12 0 -20 -1 -24 -2l-1 -67c3 0 5 -7 7 -7 c44 0 97 -1 158 -25l101 -40c44 -14 67 -41 67 -79c0 -10 -3 -24 -6 -42c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 3 16 3 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 4 -25 2c-1 -105 -2 -281 -4 -297l-44 1l3 826 c0.0762817 21.0029 -2 27 13 27c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28.7328 9.03846 -28 16c2 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1 c36 0 91 -12 164 -36c81 -27 128 -52 141 -73c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -14 1 -14 -8c0 -2 1 -7 2 -14c0 -6 -3 -14 -2 -19c1.76465 -8.8252 2 -18 -1 -29h9 c44 0 96 -13 163 -40l117 -50c26.8054 -11.4553 40 -25 40 -47c-2 -16 -5 -45 -8 -63c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v40c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 0 -14 0 -20z" /></symbol>
\ No newline at end of file
diff --git a/fonts/Leipzig.svg b/fonts/Leipzig.svg
index 23bfc1ee94a..abef620cf1d 100644
--- a/fonts/Leipzig.svg
+++ b/fonts/Leipzig.svg
@@ -2,11 +2,11 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20201107 at Tue Jan 18 09:38:40 2022
+Created by FontForge 20201107 at Tue Jan 18 14:46:26 2022
  By Laurent Pugin
 Created by Etienne Darbellay, Jean-Francois Marti, Laurent Pugin, and Klaus Rettinghaus.
 This font is licensed under the SIL Open Font License \(http://scripts.sil.org/OFL\).
-Version 5.2.65
+Version 5.2.66
 </metadata>
 <defs>
 <font id="Leipzig" horiz-adv-x="1000" >
@@ -1062,30 +1062,31 @@ c-1.52019 0 -2.55487 0.151846 -3.72446 0.151846c-5.08589 0 -8.99941 4.62292 -8.9
 c17.6711 24.5432 27.4372 52.9492 27.4372 81.2492c0 17.607 -2.75619 26.7594 -10.5653 40.4404c-8.59035 13.2529 -22.1772 26.5602 -40.4353 26.5602c-16.4256 0 -28.7492 -8.46116 -36.4676 -19.6099c-6.82344 -10.7226 -10.533 -19.9402 -10.533 -35.3906
 c0 -14.8027 7.45053 -27.4278 16.2003 -36.1777c6.4778 -6.4778 13.0667 -9.82293 21.8002 -9.82293c9.45771 0 21.5864 4 31 4z" />
     <glyph glyph-name="uniEBA7" unicode="&#xeba7;" horiz-adv-x="92" 
-d="M-82 613c12 4 35 8 70 14c38 6 61 10 67 12c7 2 12 2 14 2c7 0 11 -3 13 -9s3 -17 3 -33c0 -23 0 -42 -1 -58c-1 -11 -2 -78 -4 -201c-1 -85 -2 -146 -2 -185c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -15 347 -19 575c0 1 0 6 -1 16c0 4 -2 5 -5 5
-c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10c-2 24 -2 37 -2 38z" />
+d="M-82 763c12 4 35 8 70 14c38 6 61 10 67 12c7 2 12 2 14 2c7 0 11 -3 13 -9s3 -17 3 -33c0 -23 0 -42 -1 -58c-1 -11 -2.55285 -77.9923 -4 -201c-1 -85 2 -296 2 -335c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -23 496.965 -23 725c0 1 0 6 -1 16
+c0 4 -2 5 -5 5c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10c-2 24 -2 37 -2 38z" />
     <glyph glyph-name="uniEBA8" unicode="&#xeba8;" horiz-adv-x="403" 
-d="M-0 -0l9 621c0 9 1 15 2 19c2 3 6 5 12 5c0 0 12 -1 36 -4c79 -10 136 -17 172 -24c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5 -105 -7 -202c-2 -104 -8 -229 -19 -380z" />
+d="M-1 1l10 770c0.128549 8.9984 1 15 2 19c2 3 6 5 12 5c0 0 12 -1 36 -4c79 -10 136 -17 172 -24c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5.13456 -104.997 -7 -202
+c-2 -104 -9 -378 -20 -529z" />
     <glyph glyph-name="uniEBAA" unicode="&#xebaa;" horiz-adv-x="393" 
-d="M-0 -0l8 590c0 2 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39
-c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c0 0 1 -1 1 -3s1 -5 1 -10
-s1 -10 1 -14c2 -15 3 -27 3 -35c0 -11 -2 -20 -4 -27c3 0 6 1 9 1c43 0 95 -11 155 -31l99 -36c44 -9 66 -32 66 -70c0 -11 0 -25 -3 -41c-2 -2 -4 -3 -6 -3c-3 0 -8 2 -14 6c-7 4 -10 6 -12 6c1 8 1 15 1 21c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31
-c-11 0 -21 -1 -27 -2c-5 -36 -8 -80 -10 -138c-3 -73 -6 -120 -8 -141h-44z" />
+d="M377 435c-10.2893 0 -30 5.49144 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -98 26 -125 26c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c1.65723 -1.6582 2 -7.52637 2 -13v-49c0 -11 2 -20 0 -27c3 0 6 1 9 1c43 0 91 -11 151 -31l99 -34
+c44 -13 66 -34 66 -72c0 -11 -3 -26 -6 -42c-2 -2 -4 -3 -6 -3c-4.08008 0 -23.2266 5 -26 5c1 8 4 23 4 29c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31c-11 0 -23 -1 -29 -2c-5 -36 -3.61719 -80.0146 -6 -138c-3 -73 -8 -270 -10 -291h-44l8 740
+c0.0216185 1.99971 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c0 0 -27 10.6258 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39
+c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21c0 -11.5061 -9.94969 -66 -13 -66z" />
     <glyph glyph-name="uniEBA9" unicode="&#xeba9;" horiz-adv-x="389" 
-d="M-0 -0l8 590v36c0 6 3 9 8 9l35 -5l80 -9c37 -5 72 -13 107 -25c46 -15 90 -36 132 -63c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39
-c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -4 -63 -9 -187
-c-5 -142 -8 -221 -11 -246h-44z" />
+d="M0 0l8 740v36c0 6 3 9 8 9l35 -5l80 -9c37 -5 72 -13 107 -25c46 -15 90 -36 132 -63c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39
+c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -4.63296 -62.9761 -9 -187
+c-5 -142 -8 -371 -11 -396h-44z" />
     <glyph glyph-name="uniEBAB" unicode="&#xebab;" horiz-adv-x="392" 
-d="M392 83v-3c0 -10 0 -34 -5 -35c-4 0 -28 9 -31 9c1 8 1 15 1 21c0 14 -2 23 -8 27c-13 8 -47 20 -102 36c-68 20 -121 31 -159 31c-8 0 -17 -1 -27 -3c-1 -21 -3 -51 -7 -88l-10 -78l-44 1l8 589c1 4 1 8 1 13c0 0 -2 23 -2 24c0 6 3 9 12 9s31 -3 63 -10l87 -17
-c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 25 -128 43l-117 11l3 -82h13c37 0 90 -13 160 -38c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19c0 -11 -13 -55 -14 -62
-c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-1h-10c-6 0 -11 -1 -11 -7c0 -14 6 -38 6 -50c0 -10 -2 -18 -4 -25h10c44 0 98 -11 160 -36l105 -44c30 -8 45 -25 45 -50c0 -9 -4 -28 -11 -58h-1c-7 0 -25 11 -29 11
-c2 10 4 24 5 33c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2c0 -3 -1 -8 -1 -17c0 -11 2 -58 2 -58c0 -3 -1 -4 -1 -5c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -36c45 -12 67 -37 67 -76z" />
+d="M392 226v-3c0 -10 -4 -44 -9 -45c-4 0 -28 9 -31 9c1 8 5 25 5 31c0 14 -2 23 -8 27c-13 8 -47 27 -102 43c-68 20 -121 24 -159 24c-8 0 -17 -1 -27 -3c-1 -21 -9.38086 -128.922 -11 -166l-6 -144l-44 1l8 740c0.0429688 4.0127 0 8 0 13c0 0 -1 23 -1 24c0 6 3 9 12 9
+s31 -3 63 -10l87 -17c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 20 -128 38l-117 16l1 -82h15c37 0 90 -13 160 -38c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19
+c0 -11 -13 -55 -14 -62c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-11c-6 0 -8 -1 -8 -7c0 -14 1 -38 1 -50c0 -10 0 -18 -2 -25h10c44 0 98 -11 160 -36l105 -43c30 -11 45 -26 45 -51c0 -9 -4 -28 -11 -58h-1
+c-7 0 -25 9 -29 9c2 10 4 26 5 35c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2v-17v-65v-5c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -33c44.2412 -16.0879 67 -40 67 -79z" />
     <glyph glyph-name="uniEBAC" unicode="&#xebac;" horiz-adv-x="381" 
-d="M50 388c0 -2 2 -35 2 -38v-6h10c41 0 90 -10 150 -32l103 -41c45 -8 66 -31 66 -69c0 -9 -1 -22 -4 -41c-2 -2 -4 -2 -6 -2c-4 0 -21 11 -26 11c1 9 1 17 1 23c0 14 -3 22 -8 25c-15 9 -49 22 -102 39c-68 22 -122 33 -161 33c-12 0 -20 -1 -24 -2l-1 -52h7
-c44 0 97 -11 158 -35l101 -42c44 -9 67 -31 67 -69c0 -10 -1 -24 -4 -42c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 1 16 1 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 -1 -25 -3c-1 -105 -1 -162 -3 -178l-44 1l2 676c1 21 -2 27 13 27
-c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28 9 -28 16c0 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1c36 0 91 -12 164 -36c81 -27 128 -52 141 -73
-c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -18 1 -18 -8c0 -2 1 -7 2 -14c0 -6 1 -14 1 -19c0 -9 -1 -18 -4 -29h9c44 0 100 -13 167 -40l117 -51c27 -9 40 -24 40 -46
-c-2 -16 -5 -34 -8 -52c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v29c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 -2 -14 -2 -20z" />
+d="M52 538v-54v-6h10c41 0 90 -10 150 -32l103 -37c45 -12 66 -35 66 -73c0 -9 -2 -31 -5 -50c-2 -2 -4 -2 -6 -2c-4 0 -22 11 -27 11c1 9 3 26 3 32c0 14 -3 22 -8 25c-15 9 -52 21 -105 38c-68 22 -119 34 -158 34c-12 0 -20 -1 -24 -2l-1 -67c3 0 5 -7 7 -7
+c44 0 97 -1 158 -25l101 -40c44 -14 67 -41 67 -79c0 -10 -3 -24 -6 -42c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 3 16 3 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 4 -25 2c-1 -105 -2 -281 -4 -297l-44 1l3 826
+c0.0762817 21.0029 -2 27 13 27c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28.7328 9.03846 -28 16c2 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1
+c36 0 91 -12 164 -36c81 -27 128 -52 141 -73c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -14 1 -14 -8c0 -2 1 -7 2 -14c0 -6 -3 -14 -2 -19c1.76465 -8.8252 2 -18 -1 -29h9
+c44 0 96 -13 163 -40l117 -50c26.8054 -11.4553 40 -25 40 -47c-2 -16 -5 -45 -8 -63c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v40c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 0 -14 0 -20z" />
     <glyph glyph-name="uniE24C" unicode="&#xe24c;" horiz-adv-x="274" 
 d="M251 484c4 19 4 34 4 49v11c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c37 -34 74 -75 97 -125zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119
 zM276 -196c0 -58 -10 -86 -19 -97c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v1330h22

From fcd9249bdc57877370920736c8c8b99369706f21 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 18 Jan 2022 17:37:57 +0200
Subject: [PATCH 088/403] Adjust how beams are lengthened based on the stems

- changed logic to take into account duration of middle notes in the beams into consideration when checking whether stems should be lengthened
---
 src/beam.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index f1bdbf158eb..2d53d63b8b4 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -811,16 +811,26 @@ void BeamSegment::CalcAdjustSlope(Staff *staff, Doc *doc, BeamDrawingInterface *
     // We can actually tolerate a stem slightly shorter within the beam
     refLen -= unit;
 
-    int lengthen = 0;
+    bool lengthen = false;
     for (auto coord : m_beamElementCoordRefs) {
         if (coord->m_stem && coord->m_closestNote) {
-            // Here we should look at duration to because longer values in the middle could actually be OK as they are
-            int len = abs(coord->m_yBeam - coord->m_closestNote->GetDrawingY());
-            if (len < refLen) lengthen = std::max(lengthen, refLen - len);
+            const int len = abs(coord->m_yBeam - coord->m_closestNote->GetDrawingY());
+            if (len < refLen) {
+                lengthen = true;
+                break;
+            }
+            // Here we should look at duration too because longer values in the middle could actually be OK as they are
+            else if ((coord != m_lastNoteOrChord) || (coord != m_firstNoteOrChord)) {
+                const int durLen = len - (coord->m_dur - DUR_8) * beamInterface->m_beamWidthBlack;
+                if (durLen < refLen) {
+                    lengthen = true;
+                    break;
+                }
+            }
         }
     }
     // We need to legthen the stems
-    if (lengthen > 0) {
+    if (lengthen) {
         // First if the slope step is 4 units (or more?) reduce it to 2 units and try again (recursive call)
         if (step >= 4 * unit) {
             step = 2 * unit;

From 626429480508a56363a4d22813f927985894a545 Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Tue, 18 Jan 2022 17:35:24 +0000
Subject: [PATCH 089/403] Feedback from PR.

---
 include/vrv/layer.h |  5 +++++
 include/vrv/staff.h |  5 -----
 src/layer.cpp       | 20 ++++++++++++++++++++
 src/staff.cpp       | 20 --------------------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/include/vrv/layer.h b/include/vrv/layer.h
index 61be6ecac91..29f23dd87a9 100644
--- a/include/vrv/layer.h
+++ b/include/vrv/layer.h
@@ -246,6 +246,11 @@ class Layer : public Object,
      */
     int ResetDrawing(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::GenerateMIDIEnd
+     */
+    int GenerateMIDIEnd(FunctorParams *functorParams) override;
+
 private:
     //
 public:
diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index bcbeca93305..df2d85cc7ba 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -248,11 +248,6 @@ class Staff : public Object,
      */
     int GenerateMIDI(FunctorParams *functorParams) override;
 
-    /**
-     * See Object::GenerateMIDIEnd
-     */
-    int GenerateMIDIEnd(FunctorParams *functorParams) override;
-
 private:
     /**
      * Add the ledger line dashes to the legderline array.
diff --git a/src/layer.cpp b/src/layer.cpp
index 98235e6eb06..ada74a8f1ca 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -33,6 +33,8 @@
 #include "staffdef.h"
 #include "vrv.h"
 
+#include "MidiFile.h"
+
 namespace vrv {
 
 //----------------------------------------------------------------------------
@@ -734,4 +736,22 @@ int Layer::ResetDrawing(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Layer::GenerateMIDIEnd(FunctorParams *functorParams)
+{
+    GenerateMIDIParams *params = vrv_params_cast<GenerateMIDIParams *>(functorParams);
+    assert(params);
+
+    // stop all previously held notes
+    for (auto &held : params->m_heldNotes) {
+        if (held.m_pitch > 0) {
+            params->m_midiFile->addNoteOff(params->m_midiTrack, held.m_stopTime * params->m_midiFile->getTPQ(),
+                params->m_midiChannel, held.m_pitch);
+        }
+    }
+
+    params->m_heldNotes.clear();
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/staff.cpp b/src/staff.cpp
index 08b1857bf40..e9e4b883b3e 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -33,8 +33,6 @@
 #include "vrv.h"
 #include "zone.h"
 
-#include "MidiFile.h"
-
 namespace vrv {
 
 //----------------------------------------------------------------------------
@@ -718,22 +716,4 @@ int Staff::GenerateMIDI(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
-int Staff::GenerateMIDIEnd(FunctorParams *functorParams)
-{
-    GenerateMIDIParams *params = vrv_params_cast<GenerateMIDIParams *>(functorParams);
-    assert(params);
-
-    // stop all previously held notes
-    for (auto &held : params->m_heldNotes) {
-        if (held.m_pitch > 0) {
-            params->m_midiFile->addNoteOff(params->m_midiTrack, held.m_stopTime * params->m_midiFile->getTPQ(),
-                params->m_midiChannel, held.m_pitch);
-        }
-    }
-
-    params->m_heldNotes.clear();
-
-    return FUNCTOR_CONTINUE;
-}
-
 } // namespace vrv

From 5474ee9f406318f4772fc3e62e2d8335f9037ddf Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 19 Jan 2022 13:18:53 +0100
Subject: [PATCH 090/403] Apply to find ancestor staff

---
 include/vrv/layerelement.h  |  2 +-
 src/arpeg.cpp               |  9 +++----
 src/artic.cpp               | 14 +++--------
 src/beam.cpp                | 10 +++-----
 src/chord.cpp               |  9 +++----
 src/clef.cpp                |  6 ++---
 src/editortoolkit_neume.cpp | 15 ++++--------
 src/elementpart.cpp         |  3 +--
 src/ftrem.cpp               |  3 +--
 src/horizontalaligner.cpp   |  4 +---
 src/iopae.cpp               |  3 +--
 src/layer.cpp               |  3 +--
 src/layerelement.cpp        | 42 ++++++++++++---------------------
 src/ligature.cpp            |  3 +--
 src/mrest.cpp               |  3 +--
 src/note.cpp                | 47 ++++++++++++-------------------------
 src/rest.cpp                | 13 +++-------
 src/slur.cpp                | 10 ++++----
 src/tie.cpp                 |  4 ++--
 src/timeinterface.cpp       | 10 ++++----
 src/tuplet.cpp              |  8 +++----
 src/verse.cpp               |  4 ++--
 src/view_control.cpp        |  3 +--
 src/view_page.cpp           |  2 +-
 src/view_slur.cpp           |  7 +++---
 25 files changed, 81 insertions(+), 156 deletions(-)

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 6c52f85a487..cd825acbe79 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -185,7 +185,7 @@ class LayerElement : public Object,
     /**
      * Find the ancestor or cross staff
      */
-    Staff *FindStaff(StaffSearch strategy);
+    Staff *FindStaff(StaffSearch strategy, bool assertExistence = true) const;
 
     /**
      * Look for a cross or a a parent LayerElement (note, chord, rest) with a cross staff.
diff --git a/src/arpeg.cpp b/src/arpeg.cpp
index 2efcb51bbb5..d6ba14beef4 100644
--- a/src/arpeg.cpp
+++ b/src/arpeg.cpp
@@ -226,13 +226,10 @@ int Arpeg::AdjustArpeg(FunctorParams *functorParams)
     // We should have call DrawArpeg before
     assert(this->GetCurrentFloatingPositioner());
 
-    Staff *topStaff = vrv_cast<Staff *>(topNote->GetFirstAncestor(STAFF));
-    assert(topStaff);
+    Staff *topStaff = topNote->FindStaff(ANCESTOR_ONLY);
+    Staff *bottomStaff = bottomNote->FindStaff(ANCESTOR_ONLY);
 
-    Staff *bottomStaff = vrv_cast<Staff *>(bottomNote->GetFirstAncestor(STAFF));
-    assert(bottomStaff);
-
-    Staff *crossStaff = GetCrossStaff();
+    Staff *crossStaff = this->GetCrossStaff();
     const int staffN = (crossStaff != NULL) ? crossStaff->GetN() : topStaff->GetN();
 
     int minTopLeft, maxTopRight;
diff --git a/src/artic.cpp b/src/artic.cpp
index beb8100594b..5cd1b1dfa6d 100644
--- a/src/artic.cpp
+++ b/src/artic.cpp
@@ -399,17 +399,10 @@ int Artic::AdjustArtic(FunctorParams *functorParams)
 
     int yIn, yOut, yRel;
 
-    // Get the parent or cross-staff / layer
-
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
-
-    if (m_crossStaff) {
-        staff = m_crossStaff;
-    }
-
+    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
     Beam *beam = dynamic_cast<Beam *>(GetFirstAncestor(BEAM));
     int staffYBottom = -params->m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize);
+
     // Avoid in artic to be in legder lines
     if (this->GetDrawingPlace() == STAFFREL_above) {
         yIn = std::max(
@@ -550,8 +543,7 @@ int Artic::CalculateHorizontalShift(Doc *doc, LayerElement *parent, data_STEMDIR
     switch (artic) {
         case ARTICULATION_stacc:
         case ARTICULATION_stacciss: {
-            Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-            assert(staff);
+            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
             const int stemWidth = doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
             if ((stemDir == STEMDIRECTION_up) && (m_drawingPlace == STAFFREL_above)) {
                 shift += shift - stemWidth / 2;
diff --git a/src/beam.cpp b/src/beam.cpp
index 866078356fb..757b36a97b2 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1292,9 +1292,7 @@ void Beam::FilterList(ArrayOfObjects *childList)
         }
     }
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
-    Staff *beamStaff = staff;
+    Staff *beamStaff = this->FindStaff(ANCESTOR_ONLY);
     /*
     if (this->HasBeamWith()) {
         Measure *measure = vrv_cast<Measure *>(this->GetFirstAncestor(MEASURE));
@@ -1518,8 +1516,7 @@ int Beam::CalcLayerOverlap(Doc *doc, Object *beam, int directionBias, int y1, in
     auto collidingElementsList = parentLayer->GetLayerElementsForTimeSpanOf(this, true);
     if (collidingElementsList.empty()) return 0;
 
-    Staff *staff = vrv_cast<Staff *>(GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
 
     int leftMargin = 0;
     int rightMargin = 0;
@@ -1596,8 +1593,7 @@ int Beam::AdjustBeams(FunctorParams *functorParams)
 
     const int overlapMargin = std::max(leftMargin * params->m_directionBias, rightMargin * params->m_directionBias);
     if (overlapMargin >= params->m_overlapMargin) {
-        Staff *staff = vrv_cast<Staff *>(GetFirstAncestor(STAFF));
-        assert(staff);
+        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
         const int staffOffset = params->m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
         params->m_overlapMargin = (overlapMargin + staffOffset) * params->m_directionBias;
     }
diff --git a/src/chord.cpp b/src/chord.cpp
index 22fb033ac14..54da06946a3 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -610,8 +610,7 @@ int Chord::CalcArtic(FunctorParams *functorParams)
     params->m_parent = this;
     params->m_stemDir = this->GetDrawingStemDir();
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
 
@@ -681,8 +680,7 @@ int Chord::CalcStem(FunctorParams *functorParams)
 
     Stem *stem = this->GetDrawingStem();
     assert(stem);
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
 
@@ -944,8 +942,7 @@ int Chord::AdjustCrossStaffContent(FunctorParams *functorParams)
         }
 
         // Reposition the stem
-        Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-        assert(staff);
+        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
         Staff *rootStaff
             = (stem->GetDrawingStemDir() == STEMDIRECTION_up) ? extremalStaves.back() : extremalStaves.front();
         stem->SetDrawingYRel(stem->GetDrawingYRel() + getShift(staff) - getShift(rootStaff));
diff --git a/src/clef.cpp b/src/clef.cpp
index 8c3c3e9caeb..f296da27b6f 100644
--- a/src/clef.cpp
+++ b/src/clef.cpp
@@ -184,8 +184,7 @@ int Clef::AdjustBeams(FunctorParams *functorParams)
     assert(params);
     if (!params->m_beam) return FUNCTOR_SIBLINGS;
 
-    Staff *staff = vrv_cast<Staff *>(GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
 
     auto currentShapeIter = topToMiddleProportions.find(GetShape());
     if (currentShapeIter == topToMiddleProportions.end()) return FUNCTOR_CONTINUE;
@@ -235,8 +234,7 @@ int Clef::AdjustClefChanges(FunctorParams *functorParams)
 
     assert(params->m_aligner);
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
 
     // Create ad comparison object for each type / @n
     std::vector<int> ns;
diff --git a/src/editortoolkit_neume.cpp b/src/editortoolkit_neume.cpp
index 2860b9ea08b..6e0a39ea39e 100644
--- a/src/editortoolkit_neume.cpp
+++ b/src/editortoolkit_neume.cpp
@@ -2194,8 +2194,7 @@ bool EditorToolkitNeume::ChangeGroup(std::string elementId, std::string contour)
     int initialLrx = firstChild->GetZone()->GetLrx();
     int initialLry = firstChild->GetZone()->GetLry();
 
-    Staff *staff = vrv_cast<Staff *>(el->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = el->FindStaff(ANCESTOR_ONLY);
     Facsimile *facsimile = m_doc->GetFacsimile();
 
     const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
@@ -2294,8 +2293,7 @@ bool EditorToolkitNeume::ToggleLigature(std::vector<std::string> elementIds, std
         int ligLrx = firstNc->GetZone()->GetLrx();
         int ligLry = firstNc->GetZone()->GetLry();
 
-        Staff *staff = vrv_cast<Staff *>(firstNc->GetFirstAncestor(STAFF));
-        assert(staff);
+        Staff *staff = firstNc->FindStaff(ANCESTOR_ONLY);
 
         const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
         const int noteWidth = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 1.4);
@@ -2782,8 +2780,7 @@ bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj, Clef *clef)
 
     if (obj->Is(CUSTOS)) {
         Custos *custos = dynamic_cast<Custos *>(obj);
-        Staff *staff = vrv_cast<Staff *>(custos->GetFirstAncestor(STAFF));
-        assert(staff);
+        Staff *staff = custos->FindStaff(ANCESTOR_ONLY);
 
         // Check interfaces
         if ((custos->GetPitchInterface() == NULL) || (custos->GetFacsimileInterface() == NULL)) {
@@ -2843,8 +2840,7 @@ bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj, Clef *clef)
 
     else if (obj->Is(SYLLABLE)) {
         Syllable *syl = dynamic_cast<Syllable *>(obj);
-        Staff *staff = vrv_cast<Staff *>(syl->GetFirstAncestor(STAFF));
-        assert(staff);
+        Staff *staff = syl->FindStaff(ANCESTOR_ONLY);
 
         ListOfObjects pitchedChildren;
         InterfaceComparison ic(INTERFACE_PITCH);
@@ -2921,9 +2917,8 @@ bool EditorToolkitNeume::AdjustClefLineFromPosition(Clef *clef, Staff *staff)
     assert(clef);
 
     if (staff == NULL) {
-        staff = dynamic_cast<Staff *>(clef->GetFirstAncestor(STAFF));
+        staff = clef->FindStaff(ANCESTOR_ONLY);
     }
-    assert(staff);
 
     if (!clef->HasFacs() || !staff->HasFacs()) {
         return false;
diff --git a/src/elementpart.cpp b/src/elementpart.cpp
index 2d4d8c82d32..f13af9d2068 100644
--- a/src/elementpart.cpp
+++ b/src/elementpart.cpp
@@ -307,8 +307,7 @@ bool Stem::IsSupportedChild(Object *child)
 
 int Stem::CompareToElementPosition(Doc *doc, LayerElement *otherElement, int margin)
 {
-    Staff *staff = vrv_cast<Staff *>(GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
 
     // check if there is an overlap on the left or on the right and displace stem's parent correspondingly
     const int right = HorizontalLeftOverlap(otherElement, doc, margin, 0);
diff --git a/src/ftrem.cpp b/src/ftrem.cpp
index 8b23825fec2..abd3e82ff70 100644
--- a/src/ftrem.cpp
+++ b/src/ftrem.cpp
@@ -101,8 +101,7 @@ void FTrem::FilterList(ArrayOfObjects *childList)
         ++iter;
     }
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
 
     this->InitCoords(childList, staff, BEAMPLACE_NONE);
     this->InitCue(false);
diff --git a/src/horizontalaligner.cpp b/src/horizontalaligner.cpp
index c2aceeb0e8b..25b1774ff91 100644
--- a/src/horizontalaligner.cpp
+++ b/src/horizontalaligner.cpp
@@ -1163,9 +1163,7 @@ int Alignment::AdjustDotsEnd(FunctorParams *functorParams)
         // otherwise they should be kept separate
         for (auto dot : params->m_dots) {
             // A third staff size will be used as required margin
-            const Staff *staff
-                = vrv_cast<Staff *>(dot->m_crossStaff ? dot->m_crossStaff : dot->GetFirstAncestor(STAFF));
-            assert(staff);
+            const Staff *staff = dot->FindStaff(RESOLVE_CROSSSTAFF);
             const int staffSize = staff->m_drawingStaffSize;
             const int thirdUnit = params->m_doc->GetDrawingUnit(staffSize) / 3;
 
diff --git a/src/iopae.cpp b/src/iopae.cpp
index 5a5f14ac267..2cd73976dba 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -498,8 +498,7 @@ void PAEOutput::WriteTuplet(Tuplet *tuplet)
 {
     assert(tuplet);
 
-    Staff *staff = vrv_cast<Staff *>(tuplet->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = tuplet->FindStaff(ANCESTOR_ONLY);
 
     double content = tuplet->GetContentAlignmentDuration(NULL, NULL, true, staff->m_drawingNotationType);
     // content = DUR_MAX / 2^(dur - 2)
diff --git a/src/layer.cpp b/src/layer.cpp
index dd49cf7da61..96e31e5328c 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -282,8 +282,7 @@ data_STEMDIRECTION Layer::GetDrawingStemDir(const ArrayOfBeamElementCoords *coor
     assert(alignmentLast);
 
     // We are ignoring cross-staff situation here because this should not be called if we have one
-    Staff *staff = vrv_cast<Staff *>(first->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = first->FindStaff(ANCESTOR_ONLY);
 
     double time = alignmentFirst->GetTime();
     double duration = alignmentLast->GetTime() - time + last->GetAlignmentDuration();
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 111f11457ee..0a9260f61d8 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -242,7 +242,7 @@ int LayerElement::GetOriginalLayerN()
     return layerN;
 }
 
-Staff *LayerElement::FindStaff(const StaffSearch strategy)
+Staff *LayerElement::FindStaff(const StaffSearch strategy, const bool assertExistence) const
 {
     Staff *staff = NULL;
     if (strategy == RESOLVE_CROSSSTAFF) {
@@ -250,7 +250,7 @@ Staff *LayerElement::FindStaff(const StaffSearch strategy)
         staff = this->GetCrossStaff(layer);
     }
     if (!staff) staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    if (assertExistence) assert(staff);
     return staff;
 }
 
@@ -274,8 +274,7 @@ data_STAFFREL_basic LayerElement::GetCrossStaffRel()
 {
     if (!m_crossStaff) return STAFFREL_basic_NONE;
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
 
     return (m_crossStaff->GetN() < staff->GetN()) ? STAFFREL_basic_above : STAFFREL_basic_below;
 }
@@ -575,9 +574,8 @@ int LayerElement::GetDrawingRadius(Doc *doc, bool isInLigature)
 
     wchar_t code = 0;
     int dur = DUR_4;
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
     bool isMensuralDur = false;
-    assert(staff);
     if (this->Is(NOTE)) {
         Note *note = vrv_cast<Note *>(this);
         assert(note);
@@ -830,7 +828,7 @@ MapOfDotLocs LayerElement::CalcOptimalDotLocations()
         return {};
     }
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
     const int layerCount = staff->GetChildCount(LAYER);
 
     // Calculate primary/secondary dot locations
@@ -1104,9 +1102,7 @@ int LayerElement::AlignHorizontally(FunctorParams *functorParams)
         m_alignment = note->GetAlignment();
     }
     else if (this->Is(SYL)) {
-        Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-        assert(staff);
-
+        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
         if (staff->m_drawingNotationType == NOTATIONTYPE_neume) {
             type = ALIGNMENT_DEFAULT;
         }
@@ -1158,8 +1154,7 @@ int LayerElement::AlignHorizontally(FunctorParams *functorParams)
     else {
         assert(this->IsGraceNote());
         if (this->Is(CHORD) || (this->Is(NOTE) && !chordParent)) {
-            Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-            assert(staff);
+            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
             int graceAlignerId = params->m_doc->GetOptions()->m_graceRhythmAlign.GetValue() ? 0 : staff->GetN();
             GraceAligner *graceAligner = m_alignment->GetGraceAligner(graceAlignerId);
             // We know that this is a note or a chord - we stack them and they will be added at the end of the layer
@@ -1186,8 +1181,7 @@ int LayerElement::SetAlignmentPitchPos(FunctorParams *functorParams)
     if (this->IsScoreDefElement()) return FUNCTOR_SIBLINGS;
 
     LayerElement *layerElementY = this;
-    Staff *staffY = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staffY);
+    Staff *staffY = this->FindStaff(ANCESTOR_ONLY);
     Layer *layerY = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layerY);
 
@@ -1285,8 +1279,7 @@ int LayerElement::SetAlignmentPitchPos(FunctorParams *functorParams)
         // Automatically calculate rest position
         else {
             // set default location to the middle of the staff
-            Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-            assert(staff);
+            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
             loc = staff->m_drawingLines - 1;
             if (loc % 2 != 0) --loc;
             if (staff->m_drawingLines > 1) loc += 2;
@@ -1314,8 +1307,7 @@ int LayerElement::SetAlignmentPitchPos(FunctorParams *functorParams)
         // Automatically calculate rest position
         else {
             // set default location to the middle of the staff
-            Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-            assert(staff);
+            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
             loc = staff->m_drawingLines - 1;
             if ((rest->GetDur() < DUR_4) && (loc % 2 != 0)) --loc;
             // Adjust special cases
@@ -1467,8 +1459,7 @@ int LayerElement::AdjustBeams(FunctorParams *functorParams)
         if (accid->GetFunc() == accidLog_FUNC_edit) return FUNCTOR_CONTINUE;
     }
 
-    Staff *staff = vrv_cast<Staff *>(GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
 
     // check if top/bottom of the element overlaps with beam coordinates
     int leftMargin = 0, rightMargin = 0;
@@ -1579,8 +1570,7 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
     const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted, bool isChordElement, bool isLowerElement,
     bool unison)
 {
-    Staff *staff = vrv_cast<Staff *>(GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
 
     bool isInUnison = false;
     int shift = 0;
@@ -1888,7 +1878,7 @@ int LayerElement::AdjustXPos(FunctorParams *functorParams)
                         overlap = std::max(overlap, element->GetSelfRight() - this->GetSelfLeft() + margin);
                     }
                     else if (this->Is(ACCID) && element->Is(NOTE)) {
-                        Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
+                        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
                         const int staffTop = staff->GetDrawingY();
                         const int staffBottom = staffTop - params->m_doc->GetDrawingStaffSize(params->m_staffSize);
                         int verticalMargin = 0;
@@ -2070,8 +2060,7 @@ int LayerElement::PrepareCrossStaff(FunctorParams *functorParams)
         return FUNCTOR_CONTINUE;
     }
 
-    Staff *parentStaff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(parentStaff);
+    Staff *parentStaff = this->FindStaff(ANCESTOR_ONLY);
     // Check if we have a cross-staff to itself...
     if (m_crossStaff == parentStaff) {
         LogWarning("The cross staff reference '%d' for element '%s' seems to be identical to the parent staff",
@@ -2349,8 +2338,7 @@ int LayerElement::FindSpannedLayerElements(FunctorParams *functorParams)
 
         // Skip if neither parent staff nor cross staff matches the given staff number
         if (!params->m_staffNs.empty()) {
-            Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-            assert(staff);
+            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
             if (params->m_staffNs.find(staff->GetN()) == params->m_staffNs.end()) {
                 Layer *layer = NULL;
                 staff = this->GetCrossStaff(layer);
diff --git a/src/ligature.cpp b/src/ligature.cpp
index 8664fb0939a..86cd7984ea2 100644
--- a/src/ligature.cpp
+++ b/src/ligature.cpp
@@ -136,8 +136,7 @@ int Ligature::CalcLigatureNotePos(FunctorParams *functorParams)
     m_drawingShapes.clear();
 
     Note *lastNote = dynamic_cast<Note *>(this->GetList(this)->back());
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
 
     const ArrayOfObjects *notes = this->GetList(this);
     assert(notes);
diff --git a/src/mrest.cpp b/src/mrest.cpp
index 9617260d0a6..a969bf1197e 100644
--- a/src/mrest.cpp
+++ b/src/mrest.cpp
@@ -90,8 +90,7 @@ int MRest::ResetHorizontalAlignment(FunctorParams *functorParams)
 int MRest::GetOptimalLayerLocation(Staff *staff, Layer *layer, int defaultLocation)
 {
     if (!layer) return defaultLocation;
-    Staff *parentStaff = vrv_cast<Staff *>(GetFirstAncestor(STAFF));
-    assert(parentStaff);
+    Staff *parentStaff = this->FindStaff(ANCESTOR_ONLY);
 
     // handle rest positioning for 2 layers. 3 layers and more are much more complex to solve
     if (parentStaff->GetChildCount(LAYER) != 2) return defaultLocation;
diff --git a/src/note.cpp b/src/note.cpp
index d29d4c622fc..6f236848cca 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -211,8 +211,7 @@ Accid *Note::GetDrawingAccid()
 bool Note::HasLedgerLines(int &linesAbove, int &linesBelow, Staff *staff)
 {
     if (!staff) {
-        staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-        assert(staff);
+        staff = this->FindStaff(ANCESTOR_ONLY);
     }
 
     linesAbove = (this->GetDrawingLoc() - staff->m_drawingLines * 2 + 2) / 2;
@@ -456,8 +455,7 @@ wchar_t Note::GetMensuralNoteheadGlyph() const
         return 0;
     }
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
     bool mensural_black = (staff->m_drawingNotationType == NOTATIONTYPE_mensural_black);
 
     wchar_t code = 0;
@@ -620,8 +618,7 @@ void Note::CalcMIDIPitch(int shift)
     }
     else if (this->HasTabCourse()) {
         // tablature
-        Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-        assert(staff);
+        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
         if (staff->m_drawingTuning) {
             m_MIDIPitch = staff->m_drawingTuning->CalcPitchNumber(
                 this->GetTabCourse(), this->GetTabFret(), staff->m_drawingNotationType);
@@ -865,8 +862,7 @@ int Note::CalcArtic(FunctorParams *functorParams)
     params->m_parent = this;
     params->m_stemDir = this->GetDrawingStemDir();
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
 
@@ -934,8 +930,7 @@ int Note::CalcStem(FunctorParams *functorParams)
 
     Stem *stem = this->GetDrawingStem();
     assert(stem);
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
 
@@ -987,8 +982,8 @@ int Note::CalcChordNoteHeads(FunctorParams *functorParams)
     FunctorDocParams *params = vrv_params_cast<FunctorDocParams *>(functorParams);
     assert(params);
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    const int staffSize = staff->m_drawingStaffSize;
 
     bool mixedCue = false;
     if (Chord *chord = this->IsChordTone(); chord != NULL) {
@@ -998,10 +993,6 @@ int Note::CalcChordNoteHeads(FunctorParams *functorParams)
     // Nothing to do for notes that are not in a cluster and without cue mixing
     if (!m_cluster && !mixedCue) return FUNCTOR_SIBLINGS;
 
-    if (m_crossStaff) staff = m_crossStaff;
-
-    int staffSize = staff->m_drawingStaffSize;
-
     int diameter = 2 * this->GetDrawingRadius(params->m_doc);
 
     // If chord consists partially of cue notes we may have to shift the noteheads
@@ -1097,13 +1088,9 @@ int Note::CalcDots(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
-
-    if (m_crossStaff) staff = m_crossStaff;
-
-    bool drawingCueSize = this->GetDrawingCueSize();
-    int staffSize = staff->m_drawingStaffSize;
+    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    const int staffSize = staff->m_drawingStaffSize;
+    const bool drawingCueSize = this->GetDrawingCueSize();
 
     Dots *dots = NULL;
     Chord *chord = this->IsChordTone();
@@ -1165,19 +1152,15 @@ int Note::CalcLedgerLines(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
-
     if (!this->IsVisible()) {
         return FUNCTOR_SIBLINGS;
     }
 
-    if (m_crossStaff) staff = m_crossStaff;
-
-    bool drawingCueSize = this->GetDrawingCueSize();
-    int staffSize = staff->m_drawingStaffSize;
-    int staffX = staff->GetDrawingX();
-    int radius = GetDrawingRadius(params->m_doc);
+    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    const int staffSize = staff->m_drawingStaffSize;
+    const int staffX = staff->GetDrawingX();
+    const bool drawingCueSize = this->GetDrawingCueSize();
+    const int radius = this->GetDrawingRadius(params->m_doc);
 
     /************** Ledger lines: **************/
 
diff --git a/src/rest.cpp b/src/rest.cpp
index 95cbef4f7a6..30792c475e9 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -521,8 +521,7 @@ int Rest::AdjustBeams(FunctorParams *functorParams)
     // Adjustment should be an even number, so that the rest is positioned properly
     const int overlapMargin = std::min(leftMargin, rightMargin);
     if (overlapMargin < 0) {
-        Staff *staff = vrv_cast<Staff *>(GetFirstAncestor(STAFF));
-        assert(staff);
+        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
         if ((!HasOloc() || !HasPloc()) && !HasLoc()) {
             const int unit = params->m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
             const int locAdjust = (params->m_directionBias * (overlapMargin - 2 * unit + 1) / unit);
@@ -608,11 +607,7 @@ int Rest::CalcDots(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
-
-    if (m_crossStaff) staff = m_crossStaff;
-
+    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
     const bool drawingCueSize = this->GetDrawingCueSize();
     const int staffSize = staff->m_drawingStaffSize;
 
@@ -676,9 +671,7 @@ int Rest::Transpose(FunctorParams *functorParams)
     if ((!HasOloc() || !HasPloc()) && !HasLoc()) return FUNCTOR_SIBLINGS;
 
     // Find whether current layer is top, middle (either one if multiple) or bottom
-    Staff *parentStaff = vrv_cast<Staff *>(GetFirstAncestor(STAFF));
-    assert(parentStaff);
-
+    Staff *parentStaff = this->FindStaff(ANCESTOR_ONLY);
     Layer *parentLayer = vrv_cast<Layer *>(GetFirstAncestor(LAYER));
     assert(parentLayer);
 
diff --git a/src/slur.cpp b/src/slur.cpp
index 9dba6d151e5..c65ebb97e93 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -137,8 +137,8 @@ Staff *Slur::GetBoundaryCrossStaff()
     }
     else {
         // Check if the two elements are in different staves (but themselves not cross-staff)
-        Staff *startStaff = vrv_cast<Staff *>(start->GetFirstAncestor(STAFF));
-        Staff *endStaff = vrv_cast<Staff *>(end->GetFirstAncestor(STAFF));
+        Staff *startStaff = start->FindStaff(ANCESTOR_ONLY, false);
+        Staff *endStaff = end->FindStaff(ANCESTOR_ONLY, false);
         if (startStaff && endStaff && (startStaff->GetN() != endStaff->GetN())) {
             return endStaff;
         }
@@ -163,10 +163,8 @@ std::vector<LayerElement *> Slur::CollectSpannedElements(Staff *staff, int xMin,
 
     std::set<int> staffNumbers;
     staffNumbers.emplace(staff->GetN());
-    Staff *startStaff = this->GetStart()->m_crossStaff ? this->GetStart()->m_crossStaff
-                                                       : vrv_cast<Staff *>(this->GetStart()->GetFirstAncestor(STAFF));
-    Staff *endStaff = this->GetEnd()->m_crossStaff ? this->GetEnd()->m_crossStaff
-                                                   : vrv_cast<Staff *>(this->GetEnd()->GetFirstAncestor(STAFF));
+    Staff *startStaff = this->GetStart()->FindStaff(RESOLVE_CROSSSTAFF, false);
+    Staff *endStaff = this->GetEnd()->FindStaff(RESOLVE_CROSSSTAFF, false);
     if (startStaff && (startStaff != staff)) {
         staffNumbers.emplace(startStaff->GetN());
     }
diff --git a/src/tie.cpp b/src/tie.cpp
index 9f648f82a50..ca5f01d97ac 100644
--- a/src/tie.cpp
+++ b/src/tie.cpp
@@ -394,7 +394,7 @@ void Tie::CalculateXPosition(Doc *doc, Staff *staff, Chord *startParentChord, Ch
             }
             // endPoint
             Staff *endStaff = staff;
-            if (endParentChord) endStaff = vrv_cast<Staff *>(endParentChord->GetFirstAncestor(STAFF));
+            if (endParentChord) endStaff = endParentChord->FindStaff(ANCESTOR_ONLY);
             if (endParentChord && endParentChord->HasAdjacentNotesInStaff(endStaff)) {
                 endPoint.x = this->CalculateAdjacentChordXOffset(
                     doc, endStaff, endParentChord, endNote, drawingCurveDir, endPoint.x, false);
@@ -454,7 +454,7 @@ void Tie::CalculateXPosition(Doc *doc, Staff *staff, Chord *startParentChord, Ch
         if (!isShortTie) {
             // endPoint
             Staff *endStaff = staff;
-            if (endParentChord) endStaff = vrv_cast<Staff *>(endParentChord->GetFirstAncestor(STAFF));
+            if (endParentChord) endStaff = endParentChord->FindStaff(ANCESTOR_ONLY);
             if (endParentChord && endParentChord->HasAdjacentNotesInStaff(endStaff)) {
                 endPoint.x = this->CalculateAdjacentChordXOffset(
                     doc, endStaff, endParentChord, endNote, drawingCurveDir, endPoint.x, false);
diff --git a/src/timeinterface.cpp b/src/timeinterface.cpp
index f77ed3eb21a..835b69b84bd 100644
--- a/src/timeinterface.cpp
+++ b/src/timeinterface.cpp
@@ -97,7 +97,7 @@ bool TimePointInterface::IsOnStaff(int n)
         return false;
     }
     else if (m_start) {
-        Staff *staff = dynamic_cast<Staff *>(m_start->GetFirstAncestor(STAFF));
+        Staff *staff = m_start->FindStaff(ANCESTOR_ONLY, false);
         if (staff && (staff->GetN() == n)) return true;
     }
     return false;
@@ -129,8 +129,8 @@ std::vector<Staff *> TimePointInterface::GetTstampStaves(Measure *measure, Objec
         }
     }
     else if (m_start && !m_start->Is(TIMESTAMP_ATTR)) {
-        Staff *staff = dynamic_cast<Staff *>(m_start->GetFirstAncestor(STAFF));
-        if (staff) staffList.push_back(staff->GetN());
+        Staff *staff = m_start->FindStaff(ANCESTOR_ONLY);
+        staffList.push_back(staff->GetN());
     }
     else if (measure->GetChildCount(STAFF) == 1) {
         // If we have no @staff or startid but only one staff child assume it is the first one (@n1 is assumed)
@@ -285,10 +285,10 @@ void TimeSpanningInterface::GetCrossStaffOverflows(
 
     // No cross-staff endpoints, check if the slur itself crosses staves
     if (!startStaff) {
-        startStaff = dynamic_cast<Staff *>(this->GetStart()->GetFirstAncestor(STAFF));
+        startStaff = this->GetStart()->FindStaff(ANCESTOR_ONLY, false);
     }
     if (!endStaff) {
-        endStaff = dynamic_cast<Staff *>(this->GetEnd()->GetFirstAncestor(STAFF));
+        endStaff = this->GetEnd()->FindStaff(ANCESTOR_ONLY, false);
     }
 
     // This happens with slurs starting or ending with a timestamp
diff --git a/src/tuplet.cpp b/src/tuplet.cpp
index 18942c027bf..2442d17c9d6 100644
--- a/src/tuplet.cpp
+++ b/src/tuplet.cpp
@@ -320,8 +320,7 @@ void Tuplet::CalculateTupletNumCrossStaff(LayerElement *layerElement)
         return;
     };
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
     // Find if there is a mix of cross-staff and non-cross-staff elements in the tuplet
     ListOfObjects descendants;
     ClassIdsComparison comparison({ CHORD, NOTE, REST });
@@ -644,9 +643,8 @@ int Tuplet::AdjustTupletsY(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
-    assert(staff);
-    int staffSize = staff->m_drawingStaffSize;
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    const int staffSize = staff->m_drawingStaffSize;
 
     assert(m_drawingBracketPos != STAFFREL_basic_NONE);
 
diff --git a/src/verse.cpp b/src/verse.cpp
index 8dd6b93c56a..56946b76fdf 100644
--- a/src/verse.cpp
+++ b/src/verse.cpp
@@ -238,9 +238,9 @@ int Verse::PrepareProcessingLists(FunctorParams *functorParams)
     assert(params);
     // StaffN_LayerN_VerseN_t *tree = vrv_cast<StaffN_LayerN_VerseN_t*>((*params).at(0));
 
-    Staff *staff = vrv_cast<Staff *>(this->GetFirstAncestor(STAFF));
+    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
-    assert(staff && layer);
+    assert(layer);
 
     params->m_verseTree.child[staff->GetN()].child[layer->GetN()].child[this->GetN()];
     // Alternate solution with StaffN_LayerN_VerseN_t
diff --git a/src/view_control.cpp b/src/view_control.cpp
index 7ac6663fd99..85733bdf254 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -1336,8 +1336,7 @@ void View::DrawArpeg(DeviceContext *dc, Arpeg *arpeg, Measure *measure, System *
     const int bottom = bottomNote->GetDrawingY();
 
     // We arbitrarily look at the top note
-    Staff *staff = vrv_cast<Staff *>(topNote->GetFirstAncestor(STAFF));
-    assert(staff);
+    Staff *staff = topNote->FindStaff(ANCESTOR_ONLY);
     const bool drawingCueSize = topNote->GetDrawingCueSize();
 
     // We are going to have only one FloatingPositioner - staff will be the top note one
diff --git a/src/view_page.cpp b/src/view_page.cpp
index 9e5cbb34582..45fb59368bf 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -834,7 +834,7 @@ void View::DrawBarLine(
     assert(dc);
     assert(barLine);
 
-    Staff *staff = dynamic_cast<Staff *>(barLine->GetFirstAncestor(STAFF));
+    Staff *staff = barLine->FindStaff(ANCESTOR_ONLY, false);
     const int staffSize = (staff) ? staff->m_drawingStaffSize : 100;
 
     const int x = barLine->GetDrawingX();
diff --git a/src/view_slur.cpp b/src/view_slur.cpp
index 2c0f2afe454..d280f91dffa 100644
--- a/src/view_slur.cpp
+++ b/src/view_slur.cpp
@@ -182,10 +182,9 @@ float View::CalcInitialSlur(
     const std::vector<LayerElement *> elements
         = slur->CollectSpannedElements(staff, bezier.p1.x, bezier.p2.x, curve->GetSpanningType());
 
-    Staff *startStaff = slur->GetStart()->m_crossStaff ? slur->GetStart()->m_crossStaff
-                                                       : vrv_cast<Staff *>(slur->GetStart()->GetFirstAncestor(STAFF));
-    Staff *endStaff = slur->GetEnd()->m_crossStaff ? slur->GetEnd()->m_crossStaff
-                                                   : vrv_cast<Staff *>(slur->GetEnd()->GetFirstAncestor(STAFF));
+    Staff *startStaff = slur->GetStart()->FindStaff(RESOLVE_CROSSSTAFF, false);
+    Staff *endStaff = slur->GetEnd()->FindStaff(RESOLVE_CROSSSTAFF, false);
+
     curve->ClearSpannedElements();
     for (auto element : elements) {
 

From b7fef937c2b492316bb56dbcc65d703e87e39a1d Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 19 Jan 2022 14:49:52 +0200
Subject: [PATCH 091/403] Fix beam slope being too far impacted by the duration

- changed code to check for another unit of margin for 16th and shorter notes in the beams. Stems are already taking duration into account, so adding extra margin based on duration led to wrong calculation of the beam slope
---
 src/beam.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 64d635e1cb1..a66f253bd8c 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -834,8 +834,8 @@ void BeamSegment::CalcAdjustSlope(Staff *staff, Doc *doc, BeamDrawingInterface *
                 break;
             }
             // Here we should look at duration too because longer values in the middle could actually be OK as they are
-            else if ((coord != m_lastNoteOrChord) || (coord != m_firstNoteOrChord)) {
-                const int durLen = len - (coord->m_dur - DUR_8) * beamInterface->m_beamWidthBlack;
+            else if (((coord != m_lastNoteOrChord) || (coord != m_firstNoteOrChord)) && (coord->m_dur > DUR_8)) {
+                const int durLen = len - unit;
                 if (durLen < refLen) {
                     lengthen = true;
                     break;

From 789621d0c2370c5137fc1442ff5360b1d4bcd372 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 20 Jan 2022 09:36:02 +0100
Subject: [PATCH 092/403] Fix for whole note collision

---
 src/layerelement.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index da534e6cd49..f83c76e9511 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1714,7 +1714,7 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
         else if (this->Is(NOTE)) {
             Note *currentNote = vrv_cast<Note *>(this);
             assert(currentNote);
-            if ((currentNote->GetDrawingDur() == DUR_1) && otherElements.at(i)->Is(STEM)) {
+            if ((currentNote->GetDrawingDur() == DUR_1) && otherElements.at(i)->Is(STEM) && (shift == 0)) {
                 const int horizontalMargin = doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
                 Stem *stem = vrv_cast<Stem *>(otherElements.at(i));
                 data_STEMDIRECTION stemDir = stem->GetDrawingStemDir();

From 5bc7b066f4c95dec652a1a3823b24bddae9c6204 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 20 Jan 2022 14:09:20 +0200
Subject: [PATCH 093/403] Fix for the stem length on beams with mixed duration

- changed code to take the shortest note stem length as uniform in beams with multiple notes on the same location (e.g. horizontal beams)
---
 include/vrv/beam.h |  2 +-
 src/beam.cpp       | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 2f639023885..e6137d7f9f2 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -259,7 +259,7 @@ class BeamElementCoord {
 
     int m_x;
     int m_yBeam; // y value of stem top position
-    int m_dur; // drawing duration
+    short m_dur; // drawing duration
     int m_breaksec;
     int m_overlapMargin;
     int m_maxShortening; // maximum allowed shortening in half units
diff --git a/src/beam.cpp b/src/beam.cpp
index a66f253bd8c..c9680947598 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -267,8 +267,8 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
 {
     const int unit = doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
     // find shortest duration for above/below beams for the sake of calculating overlap with additional beams
-    int topShortestDur = DUR_8;
-    int bottomShortestDur = DUR_8;
+    short topShortestDur = DUR_8;
+    short bottomShortestDur = DUR_8;
     std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
         if (coord->m_partialFlagPlace == BEAMPLACE_above) {
             topShortestDur = std::max(topShortestDur, coord->m_dur);
@@ -1058,14 +1058,17 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
         }
     }
 
+    short minDuration = DUR_4;
     for (auto coord : m_beamElementCoordRefs) {
-        const int coordStemLength = coord->CalculateStemLength(staff, stemDir, isHorizontal);
         if (!coord->m_closestNote) continue;
         // if location matches, or if current elements duration is shorter than 8th. This ensures that beams with
         // partial beams will not be shorted when lowest/highest note is 8th and can be shortened
-        if ((coord->m_closestNote->GetDrawingLoc() == relevantNoteLoc)
-            || (!isHorizontal && (coord->m_dur > DUR_8) && (std::abs(m_uniformStemLength) < 13)))
-            m_uniformStemLength = coordStemLength;
+        if ((coord->m_dur > minDuration)
+            && ((coord->m_closestNote->GetDrawingLoc() == relevantNoteLoc)
+                || (!isHorizontal && (std::abs(m_uniformStemLength) < 13)))) {
+            m_uniformStemLength = coord->CalculateStemLength(staff, stemDir, isHorizontal);
+            minDuration = coord->m_dur;
+        }
     }
     // make adjustments for the grace notes length
     for (auto coord : m_beamElementCoordRefs) {

From cc33e882c209441aea0521ed0baeb5c46ae16030 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 21 Jan 2022 10:21:13 +0100
Subject: [PATCH 094/403] Do not show Accid in tablature

* It is not very clear if they should be given at all. However, the current MusciXML importer does add them to the MEI data
---
 src/view_element.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view_element.cpp b/src/view_element.cpp
index ef50e7ca2b5..70c1eec9573 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -240,7 +240,7 @@ void View::DrawAccid(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 
     // This can happen with accid within note with only accid.ges
     // We still create an graphic in the output
-    if (!accid->HasAccid()) {
+    if (!accid->HasAccid() || staff->IsTablature()) {
         dc->StartGraphic(element, "", element->GetUuid());
         accid->SetEmptyBB();
         dc->EndGraphic(element, this);

From 27a929b06c38db19506e72c38e83ce5886b4fa3f Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 21 Jan 2022 10:22:05 +0100
Subject: [PATCH 095/403] Do not draw lute tablature glyph for guitar tablature

---
 src/view_tab.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 2e36934f352..1136c4eb9a2 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -135,15 +135,18 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     int x = element->GetDrawingX();
     int y = element->GetDrawingY();
 
-    int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
-    int glyphSize = staff->GetDrawingStaffNotationSize();
-
+    const int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
+    const int glyphSize = staff->GetDrawingStaffNotationSize();
+    const int halfStemWidth =  m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2;
+    
     // We only need to draw the stems
     // Do we also need to draw the dots?
     if (tabGrp->IsInBeam()) {
         const int height = m_doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
-        DrawFilledRectangle(dc, x - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2, y,
-            x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2, y + height);
+        DrawFilledRectangle(dc, x - halfStemWidth, y, x + halfStemWidth, y + height);
+    }
+    else if (staff->m_drawingNotationType == NOTATIONTYPE_tab_guitar) {
+    
     }
     else {
         int symc = 0;

From 3711c06846c3ebd6f1a6a1cb34c2a36d4835b2b4 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 21 Jan 2022 10:25:42 +0100
Subject: [PATCH 096/403] Clang formatting

---
 src/view_tab.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 1136c4eb9a2..0e8a7072992 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -137,8 +137,8 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     const int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
     const int glyphSize = staff->GetDrawingStaffNotationSize();
-    const int halfStemWidth =  m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2;
-    
+    const int halfStemWidth = m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2;
+
     // We only need to draw the stems
     // Do we also need to draw the dots?
     if (tabGrp->IsInBeam()) {
@@ -146,7 +146,6 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
         DrawFilledRectangle(dc, x - halfStemWidth, y, x + halfStemWidth, y + height);
     }
     else if (staff->m_drawingNotationType == NOTATIONTYPE_tab_guitar) {
-    
     }
     else {
         int symc = 0;

From 53efab83827570f845bb0a90bc72b01c48f4e2fa Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 21 Jan 2022 13:16:55 +0200
Subject: [PATCH 097/403] Revert type change

---
 include/vrv/beam.h | 2 +-
 src/beam.cpp       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index e6137d7f9f2..2f639023885 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -259,7 +259,7 @@ class BeamElementCoord {
 
     int m_x;
     int m_yBeam; // y value of stem top position
-    short m_dur; // drawing duration
+    int m_dur; // drawing duration
     int m_breaksec;
     int m_overlapMargin;
     int m_maxShortening; // maximum allowed shortening in half units
diff --git a/src/beam.cpp b/src/beam.cpp
index c9680947598..4d938e21898 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -267,8 +267,8 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
 {
     const int unit = doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
     // find shortest duration for above/below beams for the sake of calculating overlap with additional beams
-    short topShortestDur = DUR_8;
-    short bottomShortestDur = DUR_8;
+    int topShortestDur = DUR_8;
+    int bottomShortestDur = DUR_8;
     std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
         if (coord->m_partialFlagPlace == BEAMPLACE_above) {
             topShortestDur = std::max(topShortestDur, coord->m_dur);

From 246e5381c3bbc4dbc0bcbaae58db3cfdd6cabacc Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Fri, 21 Jan 2022 14:13:22 +0100
Subject: [PATCH 098/403] Fix order check for grace note slurs

---
 include/vrv/view.h   |  7 ++++++-
 src/view_control.cpp | 39 +++++++++++++++++++++++++++++++--------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index 7213268b7a2..f70a64785ae 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -407,7 +407,7 @@ class View {
      */
     ///@{
     void DrawControlElement(DeviceContext *dc, ControlElement *element, Measure *measure, System *system);
-    void DrawTimeSpanningElement(DeviceContext *dc, Object *object, System *system);
+    void DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *system);
     void DrawArpeg(DeviceContext *dc, Arpeg *arpeg, Measure *measure, System *system);
     void DrawArpegEnclosing(DeviceContext *dc, Arpeg *arpeg, Staff *staff, wchar_t startGlyph, wchar_t fillGlyph,
         wchar_t endGlyph, int x, int y, int height, bool cueSize);
@@ -602,6 +602,11 @@ class View {
     void DrawBeamSegment(DeviceContext *dc, BeamSegment *segment, BeamDrawingInterface *beamInterface, Layer *layer,
         Staff *staff, Measure *measure);
 
+    /**
+     * Internal methods for drawing time spanning elements
+     */
+    bool HasValidTimeSpanningOrder(DeviceContext *dc, Object *element, LayerElement *start, LayerElement *end) const;
+
 public:
     /** Document */
     Doc *m_doc;
diff --git a/src/view_control.cpp b/src/view_control.cpp
index 7ac6663fd99..2497f775b8b 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -186,14 +186,8 @@ void View::DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *s
             end = nextInterface->GetStart();
         }
     }
-    if (!start || !end) return;
-    if (!interface->IsOrdered(start, end) && !element->Is(SYL)) {
-        // To avoid showing the same warning multiple times, display a warning only during actual drawing
-        if (!dc->Is(BBOX_DEVICE_CONTEXT) && (m_currentPage == vrv_cast<Page *>(start->GetFirstAncestor(PAGE)))) {
-            LogWarning("%s '%s' is ignored, since start '%s' does not occur temporally before end '%s'.",
-                element->GetClassName().c_str(), element->GetUuid().c_str(), start->GetUuid().c_str(),
-                end->GetUuid().c_str());
-        }
+
+    if (!this->HasValidTimeSpanningOrder(dc, element, start, end)) {
         return;
     }
 
@@ -386,6 +380,35 @@ void View::DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *s
     }
 }
 
+bool View::HasValidTimeSpanningOrder(DeviceContext *dc, Object *element, LayerElement *start, LayerElement *end) const
+{
+    if (!start || !end) return false;
+
+    TimeSpanningInterface *interface = element->GetTimeSpanningInterface();
+    if (interface && !interface->IsOrdered(start, end)) {
+        // Handle exceptional cases
+        if (element->Is(SLUR)) {
+            if (start->GetAlignment() == end->GetAlignment()) {
+                if (start->IsGraceNote() || end->IsGraceNote()) {
+                    return true;
+                }
+            }
+        }
+        else if (element->Is(SYL)) {
+            return true;
+        }
+        // To avoid showing the same warning multiple times, display a warning only during actual drawing
+        if (!dc->Is(BBOX_DEVICE_CONTEXT) && (m_currentPage == vrv_cast<Page *>(start->GetFirstAncestor(PAGE)))) {
+            LogWarning("%s '%s' is ignored, since start '%s' does not occur temporally before end '%s'.",
+                element->GetClassName().c_str(), element->GetUuid().c_str(), start->GetUuid().c_str(),
+                end->GetUuid().c_str());
+        }
+        return false;
+    }
+
+    return true;
+}
+
 void View::DrawBracketSpan(
     DeviceContext *dc, BracketSpan *bracketSpan, int x1, int x2, Staff *staff, char spanningType, Object *graphic)
 {

From d0579e4952432738c2f0002dc1b65ba4b9ea92c6 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Fri, 21 Jan 2022 15:46:13 +0100
Subject: [PATCH 099/403] add missing mensural clefs

---
 data/Bravura.xml                                      | 4 ++++
 data/Bravura/E907-mensuralCclefPetrucciPosLowest.xml  | 1 +
 data/Bravura/E908-mensuralCclefPetrucciPosLow.xml     | 1 +
 data/Bravura/E90A-mensuralCclefPetrucciPosHigh.xml    | 1 +
 data/Bravura/E90B-mensuralCclefPetrucciPosHighest.xml | 1 +
 data/Leipzig.xml                                      | 4 ++++
 data/Leipzig/E907-mensuralCclefPetrucciPosLowest.xml  | 1 +
 data/Leipzig/E908-mensuralCclefPetrucciPosLow.xml     | 1 +
 data/Leipzig/E90A-mensuralCclefPetrucciPosHigh.xml    | 1 +
 data/Leipzig/E90B-mensuralCclefPetrucciPosHighest.xml | 1 +
 fonts/supported.xsl                                   | 8 ++++----
 11 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 data/Bravura/E907-mensuralCclefPetrucciPosLowest.xml
 create mode 100644 data/Bravura/E908-mensuralCclefPetrucciPosLow.xml
 create mode 100644 data/Bravura/E90A-mensuralCclefPetrucciPosHigh.xml
 create mode 100644 data/Bravura/E90B-mensuralCclefPetrucciPosHighest.xml
 create mode 100644 data/Leipzig/E907-mensuralCclefPetrucciPosLowest.xml
 create mode 100644 data/Leipzig/E908-mensuralCclefPetrucciPosLow.xml
 create mode 100644 data/Leipzig/E90A-mensuralCclefPetrucciPosHigh.xml
 create mode 100644 data/Leipzig/E90B-mensuralCclefPetrucciPosHighest.xml

diff --git a/data/Bravura.xml b/data/Bravura.xml
index bd2e5d3e6b4..6e510c50175 100644
--- a/data/Bravura.xml
+++ b/data/Bravura.xml
@@ -575,7 +575,11 @@
 	<g c="E902" x="0.0" y="-231.0" w="264.0" h="452.0" h-a-x="264" />
 	<g c="E904" x="0.0" y="-1069.0" w="488.0" h="1660.0" h-a-x="488" />
 	<g c="E906" x="0.0" y="-221.0" w="134.0" h="442.0" h-a-x="134" />
+	<g c="E907" x="0.0" y="-349.0" w="244.0" h="1149.0" h-a-x="244" />
+	<g c="E908" x="0.0" y="-600.0" w="244.0" h="1400.0" h-a-x="244" />
 	<g c="E909" x="0.0" y="-800.0" w="244.0" h="1600.0" h-a-x="244" />
+	<g c="E90A" x="0.0" y="-800.0" w="244.0" h="1400.0" h-a-x="244" />
+	<g c="E90B" x="0.0" y="-795.0" w="244.0" h="1149.0" h-a-x="244" />
 	<g c="E910" x="1.0" y="-266.0" w="531.0" h="531.0" h-a-x="532" />
 	<g c="E911" x="1.0" y="-266.0" w="531.0" h="531.0" h-a-x="532" />
 	<g c="E912" x="1.0" y="-380.0" w="531.0" h="743.0" h-a-x="532" />
diff --git a/data/Bravura/E907-mensuralCclefPetrucciPosLowest.xml b/data/Bravura/E907-mensuralCclefPetrucciPosLowest.xml
new file mode 100644
index 00000000000..35ba3368a75
--- /dev/null
+++ b/data/Bravura/E907-mensuralCclefPetrucciPosLowest.xml
@@ -0,0 +1 @@
+<symbol id="E907" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 783c0 17 6 17 13 17h8c7 0 13 0 13 -17v-474c3 -26 15 -33 25 -33h121c25 0 28 19 30 37v227c0 17 6 17 13 17h9c6 0 12 0 12 -17v-837c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17c-2 18 -5 28 -30 28h-116c-24 0 -28 -20 -30 -38v-25c0 -17 -6 -17 -13 -17h-8 c-7 0 -13 0 -13 17v1115zM58 174c-7 0 -18 0 -24 -23v-36c2 -18 6 -37 30 -37h121c17 0 25 20 25 35v38c-6 20 -17 23 -27 23h-125zM34 -132c2 -18 6 -37 30 -37h121c10 0 22 7 25 33v26c-1 18 -6 37 -27 37h-127c-17 -4 -21 -21 -22 -37v-22z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E908-mensuralCclefPetrucciPosLow.xml b/data/Bravura/E908-mensuralCclefPetrucciPosLow.xml
new file mode 100644
index 00000000000..8cbc78dd7ed
--- /dev/null
+++ b/data/Bravura/E908-mensuralCclefPetrucciPosLow.xml
@@ -0,0 +1 @@
+<symbol id="E908" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -583v1366c0 17 6 17 13 17h8c7 0 13 0 13 -17v-476c2 -18 6 -38 30 -38h116c25 0 28 20 30 38v237c0 17 6 17 13 17h9c6 0 12 0 12 -17v-1074c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v227c-2 18 -5 37 -30 37h-121c-10 0 -22 -7 -25 -33v-284 c0 -17 -6 -17 -13 -17h-8c-7 0 -13 0 -13 17zM34 -115v-36c6 -23 17 -23 24 -23h125c10 0 21 3 27 23v38c0 15 -8 35 -25 35h-121c-24 0 -28 -19 -30 -37zM34 132v-22c1 -16 5 -33 22 -37h127c21 0 26 19 27 37v26c-3 26 -15 33 -25 33h-121c-24 0 -28 -19 -30 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E90A-mensuralCclefPetrucciPosHigh.xml b/data/Bravura/E90A-mensuralCclefPetrucciPosHigh.xml
new file mode 100644
index 00000000000..863c0b64ecb
--- /dev/null
+++ b/data/Bravura/E90A-mensuralCclefPetrucciPosHigh.xml
@@ -0,0 +1 @@
+<symbol id="E90A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -783v1366c0 17 6 17 13 17h8c7 0 13 0 13 -17v-284c3 -26 15 -33 25 -33h121c25 0 28 19 30 37v227c0 17 6 17 13 17h9c6 0 12 0 12 -17v-1074c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v237c-2 18 -5 38 -30 38h-116c-24 0 -28 -20 -30 -38v-476 c0 -17 -6 -17 -13 -17h-8c-7 0 -13 0 -13 17zM34 151v-36c2 -18 6 -37 30 -37h121c17 0 25 20 25 35v38c-6 20 -17 23 -27 23h-125c-7 0 -18 0 -24 -23zM34 -110v-22c2 -18 6 -37 30 -37h121c10 0 22 7 25 33v26c-1 18 -6 37 -27 37h-127c-17 -4 -21 -21 -22 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E90B-mensuralCclefPetrucciPosHighest.xml b/data/Bravura/E90B-mensuralCclefPetrucciPosHighest.xml
new file mode 100644
index 00000000000..84bd301c826
--- /dev/null
+++ b/data/Bravura/E90B-mensuralCclefPetrucciPosHighest.xml
@@ -0,0 +1 @@
+<symbol id="E90B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 337c0 17 6 17 13 17h8c7 0 13 0 13 -17v-25c2 -18 6 -38 30 -38h116c25 0 28 10 30 28c0 17 6 17 13 17h9c6 0 12 0 12 -17v-837c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v227c-2 18 -5 37 -30 37h-121c-10 0 -22 -7 -25 -33v-474c0 -17 -6 -17 -13 -17h-8 c-7 0 -13 0 -13 17v1115zM34 -110v-36c6 -23 17 -23 24 -23h125c10 0 21 3 27 23v38c0 15 -8 35 -25 35h-121c-24 0 -28 -19 -30 -37zM34 137v-22c1 -16 5 -33 22 -37h127c21 0 26 19 27 37v26c-3 26 -15 33 -25 33h-121c-24 0 -28 -19 -30 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig.xml b/data/Leipzig.xml
index 0e3d521a796..a5bdc56d21e 100644
--- a/data/Leipzig.xml
+++ b/data/Leipzig.xml
@@ -542,6 +542,10 @@
 	<g c="E51C" x="0.0" y="0.0" w="620.0" h="332.0" h-a-x="620" />
 	<g c="E51D" x="3.0" y="-8.0" w="881.0" h="329.0" h-a-x="884" />
 	<g c="E51E" x="0.0" y="-15.0" w="959.0" h="326.0" h-a-x="959" />
+	<g c="E908" x="1.0" y="-392.0" w="205.6" h="1046.0" h-a-x="204" />
+	<g c="E907" x="1.0" y="-302.0" w="205.6" h="956.0" h-a-x="204" />
+	<g c="E90A" x="1.0" y="-654.0" w="205.6" h="1046.0" h-a-x="204" />
+	<g c="E90B" x="1.0" y="-654.0" w="205.6" h="956.0" h-a-x="204" />
 	<g c="E08E" x="0.0" y="-243.0" w="186.0" h="486.0" h-a-x="186" />
 	<g c="E08F" x="0.0" y="-120.0" w="342.0" h="240.0" h-a-x="342" />
 	<g c="E090" x="0.0" y="-37.0" w="342.0" h="74.0" h-a-x="342" />
diff --git a/data/Leipzig/E907-mensuralCclefPetrucciPosLowest.xml b/data/Leipzig/E907-mensuralCclefPetrucciPosLowest.xml
new file mode 100644
index 00000000000..96f8f5dbcfe
--- /dev/null
+++ b/data/Leipzig/E907-mensuralCclefPetrucciPosLowest.xml
@@ -0,0 +1 @@
+<symbol id="E907" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 206l2 431c0 12 7 17 14 17c8 0 17 -7 17 -17l3 -204l2 -315h79h8c11 0 30 1 35 6c8 8 8 139 8 192v27l4 222s-1 20 19 20s12 -20 12 -20v-244s-1 -200 -1 -246c-1 -8 -1 -12 -4 -19c-7 -7 -8 -7 -16 -7c-45 0 -71 3 -71 3l-69 -3v-49v-48l64 -3l82 -5s5 0 8 -3 s5 -7 5 -7l1 -62v-154s0 -20 -13 -20c-10 0 -14 5 -16 14l-7 138l-2 19s0 4 -3 7s-9 2 -9 2h-40h-70l-3 -28l-3 -132s0 -20 -15 -20c-17 0 -19 17 -19 17c-1 22 -3 96 -3 336c0 49 1 100 1 155z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E908-mensuralCclefPetrucciPosLow.xml b/data/Leipzig/E908-mensuralCclefPetrucciPosLow.xml
new file mode 100644
index 00000000000..9d679cc50a9
--- /dev/null
+++ b/data/Leipzig/E908-mensuralCclefPetrucciPosLow.xml
@@ -0,0 +1 @@
+<symbol id="E908" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 206l2 431c0 12 7 17 14 17c8 0 17 -7 17 -17l3 -204l2 -315h79h8c11 0 30 1 35 6c8 8 8 119 8 172v27l4 222s-1 20 19 20s12 -20 12 -20v-244s-1 -180 -1 -226c-1 -8 -1 -12 -4 -19c-7 -7 -8 -7 -16 -7c-45 0 -71 3 -71 3l-69 -3v-49v-48l64 -3l82 -5s5 0 8 -3 s5 -7 5 -7l1 -152v-154s0 -20 -13 -20c-10 0 -14 5 -16 14l-7 138l-2 109s0 4 -3 7s-9 2 -9 2h-40h-70l-3 -118l-3 -132s0 -20 -15 -20c-17 0 -19 17 -19 17c-1 22 -3 186 -3 426c0 49 1 100 1 155z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E90A-mensuralCclefPetrucciPosHigh.xml b/data/Leipzig/E90A-mensuralCclefPetrucciPosHigh.xml
new file mode 100644
index 00000000000..3c74dbf9732
--- /dev/null
+++ b/data/Leipzig/E90A-mensuralCclefPetrucciPosHigh.xml
@@ -0,0 +1 @@
+<symbol id="E90A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -206c0 55 -1 106 -1 155c0 240 2 404 3 426c0 0 2 17 19 17c15 0 15 -20 15 -20l3 -132l3 -118h70h40s6 -1 9 2s3 7 3 7l2 109l7 138c2 9 6 14 16 14c13 0 13 -20 13 -20v-154l-1 -152s-2 -4 -5 -7s-8 -3 -8 -3l-82 -5l-64 -3v-48v-49l69 -3s26 3 71 3c8 0 9 0 16 -7 c3 -7 3 -11 4 -19c0 -46 1 -226 1 -226v-244s8 -20 -12 -20s-19 20 -19 20l-4 222v27c0 53 0 164 -8 172c-5 5 -24 6 -35 6h-8h-79l-2 -315l-3 -204c0 -10 -9 -17 -17 -17c-7 0 -14 5 -14 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E90B-mensuralCclefPetrucciPosHighest.xml b/data/Leipzig/E90B-mensuralCclefPetrucciPosHighest.xml
new file mode 100644
index 00000000000..cb707a3af09
--- /dev/null
+++ b/data/Leipzig/E90B-mensuralCclefPetrucciPosHighest.xml
@@ -0,0 +1 @@
+<symbol id="E90B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -206c0 55 -1 106 -1 155c0 240 2 314 3 336c0 0 2 17 19 17c15 0 15 -20 15 -20l3 -135l3 -25h70h40s6 -1 9 2s3 7 3 7l2 16l7 141c2 9 6 14 16 14c13 0 13 -20 13 -20v-154l-1 -62s-2 -4 -5 -7s-8 -3 -8 -3l-82 -5l-64 -3v-48v-49l69 -3s26 3 71 3c8 0 9 0 16 -7 c3 -7 3 -11 4 -19c0 -46 1 -246 1 -246v-244s8 -20 -12 -20s-19 20 -19 20l-4 222v27c0 53 0 184 -8 192c-5 5 -24 6 -35 6h-8h-79l-2 -315l-3 -204c0 -10 -9 -17 -17 -17c-7 0 -14 5 -14 17z" /></symbol>
\ No newline at end of file
diff --git a/fonts/supported.xsl b/fonts/supported.xsl
index 9f9661917f4..db3075ef785 100644
--- a/fonts/supported.xsl
+++ b/fonts/supported.xsl
@@ -2160,11 +2160,11 @@
             <glyph glyph-code="E904" smufl-name="mensuralFclefPetrucci" />
             <!--<glyph glyph-code="E905" smufl-name="mensuralCclef" />-->
             <glyph glyph-code="E906" smufl-name="chantCclef" />
-            <!--<glyph glyph-code="E907" smufl-name="mensuralCclefPetrucciPosLowest" />-->
-            <!--<glyph glyph-code="E908" smufl-name="mensuralCclefPetrucciPosLow" />-->
+            <glyph glyph-code="E907" smufl-name="mensuralCclefPetrucciPosLowest" />
+            <glyph glyph-code="E908" smufl-name="mensuralCclefPetrucciPosLow" />
             <glyph glyph-code="E909" smufl-name="mensuralCclefPetrucciPosMiddle" />
-            <!--<glyph glyph-code="E90A" smufl-name="mensuralCclefPetrucciPosHigh" />-->
-            <!--<glyph glyph-code="E90B" smufl-name="mensuralCclefPetrucciPosHighest" />-->
+            <glyph glyph-code="E90A" smufl-name="mensuralCclefPetrucciPosHigh" />
+            <glyph glyph-code="E90B" smufl-name="mensuralCclefPetrucciPosHighest" />
             <range_end>U+E90F</range_end>
             <range_start>U+E900</range_start>
         </medievalAndRenaissanceClefs>

From 1fa1dc5a7daf0f6465c3f0282809f9b9683c4a47 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Fri, 21 Jan 2022 15:46:56 +0100
Subject: [PATCH 100/403] draw proper c clefs

---
 include/vrv/smufl.h | 6 +++++-
 src/clef.cpp        | 8 ++++++++
 src/smufl.cpp       | 6 +++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/include/vrv/smufl.h b/include/vrv/smufl.h
index 711723e68a9..26d2a4a3227 100644
--- a/include/vrv/smufl.h
+++ b/include/vrv/smufl.h
@@ -334,7 +334,11 @@ enum {
     SMUFL_E902_chantFclef = 0xE902,
     SMUFL_E904_mensuralFclefPetrucci = 0xE904,
     SMUFL_E906_chantCclef = 0xE906,
+    SMUFL_E907_mensuralCclefPetrucciPosLowest = 0xE907,
+    SMUFL_E908_mensuralCclefPetrucciPosLow = 0xE908,
     SMUFL_E909_mensuralCclefPetrucciPosMiddle = 0xE909,
+    SMUFL_E90A_mensuralCclefPetrucciPosHigh = 0xE90A,
+    SMUFL_E90B_mensuralCclefPetrucciPosHighest = 0xE90B,
     SMUFL_E910_mensuralProlation1 = 0xE910,
     SMUFL_E911_mensuralProlation2 = 0xE911,
     SMUFL_E912_mensuralProlation3 = 0xE912,
@@ -436,7 +440,7 @@ enum {
 };
 
 /** The number of glyphs for verification **/
-#define SMUFL_COUNT 411
+#define SMUFL_COUNT 415
 
 } // namespace vrv
 
diff --git a/src/clef.cpp b/src/clef.cpp
index 6b8d0974eae..820501dc1d7 100644
--- a/src/clef.cpp
+++ b/src/clef.cpp
@@ -118,6 +118,14 @@ wchar_t Clef::GetClefGlyph(const data_NOTATIONTYPE notationtype) const
             switch (GetShape()) {
                 case CLEFSHAPE_G: return SMUFL_E901_mensuralGclefPetrucci; break;
                 case CLEFSHAPE_F: return SMUFL_E904_mensuralFclefPetrucci; break;
+                case CLEFSHAPE_C:
+                    switch (GetLine()) {
+                        case 1: return SMUFL_E907_mensuralCclefPetrucciPosLowest; break;
+                        case 2: return SMUFL_E908_mensuralCclefPetrucciPosLow; break;
+                        case 3: return SMUFL_E909_mensuralCclefPetrucciPosMiddle; break;
+                        case 4: return SMUFL_E90A_mensuralCclefPetrucciPosHigh; break;
+                        case 5: return SMUFL_E90B_mensuralCclefPetrucciPosHighest; break;
+                    }
                 default: return SMUFL_E909_mensuralCclefPetrucciPosMiddle; break;
             }
         case NOTATIONTYPE_mensural_black:
diff --git a/src/smufl.cpp b/src/smufl.cpp
index 6c22f0a67d6..8a1a8efd2ce 100644
--- a/src/smufl.cpp
+++ b/src/smufl.cpp
@@ -335,7 +335,11 @@ const std::map<std::string, wchar_t> Resources::s_smuflNames = {
     { "chantFclef", SMUFL_E902_chantFclef },
     { "mensuralFclefPetrucci", SMUFL_E904_mensuralFclefPetrucci },
     { "chantCclef", SMUFL_E906_chantCclef },
+    { "mensuralCclefPetrucciPosLowest", SMUFL_E907_mensuralCclefPetrucciPosLowest },
+    { "mensuralCclefPetrucciPosLow", SMUFL_E908_mensuralCclefPetrucciPosLow },
     { "mensuralCclefPetrucciPosMiddle", SMUFL_E909_mensuralCclefPetrucciPosMiddle },
+    { "mensuralCclefPetrucciPosHigh", SMUFL_E90A_mensuralCclefPetrucciPosHigh },
+    { "mensuralCclefPetrucciPosHighest", SMUFL_E90B_mensuralCclefPetrucciPosHighest },
     { "mensuralProlation1", SMUFL_E910_mensuralProlation1 },
     { "mensuralProlation2", SMUFL_E911_mensuralProlation2 },
     { "mensuralProlation3", SMUFL_E912_mensuralProlation3 },
@@ -437,6 +441,6 @@ const std::map<std::string, wchar_t> Resources::s_smuflNames = {
 };
 
 /** The number of glyphs for verification **/
-// 411
+// 415
 
 } // namespace vrv

From e6eef8d0cc545c5a517bfd7c307059886272eebf Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Fri, 21 Jan 2022 15:59:50 +0100
Subject: [PATCH 101/403] Renaming

---
 include/vrv/layerelement.h  |  4 ++--
 src/accid.cpp               |  2 +-
 src/arpeg.cpp               |  4 ++--
 src/artic.cpp               |  4 ++--
 src/beam.cpp                |  6 +++---
 src/chord.cpp               | 12 +++++------
 src/clef.cpp                |  4 ++--
 src/editortoolkit_neume.cpp | 10 +++++-----
 src/elementpart.cpp         |  2 +-
 src/ftrem.cpp               |  2 +-
 src/horizontalaligner.cpp   |  4 ++--
 src/iopae.cpp               |  2 +-
 src/layer.cpp               |  6 +++---
 src/layerelement.cpp        | 40 ++++++++++++++++++-------------------
 src/ligature.cpp            |  2 +-
 src/mrest.cpp               |  2 +-
 src/note.cpp                | 18 ++++++++---------
 src/rest.cpp                |  6 +++---
 src/slur.cpp                | 10 +++++-----
 src/tie.cpp                 |  4 ++--
 src/timeinterface.cpp       |  8 ++++----
 src/tuplet.cpp              |  4 ++--
 src/verse.cpp               |  2 +-
 src/view_control.cpp        |  2 +-
 src/view_page.cpp           |  2 +-
 src/view_slur.cpp           |  4 ++--
 26 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index cd825acbe79..590843fec21 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -183,9 +183,9 @@ class LayerElement : public Object,
     Alignment *GetAlignment() const { return m_alignment; }
 
     /**
-     * Find the ancestor or cross staff
+     * Get the ancestor or cross staff
      */
-    Staff *FindStaff(StaffSearch strategy, bool assertExistence = true) const;
+    Staff *GetAncestorStaff(StaffSearch strategy = ANCESTOR_ONLY, bool assertExistence = true) const;
 
     /**
      * Look for a cross or a a parent LayerElement (note, chord, rest) with a cross staff.
diff --git a/src/accid.cpp b/src/accid.cpp
index 3999d5b26a1..c03038170a0 100644
--- a/src/accid.cpp
+++ b/src/accid.cpp
@@ -121,7 +121,7 @@ std::wstring Accid::GetSymbolStr(const data_NOTATIONTYPE notationType) const
 
 void Accid::AdjustToLedgerLines(Doc *doc, LayerElement *element, int staffSize)
 {
-    Staff *staff = element->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = element->GetAncestorStaff(RESOLVE_CROSSSTAFF);
     Chord *chord = vrv_cast<Chord *>(this->GetFirstAncestor(CHORD));
 
     if (element->Is(NOTE) && chord && chord->HasAdjacentNotesInStaff(staff)) {
diff --git a/src/arpeg.cpp b/src/arpeg.cpp
index d6ba14beef4..198143019ee 100644
--- a/src/arpeg.cpp
+++ b/src/arpeg.cpp
@@ -226,8 +226,8 @@ int Arpeg::AdjustArpeg(FunctorParams *functorParams)
     // We should have call DrawArpeg before
     assert(this->GetCurrentFloatingPositioner());
 
-    Staff *topStaff = topNote->FindStaff(ANCESTOR_ONLY);
-    Staff *bottomStaff = bottomNote->FindStaff(ANCESTOR_ONLY);
+    Staff *topStaff = topNote->GetAncestorStaff();
+    Staff *bottomStaff = bottomNote->GetAncestorStaff();
 
     Staff *crossStaff = this->GetCrossStaff();
     const int staffN = (crossStaff != NULL) ? crossStaff->GetN() : topStaff->GetN();
diff --git a/src/artic.cpp b/src/artic.cpp
index 5cd1b1dfa6d..68e6f25596a 100644
--- a/src/artic.cpp
+++ b/src/artic.cpp
@@ -399,7 +399,7 @@ int Artic::AdjustArtic(FunctorParams *functorParams)
 
     int yIn, yOut, yRel;
 
-    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
     Beam *beam = dynamic_cast<Beam *>(GetFirstAncestor(BEAM));
     int staffYBottom = -params->m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize);
 
@@ -543,7 +543,7 @@ int Artic::CalculateHorizontalShift(Doc *doc, LayerElement *parent, data_STEMDIR
     switch (artic) {
         case ARTICULATION_stacc:
         case ARTICULATION_stacciss: {
-            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+            Staff *staff = this->GetAncestorStaff();
             const int stemWidth = doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
             if ((stemDir == STEMDIRECTION_up) && (m_drawingPlace == STAFFREL_above)) {
                 shift += shift - stemWidth / 2;
diff --git a/src/beam.cpp b/src/beam.cpp
index 757b36a97b2..3072d8d1813 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1292,7 +1292,7 @@ void Beam::FilterList(ArrayOfObjects *childList)
         }
     }
 
-    Staff *beamStaff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *beamStaff = this->GetAncestorStaff();
     /*
     if (this->HasBeamWith()) {
         Measure *measure = vrv_cast<Measure *>(this->GetFirstAncestor(MEASURE));
@@ -1516,7 +1516,7 @@ int Beam::CalcLayerOverlap(Doc *doc, Object *beam, int directionBias, int y1, in
     auto collidingElementsList = parentLayer->GetLayerElementsForTimeSpanOf(this, true);
     if (collidingElementsList.empty()) return 0;
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
 
     int leftMargin = 0;
     int rightMargin = 0;
@@ -1593,7 +1593,7 @@ int Beam::AdjustBeams(FunctorParams *functorParams)
 
     const int overlapMargin = std::max(leftMargin * params->m_directionBias, rightMargin * params->m_directionBias);
     if (overlapMargin >= params->m_overlapMargin) {
-        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+        Staff *staff = this->GetAncestorStaff();
         const int staffOffset = params->m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
         params->m_overlapMargin = (overlapMargin + staffOffset) * params->m_directionBias;
     }
diff --git a/src/chord.cpp b/src/chord.cpp
index 54da06946a3..5cfbf77d476 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -535,7 +535,7 @@ std::list<Note *> Chord::GetAdjacentNotesList(Staff *staff, int loc)
         Note *note = vrv_cast<Note *>(obj);
         assert(note);
 
-        Staff *noteStaff = note->FindStaff(RESOLVE_CROSSSTAFF);
+        Staff *noteStaff = note->GetAncestorStaff(RESOLVE_CROSSSTAFF);
         if (noteStaff != staff) continue;
 
         const int locDiff = note->GetDrawingLoc() - loc;
@@ -610,7 +610,7 @@ int Chord::CalcArtic(FunctorParams *functorParams)
     params->m_parent = this;
     params->m_stemDir = this->GetDrawingStemDir();
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
 
@@ -680,7 +680,7 @@ int Chord::CalcStem(FunctorParams *functorParams)
 
     Stem *stem = this->GetDrawingStem();
     assert(stem);
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
 
@@ -742,7 +742,7 @@ MapOfNoteLocs Chord::CalcNoteLocations(NotePredicate predicate)
 
         if (predicate && !predicate(note)) continue;
 
-        Staff *staff = note->FindStaff(RESOLVE_CROSSSTAFF);
+        Staff *staff = note->GetAncestorStaff(RESOLVE_CROSSSTAFF);
 
         noteLocations[staff].insert(note->GetDrawingLoc());
     }
@@ -910,7 +910,7 @@ int Chord::AdjustCrossStaffContent(FunctorParams *functorParams)
     // Check if chord spreads across several staves
     std::list<Staff *> extremalStaves;
     for (Note *note : { this->GetTopNote(), this->GetBottomNote() }) {
-        Staff *staff = note->FindStaff(RESOLVE_CROSSSTAFF);
+        Staff *staff = note->GetAncestorStaff(RESOLVE_CROSSSTAFF);
         extremalStaves.push_back(staff);
     }
     assert(extremalStaves.size() == 2);
@@ -942,7 +942,7 @@ int Chord::AdjustCrossStaffContent(FunctorParams *functorParams)
         }
 
         // Reposition the stem
-        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+        Staff *staff = this->GetAncestorStaff();
         Staff *rootStaff
             = (stem->GetDrawingStemDir() == STEMDIRECTION_up) ? extremalStaves.back() : extremalStaves.front();
         stem->SetDrawingYRel(stem->GetDrawingYRel() + getShift(staff) - getShift(rootStaff));
diff --git a/src/clef.cpp b/src/clef.cpp
index f296da27b6f..ff3b39e6843 100644
--- a/src/clef.cpp
+++ b/src/clef.cpp
@@ -184,7 +184,7 @@ int Clef::AdjustBeams(FunctorParams *functorParams)
     assert(params);
     if (!params->m_beam) return FUNCTOR_SIBLINGS;
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
 
     auto currentShapeIter = topToMiddleProportions.find(GetShape());
     if (currentShapeIter == topToMiddleProportions.end()) return FUNCTOR_CONTINUE;
@@ -234,7 +234,7 @@ int Clef::AdjustClefChanges(FunctorParams *functorParams)
 
     assert(params->m_aligner);
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
 
     // Create ad comparison object for each type / @n
     std::vector<int> ns;
diff --git a/src/editortoolkit_neume.cpp b/src/editortoolkit_neume.cpp
index 6e0a39ea39e..d6af7dab5e1 100644
--- a/src/editortoolkit_neume.cpp
+++ b/src/editortoolkit_neume.cpp
@@ -2194,7 +2194,7 @@ bool EditorToolkitNeume::ChangeGroup(std::string elementId, std::string contour)
     int initialLrx = firstChild->GetZone()->GetLrx();
     int initialLry = firstChild->GetZone()->GetLry();
 
-    Staff *staff = el->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = el->GetAncestorStaff();
     Facsimile *facsimile = m_doc->GetFacsimile();
 
     const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
@@ -2293,7 +2293,7 @@ bool EditorToolkitNeume::ToggleLigature(std::vector<std::string> elementIds, std
         int ligLrx = firstNc->GetZone()->GetLrx();
         int ligLry = firstNc->GetZone()->GetLry();
 
-        Staff *staff = firstNc->FindStaff(ANCESTOR_ONLY);
+        Staff *staff = firstNc->GetAncestorStaff();
 
         const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
         const int noteWidth = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 1.4);
@@ -2780,7 +2780,7 @@ bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj, Clef *clef)
 
     if (obj->Is(CUSTOS)) {
         Custos *custos = dynamic_cast<Custos *>(obj);
-        Staff *staff = custos->FindStaff(ANCESTOR_ONLY);
+        Staff *staff = custos->GetAncestorStaff();
 
         // Check interfaces
         if ((custos->GetPitchInterface() == NULL) || (custos->GetFacsimileInterface() == NULL)) {
@@ -2840,7 +2840,7 @@ bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj, Clef *clef)
 
     else if (obj->Is(SYLLABLE)) {
         Syllable *syl = dynamic_cast<Syllable *>(obj);
-        Staff *staff = syl->FindStaff(ANCESTOR_ONLY);
+        Staff *staff = syl->GetAncestorStaff();
 
         ListOfObjects pitchedChildren;
         InterfaceComparison ic(INTERFACE_PITCH);
@@ -2917,7 +2917,7 @@ bool EditorToolkitNeume::AdjustClefLineFromPosition(Clef *clef, Staff *staff)
     assert(clef);
 
     if (staff == NULL) {
-        staff = clef->FindStaff(ANCESTOR_ONLY);
+        staff = clef->GetAncestorStaff();
     }
 
     if (!clef->HasFacs() || !staff->HasFacs()) {
diff --git a/src/elementpart.cpp b/src/elementpart.cpp
index f13af9d2068..eae9adc3c15 100644
--- a/src/elementpart.cpp
+++ b/src/elementpart.cpp
@@ -307,7 +307,7 @@ bool Stem::IsSupportedChild(Object *child)
 
 int Stem::CompareToElementPosition(Doc *doc, LayerElement *otherElement, int margin)
 {
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
 
     // check if there is an overlap on the left or on the right and displace stem's parent correspondingly
     const int right = HorizontalLeftOverlap(otherElement, doc, margin, 0);
diff --git a/src/ftrem.cpp b/src/ftrem.cpp
index abd3e82ff70..a0456a64516 100644
--- a/src/ftrem.cpp
+++ b/src/ftrem.cpp
@@ -101,7 +101,7 @@ void FTrem::FilterList(ArrayOfObjects *childList)
         ++iter;
     }
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
 
     this->InitCoords(childList, staff, BEAMPLACE_NONE);
     this->InitCue(false);
diff --git a/src/horizontalaligner.cpp b/src/horizontalaligner.cpp
index 25b1774ff91..5a30fd054f0 100644
--- a/src/horizontalaligner.cpp
+++ b/src/horizontalaligner.cpp
@@ -1163,7 +1163,7 @@ int Alignment::AdjustDotsEnd(FunctorParams *functorParams)
         // otherwise they should be kept separate
         for (auto dot : params->m_dots) {
             // A third staff size will be used as required margin
-            const Staff *staff = dot->FindStaff(RESOLVE_CROSSSTAFF);
+            const Staff *staff = dot->GetAncestorStaff(RESOLVE_CROSSSTAFF);
             const int staffSize = staff->m_drawingStaffSize;
             const int thirdUnit = params->m_doc->GetDrawingUnit(staffSize) / 3;
 
@@ -1337,7 +1337,7 @@ int AlignmentReference::AdjustLayersEnd(FunctorParams *functorParams)
     // Determine staff
     if (params->m_current.empty()) return FUNCTOR_CONTINUE;
     LayerElement *firstElem = params->m_current.at(0);
-    Staff *staff = firstElem->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = firstElem->GetAncestorStaff(RESOLVE_CROSSSTAFF);
 
     const int extension
         = params->m_doc->GetDrawingLedgerLineExtension(staff->m_drawingStaffSize, firstElem->GetDrawingCueSize());
diff --git a/src/iopae.cpp b/src/iopae.cpp
index 2cd73976dba..d143b2e8ccd 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -498,7 +498,7 @@ void PAEOutput::WriteTuplet(Tuplet *tuplet)
 {
     assert(tuplet);
 
-    Staff *staff = tuplet->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = tuplet->GetAncestorStaff();
 
     double content = tuplet->GetContentAlignmentDuration(NULL, NULL, true, staff->m_drawingNotationType);
     // content = DUR_MAX / 2^(dur - 2)
diff --git a/src/layer.cpp b/src/layer.cpp
index 96e31e5328c..cac1aef623a 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -282,7 +282,7 @@ data_STEMDIRECTION Layer::GetDrawingStemDir(const ArrayOfBeamElementCoords *coor
     assert(alignmentLast);
 
     // We are ignoring cross-staff situation here because this should not be called if we have one
-    Staff *staff = first->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = first->GetAncestorStaff();
 
     double time = alignmentFirst->GetTime();
     double duration = alignmentLast->GetTime() - time + last->GetAlignmentDuration();
@@ -306,7 +306,7 @@ std::set<int> Layer::GetLayersNForTimeSpanOf(LayerElement *element)
     Alignment *alignment = element->GetAlignment();
     assert(alignment);
 
-    Staff *staff = element->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = element->GetAncestorStaff(RESOLVE_CROSSSTAFF);
 
     return this->GetLayersNInTimeSpan(alignment->GetTime(), element->GetAlignmentDuration(), measure, staff->GetN());
 }
@@ -374,7 +374,7 @@ ListOfObjects Layer::GetLayerElementsForTimeSpanOf(LayerElement *element, bool e
         return {};
     }
 
-    Staff *staff = element->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = element->GetAncestorStaff(RESOLVE_CROSSSTAFF);
 
     return GetLayerElementsInTimeSpan(time, duration, measure, staff->GetN(), excludeCurrent);
 }
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 0a9260f61d8..8ee8c03fcb6 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -242,7 +242,7 @@ int LayerElement::GetOriginalLayerN()
     return layerN;
 }
 
-Staff *LayerElement::FindStaff(const StaffSearch strategy, const bool assertExistence) const
+Staff *LayerElement::GetAncestorStaff(const StaffSearch strategy, const bool assertExistence) const
 {
     Staff *staff = NULL;
     if (strategy == RESOLVE_CROSSSTAFF) {
@@ -274,14 +274,14 @@ data_STAFFREL_basic LayerElement::GetCrossStaffRel()
 {
     if (!m_crossStaff) return STAFFREL_basic_NONE;
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
 
     return (m_crossStaff->GetN() < staff->GetN()) ? STAFFREL_basic_above : STAFFREL_basic_below;
 }
 
 void LayerElement::GetOverflowStaffAlignments(StaffAlignment *&above, StaffAlignment *&below)
 {
-    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
 
     // By default use the alignment of the staff
     above = staff->GetAlignment();
@@ -574,7 +574,7 @@ int LayerElement::GetDrawingRadius(Doc *doc, bool isInLigature)
 
     wchar_t code = 0;
     int dur = DUR_4;
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     bool isMensuralDur = false;
     if (this->Is(NOTE)) {
         Note *note = vrv_cast<Note *>(this);
@@ -828,7 +828,7 @@ MapOfDotLocs LayerElement::CalcOptimalDotLocations()
         return {};
     }
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     const int layerCount = staff->GetChildCount(LAYER);
 
     // Calculate primary/secondary dot locations
@@ -1102,7 +1102,7 @@ int LayerElement::AlignHorizontally(FunctorParams *functorParams)
         m_alignment = note->GetAlignment();
     }
     else if (this->Is(SYL)) {
-        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+        Staff *staff = this->GetAncestorStaff();
         if (staff->m_drawingNotationType == NOTATIONTYPE_neume) {
             type = ALIGNMENT_DEFAULT;
         }
@@ -1154,7 +1154,7 @@ int LayerElement::AlignHorizontally(FunctorParams *functorParams)
     else {
         assert(this->IsGraceNote());
         if (this->Is(CHORD) || (this->Is(NOTE) && !chordParent)) {
-            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+            Staff *staff = this->GetAncestorStaff();
             int graceAlignerId = params->m_doc->GetOptions()->m_graceRhythmAlign.GetValue() ? 0 : staff->GetN();
             GraceAligner *graceAligner = m_alignment->GetGraceAligner(graceAlignerId);
             // We know that this is a note or a chord - we stack them and they will be added at the end of the layer
@@ -1181,7 +1181,7 @@ int LayerElement::SetAlignmentPitchPos(FunctorParams *functorParams)
     if (this->IsScoreDefElement()) return FUNCTOR_SIBLINGS;
 
     LayerElement *layerElementY = this;
-    Staff *staffY = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staffY = this->GetAncestorStaff();
     Layer *layerY = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layerY);
 
@@ -1279,7 +1279,7 @@ int LayerElement::SetAlignmentPitchPos(FunctorParams *functorParams)
         // Automatically calculate rest position
         else {
             // set default location to the middle of the staff
-            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+            Staff *staff = this->GetAncestorStaff();
             loc = staff->m_drawingLines - 1;
             if (loc % 2 != 0) --loc;
             if (staff->m_drawingLines > 1) loc += 2;
@@ -1307,7 +1307,7 @@ int LayerElement::SetAlignmentPitchPos(FunctorParams *functorParams)
         // Automatically calculate rest position
         else {
             // set default location to the middle of the staff
-            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+            Staff *staff = this->GetAncestorStaff();
             loc = staff->m_drawingLines - 1;
             if ((rest->GetDur() < DUR_4) && (loc % 2 != 0)) --loc;
             // Adjust special cases
@@ -1459,7 +1459,7 @@ int LayerElement::AdjustBeams(FunctorParams *functorParams)
         if (accid->GetFunc() == accidLog_FUNC_edit) return FUNCTOR_CONTINUE;
     }
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
 
     // check if top/bottom of the element overlaps with beam coordinates
     int leftMargin = 0, rightMargin = 0;
@@ -1570,7 +1570,7 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
     const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted, bool isChordElement, bool isLowerElement,
     bool unison)
 {
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
 
     bool isInUnison = false;
     int shift = 0;
@@ -1878,7 +1878,7 @@ int LayerElement::AdjustXPos(FunctorParams *functorParams)
                         overlap = std::max(overlap, element->GetSelfRight() - this->GetSelfLeft() + margin);
                     }
                     else if (this->Is(ACCID) && element->Is(NOTE)) {
-                        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+                        Staff *staff = this->GetAncestorStaff();
                         const int staffTop = staff->GetDrawingY();
                         const int staffBottom = staffTop - params->m_doc->GetDrawingStaffSize(params->m_staffSize);
                         int verticalMargin = 0;
@@ -2060,7 +2060,7 @@ int LayerElement::PrepareCrossStaff(FunctorParams *functorParams)
         return FUNCTOR_CONTINUE;
     }
 
-    Staff *parentStaff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *parentStaff = this->GetAncestorStaff();
     // Check if we have a cross-staff to itself...
     if (m_crossStaff == parentStaff) {
         LogWarning("The cross staff reference '%d' for element '%s' seems to be identical to the parent staff",
@@ -2338,7 +2338,7 @@ int LayerElement::FindSpannedLayerElements(FunctorParams *functorParams)
 
         // Skip if neither parent staff nor cross staff matches the given staff number
         if (!params->m_staffNs.empty()) {
-            Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+            Staff *staff = this->GetAncestorStaff();
             if (params->m_staffNs.find(staff->GetN()) == params->m_staffNs.end()) {
                 Layer *layer = NULL;
                 staff = this->GetCrossStaff(layer);
@@ -2359,15 +2359,15 @@ int LayerElement::FindSpannedLayerElements(FunctorParams *functorParams)
 
         // Skip elements aligned at start/end, but on a different staff
         if ((this->GetAlignment() == start->GetAlignment()) && !start->Is(TIMESTAMP_ATTR)) {
-            Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
-            Staff *startStaff = start->FindStaff(RESOLVE_CROSSSTAFF);
+            Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+            Staff *startStaff = start->GetAncestorStaff(RESOLVE_CROSSSTAFF);
             if (staff->GetN() != startStaff->GetN()) {
                 return FUNCTOR_CONTINUE;
             }
         }
         if ((this->GetAlignment() == end->GetAlignment()) && !end->Is(TIMESTAMP_ATTR)) {
-            Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
-            Staff *endStaff = end->FindStaff(RESOLVE_CROSSSTAFF);
+            Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+            Staff *endStaff = end->GetAncestorStaff(RESOLVE_CROSSSTAFF);
             if (staff->GetN() != endStaff->GetN()) {
                 return FUNCTOR_CONTINUE;
             }
@@ -2554,7 +2554,7 @@ int LayerElement::PrepareDuration(FunctorParams *functorParams)
         durInterface->SetDurDefault(params->m_durDefault);
         // Check if there is a duration default for the staff
         if (!params->m_durDefaultForStaffN.empty()) {
-            Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+            Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
             if (params->m_durDefaultForStaffN.count(staff->GetN()) > 0) {
                 durInterface->SetDurDefault(params->m_durDefaultForStaffN.at(staff->GetN()));
             }
diff --git a/src/ligature.cpp b/src/ligature.cpp
index 86cd7984ea2..0fa19aee46c 100644
--- a/src/ligature.cpp
+++ b/src/ligature.cpp
@@ -136,7 +136,7 @@ int Ligature::CalcLigatureNotePos(FunctorParams *functorParams)
     m_drawingShapes.clear();
 
     Note *lastNote = dynamic_cast<Note *>(this->GetList(this)->back());
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
 
     const ArrayOfObjects *notes = this->GetList(this);
     assert(notes);
diff --git a/src/mrest.cpp b/src/mrest.cpp
index a969bf1197e..5e3129ee2a7 100644
--- a/src/mrest.cpp
+++ b/src/mrest.cpp
@@ -90,7 +90,7 @@ int MRest::ResetHorizontalAlignment(FunctorParams *functorParams)
 int MRest::GetOptimalLayerLocation(Staff *staff, Layer *layer, int defaultLocation)
 {
     if (!layer) return defaultLocation;
-    Staff *parentStaff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *parentStaff = this->GetAncestorStaff();
 
     // handle rest positioning for 2 layers. 3 layers and more are much more complex to solve
     if (parentStaff->GetChildCount(LAYER) != 2) return defaultLocation;
diff --git a/src/note.cpp b/src/note.cpp
index 6f236848cca..7d1d68087e0 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -211,7 +211,7 @@ Accid *Note::GetDrawingAccid()
 bool Note::HasLedgerLines(int &linesAbove, int &linesBelow, Staff *staff)
 {
     if (!staff) {
-        staff = this->FindStaff(ANCESTOR_ONLY);
+        staff = this->GetAncestorStaff();
     }
 
     linesAbove = (this->GetDrawingLoc() - staff->m_drawingLines * 2 + 2) / 2;
@@ -455,7 +455,7 @@ wchar_t Note::GetMensuralNoteheadGlyph() const
         return 0;
     }
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     bool mensural_black = (staff->m_drawingNotationType == NOTATIONTYPE_mensural_black);
 
     wchar_t code = 0;
@@ -618,7 +618,7 @@ void Note::CalcMIDIPitch(int shift)
     }
     else if (this->HasTabCourse()) {
         // tablature
-        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+        Staff *staff = this->GetAncestorStaff();
         if (staff->m_drawingTuning) {
             m_MIDIPitch = staff->m_drawingTuning->CalcPitchNumber(
                 this->GetTabCourse(), this->GetTabFret(), staff->m_drawingNotationType);
@@ -862,7 +862,7 @@ int Note::CalcArtic(FunctorParams *functorParams)
     params->m_parent = this;
     params->m_stemDir = this->GetDrawingStemDir();
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
 
@@ -930,7 +930,7 @@ int Note::CalcStem(FunctorParams *functorParams)
 
     Stem *stem = this->GetDrawingStem();
     assert(stem);
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
 
@@ -982,7 +982,7 @@ int Note::CalcChordNoteHeads(FunctorParams *functorParams)
     FunctorDocParams *params = vrv_params_cast<FunctorDocParams *>(functorParams);
     assert(params);
 
-    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
     const int staffSize = staff->m_drawingStaffSize;
 
     bool mixedCue = false;
@@ -1053,7 +1053,7 @@ MapOfNoteLocs Note::CalcNoteLocations(NotePredicate predicate)
 {
     if (predicate && !predicate(this)) return {};
 
-    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
 
     MapOfNoteLocs noteLocations;
     noteLocations[staff] = { this->GetDrawingLoc() };
@@ -1088,7 +1088,7 @@ int Note::CalcDots(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
     const int staffSize = staff->m_drawingStaffSize;
     const bool drawingCueSize = this->GetDrawingCueSize();
 
@@ -1156,7 +1156,7 @@ int Note::CalcLedgerLines(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
     const int staffSize = staff->m_drawingStaffSize;
     const int staffX = staff->GetDrawingX();
     const bool drawingCueSize = this->GetDrawingCueSize();
diff --git a/src/rest.cpp b/src/rest.cpp
index 30792c475e9..d70671ce93c 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -521,7 +521,7 @@ int Rest::AdjustBeams(FunctorParams *functorParams)
     // Adjustment should be an even number, so that the rest is positioned properly
     const int overlapMargin = std::min(leftMargin, rightMargin);
     if (overlapMargin < 0) {
-        Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+        Staff *staff = this->GetAncestorStaff();
         if ((!HasOloc() || !HasPloc()) && !HasLoc()) {
             const int unit = params->m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
             const int locAdjust = (params->m_directionBias * (overlapMargin - 2 * unit + 1) / unit);
@@ -607,7 +607,7 @@ int Rest::CalcDots(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = this->FindStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
     const bool drawingCueSize = this->GetDrawingCueSize();
     const int staffSize = staff->m_drawingStaffSize;
 
@@ -671,7 +671,7 @@ int Rest::Transpose(FunctorParams *functorParams)
     if ((!HasOloc() || !HasPloc()) && !HasLoc()) return FUNCTOR_SIBLINGS;
 
     // Find whether current layer is top, middle (either one if multiple) or bottom
-    Staff *parentStaff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *parentStaff = this->GetAncestorStaff();
     Layer *parentLayer = vrv_cast<Layer *>(GetFirstAncestor(LAYER));
     assert(parentLayer);
 
diff --git a/src/slur.cpp b/src/slur.cpp
index c65ebb97e93..7abbe6181b9 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -137,8 +137,8 @@ Staff *Slur::GetBoundaryCrossStaff()
     }
     else {
         // Check if the two elements are in different staves (but themselves not cross-staff)
-        Staff *startStaff = start->FindStaff(ANCESTOR_ONLY, false);
-        Staff *endStaff = end->FindStaff(ANCESTOR_ONLY, false);
+        Staff *startStaff = start->GetAncestorStaff(ANCESTOR_ONLY, false);
+        Staff *endStaff = end->GetAncestorStaff(ANCESTOR_ONLY, false);
         if (startStaff && endStaff && (startStaff->GetN() != endStaff->GetN())) {
             return endStaff;
         }
@@ -163,8 +163,8 @@ std::vector<LayerElement *> Slur::CollectSpannedElements(Staff *staff, int xMin,
 
     std::set<int> staffNumbers;
     staffNumbers.emplace(staff->GetN());
-    Staff *startStaff = this->GetStart()->FindStaff(RESOLVE_CROSSSTAFF, false);
-    Staff *endStaff = this->GetEnd()->FindStaff(RESOLVE_CROSSSTAFF, false);
+    Staff *startStaff = this->GetStart()->GetAncestorStaff(RESOLVE_CROSSSTAFF, false);
+    Staff *endStaff = this->GetEnd()->GetAncestorStaff(RESOLVE_CROSSSTAFF, false);
     if (startStaff && (startStaff != staff)) {
         staffNumbers.emplace(startStaff->GetN());
     }
@@ -273,7 +273,7 @@ Staff *Slur::CalculateExtremalStaff(Staff *staff, int xMin, int xMax, char spann
     // The floating curve positioner of cross staff slurs should live in the upper/lower staff alignment
     // corresponding to whether the slur is curved above/below
     auto adaptStaff = [&extremalStaff, curveDir](LayerElement *element) {
-        Staff *elementStaff = element->FindStaff(RESOLVE_CROSSSTAFF);
+        Staff *elementStaff = element->GetAncestorStaff(RESOLVE_CROSSSTAFF);
         if ((curveDir == curvature_CURVEDIR_above) && (elementStaff->GetN() < extremalStaff->GetN())) {
             extremalStaff = elementStaff;
         }
diff --git a/src/tie.cpp b/src/tie.cpp
index ca5f01d97ac..99d9a0fb713 100644
--- a/src/tie.cpp
+++ b/src/tie.cpp
@@ -394,7 +394,7 @@ void Tie::CalculateXPosition(Doc *doc, Staff *staff, Chord *startParentChord, Ch
             }
             // endPoint
             Staff *endStaff = staff;
-            if (endParentChord) endStaff = endParentChord->FindStaff(ANCESTOR_ONLY);
+            if (endParentChord) endStaff = endParentChord->GetAncestorStaff();
             if (endParentChord && endParentChord->HasAdjacentNotesInStaff(endStaff)) {
                 endPoint.x = this->CalculateAdjacentChordXOffset(
                     doc, endStaff, endParentChord, endNote, drawingCurveDir, endPoint.x, false);
@@ -454,7 +454,7 @@ void Tie::CalculateXPosition(Doc *doc, Staff *staff, Chord *startParentChord, Ch
         if (!isShortTie) {
             // endPoint
             Staff *endStaff = staff;
-            if (endParentChord) endStaff = endParentChord->FindStaff(ANCESTOR_ONLY);
+            if (endParentChord) endStaff = endParentChord->GetAncestorStaff();
             if (endParentChord && endParentChord->HasAdjacentNotesInStaff(endStaff)) {
                 endPoint.x = this->CalculateAdjacentChordXOffset(
                     doc, endStaff, endParentChord, endNote, drawingCurveDir, endPoint.x, false);
diff --git a/src/timeinterface.cpp b/src/timeinterface.cpp
index 835b69b84bd..490b4370f9d 100644
--- a/src/timeinterface.cpp
+++ b/src/timeinterface.cpp
@@ -97,7 +97,7 @@ bool TimePointInterface::IsOnStaff(int n)
         return false;
     }
     else if (m_start) {
-        Staff *staff = m_start->FindStaff(ANCESTOR_ONLY, false);
+        Staff *staff = m_start->GetAncestorStaff(ANCESTOR_ONLY, false);
         if (staff && (staff->GetN() == n)) return true;
     }
     return false;
@@ -129,7 +129,7 @@ std::vector<Staff *> TimePointInterface::GetTstampStaves(Measure *measure, Objec
         }
     }
     else if (m_start && !m_start->Is(TIMESTAMP_ATTR)) {
-        Staff *staff = m_start->FindStaff(ANCESTOR_ONLY);
+        Staff *staff = m_start->GetAncestorStaff();
         staffList.push_back(staff->GetN());
     }
     else if (measure->GetChildCount(STAFF) == 1) {
@@ -285,10 +285,10 @@ void TimeSpanningInterface::GetCrossStaffOverflows(
 
     // No cross-staff endpoints, check if the slur itself crosses staves
     if (!startStaff) {
-        startStaff = this->GetStart()->FindStaff(ANCESTOR_ONLY, false);
+        startStaff = this->GetStart()->GetAncestorStaff(ANCESTOR_ONLY, false);
     }
     if (!endStaff) {
-        endStaff = this->GetEnd()->FindStaff(ANCESTOR_ONLY, false);
+        endStaff = this->GetEnd()->GetAncestorStaff(ANCESTOR_ONLY, false);
     }
 
     // This happens with slurs starting or ending with a timestamp
diff --git a/src/tuplet.cpp b/src/tuplet.cpp
index 2442d17c9d6..74e32e3dde9 100644
--- a/src/tuplet.cpp
+++ b/src/tuplet.cpp
@@ -320,7 +320,7 @@ void Tuplet::CalculateTupletNumCrossStaff(LayerElement *layerElement)
         return;
     };
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     // Find if there is a mix of cross-staff and non-cross-staff elements in the tuplet
     ListOfObjects descendants;
     ClassIdsComparison comparison({ CHORD, NOTE, REST });
@@ -643,7 +643,7 @@ int Tuplet::AdjustTupletsY(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     const int staffSize = staff->m_drawingStaffSize;
 
     assert(m_drawingBracketPos != STAFFREL_basic_NONE);
diff --git a/src/verse.cpp b/src/verse.cpp
index 56946b76fdf..d69e6032f2d 100644
--- a/src/verse.cpp
+++ b/src/verse.cpp
@@ -238,7 +238,7 @@ int Verse::PrepareProcessingLists(FunctorParams *functorParams)
     assert(params);
     // StaffN_LayerN_VerseN_t *tree = vrv_cast<StaffN_LayerN_VerseN_t*>((*params).at(0));
 
-    Staff *staff = this->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = this->GetAncestorStaff();
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
 
diff --git a/src/view_control.cpp b/src/view_control.cpp
index 85733bdf254..4f58e7e33b1 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -1336,7 +1336,7 @@ void View::DrawArpeg(DeviceContext *dc, Arpeg *arpeg, Measure *measure, System *
     const int bottom = bottomNote->GetDrawingY();
 
     // We arbitrarily look at the top note
-    Staff *staff = topNote->FindStaff(ANCESTOR_ONLY);
+    Staff *staff = topNote->GetAncestorStaff();
     const bool drawingCueSize = topNote->GetDrawingCueSize();
 
     // We are going to have only one FloatingPositioner - staff will be the top note one
diff --git a/src/view_page.cpp b/src/view_page.cpp
index 45fb59368bf..43a572e622c 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -834,7 +834,7 @@ void View::DrawBarLine(
     assert(dc);
     assert(barLine);
 
-    Staff *staff = barLine->FindStaff(ANCESTOR_ONLY, false);
+    Staff *staff = barLine->GetAncestorStaff(ANCESTOR_ONLY, false);
     const int staffSize = (staff) ? staff->m_drawingStaffSize : 100;
 
     const int x = barLine->GetDrawingX();
diff --git a/src/view_slur.cpp b/src/view_slur.cpp
index d280f91dffa..07f51fed6c2 100644
--- a/src/view_slur.cpp
+++ b/src/view_slur.cpp
@@ -182,8 +182,8 @@ float View::CalcInitialSlur(
     const std::vector<LayerElement *> elements
         = slur->CollectSpannedElements(staff, bezier.p1.x, bezier.p2.x, curve->GetSpanningType());
 
-    Staff *startStaff = slur->GetStart()->FindStaff(RESOLVE_CROSSSTAFF, false);
-    Staff *endStaff = slur->GetEnd()->FindStaff(RESOLVE_CROSSSTAFF, false);
+    Staff *startStaff = slur->GetStart()->GetAncestorStaff(RESOLVE_CROSSSTAFF, false);
+    Staff *endStaff = slur->GetEnd()->GetAncestorStaff(RESOLVE_CROSSSTAFF, false);
 
     curve->ClearSpannedElements();
     for (auto element : elements) {

From f19f860804bbc0eddd71bb18e8b5ed5ad79ba624 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 21 Jan 2022 20:42:00 +0200
Subject: [PATCH 102/403] Minor fix

---
 src/beam.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 4d938e21898..176ae7ad7d2 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1058,7 +1058,7 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
         }
     }
 
-    short minDuration = DUR_4;
+    int minDuration = DUR_4;
     for (auto coord : m_beamElementCoordRefs) {
         if (!coord->m_closestNote) continue;
         // if location matches, or if current elements duration is shorter than 8th. This ensures that beams with

From 0d005a2a605d3c41752536a9c27449667ec69434 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 07:41:29 +0100
Subject: [PATCH 103/403] Fix measure positioning

---
 src/doc.cpp            | 7 +++++++
 src/floatingobject.cpp | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/doc.cpp b/src/doc.cpp
index 78c1ccc5e0f..d709df4c10e 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -859,6 +859,13 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
         contentPage->LayOutHorizontally();
         LogMessage("Horizontal Layout Done");
     }
+    else {
+        // Adjust measure X position
+        AlignMeasuresParams alignMeasuresParams;
+        Functor alignMeasures(&Object::AlignMeasures);
+        Functor alignMeasuresEnd(&Object::AlignMeasuresEnd);
+        contentPage->Process(&alignMeasures, &alignMeasuresParams, &alignMeasuresEnd);
+    }
 
     System *contentSystem = vrv_cast<System *>(contentPage->DetachChild(0));
     assert(contentSystem);
diff --git a/src/floatingobject.cpp b/src/floatingobject.cpp
index 9ae8c5505d2..61677dcb18a 100644
--- a/src/floatingobject.cpp
+++ b/src/floatingobject.cpp
@@ -254,6 +254,7 @@ FloatingPositioner::FloatingPositioner(FloatingObject *object, StaffAlignment *a
 void FloatingPositioner::ResetPositioner()
 {
     BoundingBox::ResetBoundingBox();
+    ResetCachedDrawingX();
     ResetCachedDrawingY();
 
     m_objectX = NULL;

From bd0ba94e55a85d63161a480f269b3cc58164618c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 08:31:51 +0100
Subject: [PATCH 104/403] Add cache use in DocCastOff

---
 src/doc.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/doc.cpp b/src/doc.cpp
index f266071b504..ea245ffcbfc 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -928,7 +928,20 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
 
     Page *unCastOffPage = this->SetDrawingPage(0);
     assert(unCastOffPage);
-    unCastOffPage->LayOutHorizontally();
+
+    // Check if the the horizontal layout is cached by looking at the first measure
+    Measure *firstMeasure = vrv_cast<Measure *>(unCastOffPage->FindDescendantByType(MEASURE));
+    if (!firstMeasure || firstMeasure->m_cachedCastOffWidth == VRV_UNSET) {
+        LogDebug("Performing the horizontal layout");
+        unCastOffPage->LayOutHorizontally();
+    }
+    else {
+        // Adjust measure X position
+        AlignMeasuresParams alignMeasuresParams(this);
+        Functor alignMeasures(&Object::AlignMeasures);
+        Functor alignMeasuresEnd(&Object::AlignMeasuresEnd);
+        unCastOffPage->Process(&alignMeasures, &alignMeasuresParams, &alignMeasuresEnd);
+    }
 
     Page *castOffSinglePage = new Page();
 

From 08f2d7fbf56eab3f4a00489f99305ff61d11a7c0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 15:25:27 +0100
Subject: [PATCH 105/403] Add cache members and functors to Measure,
 LayerElement and Arpeg

---
 include/vrv/arpeg.h        | 10 ++++++++
 include/vrv/layerelement.h | 15 ++++++++++++
 include/vrv/measure.h      | 22 +++++++++++++----
 include/vrv/object.h       |  6 +++++
 src/arpeg.cpp              | 16 +++++++++++++
 src/layerelement.cpp       | 20 ++++++++++++++++
 src/measure.cpp            | 48 ++++++++++++++++++++++++--------------
 7 files changed, 115 insertions(+), 22 deletions(-)

diff --git a/include/vrv/arpeg.h b/include/vrv/arpeg.h
index 7dcb3d10bb2..df1a503c7b2 100644
--- a/include/vrv/arpeg.h
+++ b/include/vrv/arpeg.h
@@ -103,6 +103,11 @@ class Arpeg : public ControlElement,
      */
     int ResetDrawing(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::HorizontalLayoutCache
+     */
+    int HorizontalLayoutCache(FunctorParams *functorParams) override;
+
 protected:
     //
 private:
@@ -116,6 +121,11 @@ class Arpeg : public ControlElement,
      * (See View::DrawArpeg that sets the FloatingPositioner)
      */
     int m_drawingXRel;
+
+    /**
+     * The cached value for m_darwingXRel for caching horizontal layout
+     */
+    int m_cachedXRel;
 };
 
 } // namespace vrv
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 590843fec21..ba2a2316df2 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -411,6 +411,11 @@ class LayerElement : public Object,
      */
     int PrepareDuration(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::HorizontalLayoutCache
+     */
+    int HorizontalLayoutCache(FunctorParams *functorParams) override;
+
 protected:
     /**
      * Helper to figure whether two chords are in fully in unison based on the locations of the notes.
@@ -481,12 +486,22 @@ class LayerElement : public Object,
      */
     int m_drawingYRel;
 
+    /**
+     * The cached value for m_darwingYRel for caching horizontal layout
+     */
+    int m_cachedYRel;
+
     /**
      * 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;
 
+    /**
+     * The cached value for m_darwingXRel for caching horizontal layout
+     */
+    int m_cachedXRel;
+
     /**
      * The cached drawing cue size set by PrepareDrawingCueSize
      */
diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index 66d36d17f3e..46496c56e73 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -467,6 +467,11 @@ class Measure : public Object,
      */
     int PrepareTimestampsEnd(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::HorizontalLayoutCache
+     */
+    int HorizontalLayoutCache(FunctorParams *functorParams) override;
+
 public:
     // flags for drawing measure barline based on visibility or other conditions
     enum BarlineDrawingFlags {
@@ -490,10 +495,14 @@ class Measure : public Object,
     mutable MeasureAligner m_measureAligner;
 
     TimestampAligner m_timestampAligner;
-                    
-    int m_cachedCastOffOverflow;
-    int m_cachedCastOffDrawingXRel;
-    int m_cachedCastOffWidth;
+
+    /**
+     * @name Cached values of overflow and width for caching the horizontal layout
+     */
+    ///@{
+    int m_cachedOverflow;
+    int m_cachedWidth;
+    ///@}
 
 protected:
     /**
@@ -502,6 +511,11 @@ class Measure : public Object,
      */
     int m_drawingXRel;
 
+    /**
+     * The cached value for m_darwingXRel for caching horizontal layout
+     */
+    int m_cachedXRel;
+
 private:
     bool m_measuredMusic;
 
diff --git a/include/vrv/object.h b/include/vrv/object.h
index e6a03d3aaae..f8011e9d918 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -1257,6 +1257,12 @@ class Object : public BoundingBox {
     virtual int CalcOnsetOffsetEnd(FunctorParams *) { return FUNCTOR_CONTINUE; }
     ///@}
 
+    /**
+     * Cache or restore cached horizontal layout for faster layout redoing
+     */
+    ///@{
+    virtual int HorizontalLayoutCache(FunctorParams *) { return FUNCTOR_CONTINUE; }
+
     /**
      * Adjust note timings based on ties
      */
diff --git a/src/arpeg.cpp b/src/arpeg.cpp
index 198143019ee..11b388e0f92 100644
--- a/src/arpeg.cpp
+++ b/src/arpeg.cpp
@@ -55,6 +55,7 @@ void Arpeg::Reset()
     ResetEnclosingChars();
 
     m_drawingXRel = 0;
+    m_cachedXRel = VRV_UNSET;
 }
 
 int Arpeg::GetDrawingX() const
@@ -269,4 +270,19 @@ int Arpeg::ResetDrawing(FunctorParams *functorParams)
     return interface->InterfaceResetDrawing(functorParams, this);
 }
 
+int Arpeg::HorizontalLayoutCache(FunctorParams *functorParams)
+{
+    HorizontalLayoutCacheParams *params = vrv_params_cast<HorizontalLayoutCacheParams *>(functorParams);
+    assert(params);
+
+    if (params->m_restore) {
+        m_drawingXRel = m_cachedXRel;
+    }
+    else {
+        m_cachedXRel = m_drawingXRel;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 7d23704b42a..ea2f5e20462 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -119,6 +119,9 @@ void LayerElement::Reset()
     m_drawingXRel = 0;
     m_drawingCueSize = false;
 
+    m_cachedYRel = VRV_UNSET;
+    m_cachedXRel = VRV_UNSET;
+
     m_scoreDefRole = SCOREDEF_NONE;
     m_alignment = NULL;
     m_graceAlignment = NULL;
@@ -2576,4 +2579,21 @@ int LayerElement::PrepareDuration(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int LayerElement::HorizontalLayoutCache(FunctorParams *functorParams)
+{
+    HorizontalLayoutCacheParams *params = vrv_params_cast<HorizontalLayoutCacheParams *>(functorParams);
+    assert(params);
+
+    if (params->m_restore) {
+        m_drawingXRel = m_cachedXRel;
+        m_drawingYRel = m_cachedYRel;
+    }
+    else {
+        m_cachedXRel = m_drawingXRel;
+        m_cachedYRel = m_drawingYRel;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/measure.cpp b/src/measure.cpp
index 5b1ca952948..345bc67fac0 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -134,10 +134,10 @@ void Measure::Reset()
     m_xAbs = VRV_UNSET;
     m_xAbs2 = VRV_UNSET;
     m_drawingXRel = 0;
-    
-    m_cachedCastOffOverflow = VRV_UNSET;
-    m_cachedCastOffDrawingXRel = VRV_UNSET;
-    m_cachedCastOffWidth = VRV_UNSET;
+
+    m_cachedXRel = VRV_UNSET;
+    m_cachedOverflow = VRV_UNSET;
+    m_cachedWidth = VRV_UNSET;
 
     // by default, we have a single barLine on the right (none on the left)
     m_rightBarLine.SetForm(this->GetRight());
@@ -1201,17 +1201,11 @@ int Measure::CastOffSystems(FunctorParams *functorParams)
 {
     CastOffSystemsParams *params = vrv_params_cast<CastOffSystemsParams *>(functorParams);
     assert(params);
-    
-    if (m_cachedCastOffWidth == VRV_UNSET) {
-        // Check if the measure has some overflowing control elements
-        m_cachedCastOffOverflow = this->GetDrawingOverflow();
-        m_cachedCastOffWidth = this->GetWidth();
-        m_cachedCastOffDrawingXRel = this->m_drawingXRel;
-        
-    }
-    int overflow = this->m_cachedCastOffOverflow;
-    int width = this->m_cachedCastOffWidth;
-    int drawingXRel = this->m_cachedCastOffDrawingXRel;
+
+    const bool hasCache = (m_cachedWidth == VRV_UNSET);
+    int overflow = hasCache ? this->m_cachedOverflow : this->GetDrawingOverflow();
+    int width = hasCache ? this->m_cachedWidth : this->GetWidth();
+    int drawingXRel = this->m_drawingXRel;
 
     Object *nextMeasure = params->m_contentSystem->GetNext(this, MEASURE);
     const bool isLeftoverMeasure = ((NULL == nextMeasure) && params->m_doc->GetOptions()->m_breaksNoWidow.GetValue()
@@ -1227,8 +1221,7 @@ int Measure::CastOffSystems(FunctorParams *functorParams)
             return FUNCTOR_SIBLINGS;
         }
         // Break it if necessary
-        else if (drawingXRel + width + params->m_currentScoreDefWidth - params->m_shift
-            > params->m_systemWidth) {
+        else if (drawingXRel + width + params->m_currentScoreDefWidth - params->m_shift > params->m_systemWidth) {
             params->m_currentSystem = new System();
             params->m_page->AddChild(params->m_currentSystem);
             params->m_shift = drawingXRel;
@@ -1240,7 +1233,7 @@ int Measure::CastOffSystems(FunctorParams *functorParams)
                 if (oneOfPendingObjects->Is(MEASURE)) {
                     Measure *firstPendingMesure = vrv_cast<Measure *>(oneOfPendingObjects);
                     assert(firstPendingMesure);
-                    params->m_shift = firstPendingMesure->m_cachedCastOffDrawingXRel;
+                    params->m_shift = firstPendingMesure->m_cachedXRel;
                     params->m_leftoverSystem = NULL;
                     // it has to be first measure
                     break;
@@ -1608,4 +1601,23 @@ int Measure::CalcOnsetOffset(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Measure::HorizontalLayoutCache(FunctorParams *functorParams)
+{
+    HorizontalLayoutCacheParams *params = vrv_params_cast<HorizontalLayoutCacheParams *>(functorParams);
+    assert(params);
+
+    if (params->m_restore) {
+        m_drawingXRel = m_cachedXRel;
+    }
+    else {
+        m_cachedWidth = this->GetWidth();
+        m_cachedOverflow = this->GetDrawingOverflow();
+        m_cachedXRel = m_drawingXRel;
+    }
+    if (this->GetLeftBarLine()) this->GetLeftBarLine()->HorizontalLayoutCache(functorParams);
+    if (this->GetRightBarLine()) this->GetRightBarLine()->HorizontalLayoutCache(functorParams);
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv

From f3754f69ef9c5ec5cacaf33a72b6ed4a404eb930 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 15:27:11 +0100
Subject: [PATCH 106/403] Add Page::HorizontalLayoutCache to store or restore
 cache

---
 include/vrv/page.h |  7 +++++++
 src/page.cpp       | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/include/vrv/page.h b/include/vrv/page.h
index 802dca23f5b..3065f47f0c9 100644
--- a/include/vrv/page.h
+++ b/include/vrv/page.h
@@ -99,6 +99,13 @@ class Page : public Object {
      */
     void LayOutHorizontally();
 
+    /**
+     * Layout out the measures horizontally using the cached values.
+     * This should be done in preparation of cast-off which it based on measure positioning.
+     * The content of the measures it not layout out and keeps previous relative positioning.
+     */
+    void HorizontalLayoutCachePage(bool restore = false);
+
     /**
      * Justifiy the content of the page (measures and their content) horizontally
      */
diff --git a/src/page.cpp b/src/page.cpp
index 17e7d4e8929..6e745582217 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -254,7 +254,7 @@ void Page::LayOutHorizontally()
     Functor alignVerticallyEnd(&Object::AlignVerticallyEnd);
     AlignVerticallyParams alignVerticallyParams(doc, &alignVertically, &alignVerticallyEnd);
     this->Process(&alignVertically, &alignVerticallyParams, &alignVerticallyEnd);
-    
+
     // Unless duration-based spacing is disabled, set the X position of each Alignment.
     // Does non-linear spacing based on the duration space between two Alignment objects.
     if (!doc->GetOptions()->m_evenNoteSpacing.GetValue()) {
@@ -426,6 +426,17 @@ void Page::LayOutHorizontally()
     this->Process(&prepareSlurs, &prepareSlursParams);
 }
 
+void Page::HorizontalLayoutCachePage(bool restore)
+{
+    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    assert(doc);
+
+    HorizontalLayoutCacheParams horizontalLayoutCacheParams(doc);
+    horizontalLayoutCacheParams.m_restore = restore;
+    Functor horizontalLayoutCache(&Object::HorizontalLayoutCache);
+    this->Process(&horizontalLayoutCache, &horizontalLayoutCacheParams);
+}
+
 void Page::LayOutVertically()
 {
     Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));

From e843e768034386905aa274df9a2567c7e6aeff6b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 15:27:24 +0100
Subject: [PATCH 107/403] Adjust Doc::CastOffBase to use cache if existing

---
 src/doc.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/doc.cpp b/src/doc.cpp
index ea245ffcbfc..7383de4d3d3 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -931,16 +931,13 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
 
     // Check if the the horizontal layout is cached by looking at the first measure
     Measure *firstMeasure = vrv_cast<Measure *>(unCastOffPage->FindDescendantByType(MEASURE));
-    if (!firstMeasure || firstMeasure->m_cachedCastOffWidth == VRV_UNSET) {
+    if (!firstMeasure || firstMeasure->m_cachedWidth == VRV_UNSET) {
         LogDebug("Performing the horizontal layout");
         unCastOffPage->LayOutHorizontally();
+        unCastOffPage->HorizontalLayoutCachePage();
     }
     else {
-        // Adjust measure X position
-        AlignMeasuresParams alignMeasuresParams(this);
-        Functor alignMeasures(&Object::AlignMeasures);
-        Functor alignMeasuresEnd(&Object::AlignMeasuresEnd);
-        unCastOffPage->Process(&alignMeasures, &alignMeasuresParams, &alignMeasuresEnd);
+        unCastOffPage->HorizontalLayoutCachePage(true);
     }
 
     Page *castOffSinglePage = new Page();

From e9e34ee0b02379fefe3a061c0613e145dcc3300d Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 15:29:06 +0100
Subject: [PATCH 108/403] Adjust Object::UnCastOff functor to reset cache in
 Measure

---
 include/vrv/functorparams.h |  3 +++
 include/vrv/measure.h       |  5 +++++
 src/measure.cpp             | 14 ++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 87251d1bd05..a183bd514db 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -2452,6 +2452,7 @@ class TransposeParams : public FunctorParams {
 /**
  * member 0: a pointer to the page we are adding system to
  * member 1: a pointer to the system we are adding content to
+ * member 2: a flag indicating if we need to reset the horizontal layout cache
  **/
 
 class UnCastOffParams : public FunctorParams {
@@ -2460,9 +2461,11 @@ class UnCastOffParams : public FunctorParams {
     {
         m_page = page;
         m_currentSystem = NULL;
+        m_resetCache = true;
     }
     Page *m_page;
     System *m_currentSystem;
+    bool m_resetCache;
 };
 
 } // namespace vrv
diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index 46496c56e73..6177a308392 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -467,6 +467,11 @@ class Measure : public Object,
      */
     int PrepareTimestampsEnd(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::UnCastOff
+     */
+    int UnCastOff(FunctorParams *functorParams) override;
+
     /**
      * See Object::HorizontalLayoutCache
      */
diff --git a/src/measure.cpp b/src/measure.cpp
index 345bc67fac0..9c564c66dfe 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -1601,6 +1601,20 @@ int Measure::CalcOnsetOffset(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Measure::UnCastOff(FunctorParams *functorParams)
+{
+    UnCastOffParams *params = vrv_params_cast<UnCastOffParams *>(functorParams);
+    assert(params);
+
+    if (params->m_resetCache) {
+        m_cachedXRel = VRV_UNSET;
+        m_cachedWidth = VRV_UNSET;
+        m_cachedOverflow = VRV_UNSET;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 int Measure::HorizontalLayoutCache(FunctorParams *functorParams)
 {
     HorizontalLayoutCacheParams *params = vrv_params_cast<HorizontalLayoutCacheParams *>(functorParams);

From d3d476875825cf9f41ffd7935eb138d3c093b533 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 15:29:53 +0100
Subject: [PATCH 109/403] Add HorizontalLayoutCacheParams

---
 include/vrv/functorparams.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index a183bd514db..7e7c2fdef10 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -804,6 +804,7 @@ class AlignHorizontallyParams : public FunctorParams {
 /**
  * member 0: the cumulated shift
  * member 1: the cumulated justifiable width
+ * member 2: the doc
  **/
 
 class AlignMeasuresParams : public FunctorParams {
@@ -1540,6 +1541,26 @@ class GenerateFeaturesParams : public FunctorParams {
     FeatureExtractor *m_extractor;
 };
 
+//----------------------------------------------------------------------------
+// HorizontalLayoutCacheParams
+//----------------------------------------------------------------------------
+
+/**
+ * member 0: a flag indicating if the cache should be stored (default) or restored
+ * member 1: a pointer to the Doc
+ **/
+
+class HorizontalLayoutCacheParams : public FunctorParams {
+public:
+    HorizontalLayoutCacheParams(Doc *doc)
+    {
+        m_restore = false;
+        m_doc = doc;
+    }
+    bool m_restore;
+    Doc *m_doc;
+};
+
 //----------------------------------------------------------------------------
 // GenerateMIDIParams
 //----------------------------------------------------------------------------

From 81c91d89be5c17ab06d83e28a9e34aeb991d29bb Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 15:30:53 +0100
Subject: [PATCH 110/403] Adjust Toolkit::RedoLayout to take and pass
 resetCache parameter

---
 include/vrv/doc.h     |  2 +-
 include/vrv/toolkit.h |  5 ++++-
 src/doc.cpp           |  3 ++-
 src/toolkit.cpp       | 18 ++++++++++++++++--
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index 84fdc82194e..967280b8583 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -296,7 +296,7 @@ class Doc : public Object {
      * Undo the cast off of the entire document.
      * The document will then contain one single page with one single system.
      */
-    void UnCastOffDoc();
+    void UnCastOffDoc(bool resetCache = true);
 
     /**
      * Cast off of the entire document according to the encoded data (pb and sb).
diff --git a/include/vrv/toolkit.h b/include/vrv/toolkit.h
index 3734f912456..26ced0cf965 100644
--- a/include/vrv/toolkit.h
+++ b/include/vrv/toolkit.h
@@ -570,8 +570,11 @@ class Toolkit {
      *
      * This can be called once the rendering option were changed, for example with a new page (sceen) height or a new
      * zoom level.
+     *
+     * @param jsonOptions A stringified JSON object with the action options
+     * resetCache: true or false; true by default;
      */
-    void RedoLayout();
+    void RedoLayout(const std::string &jsonOptions = "");
 
     /**
      * Redo the layout of the pitch postitions of the current drawing page
diff --git a/src/doc.cpp b/src/doc.cpp
index 7383de4d3d3..0f62e000f4f 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -1013,13 +1013,14 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
     }
 }
 
-void Doc::UnCastOffDoc()
+void Doc::UnCastOffDoc(bool resetCache)
 {
     Pages *pages = this->GetPages();
     assert(pages);
 
     Page *unCastOffPage = new Page();
     UnCastOffParams unCastOffParams(unCastOffPage);
+    unCastOffParams.m_resetCache = resetCache;
 
     Functor unCastOff(&Object::UnCastOff);
     this->Process(&unCastOff, &unCastOffParams);
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index 79826a07315..719202bca57 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -1174,8 +1174,22 @@ void Toolkit::ResetLogBuffer()
     logBuffer.clear();
 }
 
-void Toolkit::RedoLayout()
+void Toolkit::RedoLayout(const std::string &jsonOptions)
 {
+    bool resetCache = true;
+
+    jsonxx::Object json;
+
+    // Read JSON options if not empty
+    if (!jsonOptions.empty()) {
+        if (!json.parse(jsonOptions)) {
+            LogWarning("Cannot parse JSON std::string. Using default options.");
+        }
+        else {
+            if (json.has<jsonxx::Boolean>("resetCache")) resetCache = json.get<jsonxx::Boolean>("resetCache");
+        }
+    }
+
     this->ResetLogBuffer();
 
     if ((GetPageCount() == 0) || (m_doc.GetType() == Transcription) || (m_doc.GetType() == Facs)) {
@@ -1183,7 +1197,7 @@ void Toolkit::RedoLayout()
         return;
     }
 
-    m_doc.UnCastOffDoc();
+    m_doc.UnCastOffDoc(resetCache);
     if (m_options->m_breaks.GetValue() == BREAKS_line) {
         m_doc.CastOffLineDoc();
     }

From 92e0a09bfd66a31b20bcb7f00ebc46bf8025323a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 15:31:32 +0100
Subject: [PATCH 111/403] Adjust C wrapper and JS proxy

---
 emscripten/verovio-proxy.js | 6 +++---
 tools/c_wrapper.cpp         | 4 ++--
 tools/c_wrapper.h           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emscripten/verovio-proxy.js b/emscripten/verovio-proxy.js
index 481f19b2d15..3d9f0a5d578 100644
--- a/emscripten/verovio-proxy.js
+++ b/emscripten/verovio-proxy.js
@@ -79,7 +79,7 @@ verovio.vrvToolkit.loadZipDataBase64 = Module.cwrap( 'vrvToolkit_loadZipDataBase
 verovio.vrvToolkit.loadZipDataBuffer = Module.cwrap( 'vrvToolkit_loadZipDataBuffer', 'number', ['number', 'number', 'number'] );
 
 // void redoLayout(Toolkit *ic)
-verovio.vrvToolkit.redoLayout = Module.cwrap( 'vrvToolkit_redoLayout', null, ['number'] );
+verovio.vrvToolkit.redoLayout = Module.cwrap( 'vrvToolkit_redoLayout', null, ['number', 'string'] );
 
 // void redoPagePitchPosLayout(Toolkit *ic)
 verovio.vrvToolkit.redoPagePitchPosLayout = Module.cwrap( 'vrvToolkit_redoPagePitchPosLayout', null, ['number'] );
@@ -253,9 +253,9 @@ verovio.toolkit.prototype.loadZipDataBuffer = function ( data )
     return res;
 };
 
-verovio.toolkit.prototype.redoLayout = function ()
+verovio.toolkit.prototype.redoLayout = function ( options = {} )
 {
-    verovio.vrvToolkit.redoLayout( this.ptr );
+    verovio.vrvToolkit.redoLayout( this.ptr, JSON.stringify( options ) );
 }
 
 verovio.toolkit.prototype.redoPagePitchPosLayout = function ()
diff --git a/tools/c_wrapper.cpp b/tools/c_wrapper.cpp
index 7e3e162b727..51c6bb7c702 100644
--- a/tools/c_wrapper.cpp
+++ b/tools/c_wrapper.cpp
@@ -229,10 +229,10 @@ const char *vrvToolkit_renderToTimemap(void *tkPtr)
     return tk->GetCString();
 }
 
-void vrvToolkit_redoLayout(void *tkPtr)
+void vrvToolkit_redoLayout(void *tkPtr, const char *c_options)
 {
     Toolkit *tk = static_cast<Toolkit *>(tkPtr);
-    tk->RedoLayout();
+    tk->RedoLayout(c_options);
 }
 
 void vrvToolkit_redoPagePitchPosLayout(void *tkPtr)
diff --git a/tools/c_wrapper.h b/tools/c_wrapper.h
index a5034242636..2ff5a4c6bef 100644
--- a/tools/c_wrapper.h
+++ b/tools/c_wrapper.h
@@ -42,7 +42,7 @@ const char *vrvToolkit_renderToMIDI(void *tkPtr, const char *c_options);
 const char *vrvToolkit_renderToPAE(void *tkPtr);
 const char *vrvToolkit_renderToSVG(void *tkPtr, int page_no, const char *c_options);
 const char *vrvToolkit_renderToTimemap(void *tkPtr);
-void vrvToolkit_redoLayout(void *tkPtr);
+void vrvToolkit_redoLayout(void *tkPtr, const char *c_options);
 void vrvToolkit_redoPagePitchPosLayout(void *tkPtr);
 const char *vrvToolkit_renderData(void *tkPtr, const char *data, const char *options);
 void vrvToolkit_resetXmlIdSeed(void *tkPtr, int seed);

From 695af10fe19a640412b91460c91087c9a28668fe Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 15:31:46 +0100
Subject: [PATCH 112/403] Cleanup

---
 include/vrv/scoredef.h | 2 +-
 src/system.cpp         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/vrv/scoredef.h b/include/vrv/scoredef.h
index 5187fbe83a3..5e894be7c2b 100644
--- a/include/vrv/scoredef.h
+++ b/include/vrv/scoredef.h
@@ -264,7 +264,7 @@ class ScoreDef : public ScoreDefElement,
 public:
     bool m_setAsDrawing;
     bool m_insertScoreDef;
-                     
+
     int m_cacheCastOffWidth;
     //
 private:
diff --git a/src/system.cpp b/src/system.cpp
index 24889e0339a..f7d4ab52a41 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1003,6 +1003,8 @@ int System::CastOffPages(FunctorParams *functorParams)
         currentShift += params->m_pgHead2Height + params->m_pgFoot2Height;
     }
 
+    // LogMessage("System: %d", this->GetHeight());
+
     const int systemMaxPerPage = params->m_doc->GetOptions()->m_systemMaxPerPage.GetValue();
     const int childCount = params->m_currentPage->GetChildCount();
     if ((systemMaxPerPage && systemMaxPerPage == childCount)

From 8060d33e559e4bb8108476329273d7299cfcb673 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 15:34:19 +0100
Subject: [PATCH 113/403] Remove unused scoreDef width cache

---
 include/vrv/scoredef.h | 2 --
 src/scoredef.cpp       | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/vrv/scoredef.h b/include/vrv/scoredef.h
index 5e894be7c2b..b4e636ad155 100644
--- a/include/vrv/scoredef.h
+++ b/include/vrv/scoredef.h
@@ -265,8 +265,6 @@ class ScoreDef : public ScoreDefElement,
     bool m_setAsDrawing;
     bool m_insertScoreDef;
 
-    int m_cacheCastOffWidth;
-    //
 private:
     /** Flags for indicating whether labels need to be drawn or not */
     bool m_drawLabels;
diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index 2a2caccb74d..beab7d501c0 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -219,7 +219,6 @@ void ScoreDef::Reset()
     m_drawingWidth = 0;
     m_drawingLabelsWidth = 0;
     m_setAsDrawing = false;
-    m_cacheCastOffWidth = VRV_UNSET;
 }
 
 bool ScoreDef::IsSupportedChild(Object *child)
@@ -572,10 +571,7 @@ int ScoreDef::CastOffSystems(FunctorParams *functorParams)
     // the initial one - for this to be corrected, we would need two parameters, one for the current initial
     // scoreDef and one for the current that will be the initial one at the next system
     // Also, the abbr label (width) changes would not be taken into account
-    if (m_cacheCastOffWidth == VRV_UNSET) {
-        m_cacheCastOffWidth = this->GetDrawingWidth() + params->m_contentSystem->GetDrawingAbbrLabelsWidth();
-    }
-    params->m_currentScoreDefWidth = m_cacheCastOffWidth;
+    params->m_currentScoreDefWidth = this->GetDrawingWidth() + params->m_contentSystem->GetDrawingAbbrLabelsWidth();
 
     return FUNCTOR_SIBLINGS;
 }

From b45b8a7cc57b93d3caa94c0928dd4c49219ec779 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 16:10:22 +0100
Subject: [PATCH 114/403] Make member protected and add helper for checking
 cache

---
 include/vrv/measure.h | 21 +++++++++++++--------
 src/doc.cpp           |  3 ++-
 src/measure.cpp       |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index 6177a308392..3f26f20ddb1 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -84,6 +84,11 @@ class Measure : public Object,
      */
     void AddTimestamp(TimestampAttr *timestampAttr);
 
+    /**
+     * Return true if the Measure has cached values for the horizontal layout
+     */
+    bool HasCachedHorizontalLayout() const { return (m_cachedWidth != VRV_UNSET); }
+
     /**
      * Get the X drawing position
      */
@@ -501,14 +506,6 @@ class Measure : public Object,
 
     TimestampAligner m_timestampAligner;
 
-    /**
-     * @name Cached values of overflow and width for caching the horizontal layout
-     */
-    ///@{
-    int m_cachedOverflow;
-    int m_cachedWidth;
-    ///@}
-
 protected:
     /**
      * The X relative position of the measure.
@@ -521,6 +518,14 @@ class Measure : public Object,
      */
     int m_cachedXRel;
 
+    /**
+     * @name Cached values of overflow and width for caching the horizontal layout
+     */
+    ///@{
+    int m_cachedOverflow;
+    int m_cachedWidth;
+    ///@}
+
 private:
     bool m_measuredMusic;
 
diff --git a/src/doc.cpp b/src/doc.cpp
index 0f62e000f4f..d79ad89c604 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -930,8 +930,9 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
     assert(unCastOffPage);
 
     // Check if the the horizontal layout is cached by looking at the first measure
+    // The cache is not set the first time, or can be reset by Doc::UnCastOffDoc
     Measure *firstMeasure = vrv_cast<Measure *>(unCastOffPage->FindDescendantByType(MEASURE));
-    if (!firstMeasure || firstMeasure->m_cachedWidth == VRV_UNSET) {
+    if (!firstMeasure || !firstMeasure->HasCachedHorizontalLayout()) {
         LogDebug("Performing the horizontal layout");
         unCastOffPage->LayOutHorizontally();
         unCastOffPage->HorizontalLayoutCachePage();
diff --git a/src/measure.cpp b/src/measure.cpp
index 9c564c66dfe..11c4f8fd905 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -1202,7 +1202,7 @@ int Measure::CastOffSystems(FunctorParams *functorParams)
     CastOffSystemsParams *params = vrv_params_cast<CastOffSystemsParams *>(functorParams);
     assert(params);
 
-    const bool hasCache = (m_cachedWidth == VRV_UNSET);
+    const bool hasCache = this->HasCachedHorizontalLayout();
     int overflow = hasCache ? this->m_cachedOverflow : this->GetDrawingOverflow();
     int width = hasCache ? this->m_cachedWidth : this->GetWidth();
     int drawingXRel = this->m_drawingXRel;

From 6a58106de5a28fcdf2629723670f6fdf1902b330 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 18:01:29 +0100
Subject: [PATCH 115/403] Rename RESOLVE_CROSSSTAFF to RESOLVE_CROSS_STAFF
 [skip-ci]

---
 include/vrv/layerelement.h |  2 +-
 src/accid.cpp              |  2 +-
 src/artic.cpp              |  2 +-
 src/chord.cpp              |  6 +++---
 src/horizontalaligner.cpp  |  4 ++--
 src/layer.cpp              |  4 ++--
 src/layerelement.cpp       | 14 +++++++-------
 src/note.cpp               |  8 ++++----
 src/rest.cpp               |  2 +-
 src/slur.cpp               |  6 +++---
 src/view_slur.cpp          |  4 ++--
 11 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 590843fec21..94a8cc5ea7f 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -30,7 +30,7 @@ class Staff;
 class StaffAlignment;
 
 // Helper enums
-enum StaffSearch { ANCESTOR_ONLY = 0, RESOLVE_CROSSSTAFF };
+enum StaffSearch { ANCESTOR_ONLY = 0, RESOLVE_CROSS_STAFF };
 
 //----------------------------------------------------------------------------
 // LayerElement
diff --git a/src/accid.cpp b/src/accid.cpp
index c03038170a0..a4e43397d63 100644
--- a/src/accid.cpp
+++ b/src/accid.cpp
@@ -121,7 +121,7 @@ std::wstring Accid::GetSymbolStr(const data_NOTATIONTYPE notationType) const
 
 void Accid::AdjustToLedgerLines(Doc *doc, LayerElement *element, int staffSize)
 {
-    Staff *staff = element->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = element->GetAncestorStaff(RESOLVE_CROSS_STAFF);
     Chord *chord = vrv_cast<Chord *>(this->GetFirstAncestor(CHORD));
 
     if (element->Is(NOTE) && chord && chord->HasAdjacentNotesInStaff(staff)) {
diff --git a/src/artic.cpp b/src/artic.cpp
index 68e6f25596a..7e8d70f30a8 100644
--- a/src/artic.cpp
+++ b/src/artic.cpp
@@ -399,7 +399,7 @@ int Artic::AdjustArtic(FunctorParams *functorParams)
 
     int yIn, yOut, yRel;
 
-    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
     Beam *beam = dynamic_cast<Beam *>(GetFirstAncestor(BEAM));
     int staffYBottom = -params->m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize);
 
diff --git a/src/chord.cpp b/src/chord.cpp
index 89d35b53b3a..1e6be2e691d 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -536,7 +536,7 @@ std::list<Note *> Chord::GetAdjacentNotesList(Staff *staff, int loc)
         Note *note = vrv_cast<Note *>(obj);
         assert(note);
 
-        Staff *noteStaff = note->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+        Staff *noteStaff = note->GetAncestorStaff(RESOLVE_CROSS_STAFF);
         if (noteStaff != staff) continue;
 
         const int locDiff = note->GetDrawingLoc() - loc;
@@ -743,7 +743,7 @@ MapOfNoteLocs Chord::CalcNoteLocations(NotePredicate predicate)
 
         if (predicate && !predicate(note)) continue;
 
-        Staff *staff = note->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+        Staff *staff = note->GetAncestorStaff(RESOLVE_CROSS_STAFF);
 
         noteLocations[staff].insert(note->GetDrawingLoc());
     }
@@ -911,7 +911,7 @@ int Chord::AdjustCrossStaffContent(FunctorParams *functorParams)
     // Check if chord spreads across several staves
     std::list<Staff *> extremalStaves;
     for (Note *note : { this->GetTopNote(), this->GetBottomNote() }) {
-        Staff *staff = note->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+        Staff *staff = note->GetAncestorStaff(RESOLVE_CROSS_STAFF);
         extremalStaves.push_back(staff);
     }
     assert(extremalStaves.size() == 2);
diff --git a/src/horizontalaligner.cpp b/src/horizontalaligner.cpp
index 5a30fd054f0..1e36fd692de 100644
--- a/src/horizontalaligner.cpp
+++ b/src/horizontalaligner.cpp
@@ -1163,7 +1163,7 @@ int Alignment::AdjustDotsEnd(FunctorParams *functorParams)
         // otherwise they should be kept separate
         for (auto dot : params->m_dots) {
             // A third staff size will be used as required margin
-            const Staff *staff = dot->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+            const Staff *staff = dot->GetAncestorStaff(RESOLVE_CROSS_STAFF);
             const int staffSize = staff->m_drawingStaffSize;
             const int thirdUnit = params->m_doc->GetDrawingUnit(staffSize) / 3;
 
@@ -1337,7 +1337,7 @@ int AlignmentReference::AdjustLayersEnd(FunctorParams *functorParams)
     // Determine staff
     if (params->m_current.empty()) return FUNCTOR_CONTINUE;
     LayerElement *firstElem = params->m_current.at(0);
-    Staff *staff = firstElem->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = firstElem->GetAncestorStaff(RESOLVE_CROSS_STAFF);
 
     const int extension
         = params->m_doc->GetDrawingLedgerLineExtension(staff->m_drawingStaffSize, firstElem->GetDrawingCueSize());
diff --git a/src/layer.cpp b/src/layer.cpp
index 38142b0fb9e..f0cf7dd5da3 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -308,7 +308,7 @@ std::set<int> Layer::GetLayersNForTimeSpanOf(LayerElement *element)
     Alignment *alignment = element->GetAlignment();
     assert(alignment);
 
-    Staff *staff = element->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = element->GetAncestorStaff(RESOLVE_CROSS_STAFF);
 
     return this->GetLayersNInTimeSpan(alignment->GetTime(), element->GetAlignmentDuration(), measure, staff->GetN());
 }
@@ -376,7 +376,7 @@ ListOfObjects Layer::GetLayerElementsForTimeSpanOf(LayerElement *element, bool e
         return {};
     }
 
-    Staff *staff = element->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = element->GetAncestorStaff(RESOLVE_CROSS_STAFF);
 
     return GetLayerElementsInTimeSpan(time, duration, measure, staff->GetN(), excludeCurrent);
 }
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 7d23704b42a..e1fdc978a16 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -245,7 +245,7 @@ int LayerElement::GetOriginalLayerN()
 Staff *LayerElement::GetAncestorStaff(const StaffSearch strategy, const bool assertExistence) const
 {
     Staff *staff = NULL;
-    if (strategy == RESOLVE_CROSSSTAFF) {
+    if (strategy == RESOLVE_CROSS_STAFF) {
         Layer *layer = NULL;
         staff = this->GetCrossStaff(layer);
     }
@@ -281,7 +281,7 @@ data_STAFFREL_basic LayerElement::GetCrossStaffRel()
 
 void LayerElement::GetOverflowStaffAlignments(StaffAlignment *&above, StaffAlignment *&below)
 {
-    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
 
     // By default use the alignment of the staff
     above = staff->GetAlignment();
@@ -2369,15 +2369,15 @@ int LayerElement::FindSpannedLayerElements(FunctorParams *functorParams)
 
         // Skip elements aligned at start/end, but on a different staff
         if ((this->GetAlignment() == start->GetAlignment()) && !start->Is(TIMESTAMP_ATTR)) {
-            Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
-            Staff *startStaff = start->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+            Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
+            Staff *startStaff = start->GetAncestorStaff(RESOLVE_CROSS_STAFF);
             if (staff->GetN() != startStaff->GetN()) {
                 return FUNCTOR_CONTINUE;
             }
         }
         if ((this->GetAlignment() == end->GetAlignment()) && !end->Is(TIMESTAMP_ATTR)) {
-            Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
-            Staff *endStaff = end->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+            Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
+            Staff *endStaff = end->GetAncestorStaff(RESOLVE_CROSS_STAFF);
             if (staff->GetN() != endStaff->GetN()) {
                 return FUNCTOR_CONTINUE;
             }
@@ -2566,7 +2566,7 @@ int LayerElement::PrepareDuration(FunctorParams *functorParams)
         durInterface->SetDurDefault(params->m_durDefault);
         // Check if there is a duration default for the staff
         if (!params->m_durDefaultForStaffN.empty()) {
-            Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+            Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
             if (params->m_durDefaultForStaffN.count(staff->GetN()) > 0) {
                 durInterface->SetDurDefault(params->m_durDefaultForStaffN.at(staff->GetN()));
             }
diff --git a/src/note.cpp b/src/note.cpp
index a044a3cf9f5..a1f791e82af 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1029,7 +1029,7 @@ int Note::CalcChordNoteHeads(FunctorParams *functorParams)
     FunctorDocParams *params = vrv_params_cast<FunctorDocParams *>(functorParams);
     assert(params);
 
-    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
     const int staffSize = staff->m_drawingStaffSize;
 
     bool mixedCue = false;
@@ -1100,7 +1100,7 @@ MapOfNoteLocs Note::CalcNoteLocations(NotePredicate predicate)
 {
     if (predicate && !predicate(this)) return {};
 
-    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
 
     MapOfNoteLocs noteLocations;
     noteLocations[staff] = { this->GetDrawingLoc() };
@@ -1135,7 +1135,7 @@ int Note::CalcDots(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
     const int staffSize = staff->m_drawingStaffSize;
     const bool drawingCueSize = this->GetDrawingCueSize();
 
@@ -1203,7 +1203,7 @@ int Note::CalcLedgerLines(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
     const int staffSize = staff->m_drawingStaffSize;
     const int staffX = staff->GetDrawingX();
     const bool drawingCueSize = this->GetDrawingCueSize();
diff --git a/src/rest.cpp b/src/rest.cpp
index d70671ce93c..8c997932944 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -607,7 +607,7 @@ int Rest::CalcDots(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+    Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
     const bool drawingCueSize = this->GetDrawingCueSize();
     const int staffSize = staff->m_drawingStaffSize;
 
diff --git a/src/slur.cpp b/src/slur.cpp
index 138428a0c1f..5aca94d57ce 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -163,8 +163,8 @@ std::vector<LayerElement *> Slur::CollectSpannedElements(Staff *staff, int xMin,
 
     std::set<int> staffNumbers;
     staffNumbers.emplace(staff->GetN());
-    Staff *startStaff = this->GetStart()->GetAncestorStaff(RESOLVE_CROSSSTAFF, false);
-    Staff *endStaff = this->GetEnd()->GetAncestorStaff(RESOLVE_CROSSSTAFF, false);
+    Staff *startStaff = this->GetStart()->GetAncestorStaff(RESOLVE_CROSS_STAFF, false);
+    Staff *endStaff = this->GetEnd()->GetAncestorStaff(RESOLVE_CROSS_STAFF, false);
     if (startStaff && (startStaff != staff)) {
         staffNumbers.emplace(startStaff->GetN());
     }
@@ -273,7 +273,7 @@ Staff *Slur::CalculateExtremalStaff(Staff *staff, int xMin, int xMax, char spann
     // The floating curve positioner of cross staff slurs should live in the upper/lower staff alignment
     // corresponding to whether the slur is curved above/below
     auto adaptStaff = [&extremalStaff, curveDir](LayerElement *element) {
-        Staff *elementStaff = element->GetAncestorStaff(RESOLVE_CROSSSTAFF);
+        Staff *elementStaff = element->GetAncestorStaff(RESOLVE_CROSS_STAFF);
         if ((curveDir == curvature_CURVEDIR_above) && (elementStaff->GetN() < extremalStaff->GetN())) {
             extremalStaff = elementStaff;
         }
diff --git a/src/view_slur.cpp b/src/view_slur.cpp
index 07f51fed6c2..ecea84726d8 100644
--- a/src/view_slur.cpp
+++ b/src/view_slur.cpp
@@ -182,8 +182,8 @@ float View::CalcInitialSlur(
     const std::vector<LayerElement *> elements
         = slur->CollectSpannedElements(staff, bezier.p1.x, bezier.p2.x, curve->GetSpanningType());
 
-    Staff *startStaff = slur->GetStart()->GetAncestorStaff(RESOLVE_CROSSSTAFF, false);
-    Staff *endStaff = slur->GetEnd()->GetAncestorStaff(RESOLVE_CROSSSTAFF, false);
+    Staff *startStaff = slur->GetStart()->GetAncestorStaff(RESOLVE_CROSS_STAFF, false);
+    Staff *endStaff = slur->GetEnd()->GetAncestorStaff(RESOLVE_CROSS_STAFF, false);
 
     curve->ClearSpannedElements();
     for (auto element : elements) {

From 498fb8be9a83a7903a9a5f9ab14dab99d20f717a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 24 Jan 2022 18:39:32 +0100
Subject: [PATCH 116/403] Update changelog [skip-ci]

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbaeed5eddc..61d9ec593fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ## [unreleased]
 * Support for `beatRpt@beatdef`
 * Support for `scoreDef` and `staffDef` `@dur.default` (@eNote-GmBH)
+* Support for MIDI output of grace notes (@eNote-GmBH)
+* Improved tablature MIDI output (@paul-bayleaf)
+* Preliminary support for tablature MusicXML import (@paul-bayleaf)
 
 ## [3.8.1] - 2022-01-10
 * Fix bug in PAE importer for durations and for key signatures

From e18bbc1b5b7a37d06b8b3e017ab75e2a4e77e509 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 08:25:42 +0100
Subject: [PATCH 117/403] Add Note member and helpers

---
 include/vrv/note.h | 19 +++++++++++++++++++
 src/note.cpp       |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index ae131487a7b..dc4230276d2 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -232,6 +232,14 @@ class Note : public LayerElement,
      */
     int GetMIDIPitch(int shift = 0);
 
+    /**
+     * @name Checker and getter for a note with which the stem is shared
+     */
+    ///@{
+    bool HasStemSameasNote() const { return (m_stemSameas); }
+    Note *GetStemSameasNote() const { return m_stemSameas; }
+    ///@}
+
 public:
     //----------------//
     // Static methods //
@@ -414,6 +422,17 @@ class Note : public LayerElement,
      * indicate that it should not be written to MIDI output.
      */
     double m_scoreTimeTiedDuration;
+
+    /**
+     * A pointer to a note with which the note shares its stem and implementing @stem.sameas.
+     * The other note is always the one with the stem going outward (up or down). This means
+     * that the note pointing to it will have a stem linking the two notes.
+     * The current implementation requires the notes with the @stem.sameas to be in a lower layer.
+     * The note in the upper layer has no attribute. By default, stems go up but the @stem.dir
+     * value is supported. If the stem is going down, the upper note will have a m_stemSameas Note.
+     * It means that the pointing note is not necessary the note carrying the @stem.sameas.
+     */
+    Note *m_stemSameas;
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/note.cpp b/src/note.cpp
index a1f791e82af..d4070c8607b 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -123,6 +123,8 @@ void Note::Reset()
     m_realTimeOnsetMilliseconds = 0;
     m_realTimeOffsetMilliseconds = 0;
     m_scoreTimeTiedDuration = 0.0;
+
+    m_stemSameas = NULL;
 }
 
 bool Note::IsSupportedChild(Object *child)

From 26e871b94cb9160632c7a44f63812792a77cee72 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 09:32:45 +0100
Subject: [PATCH 118/403] Add m_stemSameasNotes the BeamInterface

---
 include/vrv/drawinginterface.h | 12 ++++++++++++
 src/drawinginterface.cpp       |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index dd8eca9c700..0866018c070 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -132,6 +132,14 @@ class BeamDrawingInterface : public ObjectListInterface {
      */
     void ClearCoords();
 
+    /**
+     * @name Setter and getter for the stemSameasNote flag
+     */
+    ///@{
+    void SetStemSameasNotes(bool stemSameasNotes) { m_stemSameAsNotes = stemSameasNotes; }
+    bool GetStemSameasNotes() const { return m_stemSameAsNotes; }
+    ///@}
+
 protected:
     /**
      * Return the position of the element in the beam.
@@ -166,6 +174,10 @@ class BeamDrawingInterface : public ObjectListInterface {
      * An array of coordinates for each element
      **/
     ArrayOfBeamElementCoords m_beamElementCoords;
+
+private:
+    /** A flag indicating that we have notes with stem shared and that it should not be drawn */
+    bool m_stemSameAsNotes;
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 141ce8a2bd7..03eec7e3a20 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -92,6 +92,8 @@ void BeamDrawingInterface::Reset()
     m_beamWidth = 0;
     m_beamWidthBlack = 0;
     m_beamWidthWhite = 0;
+
+    m_stemSameAsNotes = false;
 }
 
 int BeamDrawingInterface::GetTotalBeamWidth() const

From 24c1a72ecaf0ef3955a40633397d57bf37e11e5e Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 25 Jan 2022 10:42:42 +0100
Subject: [PATCH 119/403] Restructure code in AlignMeasures

---
 include/vrv/functorparams.h |  4 ++++
 include/vrv/measure.h       |  5 +++++
 include/vrv/section.h       |  5 +++++
 src/measure.cpp             | 17 +++++++++--------
 src/scoredef.cpp            | 12 ++++++------
 src/section.cpp             | 12 ++++++++++++
 6 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 87251d1bd05..2a6a1daa8e6 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -804,6 +804,8 @@ class AlignHorizontallyParams : public FunctorParams {
 /**
  * member 0: the cumulated shift
  * member 1: the cumulated justifiable width
+ * member 2: shift next measure due to section restart
+ * member 3: the doc
  **/
 
 class AlignMeasuresParams : public FunctorParams {
@@ -812,11 +814,13 @@ class AlignMeasuresParams : public FunctorParams {
     {
         m_shift = 0;
         m_justifiableWidth = 0;
+        m_applySectionRestartShift = false;
         m_doc = doc;
     }
 
     int m_shift;
     int m_justifiableWidth;
+    bool m_applySectionRestartShift;
     Doc *m_doc;
 };
 
diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index 03efa458ebc..ab17c80da87 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -203,6 +203,11 @@ class Measure : public Object,
      */
     int GetDrawingOverflow();
 
+    /**
+     * Calculates the section restart shift
+     */
+    int GetSectionRestartShift(Doc *doc) const;
+
     /**
      * @name Setter and getter of the drawing scoreDef
      */
diff --git a/include/vrv/section.h b/include/vrv/section.h
index 604afa6a18e..85fb90fe005 100644
--- a/include/vrv/section.h
+++ b/include/vrv/section.h
@@ -71,6 +71,11 @@ class Section : public SystemElement, public SystemMilestoneInterface, public At
      */
     int ResetDrawing(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::AlignMeasures
+     */
+    int AlignMeasures(FunctorParams *functorParams) override;
+
 private:
     //
 public:
diff --git a/src/measure.cpp b/src/measure.cpp
index f6d85f533c8..ecd0cfe6b48 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -362,6 +362,11 @@ int Measure::GetDrawingOverflow()
     return std::max(0, overflow);
 }
 
+int Measure::GetSectionRestartShift(Doc *doc) const
+{
+    return 5 * doc->GetDrawingDoubleUnit(100);
+}
+
 void Measure::SetDrawingScoreDef(ScoreDef *drawingScoreDef)
 {
     assert(!m_drawingScoreDef); // We should always call UnscoreDefSetCurrent before
@@ -1169,16 +1174,12 @@ int Measure::AlignMeasures(FunctorParams *functorParams)
     AlignMeasuresParams *params = vrv_params_cast<AlignMeasuresParams *>(functorParams);
     assert(params);
 
-    assert(this->GetParent());
-    Object *object = this->GetParent()->GetPrevious(this);
-    if (object && object->Is(SECTION)) {
-        Section *section = vrv_cast<Section *>(object);
-        if (section && (section->GetRestart() == BOOLEAN_true)) {
-            params->m_shift += 5 * params->m_doc->GetDrawingDoubleUnit(100);
-        }
+    if (params->m_applySectionRestartShift) {
+        params->m_shift += this->GetSectionRestartShift(params->m_doc);
+        params->m_applySectionRestartShift = false;
     }
 
-    SetDrawingXRel(params->m_shift);
+    this->SetDrawingXRel(params->m_shift);
 
     params->m_shift += this->GetWidth();
     params->m_justifiableWidth += this->GetRightBarLineXRel() - this->GetLeftBarLineXRel();
diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index beab7d501c0..d64a0d1e9dd 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -591,13 +591,13 @@ int ScoreDef::AlignMeasures(FunctorParams *functorParams)
     AlignMeasuresParams *params = vrv_params_cast<AlignMeasuresParams *>(functorParams);
     assert(params);
 
-    // SetDrawingXRel(m_systemLeftMar + this->GetDrawingWidth());
     params->m_shift += m_drawingLabelsWidth;
-    if (this->IsSectionRestart()) {
-        const bool hasLabel
-            = (NULL != this->FindDescendantByType(LABEL)) || (NULL != this->FindDescendantByType(LABELABBR));
-        // Add space if we have no label/labelAbbr and no grpSym
-        if (!hasLabel) params->m_shift += 5 * params->m_doc->GetDrawingDoubleUnit(100);
+
+    if (params->m_applySectionRestartShift) {
+        ClassIdsComparison comparison({ LABEL, LABELABBR });
+        if (this->FindDescendantByComparison(&comparison)) {
+            params->m_applySectionRestartShift = false;
+        }
     }
 
     return FUNCTOR_CONTINUE;
diff --git a/src/section.cpp b/src/section.cpp
index 54e596b4468..b6efcec923f 100644
--- a/src/section.cpp
+++ b/src/section.cpp
@@ -126,4 +126,16 @@ int Section::ResetDrawing(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Section::AlignMeasures(FunctorParams *functorParams)
+{
+    AlignMeasuresParams *params = vrv_params_cast<AlignMeasuresParams *>(functorParams);
+    assert(params);
+
+    if (this->GetRestart() == BOOLEAN_true) {
+        params->m_applySectionRestartShift = true;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv

From da1a0aab39476a2f329986d955faa4e9eee24fc9 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 25 Jan 2022 11:07:05 +0100
Subject: [PATCH 120/403] better use of pugixml

---
 src/iomei.cpp | 24 ++++++++++++------------
 src/vrv.cpp   | 26 +++++++++++++-------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/iomei.cpp b/src/iomei.cpp
index fccd47cde98..4677df73a03 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -3634,27 +3634,27 @@ bool MEIInput::ReadPage(Object *parent, pugi::xml_node page)
     }
 
     if (page.attribute("page.height")) {
-        vrvPage->m_pageHeight = atoi(page.attribute("page.height").value()) * DEFINITION_FACTOR;
+        vrvPage->m_pageHeight = page.attribute("page.height").as_int() * DEFINITION_FACTOR;
         page.remove_attribute("page.height");
     }
     if (page.attribute("page.width")) {
-        vrvPage->m_pageWidth = atoi(page.attribute("page.width").value()) * DEFINITION_FACTOR;
+        vrvPage->m_pageWidth = page.attribute("page.width").as_int() * DEFINITION_FACTOR;
         page.remove_attribute("page.width");
     }
     if (page.attribute("page.botmar")) {
-        vrvPage->m_pageMarginBottom = atoi(page.attribute("page.botmar").value()) * DEFINITION_FACTOR;
+        vrvPage->m_pageMarginBottom = page.attribute("page.botmar").as_int() * DEFINITION_FACTOR;
         page.remove_attribute("page.botmar");
     }
     if (page.attribute("page.leftmar")) {
-        vrvPage->m_pageMarginLeft = atoi(page.attribute("page.leftmar").value()) * DEFINITION_FACTOR;
+        vrvPage->m_pageMarginLeft = page.attribute("page.leftmar").as_int() * DEFINITION_FACTOR;
         page.remove_attribute("page.leftmar");
     }
     if (page.attribute("page.rightmar")) {
-        vrvPage->m_pageMarginRight = atoi(page.attribute("page.rightmar").value()) * DEFINITION_FACTOR;
+        vrvPage->m_pageMarginRight = page.attribute("page.rightmar").as_int() * DEFINITION_FACTOR;
         page.remove_attribute("page.rightmar");
     }
     if (page.attribute("page.topmar")) {
-        vrvPage->m_pageMarginTop = atoi(page.attribute("page.topmar").value()) * DEFINITION_FACTOR;
+        vrvPage->m_pageMarginTop = page.attribute("page.topmar").as_int() * DEFINITION_FACTOR;
         page.remove_attribute("page.topmar");
     }
     if (page.attribute("surface")) {
@@ -3662,7 +3662,7 @@ bool MEIInput::ReadPage(Object *parent, pugi::xml_node page)
         page.remove_attribute("surface");
     }
     if (page.attribute("ppu")) {
-        vrvPage->m_PPUFactor = atof(page.attribute("ppu").value());
+        vrvPage->m_PPUFactor = page.attribute("ppu").as_float();
     }
 
     parent->AddChild(vrvPage);
@@ -4035,15 +4035,15 @@ bool MEIInput::ReadSystem(Object *parent, pugi::xml_node system)
     vrvSystem->ReadTyped(system);
 
     if (system.attribute("system.leftmar")) {
-        vrvSystem->m_systemLeftMar = atoi(system.attribute("system.leftmar").value());
+        vrvSystem->m_systemLeftMar = system.attribute("system.leftmar").as_int();
         system.remove_attribute("system.leftmar");
     }
     if (system.attribute("system.rightmar")) {
-        vrvSystem->m_systemRightMar = atoi(system.attribute("system.rightmar").value());
+        vrvSystem->m_systemRightMar = system.attribute("system.rightmar").as_int();
         system.remove_attribute("system.rightmar");
     }
     if (system.attribute("uly") && (m_doc->GetType() == Transcription)) {
-        vrvSystem->m_yAbs = atoi(system.attribute("uly").value()) * DEFINITION_FACTOR;
+        vrvSystem->m_yAbs = system.attribute("uly").as_int() * DEFINITION_FACTOR;
         system.remove_attribute("uly");
     }
 
@@ -7183,10 +7183,10 @@ bool MEIInput::ReadTupletSpanAsTuplet(Measure *measure, pugi::xml_node tupletSpa
 
     // att.duration.ratio
     if (tupletSpan.attribute("num")) {
-        tuplet->SetNum(atoi(tupletSpan.attribute("num").value()));
+        tuplet->SetNum(tupletSpan.attribute("num").as_int());
     }
     if (tupletSpan.attribute("numbase")) {
-        tuplet->SetNumbase(atoi(tupletSpan.attribute("numbase").value()));
+        tuplet->SetNumbase(tupletSpan.attribute("numbase").as_int());
     }
 
     // att.tuplet.vis
diff --git a/src/vrv.cpp b/src/vrv.cpp
index 34ab399393e..ec97b2f6aad 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -213,7 +213,7 @@ bool Resources::LoadFont(const std::string &fontName)
         LogWarning("No units-per-em attribute in bouding box file");
         return true;
     }
-    int unitsPerEm = atoi(root.attribute("units-per-em").value());
+    const int unitsPerEm = root.attribute("units-per-em").as_int();
     pugi::xml_node current;
     for (current = root.child("g"); current; current = current.next_sibling("g")) {
         Glyph *glyph = NULL;
@@ -231,12 +231,12 @@ bool Resources::LoadFont(const std::string &fontName)
             }
             double x = 0.0, y = 0.0, width = 0.0, height = 0.0;
             // Not check for missing values...
-            if (current.attribute("x")) x = atof(current.attribute("x").value());
-            if (current.attribute("y")) y = atof(current.attribute("y").value());
-            if (current.attribute("w")) width = atof(current.attribute("w").value());
-            if (current.attribute("h")) height = atof(current.attribute("h").value());
+            if (current.attribute("x")) x = current.attribute("x").as_float();
+            if (current.attribute("y")) y = current.attribute("y").as_float();
+            if (current.attribute("w")) width = current.attribute("w").as_float();
+            if (current.attribute("h")) height = current.attribute("h").as_float();
             glyph->SetBoundingBox(x, y, width, height);
-            if (current.attribute("h-a-x")) glyph->SetHorizAdvX(atof(current.attribute("h-a-x").value()));
+            if (current.attribute("h-a-x")) glyph->SetHorizAdvX(current.attribute("h-a-x").as_float());
         }
 
         if (!glyph) continue;
@@ -247,7 +247,7 @@ bool Resources::LoadFont(const std::string &fontName)
             if (anchor.attribute("n")) {
                 std::string name = std::string(anchor.attribute("n").value());
                 // No check for possible x and y missing attributes - not very safe.
-                glyph->SetAnchor(name, atof(anchor.attribute("x").value()), atof(anchor.attribute("y").value()));
+                glyph->SetAnchor(name, anchor.attribute("x").as_float(), anchor.attribute("y").as_float());
             }
         }
     }
@@ -273,7 +273,7 @@ bool Resources::InitTextFont(const std::string &fontName, const StyleAttributes
         LogWarning("No units-per-em attribute in bouding box file");
         return false;
     }
-    int unitsPerEm = atoi(root.attribute("units-per-em").value());
+    const int unitsPerEm = root.attribute("units-per-em").as_int();
     pugi::xml_node current;
     if (s_textFont.count(style) == 0) {
         s_textFont[style] = GlyphMap{};
@@ -287,12 +287,12 @@ bool Resources::InitTextFont(const std::string &fontName, const StyleAttributes
             Glyph glyph(unitsPerEm);
             double x = 0.0, y = 0.0, width = 0.0, height = 0.0;
             // Not check for missing values...
-            if (current.attribute("x")) x = atof(current.attribute("x").value());
-            if (current.attribute("y")) y = atof(current.attribute("y").value());
-            if (current.attribute("w")) width = atof(current.attribute("w").value());
-            if (current.attribute("h")) height = atof(current.attribute("h").value());
+            if (current.attribute("x")) x = current.attribute("x").as_float();
+            if (current.attribute("y")) y = current.attribute("y").as_float();
+            if (current.attribute("w")) width = current.attribute("w").as_float();
+            if (current.attribute("h")) height = current.attribute("h").as_float();
             glyph.SetBoundingBox(x, y, width, height);
-            if (current.attribute("h-a-x")) glyph.SetHorizAdvX(atof(current.attribute("h-a-x").value()));
+            if (current.attribute("h-a-x")) glyph.SetHorizAdvX(current.attribute("h-a-x").as_float());
             if (currentMap.count(code) > 0) {
                 LogDebug("Redefining %d with %s", code, fontName.c_str());
             }

From 31ade00d1f9c1081c95398e78043a11e5099336d Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 11:28:04 +0100
Subject: [PATCH 121/403] Add Note::ResolveStemSameas and call from
 Object::PrepareLinks

---
 include/vrv/functorparams.h | 8 ++++++--
 include/vrv/note.h          | 6 ++++++
 include/vrv/vrvdef.h        | 2 ++
 src/doc.cpp                 | 2 +-
 src/note.cpp                | 5 +++++
 src/object.cpp              | 8 ++++++++
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 87251d1bd05..5d86915f4db 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1972,8 +1972,11 @@ class PrepareLyricsParams : public FunctorParams {
 //----------------------------------------------------------------------------
 
 /**
- * member 0: ArrayOfInterfaceUuidPairs holds the interface / uuid pairs to match
- * member 1: bool* fillList for indicating whether the pairs have to be stacked or not
+ * member 0: MapOfLinkingInterfaceUuidPairs holds the interface / uuid pairs to match for links
+ * member 1: MapOfLinkingInterfaceUuidPairs holds the interface / uuid pairs to match for sameas
+ * member 2: MapOfNoteUuidPairs holds the note / uuid pairs to match for stem.sameas
+ * member 3: bool* fillList for indicating whether the pairs have to be stacked or not
+ *
  **/
 
 class PrepareLinkingParams : public FunctorParams {
@@ -1981,6 +1984,7 @@ class PrepareLinkingParams : public FunctorParams {
     PrepareLinkingParams() { m_fillList = true; }
     MapOfLinkingInterfaceUuidPairs m_nextUuidPairs;
     MapOfLinkingInterfaceUuidPairs m_sameasUuidPairs;
+    MapOfNoteUuidPairs m_stemSameasUuidPairs;
     bool m_fillList;
 };
 
diff --git a/include/vrv/note.h b/include/vrv/note.h
index dc4230276d2..5374f006995 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -30,6 +30,7 @@ namespace vrv {
 class Accid;
 class Chord;
 class Note;
+class PrepareLinkingParams;
 class Slur;
 class TabGrp;
 class Tie;
@@ -240,6 +241,11 @@ class Note : public LayerElement,
     Note *GetStemSameasNote() const { return m_stemSameas; }
     ///@}
 
+    /**
+     *
+     */
+    void ResolveStemSameas(PrepareLinkingParams *params);
+
 public:
     //----------------//
     // Static methods //
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index d234364bbb6..9925c2123f2 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -325,6 +325,8 @@ typedef std::vector<std::pair<int, int>> ArrayOfIntPairs;
 
 typedef std::multimap<std::string, LinkingInterface *> MapOfLinkingInterfaceUuidPairs;
 
+typedef std::map<std::string, Note *> MapOfNoteUuidPairs;
+
 typedef std::vector<std::pair<PlistInterface *, std::string>> ArrayOfPlistInterfaceUuidPairs;
 
 typedef std::vector<CurveSpannedElement *> ArrayOfCurveSpannedElements;
diff --git a/src/doc.cpp b/src/doc.cpp
index f266071b504..419d0ec3754 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -578,7 +578,7 @@ void Doc::PrepareDrawing()
 
     /************ Resolve linking (@next) ************/
 
-    // Try to match all pointing elements using @next and @sameas
+    // Try to match all pointing elements using @next, @sameas and @stem.sameas
     PrepareLinkingParams prepareLinkingParams;
     Functor prepareLinking(&Object::PrepareLinking);
     this->Process(&prepareLinking, &prepareLinkingParams);
diff --git a/src/note.cpp b/src/note.cpp
index d4070c8607b..f39bf35aa9d 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -551,6 +551,11 @@ bool Note::IsVisible() const
     return true;
 }
 
+void Note::ResolveStemSameas(PrepareLinkingParams *params)
+{
+    assert(params);
+}
+
 bool Note::IsEnharmonicWith(Note *note)
 {
     return (this->GetMIDIPitch() == note->GetMIDIPitch());
diff --git a/src/object.cpp b/src/object.cpp
index ac34038887b..6c7eaee9dad 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1526,6 +1526,14 @@ int Object::PrepareLinking(FunctorParams *functorParams)
         interface->InterfacePrepareLinking(functorParams, this);
     }
 
+    if (params->m_fillList && this->Is(NOTE)) {
+        Note *note = vrv_cast<Note *>(this);
+        assert(note);
+        PrepareLinkingParams *params = vrv_params_cast<PrepareLinkingParams *>(functorParams);
+        assert(params);
+        note->ResolveStemSameas(params);
+    }
+
     // @next
     std::string uuid = this->GetUuid();
     auto r1 = params->m_nextUuidPairs.equal_range(uuid);

From 85b17c4ba81d7b52c822e5955acd1b4ab3c742b4 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 25 Jan 2022 11:31:50 +0100
Subject: [PATCH 122/403] Add handling to JustifyX

---
 include/vrv/functorparams.h | 16 ++++++++++------
 include/vrv/section.h       |  5 +++++
 src/measure.cpp             |  7 ++++++-
 src/scoredef.cpp            |  5 ++++-
 src/section.cpp             | 12 ++++++++++++
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 2a6a1daa8e6..307c0111b8e 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1708,12 +1708,14 @@ class GetRelativeLayerElementParams : public FunctorParams {
 //----------------------------------------------------------------------------
 
 /**
- * member 0: the justification ratio
- * member 1: the justification ratio for the measure (depends on the margin)
- * member 2: the non justifiable margin
- * member 3: the system full width (without system margins)
- * member 4: the functor to be redirected to the MeasureAligner
- * member 5: the doc
+ * member 0: the relative X position of the next measure
+ * member 1: the justification ratio
+ * member 2: the left barline X position
+ * member 3: the right barline X position
+ * member 4: the system full width (without system margins)
+ * member 5: shift next measure due to section restart
+ * member 6: the functor to be redirected to the MeasureAligner
+ * member 7: the doc
  **/
 
 class JustifyXParams : public FunctorParams {
@@ -1725,6 +1727,7 @@ class JustifyXParams : public FunctorParams {
         m_leftBarLineX = 0;
         m_rightBarLineX = 0;
         m_systemFullWidth = 0;
+        m_applySectionRestartShift = false;
         m_functor = functor;
         m_doc = doc;
     }
@@ -1733,6 +1736,7 @@ class JustifyXParams : public FunctorParams {
     int m_leftBarLineX;
     int m_rightBarLineX;
     int m_systemFullWidth;
+    bool m_applySectionRestartShift;
     Functor *m_functor;
     Doc *m_doc;
 };
diff --git a/include/vrv/section.h b/include/vrv/section.h
index 85fb90fe005..7ee489d5a98 100644
--- a/include/vrv/section.h
+++ b/include/vrv/section.h
@@ -76,6 +76,11 @@ class Section : public SystemElement, public SystemMilestoneInterface, public At
      */
     int AlignMeasures(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::JustifyX
+     */
+    int JustifyX(FunctorParams *functorParams) override;
+
 private:
     //
 public:
diff --git a/src/measure.cpp b/src/measure.cpp
index ecd0cfe6b48..a18ffca3372 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -1157,8 +1157,13 @@ int Measure::JustifyX(FunctorParams *functorParams)
     JustifyXParams *params = vrv_params_cast<JustifyXParams *>(functorParams);
     assert(params);
 
+    if (params->m_applySectionRestartShift) {
+        params->m_measureXRel += this->GetSectionRestartShift(params->m_doc);
+        params->m_applySectionRestartShift = false;
+    }
+
     if (params->m_measureXRel > 0) {
-        SetDrawingXRel(params->m_measureXRel);
+        this->SetDrawingXRel(params->m_measureXRel);
     }
     else {
         params->m_measureXRel = GetDrawingXRel();
diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index d64a0d1e9dd..b56d3dfae68 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -608,7 +608,10 @@ int ScoreDef::JustifyX(FunctorParams *functorParams)
     JustifyXParams *params = vrv_params_cast<JustifyXParams *>(functorParams);
     assert(params);
 
-    params->m_measureXRel += m_drawingLabelsWidth;
+    if (m_drawingLabelsWidth > 0) {
+        params->m_measureXRel += m_drawingLabelsWidth;
+        params->m_applySectionRestartShift = false;
+    }
 
     return FUNCTOR_SIBLINGS;
 }
diff --git a/src/section.cpp b/src/section.cpp
index b6efcec923f..1c858716568 100644
--- a/src/section.cpp
+++ b/src/section.cpp
@@ -138,4 +138,16 @@ int Section::AlignMeasures(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Section::JustifyX(FunctorParams *functorParams)
+{
+    JustifyXParams *params = vrv_params_cast<JustifyXParams *>(functorParams);
+    assert(params);
+
+    if (this->GetRestart() == BOOLEAN_true) {
+        params->m_applySectionRestartShift = true;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv

From 3bab1be9338f2ab0e308ff031366fb7e720a776b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 11:58:11 +0100
Subject: [PATCH 123/403] Implement Note::ResolveStemSameas

---
 include/vrv/note.h |  3 ++-
 src/note.cpp       | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index 5374f006995..cc96ae70588 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -234,11 +234,12 @@ class Note : public LayerElement,
     int GetMIDIPitch(int shift = 0);
 
     /**
-     * @name Checker and getter for a note with which the stem is shared
+     * @name Checker, getter and setter for a note with which the stem is shared
      */
     ///@{
     bool HasStemSameasNote() const { return (m_stemSameas); }
     Note *GetStemSameasNote() const { return m_stemSameas; }
+    void SetStemSameasNote(Note *stemSameas) { m_stemSameas = stemSameas; }
     ///@}
 
     /**
diff --git a/src/note.cpp b/src/note.cpp
index f39bf35aa9d..f0a2f8198b3 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -554,6 +554,33 @@ bool Note::IsVisible() const
 void Note::ResolveStemSameas(PrepareLinkingParams *params)
 {
     assert(params);
+
+    // First pass we fill m_stemSameasUuidPairs
+    if (params->m_fillList) {
+        if (this->HasStemSameas()) {
+            std::string uuidTarget = ExtractUuidFragment(this->GetStemSameas());
+            params->m_stemSameasUuidPairs[uuidTarget] = this;
+        }
+    }
+    // Second pass we resolve links
+    else {
+        const std::string uuid = this->GetUuid();
+        if (params->m_stemSameasUuidPairs.count(uuid)) {
+            Note *noteWithStemSameas = params->m_stemSameasUuidPairs.at(uuid);
+            // By default (stem up) the pointing note is the one with @stem.sameas (lower)
+            Note *targetNote = noteWithStemSameas;
+            if (this->HasStemDir() && this->GetStemDir() == STEMDIRECTION_down) {
+                this->SetStemSameasNote(noteWithStemSameas);
+                targetNote = this;
+            }
+            else {
+                noteWithStemSameas->SetStemSameasNote(this);
+            }
+            Beam *beam = targetNote->IsInBeam();
+            if (beam) beam->SetStemSameasNotes(true);
+            params->m_stemSameasUuidPairs.erase(uuid);
+        }
+    }
 }
 
 bool Note::IsEnharmonicWith(Note *note)

From ba6877ca08c88c2ca0c388f6108af0951a11f8ce Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 13:46:46 +0100
Subject: [PATCH 124/403] Disable layer adjustment when stemSameasNote is given

---
 include/vrv/chord.h         |  4 ++--
 include/vrv/functorparams.h |  5 ++++-
 include/vrv/layerelement.h  |  4 ++--
 src/chord.cpp               |  2 +-
 src/layerelement.cpp        | 13 ++++++++++---
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/include/vrv/chord.h b/include/vrv/chord.h
index 1d7fcf624ed..fd96db347c9 100644
--- a/include/vrv/chord.h
+++ b/include/vrv/chord.h
@@ -154,8 +154,8 @@ class Chord : public LayerElement,
      * Helper to adjust overlapping layers for chords
      * Returns the shift of the adjustment
      */
-    int AdjustOverlappingLayers(
-        Doc *doc, const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted, bool &isUnison) override;
+    int AdjustOverlappingLayers(Doc *doc, const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted,
+        bool &isUnison, bool &stemSameas) override;
 
     /**
      * Helper to get list of notes that are adjacent to the specified location.
diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 5d86915f4db..62b0a07872d 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -462,7 +462,8 @@ class AdjustHarmGrpsSpacingParams : public FunctorParams {
  * member 5: a pointer to the functor for passing it to the system aligner
  * member 6: a pointer to the end functor for passing it to the system aligner
  * member 7: flag whether element is in unison
- * member 8: the total shift of the current note or chord
+ * member 8: flag whether element (note) has as stem same as note
+ * member 9: the total shift of the current note or chord
  **/
 
 class AdjustLayersParams : public FunctorParams {
@@ -476,6 +477,7 @@ class AdjustLayersParams : public FunctorParams {
         m_staffNs = staffNs;
         m_unison = false;
         m_ignoreDots = true;
+        m_stemSameas = false;
         m_accumulatedShift = 0;
     }
     std::vector<int> m_staffNs;
@@ -487,6 +489,7 @@ class AdjustLayersParams : public FunctorParams {
     Functor *m_functorEnd;
     bool m_unison;
     bool m_ignoreDots;
+    bool m_stemSameas;
     int m_accumulatedShift;
 };
 
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 94a8cc5ea7f..b38cccfc2d1 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -241,8 +241,8 @@ class LayerElement : public Object,
      * Helper to adjust overlapping layers for notes, chords, stems, etc.
      * Returns the shift of the adjustment
      */
-    virtual int AdjustOverlappingLayers(
-        Doc *doc, const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted, bool &isUnison);
+    virtual int AdjustOverlappingLayers(Doc *doc, const std::vector<LayerElement *> &otherElements,
+        bool areDotsAdjusted, bool &isUnison, bool &stemSameAs);
 
     /**
      * Calculate note horizontal overlap with elemenents from another layers. Returns overlapMargin and index of other
diff --git a/src/chord.cpp b/src/chord.cpp
index 1e6be2e691d..4f263882631 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -478,7 +478,7 @@ bool Chord::HasNoteWithDots()
 }
 
 int Chord::AdjustOverlappingLayers(
-    Doc *doc, const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted, bool &isUnison)
+    Doc *doc, const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted, bool &isUnison, bool &stemSameas)
 {
     int margin = 0;
     // get positions of other elements
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index e1fdc978a16..9ed1cbcb52c 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1542,15 +1542,15 @@ int LayerElement::AdjustLayers(FunctorParams *functorParams)
     // We are processing the first layer, nothing to do yet
     if (params->m_previous.empty()) return FUNCTOR_SIBLINGS;
 
-    const int shift
-        = AdjustOverlappingLayers(params->m_doc, params->m_previous, !params->m_ignoreDots, params->m_unison);
+    const int shift = AdjustOverlappingLayers(
+        params->m_doc, params->m_previous, !params->m_ignoreDots, params->m_unison, params->m_stemSameas);
     params->m_accumulatedShift += shift;
 
     return FUNCTOR_SIBLINGS;
 }
 
 int LayerElement::AdjustOverlappingLayers(
-    Doc *doc, const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted, bool &isUnison)
+    Doc *doc, const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted, bool &isUnison, bool &stemSameas)
 {
     if (Is(NOTE) && GetParent()->Is(CHORD))
         return 0;
@@ -1558,11 +1558,18 @@ int LayerElement::AdjustOverlappingLayers(
         isUnison = false;
         return 0;
     }
+    else if (Is(STEM) && stemSameas) {
+        stemSameas = false;
+        return 0;
+    }
 
     auto [margin, isInUnison] = CalcElementHorizontalOverlap(doc, otherElements, areDotsAdjusted, false);
     if (Is(NOTE)) {
         isUnison = isInUnison;
         if (isUnison) return 0;
+        Note *note = vrv_cast<Note *>(this);
+        assert(note);
+        stemSameas = note->HasStemSameasNote();
     }
 
     if (Is({ DOTS, STEM })) {

From cb18d98799cda002f9649e86eba9f3e05e7c38ea Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 13:48:22 +0100
Subject: [PATCH 125/403] Make sure Note::ResolveStemSameas is called twice and
 log remaining pairs

---
 src/doc.cpp    | 6 +++++-
 src/object.cpp | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/doc.cpp b/src/doc.cpp
index 419d0ec3754..8fd876a87b9 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -584,7 +584,7 @@ void Doc::PrepareDrawing()
     this->Process(&prepareLinking, &prepareLinkingParams);
 
     // If we have some left process again backward
-    if (!prepareLinkingParams.m_sameasUuidPairs.empty()) {
+    if (!prepareLinkingParams.m_sameasUuidPairs.empty() || !prepareLinkingParams.m_stemSameasUuidPairs.empty()) {
         prepareLinkingParams.m_fillList = false;
         this->Process(&prepareLinking, &prepareLinkingParams, NULL, NULL, UNLIMITED_DEPTH, BACKWARD);
     }
@@ -597,6 +597,10 @@ void Doc::PrepareDrawing()
         LogWarning(
             "%d element(s) with a @sameas could match the target", prepareLinkingParams.m_sameasUuidPairs.size());
     }
+    if (!prepareLinkingParams.m_stemSameasUuidPairs.empty()) {
+        LogWarning("%d element(s) with a @stem.sameas could match the target",
+            prepareLinkingParams.m_stemSameasUuidPairs.size());
+    }
 
     /************ Resolve @plist ************/
 
diff --git a/src/object.cpp b/src/object.cpp
index 6c7eaee9dad..b822e6c60c9 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1526,7 +1526,7 @@ int Object::PrepareLinking(FunctorParams *functorParams)
         interface->InterfacePrepareLinking(functorParams, this);
     }
 
-    if (params->m_fillList && this->Is(NOTE)) {
+    if (this->Is(NOTE)) {
         Note *note = vrv_cast<Note *>(this);
         assert(note);
         PrepareLinkingParams *params = vrv_params_cast<PrepareLinkingParams *>(functorParams);

From 506ba016a625c43811f8a61f6c9bc2c3b66e5f34 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 25 Jan 2022 15:30:23 +0100
Subject: [PATCH 126/403] minor improvement

---
 src/iomusxml.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 1ac67bda767..0a0263992ca 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2736,17 +2736,17 @@ void MusicXmlInput::ReadMusicXmlNote(
         pugi::xml_node pitch = node.child("pitch");
         if (pitch && !isTablature) {
             const std::string stepStr = pitch.child("step").text().as_string();
-            const std::string alterStr = pitch.child("alter").text().as_string();
+            const float alterVal = pitch.child("alter").text().as_float();
             const int octaveNum = pitch.child("octave").text().as_int();
             if (!stepStr.empty()) note->SetPname(ConvertStepToPitchName(stepStr));
-            if (!alterStr.empty()) {
+            if (pitch.child("alter")) {
                 Accid *accid = dynamic_cast<Accid *>(note->GetFirst(ACCID));
                 if (!accid) {
                     accid = new Accid();
                     note->AddChild(accid);
                     accid->IsAttribute(true);
                 }
-                const data_ACCIDENTAL_GESTURAL accidGes = ConvertAlterToAccid(std::atof(alterStr.c_str()));
+                const data_ACCIDENTAL_GESTURAL accidGes = ConvertAlterToAccid(alterVal);
                 if (!IsSameAccidWrittenGestural(accid->GetAccid(), accidGes)) {
                     accid->SetAccidGes(accidGes);
                 }
@@ -3795,8 +3795,7 @@ KeySig *MusicXmlInput::ConvertKey(const pugi::xml_node &key)
             KeyAccid *keyAccid = new KeyAccid();
             keyAccid->SetPname(ConvertStepToPitchName(keyStep.text().as_string()));
             if (std::strncmp(keyStep.next_sibling().name(), "key-alter", 9) == 0) {
-                data_ACCIDENTAL_GESTURAL accidValue
-                    = ConvertAlterToAccid(std::atof(keyStep.next_sibling().text().as_string()));
+                data_ACCIDENTAL_GESTURAL accidValue = ConvertAlterToAccid(keyStep.next_sibling().text().as_float());
                 keyAccid->SetAccid(AreaPosInterface::AccidentalGesturalToWritten(accidValue));
                 if (std::strncmp(keyStep.next_sibling().next_sibling().name(), "key-accidental", 14) == 0) {
                     keyAccid->SetAccid(
@@ -4106,7 +4105,7 @@ data_PITCHNAME MusicXmlInput::ConvertStepToPitchName(const std::string &value)
         return result->second;
     }
 
-    LogWarning("MusicXML import: Unsupported pitch name '%s'", value.c_str());
+    LogWarning("MusicXML import: Unsupported step value '%s'", value.c_str());
     return PITCHNAME_NONE;
 }
 

From 61626a5f1609b4516165a72cefa1cfa2239ff9b7 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 25 Jan 2022 15:31:28 +0100
Subject: [PATCH 127/403] don't cast to cstr

---
 src/iomei.cpp   | 6 +++---
 src/options.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/iomei.cpp b/src/iomei.cpp
index 4677df73a03..f0d770ab87b 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -7399,15 +7399,15 @@ void MEIInput::UpgradeDurGesTo_4_0_0(pugi::xml_node element, DurationInterface *
     if (element.attribute("dur.ges")) {
         std::string durGes = element.attribute("dur.ges").as_string();
         if (durGes.back() == 'p') {
-            interface->SetDurPpq(std::atoi(durGes.c_str()));
+            interface->SetDurPpq(std::stoi(durGes));
         }
         else if (durGes.back() == 'r') {
             durGes.pop_back();
-            interface->SetDurRecip(durGes.c_str());
+            interface->SetDurRecip(durGes);
         }
         else if (durGes.back() == 's') {
             durGes.pop_back();
-            interface->SetDurReal(std::atof(durGes.c_str()));
+            interface->SetDurReal(std::stof(durGes));
         }
         element.remove_attribute("dur.ges");
     }
diff --git a/src/options.cpp b/src/options.cpp
index 34071620cc3..5fb3ad9042e 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -240,7 +240,7 @@ void OptionDbl::Init(double defaultValue, double minValue, double maxValue)
 
 bool OptionDbl::SetValue(const std::string &value)
 {
-    return SetValue(atof(value.c_str()));
+    return SetValue(std::stof(value));
 }
 
 std::string OptionDbl::GetStrValue() const
@@ -303,7 +303,7 @@ bool OptionInt::SetValueDbl(double value)
 
 bool OptionInt::SetValue(const std::string &value)
 {
-    return SetValue(atoi(value.c_str()));
+    return SetValue(std::stoi(value));
 }
 
 std::string OptionInt::GetStrValue() const

From 44b3e4d438bdae82c505cfcbc26cb74316f0e1d9 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 25 Jan 2022 15:43:40 +0100
Subject: [PATCH 128/403] switch for pure python for font handling

---
 .gitignore                            |   2 -
 Verovio.xcodeproj/project.pbxproj     |   2 +-
 fonts/extract-bounding-boxes.py       | 256 ++++++++++++++++++++++++++
 fonts/extract-glyphs-verovio-text.xsl |  39 ----
 fonts/extract-glyphs.py               | 128 -------------
 fonts/generate-bbox.js                | 112 -----------
 fonts/generate-smufl-code.py          |  69 ++++---
 fonts/generate_all.sh                 |  31 +---
 fonts/generate_plain_text.py          |  14 ++
 fonts/generate_text_font.sh           |  21 +++
 fonts/generate_woff.sh                |  39 +---
 11 files changed, 341 insertions(+), 372 deletions(-)
 create mode 100644 fonts/extract-bounding-boxes.py
 delete mode 100644 fonts/extract-glyphs-verovio-text.xsl
 delete mode 100644 fonts/extract-glyphs.py
 delete mode 100644 fonts/generate-bbox.js
 create mode 100644 fonts/generate_plain_text.py
 create mode 100644 fonts/generate_text_font.sh

diff --git a/.gitignore b/.gitignore
index 659ae0e9810..d16394c1926 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,5 +94,3 @@ Release/
 *.vcxproj*
 *.sln
 
-# Fonts
-fonts/tmp/
diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
index 2eb88887993..b4c2e36b470 100644
--- a/Verovio.xcodeproj/project.pbxproj
+++ b/Verovio.xcodeproj/project.pbxproj
@@ -2208,8 +2208,8 @@
 				4DA80D941A6940120089802D /* options.h */,
 				E79ADDC626BD645B00527E4B /* runtimeclock.cpp */,
 				E79ADDC326BD1AE900527E4B /* runtimeclock.h */,
-				4D1D733B1A1D0390001E08F6 /* smufl.h */,
 				4D98CCDA25D26E3C00DC7A2C /* smufl.cpp */,
+				4D1D733B1A1D0390001E08F6 /* smufl.h */,
 				8F086EBF188539540037FD8E /* toolkit.cpp */,
 				8F59291618854BF800FE51AD /* toolkit.h */,
 				4DC3B9E4239E2ABE007F185E /* transposition.cpp */,
diff --git a/fonts/extract-bounding-boxes.py b/fonts/extract-bounding-boxes.py
new file mode 100644
index 00000000000..9a795ddc486
--- /dev/null
+++ b/fonts/extract-bounding-boxes.py
@@ -0,0 +1,256 @@
+#! /usr/bin/env python3
+
+import json
+import os
+import sys
+from typing import Dict
+# We can 1-to-1 replace ElementTree with lxml to support such features like
+# pretty_print and retaining order of attributes during the output
+# import xml.etree.ElementTree as ET
+from lxml import etree as ET
+from svgpathtools import Path
+
+# Define svg namespace
+svg_ns = "http://www.w3.org/2000/svg"
+
+######################
+#  Helper Functions  #
+######################
+
+
+def get_file_content(filepath):
+    """Open file in same directory as script and retrieve its content."""
+    location = os.path.realpath(os.path.dirname(__file__))
+    file = open(os.path.join(location, filepath), "r")
+    content = file.read()
+    file.close()
+    return content
+
+
+def write_file_content(filepath, content):
+    """Write content to file with path relative to the script directory."""
+    location = os.path.realpath(os.path.dirname(__file__))
+    file = open(os.path.join(location, filepath), "w")
+    file.write(content)
+    file.close()
+
+
+def get_svg_elements(root, tag):
+    """Retrieve all elements with given tag name from svg."""
+    return root.findall(".//svg:" + tag, {"svg": svg_ns})  # XPath, recursive
+
+########################
+#  Parse Fontname.svg  #
+########################
+
+
+def read_svg_font_file(font_file_name: str):
+    """Read SVG file which is passed as argument and retrieve information."""
+    try:
+        font_svg_content = get_file_content(font_file_name)
+    except OSError:
+        print(f"Error opening font file {font_file_name}!")
+        sys.exit(1)
+    root = ET.fromstring(bytes(font_svg_content, encoding="utf-8"))
+    font_faces = get_svg_elements(root, "font-face")
+    if len(font_faces) != 1:
+        print(
+            f"Error: the file {font_file_name} should have a unique font-face element!")
+        print(f"Please check that the svg has correct namespace: {svg_ns}")
+        sys.exit(1)
+    font_family = font_faces[0].get("font-family")
+    units_per_em = font_faces[0].get("units-per-em")
+    glyphs = get_svg_elements(root, "glyph")
+    return (font_family, units_per_em, glyphs)
+
+
+########################
+#   Write xml glyphs   #
+########################
+
+def write_xml_glyphs(glyphnames: Dict):
+    """Etracts glyphs from SVG font as specified in glyphnames."""
+    rel_path = f"../data/{font_family}"
+    for glyph in glyphs:
+        glyph_code = glyph.attrib["glyph-name"][-4:]
+        if glyph_code not in glyphnames:
+            continue
+        root = ET.Element("symbol")
+        root.set("id", glyph_code)
+        root.set("viewBox", f"0 0 {units_per_em} {units_per_em}")
+        root.set("overflow", "inherit")
+        if "d" in glyph.attrib:
+            path = ET.SubElement(root, "path")
+            path.set("transform", "scale(1,-1)")
+            path.set("d", glyph.attrib["d"])
+
+        os.makedirs(rel_path, exist_ok=True)
+        file_path = f"{rel_path}/{glyph_code}.xml"
+        xml = ET.tostring(root, encoding="unicode")
+        write_file_content(file_path, xml)
+
+#########################
+#  Parse json  #
+#########################
+
+
+def get_json_content(filepath: str) -> Dict:
+    """Retrieve dictionary with supported SMuFL codepoints and name."""
+    json_content = get_file_content(filepath)
+    json_items = json.loads(json_content)
+    return json_items
+
+#########################
+#  Parse supported.xsl  #
+#########################
+
+
+def get_supported_glyph_codes() -> Dict:
+    """Retrieve dictionary with supported SMuFL codepoints and name."""
+    supported_xsl = ET.parse("supported.xsl")
+    glyphs = supported_xsl.findall(".//glyph")
+    supported_glyphs = {}
+    for glyph in glyphs:
+        supported_glyphs[glyph.attrib["glyph-code"]] = glyph.attrib["smufl-name"]
+    return supported_glyphs
+
+
+#########################
+#  Parse font.g2n  #
+#########################
+
+
+def get_text_names_to_codes(filepath: str) -> Dict:
+    """Retrieve dictionary mapping glyph code to SMuFL name."""
+    result = {}
+    with open(filepath, "r") as fin:
+        for line in fin:
+            items = line.split()
+            # g2n file contains glyph-to-name mapping
+            # index 3 corresponds to glyph name, and 5 - glyph code
+            if len(items) == 6:
+                result[items[3]] = items[5]
+    return result
+
+#########################
+#  Extract SMUFL font   #
+#########################
+
+
+def extract_smufl_font(root, metadata_file):
+    glyphnames = get_supported_glyph_codes()
+    metadata = get_json_content(metadata_file)
+    glyph_anchors = metadata["glyphsWithAnchors"] if "glyphsWithAnchors" in metadata else ""
+
+    # (1) Create xml file for each glyph
+    write_xml_glyphs(glyphnames)
+
+    # (2) Output bounding box svg
+    for glyph in glyphs:
+        # set glyph id
+        glyph_code = glyph.attrib["glyph-name"][-4:]
+        if glyph_code not in glyphnames:
+            continue
+        g_element = ET.SubElement(root, "g")
+        g_element.set("c", glyph_code)
+
+        # set bounding box values if present
+        if "d" in glyph.attrib:
+            path = Path(glyph.attrib["d"])
+            xmin, xmax, ymin, ymax = path.bbox()
+            g_element.set("x", str(round(xmin, 2)))
+            g_element.set("y", str(round(ymin, 2)))
+            g_element.set("w", str(round(xmax - xmin, 2)))
+            g_element.set("h", str(round(ymax - ymin, 2)))
+        else:
+            g_element.set("x", str(0.0))
+            g_element.set("y", str(0.0))
+            g_element.set("w", str(0.0))
+            g_element.set("h", str(0.0))
+
+        # set set horiz-av-x
+        if "horiz-adv-x" in glyph.attrib:
+            g_element.set("h-a-x", glyph.get("horiz-adv-x"))
+            if not float(g_element.get("w")):
+                g_element.set("w", glyph.get("horiz-adv-x"))
+
+        # add glyph anchors if present for current glyph
+        current_glyphname = glyphnames[glyph_code] if glyph_code in glyphnames else ""
+        if current_glyphname:
+            g_element.set("n", current_glyphname)
+            if current_glyphname in glyph_anchors:
+                for key, value in glyph_anchors[current_glyphname].items():
+                    a_element = ET.SubElement(g_element, "a")
+                    a_element.set("n", key)
+                    a_element.set("x", str(round(value[0], 2)))
+                    a_element.set("y", str(round(value[1], 2)))
+
+    return root
+
+#########################
+#  Extract text font   #
+#########################
+
+
+def extract_text_font(root, metadata_file):
+    glyphcodes = get_text_names_to_codes(metadata_file)
+    # (2) Output bounding box svg
+    for glyph in glyphs:
+        if glyph.attrib["glyph-name"] not in glyphcodes:
+            continue
+        # set glyph id
+        g_element = ET.SubElement(root, "g")
+        name = glyph.attrib["glyph-name"]
+        glyph_code = glyphcodes[name]
+        #glyph_code = name.split("uni")[-1]
+        g_element.set("c", glyph_code)
+        g_element.set("n", name)
+
+        # set bounding box values if present
+        if "d" in glyph.attrib:
+            path = Path(glyph.attrib["d"])
+            xmin, xmax, ymin, ymax = path.bbox()
+            g_element.set("x", str(round(xmin, 2)))
+            g_element.set("y", str(round(ymin, 2)))
+            g_element.set("w", str(round(xmax - xmin, 2)))
+            g_element.set("h", str(round(ymax - ymin, 2)))
+        else:
+            g_element.set("x", str(0.0))
+            g_element.set("y", str(0.0))
+            g_element.set("w", str(0.0))
+            g_element.set("h", str(0.0))
+
+        # set set horiz-av-x
+        horiz_adv_x = glyph.attrib["horiz-adv-x"] if "horiz-adv-x" in glyph.attrib else ""
+        if horiz_adv_x:
+            g_element.set("h-a-x", horiz_adv_x)
+
+    return root
+
+##################
+#  Main program  #
+##################
+
+
+if __name__ == "__main__":
+    # (1) Parse files
+    font_file = os.sys.argv[1]
+    metadata_file = os.sys.argv[2]
+    (font_family, units_per_em, glyphs) = read_svg_font_file(font_file)
+
+    root = ET.Element("bounding-boxes")
+    root.set("font-family", font_family)
+    root.set("units-per-em", units_per_em)
+
+    if metadata_file.endswith(".json"):
+        root = extract_smufl_font(root, metadata_file)
+    elif metadata_file.endswith(".g2n"):
+        root = extract_text_font(root, metadata_file)
+
+    # (2) Combine resulting content and output to the file
+    xml_output_content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+    xml_output_content += ET.tostring(root,
+                                      encoding="unicode", pretty_print=True)
+
+    output_file = os.sys.argv[3]
+    write_file_content(output_file, xml_output_content)
diff --git a/fonts/extract-glyphs-verovio-text.xsl b/fonts/extract-glyphs-verovio-text.xsl
deleted file mode 100644
index b834520aa23..00000000000
--- a/fonts/extract-glyphs-verovio-text.xsl
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" exclude-result-prefixes="svg">
-    <xsl:output encoding="UTF-8" indent="yes" method="xml" omit-xml-declaration="yes"/>
-
-    <xsl:template match="/" exclude-result-prefixes="svg xlink">
-        <!-- root of the bounding box svg file -->
-        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-            <xsl:attribute name="font-family" select="//svg:font-face/@font-family"/>
-            <xsl:apply-templates select="//svg:font-face"/>
-            <xsl:apply-templates select="//svg:glyph">
-                <xsl:with-param name="fontName" select="//svg:font-face/@font-family"/>
-                <xsl:with-param name="unitsPerEm" select="//svg:font-face/@units-per-em"/>
-            </xsl:apply-templates>
-        </svg>
-    </xsl:template>
-
-
-    <xsl:template match="svg:font-face" exclude-result-prefixes="svg xlink" >
-        <font-face xmlns="http://www.w3.org/2000/svg">
-            <xsl:copy-of select="@units-per-em"/>
-        </font-face>
-    </xsl:template>
-
-    <xsl:template match="svg:glyph" exclude-result-prefixes="xlink svg">
-        <xsl:param name="fontName"/>
-        <xsl:param name="unitsPerEm"/>
-        <xsl:variable name="thisGlyph" select="@unicode"/>
-        <xsl:variable name="horiz-adv-x" select="@horiz-adv-x"/>
-        
-        <xsl:if test="@glyph-name and @glyph-name != '.notdef'">
-        	<xsl:variable name="glyphCode" select="substring-after(@glyph-name, 'uni')"/>
-            <!-- write the glyph to the bounding box svg file -->
-            <path xmlns="http://www.w3.org/2000/svg" transform="scale(1.0,-1.0)" id="{$glyphCode}" horiz-adv-x="{$horiz-adv-x}">
-                <xsl:copy-of select="@d"/>
-            </path>
-        </xsl:if>
-    </xsl:template>
-
-</xsl:stylesheet>
diff --git a/fonts/extract-glyphs.py b/fonts/extract-glyphs.py
deleted file mode 100644
index 8df28c83991..00000000000
--- a/fonts/extract-glyphs.py
+++ /dev/null
@@ -1,128 +0,0 @@
-#! /usr/bin/env python3
-
-import os
-import sys
-import xml.etree.ElementTree as ET
-
-# Define svg namespace
-svg_ns = 'http://www.w3.org/2000/svg'
-
-######################
-#  Helper Functions  #
-######################
-
-
-def get_file_content(filepath):
-    """Open file in same directory as script and retrieve its content."""
-    location = os.path.realpath(os.path.dirname(__file__))
-    file = open(os.path.join(location, filepath), 'r')
-    content = file.read()
-    file.close()
-    return content
-
-
-def write_file_content(filepath, content):
-    """Write content to file with path relative to the script directory."""
-    location = os.path.realpath(os.path.dirname(__file__))
-    file = open(os.path.join(location, filepath), 'w')
-    file.write(content)
-    file.close()
-
-
-def get_elements(xml, tag):
-    """Retrieve all elements with given tag name from xml."""
-    root = ET.fromstring(bytes(xml, encoding='utf-8'))
-    return root.findall('.//' + tag)  # XPath, recursive
-
-
-def get_svg_elements(root, tag):
-    """Retrieve all elements with given tag name from svg."""
-    return root.findall('.//svg:' + tag, {'svg': svg_ns})  # XPath, recursive
-
-#########################
-#  Parse supported.xsl  #
-#########################
-
-
-def get_supported_glyph_codes():
-    """Retrieve dictionary mapping glyph code to SMuFL name."""
-    xml = get_file_content('supported.xsl')
-    glyphs = get_elements(xml, 'glyph')
-    result = {}
-    for glyph in glyphs:
-        result[glyph.attrib['glyph-code']] = glyph.attrib['smufl-name']
-    return result
-
-########################
-#  Parse Fontname.svg  #
-########################
-
-
-def read_svg_file():
-    """Read svg file which is passed as argument and retrieve information."""
-    font_file_name = os.sys.argv[1]
-    try:
-        font_svg_content = get_file_content(font_file_name)
-    except OSError:
-        print(f"Error opening font file {font_file_name}!")
-        sys.exit(1)
-    root = ET.fromstring(bytes(font_svg_content, encoding='utf-8'))
-    font_faces = get_svg_elements(root, "font-face")
-    if len(font_faces) != 1:
-        print(f"Error: the file {font_file_name} should have a unique font-face element!")
-        print(f"Please check that the svg has correct namespace: {svg_ns}")
-        sys.exit(1)
-    font_family = font_faces[0].get("font-family")
-    units_per_em = font_faces[0].get("units-per-em")
-    glyphs = get_svg_elements(root, "glyph")
-    return (font_family, units_per_em, glyphs)
-
-##################
-#  Main program  #
-##################
-
-
-if __name__ == '__main__':
-    # (1) Parse files
-    supported_glyph_codes = get_supported_glyph_codes()
-    (font_family, units_per_em, glyphs) = read_svg_file()
-    rel_path = f'../data/{font_family}'
-
-    # (2) Create xml file for each glyph
-    for glyph in glyphs:
-        name = glyph.attrib['glyph-name']
-        glyph_code = name.split('uni')[-1]
-        if glyph_code in supported_glyph_codes:
-            root = ET.Element('symbol')
-            root.set('id', glyph_code)
-            root.set('viewBox', f"0 0 {units_per_em} {units_per_em}")
-            root.set('overflow', 'inherit')
-            path = ET.SubElement(root, 'path')
-            path.set('transform', 'scale(1,-1)')
-            if 'd' in glyph.attrib:
-                path.set('d', glyph.attrib['d'])
-            os.makedirs(rel_path, exist_ok=True)
-            file_path = f'{rel_path}/{glyph_code}-{supported_glyph_codes[glyph_code]}.xml'
-            xml = ET.tostring(root, encoding='unicode')
-            write_file_content(file_path, xml)
-
-    # (3) Output bounding box svg
-    root = ET.Element('svg')
-    root.set('xmlns', svg_ns)
-    root.set('version', '1.1')
-    root.set('font-family', font_family)
-    fontface = ET.SubElement(root, 'font-face')
-    fontface.set('units-per-em', units_per_em)
-    for glyph in glyphs:
-        name = glyph.attrib['glyph-name']
-        glyph_code = name.split('uni')[-1]
-        if glyph_code in supported_glyph_codes:
-            path = ET.SubElement(root, 'path')
-            path.set('name', supported_glyph_codes[glyph_code])
-            path.set('id', glyph_code)
-            horiz_adv_x = glyph.attrib['horiz-adv-x'] if 'horiz-adv-x' in glyph.attrib else ''
-            path.set('horiz-adv-x', horiz_adv_x)
-            path.set('transform', 'scale(1,-1)')
-            if 'd' in glyph.attrib:
-                path.set('d', glyph.attrib['d'])
-    print(ET.tostring(root, encoding='unicode'))
diff --git a/fonts/generate-bbox.js b/fonts/generate-bbox.js
deleted file mode 100644
index 487fb89a9cb..00000000000
--- a/fonts/generate-bbox.js
+++ /dev/null
@@ -1,112 +0,0 @@
-var system = require("system");
-var fs = require("fs");
-
-if (system.args.length !== 4) {
-    console.log("Usage: generate-bbox.js svg_input_file bbox_output_file ");
-    phantom.exit(1);
-}
-
-var address = system.args[1];
-var output = system.args[2];
-var metadata = system.args[3];
-
-var content = JSON.parse(fs.read(metadata));
-var glyphAnchors;
-if (content.hasOwnProperty("glyphsWithAnchors")) {
-    glyphAnchors = content["glyphsWithAnchors"];
-}
-
-var page = require("webpage").create();
-
-
-function serialize(glyphAnchors) {
-
-    var items = document.documentElement.getElementsByTagName("path");
-    var bb = null;
-    var getScreenBBoxImpl = null;
-    var svgns = "http://www.w3.org/2000/svg";
-    var unitsPerEm = document.documentElement.getElementsByTagName("font-face")[0].getAttribute("units-per-em");
-
-    function getScreenBBox(e) {
-        if (e.getScreenBBox) {
-            return e.getScreenBBox();
-        } else if (getScreenBBoxImpl) {
-            return getScreenBBoxImpl(e);
-        }
-    }
-
-    var impl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    impl += "<bounding-boxes ";
-    impl += "font-family=\"" + document.documentElement.getAttribute("font-family") + "\" ";
-    impl += "units-per-em=\"" + unitsPerEm + "\">\n";
-
-    var i;
-    for (i = 0; i < items.length; i++) {
-        var item = items[i];
-        impl += "\t<g c=\"" + item.getAttribute("id").toUpperCase() + "\" ";
-        var r = item.getBBox();
-
-        // add the bb value to the implementation
-        impl += "x=\"" + r.x.toFixed(1) + "\" ";
-        impl += "y=\"" + r.y.toFixed(1) + "\" ";
-        impl += "w=\"" + r.width.toFixed(1) + "\" ";
-        impl += "h=\"" + r.height.toFixed(1) + "\" ";
-        if (item.getAttribute("horiz-adv-x")) {
-            impl += "h-a-x=\"" + item.getAttribute("horiz-adv-x") + "\" ";
-        }
-
-
-
-        if (glyphAnchors) {
-            var anchor = null;
-            var testId = "uni" + item.getAttribute("id");
-            var testName  = item.getAttribute("name");
-            if (glyphAnchors.hasOwnProperty(testId)) {
-                anchor = glyphAnchors[testId];
-            }
-            else if (glyphAnchors.hasOwnProperty(testName)) {
-                anchor = glyphAnchors[testName];
-            }
-            if (anchor) {
-                impl += ">";
-                Object.keys(anchor).forEach(function(key) {
-                    impl += "\n\t\t<a n=\"" + key + "\" x=\"" + anchor[key][0] + "\" y=\"" + anchor[key][1] + "\"/>";
-                });
-                impl += "\n\t</g>\n";
-            }
-            else {
-              impl += "/>\n";
-            }
-        }
-        else {
-          impl += "/>\n";
-        }
-    }
-
-    impl += "</bounding-boxes>\n";
-
-    return impl;
-}
-
-function extract() {
-    return function (status) {
-        if (status !== "success") {
-            console.log("Failed to open the page.");
-        }
-        else {
-            var code = page.evaluate(serialize, glyphAnchors);
-            //console.log(code);
-            try {
-                // We write the impl to the file...
-                fs.write(output, code, "w");
-            } catch(e) {
-                console.log(e);
-            }
-            // ... and log the header
-            //console.log(code[1]);
-        }
-        phantom.exit();
-    };
-}
-
-page.open("file://" + fs.absolute(address), extract());
diff --git a/fonts/generate-smufl-code.py b/fonts/generate-smufl-code.py
index 0d669bca318..fcf2f5b9129 100644
--- a/fonts/generate-smufl-code.py
+++ b/fonts/generate-smufl-code.py
@@ -2,10 +2,11 @@
 
 import os
 import xml.etree.ElementTree as ET
+from typing import Dict
 
 # Define file output paths
-smufl_h_path = '../include/vrv/smufl.h'
-smufl_cpp_path = '../src/smufl.cpp'
+SMUFL_HEADER = "../include/vrv/smufl.h"
+SMUFL_SOURCE = '../src/smufl.cpp'
 
 ######################
 #  Helper Functions  #
@@ -16,7 +17,7 @@
 
 def get_file_content(filepath):
     location = os.path.realpath(os.path.dirname(__file__))
-    file = open(os.path.join(location, filepath), 'r')
+    file = open(os.path.join(location, filepath), "r")
     content = file.read()
     file.close()
     return content
@@ -26,17 +27,10 @@ def get_file_content(filepath):
 
 def write_file_content(filepath, content):
     location = os.path.realpath(os.path.dirname(__file__))
-    file = open(os.path.join(location, filepath), 'w')
+    file = open(os.path.join(location, filepath), "w")
     file.write(content)
     file.close()
 
-# Retrieve all elements with given tag name from xml
-
-
-def get_elements(xml, tag):
-    root = ET.fromstring(bytes(xml, encoding='utf-8'))
-    return root.findall('.//' + tag)  # XPath, recursive
-
 #########################
 #  Parse supported.xsl  #
 #########################
@@ -44,44 +38,47 @@ def get_elements(xml, tag):
 # Retrieve dictionary mapping glyph code to smufl name
 
 
-def get_supported_glyph_codes():
-    xml = get_file_content('supported.xsl')
-    glyphs = get_elements(xml, 'glyph')
-    result = {}
+def get_supported_glyph_codes() -> Dict:
+    """Retrieve dictionary with supported SMuFL codepoints and name."""
+    supported_xsl = ET.parse("supported.xsl")
+    glyphs = supported_xsl.findall(".//glyph")
+    supported_glyphs = {}
     for glyph in glyphs:
-        result[glyph.attrib["glyph-code"]] = glyph.attrib["smufl-name"]
-    return result
+        supported_glyphs[glyph.attrib["glyph-code"]
+                         ] = glyph.attrib["smufl-name"]
+    return supported_glyphs
 
 ##################
 #  Main program  #
 ##################
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     smufl_names = get_supported_glyph_codes()
 
     # (1) Create header file
-    smufl_h_content = get_file_content('smufl.h.inc') + '\n'
-    smufl_h_content += 'enum {\n'
+    smufl_h_content = get_file_content("smufl.h.inc") + "\n"
+    smufl_h_content += "enum {\n"
     for glyph_code in smufl_names:
         # SMUFL_E000_brace = 0xE000,
-        smufl_h_content += ' ' * 4 + f"SMUFL_{glyph_code}_{smufl_names[glyph_code]} = 0x{glyph_code}," + '\n'
-    smufl_h_content += '};\n\n'
-    smufl_h_content += '/** The number of glyphs for verification **/\n'
-    smufl_h_content += f"#define SMUFL_COUNT {len(smufl_names)}" + '\n\n'
-    smufl_h_content += '} // namespace vrv\n\n'
-    smufl_h_content += '#endif\n'
-    write_file_content(smufl_h_path, smufl_h_content)
+        smufl_h_content += " " * 4 + \
+            f"SMUFL_{glyph_code}_{smufl_names[glyph_code]} = 0x{glyph_code}," + "\n"
+    smufl_h_content += "};\n\n"
+    smufl_h_content += "/** The number of glyphs for verification **/\n"
+    smufl_h_content += f"#define SMUFL_COUNT {len(smufl_names)}" + "\n\n"
+    smufl_h_content += "} // namespace vrv\n\n"
+    smufl_h_content += "#endif\n"
+    write_file_content(SMUFL_HEADER, smufl_h_content)
 
     # (2) Create cpp file
-    smufl_cpp_content = get_file_content('smufl.cpp.inc') + '\n'
-    smufl_cpp_content += 'const std::map<std::string, wchar_t> Resources::s_smuflNames = {\n'
+    smufl_cpp_content = get_file_content("smufl.cpp.inc") + "\n"
+    smufl_cpp_content += "const std::map<std::string, wchar_t> Resources::s_smuflNames = {\n"
     for glyph_code in smufl_names:
         # { "brace", SMUFL_E000_brace },
-        smufl_cpp_content += ' ' * 4 + \
-            f"{{ \"{smufl_names[glyph_code]}\", SMUFL_{glyph_code}_{smufl_names[glyph_code]} }}," + '\n'
-    smufl_cpp_content += '};\n\n'
-    smufl_cpp_content += '/** The number of glyphs for verification **/\n'
-    smufl_cpp_content += f"// {len(smufl_names)}" + '\n\n'
-    smufl_cpp_content += '} // namespace vrv\n'
-    write_file_content(smufl_cpp_path, smufl_cpp_content)
+        smufl_cpp_content += " " * 4 + \
+            f"{{ \"{smufl_names[glyph_code]}\", SMUFL_{glyph_code}_{smufl_names[glyph_code]} }}," + "\n"
+    smufl_cpp_content += "};\n\n"
+    smufl_cpp_content += "/** The number of glyphs for verification **/\n"
+    smufl_cpp_content += f"// {len(smufl_names)}" + "\n\n"
+    smufl_cpp_content += "} // namespace vrv\n"
+    write_file_content(SMUFL_SOURCE, smufl_cpp_content)
\ No newline at end of file
diff --git a/fonts/generate_all.sh b/fonts/generate_all.sh
index e5f3fa3674e..2c960d9d38c 100755
--- a/fonts/generate_all.sh
+++ b/fonts/generate_all.sh
@@ -1,37 +1,22 @@
-#!/bin/zsh
+# Requires python
+# Requires svgpathtools and lxml python libraries (install with 'pip3 install %name%')
 
-# Requires phantomjs and python
-
-if [ ! -e tmp ]; then
-    mkdir tmp
-fi
-
-if ! command -v phantomjs >/dev/null 2>&1 ; then
-	echo >&2 "Phantomjs is required.  Aborting.";
-	exit 1;
-fi
-
-echo "Generating C++ header and implementation file ..."
+echo "Generating C++ header file ..."
 python3 generate-smufl-code.py
 
 echo "Generating Bravura files ..."
-python3 extract-glyphs.py Bravura.svg > tmp/Bravura-bounding-boxes.svg
-phantomjs generate-bbox.js tmp/Bravura-bounding-boxes.svg ../data/Bravura.xml json/bravura_metadata.json
+python3 extract-bounding-boxes.py Bravura.svg json/bravura_metadata.json ../data/Bravura.xml
 
 echo "Generating Leipzig files ..."
-python3 extract-glyphs.py Leipzig.svg > tmp/Leipzig-bounding-boxes.svg
-phantomjs generate-bbox.js tmp/Leipzig-bounding-boxes.svg ../data/Leipzig.xml json/leipzig_metadata.json
+python3 extract-bounding-boxes.py Leipzig.svg json/leipzig_metadata.json ../data/Leipzig.xml
 
 echo "Generating Gootville files ..."
-python3 extract-glyphs.py Gootville.svg > tmp/Gootville-bounding-boxes.svg
-phantomjs generate-bbox.js tmp/Gootville-bounding-boxes.svg ../data/Gootville.xml json/gootville-1.2_metadata.json
+python3 extract-bounding-boxes.py Gootville.svg json/gootville-1.2_metadata.json ../data/Gootville.xml
 
 echo "Generating Petaluma files ..."
-python3 extract-glyphs.py Petaluma.svg > tmp/Petaluma-bounding-boxes.svg
-phantomjs generate-bbox.js tmp/Petaluma-bounding-boxes.svg ../data/Petaluma.xml json/petaluma_metadata.json
+python3 extract-bounding-boxes.py Petaluma.svg json/petaluma_metadata.json ../data/Petaluma.xml
 
 echo "Generating Leland files ..."
-python3 extract-glyphs.py Leland.svg > tmp/Leland-bounding-boxes.svg
-phantomjs generate-bbox.js tmp/Leland-bounding-boxes.svg ../data/Leland.xml json/leland_metadata.json
+python3 extract-bounding-boxes.py Leland.svg json/leland_metadata.json ../data/Leland.xml
 
 echo "Done!"
diff --git a/fonts/generate_plain_text.py b/fonts/generate_plain_text.py
new file mode 100644
index 00000000000..9955afbf359
--- /dev/null
+++ b/fonts/generate_plain_text.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+import os
+import fontforge
+
+fontFileName = os.sys.argv[1]
+path = fontFileName
+try:
+    font = fontforge.open(path)
+    font.generate(os.path.splitext(fontFileName)[0] + ".svg")
+    font.generate(os.path.splitext(fontFileName)[0] + ".otf", "", "glyph-map-file")
+
+except EnvironmentError:
+    print("Error opening font file %s!" % fontFileName)
+    os.sys.exit(1)
\ No newline at end of file
diff --git a/fonts/generate_text_font.sh b/fonts/generate_text_font.sh
new file mode 100644
index 00000000000..2a2362269b6
--- /dev/null
+++ b/fonts/generate_text_font.sh
@@ -0,0 +1,21 @@
+# This script generates XML file with bounding boxes for the plain font
+# One input argument (font name) is expected when running this script
+
+scriptdir=$(dirname "$0")
+fontfile="${1%.*}"
+
+if [ -z "$1" ]
+  then
+    echo "Font name is expected as an argument"
+	exit 1
+fi
+
+echo "Generating metadata for $fontfile font"
+
+# generate SVG and G2N files for the text font
+fontforge generate_plain_text.py "$1"
+# generate XML file with bounding boxes for the text font
+python3 extract-bounding-boxes.py "$fontfile".svg "$fontfile".g2n ../data/text/"$fontfile".xml 
+
+
+echo "Done!"
\ No newline at end of file
diff --git a/fonts/generate_woff.sh b/fonts/generate_woff.sh
index 36c16342bd0..8e83f239fc4 100755
--- a/fonts/generate_woff.sh
+++ b/fonts/generate_woff.sh
@@ -2,48 +2,25 @@
 
 font="VerovioText-1.0.sfd"
 
-shopt -s expand_aliases
-[[ -f ~/.bash_profile ]] && source ~/.bash_profile
-
-# Requires saxon9ee and phantomjs
-# saxon9ee can be aliased from Oxygen in ~/.bash_profile
-# alias saxon9ee="java -jar /Applications/oxygen/lib/saxon9ee.jar"
-
-if [ ! -e tmp ]; then
-    mkdir tmp
-fi
-
-if ! command -v saxon9ee >/dev/null 2>&1 ; then
-	echo >&2 "Saxon9ee is required.  Aborting.";
-	exit 1;
-fi
-
-if ! command -v phantomjs >/dev/null 2>&1 ; then
-	echo >&2 "Phantomjs is required.  Aborting.";
-	exit 1;
-fi
+# Generate bounding boxes for the VerovioText and move to ../data/text
+echo "Generating bounding-box file ..."
+./generate_text_font $font
 
-#./generate_ff.sh $1
+# Generate woff.xml
 fontforge generate_ff.py $font
 
-# base64
+# base64 and ouput woff font
 woffFont=${font%.sfd}.woff
 w=$(base64 $woffFont)
 
-# output
 cat woff-1.txt > woff.xml
 echo $w >> woff.xml
 cat woff-2.txt >> woff.xml
 
+# move woff to data folder
 mv woff.xml ../data
 
-# base64
+# base64 and output ttf font
 ttfFont=${font%.sfd}.ttf
 t=$(base64 $ttfFont)
-echo "var vrvTTF = \"$t\";" > vrv-ttf.js
-
-svgFont=${font%.sfd}.svg
-baseFont=${font%.sfd}
-echo "Generating bounding-box file ..."
-saxon9ee $svgFont extract-glyphs-verovio-text.xsl > tmp/${baseFont}-bounding-boxes.svg
-phantomjs generate-bbox.js tmp/${baseFont}-bounding-boxes.svg ../data/text/${baseFont}.xml json/verovio-text.json
+echo "var vrvTTF = \"$t\";" > vrv-ttf.js
\ No newline at end of file

From c72db2f8a373bfe6401de2733eb9ed37d08fe972 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 25 Jan 2022 15:48:05 +0100
Subject: [PATCH 129/403] make script executable

---
 fonts/generate_text_font.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 fonts/generate_text_font.sh

diff --git a/fonts/generate_text_font.sh b/fonts/generate_text_font.sh
old mode 100644
new mode 100755

From 53e8751e9538263f75300bb3d2063a4cc812f5c6 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 25 Jan 2022 16:08:28 +0100
Subject: [PATCH 130/403] change quotation marks

---
 fonts/generate-smufl-code.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fonts/generate-smufl-code.py b/fonts/generate-smufl-code.py
index fcf2f5b9129..0b64868d8c9 100644
--- a/fonts/generate-smufl-code.py
+++ b/fonts/generate-smufl-code.py
@@ -6,7 +6,7 @@
 
 # Define file output paths
 SMUFL_HEADER = "../include/vrv/smufl.h"
-SMUFL_SOURCE = '../src/smufl.cpp'
+SMUFL_SOURCE = "../src/smufl.cpp"
 
 ######################
 #  Helper Functions  #
@@ -81,4 +81,4 @@ def get_supported_glyph_codes() -> Dict:
     smufl_cpp_content += "/** The number of glyphs for verification **/\n"
     smufl_cpp_content += f"// {len(smufl_names)}" + "\n\n"
     smufl_cpp_content += "} // namespace vrv\n"
-    write_file_content(SMUFL_SOURCE, smufl_cpp_content)
\ No newline at end of file
+    write_file_content(SMUFL_SOURCE, smufl_cpp_content)

From 58664ec6dcffd1589ab9b7b6b68c1c9fbc761688 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 16:09:56 +0100
Subject: [PATCH 131/403] Move m_stemSameAsNotes from BeamDrawingInterface to
 Beam

---
 include/vrv/beam.h             | 12 +++++++++++-
 include/vrv/drawinginterface.h | 11 +----------
 src/beam.cpp                   |  2 ++
 src/drawinginterface.cpp       |  2 --
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 2f639023885..8accf201ea4 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -174,6 +174,14 @@ class Beam : public LayerElement,
      */
     bool IsTabBeam();
 
+    /**
+     * @name Setter and getter for the stemSameasNote flag
+     */
+    ///@{
+    void SetStemSameasNotes(bool stemSameasNotes) { m_stemSameAsNotes = stemSameasNotes; }
+    bool GetStemSameasNotes() const { return m_stemSameAsNotes; }
+    ///@}
+
     //----------//
     // Functors //
     //----------//
@@ -212,7 +220,9 @@ class Beam : public LayerElement,
     int CalcLayerOverlap(Doc *doc, Object *beam, int directionBias, int y1, int y2);
 
 private:
-    //
+    /** A flag indicating that we have notes with stem shared and that it should not be drawn */
+    bool m_stemSameAsNotes;
+
 public:
     /** */
     BeamSegment m_beamSegment;
diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index 0866018c070..2e8ad957ba8 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -132,14 +132,6 @@ class BeamDrawingInterface : public ObjectListInterface {
      */
     void ClearCoords();
 
-    /**
-     * @name Setter and getter for the stemSameasNote flag
-     */
-    ///@{
-    void SetStemSameasNotes(bool stemSameasNotes) { m_stemSameAsNotes = stemSameasNotes; }
-    bool GetStemSameasNotes() const { return m_stemSameAsNotes; }
-    ///@}
-
 protected:
     /**
      * Return the position of the element in the beam.
@@ -176,8 +168,7 @@ class BeamDrawingInterface : public ObjectListInterface {
     ArrayOfBeamElementCoords m_beamElementCoords;
 
 private:
-    /** A flag indicating that we have notes with stem shared and that it should not be drawn */
-    bool m_stemSameAsNotes;
+    //
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/beam.cpp b/src/beam.cpp
index d938278394d..f7be74bc5cf 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1214,6 +1214,8 @@ void Beam::Reset()
     ResetBeamRend();
     ResetColor();
     ResetCue();
+
+    m_stemSameAsNotes = false;
 }
 
 bool Beam::IsSupportedChild(Object *child)
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 03eec7e3a20..141ce8a2bd7 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -92,8 +92,6 @@ void BeamDrawingInterface::Reset()
     m_beamWidth = 0;
     m_beamWidthBlack = 0;
     m_beamWidthWhite = 0;
-
-    m_stemSameAsNotes = false;
 }
 
 int BeamDrawingInterface::GetTotalBeamWidth() const

From 47376f5f5906d92249b3bb89cd505b1ad8f66187 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 16:11:19 +0100
Subject: [PATCH 132/403] Set drawing stem for notes with stemSameasNote

---
 include/vrv/functorparams.h | 11 +++++++----
 src/beam.cpp                |  2 +-
 src/chord.cpp               |  1 +
 src/elementpart.cpp         | 20 ++++++++++++--------
 src/note.cpp                | 18 ++++++++++++++----
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 62b0a07872d..38981cf7a69 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1052,10 +1052,11 @@ class CalcOnsetOffsetParams : public FunctorParams {
  * member 1: the vertical center of the staff
  * member 2: the actual duration of the chord / note
  * member 3: the flag for grace notes (stem is not extended)
- * member 4: the current staff (to avoid additional lookup)
- * member 5: the current layer (ditto)
- * member 6: the chord or note to which the stem belongs
- * member 7: the doc
+ * member 4: the flag for stem.sameas notes
+ * member 5: the current staff (to avoid additional lookup)
+ * member 6: the current layer (ditto)
+ * member 7: the chord or note to which the stem belongs
+ * member 8: the doc
  **/
 
 class CalcStemParams : public FunctorParams {
@@ -1066,6 +1067,7 @@ class CalcStemParams : public FunctorParams {
         m_verticalCenter = 0;
         m_dur = DUR_1;
         m_isGraceNote = false;
+        m_stemSameas = false;
         m_staff = NULL;
         m_layer = NULL;
         m_interface = NULL;
@@ -1075,6 +1077,7 @@ class CalcStemParams : public FunctorParams {
     int m_verticalCenter;
     int m_dur;
     bool m_isGraceNote;
+    bool m_stemSameas;
     Staff *m_staff;
     Layer *m_layer;
     StemmedDrawingInterface *m_interface;
diff --git a/src/beam.cpp b/src/beam.cpp
index f7be74bc5cf..ab3705aea85 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1667,7 +1667,7 @@ int Beam::CalcStem(FunctorParams *functorParams)
     CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
     assert(params);
 
-    if (this->IsTabBeam()) return FUNCTOR_CONTINUE;
+    if (this->IsTabBeam() || this->GetStemSameasNotes()) return FUNCTOR_CONTINUE;
 
     const ArrayOfObjects *beamChildren = this->GetList(this);
 
diff --git a/src/chord.cpp b/src/chord.cpp
index 4f263882631..c5fd0f9ccde 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -696,6 +696,7 @@ int Chord::CalcStem(FunctorParams *functorParams)
     params->m_interface = this;
     params->m_dur = this->GetActualDur();
     params->m_isGraceNote = this->IsGraceNote();
+    params->m_stemSameas = false;
 
     /************ Set the direction ************/
 
diff --git a/src/elementpart.cpp b/src/elementpart.cpp
index eae9adc3c15..b294486817d 100644
--- a/src/elementpart.cpp
+++ b/src/elementpart.cpp
@@ -487,7 +487,8 @@ int Stem::CalcStem(FunctorParams *functorParams)
     if (this->HasStemLen()) {
         baseStem = this->GetStemLen() * -params->m_doc->GetDrawingUnit(staffSize);
     }
-    else {
+    // Do not adjust the baseStem for stem sameas notes (its length is in m_chordStemLength)
+    else if (!params->m_stemSameas) {
         int thirdUnit = params->m_doc->GetDrawingUnit(staffSize) / 3;
         const data_STEMDIRECTION stemDir = params->m_interface->GetDrawingStemDir();
         baseStem = -(params->m_interface->CalcStemLenInThirdUnits(params->m_staff, stemDir) * thirdUnit);
@@ -496,7 +497,7 @@ int Stem::CalcStem(FunctorParams *functorParams)
     // Even if a stem length is given we add the length of the chord content (however only if not 0)
     // Also, the given stem length is understood as being measured from the center of the note.
     // This means that it will be adjusted according to the note head (see below
-    if (!this->HasStemLen() || (this->GetStemLen() != 0)) {
+    if (!params->m_staff || !this->HasStemLen() || (this->GetStemLen() != 0)) {
         Point p;
         if (this->GetDrawingStemDir() == STEMDIRECTION_up) {
             if (this->GetStemPos() == STEMPOSITION_left) {
@@ -507,7 +508,8 @@ int Stem::CalcStem(FunctorParams *functorParams)
                 p = params->m_interface->GetStemUpSE(params->m_doc, staffSize, drawingCueSize);
                 p.x -= stemShift;
             }
-            this->SetDrawingStemLen(baseStem + params->m_chordStemLength + p.y);
+            const int stemShotening = (params->m_stemSameas) ? 0 : p.y;
+            this->SetDrawingStemLen(baseStem + params->m_chordStemLength + stemShotening);
         }
         else {
             if (this->GetStemPos() == STEMPOSITION_right) {
@@ -518,7 +520,8 @@ int Stem::CalcStem(FunctorParams *functorParams)
                 p = params->m_interface->GetStemDownNW(params->m_doc, staffSize, drawingCueSize);
                 p.x += stemShift;
             }
-            this->SetDrawingStemLen(-(baseStem + params->m_chordStemLength - p.y));
+            const int stemShotening = (params->m_stemSameas) ? 0 : p.y;
+            this->SetDrawingStemLen(-(baseStem + params->m_chordStemLength - stemShotening));
         }
         this->SetDrawingYRel(this->GetDrawingYRel() + p.y);
         this->SetDrawingXRel(p.x);
@@ -541,7 +544,8 @@ int Stem::CalcStem(FunctorParams *functorParams)
     }
 
     Flag *flag = NULL;
-    if (params->m_dur > DUR_4) {
+    // There is never a flag with stem sameas notes or with a duration longer than 8th notes
+    if (!params->m_stemSameas && params->m_dur > DUR_4) {
         flag = vrv_cast<Flag *>(this->GetFirst(FLAG));
         assert(flag);
         flag->m_drawingNbFlags = params->m_dur - DUR_4;
@@ -570,9 +574,9 @@ int Stem::CalcStem(FunctorParams *functorParams)
         flag->SetDrawingYRel(-this->GetDrawingStemLen());
     }
 
-    // Do not adjust the length if given in the encoding - however, the stem will be extend with the SMuFL
-    // extension from 32th - this can be improved
-    if (this->HasStemLen()) {
+    // Do not adjust the length with stem sameas notes or if given in the encoding
+    // however, the stem will be extend with the SMuFL extension from 32th - this can be improved
+    if (params->m_stemSameas || this->HasStemLen()) {
         if ((this->GetStemLen() == 0) && flag) flag->m_drawingNbFlags = 0;
         return FUNCTOR_CONTINUE;
     }
diff --git a/src/note.cpp b/src/note.cpp
index f0a2f8198b3..4a2221cfd27 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -990,8 +990,8 @@ int Note::CalcStem(FunctorParams *functorParams)
     }
 
     // Stems have been calculated previously in Beam or fTrem - siblings because flags do not need to
-    // be processed either
-    if (this->IsInBeam() || this->IsInFTrem()) {
+    // be processed either - except when there is a stemSameasNote
+    if ((this->IsInBeam() || this->IsInFTrem()) && !this->HasStemSameasNote()) {
         return FUNCTOR_SIBLINGS;
     }
 
@@ -1026,6 +1026,7 @@ int Note::CalcStem(FunctorParams *functorParams)
     params->m_interface = this;
     params->m_dur = this->GetActualDur();
     params->m_isGraceNote = this->IsGraceNote();
+    params->m_stemSameas = this->HasStemSameasNote();
 
     int staffSize = staff->m_drawingStaffSize;
 
@@ -1037,7 +1038,11 @@ int Note::CalcStem(FunctorParams *functorParams)
     data_STEMDIRECTION layerStemDir;
     data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
 
-    if (stem->HasStemDir()) {
+    if (this->HasStemSameasNote()) {
+        // for stem same as notes, the direction is up if the note also carries the @stem.sameas attribute (default)
+        stemDir = (this->HasStemSameas()) ? STEMDIRECTION_up : STEMDIRECTION_down;
+    }
+    else if (stem->HasStemDir()) {
         stemDir = stem->GetStemDir();
     }
     else if (this->IsGraceNote()) {
@@ -1055,6 +1060,11 @@ int Note::CalcStem(FunctorParams *functorParams)
     // Make sure the relative position of the stem is the same
     stem->SetDrawingYRel(0);
 
+    // Use the params->m_chordStemLength for the length of the stem beetween the notes
+    if (this->HasStemSameasNote()) {
+        params->m_chordStemLength = this->GetDrawingY() - this->GetStemSameasNote()->GetDrawingY();
+    }
+
     return FUNCTOR_CONTINUE;
 }
 
@@ -1293,7 +1303,7 @@ int Note::PrepareLayerElementParts(FunctorParams *functorParams)
     }
 
     if ((this->GetActualDur() > DUR_4) && !this->IsInBeam() && !this->IsInFTrem() && !this->IsChordTone()
-        && !this->IsMensuralDur()) {
+        && !this->IsMensuralDur() && !this->HasStemSameasNote()) {
         // We should have a stem at this stage
         assert(currentStem);
         if (!currentFlag) {

From 6ee17e508d22a8bbc7e6bed63d0296cb47142115 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 16:11:49 +0100
Subject: [PATCH 133/403] Remove old code

---
 src/ftrem.cpp | 52 ---------------------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/src/ftrem.cpp b/src/ftrem.cpp
index a0456a64516..dec5979218c 100644
--- a/src/ftrem.cpp
+++ b/src/ftrem.cpp
@@ -107,58 +107,6 @@ void FTrem::FilterList(ArrayOfObjects *childList)
     this->InitCue(false);
 }
 
-/*
-void FTrem::InitCoords(ArrayOfObjects *childList)
-{
-    ClearCoords();
-
-    if (childList->empty()) {
-        return;
-    }
-
-    BeamElementCoord *firstElement = new BeamElementCoord;
-    BeamElementCoord *secondElement = new BeamElementCoord;
-
-    m_beamElementCoords.push_back(firstElement);
-    m_beamElementCoords.push_back(secondElement);
-
-    // current point to the first Note in the layed out layer
-    firstElement->m_element = dynamic_cast<LayerElement *>(childList->front());
-    // fTrem list should contain only DurationInterface objects
-    assert(firstElement->m_element->GetDurationInterface());
-    // current point to the first Note in the layed out layer
-    secondElement->m_element = dynamic_cast<LayerElement *>(childList->back());
-    // fTrem list should contain only DurationInterface objects
-    assert(secondElement->m_element->GetDurationInterface());
-    // Should we assert this at the beginning?
-    if (firstElement->m_element == secondElement->m_element) {
-        return;
-    }
-
-    m_changingDur = false;
-    m_beamHasChord = false;
-    m_hasMultipleStemDir = false;
-    m_cueSize = false;
-    // adjust beam->m_drawingParams.m_shortestDur depending on the number of slashes
-    m_shortestDur = std::max(DUR_8, DUR_1 + this->GetBeams());
-    m_stemDir = STEMDIRECTION_NONE;
-
-    if (firstElement->m_element->Is(CHORD)) {
-        m_beamHasChord = true;
-    }
-    if (secondElement->m_element->Is(CHORD)) {
-        m_beamHasChord = true;
-    }
-
-    // For now look at the stemDir only on the first note
-    assert(dynamic_cast<AttStems *>(firstElement->m_element));
-    m_stemDir = (dynamic_cast<AttStems *>(firstElement->m_element))->GetStemDir();
-
-    // We look only at the first note for checking if cue-sized. Somehow arbitrarily
-    m_cueSize = firstElement->m_element->GetDrawingCueSize();
- }
- */
-
 //----------------------------------------------------------------------------
 // Functors methods
 //----------------------------------------------------------------------------

From d3402a6c6bbd619f691d7b0100e71d43cc8e8103 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 16:12:30 +0100
Subject: [PATCH 134/403] Skip beam drawing when notes with stemSameasNotes

---
 src/view_beam.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 1fa5aa5f03d..08195e76810 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -42,6 +42,7 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     assert(beam);
 
     const bool isTabBeam = beam->IsTabBeam();
+    const bool hasStemSameas = beam->GetStemSameasNotes();
 
     /******************************************************************/
     // initialization
@@ -61,7 +62,7 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     if (isTabBeam) {
         beam->m_beamSegment.CalcTabBeam(layer, beam->m_beamStaff, m_doc, beam, beam->GetPlace());
     }
-    else {
+    else if (!hasStemSameas) {
         beam->m_beamSegment.CalcBeam(layer, beam->m_beamStaff, m_doc, beam, beam->GetPlace());
     }
 
@@ -78,7 +79,7 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     /******************************************************************/
     // Draw the beamSegment
 
-    DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
+    if (!hasStemSameas) DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
 
     dc->EndGraphic(element, this);
 }

From 9ff9a7434aa71ba5f57fcf73dc1b339ddd34ef13 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 25 Jan 2022 16:26:43 +0100
Subject: [PATCH 135/403] follow PEP585

---
 fonts/extract-bounding-boxes.py | 17 ++++++++---------
 fonts/generate-smufl-code.py    |  5 ++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/fonts/extract-bounding-boxes.py b/fonts/extract-bounding-boxes.py
index 9a795ddc486..cca9412631c 100644
--- a/fonts/extract-bounding-boxes.py
+++ b/fonts/extract-bounding-boxes.py
@@ -3,7 +3,6 @@
 import json
 import os
 import sys
-from typing import Dict
 # We can 1-to-1 replace ElementTree with lxml to support such features like
 # pretty_print and retaining order of attributes during the output
 # import xml.etree.ElementTree as ET
@@ -11,14 +10,14 @@
 from svgpathtools import Path
 
 # Define svg namespace
-svg_ns = "http://www.w3.org/2000/svg"
+SVG_NS = "http://www.w3.org/2000/svg"
 
 ######################
 #  Helper Functions  #
 ######################
 
 
-def get_file_content(filepath):
+def get_file_content(filepath) -> str:
     """Open file in same directory as script and retrieve its content."""
     location = os.path.realpath(os.path.dirname(__file__))
     file = open(os.path.join(location, filepath), "r")
@@ -37,7 +36,7 @@ def write_file_content(filepath, content):
 
 def get_svg_elements(root, tag):
     """Retrieve all elements with given tag name from svg."""
-    return root.findall(".//svg:" + tag, {"svg": svg_ns})  # XPath, recursive
+    return root.findall(".//svg:" + tag, {"svg": SVG_NS})  # XPath, recursive
 
 ########################
 #  Parse Fontname.svg  #
@@ -56,7 +55,7 @@ def read_svg_font_file(font_file_name: str):
     if len(font_faces) != 1:
         print(
             f"Error: the file {font_file_name} should have a unique font-face element!")
-        print(f"Please check that the svg has correct namespace: {svg_ns}")
+        print(f"Please check that the svg has correct namespace: {SVG_NS}")
         sys.exit(1)
     font_family = font_faces[0].get("font-family")
     units_per_em = font_faces[0].get("units-per-em")
@@ -68,7 +67,7 @@ def read_svg_font_file(font_file_name: str):
 #   Write xml glyphs   #
 ########################
 
-def write_xml_glyphs(glyphnames: Dict):
+def write_xml_glyphs(glyphnames: dict):
     """Etracts glyphs from SVG font as specified in glyphnames."""
     rel_path = f"../data/{font_family}"
     for glyph in glyphs:
@@ -94,7 +93,7 @@ def write_xml_glyphs(glyphnames: Dict):
 #########################
 
 
-def get_json_content(filepath: str) -> Dict:
+def get_json_content(filepath: str) -> dict:
     """Retrieve dictionary with supported SMuFL codepoints and name."""
     json_content = get_file_content(filepath)
     json_items = json.loads(json_content)
@@ -105,7 +104,7 @@ def get_json_content(filepath: str) -> Dict:
 #########################
 
 
-def get_supported_glyph_codes() -> Dict:
+def get_supported_glyph_codes() -> dict:
     """Retrieve dictionary with supported SMuFL codepoints and name."""
     supported_xsl = ET.parse("supported.xsl")
     glyphs = supported_xsl.findall(".//glyph")
@@ -120,7 +119,7 @@ def get_supported_glyph_codes() -> Dict:
 #########################
 
 
-def get_text_names_to_codes(filepath: str) -> Dict:
+def get_text_names_to_codes(filepath: str) -> dict:
     """Retrieve dictionary mapping glyph code to SMuFL name."""
     result = {}
     with open(filepath, "r") as fin:
diff --git a/fonts/generate-smufl-code.py b/fonts/generate-smufl-code.py
index 0b64868d8c9..f26f212fae3 100644
--- a/fonts/generate-smufl-code.py
+++ b/fonts/generate-smufl-code.py
@@ -2,7 +2,6 @@
 
 import os
 import xml.etree.ElementTree as ET
-from typing import Dict
 
 # Define file output paths
 SMUFL_HEADER = "../include/vrv/smufl.h"
@@ -15,7 +14,7 @@
 # Open file in same directory as script and retrieve its content
 
 
-def get_file_content(filepath):
+def get_file_content(filepath) -> str:
     location = os.path.realpath(os.path.dirname(__file__))
     file = open(os.path.join(location, filepath), "r")
     content = file.read()
@@ -38,7 +37,7 @@ def write_file_content(filepath, content):
 # Retrieve dictionary mapping glyph code to smufl name
 
 
-def get_supported_glyph_codes() -> Dict:
+def get_supported_glyph_codes() -> dict:
     """Retrieve dictionary with supported SMuFL codepoints and name."""
     supported_xsl = ET.parse("supported.xsl")
     glyphs = supported_xsl.findall(".//glyph")

From e226ec47d0f4f3e0e539ae3936d0ae1e2f5c999d Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 16:35:09 +0100
Subject: [PATCH 136/403] Fix stem length for stem down cases and add comment

---
 include/vrv/note.h | 5 ++++-
 src/note.cpp       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index cc96ae70588..cb11ad6f7bd 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -243,7 +243,10 @@ class Note : public LayerElement,
     ///@}
 
     /**
-     *
+     * Resovle @stem.sameas links by instanciating Note::m_stemSameas (*Note).
+     * Called twice from Object::PrepareLinks. Once to fill uuid / note pairs,
+     * and once to resolve the link. The direction of the link depends on the
+     * stem direction and not on the presence of the @stem.sameas
      */
     void ResolveStemSameas(PrepareLinkingParams *params);
 
diff --git a/src/note.cpp b/src/note.cpp
index 4a2221cfd27..44a655655f9 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1062,7 +1062,7 @@ int Note::CalcStem(FunctorParams *functorParams)
 
     // Use the params->m_chordStemLength for the length of the stem beetween the notes
     if (this->HasStemSameasNote()) {
-        params->m_chordStemLength = this->GetDrawingY() - this->GetStemSameasNote()->GetDrawingY();
+        params->m_chordStemLength = -std::abs(this->GetDrawingY() - this->GetStemSameasNote()->GetDrawingY());
     }
 
     return FUNCTOR_CONTINUE;

From d3409f6d1f191087fc36a0ff524f788025f7f160 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 16:39:16 +0100
Subject: [PATCH 137/403] ResetDrawing for beams and notes

---
 src/beam.cpp | 1 +
 src/note.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/beam.cpp b/src/beam.cpp
index ab3705aea85..93aef952975 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1694,6 +1694,7 @@ int Beam::ResetDrawing(FunctorParams *functorParams)
     LayerElement::ResetDrawing(functorParams);
 
     m_beamSegment.Reset();
+    m_stemSameAsNotes = false;
 
     // We want the list of the ObjectListInterface to be re-generated
     this->Modify();
diff --git a/src/note.cpp b/src/note.cpp
index 44a655655f9..cb9afe7954c 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1370,6 +1370,7 @@ int Note::ResetDrawing(FunctorParams *functorParams)
 
     m_drawingLoc = 0;
     m_flippedNotehead = false;
+    m_stemSameas = NULL;
 
     return FUNCTOR_CONTINUE;
 }

From c84aad1af066beabccbe2043aa4c5e8318b597ce Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 25 Jan 2022 18:06:56 +0100
Subject: [PATCH 138/403] Preserve xml:id of notes references with
 `@stem.sameas`

---
 src/object.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/object.cpp b/src/object.cpp
index b822e6c60c9..f708fff7246 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1464,6 +1464,19 @@ int Object::FindAllReferencedObjects(FunctorParams *functorParams)
         if (interface->GetEnd() && !interface->GetEnd()->Is(TIMESTAMP_ATTR))
             params->m_elements->push_back(interface->GetEnd());
     }
+    if (this->Is(NOTE)) {
+        Note *note = vrv_cast<Note *>(this);
+        assert(note);
+        if (note->HasStemSameasNote()) {
+            // We need to check where the @stem.sameas attribute actually is because of the handling
+            // of share stem pointers depending on the stem direction.
+            // If it is on this note, then the reference we want to keep is the other note.
+            // Otherwise it means that the @stem.sameas is on the other note that we already have
+            // the one that is actually referenced
+            if (note->HasStemSameas()) note = note->GetStemSameasNote();
+            params->m_elements->push_back(note);
+        }
+    }
     // These will also be referred to as milestones in page-based MEI
     if (params->m_milestoneReferences && this->IsMilestoneElement()) {
         params->m_elements->push_back(this);

From 6a8747617dabf2e7208d35a4363fd7ebfda43aa0 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Tue, 25 Jan 2022 18:42:42 +0100
Subject: [PATCH 139/403] add fallthrough

---
 src/clef.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/clef.cpp b/src/clef.cpp
index dc2870915be..8fa6e6ea3b0 100644
--- a/src/clef.cpp
+++ b/src/clef.cpp
@@ -126,6 +126,7 @@ wchar_t Clef::GetClefGlyph(const data_NOTATIONTYPE notationtype) const
                         case 4: return SMUFL_E90A_mensuralCclefPetrucciPosHigh; break;
                         case 5: return SMUFL_E90B_mensuralCclefPetrucciPosHighest; break;
                     }
+                    [[fallthrough]];
                 default: return SMUFL_E909_mensuralCclefPetrucciPosMiddle; break;
             }
         case NOTATIONTYPE_mensural_black:

From dd7312751cd673e45377b30d4cb18d32ed52e9b3 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 26 Jan 2022 10:37:21 +0100
Subject: [PATCH 140/403] Fix typos in comments [skip-ci]

---
 include/vrv/arpeg.h        | 2 +-
 include/vrv/layerelement.h | 4 ++--
 include/vrv/measure.h      | 2 +-
 include/vrv/page.h         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/vrv/arpeg.h b/include/vrv/arpeg.h
index df1a503c7b2..acc61817003 100644
--- a/include/vrv/arpeg.h
+++ b/include/vrv/arpeg.h
@@ -123,7 +123,7 @@ class Arpeg : public ControlElement,
     int m_drawingXRel;
 
     /**
-     * The cached value for m_darwingXRel for caching horizontal layout
+     * The cached value for m_drawingXRel for caching horizontal layout
      */
     int m_cachedXRel;
 };
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index ba2a2316df2..9e7da648f0e 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -487,7 +487,7 @@ class LayerElement : public Object,
     int m_drawingYRel;
 
     /**
-     * The cached value for m_darwingYRel for caching horizontal layout
+     * The cached value for m_drawingYRel for caching horizontal layout
      */
     int m_cachedYRel;
 
@@ -498,7 +498,7 @@ class LayerElement : public Object,
     int m_drawingXRel;
 
     /**
-     * The cached value for m_darwingXRel for caching horizontal layout
+     * The cached value for m_drawingXRel for caching horizontal layout
      */
     int m_cachedXRel;
 
diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index 3f26f20ddb1..84ff0d40e1b 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -514,7 +514,7 @@ class Measure : public Object,
     int m_drawingXRel;
 
     /**
-     * The cached value for m_darwingXRel for caching horizontal layout
+     * The cached value for m_drawingXRel for caching horizontal layout
      */
     int m_cachedXRel;
 
diff --git a/include/vrv/page.h b/include/vrv/page.h
index 3065f47f0c9..7d754cef5cf 100644
--- a/include/vrv/page.h
+++ b/include/vrv/page.h
@@ -101,8 +101,8 @@ class Page : public Object {
 
     /**
      * Layout out the measures horizontally using the cached values.
-     * This should be done in preparation of cast-off which it based on measure positioning.
-     * The content of the measures it not layout out and keeps previous relative positioning.
+     * This should be done in preparation of cast-off which is based on measure positioning.
+     * The content of the measures is not laid out and keeps previously cached positioning.
      */
     void HorizontalLayoutCachePage(bool restore = false);
 

From 4febc57d49cb1fb483169d59faeb3bfcd7436799 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Mon, 20 Dec 2021 14:49:42 +0100
Subject: [PATCH 141/403] delete unused

---
 fonts/json/glyphnames.json | 11393 -----------------------------------
 1 file changed, 11393 deletions(-)
 delete mode 100644 fonts/json/glyphnames.json

diff --git a/fonts/json/glyphnames.json b/fonts/json/glyphnames.json
deleted file mode 100644
index 42b3018cb90..00000000000
--- a/fonts/json/glyphnames.json
+++ /dev/null
@@ -1,11393 +0,0 @@
-{
-    "4stringTabClef": {
-        "codepoint": "U+E06E", 
-        "description": "4-string tab clef"
-    }, 
-    "6stringTabClef": {
-        "codepoint": "U+E06D", 
-        "description": "6-string tab clef"
-    }, 
-    "accSagittal11LargeDiesisDown": {
-        "codepoint": "U+E30D", 
-        "description": "11 large diesis down, 3\u00b0 down [46 EDO]"
-    }, 
-    "accSagittal11LargeDiesisUp": {
-        "codepoint": "U+E30C", 
-        "description": "11 large diesis up, (11L), (sharp less 11M), 3\u00b0 up [46 EDO]"
-    }, 
-    "accSagittal11MediumDiesisDown": {
-        "codepoint": "U+E30B", 
-        "description": "11 medium diesis down, 1\u00b0[17 31] 2\u00b046 down, 1/4-tone down"
-    }, 
-    "accSagittal11MediumDiesisUp": {
-        "codepoint": "U+E30A", 
-        "description": "11 medium diesis up, (11M), 1\u00b0[17 31] 2\u00b046 up, 1/4-tone up"
-    }, 
-    "accSagittal11v19LargeDiesisDown": {
-        "codepoint": "U+E3AB", 
-        "description": "11:19 large diesis down"
-    }, 
-    "accSagittal11v19LargeDiesisUp": {
-        "codepoint": "U+E3AA", 
-        "description": "11:19 large diesis up, (11:19L, apotome less 11:19M)"
-    }, 
-    "accSagittal11v19MediumDiesisDown": {
-        "codepoint": "U+E3A3", 
-        "description": "11:19 medium diesis down"
-    }, 
-    "accSagittal11v19MediumDiesisUp": {
-        "codepoint": "U+E3A2", 
-        "description": "11:19 medium diesis up, (11:19M, 11M plus 19s)"
-    }, 
-    "accSagittal11v49CommaDown": {
-        "codepoint": "U+E397", 
-        "description": "11:49 comma down"
-    }, 
-    "accSagittal11v49CommaUp": {
-        "codepoint": "U+E396", 
-        "description": "11:49 comma up, (11:49C, 11M less 49C)"
-    }, 
-    "accSagittal143CommaDown": {
-        "codepoint": "U+E395", 
-        "description": "143 comma down"
-    }, 
-    "accSagittal143CommaUp": {
-        "codepoint": "U+E394", 
-        "description": "143 comma up, (143C, 13L less 11M)"
-    }, 
-    "accSagittal17CommaDown": {
-        "codepoint": "U+E343", 
-        "description": "17 comma down"
-    }, 
-    "accSagittal17CommaUp": {
-        "codepoint": "U+E342", 
-        "description": "17 comma up, (17C)"
-    }, 
-    "accSagittal17KleismaDown": {
-        "codepoint": "U+E393", 
-        "description": "17 kleisma down"
-    }, 
-    "accSagittal17KleismaUp": {
-        "codepoint": "U+E392", 
-        "description": "17 kleisma up, (17k)"
-    }, 
-    "accSagittal19CommaDown": {
-        "codepoint": "U+E399", 
-        "description": "19 comma down"
-    }, 
-    "accSagittal19CommaUp": {
-        "codepoint": "U+E398", 
-        "description": "19 comma up, (19C)"
-    }, 
-    "accSagittal19SchismaDown": {
-        "codepoint": "U+E391", 
-        "description": "19 schisma down"
-    }, 
-    "accSagittal19SchismaUp": {
-        "codepoint": "U+E390", 
-        "description": "19 schisma up, (19s)"
-    }, 
-    "accSagittal23CommaDown": {
-        "codepoint": "U+E371", 
-        "description": "23 comma down, 2\u00b0 down [96 EDO], 1/8-tone down"
-    }, 
-    "accSagittal23CommaUp": {
-        "codepoint": "U+E370", 
-        "description": "23 comma up, (23C), 2\u00b0 up [96 EDO], 1/8-tone up"
-    }, 
-    "accSagittal23SmallDiesisDown": {
-        "codepoint": "U+E39F", 
-        "description": "23 small diesis down"
-    }, 
-    "accSagittal23SmallDiesisUp": {
-        "codepoint": "U+E39E", 
-        "description": "23 small diesis up, (23S)"
-    }, 
-    "accSagittal25SmallDiesisDown": {
-        "codepoint": "U+E307", 
-        "description": "25 small diesis down, 2\u00b0 down [53 EDO]"
-    }, 
-    "accSagittal25SmallDiesisUp": {
-        "codepoint": "U+E306", 
-        "description": "25 small diesis up, (25S, ~5:13S, ~37S, 5C\u00a0plus\u00a05C), 2\u00b0 up [53 EDO]"
-    }, 
-    "accSagittal35LargeDiesisDown": {
-        "codepoint": "U+E30F", 
-        "description": "35 large diesis down, 2\u00b0 down [50 EDO], 5/18-tone down"
-    }, 
-    "accSagittal35LargeDiesisUp": {
-        "codepoint": "U+E30E", 
-        "description": "35 large diesis up, (35L, ~13L, ~125L,  sharp less 35M), 2\u00b050 up"
-    }, 
-    "accSagittal35MediumDiesisDown": {
-        "codepoint": "U+E309", 
-        "description": "35 medium diesis down, 1\u00b0[50] 2\u00b0[27] down, 2/9-tone down"
-    }, 
-    "accSagittal35MediumDiesisUp": {
-        "codepoint": "U+E308", 
-        "description": "35 medium diesis up, (35M, ~13M, ~125M, 5C\u00a0plus\u00a07C), 2/9-tone up"
-    }, 
-    "accSagittal49LargeDiesisDown": {
-        "codepoint": "U+E3A9", 
-        "description": "49 large diesis down"
-    }, 
-    "accSagittal49LargeDiesisUp": {
-        "codepoint": "U+E3A8", 
-        "description": "49 large diesis up, (49L, ~31L, apotome less 49M)"
-    }, 
-    "accSagittal49MediumDiesisDown": {
-        "codepoint": "U+E3A5", 
-        "description": "49 medium diesis down"
-    }, 
-    "accSagittal49MediumDiesisUp": {
-        "codepoint": "U+E3A4", 
-        "description": "49 medium diesis up, (49M, ~31M, 7C plus 7C)"
-    }, 
-    "accSagittal49SmallDiesisDown": {
-        "codepoint": "U+E39D", 
-        "description": "49 small diesis down"
-    }, 
-    "accSagittal49SmallDiesisUp": {
-        "codepoint": "U+E39C", 
-        "description": "49 small diesis up, (49S, ~31S)"
-    }, 
-    "accSagittal55CommaDown": {
-        "codepoint": "U+E345", 
-        "description": "55 comma down, 3\u00b0 down [96 EDO], 3/16-tone down"
-    }, 
-    "accSagittal55CommaUp": {
-        "codepoint": "U+E344", 
-        "description": "55 comma up, (55C, 11M less 5C), 3\u00b0up [96 EDO], 3/16-tone up"
-    }, 
-    "accSagittal5CommaDown": {
-        "codepoint": "U+E303", 
-        "description": "5 comma down, 1\u00b0 down [22 27 29 34 41 46 53 96 EDOs], 1/12-tone down"
-    }, 
-    "accSagittal5CommaUp": {
-        "codepoint": "U+E302", 
-        "description": "5 comma up, (5C), 1\u00b0 up [22 27 29 34 41 46 53 96 EDOs], 1/12-tone up"
-    }, 
-    "accSagittal5v11SmallDiesisDown": {
-        "codepoint": "U+E349", 
-        "description": "5:11 small diesis down"
-    }, 
-    "accSagittal5v11SmallDiesisUp": {
-        "codepoint": "U+E348", 
-        "description": "5:11 small diesis up, (5:11S, ~7:13S, ~11:17S, 5:7k plus 7:11C)"
-    }, 
-    "accSagittal5v13LargeDiesisDown": {
-        "codepoint": "U+E3AD", 
-        "description": "5:13 large diesis down"
-    }, 
-    "accSagittal5v13LargeDiesisUp": {
-        "codepoint": "U+E3AC", 
-        "description": "5:13 large diesis up, (5:13L, ~37L, apotome less 5:13M)"
-    }, 
-    "accSagittal5v13MediumDiesisDown": {
-        "codepoint": "U+E3A1", 
-        "description": "5:13 medium diesis down"
-    }, 
-    "accSagittal5v13MediumDiesisUp": {
-        "codepoint": "U+E3A0", 
-        "description": "5:13 medium diesis up, (5:13M, ~37M, 5C plus 13C)"
-    }, 
-    "accSagittal5v19CommaDown": {
-        "codepoint": "U+E373", 
-        "description": "5:19 comma down, 1/20-tone down"
-    }, 
-    "accSagittal5v19CommaUp": {
-        "codepoint": "U+E372", 
-        "description": "5:19 comma up, (5:19C, 5C plus 19s), 1/20-tone up"
-    }, 
-    "accSagittal5v23SmallDiesisDown": {
-        "codepoint": "U+E375", 
-        "description": "5:23 small diesis down, 2\u00b0 down [60 EDO], 1/5-tone down"
-    }, 
-    "accSagittal5v23SmallDiesisUp": {
-        "codepoint": "U+E374", 
-        "description": "5:23 small diesis up, (5:23S, 5C plus 23C), 2\u00b0 up [60 EDO], 1/5-tone up"
-    }, 
-    "accSagittal5v49MediumDiesisDown": {
-        "codepoint": "U+E3A7", 
-        "description": "5:49 medium diesis down"
-    }, 
-    "accSagittal5v49MediumDiesisUp": {
-        "codepoint": "U+E3A6", 
-        "description": "5:49 medium diesis up, (5:49M, half apotome)"
-    }, 
-    "accSagittal5v7KleismaDown": {
-        "codepoint": "U+E301", 
-        "description": "5:7 kleisma down"
-    }, 
-    "accSagittal5v7KleismaUp": {
-        "codepoint": "U+E300", 
-        "description": "5:7 kleisma up, (5:7k, ~11:13k, 7C\u00a0less\u00a05C)"
-    }, 
-    "accSagittal7CommaDown": {
-        "codepoint": "U+E305", 
-        "description": "7 comma down, 1\u00b0 down [43 EDO], 2\u00b0 down [72 EDO], 1/6-tone down"
-    }, 
-    "accSagittal7CommaUp": {
-        "codepoint": "U+E304", 
-        "description": "7 comma up, (7C), 1\u00b0 up [43 EDO], 2\u00b0 up [72 EDO], 1/6-tone up"
-    }, 
-    "accSagittal7v11CommaDown": {
-        "codepoint": "U+E347", 
-        "description": "7:11 comma down, 1\u00b0 down [60 EDO], 1/10-tone down"
-    }, 
-    "accSagittal7v11CommaUp": {
-        "codepoint": "U+E346", 
-        "description": "7:11 comma up, (7:11C, ~13:17S, ~29S, 11L less 7C), 1\u00b0 up [60 EDO]"
-    }, 
-    "accSagittal7v11KleismaDown": {
-        "codepoint": "U+E341", 
-        "description": "7:11 kleisma down"
-    }, 
-    "accSagittal7v11KleismaUp": {
-        "codepoint": "U+E340", 
-        "description": "7:11 kleisma up, (7:11k, ~29k)"
-    }, 
-    "accSagittal7v19CommaDown": {
-        "codepoint": "U+E39B", 
-        "description": "7:19 comma down"
-    }, 
-    "accSagittal7v19CommaUp": {
-        "codepoint": "U+E39A", 
-        "description": "7:19 comma up, (7:19C, 7C less 19s)"
-    }, 
-    "accSagittalAcute": {
-        "codepoint": "U+E3F2", 
-        "description": "Acute, 5 schisma up (5s), 2 cents up"
-    }, 
-    "accSagittalDoubleFlat": {
-        "codepoint": "U+E335", 
-        "description": "Double flat, (2 apotomes down)[almost all EDOs], whole-tone down"
-    }, 
-    "accSagittalDoubleFlat11v49CUp": {
-        "codepoint": "U+E3E9", 
-        "description": "Double flat 11:49C-up"
-    }, 
-    "accSagittalDoubleFlat143CUp": {
-        "codepoint": "U+E3EB", 
-        "description": "Double flat 143C-up"
-    }, 
-    "accSagittalDoubleFlat17CUp": {
-        "codepoint": "U+E365", 
-        "description": "Double flat 17C-up"
-    }, 
-    "accSagittalDoubleFlat17kUp": {
-        "codepoint": "U+E3ED", 
-        "description": "Double flat 17k-up"
-    }, 
-    "accSagittalDoubleFlat19CUp": {
-        "codepoint": "U+E3E7", 
-        "description": "Double flat 19C-up"
-    }, 
-    "accSagittalDoubleFlat19sUp": {
-        "codepoint": "U+E3EF", 
-        "description": "Double flat 19s-up"
-    }, 
-    "accSagittalDoubleFlat23CUp": {
-        "codepoint": "U+E387", 
-        "description": "Double flat 23C-up, 14\u00b0 down [96 EDO], 7/8-tone down"
-    }, 
-    "accSagittalDoubleFlat23SUp": {
-        "codepoint": "U+E3E1", 
-        "description": "Double flat 23S-up"
-    }, 
-    "accSagittalDoubleFlat25SUp": {
-        "codepoint": "U+E32D", 
-        "description": "Double flat 25S-up, 8\u00b0down [53 EDO]"
-    }, 
-    "accSagittalDoubleFlat49SUp": {
-        "codepoint": "U+E3E3", 
-        "description": "Double flat 49S-up"
-    }, 
-    "accSagittalDoubleFlat55CUp": {
-        "codepoint": "U+E363", 
-        "description": "Double flat 55C-up, 13\u00b0 down [96 EDO], 13/16-tone down"
-    }, 
-    "accSagittalDoubleFlat5CUp": {
-        "codepoint": "U+E331", 
-        "description": "Double flat 5C-up, 5\u00b0[22 29] 7\u00b0[34 41] 9\u00b053 down, 11/12 tone down"
-    }, 
-    "accSagittalDoubleFlat5v11SUp": {
-        "codepoint": "U+E35F", 
-        "description": "Double flat 5:11S-up"
-    }, 
-    "accSagittalDoubleFlat5v19CUp": {
-        "codepoint": "U+E385", 
-        "description": "Double flat 5:19C-up, 19/20-tone down"
-    }, 
-    "accSagittalDoubleFlat5v23SUp": {
-        "codepoint": "U+E383", 
-        "description": "Double flat 5:23S-up, 8\u00b0 down  [60 EDO], 4/5-tone down"
-    }, 
-    "accSagittalDoubleFlat5v7kUp": {
-        "codepoint": "U+E333", 
-        "description": "Double flat 5:7k-up"
-    }, 
-    "accSagittalDoubleFlat7CUp": {
-        "codepoint": "U+E32F", 
-        "description": "Double flat 7C-up, 5\u00b0 down [43 EDO], 10\u00b0 down [72 EDO], 5/6-tone down"
-    }, 
-    "accSagittalDoubleFlat7v11CUp": {
-        "codepoint": "U+E361", 
-        "description": "Double flat 7:11C-up, 9\u00b0 down [60 EDO], 9/10-tone down"
-    }, 
-    "accSagittalDoubleFlat7v11kUp": {
-        "codepoint": "U+E367", 
-        "description": "Double flat 7:11k-up"
-    }, 
-    "accSagittalDoubleFlat7v19CUp": {
-        "codepoint": "U+E3E5", 
-        "description": "Double flat 7:19C-up"
-    }, 
-    "accSagittalDoubleSharp": {
-        "codepoint": "U+E334", 
-        "description": "Double sharp, (2 apotomes up)[almost all EDOs], whole-tone up"
-    }, 
-    "accSagittalDoubleSharp11v49CDown": {
-        "codepoint": "U+E3E8", 
-        "description": "Double sharp 11:49C-down"
-    }, 
-    "accSagittalDoubleSharp143CDown": {
-        "codepoint": "U+E3EA", 
-        "description": "Double sharp 143C-down"
-    }, 
-    "accSagittalDoubleSharp17CDown": {
-        "codepoint": "U+E364", 
-        "description": "Double sharp 17C-down"
-    }, 
-    "accSagittalDoubleSharp17kDown": {
-        "codepoint": "U+E3EC", 
-        "description": "Double sharp 17k-down"
-    }, 
-    "accSagittalDoubleSharp19CDown": {
-        "codepoint": "U+E3E6", 
-        "description": "Double sharp 19C-down"
-    }, 
-    "accSagittalDoubleSharp19sDown": {
-        "codepoint": "U+E3EE", 
-        "description": "Double sharp 19s-down"
-    }, 
-    "accSagittalDoubleSharp23CDown": {
-        "codepoint": "U+E386", 
-        "description": "Double sharp 23C-down, 14\u00b0up [96 EDO], 7/8-tone up"
-    }, 
-    "accSagittalDoubleSharp23SDown": {
-        "codepoint": "U+E3E0", 
-        "description": "Double sharp 23S-down"
-    }, 
-    "accSagittalDoubleSharp25SDown": {
-        "codepoint": "U+E32C", 
-        "description": "Double sharp 25S-down, 8\u00b0up [53 EDO]"
-    }, 
-    "accSagittalDoubleSharp49SDown": {
-        "codepoint": "U+E3E2", 
-        "description": "Double sharp 49S-down"
-    }, 
-    "accSagittalDoubleSharp55CDown": {
-        "codepoint": "U+E362", 
-        "description": "Double sharp 55C-down, 13\u00b0 up [96 EDO], 13/16-tone up"
-    }, 
-    "accSagittalDoubleSharp5CDown": {
-        "codepoint": "U+E330", 
-        "description": "Double sharp 5C-down, 5\u00b0[22 29] 7\u00b0[34 41] 9\u00b053 up, 11/12 tone up"
-    }, 
-    "accSagittalDoubleSharp5v11SDown": {
-        "codepoint": "U+E35E", 
-        "description": "Double sharp 5:11S-down"
-    }, 
-    "accSagittalDoubleSharp5v19CDown": {
-        "codepoint": "U+E384", 
-        "description": "Double sharp 5:19C-down, 19/20-tone up"
-    }, 
-    "accSagittalDoubleSharp5v23SDown": {
-        "codepoint": "U+E382", 
-        "description": "Double sharp 5:23S-down, 8\u00b0 up [60 EDO], 4/5-tone up"
-    }, 
-    "accSagittalDoubleSharp5v7kDown": {
-        "codepoint": "U+E332", 
-        "description": "Double sharp 5:7k-down"
-    }, 
-    "accSagittalDoubleSharp7CDown": {
-        "codepoint": "U+E32E", 
-        "description": "Double sharp 7C-down, 5\u00b0[43] 10\u00b0[72] up, 5/6-tone up"
-    }, 
-    "accSagittalDoubleSharp7v11CDown": {
-        "codepoint": "U+E360", 
-        "description": "Double sharp 7:11C-down, 9\u00b0 up [60 EDO], 9/10-tone up"
-    }, 
-    "accSagittalDoubleSharp7v11kDown": {
-        "codepoint": "U+E366", 
-        "description": "Double sharp 7:11k-down"
-    }, 
-    "accSagittalDoubleSharp7v19CDown": {
-        "codepoint": "U+E3E4", 
-        "description": "Double sharp 7:19C-down"
-    }, 
-    "accSagittalFlat": {
-        "codepoint": "U+E319", 
-        "description": "Flat, (apotome down)[almost all EDOs], 1/2-tone down"
-    }, 
-    "accSagittalFlat11LDown": {
-        "codepoint": "U+E329", 
-        "description": "Flat 11L-down, 8\u00b0 up [46 EDO]"
-    }, 
-    "accSagittalFlat11MDown": {
-        "codepoint": "U+E327", 
-        "description": "Flat 11M-down, 3\u00b0 down [17 31 EDOs], 7\u00b0 down [46 EDO], 3/4-tone down"
-    }, 
-    "accSagittalFlat11v19LDown": {
-        "codepoint": "U+E3DB", 
-        "description": "Flat 11:19L-down"
-    }, 
-    "accSagittalFlat11v19MDown": {
-        "codepoint": "U+E3D3", 
-        "description": "Flat 11:19M-down"
-    }, 
-    "accSagittalFlat11v49CDown": {
-        "codepoint": "U+E3C7", 
-        "description": "Flat 11:49C-down"
-    }, 
-    "accSagittalFlat11v49CUp": {
-        "codepoint": "U+E3B9", 
-        "description": "Flat 11:49C-up"
-    }, 
-    "accSagittalFlat143CDown": {
-        "codepoint": "U+E3C5", 
-        "description": "Flat 143C-down"
-    }, 
-    "accSagittalFlat143CUp": {
-        "codepoint": "U+E3BB", 
-        "description": "Flat 143C-up"
-    }, 
-    "accSagittalFlat17CDown": {
-        "codepoint": "U+E357", 
-        "description": "Flat 17C-down"
-    }, 
-    "accSagittalFlat17CUp": {
-        "codepoint": "U+E351", 
-        "description": "Flat 17C-up"
-    }, 
-    "accSagittalFlat17kDown": {
-        "codepoint": "U+E3C3", 
-        "description": "Flat 17k-down"
-    }, 
-    "accSagittalFlat17kUp": {
-        "codepoint": "U+E3BD", 
-        "description": "Flat 17k-up"
-    }, 
-    "accSagittalFlat19CDown": {
-        "codepoint": "U+E3C9", 
-        "description": "Flat 19C-down"
-    }, 
-    "accSagittalFlat19CUp": {
-        "codepoint": "U+E3B7", 
-        "description": "Flat 19C-up"
-    }, 
-    "accSagittalFlat19sDown": {
-        "codepoint": "U+E3C1", 
-        "description": "Flat 19s-down"
-    }, 
-    "accSagittalFlat19sUp": {
-        "codepoint": "U+E3BF", 
-        "description": "Flat 19s-up"
-    }, 
-    "accSagittalFlat23CDown": {
-        "codepoint": "U+E37D", 
-        "description": "Flat 23C-down, 10\u00b0 down [96 EDO], 5/8-tone down"
-    }, 
-    "accSagittalFlat23CUp": {
-        "codepoint": "U+E37B", 
-        "description": "Flat 23C-up, 6\u00b0 down [96 EDO], 3/8-tone down"
-    }, 
-    "accSagittalFlat23SDown": {
-        "codepoint": "U+E3CF", 
-        "description": "Flat 23S-down"
-    }, 
-    "accSagittalFlat23SUp": {
-        "codepoint": "U+E3B1", 
-        "description": "Flat 23S-up"
-    }, 
-    "accSagittalFlat25SDown": {
-        "codepoint": "U+E323", 
-        "description": "Flat 25S-down, 7\u00b0 down [53 EDO]"
-    }, 
-    "accSagittalFlat25SUp": {
-        "codepoint": "U+E311", 
-        "description": "Flat 25S-up, 3\u00b0 down [53 EDO]"
-    }, 
-    "accSagittalFlat35LDown": {
-        "codepoint": "U+E32B", 
-        "description": "Flat 35L-down, 5\u00b0 down [50 EDO]"
-    }, 
-    "accSagittalFlat35MDown": {
-        "codepoint": "U+E325", 
-        "description": "Flat 35M-down, 4\u00b0 down [50 EDO], 6\u00b0 down [27 EDO], 13/18-tone down"
-    }, 
-    "accSagittalFlat49LDown": {
-        "codepoint": "U+E3D9", 
-        "description": "Flat 49L-down"
-    }, 
-    "accSagittalFlat49MDown": {
-        "codepoint": "U+E3D5", 
-        "description": "Flat 49M-down"
-    }, 
-    "accSagittalFlat49SDown": {
-        "codepoint": "U+E3CD", 
-        "description": "Flat 49S-down"
-    }, 
-    "accSagittalFlat49SUp": {
-        "codepoint": "U+E3B3", 
-        "description": "Flat 49S-up"
-    }, 
-    "accSagittalFlat55CDown": {
-        "codepoint": "U+E359", 
-        "description": "Flat 55C-down, 11\u00b0 down [96 EDO], 11/16-tone down"
-    }, 
-    "accSagittalFlat55CUp": {
-        "codepoint": "U+E34F", 
-        "description": "Flat 55C-up, 5\u00b0 down [96 EDO], 5/16-tone down"
-    }, 
-    "accSagittalFlat5CDown": {
-        "codepoint": "U+E31F", 
-        "description": "Flat 5C-down, 4\u00b0[22 29] 5\u00b0[27 34 41] 6\u00b0[39 46 53] down, 7/12-tone down"
-    }, 
-    "accSagittalFlat5CUp": {
-        "codepoint": "U+E315", 
-        "description": "Flat 5C-up, 2\u00b0[22,29] 3\u00b0[34 41] 4\u00b0[46 53 60] down, 5/12-tone down"
-    }, 
-    "accSagittalFlat5v11SDown": {
-        "codepoint": "U+E35D", 
-        "description": "Flat 5:11S-down"
-    }, 
-    "accSagittalFlat5v11SUp": {
-        "codepoint": "U+E34B", 
-        "description": "Flat 5:11S-up"
-    }, 
-    "accSagittalFlat5v13LDown": {
-        "codepoint": "U+E3DD", 
-        "description": "Flat 5:13L-down"
-    }, 
-    "accSagittalFlat5v13MDown": {
-        "codepoint": "U+E3D1", 
-        "description": "Flat 5:13M-down"
-    }, 
-    "accSagittalFlat5v19CDown": {
-        "codepoint": "U+E37F", 
-        "description": "Flat 5:19C-down, 11/20-tone down"
-    }, 
-    "accSagittalFlat5v19CUp": {
-        "codepoint": "U+E379", 
-        "description": "Flat 5:19C-up, 9/20-tone down"
-    }, 
-    "accSagittalFlat5v23SDown": {
-        "codepoint": "U+E381", 
-        "description": "Flat 5:23S-down, 7\u00b0 down [60 EDO], 7/10-tone down"
-    }, 
-    "accSagittalFlat5v23SUp": {
-        "codepoint": "U+E377", 
-        "description": "Flat 5:23S-up, 3\u00b0 down [60 EDO], 3/10-tone down"
-    }, 
-    "accSagittalFlat5v49MDown": {
-        "codepoint": "U+E3D7", 
-        "description": "Flat 5:49M-down"
-    }, 
-    "accSagittalFlat5v7kDown": {
-        "codepoint": "U+E31D", 
-        "description": "Flat 5:7k-down"
-    }, 
-    "accSagittalFlat5v7kUp": {
-        "codepoint": "U+E317", 
-        "description": "Flat 5:7k-up"
-    }, 
-    "accSagittalFlat7CDown": {
-        "codepoint": "U+E321", 
-        "description": "Flat 7C-down, 4\u00b0 down [43 EDO], 8\u00b0 down [72 EDO], 2/3-tone down"
-    }, 
-    "accSagittalFlat7CUp": {
-        "codepoint": "U+E313", 
-        "description": "Flat 7C-up, 2\u00b0 down [43 EDO], 4\u00b0 down [72 EDO], 1/3-tone down"
-    }, 
-    "accSagittalFlat7v11CDown": {
-        "codepoint": "U+E35B", 
-        "description": "Flat 7:11C-down, 6\u00b0 down [60 EDO], 3/5- tone down"
-    }, 
-    "accSagittalFlat7v11CUp": {
-        "codepoint": "U+E34D", 
-        "description": "Flat 7:11C-up, 4\u00b0 down [60 EDO], 2/5-tone down"
-    }, 
-    "accSagittalFlat7v11kDown": {
-        "codepoint": "U+E355", 
-        "description": "Flat 7:11k-down"
-    }, 
-    "accSagittalFlat7v11kUp": {
-        "codepoint": "U+E353", 
-        "description": "Flat 7:11k-up"
-    }, 
-    "accSagittalFlat7v19CDown": {
-        "codepoint": "U+E3CB", 
-        "description": "Flat 7:19C-down"
-    }, 
-    "accSagittalFlat7v19CUp": {
-        "codepoint": "U+E3B5", 
-        "description": "Flat 7:19C-up"
-    }, 
-    "accSagittalGrave": {
-        "codepoint": "U+E3F3", 
-        "description": "Grave, 5 schisma down, 2 cents down"
-    }, 
-    "accSagittalShaftDown": {
-        "codepoint": "U+E3F1", 
-        "description": "Shaft down, (natural for use with only diacritics down)"
-    }, 
-    "accSagittalShaftUp": {
-        "codepoint": "U+E3F0", 
-        "description": "Shaft up, (natural for use with only diacritics up)"
-    }, 
-    "accSagittalSharp": {
-        "codepoint": "U+E318", 
-        "description": "Sharp, (apotome up)[almost all EDOs], 1/2-tone up"
-    }, 
-    "accSagittalSharp11LUp": {
-        "codepoint": "U+E328", 
-        "description": "Sharp 11L-up, 8\u00b0 up [46 EDO]"
-    }, 
-    "accSagittalSharp11MUp": {
-        "codepoint": "U+E326", 
-        "description": "Sharp 11M-up, 3\u00b0 up [17 31 EDOs], 7\u00b0 up [46 EDO], 3/4-tone up"
-    }, 
-    "accSagittalSharp11v19LUp": {
-        "codepoint": "U+E3DA", 
-        "description": "Sharp 11:19L-up"
-    }, 
-    "accSagittalSharp11v19MUp": {
-        "codepoint": "U+E3D2", 
-        "description": "Sharp 11:19M-up"
-    }, 
-    "accSagittalSharp11v49CDown": {
-        "codepoint": "U+E3B8", 
-        "description": "Sharp 11:49C-down"
-    }, 
-    "accSagittalSharp11v49CUp": {
-        "codepoint": "U+E3C6", 
-        "description": "Sharp 11:49C-up"
-    }, 
-    "accSagittalSharp143CDown": {
-        "codepoint": "U+E3BA", 
-        "description": "Sharp 143C-down"
-    }, 
-    "accSagittalSharp143CUp": {
-        "codepoint": "U+E3C4", 
-        "description": "Sharp 143C-up"
-    }, 
-    "accSagittalSharp17CDown": {
-        "codepoint": "U+E350", 
-        "description": "Sharp 17C-down"
-    }, 
-    "accSagittalSharp17CUp": {
-        "codepoint": "U+E356", 
-        "description": "Sharp 17C-up"
-    }, 
-    "accSagittalSharp17kDown": {
-        "codepoint": "U+E3BC", 
-        "description": "Sharp 17k-down"
-    }, 
-    "accSagittalSharp17kUp": {
-        "codepoint": "U+E3C2", 
-        "description": "Sharp 17k-up"
-    }, 
-    "accSagittalSharp19CDown": {
-        "codepoint": "U+E3B6", 
-        "description": "Sharp 19C-down"
-    }, 
-    "accSagittalSharp19CUp": {
-        "codepoint": "U+E3C8", 
-        "description": "Sharp 19C-up"
-    }, 
-    "accSagittalSharp19sDown": {
-        "codepoint": "U+E3BE", 
-        "description": "Sharp 19s-down"
-    }, 
-    "accSagittalSharp19sUp": {
-        "codepoint": "U+E3C0", 
-        "description": "Sharp 19s-up"
-    }, 
-    "accSagittalSharp23CDown": {
-        "codepoint": "U+E37A", 
-        "description": "Sharp 23C-down, 6\u00b0 up [96 EDO], 3/8-tone up"
-    }, 
-    "accSagittalSharp23CUp": {
-        "codepoint": "U+E37C", 
-        "description": "Sharp 23C-up, 10\u00b0 up [96 EDO], 5/8-tone up"
-    }, 
-    "accSagittalSharp23SDown": {
-        "codepoint": "U+E3B0", 
-        "description": "Sharp 23S-down"
-    }, 
-    "accSagittalSharp23SUp": {
-        "codepoint": "U+E3CE", 
-        "description": "Sharp 23S-up"
-    }, 
-    "accSagittalSharp25SDown": {
-        "codepoint": "U+E310", 
-        "description": "Sharp 25S-down, 3\u00b0 up [53 EDO]"
-    }, 
-    "accSagittalSharp25SUp": {
-        "codepoint": "U+E322", 
-        "description": "Sharp 25S-up, 7\u00b0 up [53 EDO]"
-    }, 
-    "accSagittalSharp35LUp": {
-        "codepoint": "U+E32A", 
-        "description": "Sharp 35L-up, 5\u00b0 up [50 EDO]"
-    }, 
-    "accSagittalSharp35MUp": {
-        "codepoint": "U+E324", 
-        "description": "Sharp 35M-up, 4\u00b0 up [50 EDO], 6\u00b0 up [27 EDO], 13/18-tone up"
-    }, 
-    "accSagittalSharp49LUp": {
-        "codepoint": "U+E3D8", 
-        "description": "Sharp 49L-up"
-    }, 
-    "accSagittalSharp49MUp": {
-        "codepoint": "U+E3D4", 
-        "description": "Sharp 49M-up"
-    }, 
-    "accSagittalSharp49SDown": {
-        "codepoint": "U+E3B2", 
-        "description": "Sharp 49S-down"
-    }, 
-    "accSagittalSharp49SUp": {
-        "codepoint": "U+E3CC", 
-        "description": "Sharp 49S-up"
-    }, 
-    "accSagittalSharp55CDown": {
-        "codepoint": "U+E34E", 
-        "description": "Sharp 55C-down, 5\u00b0 up [96 EDO], 5/16-tone up"
-    }, 
-    "accSagittalSharp55CUp": {
-        "codepoint": "U+E358", 
-        "description": "Sharp 55C-up, 11\u00b0 up [96 EDO], 11/16-tone up"
-    }, 
-    "accSagittalSharp5CDown": {
-        "codepoint": "U+E314", 
-        "description": "Sharp 5C-down, 2\u00b0[22 29] 3\u00b0[34 41] 4\u00b0[46 53 60] up, 5/12-tone up"
-    }, 
-    "accSagittalSharp5CUp": {
-        "codepoint": "U+E31E", 
-        "description": "Sharp 5C-up, 4\u00b0[22 29] 5\u00b0[27 34 41] 6\u00b0[39 46 53] up, 7/12-tone up"
-    }, 
-    "accSagittalSharp5v11SDown": {
-        "codepoint": "U+E34A", 
-        "description": "Sharp 5:11S-down"
-    }, 
-    "accSagittalSharp5v11SUp": {
-        "codepoint": "U+E35C", 
-        "description": "Sharp 5:11S-up"
-    }, 
-    "accSagittalSharp5v13LUp": {
-        "codepoint": "U+E3DC", 
-        "description": "Sharp 5:13L-up"
-    }, 
-    "accSagittalSharp5v13MUp": {
-        "codepoint": "U+E3D0", 
-        "description": "Sharp 5:13M-up"
-    }, 
-    "accSagittalSharp5v19CDown": {
-        "codepoint": "U+E378", 
-        "description": "Sharp 5:19C-down, 9/20-tone up"
-    }, 
-    "accSagittalSharp5v19CUp": {
-        "codepoint": "U+E37E", 
-        "description": "Sharp 5:19C-up, 11/20-tone up"
-    }, 
-    "accSagittalSharp5v23SDown": {
-        "codepoint": "U+E376", 
-        "description": "Sharp 5:23S-down, 3\u00b0 up [60 EDO], 3/10-tone up"
-    }, 
-    "accSagittalSharp5v23SUp": {
-        "codepoint": "U+E380", 
-        "description": "Sharp 5:23S-up, 7\u00b0 up [60 EDO], 7/10-tone up"
-    }, 
-    "accSagittalSharp5v49MUp": {
-        "codepoint": "U+E3D6", 
-        "description": "Sharp 5:49M-up, (one and a half apotomes)"
-    }, 
-    "accSagittalSharp5v7kDown": {
-        "codepoint": "U+E316", 
-        "description": "Sharp 5:7k-down"
-    }, 
-    "accSagittalSharp5v7kUp": {
-        "codepoint": "U+E31C", 
-        "description": "Sharp 5:7k-up"
-    }, 
-    "accSagittalSharp7CDown": {
-        "codepoint": "U+E312", 
-        "description": "Sharp 7C-down, 2\u00b0 up [43 EDO], 4\u00b0 up [72 EDO], 1/3-tone up"
-    }, 
-    "accSagittalSharp7CUp": {
-        "codepoint": "U+E320", 
-        "description": "Sharp 7C-up, 4\u00b0 up [43 EDO], 8\u00b0 up [72 EDO], 2/3-tone up"
-    }, 
-    "accSagittalSharp7v11CDown": {
-        "codepoint": "U+E34C", 
-        "description": "Sharp 7:11C-down, 4\u00b0 up [60 EDO], 2/5-tone up"
-    }, 
-    "accSagittalSharp7v11CUp": {
-        "codepoint": "U+E35A", 
-        "description": "Sharp 7:11C-up, 6\u00b0 up [60 EDO], 3/5- tone up"
-    }, 
-    "accSagittalSharp7v11kDown": {
-        "codepoint": "U+E352", 
-        "description": "Sharp 7:11k-down"
-    }, 
-    "accSagittalSharp7v11kUp": {
-        "codepoint": "U+E354", 
-        "description": "Sharp 7:11k-up"
-    }, 
-    "accSagittalSharp7v19CDown": {
-        "codepoint": "U+E3B4", 
-        "description": "Sharp 7:19C-down"
-    }, 
-    "accSagittalSharp7v19CUp": {
-        "codepoint": "U+E3CA", 
-        "description": "Sharp 7:19C-up"
-    }, 
-    "accSagittalUnused1": {
-        "codepoint": "U+E31A", 
-        "description": "Unused"
-    }, 
-    "accSagittalUnused2": {
-        "codepoint": "U+E31B", 
-        "description": "Unused"
-    }, 
-    "accSagittalUnused3": {
-        "codepoint": "U+E3DE", 
-        "description": "Unused"
-    }, 
-    "accSagittalUnused4": {
-        "codepoint": "U+E3DF", 
-        "description": "Unused"
-    }, 
-    "accdnCombDot": {
-        "codepoint": "U+E8CA", 
-        "description": "Combining accordion coupler dot"
-    }, 
-    "accdnCombLH2RanksEmpty": {
-        "codepoint": "U+E8C8", 
-        "description": "Combining left hand, 2 ranks, empty"
-    }, 
-    "accdnCombLH3RanksEmptySquare": {
-        "codepoint": "U+E8C9", 
-        "description": "Combining left hand, 3 ranks, empty (square)"
-    }, 
-    "accdnCombRH3RanksEmpty": {
-        "codepoint": "U+E8C6", 
-        "description": "Combining right hand, 3 ranks, empty"
-    }, 
-    "accdnCombRH4RanksEmpty": {
-        "codepoint": "U+E8C7", 
-        "description": "Combining right hand, 4 ranks, empty"
-    }, 
-    "accdnDiatonicClef": {
-        "codepoint": "U+E079", 
-        "description": "Diatonic accordion clef"
-    }, 
-    "accdnLH2Ranks16Round": {
-        "codepoint": "U+E8BC", 
-        "description": "Left hand, 2 ranks, 16' stop (round)"
-    }, 
-    "accdnLH2Ranks8Plus16Round": {
-        "codepoint": "U+E8BD", 
-        "description": "Left hand, 2 ranks, 8' stop + 16' stop (round)"
-    }, 
-    "accdnLH2Ranks8Round": {
-        "codepoint": "U+E8BB", 
-        "description": "Left hand, 2 ranks, 8' stop (round)"
-    }, 
-    "accdnLH2RanksFullMasterRound": {
-        "codepoint": "U+E8C0", 
-        "description": "Left hand, 2 ranks, full master (round)"
-    }, 
-    "accdnLH2RanksMasterPlus16Round": {
-        "codepoint": "U+E8BF", 
-        "description": "Left hand, 2 ranks, master + 16' stop (round)"
-    }, 
-    "accdnLH2RanksMasterRound": {
-        "codepoint": "U+E8BE", 
-        "description": "Left hand, 2 ranks, master (round)"
-    }, 
-    "accdnLH3Ranks2Plus8Square": {
-        "codepoint": "U+E8C4", 
-        "description": "Left hand, 3 ranks, 2' stop + 8' stop (square)"
-    }, 
-    "accdnLH3Ranks2Square": {
-        "codepoint": "U+E8C2", 
-        "description": "Left hand, 3 ranks, 2' stop (square)"
-    }, 
-    "accdnLH3Ranks8Square": {
-        "codepoint": "U+E8C1", 
-        "description": "Left hand, 3 ranks, 8' stop (square)"
-    }, 
-    "accdnLH3RanksDouble8Square": {
-        "codepoint": "U+E8C3", 
-        "description": "Left hand, 3 ranks, double 8' stop (square)"
-    }, 
-    "accdnLH3RanksTuttiSquare": {
-        "codepoint": "U+E8C5", 
-        "description": "Left hand, 3 ranks, 2' stop + double 8' stop (tutti) (square)"
-    }, 
-    "accdnPull": {
-        "codepoint": "U+E8CC", 
-        "description": "Pull"
-    }, 
-    "accdnPush": {
-        "codepoint": "U+E8CB", 
-        "description": "Push"
-    }, 
-    "accdnRH3RanksAccordion": {
-        "codepoint": "U+E8AC", 
-        "description": "Right hand, 3 ranks, 8' stop + upper tremolo 8' stop + 16' stop (accordion)"
-    }, 
-    "accdnRH3RanksAuthenticMusette": {
-        "codepoint": "U+E8A8", 
-        "description": "Right hand, 3 ranks, lower tremolo 8' stop + 8' stop + upper tremolo 8' stop (authentic musette)"
-    }, 
-    "accdnRH3RanksBandoneon": {
-        "codepoint": "U+E8AB", 
-        "description": "Right hand, 3 ranks, 8' stop + 16' stop (bandone\u00f3n)"
-    }, 
-    "accdnRH3RanksBassoon": {
-        "codepoint": "U+E8A4", 
-        "description": "Right hand, 3 ranks, 16' stop (bassoon)"
-    }, 
-    "accdnRH3RanksClarinet": {
-        "codepoint": "U+E8A1", 
-        "description": "Right hand, 3 ranks, 8' stop (clarinet)"
-    }, 
-    "accdnRH3RanksDoubleTremoloLower8ve": {
-        "codepoint": "U+E8B1", 
-        "description": "Right hand, 3 ranks, lower tremolo 8' stop + 8' stop + upper tremolo 8' stop + 16' stop"
-    }, 
-    "accdnRH3RanksDoubleTremoloUpper8ve": {
-        "codepoint": "U+E8B2", 
-        "description": "Right hand, 3 ranks, 4' stop + lower tremolo 8' stop + 8' stop + upper tremolo 8' stop"
-    }, 
-    "accdnRH3RanksFullFactory": {
-        "codepoint": "U+E8B3", 
-        "description": "Right hand, 3 ranks, 4' stop + lower tremolo 8' stop + 8' stop + upper tremolo 8' stop + 16' stop"
-    }, 
-    "accdnRH3RanksHarmonium": {
-        "codepoint": "U+E8AA", 
-        "description": "Right hand, 3 ranks, 4' stop + 8' stop + 16' stop (harmonium)"
-    }, 
-    "accdnRH3RanksImitationMusette": {
-        "codepoint": "U+E8A7", 
-        "description": "Right hand, 3 ranks, 4' stop + 8' stop + upper tremolo 8' stop (imitation musette)"
-    }, 
-    "accdnRH3RanksLowerTremolo8": {
-        "codepoint": "U+E8A3", 
-        "description": "Right hand, 3 ranks, lower tremolo 8' stop"
-    }, 
-    "accdnRH3RanksMaster": {
-        "codepoint": "U+E8AD", 
-        "description": "Right hand, 3 ranks, 4' stop + lower tremolo 8' stop + upper tremolo 8' stop + 16' stop (master)"
-    }, 
-    "accdnRH3RanksOboe": {
-        "codepoint": "U+E8A5", 
-        "description": "Right hand, 3 ranks, 4' stop + 8' stop (oboe)"
-    }, 
-    "accdnRH3RanksOrgan": {
-        "codepoint": "U+E8A9", 
-        "description": "Right hand, 3 ranks, 4' stop + 16' stop (organ)"
-    }, 
-    "accdnRH3RanksPiccolo": {
-        "codepoint": "U+E8A0", 
-        "description": "Right hand, 3 ranks, 4' stop (piccolo)"
-    }, 
-    "accdnRH3RanksTremoloLower8ve": {
-        "codepoint": "U+E8AF", 
-        "description": "Right hand, 3 ranks, lower tremolo 8' stop + upper tremolo 8' stop + 16' stop"
-    }, 
-    "accdnRH3RanksTremoloUpper8ve": {
-        "codepoint": "U+E8B0", 
-        "description": "Right hand, 3 ranks, 4' stop + lower tremolo 8' stop + upper tremolo 8' stop"
-    }, 
-    "accdnRH3RanksTwoChoirs": {
-        "codepoint": "U+E8AE", 
-        "description": "Right hand, 3 ranks, lower tremolo 8' stop + upper tremolo 8' stop"
-    }, 
-    "accdnRH3RanksUpperTremolo8": {
-        "codepoint": "U+E8A2", 
-        "description": "Right hand, 3 ranks, upper tremolo 8' stop"
-    }, 
-    "accdnRH3RanksViolin": {
-        "codepoint": "U+E8A6", 
-        "description": "Right hand, 3 ranks, 8' stop + upper tremolo 8' stop (violin)"
-    }, 
-    "accdnRH4RanksAlto": {
-        "codepoint": "U+E8B5", 
-        "description": "Right hand, 4 ranks, alto"
-    }, 
-    "accdnRH4RanksBassAlto": {
-        "codepoint": "U+E8BA", 
-        "description": "Right hand, 4 ranks, bass/alto"
-    }, 
-    "accdnRH4RanksMaster": {
-        "codepoint": "U+E8B7", 
-        "description": "Right hand, 4 ranks, master"
-    }, 
-    "accdnRH4RanksSoftBass": {
-        "codepoint": "U+E8B8", 
-        "description": "Right hand, 4 ranks, soft bass"
-    }, 
-    "accdnRH4RanksSoftTenor": {
-        "codepoint": "U+E8B9", 
-        "description": "Right hand, 4 ranks, soft tenor"
-    }, 
-    "accdnRH4RanksSoprano": {
-        "codepoint": "U+E8B4", 
-        "description": "Right hand, 4 ranks, soprano"
-    }, 
-    "accdnRH4RanksTenor": {
-        "codepoint": "U+E8B6", 
-        "description": "Right hand, 4 ranks, tenor"
-    }, 
-    "accdnRicochet2": {
-        "codepoint": "U+E8CD", 
-        "description": "Ricochet (2 tones)"
-    }, 
-    "accdnRicochet3": {
-        "codepoint": "U+E8CE", 
-        "description": "Ricochet (3 tones)"
-    }, 
-    "accdnRicochet4": {
-        "codepoint": "U+E8CF", 
-        "description": "Ricochet (4 tones)"
-    }, 
-    "accdnRicochet5": {
-        "codepoint": "U+E8D0", 
-        "description": "Ricochet (5 tones)"
-    }, 
-    "accdnRicochet6": {
-        "codepoint": "U+E8D1", 
-        "description": "Ricochet (6 tones)"
-    }, 
-    "accdnRicochetStem2": {
-        "codepoint": "U+E8D2", 
-        "description": "Combining ricochet for stem (2 tones)"
-    }, 
-    "accdnRicochetStem3": {
-        "codepoint": "U+E8D3", 
-        "description": "Combining ricochet for stem (3 tones)"
-    }, 
-    "accdnRicochetStem4": {
-        "codepoint": "U+E8D4", 
-        "description": "Combining ricochet for stem (4 tones)"
-    }, 
-    "accdnRicochetStem5": {
-        "codepoint": "U+E8D5", 
-        "description": "Combining ricochet for stem (5 tones)"
-    }, 
-    "accdnRicochetStem6": {
-        "codepoint": "U+E8D6", 
-        "description": "Combining ricochet for stem (6 tones)"
-    }, 
-    "accidental1CommaFlat": {
-        "codepoint": "U+E454", 
-        "description": "1-comma flat"
-    }, 
-    "accidental1CommaSharp": {
-        "codepoint": "U+E450", 
-        "description": "1-comma sharp"
-    }, 
-    "accidental2CommaFlat": {
-        "codepoint": "U+E455", 
-        "description": "2-comma flat"
-    }, 
-    "accidental2CommaSharp": {
-        "codepoint": "U+E451", 
-        "description": "2-comma sharp"
-    }, 
-    "accidental3CommaFlat": {
-        "codepoint": "U+E456", 
-        "description": "3-comma flat"
-    }, 
-    "accidental3CommaSharp": {
-        "codepoint": "U+E452", 
-        "description": "3-comma sharp"
-    }, 
-    "accidental4CommaFlat": {
-        "codepoint": "U+E457", 
-        "description": "4-comma flat"
-    }, 
-    "accidental5CommaSharp": {
-        "codepoint": "U+E453", 
-        "description": "5-comma sharp"
-    }, 
-    "accidentalArrowDown": {
-        "codepoint": "U+E27B", 
-        "description": "Arrow down (lower by one quarter-tone)"
-    }, 
-    "accidentalArrowUp": {
-        "codepoint": "U+E27A", 
-        "description": "Arrow up (raise by one quarter-tone)"
-    }, 
-    "accidentalBakiyeFlat": {
-        "codepoint": "U+E442", 
-        "description": "Bakiye (flat)"
-    }, 
-    "accidentalBakiyeSharp": {
-        "codepoint": "U+E445", 
-        "description": "Bakiye (sharp)"
-    }, 
-    "accidentalBracketLeft": {
-        "codepoint": "U+E26C", 
-        "description": "Accidental bracket, left"
-    }, 
-    "accidentalBracketRight": {
-        "codepoint": "U+E26D", 
-        "description": "Accidental bracket, right"
-    }, 
-    "accidentalBuyukMucennebFlat": {
-        "codepoint": "U+E440", 
-        "description": "B\u00fcy\u00fck m\u00fccenneb (flat)"
-    }, 
-    "accidentalBuyukMucennebSharp": {
-        "codepoint": "U+E447", 
-        "description": "B\u00fcy\u00fck m\u00fccenneb (sharp)"
-    }, 
-    "accidentalCombiningCloseCurlyBrace": {
-        "codepoint": "U+E2EF", 
-        "description": "Combining close curly brace"
-    }, 
-    "accidentalCombiningLower17Schisma": {
-        "codepoint": "U+E2E6", 
-        "description": "Combining lower by one 17-limit schisma"
-    }, 
-    "accidentalCombiningLower19Schisma": {
-        "codepoint": "U+E2E8", 
-        "description": "Combining lower by one 19-limit schisma"
-    }, 
-    "accidentalCombiningLower23Limit29LimitComma": {
-        "codepoint": "U+E2EA", 
-        "description": "Combining lower by one 23-limit comma or 29-limit comma"
-    }, 
-    "accidentalCombiningLower31Schisma": {
-        "codepoint": "U+E2EC", 
-        "description": "Combining lower by one 31-limit schisma"
-    }, 
-    "accidentalCombiningLower53LimitComma": {
-        "codepoint": "U+E2F7", 
-        "description": "Combining lower by one 53-limit comma"
-    }, 
-    "accidentalCombiningOpenCurlyBrace": {
-        "codepoint": "U+E2EE", 
-        "description": "Combining open curly brace"
-    }, 
-    "accidentalCombiningRaise17Schisma": {
-        "codepoint": "U+E2E7", 
-        "description": "Combining raise by one 17-limit schisma"
-    }, 
-    "accidentalCombiningRaise19Schisma": {
-        "codepoint": "U+E2E9", 
-        "description": "Combining raise by one 19-limit schisma"
-    }, 
-    "accidentalCombiningRaise23Limit29LimitComma": {
-        "codepoint": "U+E2EB", 
-        "description": "Combining raise by one 23-limit comma or 29-limit comma"
-    }, 
-    "accidentalCombiningRaise31Schisma": {
-        "codepoint": "U+E2ED", 
-        "description": "Combining raise by one 31-limit schisma"
-    }, 
-    "accidentalCombiningRaise53LimitComma": {
-        "codepoint": "U+E2F8", 
-        "description": "Combining raise by one 53-limit comma"
-    }, 
-    "accidentalCommaSlashDown": {
-        "codepoint": "U+E47A", 
-        "description": "Syntonic/Didymus comma (80:81) down (Bosanquet)"
-    }, 
-    "accidentalCommaSlashUp": {
-        "codepoint": "U+E479", 
-        "description": "Syntonic/Didymus comma (80:81) up (Bosanquet)"
-    }, 
-    "accidentalDoubleFlat": {
-        "alternateCodepoint": "U+1D12B", 
-        "codepoint": "U+E264", 
-        "description": "Double flat"
-    }, 
-    "accidentalDoubleFlatArabic": {
-        "codepoint": "U+ED30", 
-        "description": "Arabic double flat"
-    }, 
-    "accidentalDoubleFlatEqualTempered": {
-        "codepoint": "U+E2F0", 
-        "description": "Double flat equal tempered semitone"
-    }, 
-    "accidentalDoubleFlatOneArrowDown": {
-        "codepoint": "U+E2C0", 
-        "description": "Double flat lowered by one syntonic comma"
-    }, 
-    "accidentalDoubleFlatOneArrowUp": {
-        "codepoint": "U+E2C5", 
-        "description": "Double flat raised by one syntonic comma"
-    }, 
-    "accidentalDoubleFlatReversed": {
-        "codepoint": "U+E483", 
-        "description": "Reversed double flat"
-    }, 
-    "accidentalDoubleFlatThreeArrowsDown": {
-        "codepoint": "U+E2D4", 
-        "description": "Double flat lowered by three syntonic commas"
-    }, 
-    "accidentalDoubleFlatThreeArrowsUp": {
-        "codepoint": "U+E2D9", 
-        "description": "Double flat raised by three syntonic commas"
-    }, 
-    "accidentalDoubleFlatTurned": {
-        "codepoint": "U+E485", 
-        "description": "Turned double flat"
-    }, 
-    "accidentalDoubleFlatTwoArrowsDown": {
-        "codepoint": "U+E2CA", 
-        "description": "Double flat lowered by two syntonic commas"
-    }, 
-    "accidentalDoubleFlatTwoArrowsUp": {
-        "codepoint": "U+E2CF", 
-        "description": "Double flat raised by two syntonic commas"
-    }, 
-    "accidentalDoubleSharp": {
-        "alternateCodepoint": "U+1D12A", 
-        "codepoint": "U+E263", 
-        "description": "Double sharp"
-    }, 
-    "accidentalDoubleSharpArabic": {
-        "codepoint": "U+ED38", 
-        "description": "Arabic double sharp"
-    }, 
-    "accidentalDoubleSharpEqualTempered": {
-        "codepoint": "U+E2F4", 
-        "description": "Double sharp equal tempered semitone"
-    }, 
-    "accidentalDoubleSharpOneArrowDown": {
-        "codepoint": "U+E2C4", 
-        "description": "Double sharp lowered by one syntonic comma"
-    }, 
-    "accidentalDoubleSharpOneArrowUp": {
-        "codepoint": "U+E2C9", 
-        "description": "Double sharp raised by one syntonic comma"
-    }, 
-    "accidentalDoubleSharpThreeArrowsDown": {
-        "codepoint": "U+E2D8", 
-        "description": "Double sharp lowered by three syntonic commas"
-    }, 
-    "accidentalDoubleSharpThreeArrowsUp": {
-        "codepoint": "U+E2DD", 
-        "description": "Double sharp raised by three syntonic commas"
-    }, 
-    "accidentalDoubleSharpTwoArrowsDown": {
-        "codepoint": "U+E2CE", 
-        "description": "Double sharp lowered by two syntonic commas"
-    }, 
-    "accidentalDoubleSharpTwoArrowsUp": {
-        "codepoint": "U+E2D3", 
-        "description": "Double sharp raised by two syntonic commas"
-    }, 
-    "accidentalEnharmonicAlmostEqualTo": {
-        "codepoint": "U+E2FA", 
-        "description": "Enharmonically reinterpret accidental almost equal to"
-    }, 
-    "accidentalEnharmonicEquals": {
-        "codepoint": "U+E2FB", 
-        "description": "Enharmonically reinterpret accidental equals"
-    }, 
-    "accidentalEnharmonicTilde": {
-        "codepoint": "U+E2F9", 
-        "description": "Enharmonically reinterpret accidental tilde"
-    }, 
-    "accidentalFilledReversedFlatAndFlat": {
-        "codepoint": "U+E296", 
-        "description": "Filled reversed flat and flat"
-    }, 
-    "accidentalFilledReversedFlatAndFlatArrowDown": {
-        "codepoint": "U+E298", 
-        "description": "Filled reversed flat and flat with arrow down"
-    }, 
-    "accidentalFilledReversedFlatAndFlatArrowUp": {
-        "codepoint": "U+E297", 
-        "description": "Filled reversed flat and flat with arrow up"
-    }, 
-    "accidentalFilledReversedFlatArrowDown": {
-        "codepoint": "U+E293", 
-        "description": "Filled reversed flat with arrow down"
-    }, 
-    "accidentalFilledReversedFlatArrowUp": {
-        "codepoint": "U+E292", 
-        "description": "Filled reversed flat with arrow up"
-    }, 
-    "accidentalFiveQuarterTonesFlatArrowDown": {
-        "codepoint": "U+E279", 
-        "description": "Five-quarter-tones flat"
-    }, 
-    "accidentalFiveQuarterTonesSharpArrowUp": {
-        "codepoint": "U+E276", 
-        "description": "Five-quarter-tones sharp"
-    }, 
-    "accidentalFlat": {
-        "alternateCodepoint": "U+266D", 
-        "codepoint": "U+E260", 
-        "description": "Flat"
-    }, 
-    "accidentalFlatArabic": {
-        "codepoint": "U+ED32", 
-        "description": "Arabic half-tone flat"
-    }, 
-    "accidentalFlatEqualTempered": {
-        "codepoint": "U+E2F1", 
-        "description": "Flat equal tempered semitone"
-    }, 
-    "accidentalFlatLoweredStockhausen": {
-        "codepoint": "U+ED53", 
-        "description": "Lowered flat (Stockhausen)"
-    }, 
-    "accidentalFlatOneArrowDown": {
-        "codepoint": "U+E2C1", 
-        "description": "Flat lowered by one syntonic comma"
-    }, 
-    "accidentalFlatOneArrowUp": {
-        "codepoint": "U+E2C6", 
-        "description": "Flat raised by one syntonic comma"
-    }, 
-    "accidentalFlatRaisedStockhausen": {
-        "codepoint": "U+ED52", 
-        "description": "Raised flat (Stockhausen)"
-    }, 
-    "accidentalFlatRepeatedLineStockhausen": {
-        "codepoint": "U+ED5C", 
-        "description": "Repeated flat, note on line (Stockhausen)"
-    }, 
-    "accidentalFlatRepeatedSpaceStockhausen": {
-        "codepoint": "U+ED5B", 
-        "description": "Repeated flat, note in space (Stockhausen)"
-    }, 
-    "accidentalFlatThreeArrowsDown": {
-        "codepoint": "U+E2D5", 
-        "description": "Flat lowered by three syntonic commas"
-    }, 
-    "accidentalFlatThreeArrowsUp": {
-        "codepoint": "U+E2DA", 
-        "description": "Flat raised by three syntonic commas"
-    }, 
-    "accidentalFlatTurned": {
-        "codepoint": "U+E484", 
-        "description": "Turned flat"
-    }, 
-    "accidentalFlatTwoArrowsDown": {
-        "codepoint": "U+E2CB", 
-        "description": "Flat lowered by two syntonic commas"
-    }, 
-    "accidentalFlatTwoArrowsUp": {
-        "codepoint": "U+E2D0", 
-        "description": "Flat raised by two syntonic commas"
-    }, 
-    "accidentalHalfSharpArrowDown": {
-        "codepoint": "U+E29A", 
-        "description": "Half sharp with arrow down"
-    }, 
-    "accidentalHalfSharpArrowUp": {
-        "codepoint": "U+E299", 
-        "description": "Half sharp with arrow up"
-    }, 
-    "accidentalJohnston13": {
-        "codepoint": "U+E2B6", 
-        "description": "Thirteen (raise by 65:64)"
-    }, 
-    "accidentalJohnston31": {
-        "codepoint": "U+E2B7", 
-        "description": "Inverted 13 (lower by 65:64)"
-    }, 
-    "accidentalJohnstonDown": {
-        "codepoint": "U+E2B5", 
-        "description": "Down arrow (lower by 33:32)"
-    }, 
-    "accidentalJohnstonEl": {
-        "codepoint": "U+E2B2", 
-        "description": "Inverted seven (raise by 36:35)"
-    }, 
-    "accidentalJohnstonMinus": {
-        "codepoint": "U+E2B1", 
-        "description": "Minus (lower by 81:80)"
-    }, 
-    "accidentalJohnstonPlus": {
-        "codepoint": "U+E2B0", 
-        "description": "Plus (raise by 81:80)"
-    }, 
-    "accidentalJohnstonSeven": {
-        "codepoint": "U+E2B3", 
-        "description": "Seven (lower by 36:35)"
-    }, 
-    "accidentalJohnstonUp": {
-        "codepoint": "U+E2B4", 
-        "description": "Up arrow (raise by 33:32)"
-    }, 
-    "accidentalKomaFlat": {
-        "codepoint": "U+E443", 
-        "description": "Koma (flat)"
-    }, 
-    "accidentalKomaSharp": {
-        "codepoint": "U+E444", 
-        "description": "Koma (sharp)"
-    }, 
-    "accidentalKoron": {
-        "codepoint": "U+E460", 
-        "description": "Koron (quarter tone flat)"
-    }, 
-    "accidentalKucukMucennebFlat": {
-        "codepoint": "U+E441", 
-        "description": "K\u00fc\u00e7\u00fck m\u00fccenneb (flat)"
-    }, 
-    "accidentalKucukMucennebSharp": {
-        "codepoint": "U+E446", 
-        "description": "K\u00fc\u00e7\u00fck m\u00fccenneb (sharp)"
-    }, 
-    "accidentalLargeDoubleSharp": {
-        "codepoint": "U+E47D", 
-        "description": "Large double sharp"
-    }, 
-    "accidentalLowerOneSeptimalComma": {
-        "codepoint": "U+E2DE", 
-        "description": "Lower by one septimal comma"
-    }, 
-    "accidentalLowerOneTridecimalQuartertone": {
-        "codepoint": "U+E2E4", 
-        "description": "Lower by one tridecimal quartertone"
-    }, 
-    "accidentalLowerOneUndecimalQuartertone": {
-        "codepoint": "U+E2E2", 
-        "description": "Lower by one undecimal quartertone"
-    }, 
-    "accidentalLowerTwoSeptimalCommas": {
-        "codepoint": "U+E2E0", 
-        "description": "Lower by two septimal commas"
-    }, 
-    "accidentalLoweredStockhausen": {
-        "codepoint": "U+ED51", 
-        "description": "Lowered (Stockhausen)"
-    }, 
-    "accidentalNarrowReversedFlat": {
-        "codepoint": "U+E284", 
-        "description": "Narrow reversed flat(quarter-tone flat)"
-    }, 
-    "accidentalNarrowReversedFlatAndFlat": {
-        "codepoint": "U+E285", 
-        "description": "Narrow reversed flat and flat(three-quarter-tones flat)"
-    }, 
-    "accidentalNatural": {
-        "alternateCodepoint": "U+266E", 
-        "codepoint": "U+E261", 
-        "description": "Natural"
-    }, 
-    "accidentalNaturalArabic": {
-        "codepoint": "U+ED34", 
-        "description": "Arabic natural"
-    }, 
-    "accidentalNaturalEqualTempered": {
-        "codepoint": "U+E2F2", 
-        "description": "Natural equal tempered semitone"
-    }, 
-    "accidentalNaturalFlat": {
-        "codepoint": "U+E267", 
-        "description": "Natural flat"
-    }, 
-    "accidentalNaturalLoweredStockhausen": {
-        "codepoint": "U+ED55", 
-        "description": "Lowered natural (Stockhausen)"
-    }, 
-    "accidentalNaturalOneArrowDown": {
-        "codepoint": "U+E2C2", 
-        "description": "Natural lowered by one syntonic comma"
-    }, 
-    "accidentalNaturalOneArrowUp": {
-        "codepoint": "U+E2C7", 
-        "description": "Natural raised by one syntonic comma"
-    }, 
-    "accidentalNaturalRaisedStockhausen": {
-        "codepoint": "U+ED54", 
-        "description": "Raised natural (Stockhausen)"
-    }, 
-    "accidentalNaturalReversed": {
-        "codepoint": "U+E482", 
-        "description": "Reversed natural"
-    }, 
-    "accidentalNaturalSharp": {
-        "codepoint": "U+E268", 
-        "description": "Natural sharp"
-    }, 
-    "accidentalNaturalThreeArrowsDown": {
-        "codepoint": "U+E2D6", 
-        "description": "Natural lowered by three syntonic commas"
-    }, 
-    "accidentalNaturalThreeArrowsUp": {
-        "codepoint": "U+E2DB", 
-        "description": "Natural raised by three syntonic commas"
-    }, 
-    "accidentalNaturalTwoArrowsDown": {
-        "codepoint": "U+E2CC", 
-        "description": "Natural lowered by two syntonic commas"
-    }, 
-    "accidentalNaturalTwoArrowsUp": {
-        "codepoint": "U+E2D1", 
-        "description": "Natural raised by two syntonic commas"
-    }, 
-    "accidentalOneAndAHalfSharpsArrowDown": {
-        "codepoint": "U+E29C", 
-        "description": "One and a half sharps with arrow down"
-    }, 
-    "accidentalOneAndAHalfSharpsArrowUp": {
-        "codepoint": "U+E29B", 
-        "description": "One and a half sharps with arrow up"
-    }, 
-    "accidentalOneQuarterToneFlatFerneyhough": {
-        "codepoint": "U+E48F", 
-        "description": "One-quarter-tone flat (Ferneyhough)"
-    }, 
-    "accidentalOneQuarterToneFlatStockhausen": {
-        "codepoint": "U+ED59", 
-        "description": "One-quarter-tone flat (Stockhausen)"
-    }, 
-    "accidentalOneQuarterToneSharpFerneyhough": {
-        "codepoint": "U+E48E", 
-        "description": "One-quarter-tone sharp (Ferneyhough)"
-    }, 
-    "accidentalOneQuarterToneSharpStockhausen": {
-        "codepoint": "U+ED58", 
-        "description": "One-quarter-tone sharp (Stockhausen)"
-    }, 
-    "accidentalOneThirdToneFlatFerneyhough": {
-        "codepoint": "U+E48B", 
-        "description": "One-third-tone flat (Ferneyhough)"
-    }, 
-    "accidentalOneThirdToneSharpFerneyhough": {
-        "codepoint": "U+E48A", 
-        "description": "One-third-tone sharp (Ferneyhough)"
-    }, 
-    "accidentalParensLeft": {
-        "codepoint": "U+E26A", 
-        "description": "Accidental parenthesis, left"
-    }, 
-    "accidentalParensRight": {
-        "codepoint": "U+E26B", 
-        "description": "Accidental parenthesis, right"
-    }, 
-    "accidentalQuarterFlatEqualTempered": {
-        "codepoint": "U+E2F5", 
-        "description": "Lower by one equal tempered quarter-tone"
-    }, 
-    "accidentalQuarterSharpEqualTempered": {
-        "codepoint": "U+E2F6", 
-        "description": "Raise by one equal tempered quarter tone"
-    }, 
-    "accidentalQuarterToneFlat4": {
-        "alternateCodepoint": "U+1D133", 
-        "codepoint": "U+E47F", 
-        "description": "Quarter-tone flat"
-    }, 
-    "accidentalQuarterToneFlatArabic": {
-        "codepoint": "U+ED33", 
-        "description": "Arabic quarter-tone flat"
-    }, 
-    "accidentalQuarterToneFlatArrowUp": {
-        "alternateCodepoint": "U+1D12C", 
-        "codepoint": "U+E270", 
-        "description": "Quarter-tone flat"
-    }, 
-    "accidentalQuarterToneFlatFilledReversed": {
-        "codepoint": "U+E480", 
-        "description": "Filled reversed flat (quarter-tone flat)"
-    }, 
-    "accidentalQuarterToneFlatNaturalArrowDown": {
-        "alternateCodepoint": "U+1D12F", 
-        "codepoint": "U+E273", 
-        "description": "Quarter-tone flat"
-    }, 
-    "accidentalQuarterToneFlatPenderecki": {
-        "codepoint": "U+E478", 
-        "description": "Quarter tone flat (Penderecki)"
-    }, 
-    "accidentalQuarterToneFlatStein": {
-        "codepoint": "U+E280", 
-        "description": "Reversed flat (quarter-tone flat) (Stein)"
-    }, 
-    "accidentalQuarterToneFlatVanBlankenburg": {
-        "codepoint": "U+E488", 
-        "description": "Quarter-tone flat (van Blankenburg)"
-    }, 
-    "accidentalQuarterToneSharp4": {
-        "alternateCodepoint": "U+1D132", 
-        "codepoint": "U+E47E", 
-        "description": "Quarter-tone sharp"
-    }, 
-    "accidentalQuarterToneSharpArabic": {
-        "codepoint": "U+ED35", 
-        "description": "Arabic quarter-tone sharp"
-    }, 
-    "accidentalQuarterToneSharpArrowDown": {
-        "alternateCodepoint": "U+1D131", 
-        "codepoint": "U+E275", 
-        "description": "Quarter-tone sharp"
-    }, 
-    "accidentalQuarterToneSharpBusotti": {
-        "codepoint": "U+E472", 
-        "description": "Quarter tone sharp (Bussotti)"
-    }, 
-    "accidentalQuarterToneSharpNaturalArrowUp": {
-        "alternateCodepoint": "U+1D12E", 
-        "codepoint": "U+E272", 
-        "description": "Quarter-tone sharp"
-    }, 
-    "accidentalQuarterToneSharpStein": {
-        "codepoint": "U+E282", 
-        "description": "Half sharp (quarter-tone sharp) (Stein)"
-    }, 
-    "accidentalQuarterToneSharpWiggle": {
-        "codepoint": "U+E475", 
-        "description": "Quarter tone sharp with wiggly tail"
-    }, 
-    "accidentalRaiseOneSeptimalComma": {
-        "codepoint": "U+E2DF", 
-        "description": "Raise by one septimal comma"
-    }, 
-    "accidentalRaiseOneTridecimalQuartertone": {
-        "codepoint": "U+E2E5", 
-        "description": "Raise by one tridecimal quartertone"
-    }, 
-    "accidentalRaiseOneUndecimalQuartertone": {
-        "codepoint": "U+E2E3", 
-        "description": "Raise by one undecimal quartertone"
-    }, 
-    "accidentalRaiseTwoSeptimalCommas": {
-        "codepoint": "U+E2E1", 
-        "description": "Raise by two septimal commas"
-    }, 
-    "accidentalRaisedStockhausen": {
-        "codepoint": "U+ED50", 
-        "description": "Raised (Stockhausen)"
-    }, 
-    "accidentalReversedFlatAndFlatArrowDown": {
-        "codepoint": "U+E295", 
-        "description": "Reversed flat and flat with arrow down"
-    }, 
-    "accidentalReversedFlatAndFlatArrowUp": {
-        "codepoint": "U+E294", 
-        "description": "Reversed flat and flat with arrow up"
-    }, 
-    "accidentalReversedFlatArrowDown": {
-        "codepoint": "U+E291", 
-        "description": "Reversed flat with arrow down"
-    }, 
-    "accidentalReversedFlatArrowUp": {
-        "codepoint": "U+E290", 
-        "description": "Reversed flat with arrow up"
-    }, 
-    "accidentalSharp": {
-        "alternateCodepoint": "U+266F", 
-        "codepoint": "U+E262", 
-        "description": "Sharp"
-    }, 
-    "accidentalSharpArabic": {
-        "codepoint": "U+ED36", 
-        "description": "Arabic half-tone sharp"
-    }, 
-    "accidentalSharpEqualTempered": {
-        "codepoint": "U+E2F3", 
-        "description": "Sharp equal tempered semitone"
-    }, 
-    "accidentalSharpLoweredStockhausen": {
-        "codepoint": "U+ED57", 
-        "description": "Lowered sharp (Stockhausen)"
-    }, 
-    "accidentalSharpOneArrowDown": {
-        "codepoint": "U+E2C3", 
-        "description": "Sharp lowered by one syntonic comma"
-    }, 
-    "accidentalSharpOneArrowUp": {
-        "codepoint": "U+E2C8", 
-        "description": "Sharp raised by one syntonic comma"
-    }, 
-    "accidentalSharpOneHorizontalStroke": {
-        "codepoint": "U+E473", 
-        "description": "One or three quarter tones sharp"
-    }, 
-    "accidentalSharpRaisedStockhausen": {
-        "codepoint": "U+ED56", 
-        "description": "Raised sharp (Stockhausen)"
-    }, 
-    "accidentalSharpRepeatedLineStockhausen": {
-        "codepoint": "U+ED5E", 
-        "description": "Repeated sharp, note on line (Stockhausen)"
-    }, 
-    "accidentalSharpRepeatedSpaceStockhausen": {
-        "codepoint": "U+ED5D", 
-        "description": "Repeated sharp, note in space (Stockhausen)"
-    }, 
-    "accidentalSharpReversed": {
-        "codepoint": "U+E481", 
-        "description": "Reversed sharp"
-    }, 
-    "accidentalSharpSharp": {
-        "codepoint": "U+E269", 
-        "description": "Sharp sharp"
-    }, 
-    "accidentalSharpThreeArrowsDown": {
-        "codepoint": "U+E2D7", 
-        "description": "Sharp lowered by three syntonic commas"
-    }, 
-    "accidentalSharpThreeArrowsUp": {
-        "codepoint": "U+E2DC", 
-        "description": "Sharp raised by three syntonic commas"
-    }, 
-    "accidentalSharpTwoArrowsDown": {
-        "codepoint": "U+E2CD", 
-        "description": "Sharp lowered by two syntonic commas"
-    }, 
-    "accidentalSharpTwoArrowsUp": {
-        "codepoint": "U+E2D2", 
-        "description": "Sharp raised by two syntonic commas"
-    }, 
-    "accidentalSims12Down": {
-        "codepoint": "U+E2A0", 
-        "description": "1/12 tone low"
-    }, 
-    "accidentalSims12Up": {
-        "codepoint": "U+E2A3", 
-        "description": "1/12 tone high"
-    }, 
-    "accidentalSims4Down": {
-        "codepoint": "U+E2A2", 
-        "description": "1/4 tone low"
-    }, 
-    "accidentalSims4Up": {
-        "codepoint": "U+E2A5", 
-        "description": "1/4 tone high"
-    }, 
-    "accidentalSims6Down": {
-        "codepoint": "U+E2A1", 
-        "description": "1/6 tone low"
-    }, 
-    "accidentalSims6Up": {
-        "codepoint": "U+E2A4", 
-        "description": "1/6 tone high"
-    }, 
-    "accidentalSori": {
-        "codepoint": "U+E461", 
-        "description": "Sori (quarter tone sharp)"
-    }, 
-    "accidentalTavenerFlat": {
-        "codepoint": "U+E477", 
-        "description": "Byzantine-style Bakiye flat (Tavener)"
-    }, 
-    "accidentalTavenerSharp": {
-        "codepoint": "U+E476", 
-        "description": "Byzantine-style Bu\u0308yu\u0308k mu\u0308cenneb sharp (Tavener)"
-    }, 
-    "accidentalThreeQuarterTonesFlatArabic": {
-        "codepoint": "U+ED31", 
-        "description": "Arabic three-quarter-tones flat"
-    }, 
-    "accidentalThreeQuarterTonesFlatArrowDown": {
-        "alternateCodepoint": "U+1D12D", 
-        "codepoint": "U+E271", 
-        "description": "Three-quarter-tones flat"
-    }, 
-    "accidentalThreeQuarterTonesFlatArrowUp": {
-        "codepoint": "U+E278", 
-        "description": "Three-quarter-tones flat"
-    }, 
-    "accidentalThreeQuarterTonesFlatCouper": {
-        "codepoint": "U+E489", 
-        "description": "Three-quarter-tones flat (Couper)"
-    }, 
-    "accidentalThreeQuarterTonesFlatGrisey": {
-        "codepoint": "U+E486", 
-        "description": "Three-quarter-tones flat (Grisey)"
-    }, 
-    "accidentalThreeQuarterTonesFlatTartini": {
-        "codepoint": "U+E487", 
-        "description": "Three-quarter-tones flat (Tartini)"
-    }, 
-    "accidentalThreeQuarterTonesFlatZimmermann": {
-        "codepoint": "U+E281", 
-        "description": "Reversed flat and flat (three-quarter-tones flat) (Zimmermann)"
-    }, 
-    "accidentalThreeQuarterTonesSharpArabic": {
-        "codepoint": "U+ED37", 
-        "description": "Arabic three-quarter-tones sharp"
-    }, 
-    "accidentalThreeQuarterTonesSharpArrowDown": {
-        "codepoint": "U+E277", 
-        "description": "Three-quarter-tones sharp"
-    }, 
-    "accidentalThreeQuarterTonesSharpArrowUp": {
-        "alternateCodepoint": "U+1D130", 
-        "codepoint": "U+E274", 
-        "description": "Three-quarter-tones sharp"
-    }, 
-    "accidentalThreeQuarterTonesSharpBusotti": {
-        "codepoint": "U+E474", 
-        "description": "Three quarter tones sharp (Bussotti)"
-    }, 
-    "accidentalThreeQuarterTonesSharpStein": {
-        "codepoint": "U+E283", 
-        "description": "One and a half sharps (three-quarter-tones sharp) (Stein)"
-    }, 
-    "accidentalThreeQuarterTonesSharpStockhausen": {
-        "codepoint": "U+ED5A", 
-        "description": "Three-quarter-tones sharp (Stockhausen)"
-    }, 
-    "accidentalTripleFlat": {
-        "codepoint": "U+E266", 
-        "description": "Triple flat"
-    }, 
-    "accidentalTripleSharp": {
-        "codepoint": "U+E265", 
-        "description": "Triple sharp"
-    }, 
-    "accidentalTwoThirdTonesFlatFerneyhough": {
-        "codepoint": "U+E48D", 
-        "description": "Two-third-tones flat (Ferneyhough)"
-    }, 
-    "accidentalTwoThirdTonesSharpFerneyhough": {
-        "codepoint": "U+E48C", 
-        "description": "Two-third-tones sharp (Ferneyhough)"
-    }, 
-    "accidentalWilsonMinus": {
-        "codepoint": "U+E47C", 
-        "description": "Wilson minus (5 comma down)"
-    }, 
-    "accidentalWilsonPlus": {
-        "codepoint": "U+E47B", 
-        "description": "Wilson plus (5 comma up)"
-    }, 
-    "accidentalWyschnegradsky10TwelfthsFlat": {
-        "codepoint": "U+E434", 
-        "description": "5/6 tone flat"
-    }, 
-    "accidentalWyschnegradsky10TwelfthsSharp": {
-        "codepoint": "U+E429", 
-        "description": "5/6 tone sharp"
-    }, 
-    "accidentalWyschnegradsky11TwelfthsFlat": {
-        "codepoint": "U+E435", 
-        "description": "11/12 tone flat"
-    }, 
-    "accidentalWyschnegradsky11TwelfthsSharp": {
-        "codepoint": "U+E42A", 
-        "description": "11/12 tone sharp"
-    }, 
-    "accidentalWyschnegradsky1TwelfthsFlat": {
-        "codepoint": "U+E42B", 
-        "description": "1/12 tone flat"
-    }, 
-    "accidentalWyschnegradsky1TwelfthsSharp": {
-        "codepoint": "U+E420", 
-        "description": "1/12 tone sharp"
-    }, 
-    "accidentalWyschnegradsky2TwelfthsFlat": {
-        "codepoint": "U+E42C", 
-        "description": "1/6 tone flat"
-    }, 
-    "accidentalWyschnegradsky2TwelfthsSharp": {
-        "codepoint": "U+E421", 
-        "description": "1/6 tone sharp"
-    }, 
-    "accidentalWyschnegradsky3TwelfthsFlat": {
-        "codepoint": "U+E42D", 
-        "description": "1/4 tone flat"
-    }, 
-    "accidentalWyschnegradsky3TwelfthsSharp": {
-        "codepoint": "U+E422", 
-        "description": "1/4 tone sharp"
-    }, 
-    "accidentalWyschnegradsky4TwelfthsFlat": {
-        "codepoint": "U+E42E", 
-        "description": "1/3 tone flat"
-    }, 
-    "accidentalWyschnegradsky4TwelfthsSharp": {
-        "codepoint": "U+E423", 
-        "description": "1/3 tone sharp"
-    }, 
-    "accidentalWyschnegradsky5TwelfthsFlat": {
-        "codepoint": "U+E42F", 
-        "description": "5/12 tone flat"
-    }, 
-    "accidentalWyschnegradsky5TwelfthsSharp": {
-        "codepoint": "U+E424", 
-        "description": "5/12 tone sharp"
-    }, 
-    "accidentalWyschnegradsky6TwelfthsFlat": {
-        "codepoint": "U+E430", 
-        "description": "1/2 tone flat"
-    }, 
-    "accidentalWyschnegradsky6TwelfthsSharp": {
-        "codepoint": "U+E425", 
-        "description": "1/2 tone sharp"
-    }, 
-    "accidentalWyschnegradsky7TwelfthsFlat": {
-        "codepoint": "U+E431", 
-        "description": "7/12 tone flat"
-    }, 
-    "accidentalWyschnegradsky7TwelfthsSharp": {
-        "codepoint": "U+E426", 
-        "description": "7/12 tone sharp"
-    }, 
-    "accidentalWyschnegradsky8TwelfthsFlat": {
-        "codepoint": "U+E432", 
-        "description": "2/3 tone flat"
-    }, 
-    "accidentalWyschnegradsky8TwelfthsSharp": {
-        "codepoint": "U+E427", 
-        "description": "2/3 tone sharp"
-    }, 
-    "accidentalWyschnegradsky9TwelfthsFlat": {
-        "codepoint": "U+E433", 
-        "description": "3/4 tone flat"
-    }, 
-    "accidentalWyschnegradsky9TwelfthsSharp": {
-        "codepoint": "U+E428", 
-        "description": "3/4 tone sharp"
-    }, 
-    "accidentalXenakisOneThirdToneSharp": {
-        "codepoint": "U+E470", 
-        "description": "One-third-tone sharp (Xenakis)"
-    }, 
-    "accidentalXenakisTwoThirdTonesSharp": {
-        "codepoint": "U+E471", 
-        "description": "Two-third-tones sharp (Xenakis)"
-    }, 
-    "analyticsChoralmelodie": {
-        "codepoint": "U+E86A", 
-        "description": "Choralmelodie (Berg)"
-    }, 
-    "analyticsEndStimme": {
-        "alternateCodepoint": "U+1D1A8", 
-        "codepoint": "U+E863", 
-        "description": "End of stimme"
-    }, 
-    "analyticsHauptrhythmus": {
-        "codepoint": "U+E86B", 
-        "description": "Hauptrhythmus (Berg)"
-    }, 
-    "analyticsHauptstimme": {
-        "alternateCodepoint": "U+1D1A6", 
-        "codepoint": "U+E860", 
-        "description": "Hauptstimme"
-    }, 
-    "analyticsInversion1": {
-        "codepoint": "U+E869", 
-        "description": "Inversion 1"
-    }, 
-    "analyticsNebenstimme": {
-        "alternateCodepoint": "U+1D1A7", 
-        "codepoint": "U+E861", 
-        "description": "Nebenstimme"
-    }, 
-    "analyticsStartStimme": {
-        "codepoint": "U+E862", 
-        "description": "Start of stimme"
-    }, 
-    "analyticsTheme": {
-        "codepoint": "U+E864", 
-        "description": "Theme"
-    }, 
-    "analyticsTheme1": {
-        "codepoint": "U+E868", 
-        "description": "Theme 1"
-    }, 
-    "analyticsThemeInversion": {
-        "codepoint": "U+E867", 
-        "description": "Inversion of theme"
-    }, 
-    "analyticsThemeRetrograde": {
-        "codepoint": "U+E865", 
-        "description": "Retrograde of theme"
-    }, 
-    "analyticsThemeRetrogradeInversion": {
-        "codepoint": "U+E866", 
-        "description": "Retrograde inversion of theme"
-    }, 
-    "arpeggiatoDown": {
-        "alternateCodepoint": "U+1D184", 
-        "codepoint": "U+E635", 
-        "description": "Arpeggiato down"
-    }, 
-    "arpeggiatoUp": {
-        "alternateCodepoint": "U+1D183", 
-        "codepoint": "U+E634", 
-        "description": "Arpeggiato up"
-    }, 
-    "arrowBlackDown": {
-        "codepoint": "U+EB64", 
-        "description": "Black arrow down (S)"
-    }, 
-    "arrowBlackDownLeft": {
-        "codepoint": "U+EB65", 
-        "description": "Black arrow down-left (SW)"
-    }, 
-    "arrowBlackDownRight": {
-        "codepoint": "U+EB63", 
-        "description": "Black arrow down-right (SE)"
-    }, 
-    "arrowBlackLeft": {
-        "codepoint": "U+EB66", 
-        "description": "Black arrow left (W)"
-    }, 
-    "arrowBlackRight": {
-        "codepoint": "U+EB62", 
-        "description": "Black arrow right (E)"
-    }, 
-    "arrowBlackUp": {
-        "codepoint": "U+EB60", 
-        "description": "Black arrow up (N)"
-    }, 
-    "arrowBlackUpLeft": {
-        "codepoint": "U+EB67", 
-        "description": "Black arrow up-left (NW)"
-    }, 
-    "arrowBlackUpRight": {
-        "codepoint": "U+EB61", 
-        "description": "Black arrow up-right (NE)"
-    }, 
-    "arrowOpenDown": {
-        "codepoint": "U+EB74", 
-        "description": "Open arrow down (S)"
-    }, 
-    "arrowOpenDownLeft": {
-        "codepoint": "U+EB75", 
-        "description": "Open arrow down-left (SW)"
-    }, 
-    "arrowOpenDownRight": {
-        "codepoint": "U+EB73", 
-        "description": "Open arrow down-right (SE)"
-    }, 
-    "arrowOpenLeft": {
-        "codepoint": "U+EB76", 
-        "description": "Open arrow left (W)"
-    }, 
-    "arrowOpenRight": {
-        "codepoint": "U+EB72", 
-        "description": "Open arrow right (E)"
-    }, 
-    "arrowOpenUp": {
-        "codepoint": "U+EB70", 
-        "description": "Open arrow up (N)"
-    }, 
-    "arrowOpenUpLeft": {
-        "codepoint": "U+EB77", 
-        "description": "Open arrow up-left (NW)"
-    }, 
-    "arrowOpenUpRight": {
-        "codepoint": "U+EB71", 
-        "description": "Open arrow up-right (NE)"
-    }, 
-    "arrowWhiteDown": {
-        "codepoint": "U+EB6C", 
-        "description": "White arrow down (S)"
-    }, 
-    "arrowWhiteDownLeft": {
-        "codepoint": "U+EB6D", 
-        "description": "White arrow down-left (SW)"
-    }, 
-    "arrowWhiteDownRight": {
-        "codepoint": "U+EB6B", 
-        "description": "White arrow down-right (SE)"
-    }, 
-    "arrowWhiteLeft": {
-        "codepoint": "U+EB6E", 
-        "description": "White arrow left (W)"
-    }, 
-    "arrowWhiteRight": {
-        "codepoint": "U+EB6A", 
-        "description": "White arrow right (E)"
-    }, 
-    "arrowWhiteUp": {
-        "codepoint": "U+EB68", 
-        "description": "White arrow up (N)"
-    }, 
-    "arrowWhiteUpLeft": {
-        "codepoint": "U+EB6F", 
-        "description": "White arrow up-left (NW)"
-    }, 
-    "arrowWhiteUpRight": {
-        "codepoint": "U+EB69", 
-        "description": "White arrow up-right (NE)"
-    }, 
-    "arrowheadBlackDown": {
-        "codepoint": "U+EB7C", 
-        "description": "Black arrowhead down (S)"
-    }, 
-    "arrowheadBlackDownLeft": {
-        "codepoint": "U+EB7D", 
-        "description": "Black arrowhead down-left (SW)"
-    }, 
-    "arrowheadBlackDownRight": {
-        "codepoint": "U+EB7B", 
-        "description": "Black arrowhead down-right (SE)"
-    }, 
-    "arrowheadBlackLeft": {
-        "codepoint": "U+EB7E", 
-        "description": "Black arrowhead left (W)"
-    }, 
-    "arrowheadBlackRight": {
-        "codepoint": "U+EB7A", 
-        "description": "Black arrowhead right (E)"
-    }, 
-    "arrowheadBlackUp": {
-        "codepoint": "U+EB78", 
-        "description": "Black arrowhead up (N)"
-    }, 
-    "arrowheadBlackUpLeft": {
-        "codepoint": "U+EB7F", 
-        "description": "Black arrowhead up-left (NW)"
-    }, 
-    "arrowheadBlackUpRight": {
-        "codepoint": "U+EB79", 
-        "description": "Black arrowhead up-right (NE)"
-    }, 
-    "arrowheadOpenDown": {
-        "codepoint": "U+EB8C", 
-        "description": "Open arrowhead down (S)"
-    }, 
-    "arrowheadOpenDownLeft": {
-        "codepoint": "U+EB8D", 
-        "description": "Open arrowhead down-left (SW)"
-    }, 
-    "arrowheadOpenDownRight": {
-        "codepoint": "U+EB8B", 
-        "description": "Open arrowhead down-right (SE)"
-    }, 
-    "arrowheadOpenLeft": {
-        "codepoint": "U+EB8E", 
-        "description": "Open arrowhead left (W)"
-    }, 
-    "arrowheadOpenRight": {
-        "codepoint": "U+EB8A", 
-        "description": "Open arrowhead right (E)"
-    }, 
-    "arrowheadOpenUp": {
-        "codepoint": "U+EB88", 
-        "description": "Open arrowhead up (N)"
-    }, 
-    "arrowheadOpenUpLeft": {
-        "codepoint": "U+EB8F", 
-        "description": "Open arrowhead up-left (NW)"
-    }, 
-    "arrowheadOpenUpRight": {
-        "codepoint": "U+EB89", 
-        "description": "Open arrowhead up-right (NE)"
-    }, 
-    "arrowheadWhiteDown": {
-        "codepoint": "U+EB84", 
-        "description": "White arrowhead down (S)"
-    }, 
-    "arrowheadWhiteDownLeft": {
-        "codepoint": "U+EB85", 
-        "description": "White arrowhead down-left (SW)"
-    }, 
-    "arrowheadWhiteDownRight": {
-        "codepoint": "U+EB83", 
-        "description": "White arrowhead down-right (SE)"
-    }, 
-    "arrowheadWhiteLeft": {
-        "codepoint": "U+EB86", 
-        "description": "White arrowhead left (W)"
-    }, 
-    "arrowheadWhiteRight": {
-        "codepoint": "U+EB82", 
-        "description": "White arrowhead right (E)"
-    }, 
-    "arrowheadWhiteUp": {
-        "codepoint": "U+EB80", 
-        "description": "White arrowhead up (N)"
-    }, 
-    "arrowheadWhiteUpLeft": {
-        "codepoint": "U+EB87", 
-        "description": "White arrowhead up-left (NW)"
-    }, 
-    "arrowheadWhiteUpRight": {
-        "codepoint": "U+EB81", 
-        "description": "White arrowhead up-right (NE)"
-    }, 
-    "articAccentAbove": {
-        "alternateCodepoint": "U+1D17B", 
-        "codepoint": "U+E4A0", 
-        "description": "Accent above"
-    }, 
-    "articAccentBelow": {
-        "codepoint": "U+E4A1", 
-        "description": "Accent below"
-    }, 
-    "articAccentStaccatoAbove": {
-        "alternateCodepoint": "U+1D181", 
-        "codepoint": "U+E4B0", 
-        "description": "Accent-staccato above"
-    }, 
-    "articAccentStaccatoBelow": {
-        "codepoint": "U+E4B1", 
-        "description": "Accent-staccato below"
-    }, 
-    "articLaissezVibrerAbove": {
-        "codepoint": "U+E4BA", 
-        "description": "Laissez vibrer (l.v.) above"
-    }, 
-    "articLaissezVibrerBelow": {
-        "codepoint": "U+E4BB", 
-        "description": "Laissez vibrer (l.v.) below"
-    }, 
-    "articMarcatoAbove": {
-        "alternateCodepoint": "U+1D17F", 
-        "codepoint": "U+E4AC", 
-        "description": "Marcato above"
-    }, 
-    "articMarcatoBelow": {
-        "codepoint": "U+E4AD", 
-        "description": "Marcato below"
-    }, 
-    "articMarcatoStaccatoAbove": {
-        "alternateCodepoint": "U+1D180", 
-        "codepoint": "U+E4AE", 
-        "description": "Marcato-staccato above"
-    }, 
-    "articMarcatoStaccatoBelow": {
-        "codepoint": "U+E4AF", 
-        "description": "Marcato-staccato below"
-    }, 
-    "articMarcatoTenutoAbove": {
-        "codepoint": "U+E4BC", 
-        "description": "Marcato-tenuto above"
-    }, 
-    "articMarcatoTenutoBelow": {
-        "codepoint": "U+E4BD", 
-        "description": "Marcato-tenuto below"
-    }, 
-    "articSoftAccentAbove": {
-        "codepoint": "U+ED40", 
-        "description": "Soft accent above"
-    }, 
-    "articSoftAccentBelow": {
-        "codepoint": "U+ED41", 
-        "description": "Soft accent below"
-    }, 
-    "articSoftAccentStaccatoAbove": {
-        "codepoint": "U+ED42", 
-        "description": "Soft accent-staccato above"
-    }, 
-    "articSoftAccentStaccatoBelow": {
-        "codepoint": "U+ED43", 
-        "description": "Soft accent-staccato below"
-    }, 
-    "articSoftAccentTenutoAbove": {
-        "codepoint": "U+ED44", 
-        "description": "Soft accent-tenuto above"
-    }, 
-    "articSoftAccentTenutoBelow": {
-        "codepoint": "U+ED45", 
-        "description": "Soft accent-tenuto below"
-    }, 
-    "articSoftAccentTenutoStaccatoAbove": {
-        "codepoint": "U+ED46", 
-        "description": "Soft accent-tenuto-staccato above"
-    }, 
-    "articSoftAccentTenutoStaccatoBelow": {
-        "codepoint": "U+ED47", 
-        "description": "Soft accent-tenuto-staccato below"
-    }, 
-    "articStaccatissimoAbove": {
-        "alternateCodepoint": "U+1D17E", 
-        "codepoint": "U+E4A6", 
-        "description": "Staccatissimo above"
-    }, 
-    "articStaccatissimoBelow": {
-        "codepoint": "U+E4A7", 
-        "description": "Staccatissimo below"
-    }, 
-    "articStaccatissimoStrokeAbove": {
-        "codepoint": "U+E4AA", 
-        "description": "Staccatissimo stroke above"
-    }, 
-    "articStaccatissimoStrokeBelow": {
-        "codepoint": "U+E4AB", 
-        "description": "Staccatissimo stroke below"
-    }, 
-    "articStaccatissimoWedgeAbove": {
-        "codepoint": "U+E4A8", 
-        "description": "Staccatissimo wedge above"
-    }, 
-    "articStaccatissimoWedgeBelow": {
-        "codepoint": "U+E4A9", 
-        "description": "Staccatissimo wedge below"
-    }, 
-    "articStaccatoAbove": {
-        "alternateCodepoint": "U+1D17C", 
-        "codepoint": "U+E4A2", 
-        "description": "Staccato above"
-    }, 
-    "articStaccatoBelow": {
-        "codepoint": "U+E4A3", 
-        "description": "Staccato below"
-    }, 
-    "articStressAbove": {
-        "codepoint": "U+E4B6", 
-        "description": "Stress above"
-    }, 
-    "articStressBelow": {
-        "codepoint": "U+E4B7", 
-        "description": "Stress below"
-    }, 
-    "articTenutoAbove": {
-        "alternateCodepoint": "U+1D17D", 
-        "codepoint": "U+E4A4", 
-        "description": "Tenuto above"
-    }, 
-    "articTenutoAccentAbove": {
-        "codepoint": "U+E4B4", 
-        "description": "Tenuto-accent above"
-    }, 
-    "articTenutoAccentBelow": {
-        "codepoint": "U+E4B5", 
-        "description": "Tenuto-accent below"
-    }, 
-    "articTenutoBelow": {
-        "codepoint": "U+E4A5", 
-        "description": "Tenuto below"
-    }, 
-    "articTenutoStaccatoAbove": {
-        "alternateCodepoint": "U+1D182", 
-        "codepoint": "U+E4B2", 
-        "description": "Lour\u00e9 (tenuto-staccato) above"
-    }, 
-    "articTenutoStaccatoBelow": {
-        "codepoint": "U+E4B3", 
-        "description": "Lour\u00e9 (tenuto-staccato) below"
-    }, 
-    "articUnstressAbove": {
-        "codepoint": "U+E4B8", 
-        "description": "Unstress above"
-    }, 
-    "articUnstressBelow": {
-        "codepoint": "U+E4B9", 
-        "description": "Unstress below"
-    }, 
-    "augmentationDot": {
-        "alternateCodepoint": "U+1D16D", 
-        "codepoint": "U+E1E7", 
-        "description": "Augmentation dot"
-    }, 
-    "barlineDashed": {
-        "alternateCodepoint": "U+1D104", 
-        "codepoint": "U+E036", 
-        "description": "Dashed barline"
-    }, 
-    "barlineDotted": {
-        "codepoint": "U+E037", 
-        "description": "Dotted barline"
-    }, 
-    "barlineDouble": {
-        "alternateCodepoint": "U+1D101", 
-        "codepoint": "U+E031", 
-        "description": "Double barline"
-    }, 
-    "barlineFinal": {
-        "alternateCodepoint": "U+1D102", 
-        "codepoint": "U+E032", 
-        "description": "Final barline"
-    }, 
-    "barlineHeavy": {
-        "codepoint": "U+E034", 
-        "description": "Heavy barline"
-    }, 
-    "barlineHeavyHeavy": {
-        "codepoint": "U+E035", 
-        "description": "Heavy double barline"
-    }, 
-    "barlineReverseFinal": {
-        "alternateCodepoint": "U+1D103", 
-        "codepoint": "U+E033", 
-        "description": "Reverse final barline"
-    }, 
-    "barlineShort": {
-        "alternateCodepoint": "U+1D105", 
-        "codepoint": "U+E038", 
-        "description": "Short barline"
-    }, 
-    "barlineSingle": {
-        "alternateCodepoint": "U+1D100", 
-        "codepoint": "U+E030", 
-        "description": "Single barline"
-    }, 
-    "barlineTick": {
-        "codepoint": "U+E039", 
-        "description": "Tick barline"
-    }, 
-    "beamAccelRit1": {
-        "codepoint": "U+EAF4", 
-        "description": "Accel./rit. beam 1 (widest)"
-    }, 
-    "beamAccelRit10": {
-        "codepoint": "U+EAFD", 
-        "description": "Accel./rit. beam 10"
-    }, 
-    "beamAccelRit11": {
-        "codepoint": "U+EAFE", 
-        "description": "Accel./rit. beam 11"
-    }, 
-    "beamAccelRit12": {
-        "codepoint": "U+EAFF", 
-        "description": "Accel./rit. beam 12"
-    }, 
-    "beamAccelRit13": {
-        "codepoint": "U+EB00", 
-        "description": "Accel./rit. beam 13"
-    }, 
-    "beamAccelRit14": {
-        "codepoint": "U+EB01", 
-        "description": "Accel./rit. beam 14"
-    }, 
-    "beamAccelRit15": {
-        "codepoint": "U+EB02", 
-        "description": "Accel./rit. beam 15 (narrowest)"
-    }, 
-    "beamAccelRit2": {
-        "codepoint": "U+EAF5", 
-        "description": "Accel./rit. beam 2"
-    }, 
-    "beamAccelRit3": {
-        "codepoint": "U+EAF6", 
-        "description": "Accel./rit. beam 3"
-    }, 
-    "beamAccelRit4": {
-        "codepoint": "U+EAF7", 
-        "description": "Accel./rit. beam 4"
-    }, 
-    "beamAccelRit5": {
-        "codepoint": "U+EAF8", 
-        "description": "Accel./rit. beam 5"
-    }, 
-    "beamAccelRit6": {
-        "codepoint": "U+EAF9", 
-        "description": "Accel./rit. beam 6"
-    }, 
-    "beamAccelRit7": {
-        "codepoint": "U+EAFA", 
-        "description": "Accel./rit. beam 7"
-    }, 
-    "beamAccelRit8": {
-        "codepoint": "U+EAFB", 
-        "description": "Accel./rit. beam 8"
-    }, 
-    "beamAccelRit9": {
-        "codepoint": "U+EAFC", 
-        "description": "Accel./rit. beam 9"
-    }, 
-    "beamAccelRitFinal": {
-        "codepoint": "U+EB03", 
-        "description": "Accel./rit. beam terminating line"
-    }, 
-    "brace": {
-        "alternateCodepoint": "U+1D114", 
-        "codepoint": "U+E000", 
-        "description": "Brace"
-    }, 
-    "bracket": {
-        "alternateCodepoint": "U+1D115", 
-        "codepoint": "U+E002", 
-        "description": "Bracket"
-    }, 
-    "bracketBottom": {
-        "codepoint": "U+E004", 
-        "description": "Bracket bottom"
-    }, 
-    "bracketTop": {
-        "codepoint": "U+E003", 
-        "description": "Bracket top"
-    }, 
-    "brassBend": {
-        "alternateCodepoint": "U+1D189", 
-        "codepoint": "U+E5E3", 
-        "description": "Bend"
-    }, 
-    "brassDoitLong": {
-        "codepoint": "U+E5D6", 
-        "description": "Doit, long"
-    }, 
-    "brassDoitMedium": {
-        "codepoint": "U+E5D5", 
-        "description": "Doit, medium"
-    }, 
-    "brassDoitShort": {
-        "alternateCodepoint": "U+1D185", 
-        "codepoint": "U+E5D4", 
-        "description": "Doit, short"
-    }, 
-    "brassFallLipLong": {
-        "codepoint": "U+E5D9", 
-        "description": "Lip fall, long"
-    }, 
-    "brassFallLipMedium": {
-        "codepoint": "U+E5D8", 
-        "description": "Lip fall, medium"
-    }, 
-    "brassFallLipShort": {
-        "alternateCodepoint": "U+1D186", 
-        "codepoint": "U+E5D7", 
-        "description": "Lip fall, short"
-    }, 
-    "brassFallRoughLong": {
-        "codepoint": "U+E5DF", 
-        "description": "Rough fall, long"
-    }, 
-    "brassFallRoughMedium": {
-        "codepoint": "U+E5DE", 
-        "description": "Rough fall, medium"
-    }, 
-    "brassFallRoughShort": {
-        "codepoint": "U+E5DD", 
-        "description": "Rough fall, short"
-    }, 
-    "brassFallSmoothLong": {
-        "codepoint": "U+E5DC", 
-        "description": "Smooth fall, long"
-    }, 
-    "brassFallSmoothMedium": {
-        "codepoint": "U+E5DB", 
-        "description": "Smooth fall, medium"
-    }, 
-    "brassFallSmoothShort": {
-        "codepoint": "U+E5DA", 
-        "description": "Smooth fall, short"
-    }, 
-    "brassFlip": {
-        "alternateCodepoint": "U+1D187", 
-        "codepoint": "U+E5E1", 
-        "description": "Flip"
-    }, 
-    "brassHarmonMuteClosed": {
-        "codepoint": "U+E5E8", 
-        "description": "Harmon mute, stem in"
-    }, 
-    "brassHarmonMuteStemHalfLeft": {
-        "codepoint": "U+E5E9", 
-        "description": "Harmon mute, stem extended, left"
-    }, 
-    "brassHarmonMuteStemHalfRight": {
-        "codepoint": "U+E5EA", 
-        "description": "Harmon mute, stem extended, right"
-    }, 
-    "brassHarmonMuteStemOpen": {
-        "codepoint": "U+E5EB", 
-        "description": "Harmon mute, stem out"
-    }, 
-    "brassJazzTurn": {
-        "codepoint": "U+E5E4", 
-        "description": "Jazz turn"
-    }, 
-    "brassLiftLong": {
-        "codepoint": "U+E5D3", 
-        "description": "Lift, long"
-    }, 
-    "brassLiftMedium": {
-        "codepoint": "U+E5D2", 
-        "description": "Lift, medium"
-    }, 
-    "brassLiftShort": {
-        "codepoint": "U+E5D1", 
-        "description": "Lift, short"
-    }, 
-    "brassLiftSmoothLong": {
-        "codepoint": "U+E5EE", 
-        "description": "Smooth lift, long"
-    }, 
-    "brassLiftSmoothMedium": {
-        "codepoint": "U+E5ED", 
-        "description": "Smooth lift, medium"
-    }, 
-    "brassLiftSmoothShort": {
-        "codepoint": "U+E5EC", 
-        "description": "Smooth lift, short"
-    }, 
-    "brassMuteClosed": {
-        "codepoint": "U+E5E5", 
-        "description": "Muted (closed)"
-    }, 
-    "brassMuteHalfClosed": {
-        "codepoint": "U+E5E6", 
-        "description": "Half-muted (half-closed)"
-    }, 
-    "brassMuteOpen": {
-        "codepoint": "U+E5E7", 
-        "description": "Open"
-    }, 
-    "brassPlop": {
-        "codepoint": "U+E5E0", 
-        "description": "Plop"
-    }, 
-    "brassScoop": {
-        "codepoint": "U+E5D0", 
-        "description": "Scoop"
-    }, 
-    "brassSmear": {
-        "alternateCodepoint": "U+1D188", 
-        "codepoint": "U+E5E2", 
-        "description": "Smear"
-    }, 
-    "brassValveTrill": {
-        "codepoint": "U+E5EF", 
-        "description": "Valve trill"
-    }, 
-    "breathMarkComma": {
-        "alternateCodepoint": "U+1D112", 
-        "codepoint": "U+E4CE", 
-        "description": "Breath mark (comma)"
-    }, 
-    "breathMarkSalzedo": {
-        "codepoint": "U+E4D5", 
-        "description": "Breath mark (Salzedo)"
-    }, 
-    "breathMarkTick": {
-        "codepoint": "U+E4CF", 
-        "description": "Breath mark (tick-like)"
-    }, 
-    "breathMarkUpbow": {
-        "codepoint": "U+E4D0", 
-        "description": "Breath mark (upbow-like)"
-    }, 
-    "bridgeClef": {
-        "codepoint": "U+E078", 
-        "description": "Bridge clef"
-    }, 
-    "buzzRoll": {
-        "codepoint": "U+E22A", 
-        "description": "Buzz roll"
-    }, 
-    "cClef": {
-        "alternateCodepoint": "U+1D121", 
-        "codepoint": "U+E05C", 
-        "description": "C clef"
-    }, 
-    "cClef8vb": {
-        "codepoint": "U+E05D", 
-        "description": "C clef ottava bassa"
-    }, 
-    "cClefArrowDown": {
-        "codepoint": "U+E05F", 
-        "description": "C clef, arrow down"
-    }, 
-    "cClefArrowUp": {
-        "codepoint": "U+E05E", 
-        "description": "C clef, arrow up"
-    }, 
-    "cClefChange": {
-        "codepoint": "U+E07B", 
-        "description": "C clef change"
-    }, 
-    "cClefCombining": {
-        "codepoint": "U+E061", 
-        "description": "Combining C clef"
-    }, 
-    "cClefReversed": {
-        "codepoint": "U+E075", 
-        "description": "Reversed C clef"
-    }, 
-    "cClefSquare": {
-        "codepoint": "U+E060", 
-        "description": "C clef (19th century)"
-    }, 
-    "caesura": {
-        "alternateCodepoint": "U+1D113", 
-        "codepoint": "U+E4D1", 
-        "description": "Caesura"
-    }, 
-    "caesuraCurved": {
-        "codepoint": "U+E4D4", 
-        "description": "Curved caesura"
-    }, 
-    "caesuraShort": {
-        "codepoint": "U+E4D3", 
-        "description": "Short caesura"
-    }, 
-    "caesuraThick": {
-        "codepoint": "U+E4D2", 
-        "description": "Thick caesura"
-    }, 
-    "chantAccentusAbove": {
-        "codepoint": "U+E9D6", 
-        "description": "Accentus above"
-    }, 
-    "chantAccentusBelow": {
-        "codepoint": "U+E9D7", 
-        "description": "Accentus below"
-    }, 
-    "chantAuctumAsc": {
-        "codepoint": "U+E994", 
-        "description": "Punctum auctum, ascending"
-    }, 
-    "chantAuctumDesc": {
-        "codepoint": "U+E995", 
-        "description": "Punctum auctum, descending"
-    }, 
-    "chantAugmentum": {
-        "codepoint": "U+E9D9", 
-        "description": "Augmentum (mora)"
-    }, 
-    "chantCaesura": {
-        "codepoint": "U+E8F8", 
-        "description": "Caesura"
-    }, 
-    "chantCclef": {
-        "alternateCodepoint": "U+1D1D0", 
-        "codepoint": "U+E906", 
-        "description": "Plainchant C clef"
-    }, 
-    "chantCirculusAbove": {
-        "codepoint": "U+E9D2", 
-        "description": "Circulus above"
-    }, 
-    "chantCirculusBelow": {
-        "codepoint": "U+E9D3", 
-        "description": "Circulus below"
-    }, 
-    "chantConnectingLineAsc2nd": {
-        "codepoint": "U+E9BD", 
-        "description": "Connecting line, ascending 2nd"
-    }, 
-    "chantConnectingLineAsc3rd": {
-        "codepoint": "U+E9BE", 
-        "description": "Connecting line, ascending 3rd"
-    }, 
-    "chantConnectingLineAsc4th": {
-        "codepoint": "U+E9BF", 
-        "description": "Connecting line, ascending 4th"
-    }, 
-    "chantConnectingLineAsc5th": {
-        "codepoint": "U+E9C0", 
-        "description": "Connecting line, ascending 5th"
-    }, 
-    "chantConnectingLineAsc6th": {
-        "codepoint": "U+E9C1", 
-        "description": "Connecting line, ascending 6th"
-    }, 
-    "chantCustosStemDownPosHigh": {
-        "codepoint": "U+EA08", 
-        "description": "Plainchant custos, stem down, high position"
-    }, 
-    "chantCustosStemDownPosHighest": {
-        "codepoint": "U+EA09", 
-        "description": "Plainchant custos, stem down, highest position"
-    }, 
-    "chantCustosStemDownPosMiddle": {
-        "codepoint": "U+EA07", 
-        "description": "Plainchant custos, stem down, middle position"
-    }, 
-    "chantCustosStemUpPosLow": {
-        "codepoint": "U+EA05", 
-        "description": "Plainchant custos, stem up, low position"
-    }, 
-    "chantCustosStemUpPosLowest": {
-        "codepoint": "U+EA04", 
-        "description": "Plainchant custos, stem up, lowest position"
-    }, 
-    "chantCustosStemUpPosMiddle": {
-        "codepoint": "U+EA06", 
-        "description": "Plainchant custos, stem up, middle position"
-    }, 
-    "chantDeminutumLower": {
-        "codepoint": "U+E9B3", 
-        "description": "Punctum deminutum, lower"
-    }, 
-    "chantDeminutumUpper": {
-        "codepoint": "U+E9B2", 
-        "description": "Punctum deminutum, upper"
-    }, 
-    "chantDivisioFinalis": {
-        "codepoint": "U+E8F6", 
-        "description": "Divisio finalis"
-    }, 
-    "chantDivisioMaior": {
-        "codepoint": "U+E8F4", 
-        "description": "Divisio maior"
-    }, 
-    "chantDivisioMaxima": {
-        "codepoint": "U+E8F5", 
-        "description": "Divisio maxima"
-    }, 
-    "chantDivisioMinima": {
-        "codepoint": "U+E8F3", 
-        "description": "Divisio minima"
-    }, 
-    "chantEntryLineAsc2nd": {
-        "codepoint": "U+E9B4", 
-        "description": "Entry line, ascending 2nd"
-    }, 
-    "chantEntryLineAsc3rd": {
-        "codepoint": "U+E9B5", 
-        "description": "Entry line, ascending 3rd"
-    }, 
-    "chantEntryLineAsc4th": {
-        "codepoint": "U+E9B6", 
-        "description": "Entry line, ascending 4th"
-    }, 
-    "chantEntryLineAsc5th": {
-        "codepoint": "U+E9B7", 
-        "description": "Entry line, ascending 5th"
-    }, 
-    "chantEntryLineAsc6th": {
-        "codepoint": "U+E9B8", 
-        "description": "Entry line, ascending 6th"
-    }, 
-    "chantEpisema": {
-        "codepoint": "U+E9D8", 
-        "description": "Episema"
-    }, 
-    "chantFclef": {
-        "alternateCodepoint": "U+1D1D1", 
-        "codepoint": "U+E902", 
-        "description": "Plainchant F clef"
-    }, 
-    "chantIctusAbove": {
-        "codepoint": "U+E9D0", 
-        "description": "Ictus above"
-    }, 
-    "chantIctusBelow": {
-        "codepoint": "U+E9D1", 
-        "description": "Ictus below"
-    }, 
-    "chantLigaturaDesc2nd": {
-        "codepoint": "U+E9B9", 
-        "description": "Ligated stroke, descending 2nd"
-    }, 
-    "chantLigaturaDesc3rd": {
-        "codepoint": "U+E9BA", 
-        "description": "Ligated stroke, descending 3rd"
-    }, 
-    "chantLigaturaDesc4th": {
-        "codepoint": "U+E9BB", 
-        "description": "Ligated stroke, descending 4th"
-    }, 
-    "chantLigaturaDesc5th": {
-        "codepoint": "U+E9BC", 
-        "description": "Ligated stroke, descending 5th"
-    }, 
-    "chantOriscusAscending": {
-        "codepoint": "U+E99C", 
-        "description": "Oriscus ascending"
-    }, 
-    "chantOriscusDescending": {
-        "codepoint": "U+E99D", 
-        "description": "Oriscus descending"
-    }, 
-    "chantOriscusLiquescens": {
-        "codepoint": "U+E99E", 
-        "description": "Oriscus liquescens"
-    }, 
-    "chantPodatusLower": {
-        "codepoint": "U+E9B0", 
-        "description": "Podatus, lower"
-    }, 
-    "chantPodatusUpper": {
-        "alternateCodepoint": "U+1D1D4", 
-        "codepoint": "U+E9B1", 
-        "description": "Podatus, upper"
-    }, 
-    "chantPunctum": {
-        "codepoint": "U+E990", 
-        "description": "Punctum"
-    }, 
-    "chantPunctumCavum": {
-        "codepoint": "U+E998", 
-        "description": "Punctum cavum"
-    }, 
-    "chantPunctumDeminutum": {
-        "codepoint": "U+E9A1", 
-        "description": "Punctum deminutum"
-    }, 
-    "chantPunctumInclinatum": {
-        "codepoint": "U+E991", 
-        "description": "Punctum inclinatum"
-    }, 
-    "chantPunctumInclinatumAuctum": {
-        "codepoint": "U+E992", 
-        "description": "Punctum inclinatum auctum"
-    }, 
-    "chantPunctumInclinatumDeminutum": {
-        "codepoint": "U+E993", 
-        "description": "Punctum inclinatum deminutum"
-    }, 
-    "chantPunctumLinea": {
-        "codepoint": "U+E999", 
-        "description": "Punctum linea"
-    }, 
-    "chantPunctumLineaCavum": {
-        "codepoint": "U+E99A", 
-        "description": "Punctum linea cavum"
-    }, 
-    "chantPunctumVirga": {
-        "alternateCodepoint": "U+1D1D3", 
-        "codepoint": "U+E996", 
-        "description": "Punctum virga"
-    }, 
-    "chantPunctumVirgaReversed": {
-        "codepoint": "U+E997", 
-        "description": "Punctum virga, reversed"
-    }, 
-    "chantQuilisma": {
-        "codepoint": "U+E99B", 
-        "description": "Quilisma"
-    }, 
-    "chantSemicirculusAbove": {
-        "codepoint": "U+E9D4", 
-        "description": "Semicirculus above"
-    }, 
-    "chantSemicirculusBelow": {
-        "codepoint": "U+E9D5", 
-        "description": "Semicirculus below"
-    }, 
-    "chantStaff": {
-        "codepoint": "U+E8F0", 
-        "description": "Plainchant staff"
-    }, 
-    "chantStaffNarrow": {
-        "codepoint": "U+E8F2", 
-        "description": "Plainchant staff (narrow)"
-    }, 
-    "chantStaffWide": {
-        "codepoint": "U+E8F1", 
-        "description": "Plainchant staff (wide)"
-    }, 
-    "chantStrophicus": {
-        "codepoint": "U+E99F", 
-        "description": "Strophicus"
-    }, 
-    "chantStrophicusAuctus": {
-        "codepoint": "U+E9A0", 
-        "description": "Strophicus auctus"
-    }, 
-    "chantStrophicusLiquescens2nd": {
-        "codepoint": "U+E9C2", 
-        "description": "Strophicus liquescens, 2nd"
-    }, 
-    "chantStrophicusLiquescens3rd": {
-        "codepoint": "U+E9C3", 
-        "description": "Strophicus liquescens, 3rd"
-    }, 
-    "chantStrophicusLiquescens4th": {
-        "codepoint": "U+E9C4", 
-        "description": "Strophicus liquescens, 4th"
-    }, 
-    "chantStrophicusLiquescens5th": {
-        "codepoint": "U+E9C5", 
-        "description": "Strophicus liquescens, 5th"
-    }, 
-    "chantVirgula": {
-        "codepoint": "U+E8F7", 
-        "description": "Virgula"
-    }, 
-    "clef15": {
-        "codepoint": "U+E07E", 
-        "description": "15 for clefs"
-    }, 
-    "clef8": {
-        "codepoint": "U+E07D", 
-        "description": "8 for clefs"
-    }, 
-    "clefChangeCombining": {
-        "codepoint": "U+E07F", 
-        "description": "Combining clef change"
-    }, 
-    "coda": {
-        "alternateCodepoint": "U+1D10C", 
-        "codepoint": "U+E048", 
-        "description": "Coda"
-    }, 
-    "codaSquare": {
-        "codepoint": "U+E049", 
-        "description": "Square coda"
-    }, 
-    "conductorBeat2Compound": {
-        "codepoint": "U+E897", 
-        "description": "Beat 2, compound time"
-    }, 
-    "conductorBeat2Simple": {
-        "codepoint": "U+E894", 
-        "description": "Beat 2, simple time"
-    }, 
-    "conductorBeat3Compound": {
-        "codepoint": "U+E898", 
-        "description": "Beat 3, compound time"
-    }, 
-    "conductorBeat3Simple": {
-        "codepoint": "U+E895", 
-        "description": "Beat 3, simple time"
-    }, 
-    "conductorBeat4Compound": {
-        "codepoint": "U+E899", 
-        "description": "Beat 4, compound time"
-    }, 
-    "conductorBeat4Simple": {
-        "codepoint": "U+E896", 
-        "description": "Beat 4, simple time"
-    }, 
-    "conductorLeftBeat": {
-        "codepoint": "U+E891", 
-        "description": "Left-hand beat or cue"
-    }, 
-    "conductorRightBeat": {
-        "codepoint": "U+E892", 
-        "description": "Right-hand beat or cue"
-    }, 
-    "conductorStrongBeat": {
-        "codepoint": "U+E890", 
-        "description": "Strong beat or cue"
-    }, 
-    "conductorUnconducted": {
-        "codepoint": "U+E89A", 
-        "description": "Unconducted/free passages"
-    }, 
-    "conductorWeakBeat": {
-        "codepoint": "U+E893", 
-        "description": "Weak beat or cue"
-    }, 
-    "controlBeginBeam": {
-        "alternateCodepoint": "U+1D173", 
-        "codepoint": "U+E8E0", 
-        "description": "Begin beam"
-    }, 
-    "controlBeginPhrase": {
-        "alternateCodepoint": "U+1D179", 
-        "codepoint": "U+E8E6", 
-        "description": "Begin phrase"
-    }, 
-    "controlBeginSlur": {
-        "alternateCodepoint": "U+1D177", 
-        "codepoint": "U+E8E4", 
-        "description": "Begin slur"
-    }, 
-    "controlBeginTie": {
-        "alternateCodepoint": "U+1D175", 
-        "codepoint": "U+E8E2", 
-        "description": "Begin tie"
-    }, 
-    "controlEndBeam": {
-        "alternateCodepoint": "U+1D174", 
-        "codepoint": "U+E8E1", 
-        "description": "End beam"
-    }, 
-    "controlEndPhrase": {
-        "alternateCodepoint": "U+1D17A", 
-        "codepoint": "U+E8E7", 
-        "description": "End phrase"
-    }, 
-    "controlEndSlur": {
-        "alternateCodepoint": "U+1D178", 
-        "codepoint": "U+E8E5", 
-        "description": "End slur"
-    }, 
-    "controlEndTie": {
-        "alternateCodepoint": "U+1D176", 
-        "codepoint": "U+E8E3", 
-        "description": "End tie"
-    }, 
-    "csymAccidentalDoubleFlat": {
-        "codepoint": "U+ED64", 
-        "description": "Double flat"
-    }, 
-    "csymAccidentalDoubleSharp": {
-        "codepoint": "U+ED63", 
-        "description": "Double sharp"
-    }, 
-    "csymAccidentalFlat": {
-        "codepoint": "U+ED60", 
-        "description": "Flat"
-    }, 
-    "csymAccidentalNatural": {
-        "codepoint": "U+ED61", 
-        "description": "Natural"
-    }, 
-    "csymAccidentalSharp": {
-        "codepoint": "U+ED62", 
-        "description": "Sharp"
-    }, 
-    "csymAccidentalTripleFlat": {
-        "codepoint": "U+ED66", 
-        "description": "Triple flat"
-    }, 
-    "csymAccidentalTripleSharp": {
-        "codepoint": "U+ED65", 
-        "description": "Triple sharp"
-    }, 
-    "csymAlteredBassSlash": {
-        "codepoint": "U+E87B", 
-        "description": "Slash for altered bass note"
-    }, 
-    "csymAugmented": {
-        "codepoint": "U+E872", 
-        "description": "Augmented"
-    }, 
-    "csymBracketLeftTall": {
-        "codepoint": "U+E877", 
-        "description": "Double-height left bracket"
-    }, 
-    "csymBracketRightTall": {
-        "codepoint": "U+E878", 
-        "description": "Double-height right bracket"
-    }, 
-    "csymDiagonalArrangementSlash": {
-        "codepoint": "U+E87C", 
-        "description": "Slash for chord symbols arranged diagonally"
-    }, 
-    "csymDiminished": {
-        "alternateCodepoint": "U+1D1A9", 
-        "codepoint": "U+E870", 
-        "description": "Diminished"
-    }, 
-    "csymHalfDiminished": {
-        "codepoint": "U+E871", 
-        "description": "Half-diminished"
-    }, 
-    "csymMajorSeventh": {
-        "codepoint": "U+E873", 
-        "description": "Major seventh"
-    }, 
-    "csymMinor": {
-        "codepoint": "U+E874", 
-        "description": "Minor"
-    }, 
-    "csymParensLeftTall": {
-        "codepoint": "U+E875", 
-        "description": "Double-height left parenthesis"
-    }, 
-    "csymParensLeftVeryTall": {
-        "codepoint": "U+E879", 
-        "description": "Triple-height left parenthesis"
-    }, 
-    "csymParensRightTall": {
-        "codepoint": "U+E876", 
-        "description": "Double-height right parenthesis"
-    }, 
-    "csymParensRightVeryTall": {
-        "codepoint": "U+E87A", 
-        "description": "Triple-height right parenthesis"
-    }, 
-    "curlewSign": {
-        "codepoint": "U+E4D6", 
-        "description": "Curlew (Britten)"
-    }, 
-    "daCapo": {
-        "alternateCodepoint": "U+1D10A", 
-        "codepoint": "U+E046", 
-        "description": "Da capo"
-    }, 
-    "dalSegno": {
-        "alternateCodepoint": "U+1D109", 
-        "codepoint": "U+E045", 
-        "description": "Dal segno"
-    }, 
-    "daseianExcellentes1": {
-        "codepoint": "U+EA3C", 
-        "description": "Daseian excellentes 1"
-    }, 
-    "daseianExcellentes2": {
-        "codepoint": "U+EA3D", 
-        "description": "Daseian excellentes 2"
-    }, 
-    "daseianExcellentes3": {
-        "codepoint": "U+EA3E", 
-        "description": "Daseian excellentes 3"
-    }, 
-    "daseianExcellentes4": {
-        "codepoint": "U+EA3F", 
-        "description": "Daseian excellentes 4"
-    }, 
-    "daseianFinales1": {
-        "codepoint": "U+EA34", 
-        "description": "Daseian finales 1"
-    }, 
-    "daseianFinales2": {
-        "codepoint": "U+EA35", 
-        "description": "Daseian finales 2"
-    }, 
-    "daseianFinales3": {
-        "codepoint": "U+EA36", 
-        "description": "Daseian finales 3"
-    }, 
-    "daseianFinales4": {
-        "codepoint": "U+EA37", 
-        "description": "Daseian finales 4"
-    }, 
-    "daseianGraves1": {
-        "codepoint": "U+EA30", 
-        "description": "Daseian graves 1"
-    }, 
-    "daseianGraves2": {
-        "codepoint": "U+EA31", 
-        "description": "Daseian graves 2"
-    }, 
-    "daseianGraves3": {
-        "codepoint": "U+EA32", 
-        "description": "Daseian graves 3"
-    }, 
-    "daseianGraves4": {
-        "codepoint": "U+EA33", 
-        "description": "Daseian graves 4"
-    }, 
-    "daseianResidua1": {
-        "codepoint": "U+EA40", 
-        "description": "Daseian residua 1"
-    }, 
-    "daseianResidua2": {
-        "codepoint": "U+EA41", 
-        "description": "Daseian residua 2"
-    }, 
-    "daseianSuperiores1": {
-        "codepoint": "U+EA38", 
-        "description": "Daseian superiores 1"
-    }, 
-    "daseianSuperiores2": {
-        "codepoint": "U+EA39", 
-        "description": "Daseian superiores 2"
-    }, 
-    "daseianSuperiores3": {
-        "codepoint": "U+EA3A", 
-        "description": "Daseian superiores 3"
-    }, 
-    "daseianSuperiores4": {
-        "codepoint": "U+EA3B", 
-        "description": "Daseian superiores 4"
-    }, 
-    "doubleLateralRollStevens": {
-        "codepoint": "U+E234", 
-        "description": "Double lateral roll (Stevens)"
-    }, 
-    "doubleTongueAbove": {
-        "alternateCodepoint": "U+1D18A", 
-        "codepoint": "U+E5F0", 
-        "description": "Double-tongue above"
-    }, 
-    "doubleTongueBelow": {
-        "codepoint": "U+E5F1", 
-        "description": "Double-tongue below"
-    }, 
-    "dynamicCombinedSeparatorColon": {
-        "codepoint": "U+E546", 
-        "description": "Colon separator for combined dynamics"
-    }, 
-    "dynamicCombinedSeparatorHyphen": {
-        "codepoint": "U+E547", 
-        "description": "Hyphen separator for combined dynamics"
-    }, 
-    "dynamicCombinedSeparatorSlash": {
-        "codepoint": "U+E549", 
-        "description": "Slash separator for combined dynamics"
-    }, 
-    "dynamicCombinedSeparatorSpace": {
-        "codepoint": "U+E548", 
-        "description": "Space separator for combined dynamics"
-    }, 
-    "dynamicCrescendoHairpin": {
-        "alternateCodepoint": "U+1D192", 
-        "codepoint": "U+E53E", 
-        "description": "Crescendo"
-    }, 
-    "dynamicDiminuendoHairpin": {
-        "alternateCodepoint": "U+1D193", 
-        "codepoint": "U+E53F", 
-        "description": "Diminuendo"
-    }, 
-    "dynamicFF": {
-        "codepoint": "U+E52F", 
-        "description": "ff"
-    }, 
-    "dynamicFFF": {
-        "codepoint": "U+E530", 
-        "description": "fff"
-    }, 
-    "dynamicFFFF": {
-        "codepoint": "U+E531", 
-        "description": "ffff"
-    }, 
-    "dynamicFFFFF": {
-        "codepoint": "U+E532", 
-        "description": "fffff"
-    }, 
-    "dynamicFFFFFF": {
-        "codepoint": "U+E533", 
-        "description": "ffffff"
-    }, 
-    "dynamicForte": {
-        "alternateCodepoint": "U+1D191", 
-        "codepoint": "U+E522", 
-        "description": "Forte"
-    }, 
-    "dynamicFortePiano": {
-        "codepoint": "U+E534", 
-        "description": "Forte-piano"
-    }, 
-    "dynamicForzando": {
-        "codepoint": "U+E535", 
-        "description": "Forzando"
-    }, 
-    "dynamicHairpinBracketLeft": {
-        "codepoint": "U+E544", 
-        "description": "Left bracket (for hairpins)"
-    }, 
-    "dynamicHairpinBracketRight": {
-        "codepoint": "U+E545", 
-        "description": "Right bracket (for hairpins)"
-    }, 
-    "dynamicHairpinParenthesisLeft": {
-        "codepoint": "U+E542", 
-        "description": "Left parenthesis (for hairpins)"
-    }, 
-    "dynamicHairpinParenthesisRight": {
-        "codepoint": "U+E543", 
-        "description": "Right parenthesis (for hairpins)"
-    }, 
-    "dynamicMF": {
-        "codepoint": "U+E52D", 
-        "description": "mf"
-    }, 
-    "dynamicMP": {
-        "codepoint": "U+E52C", 
-        "description": "mp"
-    }, 
-    "dynamicMessaDiVoce": {
-        "codepoint": "U+E540", 
-        "description": "Messa di voce"
-    }, 
-    "dynamicMezzo": {
-        "alternateCodepoint": "U+1D190", 
-        "codepoint": "U+E521", 
-        "description": "Mezzo"
-    }, 
-    "dynamicNiente": {
-        "codepoint": "U+E526", 
-        "description": "Niente"
-    }, 
-    "dynamicNienteForHairpin": {
-        "codepoint": "U+E541", 
-        "description": "Niente (for hairpins)"
-    }, 
-    "dynamicPF": {
-        "codepoint": "U+E52E", 
-        "description": "pf"
-    }, 
-    "dynamicPP": {
-        "codepoint": "U+E52B", 
-        "description": "pp"
-    }, 
-    "dynamicPPP": {
-        "codepoint": "U+E52A", 
-        "description": "ppp"
-    }, 
-    "dynamicPPPP": {
-        "codepoint": "U+E529", 
-        "description": "pppp"
-    }, 
-    "dynamicPPPPP": {
-        "codepoint": "U+E528", 
-        "description": "ppppp"
-    }, 
-    "dynamicPPPPPP": {
-        "codepoint": "U+E527", 
-        "description": "pppppp"
-    }, 
-    "dynamicPiano": {
-        "alternateCodepoint": "U+1D18F", 
-        "codepoint": "U+E520", 
-        "description": "Piano"
-    }, 
-    "dynamicRinforzando": {
-        "alternateCodepoint": "U+1D18C", 
-        "codepoint": "U+E523", 
-        "description": "Rinforzando"
-    }, 
-    "dynamicRinforzando1": {
-        "codepoint": "U+E53C", 
-        "description": "Rinforzando 1"
-    }, 
-    "dynamicRinforzando2": {
-        "codepoint": "U+E53D", 
-        "description": "Rinforzando 2"
-    }, 
-    "dynamicSforzando": {
-        "alternateCodepoint": "U+1D18D", 
-        "codepoint": "U+E524", 
-        "description": "Sforzando"
-    }, 
-    "dynamicSforzando1": {
-        "codepoint": "U+E536", 
-        "description": "Sforzando 1"
-    }, 
-    "dynamicSforzandoPianissimo": {
-        "codepoint": "U+E538", 
-        "description": "Sforzando-pianissimo"
-    }, 
-    "dynamicSforzandoPiano": {
-        "codepoint": "U+E537", 
-        "description": "Sforzando-piano"
-    }, 
-    "dynamicSforzato": {
-        "codepoint": "U+E539", 
-        "description": "Sforzato"
-    }, 
-    "dynamicSforzatoFF": {
-        "codepoint": "U+E53B", 
-        "description": "Sforzatissimo"
-    }, 
-    "dynamicSforzatoPiano": {
-        "codepoint": "U+E53A", 
-        "description": "Sforzato-piano"
-    }, 
-    "dynamicZ": {
-        "alternateCodepoint": "U+1D18E", 
-        "codepoint": "U+E525", 
-        "description": "Z"
-    }, 
-    "elecAudioChannelsEight": {
-        "codepoint": "U+EB46", 
-        "description": "Eight channels (7.1 surround)"
-    }, 
-    "elecAudioChannelsFive": {
-        "codepoint": "U+EB43", 
-        "description": "Five channels"
-    }, 
-    "elecAudioChannelsFour": {
-        "codepoint": "U+EB42", 
-        "description": "Four channels"
-    }, 
-    "elecAudioChannelsOne": {
-        "codepoint": "U+EB3E", 
-        "description": "One channel (mono)"
-    }, 
-    "elecAudioChannelsSeven": {
-        "codepoint": "U+EB45", 
-        "description": "Seven channels"
-    }, 
-    "elecAudioChannelsSix": {
-        "codepoint": "U+EB44", 
-        "description": "Six channels (5.1 surround)"
-    }, 
-    "elecAudioChannelsThreeFrontal": {
-        "codepoint": "U+EB40", 
-        "description": "Three channels (frontal)"
-    }, 
-    "elecAudioChannelsThreeSurround": {
-        "codepoint": "U+EB41", 
-        "description": "Three channels (surround)"
-    }, 
-    "elecAudioChannelsTwo": {
-        "codepoint": "U+EB3F", 
-        "description": "Two channels (stereo)"
-    }, 
-    "elecAudioIn": {
-        "codepoint": "U+EB49", 
-        "description": "Audio in"
-    }, 
-    "elecAudioMono": {
-        "codepoint": "U+EB3C", 
-        "description": "Mono audio setup"
-    }, 
-    "elecAudioOut": {
-        "codepoint": "U+EB4A", 
-        "description": "Audio out"
-    }, 
-    "elecAudioStereo": {
-        "codepoint": "U+EB3D", 
-        "description": "Stereo audio setup"
-    }, 
-    "elecCamera": {
-        "codepoint": "U+EB1B", 
-        "description": "Camera"
-    }, 
-    "elecDataIn": {
-        "codepoint": "U+EB4D", 
-        "description": "Data in"
-    }, 
-    "elecDataOut": {
-        "codepoint": "U+EB4E", 
-        "description": "Data out"
-    }, 
-    "elecDisc": {
-        "codepoint": "U+EB13", 
-        "description": "Disc"
-    }, 
-    "elecDownload": {
-        "codepoint": "U+EB4F", 
-        "description": "Download"
-    }, 
-    "elecEject": {
-        "codepoint": "U+EB2B", 
-        "description": "Eject"
-    }, 
-    "elecFastForward": {
-        "codepoint": "U+EB1F", 
-        "description": "Fast-forward"
-    }, 
-    "elecHeadphones": {
-        "codepoint": "U+EB11", 
-        "description": "Headphones"
-    }, 
-    "elecHeadset": {
-        "codepoint": "U+EB12", 
-        "description": "Headset"
-    }, 
-    "elecLineIn": {
-        "codepoint": "U+EB47", 
-        "description": "Line in"
-    }, 
-    "elecLineOut": {
-        "codepoint": "U+EB48", 
-        "description": "Line out"
-    }, 
-    "elecLoop": {
-        "codepoint": "U+EB23", 
-        "description": "Loop"
-    }, 
-    "elecLoudspeaker": {
-        "codepoint": "U+EB1A", 
-        "description": "Loudspeaker"
-    }, 
-    "elecMIDIController0": {
-        "codepoint": "U+EB36", 
-        "description": "MIDI controller 0%"
-    }, 
-    "elecMIDIController100": {
-        "codepoint": "U+EB3B", 
-        "description": "MIDI controller 100%"
-    }, 
-    "elecMIDIController20": {
-        "codepoint": "U+EB37", 
-        "description": "MIDI controller 20%"
-    }, 
-    "elecMIDIController40": {
-        "codepoint": "U+EB38", 
-        "description": "MIDI controller 40%"
-    }, 
-    "elecMIDIController60": {
-        "codepoint": "U+EB39", 
-        "description": "MIDI controller 60%"
-    }, 
-    "elecMIDIController80": {
-        "codepoint": "U+EB3A", 
-        "description": "MIDI controller 80%"
-    }, 
-    "elecMIDIIn": {
-        "codepoint": "U+EB34", 
-        "description": "MIDI in"
-    }, 
-    "elecMIDIOut": {
-        "codepoint": "U+EB35", 
-        "description": "MIDI out"
-    }, 
-    "elecMicrophone": {
-        "codepoint": "U+EB10", 
-        "description": "Microphone"
-    }, 
-    "elecMicrophoneMute": {
-        "codepoint": "U+EB28", 
-        "description": "Mute microphone"
-    }, 
-    "elecMicrophoneUnmute": {
-        "codepoint": "U+EB29", 
-        "description": "Unmute microphone"
-    }, 
-    "elecMixingConsole": {
-        "codepoint": "U+EB15", 
-        "description": "Mixing console"
-    }, 
-    "elecMonitor": {
-        "codepoint": "U+EB18", 
-        "description": "Monitor"
-    }, 
-    "elecMute": {
-        "codepoint": "U+EB26", 
-        "description": "Mute"
-    }, 
-    "elecPause": {
-        "codepoint": "U+EB1E", 
-        "description": "Pause"
-    }, 
-    "elecPlay": {
-        "codepoint": "U+EB1C", 
-        "description": "Play"
-    }, 
-    "elecPowerOnOff": {
-        "codepoint": "U+EB2A", 
-        "description": "Power on/off"
-    }, 
-    "elecProjector": {
-        "codepoint": "U+EB19", 
-        "description": "Projector"
-    }, 
-    "elecReplay": {
-        "codepoint": "U+EB24", 
-        "description": "Replay"
-    }, 
-    "elecRewind": {
-        "codepoint": "U+EB20", 
-        "description": "Rewind"
-    }, 
-    "elecShuffle": {
-        "codepoint": "U+EB25", 
-        "description": "Shuffle"
-    }, 
-    "elecSkipBackwards": {
-        "codepoint": "U+EB22", 
-        "description": "Skip backwards"
-    }, 
-    "elecSkipForwards": {
-        "codepoint": "U+EB21", 
-        "description": "Skip forwards"
-    }, 
-    "elecStop": {
-        "codepoint": "U+EB1D", 
-        "description": "Stop"
-    }, 
-    "elecTape": {
-        "codepoint": "U+EB14", 
-        "description": "Tape"
-    }, 
-    "elecUSB": {
-        "codepoint": "U+EB16", 
-        "description": "USB connection"
-    }, 
-    "elecUnmute": {
-        "codepoint": "U+EB27", 
-        "description": "Unmute"
-    }, 
-    "elecUpload": {
-        "codepoint": "U+EB50", 
-        "description": "Upload"
-    }, 
-    "elecVideoCamera": {
-        "codepoint": "U+EB17", 
-        "description": "Video camera"
-    }, 
-    "elecVideoIn": {
-        "codepoint": "U+EB4B", 
-        "description": "Video in"
-    }, 
-    "elecVideoOut": {
-        "codepoint": "U+EB4C", 
-        "description": "Video out"
-    }, 
-    "elecVolumeFader": {
-        "codepoint": "U+EB2C", 
-        "description": "Combining volume fader"
-    }, 
-    "elecVolumeFaderThumb": {
-        "codepoint": "U+EB2D", 
-        "description": "Combining volume fader thumb"
-    }, 
-    "elecVolumeLevel0": {
-        "codepoint": "U+EB2E", 
-        "description": "Volume level 0%"
-    }, 
-    "elecVolumeLevel100": {
-        "codepoint": "U+EB33", 
-        "description": "Volume level 100%"
-    }, 
-    "elecVolumeLevel20": {
-        "codepoint": "U+EB2F", 
-        "description": "Volume level 20%"
-    }, 
-    "elecVolumeLevel40": {
-        "codepoint": "U+EB30", 
-        "description": "Volume level 40%"
-    }, 
-    "elecVolumeLevel60": {
-        "codepoint": "U+EB31", 
-        "description": "Volume level 60%"
-    }, 
-    "elecVolumeLevel80": {
-        "codepoint": "U+EB32", 
-        "description": "Volume level 80%"
-    }, 
-    "fClef": {
-        "alternateCodepoint": "U+1D122", 
-        "codepoint": "U+E062", 
-        "description": "F clef"
-    }, 
-    "fClef15ma": {
-        "codepoint": "U+E066", 
-        "description": "F clef quindicesima alta"
-    }, 
-    "fClef15mb": {
-        "codepoint": "U+E063", 
-        "description": "F clef quindicesima bassa"
-    }, 
-    "fClef8va": {
-        "alternateCodepoint": "U+1D123", 
-        "codepoint": "U+E065", 
-        "description": "F clef ottava alta"
-    }, 
-    "fClef8vb": {
-        "alternateCodepoint": "U+1D124", 
-        "codepoint": "U+E064", 
-        "description": "F clef ottava bassa"
-    }, 
-    "fClefArrowDown": {
-        "codepoint": "U+E068", 
-        "description": "F clef, arrow down"
-    }, 
-    "fClefArrowUp": {
-        "codepoint": "U+E067", 
-        "description": "F clef, arrow up"
-    }, 
-    "fClefChange": {
-        "codepoint": "U+E07C", 
-        "description": "F clef change"
-    }, 
-    "fClefReversed": {
-        "codepoint": "U+E076", 
-        "description": "Reversed F clef"
-    }, 
-    "fClefTurned": {
-        "codepoint": "U+E077", 
-        "description": "Turned F clef"
-    }, 
-    "fermataAbove": {
-        "alternateCodepoint": "U+1D110", 
-        "codepoint": "U+E4C0", 
-        "description": "Fermata above"
-    }, 
-    "fermataBelow": {
-        "alternateCodepoint": "U+1D111", 
-        "codepoint": "U+E4C1", 
-        "description": "Fermata below"
-    }, 
-    "fermataLongAbove": {
-        "codepoint": "U+E4C6", 
-        "description": "Long fermata above"
-    }, 
-    "fermataLongBelow": {
-        "codepoint": "U+E4C7", 
-        "description": "Long fermata below"
-    }, 
-    "fermataLongHenzeAbove": {
-        "codepoint": "U+E4CA", 
-        "description": "Long fermata (Henze) above"
-    }, 
-    "fermataLongHenzeBelow": {
-        "codepoint": "U+E4CB", 
-        "description": "Long fermata (Henze) below"
-    }, 
-    "fermataShortAbove": {
-        "codepoint": "U+E4C4", 
-        "description": "Short fermata above"
-    }, 
-    "fermataShortBelow": {
-        "codepoint": "U+E4C5", 
-        "description": "Short fermata below"
-    }, 
-    "fermataShortHenzeAbove": {
-        "codepoint": "U+E4CC", 
-        "description": "Short fermata (Henze) above"
-    }, 
-    "fermataShortHenzeBelow": {
-        "codepoint": "U+E4CD", 
-        "description": "Short fermata (Henze) below"
-    }, 
-    "fermataVeryLongAbove": {
-        "codepoint": "U+E4C8", 
-        "description": "Very long fermata above"
-    }, 
-    "fermataVeryLongBelow": {
-        "codepoint": "U+E4C9", 
-        "description": "Very long fermata below"
-    }, 
-    "fermataVeryShortAbove": {
-        "codepoint": "U+E4C2", 
-        "description": "Very short fermata above"
-    }, 
-    "fermataVeryShortBelow": {
-        "codepoint": "U+E4C3", 
-        "description": "Very short fermata below"
-    }, 
-    "figbass0": {
-        "codepoint": "U+EA50", 
-        "description": "Figured bass 0"
-    }, 
-    "figbass1": {
-        "codepoint": "U+EA51", 
-        "description": "Figured bass 1"
-    }, 
-    "figbass2": {
-        "codepoint": "U+EA52", 
-        "description": "Figured bass 2"
-    }, 
-    "figbass2Raised": {
-        "codepoint": "U+EA53", 
-        "description": "Figured bass 2 raised by half-step"
-    }, 
-    "figbass3": {
-        "codepoint": "U+EA54", 
-        "description": "Figured bass 3"
-    }, 
-    "figbass4": {
-        "codepoint": "U+EA55", 
-        "description": "Figured bass 4"
-    }, 
-    "figbass4Raised": {
-        "codepoint": "U+EA56", 
-        "description": "Figured bass 4 raised by half-step"
-    }, 
-    "figbass5": {
-        "codepoint": "U+EA57", 
-        "description": "Figured bass 5"
-    }, 
-    "figbass5Raised1": {
-        "codepoint": "U+EA58", 
-        "description": "Figured bass 5 raised by half-step"
-    }, 
-    "figbass5Raised2": {
-        "codepoint": "U+EA59", 
-        "description": "Figured bass 5 raised by half-step 2"
-    }, 
-    "figbass5Raised3": {
-        "codepoint": "U+EA5A", 
-        "description": "Figured bass diminished 5"
-    }, 
-    "figbass6": {
-        "codepoint": "U+EA5B", 
-        "description": "Figured bass 6"
-    }, 
-    "figbass6Raised": {
-        "codepoint": "U+EA5C", 
-        "description": "Figured bass 6 raised by half-step"
-    }, 
-    "figbass6Raised2": {
-        "codepoint": "U+EA6F", 
-        "description": "Figured bass 6 raised by half-step 2"
-    }, 
-    "figbass7": {
-        "codepoint": "U+EA5D", 
-        "description": "Figured bass 7"
-    }, 
-    "figbass7Diminished": {
-        "codepoint": "U+ECC0", 
-        "description": "Figured bass 7 diminished"
-    }, 
-    "figbass7Raised1": {
-        "codepoint": "U+EA5E", 
-        "description": "Figured bass 7 raised by half-step"
-    }, 
-    "figbass7Raised2": {
-        "codepoint": "U+EA5F", 
-        "description": "Figured bass 7 raised by a half-step 2"
-    }, 
-    "figbass8": {
-        "codepoint": "U+EA60", 
-        "description": "Figured bass 8"
-    }, 
-    "figbass9": {
-        "codepoint": "U+EA61", 
-        "description": "Figured bass 9"
-    }, 
-    "figbass9Raised": {
-        "codepoint": "U+EA62", 
-        "description": "Figured bass 9 raised by half-step"
-    }, 
-    "figbassBracketLeft": {
-        "codepoint": "U+EA68", 
-        "description": "Figured bass ["
-    }, 
-    "figbassBracketRight": {
-        "codepoint": "U+EA69", 
-        "description": "Figured bass ]"
-    }, 
-    "figbassCombiningLowering": {
-        "codepoint": "U+EA6E", 
-        "description": "Combining lower"
-    }, 
-    "figbassCombiningRaising": {
-        "codepoint": "U+EA6D", 
-        "description": "Combining raise"
-    }, 
-    "figbassDoubleFlat": {
-        "codepoint": "U+EA63", 
-        "description": "Figured bass double flat"
-    }, 
-    "figbassDoubleSharp": {
-        "codepoint": "U+EA67", 
-        "description": "Figured bass double sharp"
-    }, 
-    "figbassFlat": {
-        "codepoint": "U+EA64", 
-        "description": "Figured bass flat"
-    }, 
-    "figbassNatural": {
-        "codepoint": "U+EA65", 
-        "description": "Figured bass natural"
-    }, 
-    "figbassParensLeft": {
-        "codepoint": "U+EA6A", 
-        "description": "Figured bass ("
-    }, 
-    "figbassParensRight": {
-        "codepoint": "U+EA6B", 
-        "description": "Figured bass )"
-    }, 
-    "figbassPlus": {
-        "codepoint": "U+EA6C", 
-        "description": "Figured bass +"
-    }, 
-    "figbassSharp": {
-        "codepoint": "U+EA66", 
-        "description": "Figured bass sharp"
-    }, 
-    "fingering0": {
-        "codepoint": "U+ED10", 
-        "description": "Fingering 0 (open string)"
-    }, 
-    "fingering0Italic": {
-        "codepoint": "U+ED80", 
-        "description": "Fingering 0 italic (open string)"
-    }, 
-    "fingering1": {
-        "codepoint": "U+ED11", 
-        "description": "Fingering 1 (thumb)"
-    }, 
-    "fingering1Italic": {
-        "codepoint": "U+ED81", 
-        "description": "Fingering 1 italic (thumb)"
-    }, 
-    "fingering2": {
-        "codepoint": "U+ED12", 
-        "description": "Fingering 2 (index finger)"
-    }, 
-    "fingering2Italic": {
-        "codepoint": "U+ED82", 
-        "description": "Fingering 2 italic (index finger)"
-    }, 
-    "fingering3": {
-        "codepoint": "U+ED13", 
-        "description": "Fingering 3 (middle finger)"
-    }, 
-    "fingering3Italic": {
-        "codepoint": "U+ED83", 
-        "description": "Fingering 3 italic (middle finger)"
-    }, 
-    "fingering4": {
-        "codepoint": "U+ED14", 
-        "description": "Fingering 4 (ring finger)"
-    }, 
-    "fingering4Italic": {
-        "codepoint": "U+ED84", 
-        "description": "Fingering 4 italic (ring finger)"
-    }, 
-    "fingering5": {
-        "codepoint": "U+ED15", 
-        "description": "Fingering 5 (little finger)"
-    }, 
-    "fingering5Italic": {
-        "codepoint": "U+ED85", 
-        "description": "Fingering 5 italic (little finger)"
-    }, 
-    "fingering6": {
-        "codepoint": "U+ED24", 
-        "description": "Fingering 6"
-    }, 
-    "fingering6Italic": {
-        "codepoint": "U+ED86", 
-        "description": "Fingering 6 italic"
-    }, 
-    "fingering7": {
-        "codepoint": "U+ED25", 
-        "description": "Fingering 7"
-    }, 
-    "fingering7Italic": {
-        "codepoint": "U+ED87", 
-        "description": "Fingering 7 italic"
-    }, 
-    "fingering8": {
-        "codepoint": "U+ED26", 
-        "description": "Fingering 8"
-    }, 
-    "fingering8Italic": {
-        "codepoint": "U+ED88", 
-        "description": "Fingering 8 italic"
-    }, 
-    "fingering9": {
-        "codepoint": "U+ED27", 
-        "description": "Fingering 9"
-    }, 
-    "fingering9Italic": {
-        "codepoint": "U+ED89", 
-        "description": "Fingering 9 italic"
-    }, 
-    "fingeringALower": {
-        "codepoint": "U+ED1B", 
-        "description": "Fingering a (anular; right-hand ring finger for guitar)"
-    }, 
-    "fingeringCLower": {
-        "codepoint": "U+ED1C", 
-        "description": "Fingering c (right-hand little finger for guitar)"
-    }, 
-    "fingeringELower": {
-        "codepoint": "U+ED1E", 
-        "description": "Fingering e (right-hand little finger for guitar)"
-    }, 
-    "fingeringILower": {
-        "codepoint": "U+ED19", 
-        "description": "Fingering i (indicio; right-hand index finger for guitar)"
-    }, 
-    "fingeringLeftBracket": {
-        "codepoint": "U+ED2A", 
-        "description": "Fingering left bracket"
-    }, 
-    "fingeringLeftBracketItalic": {
-        "codepoint": "U+ED8C", 
-        "description": "Fingering left bracket italic"
-    }, 
-    "fingeringLeftParenthesis": {
-        "codepoint": "U+ED28", 
-        "description": "Fingering left parenthesis"
-    }, 
-    "fingeringLeftParenthesisItalic": {
-        "codepoint": "U+ED8A", 
-        "description": "Fingering left parenthesis italic"
-    }, 
-    "fingeringMLower": {
-        "codepoint": "U+ED1A", 
-        "description": "Fingering m (medio; right-hand middle finger for guitar)"
-    }, 
-    "fingeringMultipleNotes": {
-        "codepoint": "U+ED23", 
-        "description": "Multiple notes played by thumb or single finger"
-    }, 
-    "fingeringOLower": {
-        "codepoint": "U+ED1F", 
-        "description": "Fingering o (right-hand little finger for guitar)"
-    }, 
-    "fingeringPLower": {
-        "codepoint": "U+ED17", 
-        "description": "Fingering p (pulgar; right-hand thumb for guitar)"
-    }, 
-    "fingeringRightBracket": {
-        "codepoint": "U+ED2B", 
-        "description": "Fingering right bracket"
-    }, 
-    "fingeringRightBracketItalic": {
-        "codepoint": "U+ED8D", 
-        "description": "Fingering right bracket italic"
-    }, 
-    "fingeringRightParenthesis": {
-        "codepoint": "U+ED29", 
-        "description": "Fingering right parenthesis"
-    }, 
-    "fingeringRightParenthesisItalic": {
-        "codepoint": "U+ED8B", 
-        "description": "Fingering right parenthesis italic"
-    }, 
-    "fingeringSeparatorMiddleDot": {
-        "codepoint": "U+ED2C", 
-        "description": "Fingering middle dot separator"
-    }, 
-    "fingeringSeparatorMiddleDotWhite": {
-        "codepoint": "U+ED2D", 
-        "description": "Fingering white middle dot separator"
-    }, 
-    "fingeringSeparatorSlash": {
-        "codepoint": "U+ED2E", 
-        "description": "Fingering forward slash separator"
-    }, 
-    "fingeringSubstitutionAbove": {
-        "codepoint": "U+ED20", 
-        "description": "Finger substitution above"
-    }, 
-    "fingeringSubstitutionBelow": {
-        "codepoint": "U+ED21", 
-        "description": "Finger substitution below"
-    }, 
-    "fingeringSubstitutionDash": {
-        "codepoint": "U+ED22", 
-        "description": "Finger substitution dash"
-    }, 
-    "fingeringTLower": {
-        "codepoint": "U+ED18", 
-        "description": "Fingering t (right-hand thumb for guitar)"
-    }, 
-    "fingeringTUpper": {
-        "codepoint": "U+ED16", 
-        "description": "Fingering T (left-hand thumb for guitar)"
-    }, 
-    "fingeringXLower": {
-        "codepoint": "U+ED1D", 
-        "description": "Fingering x (right-hand little finger for guitar)"
-    }, 
-    "flag1024thDown": {
-        "codepoint": "U+E24F", 
-        "description": "Combining flag 8 (1024th) below"
-    }, 
-    "flag1024thUp": {
-        "codepoint": "U+E24E", 
-        "description": "Combining flag 8 (1024th) above"
-    }, 
-    "flag128thDown": {
-        "codepoint": "U+E249", 
-        "description": "Combining flag 5 (128th) below"
-    }, 
-    "flag128thUp": {
-        "alternateCodepoint": "U+1D172", 
-        "codepoint": "U+E248", 
-        "description": "Combining flag 5 (128th) above"
-    }, 
-    "flag16thDown": {
-        "codepoint": "U+E243", 
-        "description": "Combining flag 2 (16th) below"
-    }, 
-    "flag16thUp": {
-        "alternateCodepoint": "U+1D16F", 
-        "codepoint": "U+E242", 
-        "description": "Combining flag 2 (16th) above"
-    }, 
-    "flag256thDown": {
-        "codepoint": "U+E24B", 
-        "description": "Combining flag 6 (256th) below"
-    }, 
-    "flag256thUp": {
-        "codepoint": "U+E24A", 
-        "description": "Combining flag 6 (256th) above"
-    }, 
-    "flag32ndDown": {
-        "codepoint": "U+E245", 
-        "description": "Combining flag 3 (32nd) below"
-    }, 
-    "flag32ndUp": {
-        "alternateCodepoint": "U+1D170", 
-        "codepoint": "U+E244", 
-        "description": "Combining flag 3 (32nd) above"
-    }, 
-    "flag512thDown": {
-        "codepoint": "U+E24D", 
-        "description": "Combining flag 7 (512th) below"
-    }, 
-    "flag512thUp": {
-        "codepoint": "U+E24C", 
-        "description": "Combining flag 7 (512th) above"
-    }, 
-    "flag64thDown": {
-        "codepoint": "U+E247", 
-        "description": "Combining flag 4 (64th) below"
-    }, 
-    "flag64thUp": {
-        "alternateCodepoint": "U+1D171", 
-        "codepoint": "U+E246", 
-        "description": "Combining flag 4 (64th) above"
-    }, 
-    "flag8thDown": {
-        "codepoint": "U+E241", 
-        "description": "Combining flag 1 (8th) below"
-    }, 
-    "flag8thUp": {
-        "alternateCodepoint": "U+1D16E", 
-        "codepoint": "U+E240", 
-        "description": "Combining flag 1 (8th) above"
-    }, 
-    "flagInternalDown": {
-        "codepoint": "U+E251", 
-        "description": "Internal combining flag below"
-    }, 
-    "flagInternalUp": {
-        "codepoint": "U+E250", 
-        "description": "Internal combining flag above"
-    }, 
-    "fretboard3String": {
-        "codepoint": "U+E850", 
-        "description": "3-string fretboard"
-    }, 
-    "fretboard3StringNut": {
-        "codepoint": "U+E851", 
-        "description": "3-string fretboard at nut"
-    }, 
-    "fretboard4String": {
-        "alternateCodepoint": "U+1D11D", 
-        "codepoint": "U+E852", 
-        "description": "4-string fretboard"
-    }, 
-    "fretboard4StringNut": {
-        "codepoint": "U+E853", 
-        "description": "4-string fretboard at nut"
-    }, 
-    "fretboard5String": {
-        "codepoint": "U+E854", 
-        "description": "5-string fretboard"
-    }, 
-    "fretboard5StringNut": {
-        "codepoint": "U+E855", 
-        "description": "5-string fretboard at nut"
-    }, 
-    "fretboard6String": {
-        "alternateCodepoint": "U+1D11C", 
-        "codepoint": "U+E856", 
-        "description": "6-string fretboard"
-    }, 
-    "fretboard6StringNut": {
-        "codepoint": "U+E857", 
-        "description": "6-string fretboard at nut"
-    }, 
-    "fretboardFilledCircle": {
-        "codepoint": "U+E858", 
-        "description": "Fingered fret (filled circle)"
-    }, 
-    "fretboardO": {
-        "codepoint": "U+E85A", 
-        "description": "Open string (O)"
-    }, 
-    "fretboardX": {
-        "codepoint": "U+E859", 
-        "description": "String not played (X)"
-    }, 
-    "functionAngleLeft": {
-        "codepoint": "U+EA93", 
-        "description": "Function theory angle bracket left"
-    }, 
-    "functionAngleRight": {
-        "codepoint": "U+EA94", 
-        "description": "Function theory angle bracket right"
-    }, 
-    "functionBracketLeft": {
-        "codepoint": "U+EA8F", 
-        "description": "Function theory bracket left"
-    }, 
-    "functionBracketRight": {
-        "codepoint": "U+EA90", 
-        "description": "Function theory bracket right"
-    }, 
-    "functionDD": {
-        "codepoint": "U+EA81", 
-        "description": "Function theory dominant of dominant"
-    }, 
-    "functionDLower": {
-        "codepoint": "U+EA80", 
-        "description": "Function theory minor dominant"
-    }, 
-    "functionDUpper": {
-        "codepoint": "U+EA7F", 
-        "description": "Function theory major dominant"
-    }, 
-    "functionEight": {
-        "codepoint": "U+EA78", 
-        "description": "Function theory 8"
-    }, 
-    "functionFUpper": {
-        "codepoint": "U+EA99", 
-        "description": "Function theory F"
-    }, 
-    "functionFive": {
-        "codepoint": "U+EA75", 
-        "description": "Function theory 5"
-    }, 
-    "functionFour": {
-        "codepoint": "U+EA74", 
-        "description": "Function theory 4"
-    }, 
-    "functionGLower": {
-        "codepoint": "U+EA84", 
-        "description": "Function theory g"
-    }, 
-    "functionGUpper": {
-        "codepoint": "U+EA83", 
-        "description": "Function theory G"
-    }, 
-    "functionGreaterThan": {
-        "codepoint": "U+EA7C", 
-        "description": "Function theory greater than"
-    }, 
-    "functionILower": {
-        "codepoint": "U+EA9B", 
-        "description": "Function theory i"
-    }, 
-    "functionIUpper": {
-        "codepoint": "U+EA9A", 
-        "description": "Function theory I"
-    }, 
-    "functionKLower": {
-        "codepoint": "U+EA9D", 
-        "description": "Function theory k"
-    }, 
-    "functionKUpper": {
-        "codepoint": "U+EA9C", 
-        "description": "Function theory K"
-    }, 
-    "functionLLower": {
-        "codepoint": "U+EA9F", 
-        "description": "Function theory l"
-    }, 
-    "functionLUpper": {
-        "codepoint": "U+EA9E", 
-        "description": "Function theory L"
-    }, 
-    "functionLessThan": {
-        "codepoint": "U+EA7A", 
-        "description": "Function theory less than"
-    }, 
-    "functionMLower": {
-        "codepoint": "U+ED01", 
-        "description": "Function theory m"
-    }, 
-    "functionMUpper": {
-        "codepoint": "U+ED00", 
-        "description": "Function theory M"
-    }, 
-    "functionMinus": {
-        "codepoint": "U+EA7B", 
-        "description": "Function theory minus"
-    }, 
-    "functionNLower": {
-        "codepoint": "U+EA86", 
-        "description": "Function theory n"
-    }, 
-    "functionNUpper": {
-        "codepoint": "U+EA85", 
-        "description": "Function theory N"
-    }, 
-    "functionNUpperSuperscript": {
-        "codepoint": "U+ED02", 
-        "description": "Function theory superscript N"
-    }, 
-    "functionNine": {
-        "codepoint": "U+EA79", 
-        "description": "Function theory 9"
-    }, 
-    "functionOne": {
-        "codepoint": "U+EA71", 
-        "description": "Function theory 1"
-    }, 
-    "functionPLower": {
-        "codepoint": "U+EA88", 
-        "description": "Function theory p"
-    }, 
-    "functionPUpper": {
-        "codepoint": "U+EA87", 
-        "description": "Function theory P"
-    }, 
-    "functionParensLeft": {
-        "codepoint": "U+EA91", 
-        "description": "Function theory parenthesis left"
-    }, 
-    "functionParensRight": {
-        "codepoint": "U+EA92", 
-        "description": "Function theory parenthesis right"
-    }, 
-    "functionPlus": {
-        "codepoint": "U+EA98", 
-        "description": "Function theory prefix plus"
-    }, 
-    "functionRLower": {
-        "codepoint": "U+ED03", 
-        "description": "Function theory r"
-    }, 
-    "functionRepetition1": {
-        "codepoint": "U+EA95", 
-        "description": "Function theory repetition 1"
-    }, 
-    "functionRepetition2": {
-        "codepoint": "U+EA96", 
-        "description": "Function theory repetition 2"
-    }, 
-    "functionRing": {
-        "codepoint": "U+EA97", 
-        "description": "Function theory prefix ring"
-    }, 
-    "functionSLower": {
-        "codepoint": "U+EA8A", 
-        "description": "Function theory minor subdominant"
-    }, 
-    "functionSSLower": {
-        "codepoint": "U+EA7E", 
-        "description": "Function theory minor subdominant of subdominant"
-    }, 
-    "functionSSUpper": {
-        "codepoint": "U+EA7D", 
-        "description": "Function theory major subdominant of subdominant"
-    }, 
-    "functionSUpper": {
-        "codepoint": "U+EA89", 
-        "description": "Function theory major subdominant"
-    }, 
-    "functionSeven": {
-        "codepoint": "U+EA77", 
-        "description": "Function theory 7"
-    }, 
-    "functionSix": {
-        "codepoint": "U+EA76", 
-        "description": "Function theory 6"
-    }, 
-    "functionSlashedDD": {
-        "codepoint": "U+EA82", 
-        "description": "Function theory double dominant seventh"
-    }, 
-    "functionTLower": {
-        "codepoint": "U+EA8C", 
-        "description": "Function theory minor tonic"
-    }, 
-    "functionTUpper": {
-        "codepoint": "U+EA8B", 
-        "description": "Function theory tonic"
-    }, 
-    "functionThree": {
-        "codepoint": "U+EA73", 
-        "description": "Function theory 3"
-    }, 
-    "functionTwo": {
-        "codepoint": "U+EA72", 
-        "description": "Function theory 2"
-    }, 
-    "functionVLower": {
-        "codepoint": "U+EA8E", 
-        "description": "Function theory v"
-    }, 
-    "functionVUpper": {
-        "codepoint": "U+EA8D", 
-        "description": "Function theory V"
-    }, 
-    "functionZero": {
-        "codepoint": "U+EA70", 
-        "description": "Function theory 0"
-    }, 
-    "gClef": {
-        "alternateCodepoint": "U+1D11E", 
-        "codepoint": "U+E050", 
-        "description": "G clef"
-    }, 
-    "gClef15ma": {
-        "codepoint": "U+E054", 
-        "description": "G clef quindicesima alta"
-    }, 
-    "gClef15mb": {
-        "codepoint": "U+E051", 
-        "description": "G clef quindicesima bassa"
-    }, 
-    "gClef8va": {
-        "alternateCodepoint": "U+1D11F", 
-        "codepoint": "U+E053", 
-        "description": "G clef ottava alta"
-    }, 
-    "gClef8vb": {
-        "alternateCodepoint": "U+1D120", 
-        "codepoint": "U+E052", 
-        "description": "G clef ottava bassa"
-    }, 
-    "gClef8vbCClef": {
-        "codepoint": "U+E056", 
-        "description": "G clef ottava bassa with C clef"
-    }, 
-    "gClef8vbOld": {
-        "codepoint": "U+E055", 
-        "description": "G clef ottava bassa (old style)"
-    }, 
-    "gClef8vbParens": {
-        "codepoint": "U+E057", 
-        "description": "G clef, optionally ottava bassa"
-    }, 
-    "gClefArrowDown": {
-        "codepoint": "U+E05B", 
-        "description": "G clef, arrow down"
-    }, 
-    "gClefArrowUp": {
-        "codepoint": "U+E05A", 
-        "description": "G clef, arrow up"
-    }, 
-    "gClefChange": {
-        "codepoint": "U+E07A", 
-        "description": "G clef change"
-    }, 
-    "gClefLigatedNumberAbove": {
-        "codepoint": "U+E059", 
-        "description": "Combining G clef, number above"
-    }, 
-    "gClefLigatedNumberBelow": {
-        "codepoint": "U+E058", 
-        "description": "Combining G clef, number below"
-    }, 
-    "gClefReversed": {
-        "codepoint": "U+E073", 
-        "description": "Reversed G clef"
-    }, 
-    "gClefTurned": {
-        "codepoint": "U+E074", 
-        "description": "Turned G clef"
-    }, 
-    "glissandoDown": {
-        "alternateCodepoint": "U+1D1B2", 
-        "codepoint": "U+E586", 
-        "description": "Glissando down"
-    }, 
-    "glissandoUp": {
-        "alternateCodepoint": "U+1D1B1", 
-        "codepoint": "U+E585", 
-        "description": "Glissando up"
-    }, 
-    "graceNoteAcciaccaturaStemDown": {
-        "codepoint": "U+E561", 
-        "description": "Slashed grace note stem down"
-    }, 
-    "graceNoteAcciaccaturaStemUp": {
-        "alternateCodepoint": "U+1D194", 
-        "codepoint": "U+E560", 
-        "description": "Slashed grace note stem up"
-    }, 
-    "graceNoteAppoggiaturaStemDown": {
-        "codepoint": "U+E563", 
-        "description": "Grace note stem down"
-    }, 
-    "graceNoteAppoggiaturaStemUp": {
-        "alternateCodepoint": "U+1D195", 
-        "codepoint": "U+E562", 
-        "description": "Grace note stem up"
-    }, 
-    "graceNoteSlashStemDown": {
-        "codepoint": "U+E565", 
-        "description": "Slash for stem down grace note"
-    }, 
-    "graceNoteSlashStemUp": {
-        "codepoint": "U+E564", 
-        "description": "Slash for stem up grace note"
-    }, 
-    "guitarBarreFull": {
-        "codepoint": "U+E848", 
-        "description": "Full barr\u00e9"
-    }, 
-    "guitarBarreHalf": {
-        "codepoint": "U+E849", 
-        "description": "Half barr\u00e9"
-    }, 
-    "guitarClosePedal": {
-        "codepoint": "U+E83F", 
-        "description": "Closed wah/volume pedal"
-    }, 
-    "guitarFadeIn": {
-        "codepoint": "U+E843", 
-        "description": "Fade in"
-    }, 
-    "guitarFadeOut": {
-        "codepoint": "U+E844", 
-        "description": "Fade out"
-    }, 
-    "guitarGolpe": {
-        "codepoint": "U+E842", 
-        "description": "Golpe (tapping the pick guard)"
-    }, 
-    "guitarHalfOpenPedal": {
-        "codepoint": "U+E83E", 
-        "description": "Half-open wah/volume pedal"
-    }, 
-    "guitarLeftHandTapping": {
-        "codepoint": "U+E840", 
-        "description": "Left-hand tapping"
-    }, 
-    "guitarOpenPedal": {
-        "codepoint": "U+E83D", 
-        "description": "Open wah/volume pedal"
-    }, 
-    "guitarRightHandTapping": {
-        "codepoint": "U+E841", 
-        "description": "Right-hand tapping"
-    }, 
-    "guitarShake": {
-        "codepoint": "U+E832", 
-        "description": "Guitar shake"
-    }, 
-    "guitarString0": {
-        "codepoint": "U+E833", 
-        "description": "String number 0"
-    }, 
-    "guitarString1": {
-        "codepoint": "U+E834", 
-        "description": "String number 1"
-    }, 
-    "guitarString2": {
-        "codepoint": "U+E835", 
-        "description": "String number 2"
-    }, 
-    "guitarString3": {
-        "codepoint": "U+E836", 
-        "description": "String number 3"
-    }, 
-    "guitarString4": {
-        "codepoint": "U+E837", 
-        "description": "String number 4"
-    }, 
-    "guitarString5": {
-        "codepoint": "U+E838", 
-        "description": "String number 5"
-    }, 
-    "guitarString6": {
-        "codepoint": "U+E839", 
-        "description": "String number 6"
-    }, 
-    "guitarString7": {
-        "codepoint": "U+E83A", 
-        "description": "String number 7"
-    }, 
-    "guitarString8": {
-        "codepoint": "U+E83B", 
-        "description": "String number 8"
-    }, 
-    "guitarString9": {
-        "codepoint": "U+E83C", 
-        "description": "String number 9"
-    }, 
-    "guitarStrumDown": {
-        "codepoint": "U+E847", 
-        "description": "Strum direction down"
-    }, 
-    "guitarStrumUp": {
-        "codepoint": "U+E846", 
-        "description": "Strum direction up"
-    }, 
-    "guitarVibratoBarDip": {
-        "codepoint": "U+E831", 
-        "description": "Guitar vibrato bar dip"
-    }, 
-    "guitarVibratoBarScoop": {
-        "codepoint": "U+E830", 
-        "description": "Guitar vibrato bar scoop"
-    }, 
-    "guitarVibratoStroke": {
-        "codepoint": "U+EAB2", 
-        "description": "Vibrato wiggle segment"
-    }, 
-    "guitarVolumeSwell": {
-        "codepoint": "U+E845", 
-        "description": "Volume swell"
-    }, 
-    "guitarWideVibratoStroke": {
-        "codepoint": "U+EAB3", 
-        "description": "Wide vibrato wiggle segment"
-    }, 
-    "handbellsBelltree": {
-        "codepoint": "U+E81F", 
-        "description": "Belltree"
-    }, 
-    "handbellsDamp3": {
-        "codepoint": "U+E81E", 
-        "description": "Damp 3"
-    }, 
-    "handbellsEcho1": {
-        "codepoint": "U+E81B", 
-        "description": "Echo"
-    }, 
-    "handbellsEcho2": {
-        "codepoint": "U+E81C", 
-        "description": "Echo 2"
-    }, 
-    "handbellsGyro": {
-        "codepoint": "U+E81D", 
-        "description": "Gyro"
-    }, 
-    "handbellsHandMartellato": {
-        "codepoint": "U+E812", 
-        "description": "Hand martellato"
-    }, 
-    "handbellsMalletBellOnTable": {
-        "codepoint": "U+E815", 
-        "description": "Mallet, bell on table"
-    }, 
-    "handbellsMalletBellSuspended": {
-        "codepoint": "U+E814", 
-        "description": "Mallet, bell suspended"
-    }, 
-    "handbellsMalletLft": {
-        "codepoint": "U+E816", 
-        "description": "Mallet lift"
-    }, 
-    "handbellsMartellato": {
-        "codepoint": "U+E810", 
-        "description": "Martellato"
-    }, 
-    "handbellsMartellatoLift": {
-        "codepoint": "U+E811", 
-        "description": "Martellato lift"
-    }, 
-    "handbellsMutedMartellato": {
-        "codepoint": "U+E813", 
-        "description": "Muted martellato"
-    }, 
-    "handbellsPluckLift": {
-        "codepoint": "U+E817", 
-        "description": "Pluck lift"
-    }, 
-    "handbellsSwing": {
-        "codepoint": "U+E81A", 
-        "description": "Swing"
-    }, 
-    "handbellsSwingDown": {
-        "codepoint": "U+E819", 
-        "description": "Swing down"
-    }, 
-    "handbellsSwingUp": {
-        "codepoint": "U+E818", 
-        "description": "Swing up"
-    }, 
-    "handbellsTablePairBells": {
-        "codepoint": "U+E821", 
-        "description": "Table pair of handbells"
-    }, 
-    "handbellsTableSingleBell": {
-        "codepoint": "U+E820", 
-        "description": "Table single handbell"
-    }, 
-    "harpMetalRod": {
-        "codepoint": "U+E68F", 
-        "description": "Metal rod pictogram"
-    }, 
-    "harpPedalCentered": {
-        "codepoint": "U+E681", 
-        "description": "Harp pedal centered (natural)"
-    }, 
-    "harpPedalDivider": {
-        "codepoint": "U+E683", 
-        "description": "Harp pedal divider"
-    }, 
-    "harpPedalLowered": {
-        "codepoint": "U+E682", 
-        "description": "Harp pedal lowered (sharp)"
-    }, 
-    "harpPedalRaised": {
-        "codepoint": "U+E680", 
-        "description": "Harp pedal raised (flat)"
-    }, 
-    "harpSalzedoAeolianAscending": {
-        "codepoint": "U+E695", 
-        "description": "Ascending aeolian chords (Salzedo)"
-    }, 
-    "harpSalzedoAeolianDescending": {
-        "codepoint": "U+E696", 
-        "description": "Descending aeolian chords (Salzedo)"
-    }, 
-    "harpSalzedoDampAbove": {
-        "codepoint": "U+E69A", 
-        "description": "Damp above (Salzedo)"
-    }, 
-    "harpSalzedoDampBelow": {
-        "codepoint": "U+E699", 
-        "description": "Damp below (Salzedo)"
-    }, 
-    "harpSalzedoDampBothHands": {
-        "codepoint": "U+E698", 
-        "description": "Damp with both hands (Salzedo)"
-    }, 
-    "harpSalzedoDampLowStrings": {
-        "codepoint": "U+E697", 
-        "description": "Damp only low strings (Salzedo)"
-    }, 
-    "harpSalzedoFluidicSoundsLeft": {
-        "codepoint": "U+E68D", 
-        "description": "Fluidic sounds, left hand (Salzedo)"
-    }, 
-    "harpSalzedoFluidicSoundsRight": {
-        "codepoint": "U+E68E", 
-        "description": "Fluidic sounds, right hand (Salzedo)"
-    }, 
-    "harpSalzedoIsolatedSounds": {
-        "codepoint": "U+E69C", 
-        "description": "Isolated sounds (Salzedo)"
-    }, 
-    "harpSalzedoMetallicSounds": {
-        "codepoint": "U+E688", 
-        "description": "Metallic sounds (Salzedo)"
-    }, 
-    "harpSalzedoMetallicSoundsOneString": {
-        "codepoint": "U+E69B", 
-        "description": "Metallic sounds, one string (Salzedo)"
-    }, 
-    "harpSalzedoMuffleTotally": {
-        "codepoint": "U+E68C", 
-        "description": "Muffle totally (Salzedo)"
-    }, 
-    "harpSalzedoOboicFlux": {
-        "codepoint": "U+E685", 
-        "description": "Oboic flux (Salzedo)"
-    }, 
-    "harpSalzedoPlayUpperEnd": {
-        "codepoint": "U+E68A", 
-        "description": "Play at upper end of strings (Salzedo)"
-    }, 
-    "harpSalzedoSlideWithSuppleness": {
-        "codepoint": "U+E684", 
-        "description": "Slide with suppleness (Salzedo)"
-    }, 
-    "harpSalzedoSnareDrum": {
-        "codepoint": "U+E69D", 
-        "description": "Snare drum effect (Salzedo)"
-    }, 
-    "harpSalzedoTamTamSounds": {
-        "codepoint": "U+E689", 
-        "description": "Tam-tam sounds (Salzedo)"
-    }, 
-    "harpSalzedoThunderEffect": {
-        "codepoint": "U+E686", 
-        "description": "Thunder effect (Salzedo)"
-    }, 
-    "harpSalzedoTimpanicSounds": {
-        "codepoint": "U+E68B", 
-        "description": "Timpanic sounds (Salzedo)"
-    }, 
-    "harpSalzedoWhistlingSounds": {
-        "codepoint": "U+E687", 
-        "description": "Whistling sounds (Salzedo)"
-    }, 
-    "harpStringNoiseStem": {
-        "codepoint": "U+E694", 
-        "description": "Combining string noise for stem"
-    }, 
-    "harpTuningKey": {
-        "codepoint": "U+E690", 
-        "description": "Tuning key pictogram"
-    }, 
-    "harpTuningKeyGlissando": {
-        "codepoint": "U+E693", 
-        "description": "Retune strings for glissando"
-    }, 
-    "harpTuningKeyHandle": {
-        "codepoint": "U+E691", 
-        "description": "Use handle of tuning key pictogram"
-    }, 
-    "harpTuningKeyShank": {
-        "codepoint": "U+E692", 
-        "description": "Use shank of tuning key pictogram"
-    }, 
-    "indianDrumClef": {
-        "codepoint": "U+ED70", 
-        "description": "Indian drum clef"
-    }, 
-    "kahnBackChug": {
-        "codepoint": "U+EDE2", 
-        "description": "Back-chug"
-    }, 
-    "kahnBackFlap": {
-        "codepoint": "U+EDD8", 
-        "description": "Back-flap"
-    }, 
-    "kahnBackRiff": {
-        "codepoint": "U+EDE1", 
-        "description": "Back-riff"
-    }, 
-    "kahnBackRip": {
-        "codepoint": "U+EDDA", 
-        "description": "Back-rip"
-    }, 
-    "kahnBallChange": {
-        "codepoint": "U+EDC6", 
-        "description": "Ball-change"
-    }, 
-    "kahnBallDig": {
-        "codepoint": "U+EDCD", 
-        "description": "Ball-dig"
-    }, 
-    "kahnBrushBackward": {
-        "codepoint": "U+EDA7", 
-        "description": "Brush-backward"
-    }, 
-    "kahnBrushForward": {
-        "codepoint": "U+EDA6", 
-        "description": "Brush-forward"
-    }, 
-    "kahnChug": {
-        "codepoint": "U+EDDD", 
-        "description": "Chug"
-    }, 
-    "kahnClap": {
-        "codepoint": "U+EDB8", 
-        "description": "Clap"
-    }, 
-    "kahnDoubleSnap": {
-        "codepoint": "U+EDBA", 
-        "description": "Double-snap"
-    }, 
-    "kahnDoubleWing": {
-        "codepoint": "U+EDEB", 
-        "description": "Double-wing"
-    }, 
-    "kahnDrawStep": {
-        "codepoint": "U+EDB2", 
-        "description": "Draw-step"
-    }, 
-    "kahnDrawTap": {
-        "codepoint": "U+EDB3", 
-        "description": "Draw-tap"
-    }, 
-    "kahnFlam": {
-        "codepoint": "U+EDCF", 
-        "description": "Flam"
-    }, 
-    "kahnFlap": {
-        "codepoint": "U+EDD5", 
-        "description": "Flap"
-    }, 
-    "kahnFlapStep": {
-        "codepoint": "U+EDD7", 
-        "description": "Flap-step"
-    }, 
-    "kahnFlat": {
-        "codepoint": "U+EDA9", 
-        "description": "Flat"
-    }, 
-    "kahnFleaHop": {
-        "codepoint": "U+EDB0", 
-        "description": "Flea-hop"
-    }, 
-    "kahnFleaTap": {
-        "codepoint": "U+EDB1", 
-        "description": "Flea-tap"
-    }, 
-    "kahnGraceTap": {
-        "codepoint": "U+EDA8", 
-        "description": "Grace-tap"
-    }, 
-    "kahnGraceTapChange": {
-        "codepoint": "U+EDD1", 
-        "description": "Grace-tap-change"
-    }, 
-    "kahnGraceTapHop": {
-        "codepoint": "U+EDD0", 
-        "description": "Grace-tap-hop"
-    }, 
-    "kahnGraceTapStamp": {
-        "codepoint": "U+EDD3", 
-        "description": "Grace-tap-stamp"
-    }, 
-    "kahnHeel": {
-        "codepoint": "U+EDAA", 
-        "description": "Heel"
-    }, 
-    "kahnHeelChange": {
-        "codepoint": "U+EDC9", 
-        "description": "Heel-change"
-    }, 
-    "kahnHeelClick": {
-        "codepoint": "U+EDBB", 
-        "description": "Heel-click"
-    }, 
-    "kahnHeelDrop": {
-        "codepoint": "U+EDB6", 
-        "description": "Heel-drop"
-    }, 
-    "kahnHeelStep": {
-        "codepoint": "U+EDC4", 
-        "description": "Heel-step"
-    }, 
-    "kahnHeelTap": {
-        "codepoint": "U+EDCB", 
-        "description": "Heel-tap"
-    }, 
-    "kahnHop": {
-        "codepoint": "U+EDA2", 
-        "description": "Hop"
-    }, 
-    "kahnJumpApart": {
-        "codepoint": "U+EDA5", 
-        "description": "Jump-apart"
-    }, 
-    "kahnJumpTogether": {
-        "codepoint": "U+EDA4", 
-        "description": "Jump-together"
-    }, 
-    "kahnKneeInward": {
-        "codepoint": "U+EDAD", 
-        "description": "Knee-inward"
-    }, 
-    "kahnKneeOutward": {
-        "codepoint": "U+EDAC", 
-        "description": "Knee-outward"
-    }, 
-    "kahnLeap": {
-        "codepoint": "U+EDA3", 
-        "description": "Leap"
-    }, 
-    "kahnLeapFlatFoot": {
-        "codepoint": "U+EDD2", 
-        "description": "Leap-flat-foot"
-    }, 
-    "kahnLeapHeelClick": {
-        "codepoint": "U+EDD4", 
-        "description": "Leap-heel-click"
-    }, 
-    "kahnLeftCatch": {
-        "codepoint": "U+EDBF", 
-        "description": "Left-catch"
-    }, 
-    "kahnLeftCross": {
-        "codepoint": "U+EDBD", 
-        "description": "Left-cross"
-    }, 
-    "kahnLeftFoot": {
-        "codepoint": "U+EDEE", 
-        "description": "Left-foot"
-    }, 
-    "kahnLeftToeStrike": {
-        "codepoint": "U+EDC1", 
-        "description": "Left-toe-strike"
-    }, 
-    "kahnLeftTurn": {
-        "codepoint": "U+EDF0", 
-        "description": "Left-turn"
-    }, 
-    "kahnOverTheTop": {
-        "codepoint": "U+EDEC", 
-        "description": "Over-the-top"
-    }, 
-    "kahnOverTheTopTap": {
-        "codepoint": "U+EDED", 
-        "description": "Over-the-top-tap"
-    }, 
-    "kahnPull": {
-        "codepoint": "U+EDE3", 
-        "description": "Pull"
-    }, 
-    "kahnPush": {
-        "codepoint": "U+EDDE", 
-        "description": "Push"
-    }, 
-    "kahnRiff": {
-        "codepoint": "U+EDE0", 
-        "description": "Riff"
-    }, 
-    "kahnRiffle": {
-        "codepoint": "U+EDE7", 
-        "description": "Riffle"
-    }, 
-    "kahnRightCatch": {
-        "codepoint": "U+EDC0", 
-        "description": "Right-catch"
-    }, 
-    "kahnRightCross": {
-        "codepoint": "U+EDBE", 
-        "description": "Right-cross"
-    }, 
-    "kahnRightFoot": {
-        "codepoint": "U+EDEF", 
-        "description": "Right-foot"
-    }, 
-    "kahnRightToeStrike": {
-        "codepoint": "U+EDC2", 
-        "description": "Right-toe-strike"
-    }, 
-    "kahnRightTurn": {
-        "codepoint": "U+EDF1", 
-        "description": "Right-turn"
-    }, 
-    "kahnRip": {
-        "codepoint": "U+EDD6", 
-        "description": "Rip"
-    }, 
-    "kahnRipple": {
-        "codepoint": "U+EDE8", 
-        "description": "Ripple"
-    }, 
-    "kahnScrape": {
-        "codepoint": "U+EDAE", 
-        "description": "Scrape"
-    }, 
-    "kahnScuff": {
-        "codepoint": "U+EDDC", 
-        "description": "Scuff"
-    }, 
-    "kahnScuffle": {
-        "codepoint": "U+EDE6", 
-        "description": "Scuffle"
-    }, 
-    "kahnShuffle": {
-        "codepoint": "U+EDE5", 
-        "description": "Shuffle"
-    }, 
-    "kahnSlam": {
-        "codepoint": "U+EDCE", 
-        "description": "Slam"
-    }, 
-    "kahnSlap": {
-        "codepoint": "U+EDD9", 
-        "description": "Slap"
-    }, 
-    "kahnSlideStep": {
-        "codepoint": "U+EDB4", 
-        "description": "Slide-step"
-    }, 
-    "kahnSlideTap": {
-        "codepoint": "U+EDB5", 
-        "description": "Slide-tap"
-    }, 
-    "kahnSnap": {
-        "codepoint": "U+EDB9", 
-        "description": "Snap"
-    }, 
-    "kahnStamp": {
-        "codepoint": "U+EDC3", 
-        "description": "Stamp"
-    }, 
-    "kahnStampStamp": {
-        "codepoint": "U+EDC8", 
-        "description": "Stamp-stamp"
-    }, 
-    "kahnStep": {
-        "codepoint": "U+EDA0", 
-        "description": "Step"
-    }, 
-    "kahnStepStamp": {
-        "codepoint": "U+EDC7", 
-        "description": "Step-stamp"
-    }, 
-    "kahnStomp": {
-        "codepoint": "U+EDCA", 
-        "description": "Stomp"
-    }, 
-    "kahnStompBrush": {
-        "codepoint": "U+EDDB", 
-        "description": "Stomp-brush"
-    }, 
-    "kahnTap": {
-        "codepoint": "U+EDA1", 
-        "description": "Tap"
-    }, 
-    "kahnToe": {
-        "codepoint": "U+EDAB", 
-        "description": "Toe"
-    }, 
-    "kahnToeClick": {
-        "codepoint": "U+EDBC", 
-        "description": "Toe-click"
-    }, 
-    "kahnToeDrop": {
-        "codepoint": "U+EDB7", 
-        "description": "Toe-drop"
-    }, 
-    "kahnToeStep": {
-        "codepoint": "U+EDC5", 
-        "description": "Toe-step"
-    }, 
-    "kahnToeTap": {
-        "codepoint": "U+EDCC", 
-        "description": "Toe-tap"
-    }, 
-    "kahnTrench": {
-        "codepoint": "U+EDAF", 
-        "description": "Trench"
-    }, 
-    "kahnWing": {
-        "codepoint": "U+EDE9", 
-        "description": "Wing"
-    }, 
-    "kahnWingChange": {
-        "codepoint": "U+EDEA", 
-        "description": "Wing-change"
-    }, 
-    "kahnZank": {
-        "codepoint": "U+EDE4", 
-        "description": "Zank"
-    }, 
-    "kahnZink": {
-        "codepoint": "U+EDDF", 
-        "description": "Zink"
-    }, 
-    "keyboardBebung2DotsAbove": {
-        "codepoint": "U+E668", 
-        "description": "Clavichord bebung, 2 finger movements (above)"
-    }, 
-    "keyboardBebung2DotsBelow": {
-        "codepoint": "U+E669", 
-        "description": "Clavichord bebung, 2 finger movements (below)"
-    }, 
-    "keyboardBebung3DotsAbove": {
-        "codepoint": "U+E66A", 
-        "description": "Clavichord bebung, 3 finger movements (above)"
-    }, 
-    "keyboardBebung3DotsBelow": {
-        "codepoint": "U+E66B", 
-        "description": "Clavichord bebung, 3 finger movements (below)"
-    }, 
-    "keyboardBebung4DotsAbove": {
-        "codepoint": "U+E66C", 
-        "description": "Clavichord bebung, 4 finger movements (above)"
-    }, 
-    "keyboardBebung4DotsBelow": {
-        "codepoint": "U+E66D", 
-        "description": "Clavichord bebung, 4 finger movements (below)"
-    }, 
-    "keyboardLeftPedalPictogram": {
-        "codepoint": "U+E65E", 
-        "description": "Left pedal pictogram"
-    }, 
-    "keyboardMiddlePedalPictogram": {
-        "codepoint": "U+E65F", 
-        "description": "Middle pedal pictogram"
-    }, 
-    "keyboardPedalD": {
-        "codepoint": "U+E653", 
-        "description": "Pedal d"
-    }, 
-    "keyboardPedalDot": {
-        "codepoint": "U+E654", 
-        "description": "Pedal dot"
-    }, 
-    "keyboardPedalE": {
-        "codepoint": "U+E652", 
-        "description": "Pedal e"
-    }, 
-    "keyboardPedalHalf": {
-        "alternateCodepoint": "U+1D1B0", 
-        "codepoint": "U+E656", 
-        "description": "Half-pedal mark"
-    }, 
-    "keyboardPedalHalf2": {
-        "codepoint": "U+E65B", 
-        "description": "Half pedal mark 1"
-    }, 
-    "keyboardPedalHalf3": {
-        "codepoint": "U+E65C", 
-        "description": "Half pedal mark 2"
-    }, 
-    "keyboardPedalHeel1": {
-        "codepoint": "U+E661", 
-        "description": "Pedal heel 1"
-    }, 
-    "keyboardPedalHeel2": {
-        "codepoint": "U+E662", 
-        "description": "Pedal heel 2"
-    }, 
-    "keyboardPedalHeel3": {
-        "codepoint": "U+E663", 
-        "description": "Pedal heel 3 (Davis)"
-    }, 
-    "keyboardPedalHeelToToe": {
-        "codepoint": "U+E674", 
-        "description": "Pedal heel to toe"
-    }, 
-    "keyboardPedalHeelToe": {
-        "codepoint": "U+E666", 
-        "description": "Pedal heel or toe"
-    }, 
-    "keyboardPedalHookEnd": {
-        "codepoint": "U+E673", 
-        "description": "Pedal hook end"
-    }, 
-    "keyboardPedalHookStart": {
-        "codepoint": "U+E672", 
-        "description": "Pedal hook start"
-    }, 
-    "keyboardPedalHyphen": {
-        "codepoint": "U+E658", 
-        "description": "Pedal hyphen"
-    }, 
-    "keyboardPedalP": {
-        "codepoint": "U+E651", 
-        "description": "Pedal P"
-    }, 
-    "keyboardPedalParensLeft": {
-        "codepoint": "U+E676", 
-        "description": "Left parenthesis for pedal marking"
-    }, 
-    "keyboardPedalParensRight": {
-        "codepoint": "U+E677", 
-        "description": "Right parenthesis for pedal marking"
-    }, 
-    "keyboardPedalPed": {
-        "alternateCodepoint": "U+1D1AE", 
-        "codepoint": "U+E650", 
-        "description": "Pedal mark"
-    }, 
-    "keyboardPedalS": {
-        "codepoint": "U+E65A", 
-        "description": "Pedal S"
-    }, 
-    "keyboardPedalSost": {
-        "codepoint": "U+E659", 
-        "description": "Sostenuto pedal mark"
-    }, 
-    "keyboardPedalToe1": {
-        "codepoint": "U+E664", 
-        "description": "Pedal toe 1"
-    }, 
-    "keyboardPedalToe2": {
-        "codepoint": "U+E665", 
-        "description": "Pedal toe 2"
-    }, 
-    "keyboardPedalToeToHeel": {
-        "codepoint": "U+E675", 
-        "description": "Pedal toe to heel"
-    }, 
-    "keyboardPedalUp": {
-        "alternateCodepoint": "U+1D1AF", 
-        "codepoint": "U+E655", 
-        "description": "Pedal up mark"
-    }, 
-    "keyboardPedalUpNotch": {
-        "codepoint": "U+E657", 
-        "description": "Pedal up notch"
-    }, 
-    "keyboardPedalUpSpecial": {
-        "codepoint": "U+E65D", 
-        "description": "Pedal up special"
-    }, 
-    "keyboardPlayWithLH": {
-        "codepoint": "U+E670", 
-        "description": "Play with left hand"
-    }, 
-    "keyboardPlayWithLHEnd": {
-        "codepoint": "U+E671", 
-        "description": "Play with left hand (end)"
-    }, 
-    "keyboardPlayWithRH": {
-        "codepoint": "U+E66E", 
-        "description": "Play with right hand"
-    }, 
-    "keyboardPlayWithRHEnd": {
-        "codepoint": "U+E66F", 
-        "description": "Play with right hand (end)"
-    }, 
-    "keyboardPluckInside": {
-        "codepoint": "U+E667", 
-        "description": "Pluck strings inside piano (Maderna)"
-    }, 
-    "keyboardRightPedalPictogram": {
-        "codepoint": "U+E660", 
-        "description": "Right pedal pictogram"
-    }, 
-    "kievanAccidentalFlat": {
-        "alternateCodepoint": "U+1D1E8", 
-        "codepoint": "U+EC3E", 
-        "description": "Kievan flat"
-    }, 
-    "kievanAccidentalSharp": {
-        "codepoint": "U+EC3D", 
-        "description": "Kievan sharp"
-    }, 
-    "kievanAugmentationDot": {
-        "codepoint": "U+EC3C", 
-        "description": "Kievan augmentation dot"
-    }, 
-    "kievanCClef": {
-        "alternateCodepoint": "U+1D1DE", 
-        "codepoint": "U+EC30", 
-        "description": "Kievan C clef (tse-fa-ut)"
-    }, 
-    "kievanEndingSymbol": {
-        "alternateCodepoint": "U+1D1DF", 
-        "codepoint": "U+EC31", 
-        "description": "Kievan ending symbol"
-    }, 
-    "kievanNote8thStemDown": {
-        "alternateCodepoint": "U+1D1E6", 
-        "codepoint": "U+EC3A", 
-        "description": "Kievan eighth note, stem down"
-    }, 
-    "kievanNote8thStemUp": {
-        "alternateCodepoint": "U+1D1E7", 
-        "codepoint": "U+EC39", 
-        "description": "Kievan eighth note, stem up"
-    }, 
-    "kievanNoteBeam": {
-        "codepoint": "U+EC3B", 
-        "description": "Kievan beam"
-    }, 
-    "kievanNoteHalfStaffLine": {
-        "alternateCodepoint": "U+1D1E3", 
-        "codepoint": "U+EC35", 
-        "description": "Kievan half note (on staff line)"
-    }, 
-    "kievanNoteHalfStaffSpace": {
-        "codepoint": "U+EC36", 
-        "description": "Kievan half note (in staff space)"
-    }, 
-    "kievanNoteQuarterStemDown": {
-        "alternateCodepoint": "U+1D1E4", 
-        "codepoint": "U+EC38", 
-        "description": "Kievan quarter note, stem down"
-    }, 
-    "kievanNoteQuarterStemUp": {
-        "alternateCodepoint": "U+1D1E5", 
-        "codepoint": "U+EC37", 
-        "description": "Kievan quarter note, stem up"
-    }, 
-    "kievanNoteReciting": {
-        "alternateCodepoint": "U+1D1E1", 
-        "codepoint": "U+EC32", 
-        "description": "Kievan reciting note"
-    }, 
-    "kievanNoteWhole": {
-        "alternateCodepoint": "U+1D1E2", 
-        "codepoint": "U+EC33", 
-        "description": "Kievan whole note"
-    }, 
-    "kievanNoteWholeFinal": {
-        "alternateCodepoint": "U+1D1E0", 
-        "codepoint": "U+EC34", 
-        "description": "Kievan final whole note"
-    }, 
-    "kodalyHandDo": {
-        "codepoint": "U+EC40", 
-        "description": "Do hand sign"
-    }, 
-    "kodalyHandFa": {
-        "codepoint": "U+EC43", 
-        "description": "Fa hand sign"
-    }, 
-    "kodalyHandLa": {
-        "codepoint": "U+EC45", 
-        "description": "La hand sign"
-    }, 
-    "kodalyHandMi": {
-        "codepoint": "U+EC42", 
-        "description": "Mi hand sign"
-    }, 
-    "kodalyHandRe": {
-        "codepoint": "U+EC41", 
-        "description": "Re hand sign"
-    }, 
-    "kodalyHandSo": {
-        "codepoint": "U+EC44", 
-        "description": "So hand sign"
-    }, 
-    "kodalyHandTi": {
-        "codepoint": "U+EC46", 
-        "description": "Ti hand sign"
-    }, 
-    "leftRepeatSmall": {
-        "codepoint": "U+E04C", 
-        "description": "Left repeat sign within bar"
-    }, 
-    "legerLine": {
-        "codepoint": "U+E022", 
-        "description": "Leger line"
-    }, 
-    "legerLineNarrow": {
-        "codepoint": "U+E024", 
-        "description": "Leger line (narrow)"
-    }, 
-    "legerLineWide": {
-        "codepoint": "U+E023", 
-        "description": "Leger line (wide)"
-    }, 
-    "luteBarlineEndRepeat": {
-        "codepoint": "U+EBA4", 
-        "description": "Lute tablature end repeat barline"
-    }, 
-    "luteBarlineFinal": {
-        "codepoint": "U+EBA5", 
-        "description": "Lute tablature final barline"
-    }, 
-    "luteBarlineStartRepeat": {
-        "codepoint": "U+EBA3", 
-        "description": "Lute tablature start repeat barline"
-    }, 
-    "luteDuration16th": {
-        "codepoint": "U+EBAB", 
-        "description": "16th note (semiquaver) duration sign"
-    }, 
-    "luteDuration32nd": {
-        "codepoint": "U+EBAC", 
-        "description": "32nd note (demisemiquaver) duration sign"
-    }, 
-    "luteDuration8th": {
-        "codepoint": "U+EBAA", 
-        "description": "Eighth note (quaver) duration sign"
-    }, 
-    "luteDurationDoubleWhole": {
-        "codepoint": "U+EBA6", 
-        "description": "Double whole note (breve) duration sign"
-    }, 
-    "luteDurationHalf": {
-        "codepoint": "U+EBA8", 
-        "description": "Half note (minim) duration sign"
-    }, 
-    "luteDurationQuarter": {
-        "codepoint": "U+EBA9", 
-        "description": "Quarter note (crotchet) duration sign"
-    }, 
-    "luteDurationWhole": {
-        "codepoint": "U+EBA7", 
-        "description": "Whole note (semibreve) duration sign"
-    }, 
-    "luteFingeringRHFirst": {
-        "codepoint": "U+EBAE", 
-        "description": "Right-hand fingering, first finger"
-    }, 
-    "luteFingeringRHSecond": {
-        "codepoint": "U+EBAF", 
-        "description": "Right-hand fingering, second finger"
-    }, 
-    "luteFingeringRHThird": {
-        "codepoint": "U+EBB0", 
-        "description": "Right-hand fingering, third finger"
-    }, 
-    "luteFingeringRHThumb": {
-        "codepoint": "U+EBAD", 
-        "description": "Right-hand fingering, thumb"
-    }, 
-    "luteFrench10thCourse": {
-        "codepoint": "U+EBD0", 
-        "description": "10th course (diapason)"
-    }, 
-    "luteFrench7thCourse": {
-        "codepoint": "U+EBCD", 
-        "description": "Seventh course (diapason)"
-    }, 
-    "luteFrench8thCourse": {
-        "codepoint": "U+EBCE", 
-        "description": "Eighth course (diapason)"
-    }, 
-    "luteFrench9thCourse": {
-        "codepoint": "U+EBCF", 
-        "description": "Ninth course (diapason)"
-    }, 
-    "luteFrenchAppoggiaturaAbove": {
-        "codepoint": "U+EBD5", 
-        "description": "Appoggiatura from above"
-    }, 
-    "luteFrenchAppoggiaturaBelow": {
-        "codepoint": "U+EBD4", 
-        "description": "Appoggiatura from below"
-    }, 
-    "luteFrenchFretA": {
-        "codepoint": "U+EBC0", 
-        "description": "Open string (a)"
-    }, 
-    "luteFrenchFretB": {
-        "codepoint": "U+EBC1", 
-        "description": "First fret (b)"
-    }, 
-    "luteFrenchFretC": {
-        "codepoint": "U+EBC2", 
-        "description": "Second fret (c)"
-    }, 
-    "luteFrenchFretD": {
-        "codepoint": "U+EBC3", 
-        "description": "Third fret (d)"
-    }, 
-    "luteFrenchFretE": {
-        "codepoint": "U+EBC4", 
-        "description": "Fourth fret (e)"
-    }, 
-    "luteFrenchFretF": {
-        "codepoint": "U+EBC5", 
-        "description": "Fifth fret (f)"
-    }, 
-    "luteFrenchFretG": {
-        "codepoint": "U+EBC6", 
-        "description": "Sixth fret (g)"
-    }, 
-    "luteFrenchFretH": {
-        "codepoint": "U+EBC7", 
-        "description": "Seventh fret (h)"
-    }, 
-    "luteFrenchFretI": {
-        "codepoint": "U+EBC8", 
-        "description": "Eighth fret (i)"
-    }, 
-    "luteFrenchFretK": {
-        "codepoint": "U+EBC9", 
-        "description": "Ninth fret (k)"
-    }, 
-    "luteFrenchFretL": {
-        "codepoint": "U+EBCA", 
-        "description": "10th fret (l)"
-    }, 
-    "luteFrenchFretM": {
-        "codepoint": "U+EBCB", 
-        "description": "11th fret (m)"
-    }, 
-    "luteFrenchFretN": {
-        "codepoint": "U+EBCC", 
-        "description": "12th fret (n)"
-    }, 
-    "luteFrenchMordentInverted": {
-        "codepoint": "U+EBD3", 
-        "description": "Inverted mordent"
-    }, 
-    "luteFrenchMordentLower": {
-        "codepoint": "U+EBD2", 
-        "description": "Mordent with lower auxiliary"
-    }, 
-    "luteFrenchMordentUpper": {
-        "codepoint": "U+EBD1", 
-        "description": "Mordent with upper auxiliary"
-    }, 
-    "luteGermanALower": {
-        "codepoint": "U+EC00", 
-        "description": "5th course, 1st fret (a)"
-    }, 
-    "luteGermanAUpper": {
-        "codepoint": "U+EC17", 
-        "description": "6th course, 1st fret (A)"
-    }, 
-    "luteGermanBLower": {
-        "codepoint": "U+EC01", 
-        "description": "4th course, 1st fret (b)"
-    }, 
-    "luteGermanBUpper": {
-        "codepoint": "U+EC18", 
-        "description": "6th course, 2nd fret (B)"
-    }, 
-    "luteGermanCLower": {
-        "codepoint": "U+EC02", 
-        "description": "3rd course, 1st fret (c)"
-    }, 
-    "luteGermanCUpper": {
-        "codepoint": "U+EC19", 
-        "description": "6th course, 3rd fret (C)"
-    }, 
-    "luteGermanDLower": {
-        "codepoint": "U+EC03", 
-        "description": "2nd course, 1st fret (d)"
-    }, 
-    "luteGermanDUpper": {
-        "codepoint": "U+EC1A", 
-        "description": "6th course, 4th fret (D)"
-    }, 
-    "luteGermanELower": {
-        "codepoint": "U+EC04", 
-        "description": "1st course, 1st fret (e)"
-    }, 
-    "luteGermanEUpper": {
-        "codepoint": "U+EC1B", 
-        "description": "6th course, 5th fret (E)"
-    }, 
-    "luteGermanFLower": {
-        "codepoint": "U+EC05", 
-        "description": "5th course, 2nd fret (f)"
-    }, 
-    "luteGermanFUpper": {
-        "codepoint": "U+EC1C", 
-        "description": "6th course, 6th fret (F)"
-    }, 
-    "luteGermanGLower": {
-        "codepoint": "U+EC06", 
-        "description": "4th course, 2nd fret (g)"
-    }, 
-    "luteGermanGUpper": {
-        "codepoint": "U+EC1D", 
-        "description": "6th course, 7th fret (G)"
-    }, 
-    "luteGermanHLower": {
-        "codepoint": "U+EC07", 
-        "description": "3rd course, 2nd fret (h)"
-    }, 
-    "luteGermanHUpper": {
-        "codepoint": "U+EC1E", 
-        "description": "6th course, 8th fret (H)"
-    }, 
-    "luteGermanILower": {
-        "codepoint": "U+EC08", 
-        "description": "2nd course, 2nd fret (i)"
-    }, 
-    "luteGermanIUpper": {
-        "codepoint": "U+EC1F", 
-        "description": "6th course, 9th fret (I)"
-    }, 
-    "luteGermanKLower": {
-        "codepoint": "U+EC09", 
-        "description": "1st course, 2nd fret (k)"
-    }, 
-    "luteGermanKUpper": {
-        "codepoint": "U+EC20", 
-        "description": "6th course, 10th fret (K)"
-    }, 
-    "luteGermanLLower": {
-        "codepoint": "U+EC0A", 
-        "description": "5th course, 3rd fret (l)"
-    }, 
-    "luteGermanLUpper": {
-        "codepoint": "U+EC21", 
-        "description": "6th course, 11th fret (L)"
-    }, 
-    "luteGermanMLower": {
-        "codepoint": "U+EC0B", 
-        "description": "4th course, 3rd fret (m)"
-    }, 
-    "luteGermanMUpper": {
-        "codepoint": "U+EC22", 
-        "description": "6th course, 12th fret (M)"
-    }, 
-    "luteGermanNLower": {
-        "codepoint": "U+EC0C", 
-        "description": "3rd course, 3rd fret (n)"
-    }, 
-    "luteGermanNUpper": {
-        "codepoint": "U+EC23", 
-        "description": "6th course, 13th fret (N)"
-    }, 
-    "luteGermanOLower": {
-        "codepoint": "U+EC0D", 
-        "description": "2nd course, 3rd fret (o)"
-    }, 
-    "luteGermanPLower": {
-        "codepoint": "U+EC0E", 
-        "description": "1st course, 3rd fret (p)"
-    }, 
-    "luteGermanQLower": {
-        "codepoint": "U+EC0F", 
-        "description": "5th course, 4th fret (q)"
-    }, 
-    "luteGermanRLower": {
-        "codepoint": "U+EC10", 
-        "description": "4th course, 4th fret (r)"
-    }, 
-    "luteGermanSLower": {
-        "codepoint": "U+EC11", 
-        "description": "3rd course, 4th fret (s)"
-    }, 
-    "luteGermanTLower": {
-        "codepoint": "U+EC12", 
-        "description": "2nd course, 4th fret (t)"
-    }, 
-    "luteGermanVLower": {
-        "codepoint": "U+EC13", 
-        "description": "1st course, 4th fret (v)"
-    }, 
-    "luteGermanXLower": {
-        "codepoint": "U+EC14", 
-        "description": "5th course, 5th fret (x)"
-    }, 
-    "luteGermanYLower": {
-        "codepoint": "U+EC15", 
-        "description": "4th course, 5th fret (y)"
-    }, 
-    "luteGermanZLower": {
-        "codepoint": "U+EC16", 
-        "description": "3rd course, 5th fret (z)"
-    }, 
-    "luteItalianClefCSolFaUt": {
-        "codepoint": "U+EBF1", 
-        "description": "C sol fa ut clef"
-    }, 
-    "luteItalianClefFFaUt": {
-        "codepoint": "U+EBF0", 
-        "description": "F fa ut clef"
-    }, 
-    "luteItalianFret0": {
-        "codepoint": "U+EBE0", 
-        "description": "Open string (0)"
-    }, 
-    "luteItalianFret1": {
-        "codepoint": "U+EBE1", 
-        "description": "First fret (1)"
-    }, 
-    "luteItalianFret2": {
-        "codepoint": "U+EBE2", 
-        "description": "Second fret (2)"
-    }, 
-    "luteItalianFret3": {
-        "codepoint": "U+EBE3", 
-        "description": "Third fret (3)"
-    }, 
-    "luteItalianFret4": {
-        "codepoint": "U+EBE4", 
-        "description": "Fourth fret (4)"
-    }, 
-    "luteItalianFret5": {
-        "codepoint": "U+EBE5", 
-        "description": "Fifth fret (5)"
-    }, 
-    "luteItalianFret6": {
-        "codepoint": "U+EBE6", 
-        "description": "Sixth fret (6)"
-    }, 
-    "luteItalianFret7": {
-        "codepoint": "U+EBE7", 
-        "description": "Seventh fret (7)"
-    }, 
-    "luteItalianFret8": {
-        "codepoint": "U+EBE8", 
-        "description": "Eighth fret (8)"
-    }, 
-    "luteItalianFret9": {
-        "codepoint": "U+EBE9", 
-        "description": "Ninth fret (9)"
-    }, 
-    "luteItalianHoldFinger": {
-        "codepoint": "U+EBF4", 
-        "description": "Hold finger in place"
-    }, 
-    "luteItalianHoldNote": {
-        "codepoint": "U+EBF3", 
-        "description": "Hold note"
-    }, 
-    "luteItalianReleaseFinger": {
-        "codepoint": "U+EBF5", 
-        "description": "Release finger"
-    }, 
-    "luteItalianTempoFast": {
-        "codepoint": "U+EBEA", 
-        "description": "Fast tempo indication (de Mudarra)"
-    }, 
-    "luteItalianTempoNeitherFastNorSlow": {
-        "codepoint": "U+EBEC", 
-        "description": "Neither fast nor slow tempo indication (de Mudarra)"
-    }, 
-    "luteItalianTempoSlow": {
-        "codepoint": "U+EBED", 
-        "description": "Slow tempo indication (de Mudarra)"
-    }, 
-    "luteItalianTempoSomewhatFast": {
-        "codepoint": "U+EBEB", 
-        "description": "Somewhat fast tempo indication (de Narvaez)"
-    }, 
-    "luteItalianTempoVerySlow": {
-        "codepoint": "U+EBEE", 
-        "description": "Very slow indication (de Narvaez)"
-    }, 
-    "luteItalianTimeTriple": {
-        "codepoint": "U+EBEF", 
-        "description": "Triple time indication"
-    }, 
-    "luteItalianTremolo": {
-        "codepoint": "U+EBF2", 
-        "description": "Single-finger tremolo or mordent"
-    }, 
-    "luteItalianVibrato": {
-        "codepoint": "U+EBF6", 
-        "description": "Vibrato (verre cass\u00e9)"
-    }, 
-    "luteStaff6Lines": {
-        "codepoint": "U+EBA0", 
-        "description": "Lute tablature staff, 6 courses"
-    }, 
-    "luteStaff6LinesNarrow": {
-        "codepoint": "U+EBA2", 
-        "description": "Lute tablature staff, 6 courses (narrow)"
-    }, 
-    "luteStaff6LinesWide": {
-        "codepoint": "U+EBA1", 
-        "description": "Lute tablature staff, 6 courses (wide)"
-    }, 
-    "lyricsElision": {
-        "codepoint": "U+E551", 
-        "description": "Elision"
-    }, 
-    "lyricsElisionNarrow": {
-        "codepoint": "U+E550", 
-        "description": "Narrow elision"
-    }, 
-    "lyricsElisionWide": {
-        "codepoint": "U+E552", 
-        "description": "Wide elision"
-    }, 
-    "lyricsHyphenBaseline": {
-        "codepoint": "U+E553", 
-        "description": "Baseline hyphen"
-    }, 
-    "lyricsHyphenBaselineNonBreaking": {
-        "codepoint": "U+E554", 
-        "description": "Non-breaking baseline hyphen"
-    }, 
-    "lyricsTextRepeat": {
-        "codepoint": "U+E555", 
-        "description": "Text repeats"
-    }, 
-    "medRenFlatHardB": {
-        "codepoint": "U+E9E1", 
-        "description": "Flat, hard b (mi)"
-    }, 
-    "medRenFlatSoftB": {
-        "alternateCodepoint": "U+1D1D2", 
-        "codepoint": "U+E9E0", 
-        "description": "Flat, soft b (fa)"
-    }, 
-    "medRenFlatWithDot": {
-        "codepoint": "U+E9E4", 
-        "description": "Flat with dot"
-    }, 
-    "medRenGClefCMN": {
-        "codepoint": "U+EA24", 
-        "description": "G clef (Corpus Monodicum)"
-    }, 
-    "medRenLiquescenceCMN": {
-        "codepoint": "U+EA22", 
-        "description": "Liquescence"
-    }, 
-    "medRenLiquescentAscCMN": {
-        "codepoint": "U+EA26", 
-        "description": "Liquescent ascending (Corpus Monodicum)"
-    }, 
-    "medRenLiquescentDescCMN": {
-        "codepoint": "U+EA27", 
-        "description": "Liquescent descending (Corpus Monodicum)"
-    }, 
-    "medRenNatural": {
-        "codepoint": "U+E9E2", 
-        "description": "Natural"
-    }, 
-    "medRenNaturalWithCross": {
-        "codepoint": "U+E9E5", 
-        "description": "Natural with interrupted cross"
-    }, 
-    "medRenOriscusCMN": {
-        "codepoint": "U+EA2A", 
-        "description": "Oriscus (Corpus Monodicum)"
-    }, 
-    "medRenPlicaCMN": {
-        "codepoint": "U+EA23", 
-        "description": "Plica"
-    }, 
-    "medRenPunctumCMN": {
-        "codepoint": "U+EA25", 
-        "description": "Punctum (Corpus Monodicum)"
-    }, 
-    "medRenQuilismaCMN": {
-        "codepoint": "U+EA28", 
-        "description": "Quilisma (Corpus Monodicum)"
-    }, 
-    "medRenSharpCroix": {
-        "alternateCodepoint": "U+1D1CF", 
-        "codepoint": "U+E9E3", 
-        "description": "Croix"
-    }, 
-    "medRenStrophicusCMN": {
-        "codepoint": "U+EA29", 
-        "description": "Strophicus (Corpus Monodicum)"
-    }, 
-    "mensuralAlterationSign": {
-        "codepoint": "U+EA10", 
-        "description": "Alteration sign"
-    }, 
-    "mensuralBlackBrevis": {
-        "codepoint": "U+E952", 
-        "description": "Black mensural brevis"
-    }, 
-    "mensuralBlackBrevisVoid": {
-        "codepoint": "U+E956", 
-        "description": "Black mensural void brevis"
-    }, 
-    "mensuralBlackDragma": {
-        "codepoint": "U+E95A", 
-        "description": "Black mensural dragma"
-    }, 
-    "mensuralBlackLonga": {
-        "codepoint": "U+E951", 
-        "description": "Black mensural longa"
-    }, 
-    "mensuralBlackMaxima": {
-        "codepoint": "U+E950", 
-        "description": "Black mensural maxima"
-    }, 
-    "mensuralBlackMinima": {
-        "alternateCodepoint": "U+1D1BC", 
-        "codepoint": "U+E954", 
-        "description": "Black mensural minima"
-    }, 
-    "mensuralBlackMinimaVoid": {
-        "alternateCodepoint": "U+1D1BB", 
-        "codepoint": "U+E958", 
-        "description": "Black mensural void minima"
-    }, 
-    "mensuralBlackSemibrevis": {
-        "alternateCodepoint": "U+1D1BA", 
-        "codepoint": "U+E953", 
-        "description": "Black mensural semibrevis"
-    }, 
-    "mensuralBlackSemibrevisCaudata": {
-        "codepoint": "U+E959", 
-        "description": "Black mensural semibrevis caudata"
-    }, 
-    "mensuralBlackSemibrevisOblique": {
-        "codepoint": "U+E95B", 
-        "description": "Black mensural oblique semibrevis"
-    }, 
-    "mensuralBlackSemibrevisVoid": {
-        "alternateCodepoint": "U+1D1B9", 
-        "codepoint": "U+E957", 
-        "description": "Black mensural void semibrevis"
-    }, 
-    "mensuralBlackSemiminima": {
-        "codepoint": "U+E955", 
-        "description": "Black mensural semiminima"
-    }, 
-    "mensuralCclef": {
-        "codepoint": "U+E905", 
-        "description": "Mensural C clef"
-    }, 
-    "mensuralCclefPetrucciPosHigh": {
-        "codepoint": "U+E90A", 
-        "description": "Petrucci C clef, high position"
-    }, 
-    "mensuralCclefPetrucciPosHighest": {
-        "codepoint": "U+E90B", 
-        "description": "Petrucci C clef, highest position"
-    }, 
-    "mensuralCclefPetrucciPosLow": {
-        "codepoint": "U+E908", 
-        "description": "Petrucci C clef, low position"
-    }, 
-    "mensuralCclefPetrucciPosLowest": {
-        "codepoint": "U+E907", 
-        "description": "Petrucci C clef, lowest position"
-    }, 
-    "mensuralCclefPetrucciPosMiddle": {
-        "codepoint": "U+E909", 
-        "description": "Petrucci C clef, middle position"
-    }, 
-    "mensuralColorationEndRound": {
-        "codepoint": "U+EA0F", 
-        "description": "Coloration end, round"
-    }, 
-    "mensuralColorationEndSquare": {
-        "codepoint": "U+EA0D", 
-        "description": "Coloration end, square"
-    }, 
-    "mensuralColorationStartRound": {
-        "codepoint": "U+EA0E", 
-        "description": "Coloration start, round"
-    }, 
-    "mensuralColorationStartSquare": {
-        "codepoint": "U+EA0C", 
-        "description": "Coloration start, square"
-    }, 
-    "mensuralCombStemDiagonal": {
-        "codepoint": "U+E940", 
-        "description": "Combining stem diagonal"
-    }, 
-    "mensuralCombStemDown": {
-        "codepoint": "U+E93F", 
-        "description": "Combining stem down"
-    }, 
-    "mensuralCombStemDownFlagExtended": {
-        "codepoint": "U+E948", 
-        "description": "Combining stem with extended flag down"
-    }, 
-    "mensuralCombStemDownFlagFlared": {
-        "codepoint": "U+E946", 
-        "description": "Combining stem with flared flag down"
-    }, 
-    "mensuralCombStemDownFlagFusa": {
-        "codepoint": "U+E94C", 
-        "description": "Combining stem with fusa flag down"
-    }, 
-    "mensuralCombStemDownFlagLeft": {
-        "codepoint": "U+E944", 
-        "description": "Combining stem with flag left down"
-    }, 
-    "mensuralCombStemDownFlagRight": {
-        "codepoint": "U+E942", 
-        "description": "Combining stem with flag right down"
-    }, 
-    "mensuralCombStemDownFlagSemiminima": {
-        "codepoint": "U+E94A", 
-        "description": "Combining stem with semiminima flag down"
-    }, 
-    "mensuralCombStemUp": {
-        "codepoint": "U+E93E", 
-        "description": "Combining stem up"
-    }, 
-    "mensuralCombStemUpFlagExtended": {
-        "codepoint": "U+E947", 
-        "description": "Combining stem with extended flag up"
-    }, 
-    "mensuralCombStemUpFlagFlared": {
-        "codepoint": "U+E945", 
-        "description": "Combining stem with flared flag up"
-    }, 
-    "mensuralCombStemUpFlagFusa": {
-        "codepoint": "U+E94B", 
-        "description": "Combining stem with fusa flag up"
-    }, 
-    "mensuralCombStemUpFlagLeft": {
-        "codepoint": "U+E943", 
-        "description": "Combining stem with flag left up"
-    }, 
-    "mensuralCombStemUpFlagRight": {
-        "codepoint": "U+E941", 
-        "description": "Combining stem with flag right up"
-    }, 
-    "mensuralCombStemUpFlagSemiminima": {
-        "codepoint": "U+E949", 
-        "description": "Combining stem with semiminima flag up"
-    }, 
-    "mensuralCustosCheckmark": {
-        "codepoint": "U+EA0A", 
-        "description": "Checkmark custos"
-    }, 
-    "mensuralCustosDown": {
-        "codepoint": "U+EA03", 
-        "description": "Mensural custos down"
-    }, 
-    "mensuralCustosTurn": {
-        "codepoint": "U+EA0B", 
-        "description": "Turn-like custos"
-    }, 
-    "mensuralCustosUp": {
-        "codepoint": "U+EA02", 
-        "description": "Mensural custos up"
-    }, 
-    "mensuralFclef": {
-        "codepoint": "U+E903", 
-        "description": "Mensural F clef"
-    }, 
-    "mensuralFclefPetrucci": {
-        "codepoint": "U+E904", 
-        "description": "Petrucci F clef"
-    }, 
-    "mensuralGclef": {
-        "codepoint": "U+E900", 
-        "description": "Mensural G clef"
-    }, 
-    "mensuralGclefPetrucci": {
-        "codepoint": "U+E901", 
-        "description": "Petrucci G clef"
-    }, 
-    "mensuralModusImperfectumVert": {
-        "codepoint": "U+E92D", 
-        "description": "Modus imperfectum, vertical"
-    }, 
-    "mensuralModusPerfectumVert": {
-        "codepoint": "U+E92C", 
-        "description": "Modus perfectum, vertical"
-    }, 
-    "mensuralNoteheadLongaBlack": {
-        "codepoint": "U+E934", 
-        "description": "Longa/brevis notehead, black"
-    }, 
-    "mensuralNoteheadLongaBlackVoid": {
-        "codepoint": "U+E936", 
-        "description": "Longa/brevis notehead, black and void"
-    }, 
-    "mensuralNoteheadLongaVoid": {
-        "alternateCodepoint": "U+1D1B7", 
-        "codepoint": "U+E935", 
-        "description": "Longa/brevis notehead, void"
-    }, 
-    "mensuralNoteheadLongaWhite": {
-        "codepoint": "U+E937", 
-        "description": "Longa/brevis notehead, white"
-    }, 
-    "mensuralNoteheadMaximaBlack": {
-        "codepoint": "U+E930", 
-        "description": "Maxima notehead, black"
-    }, 
-    "mensuralNoteheadMaximaBlackVoid": {
-        "codepoint": "U+E932", 
-        "description": "Maxima notehead, black and void"
-    }, 
-    "mensuralNoteheadMaximaVoid": {
-        "alternateCodepoint": "U+1D1B6", 
-        "codepoint": "U+E931", 
-        "description": "Maxima notehead, void"
-    }, 
-    "mensuralNoteheadMaximaWhite": {
-        "codepoint": "U+E933", 
-        "description": "Maxima notehead, white"
-    }, 
-    "mensuralNoteheadMinimaWhite": {
-        "codepoint": "U+E93C", 
-        "description": "Minima notehead, white"
-    }, 
-    "mensuralNoteheadSemibrevisBlack": {
-        "alternateCodepoint": "U+1D1BA", 
-        "codepoint": "U+E938", 
-        "description": "Semibrevis notehead, black"
-    }, 
-    "mensuralNoteheadSemibrevisBlackVoid": {
-        "codepoint": "U+E93A", 
-        "description": "Semibrevis notehead, black and void"
-    }, 
-    "mensuralNoteheadSemibrevisBlackVoidTurned": {
-        "codepoint": "U+E93B", 
-        "description": "Semibrevis notehead, black and void (turned)"
-    }, 
-    "mensuralNoteheadSemibrevisVoid": {
-        "alternateCodepoint": "U+1D1B9", 
-        "codepoint": "U+E939", 
-        "description": "Semibrevis notehead, void"
-    }, 
-    "mensuralNoteheadSemiminimaWhite": {
-        "codepoint": "U+E93D", 
-        "description": "Semiminima/fusa notehead, white"
-    }, 
-    "mensuralObliqueAsc2ndBlack": {
-        "codepoint": "U+E970", 
-        "description": "Oblique form, ascending 2nd, black"
-    }, 
-    "mensuralObliqueAsc2ndBlackVoid": {
-        "codepoint": "U+E972", 
-        "description": "Oblique form, ascending 2nd, black and void"
-    }, 
-    "mensuralObliqueAsc2ndVoid": {
-        "codepoint": "U+E971", 
-        "description": "Oblique form, ascending 2nd, void"
-    }, 
-    "mensuralObliqueAsc2ndWhite": {
-        "codepoint": "U+E973", 
-        "description": "Oblique form, ascending 2nd, white"
-    }, 
-    "mensuralObliqueAsc3rdBlack": {
-        "codepoint": "U+E974", 
-        "description": "Oblique form, ascending 3rd, black"
-    }, 
-    "mensuralObliqueAsc3rdBlackVoid": {
-        "codepoint": "U+E976", 
-        "description": "Oblique form, ascending 3rd, black and void"
-    }, 
-    "mensuralObliqueAsc3rdVoid": {
-        "codepoint": "U+E975", 
-        "description": "Oblique form, ascending 3rd, void"
-    }, 
-    "mensuralObliqueAsc3rdWhite": {
-        "codepoint": "U+E977", 
-        "description": "Oblique form, ascending 3rd, white"
-    }, 
-    "mensuralObliqueAsc4thBlack": {
-        "codepoint": "U+E978", 
-        "description": "Oblique form, ascending 4th, black"
-    }, 
-    "mensuralObliqueAsc4thBlackVoid": {
-        "codepoint": "U+E97A", 
-        "description": "Oblique form, ascending 4th, black and void"
-    }, 
-    "mensuralObliqueAsc4thVoid": {
-        "codepoint": "U+E979", 
-        "description": "Oblique form, ascending 4th, void"
-    }, 
-    "mensuralObliqueAsc4thWhite": {
-        "codepoint": "U+E97B", 
-        "description": "Oblique form, ascending 4th, white"
-    }, 
-    "mensuralObliqueAsc5thBlack": {
-        "codepoint": "U+E97C", 
-        "description": "Oblique form, ascending 5th, black"
-    }, 
-    "mensuralObliqueAsc5thBlackVoid": {
-        "codepoint": "U+E97E", 
-        "description": "Oblique form, ascending 5th, black and void"
-    }, 
-    "mensuralObliqueAsc5thVoid": {
-        "codepoint": "U+E97D", 
-        "description": "Oblique form, ascending 5th, void"
-    }, 
-    "mensuralObliqueAsc5thWhite": {
-        "codepoint": "U+E97F", 
-        "description": "Oblique form, ascending 5th, white"
-    }, 
-    "mensuralObliqueDesc2ndBlack": {
-        "codepoint": "U+E980", 
-        "description": "Oblique form, descending 2nd, black"
-    }, 
-    "mensuralObliqueDesc2ndBlackVoid": {
-        "codepoint": "U+E982", 
-        "description": "Oblique form, descending 2nd, black and void"
-    }, 
-    "mensuralObliqueDesc2ndVoid": {
-        "codepoint": "U+E981", 
-        "description": "Oblique form, descending 2nd, void"
-    }, 
-    "mensuralObliqueDesc2ndWhite": {
-        "codepoint": "U+E983", 
-        "description": "Oblique form, descending 2nd, white"
-    }, 
-    "mensuralObliqueDesc3rdBlack": {
-        "codepoint": "U+E984", 
-        "description": "Oblique form, descending 3rd, black"
-    }, 
-    "mensuralObliqueDesc3rdBlackVoid": {
-        "codepoint": "U+E986", 
-        "description": "Oblique form, descending 3rd, black and void"
-    }, 
-    "mensuralObliqueDesc3rdVoid": {
-        "codepoint": "U+E985", 
-        "description": "Oblique form, descending 3rd, void"
-    }, 
-    "mensuralObliqueDesc3rdWhite": {
-        "codepoint": "U+E987", 
-        "description": "Oblique form, descending 3rd, white"
-    }, 
-    "mensuralObliqueDesc4thBlack": {
-        "codepoint": "U+E988", 
-        "description": "Oblique form, descending 4th, black"
-    }, 
-    "mensuralObliqueDesc4thBlackVoid": {
-        "codepoint": "U+E98A", 
-        "description": "Oblique form, descending 4th, black and void"
-    }, 
-    "mensuralObliqueDesc4thVoid": {
-        "codepoint": "U+E989", 
-        "description": "Oblique form, descending 4th, void"
-    }, 
-    "mensuralObliqueDesc4thWhite": {
-        "codepoint": "U+E98B", 
-        "description": "Oblique form, descending 4th, white"
-    }, 
-    "mensuralObliqueDesc5thBlack": {
-        "codepoint": "U+E98C", 
-        "description": "Oblique form, descending 5th, black"
-    }, 
-    "mensuralObliqueDesc5thBlackVoid": {
-        "codepoint": "U+E98E", 
-        "description": "Oblique form, descending 5th, black and void"
-    }, 
-    "mensuralObliqueDesc5thVoid": {
-        "codepoint": "U+E98D", 
-        "description": "Oblique form, descending 5th, void"
-    }, 
-    "mensuralObliqueDesc5thWhite": {
-        "codepoint": "U+E98F", 
-        "description": "Oblique form, descending 5th, white"
-    }, 
-    "mensuralProlation1": {
-        "alternateCodepoint": "U+1D1C7", 
-        "codepoint": "U+E910", 
-        "description": "Tempus perfectum cum prolatione perfecta (9/8)"
-    }, 
-    "mensuralProlation10": {
-        "alternateCodepoint": "U+1D1CE", 
-        "codepoint": "U+E919", 
-        "description": "Tempus imperfectum cum prolatione imperfecta diminution 4"
-    }, 
-    "mensuralProlation11": {
-        "codepoint": "U+E91A", 
-        "description": "Tempus imperfectum cum prolatione imperfecta diminution 5"
-    }, 
-    "mensuralProlation2": {
-        "alternateCodepoint": "U+1D1C8", 
-        "codepoint": "U+E911", 
-        "description": "Tempus perfectum cum prolatione imperfecta (3/4)"
-    }, 
-    "mensuralProlation3": {
-        "alternateCodepoint": "U+1D1C9", 
-        "codepoint": "U+E912", 
-        "description": "Tempus perfectum cum prolatione imperfecta diminution 1 (3/8)"
-    }, 
-    "mensuralProlation4": {
-        "codepoint": "U+E913", 
-        "description": "Tempus perfectum cum prolatione perfecta diminution 2 (9/16)"
-    }, 
-    "mensuralProlation5": {
-        "alternateCodepoint": "U+1D1CA", 
-        "codepoint": "U+E914", 
-        "description": "Tempus imperfectum cum prolatione perfecta (6/8)"
-    }, 
-    "mensuralProlation6": {
-        "alternateCodepoint": "U+1D1CB", 
-        "codepoint": "U+E915", 
-        "description": "Tempus imperfectum cum prolatione imperfecta (2/4)"
-    }, 
-    "mensuralProlation7": {
-        "alternateCodepoint": "U+1D1CC", 
-        "codepoint": "U+E916", 
-        "description": "Tempus imperfectum cum prolatione imperfecta diminution 1 (2/2)"
-    }, 
-    "mensuralProlation8": {
-        "codepoint": "U+E917", 
-        "description": "Tempus imperfectum cum prolatione imperfecta diminution 2 (6/16)"
-    }, 
-    "mensuralProlation9": {
-        "alternateCodepoint": "U+1D1CD", 
-        "codepoint": "U+E918", 
-        "description": "Tempus imperfectum cum prolatione imperfecta diminution 3 (2/2)"
-    }, 
-    "mensuralProlationCombiningDot": {
-        "codepoint": "U+E920", 
-        "description": "Combining dot"
-    }, 
-    "mensuralProlationCombiningDotVoid": {
-        "codepoint": "U+E924", 
-        "description": "Combining void dot"
-    }, 
-    "mensuralProlationCombiningStroke": {
-        "codepoint": "U+E925", 
-        "description": "Combining vertical stroke"
-    }, 
-    "mensuralProlationCombiningThreeDots": {
-        "codepoint": "U+E922", 
-        "description": "Combining three dots horizontal"
-    }, 
-    "mensuralProlationCombiningThreeDotsTri": {
-        "codepoint": "U+E923", 
-        "description": "Combining three dots triangular"
-    }, 
-    "mensuralProlationCombiningTwoDots": {
-        "codepoint": "U+E921", 
-        "description": "Combining two dots"
-    }, 
-    "mensuralProportion1": {
-        "codepoint": "U+E926", 
-        "description": "Mensural proportion 1"
-    }, 
-    "mensuralProportion2": {
-        "codepoint": "U+E927", 
-        "description": "Mensural proportion 2"
-    }, 
-    "mensuralProportion3": {
-        "codepoint": "U+E928", 
-        "description": "Mensural proportion 3"
-    }, 
-    "mensuralProportion4": {
-        "codepoint": "U+E929", 
-        "description": "Mensural proportion 4"
-    }, 
-    "mensuralProportionMajor": {
-        "codepoint": "U+E92B", 
-        "description": "Mensural proportion major"
-    }, 
-    "mensuralProportionMinor": {
-        "codepoint": "U+E92A", 
-        "description": "Mensural proportion minor"
-    }, 
-    "mensuralProportionProportioDupla1": {
-        "codepoint": "U+E91C", 
-        "description": "Proportio dupla 1"
-    }, 
-    "mensuralProportionProportioDupla2": {
-        "codepoint": "U+E91D", 
-        "description": "Proportio dupla 2"
-    }, 
-    "mensuralProportionProportioQuadrupla": {
-        "codepoint": "U+E91F", 
-        "description": "Proportio quadrupla"
-    }, 
-    "mensuralProportionProportioTripla": {
-        "codepoint": "U+E91E", 
-        "description": "Proportio tripla"
-    }, 
-    "mensuralProportionTempusPerfectum": {
-        "codepoint": "U+E91B", 
-        "description": "Tempus perfectum"
-    }, 
-    "mensuralRestBrevis": {
-        "alternateCodepoint": "U+1D1C3", 
-        "codepoint": "U+E9F3", 
-        "description": "Brevis rest"
-    }, 
-    "mensuralRestFusa": {
-        "codepoint": "U+E9F7", 
-        "description": "Fusa rest"
-    }, 
-    "mensuralRestLongaImperfecta": {
-        "alternateCodepoint": "U+1D1C2", 
-        "codepoint": "U+E9F2", 
-        "description": "Longa imperfecta rest"
-    }, 
-    "mensuralRestLongaPerfecta": {
-        "alternateCodepoint": "U+1D1C1", 
-        "codepoint": "U+E9F1", 
-        "description": "Longa perfecta rest"
-    }, 
-    "mensuralRestMaxima": {
-        "codepoint": "U+E9F0", 
-        "description": "Maxima rest"
-    }, 
-    "mensuralRestMinima": {
-        "alternateCodepoint": "U+1D1C5", 
-        "codepoint": "U+E9F5", 
-        "description": "Minima rest"
-    }, 
-    "mensuralRestSemibrevis": {
-        "alternateCodepoint": "U+1D1C4", 
-        "codepoint": "U+E9F4", 
-        "description": "Semibrevis rest"
-    }, 
-    "mensuralRestSemifusa": {
-        "codepoint": "U+E9F8", 
-        "description": "Semifusa rest"
-    }, 
-    "mensuralRestSemiminima": {
-        "alternateCodepoint": "U+1D1C6", 
-        "codepoint": "U+E9F6", 
-        "description": "Semiminima rest"
-    }, 
-    "mensuralSignumDown": {
-        "codepoint": "U+EA01", 
-        "description": "Signum congruentiae down"
-    }, 
-    "mensuralSignumUp": {
-        "codepoint": "U+EA00", 
-        "description": "Signum congruentiae up"
-    }, 
-    "mensuralTempusImperfectumHoriz": {
-        "codepoint": "U+E92F", 
-        "description": "Tempus imperfectum, horizontal"
-    }, 
-    "mensuralTempusPerfectumHoriz": {
-        "codepoint": "U+E92E", 
-        "description": "Tempus perfectum, horizontal"
-    }, 
-    "mensuralWhiteBrevis": {
-        "alternateCodepoint": "U+1D1B8", 
-        "codepoint": "U+E95E", 
-        "description": "White mensural brevis"
-    }, 
-    "mensuralWhiteFusa": {
-        "alternateCodepoint": "U+1D1BE", 
-        "codepoint": "U+E961", 
-        "description": "White mensural fusa"
-    }, 
-    "mensuralWhiteLonga": {
-        "alternateCodepoint": "U+1D1B7", 
-        "codepoint": "U+E95D", 
-        "description": "White mensural longa"
-    }, 
-    "mensuralWhiteMaxima": {
-        "alternateCodepoint": "U+1D1B6", 
-        "codepoint": "U+E95C", 
-        "description": "White mensural maxima"
-    }, 
-    "mensuralWhiteMinima": {
-        "codepoint": "U+E95F", 
-        "description": "White mensural minima"
-    }, 
-    "mensuralWhiteSemiminima": {
-        "alternateCodepoint": "U+1D1BC", 
-        "codepoint": "U+E960", 
-        "description": "White mensural semiminima"
-    }, 
-    "metAugmentationDot": {
-        "codepoint": "U+ECB7", 
-        "description": "Augmentation dot"
-    }, 
-    "metNote1024thDown": {
-        "codepoint": "U+ECB6", 
-        "description": "1024th note (semihemidemisemihemidemisemiquaver) stem down"
-    }, 
-    "metNote1024thUp": {
-        "codepoint": "U+ECB5", 
-        "description": "1024th note (semihemidemisemihemidemisemiquaver) stem up"
-    }, 
-    "metNote128thDown": {
-        "codepoint": "U+ECB0", 
-        "description": "128th note (semihemidemisemiquaver) stem down"
-    }, 
-    "metNote128thUp": {
-        "codepoint": "U+ECAF", 
-        "description": "128th note (semihemidemisemiquaver) stem up"
-    }, 
-    "metNote16thDown": {
-        "codepoint": "U+ECAA", 
-        "description": "16th note (semiquaver) stem down"
-    }, 
-    "metNote16thUp": {
-        "codepoint": "U+ECA9", 
-        "description": "16th note (semiquaver) stem up"
-    }, 
-    "metNote256thDown": {
-        "codepoint": "U+ECB2", 
-        "description": "256th note (demisemihemidemisemiquaver) stem down"
-    }, 
-    "metNote256thUp": {
-        "codepoint": "U+ECB1", 
-        "description": "256th note (demisemihemidemisemiquaver) stem up"
-    }, 
-    "metNote32ndDown": {
-        "codepoint": "U+ECAC", 
-        "description": "32nd note (demisemiquaver) stem down"
-    }, 
-    "metNote32ndUp": {
-        "codepoint": "U+ECAB", 
-        "description": "32nd note (demisemiquaver) stem up"
-    }, 
-    "metNote512thDown": {
-        "codepoint": "U+ECB4", 
-        "description": "512th note (hemidemisemihemidemisemiquaver) stem down"
-    }, 
-    "metNote512thUp": {
-        "codepoint": "U+ECB3", 
-        "description": "512th note (hemidemisemihemidemisemiquaver) stem up"
-    }, 
-    "metNote64thDown": {
-        "codepoint": "U+ECAE", 
-        "description": "64th note (hemidemisemiquaver) stem down"
-    }, 
-    "metNote64thUp": {
-        "codepoint": "U+ECAD", 
-        "description": "64th note (hemidemisemiquaver) stem up"
-    }, 
-    "metNote8thDown": {
-        "codepoint": "U+ECA8", 
-        "description": "Eighth note (quaver) stem down"
-    }, 
-    "metNote8thUp": {
-        "codepoint": "U+ECA7", 
-        "description": "Eighth note (quaver) stem up"
-    }, 
-    "metNoteDoubleWhole": {
-        "codepoint": "U+ECA0", 
-        "description": "Double whole note (breve)"
-    }, 
-    "metNoteDoubleWholeSquare": {
-        "codepoint": "U+ECA1", 
-        "description": "Double whole note (square)"
-    }, 
-    "metNoteHalfDown": {
-        "codepoint": "U+ECA4", 
-        "description": "Half note (minim) stem down"
-    }, 
-    "metNoteHalfUp": {
-        "codepoint": "U+ECA3", 
-        "description": "Half note (minim) stem up"
-    }, 
-    "metNoteQuarterDown": {
-        "codepoint": "U+ECA6", 
-        "description": "Quarter note (crotchet) stem down"
-    }, 
-    "metNoteQuarterUp": {
-        "codepoint": "U+ECA5", 
-        "description": "Quarter note (crotchet) stem up"
-    }, 
-    "metNoteWhole": {
-        "codepoint": "U+ECA2", 
-        "description": "Whole note (semibreve)"
-    }, 
-    "metricModulationArrowLeft": {
-        "codepoint": "U+EC63", 
-        "description": "Left-pointing arrow for metric modulation"
-    }, 
-    "metricModulationArrowRight": {
-        "codepoint": "U+EC64", 
-        "description": "Right-pointing arrow for metric modulation"
-    }, 
-    "miscDoNotCopy": {
-        "codepoint": "U+EC61", 
-        "description": "Do not copy"
-    }, 
-    "miscDoNotPhotocopy": {
-        "codepoint": "U+EC60", 
-        "description": "Do not photocopy"
-    }, 
-    "miscEyeglasses": {
-        "codepoint": "U+EC62", 
-        "description": "Eyeglasses"
-    }, 
-    "note1024thDown": {
-        "codepoint": "U+E1E6", 
-        "description": "1024th note (semihemidemisemihemidemisemiquaver) stem down"
-    }, 
-    "note1024thUp": {
-        "codepoint": "U+E1E5", 
-        "description": "1024th note (semihemidemisemihemidemisemiquaver) stem up"
-    }, 
-    "note128thDown": {
-        "codepoint": "U+E1E0", 
-        "description": "128th note (semihemidemisemiquaver) stem down"
-    }, 
-    "note128thUp": {
-        "alternateCodepoint": "U+1D164", 
-        "codepoint": "U+E1DF", 
-        "description": "128th note (semihemidemisemiquaver) stem up"
-    }, 
-    "note16thDown": {
-        "codepoint": "U+E1DA", 
-        "description": "16th note (semiquaver) stem down"
-    }, 
-    "note16thUp": {
-        "alternateCodepoint": "U+1D161", 
-        "codepoint": "U+E1D9", 
-        "description": "16th note (semiquaver) stem up"
-    }, 
-    "note256thDown": {
-        "codepoint": "U+E1E2", 
-        "description": "256th note (demisemihemidemisemiquaver) stem down"
-    }, 
-    "note256thUp": {
-        "codepoint": "U+E1E1", 
-        "description": "256th note (demisemihemidemisemiquaver) stem up"
-    }, 
-    "note32ndDown": {
-        "codepoint": "U+E1DC", 
-        "description": "32nd note (demisemiquaver) stem down"
-    }, 
-    "note32ndUp": {
-        "alternateCodepoint": "U+1D162", 
-        "codepoint": "U+E1DB", 
-        "description": "32nd note (demisemiquaver) stem up"
-    }, 
-    "note512thDown": {
-        "codepoint": "U+E1E4", 
-        "description": "512th note (hemidemisemihemidemisemiquaver) stem down"
-    }, 
-    "note512thUp": {
-        "codepoint": "U+E1E3", 
-        "description": "512th note (hemidemisemihemidemisemiquaver) stem up"
-    }, 
-    "note64thDown": {
-        "codepoint": "U+E1DE", 
-        "description": "64th note (hemidemisemiquaver) stem down"
-    }, 
-    "note64thUp": {
-        "alternateCodepoint": "U+1D163", 
-        "codepoint": "U+E1DD", 
-        "description": "64th note (hemidemisemiquaver) stem up"
-    }, 
-    "note8thDown": {
-        "codepoint": "U+E1D8", 
-        "description": "Eighth note (quaver) stem down"
-    }, 
-    "note8thUp": {
-        "alternateCodepoint": "U+1D160", 
-        "codepoint": "U+E1D7", 
-        "description": "Eighth note (quaver) stem up"
-    }, 
-    "noteABlack": {
-        "codepoint": "U+E197", 
-        "description": "A (black note)"
-    }, 
-    "noteAFlatBlack": {
-        "codepoint": "U+E196", 
-        "description": "A flat (black note)"
-    }, 
-    "noteAFlatHalf": {
-        "codepoint": "U+E17F", 
-        "description": "A flat (half note)"
-    }, 
-    "noteAFlatWhole": {
-        "codepoint": "U+E168", 
-        "description": "A flat (whole note)"
-    }, 
-    "noteAHalf": {
-        "codepoint": "U+E180", 
-        "description": "A (half note)"
-    }, 
-    "noteASharpBlack": {
-        "codepoint": "U+E198", 
-        "description": "A sharp (black note)"
-    }, 
-    "noteASharpHalf": {
-        "codepoint": "U+E181", 
-        "description": "A sharp (half note)"
-    }, 
-    "noteASharpWhole": {
-        "codepoint": "U+E16A", 
-        "description": "A sharp (whole note)"
-    }, 
-    "noteAWhole": {
-        "codepoint": "U+E169", 
-        "description": "A (whole note)"
-    }, 
-    "noteBBlack": {
-        "codepoint": "U+E19A", 
-        "description": "B (black note)"
-    }, 
-    "noteBFlatBlack": {
-        "codepoint": "U+E199", 
-        "description": "B flat (black note)"
-    }, 
-    "noteBFlatHalf": {
-        "codepoint": "U+E182", 
-        "description": "B flat (half note)"
-    }, 
-    "noteBFlatWhole": {
-        "codepoint": "U+E16B", 
-        "description": "B flat (whole note)"
-    }, 
-    "noteBHalf": {
-        "codepoint": "U+E183", 
-        "description": "B (half note)"
-    }, 
-    "noteBSharpBlack": {
-        "codepoint": "U+E19B", 
-        "description": "B sharp (black note)"
-    }, 
-    "noteBSharpHalf": {
-        "codepoint": "U+E184", 
-        "description": "B sharp (half note)"
-    }, 
-    "noteBSharpWhole": {
-        "codepoint": "U+E16D", 
-        "description": "B sharp (whole note)"
-    }, 
-    "noteBWhole": {
-        "codepoint": "U+E16C", 
-        "description": "B (whole note)"
-    }, 
-    "noteCBlack": {
-        "codepoint": "U+E19D", 
-        "description": "C (black note)"
-    }, 
-    "noteCFlatBlack": {
-        "codepoint": "U+E19C", 
-        "description": "C flat (black note)"
-    }, 
-    "noteCFlatHalf": {
-        "codepoint": "U+E185", 
-        "description": "C flat (half note)"
-    }, 
-    "noteCFlatWhole": {
-        "codepoint": "U+E16E", 
-        "description": "C flat (whole note)"
-    }, 
-    "noteCHalf": {
-        "codepoint": "U+E186", 
-        "description": "C (half note)"
-    }, 
-    "noteCSharpBlack": {
-        "codepoint": "U+E19E", 
-        "description": "C sharp (black note)"
-    }, 
-    "noteCSharpHalf": {
-        "codepoint": "U+E187", 
-        "description": "C sharp (half note)"
-    }, 
-    "noteCSharpWhole": {
-        "codepoint": "U+E170", 
-        "description": "C sharp (whole note)"
-    }, 
-    "noteCWhole": {
-        "codepoint": "U+E16F", 
-        "description": "C (whole note)"
-    }, 
-    "noteDBlack": {
-        "codepoint": "U+E1A0", 
-        "description": "D (black note)"
-    }, 
-    "noteDFlatBlack": {
-        "codepoint": "U+E19F", 
-        "description": "D flat (black note)"
-    }, 
-    "noteDFlatHalf": {
-        "codepoint": "U+E188", 
-        "description": "D flat (half note)"
-    }, 
-    "noteDFlatWhole": {
-        "codepoint": "U+E171", 
-        "description": "D flat (whole note)"
-    }, 
-    "noteDHalf": {
-        "codepoint": "U+E189", 
-        "description": "D (half note)"
-    }, 
-    "noteDSharpBlack": {
-        "codepoint": "U+E1A1", 
-        "description": "D sharp (black note)"
-    }, 
-    "noteDSharpHalf": {
-        "codepoint": "U+E18A", 
-        "description": "D sharp (half note)"
-    }, 
-    "noteDSharpWhole": {
-        "codepoint": "U+E173", 
-        "description": "D sharp (whole note)"
-    }, 
-    "noteDWhole": {
-        "codepoint": "U+E172", 
-        "description": "D (whole note)"
-    }, 
-    "noteDoBlack": {
-        "codepoint": "U+E160", 
-        "description": "Do (black note)"
-    }, 
-    "noteDoHalf": {
-        "codepoint": "U+E158", 
-        "description": "Do (half note)"
-    }, 
-    "noteDoWhole": {
-        "codepoint": "U+E150", 
-        "description": "Do (whole note)"
-    }, 
-    "noteDoubleWhole": {
-        "alternateCodepoint": "U+1D15C", 
-        "codepoint": "U+E1D0", 
-        "description": "Double whole note (breve)"
-    }, 
-    "noteDoubleWholeSquare": {
-        "codepoint": "U+E1D1", 
-        "description": "Double whole note (square)"
-    }, 
-    "noteEBlack": {
-        "codepoint": "U+E1A3", 
-        "description": "E (black note)"
-    }, 
-    "noteEFlatBlack": {
-        "codepoint": "U+E1A2", 
-        "description": "E flat (black note)"
-    }, 
-    "noteEFlatHalf": {
-        "codepoint": "U+E18B", 
-        "description": "E flat (half note)"
-    }, 
-    "noteEFlatWhole": {
-        "codepoint": "U+E174", 
-        "description": "E flat (whole note)"
-    }, 
-    "noteEHalf": {
-        "codepoint": "U+E18C", 
-        "description": "E (half note)"
-    }, 
-    "noteESharpBlack": {
-        "codepoint": "U+E1A4", 
-        "description": "E sharp (black note)"
-    }, 
-    "noteESharpHalf": {
-        "codepoint": "U+E18D", 
-        "description": "E sharp (half note)"
-    }, 
-    "noteESharpWhole": {
-        "codepoint": "U+E176", 
-        "description": "E sharp (whole note)"
-    }, 
-    "noteEWhole": {
-        "codepoint": "U+E175", 
-        "description": "E (whole note)"
-    }, 
-    "noteEmptyBlack": {
-        "codepoint": "U+E1AF", 
-        "description": "Empty black note"
-    }, 
-    "noteEmptyHalf": {
-        "codepoint": "U+E1AE", 
-        "description": "Empty half note"
-    }, 
-    "noteEmptyWhole": {
-        "codepoint": "U+E1AD", 
-        "description": "Empty whole note"
-    }, 
-    "noteFBlack": {
-        "codepoint": "U+E1A6", 
-        "description": "F (black note)"
-    }, 
-    "noteFFlatBlack": {
-        "codepoint": "U+E1A5", 
-        "description": "F flat (black note)"
-    }, 
-    "noteFFlatHalf": {
-        "codepoint": "U+E18E", 
-        "description": "F flat (half note)"
-    }, 
-    "noteFFlatWhole": {
-        "codepoint": "U+E177", 
-        "description": "F flat (whole note)"
-    }, 
-    "noteFHalf": {
-        "codepoint": "U+E18F", 
-        "description": "F (half note)"
-    }, 
-    "noteFSharpBlack": {
-        "codepoint": "U+E1A7", 
-        "description": "F sharp (black note)"
-    }, 
-    "noteFSharpHalf": {
-        "codepoint": "U+E190", 
-        "description": "F sharp (half note)"
-    }, 
-    "noteFSharpWhole": {
-        "codepoint": "U+E179", 
-        "description": "F sharp (whole note)"
-    }, 
-    "noteFWhole": {
-        "codepoint": "U+E178", 
-        "description": "F (whole note)"
-    }, 
-    "noteFaBlack": {
-        "codepoint": "U+E163", 
-        "description": "Fa (black note)"
-    }, 
-    "noteFaHalf": {
-        "codepoint": "U+E15B", 
-        "description": "Fa (half note)"
-    }, 
-    "noteFaWhole": {
-        "codepoint": "U+E153", 
-        "description": "Fa (whole note)"
-    }, 
-    "noteGBlack": {
-        "codepoint": "U+E1A9", 
-        "description": "G (black note)"
-    }, 
-    "noteGFlatBlack": {
-        "codepoint": "U+E1A8", 
-        "description": "G flat (black note)"
-    }, 
-    "noteGFlatHalf": {
-        "codepoint": "U+E191", 
-        "description": "G flat (half note)"
-    }, 
-    "noteGFlatWhole": {
-        "codepoint": "U+E17A", 
-        "description": "G flat (whole note)"
-    }, 
-    "noteGHalf": {
-        "codepoint": "U+E192", 
-        "description": "G (half note)"
-    }, 
-    "noteGSharpBlack": {
-        "codepoint": "U+E1AA", 
-        "description": "G sharp (black note)"
-    }, 
-    "noteGSharpHalf": {
-        "codepoint": "U+E193", 
-        "description": "G sharp (half note)"
-    }, 
-    "noteGSharpWhole": {
-        "codepoint": "U+E17C", 
-        "description": "G sharp (whole note)"
-    }, 
-    "noteGWhole": {
-        "codepoint": "U+E17B", 
-        "description": "G (whole note)"
-    }, 
-    "noteHBlack": {
-        "codepoint": "U+E1AB", 
-        "description": "H (black note)"
-    }, 
-    "noteHHalf": {
-        "codepoint": "U+E194", 
-        "description": "H (half note)"
-    }, 
-    "noteHSharpBlack": {
-        "codepoint": "U+E1AC", 
-        "description": "H sharp (black note)"
-    }, 
-    "noteHSharpHalf": {
-        "codepoint": "U+E195", 
-        "description": "H sharp (half note)"
-    }, 
-    "noteHSharpWhole": {
-        "codepoint": "U+E17E", 
-        "description": "H sharp (whole note)"
-    }, 
-    "noteHWhole": {
-        "codepoint": "U+E17D", 
-        "description": "H (whole note)"
-    }, 
-    "noteHalfDown": {
-        "codepoint": "U+E1D4", 
-        "description": "Half note (minim) stem down"
-    }, 
-    "noteHalfUp": {
-        "alternateCodepoint": "U+1D15E", 
-        "codepoint": "U+E1D3", 
-        "description": "Half note (minim) stem up"
-    }, 
-    "noteLaBlack": {
-        "codepoint": "U+E165", 
-        "description": "La (black note)"
-    }, 
-    "noteLaHalf": {
-        "codepoint": "U+E15D", 
-        "description": "La (half note)"
-    }, 
-    "noteLaWhole": {
-        "codepoint": "U+E155", 
-        "description": "La (whole note)"
-    }, 
-    "noteMiBlack": {
-        "codepoint": "U+E162", 
-        "description": "Mi (black note)"
-    }, 
-    "noteMiHalf": {
-        "codepoint": "U+E15A", 
-        "description": "Mi (half note)"
-    }, 
-    "noteMiWhole": {
-        "codepoint": "U+E152", 
-        "description": "Mi (whole note)"
-    }, 
-    "noteQuarterDown": {
-        "codepoint": "U+E1D6", 
-        "description": "Quarter note (crotchet) stem down"
-    }, 
-    "noteQuarterUp": {
-        "alternateCodepoint": "U+1D15F", 
-        "codepoint": "U+E1D5", 
-        "description": "Quarter note (crotchet) stem up"
-    }, 
-    "noteReBlack": {
-        "codepoint": "U+E161", 
-        "description": "Re (black note)"
-    }, 
-    "noteReHalf": {
-        "codepoint": "U+E159", 
-        "description": "Re (half note)"
-    }, 
-    "noteReWhole": {
-        "codepoint": "U+E151", 
-        "description": "Re (whole note)"
-    }, 
-    "noteShapeArrowheadLeftBlack": {
-        "codepoint": "U+E1C9", 
-        "description": "Arrowhead left black (Funk 7-shape re)"
-    }, 
-    "noteShapeArrowheadLeftDoubleWhole": {
-        "codepoint": "U+ECDC", 
-        "description": "Arrowhead left double whole (Funk 7-shape re)"
-    }, 
-    "noteShapeArrowheadLeftWhite": {
-        "codepoint": "U+E1C8", 
-        "description": "Arrowhead left white (Funk 7-shape re)"
-    }, 
-    "noteShapeDiamondBlack": {
-        "codepoint": "U+E1B9", 
-        "description": "Diamond black (4-shape mi; 7-shape mi)"
-    }, 
-    "noteShapeDiamondDoubleWhole": {
-        "codepoint": "U+ECD4", 
-        "description": "Diamond double whole (4-shape mi; 7-shape mi)"
-    }, 
-    "noteShapeDiamondWhite": {
-        "codepoint": "U+E1B8", 
-        "description": "Diamond white (4-shape mi; 7-shape mi)"
-    }, 
-    "noteShapeIsoscelesTriangleBlack": {
-        "codepoint": "U+E1C5", 
-        "description": "Isosceles triangle black (Walker 7-shape ti)"
-    }, 
-    "noteShapeIsoscelesTriangleDoubleWhole": {
-        "codepoint": "U+ECDA", 
-        "description": "Isosceles triangle double whole (Walker 7-shape ti)"
-    }, 
-    "noteShapeIsoscelesTriangleWhite": {
-        "codepoint": "U+E1C4", 
-        "description": "Isosceles triangle white (Walker 7-shape ti)"
-    }, 
-    "noteShapeKeystoneBlack": {
-        "codepoint": "U+E1C1", 
-        "description": "Inverted keystone black (Walker 7-shape do)"
-    }, 
-    "noteShapeKeystoneDoubleWhole": {
-        "codepoint": "U+ECD8", 
-        "description": "Inverted keystone double whole (Walker 7-shape do)"
-    }, 
-    "noteShapeKeystoneWhite": {
-        "codepoint": "U+E1C0", 
-        "description": "Inverted keystone white (Walker 7-shape do)"
-    }, 
-    "noteShapeMoonBlack": {
-        "codepoint": "U+E1BD", 
-        "description": "Moon black (Aikin 7-shape re)"
-    }, 
-    "noteShapeMoonDoubleWhole": {
-        "codepoint": "U+ECD6", 
-        "description": "Moon double whole (Aikin 7-shape re)"
-    }, 
-    "noteShapeMoonLeftBlack": {
-        "codepoint": "U+E1C7", 
-        "description": "Moon left black (Funk 7-shape do)"
-    }, 
-    "noteShapeMoonLeftDoubleWhole": {
-        "codepoint": "U+ECDB", 
-        "description": "Moon left double whole (Funk 7-shape do)"
-    }, 
-    "noteShapeMoonLeftWhite": {
-        "codepoint": "U+E1C6", 
-        "description": "Moon left white (Funk 7-shape do)"
-    }, 
-    "noteShapeMoonWhite": {
-        "codepoint": "U+E1BC", 
-        "description": "Moon white (Aikin 7-shape re)"
-    }, 
-    "noteShapeQuarterMoonBlack": {
-        "codepoint": "U+E1C3", 
-        "description": "Quarter moon black (Walker 7-shape re)"
-    }, 
-    "noteShapeQuarterMoonDoubleWhole": {
-        "codepoint": "U+ECD9", 
-        "description": "Quarter moon double whole (Walker 7-shape re)"
-    }, 
-    "noteShapeQuarterMoonWhite": {
-        "codepoint": "U+E1C2", 
-        "description": "Quarter moon white (Walker 7-shape re)"
-    }, 
-    "noteShapeRoundBlack": {
-        "codepoint": "U+E1B1", 
-        "description": "Round black (4-shape sol; 7-shape so)"
-    }, 
-    "noteShapeRoundDoubleWhole": {
-        "codepoint": "U+ECD0", 
-        "description": "Round double whole (4-shape sol; 7-shape so)"
-    }, 
-    "noteShapeRoundWhite": {
-        "codepoint": "U+E1B0", 
-        "description": "Round white (4-shape sol; 7-shape so)"
-    }, 
-    "noteShapeSquareBlack": {
-        "codepoint": "U+E1B3", 
-        "description": "Square black (4-shape la; Aikin 7-shape la)"
-    }, 
-    "noteShapeSquareDoubleWhole": {
-        "codepoint": "U+ECD1", 
-        "description": "Square double whole (4-shape la; Aikin 7-shape la)"
-    }, 
-    "noteShapeSquareWhite": {
-        "codepoint": "U+E1B2", 
-        "description": "Square white (4-shape la; Aikin 7-shape la)"
-    }, 
-    "noteShapeTriangleLeftBlack": {
-        "codepoint": "U+E1B7", 
-        "description": "Triangle left black (stem up; 4-shape fa; 7-shape fa)"
-    }, 
-    "noteShapeTriangleLeftDoubleWhole": {
-        "codepoint": "U+ECD3", 
-        "description": "Triangle left double whole (stem up; 4-shape fa; 7-shape fa)"
-    }, 
-    "noteShapeTriangleLeftWhite": {
-        "codepoint": "U+E1B6", 
-        "description": "Triangle left white (stem up; 4-shape fa; 7-shape fa)"
-    }, 
-    "noteShapeTriangleRightBlack": {
-        "codepoint": "U+E1B5", 
-        "description": "Triangle right black (stem down; 4-shape fa; 7-shape fa)"
-    }, 
-    "noteShapeTriangleRightDoubleWhole": {
-        "codepoint": "U+ECD2", 
-        "description": "Triangle right double whole (stem down; 4-shape fa; 7-shape fa)"
-    }, 
-    "noteShapeTriangleRightWhite": {
-        "codepoint": "U+E1B4", 
-        "description": "Triangle right white (stem down; 4-shape fa; 7-shape fa)"
-    }, 
-    "noteShapeTriangleRoundBlack": {
-        "codepoint": "U+E1BF", 
-        "description": "Triangle-round black (Aikin 7-shape ti)"
-    }, 
-    "noteShapeTriangleRoundDoubleWhole": {
-        "codepoint": "U+ECD7", 
-        "description": "Triangle-round white (Aikin 7-shape ti)"
-    }, 
-    "noteShapeTriangleRoundLeftBlack": {
-        "codepoint": "U+E1CB", 
-        "description": "Triangle-round left black (Funk 7-shape ti)"
-    }, 
-    "noteShapeTriangleRoundLeftDoubleWhole": {
-        "codepoint": "U+ECDD", 
-        "description": "Triangle-round left double whole (Funk 7-shape ti)"
-    }, 
-    "noteShapeTriangleRoundLeftWhite": {
-        "codepoint": "U+E1CA", 
-        "description": "Triangle-round left white (Funk 7-shape ti)"
-    }, 
-    "noteShapeTriangleRoundWhite": {
-        "codepoint": "U+E1BE", 
-        "description": "Triangle-round white (Aikin 7-shape ti)"
-    }, 
-    "noteShapeTriangleUpBlack": {
-        "codepoint": "U+E1BB", 
-        "description": "Triangle up black (Aikin 7-shape do)"
-    }, 
-    "noteShapeTriangleUpDoubleWhole": {
-        "codepoint": "U+ECD5", 
-        "description": "Triangle up double whole (Aikin 7-shape do)"
-    }, 
-    "noteShapeTriangleUpWhite": {
-        "codepoint": "U+E1BA", 
-        "description": "Triangle up white (Aikin 7-shape do)"
-    }, 
-    "noteSiBlack": {
-        "codepoint": "U+E167", 
-        "description": "Si (black note)"
-    }, 
-    "noteSiHalf": {
-        "codepoint": "U+E15F", 
-        "description": "Si (half note)"
-    }, 
-    "noteSiWhole": {
-        "codepoint": "U+E157", 
-        "description": "Si (whole note)"
-    }, 
-    "noteSoBlack": {
-        "codepoint": "U+E164", 
-        "description": "So (black note)"
-    }, 
-    "noteSoHalf": {
-        "codepoint": "U+E15C", 
-        "description": "So (half note)"
-    }, 
-    "noteSoWhole": {
-        "codepoint": "U+E154", 
-        "description": "So (whole note)"
-    }, 
-    "noteTiBlack": {
-        "codepoint": "U+E166", 
-        "description": "Ti (black note)"
-    }, 
-    "noteTiHalf": {
-        "codepoint": "U+E15E", 
-        "description": "Ti (half note)"
-    }, 
-    "noteTiWhole": {
-        "codepoint": "U+E156", 
-        "description": "Ti (whole note)"
-    }, 
-    "noteWhole": {
-        "alternateCodepoint": "U+1D15D", 
-        "codepoint": "U+E1D2", 
-        "description": "Whole note (semibreve)"
-    }, 
-    "noteheadBlack": {
-        "alternateCodepoint": "U+1D158", 
-        "codepoint": "U+E0A4", 
-        "description": "Black notehead"
-    }, 
-    "noteheadCircleSlash": {
-        "codepoint": "U+E0F7", 
-        "description": "Circle slash notehead"
-    }, 
-    "noteheadCircleX": {
-        "alternateCodepoint": "U+1D145", 
-        "codepoint": "U+E0B3", 
-        "description": "Circle X notehead"
-    }, 
-    "noteheadCircleXDoubleWhole": {
-        "codepoint": "U+E0B0", 
-        "description": "Circle X double whole"
-    }, 
-    "noteheadCircleXHalf": {
-        "codepoint": "U+E0B2", 
-        "description": "Circle X half"
-    }, 
-    "noteheadCircleXWhole": {
-        "codepoint": "U+E0B1", 
-        "description": "Circle X whole"
-    }, 
-    "noteheadCircledBlack": {
-        "codepoint": "U+E0E4", 
-        "description": "Circled black notehead"
-    }, 
-    "noteheadCircledBlackLarge": {
-        "codepoint": "U+E0E8", 
-        "description": "Black notehead in large circle"
-    }, 
-    "noteheadCircledDoubleWhole": {
-        "codepoint": "U+E0E7", 
-        "description": "Circled double whole notehead"
-    }, 
-    "noteheadCircledDoubleWholeLarge": {
-        "codepoint": "U+E0EB", 
-        "description": "Double whole notehead in large circle"
-    }, 
-    "noteheadCircledHalf": {
-        "codepoint": "U+E0E5", 
-        "description": "Circled half notehead"
-    }, 
-    "noteheadCircledHalfLarge": {
-        "codepoint": "U+E0E9", 
-        "description": "Half notehead in large circle"
-    }, 
-    "noteheadCircledWhole": {
-        "codepoint": "U+E0E6", 
-        "description": "Circled whole notehead"
-    }, 
-    "noteheadCircledWholeLarge": {
-        "codepoint": "U+E0EA", 
-        "description": "Whole notehead in large circle"
-    }, 
-    "noteheadCircledXLarge": {
-        "codepoint": "U+E0EC", 
-        "description": "Cross notehead in large circle"
-    }, 
-    "noteheadClusterDoubleWhole2nd": {
-        "codepoint": "U+E124", 
-        "description": "Double whole note cluster, 2nd"
-    }, 
-    "noteheadClusterDoubleWhole3rd": {
-        "codepoint": "U+E128", 
-        "description": "Double whole note cluster, 3rd"
-    }, 
-    "noteheadClusterDoubleWholeBottom": {
-        "codepoint": "U+E12E", 
-        "description": "Combining double whole note cluster, bottom"
-    }, 
-    "noteheadClusterDoubleWholeMiddle": {
-        "codepoint": "U+E12D", 
-        "description": "Combining double whole note cluster, middle"
-    }, 
-    "noteheadClusterDoubleWholeTop": {
-        "codepoint": "U+E12C", 
-        "description": "Combining double whole note cluster, top"
-    }, 
-    "noteheadClusterHalf2nd": {
-        "codepoint": "U+E126", 
-        "description": "Half note cluster, 2nd"
-    }, 
-    "noteheadClusterHalf3rd": {
-        "codepoint": "U+E12A", 
-        "description": "Half note cluster, 3rd"
-    }, 
-    "noteheadClusterHalfBottom": {
-        "codepoint": "U+E134", 
-        "description": "Combining half note cluster, bottom"
-    }, 
-    "noteheadClusterHalfMiddle": {
-        "codepoint": "U+E133", 
-        "description": "Combining half note cluster, middle"
-    }, 
-    "noteheadClusterHalfTop": {
-        "codepoint": "U+E132", 
-        "description": "Combining half note cluster, top"
-    }, 
-    "noteheadClusterQuarter2nd": {
-        "codepoint": "U+E127", 
-        "description": "Quarter note cluster, 2nd"
-    }, 
-    "noteheadClusterQuarter3rd": {
-        "codepoint": "U+E12B", 
-        "description": "Quarter note cluster, 3rd"
-    }, 
-    "noteheadClusterQuarterBottom": {
-        "codepoint": "U+E137", 
-        "description": "Combining quarter note cluster, bottom"
-    }, 
-    "noteheadClusterQuarterMiddle": {
-        "codepoint": "U+E136", 
-        "description": "Combining quarter note cluster, middle"
-    }, 
-    "noteheadClusterQuarterTop": {
-        "codepoint": "U+E135", 
-        "description": "Combining quarter note cluster, top"
-    }, 
-    "noteheadClusterRoundBlack": {
-        "codepoint": "U+E123", 
-        "description": "Cluster notehead black (round)"
-    }, 
-    "noteheadClusterRoundWhite": {
-        "codepoint": "U+E122", 
-        "description": "Cluster notehead white (round)"
-    }, 
-    "noteheadClusterSquareBlack": {
-        "alternateCodepoint": "U+1D15B", 
-        "codepoint": "U+E121", 
-        "description": "Cluster notehead black (square)"
-    }, 
-    "noteheadClusterSquareWhite": {
-        "alternateCodepoint": "U+1D15A", 
-        "codepoint": "U+E120", 
-        "description": "Cluster notehead white (square)"
-    }, 
-    "noteheadClusterWhole2nd": {
-        "codepoint": "U+E125", 
-        "description": "Whole note cluster, 2nd"
-    }, 
-    "noteheadClusterWhole3rd": {
-        "codepoint": "U+E129", 
-        "description": "Whole note cluster, 3rd"
-    }, 
-    "noteheadClusterWholeBottom": {
-        "codepoint": "U+E131", 
-        "description": "Combining whole note cluster, bottom"
-    }, 
-    "noteheadClusterWholeMiddle": {
-        "codepoint": "U+E130", 
-        "description": "Combining whole note cluster, middle"
-    }, 
-    "noteheadClusterWholeTop": {
-        "codepoint": "U+E12F", 
-        "description": "Combining whole note cluster, top"
-    }, 
-    "noteheadDiamondBlack": {
-        "codepoint": "U+E0DB", 
-        "description": "Diamond black notehead"
-    }, 
-    "noteheadDiamondBlackOld": {
-        "codepoint": "U+E0E2", 
-        "description": "Diamond black notehead (old)"
-    }, 
-    "noteheadDiamondBlackWide": {
-        "codepoint": "U+E0DC", 
-        "description": "Diamond black notehead (wide)"
-    }, 
-    "noteheadDiamondClusterBlack2nd": {
-        "codepoint": "U+E139", 
-        "description": "Black diamond cluster, 2nd"
-    }, 
-    "noteheadDiamondClusterBlack3rd": {
-        "codepoint": "U+E13B", 
-        "description": "Black diamond cluster, 3rd"
-    }, 
-    "noteheadDiamondClusterBlackBottom": {
-        "codepoint": "U+E141", 
-        "description": "Combining black diamond cluster, bottom"
-    }, 
-    "noteheadDiamondClusterBlackMiddle": {
-        "codepoint": "U+E140", 
-        "description": "Combining black diamond cluster, middle"
-    }, 
-    "noteheadDiamondClusterBlackTop": {
-        "codepoint": "U+E13F", 
-        "description": "Combining black diamond cluster, top"
-    }, 
-    "noteheadDiamondClusterWhite2nd": {
-        "codepoint": "U+E138", 
-        "description": "White diamond cluster, 2nd"
-    }, 
-    "noteheadDiamondClusterWhite3rd": {
-        "codepoint": "U+E13A", 
-        "description": "White diamond cluster, 3rd"
-    }, 
-    "noteheadDiamondClusterWhiteBottom": {
-        "codepoint": "U+E13E", 
-        "description": "Combining white diamond cluster, bottom"
-    }, 
-    "noteheadDiamondClusterWhiteMiddle": {
-        "codepoint": "U+E13D", 
-        "description": "Combining white diamond cluster, middle"
-    }, 
-    "noteheadDiamondClusterWhiteTop": {
-        "codepoint": "U+E13C", 
-        "description": "Combining white diamond cluster, top"
-    }, 
-    "noteheadDiamondDoubleWhole": {
-        "codepoint": "U+E0D7", 
-        "description": "Diamond double whole notehead"
-    }, 
-    "noteheadDiamondDoubleWholeOld": {
-        "codepoint": "U+E0DF", 
-        "description": "Diamond double whole notehead (old)"
-    }, 
-    "noteheadDiamondHalf": {
-        "codepoint": "U+E0D9", 
-        "description": "Diamond half notehead"
-    }, 
-    "noteheadDiamondHalfFilled": {
-        "codepoint": "U+E0E3", 
-        "description": "Half-filled diamond notehead"
-    }, 
-    "noteheadDiamondHalfOld": {
-        "codepoint": "U+E0E1", 
-        "description": "Diamond half notehead (old)"
-    }, 
-    "noteheadDiamondHalfWide": {
-        "codepoint": "U+E0DA", 
-        "description": "Diamond half notehead (wide)"
-    }, 
-    "noteheadDiamondOpen": {
-        "codepoint": "U+E0FC", 
-        "description": "Open diamond notehead"
-    }, 
-    "noteheadDiamondWhite": {
-        "codepoint": "U+E0DD", 
-        "description": "Diamond white notehead"
-    }, 
-    "noteheadDiamondWhiteWide": {
-        "codepoint": "U+E0DE", 
-        "description": "Diamond white notehead (wide)"
-    }, 
-    "noteheadDiamondWhole": {
-        "codepoint": "U+E0D8", 
-        "description": "Diamond whole notehead"
-    }, 
-    "noteheadDiamondWholeOld": {
-        "codepoint": "U+E0E0", 
-        "description": "Diamond whole notehead (old)"
-    }, 
-    "noteheadDoubleWhole": {
-        "codepoint": "U+E0A0", 
-        "description": "Double whole (breve) notehead"
-    }, 
-    "noteheadDoubleWholeSquare": {
-        "codepoint": "U+E0A1", 
-        "description": "Double whole (breve) notehead (square)"
-    }, 
-    "noteheadDoubleWholeWithX": {
-        "codepoint": "U+E0B4", 
-        "description": "Double whole notehead with X"
-    }, 
-    "noteheadHalf": {
-        "alternateCodepoint": "U+1D157", 
-        "codepoint": "U+E0A3", 
-        "description": "Half (minim) notehead"
-    }, 
-    "noteheadHalfFilled": {
-        "codepoint": "U+E0FB", 
-        "description": "Filled half (minim) notehead"
-    }, 
-    "noteheadHalfWithX": {
-        "codepoint": "U+E0B6", 
-        "description": "Half notehead with X"
-    }, 
-    "noteheadHeavyX": {
-        "codepoint": "U+E0F8", 
-        "description": "Heavy X notehead"
-    }, 
-    "noteheadHeavyXHat": {
-        "codepoint": "U+E0F9", 
-        "description": "Heavy X with hat notehead"
-    }, 
-    "noteheadLargeArrowDownBlack": {
-        "codepoint": "U+E0F4", 
-        "description": "Large arrow down (lowest pitch) black notehead"
-    }, 
-    "noteheadLargeArrowDownDoubleWhole": {
-        "codepoint": "U+E0F1", 
-        "description": "Large arrow down (lowest pitch) double whole notehead"
-    }, 
-    "noteheadLargeArrowDownHalf": {
-        "codepoint": "U+E0F3", 
-        "description": "Large arrow down (lowest pitch) half notehead"
-    }, 
-    "noteheadLargeArrowDownWhole": {
-        "codepoint": "U+E0F2", 
-        "description": "Large arrow down (lowest pitch) whole notehead"
-    }, 
-    "noteheadLargeArrowUpBlack": {
-        "codepoint": "U+E0F0", 
-        "description": "Large arrow up (highest pitch) black notehead"
-    }, 
-    "noteheadLargeArrowUpDoubleWhole": {
-        "codepoint": "U+E0ED", 
-        "description": "Large arrow up (highest pitch) double whole notehead"
-    }, 
-    "noteheadLargeArrowUpHalf": {
-        "codepoint": "U+E0EF", 
-        "description": "Large arrow up (highest pitch) half notehead"
-    }, 
-    "noteheadLargeArrowUpWhole": {
-        "codepoint": "U+E0EE", 
-        "description": "Large arrow up (highest pitch) whole notehead"
-    }, 
-    "noteheadMoonBlack": {
-        "alternateCodepoint": "U+1D153", 
-        "codepoint": "U+E0CB", 
-        "description": "Moon notehead black"
-    }, 
-    "noteheadMoonWhite": {
-        "alternateCodepoint": "U+1D152", 
-        "codepoint": "U+E0CA", 
-        "description": "Moon notehead white"
-    }, 
-    "noteheadNull": {
-        "alternateCodepoint": "U+1D159", 
-        "codepoint": "U+E0A5", 
-        "description": "Null notehead"
-    }, 
-    "noteheadParenthesis": {
-        "alternateCodepoint": "U+1D156", 
-        "codepoint": "U+E0CE", 
-        "description": "Parenthesis notehead"
-    }, 
-    "noteheadParenthesisLeft": {
-        "codepoint": "U+E0F5", 
-        "description": "Opening parenthesis"
-    }, 
-    "noteheadParenthesisRight": {
-        "codepoint": "U+E0F6", 
-        "description": "Closing parenthesis"
-    }, 
-    "noteheadPlusBlack": {
-        "alternateCodepoint": "U+1D144", 
-        "codepoint": "U+E0AF", 
-        "description": "Plus notehead black"
-    }, 
-    "noteheadPlusDoubleWhole": {
-        "codepoint": "U+E0AC", 
-        "description": "Plus notehead double whole"
-    }, 
-    "noteheadPlusHalf": {
-        "codepoint": "U+E0AE", 
-        "description": "Plus notehead half"
-    }, 
-    "noteheadPlusWhole": {
-        "codepoint": "U+E0AD", 
-        "description": "Plus notehead whole"
-    }, 
-    "noteheadRectangularClusterBlackBottom": {
-        "codepoint": "U+E144", 
-        "description": "Combining black rectangular cluster, bottom"
-    }, 
-    "noteheadRectangularClusterBlackMiddle": {
-        "codepoint": "U+E143", 
-        "description": "Combining black rectangular cluster, middle"
-    }, 
-    "noteheadRectangularClusterBlackTop": {
-        "codepoint": "U+E142", 
-        "description": "Combining black rectangular cluster, top"
-    }, 
-    "noteheadRectangularClusterWhiteBottom": {
-        "codepoint": "U+E147", 
-        "description": "Combining white rectangular cluster, bottom"
-    }, 
-    "noteheadRectangularClusterWhiteMiddle": {
-        "codepoint": "U+E146", 
-        "description": "Combining white rectangular cluster, middle"
-    }, 
-    "noteheadRectangularClusterWhiteTop": {
-        "codepoint": "U+E145", 
-        "description": "Combining white rectangular cluster, top"
-    }, 
-    "noteheadRoundBlack": {
-        "codepoint": "U+E113", 
-        "description": "Round black notehead"
-    }, 
-    "noteheadRoundBlackDoubleSlashed": {
-        "codepoint": "U+E11C", 
-        "description": "Round black notehead, double slashed"
-    }, 
-    "noteheadRoundBlackLarge": {
-        "codepoint": "U+E110", 
-        "description": "Large round black notehead"
-    }, 
-    "noteheadRoundBlackSlashed": {
-        "codepoint": "U+E118", 
-        "description": "Round black notehead, slashed"
-    }, 
-    "noteheadRoundBlackSlashedLarge": {
-        "codepoint": "U+E116", 
-        "description": "Large round black notehead, slashed"
-    }, 
-    "noteheadRoundWhite": {
-        "codepoint": "U+E114", 
-        "description": "Round white notehead"
-    }, 
-    "noteheadRoundWhiteDoubleSlashed": {
-        "codepoint": "U+E11D", 
-        "description": "Round white notehead, double slashed"
-    }, 
-    "noteheadRoundWhiteLarge": {
-        "codepoint": "U+E111", 
-        "description": "Large round white notehead"
-    }, 
-    "noteheadRoundWhiteSlashed": {
-        "codepoint": "U+E119", 
-        "description": "Round white notehead, slashed"
-    }, 
-    "noteheadRoundWhiteSlashedLarge": {
-        "codepoint": "U+E117", 
-        "description": "Large round white notehead, slashed"
-    }, 
-    "noteheadRoundWhiteWithDot": {
-        "codepoint": "U+E115", 
-        "description": "Round white notehead with dot"
-    }, 
-    "noteheadRoundWhiteWithDotLarge": {
-        "codepoint": "U+E112", 
-        "description": "Large round white notehead with dot"
-    }, 
-    "noteheadSlashDiamondWhite": {
-        "codepoint": "U+E104", 
-        "description": "Large white diamond"
-    }, 
-    "noteheadSlashHorizontalEnds": {
-        "alternateCodepoint": "U+1D10D", 
-        "codepoint": "U+E101", 
-        "description": "Slash with horizontal ends"
-    }, 
-    "noteheadSlashHorizontalEndsMuted": {
-        "codepoint": "U+E108", 
-        "description": "Muted slash with horizontal ends"
-    }, 
-    "noteheadSlashVerticalEnds": {
-        "codepoint": "U+E100", 
-        "description": "Slash with vertical ends"
-    }, 
-    "noteheadSlashVerticalEndsMuted": {
-        "codepoint": "U+E107", 
-        "description": "Muted slash with vertical ends"
-    }, 
-    "noteheadSlashVerticalEndsSmall": {
-        "codepoint": "U+E105", 
-        "description": "Small slash with vertical ends"
-    }, 
-    "noteheadSlashWhiteDoubleWhole": {
-        "codepoint": "U+E10A", 
-        "description": "White slash double whole"
-    }, 
-    "noteheadSlashWhiteHalf": {
-        "codepoint": "U+E103", 
-        "description": "White slash half"
-    }, 
-    "noteheadSlashWhiteMuted": {
-        "codepoint": "U+E109", 
-        "description": "Muted white slash"
-    }, 
-    "noteheadSlashWhiteWhole": {
-        "codepoint": "U+E102", 
-        "description": "White slash whole"
-    }, 
-    "noteheadSlashX": {
-        "codepoint": "U+E106", 
-        "description": "Large X notehead"
-    }, 
-    "noteheadSlashedBlack1": {
-        "codepoint": "U+E0CF", 
-        "description": "Slashed black notehead (bottom left to top right)"
-    }, 
-    "noteheadSlashedBlack2": {
-        "codepoint": "U+E0D0", 
-        "description": "Slashed black notehead (top left to bottom right)"
-    }, 
-    "noteheadSlashedDoubleWhole1": {
-        "codepoint": "U+E0D5", 
-        "description": "Slashed double whole notehead (bottom left to top right)"
-    }, 
-    "noteheadSlashedDoubleWhole2": {
-        "codepoint": "U+E0D6", 
-        "description": "Slashed double whole notehead (top left to bottom right)"
-    }, 
-    "noteheadSlashedHalf1": {
-        "codepoint": "U+E0D1", 
-        "description": "Slashed half notehead (bottom left to top right)"
-    }, 
-    "noteheadSlashedHalf2": {
-        "codepoint": "U+E0D2", 
-        "description": "Slashed half notehead (top left to bottom right)"
-    }, 
-    "noteheadSlashedWhole1": {
-        "codepoint": "U+E0D3", 
-        "description": "Slashed whole notehead (bottom left to top right)"
-    }, 
-    "noteheadSlashedWhole2": {
-        "codepoint": "U+E0D4", 
-        "description": "Slashed whole notehead (top left to bottom right)"
-    }, 
-    "noteheadSquareBlack": {
-        "alternateCodepoint": "U+1D147", 
-        "codepoint": "U+E0B9", 
-        "description": "Square notehead black"
-    }, 
-    "noteheadSquareBlackLarge": {
-        "codepoint": "U+E11A", 
-        "description": "Large square black notehead"
-    }, 
-    "noteheadSquareBlackWhite": {
-        "codepoint": "U+E11B", 
-        "description": "Large square white notehead"
-    }, 
-    "noteheadSquareWhite": {
-        "alternateCodepoint": "U+1D146", 
-        "codepoint": "U+E0B8", 
-        "description": "Square notehead white"
-    }, 
-    "noteheadTriangleDownBlack": {
-        "alternateCodepoint": "U+1D14F", 
-        "codepoint": "U+E0C7", 
-        "description": "Triangle notehead down black"
-    }, 
-    "noteheadTriangleDownDoubleWhole": {
-        "codepoint": "U+E0C3", 
-        "description": "Triangle notehead down double whole"
-    }, 
-    "noteheadTriangleDownHalf": {
-        "codepoint": "U+E0C5", 
-        "description": "Triangle notehead down half"
-    }, 
-    "noteheadTriangleDownWhite": {
-        "alternateCodepoint": "U+1D14E", 
-        "codepoint": "U+E0C6", 
-        "description": "Triangle notehead down white"
-    }, 
-    "noteheadTriangleDownWhole": {
-        "codepoint": "U+E0C4", 
-        "description": "Triangle notehead down whole"
-    }, 
-    "noteheadTriangleLeftBlack": {
-        "alternateCodepoint": "U+1D14B", 
-        "codepoint": "U+E0C0", 
-        "description": "Triangle notehead left black"
-    }, 
-    "noteheadTriangleLeftWhite": {
-        "alternateCodepoint": "U+1D14A", 
-        "codepoint": "U+E0BF", 
-        "description": "Triangle notehead left white"
-    }, 
-    "noteheadTriangleRightBlack": {
-        "alternateCodepoint": "U+1D14D", 
-        "codepoint": "U+E0C2", 
-        "description": "Triangle notehead right black"
-    }, 
-    "noteheadTriangleRightWhite": {
-        "alternateCodepoint": "U+1D14C", 
-        "codepoint": "U+E0C1", 
-        "description": "Triangle notehead right white"
-    }, 
-    "noteheadTriangleRoundDownBlack": {
-        "alternateCodepoint": "U+1D155", 
-        "codepoint": "U+E0CD", 
-        "description": "Triangle-round notehead down black"
-    }, 
-    "noteheadTriangleRoundDownWhite": {
-        "alternateCodepoint": "U+1D154", 
-        "codepoint": "U+E0CC", 
-        "description": "Triangle-round notehead down white"
-    }, 
-    "noteheadTriangleUpBlack": {
-        "alternateCodepoint": "U+1D149", 
-        "codepoint": "U+E0BE", 
-        "description": "Triangle notehead up black"
-    }, 
-    "noteheadTriangleUpDoubleWhole": {
-        "codepoint": "U+E0BA", 
-        "description": "Triangle notehead up double whole"
-    }, 
-    "noteheadTriangleUpHalf": {
-        "codepoint": "U+E0BC", 
-        "description": "Triangle notehead up half"
-    }, 
-    "noteheadTriangleUpRightBlack": {
-        "alternateCodepoint": "U+1D151", 
-        "codepoint": "U+E0C9", 
-        "description": "Triangle notehead up right black"
-    }, 
-    "noteheadTriangleUpRightWhite": {
-        "alternateCodepoint": "U+1D150", 
-        "codepoint": "U+E0C8", 
-        "description": "Triangle notehead up right white"
-    }, 
-    "noteheadTriangleUpWhite": {
-        "alternateCodepoint": "U+1D148", 
-        "codepoint": "U+E0BD", 
-        "description": "Triangle notehead up white"
-    }, 
-    "noteheadTriangleUpWhole": {
-        "codepoint": "U+E0BB", 
-        "description": "Triangle notehead up whole"
-    }, 
-    "noteheadVoidWithX": {
-        "codepoint": "U+E0B7", 
-        "description": "Void notehead with X"
-    }, 
-    "noteheadWhole": {
-        "codepoint": "U+E0A2", 
-        "description": "Whole (semibreve) notehead"
-    }, 
-    "noteheadWholeFilled": {
-        "codepoint": "U+E0FA", 
-        "description": "Filled whole (semibreve) notehead"
-    }, 
-    "noteheadWholeWithX": {
-        "codepoint": "U+E0B5", 
-        "description": "Whole notehead with X"
-    }, 
-    "noteheadXBlack": {
-        "alternateCodepoint": "U+1D143", 
-        "codepoint": "U+E0A9", 
-        "description": "X notehead black"
-    }, 
-    "noteheadXDoubleWhole": {
-        "codepoint": "U+E0A6", 
-        "description": "X notehead double whole"
-    }, 
-    "noteheadXHalf": {
-        "codepoint": "U+E0A8", 
-        "description": "X notehead half"
-    }, 
-    "noteheadXOrnate": {
-        "codepoint": "U+E0AA", 
-        "description": "Ornate X notehead"
-    }, 
-    "noteheadXOrnateEllipse": {
-        "codepoint": "U+E0AB", 
-        "description": "Ornate X notehead in ellipse"
-    }, 
-    "noteheadXWhole": {
-        "codepoint": "U+E0A7", 
-        "description": "X notehead whole"
-    }, 
-    "octaveBaselineA": {
-        "codepoint": "U+EC91", 
-        "description": "a (baseline)"
-    }, 
-    "octaveBaselineB": {
-        "codepoint": "U+EC93", 
-        "description": "b (baseline)"
-    }, 
-    "octaveBaselineM": {
-        "codepoint": "U+EC95", 
-        "description": "m (baseline)"
-    }, 
-    "octaveBaselineV": {
-        "codepoint": "U+EC97", 
-        "description": "v (baseline)"
-    }, 
-    "octaveBassa": {
-        "codepoint": "U+E51F", 
-        "description": "Bassa"
-    }, 
-    "octaveLoco": {
-        "codepoint": "U+EC90", 
-        "description": "Loco"
-    }, 
-    "octaveParensLeft": {
-        "codepoint": "U+E51A", 
-        "description": "Left parenthesis for octave signs"
-    }, 
-    "octaveParensRight": {
-        "codepoint": "U+E51B", 
-        "description": "Right parenthesis for octave signs"
-    }, 
-    "octaveSuperscriptA": {
-        "codepoint": "U+EC92", 
-        "description": "a (superscript)"
-    }, 
-    "octaveSuperscriptB": {
-        "codepoint": "U+EC94", 
-        "description": "b (superscript)"
-    }, 
-    "octaveSuperscriptM": {
-        "codepoint": "U+EC96", 
-        "description": "m (superscript)"
-    }, 
-    "octaveSuperscriptV": {
-        "codepoint": "U+EC98", 
-        "description": "v (superscript)"
-    }, 
-    "oneHandedRollStevens": {
-        "codepoint": "U+E233", 
-        "description": "One-handed roll (Stevens)"
-    }, 
-    "organGerman2Fusae": {
-        "codepoint": "U+EE2E", 
-        "description": "Two Fusae"
-    }, 
-    "organGerman2Minimae": {
-        "codepoint": "U+EE2C", 
-        "description": "Two Minimae"
-    }, 
-    "organGerman2OctaveUp": {
-        "codepoint": "U+EE19", 
-        "description": "Combining double octave line above"
-    }, 
-    "organGerman2Semifusae": {
-        "codepoint": "U+EE2F", 
-        "description": "Two Semifusae"
-    }, 
-    "organGerman2Semiminimae": {
-        "codepoint": "U+EE2D", 
-        "description": "Two Semiminimae"
-    }, 
-    "organGerman3Fusae": {
-        "codepoint": "U+EE32", 
-        "description": "Three Fusae"
-    }, 
-    "organGerman3Minimae": {
-        "codepoint": "U+EE30", 
-        "description": "Three Minimae"
-    }, 
-    "organGerman3Semifusae": {
-        "codepoint": "U+EE33", 
-        "description": "Three Semifusae"
-    }, 
-    "organGerman3Semiminimae": {
-        "codepoint": "U+EE31", 
-        "description": "Three Semiminimae"
-    }, 
-    "organGerman4Fusae": {
-        "codepoint": "U+EE36", 
-        "description": "Four Fusae"
-    }, 
-    "organGerman4Minimae": {
-        "codepoint": "U+EE34", 
-        "description": "Four Minimae"
-    }, 
-    "organGerman4Semifusae": {
-        "codepoint": "U+EE37", 
-        "description": "Four Semifusae"
-    }, 
-    "organGerman4Semiminimae": {
-        "codepoint": "U+EE35", 
-        "description": "Four Semiminimae"
-    }, 
-    "organGerman5Fusae": {
-        "codepoint": "U+EE3A", 
-        "description": "Five Fusae"
-    }, 
-    "organGerman5Minimae": {
-        "codepoint": "U+EE38", 
-        "description": "Five Minimae"
-    }, 
-    "organGerman5Semifusae": {
-        "codepoint": "U+EE3B", 
-        "description": "Five Semifusae"
-    }, 
-    "organGerman5Semiminimae": {
-        "codepoint": "U+EE39", 
-        "description": "Five Semiminimae"
-    }, 
-    "organGerman6Fusae": {
-        "codepoint": "U+EE3E", 
-        "description": "Six Fusae"
-    }, 
-    "organGerman6Minimae": {
-        "codepoint": "U+EE3C", 
-        "description": "Six Minimae"
-    }, 
-    "organGerman6Semifusae": {
-        "codepoint": "U+EE3F", 
-        "description": "Six Semifusae"
-    }, 
-    "organGerman6Semiminimae": {
-        "codepoint": "U+EE3D", 
-        "description": "Six Semiminimae"
-    }, 
-    "organGermanALower": {
-        "codepoint": "U+EE15", 
-        "description": "German organ tablature small A"
-    }, 
-    "organGermanAUpper": {
-        "codepoint": "U+EE09", 
-        "description": "German organ tablature great A"
-    }, 
-    "organGermanAugmentationDot": {
-        "codepoint": "U+EE1C", 
-        "description": "Rhythm Dot"
-    }, 
-    "organGermanBLower": {
-        "codepoint": "U+EE16", 
-        "description": "German organ tablature small B"
-    }, 
-    "organGermanBUpper": {
-        "codepoint": "U+EE0A", 
-        "description": "German organ tablature great B"
-    }, 
-    "organGermanBuxheimerBrevis2": {
-        "codepoint": "U+EE25", 
-        "description": "Brevis (Binary) Buxheimer Orgelbuch"
-    }, 
-    "organGermanBuxheimerBrevis3": {
-        "codepoint": "U+EE24", 
-        "description": "Brevis (Ternary) Buxheimer Orgelbuch"
-    }, 
-    "organGermanBuxheimerMinimaRest": {
-        "codepoint": "U+EE1E", 
-        "description": "Minima Rest Buxheimer Orgelbuch"
-    }, 
-    "organGermanBuxheimerSemibrevis": {
-        "codepoint": "U+EE26", 
-        "description": "Semibrevis Buxheimer Orgelbuch"
-    }, 
-    "organGermanBuxheimerSemibrevisRest": {
-        "codepoint": "U+EE1D", 
-        "description": "Semibrevis Rest Buxheimer Orgelbuch"
-    }, 
-    "organGermanCLower": {
-        "codepoint": "U+EE0C", 
-        "description": "German organ tablature small C"
-    }, 
-    "organGermanCUpper": {
-        "codepoint": "U+EE00", 
-        "description": "German organ tablature great C"
-    }, 
-    "organGermanCisLower": {
-        "codepoint": "U+EE0D", 
-        "description": "German organ tablature small Cis"
-    }, 
-    "organGermanCisUpper": {
-        "codepoint": "U+EE01", 
-        "description": "German organ tablature great Cis"
-    }, 
-    "organGermanDLower": {
-        "codepoint": "U+EE0E", 
-        "description": "German organ tablature small D"
-    }, 
-    "organGermanDUpper": {
-        "codepoint": "U+EE02", 
-        "description": "German organ tablature great D"
-    }, 
-    "organGermanDisLower": {
-        "codepoint": "U+EE0F", 
-        "description": "German organ tablature small Dis"
-    }, 
-    "organGermanDisUpper": {
-        "codepoint": "U+EE03", 
-        "description": "German organ tablature great Dis"
-    }, 
-    "organGermanELower": {
-        "codepoint": "U+EE10", 
-        "description": "German organ tablature small E"
-    }, 
-    "organGermanEUpper": {
-        "codepoint": "U+EE04", 
-        "description": "German organ tablature great E"
-    }, 
-    "organGermanFLower": {
-        "codepoint": "U+EE11", 
-        "description": "German organ tablature small F"
-    }, 
-    "organGermanFUpper": {
-        "codepoint": "U+EE05", 
-        "description": "German organ tablature great F"
-    }, 
-    "organGermanFisLower": {
-        "codepoint": "U+EE12", 
-        "description": "German organ tablature small Fis"
-    }, 
-    "organGermanFisUpper": {
-        "codepoint": "U+EE06", 
-        "description": "German organ tablature great Fis"
-    }, 
-    "organGermanFusa": {
-        "codepoint": "U+EE2A", 
-        "description": "Fusa"
-    }, 
-    "organGermanFusaRest": {
-        "codepoint": "U+EE22", 
-        "description": "Fusa Rest"
-    }, 
-    "organGermanGLower": {
-        "codepoint": "U+EE13", 
-        "description": "German organ tablature small G"
-    }, 
-    "organGermanGUpper": {
-        "codepoint": "U+EE07", 
-        "description": "German organ tablature great G"
-    }, 
-    "organGermanGisLower": {
-        "codepoint": "U+EE14", 
-        "description": "German organ tablature small Gis"
-    }, 
-    "organGermanGisUpper": {
-        "codepoint": "U+EE08", 
-        "description": "German organ tablature great Gis"
-    }, 
-    "organGermanHLower": {
-        "codepoint": "U+EE17", 
-        "description": "German organ tablature small H"
-    }, 
-    "organGermanHUpper": {
-        "codepoint": "U+EE0B", 
-        "description": "German organ tablature great H"
-    }, 
-    "organGermanMinima": {
-        "codepoint": "U+EE28", 
-        "description": "Minima"
-    }, 
-    "organGermanMinimaRest": {
-        "codepoint": "U+EE20", 
-        "description": "Minima Rest"
-    }, 
-    "organGermanOctaveDown": {
-        "codepoint": "U+EE1A", 
-        "description": "Combining single octave line below"
-    }, 
-    "organGermanOctaveUp": {
-        "codepoint": "U+EE18", 
-        "description": "Combining single octave line above"
-    }, 
-    "organGermanSemibrevis": {
-        "codepoint": "U+EE27", 
-        "description": "Semibrevis"
-    }, 
-    "organGermanSemibrevisRest": {
-        "codepoint": "U+EE1F", 
-        "description": "Semibrevis Rest"
-    }, 
-    "organGermanSemifusa": {
-        "codepoint": "U+EE2B", 
-        "description": "Semifusa"
-    }, 
-    "organGermanSemifusaRest": {
-        "codepoint": "U+EE23", 
-        "description": "Semifusa Rest"
-    }, 
-    "organGermanSemiminima": {
-        "codepoint": "U+EE29", 
-        "description": "Semiminima"
-    }, 
-    "organGermanSemiminimaRest": {
-        "codepoint": "U+EE21", 
-        "description": "Semiminima Rest"
-    }, 
-    "organGermanTie": {
-        "codepoint": "U+EE1B", 
-        "description": "Tie"
-    }, 
-    "ornamentBottomLeftConcaveStroke": {
-        "codepoint": "U+E59A", 
-        "description": "Ornament bottom left concave stroke"
-    }, 
-    "ornamentBottomLeftConcaveStrokeLarge": {
-        "alternateCodepoint": "U+1D1A1", 
-        "codepoint": "U+E59B", 
-        "description": "Ornament bottom left concave stroke, large"
-    }, 
-    "ornamentBottomLeftConvexStroke": {
-        "codepoint": "U+E59C", 
-        "description": "Ornament bottom left convex stroke"
-    }, 
-    "ornamentBottomRightConcaveStroke": {
-        "alternateCodepoint": "U+1D19F", 
-        "codepoint": "U+E5A7", 
-        "description": "Ornament bottom right concave stroke"
-    }, 
-    "ornamentBottomRightConvexStroke": {
-        "codepoint": "U+E5A8", 
-        "description": "Ornament bottom right convex stroke"
-    }, 
-    "ornamentComma": {
-        "codepoint": "U+E581", 
-        "description": "Comma"
-    }, 
-    "ornamentDoubleObliqueLinesAfterNote": {
-        "codepoint": "U+E57E", 
-        "description": "Double oblique straight lines NW-SE"
-    }, 
-    "ornamentDoubleObliqueLinesBeforeNote": {
-        "codepoint": "U+E57D", 
-        "description": "Double oblique straight lines SW-NE"
-    }, 
-    "ornamentDownCurve": {
-        "codepoint": "U+E578", 
-        "description": "Curve below"
-    }, 
-    "ornamentHaydn": {
-        "codepoint": "U+E56F", 
-        "description": "Haydn ornament"
-    }, 
-    "ornamentHighLeftConcaveStroke": {
-        "codepoint": "U+E592", 
-        "description": "Ornament high left concave stroke"
-    }, 
-    "ornamentHighLeftConvexStroke": {
-        "alternateCodepoint": "U+1D1A2", 
-        "codepoint": "U+E593", 
-        "description": "Ornament high left convex stroke"
-    }, 
-    "ornamentHighRightConcaveStroke": {
-        "codepoint": "U+E5A2", 
-        "description": "Ornament high right concave stroke"
-    }, 
-    "ornamentHighRightConvexStroke": {
-        "codepoint": "U+E5A3", 
-        "description": "Ornament high right convex stroke"
-    }, 
-    "ornamentHookAfterNote": {
-        "codepoint": "U+E576", 
-        "description": "Hook after note"
-    }, 
-    "ornamentHookBeforeNote": {
-        "codepoint": "U+E575", 
-        "description": "Hook before note"
-    }, 
-    "ornamentLeftFacingHalfCircle": {
-        "codepoint": "U+E572", 
-        "description": "Left-facing half circle"
-    }, 
-    "ornamentLeftFacingHook": {
-        "codepoint": "U+E574", 
-        "description": "Left-facing hook"
-    }, 
-    "ornamentLeftPlus": {
-        "codepoint": "U+E597", 
-        "description": "Ornament left +"
-    }, 
-    "ornamentLeftShakeT": {
-        "codepoint": "U+E596", 
-        "description": "Ornament left shake t"
-    }, 
-    "ornamentLeftVerticalStroke": {
-        "alternateCodepoint": "U+1D19B", 
-        "codepoint": "U+E594", 
-        "description": "Ornament left vertical stroke"
-    }, 
-    "ornamentLeftVerticalStrokeWithCross": {
-        "codepoint": "U+E595", 
-        "description": "Ornament left vertical stroke with cross (+)"
-    }, 
-    "ornamentLowLeftConcaveStroke": {
-        "codepoint": "U+E598", 
-        "description": "Ornament low left concave stroke"
-    }, 
-    "ornamentLowLeftConvexStroke": {
-        "alternateCodepoint": "U+1D1A4", 
-        "codepoint": "U+E599", 
-        "description": "Ornament low left convex stroke"
-    }, 
-    "ornamentLowRightConcaveStroke": {
-        "alternateCodepoint": "U+1D1A3", 
-        "codepoint": "U+E5A5", 
-        "description": "Ornament low right concave stroke"
-    }, 
-    "ornamentLowRightConvexStroke": {
-        "codepoint": "U+E5A6", 
-        "description": "Ornament low right convex stroke"
-    }, 
-    "ornamentMiddleVerticalStroke": {
-        "alternateCodepoint": "U+1D1A0", 
-        "codepoint": "U+E59F", 
-        "description": "Ornament middle vertical stroke"
-    }, 
-    "ornamentMordent": {
-        "codepoint": "U+E56D", 
-        "description": "Mordent"
-    }, 
-    "ornamentObliqueLineAfterNote": {
-        "codepoint": "U+E57C", 
-        "description": "Oblique straight line NW-SE"
-    }, 
-    "ornamentObliqueLineBeforeNote": {
-        "codepoint": "U+E57B", 
-        "description": "Oblique straight line SW-NE"
-    }, 
-    "ornamentObliqueLineHorizAfterNote": {
-        "codepoint": "U+E580", 
-        "description": "Oblique straight line tilted NW-SE"
-    }, 
-    "ornamentObliqueLineHorizBeforeNote": {
-        "codepoint": "U+E57F", 
-        "description": "Oblique straight line tilted SW-NE"
-    }, 
-    "ornamentOriscus": {
-        "codepoint": "U+EA21", 
-        "description": "Oriscus"
-    }, 
-    "ornamentPinceCouperin": {
-        "codepoint": "U+E588", 
-        "description": "Pinc\u00e9 (Couperin)"
-    }, 
-    "ornamentPortDeVoixV": {
-        "codepoint": "U+E570", 
-        "description": "Port de voix"
-    }, 
-    "ornamentPrecompAppoggTrill": {
-        "codepoint": "U+E5B2", 
-        "description": "Supported appoggiatura trill"
-    }, 
-    "ornamentPrecompAppoggTrillSuffix": {
-        "codepoint": "U+E5B3", 
-        "description": "Supported appoggiatura trill with two-note suffix"
-    }, 
-    "ornamentPrecompCadence": {
-        "codepoint": "U+E5BE", 
-        "description": "Cadence"
-    }, 
-    "ornamentPrecompCadenceUpperPrefix": {
-        "codepoint": "U+E5C1", 
-        "description": "Cadence with upper prefix"
-    }, 
-    "ornamentPrecompCadenceUpperPrefixTurn": {
-        "codepoint": "U+E5C2", 
-        "description": "Cadence with upper prefix and turn"
-    }, 
-    "ornamentPrecompCadenceWithTurn": {
-        "codepoint": "U+E5BF", 
-        "description": "Cadence with turn"
-    }, 
-    "ornamentPrecompDescendingSlide": {
-        "codepoint": "U+E5B1", 
-        "description": "Descending slide"
-    }, 
-    "ornamentPrecompDoubleCadenceLowerPrefix": {
-        "codepoint": "U+E5C0", 
-        "description": "Double cadence with lower prefix"
-    }, 
-    "ornamentPrecompDoubleCadenceUpperPrefix": {
-        "codepoint": "U+E5C3", 
-        "description": "Double cadence with upper prefix"
-    }, 
-    "ornamentPrecompDoubleCadenceUpperPrefixTurn": {
-        "codepoint": "U+E5C4", 
-        "description": "Double cadence with upper prefix and turn"
-    }, 
-    "ornamentPrecompInvertedMordentUpperPrefix": {
-        "codepoint": "U+E5C7", 
-        "description": "Inverted mordent with upper prefix"
-    }, 
-    "ornamentPrecompMordentRelease": {
-        "codepoint": "U+E5C5", 
-        "description": "Mordent with release"
-    }, 
-    "ornamentPrecompMordentUpperPrefix": {
-        "codepoint": "U+E5C6", 
-        "description": "Mordent with upper prefix"
-    }, 
-    "ornamentPrecompPortDeVoixMordent": {
-        "codepoint": "U+E5BC", 
-        "description": "Pre-beat port de voix followed by multiple mordent (Dandrieu)"
-    }, 
-    "ornamentPrecompSlide": {
-        "codepoint": "U+E5B0", 
-        "description": "Slide"
-    }, 
-    "ornamentPrecompSlideTrillBach": {
-        "codepoint": "U+E5B8", 
-        "description": "Slide-trill with two-note suffix (J.S. Bach)"
-    }, 
-    "ornamentPrecompSlideTrillDAnglebert": {
-        "codepoint": "U+E5B5", 
-        "description": "Slide-trill (D'Anglebert)"
-    }, 
-    "ornamentPrecompSlideTrillMarpurg": {
-        "codepoint": "U+E5B6", 
-        "description": "Slide-trill with one-note suffix (Marpurg)"
-    }, 
-    "ornamentPrecompSlideTrillMuffat": {
-        "codepoint": "U+E5B9", 
-        "description": "Slide-trill (Muffat)"
-    }, 
-    "ornamentPrecompSlideTrillSuffixMuffat": {
-        "codepoint": "U+E5BA", 
-        "description": "Slide-trill with two-note suffix (Muffat)"
-    }, 
-    "ornamentPrecompTrillLowerSuffix": {
-        "codepoint": "U+E5C8", 
-        "description": "Trill with lower suffix"
-    }, 
-    "ornamentPrecompTrillSuffixDandrieu": {
-        "codepoint": "U+E5BB", 
-        "description": "Trill with two-note suffix (Dandrieu)"
-    }, 
-    "ornamentPrecompTrillWithMordent": {
-        "codepoint": "U+E5BD", 
-        "description": "Trill with mordent"
-    }, 
-    "ornamentPrecompTurnTrillBach": {
-        "codepoint": "U+E5B7", 
-        "description": "Turn-trill with two-note suffix (J.S. Bach)"
-    }, 
-    "ornamentPrecompTurnTrillDAnglebert": {
-        "codepoint": "U+E5B4", 
-        "description": "Turn-trill (D'Anglebert)"
-    }, 
-    "ornamentQuilisma": {
-        "codepoint": "U+EA20", 
-        "description": "Quilisma"
-    }, 
-    "ornamentRightFacingHalfCircle": {
-        "codepoint": "U+E571", 
-        "description": "Right-facing half circle"
-    }, 
-    "ornamentRightFacingHook": {
-        "codepoint": "U+E573", 
-        "description": "Right-facing hook"
-    }, 
-    "ornamentRightVerticalStroke": {
-        "codepoint": "U+E5A4", 
-        "description": "Ornament right vertical stroke"
-    }, 
-    "ornamentSchleifer": {
-        "codepoint": "U+E587", 
-        "description": "Schleifer (long mordent)"
-    }, 
-    "ornamentShake3": {
-        "codepoint": "U+E582", 
-        "description": "Shake"
-    }, 
-    "ornamentShakeMuffat1": {
-        "codepoint": "U+E584", 
-        "description": "Shake (Muffat)"
-    }, 
-    "ornamentShortObliqueLineAfterNote": {
-        "codepoint": "U+E57A", 
-        "description": "Short oblique straight line NW-SE"
-    }, 
-    "ornamentShortObliqueLineBeforeNote": {
-        "codepoint": "U+E579", 
-        "description": "Short oblique straight line SW-NE"
-    }, 
-    "ornamentShortTrill": {
-        "codepoint": "U+E56C", 
-        "description": "Short trill"
-    }, 
-    "ornamentTopLeftConcaveStroke": {
-        "codepoint": "U+E590", 
-        "description": "Ornament top left concave stroke"
-    }, 
-    "ornamentTopLeftConvexStroke": {
-        "alternateCodepoint": "U+1D1A5", 
-        "codepoint": "U+E591", 
-        "description": "Ornament top left convex stroke"
-    }, 
-    "ornamentTopRightConcaveStroke": {
-        "codepoint": "U+E5A0", 
-        "description": "Ornament top right concave stroke"
-    }, 
-    "ornamentTopRightConvexStroke": {
-        "alternateCodepoint": "U+1D19E", 
-        "codepoint": "U+E5A1", 
-        "description": "Ornament top right convex stroke"
-    }, 
-    "ornamentTremblement": {
-        "codepoint": "U+E56E", 
-        "description": "Tremblement"
-    }, 
-    "ornamentTremblementCouperin": {
-        "codepoint": "U+E589", 
-        "description": "Tremblement appuy\u00e9 (Couperin)"
-    }, 
-    "ornamentTrill": {
-        "alternateCodepoint": "U+1D196", 
-        "codepoint": "U+E566", 
-        "description": "Trill"
-    }, 
-    "ornamentTurn": {
-        "alternateCodepoint": "U+1D197", 
-        "codepoint": "U+E567", 
-        "description": "Turn"
-    }, 
-    "ornamentTurnInverted": {
-        "alternateCodepoint": "U+1D198", 
-        "codepoint": "U+E568", 
-        "description": "Inverted turn"
-    }, 
-    "ornamentTurnSlash": {
-        "alternateCodepoint": "U+1D199", 
-        "codepoint": "U+E569", 
-        "description": "Turn with slash"
-    }, 
-    "ornamentTurnUp": {
-        "alternateCodepoint": "U+1D19A", 
-        "codepoint": "U+E56A", 
-        "description": "Turn up"
-    }, 
-    "ornamentTurnUpS": {
-        "codepoint": "U+E56B", 
-        "description": "Inverted turn up"
-    }, 
-    "ornamentUpCurve": {
-        "codepoint": "U+E577", 
-        "description": "Curve above"
-    }, 
-    "ornamentVerticalLine": {
-        "codepoint": "U+E583", 
-        "description": "Vertical line"
-    }, 
-    "ornamentZigZagLineNoRightEnd": {
-        "alternateCodepoint": "U+1D19C", 
-        "codepoint": "U+E59D", 
-        "description": "Ornament zig-zag line without right-hand end"
-    }, 
-    "ornamentZigZagLineWithRightEnd": {
-        "alternateCodepoint": "U+1D19D", 
-        "codepoint": "U+E59E", 
-        "description": "Ornament zig-zag line with right-hand end"
-    }, 
-    "ottava": {
-        "codepoint": "U+E510", 
-        "description": "Ottava"
-    }, 
-    "ottavaAlta": {
-        "alternateCodepoint": "U+1D136", 
-        "codepoint": "U+E511", 
-        "description": "Ottava alta"
-    }, 
-    "ottavaBassa": {
-        "alternateCodepoint": "U+1D137", 
-        "codepoint": "U+E512", 
-        "description": "Ottava bassa"
-    }, 
-    "ottavaBassaBa": {
-        "codepoint": "U+E513", 
-        "description": "Ottava bassa (ba)"
-    }, 
-    "ottavaBassaVb": {
-        "codepoint": "U+E51C", 
-        "description": "Ottava bassa (8vb)"
-    }, 
-    "pendereckiTremolo": {
-        "codepoint": "U+E22B", 
-        "description": "Penderecki unmeasured tremolo"
-    }, 
-    "pictAgogo": {
-        "codepoint": "U+E717", 
-        "description": "Agogo"
-    }, 
-    "pictAlmglocken": {
-        "codepoint": "U+E712", 
-        "description": "Almglocken"
-    }, 
-    "pictAnvil": {
-        "codepoint": "U+E701", 
-        "description": "Anvil"
-    }, 
-    "pictBambooChimes": {
-        "codepoint": "U+E6C3", 
-        "description": "Bamboo tube chimes"
-    }, 
-    "pictBambooScraper": {
-        "codepoint": "U+E6FB", 
-        "description": "Bamboo scraper"
-    }, 
-    "pictBassDrum": {
-        "codepoint": "U+E6D4", 
-        "description": "Bass drum"
-    }, 
-    "pictBassDrumOnSide": {
-        "codepoint": "U+E6D5", 
-        "description": "Bass drum on side"
-    }, 
-    "pictBeaterBow": {
-        "codepoint": "U+E7DE", 
-        "description": "Bow"
-    }, 
-    "pictBeaterBox": {
-        "codepoint": "U+E7EB", 
-        "description": "Box for percussion beater"
-    }, 
-    "pictBeaterBrassMalletsDown": {
-        "codepoint": "U+E7DA", 
-        "description": "Brass mallets down"
-    }, 
-    "pictBeaterBrassMalletsLeft": {
-        "codepoint": "U+E7EE", 
-        "description": "Brass mallets left"
-    }, 
-    "pictBeaterBrassMalletsRight": {
-        "codepoint": "U+E7ED", 
-        "description": "Brass mallets right"
-    }, 
-    "pictBeaterBrassMalletsUp": {
-        "codepoint": "U+E7D9", 
-        "description": "Brass mallets up"
-    }, 
-    "pictBeaterCombiningDashedCircle": {
-        "codepoint": "U+E7EA", 
-        "description": "Combining dashed circle for round beaters (plated)"
-    }, 
-    "pictBeaterCombiningParentheses": {
-        "codepoint": "U+E7E9", 
-        "description": "Combining parentheses for round beaters (padded)"
-    }, 
-    "pictBeaterDoubleBassDrumDown": {
-        "codepoint": "U+E7A1", 
-        "description": "Double bass drum stick down"
-    }, 
-    "pictBeaterDoubleBassDrumUp": {
-        "codepoint": "U+E7A0", 
-        "description": "Double bass drum stick up"
-    }, 
-    "pictBeaterFinger": {
-        "codepoint": "U+E7E4", 
-        "description": "Finger"
-    }, 
-    "pictBeaterFingernails": {
-        "codepoint": "U+E7E6", 
-        "description": "Fingernails"
-    }, 
-    "pictBeaterFist": {
-        "codepoint": "U+E7E5", 
-        "description": "Fist"
-    }, 
-    "pictBeaterGuiroScraper": {
-        "codepoint": "U+E7DD", 
-        "description": "Guiro scraper"
-    }, 
-    "pictBeaterHammer": {
-        "codepoint": "U+E7E1", 
-        "description": "Hammer"
-    }, 
-    "pictBeaterHammerMetalDown": {
-        "codepoint": "U+E7D0", 
-        "description": "Metal hammer, down"
-    }, 
-    "pictBeaterHammerMetalUp": {
-        "codepoint": "U+E7CF", 
-        "description": "Metal hammer, up"
-    }, 
-    "pictBeaterHammerPlasticDown": {
-        "codepoint": "U+E7CE", 
-        "description": "Plastic hammer, down"
-    }, 
-    "pictBeaterHammerPlasticUp": {
-        "codepoint": "U+E7CD", 
-        "description": "Plastic hammer, up"
-    }, 
-    "pictBeaterHammerWoodDown": {
-        "codepoint": "U+E7CC", 
-        "description": "Wooden hammer, down"
-    }, 
-    "pictBeaterHammerWoodUp": {
-        "codepoint": "U+E7CB", 
-        "description": "Wooden hammer, up"
-    }, 
-    "pictBeaterHand": {
-        "codepoint": "U+E7E3", 
-        "description": "Hand"
-    }, 
-    "pictBeaterHardBassDrumDown": {
-        "codepoint": "U+E79D", 
-        "description": "Hard bass drum stick down"
-    }, 
-    "pictBeaterHardBassDrumUp": {
-        "codepoint": "U+E79C", 
-        "description": "Hard bass drum stick up"
-    }, 
-    "pictBeaterHardGlockenspielDown": {
-        "codepoint": "U+E785", 
-        "description": "Hard glockenspiel stick down"
-    }, 
-    "pictBeaterHardGlockenspielLeft": {
-        "codepoint": "U+E787", 
-        "description": "Hard glockenspiel stick left"
-    }, 
-    "pictBeaterHardGlockenspielRight": {
-        "codepoint": "U+E786", 
-        "description": "Hard glockenspiel stick right"
-    }, 
-    "pictBeaterHardGlockenspielUp": {
-        "codepoint": "U+E784", 
-        "description": "Hard glockenspiel stick up"
-    }, 
-    "pictBeaterHardTimpaniDown": {
-        "codepoint": "U+E791", 
-        "description": "Hard timpani stick down"
-    }, 
-    "pictBeaterHardTimpaniLeft": {
-        "codepoint": "U+E793", 
-        "description": "Hard timpani stick left"
-    }, 
-    "pictBeaterHardTimpaniRight": {
-        "codepoint": "U+E792", 
-        "description": "Hard timpani stick right"
-    }, 
-    "pictBeaterHardTimpaniUp": {
-        "codepoint": "U+E790", 
-        "description": "Hard timpani stick up"
-    }, 
-    "pictBeaterHardXylophoneDown": {
-        "codepoint": "U+E779", 
-        "description": "Hard xylophone stick down"
-    }, 
-    "pictBeaterHardXylophoneLeft": {
-        "codepoint": "U+E77B", 
-        "description": "Hard xylophone stick left"
-    }, 
-    "pictBeaterHardXylophoneRight": {
-        "codepoint": "U+E77A", 
-        "description": "Hard xylophone stick right"
-    }, 
-    "pictBeaterHardXylophoneUp": {
-        "codepoint": "U+E778", 
-        "description": "Hard xylophone stick up"
-    }, 
-    "pictBeaterHardYarnDown": {
-        "codepoint": "U+E7AB", 
-        "description": "Hard yarn beater down"
-    }, 
-    "pictBeaterHardYarnLeft": {
-        "codepoint": "U+E7AD", 
-        "description": "Hard yarn beater left"
-    }, 
-    "pictBeaterHardYarnRight": {
-        "codepoint": "U+E7AC", 
-        "description": "Hard yarn beater right"
-    }, 
-    "pictBeaterHardYarnUp": {
-        "codepoint": "U+E7AA", 
-        "description": "Hard yarn beater up"
-    }, 
-    "pictBeaterJazzSticksDown": {
-        "codepoint": "U+E7D4", 
-        "description": "Jazz sticks down"
-    }, 
-    "pictBeaterJazzSticksUp": {
-        "codepoint": "U+E7D3", 
-        "description": "Jazz sticks up"
-    }, 
-    "pictBeaterKnittingNeedle": {
-        "codepoint": "U+E7E2", 
-        "description": "Knitting needle"
-    }, 
-    "pictBeaterMallet": {
-        "codepoint": "U+E7DF", 
-        "description": "Chime hammer up"
-    }, 
-    "pictBeaterMalletDown": {
-        "codepoint": "U+E7EC", 
-        "description": "Chime hammer down"
-    }, 
-    "pictBeaterMediumBassDrumDown": {
-        "codepoint": "U+E79B", 
-        "description": "Medium bass drum stick down"
-    }, 
-    "pictBeaterMediumBassDrumUp": {
-        "codepoint": "U+E79A", 
-        "description": "Medium bass drum stick up"
-    }, 
-    "pictBeaterMediumTimpaniDown": {
-        "codepoint": "U+E78D", 
-        "description": "Medium timpani stick down"
-    }, 
-    "pictBeaterMediumTimpaniLeft": {
-        "codepoint": "U+E78F", 
-        "description": "Medium timpani stick left"
-    }, 
-    "pictBeaterMediumTimpaniRight": {
-        "codepoint": "U+E78E", 
-        "description": "Medium timpani stick right"
-    }, 
-    "pictBeaterMediumTimpaniUp": {
-        "codepoint": "U+E78C", 
-        "description": "Medium timpani stick up"
-    }, 
-    "pictBeaterMediumXylophoneDown": {
-        "codepoint": "U+E775", 
-        "description": "Medium xylophone stick down"
-    }, 
-    "pictBeaterMediumXylophoneLeft": {
-        "codepoint": "U+E777", 
-        "description": "Medium xylophone stick left"
-    }, 
-    "pictBeaterMediumXylophoneRight": {
-        "codepoint": "U+E776", 
-        "description": "Medium xylophone stick right"
-    }, 
-    "pictBeaterMediumXylophoneUp": {
-        "codepoint": "U+E774", 
-        "description": "Medium xylophone stick up"
-    }, 
-    "pictBeaterMediumYarnDown": {
-        "codepoint": "U+E7A7", 
-        "description": "Medium yarn beater down"
-    }, 
-    "pictBeaterMediumYarnLeft": {
-        "codepoint": "U+E7A9", 
-        "description": "Medium yarn beater left"
-    }, 
-    "pictBeaterMediumYarnRight": {
-        "codepoint": "U+E7A8", 
-        "description": "Medium yarn beater right"
-    }, 
-    "pictBeaterMediumYarnUp": {
-        "codepoint": "U+E7A6", 
-        "description": "Medium yarn beater up"
-    }, 
-    "pictBeaterMetalBassDrumDown": {
-        "codepoint": "U+E79F", 
-        "description": "Metal bass drum stick down"
-    }, 
-    "pictBeaterMetalBassDrumUp": {
-        "codepoint": "U+E79E", 
-        "description": "Metal bass drum stick up"
-    }, 
-    "pictBeaterMetalDown": {
-        "codepoint": "U+E7C8", 
-        "description": "Metal beater down"
-    }, 
-    "pictBeaterMetalHammer": {
-        "codepoint": "U+E7E0", 
-        "description": "Metal hammer"
-    }, 
-    "pictBeaterMetalLeft": {
-        "codepoint": "U+E7CA", 
-        "description": "Metal beater, left"
-    }, 
-    "pictBeaterMetalRight": {
-        "codepoint": "U+E7C9", 
-        "description": "Metal beater, right"
-    }, 
-    "pictBeaterMetalUp": {
-        "codepoint": "U+E7C7", 
-        "description": "Metal beater, up"
-    }, 
-    "pictBeaterSnareSticksDown": {
-        "codepoint": "U+E7D2", 
-        "description": "Snare sticks down"
-    }, 
-    "pictBeaterSnareSticksUp": {
-        "codepoint": "U+E7D1", 
-        "description": "Snare sticks up"
-    }, 
-    "pictBeaterSoftBassDrumDown": {
-        "codepoint": "U+E799", 
-        "description": "Soft bass drum stick down"
-    }, 
-    "pictBeaterSoftBassDrumUp": {
-        "codepoint": "U+E798", 
-        "description": "Soft bass drum stick up"
-    }, 
-    "pictBeaterSoftGlockenspielDown": {
-        "codepoint": "U+E781", 
-        "description": "Soft glockenspiel stick down"
-    }, 
-    "pictBeaterSoftGlockenspielLeft": {
-        "codepoint": "U+E783", 
-        "description": "Soft glockenspiel stick left"
-    }, 
-    "pictBeaterSoftGlockenspielRight": {
-        "codepoint": "U+E782", 
-        "description": "Soft glockenspiel stick right"
-    }, 
-    "pictBeaterSoftGlockenspielUp": {
-        "codepoint": "U+E780", 
-        "description": "Soft glockenspiel stick up"
-    }, 
-    "pictBeaterSoftTimpaniDown": {
-        "codepoint": "U+E789", 
-        "description": "Soft timpani stick down"
-    }, 
-    "pictBeaterSoftTimpaniLeft": {
-        "codepoint": "U+E78B", 
-        "description": "Soft timpani stick left"
-    }, 
-    "pictBeaterSoftTimpaniRight": {
-        "codepoint": "U+E78A", 
-        "description": "Soft timpani stick right"
-    }, 
-    "pictBeaterSoftTimpaniUp": {
-        "codepoint": "U+E788", 
-        "description": "Soft timpani stick up"
-    }, 
-    "pictBeaterSoftXylophone": {
-        "codepoint": "U+E7DB", 
-        "description": "Soft xylophone beaters"
-    }, 
-    "pictBeaterSoftXylophoneDown": {
-        "codepoint": "U+E771", 
-        "description": "Soft xylophone stick down"
-    }, 
-    "pictBeaterSoftXylophoneLeft": {
-        "codepoint": "U+E773", 
-        "description": "Soft xylophone stick left"
-    }, 
-    "pictBeaterSoftXylophoneRight": {
-        "codepoint": "U+E772", 
-        "description": "Soft xylophone stick right"
-    }, 
-    "pictBeaterSoftXylophoneUp": {
-        "codepoint": "U+E770", 
-        "description": "Soft xylophone stick up"
-    }, 
-    "pictBeaterSoftYarnDown": {
-        "codepoint": "U+E7A3", 
-        "description": "Soft yarn beater down"
-    }, 
-    "pictBeaterSoftYarnLeft": {
-        "codepoint": "U+E7A5", 
-        "description": "Soft yarn beater left"
-    }, 
-    "pictBeaterSoftYarnRight": {
-        "codepoint": "U+E7A4", 
-        "description": "Soft yarn beater right"
-    }, 
-    "pictBeaterSoftYarnUp": {
-        "codepoint": "U+E7A2", 
-        "description": "Soft yarn beater up"
-    }, 
-    "pictBeaterSpoonWoodenMallet": {
-        "codepoint": "U+E7DC", 
-        "description": "Spoon-shaped wooden mallet"
-    }, 
-    "pictBeaterSuperballDown": {
-        "codepoint": "U+E7AF", 
-        "description": "Superball beater down"
-    }, 
-    "pictBeaterSuperballLeft": {
-        "codepoint": "U+E7B1", 
-        "description": "Superball beater left"
-    }, 
-    "pictBeaterSuperballRight": {
-        "codepoint": "U+E7B0", 
-        "description": "Superball beater right"
-    }, 
-    "pictBeaterSuperballUp": {
-        "codepoint": "U+E7AE", 
-        "description": "Superball beater up"
-    }, 
-    "pictBeaterTriangleDown": {
-        "codepoint": "U+E7D6", 
-        "description": "Triangle beater down"
-    }, 
-    "pictBeaterTrianglePlain": {
-        "codepoint": "U+E7EF", 
-        "description": "Triangle beater plain"
-    }, 
-    "pictBeaterTriangleUp": {
-        "codepoint": "U+E7D5", 
-        "description": "Triangle beater up"
-    }, 
-    "pictBeaterWireBrushesDown": {
-        "codepoint": "U+E7D8", 
-        "description": "Wire brushes down"
-    }, 
-    "pictBeaterWireBrushesUp": {
-        "codepoint": "U+E7D7", 
-        "description": "Wire brushes up"
-    }, 
-    "pictBeaterWoodTimpaniDown": {
-        "codepoint": "U+E795", 
-        "description": "Wood timpani stick down"
-    }, 
-    "pictBeaterWoodTimpaniLeft": {
-        "codepoint": "U+E797", 
-        "description": "Wood timpani stick left"
-    }, 
-    "pictBeaterWoodTimpaniRight": {
-        "codepoint": "U+E796", 
-        "description": "Wood timpani stick right"
-    }, 
-    "pictBeaterWoodTimpaniUp": {
-        "codepoint": "U+E794", 
-        "description": "Wood timpani stick up"
-    }, 
-    "pictBeaterWoodXylophoneDown": {
-        "codepoint": "U+E77D", 
-        "description": "Wood xylophone stick down"
-    }, 
-    "pictBeaterWoodXylophoneLeft": {
-        "codepoint": "U+E77F", 
-        "description": "Wood xylophone stick left"
-    }, 
-    "pictBeaterWoodXylophoneRight": {
-        "codepoint": "U+E77E", 
-        "description": "Wood xylophone stick right"
-    }, 
-    "pictBeaterWoodXylophoneUp": {
-        "codepoint": "U+E77C", 
-        "description": "Wood xylophone stick up"
-    }, 
-    "pictBell": {
-        "codepoint": "U+E714", 
-        "description": "Bell"
-    }, 
-    "pictBellOfCymbal": {
-        "codepoint": "U+E72A", 
-        "description": "Bell of cymbal"
-    }, 
-    "pictBellPlate": {
-        "codepoint": "U+E713", 
-        "description": "Bell plate"
-    }, 
-    "pictBellTree": {
-        "codepoint": "U+E71A", 
-        "description": "Bell tree"
-    }, 
-    "pictBirdWhistle": {
-        "codepoint": "U+E751", 
-        "description": "Bird whistle"
-    }, 
-    "pictBoardClapper": {
-        "codepoint": "U+E6F7", 
-        "description": "Board clapper"
-    }, 
-    "pictBongos": {
-        "codepoint": "U+E6DD", 
-        "description": "Bongos"
-    }, 
-    "pictBrakeDrum": {
-        "codepoint": "U+E6E1", 
-        "description": "Brake drum"
-    }, 
-    "pictCabasa": {
-        "codepoint": "U+E743", 
-        "description": "Cabasa"
-    }, 
-    "pictCannon": {
-        "codepoint": "U+E761", 
-        "description": "Cannon"
-    }, 
-    "pictCarHorn": {
-        "codepoint": "U+E755", 
-        "description": "Car horn"
-    }, 
-    "pictCastanets": {
-        "codepoint": "U+E6F8", 
-        "description": "Castanets"
-    }, 
-    "pictCastanetsWithHandle": {
-        "codepoint": "U+E6F9", 
-        "description": "Castanets with handle"
-    }, 
-    "pictCelesta": {
-        "codepoint": "U+E6B0", 
-        "description": "Celesta"
-    }, 
-    "pictCencerro": {
-        "codepoint": "U+E716", 
-        "description": "Cencerro"
-    }, 
-    "pictCenter1": {
-        "codepoint": "U+E7FE", 
-        "description": "Center (Weinberg)"
-    }, 
-    "pictCenter2": {
-        "codepoint": "U+E7FF", 
-        "description": "Center (Ghent)"
-    }, 
-    "pictCenter3": {
-        "codepoint": "U+E800", 
-        "description": "Center (Caltabiano)"
-    }, 
-    "pictChainRattle": {
-        "codepoint": "U+E748", 
-        "description": "Chain rattle"
-    }, 
-    "pictChimes": {
-        "codepoint": "U+E6C2", 
-        "description": "Chimes"
-    }, 
-    "pictChineseCymbal": {
-        "codepoint": "U+E726", 
-        "description": "Chinese cymbal"
-    }, 
-    "pictChokeCymbal": {
-        "codepoint": "U+E805", 
-        "description": "Choke (Weinberg)"
-    }, 
-    "pictClaves": {
-        "codepoint": "U+E6F2", 
-        "description": "Claves"
-    }, 
-    "pictCoins": {
-        "codepoint": "U+E7E7", 
-        "description": "Coins"
-    }, 
-    "pictConga": {
-        "codepoint": "U+E6DE", 
-        "description": "Conga"
-    }, 
-    "pictCowBell": {
-        "codepoint": "U+E711", 
-        "description": "Cow bell"
-    }, 
-    "pictCrashCymbals": {
-        "codepoint": "U+E720", 
-        "description": "Crash cymbals"
-    }, 
-    "pictCrotales": {
-        "codepoint": "U+E6AE", 
-        "description": "Crotales"
-    }, 
-    "pictCrushStem": {
-        "codepoint": "U+E80C", 
-        "description": "Combining crush for stem"
-    }, 
-    "pictCuica": {
-        "codepoint": "U+E6E4", 
-        "description": "Cuica"
-    }, 
-    "pictCymbalTongs": {
-        "codepoint": "U+E728", 
-        "description": "Cymbal tongs"
-    }, 
-    "pictDamp1": {
-        "codepoint": "U+E7F9", 
-        "description": "Damp"
-    }, 
-    "pictDamp2": {
-        "codepoint": "U+E7FA", 
-        "description": "Damp 2"
-    }, 
-    "pictDamp3": {
-        "codepoint": "U+E7FB", 
-        "description": "Damp 3"
-    }, 
-    "pictDamp4": {
-        "codepoint": "U+E7FC", 
-        "description": "Damp 4"
-    }, 
-    "pictDeadNoteStem": {
-        "codepoint": "U+E80D", 
-        "description": "Combining X for stem (dead note)"
-    }, 
-    "pictDrumStick": {
-        "codepoint": "U+E7E8", 
-        "description": "Drum stick"
-    }, 
-    "pictDuckCall": {
-        "codepoint": "U+E757", 
-        "description": "Duck call"
-    }, 
-    "pictEdgeOfCymbal": {
-        "codepoint": "U+E729", 
-        "description": "Edge of cymbal"
-    }, 
-    "pictEmptyTrap": {
-        "codepoint": "U+E6A9", 
-        "description": "Empty trapezoid"
-    }, 
-    "pictFingerCymbals": {
-        "codepoint": "U+E727", 
-        "description": "Finger cymbals"
-    }, 
-    "pictFlexatone": {
-        "codepoint": "U+E740", 
-        "description": "Flexatone"
-    }, 
-    "pictFootballRatchet": {
-        "codepoint": "U+E6F5", 
-        "description": "Football rattle"
-    }, 
-    "pictGlassHarmonica": {
-        "codepoint": "U+E765", 
-        "description": "Glass harmonica"
-    }, 
-    "pictGlassHarp": {
-        "codepoint": "U+E764", 
-        "description": "Glass harp"
-    }, 
-    "pictGlassPlateChimes": {
-        "codepoint": "U+E6C6", 
-        "description": "Glass plate chimes"
-    }, 
-    "pictGlassTubeChimes": {
-        "codepoint": "U+E6C5", 
-        "description": "Glass tube chimes"
-    }, 
-    "pictGlsp": {
-        "codepoint": "U+E6A0", 
-        "description": "Glockenspiel"
-    }, 
-    "pictGlspSmithBrindle": {
-        "codepoint": "U+E6AA", 
-        "description": "Glockenspiel (Smith Brindle)"
-    }, 
-    "pictGobletDrum": {
-        "codepoint": "U+E6E2", 
-        "description": "Goblet drum (djembe, dumbek)"
-    }, 
-    "pictGong": {
-        "codepoint": "U+E732", 
-        "description": "Gong"
-    }, 
-    "pictGongWithButton": {
-        "codepoint": "U+E733", 
-        "description": "Gong with button (nipple)"
-    }, 
-    "pictGuiro": {
-        "codepoint": "U+E6F3", 
-        "description": "Guiro"
-    }, 
-    "pictGumHardDown": {
-        "codepoint": "U+E7C4", 
-        "description": "Hard gum beater, down"
-    }, 
-    "pictGumHardLeft": {
-        "codepoint": "U+E7C6", 
-        "description": "Hard gum beater, left"
-    }, 
-    "pictGumHardRight": {
-        "codepoint": "U+E7C5", 
-        "description": "Hard gum beater, right"
-    }, 
-    "pictGumHardUp": {
-        "codepoint": "U+E7C3", 
-        "description": "Hard gum beater, up"
-    }, 
-    "pictGumMediumDown": {
-        "codepoint": "U+E7C0", 
-        "description": "Medium gum beater, down"
-    }, 
-    "pictGumMediumLeft": {
-        "codepoint": "U+E7C2", 
-        "description": "Medium gum beater, left"
-    }, 
-    "pictGumMediumRight": {
-        "codepoint": "U+E7C1", 
-        "description": "Medium gum beater, right"
-    }, 
-    "pictGumMediumUp": {
-        "codepoint": "U+E7BF", 
-        "description": "Medium gum beater, up"
-    }, 
-    "pictGumSoftDown": {
-        "codepoint": "U+E7BC", 
-        "description": "Soft gum beater, down"
-    }, 
-    "pictGumSoftLeft": {
-        "codepoint": "U+E7BE", 
-        "description": "Soft gum beater, left"
-    }, 
-    "pictGumSoftRight": {
-        "codepoint": "U+E7BD", 
-        "description": "Soft gum beater, right"
-    }, 
-    "pictGumSoftUp": {
-        "codepoint": "U+E7BB", 
-        "description": "Soft gum beater, up"
-    }, 
-    "pictHalfOpen1": {
-        "codepoint": "U+E7F6", 
-        "description": "Half-open"
-    }, 
-    "pictHalfOpen2": {
-        "codepoint": "U+E7F7", 
-        "description": "Half-open 2 (Weinberg)"
-    }, 
-    "pictHandbell": {
-        "codepoint": "U+E715", 
-        "description": "Handbell"
-    }, 
-    "pictHiHat": {
-        "codepoint": "U+E722", 
-        "description": "Hi-hat"
-    }, 
-    "pictHiHatOnStand": {
-        "codepoint": "U+E723", 
-        "description": "Hi-hat cymbals on stand"
-    }, 
-    "pictJawHarp": {
-        "codepoint": "U+E767", 
-        "description": "Jaw harp"
-    }, 
-    "pictJingleBells": {
-        "codepoint": "U+E719", 
-        "description": "Jingle bells"
-    }, 
-    "pictKlaxonHorn": {
-        "codepoint": "U+E756", 
-        "description": "Klaxon horn"
-    }, 
-    "pictLeftHandCircle": {
-        "codepoint": "U+E807", 
-        "description": "Right hand (Agostini)"
-    }, 
-    "pictLionsRoar": {
-        "codepoint": "U+E763", 
-        "description": "Lion's roar"
-    }, 
-    "pictLithophone": {
-        "codepoint": "U+E6B1", 
-        "description": "Lithophone"
-    }, 
-    "pictLogDrum": {
-        "codepoint": "U+E6DF", 
-        "description": "Log drum"
-    }, 
-    "pictLotusFlute": {
-        "codepoint": "U+E75A", 
-        "description": "Lotus flute"
-    }, 
-    "pictMar": {
-        "codepoint": "U+E6A6", 
-        "description": "Marimba"
-    }, 
-    "pictMarSmithBrindle": {
-        "codepoint": "U+E6AC", 
-        "description": "Marimba (Smith Brindle)"
-    }, 
-    "pictMaraca": {
-        "codepoint": "U+E741", 
-        "description": "Maraca"
-    }, 
-    "pictMaracas": {
-        "codepoint": "U+E742", 
-        "description": "Maracas"
-    }, 
-    "pictMegaphone": {
-        "codepoint": "U+E759", 
-        "description": "Megaphone"
-    }, 
-    "pictMetalPlateChimes": {
-        "codepoint": "U+E6C8", 
-        "description": "Metal plate chimes"
-    }, 
-    "pictMetalTubeChimes": {
-        "codepoint": "U+E6C7", 
-        "description": "Metal tube chimes"
-    }, 
-    "pictMusicalSaw": {
-        "codepoint": "U+E766", 
-        "description": "Musical saw"
-    }, 
-    "pictNormalPosition": {
-        "codepoint": "U+E804", 
-        "description": "Normal position (Caltabiano)"
-    }, 
-    "pictOnRim": {
-        "codepoint": "U+E7F4", 
-        "description": "On rim"
-    }, 
-    "pictOpen": {
-        "codepoint": "U+E7F8", 
-        "description": "Open"
-    }, 
-    "pictOpenRimShot": {
-        "codepoint": "U+E7F5", 
-        "description": "Closed / rim shot"
-    }, 
-    "pictPistolShot": {
-        "codepoint": "U+E760", 
-        "description": "Pistol shot"
-    }, 
-    "pictPoliceWhistle": {
-        "codepoint": "U+E752", 
-        "description": "Police whistle"
-    }, 
-    "pictQuijada": {
-        "codepoint": "U+E6FA", 
-        "description": "Quijada (jawbone)"
-    }, 
-    "pictRainstick": {
-        "codepoint": "U+E747", 
-        "description": "Rainstick"
-    }, 
-    "pictRatchet": {
-        "codepoint": "U+E6F4", 
-        "description": "Ratchet"
-    }, 
-    "pictRecoReco": {
-        "codepoint": "U+E6FC", 
-        "description": "Reco-reco"
-    }, 
-    "pictRightHandSquare": {
-        "codepoint": "U+E806", 
-        "description": "Left hand (Agostini)"
-    }, 
-    "pictRim1": {
-        "codepoint": "U+E801", 
-        "description": "Rim or edge (Weinberg)"
-    }, 
-    "pictRim2": {
-        "codepoint": "U+E802", 
-        "description": "Rim (Ghent)"
-    }, 
-    "pictRim3": {
-        "codepoint": "U+E803", 
-        "description": "Rim (Caltabiano)"
-    }, 
-    "pictRimShotOnStem": {
-        "codepoint": "U+E7FD", 
-        "description": "Rim shot for stem"
-    }, 
-    "pictSandpaperBlocks": {
-        "codepoint": "U+E762", 
-        "description": "Sandpaper blocks"
-    }, 
-    "pictScrapeAroundRim": {
-        "codepoint": "U+E7F3", 
-        "description": "Scrape around rim (counter-clockwise)"
-    }, 
-    "pictScrapeAroundRimClockwise": {
-        "codepoint": "U+E80E", 
-        "description": "Scrape around rim (clockwise)"
-    }, 
-    "pictScrapeCenterToEdge": {
-        "codepoint": "U+E7F1", 
-        "description": "Scrape from center to edge"
-    }, 
-    "pictScrapeEdgeToCenter": {
-        "codepoint": "U+E7F2", 
-        "description": "Scrape from edge to center"
-    }, 
-    "pictShellBells": {
-        "codepoint": "U+E718", 
-        "description": "Shell bells"
-    }, 
-    "pictShellChimes": {
-        "codepoint": "U+E6C4", 
-        "description": "Shell chimes"
-    }, 
-    "pictSiren": {
-        "codepoint": "U+E753", 
-        "description": "Siren"
-    }, 
-    "pictSistrum": {
-        "codepoint": "U+E746", 
-        "description": "Sistrum"
-    }, 
-    "pictSizzleCymbal": {
-        "codepoint": "U+E724", 
-        "description": "Sizzle cymbal"
-    }, 
-    "pictSleighBell": {
-        "codepoint": "U+E710", 
-        "description": "Sleigh bell"
-    }, 
-    "pictSlideBrushOnGong": {
-        "codepoint": "U+E734", 
-        "description": "Slide brush on gong"
-    }, 
-    "pictSlideWhistle": {
-        "codepoint": "U+E750", 
-        "description": "Slide whistle"
-    }, 
-    "pictSlitDrum": {
-        "codepoint": "U+E6E0", 
-        "description": "Slit drum"
-    }, 
-    "pictSnareDrum": {
-        "codepoint": "U+E6D1", 
-        "description": "Snare drum"
-    }, 
-    "pictSnareDrumMilitary": {
-        "codepoint": "U+E6D3", 
-        "description": "Military snare drum"
-    }, 
-    "pictSnareDrumSnaresOff": {
-        "codepoint": "U+E6D2", 
-        "description": "Snare drum, snares off"
-    }, 
-    "pictSteelDrums": {
-        "codepoint": "U+E6AF", 
-        "description": "Steel drums"
-    }, 
-    "pictStickShot": {
-        "codepoint": "U+E7F0", 
-        "description": "Stick shot"
-    }, 
-    "pictSuperball": {
-        "codepoint": "U+E7B2", 
-        "description": "Superball"
-    }, 
-    "pictSuspendedCymbal": {
-        "codepoint": "U+E721", 
-        "description": "Suspended cymbal"
-    }, 
-    "pictSwishStem": {
-        "codepoint": "U+E808", 
-        "description": "Combining swish for stem"
-    }, 
-    "pictTabla": {
-        "codepoint": "U+E6E3", 
-        "description": "Indian tabla"
-    }, 
-    "pictTamTam": {
-        "codepoint": "U+E730", 
-        "description": "Tam-tam"
-    }, 
-    "pictTamTamWithBeater": {
-        "codepoint": "U+E731", 
-        "description": "Tam-tam with beater (Smith Brindle)"
-    }, 
-    "pictTambourine": {
-        "codepoint": "U+E6DB", 
-        "description": "Tambourine"
-    }, 
-    "pictTempleBlocks": {
-        "codepoint": "U+E6F1", 
-        "description": "Temple blocks"
-    }, 
-    "pictTenorDrum": {
-        "codepoint": "U+E6D6", 
-        "description": "Tenor drum"
-    }, 
-    "pictThundersheet": {
-        "codepoint": "U+E744", 
-        "description": "Thundersheet"
-    }, 
-    "pictTimbales": {
-        "codepoint": "U+E6DC", 
-        "description": "Timbales"
-    }, 
-    "pictTimpani": {
-        "codepoint": "U+E6D0", 
-        "description": "Timpani"
-    }, 
-    "pictTomTom": {
-        "codepoint": "U+E6D7", 
-        "description": "Tom-tom"
-    }, 
-    "pictTomTomChinese": {
-        "codepoint": "U+E6D8", 
-        "description": "Chinese tom-tom"
-    }, 
-    "pictTomTomIndoAmerican": {
-        "codepoint": "U+E6DA", 
-        "description": "Indo-American tom tom"
-    }, 
-    "pictTomTomJapanese": {
-        "codepoint": "U+E6D9", 
-        "description": "Japanese tom-tom"
-    }, 
-    "pictTriangle": {
-        "codepoint": "U+E700", 
-        "description": "Triangle"
-    }, 
-    "pictTubaphone": {
-        "codepoint": "U+E6B2", 
-        "description": "Tubaphone"
-    }, 
-    "pictTubularBells": {
-        "codepoint": "U+E6C0", 
-        "description": "Tubular bells"
-    }, 
-    "pictTurnLeftStem": {
-        "codepoint": "U+E80A", 
-        "description": "Combining turn left for stem"
-    }, 
-    "pictTurnRightLeftStem": {
-        "codepoint": "U+E80B", 
-        "description": "Combining turn left or right for stem"
-    }, 
-    "pictTurnRightStem": {
-        "codepoint": "U+E809", 
-        "description": "Combining turn right for stem"
-    }, 
-    "pictVib": {
-        "codepoint": "U+E6A7", 
-        "description": "Vibraphone"
-    }, 
-    "pictVibMotorOff": {
-        "codepoint": "U+E6A8", 
-        "description": "Metallophone (vibraphone motor off)"
-    }, 
-    "pictVibSmithBrindle": {
-        "codepoint": "U+E6AD", 
-        "description": "Vibraphone (Smith Brindle)"
-    }, 
-    "pictVibraslap": {
-        "codepoint": "U+E745", 
-        "description": "Vibraslap"
-    }, 
-    "pictVietnameseHat": {
-        "codepoint": "U+E725", 
-        "description": "Vietnamese hat cymbal"
-    }, 
-    "pictWhip": {
-        "codepoint": "U+E6F6", 
-        "description": "Whip"
-    }, 
-    "pictWindChimesGlass": {
-        "codepoint": "U+E6C1", 
-        "description": "Wind chimes (glass)"
-    }, 
-    "pictWindMachine": {
-        "codepoint": "U+E754", 
-        "description": "Wind machine"
-    }, 
-    "pictWindWhistle": {
-        "codepoint": "U+E758", 
-        "description": "Wind whistle (or mouth siren)"
-    }, 
-    "pictWoodBlock": {
-        "codepoint": "U+E6F0", 
-        "description": "Wood block"
-    }, 
-    "pictWoundHardDown": {
-        "codepoint": "U+E7B4", 
-        "description": "Wound beater, hard core down"
-    }, 
-    "pictWoundHardLeft": {
-        "codepoint": "U+E7B6", 
-        "description": "Wound beater, hard core left"
-    }, 
-    "pictWoundHardRight": {
-        "codepoint": "U+E7B5", 
-        "description": "Wound beater, hard core right"
-    }, 
-    "pictWoundHardUp": {
-        "codepoint": "U+E7B3", 
-        "description": "Wound beater, hard core up"
-    }, 
-    "pictWoundSoftDown": {
-        "codepoint": "U+E7B8", 
-        "description": "Wound beater, soft core down"
-    }, 
-    "pictWoundSoftLeft": {
-        "codepoint": "U+E7BA", 
-        "description": "Wound beater, soft core left"
-    }, 
-    "pictWoundSoftRight": {
-        "codepoint": "U+E7B9", 
-        "description": "Wound beater, soft core right"
-    }, 
-    "pictWoundSoftUp": {
-        "codepoint": "U+E7B7", 
-        "description": "Wound beater, soft core up"
-    }, 
-    "pictXyl": {
-        "codepoint": "U+E6A1", 
-        "description": "Xylophone"
-    }, 
-    "pictXylBass": {
-        "codepoint": "U+E6A3", 
-        "description": "Bass xylophone"
-    }, 
-    "pictXylSmithBrindle": {
-        "codepoint": "U+E6AB", 
-        "description": "Xylophone (Smith Brindle)"
-    }, 
-    "pictXylTenor": {
-        "codepoint": "U+E6A2", 
-        "description": "Tenor xylophone"
-    }, 
-    "pictXylTenorTrough": {
-        "codepoint": "U+E6A5", 
-        "description": "Trough tenor xylophone"
-    }, 
-    "pictXylTrough": {
-        "codepoint": "U+E6A4", 
-        "description": "Trough xylophone"
-    }, 
-    "pluckedBuzzPizzicato": {
-        "codepoint": "U+E632", 
-        "description": "Buzz pizzicato"
-    }, 
-    "pluckedDamp": {
-        "alternateCodepoint": "U+1D1B4", 
-        "codepoint": "U+E638", 
-        "description": "Damp"
-    }, 
-    "pluckedDampAll": {
-        "alternateCodepoint": "U+1D1B5", 
-        "codepoint": "U+E639", 
-        "description": "Damp all"
-    }, 
-    "pluckedDampOnStem": {
-        "codepoint": "U+E63B", 
-        "description": "Damp for stem"
-    }, 
-    "pluckedFingernailFlick": {
-        "codepoint": "U+E637", 
-        "description": "Fingernail flick"
-    }, 
-    "pluckedLeftHandPizzicato": {
-        "codepoint": "U+E633", 
-        "description": "Left-hand pizzicato"
-    }, 
-    "pluckedPlectrum": {
-        "codepoint": "U+E63A", 
-        "description": "Plectrum"
-    }, 
-    "pluckedSnapPizzicatoAbove": {
-        "codepoint": "U+E631", 
-        "description": "Snap pizzicato above"
-    }, 
-    "pluckedSnapPizzicatoBelow": {
-        "alternateCodepoint": "U+1D1AD", 
-        "codepoint": "U+E630", 
-        "description": "Snap pizzicato below"
-    }, 
-    "pluckedWithFingernails": {
-        "alternateCodepoint": "U+1D1B3", 
-        "codepoint": "U+E636", 
-        "description": "With fingernails"
-    }, 
-    "quindicesima": {
-        "codepoint": "U+E514", 
-        "description": "Quindicesima"
-    }, 
-    "quindicesimaAlta": {
-        "alternateCodepoint": "U+1D138", 
-        "codepoint": "U+E515", 
-        "description": "Quindicesima alta"
-    }, 
-    "quindicesimaBassa": {
-        "alternateCodepoint": "U+1D139", 
-        "codepoint": "U+E516", 
-        "description": "Quindicesima bassa"
-    }, 
-    "quindicesimaBassaMb": {
-        "codepoint": "U+E51D", 
-        "description": "Quindicesima bassa (mb)"
-    }, 
-    "repeat1Bar": {
-        "alternateCodepoint": "U+1D10E", 
-        "codepoint": "U+E500", 
-        "description": "Repeat last bar"
-    }, 
-    "repeat2Bars": {
-        "alternateCodepoint": "U+1D10F", 
-        "codepoint": "U+E501", 
-        "description": "Repeat last two bars"
-    }, 
-    "repeat4Bars": {
-        "codepoint": "U+E502", 
-        "description": "Repeat last four bars"
-    }, 
-    "repeatBarLowerDot": {
-        "codepoint": "U+E505", 
-        "description": "Repeat bar lower dot"
-    }, 
-    "repeatBarSlash": {
-        "codepoint": "U+E504", 
-        "description": "Repeat bar slash"
-    }, 
-    "repeatBarUpperDot": {
-        "codepoint": "U+E503", 
-        "description": "Repeat bar upper dot"
-    }, 
-    "repeatDot": {
-        "codepoint": "U+E044", 
-        "description": "Single repeat dot"
-    }, 
-    "repeatDots": {
-        "alternateCodepoint": "U+1D108", 
-        "codepoint": "U+E043", 
-        "description": "Repeat dots"
-    }, 
-    "repeatLeft": {
-        "alternateCodepoint": "U+1D106", 
-        "codepoint": "U+E040", 
-        "description": "Left (start) repeat sign"
-    }, 
-    "repeatRight": {
-        "alternateCodepoint": "U+1D107", 
-        "codepoint": "U+E041", 
-        "description": "Right (end) repeat sign"
-    }, 
-    "repeatRightLeft": {
-        "codepoint": "U+E042", 
-        "description": "Right and left repeat sign"
-    }, 
-    "rest1024th": {
-        "codepoint": "U+E4ED", 
-        "description": "1024th rest"
-    }, 
-    "rest128th": {
-        "alternateCodepoint": "U+1D142", 
-        "codepoint": "U+E4EA", 
-        "description": "128th (semihemidemisemiquaver) rest"
-    }, 
-    "rest16th": {
-        "alternateCodepoint": "U+1D13F", 
-        "codepoint": "U+E4E7", 
-        "description": "16th (semiquaver) rest"
-    }, 
-    "rest256th": {
-        "codepoint": "U+E4EB", 
-        "description": "256th rest"
-    }, 
-    "rest32nd": {
-        "alternateCodepoint": "U+1D140", 
-        "codepoint": "U+E4E8", 
-        "description": "32nd (demisemiquaver) rest"
-    }, 
-    "rest512th": {
-        "codepoint": "U+E4EC", 
-        "description": "512th rest"
-    }, 
-    "rest64th": {
-        "alternateCodepoint": "U+1D141", 
-        "codepoint": "U+E4E9", 
-        "description": "64th (hemidemisemiquaver) rest"
-    }, 
-    "rest8th": {
-        "alternateCodepoint": "U+1D13E", 
-        "codepoint": "U+E4E6", 
-        "description": "Eighth (quaver) rest"
-    }, 
-    "restDoubleWhole": {
-        "alternateCodepoint": "U+1D13A", 
-        "codepoint": "U+E4E2", 
-        "description": "Double whole (breve) rest"
-    }, 
-    "restDoubleWholeLegerLine": {
-        "codepoint": "U+E4F3", 
-        "description": "Double whole rest on leger lines"
-    }, 
-    "restHBar": {
-        "alternateCodepoint": "U+1D129", 
-        "codepoint": "U+E4EE", 
-        "description": "Multiple measure rest"
-    }, 
-    "restHBarLeft": {
-        "codepoint": "U+E4EF", 
-        "description": "H-bar, left half"
-    }, 
-    "restHBarMiddle": {
-        "codepoint": "U+E4F0", 
-        "description": "H-bar, middle"
-    }, 
-    "restHBarRight": {
-        "codepoint": "U+E4F1", 
-        "description": "H-bar, right half"
-    }, 
-    "restHalf": {
-        "alternateCodepoint": "U+1D13C", 
-        "codepoint": "U+E4E4", 
-        "description": "Half (minim) rest"
-    }, 
-    "restHalfLegerLine": {
-        "codepoint": "U+E4F5", 
-        "description": "Half rest on leger line"
-    }, 
-    "restLonga": {
-        "codepoint": "U+E4E1", 
-        "description": "Longa rest"
-    }, 
-    "restMaxima": {
-        "codepoint": "U+E4E0", 
-        "description": "Maxima rest"
-    }, 
-    "restQuarter": {
-        "alternateCodepoint": "U+1D13D", 
-        "codepoint": "U+E4E5", 
-        "description": "Quarter (crotchet) rest"
-    }, 
-    "restQuarterOld": {
-        "codepoint": "U+E4F2", 
-        "description": "Old-style quarter (crotchet) rest"
-    }, 
-    "restQuarterZ": {
-        "codepoint": "U+E4F6", 
-        "description": "Z-style quarter (crotchet) rest"
-    }, 
-    "restWhole": {
-        "alternateCodepoint": "U+1D13B", 
-        "codepoint": "U+E4E3", 
-        "description": "Whole (semibreve) rest"
-    }, 
-    "restWholeLegerLine": {
-        "codepoint": "U+E4F4", 
-        "description": "Whole rest on leger line"
-    }, 
-    "reversedBrace": {
-        "codepoint": "U+E001", 
-        "description": "Reversed brace"
-    }, 
-    "reversedBracketBottom": {
-        "codepoint": "U+E006", 
-        "description": "Reversed bracket bottom"
-    }, 
-    "reversedBracketTop": {
-        "codepoint": "U+E005", 
-        "description": "Reversed bracket top"
-    }, 
-    "rightRepeatSmall": {
-        "codepoint": "U+E04D", 
-        "description": "Right repeat sign within bar"
-    }, 
-    "schaefferClef": {
-        "codepoint": "U+E06F", 
-        "description": "Sch\u00e4ffer clef"
-    }, 
-    "schaefferFClefToGClef": {
-        "codepoint": "U+E072", 
-        "description": "Sch\u00e4ffer F clef to G clef change"
-    }, 
-    "schaefferGClefToFClef": {
-        "codepoint": "U+E071", 
-        "description": "Sch\u00e4ffer G clef to F clef change"
-    }, 
-    "schaefferPreviousClef": {
-        "codepoint": "U+E070", 
-        "description": "Sch\u00e4ffer previous clef"
-    }, 
-    "segno": {
-        "alternateCodepoint": "U+1D10B", 
-        "codepoint": "U+E047", 
-        "description": "Segno"
-    }, 
-    "segnoSerpent1": {
-        "codepoint": "U+E04A", 
-        "description": "Segno (serpent)"
-    }, 
-    "segnoSerpent2": {
-        "codepoint": "U+E04B", 
-        "description": "Segno (serpent with vertical lines)"
-    }, 
-    "semipitchedPercussionClef1": {
-        "codepoint": "U+E06B", 
-        "description": "Semi-pitched percussion clef 1"
-    }, 
-    "semipitchedPercussionClef2": {
-        "codepoint": "U+E06C", 
-        "description": "Semi-pitched percussion clef 2"
-    }, 
-    "smnFlat": {
-        "codepoint": "U+EC52", 
-        "description": "Flat"
-    }, 
-    "smnFlatWhite": {
-        "codepoint": "U+EC53", 
-        "description": "Flat (white)"
-    }, 
-    "smnHistoryDoubleFlat": {
-        "codepoint": "U+EC57", 
-        "description": "Double flat history sign"
-    }, 
-    "smnHistoryDoubleSharp": {
-        "codepoint": "U+EC55", 
-        "description": "Double sharp history sign"
-    }, 
-    "smnHistoryFlat": {
-        "codepoint": "U+EC56", 
-        "description": "Flat history sign"
-    }, 
-    "smnHistorySharp": {
-        "codepoint": "U+EC54", 
-        "description": "Sharp history sign"
-    }, 
-    "smnNatural": {
-        "codepoint": "U+EC58", 
-        "description": "Natural (N)"
-    }, 
-    "smnSharp": {
-        "codepoint": "U+EC50", 
-        "description": "Sharp stem up"
-    }, 
-    "smnSharpDown": {
-        "codepoint": "U+EC59", 
-        "description": "Sharp stem down"
-    }, 
-    "smnSharpWhite": {
-        "codepoint": "U+EC51", 
-        "description": "Sharp (white) stem up"
-    }, 
-    "smnSharpWhiteDown": {
-        "codepoint": "U+EC5A", 
-        "description": "Sharp (white) stem down"
-    }, 
-    "splitBarDivider": {
-        "codepoint": "U+E00A", 
-        "description": "Split bar divider (bar spans a system break)"
-    }, 
-    "staff1Line": {
-        "alternateCodepoint": "U+1D116", 
-        "codepoint": "U+E010", 
-        "description": "1-line staff"
-    }, 
-    "staff1LineNarrow": {
-        "codepoint": "U+E01C", 
-        "description": "1-line staff (narrow)"
-    }, 
-    "staff1LineWide": {
-        "codepoint": "U+E016", 
-        "description": "1-line staff (wide)"
-    }, 
-    "staff2Lines": {
-        "alternateCodepoint": "U+1D117", 
-        "codepoint": "U+E011", 
-        "description": "2-line staff"
-    }, 
-    "staff2LinesNarrow": {
-        "codepoint": "U+E01D", 
-        "description": "2-line staff (narrow)"
-    }, 
-    "staff2LinesWide": {
-        "codepoint": "U+E017", 
-        "description": "2-line staff (wide)"
-    }, 
-    "staff3Lines": {
-        "alternateCodepoint": "U+1D118", 
-        "codepoint": "U+E012", 
-        "description": "3-line staff"
-    }, 
-    "staff3LinesNarrow": {
-        "codepoint": "U+E01E", 
-        "description": "3-line staff (narrow)"
-    }, 
-    "staff3LinesWide": {
-        "codepoint": "U+E018", 
-        "description": "3-line staff (wide)"
-    }, 
-    "staff4Lines": {
-        "alternateCodepoint": "U+1D119", 
-        "codepoint": "U+E013", 
-        "description": "4-line staff"
-    }, 
-    "staff4LinesNarrow": {
-        "codepoint": "U+E01F", 
-        "description": "4-line staff (narrow)"
-    }, 
-    "staff4LinesWide": {
-        "codepoint": "U+E019", 
-        "description": "4-line staff (wide)"
-    }, 
-    "staff5Lines": {
-        "alternateCodepoint": "U+1D11A", 
-        "codepoint": "U+E014", 
-        "description": "5-line staff"
-    }, 
-    "staff5LinesNarrow": {
-        "codepoint": "U+E020", 
-        "description": "5-line staff (narrow)"
-    }, 
-    "staff5LinesWide": {
-        "codepoint": "U+E01A", 
-        "description": "5-line staff (wide)"
-    }, 
-    "staff6Lines": {
-        "alternateCodepoint": "U+1D11B", 
-        "codepoint": "U+E015", 
-        "description": "6-line staff"
-    }, 
-    "staff6LinesNarrow": {
-        "codepoint": "U+E021", 
-        "description": "6-line staff (narrow)"
-    }, 
-    "staff6LinesWide": {
-        "codepoint": "U+E01B", 
-        "description": "6-line staff (wide)"
-    }, 
-    "staffDivideArrowDown": {
-        "codepoint": "U+E00B", 
-        "description": "Staff divide arrow down"
-    }, 
-    "staffDivideArrowUp": {
-        "codepoint": "U+E00C", 
-        "description": "Staff divide arrow up"
-    }, 
-    "staffDivideArrowUpDown": {
-        "codepoint": "U+E00D", 
-        "description": "Staff divide arrows"
-    }, 
-    "staffPosLower1": {
-        "codepoint": "U+EB98", 
-        "description": "Lower 1 staff position"
-    }, 
-    "staffPosLower2": {
-        "codepoint": "U+EB99", 
-        "description": "Lower 2 staff positions"
-    }, 
-    "staffPosLower3": {
-        "codepoint": "U+EB9A", 
-        "description": "Lower 3 staff positions"
-    }, 
-    "staffPosLower4": {
-        "codepoint": "U+EB9B", 
-        "description": "Lower 4 staff positions"
-    }, 
-    "staffPosLower5": {
-        "codepoint": "U+EB9C", 
-        "description": "Lower 5 staff positions"
-    }, 
-    "staffPosLower6": {
-        "codepoint": "U+EB9D", 
-        "description": "Lower 6 staff positions"
-    }, 
-    "staffPosLower7": {
-        "codepoint": "U+EB9E", 
-        "description": "Lower 7 staff positions"
-    }, 
-    "staffPosLower8": {
-        "codepoint": "U+EB9F", 
-        "description": "Lower 8 staff positions"
-    }, 
-    "staffPosRaise1": {
-        "codepoint": "U+EB90", 
-        "description": "Raise 1 staff position"
-    }, 
-    "staffPosRaise2": {
-        "codepoint": "U+EB91", 
-        "description": "Raise 2 staff positions"
-    }, 
-    "staffPosRaise3": {
-        "codepoint": "U+EB92", 
-        "description": "Raise 3 staff positions"
-    }, 
-    "staffPosRaise4": {
-        "codepoint": "U+EB93", 
-        "description": "Raise 4 staff positions"
-    }, 
-    "staffPosRaise5": {
-        "codepoint": "U+EB94", 
-        "description": "Raise 5 staff positions"
-    }, 
-    "staffPosRaise6": {
-        "codepoint": "U+EB95", 
-        "description": "Raise 6 staff positions"
-    }, 
-    "staffPosRaise7": {
-        "codepoint": "U+EB96", 
-        "description": "Raise 7 staff positions"
-    }, 
-    "staffPosRaise8": {
-        "codepoint": "U+EB97", 
-        "description": "Raise 8 staff positions"
-    }, 
-    "stem": {
-        "alternateCodepoint": "U+1D165", 
-        "codepoint": "U+E210", 
-        "description": "Combining stem"
-    }, 
-    "stemBowOnBridge": {
-        "codepoint": "U+E215", 
-        "description": "Combining bow on bridge stem"
-    }, 
-    "stemBowOnTailpiece": {
-        "codepoint": "U+E216", 
-        "description": "Combining bow on tailpiece stem"
-    }, 
-    "stemBuzzRoll": {
-        "codepoint": "U+E217", 
-        "description": "Combining buzz roll stem"
-    }, 
-    "stemDamp": {
-        "codepoint": "U+E218", 
-        "description": "Combining damp stem"
-    }, 
-    "stemHarpStringNoise": {
-        "codepoint": "U+E21F", 
-        "description": "Combining harp string noise stem"
-    }, 
-    "stemMultiphonicsBlack": {
-        "codepoint": "U+E21A", 
-        "description": "Combining multiphonics (black) stem"
-    }, 
-    "stemMultiphonicsBlackWhite": {
-        "codepoint": "U+E21C", 
-        "description": "Combining multiphonics (black and white) stem"
-    }, 
-    "stemMultiphonicsWhite": {
-        "codepoint": "U+E21B", 
-        "description": "Combining multiphonics (white) stem"
-    }, 
-    "stemPendereckiTremolo": {
-        "codepoint": "U+E213", 
-        "description": "Combining Penderecki unmeasured tremolo stem"
-    }, 
-    "stemRimShot": {
-        "codepoint": "U+E21E", 
-        "description": "Combining rim shot stem"
-    }, 
-    "stemSprechgesang": {
-        "alternateCodepoint": "U+1D166", 
-        "codepoint": "U+E211", 
-        "description": "Combining sprechgesang stem"
-    }, 
-    "stemSulPonticello": {
-        "codepoint": "U+E214", 
-        "description": "Combining sul ponticello (bow behind bridge) stem"
-    }, 
-    "stemSussurando": {
-        "codepoint": "U+E21D", 
-        "description": "Combining sussurando stem"
-    }, 
-    "stemSwished": {
-        "codepoint": "U+E212", 
-        "description": "Combining swished stem"
-    }, 
-    "stemVibratoPulse": {
-        "codepoint": "U+E219", 
-        "description": "Combining vibrato pulse accent (Saunders) stem"
-    }, 
-    "stockhausenTremolo": {
-        "codepoint": "U+E232", 
-        "description": "Stockhausen irregular tremolo (\"Morsen\", like Morse code)"
-    }, 
-    "stringsBowBehindBridge": {
-        "codepoint": "U+E618", 
-        "description": "Bow behind bridge (sul ponticello)"
-    }, 
-    "stringsBowBehindBridgeFourStrings": {
-        "codepoint": "U+E62A", 
-        "description": "Bow behind bridge on four strings"
-    }, 
-    "stringsBowBehindBridgeOneString": {
-        "codepoint": "U+E627", 
-        "description": "Bow behind bridge on one string"
-    }, 
-    "stringsBowBehindBridgeThreeStrings": {
-        "codepoint": "U+E629", 
-        "description": "Bow behind bridge on three strings"
-    }, 
-    "stringsBowBehindBridgeTwoStrings": {
-        "codepoint": "U+E628", 
-        "description": "Bow behind bridge on two strings"
-    }, 
-    "stringsBowOnBridge": {
-        "codepoint": "U+E619", 
-        "description": "Bow on top of bridge"
-    }, 
-    "stringsBowOnTailpiece": {
-        "codepoint": "U+E61A", 
-        "description": "Bow on tailpiece"
-    }, 
-    "stringsChangeBowDirection": {
-        "codepoint": "U+E626", 
-        "description": "Change bow direction, indeterminate"
-    }, 
-    "stringsDownBow": {
-        "alternateCodepoint": "U+1D1AA", 
-        "codepoint": "U+E610", 
-        "description": "Down bow"
-    }, 
-    "stringsDownBowTurned": {
-        "codepoint": "U+E611", 
-        "description": "Turned down bow"
-    }, 
-    "stringsFouette": {
-        "codepoint": "U+E622", 
-        "description": "Fouett\u00e9"
-    }, 
-    "stringsHalfHarmonic": {
-        "codepoint": "U+E615", 
-        "description": "Half-harmonic"
-    }, 
-    "stringsHarmonic": {
-        "alternateCodepoint": "U+1D1AC", 
-        "codepoint": "U+E614", 
-        "description": "Harmonic"
-    }, 
-    "stringsJeteAbove": {
-        "codepoint": "U+E620", 
-        "description": "Jet\u00e9 (gettato) above"
-    }, 
-    "stringsJeteBelow": {
-        "codepoint": "U+E621", 
-        "description": "Jet\u00e9 (gettato) below"
-    }, 
-    "stringsMuteOff": {
-        "codepoint": "U+E617", 
-        "description": "Mute off"
-    }, 
-    "stringsMuteOn": {
-        "codepoint": "U+E616", 
-        "description": "Mute on"
-    }, 
-    "stringsOverpressureDownBow": {
-        "codepoint": "U+E61B", 
-        "description": "Overpressure, down bow"
-    }, 
-    "stringsOverpressureNoDirection": {
-        "codepoint": "U+E61F", 
-        "description": "Overpressure, no bow direction"
-    }, 
-    "stringsOverpressurePossibileDownBow": {
-        "codepoint": "U+E61D", 
-        "description": "Overpressure possibile, down bow"
-    }, 
-    "stringsOverpressurePossibileUpBow": {
-        "codepoint": "U+E61E", 
-        "description": "Overpressure possibile, up bow"
-    }, 
-    "stringsOverpressureUpBow": {
-        "codepoint": "U+E61C", 
-        "description": "Overpressure, up bow"
-    }, 
-    "stringsThumbPosition": {
-        "codepoint": "U+E624", 
-        "description": "Thumb position"
-    }, 
-    "stringsThumbPositionTurned": {
-        "codepoint": "U+E625", 
-        "description": "Turned thumb position"
-    }, 
-    "stringsUpBow": {
-        "alternateCodepoint": "U+1D1AB", 
-        "codepoint": "U+E612", 
-        "description": "Up bow"
-    }, 
-    "stringsUpBowTurned": {
-        "codepoint": "U+E613", 
-        "description": "Turned up bow"
-    }, 
-    "stringsVibratoPulse": {
-        "codepoint": "U+E623", 
-        "description": "Vibrato pulse accent (Saunders) for stem"
-    }, 
-    "systemDivider": {
-        "codepoint": "U+E007", 
-        "description": "System divider"
-    }, 
-    "systemDividerExtraLong": {
-        "codepoint": "U+E009", 
-        "description": "Extra long system divider"
-    }, 
-    "systemDividerLong": {
-        "codepoint": "U+E008", 
-        "description": "Long system divider"
-    }, 
-    "textAugmentationDot": {
-        "codepoint": "U+E1FC", 
-        "description": "Augmentation dot"
-    }, 
-    "textBlackNoteFrac16thLongStem": {
-        "codepoint": "U+E1F5", 
-        "description": "Black note, fractional 16th beam, long stem"
-    }, 
-    "textBlackNoteFrac16thShortStem": {
-        "codepoint": "U+E1F4", 
-        "description": "Black note, fractional 16th beam, short stem"
-    }, 
-    "textBlackNoteFrac32ndLongStem": {
-        "codepoint": "U+E1F6", 
-        "description": "Black note, fractional 32nd beam, long stem"
-    }, 
-    "textBlackNoteFrac8thLongStem": {
-        "codepoint": "U+E1F3", 
-        "description": "Black note, fractional 8th beam, long stem"
-    }, 
-    "textBlackNoteFrac8thShortStem": {
-        "codepoint": "U+E1F2", 
-        "description": "Black note, fractional 8th beam, short stem"
-    }, 
-    "textBlackNoteLongStem": {
-        "codepoint": "U+E1F1", 
-        "description": "Black note, long stem"
-    }, 
-    "textBlackNoteShortStem": {
-        "codepoint": "U+E1F0", 
-        "description": "Black note, short stem"
-    }, 
-    "textCont16thBeamLongStem": {
-        "codepoint": "U+E1FA", 
-        "description": "Continuing 16th beam for long stem"
-    }, 
-    "textCont16thBeamShortStem": {
-        "codepoint": "U+E1F9", 
-        "description": "Continuing 16th beam for short stem"
-    }, 
-    "textCont32ndBeamLongStem": {
-        "codepoint": "U+E1FB", 
-        "description": "Continuing 32nd beam for long stem"
-    }, 
-    "textCont8thBeamLongStem": {
-        "codepoint": "U+E1F8", 
-        "description": "Continuing 8th beam for long stem"
-    }, 
-    "textCont8thBeamShortStem": {
-        "codepoint": "U+E1F7", 
-        "description": "Continuing 8th beam for short stem"
-    }, 
-    "textTie": {
-        "codepoint": "U+E1FD", 
-        "description": "Tie"
-    }, 
-    "textTuplet3LongStem": {
-        "codepoint": "U+E202", 
-        "description": "Tuplet number 3 for long stem"
-    }, 
-    "textTuplet3ShortStem": {
-        "codepoint": "U+E1FF", 
-        "description": "Tuplet number 3 for short stem"
-    }, 
-    "textTupletBracketEndLongStem": {
-        "codepoint": "U+E203", 
-        "description": "Tuplet bracket end for long stem"
-    }, 
-    "textTupletBracketEndShortStem": {
-        "codepoint": "U+E200", 
-        "description": "Tuplet bracket end for short stem"
-    }, 
-    "textTupletBracketStartLongStem": {
-        "codepoint": "U+E201", 
-        "description": "Tuplet bracket start for long stem"
-    }, 
-    "textTupletBracketStartShortStem": {
-        "codepoint": "U+E1FE", 
-        "description": "Tuplet bracket start for short stem"
-    }, 
-    "timeSig0": {
-        "codepoint": "U+E080", 
-        "description": "Time signature 0"
-    }, 
-    "timeSig0Reversed": {
-        "codepoint": "U+ECF0", 
-        "description": "Reversed time signature 0"
-    }, 
-    "timeSig0Turned": {
-        "codepoint": "U+ECE0", 
-        "description": "Turned time signature 0"
-    }, 
-    "timeSig1": {
-        "codepoint": "U+E081", 
-        "description": "Time signature 1"
-    }, 
-    "timeSig1Reversed": {
-        "codepoint": "U+ECF1", 
-        "description": "Reversed time signature 1"
-    }, 
-    "timeSig1Turned": {
-        "codepoint": "U+ECE1", 
-        "description": "Turned time signature 1"
-    }, 
-    "timeSig2": {
-        "codepoint": "U+E082", 
-        "description": "Time signature 2"
-    }, 
-    "timeSig2Reversed": {
-        "codepoint": "U+ECF2", 
-        "description": "Reversed time signature 2"
-    }, 
-    "timeSig2Turned": {
-        "codepoint": "U+ECE2", 
-        "description": "Turned time signature 2"
-    }, 
-    "timeSig3": {
-        "codepoint": "U+E083", 
-        "description": "Time signature 3"
-    }, 
-    "timeSig3Reversed": {
-        "codepoint": "U+ECF3", 
-        "description": "Reversed time signature 3"
-    }, 
-    "timeSig3Turned": {
-        "codepoint": "U+ECE3", 
-        "description": "Turned time signature 3"
-    }, 
-    "timeSig4": {
-        "codepoint": "U+E084", 
-        "description": "Time signature 4"
-    }, 
-    "timeSig4Reversed": {
-        "codepoint": "U+ECF4", 
-        "description": "Reversed time signature 4"
-    }, 
-    "timeSig4Turned": {
-        "codepoint": "U+ECE4", 
-        "description": "Turned time signature 4"
-    }, 
-    "timeSig5": {
-        "codepoint": "U+E085", 
-        "description": "Time signature 5"
-    }, 
-    "timeSig5Reversed": {
-        "codepoint": "U+ECF5", 
-        "description": "Reversed time signature 5"
-    }, 
-    "timeSig5Turned": {
-        "codepoint": "U+ECE5", 
-        "description": "Turned time signature 5"
-    }, 
-    "timeSig6": {
-        "codepoint": "U+E086", 
-        "description": "Time signature 6"
-    }, 
-    "timeSig6Reversed": {
-        "codepoint": "U+ECF6", 
-        "description": "Reversed time signature 6"
-    }, 
-    "timeSig6Turned": {
-        "codepoint": "U+ECE6", 
-        "description": "Turned time signature 6"
-    }, 
-    "timeSig7": {
-        "codepoint": "U+E087", 
-        "description": "Time signature 7"
-    }, 
-    "timeSig7Reversed": {
-        "codepoint": "U+ECF7", 
-        "description": "Reversed time signature 7"
-    }, 
-    "timeSig7Turned": {
-        "codepoint": "U+ECE7", 
-        "description": "Turned time signature 7"
-    }, 
-    "timeSig8": {
-        "codepoint": "U+E088", 
-        "description": "Time signature 8"
-    }, 
-    "timeSig8Reversed": {
-        "codepoint": "U+ECF8", 
-        "description": "Reversed time signature 8"
-    }, 
-    "timeSig8Turned": {
-        "codepoint": "U+ECE8", 
-        "description": "Turned time signature 8"
-    }, 
-    "timeSig9": {
-        "codepoint": "U+E089", 
-        "description": "Time signature 9"
-    }, 
-    "timeSig9Reversed": {
-        "codepoint": "U+ECF9", 
-        "description": "Reversed time signature 9"
-    }, 
-    "timeSig9Turned": {
-        "codepoint": "U+ECE9", 
-        "description": "Turned time signature 9"
-    }, 
-    "timeSigBracketLeft": {
-        "codepoint": "U+EC80", 
-        "description": "Left bracket for whole time signature"
-    }, 
-    "timeSigBracketLeftSmall": {
-        "codepoint": "U+EC82", 
-        "description": "Left bracket for numerator only"
-    }, 
-    "timeSigBracketRight": {
-        "codepoint": "U+EC81", 
-        "description": "Right bracket for whole time signature"
-    }, 
-    "timeSigBracketRightSmall": {
-        "codepoint": "U+EC83", 
-        "description": "Right bracket for numerator only"
-    }, 
-    "timeSigCombDenominator": {
-        "codepoint": "U+E09F", 
-        "description": "Control character for denominator digit"
-    }, 
-    "timeSigCombNumerator": {
-        "codepoint": "U+E09E", 
-        "description": "Control character for numerator digit"
-    }, 
-    "timeSigComma": {
-        "codepoint": "U+E096", 
-        "description": "Time signature comma"
-    }, 
-    "timeSigCommon": {
-        "alternateCodepoint": "U+1D134", 
-        "codepoint": "U+E08A", 
-        "description": "Common time"
-    }, 
-    "timeSigCommonReversed": {
-        "codepoint": "U+ECFA", 
-        "description": "Reversed common time"
-    }, 
-    "timeSigCommonTurned": {
-        "codepoint": "U+ECEA", 
-        "description": "Turned common time"
-    }, 
-    "timeSigCut2": {
-        "codepoint": "U+EC85", 
-        "description": "Cut time (Bach)"
-    }, 
-    "timeSigCut3": {
-        "codepoint": "U+EC86", 
-        "description": "Cut triple time (9/8)"
-    }, 
-    "timeSigCutCommon": {
-        "alternateCodepoint": "U+1D135", 
-        "codepoint": "U+E08B", 
-        "description": "Cut time"
-    }, 
-    "timeSigCutCommonReversed": {
-        "codepoint": "U+ECFB", 
-        "description": "Reversed cut time"
-    }, 
-    "timeSigCutCommonTurned": {
-        "codepoint": "U+ECEB", 
-        "description": "Turned cut time"
-    }, 
-    "timeSigEquals": {
-        "codepoint": "U+E08F", 
-        "description": "Time signature equals"
-    }, 
-    "timeSigFractionHalf": {
-        "codepoint": "U+E098", 
-        "description": "Time signature fraction \u00bd"
-    }, 
-    "timeSigFractionOneThird": {
-        "codepoint": "U+E09A", 
-        "description": "Time signature fraction \u2153"
-    }, 
-    "timeSigFractionQuarter": {
-        "codepoint": "U+E097", 
-        "description": "Time signature fraction \u00bc"
-    }, 
-    "timeSigFractionThreeQuarters": {
-        "codepoint": "U+E099", 
-        "description": "Time signature fraction \u00be"
-    }, 
-    "timeSigFractionTwoThirds": {
-        "codepoint": "U+E09B", 
-        "description": "Time signature fraction \u2154"
-    }, 
-    "timeSigFractionalSlash": {
-        "codepoint": "U+E08E", 
-        "description": "Time signature fraction slash"
-    }, 
-    "timeSigMinus": {
-        "codepoint": "U+E090", 
-        "description": "Time signature minus"
-    }, 
-    "timeSigMultiply": {
-        "codepoint": "U+E091", 
-        "description": "Time signature multiply"
-    }, 
-    "timeSigOpenPenderecki": {
-        "codepoint": "U+E09D", 
-        "description": "Open time signature (Penderecki)"
-    }, 
-    "timeSigParensLeft": {
-        "codepoint": "U+E094", 
-        "description": "Left parenthesis for whole time signature"
-    }, 
-    "timeSigParensLeftSmall": {
-        "codepoint": "U+E092", 
-        "description": "Left parenthesis for numerator only"
-    }, 
-    "timeSigParensRight": {
-        "codepoint": "U+E095", 
-        "description": "Right parenthesis for whole time signature"
-    }, 
-    "timeSigParensRightSmall": {
-        "codepoint": "U+E093", 
-        "description": "Right parenthesis for numerator only"
-    }, 
-    "timeSigPlus": {
-        "codepoint": "U+E08C", 
-        "description": "Time signature +"
-    }, 
-    "timeSigPlusSmall": {
-        "codepoint": "U+E08D", 
-        "description": "Time signature + (for numerators)"
-    }, 
-    "timeSigSlash": {
-        "codepoint": "U+EC84", 
-        "description": "Time signature slash separator"
-    }, 
-    "timeSigX": {
-        "codepoint": "U+E09C", 
-        "description": "Open time signature"
-    }, 
-    "tremolo1": {
-        "alternateCodepoint": "U+1D167", 
-        "codepoint": "U+E220", 
-        "description": "Combining tremolo 1"
-    }, 
-    "tremolo2": {
-        "alternateCodepoint": "U+1D168", 
-        "codepoint": "U+E221", 
-        "description": "Combining tremolo 2"
-    }, 
-    "tremolo3": {
-        "alternateCodepoint": "U+1D169", 
-        "codepoint": "U+E222", 
-        "description": "Combining tremolo 3"
-    }, 
-    "tremolo4": {
-        "codepoint": "U+E223", 
-        "description": "Combining tremolo 4"
-    }, 
-    "tremolo5": {
-        "codepoint": "U+E224", 
-        "description": "Combining tremolo 5"
-    }, 
-    "tremoloDivisiDots2": {
-        "codepoint": "U+E22E", 
-        "description": "Divide measured tremolo by 2"
-    }, 
-    "tremoloDivisiDots3": {
-        "codepoint": "U+E22F", 
-        "description": "Divide measured tremolo by 3"
-    }, 
-    "tremoloDivisiDots4": {
-        "codepoint": "U+E230", 
-        "description": "Divide measured tremolo by 4"
-    }, 
-    "tremoloDivisiDots6": {
-        "codepoint": "U+E231", 
-        "description": "Divide measured tremolo by 6"
-    }, 
-    "tremoloFingered1": {
-        "alternateCodepoint": "U+1D16A", 
-        "codepoint": "U+E225", 
-        "description": "Fingered tremolo 1"
-    }, 
-    "tremoloFingered2": {
-        "alternateCodepoint": "U+1D16B", 
-        "codepoint": "U+E226", 
-        "description": "Fingered tremolo 2"
-    }, 
-    "tremoloFingered3": {
-        "alternateCodepoint": "U+1D16C", 
-        "codepoint": "U+E227", 
-        "description": "Fingered tremolo 3"
-    }, 
-    "tremoloFingered4": {
-        "codepoint": "U+E228", 
-        "description": "Fingered tremolo 4"
-    }, 
-    "tremoloFingered5": {
-        "codepoint": "U+E229", 
-        "description": "Fingered tremolo 5"
-    }, 
-    "tripleTongueAbove": {
-        "alternateCodepoint": "U+1D18B", 
-        "codepoint": "U+E5F2", 
-        "description": "Triple-tongue above"
-    }, 
-    "tripleTongueBelow": {
-        "codepoint": "U+E5F3", 
-        "description": "Triple-tongue below"
-    }, 
-    "tuplet0": {
-        "codepoint": "U+E880", 
-        "description": "Tuplet 0"
-    }, 
-    "tuplet1": {
-        "codepoint": "U+E881", 
-        "description": "Tuplet 1"
-    }, 
-    "tuplet2": {
-        "codepoint": "U+E882", 
-        "description": "Tuplet 2"
-    }, 
-    "tuplet3": {
-        "codepoint": "U+E883", 
-        "description": "Tuplet 3"
-    }, 
-    "tuplet4": {
-        "codepoint": "U+E884", 
-        "description": "Tuplet 4"
-    }, 
-    "tuplet5": {
-        "codepoint": "U+E885", 
-        "description": "Tuplet 5"
-    }, 
-    "tuplet6": {
-        "codepoint": "U+E886", 
-        "description": "Tuplet 6"
-    }, 
-    "tuplet7": {
-        "codepoint": "U+E887", 
-        "description": "Tuplet 7"
-    }, 
-    "tuplet8": {
-        "codepoint": "U+E888", 
-        "description": "Tuplet 8"
-    }, 
-    "tuplet9": {
-        "codepoint": "U+E889", 
-        "description": "Tuplet 9"
-    }, 
-    "tupletColon": {
-        "codepoint": "U+E88A", 
-        "description": "Tuplet colon"
-    }, 
-    "unmeasuredTremolo": {
-        "codepoint": "U+E22C", 
-        "description": "Wieniawski unmeasured tremolo"
-    }, 
-    "unmeasuredTremoloSimple": {
-        "codepoint": "U+E22D", 
-        "description": "Wieniawski unmeasured tremolo (simpler)"
-    }, 
-    "unpitchedPercussionClef1": {
-        "alternateCodepoint": "U+1D125", 
-        "codepoint": "U+E069", 
-        "description": "Unpitched percussion clef 1"
-    }, 
-    "unpitchedPercussionClef2": {
-        "alternateCodepoint": "U+1D126", 
-        "codepoint": "U+E06A", 
-        "description": "Unpitched percussion clef 2"
-    }, 
-    "ventiduesima": {
-        "codepoint": "U+E517", 
-        "description": "Ventiduesima"
-    }, 
-    "ventiduesimaAlta": {
-        "codepoint": "U+E518", 
-        "description": "Ventiduesima alta"
-    }, 
-    "ventiduesimaBassa": {
-        "codepoint": "U+E519", 
-        "description": "Ventiduesima bassa"
-    }, 
-    "ventiduesimaBassaMb": {
-        "codepoint": "U+E51E", 
-        "description": "Ventiduesima bassa (mb)"
-    }, 
-    "vocalFingerClickStockhausen": {
-        "codepoint": "U+E649", 
-        "description": "Finger click (Stockhausen)"
-    }, 
-    "vocalHalbGesungen": {
-        "codepoint": "U+E64B", 
-        "description": "Halb gesungen (semi-sprechgesang)"
-    }, 
-    "vocalMouthClosed": {
-        "codepoint": "U+E640", 
-        "description": "Mouth closed"
-    }, 
-    "vocalMouthOpen": {
-        "codepoint": "U+E642", 
-        "description": "Mouth open"
-    }, 
-    "vocalMouthPursed": {
-        "codepoint": "U+E644", 
-        "description": "Mouth pursed"
-    }, 
-    "vocalMouthSlightlyOpen": {
-        "codepoint": "U+E641", 
-        "description": "Mouth slightly open"
-    }, 
-    "vocalMouthWideOpen": {
-        "codepoint": "U+E643", 
-        "description": "Mouth wide open"
-    }, 
-    "vocalNasalVoice": {
-        "codepoint": "U+E647", 
-        "description": "Nasal voice"
-    }, 
-    "vocalSprechgesang": {
-        "codepoint": "U+E645", 
-        "description": "Sprechgesang"
-    }, 
-    "vocalTongueClickStockhausen": {
-        "codepoint": "U+E648", 
-        "description": "Tongue click (Stockhausen)"
-    }, 
-    "vocalTongueFingerClickStockhausen": {
-        "codepoint": "U+E64A", 
-        "description": "Tongue and finger click (Stockhausen)"
-    }, 
-    "vocalsSussurando": {
-        "codepoint": "U+E646", 
-        "description": "Combining sussurando for stem"
-    }, 
-    "wiggleArpeggiatoDown": {
-        "codepoint": "U+EAAA", 
-        "description": "Arpeggiato wiggle segment, downwards"
-    }, 
-    "wiggleArpeggiatoDownArrow": {
-        "codepoint": "U+EAAE", 
-        "description": "Arpeggiato arrowhead down"
-    }, 
-    "wiggleArpeggiatoDownSwash": {
-        "codepoint": "U+EAAC", 
-        "description": "Arpeggiato downward swash"
-    }, 
-    "wiggleArpeggiatoUp": {
-        "codepoint": "U+EAA9", 
-        "description": "Arpeggiato wiggle segment, upwards"
-    }, 
-    "wiggleArpeggiatoUpArrow": {
-        "codepoint": "U+EAAD", 
-        "description": "Arpeggiato arrowhead up"
-    }, 
-    "wiggleArpeggiatoUpSwash": {
-        "codepoint": "U+EAAB", 
-        "description": "Arpeggiato upward swash"
-    }, 
-    "wiggleCircular": {
-        "codepoint": "U+EAC9", 
-        "description": "Circular motion segment"
-    }, 
-    "wiggleCircularConstant": {
-        "codepoint": "U+EAC0", 
-        "description": "Constant circular motion segment"
-    }, 
-    "wiggleCircularConstantFlipped": {
-        "codepoint": "U+EAC1", 
-        "description": "Constant circular motion segment (flipped)"
-    }, 
-    "wiggleCircularConstantFlippedLarge": {
-        "codepoint": "U+EAC3", 
-        "description": "Constant circular motion segment (flipped, large)"
-    }, 
-    "wiggleCircularConstantLarge": {
-        "codepoint": "U+EAC2", 
-        "description": "Constant circular motion segment (large)"
-    }, 
-    "wiggleCircularEnd": {
-        "codepoint": "U+EACB", 
-        "description": "Circular motion end"
-    }, 
-    "wiggleCircularLarge": {
-        "codepoint": "U+EAC8", 
-        "description": "Circular motion segment, large"
-    }, 
-    "wiggleCircularLarger": {
-        "codepoint": "U+EAC7", 
-        "description": "Circular motion segment, larger"
-    }, 
-    "wiggleCircularLargerStill": {
-        "codepoint": "U+EAC6", 
-        "description": "Circular motion segment, larger still"
-    }, 
-    "wiggleCircularLargest": {
-        "codepoint": "U+EAC5", 
-        "description": "Circular motion segment, largest"
-    }, 
-    "wiggleCircularSmall": {
-        "codepoint": "U+EACA", 
-        "description": "Circular motion segment, small"
-    }, 
-    "wiggleCircularStart": {
-        "codepoint": "U+EAC4", 
-        "description": "Circular motion start"
-    }, 
-    "wiggleGlissando": {
-        "codepoint": "U+EAAF", 
-        "description": "Glissando wiggle segment"
-    }, 
-    "wiggleGlissandoGroup1": {
-        "codepoint": "U+EABD", 
-        "description": "Group glissando 1"
-    }, 
-    "wiggleGlissandoGroup2": {
-        "codepoint": "U+EABE", 
-        "description": "Group glissando 2"
-    }, 
-    "wiggleGlissandoGroup3": {
-        "codepoint": "U+EABF", 
-        "description": "Group glissando 3"
-    }, 
-    "wiggleRandom1": {
-        "codepoint": "U+EAF0", 
-        "description": "Quasi-random squiggle 1"
-    }, 
-    "wiggleRandom2": {
-        "codepoint": "U+EAF1", 
-        "description": "Quasi-random squiggle 2"
-    }, 
-    "wiggleRandom3": {
-        "codepoint": "U+EAF2", 
-        "description": "Quasi-random squiggle 3"
-    }, 
-    "wiggleRandom4": {
-        "codepoint": "U+EAF3", 
-        "description": "Quasi-random squiggle 4"
-    }, 
-    "wiggleSawtooth": {
-        "codepoint": "U+EABB", 
-        "description": "Sawtooth line segment"
-    }, 
-    "wiggleSawtoothNarrow": {
-        "codepoint": "U+EABA", 
-        "description": "Narrow sawtooth line segment"
-    }, 
-    "wiggleSawtoothWide": {
-        "codepoint": "U+EABC", 
-        "description": "Wide sawtooth line segment"
-    }, 
-    "wiggleSquareWave": {
-        "codepoint": "U+EAB8", 
-        "description": "Square wave line segment"
-    }, 
-    "wiggleSquareWaveNarrow": {
-        "codepoint": "U+EAB7", 
-        "description": "Narrow square wave line segment"
-    }, 
-    "wiggleSquareWaveWide": {
-        "codepoint": "U+EAB9", 
-        "description": "Wide square wave line segment"
-    }, 
-    "wiggleTrill": {
-        "codepoint": "U+EAA4", 
-        "description": "Trill wiggle segment"
-    }, 
-    "wiggleTrillFast": {
-        "codepoint": "U+EAA3", 
-        "description": "Trill wiggle segment, fast"
-    }, 
-    "wiggleTrillFaster": {
-        "codepoint": "U+EAA2", 
-        "description": "Trill wiggle segment, faster"
-    }, 
-    "wiggleTrillFasterStill": {
-        "codepoint": "U+EAA1", 
-        "description": "Trill wiggle segment, faster still"
-    }, 
-    "wiggleTrillFastest": {
-        "codepoint": "U+EAA0", 
-        "description": "Trill wiggle segment, fastest"
-    }, 
-    "wiggleTrillSlow": {
-        "codepoint": "U+EAA5", 
-        "description": "Trill wiggle segment, slow"
-    }, 
-    "wiggleTrillSlower": {
-        "codepoint": "U+EAA6", 
-        "description": "Trill wiggle segment, slower"
-    }, 
-    "wiggleTrillSlowerStill": {
-        "codepoint": "U+EAA7", 
-        "description": "Trill wiggle segment, slower still"
-    }, 
-    "wiggleTrillSlowest": {
-        "codepoint": "U+EAA8", 
-        "description": "Trill wiggle segment, slowest"
-    }, 
-    "wiggleVIbratoLargestSlower": {
-        "codepoint": "U+EAEE", 
-        "description": "Vibrato largest, slower"
-    }, 
-    "wiggleVIbratoMediumSlower": {
-        "codepoint": "U+EAE0", 
-        "description": "Vibrato medium, slower"
-    }, 
-    "wiggleVibrato": {
-        "codepoint": "U+EAB0", 
-        "description": "Vibrato / shake wiggle segment"
-    }, 
-    "wiggleVibratoLargeFast": {
-        "codepoint": "U+EAE5", 
-        "description": "Vibrato large, fast"
-    }, 
-    "wiggleVibratoLargeFaster": {
-        "codepoint": "U+EAE4", 
-        "description": "Vibrato large, faster"
-    }, 
-    "wiggleVibratoLargeFasterStill": {
-        "codepoint": "U+EAE3", 
-        "description": "Vibrato large, faster still"
-    }, 
-    "wiggleVibratoLargeFastest": {
-        "codepoint": "U+EAE2", 
-        "description": "Vibrato large, fastest"
-    }, 
-    "wiggleVibratoLargeSlow": {
-        "codepoint": "U+EAE6", 
-        "description": "Vibrato large, slow"
-    }, 
-    "wiggleVibratoLargeSlower": {
-        "codepoint": "U+EAE7", 
-        "description": "Vibrato large, slower"
-    }, 
-    "wiggleVibratoLargeSlowest": {
-        "codepoint": "U+EAE8", 
-        "description": "Vibrato large, slowest"
-    }, 
-    "wiggleVibratoLargestFast": {
-        "codepoint": "U+EAEC", 
-        "description": "Vibrato largest, fast"
-    }, 
-    "wiggleVibratoLargestFaster": {
-        "codepoint": "U+EAEB", 
-        "description": "Vibrato largest, faster"
-    }, 
-    "wiggleVibratoLargestFasterStill": {
-        "codepoint": "U+EAEA", 
-        "description": "Vibrato largest, faster still"
-    }, 
-    "wiggleVibratoLargestFastest": {
-        "codepoint": "U+EAE9", 
-        "description": "Vibrato largest, fastest"
-    }, 
-    "wiggleVibratoLargestSlow": {
-        "codepoint": "U+EAED", 
-        "description": "Vibrato largest, slow"
-    }, 
-    "wiggleVibratoLargestSlowest": {
-        "codepoint": "U+EAEF", 
-        "description": "Vibrato largest, slowest"
-    }, 
-    "wiggleVibratoMediumFast": {
-        "codepoint": "U+EADE", 
-        "description": "Vibrato medium, fast"
-    }, 
-    "wiggleVibratoMediumFaster": {
-        "codepoint": "U+EADD", 
-        "description": "Vibrato medium, faster"
-    }, 
-    "wiggleVibratoMediumFasterStill": {
-        "codepoint": "U+EADC", 
-        "description": "Vibrato medium, faster still"
-    }, 
-    "wiggleVibratoMediumFastest": {
-        "codepoint": "U+EADB", 
-        "description": "Vibrato medium, fastest"
-    }, 
-    "wiggleVibratoMediumSlow": {
-        "codepoint": "U+EADF", 
-        "description": "Vibrato medium, slow"
-    }, 
-    "wiggleVibratoMediumSlowest": {
-        "codepoint": "U+EAE1", 
-        "description": "Vibrato medium, slowest"
-    }, 
-    "wiggleVibratoSmallFast": {
-        "codepoint": "U+EAD7", 
-        "description": "Vibrato small, fast"
-    }, 
-    "wiggleVibratoSmallFaster": {
-        "codepoint": "U+EAD6", 
-        "description": "Vibrato small, faster"
-    }, 
-    "wiggleVibratoSmallFasterStill": {
-        "codepoint": "U+EAD5", 
-        "description": "Vibrato small, faster still"
-    }, 
-    "wiggleVibratoSmallFastest": {
-        "codepoint": "U+EAD4", 
-        "description": "Vibrato small, fastest"
-    }, 
-    "wiggleVibratoSmallSlow": {
-        "codepoint": "U+EAD8", 
-        "description": "Vibrato small, slow"
-    }, 
-    "wiggleVibratoSmallSlower": {
-        "codepoint": "U+EAD9", 
-        "description": "Vibrato small, slower"
-    }, 
-    "wiggleVibratoSmallSlowest": {
-        "codepoint": "U+EADA", 
-        "description": "Vibrato small, slowest"
-    }, 
-    "wiggleVibratoSmallestFast": {
-        "codepoint": "U+EAD0", 
-        "description": "Vibrato smallest, fast"
-    }, 
-    "wiggleVibratoSmallestFaster": {
-        "codepoint": "U+EACF", 
-        "description": "Vibrato smallest, faster"
-    }, 
-    "wiggleVibratoSmallestFasterStill": {
-        "codepoint": "U+EACE", 
-        "description": "Vibrato smallest, faster still"
-    }, 
-    "wiggleVibratoSmallestFastest": {
-        "codepoint": "U+EACD", 
-        "description": "Vibrato smallest, fastest"
-    }, 
-    "wiggleVibratoSmallestSlow": {
-        "codepoint": "U+EAD1", 
-        "description": "Vibrato smallest, slow"
-    }, 
-    "wiggleVibratoSmallestSlower": {
-        "codepoint": "U+EAD2", 
-        "description": "Vibrato smallest, slower"
-    }, 
-    "wiggleVibratoSmallestSlowest": {
-        "codepoint": "U+EAD3", 
-        "description": "Vibrato smallest, slowest"
-    }, 
-    "wiggleVibratoStart": {
-        "codepoint": "U+EACC", 
-        "description": "Vibrato start"
-    }, 
-    "wiggleVibratoWide": {
-        "codepoint": "U+EAB1", 
-        "description": "Wide vibrato / shake wiggle segment"
-    }, 
-    "wiggleWavy": {
-        "codepoint": "U+EAB5", 
-        "description": "Wavy line segment"
-    }, 
-    "wiggleWavyNarrow": {
-        "codepoint": "U+EAB4", 
-        "description": "Narrow wavy line segment"
-    }, 
-    "wiggleWavyWide": {
-        "codepoint": "U+EAB6", 
-        "description": "Wide wavy line segment"
-    }, 
-    "windClosedHole": {
-        "codepoint": "U+E5F4", 
-        "description": "Closed hole"
-    }, 
-    "windFlatEmbouchure": {
-        "codepoint": "U+E5FB", 
-        "description": "Flatter embouchure"
-    }, 
-    "windHalfClosedHole1": {
-        "codepoint": "U+E5F6", 
-        "description": "Half-closed hole"
-    }, 
-    "windHalfClosedHole2": {
-        "codepoint": "U+E5F7", 
-        "description": "Half-closed hole 2"
-    }, 
-    "windHalfClosedHole3": {
-        "codepoint": "U+E5F8", 
-        "description": "Half-open hole"
-    }, 
-    "windLessRelaxedEmbouchure": {
-        "codepoint": "U+E5FE", 
-        "description": "Somewhat relaxed embouchure"
-    }, 
-    "windLessTightEmbouchure": {
-        "codepoint": "U+E600", 
-        "description": "Somewhat tight embouchure"
-    }, 
-    "windMouthpiecePop": {
-        "codepoint": "U+E60A", 
-        "description": "Mouthpiece or hand pop"
-    }, 
-    "windMultiphonicsBlackStem": {
-        "codepoint": "U+E607", 
-        "description": "Combining multiphonics (black) for stem"
-    }, 
-    "windMultiphonicsBlackWhiteStem": {
-        "codepoint": "U+E609", 
-        "description": "Combining multiphonics (black and white) for stem"
-    }, 
-    "windMultiphonicsWhiteStem": {
-        "codepoint": "U+E608", 
-        "description": "Combining multiphonics (white) for stem"
-    }, 
-    "windOpenHole": {
-        "codepoint": "U+E5F9", 
-        "description": "Open hole"
-    }, 
-    "windReedPositionIn": {
-        "codepoint": "U+E606", 
-        "description": "Much more reed (push inwards)"
-    }, 
-    "windReedPositionNormal": {
-        "codepoint": "U+E604", 
-        "description": "Normal reed position"
-    }, 
-    "windReedPositionOut": {
-        "codepoint": "U+E605", 
-        "description": "Very little reed (pull outwards)"
-    }, 
-    "windRelaxedEmbouchure": {
-        "codepoint": "U+E5FD", 
-        "description": "Relaxed embouchure"
-    }, 
-    "windRimOnly": {
-        "codepoint": "U+E60B", 
-        "description": "Rim only"
-    }, 
-    "windSharpEmbouchure": {
-        "codepoint": "U+E5FC", 
-        "description": "Sharper embouchure"
-    }, 
-    "windStrongAirPressure": {
-        "codepoint": "U+E603", 
-        "description": "Very tight embouchure / strong air pressure"
-    }, 
-    "windThreeQuartersClosedHole": {
-        "codepoint": "U+E5F5", 
-        "description": "Three-quarters closed hole"
-    }, 
-    "windTightEmbouchure": {
-        "codepoint": "U+E5FF", 
-        "description": "Tight embouchure"
-    }, 
-    "windTrillKey": {
-        "codepoint": "U+E5FA", 
-        "description": "Trill key"
-    }, 
-    "windVeryTightEmbouchure": {
-        "codepoint": "U+E601", 
-        "description": "Very tight embouchure"
-    }, 
-    "windWeakAirPressure": {
-        "codepoint": "U+E602", 
-        "description": "Very relaxed embouchure / weak air-pressure"
-    }
-}
\ No newline at end of file

From 00fb3311e4e6c01eeab3ea5b15ab1d4fc6e49490 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Wed, 26 Jan 2022 09:33:19 +0100
Subject: [PATCH 142/403] remove extracted SMuFL glyphs

---
 data/Bravura.xml                              | 696 ------------------
 data/Bravura/E000-brace.xml                   |   1 -
 data/Bravura/E003-bracketTop.xml              |   1 -
 data/Bravura/E004-bracketBottom.xml           |   1 -
 data/Bravura/E043-repeatDots.xml              |   1 -
 data/Bravura/E044-repeatDot.xml               |   1 -
 data/Bravura/E045-dalSegno.xml                |   1 -
 data/Bravura/E046-daCapo.xml                  |   1 -
 data/Bravura/E047-segno.xml                   |   1 -
 data/Bravura/E048-coda.xml                    |   1 -
 data/Bravura/E049-codaSquare.xml              |   1 -
 data/Bravura/E04B-segnoSerpent2.xml           |   1 -
 data/Bravura/E050-gClef.xml                   |   1 -
 data/Bravura/E051-gClef15mb.xml               |   1 -
 data/Bravura/E052-gClef8vb.xml                |   1 -
 data/Bravura/E053-gClef8va.xml                |   1 -
 data/Bravura/E054-gClef15ma.xml               |   1 -
 data/Bravura/E055-gClef8vbOld.xml             |   1 -
 data/Bravura/E056-gClef8vbCClef.xml           |   1 -
 data/Bravura/E05C-cClef.xml                   |   1 -
 data/Bravura/E05D-cClef8vb.xml                |   1 -
 data/Bravura/E062-fClef.xml                   |   1 -
 data/Bravura/E063-fClef15mb.xml               |   1 -
 data/Bravura/E064-fClef8vb.xml                |   1 -
 data/Bravura/E065-fClef8va.xml                |   1 -
 data/Bravura/E066-fClef15ma.xml               |   1 -
 .../Bravura/E069-unpitchedPercussionClef1.xml |   1 -
 .../Bravura/E06A-unpitchedPercussionClef2.xml |   1 -
 data/Bravura/E073-gClefReversed.xml           |   1 -
 data/Bravura/E074-gClefTurned.xml             |   1 -
 data/Bravura/E075-cClefReversed.xml           |   1 -
 data/Bravura/E076-fClefReversed.xml           |   1 -
 data/Bravura/E077-fClefTurned.xml             |   1 -
 data/Bravura/E080-timeSig0.xml                |   1 -
 data/Bravura/E081-timeSig1.xml                |   1 -
 data/Bravura/E082-timeSig2.xml                |   1 -
 data/Bravura/E083-timeSig3.xml                |   1 -
 data/Bravura/E084-timeSig4.xml                |   1 -
 data/Bravura/E085-timeSig5.xml                |   1 -
 data/Bravura/E086-timeSig6.xml                |   1 -
 data/Bravura/E087-timeSig7.xml                |   1 -
 data/Bravura/E088-timeSig8.xml                |   1 -
 data/Bravura/E089-timeSig9.xml                |   1 -
 data/Bravura/E08A-timeSigCommon.xml           |   1 -
 data/Bravura/E08B-timeSigCutCommon.xml        |   1 -
 data/Bravura/E08C-timeSigPlus.xml             |   1 -
 data/Bravura/E08D-timeSigPlusSmall.xml        |   1 -
 data/Bravura/E08E-timeSigFractionalSlash.xml  |   1 -
 data/Bravura/E08F-timeSigEquals.xml           |   1 -
 data/Bravura/E090-timeSigMinus.xml            |   1 -
 data/Bravura/E091-timeSigMultiply.xml         |   1 -
 data/Bravura/E092-timeSigParensLeftSmall.xml  |   1 -
 data/Bravura/E093-timeSigParensRightSmall.xml |   1 -
 data/Bravura/E094-timeSigParensLeft.xml       |   1 -
 data/Bravura/E095-timeSigParensRight.xml      |   1 -
 data/Bravura/E0A0-noteheadDoubleWhole.xml     |   1 -
 .../E0A1-noteheadDoubleWholeSquare.xml        |   1 -
 data/Bravura/E0A2-noteheadWhole.xml           |   1 -
 data/Bravura/E0A3-noteheadHalf.xml            |   1 -
 data/Bravura/E0A4-noteheadBlack.xml           |   1 -
 data/Bravura/E0A5-noteheadNull.xml            |   1 -
 data/Bravura/E0A9-noteheadXBlack.xml          |   1 -
 data/Bravura/E0AF-noteheadPlusBlack.xml       |   1 -
 data/Bravura/E0B5-noteheadWholeWithX.xml      |   1 -
 data/Bravura/E0B6-noteheadHalfWithX.xml       |   1 -
 data/Bravura/E0B7-noteheadVoidWithX.xml       |   1 -
 data/Bravura/E0D9-noteheadDiamondHalf.xml     |   1 -
 data/Bravura/E0DA-noteheadDiamondHalfWide.xml |   1 -
 data/Bravura/E0DB-noteheadDiamondBlack.xml    |   1 -
 .../Bravura/E0DC-noteheadDiamondBlackWide.xml |   1 -
 data/Bravura/E0DD-noteheadDiamondWhite.xml    |   1 -
 .../Bravura/E0DE-noteheadDiamondWhiteWide.xml |   1 -
 data/Bravura/E0F5-noteheadParenthesisLeft.xml |   1 -
 .../Bravura/E0F6-noteheadParenthesisRight.xml |   1 -
 data/Bravura/E0FA-noteheadWholeFilled.xml     |   1 -
 .../E101-noteheadSlashHorizontalEnds.xml      |   1 -
 data/Bravura/E102-noteheadSlashWhiteWhole.xml |   1 -
 data/Bravura/E103-noteheadSlashWhiteHalf.xml  |   1 -
 data/Bravura/E220-tremolo1.xml                |   1 -
 data/Bravura/E221-tremolo2.xml                |   1 -
 data/Bravura/E222-tremolo3.xml                |   1 -
 data/Bravura/E223-tremolo4.xml                |   1 -
 data/Bravura/E224-tremolo5.xml                |   1 -
 data/Bravura/E22A-buzzRoll.xml                |   1 -
 data/Bravura/E240-flag8thUp.xml               |   1 -
 data/Bravura/E241-flag8thDown.xml             |   1 -
 data/Bravura/E242-flag16thUp.xml              |   1 -
 data/Bravura/E243-flag16thDown.xml            |   1 -
 data/Bravura/E244-flag32ndUp.xml              |   1 -
 data/Bravura/E245-flag32ndDown.xml            |   1 -
 data/Bravura/E246-flag64thUp.xml              |   1 -
 data/Bravura/E247-flag64thDown.xml            |   1 -
 data/Bravura/E248-flag128thUp.xml             |   1 -
 data/Bravura/E249-flag128thDown.xml           |   1 -
 data/Bravura/E24A-flag256thUp.xml             |   1 -
 data/Bravura/E24B-flag256thDown.xml           |   1 -
 data/Bravura/E24C-flag512thUp.xml             |   1 -
 data/Bravura/E24D-flag512thDown.xml           |   1 -
 data/Bravura/E24E-flag1024thUp.xml            |   1 -
 data/Bravura/E24F-flag1024thDown.xml          |   1 -
 data/Bravura/E260-accidentalFlat.xml          |   1 -
 data/Bravura/E261-accidentalNatural.xml       |   1 -
 data/Bravura/E262-accidentalSharp.xml         |   1 -
 data/Bravura/E263-accidentalDoubleSharp.xml   |   1 -
 data/Bravura/E264-accidentalDoubleFlat.xml    |   1 -
 data/Bravura/E265-accidentalTripleSharp.xml   |   1 -
 data/Bravura/E266-accidentalTripleFlat.xml    |   1 -
 data/Bravura/E267-accidentalNaturalFlat.xml   |   1 -
 data/Bravura/E268-accidentalNaturalSharp.xml  |   1 -
 data/Bravura/E269-accidentalSharpSharp.xml    |   1 -
 data/Bravura/E26A-accidentalParensLeft.xml    |   1 -
 data/Bravura/E26B-accidentalParensRight.xml   |   1 -
 data/Bravura/E26C-accidentalBracketLeft.xml   |   1 -
 data/Bravura/E26D-accidentalBracketRight.xml  |   1 -
 .../E270-accidentalQuarterToneFlatArrowUp.xml |   1 -
 ...cidentalThreeQuarterTonesFlatArrowDown.xml |   1 -
 ...cidentalQuarterToneSharpNaturalArrowUp.xml |   1 -
 ...identalQuarterToneFlatNaturalArrowDown.xml |   1 -
 ...ccidentalThreeQuarterTonesSharpArrowUp.xml |   1 -
 ...75-accidentalQuarterToneSharpArrowDown.xml |   1 -
 .../E280-accidentalQuarterToneFlatStein.xml   |   1 -
 ...identalThreeQuarterTonesFlatZimmermann.xml |   1 -
 .../E282-accidentalQuarterToneSharpStein.xml  |   1 -
 ...-accidentalThreeQuarterTonesSharpStein.xml |   1 -
 .../E440-accidentalBuyukMucennebFlat.xml      |   1 -
 .../E441-accidentalKucukMucennebFlat.xml      |   1 -
 data/Bravura/E442-accidentalBakiyeFlat.xml    |   1 -
 data/Bravura/E443-accidentalKomaFlat.xml      |   1 -
 data/Bravura/E444-accidentalKomaSharp.xml     |   1 -
 data/Bravura/E445-accidentalBakiyeSharp.xml   |   1 -
 .../E446-accidentalKucukMucennebSharp.xml     |   1 -
 .../E447-accidentalBuyukMucennebSharp.xml     |   1 -
 data/Bravura/E4A0-articAccentAbove.xml        |   1 -
 data/Bravura/E4A1-articAccentBelow.xml        |   1 -
 data/Bravura/E4A2-articStaccatoAbove.xml      |   1 -
 data/Bravura/E4A3-articStaccatoBelow.xml      |   1 -
 data/Bravura/E4A4-articTenutoAbove.xml        |   1 -
 data/Bravura/E4A5-articTenutoBelow.xml        |   1 -
 data/Bravura/E4A6-articStaccatissimoAbove.xml |   1 -
 data/Bravura/E4A7-articStaccatissimoBelow.xml |   1 -
 .../E4A8-articStaccatissimoWedgeAbove.xml     |   1 -
 .../E4A9-articStaccatissimoWedgeBelow.xml     |   1 -
 .../E4AA-articStaccatissimoStrokeAbove.xml    |   1 -
 .../E4AB-articStaccatissimoStrokeBelow.xml    |   1 -
 data/Bravura/E4AC-articMarcatoAbove.xml       |   1 -
 data/Bravura/E4AD-articMarcatoBelow.xml       |   1 -
 .../E4AE-articMarcatoStaccatoAbove.xml        |   1 -
 .../E4AF-articMarcatoStaccatoBelow.xml        |   1 -
 .../Bravura/E4B0-articAccentStaccatoAbove.xml |   1 -
 .../Bravura/E4B1-articAccentStaccatoBelow.xml |   1 -
 .../Bravura/E4B2-articTenutoStaccatoAbove.xml |   1 -
 .../Bravura/E4B3-articTenutoStaccatoBelow.xml |   1 -
 data/Bravura/E4B4-articTenutoAccentAbove.xml  |   1 -
 data/Bravura/E4B5-articTenutoAccentBelow.xml  |   1 -
 data/Bravura/E4B6-articStressAbove.xml        |   1 -
 data/Bravura/E4B7-articStressBelow.xml        |   1 -
 data/Bravura/E4B8-articUnstressAbove.xml      |   1 -
 data/Bravura/E4B9-articUnstressBelow.xml      |   1 -
 data/Bravura/E4BA-articLaissezVibrerAbove.xml |   1 -
 data/Bravura/E4BB-articLaissezVibrerBelow.xml |   1 -
 data/Bravura/E4BC-articMarcatoTenutoAbove.xml |   1 -
 data/Bravura/E4BD-articMarcatoTenutoBelow.xml |   1 -
 data/Bravura/E4C0-fermataAbove.xml            |   1 -
 data/Bravura/E4C1-fermataBelow.xml            |   1 -
 data/Bravura/E4C2-fermataVeryShortAbove.xml   |   1 -
 data/Bravura/E4C3-fermataVeryShortBelow.xml   |   1 -
 data/Bravura/E4C4-fermataShortAbove.xml       |   1 -
 data/Bravura/E4C5-fermataShortBelow.xml       |   1 -
 data/Bravura/E4C6-fermataLongAbove.xml        |   1 -
 data/Bravura/E4C7-fermataLongBelow.xml        |   1 -
 data/Bravura/E4C8-fermataVeryLongAbove.xml    |   1 -
 data/Bravura/E4C9-fermataVeryLongBelow.xml    |   1 -
 data/Bravura/E4CE-breathMarkComma.xml         |   1 -
 data/Bravura/E4E0-restMaxima.xml              |   1 -
 data/Bravura/E4E1-restLonga.xml               |   1 -
 data/Bravura/E4E2-restDoubleWhole.xml         |   1 -
 data/Bravura/E4E3-restWhole.xml               |   1 -
 data/Bravura/E4E4-restHalf.xml                |   1 -
 data/Bravura/E4E5-restQuarter.xml             |   1 -
 data/Bravura/E4E6-rest8th.xml                 |   1 -
 data/Bravura/E4E7-rest16th.xml                |   1 -
 data/Bravura/E4E8-rest32nd.xml                |   1 -
 data/Bravura/E4E9-rest64th.xml                |   1 -
 data/Bravura/E4EA-rest128th.xml               |   1 -
 data/Bravura/E4EB-rest256th.xml               |   1 -
 data/Bravura/E4EC-rest512th.xml               |   1 -
 data/Bravura/E4ED-rest1024th.xml              |   1 -
 data/Bravura/E4F2-restQuarterOld.xml          |   1 -
 data/Bravura/E4F6-restQuarterZ.xml            |   1 -
 data/Bravura/E500-repeat1Bar.xml              |   1 -
 data/Bravura/E501-repeat2Bars.xml             |   1 -
 data/Bravura/E502-repeat4Bars.xml             |   1 -
 data/Bravura/E503-repeatBarUpperDot.xml       |   1 -
 data/Bravura/E504-repeatBarSlash.xml          |   1 -
 data/Bravura/E505-repeatBarLowerDot.xml       |   1 -
 data/Bravura/E510-ottava.xml                  |   1 -
 data/Bravura/E511-ottavaAlta.xml              |   1 -
 data/Bravura/E512-ottavaBassa.xml             |   1 -
 data/Bravura/E513-ottavaBassaBa.xml           |   1 -
 data/Bravura/E514-quindicesima.xml            |   1 -
 data/Bravura/E515-quindicesimaAlta.xml        |   1 -
 data/Bravura/E516-quindicesimaBassa.xml       |   1 -
 data/Bravura/E517-ventiduesima.xml            |   1 -
 data/Bravura/E518-ventiduesimaAlta.xml        |   1 -
 data/Bravura/E519-ventiduesimaBassa.xml       |   1 -
 data/Bravura/E51A-octaveParensLeft.xml        |   1 -
 data/Bravura/E51B-octaveParensRight.xml       |   1 -
 data/Bravura/E51C-ottavaBassaVb.xml           |   1 -
 data/Bravura/E51D-quindicesimaBassaMb.xml     |   1 -
 data/Bravura/E51E-ventiduesimaBassaMb.xml     |   1 -
 data/Bravura/E520-dynamicPiano.xml            |   1 -
 data/Bravura/E521-dynamicMezzo.xml            |   1 -
 data/Bravura/E522-dynamicForte.xml            |   1 -
 data/Bravura/E523-dynamicRinforzando.xml      |   1 -
 data/Bravura/E524-dynamicSforzando.xml        |   1 -
 data/Bravura/E525-dynamicZ.xml                |   1 -
 data/Bravura/E526-dynamicNiente.xml           |   1 -
 data/Bravura/E527-dynamicPPPPPP.xml           |   1 -
 data/Bravura/E528-dynamicPPPPP.xml            |   1 -
 data/Bravura/E529-dynamicPPPP.xml             |   1 -
 data/Bravura/E52A-dynamicPPP.xml              |   1 -
 data/Bravura/E52B-dynamicPP.xml               |   1 -
 data/Bravura/E52C-dynamicMP.xml               |   1 -
 data/Bravura/E52D-dynamicMF.xml               |   1 -
 data/Bravura/E52E-dynamicPF.xml               |   1 -
 data/Bravura/E52F-dynamicFF.xml               |   1 -
 data/Bravura/E530-dynamicFFF.xml              |   1 -
 data/Bravura/E531-dynamicFFFF.xml             |   1 -
 data/Bravura/E532-dynamicFFFFF.xml            |   1 -
 data/Bravura/E533-dynamicFFFFFF.xml           |   1 -
 data/Bravura/E534-dynamicFortePiano.xml       |   1 -
 data/Bravura/E535-dynamicForzando.xml         |   1 -
 data/Bravura/E536-dynamicSforzando1.xml       |   1 -
 data/Bravura/E537-dynamicSforzandoPiano.xml   |   1 -
 .../E538-dynamicSforzandoPianissimo.xml       |   1 -
 data/Bravura/E539-dynamicSforzato.xml         |   1 -
 data/Bravura/E53A-dynamicSforzatoPiano.xml    |   1 -
 data/Bravura/E53B-dynamicSforzatoFF.xml       |   1 -
 data/Bravura/E53C-dynamicRinforzando1.xml     |   1 -
 data/Bravura/E53D-dynamicRinforzando2.xml     |   1 -
 data/Bravura/E566-ornamentTrill.xml           |   1 -
 data/Bravura/E567-ornamentTurn.xml            |   1 -
 data/Bravura/E568-ornamentTurnInverted.xml    |   1 -
 data/Bravura/E569-ornamentTurnSlash.xml       |   1 -
 data/Bravura/E56A-ornamentTurnUp.xml          |   1 -
 data/Bravura/E56B-ornamentTurnUpS.xml         |   1 -
 data/Bravura/E56C-ornamentShortTrill.xml      |   1 -
 data/Bravura/E56D-ornamentMordent.xml         |   1 -
 data/Bravura/E56E-ornamentTremblement.xml     |   1 -
 data/Bravura/E56F-ornamentHaydn.xml           |   1 -
 data/Bravura/E583-ornamentVerticalLine.xml    |   1 -
 data/Bravura/E587-ornamentSchleifer.xml       |   1 -
 .../E59D-ornamentZigZagLineNoRightEnd.xml     |   1 -
 .../E59E-ornamentZigZagLineWithRightEnd.xml   |   1 -
 data/Bravura/E5B0-ornamentPrecompSlide.xml    |   1 -
 .../E5B1-ornamentPrecompDescendingSlide.xml   |   1 -
 .../E5B2-ornamentPrecompAppoggTrill.xml       |   1 -
 .../E5B3-ornamentPrecompAppoggTrillSuffix.xml |   1 -
 ...5B4-ornamentPrecompTurnTrillDAnglebert.xml |   1 -
 ...B5-ornamentPrecompSlideTrillDAnglebert.xml |   1 -
 .../E5B6-ornamentPrecompSlideTrillMarpurg.xml |   1 -
 .../E5B7-ornamentPrecompTurnTrillBach.xml     |   1 -
 .../E5B8-ornamentPrecompSlideTrillBach.xml    |   1 -
 .../E5B9-ornamentPrecompSlideTrillMuffat.xml  |   1 -
 ...-ornamentPrecompSlideTrillSuffixMuffat.xml |   1 -
 ...5BB-ornamentPrecompTrillSuffixDandrieu.xml |   1 -
 .../E5BC-ornamentPrecompPortDeVoixMordent.xml |   1 -
 .../E5BD-ornamentPrecompTrillWithMordent.xml  |   1 -
 data/Bravura/E5BE-ornamentPrecompCadence.xml  |   1 -
 .../E5BF-ornamentPrecompCadenceWithTurn.xml   |   1 -
 ...rnamentPrecompDoubleCadenceLowerPrefix.xml |   1 -
 ...E5C1-ornamentPrecompCadenceUpperPrefix.xml |   1 -
 ...-ornamentPrecompCadenceUpperPrefixTurn.xml |   1 -
 ...rnamentPrecompDoubleCadenceUpperPrefix.xml |   1 -
 ...entPrecompDoubleCadenceUpperPrefixTurn.xml |   1 -
 .../E5C5-ornamentPrecompMordentRelease.xml    |   1 -
 ...E5C6-ornamentPrecompMordentUpperPrefix.xml |   1 -
 ...amentPrecompInvertedMordentUpperPrefix.xml |   1 -
 .../E5C8-ornamentPrecompTrillLowerSuffix.xml  |   1 -
 data/Bravura/E5E5-brassMuteClosed.xml         |   1 -
 data/Bravura/E5E6-brassMuteHalfClosed.xml     |   1 -
 data/Bravura/E5E7-brassMuteOpen.xml           |   1 -
 data/Bravura/E610-stringsDownBow.xml          |   1 -
 data/Bravura/E611-stringsDownBowTurned.xml    |   1 -
 data/Bravura/E612-stringsUpBow.xml            |   1 -
 data/Bravura/E613-stringsUpBowTurned.xml      |   1 -
 data/Bravura/E614-stringsHarmonic.xml         |   1 -
 .../E630-pluckedSnapPizzicatoBelow.xml        |   1 -
 .../E631-pluckedSnapPizzicatoAbove.xml        |   1 -
 data/Bravura/E632-pluckedBuzzPizzicato.xml    |   1 -
 .../Bravura/E633-pluckedLeftHandPizzicato.xml |   1 -
 data/Bravura/E638-pluckedDamp.xml             |   1 -
 data/Bravura/E645-vocalSprechgesang.xml       |   1 -
 data/Bravura/E650-keyboardPedalPed.xml        |   1 -
 data/Bravura/E651-keyboardPedalP.xml          |   1 -
 data/Bravura/E655-keyboardPedalUp.xml         |   1 -
 data/Bravura/E659-keyboardPedalSost.xml       |   1 -
 data/Bravura/E65A-keyboardPedalS.xml          |   1 -
 data/Bravura/E880-tuplet0.xml                 |   1 -
 data/Bravura/E881-tuplet1.xml                 |   1 -
 data/Bravura/E882-tuplet2.xml                 |   1 -
 data/Bravura/E883-tuplet3.xml                 |   1 -
 data/Bravura/E884-tuplet4.xml                 |   1 -
 data/Bravura/E885-tuplet5.xml                 |   1 -
 data/Bravura/E886-tuplet6.xml                 |   1 -
 data/Bravura/E887-tuplet7.xml                 |   1 -
 data/Bravura/E888-tuplet8.xml                 |   1 -
 data/Bravura/E889-tuplet9.xml                 |   1 -
 data/Bravura/E88A-tupletColon.xml             |   1 -
 data/Bravura/E901-mensuralGclefPetrucci.xml   |   1 -
 data/Bravura/E902-chantFclef.xml              |   1 -
 data/Bravura/E904-mensuralFclefPetrucci.xml   |   1 -
 data/Bravura/E906-chantCclef.xml              |   1 -
 .../E907-mensuralCclefPetrucciPosLowest.xml   |   1 -
 .../E908-mensuralCclefPetrucciPosLow.xml      |   1 -
 .../E909-mensuralCclefPetrucciPosMiddle.xml   |   1 -
 .../E90A-mensuralCclefPetrucciPosHigh.xml     |   1 -
 .../E90B-mensuralCclefPetrucciPosHighest.xml  |   1 -
 data/Bravura/E910-mensuralProlation1.xml      |   1 -
 data/Bravura/E911-mensuralProlation2.xml      |   1 -
 data/Bravura/E912-mensuralProlation3.xml      |   1 -
 data/Bravura/E913-mensuralProlation4.xml      |   1 -
 data/Bravura/E914-mensuralProlation5.xml      |   1 -
 data/Bravura/E915-mensuralProlation6.xml      |   1 -
 data/Bravura/E916-mensuralProlation7.xml      |   1 -
 data/Bravura/E917-mensuralProlation8.xml      |   1 -
 data/Bravura/E918-mensuralProlation9.xml      |   1 -
 data/Bravura/E919-mensuralProlation10.xml     |   1 -
 data/Bravura/E91A-mensuralProlation11.xml     |   1 -
 ...E91B-mensuralProportionTempusPerfectum.xml |   1 -
 ...E91C-mensuralProportionProportioDupla1.xml |   1 -
 ...E91D-mensuralProportionProportioDupla2.xml |   1 -
 ...E91E-mensuralProportionProportioTripla.xml |   1 -
 ...F-mensuralProportionProportioQuadrupla.xml |   1 -
 .../E920-mensuralProlationCombiningDot.xml    |   1 -
 ...E921-mensuralProlationCombiningTwoDots.xml |   1 -
 ...22-mensuralProlationCombiningThreeDots.xml |   1 -
 ...mensuralProlationCombiningThreeDotsTri.xml |   1 -
 ...E924-mensuralProlationCombiningDotVoid.xml |   1 -
 .../E925-mensuralProlationCombiningStroke.xml |   1 -
 .../E938-mensuralNoteheadSemibrevisBlack.xml  |   1 -
 .../E939-mensuralNoteheadSemibrevisVoid.xml   |   1 -
 .../E93C-mensuralNoteheadMinimaWhite.xml      |   1 -
 .../E93D-mensuralNoteheadSemiminimaWhite.xml  |   1 -
 data/Bravura/E93E-mensuralCombStemUp.xml      |   1 -
 data/Bravura/E93F-mensuralCombStemDown.xml    |   1 -
 .../E949-mensuralCombStemUpFlagSemiminima.xml |   1 -
 ...94A-mensuralCombStemDownFlagSemiminima.xml |   1 -
 .../E94B-mensuralCombStemUpFlagFusa.xml       |   1 -
 .../E94C-mensuralCombStemDownFlagFusa.xml     |   1 -
 data/Bravura/E990-chantPunctum.xml            |   1 -
 data/Bravura/E991-chantPunctumInclinatum.xml  |   1 -
 data/Bravura/E996-chantPunctumVirga.xml       |   1 -
 data/Bravura/E99B-chantQuilisma.xml           |   1 -
 data/Bravura/E99E-chantOriscusLiquescens.xml  |   1 -
 data/Bravura/E99F-chantStrophicus.xml         |   1 -
 data/Bravura/E9B4-chantEntryLineAsc2nd.xml    |   1 -
 data/Bravura/E9B5-chantEntryLineAsc3rd.xml    |   1 -
 data/Bravura/E9B6-chantEntryLineAsc4th.xml    |   1 -
 data/Bravura/E9B7-chantEntryLineAsc5th.xml    |   1 -
 data/Bravura/E9B9-chantLigaturaDesc2nd.xml    |   1 -
 data/Bravura/E9BA-chantLigaturaDesc3rd.xml    |   1 -
 data/Bravura/E9BB-chantLigaturaDesc4th.xml    |   1 -
 data/Bravura/E9BC-chantLigaturaDesc5th.xml    |   1 -
 data/Bravura/E9E0-medRenFlatSoftB.xml         |   1 -
 data/Bravura/E9E1-medRenFlatHardB.xml         |   1 -
 data/Bravura/E9E2-medRenNatural.xml           |   1 -
 data/Bravura/E9E3-medRenSharpCroix.xml        |   1 -
 data/Bravura/E9F0-mensuralRestMaxima.xml      |   1 -
 .../E9F1-mensuralRestLongaPerfecta.xml        |   1 -
 .../E9F2-mensuralRestLongaImperfecta.xml      |   1 -
 data/Bravura/E9F3-mensuralRestBrevis.xml      |   1 -
 data/Bravura/E9F4-mensuralRestSemibrevis.xml  |   1 -
 data/Bravura/E9F5-mensuralRestMinima.xml      |   1 -
 data/Bravura/E9F6-mensuralRestSemiminima.xml  |   1 -
 data/Bravura/E9F7-mensuralRestFusa.xml        |   1 -
 data/Bravura/E9F8-mensuralRestSemifusa.xml    |   1 -
 data/Bravura/EA02-mensuralCustosUp.xml        |   1 -
 .../EA06-chantCustosStemUpPosMiddle.xml       |   1 -
 data/Bravura/EAA4-wiggleTrill.xml             |   1 -
 data/Bravura/EAA9-wiggleArpeggiatoUp.xml      |   1 -
 data/Bravura/EAAA-wiggleArpeggiatoDown.xml    |   1 -
 data/Bravura/EAAD-wiggleArpeggiatoUpArrow.xml |   1 -
 .../EAAE-wiggleArpeggiatoDownArrow.xml        |   1 -
 data/Bravura/EAAF-wiggleGlissando.xml         |   1 -
 data/Bravura/EBA7-luteDurationWhole.xml       |   1 -
 data/Bravura/EBA8-luteDurationHalf.xml        |   1 -
 data/Bravura/EBA9-luteDurationQuarter.xml     |   1 -
 data/Bravura/EBAA-luteDuration8th.xml         |   1 -
 data/Bravura/EBAB-luteDuration16th.xml        |   1 -
 data/Bravura/EBAC-luteDuration32nd.xml        |   1 -
 data/Bravura/EBC0-luteFrenchFretA.xml         |   1 -
 data/Bravura/EBC1-luteFrenchFretB.xml         |   1 -
 data/Bravura/EBC2-luteFrenchFretC.xml         |   1 -
 data/Bravura/EBC3-luteFrenchFretD.xml         |   1 -
 data/Bravura/EBC4-luteFrenchFretE.xml         |   1 -
 data/Bravura/EBC5-luteFrenchFretF.xml         |   1 -
 data/Bravura/EBC6-luteFrenchFretG.xml         |   1 -
 data/Bravura/EBC7-luteFrenchFretH.xml         |   1 -
 data/Bravura/EBC8-luteFrenchFretI.xml         |   1 -
 data/Bravura/EBC9-luteFrenchFretK.xml         |   1 -
 data/Bravura/EBCA-luteFrenchFretL.xml         |   1 -
 data/Bravura/EBCB-luteFrenchFretM.xml         |   1 -
 data/Bravura/EBCC-luteFrenchFretN.xml         |   1 -
 data/Bravura/EBE0-luteItalianFret0.xml        |   1 -
 data/Bravura/EBE1-luteItalianFret1.xml        |   1 -
 data/Bravura/EBE2-luteItalianFret2.xml        |   1 -
 data/Bravura/EBE3-luteItalianFret3.xml        |   1 -
 data/Bravura/EBE4-luteItalianFret4.xml        |   1 -
 data/Bravura/EBE5-luteItalianFret5.xml        |   1 -
 data/Bravura/EBE6-luteItalianFret6.xml        |   1 -
 data/Bravura/EBE7-luteItalianFret7.xml        |   1 -
 data/Bravura/EBE8-luteItalianFret8.xml        |   1 -
 data/Bravura/EBE9-luteItalianFret9.xml        |   1 -
 data/Bravura/ED40-articSoftAccentAbove.xml    |   1 -
 data/Bravura/ED41-articSoftAccentBelow.xml    |   1 -
 data/Gootville.xml                            | 416 -----------
 data/Gootville/E003-bracketTop.xml            |   1 -
 data/Gootville/E004-bracketBottom.xml         |   1 -
 data/Gootville/E043-repeatDots.xml            |   1 -
 data/Gootville/E044-repeatDot.xml             |   1 -
 data/Gootville/E047-segno.xml                 |   1 -
 data/Gootville/E048-coda.xml                  |   1 -
 data/Gootville/E049-codaSquare.xml            |   1 -
 data/Gootville/E050-gClef.xml                 |   1 -
 data/Gootville/E051-gClef15mb.xml             |   1 -
 data/Gootville/E052-gClef8vb.xml              |   1 -
 data/Gootville/E053-gClef8va.xml              |   1 -
 data/Gootville/E054-gClef15ma.xml             |   1 -
 data/Gootville/E05C-cClef.xml                 |   1 -
 data/Gootville/E05D-cClef8vb.xml              |   1 -
 data/Gootville/E062-fClef.xml                 |   1 -
 data/Gootville/E063-fClef15mb.xml             |   1 -
 data/Gootville/E064-fClef8vb.xml              |   1 -
 data/Gootville/E065-fClef8va.xml              |   1 -
 data/Gootville/E066-fClef15ma.xml             |   1 -
 .../E069-unpitchedPercussionClef1.xml         |   1 -
 .../E06A-unpitchedPercussionClef2.xml         |   1 -
 data/Gootville/E080-timeSig0.xml              |   1 -
 data/Gootville/E081-timeSig1.xml              |   1 -
 data/Gootville/E082-timeSig2.xml              |   1 -
 data/Gootville/E083-timeSig3.xml              |   1 -
 data/Gootville/E084-timeSig4.xml              |   1 -
 data/Gootville/E085-timeSig5.xml              |   1 -
 data/Gootville/E086-timeSig6.xml              |   1 -
 data/Gootville/E087-timeSig7.xml              |   1 -
 data/Gootville/E088-timeSig8.xml              |   1 -
 data/Gootville/E089-timeSig9.xml              |   1 -
 data/Gootville/E08A-timeSigCommon.xml         |   1 -
 data/Gootville/E08B-timeSigCutCommon.xml      |   1 -
 .../Gootville/E092-timeSigParensLeftSmall.xml |   1 -
 .../E093-timeSigParensRightSmall.xml          |   1 -
 data/Gootville/E094-timeSigParensLeft.xml     |   1 -
 data/Gootville/E095-timeSigParensRight.xml    |   1 -
 data/Gootville/E0A0-noteheadDoubleWhole.xml   |   1 -
 .../E0A1-noteheadDoubleWholeSquare.xml        |   1 -
 data/Gootville/E0A2-noteheadWhole.xml         |   1 -
 data/Gootville/E0A3-noteheadHalf.xml          |   1 -
 data/Gootville/E0A4-noteheadBlack.xml         |   1 -
 data/Gootville/E0A9-noteheadXBlack.xml        |   1 -
 data/Gootville/E0D9-noteheadDiamondHalf.xml   |   1 -
 .../E0DA-noteheadDiamondHalfWide.xml          |   1 -
 data/Gootville/E0DB-noteheadDiamondBlack.xml  |   1 -
 .../E0DC-noteheadDiamondBlackWide.xml         |   1 -
 data/Gootville/E0DD-noteheadDiamondWhite.xml  |   1 -
 .../E0DE-noteheadDiamondWhiteWide.xml         |   1 -
 .../E0F5-noteheadParenthesisLeft.xml          |   1 -
 .../E0F6-noteheadParenthesisRight.xml         |   1 -
 .../E101-noteheadSlashHorizontalEnds.xml      |   1 -
 .../E102-noteheadSlashWhiteWhole.xml          |   1 -
 .../Gootville/E103-noteheadSlashWhiteHalf.xml |   1 -
 data/Gootville/E240-flag8thUp.xml             |   1 -
 data/Gootville/E241-flag8thDown.xml           |   1 -
 data/Gootville/E242-flag16thUp.xml            |   1 -
 data/Gootville/E243-flag16thDown.xml          |   1 -
 data/Gootville/E244-flag32ndUp.xml            |   1 -
 data/Gootville/E245-flag32ndDown.xml          |   1 -
 data/Gootville/E246-flag64thUp.xml            |   1 -
 data/Gootville/E247-flag64thDown.xml          |   1 -
 data/Gootville/E248-flag128thUp.xml           |   1 -
 data/Gootville/E249-flag128thDown.xml         |   1 -
 data/Gootville/E260-accidentalFlat.xml        |   1 -
 data/Gootville/E261-accidentalNatural.xml     |   1 -
 data/Gootville/E262-accidentalSharp.xml       |   1 -
 data/Gootville/E263-accidentalDoubleSharp.xml |   1 -
 data/Gootville/E264-accidentalDoubleFlat.xml  |   1 -
 data/Gootville/E26A-accidentalParensLeft.xml  |   1 -
 data/Gootville/E26B-accidentalParensRight.xml |   1 -
 .../E270-accidentalQuarterToneFlatArrowUp.xml |   1 -
 ...cidentalThreeQuarterTonesFlatArrowDown.xml |   1 -
 ...cidentalQuarterToneSharpNaturalArrowUp.xml |   1 -
 ...identalQuarterToneFlatNaturalArrowDown.xml |   1 -
 ...ccidentalThreeQuarterTonesSharpArrowUp.xml |   1 -
 ...75-accidentalQuarterToneSharpArrowDown.xml |   1 -
 .../E280-accidentalQuarterToneFlatStein.xml   |   1 -
 ...identalThreeQuarterTonesFlatZimmermann.xml |   1 -
 .../E282-accidentalQuarterToneSharpStein.xml  |   1 -
 ...-accidentalThreeQuarterTonesSharpStein.xml |   1 -
 .../E440-accidentalBuyukMucennebFlat.xml      |   1 -
 .../E441-accidentalKucukMucennebFlat.xml      |   1 -
 data/Gootville/E442-accidentalBakiyeFlat.xml  |   1 -
 data/Gootville/E443-accidentalKomaFlat.xml    |   1 -
 data/Gootville/E444-accidentalKomaSharp.xml   |   1 -
 data/Gootville/E445-accidentalBakiyeSharp.xml |   1 -
 .../E446-accidentalKucukMucennebSharp.xml     |   1 -
 .../E447-accidentalBuyukMucennebSharp.xml     |   1 -
 data/Gootville/E4A0-articAccentAbove.xml      |   1 -
 data/Gootville/E4A1-articAccentBelow.xml      |   1 -
 data/Gootville/E4A2-articStaccatoAbove.xml    |   1 -
 data/Gootville/E4A3-articStaccatoBelow.xml    |   1 -
 data/Gootville/E4A4-articTenutoAbove.xml      |   1 -
 data/Gootville/E4A5-articTenutoBelow.xml      |   1 -
 .../E4A6-articStaccatissimoAbove.xml          |   1 -
 .../E4A7-articStaccatissimoBelow.xml          |   1 -
 .../E4A8-articStaccatissimoWedgeAbove.xml     |   1 -
 .../E4A9-articStaccatissimoWedgeBelow.xml     |   1 -
 data/Gootville/E4AC-articMarcatoAbove.xml     |   1 -
 data/Gootville/E4AD-articMarcatoBelow.xml     |   1 -
 .../E4B2-articTenutoStaccatoAbove.xml         |   1 -
 .../E4B3-articTenutoStaccatoBelow.xml         |   1 -
 data/Gootville/E4B6-articStressAbove.xml      |   1 -
 data/Gootville/E4B7-articStressBelow.xml      |   1 -
 data/Gootville/E4C0-fermataAbove.xml          |   1 -
 data/Gootville/E4C1-fermataBelow.xml          |   1 -
 data/Gootville/E4C4-fermataShortAbove.xml     |   1 -
 data/Gootville/E4C5-fermataShortBelow.xml     |   1 -
 data/Gootville/E4C6-fermataLongAbove.xml      |   1 -
 data/Gootville/E4C7-fermataLongBelow.xml      |   1 -
 data/Gootville/E4C8-fermataVeryLongAbove.xml  |   1 -
 data/Gootville/E4C9-fermataVeryLongBelow.xml  |   1 -
 data/Gootville/E4CE-breathMarkComma.xml       |   1 -
 data/Gootville/E4E1-restLonga.xml             |   1 -
 data/Gootville/E4E2-restDoubleWhole.xml       |   1 -
 data/Gootville/E4E3-restWhole.xml             |   1 -
 data/Gootville/E4E4-restHalf.xml              |   1 -
 data/Gootville/E4E5-restQuarter.xml           |   1 -
 data/Gootville/E4E6-rest8th.xml               |   1 -
 data/Gootville/E4E7-rest16th.xml              |   1 -
 data/Gootville/E4E8-rest32nd.xml              |   1 -
 data/Gootville/E4E9-rest64th.xml              |   1 -
 data/Gootville/E4EA-rest128th.xml             |   1 -
 data/Gootville/E4F2-restQuarterOld.xml        |   1 -
 data/Gootville/E510-ottava.xml                |   1 -
 data/Gootville/E514-quindicesima.xml          |   1 -
 data/Gootville/E517-ventiduesima.xml          |   1 -
 data/Gootville/E51A-octaveParensLeft.xml      |   1 -
 data/Gootville/E51B-octaveParensRight.xml     |   1 -
 data/Gootville/E520-dynamicPiano.xml          |   1 -
 data/Gootville/E521-dynamicMezzo.xml          |   1 -
 data/Gootville/E522-dynamicForte.xml          |   1 -
 data/Gootville/E523-dynamicRinforzando.xml    |   1 -
 data/Gootville/E524-dynamicSforzando.xml      |   1 -
 data/Gootville/E525-dynamicZ.xml              |   1 -
 data/Gootville/E526-dynamicNiente.xml         |   1 -
 data/Gootville/E527-dynamicPPPPPP.xml         |   1 -
 data/Gootville/E528-dynamicPPPPP.xml          |   1 -
 data/Gootville/E529-dynamicPPPP.xml           |   1 -
 data/Gootville/E52A-dynamicPPP.xml            |   1 -
 data/Gootville/E52B-dynamicPP.xml             |   1 -
 data/Gootville/E52C-dynamicMP.xml             |   1 -
 data/Gootville/E52D-dynamicMF.xml             |   1 -
 data/Gootville/E52E-dynamicPF.xml             |   1 -
 data/Gootville/E52F-dynamicFF.xml             |   1 -
 data/Gootville/E530-dynamicFFF.xml            |   1 -
 data/Gootville/E531-dynamicFFFF.xml           |   1 -
 data/Gootville/E532-dynamicFFFFF.xml          |   1 -
 data/Gootville/E533-dynamicFFFFFF.xml         |   1 -
 data/Gootville/E534-dynamicFortePiano.xml     |   1 -
 data/Gootville/E535-dynamicForzando.xml       |   1 -
 data/Gootville/E536-dynamicSforzando1.xml     |   1 -
 data/Gootville/E537-dynamicSforzandoPiano.xml |   1 -
 .../E538-dynamicSforzandoPianissimo.xml       |   1 -
 data/Gootville/E539-dynamicSforzato.xml       |   1 -
 data/Gootville/E53A-dynamicSforzatoPiano.xml  |   1 -
 data/Gootville/E53B-dynamicSforzatoFF.xml     |   1 -
 data/Gootville/E53C-dynamicRinforzando1.xml   |   1 -
 data/Gootville/E53D-dynamicRinforzando2.xml   |   1 -
 data/Gootville/E566-ornamentTrill.xml         |   1 -
 data/Gootville/E567-ornamentTurn.xml          |   1 -
 data/Gootville/E568-ornamentTurnInverted.xml  |   1 -
 data/Gootville/E569-ornamentTurnSlash.xml     |   1 -
 data/Gootville/E56C-ornamentShortTrill.xml    |   1 -
 data/Gootville/E56D-ornamentMordent.xml       |   1 -
 data/Gootville/E56E-ornamentTremblement.xml   |   1 -
 .../E59D-ornamentZigZagLineNoRightEnd.xml     |   1 -
 .../E59E-ornamentZigZagLineWithRightEnd.xml   |   1 -
 data/Gootville/E5B0-ornamentPrecompSlide.xml  |   1 -
 data/Gootville/E5E5-brassMuteClosed.xml       |   1 -
 data/Gootville/E5E7-brassMuteOpen.xml         |   1 -
 data/Gootville/E610-stringsDownBow.xml        |   1 -
 data/Gootville/E611-stringsDownBowTurned.xml  |   1 -
 data/Gootville/E612-stringsUpBow.xml          |   1 -
 data/Gootville/E613-stringsUpBowTurned.xml    |   1 -
 .../E630-pluckedSnapPizzicatoBelow.xml        |   1 -
 .../E631-pluckedSnapPizzicatoAbove.xml        |   1 -
 data/Gootville/E650-keyboardPedalPed.xml      |   1 -
 data/Gootville/E651-keyboardPedalP.xml        |   1 -
 data/Gootville/E655-keyboardPedalUp.xml       |   1 -
 data/Gootville/EAA4-wiggleTrill.xml           |   1 -
 data/Gootville/EAA9-wiggleArpeggiatoUp.xml    |   1 -
 data/Gootville/EAAA-wiggleArpeggiatoDown.xml  |   1 -
 .../EAAD-wiggleArpeggiatoUpArrow.xml          |   1 -
 .../EAAE-wiggleArpeggiatoDownArrow.xml        |   1 -
 data/Gootville/EAAF-wiggleGlissando.xml       |   1 -
 data/Leipzig.xml                              | 573 --------------
 data/Leipzig/E000-brace.xml                   |   1 -
 data/Leipzig/E003-bracketTop.xml              |   1 -
 data/Leipzig/E004-bracketBottom.xml           |   1 -
 data/Leipzig/E043-repeatDots.xml              |   1 -
 data/Leipzig/E044-repeatDot.xml               |   1 -
 data/Leipzig/E045-dalSegno.xml                |   1 -
 data/Leipzig/E046-daCapo.xml                  |   1 -
 data/Leipzig/E047-segno.xml                   |   1 -
 data/Leipzig/E048-coda.xml                    |   1 -
 data/Leipzig/E049-codaSquare.xml              |   1 -
 data/Leipzig/E04B-segnoSerpent2.xml           |   1 -
 data/Leipzig/E050-gClef.xml                   |   1 -
 data/Leipzig/E051-gClef15mb.xml               |   1 -
 data/Leipzig/E052-gClef8vb.xml                |   1 -
 data/Leipzig/E053-gClef8va.xml                |   1 -
 data/Leipzig/E054-gClef15ma.xml               |   1 -
 data/Leipzig/E055-gClef8vbOld.xml             |   1 -
 data/Leipzig/E056-gClef8vbCClef.xml           |   1 -
 data/Leipzig/E05C-cClef.xml                   |   1 -
 data/Leipzig/E05D-cClef8vb.xml                |   1 -
 data/Leipzig/E062-fClef.xml                   |   1 -
 data/Leipzig/E063-fClef15mb.xml               |   1 -
 data/Leipzig/E064-fClef8vb.xml                |   1 -
 data/Leipzig/E065-fClef8va.xml                |   1 -
 data/Leipzig/E066-fClef15ma.xml               |   1 -
 .../Leipzig/E069-unpitchedPercussionClef1.xml |   1 -
 .../Leipzig/E06A-unpitchedPercussionClef2.xml |   1 -
 data/Leipzig/E073-gClefReversed.xml           |   1 -
 data/Leipzig/E074-gClefTurned.xml             |   1 -
 data/Leipzig/E075-cClefReversed.xml           |   1 -
 data/Leipzig/E076-fClefReversed.xml           |   1 -
 data/Leipzig/E077-fClefTurned.xml             |   1 -
 data/Leipzig/E080-timeSig0.xml                |   1 -
 data/Leipzig/E081-timeSig1.xml                |   1 -
 data/Leipzig/E082-timeSig2.xml                |   1 -
 data/Leipzig/E083-timeSig3.xml                |   1 -
 data/Leipzig/E084-timeSig4.xml                |   1 -
 data/Leipzig/E085-timeSig5.xml                |   1 -
 data/Leipzig/E086-timeSig6.xml                |   1 -
 data/Leipzig/E087-timeSig7.xml                |   1 -
 data/Leipzig/E088-timeSig8.xml                |   1 -
 data/Leipzig/E089-timeSig9.xml                |   1 -
 data/Leipzig/E08A-timeSigCommon.xml           |   1 -
 data/Leipzig/E08B-timeSigCutCommon.xml        |   1 -
 data/Leipzig/E08C-timeSigPlus.xml             |   1 -
 data/Leipzig/E08D-timeSigPlusSmall.xml        |   1 -
 data/Leipzig/E08E-timeSigFractionalSlash.xml  |   1 -
 data/Leipzig/E08F-timeSigEquals.xml           |   1 -
 data/Leipzig/E090-timeSigMinus.xml            |   1 -
 data/Leipzig/E091-timeSigMultiply.xml         |   1 -
 data/Leipzig/E092-timeSigParensLeftSmall.xml  |   1 -
 data/Leipzig/E093-timeSigParensRightSmall.xml |   1 -
 data/Leipzig/E094-timeSigParensLeft.xml       |   1 -
 data/Leipzig/E095-timeSigParensRight.xml      |   1 -
 data/Leipzig/E0A0-noteheadDoubleWhole.xml     |   1 -
 .../E0A1-noteheadDoubleWholeSquare.xml        |   1 -
 data/Leipzig/E0A2-noteheadWhole.xml           |   1 -
 data/Leipzig/E0A3-noteheadHalf.xml            |   1 -
 data/Leipzig/E0A4-noteheadBlack.xml           |   1 -
 data/Leipzig/E0A5-noteheadNull.xml            |   1 -
 data/Leipzig/E0A9-noteheadXBlack.xml          |   1 -
 data/Leipzig/E0AF-noteheadPlusBlack.xml       |   1 -
 data/Leipzig/E0B5-noteheadWholeWithX.xml      |   1 -
 data/Leipzig/E0B6-noteheadHalfWithX.xml       |   1 -
 data/Leipzig/E0B7-noteheadVoidWithX.xml       |   1 -
 data/Leipzig/E0D9-noteheadDiamondHalf.xml     |   1 -
 data/Leipzig/E0DA-noteheadDiamondHalfWide.xml |   1 -
 data/Leipzig/E0DB-noteheadDiamondBlack.xml    |   1 -
 .../Leipzig/E0DC-noteheadDiamondBlackWide.xml |   1 -
 data/Leipzig/E0DD-noteheadDiamondWhite.xml    |   1 -
 .../Leipzig/E0DE-noteheadDiamondWhiteWide.xml |   1 -
 data/Leipzig/E0F5-noteheadParenthesisLeft.xml |   1 -
 .../Leipzig/E0F6-noteheadParenthesisRight.xml |   1 -
 data/Leipzig/E0FA-noteheadWholeFilled.xml     |   1 -
 .../E101-noteheadSlashHorizontalEnds.xml      |   1 -
 data/Leipzig/E102-noteheadSlashWhiteWhole.xml |   1 -
 data/Leipzig/E103-noteheadSlashWhiteHalf.xml  |   1 -
 data/Leipzig/E220-tremolo1.xml                |   1 -
 data/Leipzig/E221-tremolo2.xml                |   1 -
 data/Leipzig/E222-tremolo3.xml                |   1 -
 data/Leipzig/E223-tremolo4.xml                |   1 -
 data/Leipzig/E224-tremolo5.xml                |   1 -
 data/Leipzig/E22A-buzzRoll.xml                |   1 -
 data/Leipzig/E240-flag8thUp.xml               |   1 -
 data/Leipzig/E241-flag8thDown.xml             |   1 -
 data/Leipzig/E242-flag16thUp.xml              |   1 -
 data/Leipzig/E243-flag16thDown.xml            |   1 -
 data/Leipzig/E244-flag32ndUp.xml              |   1 -
 data/Leipzig/E245-flag32ndDown.xml            |   1 -
 data/Leipzig/E246-flag64thUp.xml              |   1 -
 data/Leipzig/E247-flag64thDown.xml            |   1 -
 data/Leipzig/E248-flag128thUp.xml             |   1 -
 data/Leipzig/E249-flag128thDown.xml           |   1 -
 data/Leipzig/E24A-flag256thUp.xml             |   1 -
 data/Leipzig/E24B-flag256thDown.xml           |   1 -
 data/Leipzig/E24C-flag512thUp.xml             |   1 -
 data/Leipzig/E24D-flag512thDown.xml           |   1 -
 data/Leipzig/E24E-flag1024thUp.xml            |   1 -
 data/Leipzig/E24F-flag1024thDown.xml          |   1 -
 data/Leipzig/E260-accidentalFlat.xml          |   1 -
 data/Leipzig/E261-accidentalNatural.xml       |   1 -
 data/Leipzig/E262-accidentalSharp.xml         |   1 -
 data/Leipzig/E263-accidentalDoubleSharp.xml   |   1 -
 data/Leipzig/E264-accidentalDoubleFlat.xml    |   1 -
 data/Leipzig/E265-accidentalTripleSharp.xml   |   1 -
 data/Leipzig/E266-accidentalTripleFlat.xml    |   1 -
 data/Leipzig/E267-accidentalNaturalFlat.xml   |   1 -
 data/Leipzig/E268-accidentalNaturalSharp.xml  |   1 -
 data/Leipzig/E269-accidentalSharpSharp.xml    |   1 -
 data/Leipzig/E26A-accidentalParensLeft.xml    |   1 -
 data/Leipzig/E26B-accidentalParensRight.xml   |   1 -
 data/Leipzig/E26C-accidentalBracketLeft.xml   |   1 -
 data/Leipzig/E26D-accidentalBracketRight.xml  |   1 -
 .../E270-accidentalQuarterToneFlatArrowUp.xml |   1 -
 ...cidentalThreeQuarterTonesFlatArrowDown.xml |   1 -
 ...cidentalQuarterToneSharpNaturalArrowUp.xml |   1 -
 ...identalQuarterToneFlatNaturalArrowDown.xml |   1 -
 ...ccidentalThreeQuarterTonesSharpArrowUp.xml |   1 -
 ...75-accidentalQuarterToneSharpArrowDown.xml |   1 -
 .../E280-accidentalQuarterToneFlatStein.xml   |   1 -
 ...identalThreeQuarterTonesFlatZimmermann.xml |   1 -
 .../E282-accidentalQuarterToneSharpStein.xml  |   1 -
 ...-accidentalThreeQuarterTonesSharpStein.xml |   1 -
 .../E440-accidentalBuyukMucennebFlat.xml      |   1 -
 .../E441-accidentalKucukMucennebFlat.xml      |   1 -
 data/Leipzig/E442-accidentalBakiyeFlat.xml    |   1 -
 data/Leipzig/E443-accidentalKomaFlat.xml      |   1 -
 data/Leipzig/E444-accidentalKomaSharp.xml     |   1 -
 data/Leipzig/E445-accidentalBakiyeSharp.xml   |   1 -
 .../E446-accidentalKucukMucennebSharp.xml     |   1 -
 .../E447-accidentalBuyukMucennebSharp.xml     |   1 -
 data/Leipzig/E4A0-articAccentAbove.xml        |   1 -
 data/Leipzig/E4A1-articAccentBelow.xml        |   1 -
 data/Leipzig/E4A2-articStaccatoAbove.xml      |   1 -
 data/Leipzig/E4A3-articStaccatoBelow.xml      |   1 -
 data/Leipzig/E4A4-articTenutoAbove.xml        |   1 -
 data/Leipzig/E4A5-articTenutoBelow.xml        |   1 -
 data/Leipzig/E4A6-articStaccatissimoAbove.xml |   1 -
 data/Leipzig/E4A7-articStaccatissimoBelow.xml |   1 -
 .../E4A8-articStaccatissimoWedgeAbove.xml     |   1 -
 .../E4A9-articStaccatissimoWedgeBelow.xml     |   1 -
 .../E4AA-articStaccatissimoStrokeAbove.xml    |   1 -
 .../E4AB-articStaccatissimoStrokeBelow.xml    |   1 -
 data/Leipzig/E4AC-articMarcatoAbove.xml       |   1 -
 data/Leipzig/E4AD-articMarcatoBelow.xml       |   1 -
 .../E4AE-articMarcatoStaccatoAbove.xml        |   1 -
 .../E4AF-articMarcatoStaccatoBelow.xml        |   1 -
 .../Leipzig/E4B0-articAccentStaccatoAbove.xml |   1 -
 .../Leipzig/E4B1-articAccentStaccatoBelow.xml |   1 -
 .../Leipzig/E4B2-articTenutoStaccatoAbove.xml |   1 -
 .../Leipzig/E4B3-articTenutoStaccatoBelow.xml |   1 -
 data/Leipzig/E4B4-articTenutoAccentAbove.xml  |   1 -
 data/Leipzig/E4B5-articTenutoAccentBelow.xml  |   1 -
 data/Leipzig/E4B6-articStressAbove.xml        |   1 -
 data/Leipzig/E4B7-articStressBelow.xml        |   1 -
 data/Leipzig/E4B8-articUnstressAbove.xml      |   1 -
 data/Leipzig/E4B9-articUnstressBelow.xml      |   1 -
 data/Leipzig/E4BA-articLaissezVibrerAbove.xml |   1 -
 data/Leipzig/E4BB-articLaissezVibrerBelow.xml |   1 -
 data/Leipzig/E4BC-articMarcatoTenutoAbove.xml |   1 -
 data/Leipzig/E4BD-articMarcatoTenutoBelow.xml |   1 -
 data/Leipzig/E4C0-fermataAbove.xml            |   1 -
 data/Leipzig/E4C1-fermataBelow.xml            |   1 -
 data/Leipzig/E4C2-fermataVeryShortAbove.xml   |   1 -
 data/Leipzig/E4C3-fermataVeryShortBelow.xml   |   1 -
 data/Leipzig/E4C4-fermataShortAbove.xml       |   1 -
 data/Leipzig/E4C5-fermataShortBelow.xml       |   1 -
 data/Leipzig/E4C6-fermataLongAbove.xml        |   1 -
 data/Leipzig/E4C7-fermataLongBelow.xml        |   1 -
 data/Leipzig/E4C8-fermataVeryLongAbove.xml    |   1 -
 data/Leipzig/E4C9-fermataVeryLongBelow.xml    |   1 -
 data/Leipzig/E4CE-breathMarkComma.xml         |   1 -
 data/Leipzig/E4E0-restMaxima.xml              |   1 -
 data/Leipzig/E4E1-restLonga.xml               |   1 -
 data/Leipzig/E4E2-restDoubleWhole.xml         |   1 -
 data/Leipzig/E4E3-restWhole.xml               |   1 -
 data/Leipzig/E4E4-restHalf.xml                |   1 -
 data/Leipzig/E4E5-restQuarter.xml             |   1 -
 data/Leipzig/E4E6-rest8th.xml                 |   1 -
 data/Leipzig/E4E7-rest16th.xml                |   1 -
 data/Leipzig/E4E8-rest32nd.xml                |   1 -
 data/Leipzig/E4E9-rest64th.xml                |   1 -
 data/Leipzig/E4EA-rest128th.xml               |   1 -
 data/Leipzig/E4EB-rest256th.xml               |   1 -
 data/Leipzig/E4EC-rest512th.xml               |   1 -
 data/Leipzig/E4ED-rest1024th.xml              |   1 -
 data/Leipzig/E4F2-restQuarterOld.xml          |   1 -
 data/Leipzig/E4F6-restQuarterZ.xml            |   1 -
 data/Leipzig/E500-repeat1Bar.xml              |   1 -
 data/Leipzig/E501-repeat2Bars.xml             |   1 -
 data/Leipzig/E502-repeat4Bars.xml             |   1 -
 data/Leipzig/E503-repeatBarUpperDot.xml       |   1 -
 data/Leipzig/E504-repeatBarSlash.xml          |   1 -
 data/Leipzig/E505-repeatBarLowerDot.xml       |   1 -
 data/Leipzig/E510-ottava.xml                  |   1 -
 data/Leipzig/E511-ottavaAlta.xml              |   1 -
 data/Leipzig/E512-ottavaBassa.xml             |   1 -
 data/Leipzig/E513-ottavaBassaBa.xml           |   1 -
 data/Leipzig/E514-quindicesima.xml            |   1 -
 data/Leipzig/E515-quindicesimaAlta.xml        |   1 -
 data/Leipzig/E516-quindicesimaBassa.xml       |   1 -
 data/Leipzig/E517-ventiduesima.xml            |   1 -
 data/Leipzig/E518-ventiduesimaAlta.xml        |   1 -
 data/Leipzig/E519-ventiduesimaBassa.xml       |   1 -
 data/Leipzig/E51A-octaveParensLeft.xml        |   1 -
 data/Leipzig/E51B-octaveParensRight.xml       |   1 -
 data/Leipzig/E51C-ottavaBassaVb.xml           |   1 -
 data/Leipzig/E51D-quindicesimaBassaMb.xml     |   1 -
 data/Leipzig/E51E-ventiduesimaBassaMb.xml     |   1 -
 data/Leipzig/E520-dynamicPiano.xml            |   1 -
 data/Leipzig/E521-dynamicMezzo.xml            |   1 -
 data/Leipzig/E522-dynamicForte.xml            |   1 -
 data/Leipzig/E523-dynamicRinforzando.xml      |   1 -
 data/Leipzig/E524-dynamicSforzando.xml        |   1 -
 data/Leipzig/E525-dynamicZ.xml                |   1 -
 data/Leipzig/E526-dynamicNiente.xml           |   1 -
 data/Leipzig/E527-dynamicPPPPPP.xml           |   1 -
 data/Leipzig/E528-dynamicPPPPP.xml            |   1 -
 data/Leipzig/E529-dynamicPPPP.xml             |   1 -
 data/Leipzig/E52A-dynamicPPP.xml              |   1 -
 data/Leipzig/E52B-dynamicPP.xml               |   1 -
 data/Leipzig/E52C-dynamicMP.xml               |   1 -
 data/Leipzig/E52D-dynamicMF.xml               |   1 -
 data/Leipzig/E52E-dynamicPF.xml               |   1 -
 data/Leipzig/E52F-dynamicFF.xml               |   1 -
 data/Leipzig/E530-dynamicFFF.xml              |   1 -
 data/Leipzig/E531-dynamicFFFF.xml             |   1 -
 data/Leipzig/E532-dynamicFFFFF.xml            |   1 -
 data/Leipzig/E533-dynamicFFFFFF.xml           |   1 -
 data/Leipzig/E534-dynamicFortePiano.xml       |   1 -
 data/Leipzig/E535-dynamicForzando.xml         |   1 -
 data/Leipzig/E536-dynamicSforzando1.xml       |   1 -
 data/Leipzig/E537-dynamicSforzandoPiano.xml   |   1 -
 .../E538-dynamicSforzandoPianissimo.xml       |   1 -
 data/Leipzig/E539-dynamicSforzato.xml         |   1 -
 data/Leipzig/E53A-dynamicSforzatoPiano.xml    |   1 -
 data/Leipzig/E53B-dynamicSforzatoFF.xml       |   1 -
 data/Leipzig/E53C-dynamicRinforzando1.xml     |   1 -
 data/Leipzig/E53D-dynamicRinforzando2.xml     |   1 -
 data/Leipzig/E566-ornamentTrill.xml           |   1 -
 data/Leipzig/E567-ornamentTurn.xml            |   1 -
 data/Leipzig/E568-ornamentTurnInverted.xml    |   1 -
 data/Leipzig/E569-ornamentTurnSlash.xml       |   1 -
 data/Leipzig/E56A-ornamentTurnUp.xml          |   1 -
 data/Leipzig/E56B-ornamentTurnUpS.xml         |   1 -
 data/Leipzig/E56C-ornamentShortTrill.xml      |   1 -
 data/Leipzig/E56D-ornamentMordent.xml         |   1 -
 data/Leipzig/E56E-ornamentTremblement.xml     |   1 -
 data/Leipzig/E56F-ornamentHaydn.xml           |   1 -
 data/Leipzig/E583-ornamentVerticalLine.xml    |   1 -
 data/Leipzig/E587-ornamentSchleifer.xml       |   1 -
 .../E59D-ornamentZigZagLineNoRightEnd.xml     |   1 -
 .../E59E-ornamentZigZagLineWithRightEnd.xml   |   1 -
 data/Leipzig/E5B0-ornamentPrecompSlide.xml    |   1 -
 .../E5B1-ornamentPrecompDescendingSlide.xml   |   1 -
 .../E5B2-ornamentPrecompAppoggTrill.xml       |   1 -
 .../E5B3-ornamentPrecompAppoggTrillSuffix.xml |   1 -
 ...5B4-ornamentPrecompTurnTrillDAnglebert.xml |   1 -
 ...B5-ornamentPrecompSlideTrillDAnglebert.xml |   1 -
 .../E5B6-ornamentPrecompSlideTrillMarpurg.xml |   1 -
 .../E5B7-ornamentPrecompTurnTrillBach.xml     |   1 -
 .../E5B8-ornamentPrecompSlideTrillBach.xml    |   1 -
 .../E5B9-ornamentPrecompSlideTrillMuffat.xml  |   1 -
 ...-ornamentPrecompSlideTrillSuffixMuffat.xml |   1 -
 ...5BB-ornamentPrecompTrillSuffixDandrieu.xml |   1 -
 .../E5BC-ornamentPrecompPortDeVoixMordent.xml |   1 -
 .../E5BD-ornamentPrecompTrillWithMordent.xml  |   1 -
 data/Leipzig/E5BE-ornamentPrecompCadence.xml  |   1 -
 .../E5BF-ornamentPrecompCadenceWithTurn.xml   |   1 -
 ...rnamentPrecompDoubleCadenceLowerPrefix.xml |   1 -
 ...E5C1-ornamentPrecompCadenceUpperPrefix.xml |   1 -
 ...-ornamentPrecompCadenceUpperPrefixTurn.xml |   1 -
 ...rnamentPrecompDoubleCadenceUpperPrefix.xml |   1 -
 ...entPrecompDoubleCadenceUpperPrefixTurn.xml |   1 -
 .../E5C5-ornamentPrecompMordentRelease.xml    |   1 -
 ...E5C6-ornamentPrecompMordentUpperPrefix.xml |   1 -
 ...amentPrecompInvertedMordentUpperPrefix.xml |   1 -
 .../E5C8-ornamentPrecompTrillLowerSuffix.xml  |   1 -
 data/Leipzig/E5E5-brassMuteClosed.xml         |   1 -
 data/Leipzig/E5E6-brassMuteHalfClosed.xml     |   1 -
 data/Leipzig/E5E7-brassMuteOpen.xml           |   1 -
 data/Leipzig/E610-stringsDownBow.xml          |   1 -
 data/Leipzig/E611-stringsDownBowTurned.xml    |   1 -
 data/Leipzig/E612-stringsUpBow.xml            |   1 -
 data/Leipzig/E613-stringsUpBowTurned.xml      |   1 -
 data/Leipzig/E614-stringsHarmonic.xml         |   1 -
 .../E630-pluckedSnapPizzicatoBelow.xml        |   1 -
 .../E631-pluckedSnapPizzicatoAbove.xml        |   1 -
 data/Leipzig/E632-pluckedBuzzPizzicato.xml    |   1 -
 .../Leipzig/E633-pluckedLeftHandPizzicato.xml |   1 -
 data/Leipzig/E638-pluckedDamp.xml             |   1 -
 data/Leipzig/E645-vocalSprechgesang.xml       |   1 -
 data/Leipzig/E650-keyboardPedalPed.xml        |   1 -
 data/Leipzig/E651-keyboardPedalP.xml          |   1 -
 data/Leipzig/E655-keyboardPedalUp.xml         |   1 -
 data/Leipzig/E659-keyboardPedalSost.xml       |   1 -
 data/Leipzig/E65A-keyboardPedalS.xml          |   1 -
 data/Leipzig/E880-tuplet0.xml                 |   1 -
 data/Leipzig/E881-tuplet1.xml                 |   1 -
 data/Leipzig/E882-tuplet2.xml                 |   1 -
 data/Leipzig/E883-tuplet3.xml                 |   1 -
 data/Leipzig/E884-tuplet4.xml                 |   1 -
 data/Leipzig/E885-tuplet5.xml                 |   1 -
 data/Leipzig/E886-tuplet6.xml                 |   1 -
 data/Leipzig/E887-tuplet7.xml                 |   1 -
 data/Leipzig/E888-tuplet8.xml                 |   1 -
 data/Leipzig/E889-tuplet9.xml                 |   1 -
 data/Leipzig/E88A-tupletColon.xml             |   1 -
 data/Leipzig/E901-mensuralGclefPetrucci.xml   |   1 -
 data/Leipzig/E902-chantFclef.xml              |   1 -
 data/Leipzig/E904-mensuralFclefPetrucci.xml   |   1 -
 data/Leipzig/E906-chantCclef.xml              |   1 -
 .../E907-mensuralCclefPetrucciPosLowest.xml   |   1 -
 .../E908-mensuralCclefPetrucciPosLow.xml      |   1 -
 .../E909-mensuralCclefPetrucciPosMiddle.xml   |   1 -
 .../E90A-mensuralCclefPetrucciPosHigh.xml     |   1 -
 .../E90B-mensuralCclefPetrucciPosHighest.xml  |   1 -
 data/Leipzig/E910-mensuralProlation1.xml      |   1 -
 data/Leipzig/E911-mensuralProlation2.xml      |   1 -
 data/Leipzig/E912-mensuralProlation3.xml      |   1 -
 data/Leipzig/E913-mensuralProlation4.xml      |   1 -
 data/Leipzig/E914-mensuralProlation5.xml      |   1 -
 data/Leipzig/E915-mensuralProlation6.xml      |   1 -
 data/Leipzig/E916-mensuralProlation7.xml      |   1 -
 data/Leipzig/E917-mensuralProlation8.xml      |   1 -
 data/Leipzig/E918-mensuralProlation9.xml      |   1 -
 data/Leipzig/E919-mensuralProlation10.xml     |   1 -
 data/Leipzig/E91A-mensuralProlation11.xml     |   1 -
 ...E91B-mensuralProportionTempusPerfectum.xml |   1 -
 ...E91C-mensuralProportionProportioDupla1.xml |   1 -
 ...E91D-mensuralProportionProportioDupla2.xml |   1 -
 ...E91E-mensuralProportionProportioTripla.xml |   1 -
 ...F-mensuralProportionProportioQuadrupla.xml |   1 -
 .../E920-mensuralProlationCombiningDot.xml    |   1 -
 ...E921-mensuralProlationCombiningTwoDots.xml |   1 -
 ...22-mensuralProlationCombiningThreeDots.xml |   1 -
 ...mensuralProlationCombiningThreeDotsTri.xml |   1 -
 ...E924-mensuralProlationCombiningDotVoid.xml |   1 -
 .../E925-mensuralProlationCombiningStroke.xml |   1 -
 .../E938-mensuralNoteheadSemibrevisBlack.xml  |   1 -
 .../E939-mensuralNoteheadSemibrevisVoid.xml   |   1 -
 .../E93C-mensuralNoteheadMinimaWhite.xml      |   1 -
 .../E93D-mensuralNoteheadSemiminimaWhite.xml  |   1 -
 data/Leipzig/E93E-mensuralCombStemUp.xml      |   1 -
 data/Leipzig/E93F-mensuralCombStemDown.xml    |   1 -
 .../E949-mensuralCombStemUpFlagSemiminima.xml |   1 -
 ...94A-mensuralCombStemDownFlagSemiminima.xml |   1 -
 .../E94B-mensuralCombStemUpFlagFusa.xml       |   1 -
 .../E94C-mensuralCombStemDownFlagFusa.xml     |   1 -
 data/Leipzig/E9E0-medRenFlatSoftB.xml         |   1 -
 data/Leipzig/E9E1-medRenFlatHardB.xml         |   1 -
 data/Leipzig/E9E2-medRenNatural.xml           |   1 -
 data/Leipzig/E9E3-medRenSharpCroix.xml        |   1 -
 data/Leipzig/E9F0-mensuralRestMaxima.xml      |   1 -
 .../E9F1-mensuralRestLongaPerfecta.xml        |   1 -
 .../E9F2-mensuralRestLongaImperfecta.xml      |   1 -
 data/Leipzig/E9F3-mensuralRestBrevis.xml      |   1 -
 data/Leipzig/E9F4-mensuralRestSemibrevis.xml  |   1 -
 data/Leipzig/E9F5-mensuralRestMinima.xml      |   1 -
 data/Leipzig/E9F6-mensuralRestSemiminima.xml  |   1 -
 data/Leipzig/E9F7-mensuralRestFusa.xml        |   1 -
 data/Leipzig/E9F8-mensuralRestSemifusa.xml    |   1 -
 data/Leipzig/EA02-mensuralCustosUp.xml        |   1 -
 .../EA06-chantCustosStemUpPosMiddle.xml       |   1 -
 data/Leipzig/EAA4-wiggleTrill.xml             |   1 -
 data/Leipzig/EAA9-wiggleArpeggiatoUp.xml      |   1 -
 data/Leipzig/EAAA-wiggleArpeggiatoDown.xml    |   1 -
 data/Leipzig/EAAD-wiggleArpeggiatoUpArrow.xml |   1 -
 .../EAAE-wiggleArpeggiatoDownArrow.xml        |   1 -
 data/Leipzig/EAAF-wiggleGlissando.xml         |   1 -
 data/Leipzig/EBA7-luteDurationWhole.xml       |   1 -
 data/Leipzig/EBA8-luteDurationHalf.xml        |   1 -
 data/Leipzig/EBA9-luteDurationQuarter.xml     |   1 -
 data/Leipzig/EBAA-luteDuration8th.xml         |   1 -
 data/Leipzig/EBAB-luteDuration16th.xml        |   1 -
 data/Leipzig/EBAC-luteDuration32nd.xml        |   1 -
 data/Leipzig/EBC0-luteFrenchFretA.xml         |   1 -
 data/Leipzig/EBC1-luteFrenchFretB.xml         |   1 -
 data/Leipzig/EBC2-luteFrenchFretC.xml         |   1 -
 data/Leipzig/EBC3-luteFrenchFretD.xml         |   1 -
 data/Leipzig/EBC4-luteFrenchFretE.xml         |   1 -
 data/Leipzig/EBC5-luteFrenchFretF.xml         |   1 -
 data/Leipzig/EBC6-luteFrenchFretG.xml         |   1 -
 data/Leipzig/EBC7-luteFrenchFretH.xml         |   1 -
 data/Leipzig/EBC8-luteFrenchFretI.xml         |   1 -
 data/Leipzig/EBC9-luteFrenchFretK.xml         |   1 -
 data/Leipzig/EBCA-luteFrenchFretL.xml         |   1 -
 data/Leipzig/EBCB-luteFrenchFretM.xml         |   1 -
 data/Leipzig/EBCC-luteFrenchFretN.xml         |   1 -
 data/Leipzig/EBE0-luteItalianFret0.xml        |   1 -
 data/Leipzig/EBE1-luteItalianFret1.xml        |   1 -
 data/Leipzig/EBE2-luteItalianFret2.xml        |   1 -
 data/Leipzig/EBE3-luteItalianFret3.xml        |   1 -
 data/Leipzig/EBE4-luteItalianFret4.xml        |   1 -
 data/Leipzig/EBE5-luteItalianFret5.xml        |   1 -
 data/Leipzig/EBE6-luteItalianFret6.xml        |   1 -
 data/Leipzig/EBE7-luteItalianFret7.xml        |   1 -
 data/Leipzig/EBE8-luteItalianFret8.xml        |   1 -
 data/Leipzig/EBE9-luteItalianFret9.xml        |   1 -
 data/Leipzig/ED40-articSoftAccentAbove.xml    |   1 -
 data/Leipzig/ED41-articSoftAccentBelow.xml    |   1 -
 data/Leland.xml                               | 500 -------------
 data/Leland/E000-brace.xml                    |   1 -
 data/Leland/E003-bracketTop.xml               |   1 -
 data/Leland/E004-bracketBottom.xml            |   1 -
 data/Leland/E043-repeatDots.xml               |   1 -
 data/Leland/E044-repeatDot.xml                |   1 -
 data/Leland/E047-segno.xml                    |   1 -
 data/Leland/E048-coda.xml                     |   1 -
 data/Leland/E049-codaSquare.xml               |   1 -
 data/Leland/E04B-segnoSerpent2.xml            |   1 -
 data/Leland/E050-gClef.xml                    |   1 -
 data/Leland/E051-gClef15mb.xml                |   1 -
 data/Leland/E052-gClef8vb.xml                 |   1 -
 data/Leland/E053-gClef8va.xml                 |   1 -
 data/Leland/E054-gClef15ma.xml                |   1 -
 data/Leland/E055-gClef8vbOld.xml              |   1 -
 data/Leland/E05C-cClef.xml                    |   1 -
 data/Leland/E05D-cClef8vb.xml                 |   1 -
 data/Leland/E062-fClef.xml                    |   1 -
 data/Leland/E063-fClef15mb.xml                |   1 -
 data/Leland/E064-fClef8vb.xml                 |   1 -
 data/Leland/E065-fClef8va.xml                 |   1 -
 data/Leland/E066-fClef15ma.xml                |   1 -
 data/Leland/E069-unpitchedPercussionClef1.xml |   1 -
 data/Leland/E06A-unpitchedPercussionClef2.xml |   1 -
 data/Leland/E080-timeSig0.xml                 |   1 -
 data/Leland/E081-timeSig1.xml                 |   1 -
 data/Leland/E082-timeSig2.xml                 |   1 -
 data/Leland/E083-timeSig3.xml                 |   1 -
 data/Leland/E084-timeSig4.xml                 |   1 -
 data/Leland/E085-timeSig5.xml                 |   1 -
 data/Leland/E086-timeSig6.xml                 |   1 -
 data/Leland/E087-timeSig7.xml                 |   1 -
 data/Leland/E088-timeSig8.xml                 |   1 -
 data/Leland/E089-timeSig9.xml                 |   1 -
 data/Leland/E08A-timeSigCommon.xml            |   1 -
 data/Leland/E08B-timeSigCutCommon.xml         |   1 -
 data/Leland/E08C-timeSigPlus.xml              |   1 -
 data/Leland/E0A0-noteheadDoubleWhole.xml      |   1 -
 .../Leland/E0A1-noteheadDoubleWholeSquare.xml |   1 -
 data/Leland/E0A2-noteheadWhole.xml            |   1 -
 data/Leland/E0A3-noteheadHalf.xml             |   1 -
 data/Leland/E0A4-noteheadBlack.xml            |   1 -
 data/Leland/E0A5-noteheadNull.xml             |   1 -
 data/Leland/E0A9-noteheadXBlack.xml           |   1 -
 data/Leland/E0AF-noteheadPlusBlack.xml        |   1 -
 data/Leland/E0D9-noteheadDiamondHalf.xml      |   1 -
 data/Leland/E0DB-noteheadDiamondBlack.xml     |   1 -
 data/Leland/E0F5-noteheadParenthesisLeft.xml  |   1 -
 data/Leland/E0F6-noteheadParenthesisRight.xml |   1 -
 data/Leland/E220-tremolo1.xml                 |   1 -
 data/Leland/E221-tremolo2.xml                 |   1 -
 data/Leland/E222-tremolo3.xml                 |   1 -
 data/Leland/E223-tremolo4.xml                 |   1 -
 data/Leland/E224-tremolo5.xml                 |   1 -
 data/Leland/E22A-buzzRoll.xml                 |   1 -
 data/Leland/E240-flag8thUp.xml                |   1 -
 data/Leland/E241-flag8thDown.xml              |   1 -
 data/Leland/E242-flag16thUp.xml               |   1 -
 data/Leland/E243-flag16thDown.xml             |   1 -
 data/Leland/E244-flag32ndUp.xml               |   1 -
 data/Leland/E245-flag32ndDown.xml             |   1 -
 data/Leland/E246-flag64thUp.xml               |   1 -
 data/Leland/E247-flag64thDown.xml             |   1 -
 data/Leland/E248-flag128thUp.xml              |   1 -
 data/Leland/E249-flag128thDown.xml            |   1 -
 data/Leland/E24A-flag256thUp.xml              |   1 -
 data/Leland/E24B-flag256thDown.xml            |   1 -
 data/Leland/E24C-flag512thUp.xml              |   1 -
 data/Leland/E24D-flag512thDown.xml            |   1 -
 data/Leland/E24E-flag1024thUp.xml             |   1 -
 data/Leland/E24F-flag1024thDown.xml           |   1 -
 data/Leland/E260-accidentalFlat.xml           |   1 -
 data/Leland/E261-accidentalNatural.xml        |   1 -
 data/Leland/E262-accidentalSharp.xml          |   1 -
 data/Leland/E263-accidentalDoubleSharp.xml    |   1 -
 data/Leland/E264-accidentalDoubleFlat.xml     |   1 -
 data/Leland/E265-accidentalTripleSharp.xml    |   1 -
 data/Leland/E266-accidentalTripleFlat.xml     |   1 -
 data/Leland/E267-accidentalNaturalFlat.xml    |   1 -
 data/Leland/E268-accidentalNaturalSharp.xml   |   1 -
 data/Leland/E269-accidentalSharpSharp.xml     |   1 -
 data/Leland/E26A-accidentalParensLeft.xml     |   1 -
 data/Leland/E26B-accidentalParensRight.xml    |   1 -
 data/Leland/E26C-accidentalBracketLeft.xml    |   1 -
 data/Leland/E26D-accidentalBracketRight.xml   |   1 -
 .../E270-accidentalQuarterToneFlatArrowUp.xml |   1 -
 ...cidentalThreeQuarterTonesFlatArrowDown.xml |   1 -
 ...cidentalQuarterToneSharpNaturalArrowUp.xml |   1 -
 ...identalQuarterToneFlatNaturalArrowDown.xml |   1 -
 ...ccidentalThreeQuarterTonesSharpArrowUp.xml |   1 -
 ...75-accidentalQuarterToneSharpArrowDown.xml |   1 -
 .../E280-accidentalQuarterToneFlatStein.xml   |   1 -
 ...identalThreeQuarterTonesFlatZimmermann.xml |   1 -
 .../E282-accidentalQuarterToneSharpStein.xml  |   1 -
 ...-accidentalThreeQuarterTonesSharpStein.xml |   1 -
 .../E440-accidentalBuyukMucennebFlat.xml      |   1 -
 data/Leland/E442-accidentalBakiyeFlat.xml     |   1 -
 .../E446-accidentalKucukMucennebSharp.xml     |   1 -
 .../E447-accidentalBuyukMucennebSharp.xml     |   1 -
 data/Leland/E4A0-articAccentAbove.xml         |   1 -
 data/Leland/E4A1-articAccentBelow.xml         |   1 -
 data/Leland/E4A2-articStaccatoAbove.xml       |   1 -
 data/Leland/E4A3-articStaccatoBelow.xml       |   1 -
 data/Leland/E4A4-articTenutoAbove.xml         |   1 -
 data/Leland/E4A5-articTenutoBelow.xml         |   1 -
 data/Leland/E4A6-articStaccatissimoAbove.xml  |   1 -
 data/Leland/E4A7-articStaccatissimoBelow.xml  |   1 -
 .../E4A8-articStaccatissimoWedgeAbove.xml     |   1 -
 .../E4A9-articStaccatissimoWedgeBelow.xml     |   1 -
 data/Leland/E4AC-articMarcatoAbove.xml        |   1 -
 data/Leland/E4AD-articMarcatoBelow.xml        |   1 -
 .../Leland/E4AE-articMarcatoStaccatoAbove.xml |   1 -
 .../Leland/E4AF-articMarcatoStaccatoBelow.xml |   1 -
 data/Leland/E4B0-articAccentStaccatoAbove.xml |   1 -
 data/Leland/E4B1-articAccentStaccatoBelow.xml |   1 -
 data/Leland/E4B2-articTenutoStaccatoAbove.xml |   1 -
 data/Leland/E4B3-articTenutoStaccatoBelow.xml |   1 -
 data/Leland/E4B4-articTenutoAccentAbove.xml   |   1 -
 data/Leland/E4B5-articTenutoAccentBelow.xml   |   1 -
 data/Leland/E4B6-articStressAbove.xml         |   1 -
 data/Leland/E4B7-articStressBelow.xml         |   1 -
 data/Leland/E4B8-articUnstressAbove.xml       |   1 -
 data/Leland/E4B9-articUnstressBelow.xml       |   1 -
 data/Leland/E4BA-articLaissezVibrerAbove.xml  |   1 -
 data/Leland/E4BB-articLaissezVibrerBelow.xml  |   1 -
 data/Leland/E4BC-articMarcatoTenutoAbove.xml  |   1 -
 data/Leland/E4BD-articMarcatoTenutoBelow.xml  |   1 -
 data/Leland/E4C0-fermataAbove.xml             |   1 -
 data/Leland/E4C1-fermataBelow.xml             |   1 -
 data/Leland/E4C4-fermataShortAbove.xml        |   1 -
 data/Leland/E4C5-fermataShortBelow.xml        |   1 -
 data/Leland/E4C6-fermataLongAbove.xml         |   1 -
 data/Leland/E4C7-fermataLongBelow.xml         |   1 -
 data/Leland/E4C8-fermataVeryLongAbove.xml     |   1 -
 data/Leland/E4C9-fermataVeryLongBelow.xml     |   1 -
 data/Leland/E4CE-breathMarkComma.xml          |   1 -
 data/Leland/E4E0-restMaxima.xml               |   1 -
 data/Leland/E4E1-restLonga.xml                |   1 -
 data/Leland/E4E2-restDoubleWhole.xml          |   1 -
 data/Leland/E4E3-restWhole.xml                |   1 -
 data/Leland/E4E4-restHalf.xml                 |   1 -
 data/Leland/E4E5-restQuarter.xml              |   1 -
 data/Leland/E4E6-rest8th.xml                  |   1 -
 data/Leland/E4E7-rest16th.xml                 |   1 -
 data/Leland/E4E8-rest32nd.xml                 |   1 -
 data/Leland/E4E9-rest64th.xml                 |   1 -
 data/Leland/E4EA-rest128th.xml                |   1 -
 data/Leland/E4EB-rest256th.xml                |   1 -
 data/Leland/E4EC-rest512th.xml                |   1 -
 data/Leland/E4ED-rest1024th.xml               |   1 -
 data/Leland/E4F2-restQuarterOld.xml           |   1 -
 data/Leland/E4F6-restQuarterZ.xml             |   1 -
 data/Leland/E500-repeat1Bar.xml               |   1 -
 data/Leland/E501-repeat2Bars.xml              |   1 -
 data/Leland/E502-repeat4Bars.xml              |   1 -
 data/Leland/E503-repeatBarUpperDot.xml        |   1 -
 data/Leland/E504-repeatBarSlash.xml           |   1 -
 data/Leland/E505-repeatBarLowerDot.xml        |   1 -
 data/Leland/E510-ottava.xml                   |   1 -
 data/Leland/E511-ottavaAlta.xml               |   1 -
 data/Leland/E512-ottavaBassa.xml              |   1 -
 data/Leland/E513-ottavaBassaBa.xml            |   1 -
 data/Leland/E514-quindicesima.xml             |   1 -
 data/Leland/E515-quindicesimaAlta.xml         |   1 -
 data/Leland/E516-quindicesimaBassa.xml        |   1 -
 data/Leland/E517-ventiduesima.xml             |   1 -
 data/Leland/E518-ventiduesimaAlta.xml         |   1 -
 data/Leland/E519-ventiduesimaBassa.xml        |   1 -
 data/Leland/E51A-octaveParensLeft.xml         |   1 -
 data/Leland/E51B-octaveParensRight.xml        |   1 -
 data/Leland/E51C-ottavaBassaVb.xml            |   1 -
 data/Leland/E51D-quindicesimaBassaMb.xml      |   1 -
 data/Leland/E51E-ventiduesimaBassaMb.xml      |   1 -
 data/Leland/E520-dynamicPiano.xml             |   1 -
 data/Leland/E521-dynamicMezzo.xml             |   1 -
 data/Leland/E522-dynamicForte.xml             |   1 -
 data/Leland/E523-dynamicRinforzando.xml       |   1 -
 data/Leland/E524-dynamicSforzando.xml         |   1 -
 data/Leland/E525-dynamicZ.xml                 |   1 -
 data/Leland/E526-dynamicNiente.xml            |   1 -
 data/Leland/E527-dynamicPPPPPP.xml            |   1 -
 data/Leland/E528-dynamicPPPPP.xml             |   1 -
 data/Leland/E529-dynamicPPPP.xml              |   1 -
 data/Leland/E52A-dynamicPPP.xml               |   1 -
 data/Leland/E52B-dynamicPP.xml                |   1 -
 data/Leland/E52C-dynamicMP.xml                |   1 -
 data/Leland/E52D-dynamicMF.xml                |   1 -
 data/Leland/E52E-dynamicPF.xml                |   1 -
 data/Leland/E52F-dynamicFF.xml                |   1 -
 data/Leland/E530-dynamicFFF.xml               |   1 -
 data/Leland/E531-dynamicFFFF.xml              |   1 -
 data/Leland/E532-dynamicFFFFF.xml             |   1 -
 data/Leland/E533-dynamicFFFFFF.xml            |   1 -
 data/Leland/E534-dynamicFortePiano.xml        |   1 -
 data/Leland/E535-dynamicForzando.xml          |   1 -
 data/Leland/E536-dynamicSforzando1.xml        |   1 -
 data/Leland/E537-dynamicSforzandoPiano.xml    |   1 -
 .../E538-dynamicSforzandoPianissimo.xml       |   1 -
 data/Leland/E539-dynamicSforzato.xml          |   1 -
 data/Leland/E53A-dynamicSforzatoPiano.xml     |   1 -
 data/Leland/E53B-dynamicSforzatoFF.xml        |   1 -
 data/Leland/E53C-dynamicRinforzando1.xml      |   1 -
 data/Leland/E53D-dynamicRinforzando2.xml      |   1 -
 data/Leland/E566-ornamentTrill.xml            |   1 -
 data/Leland/E567-ornamentTurn.xml             |   1 -
 data/Leland/E568-ornamentTurnInverted.xml     |   1 -
 data/Leland/E569-ornamentTurnSlash.xml        |   1 -
 data/Leland/E56A-ornamentTurnUp.xml           |   1 -
 data/Leland/E56B-ornamentTurnUpS.xml          |   1 -
 data/Leland/E56C-ornamentShortTrill.xml       |   1 -
 data/Leland/E56D-ornamentMordent.xml          |   1 -
 data/Leland/E56E-ornamentTremblement.xml      |   1 -
 data/Leland/E56F-ornamentHaydn.xml            |   1 -
 data/Leland/E583-ornamentVerticalLine.xml     |   1 -
 data/Leland/E587-ornamentSchleifer.xml        |   1 -
 .../E59D-ornamentZigZagLineNoRightEnd.xml     |   1 -
 .../E59E-ornamentZigZagLineWithRightEnd.xml   |   1 -
 .../E5B2-ornamentPrecompAppoggTrill.xml       |   1 -
 ...B5-ornamentPrecompSlideTrillDAnglebert.xml |   1 -
 .../E5B8-ornamentPrecompSlideTrillBach.xml    |   1 -
 ...5BB-ornamentPrecompTrillSuffixDandrieu.xml |   1 -
 .../E5BC-ornamentPrecompPortDeVoixMordent.xml |   1 -
 .../E5BD-ornamentPrecompTrillWithMordent.xml  |   1 -
 data/Leland/E5BE-ornamentPrecompCadence.xml   |   1 -
 ...rnamentPrecompDoubleCadenceLowerPrefix.xml |   1 -
 ...rnamentPrecompDoubleCadenceUpperPrefix.xml |   1 -
 ...E5C6-ornamentPrecompMordentUpperPrefix.xml |   1 -
 ...amentPrecompInvertedMordentUpperPrefix.xml |   1 -
 .../E5C8-ornamentPrecompTrillLowerSuffix.xml  |   1 -
 data/Leland/E5E5-brassMuteClosed.xml          |   1 -
 data/Leland/E5E6-brassMuteHalfClosed.xml      |   1 -
 data/Leland/E5E7-brassMuteOpen.xml            |   1 -
 data/Leland/E610-stringsDownBow.xml           |   1 -
 data/Leland/E611-stringsDownBowTurned.xml     |   1 -
 data/Leland/E612-stringsUpBow.xml             |   1 -
 data/Leland/E613-stringsUpBowTurned.xml       |   1 -
 data/Leland/E614-stringsHarmonic.xml          |   1 -
 .../Leland/E630-pluckedSnapPizzicatoBelow.xml |   1 -
 .../Leland/E631-pluckedSnapPizzicatoAbove.xml |   1 -
 data/Leland/E632-pluckedBuzzPizzicato.xml     |   1 -
 data/Leland/E650-keyboardPedalPed.xml         |   1 -
 data/Leland/E651-keyboardPedalP.xml           |   1 -
 data/Leland/E655-keyboardPedalUp.xml          |   1 -
 data/Leland/E880-tuplet0.xml                  |   1 -
 data/Leland/E881-tuplet1.xml                  |   1 -
 data/Leland/E882-tuplet2.xml                  |   1 -
 data/Leland/E883-tuplet3.xml                  |   1 -
 data/Leland/E884-tuplet4.xml                  |   1 -
 data/Leland/E885-tuplet5.xml                  |   1 -
 data/Leland/E886-tuplet6.xml                  |   1 -
 data/Leland/E887-tuplet7.xml                  |   1 -
 data/Leland/E888-tuplet8.xml                  |   1 -
 data/Leland/E889-tuplet9.xml                  |   1 -
 data/Leland/E88A-tupletColon.xml              |   1 -
 .../E93C-mensuralNoteheadMinimaWhite.xml      |   1 -
 .../E93D-mensuralNoteheadSemiminimaWhite.xml  |   1 -
 data/Leland/EAA4-wiggleTrill.xml              |   1 -
 data/Leland/EAA9-wiggleArpeggiatoUp.xml       |   1 -
 data/Leland/EAAA-wiggleArpeggiatoDown.xml     |   1 -
 data/Leland/EAAD-wiggleArpeggiatoUpArrow.xml  |   1 -
 .../Leland/EAAE-wiggleArpeggiatoDownArrow.xml |   1 -
 data/Petaluma.xml                             | 599 ---------------
 data/Petaluma/E000-brace.xml                  |   1 -
 data/Petaluma/E003-bracketTop.xml             |   1 -
 data/Petaluma/E004-bracketBottom.xml          |   1 -
 data/Petaluma/E043-repeatDots.xml             |   1 -
 data/Petaluma/E044-repeatDot.xml              |   1 -
 data/Petaluma/E045-dalSegno.xml               |   1 -
 data/Petaluma/E046-daCapo.xml                 |   1 -
 data/Petaluma/E047-segno.xml                  |   1 -
 data/Petaluma/E048-coda.xml                   |   1 -
 data/Petaluma/E049-codaSquare.xml             |   1 -
 data/Petaluma/E04B-segnoSerpent2.xml          |   1 -
 data/Petaluma/E050-gClef.xml                  |   1 -
 data/Petaluma/E051-gClef15mb.xml              |   1 -
 data/Petaluma/E052-gClef8vb.xml               |   1 -
 data/Petaluma/E053-gClef8va.xml               |   1 -
 data/Petaluma/E054-gClef15ma.xml              |   1 -
 data/Petaluma/E055-gClef8vbOld.xml            |   1 -
 data/Petaluma/E056-gClef8vbCClef.xml          |   1 -
 data/Petaluma/E05C-cClef.xml                  |   1 -
 data/Petaluma/E05D-cClef8vb.xml               |   1 -
 data/Petaluma/E062-fClef.xml                  |   1 -
 data/Petaluma/E063-fClef15mb.xml              |   1 -
 data/Petaluma/E064-fClef8vb.xml               |   1 -
 data/Petaluma/E065-fClef8va.xml               |   1 -
 data/Petaluma/E066-fClef15ma.xml              |   1 -
 .../E069-unpitchedPercussionClef1.xml         |   1 -
 .../E06A-unpitchedPercussionClef2.xml         |   1 -
 data/Petaluma/E073-gClefReversed.xml          |   1 -
 data/Petaluma/E074-gClefTurned.xml            |   1 -
 data/Petaluma/E075-cClefReversed.xml          |   1 -
 data/Petaluma/E076-fClefReversed.xml          |   1 -
 data/Petaluma/E077-fClefTurned.xml            |   1 -
 data/Petaluma/E080-timeSig0.xml               |   1 -
 data/Petaluma/E081-timeSig1.xml               |   1 -
 data/Petaluma/E082-timeSig2.xml               |   1 -
 data/Petaluma/E083-timeSig3.xml               |   1 -
 data/Petaluma/E084-timeSig4.xml               |   1 -
 data/Petaluma/E085-timeSig5.xml               |   1 -
 data/Petaluma/E086-timeSig6.xml               |   1 -
 data/Petaluma/E087-timeSig7.xml               |   1 -
 data/Petaluma/E088-timeSig8.xml               |   1 -
 data/Petaluma/E089-timeSig9.xml               |   1 -
 data/Petaluma/E08A-timeSigCommon.xml          |   1 -
 data/Petaluma/E08B-timeSigCutCommon.xml       |   1 -
 data/Petaluma/E08C-timeSigPlus.xml            |   1 -
 data/Petaluma/E08D-timeSigPlusSmall.xml       |   1 -
 data/Petaluma/E08E-timeSigFractionalSlash.xml |   1 -
 data/Petaluma/E08F-timeSigEquals.xml          |   1 -
 data/Petaluma/E090-timeSigMinus.xml           |   1 -
 data/Petaluma/E091-timeSigMultiply.xml        |   1 -
 data/Petaluma/E092-timeSigParensLeftSmall.xml |   1 -
 .../Petaluma/E093-timeSigParensRightSmall.xml |   1 -
 data/Petaluma/E094-timeSigParensLeft.xml      |   1 -
 data/Petaluma/E095-timeSigParensRight.xml     |   1 -
 data/Petaluma/E0A0-noteheadDoubleWhole.xml    |   1 -
 .../E0A1-noteheadDoubleWholeSquare.xml        |   1 -
 data/Petaluma/E0A2-noteheadWhole.xml          |   1 -
 data/Petaluma/E0A3-noteheadHalf.xml           |   1 -
 data/Petaluma/E0A4-noteheadBlack.xml          |   1 -
 data/Petaluma/E0A5-noteheadNull.xml           |   1 -
 data/Petaluma/E0A9-noteheadXBlack.xml         |   1 -
 data/Petaluma/E0AF-noteheadPlusBlack.xml      |   1 -
 data/Petaluma/E0B5-noteheadWholeWithX.xml     |   1 -
 data/Petaluma/E0B6-noteheadHalfWithX.xml      |   1 -
 data/Petaluma/E0B7-noteheadVoidWithX.xml      |   1 -
 data/Petaluma/E0D9-noteheadDiamondHalf.xml    |   1 -
 .../Petaluma/E0DA-noteheadDiamondHalfWide.xml |   1 -
 data/Petaluma/E0DB-noteheadDiamondBlack.xml   |   1 -
 .../E0DC-noteheadDiamondBlackWide.xml         |   1 -
 data/Petaluma/E0DD-noteheadDiamondWhite.xml   |   1 -
 .../E0DE-noteheadDiamondWhiteWide.xml         |   1 -
 .../Petaluma/E0F5-noteheadParenthesisLeft.xml |   1 -
 .../E0F6-noteheadParenthesisRight.xml         |   1 -
 data/Petaluma/E0FA-noteheadWholeFilled.xml    |   1 -
 .../E101-noteheadSlashHorizontalEnds.xml      |   1 -
 .../Petaluma/E102-noteheadSlashWhiteWhole.xml |   1 -
 data/Petaluma/E103-noteheadSlashWhiteHalf.xml |   1 -
 data/Petaluma/E220-tremolo1.xml               |   1 -
 data/Petaluma/E221-tremolo2.xml               |   1 -
 data/Petaluma/E222-tremolo3.xml               |   1 -
 data/Petaluma/E223-tremolo4.xml               |   1 -
 data/Petaluma/E224-tremolo5.xml               |   1 -
 data/Petaluma/E22A-buzzRoll.xml               |   1 -
 data/Petaluma/E240-flag8thUp.xml              |   1 -
 data/Petaluma/E241-flag8thDown.xml            |   1 -
 data/Petaluma/E242-flag16thUp.xml             |   1 -
 data/Petaluma/E243-flag16thDown.xml           |   1 -
 data/Petaluma/E244-flag32ndUp.xml             |   1 -
 data/Petaluma/E245-flag32ndDown.xml           |   1 -
 data/Petaluma/E246-flag64thUp.xml             |   1 -
 data/Petaluma/E247-flag64thDown.xml           |   1 -
 data/Petaluma/E248-flag128thUp.xml            |   1 -
 data/Petaluma/E249-flag128thDown.xml          |   1 -
 data/Petaluma/E24A-flag256thUp.xml            |   1 -
 data/Petaluma/E24B-flag256thDown.xml          |   1 -
 data/Petaluma/E24C-flag512thUp.xml            |   1 -
 data/Petaluma/E24D-flag512thDown.xml          |   1 -
 data/Petaluma/E24E-flag1024thUp.xml           |   1 -
 data/Petaluma/E24F-flag1024thDown.xml         |   1 -
 data/Petaluma/E260-accidentalFlat.xml         |   1 -
 data/Petaluma/E261-accidentalNatural.xml      |   1 -
 data/Petaluma/E262-accidentalSharp.xml        |   1 -
 data/Petaluma/E263-accidentalDoubleSharp.xml  |   1 -
 data/Petaluma/E264-accidentalDoubleFlat.xml   |   1 -
 data/Petaluma/E265-accidentalTripleSharp.xml  |   1 -
 data/Petaluma/E266-accidentalTripleFlat.xml   |   1 -
 data/Petaluma/E267-accidentalNaturalFlat.xml  |   1 -
 data/Petaluma/E268-accidentalNaturalSharp.xml |   1 -
 data/Petaluma/E269-accidentalSharpSharp.xml   |   1 -
 data/Petaluma/E26A-accidentalParensLeft.xml   |   1 -
 data/Petaluma/E26B-accidentalParensRight.xml  |   1 -
 data/Petaluma/E26C-accidentalBracketLeft.xml  |   1 -
 data/Petaluma/E26D-accidentalBracketRight.xml |   1 -
 .../E270-accidentalQuarterToneFlatArrowUp.xml |   1 -
 ...cidentalThreeQuarterTonesFlatArrowDown.xml |   1 -
 ...cidentalQuarterToneSharpNaturalArrowUp.xml |   1 -
 ...identalQuarterToneFlatNaturalArrowDown.xml |   1 -
 ...ccidentalThreeQuarterTonesSharpArrowUp.xml |   1 -
 ...75-accidentalQuarterToneSharpArrowDown.xml |   1 -
 .../E280-accidentalQuarterToneFlatStein.xml   |   1 -
 ...identalThreeQuarterTonesFlatZimmermann.xml |   1 -
 .../E282-accidentalQuarterToneSharpStein.xml  |   1 -
 ...-accidentalThreeQuarterTonesSharpStein.xml |   1 -
 .../E440-accidentalBuyukMucennebFlat.xml      |   1 -
 .../E441-accidentalKucukMucennebFlat.xml      |   1 -
 data/Petaluma/E442-accidentalBakiyeFlat.xml   |   1 -
 data/Petaluma/E443-accidentalKomaFlat.xml     |   1 -
 data/Petaluma/E444-accidentalKomaSharp.xml    |   1 -
 data/Petaluma/E445-accidentalBakiyeSharp.xml  |   1 -
 .../E446-accidentalKucukMucennebSharp.xml     |   1 -
 .../E447-accidentalBuyukMucennebSharp.xml     |   1 -
 data/Petaluma/E4A0-articAccentAbove.xml       |   1 -
 data/Petaluma/E4A1-articAccentBelow.xml       |   1 -
 data/Petaluma/E4A2-articStaccatoAbove.xml     |   1 -
 data/Petaluma/E4A3-articStaccatoBelow.xml     |   1 -
 data/Petaluma/E4A4-articTenutoAbove.xml       |   1 -
 data/Petaluma/E4A5-articTenutoBelow.xml       |   1 -
 .../Petaluma/E4A6-articStaccatissimoAbove.xml |   1 -
 .../Petaluma/E4A7-articStaccatissimoBelow.xml |   1 -
 .../E4A8-articStaccatissimoWedgeAbove.xml     |   1 -
 .../E4A9-articStaccatissimoWedgeBelow.xml     |   1 -
 .../E4AA-articStaccatissimoStrokeAbove.xml    |   1 -
 .../E4AB-articStaccatissimoStrokeBelow.xml    |   1 -
 data/Petaluma/E4AC-articMarcatoAbove.xml      |   1 -
 data/Petaluma/E4AD-articMarcatoBelow.xml      |   1 -
 .../E4AE-articMarcatoStaccatoAbove.xml        |   1 -
 .../E4AF-articMarcatoStaccatoBelow.xml        |   1 -
 .../E4B0-articAccentStaccatoAbove.xml         |   1 -
 .../E4B1-articAccentStaccatoBelow.xml         |   1 -
 .../E4B2-articTenutoStaccatoAbove.xml         |   1 -
 .../E4B3-articTenutoStaccatoBelow.xml         |   1 -
 data/Petaluma/E4B4-articTenutoAccentAbove.xml |   1 -
 data/Petaluma/E4B5-articTenutoAccentBelow.xml |   1 -
 data/Petaluma/E4B6-articStressAbove.xml       |   1 -
 data/Petaluma/E4B7-articStressBelow.xml       |   1 -
 data/Petaluma/E4B8-articUnstressAbove.xml     |   1 -
 data/Petaluma/E4B9-articUnstressBelow.xml     |   1 -
 .../Petaluma/E4BA-articLaissezVibrerAbove.xml |   1 -
 .../Petaluma/E4BB-articLaissezVibrerBelow.xml |   1 -
 .../Petaluma/E4BC-articMarcatoTenutoAbove.xml |   1 -
 .../Petaluma/E4BD-articMarcatoTenutoBelow.xml |   1 -
 data/Petaluma/E4C0-fermataAbove.xml           |   1 -
 data/Petaluma/E4C1-fermataBelow.xml           |   1 -
 data/Petaluma/E4C2-fermataVeryShortAbove.xml  |   1 -
 data/Petaluma/E4C3-fermataVeryShortBelow.xml  |   1 -
 data/Petaluma/E4C4-fermataShortAbove.xml      |   1 -
 data/Petaluma/E4C5-fermataShortBelow.xml      |   1 -
 data/Petaluma/E4C6-fermataLongAbove.xml       |   1 -
 data/Petaluma/E4C7-fermataLongBelow.xml       |   1 -
 data/Petaluma/E4C8-fermataVeryLongAbove.xml   |   1 -
 data/Petaluma/E4C9-fermataVeryLongBelow.xml   |   1 -
 data/Petaluma/E4CE-breathMarkComma.xml        |   1 -
 data/Petaluma/E4E0-restMaxima.xml             |   1 -
 data/Petaluma/E4E1-restLonga.xml              |   1 -
 data/Petaluma/E4E2-restDoubleWhole.xml        |   1 -
 data/Petaluma/E4E3-restWhole.xml              |   1 -
 data/Petaluma/E4E4-restHalf.xml               |   1 -
 data/Petaluma/E4E5-restQuarter.xml            |   1 -
 data/Petaluma/E4E6-rest8th.xml                |   1 -
 data/Petaluma/E4E7-rest16th.xml               |   1 -
 data/Petaluma/E4E8-rest32nd.xml               |   1 -
 data/Petaluma/E4E9-rest64th.xml               |   1 -
 data/Petaluma/E4EA-rest128th.xml              |   1 -
 data/Petaluma/E4EB-rest256th.xml              |   1 -
 data/Petaluma/E4EC-rest512th.xml              |   1 -
 data/Petaluma/E4ED-rest1024th.xml             |   1 -
 data/Petaluma/E4F2-restQuarterOld.xml         |   1 -
 data/Petaluma/E4F6-restQuarterZ.xml           |   1 -
 data/Petaluma/E500-repeat1Bar.xml             |   1 -
 data/Petaluma/E501-repeat2Bars.xml            |   1 -
 data/Petaluma/E502-repeat4Bars.xml            |   1 -
 data/Petaluma/E503-repeatBarUpperDot.xml      |   1 -
 data/Petaluma/E504-repeatBarSlash.xml         |   1 -
 data/Petaluma/E505-repeatBarLowerDot.xml      |   1 -
 data/Petaluma/E510-ottava.xml                 |   1 -
 data/Petaluma/E511-ottavaAlta.xml             |   1 -
 data/Petaluma/E512-ottavaBassa.xml            |   1 -
 data/Petaluma/E513-ottavaBassaBa.xml          |   1 -
 data/Petaluma/E514-quindicesima.xml           |   1 -
 data/Petaluma/E515-quindicesimaAlta.xml       |   1 -
 data/Petaluma/E516-quindicesimaBassa.xml      |   1 -
 data/Petaluma/E517-ventiduesima.xml           |   1 -
 data/Petaluma/E518-ventiduesimaAlta.xml       |   1 -
 data/Petaluma/E519-ventiduesimaBassa.xml      |   1 -
 data/Petaluma/E51A-octaveParensLeft.xml       |   1 -
 data/Petaluma/E51B-octaveParensRight.xml      |   1 -
 data/Petaluma/E51C-ottavaBassaVb.xml          |   1 -
 data/Petaluma/E51D-quindicesimaBassaMb.xml    |   1 -
 data/Petaluma/E51E-ventiduesimaBassaMb.xml    |   1 -
 data/Petaluma/E520-dynamicPiano.xml           |   1 -
 data/Petaluma/E521-dynamicMezzo.xml           |   1 -
 data/Petaluma/E522-dynamicForte.xml           |   1 -
 data/Petaluma/E523-dynamicRinforzando.xml     |   1 -
 data/Petaluma/E524-dynamicSforzando.xml       |   1 -
 data/Petaluma/E525-dynamicZ.xml               |   1 -
 data/Petaluma/E526-dynamicNiente.xml          |   1 -
 data/Petaluma/E527-dynamicPPPPPP.xml          |   1 -
 data/Petaluma/E528-dynamicPPPPP.xml           |   1 -
 data/Petaluma/E529-dynamicPPPP.xml            |   1 -
 data/Petaluma/E52A-dynamicPPP.xml             |   1 -
 data/Petaluma/E52B-dynamicPP.xml              |   1 -
 data/Petaluma/E52C-dynamicMP.xml              |   1 -
 data/Petaluma/E52D-dynamicMF.xml              |   1 -
 data/Petaluma/E52E-dynamicPF.xml              |   1 -
 data/Petaluma/E52F-dynamicFF.xml              |   1 -
 data/Petaluma/E530-dynamicFFF.xml             |   1 -
 data/Petaluma/E531-dynamicFFFF.xml            |   1 -
 data/Petaluma/E532-dynamicFFFFF.xml           |   1 -
 data/Petaluma/E533-dynamicFFFFFF.xml          |   1 -
 data/Petaluma/E534-dynamicFortePiano.xml      |   1 -
 data/Petaluma/E535-dynamicForzando.xml        |   1 -
 data/Petaluma/E536-dynamicSforzando1.xml      |   1 -
 data/Petaluma/E537-dynamicSforzandoPiano.xml  |   1 -
 .../E538-dynamicSforzandoPianissimo.xml       |   1 -
 data/Petaluma/E539-dynamicSforzato.xml        |   1 -
 data/Petaluma/E53A-dynamicSforzatoPiano.xml   |   1 -
 data/Petaluma/E53B-dynamicSforzatoFF.xml      |   1 -
 data/Petaluma/E53C-dynamicRinforzando1.xml    |   1 -
 data/Petaluma/E53D-dynamicRinforzando2.xml    |   1 -
 data/Petaluma/E566-ornamentTrill.xml          |   1 -
 data/Petaluma/E567-ornamentTurn.xml           |   1 -
 data/Petaluma/E568-ornamentTurnInverted.xml   |   1 -
 data/Petaluma/E569-ornamentTurnSlash.xml      |   1 -
 data/Petaluma/E56A-ornamentTurnUp.xml         |   1 -
 data/Petaluma/E56B-ornamentTurnUpS.xml        |   1 -
 data/Petaluma/E56C-ornamentShortTrill.xml     |   1 -
 data/Petaluma/E56D-ornamentMordent.xml        |   1 -
 data/Petaluma/E56E-ornamentTremblement.xml    |   1 -
 data/Petaluma/E56F-ornamentHaydn.xml          |   1 -
 data/Petaluma/E583-ornamentVerticalLine.xml   |   1 -
 data/Petaluma/E587-ornamentSchleifer.xml      |   1 -
 data/Petaluma/E5B0-ornamentPrecompSlide.xml   |   1 -
 .../E5B1-ornamentPrecompDescendingSlide.xml   |   1 -
 .../E5B2-ornamentPrecompAppoggTrill.xml       |   1 -
 .../E5B3-ornamentPrecompAppoggTrillSuffix.xml |   1 -
 ...5B4-ornamentPrecompTurnTrillDAnglebert.xml |   1 -
 ...B5-ornamentPrecompSlideTrillDAnglebert.xml |   1 -
 .../E5B6-ornamentPrecompSlideTrillMarpurg.xml |   1 -
 .../E5B7-ornamentPrecompTurnTrillBach.xml     |   1 -
 .../E5B8-ornamentPrecompSlideTrillBach.xml    |   1 -
 .../E5B9-ornamentPrecompSlideTrillMuffat.xml  |   1 -
 ...-ornamentPrecompSlideTrillSuffixMuffat.xml |   1 -
 ...5BB-ornamentPrecompTrillSuffixDandrieu.xml |   1 -
 .../E5BC-ornamentPrecompPortDeVoixMordent.xml |   1 -
 .../E5BD-ornamentPrecompTrillWithMordent.xml  |   1 -
 data/Petaluma/E5BE-ornamentPrecompCadence.xml |   1 -
 .../E5BF-ornamentPrecompCadenceWithTurn.xml   |   1 -
 ...rnamentPrecompDoubleCadenceLowerPrefix.xml |   1 -
 ...E5C1-ornamentPrecompCadenceUpperPrefix.xml |   1 -
 ...-ornamentPrecompCadenceUpperPrefixTurn.xml |   1 -
 ...rnamentPrecompDoubleCadenceUpperPrefix.xml |   1 -
 ...entPrecompDoubleCadenceUpperPrefixTurn.xml |   1 -
 .../E5C5-ornamentPrecompMordentRelease.xml    |   1 -
 ...E5C6-ornamentPrecompMordentUpperPrefix.xml |   1 -
 ...amentPrecompInvertedMordentUpperPrefix.xml |   1 -
 .../E5C8-ornamentPrecompTrillLowerSuffix.xml  |   1 -
 data/Petaluma/E5E5-brassMuteClosed.xml        |   1 -
 data/Petaluma/E5E6-brassMuteHalfClosed.xml    |   1 -
 data/Petaluma/E5E7-brassMuteOpen.xml          |   1 -
 data/Petaluma/E610-stringsDownBow.xml         |   1 -
 data/Petaluma/E611-stringsDownBowTurned.xml   |   1 -
 data/Petaluma/E612-stringsUpBow.xml           |   1 -
 data/Petaluma/E613-stringsUpBowTurned.xml     |   1 -
 data/Petaluma/E614-stringsHarmonic.xml        |   1 -
 .../E630-pluckedSnapPizzicatoBelow.xml        |   1 -
 .../E631-pluckedSnapPizzicatoAbove.xml        |   1 -
 data/Petaluma/E632-pluckedBuzzPizzicato.xml   |   1 -
 .../E633-pluckedLeftHandPizzicato.xml         |   1 -
 data/Petaluma/E638-pluckedDamp.xml            |   1 -
 data/Petaluma/E645-vocalSprechgesang.xml      |   1 -
 data/Petaluma/E650-keyboardPedalPed.xml       |   1 -
 data/Petaluma/E651-keyboardPedalP.xml         |   1 -
 data/Petaluma/E655-keyboardPedalUp.xml        |   1 -
 data/Petaluma/E659-keyboardPedalSost.xml      |   1 -
 data/Petaluma/E65A-keyboardPedalS.xml         |   1 -
 data/Petaluma/E880-tuplet0.xml                |   1 -
 data/Petaluma/E881-tuplet1.xml                |   1 -
 data/Petaluma/E882-tuplet2.xml                |   1 -
 data/Petaluma/E883-tuplet3.xml                |   1 -
 data/Petaluma/E884-tuplet4.xml                |   1 -
 data/Petaluma/E885-tuplet5.xml                |   1 -
 data/Petaluma/E886-tuplet6.xml                |   1 -
 data/Petaluma/E887-tuplet7.xml                |   1 -
 data/Petaluma/E888-tuplet8.xml                |   1 -
 data/Petaluma/E889-tuplet9.xml                |   1 -
 data/Petaluma/E88A-tupletColon.xml            |   1 -
 .../E938-mensuralNoteheadSemibrevisBlack.xml  |   1 -
 .../E939-mensuralNoteheadSemibrevisVoid.xml   |   1 -
 .../E93C-mensuralNoteheadMinimaWhite.xml      |   1 -
 .../E93D-mensuralNoteheadSemiminimaWhite.xml  |   1 -
 data/Petaluma/E93E-mensuralCombStemUp.xml     |   1 -
 data/Petaluma/E93F-mensuralCombStemDown.xml   |   1 -
 .../E949-mensuralCombStemUpFlagSemiminima.xml |   1 -
 ...94A-mensuralCombStemDownFlagSemiminima.xml |   1 -
 .../E94B-mensuralCombStemUpFlagFusa.xml       |   1 -
 .../E94C-mensuralCombStemDownFlagFusa.xml     |   1 -
 data/Petaluma/EAA4-wiggleTrill.xml            |   1 -
 data/Petaluma/EAA9-wiggleArpeggiatoUp.xml     |   1 -
 data/Petaluma/EAAA-wiggleArpeggiatoDown.xml   |   1 -
 .../Petaluma/EAAD-wiggleArpeggiatoUpArrow.xml |   1 -
 .../EAAE-wiggleArpeggiatoDownArrow.xml        |   1 -
 data/Petaluma/EAAF-wiggleGlissando.xml        |   1 -
 1591 files changed, 4370 deletions(-)
 delete mode 100644 data/Bravura.xml
 delete mode 100644 data/Bravura/E000-brace.xml
 delete mode 100644 data/Bravura/E003-bracketTop.xml
 delete mode 100644 data/Bravura/E004-bracketBottom.xml
 delete mode 100644 data/Bravura/E043-repeatDots.xml
 delete mode 100644 data/Bravura/E044-repeatDot.xml
 delete mode 100644 data/Bravura/E045-dalSegno.xml
 delete mode 100644 data/Bravura/E046-daCapo.xml
 delete mode 100644 data/Bravura/E047-segno.xml
 delete mode 100644 data/Bravura/E048-coda.xml
 delete mode 100644 data/Bravura/E049-codaSquare.xml
 delete mode 100644 data/Bravura/E04B-segnoSerpent2.xml
 delete mode 100644 data/Bravura/E050-gClef.xml
 delete mode 100644 data/Bravura/E051-gClef15mb.xml
 delete mode 100644 data/Bravura/E052-gClef8vb.xml
 delete mode 100644 data/Bravura/E053-gClef8va.xml
 delete mode 100644 data/Bravura/E054-gClef15ma.xml
 delete mode 100644 data/Bravura/E055-gClef8vbOld.xml
 delete mode 100644 data/Bravura/E056-gClef8vbCClef.xml
 delete mode 100644 data/Bravura/E05C-cClef.xml
 delete mode 100644 data/Bravura/E05D-cClef8vb.xml
 delete mode 100644 data/Bravura/E062-fClef.xml
 delete mode 100644 data/Bravura/E063-fClef15mb.xml
 delete mode 100644 data/Bravura/E064-fClef8vb.xml
 delete mode 100644 data/Bravura/E065-fClef8va.xml
 delete mode 100644 data/Bravura/E066-fClef15ma.xml
 delete mode 100644 data/Bravura/E069-unpitchedPercussionClef1.xml
 delete mode 100644 data/Bravura/E06A-unpitchedPercussionClef2.xml
 delete mode 100644 data/Bravura/E073-gClefReversed.xml
 delete mode 100644 data/Bravura/E074-gClefTurned.xml
 delete mode 100644 data/Bravura/E075-cClefReversed.xml
 delete mode 100644 data/Bravura/E076-fClefReversed.xml
 delete mode 100644 data/Bravura/E077-fClefTurned.xml
 delete mode 100644 data/Bravura/E080-timeSig0.xml
 delete mode 100644 data/Bravura/E081-timeSig1.xml
 delete mode 100644 data/Bravura/E082-timeSig2.xml
 delete mode 100644 data/Bravura/E083-timeSig3.xml
 delete mode 100644 data/Bravura/E084-timeSig4.xml
 delete mode 100644 data/Bravura/E085-timeSig5.xml
 delete mode 100644 data/Bravura/E086-timeSig6.xml
 delete mode 100644 data/Bravura/E087-timeSig7.xml
 delete mode 100644 data/Bravura/E088-timeSig8.xml
 delete mode 100644 data/Bravura/E089-timeSig9.xml
 delete mode 100644 data/Bravura/E08A-timeSigCommon.xml
 delete mode 100644 data/Bravura/E08B-timeSigCutCommon.xml
 delete mode 100644 data/Bravura/E08C-timeSigPlus.xml
 delete mode 100644 data/Bravura/E08D-timeSigPlusSmall.xml
 delete mode 100644 data/Bravura/E08E-timeSigFractionalSlash.xml
 delete mode 100644 data/Bravura/E08F-timeSigEquals.xml
 delete mode 100644 data/Bravura/E090-timeSigMinus.xml
 delete mode 100644 data/Bravura/E091-timeSigMultiply.xml
 delete mode 100644 data/Bravura/E092-timeSigParensLeftSmall.xml
 delete mode 100644 data/Bravura/E093-timeSigParensRightSmall.xml
 delete mode 100644 data/Bravura/E094-timeSigParensLeft.xml
 delete mode 100644 data/Bravura/E095-timeSigParensRight.xml
 delete mode 100644 data/Bravura/E0A0-noteheadDoubleWhole.xml
 delete mode 100644 data/Bravura/E0A1-noteheadDoubleWholeSquare.xml
 delete mode 100644 data/Bravura/E0A2-noteheadWhole.xml
 delete mode 100644 data/Bravura/E0A3-noteheadHalf.xml
 delete mode 100644 data/Bravura/E0A4-noteheadBlack.xml
 delete mode 100644 data/Bravura/E0A5-noteheadNull.xml
 delete mode 100644 data/Bravura/E0A9-noteheadXBlack.xml
 delete mode 100644 data/Bravura/E0AF-noteheadPlusBlack.xml
 delete mode 100644 data/Bravura/E0B5-noteheadWholeWithX.xml
 delete mode 100644 data/Bravura/E0B6-noteheadHalfWithX.xml
 delete mode 100644 data/Bravura/E0B7-noteheadVoidWithX.xml
 delete mode 100644 data/Bravura/E0D9-noteheadDiamondHalf.xml
 delete mode 100644 data/Bravura/E0DA-noteheadDiamondHalfWide.xml
 delete mode 100644 data/Bravura/E0DB-noteheadDiamondBlack.xml
 delete mode 100644 data/Bravura/E0DC-noteheadDiamondBlackWide.xml
 delete mode 100644 data/Bravura/E0DD-noteheadDiamondWhite.xml
 delete mode 100644 data/Bravura/E0DE-noteheadDiamondWhiteWide.xml
 delete mode 100644 data/Bravura/E0F5-noteheadParenthesisLeft.xml
 delete mode 100644 data/Bravura/E0F6-noteheadParenthesisRight.xml
 delete mode 100644 data/Bravura/E0FA-noteheadWholeFilled.xml
 delete mode 100644 data/Bravura/E101-noteheadSlashHorizontalEnds.xml
 delete mode 100644 data/Bravura/E102-noteheadSlashWhiteWhole.xml
 delete mode 100644 data/Bravura/E103-noteheadSlashWhiteHalf.xml
 delete mode 100644 data/Bravura/E220-tremolo1.xml
 delete mode 100644 data/Bravura/E221-tremolo2.xml
 delete mode 100644 data/Bravura/E222-tremolo3.xml
 delete mode 100644 data/Bravura/E223-tremolo4.xml
 delete mode 100644 data/Bravura/E224-tremolo5.xml
 delete mode 100644 data/Bravura/E22A-buzzRoll.xml
 delete mode 100644 data/Bravura/E240-flag8thUp.xml
 delete mode 100644 data/Bravura/E241-flag8thDown.xml
 delete mode 100644 data/Bravura/E242-flag16thUp.xml
 delete mode 100644 data/Bravura/E243-flag16thDown.xml
 delete mode 100644 data/Bravura/E244-flag32ndUp.xml
 delete mode 100644 data/Bravura/E245-flag32ndDown.xml
 delete mode 100644 data/Bravura/E246-flag64thUp.xml
 delete mode 100644 data/Bravura/E247-flag64thDown.xml
 delete mode 100644 data/Bravura/E248-flag128thUp.xml
 delete mode 100644 data/Bravura/E249-flag128thDown.xml
 delete mode 100644 data/Bravura/E24A-flag256thUp.xml
 delete mode 100644 data/Bravura/E24B-flag256thDown.xml
 delete mode 100644 data/Bravura/E24C-flag512thUp.xml
 delete mode 100644 data/Bravura/E24D-flag512thDown.xml
 delete mode 100644 data/Bravura/E24E-flag1024thUp.xml
 delete mode 100644 data/Bravura/E24F-flag1024thDown.xml
 delete mode 100644 data/Bravura/E260-accidentalFlat.xml
 delete mode 100644 data/Bravura/E261-accidentalNatural.xml
 delete mode 100644 data/Bravura/E262-accidentalSharp.xml
 delete mode 100644 data/Bravura/E263-accidentalDoubleSharp.xml
 delete mode 100644 data/Bravura/E264-accidentalDoubleFlat.xml
 delete mode 100644 data/Bravura/E265-accidentalTripleSharp.xml
 delete mode 100644 data/Bravura/E266-accidentalTripleFlat.xml
 delete mode 100644 data/Bravura/E267-accidentalNaturalFlat.xml
 delete mode 100644 data/Bravura/E268-accidentalNaturalSharp.xml
 delete mode 100644 data/Bravura/E269-accidentalSharpSharp.xml
 delete mode 100644 data/Bravura/E26A-accidentalParensLeft.xml
 delete mode 100644 data/Bravura/E26B-accidentalParensRight.xml
 delete mode 100644 data/Bravura/E26C-accidentalBracketLeft.xml
 delete mode 100644 data/Bravura/E26D-accidentalBracketRight.xml
 delete mode 100644 data/Bravura/E270-accidentalQuarterToneFlatArrowUp.xml
 delete mode 100644 data/Bravura/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
 delete mode 100644 data/Bravura/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
 delete mode 100644 data/Bravura/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
 delete mode 100644 data/Bravura/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
 delete mode 100644 data/Bravura/E275-accidentalQuarterToneSharpArrowDown.xml
 delete mode 100644 data/Bravura/E280-accidentalQuarterToneFlatStein.xml
 delete mode 100644 data/Bravura/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
 delete mode 100644 data/Bravura/E282-accidentalQuarterToneSharpStein.xml
 delete mode 100644 data/Bravura/E283-accidentalThreeQuarterTonesSharpStein.xml
 delete mode 100644 data/Bravura/E440-accidentalBuyukMucennebFlat.xml
 delete mode 100644 data/Bravura/E441-accidentalKucukMucennebFlat.xml
 delete mode 100644 data/Bravura/E442-accidentalBakiyeFlat.xml
 delete mode 100644 data/Bravura/E443-accidentalKomaFlat.xml
 delete mode 100644 data/Bravura/E444-accidentalKomaSharp.xml
 delete mode 100644 data/Bravura/E445-accidentalBakiyeSharp.xml
 delete mode 100644 data/Bravura/E446-accidentalKucukMucennebSharp.xml
 delete mode 100644 data/Bravura/E447-accidentalBuyukMucennebSharp.xml
 delete mode 100644 data/Bravura/E4A0-articAccentAbove.xml
 delete mode 100644 data/Bravura/E4A1-articAccentBelow.xml
 delete mode 100644 data/Bravura/E4A2-articStaccatoAbove.xml
 delete mode 100644 data/Bravura/E4A3-articStaccatoBelow.xml
 delete mode 100644 data/Bravura/E4A4-articTenutoAbove.xml
 delete mode 100644 data/Bravura/E4A5-articTenutoBelow.xml
 delete mode 100644 data/Bravura/E4A6-articStaccatissimoAbove.xml
 delete mode 100644 data/Bravura/E4A7-articStaccatissimoBelow.xml
 delete mode 100644 data/Bravura/E4A8-articStaccatissimoWedgeAbove.xml
 delete mode 100644 data/Bravura/E4A9-articStaccatissimoWedgeBelow.xml
 delete mode 100644 data/Bravura/E4AA-articStaccatissimoStrokeAbove.xml
 delete mode 100644 data/Bravura/E4AB-articStaccatissimoStrokeBelow.xml
 delete mode 100644 data/Bravura/E4AC-articMarcatoAbove.xml
 delete mode 100644 data/Bravura/E4AD-articMarcatoBelow.xml
 delete mode 100644 data/Bravura/E4AE-articMarcatoStaccatoAbove.xml
 delete mode 100644 data/Bravura/E4AF-articMarcatoStaccatoBelow.xml
 delete mode 100644 data/Bravura/E4B0-articAccentStaccatoAbove.xml
 delete mode 100644 data/Bravura/E4B1-articAccentStaccatoBelow.xml
 delete mode 100644 data/Bravura/E4B2-articTenutoStaccatoAbove.xml
 delete mode 100644 data/Bravura/E4B3-articTenutoStaccatoBelow.xml
 delete mode 100644 data/Bravura/E4B4-articTenutoAccentAbove.xml
 delete mode 100644 data/Bravura/E4B5-articTenutoAccentBelow.xml
 delete mode 100644 data/Bravura/E4B6-articStressAbove.xml
 delete mode 100644 data/Bravura/E4B7-articStressBelow.xml
 delete mode 100644 data/Bravura/E4B8-articUnstressAbove.xml
 delete mode 100644 data/Bravura/E4B9-articUnstressBelow.xml
 delete mode 100644 data/Bravura/E4BA-articLaissezVibrerAbove.xml
 delete mode 100644 data/Bravura/E4BB-articLaissezVibrerBelow.xml
 delete mode 100644 data/Bravura/E4BC-articMarcatoTenutoAbove.xml
 delete mode 100644 data/Bravura/E4BD-articMarcatoTenutoBelow.xml
 delete mode 100644 data/Bravura/E4C0-fermataAbove.xml
 delete mode 100644 data/Bravura/E4C1-fermataBelow.xml
 delete mode 100644 data/Bravura/E4C2-fermataVeryShortAbove.xml
 delete mode 100644 data/Bravura/E4C3-fermataVeryShortBelow.xml
 delete mode 100644 data/Bravura/E4C4-fermataShortAbove.xml
 delete mode 100644 data/Bravura/E4C5-fermataShortBelow.xml
 delete mode 100644 data/Bravura/E4C6-fermataLongAbove.xml
 delete mode 100644 data/Bravura/E4C7-fermataLongBelow.xml
 delete mode 100644 data/Bravura/E4C8-fermataVeryLongAbove.xml
 delete mode 100644 data/Bravura/E4C9-fermataVeryLongBelow.xml
 delete mode 100644 data/Bravura/E4CE-breathMarkComma.xml
 delete mode 100644 data/Bravura/E4E0-restMaxima.xml
 delete mode 100644 data/Bravura/E4E1-restLonga.xml
 delete mode 100644 data/Bravura/E4E2-restDoubleWhole.xml
 delete mode 100644 data/Bravura/E4E3-restWhole.xml
 delete mode 100644 data/Bravura/E4E4-restHalf.xml
 delete mode 100644 data/Bravura/E4E5-restQuarter.xml
 delete mode 100644 data/Bravura/E4E6-rest8th.xml
 delete mode 100644 data/Bravura/E4E7-rest16th.xml
 delete mode 100644 data/Bravura/E4E8-rest32nd.xml
 delete mode 100644 data/Bravura/E4E9-rest64th.xml
 delete mode 100644 data/Bravura/E4EA-rest128th.xml
 delete mode 100644 data/Bravura/E4EB-rest256th.xml
 delete mode 100644 data/Bravura/E4EC-rest512th.xml
 delete mode 100644 data/Bravura/E4ED-rest1024th.xml
 delete mode 100644 data/Bravura/E4F2-restQuarterOld.xml
 delete mode 100644 data/Bravura/E4F6-restQuarterZ.xml
 delete mode 100644 data/Bravura/E500-repeat1Bar.xml
 delete mode 100644 data/Bravura/E501-repeat2Bars.xml
 delete mode 100644 data/Bravura/E502-repeat4Bars.xml
 delete mode 100644 data/Bravura/E503-repeatBarUpperDot.xml
 delete mode 100644 data/Bravura/E504-repeatBarSlash.xml
 delete mode 100644 data/Bravura/E505-repeatBarLowerDot.xml
 delete mode 100644 data/Bravura/E510-ottava.xml
 delete mode 100644 data/Bravura/E511-ottavaAlta.xml
 delete mode 100644 data/Bravura/E512-ottavaBassa.xml
 delete mode 100644 data/Bravura/E513-ottavaBassaBa.xml
 delete mode 100644 data/Bravura/E514-quindicesima.xml
 delete mode 100644 data/Bravura/E515-quindicesimaAlta.xml
 delete mode 100644 data/Bravura/E516-quindicesimaBassa.xml
 delete mode 100644 data/Bravura/E517-ventiduesima.xml
 delete mode 100644 data/Bravura/E518-ventiduesimaAlta.xml
 delete mode 100644 data/Bravura/E519-ventiduesimaBassa.xml
 delete mode 100644 data/Bravura/E51A-octaveParensLeft.xml
 delete mode 100644 data/Bravura/E51B-octaveParensRight.xml
 delete mode 100644 data/Bravura/E51C-ottavaBassaVb.xml
 delete mode 100644 data/Bravura/E51D-quindicesimaBassaMb.xml
 delete mode 100644 data/Bravura/E51E-ventiduesimaBassaMb.xml
 delete mode 100644 data/Bravura/E520-dynamicPiano.xml
 delete mode 100644 data/Bravura/E521-dynamicMezzo.xml
 delete mode 100644 data/Bravura/E522-dynamicForte.xml
 delete mode 100644 data/Bravura/E523-dynamicRinforzando.xml
 delete mode 100644 data/Bravura/E524-dynamicSforzando.xml
 delete mode 100644 data/Bravura/E525-dynamicZ.xml
 delete mode 100644 data/Bravura/E526-dynamicNiente.xml
 delete mode 100644 data/Bravura/E527-dynamicPPPPPP.xml
 delete mode 100644 data/Bravura/E528-dynamicPPPPP.xml
 delete mode 100644 data/Bravura/E529-dynamicPPPP.xml
 delete mode 100644 data/Bravura/E52A-dynamicPPP.xml
 delete mode 100644 data/Bravura/E52B-dynamicPP.xml
 delete mode 100644 data/Bravura/E52C-dynamicMP.xml
 delete mode 100644 data/Bravura/E52D-dynamicMF.xml
 delete mode 100644 data/Bravura/E52E-dynamicPF.xml
 delete mode 100644 data/Bravura/E52F-dynamicFF.xml
 delete mode 100644 data/Bravura/E530-dynamicFFF.xml
 delete mode 100644 data/Bravura/E531-dynamicFFFF.xml
 delete mode 100644 data/Bravura/E532-dynamicFFFFF.xml
 delete mode 100644 data/Bravura/E533-dynamicFFFFFF.xml
 delete mode 100644 data/Bravura/E534-dynamicFortePiano.xml
 delete mode 100644 data/Bravura/E535-dynamicForzando.xml
 delete mode 100644 data/Bravura/E536-dynamicSforzando1.xml
 delete mode 100644 data/Bravura/E537-dynamicSforzandoPiano.xml
 delete mode 100644 data/Bravura/E538-dynamicSforzandoPianissimo.xml
 delete mode 100644 data/Bravura/E539-dynamicSforzato.xml
 delete mode 100644 data/Bravura/E53A-dynamicSforzatoPiano.xml
 delete mode 100644 data/Bravura/E53B-dynamicSforzatoFF.xml
 delete mode 100644 data/Bravura/E53C-dynamicRinforzando1.xml
 delete mode 100644 data/Bravura/E53D-dynamicRinforzando2.xml
 delete mode 100644 data/Bravura/E566-ornamentTrill.xml
 delete mode 100644 data/Bravura/E567-ornamentTurn.xml
 delete mode 100644 data/Bravura/E568-ornamentTurnInverted.xml
 delete mode 100644 data/Bravura/E569-ornamentTurnSlash.xml
 delete mode 100644 data/Bravura/E56A-ornamentTurnUp.xml
 delete mode 100644 data/Bravura/E56B-ornamentTurnUpS.xml
 delete mode 100644 data/Bravura/E56C-ornamentShortTrill.xml
 delete mode 100644 data/Bravura/E56D-ornamentMordent.xml
 delete mode 100644 data/Bravura/E56E-ornamentTremblement.xml
 delete mode 100644 data/Bravura/E56F-ornamentHaydn.xml
 delete mode 100644 data/Bravura/E583-ornamentVerticalLine.xml
 delete mode 100644 data/Bravura/E587-ornamentSchleifer.xml
 delete mode 100644 data/Bravura/E59D-ornamentZigZagLineNoRightEnd.xml
 delete mode 100644 data/Bravura/E59E-ornamentZigZagLineWithRightEnd.xml
 delete mode 100644 data/Bravura/E5B0-ornamentPrecompSlide.xml
 delete mode 100644 data/Bravura/E5B1-ornamentPrecompDescendingSlide.xml
 delete mode 100644 data/Bravura/E5B2-ornamentPrecompAppoggTrill.xml
 delete mode 100644 data/Bravura/E5B3-ornamentPrecompAppoggTrillSuffix.xml
 delete mode 100644 data/Bravura/E5B4-ornamentPrecompTurnTrillDAnglebert.xml
 delete mode 100644 data/Bravura/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
 delete mode 100644 data/Bravura/E5B6-ornamentPrecompSlideTrillMarpurg.xml
 delete mode 100644 data/Bravura/E5B7-ornamentPrecompTurnTrillBach.xml
 delete mode 100644 data/Bravura/E5B8-ornamentPrecompSlideTrillBach.xml
 delete mode 100644 data/Bravura/E5B9-ornamentPrecompSlideTrillMuffat.xml
 delete mode 100644 data/Bravura/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml
 delete mode 100644 data/Bravura/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
 delete mode 100644 data/Bravura/E5BC-ornamentPrecompPortDeVoixMordent.xml
 delete mode 100644 data/Bravura/E5BD-ornamentPrecompTrillWithMordent.xml
 delete mode 100644 data/Bravura/E5BE-ornamentPrecompCadence.xml
 delete mode 100644 data/Bravura/E5BF-ornamentPrecompCadenceWithTurn.xml
 delete mode 100644 data/Bravura/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
 delete mode 100644 data/Bravura/E5C1-ornamentPrecompCadenceUpperPrefix.xml
 delete mode 100644 data/Bravura/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml
 delete mode 100644 data/Bravura/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
 delete mode 100644 data/Bravura/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml
 delete mode 100644 data/Bravura/E5C5-ornamentPrecompMordentRelease.xml
 delete mode 100644 data/Bravura/E5C6-ornamentPrecompMordentUpperPrefix.xml
 delete mode 100644 data/Bravura/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
 delete mode 100644 data/Bravura/E5C8-ornamentPrecompTrillLowerSuffix.xml
 delete mode 100644 data/Bravura/E5E5-brassMuteClosed.xml
 delete mode 100644 data/Bravura/E5E6-brassMuteHalfClosed.xml
 delete mode 100644 data/Bravura/E5E7-brassMuteOpen.xml
 delete mode 100644 data/Bravura/E610-stringsDownBow.xml
 delete mode 100644 data/Bravura/E611-stringsDownBowTurned.xml
 delete mode 100644 data/Bravura/E612-stringsUpBow.xml
 delete mode 100644 data/Bravura/E613-stringsUpBowTurned.xml
 delete mode 100644 data/Bravura/E614-stringsHarmonic.xml
 delete mode 100644 data/Bravura/E630-pluckedSnapPizzicatoBelow.xml
 delete mode 100644 data/Bravura/E631-pluckedSnapPizzicatoAbove.xml
 delete mode 100644 data/Bravura/E632-pluckedBuzzPizzicato.xml
 delete mode 100644 data/Bravura/E633-pluckedLeftHandPizzicato.xml
 delete mode 100644 data/Bravura/E638-pluckedDamp.xml
 delete mode 100644 data/Bravura/E645-vocalSprechgesang.xml
 delete mode 100644 data/Bravura/E650-keyboardPedalPed.xml
 delete mode 100644 data/Bravura/E651-keyboardPedalP.xml
 delete mode 100644 data/Bravura/E655-keyboardPedalUp.xml
 delete mode 100644 data/Bravura/E659-keyboardPedalSost.xml
 delete mode 100644 data/Bravura/E65A-keyboardPedalS.xml
 delete mode 100644 data/Bravura/E880-tuplet0.xml
 delete mode 100644 data/Bravura/E881-tuplet1.xml
 delete mode 100644 data/Bravura/E882-tuplet2.xml
 delete mode 100644 data/Bravura/E883-tuplet3.xml
 delete mode 100644 data/Bravura/E884-tuplet4.xml
 delete mode 100644 data/Bravura/E885-tuplet5.xml
 delete mode 100644 data/Bravura/E886-tuplet6.xml
 delete mode 100644 data/Bravura/E887-tuplet7.xml
 delete mode 100644 data/Bravura/E888-tuplet8.xml
 delete mode 100644 data/Bravura/E889-tuplet9.xml
 delete mode 100644 data/Bravura/E88A-tupletColon.xml
 delete mode 100644 data/Bravura/E901-mensuralGclefPetrucci.xml
 delete mode 100644 data/Bravura/E902-chantFclef.xml
 delete mode 100644 data/Bravura/E904-mensuralFclefPetrucci.xml
 delete mode 100644 data/Bravura/E906-chantCclef.xml
 delete mode 100644 data/Bravura/E907-mensuralCclefPetrucciPosLowest.xml
 delete mode 100644 data/Bravura/E908-mensuralCclefPetrucciPosLow.xml
 delete mode 100644 data/Bravura/E909-mensuralCclefPetrucciPosMiddle.xml
 delete mode 100644 data/Bravura/E90A-mensuralCclefPetrucciPosHigh.xml
 delete mode 100644 data/Bravura/E90B-mensuralCclefPetrucciPosHighest.xml
 delete mode 100644 data/Bravura/E910-mensuralProlation1.xml
 delete mode 100644 data/Bravura/E911-mensuralProlation2.xml
 delete mode 100644 data/Bravura/E912-mensuralProlation3.xml
 delete mode 100644 data/Bravura/E913-mensuralProlation4.xml
 delete mode 100644 data/Bravura/E914-mensuralProlation5.xml
 delete mode 100644 data/Bravura/E915-mensuralProlation6.xml
 delete mode 100644 data/Bravura/E916-mensuralProlation7.xml
 delete mode 100644 data/Bravura/E917-mensuralProlation8.xml
 delete mode 100644 data/Bravura/E918-mensuralProlation9.xml
 delete mode 100644 data/Bravura/E919-mensuralProlation10.xml
 delete mode 100644 data/Bravura/E91A-mensuralProlation11.xml
 delete mode 100644 data/Bravura/E91B-mensuralProportionTempusPerfectum.xml
 delete mode 100644 data/Bravura/E91C-mensuralProportionProportioDupla1.xml
 delete mode 100644 data/Bravura/E91D-mensuralProportionProportioDupla2.xml
 delete mode 100644 data/Bravura/E91E-mensuralProportionProportioTripla.xml
 delete mode 100644 data/Bravura/E91F-mensuralProportionProportioQuadrupla.xml
 delete mode 100644 data/Bravura/E920-mensuralProlationCombiningDot.xml
 delete mode 100644 data/Bravura/E921-mensuralProlationCombiningTwoDots.xml
 delete mode 100644 data/Bravura/E922-mensuralProlationCombiningThreeDots.xml
 delete mode 100644 data/Bravura/E923-mensuralProlationCombiningThreeDotsTri.xml
 delete mode 100644 data/Bravura/E924-mensuralProlationCombiningDotVoid.xml
 delete mode 100644 data/Bravura/E925-mensuralProlationCombiningStroke.xml
 delete mode 100644 data/Bravura/E938-mensuralNoteheadSemibrevisBlack.xml
 delete mode 100644 data/Bravura/E939-mensuralNoteheadSemibrevisVoid.xml
 delete mode 100644 data/Bravura/E93C-mensuralNoteheadMinimaWhite.xml
 delete mode 100644 data/Bravura/E93D-mensuralNoteheadSemiminimaWhite.xml
 delete mode 100644 data/Bravura/E93E-mensuralCombStemUp.xml
 delete mode 100644 data/Bravura/E93F-mensuralCombStemDown.xml
 delete mode 100644 data/Bravura/E949-mensuralCombStemUpFlagSemiminima.xml
 delete mode 100644 data/Bravura/E94A-mensuralCombStemDownFlagSemiminima.xml
 delete mode 100644 data/Bravura/E94B-mensuralCombStemUpFlagFusa.xml
 delete mode 100644 data/Bravura/E94C-mensuralCombStemDownFlagFusa.xml
 delete mode 100644 data/Bravura/E990-chantPunctum.xml
 delete mode 100644 data/Bravura/E991-chantPunctumInclinatum.xml
 delete mode 100644 data/Bravura/E996-chantPunctumVirga.xml
 delete mode 100644 data/Bravura/E99B-chantQuilisma.xml
 delete mode 100644 data/Bravura/E99E-chantOriscusLiquescens.xml
 delete mode 100644 data/Bravura/E99F-chantStrophicus.xml
 delete mode 100644 data/Bravura/E9B4-chantEntryLineAsc2nd.xml
 delete mode 100644 data/Bravura/E9B5-chantEntryLineAsc3rd.xml
 delete mode 100644 data/Bravura/E9B6-chantEntryLineAsc4th.xml
 delete mode 100644 data/Bravura/E9B7-chantEntryLineAsc5th.xml
 delete mode 100644 data/Bravura/E9B9-chantLigaturaDesc2nd.xml
 delete mode 100644 data/Bravura/E9BA-chantLigaturaDesc3rd.xml
 delete mode 100644 data/Bravura/E9BB-chantLigaturaDesc4th.xml
 delete mode 100644 data/Bravura/E9BC-chantLigaturaDesc5th.xml
 delete mode 100644 data/Bravura/E9E0-medRenFlatSoftB.xml
 delete mode 100644 data/Bravura/E9E1-medRenFlatHardB.xml
 delete mode 100644 data/Bravura/E9E2-medRenNatural.xml
 delete mode 100644 data/Bravura/E9E3-medRenSharpCroix.xml
 delete mode 100644 data/Bravura/E9F0-mensuralRestMaxima.xml
 delete mode 100644 data/Bravura/E9F1-mensuralRestLongaPerfecta.xml
 delete mode 100644 data/Bravura/E9F2-mensuralRestLongaImperfecta.xml
 delete mode 100644 data/Bravura/E9F3-mensuralRestBrevis.xml
 delete mode 100644 data/Bravura/E9F4-mensuralRestSemibrevis.xml
 delete mode 100644 data/Bravura/E9F5-mensuralRestMinima.xml
 delete mode 100644 data/Bravura/E9F6-mensuralRestSemiminima.xml
 delete mode 100644 data/Bravura/E9F7-mensuralRestFusa.xml
 delete mode 100644 data/Bravura/E9F8-mensuralRestSemifusa.xml
 delete mode 100644 data/Bravura/EA02-mensuralCustosUp.xml
 delete mode 100644 data/Bravura/EA06-chantCustosStemUpPosMiddle.xml
 delete mode 100644 data/Bravura/EAA4-wiggleTrill.xml
 delete mode 100644 data/Bravura/EAA9-wiggleArpeggiatoUp.xml
 delete mode 100644 data/Bravura/EAAA-wiggleArpeggiatoDown.xml
 delete mode 100644 data/Bravura/EAAD-wiggleArpeggiatoUpArrow.xml
 delete mode 100644 data/Bravura/EAAE-wiggleArpeggiatoDownArrow.xml
 delete mode 100644 data/Bravura/EAAF-wiggleGlissando.xml
 delete mode 100644 data/Bravura/EBA7-luteDurationWhole.xml
 delete mode 100644 data/Bravura/EBA8-luteDurationHalf.xml
 delete mode 100644 data/Bravura/EBA9-luteDurationQuarter.xml
 delete mode 100644 data/Bravura/EBAA-luteDuration8th.xml
 delete mode 100644 data/Bravura/EBAB-luteDuration16th.xml
 delete mode 100644 data/Bravura/EBAC-luteDuration32nd.xml
 delete mode 100644 data/Bravura/EBC0-luteFrenchFretA.xml
 delete mode 100644 data/Bravura/EBC1-luteFrenchFretB.xml
 delete mode 100644 data/Bravura/EBC2-luteFrenchFretC.xml
 delete mode 100644 data/Bravura/EBC3-luteFrenchFretD.xml
 delete mode 100644 data/Bravura/EBC4-luteFrenchFretE.xml
 delete mode 100644 data/Bravura/EBC5-luteFrenchFretF.xml
 delete mode 100644 data/Bravura/EBC6-luteFrenchFretG.xml
 delete mode 100644 data/Bravura/EBC7-luteFrenchFretH.xml
 delete mode 100644 data/Bravura/EBC8-luteFrenchFretI.xml
 delete mode 100644 data/Bravura/EBC9-luteFrenchFretK.xml
 delete mode 100644 data/Bravura/EBCA-luteFrenchFretL.xml
 delete mode 100644 data/Bravura/EBCB-luteFrenchFretM.xml
 delete mode 100644 data/Bravura/EBCC-luteFrenchFretN.xml
 delete mode 100644 data/Bravura/EBE0-luteItalianFret0.xml
 delete mode 100644 data/Bravura/EBE1-luteItalianFret1.xml
 delete mode 100644 data/Bravura/EBE2-luteItalianFret2.xml
 delete mode 100644 data/Bravura/EBE3-luteItalianFret3.xml
 delete mode 100644 data/Bravura/EBE4-luteItalianFret4.xml
 delete mode 100644 data/Bravura/EBE5-luteItalianFret5.xml
 delete mode 100644 data/Bravura/EBE6-luteItalianFret6.xml
 delete mode 100644 data/Bravura/EBE7-luteItalianFret7.xml
 delete mode 100644 data/Bravura/EBE8-luteItalianFret8.xml
 delete mode 100644 data/Bravura/EBE9-luteItalianFret9.xml
 delete mode 100644 data/Bravura/ED40-articSoftAccentAbove.xml
 delete mode 100644 data/Bravura/ED41-articSoftAccentBelow.xml
 delete mode 100644 data/Gootville.xml
 delete mode 100644 data/Gootville/E003-bracketTop.xml
 delete mode 100644 data/Gootville/E004-bracketBottom.xml
 delete mode 100644 data/Gootville/E043-repeatDots.xml
 delete mode 100644 data/Gootville/E044-repeatDot.xml
 delete mode 100644 data/Gootville/E047-segno.xml
 delete mode 100644 data/Gootville/E048-coda.xml
 delete mode 100644 data/Gootville/E049-codaSquare.xml
 delete mode 100644 data/Gootville/E050-gClef.xml
 delete mode 100644 data/Gootville/E051-gClef15mb.xml
 delete mode 100644 data/Gootville/E052-gClef8vb.xml
 delete mode 100644 data/Gootville/E053-gClef8va.xml
 delete mode 100644 data/Gootville/E054-gClef15ma.xml
 delete mode 100644 data/Gootville/E05C-cClef.xml
 delete mode 100644 data/Gootville/E05D-cClef8vb.xml
 delete mode 100644 data/Gootville/E062-fClef.xml
 delete mode 100644 data/Gootville/E063-fClef15mb.xml
 delete mode 100644 data/Gootville/E064-fClef8vb.xml
 delete mode 100644 data/Gootville/E065-fClef8va.xml
 delete mode 100644 data/Gootville/E066-fClef15ma.xml
 delete mode 100644 data/Gootville/E069-unpitchedPercussionClef1.xml
 delete mode 100644 data/Gootville/E06A-unpitchedPercussionClef2.xml
 delete mode 100644 data/Gootville/E080-timeSig0.xml
 delete mode 100644 data/Gootville/E081-timeSig1.xml
 delete mode 100644 data/Gootville/E082-timeSig2.xml
 delete mode 100644 data/Gootville/E083-timeSig3.xml
 delete mode 100644 data/Gootville/E084-timeSig4.xml
 delete mode 100644 data/Gootville/E085-timeSig5.xml
 delete mode 100644 data/Gootville/E086-timeSig6.xml
 delete mode 100644 data/Gootville/E087-timeSig7.xml
 delete mode 100644 data/Gootville/E088-timeSig8.xml
 delete mode 100644 data/Gootville/E089-timeSig9.xml
 delete mode 100644 data/Gootville/E08A-timeSigCommon.xml
 delete mode 100644 data/Gootville/E08B-timeSigCutCommon.xml
 delete mode 100644 data/Gootville/E092-timeSigParensLeftSmall.xml
 delete mode 100644 data/Gootville/E093-timeSigParensRightSmall.xml
 delete mode 100644 data/Gootville/E094-timeSigParensLeft.xml
 delete mode 100644 data/Gootville/E095-timeSigParensRight.xml
 delete mode 100644 data/Gootville/E0A0-noteheadDoubleWhole.xml
 delete mode 100644 data/Gootville/E0A1-noteheadDoubleWholeSquare.xml
 delete mode 100644 data/Gootville/E0A2-noteheadWhole.xml
 delete mode 100644 data/Gootville/E0A3-noteheadHalf.xml
 delete mode 100644 data/Gootville/E0A4-noteheadBlack.xml
 delete mode 100644 data/Gootville/E0A9-noteheadXBlack.xml
 delete mode 100644 data/Gootville/E0D9-noteheadDiamondHalf.xml
 delete mode 100644 data/Gootville/E0DA-noteheadDiamondHalfWide.xml
 delete mode 100644 data/Gootville/E0DB-noteheadDiamondBlack.xml
 delete mode 100644 data/Gootville/E0DC-noteheadDiamondBlackWide.xml
 delete mode 100644 data/Gootville/E0DD-noteheadDiamondWhite.xml
 delete mode 100644 data/Gootville/E0DE-noteheadDiamondWhiteWide.xml
 delete mode 100644 data/Gootville/E0F5-noteheadParenthesisLeft.xml
 delete mode 100644 data/Gootville/E0F6-noteheadParenthesisRight.xml
 delete mode 100644 data/Gootville/E101-noteheadSlashHorizontalEnds.xml
 delete mode 100644 data/Gootville/E102-noteheadSlashWhiteWhole.xml
 delete mode 100644 data/Gootville/E103-noteheadSlashWhiteHalf.xml
 delete mode 100644 data/Gootville/E240-flag8thUp.xml
 delete mode 100644 data/Gootville/E241-flag8thDown.xml
 delete mode 100644 data/Gootville/E242-flag16thUp.xml
 delete mode 100644 data/Gootville/E243-flag16thDown.xml
 delete mode 100644 data/Gootville/E244-flag32ndUp.xml
 delete mode 100644 data/Gootville/E245-flag32ndDown.xml
 delete mode 100644 data/Gootville/E246-flag64thUp.xml
 delete mode 100644 data/Gootville/E247-flag64thDown.xml
 delete mode 100644 data/Gootville/E248-flag128thUp.xml
 delete mode 100644 data/Gootville/E249-flag128thDown.xml
 delete mode 100644 data/Gootville/E260-accidentalFlat.xml
 delete mode 100644 data/Gootville/E261-accidentalNatural.xml
 delete mode 100644 data/Gootville/E262-accidentalSharp.xml
 delete mode 100644 data/Gootville/E263-accidentalDoubleSharp.xml
 delete mode 100644 data/Gootville/E264-accidentalDoubleFlat.xml
 delete mode 100644 data/Gootville/E26A-accidentalParensLeft.xml
 delete mode 100644 data/Gootville/E26B-accidentalParensRight.xml
 delete mode 100644 data/Gootville/E270-accidentalQuarterToneFlatArrowUp.xml
 delete mode 100644 data/Gootville/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
 delete mode 100644 data/Gootville/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
 delete mode 100644 data/Gootville/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
 delete mode 100644 data/Gootville/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
 delete mode 100644 data/Gootville/E275-accidentalQuarterToneSharpArrowDown.xml
 delete mode 100644 data/Gootville/E280-accidentalQuarterToneFlatStein.xml
 delete mode 100644 data/Gootville/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
 delete mode 100644 data/Gootville/E282-accidentalQuarterToneSharpStein.xml
 delete mode 100644 data/Gootville/E283-accidentalThreeQuarterTonesSharpStein.xml
 delete mode 100644 data/Gootville/E440-accidentalBuyukMucennebFlat.xml
 delete mode 100644 data/Gootville/E441-accidentalKucukMucennebFlat.xml
 delete mode 100644 data/Gootville/E442-accidentalBakiyeFlat.xml
 delete mode 100644 data/Gootville/E443-accidentalKomaFlat.xml
 delete mode 100644 data/Gootville/E444-accidentalKomaSharp.xml
 delete mode 100644 data/Gootville/E445-accidentalBakiyeSharp.xml
 delete mode 100644 data/Gootville/E446-accidentalKucukMucennebSharp.xml
 delete mode 100644 data/Gootville/E447-accidentalBuyukMucennebSharp.xml
 delete mode 100644 data/Gootville/E4A0-articAccentAbove.xml
 delete mode 100644 data/Gootville/E4A1-articAccentBelow.xml
 delete mode 100644 data/Gootville/E4A2-articStaccatoAbove.xml
 delete mode 100644 data/Gootville/E4A3-articStaccatoBelow.xml
 delete mode 100644 data/Gootville/E4A4-articTenutoAbove.xml
 delete mode 100644 data/Gootville/E4A5-articTenutoBelow.xml
 delete mode 100644 data/Gootville/E4A6-articStaccatissimoAbove.xml
 delete mode 100644 data/Gootville/E4A7-articStaccatissimoBelow.xml
 delete mode 100644 data/Gootville/E4A8-articStaccatissimoWedgeAbove.xml
 delete mode 100644 data/Gootville/E4A9-articStaccatissimoWedgeBelow.xml
 delete mode 100644 data/Gootville/E4AC-articMarcatoAbove.xml
 delete mode 100644 data/Gootville/E4AD-articMarcatoBelow.xml
 delete mode 100644 data/Gootville/E4B2-articTenutoStaccatoAbove.xml
 delete mode 100644 data/Gootville/E4B3-articTenutoStaccatoBelow.xml
 delete mode 100644 data/Gootville/E4B6-articStressAbove.xml
 delete mode 100644 data/Gootville/E4B7-articStressBelow.xml
 delete mode 100644 data/Gootville/E4C0-fermataAbove.xml
 delete mode 100644 data/Gootville/E4C1-fermataBelow.xml
 delete mode 100644 data/Gootville/E4C4-fermataShortAbove.xml
 delete mode 100644 data/Gootville/E4C5-fermataShortBelow.xml
 delete mode 100644 data/Gootville/E4C6-fermataLongAbove.xml
 delete mode 100644 data/Gootville/E4C7-fermataLongBelow.xml
 delete mode 100644 data/Gootville/E4C8-fermataVeryLongAbove.xml
 delete mode 100644 data/Gootville/E4C9-fermataVeryLongBelow.xml
 delete mode 100644 data/Gootville/E4CE-breathMarkComma.xml
 delete mode 100644 data/Gootville/E4E1-restLonga.xml
 delete mode 100644 data/Gootville/E4E2-restDoubleWhole.xml
 delete mode 100644 data/Gootville/E4E3-restWhole.xml
 delete mode 100644 data/Gootville/E4E4-restHalf.xml
 delete mode 100644 data/Gootville/E4E5-restQuarter.xml
 delete mode 100644 data/Gootville/E4E6-rest8th.xml
 delete mode 100644 data/Gootville/E4E7-rest16th.xml
 delete mode 100644 data/Gootville/E4E8-rest32nd.xml
 delete mode 100644 data/Gootville/E4E9-rest64th.xml
 delete mode 100644 data/Gootville/E4EA-rest128th.xml
 delete mode 100644 data/Gootville/E4F2-restQuarterOld.xml
 delete mode 100644 data/Gootville/E510-ottava.xml
 delete mode 100644 data/Gootville/E514-quindicesima.xml
 delete mode 100644 data/Gootville/E517-ventiduesima.xml
 delete mode 100644 data/Gootville/E51A-octaveParensLeft.xml
 delete mode 100644 data/Gootville/E51B-octaveParensRight.xml
 delete mode 100644 data/Gootville/E520-dynamicPiano.xml
 delete mode 100644 data/Gootville/E521-dynamicMezzo.xml
 delete mode 100644 data/Gootville/E522-dynamicForte.xml
 delete mode 100644 data/Gootville/E523-dynamicRinforzando.xml
 delete mode 100644 data/Gootville/E524-dynamicSforzando.xml
 delete mode 100644 data/Gootville/E525-dynamicZ.xml
 delete mode 100644 data/Gootville/E526-dynamicNiente.xml
 delete mode 100644 data/Gootville/E527-dynamicPPPPPP.xml
 delete mode 100644 data/Gootville/E528-dynamicPPPPP.xml
 delete mode 100644 data/Gootville/E529-dynamicPPPP.xml
 delete mode 100644 data/Gootville/E52A-dynamicPPP.xml
 delete mode 100644 data/Gootville/E52B-dynamicPP.xml
 delete mode 100644 data/Gootville/E52C-dynamicMP.xml
 delete mode 100644 data/Gootville/E52D-dynamicMF.xml
 delete mode 100644 data/Gootville/E52E-dynamicPF.xml
 delete mode 100644 data/Gootville/E52F-dynamicFF.xml
 delete mode 100644 data/Gootville/E530-dynamicFFF.xml
 delete mode 100644 data/Gootville/E531-dynamicFFFF.xml
 delete mode 100644 data/Gootville/E532-dynamicFFFFF.xml
 delete mode 100644 data/Gootville/E533-dynamicFFFFFF.xml
 delete mode 100644 data/Gootville/E534-dynamicFortePiano.xml
 delete mode 100644 data/Gootville/E535-dynamicForzando.xml
 delete mode 100644 data/Gootville/E536-dynamicSforzando1.xml
 delete mode 100644 data/Gootville/E537-dynamicSforzandoPiano.xml
 delete mode 100644 data/Gootville/E538-dynamicSforzandoPianissimo.xml
 delete mode 100644 data/Gootville/E539-dynamicSforzato.xml
 delete mode 100644 data/Gootville/E53A-dynamicSforzatoPiano.xml
 delete mode 100644 data/Gootville/E53B-dynamicSforzatoFF.xml
 delete mode 100644 data/Gootville/E53C-dynamicRinforzando1.xml
 delete mode 100644 data/Gootville/E53D-dynamicRinforzando2.xml
 delete mode 100644 data/Gootville/E566-ornamentTrill.xml
 delete mode 100644 data/Gootville/E567-ornamentTurn.xml
 delete mode 100644 data/Gootville/E568-ornamentTurnInverted.xml
 delete mode 100644 data/Gootville/E569-ornamentTurnSlash.xml
 delete mode 100644 data/Gootville/E56C-ornamentShortTrill.xml
 delete mode 100644 data/Gootville/E56D-ornamentMordent.xml
 delete mode 100644 data/Gootville/E56E-ornamentTremblement.xml
 delete mode 100644 data/Gootville/E59D-ornamentZigZagLineNoRightEnd.xml
 delete mode 100644 data/Gootville/E59E-ornamentZigZagLineWithRightEnd.xml
 delete mode 100644 data/Gootville/E5B0-ornamentPrecompSlide.xml
 delete mode 100644 data/Gootville/E5E5-brassMuteClosed.xml
 delete mode 100644 data/Gootville/E5E7-brassMuteOpen.xml
 delete mode 100644 data/Gootville/E610-stringsDownBow.xml
 delete mode 100644 data/Gootville/E611-stringsDownBowTurned.xml
 delete mode 100644 data/Gootville/E612-stringsUpBow.xml
 delete mode 100644 data/Gootville/E613-stringsUpBowTurned.xml
 delete mode 100644 data/Gootville/E630-pluckedSnapPizzicatoBelow.xml
 delete mode 100644 data/Gootville/E631-pluckedSnapPizzicatoAbove.xml
 delete mode 100644 data/Gootville/E650-keyboardPedalPed.xml
 delete mode 100644 data/Gootville/E651-keyboardPedalP.xml
 delete mode 100644 data/Gootville/E655-keyboardPedalUp.xml
 delete mode 100644 data/Gootville/EAA4-wiggleTrill.xml
 delete mode 100644 data/Gootville/EAA9-wiggleArpeggiatoUp.xml
 delete mode 100644 data/Gootville/EAAA-wiggleArpeggiatoDown.xml
 delete mode 100644 data/Gootville/EAAD-wiggleArpeggiatoUpArrow.xml
 delete mode 100644 data/Gootville/EAAE-wiggleArpeggiatoDownArrow.xml
 delete mode 100644 data/Gootville/EAAF-wiggleGlissando.xml
 delete mode 100644 data/Leipzig.xml
 delete mode 100644 data/Leipzig/E000-brace.xml
 delete mode 100644 data/Leipzig/E003-bracketTop.xml
 delete mode 100644 data/Leipzig/E004-bracketBottom.xml
 delete mode 100644 data/Leipzig/E043-repeatDots.xml
 delete mode 100644 data/Leipzig/E044-repeatDot.xml
 delete mode 100644 data/Leipzig/E045-dalSegno.xml
 delete mode 100644 data/Leipzig/E046-daCapo.xml
 delete mode 100644 data/Leipzig/E047-segno.xml
 delete mode 100644 data/Leipzig/E048-coda.xml
 delete mode 100644 data/Leipzig/E049-codaSquare.xml
 delete mode 100644 data/Leipzig/E04B-segnoSerpent2.xml
 delete mode 100644 data/Leipzig/E050-gClef.xml
 delete mode 100644 data/Leipzig/E051-gClef15mb.xml
 delete mode 100644 data/Leipzig/E052-gClef8vb.xml
 delete mode 100644 data/Leipzig/E053-gClef8va.xml
 delete mode 100644 data/Leipzig/E054-gClef15ma.xml
 delete mode 100644 data/Leipzig/E055-gClef8vbOld.xml
 delete mode 100644 data/Leipzig/E056-gClef8vbCClef.xml
 delete mode 100644 data/Leipzig/E05C-cClef.xml
 delete mode 100644 data/Leipzig/E05D-cClef8vb.xml
 delete mode 100644 data/Leipzig/E062-fClef.xml
 delete mode 100644 data/Leipzig/E063-fClef15mb.xml
 delete mode 100644 data/Leipzig/E064-fClef8vb.xml
 delete mode 100644 data/Leipzig/E065-fClef8va.xml
 delete mode 100644 data/Leipzig/E066-fClef15ma.xml
 delete mode 100644 data/Leipzig/E069-unpitchedPercussionClef1.xml
 delete mode 100644 data/Leipzig/E06A-unpitchedPercussionClef2.xml
 delete mode 100644 data/Leipzig/E073-gClefReversed.xml
 delete mode 100644 data/Leipzig/E074-gClefTurned.xml
 delete mode 100644 data/Leipzig/E075-cClefReversed.xml
 delete mode 100644 data/Leipzig/E076-fClefReversed.xml
 delete mode 100644 data/Leipzig/E077-fClefTurned.xml
 delete mode 100644 data/Leipzig/E080-timeSig0.xml
 delete mode 100644 data/Leipzig/E081-timeSig1.xml
 delete mode 100644 data/Leipzig/E082-timeSig2.xml
 delete mode 100644 data/Leipzig/E083-timeSig3.xml
 delete mode 100644 data/Leipzig/E084-timeSig4.xml
 delete mode 100644 data/Leipzig/E085-timeSig5.xml
 delete mode 100644 data/Leipzig/E086-timeSig6.xml
 delete mode 100644 data/Leipzig/E087-timeSig7.xml
 delete mode 100644 data/Leipzig/E088-timeSig8.xml
 delete mode 100644 data/Leipzig/E089-timeSig9.xml
 delete mode 100644 data/Leipzig/E08A-timeSigCommon.xml
 delete mode 100644 data/Leipzig/E08B-timeSigCutCommon.xml
 delete mode 100644 data/Leipzig/E08C-timeSigPlus.xml
 delete mode 100644 data/Leipzig/E08D-timeSigPlusSmall.xml
 delete mode 100644 data/Leipzig/E08E-timeSigFractionalSlash.xml
 delete mode 100644 data/Leipzig/E08F-timeSigEquals.xml
 delete mode 100644 data/Leipzig/E090-timeSigMinus.xml
 delete mode 100644 data/Leipzig/E091-timeSigMultiply.xml
 delete mode 100644 data/Leipzig/E092-timeSigParensLeftSmall.xml
 delete mode 100644 data/Leipzig/E093-timeSigParensRightSmall.xml
 delete mode 100644 data/Leipzig/E094-timeSigParensLeft.xml
 delete mode 100644 data/Leipzig/E095-timeSigParensRight.xml
 delete mode 100644 data/Leipzig/E0A0-noteheadDoubleWhole.xml
 delete mode 100644 data/Leipzig/E0A1-noteheadDoubleWholeSquare.xml
 delete mode 100644 data/Leipzig/E0A2-noteheadWhole.xml
 delete mode 100644 data/Leipzig/E0A3-noteheadHalf.xml
 delete mode 100644 data/Leipzig/E0A4-noteheadBlack.xml
 delete mode 100644 data/Leipzig/E0A5-noteheadNull.xml
 delete mode 100644 data/Leipzig/E0A9-noteheadXBlack.xml
 delete mode 100644 data/Leipzig/E0AF-noteheadPlusBlack.xml
 delete mode 100644 data/Leipzig/E0B5-noteheadWholeWithX.xml
 delete mode 100644 data/Leipzig/E0B6-noteheadHalfWithX.xml
 delete mode 100644 data/Leipzig/E0B7-noteheadVoidWithX.xml
 delete mode 100644 data/Leipzig/E0D9-noteheadDiamondHalf.xml
 delete mode 100644 data/Leipzig/E0DA-noteheadDiamondHalfWide.xml
 delete mode 100644 data/Leipzig/E0DB-noteheadDiamondBlack.xml
 delete mode 100644 data/Leipzig/E0DC-noteheadDiamondBlackWide.xml
 delete mode 100644 data/Leipzig/E0DD-noteheadDiamondWhite.xml
 delete mode 100644 data/Leipzig/E0DE-noteheadDiamondWhiteWide.xml
 delete mode 100644 data/Leipzig/E0F5-noteheadParenthesisLeft.xml
 delete mode 100644 data/Leipzig/E0F6-noteheadParenthesisRight.xml
 delete mode 100644 data/Leipzig/E0FA-noteheadWholeFilled.xml
 delete mode 100644 data/Leipzig/E101-noteheadSlashHorizontalEnds.xml
 delete mode 100644 data/Leipzig/E102-noteheadSlashWhiteWhole.xml
 delete mode 100644 data/Leipzig/E103-noteheadSlashWhiteHalf.xml
 delete mode 100644 data/Leipzig/E220-tremolo1.xml
 delete mode 100644 data/Leipzig/E221-tremolo2.xml
 delete mode 100644 data/Leipzig/E222-tremolo3.xml
 delete mode 100644 data/Leipzig/E223-tremolo4.xml
 delete mode 100644 data/Leipzig/E224-tremolo5.xml
 delete mode 100644 data/Leipzig/E22A-buzzRoll.xml
 delete mode 100644 data/Leipzig/E240-flag8thUp.xml
 delete mode 100644 data/Leipzig/E241-flag8thDown.xml
 delete mode 100644 data/Leipzig/E242-flag16thUp.xml
 delete mode 100644 data/Leipzig/E243-flag16thDown.xml
 delete mode 100644 data/Leipzig/E244-flag32ndUp.xml
 delete mode 100644 data/Leipzig/E245-flag32ndDown.xml
 delete mode 100644 data/Leipzig/E246-flag64thUp.xml
 delete mode 100644 data/Leipzig/E247-flag64thDown.xml
 delete mode 100644 data/Leipzig/E248-flag128thUp.xml
 delete mode 100644 data/Leipzig/E249-flag128thDown.xml
 delete mode 100644 data/Leipzig/E24A-flag256thUp.xml
 delete mode 100644 data/Leipzig/E24B-flag256thDown.xml
 delete mode 100644 data/Leipzig/E24C-flag512thUp.xml
 delete mode 100644 data/Leipzig/E24D-flag512thDown.xml
 delete mode 100644 data/Leipzig/E24E-flag1024thUp.xml
 delete mode 100644 data/Leipzig/E24F-flag1024thDown.xml
 delete mode 100644 data/Leipzig/E260-accidentalFlat.xml
 delete mode 100644 data/Leipzig/E261-accidentalNatural.xml
 delete mode 100644 data/Leipzig/E262-accidentalSharp.xml
 delete mode 100644 data/Leipzig/E263-accidentalDoubleSharp.xml
 delete mode 100644 data/Leipzig/E264-accidentalDoubleFlat.xml
 delete mode 100644 data/Leipzig/E265-accidentalTripleSharp.xml
 delete mode 100644 data/Leipzig/E266-accidentalTripleFlat.xml
 delete mode 100644 data/Leipzig/E267-accidentalNaturalFlat.xml
 delete mode 100644 data/Leipzig/E268-accidentalNaturalSharp.xml
 delete mode 100644 data/Leipzig/E269-accidentalSharpSharp.xml
 delete mode 100644 data/Leipzig/E26A-accidentalParensLeft.xml
 delete mode 100644 data/Leipzig/E26B-accidentalParensRight.xml
 delete mode 100644 data/Leipzig/E26C-accidentalBracketLeft.xml
 delete mode 100644 data/Leipzig/E26D-accidentalBracketRight.xml
 delete mode 100644 data/Leipzig/E270-accidentalQuarterToneFlatArrowUp.xml
 delete mode 100644 data/Leipzig/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
 delete mode 100644 data/Leipzig/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
 delete mode 100644 data/Leipzig/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
 delete mode 100644 data/Leipzig/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
 delete mode 100644 data/Leipzig/E275-accidentalQuarterToneSharpArrowDown.xml
 delete mode 100644 data/Leipzig/E280-accidentalQuarterToneFlatStein.xml
 delete mode 100644 data/Leipzig/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
 delete mode 100644 data/Leipzig/E282-accidentalQuarterToneSharpStein.xml
 delete mode 100644 data/Leipzig/E283-accidentalThreeQuarterTonesSharpStein.xml
 delete mode 100644 data/Leipzig/E440-accidentalBuyukMucennebFlat.xml
 delete mode 100644 data/Leipzig/E441-accidentalKucukMucennebFlat.xml
 delete mode 100644 data/Leipzig/E442-accidentalBakiyeFlat.xml
 delete mode 100644 data/Leipzig/E443-accidentalKomaFlat.xml
 delete mode 100644 data/Leipzig/E444-accidentalKomaSharp.xml
 delete mode 100644 data/Leipzig/E445-accidentalBakiyeSharp.xml
 delete mode 100644 data/Leipzig/E446-accidentalKucukMucennebSharp.xml
 delete mode 100644 data/Leipzig/E447-accidentalBuyukMucennebSharp.xml
 delete mode 100644 data/Leipzig/E4A0-articAccentAbove.xml
 delete mode 100644 data/Leipzig/E4A1-articAccentBelow.xml
 delete mode 100644 data/Leipzig/E4A2-articStaccatoAbove.xml
 delete mode 100644 data/Leipzig/E4A3-articStaccatoBelow.xml
 delete mode 100644 data/Leipzig/E4A4-articTenutoAbove.xml
 delete mode 100644 data/Leipzig/E4A5-articTenutoBelow.xml
 delete mode 100644 data/Leipzig/E4A6-articStaccatissimoAbove.xml
 delete mode 100644 data/Leipzig/E4A7-articStaccatissimoBelow.xml
 delete mode 100644 data/Leipzig/E4A8-articStaccatissimoWedgeAbove.xml
 delete mode 100644 data/Leipzig/E4A9-articStaccatissimoWedgeBelow.xml
 delete mode 100644 data/Leipzig/E4AA-articStaccatissimoStrokeAbove.xml
 delete mode 100644 data/Leipzig/E4AB-articStaccatissimoStrokeBelow.xml
 delete mode 100644 data/Leipzig/E4AC-articMarcatoAbove.xml
 delete mode 100644 data/Leipzig/E4AD-articMarcatoBelow.xml
 delete mode 100644 data/Leipzig/E4AE-articMarcatoStaccatoAbove.xml
 delete mode 100644 data/Leipzig/E4AF-articMarcatoStaccatoBelow.xml
 delete mode 100644 data/Leipzig/E4B0-articAccentStaccatoAbove.xml
 delete mode 100644 data/Leipzig/E4B1-articAccentStaccatoBelow.xml
 delete mode 100644 data/Leipzig/E4B2-articTenutoStaccatoAbove.xml
 delete mode 100644 data/Leipzig/E4B3-articTenutoStaccatoBelow.xml
 delete mode 100644 data/Leipzig/E4B4-articTenutoAccentAbove.xml
 delete mode 100644 data/Leipzig/E4B5-articTenutoAccentBelow.xml
 delete mode 100644 data/Leipzig/E4B6-articStressAbove.xml
 delete mode 100644 data/Leipzig/E4B7-articStressBelow.xml
 delete mode 100644 data/Leipzig/E4B8-articUnstressAbove.xml
 delete mode 100644 data/Leipzig/E4B9-articUnstressBelow.xml
 delete mode 100644 data/Leipzig/E4BA-articLaissezVibrerAbove.xml
 delete mode 100644 data/Leipzig/E4BB-articLaissezVibrerBelow.xml
 delete mode 100644 data/Leipzig/E4BC-articMarcatoTenutoAbove.xml
 delete mode 100644 data/Leipzig/E4BD-articMarcatoTenutoBelow.xml
 delete mode 100644 data/Leipzig/E4C0-fermataAbove.xml
 delete mode 100644 data/Leipzig/E4C1-fermataBelow.xml
 delete mode 100644 data/Leipzig/E4C2-fermataVeryShortAbove.xml
 delete mode 100644 data/Leipzig/E4C3-fermataVeryShortBelow.xml
 delete mode 100644 data/Leipzig/E4C4-fermataShortAbove.xml
 delete mode 100644 data/Leipzig/E4C5-fermataShortBelow.xml
 delete mode 100644 data/Leipzig/E4C6-fermataLongAbove.xml
 delete mode 100644 data/Leipzig/E4C7-fermataLongBelow.xml
 delete mode 100644 data/Leipzig/E4C8-fermataVeryLongAbove.xml
 delete mode 100644 data/Leipzig/E4C9-fermataVeryLongBelow.xml
 delete mode 100644 data/Leipzig/E4CE-breathMarkComma.xml
 delete mode 100644 data/Leipzig/E4E0-restMaxima.xml
 delete mode 100644 data/Leipzig/E4E1-restLonga.xml
 delete mode 100644 data/Leipzig/E4E2-restDoubleWhole.xml
 delete mode 100644 data/Leipzig/E4E3-restWhole.xml
 delete mode 100644 data/Leipzig/E4E4-restHalf.xml
 delete mode 100644 data/Leipzig/E4E5-restQuarter.xml
 delete mode 100644 data/Leipzig/E4E6-rest8th.xml
 delete mode 100644 data/Leipzig/E4E7-rest16th.xml
 delete mode 100644 data/Leipzig/E4E8-rest32nd.xml
 delete mode 100644 data/Leipzig/E4E9-rest64th.xml
 delete mode 100644 data/Leipzig/E4EA-rest128th.xml
 delete mode 100644 data/Leipzig/E4EB-rest256th.xml
 delete mode 100644 data/Leipzig/E4EC-rest512th.xml
 delete mode 100644 data/Leipzig/E4ED-rest1024th.xml
 delete mode 100644 data/Leipzig/E4F2-restQuarterOld.xml
 delete mode 100644 data/Leipzig/E4F6-restQuarterZ.xml
 delete mode 100644 data/Leipzig/E500-repeat1Bar.xml
 delete mode 100644 data/Leipzig/E501-repeat2Bars.xml
 delete mode 100644 data/Leipzig/E502-repeat4Bars.xml
 delete mode 100644 data/Leipzig/E503-repeatBarUpperDot.xml
 delete mode 100644 data/Leipzig/E504-repeatBarSlash.xml
 delete mode 100644 data/Leipzig/E505-repeatBarLowerDot.xml
 delete mode 100644 data/Leipzig/E510-ottava.xml
 delete mode 100644 data/Leipzig/E511-ottavaAlta.xml
 delete mode 100644 data/Leipzig/E512-ottavaBassa.xml
 delete mode 100644 data/Leipzig/E513-ottavaBassaBa.xml
 delete mode 100644 data/Leipzig/E514-quindicesima.xml
 delete mode 100644 data/Leipzig/E515-quindicesimaAlta.xml
 delete mode 100644 data/Leipzig/E516-quindicesimaBassa.xml
 delete mode 100644 data/Leipzig/E517-ventiduesima.xml
 delete mode 100644 data/Leipzig/E518-ventiduesimaAlta.xml
 delete mode 100644 data/Leipzig/E519-ventiduesimaBassa.xml
 delete mode 100644 data/Leipzig/E51A-octaveParensLeft.xml
 delete mode 100644 data/Leipzig/E51B-octaveParensRight.xml
 delete mode 100644 data/Leipzig/E51C-ottavaBassaVb.xml
 delete mode 100644 data/Leipzig/E51D-quindicesimaBassaMb.xml
 delete mode 100644 data/Leipzig/E51E-ventiduesimaBassaMb.xml
 delete mode 100644 data/Leipzig/E520-dynamicPiano.xml
 delete mode 100644 data/Leipzig/E521-dynamicMezzo.xml
 delete mode 100644 data/Leipzig/E522-dynamicForte.xml
 delete mode 100644 data/Leipzig/E523-dynamicRinforzando.xml
 delete mode 100644 data/Leipzig/E524-dynamicSforzando.xml
 delete mode 100644 data/Leipzig/E525-dynamicZ.xml
 delete mode 100644 data/Leipzig/E526-dynamicNiente.xml
 delete mode 100644 data/Leipzig/E527-dynamicPPPPPP.xml
 delete mode 100644 data/Leipzig/E528-dynamicPPPPP.xml
 delete mode 100644 data/Leipzig/E529-dynamicPPPP.xml
 delete mode 100644 data/Leipzig/E52A-dynamicPPP.xml
 delete mode 100644 data/Leipzig/E52B-dynamicPP.xml
 delete mode 100644 data/Leipzig/E52C-dynamicMP.xml
 delete mode 100644 data/Leipzig/E52D-dynamicMF.xml
 delete mode 100644 data/Leipzig/E52E-dynamicPF.xml
 delete mode 100644 data/Leipzig/E52F-dynamicFF.xml
 delete mode 100644 data/Leipzig/E530-dynamicFFF.xml
 delete mode 100644 data/Leipzig/E531-dynamicFFFF.xml
 delete mode 100644 data/Leipzig/E532-dynamicFFFFF.xml
 delete mode 100644 data/Leipzig/E533-dynamicFFFFFF.xml
 delete mode 100644 data/Leipzig/E534-dynamicFortePiano.xml
 delete mode 100644 data/Leipzig/E535-dynamicForzando.xml
 delete mode 100644 data/Leipzig/E536-dynamicSforzando1.xml
 delete mode 100644 data/Leipzig/E537-dynamicSforzandoPiano.xml
 delete mode 100644 data/Leipzig/E538-dynamicSforzandoPianissimo.xml
 delete mode 100644 data/Leipzig/E539-dynamicSforzato.xml
 delete mode 100644 data/Leipzig/E53A-dynamicSforzatoPiano.xml
 delete mode 100644 data/Leipzig/E53B-dynamicSforzatoFF.xml
 delete mode 100644 data/Leipzig/E53C-dynamicRinforzando1.xml
 delete mode 100644 data/Leipzig/E53D-dynamicRinforzando2.xml
 delete mode 100644 data/Leipzig/E566-ornamentTrill.xml
 delete mode 100644 data/Leipzig/E567-ornamentTurn.xml
 delete mode 100644 data/Leipzig/E568-ornamentTurnInverted.xml
 delete mode 100644 data/Leipzig/E569-ornamentTurnSlash.xml
 delete mode 100644 data/Leipzig/E56A-ornamentTurnUp.xml
 delete mode 100644 data/Leipzig/E56B-ornamentTurnUpS.xml
 delete mode 100644 data/Leipzig/E56C-ornamentShortTrill.xml
 delete mode 100644 data/Leipzig/E56D-ornamentMordent.xml
 delete mode 100644 data/Leipzig/E56E-ornamentTremblement.xml
 delete mode 100644 data/Leipzig/E56F-ornamentHaydn.xml
 delete mode 100644 data/Leipzig/E583-ornamentVerticalLine.xml
 delete mode 100644 data/Leipzig/E587-ornamentSchleifer.xml
 delete mode 100644 data/Leipzig/E59D-ornamentZigZagLineNoRightEnd.xml
 delete mode 100644 data/Leipzig/E59E-ornamentZigZagLineWithRightEnd.xml
 delete mode 100644 data/Leipzig/E5B0-ornamentPrecompSlide.xml
 delete mode 100644 data/Leipzig/E5B1-ornamentPrecompDescendingSlide.xml
 delete mode 100644 data/Leipzig/E5B2-ornamentPrecompAppoggTrill.xml
 delete mode 100644 data/Leipzig/E5B3-ornamentPrecompAppoggTrillSuffix.xml
 delete mode 100644 data/Leipzig/E5B4-ornamentPrecompTurnTrillDAnglebert.xml
 delete mode 100644 data/Leipzig/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
 delete mode 100644 data/Leipzig/E5B6-ornamentPrecompSlideTrillMarpurg.xml
 delete mode 100644 data/Leipzig/E5B7-ornamentPrecompTurnTrillBach.xml
 delete mode 100644 data/Leipzig/E5B8-ornamentPrecompSlideTrillBach.xml
 delete mode 100644 data/Leipzig/E5B9-ornamentPrecompSlideTrillMuffat.xml
 delete mode 100644 data/Leipzig/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml
 delete mode 100644 data/Leipzig/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
 delete mode 100644 data/Leipzig/E5BC-ornamentPrecompPortDeVoixMordent.xml
 delete mode 100644 data/Leipzig/E5BD-ornamentPrecompTrillWithMordent.xml
 delete mode 100644 data/Leipzig/E5BE-ornamentPrecompCadence.xml
 delete mode 100644 data/Leipzig/E5BF-ornamentPrecompCadenceWithTurn.xml
 delete mode 100644 data/Leipzig/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
 delete mode 100644 data/Leipzig/E5C1-ornamentPrecompCadenceUpperPrefix.xml
 delete mode 100644 data/Leipzig/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml
 delete mode 100644 data/Leipzig/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
 delete mode 100644 data/Leipzig/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml
 delete mode 100644 data/Leipzig/E5C5-ornamentPrecompMordentRelease.xml
 delete mode 100644 data/Leipzig/E5C6-ornamentPrecompMordentUpperPrefix.xml
 delete mode 100644 data/Leipzig/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
 delete mode 100644 data/Leipzig/E5C8-ornamentPrecompTrillLowerSuffix.xml
 delete mode 100644 data/Leipzig/E5E5-brassMuteClosed.xml
 delete mode 100644 data/Leipzig/E5E6-brassMuteHalfClosed.xml
 delete mode 100644 data/Leipzig/E5E7-brassMuteOpen.xml
 delete mode 100644 data/Leipzig/E610-stringsDownBow.xml
 delete mode 100644 data/Leipzig/E611-stringsDownBowTurned.xml
 delete mode 100644 data/Leipzig/E612-stringsUpBow.xml
 delete mode 100644 data/Leipzig/E613-stringsUpBowTurned.xml
 delete mode 100644 data/Leipzig/E614-stringsHarmonic.xml
 delete mode 100644 data/Leipzig/E630-pluckedSnapPizzicatoBelow.xml
 delete mode 100644 data/Leipzig/E631-pluckedSnapPizzicatoAbove.xml
 delete mode 100644 data/Leipzig/E632-pluckedBuzzPizzicato.xml
 delete mode 100644 data/Leipzig/E633-pluckedLeftHandPizzicato.xml
 delete mode 100644 data/Leipzig/E638-pluckedDamp.xml
 delete mode 100644 data/Leipzig/E645-vocalSprechgesang.xml
 delete mode 100644 data/Leipzig/E650-keyboardPedalPed.xml
 delete mode 100644 data/Leipzig/E651-keyboardPedalP.xml
 delete mode 100644 data/Leipzig/E655-keyboardPedalUp.xml
 delete mode 100644 data/Leipzig/E659-keyboardPedalSost.xml
 delete mode 100644 data/Leipzig/E65A-keyboardPedalS.xml
 delete mode 100644 data/Leipzig/E880-tuplet0.xml
 delete mode 100644 data/Leipzig/E881-tuplet1.xml
 delete mode 100644 data/Leipzig/E882-tuplet2.xml
 delete mode 100644 data/Leipzig/E883-tuplet3.xml
 delete mode 100644 data/Leipzig/E884-tuplet4.xml
 delete mode 100644 data/Leipzig/E885-tuplet5.xml
 delete mode 100644 data/Leipzig/E886-tuplet6.xml
 delete mode 100644 data/Leipzig/E887-tuplet7.xml
 delete mode 100644 data/Leipzig/E888-tuplet8.xml
 delete mode 100644 data/Leipzig/E889-tuplet9.xml
 delete mode 100644 data/Leipzig/E88A-tupletColon.xml
 delete mode 100644 data/Leipzig/E901-mensuralGclefPetrucci.xml
 delete mode 100644 data/Leipzig/E902-chantFclef.xml
 delete mode 100644 data/Leipzig/E904-mensuralFclefPetrucci.xml
 delete mode 100644 data/Leipzig/E906-chantCclef.xml
 delete mode 100644 data/Leipzig/E907-mensuralCclefPetrucciPosLowest.xml
 delete mode 100644 data/Leipzig/E908-mensuralCclefPetrucciPosLow.xml
 delete mode 100644 data/Leipzig/E909-mensuralCclefPetrucciPosMiddle.xml
 delete mode 100644 data/Leipzig/E90A-mensuralCclefPetrucciPosHigh.xml
 delete mode 100644 data/Leipzig/E90B-mensuralCclefPetrucciPosHighest.xml
 delete mode 100644 data/Leipzig/E910-mensuralProlation1.xml
 delete mode 100644 data/Leipzig/E911-mensuralProlation2.xml
 delete mode 100644 data/Leipzig/E912-mensuralProlation3.xml
 delete mode 100644 data/Leipzig/E913-mensuralProlation4.xml
 delete mode 100644 data/Leipzig/E914-mensuralProlation5.xml
 delete mode 100644 data/Leipzig/E915-mensuralProlation6.xml
 delete mode 100644 data/Leipzig/E916-mensuralProlation7.xml
 delete mode 100644 data/Leipzig/E917-mensuralProlation8.xml
 delete mode 100644 data/Leipzig/E918-mensuralProlation9.xml
 delete mode 100644 data/Leipzig/E919-mensuralProlation10.xml
 delete mode 100644 data/Leipzig/E91A-mensuralProlation11.xml
 delete mode 100644 data/Leipzig/E91B-mensuralProportionTempusPerfectum.xml
 delete mode 100644 data/Leipzig/E91C-mensuralProportionProportioDupla1.xml
 delete mode 100644 data/Leipzig/E91D-mensuralProportionProportioDupla2.xml
 delete mode 100644 data/Leipzig/E91E-mensuralProportionProportioTripla.xml
 delete mode 100644 data/Leipzig/E91F-mensuralProportionProportioQuadrupla.xml
 delete mode 100644 data/Leipzig/E920-mensuralProlationCombiningDot.xml
 delete mode 100644 data/Leipzig/E921-mensuralProlationCombiningTwoDots.xml
 delete mode 100644 data/Leipzig/E922-mensuralProlationCombiningThreeDots.xml
 delete mode 100644 data/Leipzig/E923-mensuralProlationCombiningThreeDotsTri.xml
 delete mode 100644 data/Leipzig/E924-mensuralProlationCombiningDotVoid.xml
 delete mode 100644 data/Leipzig/E925-mensuralProlationCombiningStroke.xml
 delete mode 100644 data/Leipzig/E938-mensuralNoteheadSemibrevisBlack.xml
 delete mode 100644 data/Leipzig/E939-mensuralNoteheadSemibrevisVoid.xml
 delete mode 100644 data/Leipzig/E93C-mensuralNoteheadMinimaWhite.xml
 delete mode 100644 data/Leipzig/E93D-mensuralNoteheadSemiminimaWhite.xml
 delete mode 100644 data/Leipzig/E93E-mensuralCombStemUp.xml
 delete mode 100644 data/Leipzig/E93F-mensuralCombStemDown.xml
 delete mode 100644 data/Leipzig/E949-mensuralCombStemUpFlagSemiminima.xml
 delete mode 100644 data/Leipzig/E94A-mensuralCombStemDownFlagSemiminima.xml
 delete mode 100644 data/Leipzig/E94B-mensuralCombStemUpFlagFusa.xml
 delete mode 100644 data/Leipzig/E94C-mensuralCombStemDownFlagFusa.xml
 delete mode 100644 data/Leipzig/E9E0-medRenFlatSoftB.xml
 delete mode 100644 data/Leipzig/E9E1-medRenFlatHardB.xml
 delete mode 100644 data/Leipzig/E9E2-medRenNatural.xml
 delete mode 100644 data/Leipzig/E9E3-medRenSharpCroix.xml
 delete mode 100644 data/Leipzig/E9F0-mensuralRestMaxima.xml
 delete mode 100644 data/Leipzig/E9F1-mensuralRestLongaPerfecta.xml
 delete mode 100644 data/Leipzig/E9F2-mensuralRestLongaImperfecta.xml
 delete mode 100644 data/Leipzig/E9F3-mensuralRestBrevis.xml
 delete mode 100644 data/Leipzig/E9F4-mensuralRestSemibrevis.xml
 delete mode 100644 data/Leipzig/E9F5-mensuralRestMinima.xml
 delete mode 100644 data/Leipzig/E9F6-mensuralRestSemiminima.xml
 delete mode 100644 data/Leipzig/E9F7-mensuralRestFusa.xml
 delete mode 100644 data/Leipzig/E9F8-mensuralRestSemifusa.xml
 delete mode 100644 data/Leipzig/EA02-mensuralCustosUp.xml
 delete mode 100644 data/Leipzig/EA06-chantCustosStemUpPosMiddle.xml
 delete mode 100644 data/Leipzig/EAA4-wiggleTrill.xml
 delete mode 100644 data/Leipzig/EAA9-wiggleArpeggiatoUp.xml
 delete mode 100644 data/Leipzig/EAAA-wiggleArpeggiatoDown.xml
 delete mode 100644 data/Leipzig/EAAD-wiggleArpeggiatoUpArrow.xml
 delete mode 100644 data/Leipzig/EAAE-wiggleArpeggiatoDownArrow.xml
 delete mode 100644 data/Leipzig/EAAF-wiggleGlissando.xml
 delete mode 100644 data/Leipzig/EBA7-luteDurationWhole.xml
 delete mode 100644 data/Leipzig/EBA8-luteDurationHalf.xml
 delete mode 100644 data/Leipzig/EBA9-luteDurationQuarter.xml
 delete mode 100644 data/Leipzig/EBAA-luteDuration8th.xml
 delete mode 100644 data/Leipzig/EBAB-luteDuration16th.xml
 delete mode 100644 data/Leipzig/EBAC-luteDuration32nd.xml
 delete mode 100644 data/Leipzig/EBC0-luteFrenchFretA.xml
 delete mode 100644 data/Leipzig/EBC1-luteFrenchFretB.xml
 delete mode 100644 data/Leipzig/EBC2-luteFrenchFretC.xml
 delete mode 100644 data/Leipzig/EBC3-luteFrenchFretD.xml
 delete mode 100644 data/Leipzig/EBC4-luteFrenchFretE.xml
 delete mode 100644 data/Leipzig/EBC5-luteFrenchFretF.xml
 delete mode 100644 data/Leipzig/EBC6-luteFrenchFretG.xml
 delete mode 100644 data/Leipzig/EBC7-luteFrenchFretH.xml
 delete mode 100644 data/Leipzig/EBC8-luteFrenchFretI.xml
 delete mode 100644 data/Leipzig/EBC9-luteFrenchFretK.xml
 delete mode 100644 data/Leipzig/EBCA-luteFrenchFretL.xml
 delete mode 100644 data/Leipzig/EBCB-luteFrenchFretM.xml
 delete mode 100644 data/Leipzig/EBCC-luteFrenchFretN.xml
 delete mode 100644 data/Leipzig/EBE0-luteItalianFret0.xml
 delete mode 100644 data/Leipzig/EBE1-luteItalianFret1.xml
 delete mode 100644 data/Leipzig/EBE2-luteItalianFret2.xml
 delete mode 100644 data/Leipzig/EBE3-luteItalianFret3.xml
 delete mode 100644 data/Leipzig/EBE4-luteItalianFret4.xml
 delete mode 100644 data/Leipzig/EBE5-luteItalianFret5.xml
 delete mode 100644 data/Leipzig/EBE6-luteItalianFret6.xml
 delete mode 100644 data/Leipzig/EBE7-luteItalianFret7.xml
 delete mode 100644 data/Leipzig/EBE8-luteItalianFret8.xml
 delete mode 100644 data/Leipzig/EBE9-luteItalianFret9.xml
 delete mode 100644 data/Leipzig/ED40-articSoftAccentAbove.xml
 delete mode 100644 data/Leipzig/ED41-articSoftAccentBelow.xml
 delete mode 100644 data/Leland.xml
 delete mode 100644 data/Leland/E000-brace.xml
 delete mode 100644 data/Leland/E003-bracketTop.xml
 delete mode 100644 data/Leland/E004-bracketBottom.xml
 delete mode 100644 data/Leland/E043-repeatDots.xml
 delete mode 100644 data/Leland/E044-repeatDot.xml
 delete mode 100644 data/Leland/E047-segno.xml
 delete mode 100644 data/Leland/E048-coda.xml
 delete mode 100644 data/Leland/E049-codaSquare.xml
 delete mode 100644 data/Leland/E04B-segnoSerpent2.xml
 delete mode 100644 data/Leland/E050-gClef.xml
 delete mode 100644 data/Leland/E051-gClef15mb.xml
 delete mode 100644 data/Leland/E052-gClef8vb.xml
 delete mode 100644 data/Leland/E053-gClef8va.xml
 delete mode 100644 data/Leland/E054-gClef15ma.xml
 delete mode 100644 data/Leland/E055-gClef8vbOld.xml
 delete mode 100644 data/Leland/E05C-cClef.xml
 delete mode 100644 data/Leland/E05D-cClef8vb.xml
 delete mode 100644 data/Leland/E062-fClef.xml
 delete mode 100644 data/Leland/E063-fClef15mb.xml
 delete mode 100644 data/Leland/E064-fClef8vb.xml
 delete mode 100644 data/Leland/E065-fClef8va.xml
 delete mode 100644 data/Leland/E066-fClef15ma.xml
 delete mode 100644 data/Leland/E069-unpitchedPercussionClef1.xml
 delete mode 100644 data/Leland/E06A-unpitchedPercussionClef2.xml
 delete mode 100644 data/Leland/E080-timeSig0.xml
 delete mode 100644 data/Leland/E081-timeSig1.xml
 delete mode 100644 data/Leland/E082-timeSig2.xml
 delete mode 100644 data/Leland/E083-timeSig3.xml
 delete mode 100644 data/Leland/E084-timeSig4.xml
 delete mode 100644 data/Leland/E085-timeSig5.xml
 delete mode 100644 data/Leland/E086-timeSig6.xml
 delete mode 100644 data/Leland/E087-timeSig7.xml
 delete mode 100644 data/Leland/E088-timeSig8.xml
 delete mode 100644 data/Leland/E089-timeSig9.xml
 delete mode 100644 data/Leland/E08A-timeSigCommon.xml
 delete mode 100644 data/Leland/E08B-timeSigCutCommon.xml
 delete mode 100644 data/Leland/E08C-timeSigPlus.xml
 delete mode 100644 data/Leland/E0A0-noteheadDoubleWhole.xml
 delete mode 100644 data/Leland/E0A1-noteheadDoubleWholeSquare.xml
 delete mode 100644 data/Leland/E0A2-noteheadWhole.xml
 delete mode 100644 data/Leland/E0A3-noteheadHalf.xml
 delete mode 100644 data/Leland/E0A4-noteheadBlack.xml
 delete mode 100644 data/Leland/E0A5-noteheadNull.xml
 delete mode 100644 data/Leland/E0A9-noteheadXBlack.xml
 delete mode 100644 data/Leland/E0AF-noteheadPlusBlack.xml
 delete mode 100644 data/Leland/E0D9-noteheadDiamondHalf.xml
 delete mode 100644 data/Leland/E0DB-noteheadDiamondBlack.xml
 delete mode 100644 data/Leland/E0F5-noteheadParenthesisLeft.xml
 delete mode 100644 data/Leland/E0F6-noteheadParenthesisRight.xml
 delete mode 100644 data/Leland/E220-tremolo1.xml
 delete mode 100644 data/Leland/E221-tremolo2.xml
 delete mode 100644 data/Leland/E222-tremolo3.xml
 delete mode 100644 data/Leland/E223-tremolo4.xml
 delete mode 100644 data/Leland/E224-tremolo5.xml
 delete mode 100644 data/Leland/E22A-buzzRoll.xml
 delete mode 100644 data/Leland/E240-flag8thUp.xml
 delete mode 100644 data/Leland/E241-flag8thDown.xml
 delete mode 100644 data/Leland/E242-flag16thUp.xml
 delete mode 100644 data/Leland/E243-flag16thDown.xml
 delete mode 100644 data/Leland/E244-flag32ndUp.xml
 delete mode 100644 data/Leland/E245-flag32ndDown.xml
 delete mode 100644 data/Leland/E246-flag64thUp.xml
 delete mode 100644 data/Leland/E247-flag64thDown.xml
 delete mode 100644 data/Leland/E248-flag128thUp.xml
 delete mode 100644 data/Leland/E249-flag128thDown.xml
 delete mode 100644 data/Leland/E24A-flag256thUp.xml
 delete mode 100644 data/Leland/E24B-flag256thDown.xml
 delete mode 100644 data/Leland/E24C-flag512thUp.xml
 delete mode 100644 data/Leland/E24D-flag512thDown.xml
 delete mode 100644 data/Leland/E24E-flag1024thUp.xml
 delete mode 100644 data/Leland/E24F-flag1024thDown.xml
 delete mode 100644 data/Leland/E260-accidentalFlat.xml
 delete mode 100644 data/Leland/E261-accidentalNatural.xml
 delete mode 100644 data/Leland/E262-accidentalSharp.xml
 delete mode 100644 data/Leland/E263-accidentalDoubleSharp.xml
 delete mode 100644 data/Leland/E264-accidentalDoubleFlat.xml
 delete mode 100644 data/Leland/E265-accidentalTripleSharp.xml
 delete mode 100644 data/Leland/E266-accidentalTripleFlat.xml
 delete mode 100644 data/Leland/E267-accidentalNaturalFlat.xml
 delete mode 100644 data/Leland/E268-accidentalNaturalSharp.xml
 delete mode 100644 data/Leland/E269-accidentalSharpSharp.xml
 delete mode 100644 data/Leland/E26A-accidentalParensLeft.xml
 delete mode 100644 data/Leland/E26B-accidentalParensRight.xml
 delete mode 100644 data/Leland/E26C-accidentalBracketLeft.xml
 delete mode 100644 data/Leland/E26D-accidentalBracketRight.xml
 delete mode 100644 data/Leland/E270-accidentalQuarterToneFlatArrowUp.xml
 delete mode 100644 data/Leland/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
 delete mode 100644 data/Leland/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
 delete mode 100644 data/Leland/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
 delete mode 100644 data/Leland/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
 delete mode 100644 data/Leland/E275-accidentalQuarterToneSharpArrowDown.xml
 delete mode 100644 data/Leland/E280-accidentalQuarterToneFlatStein.xml
 delete mode 100644 data/Leland/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
 delete mode 100644 data/Leland/E282-accidentalQuarterToneSharpStein.xml
 delete mode 100644 data/Leland/E283-accidentalThreeQuarterTonesSharpStein.xml
 delete mode 100644 data/Leland/E440-accidentalBuyukMucennebFlat.xml
 delete mode 100644 data/Leland/E442-accidentalBakiyeFlat.xml
 delete mode 100644 data/Leland/E446-accidentalKucukMucennebSharp.xml
 delete mode 100644 data/Leland/E447-accidentalBuyukMucennebSharp.xml
 delete mode 100644 data/Leland/E4A0-articAccentAbove.xml
 delete mode 100644 data/Leland/E4A1-articAccentBelow.xml
 delete mode 100644 data/Leland/E4A2-articStaccatoAbove.xml
 delete mode 100644 data/Leland/E4A3-articStaccatoBelow.xml
 delete mode 100644 data/Leland/E4A4-articTenutoAbove.xml
 delete mode 100644 data/Leland/E4A5-articTenutoBelow.xml
 delete mode 100644 data/Leland/E4A6-articStaccatissimoAbove.xml
 delete mode 100644 data/Leland/E4A7-articStaccatissimoBelow.xml
 delete mode 100644 data/Leland/E4A8-articStaccatissimoWedgeAbove.xml
 delete mode 100644 data/Leland/E4A9-articStaccatissimoWedgeBelow.xml
 delete mode 100644 data/Leland/E4AC-articMarcatoAbove.xml
 delete mode 100644 data/Leland/E4AD-articMarcatoBelow.xml
 delete mode 100644 data/Leland/E4AE-articMarcatoStaccatoAbove.xml
 delete mode 100644 data/Leland/E4AF-articMarcatoStaccatoBelow.xml
 delete mode 100644 data/Leland/E4B0-articAccentStaccatoAbove.xml
 delete mode 100644 data/Leland/E4B1-articAccentStaccatoBelow.xml
 delete mode 100644 data/Leland/E4B2-articTenutoStaccatoAbove.xml
 delete mode 100644 data/Leland/E4B3-articTenutoStaccatoBelow.xml
 delete mode 100644 data/Leland/E4B4-articTenutoAccentAbove.xml
 delete mode 100644 data/Leland/E4B5-articTenutoAccentBelow.xml
 delete mode 100644 data/Leland/E4B6-articStressAbove.xml
 delete mode 100644 data/Leland/E4B7-articStressBelow.xml
 delete mode 100644 data/Leland/E4B8-articUnstressAbove.xml
 delete mode 100644 data/Leland/E4B9-articUnstressBelow.xml
 delete mode 100644 data/Leland/E4BA-articLaissezVibrerAbove.xml
 delete mode 100644 data/Leland/E4BB-articLaissezVibrerBelow.xml
 delete mode 100644 data/Leland/E4BC-articMarcatoTenutoAbove.xml
 delete mode 100644 data/Leland/E4BD-articMarcatoTenutoBelow.xml
 delete mode 100644 data/Leland/E4C0-fermataAbove.xml
 delete mode 100644 data/Leland/E4C1-fermataBelow.xml
 delete mode 100644 data/Leland/E4C4-fermataShortAbove.xml
 delete mode 100644 data/Leland/E4C5-fermataShortBelow.xml
 delete mode 100644 data/Leland/E4C6-fermataLongAbove.xml
 delete mode 100644 data/Leland/E4C7-fermataLongBelow.xml
 delete mode 100644 data/Leland/E4C8-fermataVeryLongAbove.xml
 delete mode 100644 data/Leland/E4C9-fermataVeryLongBelow.xml
 delete mode 100644 data/Leland/E4CE-breathMarkComma.xml
 delete mode 100644 data/Leland/E4E0-restMaxima.xml
 delete mode 100644 data/Leland/E4E1-restLonga.xml
 delete mode 100644 data/Leland/E4E2-restDoubleWhole.xml
 delete mode 100644 data/Leland/E4E3-restWhole.xml
 delete mode 100644 data/Leland/E4E4-restHalf.xml
 delete mode 100644 data/Leland/E4E5-restQuarter.xml
 delete mode 100644 data/Leland/E4E6-rest8th.xml
 delete mode 100644 data/Leland/E4E7-rest16th.xml
 delete mode 100644 data/Leland/E4E8-rest32nd.xml
 delete mode 100644 data/Leland/E4E9-rest64th.xml
 delete mode 100644 data/Leland/E4EA-rest128th.xml
 delete mode 100644 data/Leland/E4EB-rest256th.xml
 delete mode 100644 data/Leland/E4EC-rest512th.xml
 delete mode 100644 data/Leland/E4ED-rest1024th.xml
 delete mode 100644 data/Leland/E4F2-restQuarterOld.xml
 delete mode 100644 data/Leland/E4F6-restQuarterZ.xml
 delete mode 100644 data/Leland/E500-repeat1Bar.xml
 delete mode 100644 data/Leland/E501-repeat2Bars.xml
 delete mode 100644 data/Leland/E502-repeat4Bars.xml
 delete mode 100644 data/Leland/E503-repeatBarUpperDot.xml
 delete mode 100644 data/Leland/E504-repeatBarSlash.xml
 delete mode 100644 data/Leland/E505-repeatBarLowerDot.xml
 delete mode 100644 data/Leland/E510-ottava.xml
 delete mode 100644 data/Leland/E511-ottavaAlta.xml
 delete mode 100644 data/Leland/E512-ottavaBassa.xml
 delete mode 100644 data/Leland/E513-ottavaBassaBa.xml
 delete mode 100644 data/Leland/E514-quindicesima.xml
 delete mode 100644 data/Leland/E515-quindicesimaAlta.xml
 delete mode 100644 data/Leland/E516-quindicesimaBassa.xml
 delete mode 100644 data/Leland/E517-ventiduesima.xml
 delete mode 100644 data/Leland/E518-ventiduesimaAlta.xml
 delete mode 100644 data/Leland/E519-ventiduesimaBassa.xml
 delete mode 100644 data/Leland/E51A-octaveParensLeft.xml
 delete mode 100644 data/Leland/E51B-octaveParensRight.xml
 delete mode 100644 data/Leland/E51C-ottavaBassaVb.xml
 delete mode 100644 data/Leland/E51D-quindicesimaBassaMb.xml
 delete mode 100644 data/Leland/E51E-ventiduesimaBassaMb.xml
 delete mode 100644 data/Leland/E520-dynamicPiano.xml
 delete mode 100644 data/Leland/E521-dynamicMezzo.xml
 delete mode 100644 data/Leland/E522-dynamicForte.xml
 delete mode 100644 data/Leland/E523-dynamicRinforzando.xml
 delete mode 100644 data/Leland/E524-dynamicSforzando.xml
 delete mode 100644 data/Leland/E525-dynamicZ.xml
 delete mode 100644 data/Leland/E526-dynamicNiente.xml
 delete mode 100644 data/Leland/E527-dynamicPPPPPP.xml
 delete mode 100644 data/Leland/E528-dynamicPPPPP.xml
 delete mode 100644 data/Leland/E529-dynamicPPPP.xml
 delete mode 100644 data/Leland/E52A-dynamicPPP.xml
 delete mode 100644 data/Leland/E52B-dynamicPP.xml
 delete mode 100644 data/Leland/E52C-dynamicMP.xml
 delete mode 100644 data/Leland/E52D-dynamicMF.xml
 delete mode 100644 data/Leland/E52E-dynamicPF.xml
 delete mode 100644 data/Leland/E52F-dynamicFF.xml
 delete mode 100644 data/Leland/E530-dynamicFFF.xml
 delete mode 100644 data/Leland/E531-dynamicFFFF.xml
 delete mode 100644 data/Leland/E532-dynamicFFFFF.xml
 delete mode 100644 data/Leland/E533-dynamicFFFFFF.xml
 delete mode 100644 data/Leland/E534-dynamicFortePiano.xml
 delete mode 100644 data/Leland/E535-dynamicForzando.xml
 delete mode 100644 data/Leland/E536-dynamicSforzando1.xml
 delete mode 100644 data/Leland/E537-dynamicSforzandoPiano.xml
 delete mode 100644 data/Leland/E538-dynamicSforzandoPianissimo.xml
 delete mode 100644 data/Leland/E539-dynamicSforzato.xml
 delete mode 100644 data/Leland/E53A-dynamicSforzatoPiano.xml
 delete mode 100644 data/Leland/E53B-dynamicSforzatoFF.xml
 delete mode 100644 data/Leland/E53C-dynamicRinforzando1.xml
 delete mode 100644 data/Leland/E53D-dynamicRinforzando2.xml
 delete mode 100644 data/Leland/E566-ornamentTrill.xml
 delete mode 100644 data/Leland/E567-ornamentTurn.xml
 delete mode 100644 data/Leland/E568-ornamentTurnInverted.xml
 delete mode 100644 data/Leland/E569-ornamentTurnSlash.xml
 delete mode 100644 data/Leland/E56A-ornamentTurnUp.xml
 delete mode 100644 data/Leland/E56B-ornamentTurnUpS.xml
 delete mode 100644 data/Leland/E56C-ornamentShortTrill.xml
 delete mode 100644 data/Leland/E56D-ornamentMordent.xml
 delete mode 100644 data/Leland/E56E-ornamentTremblement.xml
 delete mode 100644 data/Leland/E56F-ornamentHaydn.xml
 delete mode 100644 data/Leland/E583-ornamentVerticalLine.xml
 delete mode 100644 data/Leland/E587-ornamentSchleifer.xml
 delete mode 100644 data/Leland/E59D-ornamentZigZagLineNoRightEnd.xml
 delete mode 100644 data/Leland/E59E-ornamentZigZagLineWithRightEnd.xml
 delete mode 100644 data/Leland/E5B2-ornamentPrecompAppoggTrill.xml
 delete mode 100644 data/Leland/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
 delete mode 100644 data/Leland/E5B8-ornamentPrecompSlideTrillBach.xml
 delete mode 100644 data/Leland/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
 delete mode 100644 data/Leland/E5BC-ornamentPrecompPortDeVoixMordent.xml
 delete mode 100644 data/Leland/E5BD-ornamentPrecompTrillWithMordent.xml
 delete mode 100644 data/Leland/E5BE-ornamentPrecompCadence.xml
 delete mode 100644 data/Leland/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
 delete mode 100644 data/Leland/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
 delete mode 100644 data/Leland/E5C6-ornamentPrecompMordentUpperPrefix.xml
 delete mode 100644 data/Leland/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
 delete mode 100644 data/Leland/E5C8-ornamentPrecompTrillLowerSuffix.xml
 delete mode 100644 data/Leland/E5E5-brassMuteClosed.xml
 delete mode 100644 data/Leland/E5E6-brassMuteHalfClosed.xml
 delete mode 100644 data/Leland/E5E7-brassMuteOpen.xml
 delete mode 100644 data/Leland/E610-stringsDownBow.xml
 delete mode 100644 data/Leland/E611-stringsDownBowTurned.xml
 delete mode 100644 data/Leland/E612-stringsUpBow.xml
 delete mode 100644 data/Leland/E613-stringsUpBowTurned.xml
 delete mode 100644 data/Leland/E614-stringsHarmonic.xml
 delete mode 100644 data/Leland/E630-pluckedSnapPizzicatoBelow.xml
 delete mode 100644 data/Leland/E631-pluckedSnapPizzicatoAbove.xml
 delete mode 100644 data/Leland/E632-pluckedBuzzPizzicato.xml
 delete mode 100644 data/Leland/E650-keyboardPedalPed.xml
 delete mode 100644 data/Leland/E651-keyboardPedalP.xml
 delete mode 100644 data/Leland/E655-keyboardPedalUp.xml
 delete mode 100644 data/Leland/E880-tuplet0.xml
 delete mode 100644 data/Leland/E881-tuplet1.xml
 delete mode 100644 data/Leland/E882-tuplet2.xml
 delete mode 100644 data/Leland/E883-tuplet3.xml
 delete mode 100644 data/Leland/E884-tuplet4.xml
 delete mode 100644 data/Leland/E885-tuplet5.xml
 delete mode 100644 data/Leland/E886-tuplet6.xml
 delete mode 100644 data/Leland/E887-tuplet7.xml
 delete mode 100644 data/Leland/E888-tuplet8.xml
 delete mode 100644 data/Leland/E889-tuplet9.xml
 delete mode 100644 data/Leland/E88A-tupletColon.xml
 delete mode 100644 data/Leland/E93C-mensuralNoteheadMinimaWhite.xml
 delete mode 100644 data/Leland/E93D-mensuralNoteheadSemiminimaWhite.xml
 delete mode 100644 data/Leland/EAA4-wiggleTrill.xml
 delete mode 100644 data/Leland/EAA9-wiggleArpeggiatoUp.xml
 delete mode 100644 data/Leland/EAAA-wiggleArpeggiatoDown.xml
 delete mode 100644 data/Leland/EAAD-wiggleArpeggiatoUpArrow.xml
 delete mode 100644 data/Leland/EAAE-wiggleArpeggiatoDownArrow.xml
 delete mode 100644 data/Petaluma.xml
 delete mode 100644 data/Petaluma/E000-brace.xml
 delete mode 100644 data/Petaluma/E003-bracketTop.xml
 delete mode 100644 data/Petaluma/E004-bracketBottom.xml
 delete mode 100644 data/Petaluma/E043-repeatDots.xml
 delete mode 100644 data/Petaluma/E044-repeatDot.xml
 delete mode 100644 data/Petaluma/E045-dalSegno.xml
 delete mode 100644 data/Petaluma/E046-daCapo.xml
 delete mode 100644 data/Petaluma/E047-segno.xml
 delete mode 100644 data/Petaluma/E048-coda.xml
 delete mode 100644 data/Petaluma/E049-codaSquare.xml
 delete mode 100644 data/Petaluma/E04B-segnoSerpent2.xml
 delete mode 100644 data/Petaluma/E050-gClef.xml
 delete mode 100644 data/Petaluma/E051-gClef15mb.xml
 delete mode 100644 data/Petaluma/E052-gClef8vb.xml
 delete mode 100644 data/Petaluma/E053-gClef8va.xml
 delete mode 100644 data/Petaluma/E054-gClef15ma.xml
 delete mode 100644 data/Petaluma/E055-gClef8vbOld.xml
 delete mode 100644 data/Petaluma/E056-gClef8vbCClef.xml
 delete mode 100644 data/Petaluma/E05C-cClef.xml
 delete mode 100644 data/Petaluma/E05D-cClef8vb.xml
 delete mode 100644 data/Petaluma/E062-fClef.xml
 delete mode 100644 data/Petaluma/E063-fClef15mb.xml
 delete mode 100644 data/Petaluma/E064-fClef8vb.xml
 delete mode 100644 data/Petaluma/E065-fClef8va.xml
 delete mode 100644 data/Petaluma/E066-fClef15ma.xml
 delete mode 100644 data/Petaluma/E069-unpitchedPercussionClef1.xml
 delete mode 100644 data/Petaluma/E06A-unpitchedPercussionClef2.xml
 delete mode 100644 data/Petaluma/E073-gClefReversed.xml
 delete mode 100644 data/Petaluma/E074-gClefTurned.xml
 delete mode 100644 data/Petaluma/E075-cClefReversed.xml
 delete mode 100644 data/Petaluma/E076-fClefReversed.xml
 delete mode 100644 data/Petaluma/E077-fClefTurned.xml
 delete mode 100644 data/Petaluma/E080-timeSig0.xml
 delete mode 100644 data/Petaluma/E081-timeSig1.xml
 delete mode 100644 data/Petaluma/E082-timeSig2.xml
 delete mode 100644 data/Petaluma/E083-timeSig3.xml
 delete mode 100644 data/Petaluma/E084-timeSig4.xml
 delete mode 100644 data/Petaluma/E085-timeSig5.xml
 delete mode 100644 data/Petaluma/E086-timeSig6.xml
 delete mode 100644 data/Petaluma/E087-timeSig7.xml
 delete mode 100644 data/Petaluma/E088-timeSig8.xml
 delete mode 100644 data/Petaluma/E089-timeSig9.xml
 delete mode 100644 data/Petaluma/E08A-timeSigCommon.xml
 delete mode 100644 data/Petaluma/E08B-timeSigCutCommon.xml
 delete mode 100644 data/Petaluma/E08C-timeSigPlus.xml
 delete mode 100644 data/Petaluma/E08D-timeSigPlusSmall.xml
 delete mode 100644 data/Petaluma/E08E-timeSigFractionalSlash.xml
 delete mode 100644 data/Petaluma/E08F-timeSigEquals.xml
 delete mode 100644 data/Petaluma/E090-timeSigMinus.xml
 delete mode 100644 data/Petaluma/E091-timeSigMultiply.xml
 delete mode 100644 data/Petaluma/E092-timeSigParensLeftSmall.xml
 delete mode 100644 data/Petaluma/E093-timeSigParensRightSmall.xml
 delete mode 100644 data/Petaluma/E094-timeSigParensLeft.xml
 delete mode 100644 data/Petaluma/E095-timeSigParensRight.xml
 delete mode 100644 data/Petaluma/E0A0-noteheadDoubleWhole.xml
 delete mode 100644 data/Petaluma/E0A1-noteheadDoubleWholeSquare.xml
 delete mode 100644 data/Petaluma/E0A2-noteheadWhole.xml
 delete mode 100644 data/Petaluma/E0A3-noteheadHalf.xml
 delete mode 100644 data/Petaluma/E0A4-noteheadBlack.xml
 delete mode 100644 data/Petaluma/E0A5-noteheadNull.xml
 delete mode 100644 data/Petaluma/E0A9-noteheadXBlack.xml
 delete mode 100644 data/Petaluma/E0AF-noteheadPlusBlack.xml
 delete mode 100644 data/Petaluma/E0B5-noteheadWholeWithX.xml
 delete mode 100644 data/Petaluma/E0B6-noteheadHalfWithX.xml
 delete mode 100644 data/Petaluma/E0B7-noteheadVoidWithX.xml
 delete mode 100644 data/Petaluma/E0D9-noteheadDiamondHalf.xml
 delete mode 100644 data/Petaluma/E0DA-noteheadDiamondHalfWide.xml
 delete mode 100644 data/Petaluma/E0DB-noteheadDiamondBlack.xml
 delete mode 100644 data/Petaluma/E0DC-noteheadDiamondBlackWide.xml
 delete mode 100644 data/Petaluma/E0DD-noteheadDiamondWhite.xml
 delete mode 100644 data/Petaluma/E0DE-noteheadDiamondWhiteWide.xml
 delete mode 100644 data/Petaluma/E0F5-noteheadParenthesisLeft.xml
 delete mode 100644 data/Petaluma/E0F6-noteheadParenthesisRight.xml
 delete mode 100644 data/Petaluma/E0FA-noteheadWholeFilled.xml
 delete mode 100644 data/Petaluma/E101-noteheadSlashHorizontalEnds.xml
 delete mode 100644 data/Petaluma/E102-noteheadSlashWhiteWhole.xml
 delete mode 100644 data/Petaluma/E103-noteheadSlashWhiteHalf.xml
 delete mode 100644 data/Petaluma/E220-tremolo1.xml
 delete mode 100644 data/Petaluma/E221-tremolo2.xml
 delete mode 100644 data/Petaluma/E222-tremolo3.xml
 delete mode 100644 data/Petaluma/E223-tremolo4.xml
 delete mode 100644 data/Petaluma/E224-tremolo5.xml
 delete mode 100644 data/Petaluma/E22A-buzzRoll.xml
 delete mode 100644 data/Petaluma/E240-flag8thUp.xml
 delete mode 100644 data/Petaluma/E241-flag8thDown.xml
 delete mode 100644 data/Petaluma/E242-flag16thUp.xml
 delete mode 100644 data/Petaluma/E243-flag16thDown.xml
 delete mode 100644 data/Petaluma/E244-flag32ndUp.xml
 delete mode 100644 data/Petaluma/E245-flag32ndDown.xml
 delete mode 100644 data/Petaluma/E246-flag64thUp.xml
 delete mode 100644 data/Petaluma/E247-flag64thDown.xml
 delete mode 100644 data/Petaluma/E248-flag128thUp.xml
 delete mode 100644 data/Petaluma/E249-flag128thDown.xml
 delete mode 100644 data/Petaluma/E24A-flag256thUp.xml
 delete mode 100644 data/Petaluma/E24B-flag256thDown.xml
 delete mode 100644 data/Petaluma/E24C-flag512thUp.xml
 delete mode 100644 data/Petaluma/E24D-flag512thDown.xml
 delete mode 100644 data/Petaluma/E24E-flag1024thUp.xml
 delete mode 100644 data/Petaluma/E24F-flag1024thDown.xml
 delete mode 100644 data/Petaluma/E260-accidentalFlat.xml
 delete mode 100644 data/Petaluma/E261-accidentalNatural.xml
 delete mode 100644 data/Petaluma/E262-accidentalSharp.xml
 delete mode 100644 data/Petaluma/E263-accidentalDoubleSharp.xml
 delete mode 100644 data/Petaluma/E264-accidentalDoubleFlat.xml
 delete mode 100644 data/Petaluma/E265-accidentalTripleSharp.xml
 delete mode 100644 data/Petaluma/E266-accidentalTripleFlat.xml
 delete mode 100644 data/Petaluma/E267-accidentalNaturalFlat.xml
 delete mode 100644 data/Petaluma/E268-accidentalNaturalSharp.xml
 delete mode 100644 data/Petaluma/E269-accidentalSharpSharp.xml
 delete mode 100644 data/Petaluma/E26A-accidentalParensLeft.xml
 delete mode 100644 data/Petaluma/E26B-accidentalParensRight.xml
 delete mode 100644 data/Petaluma/E26C-accidentalBracketLeft.xml
 delete mode 100644 data/Petaluma/E26D-accidentalBracketRight.xml
 delete mode 100644 data/Petaluma/E270-accidentalQuarterToneFlatArrowUp.xml
 delete mode 100644 data/Petaluma/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
 delete mode 100644 data/Petaluma/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
 delete mode 100644 data/Petaluma/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
 delete mode 100644 data/Petaluma/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
 delete mode 100644 data/Petaluma/E275-accidentalQuarterToneSharpArrowDown.xml
 delete mode 100644 data/Petaluma/E280-accidentalQuarterToneFlatStein.xml
 delete mode 100644 data/Petaluma/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
 delete mode 100644 data/Petaluma/E282-accidentalQuarterToneSharpStein.xml
 delete mode 100644 data/Petaluma/E283-accidentalThreeQuarterTonesSharpStein.xml
 delete mode 100644 data/Petaluma/E440-accidentalBuyukMucennebFlat.xml
 delete mode 100644 data/Petaluma/E441-accidentalKucukMucennebFlat.xml
 delete mode 100644 data/Petaluma/E442-accidentalBakiyeFlat.xml
 delete mode 100644 data/Petaluma/E443-accidentalKomaFlat.xml
 delete mode 100644 data/Petaluma/E444-accidentalKomaSharp.xml
 delete mode 100644 data/Petaluma/E445-accidentalBakiyeSharp.xml
 delete mode 100644 data/Petaluma/E446-accidentalKucukMucennebSharp.xml
 delete mode 100644 data/Petaluma/E447-accidentalBuyukMucennebSharp.xml
 delete mode 100644 data/Petaluma/E4A0-articAccentAbove.xml
 delete mode 100644 data/Petaluma/E4A1-articAccentBelow.xml
 delete mode 100644 data/Petaluma/E4A2-articStaccatoAbove.xml
 delete mode 100644 data/Petaluma/E4A3-articStaccatoBelow.xml
 delete mode 100644 data/Petaluma/E4A4-articTenutoAbove.xml
 delete mode 100644 data/Petaluma/E4A5-articTenutoBelow.xml
 delete mode 100644 data/Petaluma/E4A6-articStaccatissimoAbove.xml
 delete mode 100644 data/Petaluma/E4A7-articStaccatissimoBelow.xml
 delete mode 100644 data/Petaluma/E4A8-articStaccatissimoWedgeAbove.xml
 delete mode 100644 data/Petaluma/E4A9-articStaccatissimoWedgeBelow.xml
 delete mode 100644 data/Petaluma/E4AA-articStaccatissimoStrokeAbove.xml
 delete mode 100644 data/Petaluma/E4AB-articStaccatissimoStrokeBelow.xml
 delete mode 100644 data/Petaluma/E4AC-articMarcatoAbove.xml
 delete mode 100644 data/Petaluma/E4AD-articMarcatoBelow.xml
 delete mode 100644 data/Petaluma/E4AE-articMarcatoStaccatoAbove.xml
 delete mode 100644 data/Petaluma/E4AF-articMarcatoStaccatoBelow.xml
 delete mode 100644 data/Petaluma/E4B0-articAccentStaccatoAbove.xml
 delete mode 100644 data/Petaluma/E4B1-articAccentStaccatoBelow.xml
 delete mode 100644 data/Petaluma/E4B2-articTenutoStaccatoAbove.xml
 delete mode 100644 data/Petaluma/E4B3-articTenutoStaccatoBelow.xml
 delete mode 100644 data/Petaluma/E4B4-articTenutoAccentAbove.xml
 delete mode 100644 data/Petaluma/E4B5-articTenutoAccentBelow.xml
 delete mode 100644 data/Petaluma/E4B6-articStressAbove.xml
 delete mode 100644 data/Petaluma/E4B7-articStressBelow.xml
 delete mode 100644 data/Petaluma/E4B8-articUnstressAbove.xml
 delete mode 100644 data/Petaluma/E4B9-articUnstressBelow.xml
 delete mode 100644 data/Petaluma/E4BA-articLaissezVibrerAbove.xml
 delete mode 100644 data/Petaluma/E4BB-articLaissezVibrerBelow.xml
 delete mode 100644 data/Petaluma/E4BC-articMarcatoTenutoAbove.xml
 delete mode 100644 data/Petaluma/E4BD-articMarcatoTenutoBelow.xml
 delete mode 100644 data/Petaluma/E4C0-fermataAbove.xml
 delete mode 100644 data/Petaluma/E4C1-fermataBelow.xml
 delete mode 100644 data/Petaluma/E4C2-fermataVeryShortAbove.xml
 delete mode 100644 data/Petaluma/E4C3-fermataVeryShortBelow.xml
 delete mode 100644 data/Petaluma/E4C4-fermataShortAbove.xml
 delete mode 100644 data/Petaluma/E4C5-fermataShortBelow.xml
 delete mode 100644 data/Petaluma/E4C6-fermataLongAbove.xml
 delete mode 100644 data/Petaluma/E4C7-fermataLongBelow.xml
 delete mode 100644 data/Petaluma/E4C8-fermataVeryLongAbove.xml
 delete mode 100644 data/Petaluma/E4C9-fermataVeryLongBelow.xml
 delete mode 100644 data/Petaluma/E4CE-breathMarkComma.xml
 delete mode 100644 data/Petaluma/E4E0-restMaxima.xml
 delete mode 100644 data/Petaluma/E4E1-restLonga.xml
 delete mode 100644 data/Petaluma/E4E2-restDoubleWhole.xml
 delete mode 100644 data/Petaluma/E4E3-restWhole.xml
 delete mode 100644 data/Petaluma/E4E4-restHalf.xml
 delete mode 100644 data/Petaluma/E4E5-restQuarter.xml
 delete mode 100644 data/Petaluma/E4E6-rest8th.xml
 delete mode 100644 data/Petaluma/E4E7-rest16th.xml
 delete mode 100644 data/Petaluma/E4E8-rest32nd.xml
 delete mode 100644 data/Petaluma/E4E9-rest64th.xml
 delete mode 100644 data/Petaluma/E4EA-rest128th.xml
 delete mode 100644 data/Petaluma/E4EB-rest256th.xml
 delete mode 100644 data/Petaluma/E4EC-rest512th.xml
 delete mode 100644 data/Petaluma/E4ED-rest1024th.xml
 delete mode 100644 data/Petaluma/E4F2-restQuarterOld.xml
 delete mode 100644 data/Petaluma/E4F6-restQuarterZ.xml
 delete mode 100644 data/Petaluma/E500-repeat1Bar.xml
 delete mode 100644 data/Petaluma/E501-repeat2Bars.xml
 delete mode 100644 data/Petaluma/E502-repeat4Bars.xml
 delete mode 100644 data/Petaluma/E503-repeatBarUpperDot.xml
 delete mode 100644 data/Petaluma/E504-repeatBarSlash.xml
 delete mode 100644 data/Petaluma/E505-repeatBarLowerDot.xml
 delete mode 100644 data/Petaluma/E510-ottava.xml
 delete mode 100644 data/Petaluma/E511-ottavaAlta.xml
 delete mode 100644 data/Petaluma/E512-ottavaBassa.xml
 delete mode 100644 data/Petaluma/E513-ottavaBassaBa.xml
 delete mode 100644 data/Petaluma/E514-quindicesima.xml
 delete mode 100644 data/Petaluma/E515-quindicesimaAlta.xml
 delete mode 100644 data/Petaluma/E516-quindicesimaBassa.xml
 delete mode 100644 data/Petaluma/E517-ventiduesima.xml
 delete mode 100644 data/Petaluma/E518-ventiduesimaAlta.xml
 delete mode 100644 data/Petaluma/E519-ventiduesimaBassa.xml
 delete mode 100644 data/Petaluma/E51A-octaveParensLeft.xml
 delete mode 100644 data/Petaluma/E51B-octaveParensRight.xml
 delete mode 100644 data/Petaluma/E51C-ottavaBassaVb.xml
 delete mode 100644 data/Petaluma/E51D-quindicesimaBassaMb.xml
 delete mode 100644 data/Petaluma/E51E-ventiduesimaBassaMb.xml
 delete mode 100644 data/Petaluma/E520-dynamicPiano.xml
 delete mode 100644 data/Petaluma/E521-dynamicMezzo.xml
 delete mode 100644 data/Petaluma/E522-dynamicForte.xml
 delete mode 100644 data/Petaluma/E523-dynamicRinforzando.xml
 delete mode 100644 data/Petaluma/E524-dynamicSforzando.xml
 delete mode 100644 data/Petaluma/E525-dynamicZ.xml
 delete mode 100644 data/Petaluma/E526-dynamicNiente.xml
 delete mode 100644 data/Petaluma/E527-dynamicPPPPPP.xml
 delete mode 100644 data/Petaluma/E528-dynamicPPPPP.xml
 delete mode 100644 data/Petaluma/E529-dynamicPPPP.xml
 delete mode 100644 data/Petaluma/E52A-dynamicPPP.xml
 delete mode 100644 data/Petaluma/E52B-dynamicPP.xml
 delete mode 100644 data/Petaluma/E52C-dynamicMP.xml
 delete mode 100644 data/Petaluma/E52D-dynamicMF.xml
 delete mode 100644 data/Petaluma/E52E-dynamicPF.xml
 delete mode 100644 data/Petaluma/E52F-dynamicFF.xml
 delete mode 100644 data/Petaluma/E530-dynamicFFF.xml
 delete mode 100644 data/Petaluma/E531-dynamicFFFF.xml
 delete mode 100644 data/Petaluma/E532-dynamicFFFFF.xml
 delete mode 100644 data/Petaluma/E533-dynamicFFFFFF.xml
 delete mode 100644 data/Petaluma/E534-dynamicFortePiano.xml
 delete mode 100644 data/Petaluma/E535-dynamicForzando.xml
 delete mode 100644 data/Petaluma/E536-dynamicSforzando1.xml
 delete mode 100644 data/Petaluma/E537-dynamicSforzandoPiano.xml
 delete mode 100644 data/Petaluma/E538-dynamicSforzandoPianissimo.xml
 delete mode 100644 data/Petaluma/E539-dynamicSforzato.xml
 delete mode 100644 data/Petaluma/E53A-dynamicSforzatoPiano.xml
 delete mode 100644 data/Petaluma/E53B-dynamicSforzatoFF.xml
 delete mode 100644 data/Petaluma/E53C-dynamicRinforzando1.xml
 delete mode 100644 data/Petaluma/E53D-dynamicRinforzando2.xml
 delete mode 100644 data/Petaluma/E566-ornamentTrill.xml
 delete mode 100644 data/Petaluma/E567-ornamentTurn.xml
 delete mode 100644 data/Petaluma/E568-ornamentTurnInverted.xml
 delete mode 100644 data/Petaluma/E569-ornamentTurnSlash.xml
 delete mode 100644 data/Petaluma/E56A-ornamentTurnUp.xml
 delete mode 100644 data/Petaluma/E56B-ornamentTurnUpS.xml
 delete mode 100644 data/Petaluma/E56C-ornamentShortTrill.xml
 delete mode 100644 data/Petaluma/E56D-ornamentMordent.xml
 delete mode 100644 data/Petaluma/E56E-ornamentTremblement.xml
 delete mode 100644 data/Petaluma/E56F-ornamentHaydn.xml
 delete mode 100644 data/Petaluma/E583-ornamentVerticalLine.xml
 delete mode 100644 data/Petaluma/E587-ornamentSchleifer.xml
 delete mode 100644 data/Petaluma/E5B0-ornamentPrecompSlide.xml
 delete mode 100644 data/Petaluma/E5B1-ornamentPrecompDescendingSlide.xml
 delete mode 100644 data/Petaluma/E5B2-ornamentPrecompAppoggTrill.xml
 delete mode 100644 data/Petaluma/E5B3-ornamentPrecompAppoggTrillSuffix.xml
 delete mode 100644 data/Petaluma/E5B4-ornamentPrecompTurnTrillDAnglebert.xml
 delete mode 100644 data/Petaluma/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
 delete mode 100644 data/Petaluma/E5B6-ornamentPrecompSlideTrillMarpurg.xml
 delete mode 100644 data/Petaluma/E5B7-ornamentPrecompTurnTrillBach.xml
 delete mode 100644 data/Petaluma/E5B8-ornamentPrecompSlideTrillBach.xml
 delete mode 100644 data/Petaluma/E5B9-ornamentPrecompSlideTrillMuffat.xml
 delete mode 100644 data/Petaluma/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml
 delete mode 100644 data/Petaluma/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
 delete mode 100644 data/Petaluma/E5BC-ornamentPrecompPortDeVoixMordent.xml
 delete mode 100644 data/Petaluma/E5BD-ornamentPrecompTrillWithMordent.xml
 delete mode 100644 data/Petaluma/E5BE-ornamentPrecompCadence.xml
 delete mode 100644 data/Petaluma/E5BF-ornamentPrecompCadenceWithTurn.xml
 delete mode 100644 data/Petaluma/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
 delete mode 100644 data/Petaluma/E5C1-ornamentPrecompCadenceUpperPrefix.xml
 delete mode 100644 data/Petaluma/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml
 delete mode 100644 data/Petaluma/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
 delete mode 100644 data/Petaluma/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml
 delete mode 100644 data/Petaluma/E5C5-ornamentPrecompMordentRelease.xml
 delete mode 100644 data/Petaluma/E5C6-ornamentPrecompMordentUpperPrefix.xml
 delete mode 100644 data/Petaluma/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
 delete mode 100644 data/Petaluma/E5C8-ornamentPrecompTrillLowerSuffix.xml
 delete mode 100644 data/Petaluma/E5E5-brassMuteClosed.xml
 delete mode 100644 data/Petaluma/E5E6-brassMuteHalfClosed.xml
 delete mode 100644 data/Petaluma/E5E7-brassMuteOpen.xml
 delete mode 100644 data/Petaluma/E610-stringsDownBow.xml
 delete mode 100644 data/Petaluma/E611-stringsDownBowTurned.xml
 delete mode 100644 data/Petaluma/E612-stringsUpBow.xml
 delete mode 100644 data/Petaluma/E613-stringsUpBowTurned.xml
 delete mode 100644 data/Petaluma/E614-stringsHarmonic.xml
 delete mode 100644 data/Petaluma/E630-pluckedSnapPizzicatoBelow.xml
 delete mode 100644 data/Petaluma/E631-pluckedSnapPizzicatoAbove.xml
 delete mode 100644 data/Petaluma/E632-pluckedBuzzPizzicato.xml
 delete mode 100644 data/Petaluma/E633-pluckedLeftHandPizzicato.xml
 delete mode 100644 data/Petaluma/E638-pluckedDamp.xml
 delete mode 100644 data/Petaluma/E645-vocalSprechgesang.xml
 delete mode 100644 data/Petaluma/E650-keyboardPedalPed.xml
 delete mode 100644 data/Petaluma/E651-keyboardPedalP.xml
 delete mode 100644 data/Petaluma/E655-keyboardPedalUp.xml
 delete mode 100644 data/Petaluma/E659-keyboardPedalSost.xml
 delete mode 100644 data/Petaluma/E65A-keyboardPedalS.xml
 delete mode 100644 data/Petaluma/E880-tuplet0.xml
 delete mode 100644 data/Petaluma/E881-tuplet1.xml
 delete mode 100644 data/Petaluma/E882-tuplet2.xml
 delete mode 100644 data/Petaluma/E883-tuplet3.xml
 delete mode 100644 data/Petaluma/E884-tuplet4.xml
 delete mode 100644 data/Petaluma/E885-tuplet5.xml
 delete mode 100644 data/Petaluma/E886-tuplet6.xml
 delete mode 100644 data/Petaluma/E887-tuplet7.xml
 delete mode 100644 data/Petaluma/E888-tuplet8.xml
 delete mode 100644 data/Petaluma/E889-tuplet9.xml
 delete mode 100644 data/Petaluma/E88A-tupletColon.xml
 delete mode 100644 data/Petaluma/E938-mensuralNoteheadSemibrevisBlack.xml
 delete mode 100644 data/Petaluma/E939-mensuralNoteheadSemibrevisVoid.xml
 delete mode 100644 data/Petaluma/E93C-mensuralNoteheadMinimaWhite.xml
 delete mode 100644 data/Petaluma/E93D-mensuralNoteheadSemiminimaWhite.xml
 delete mode 100644 data/Petaluma/E93E-mensuralCombStemUp.xml
 delete mode 100644 data/Petaluma/E93F-mensuralCombStemDown.xml
 delete mode 100644 data/Petaluma/E949-mensuralCombStemUpFlagSemiminima.xml
 delete mode 100644 data/Petaluma/E94A-mensuralCombStemDownFlagSemiminima.xml
 delete mode 100644 data/Petaluma/E94B-mensuralCombStemUpFlagFusa.xml
 delete mode 100644 data/Petaluma/E94C-mensuralCombStemDownFlagFusa.xml
 delete mode 100644 data/Petaluma/EAA4-wiggleTrill.xml
 delete mode 100644 data/Petaluma/EAA9-wiggleArpeggiatoUp.xml
 delete mode 100644 data/Petaluma/EAAA-wiggleArpeggiatoDown.xml
 delete mode 100644 data/Petaluma/EAAD-wiggleArpeggiatoUpArrow.xml
 delete mode 100644 data/Petaluma/EAAE-wiggleArpeggiatoDownArrow.xml
 delete mode 100644 data/Petaluma/EAAF-wiggleGlissando.xml

diff --git a/data/Bravura.xml b/data/Bravura.xml
deleted file mode 100644
index 6e510c50175..00000000000
--- a/data/Bravura.xml
+++ /dev/null
@@ -1,696 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bounding-boxes font-family="Bravura" units-per-em="1000">
-	<g c="E000" x="2.0" y="0.0" w="80.0" h="997.0" h-a-x="84" />
-	<g c="E003" x="0.0" y="0.0" w="469.0" h="295.0" h-a-x="469" />
-	<g c="E004" x="0.0" y="-295.0" w="469.0" h="295.0" h-a-x="469" />
-	<g c="E043" x="0.0" y="318.0" w="100.0" h="352.0" h-a-x="100" />
-	<g c="E044" x="0.0" y="-50.0" w="100.0" h="100.0" h-a-x="100" />
-	<g c="E045" x="11.0" y="-9.0" w="1071.0" h="451.0" h-a-x="1082" />
-	<g c="E046" x="11.0" y="-9.0" w="1071.0" h="451.0" h-a-x="1083" />
-	<g c="E047" x="4.0" y="-27.0" w="546.0" h="786.0" h-a-x="557" />
-	<g c="E048" x="-4.0" y="-158.0" w="959.0" h="1056.0" h-a-x="954" />
-	<g c="E049" x="0.0" y="-154.0" w="822.0" h="1057.0" h-a-x="819" />
-	<g c="E04B" x="1.0" y="-33.0" w="401.0" h="1064.0" h-a-x="402" />
-	<g c="E050" x="0.0" y="-658.0" w="671.0" h="1756.0" h-a-x="671" />
-	<g c="E051" x="0.0" y="-881.0" w="671.0" h="1979.0" h-a-x="671" />
-	<g c="E052" x="0.0" y="-878.0" w="671.0" h="1976.0" h-a-x="664" />
-	<g c="E053" x="0.0" y="-658.0" w="671.0" h="1978.0" h-a-x="671" />
-	<g c="E054" x="0.0" y="-658.0" w="671.0" h="1977.0" h-a-x="671" />
-	<g c="E055" x="0.0" y="-658.0" w="1044.0" h="1756.0" h-a-x="1044" />
-	<g c="E056" x="0.0" y="-658.0" w="842.0" h="1756.0" h-a-x="842" />
-	<g c="E05C" x="0.0" y="-506.0" w="699.0" h="1012.0" h-a-x="699" />
-	<g c="E05D" x="0.0" y="-741.0" w="699.0" h="1247.0" h-a-x="699" />
-	<g c="E062" x="-5.0" y="-635.0" w="689.0" h="897.0" h-a-x="684" />
-	<g c="E063" x="-5.0" y="-742.0" w="689.0" h="1004.0" h-a-x="684" />
-	<g c="E064" x="-5.0" y="-744.0" w="689.0" h="1006.0" h-a-x="684" />
-	<g c="E065" x="-5.0" y="-635.0" w="689.0" h="1130.0" h-a-x="684" />
-	<g c="E066" x="-5.0" y="-635.0" w="689.0" h="1131.0" h-a-x="684" />
-	<g c="E069" x="0.0" y="-250.0" w="382.0" h="500.0" h-a-x="382" />
-	<g c="E06A" x="0.0" y="-465.0" w="312.0" h="926.0" h-a-x="312" />
-	<g c="E073" x="6.0" y="-658.0" w="671.0" h="1756.0" h-a-x="674" />
-	<g c="E074" x="6.0" y="-602.0" w="671.0" h="1756.0" h-a-x="674" />
-	<g c="E075" x="0.0" y="-506.0" w="699.0" h="1012.0" h-a-x="699" />
-	<g c="E076" x="0.0" y="-635.0" w="689.0" h="897.0" h-a-x="689" />
-	<g c="E077" x="0.0" y="-264.0" w="689.0" h="897.0" h-a-x="684" />
-	<g c="E080" x="20.0" y="-250.0" w="430.0" h="501.0" h-a-x="470" />
-	<g c="E081" x="20.0" y="-250.0" w="294.0" h="501.0" h-a-x="334" />
-	<g c="E082" x="20.0" y="-257.0" w="406.0" h="511.0" h-a-x="446" />
-	<g c="E083" x="20.0" y="-251.0" w="381.0" h="500.0" h-a-x="421" />
-	<g c="E084" x="20.0" y="-250.0" w="430.0" h="501.0" h-a-x="470" />
-	<g c="E085" x="20.0" y="-251.0" w="363.0" h="497.0" h-a-x="403" />
-	<g c="E086" x="20.0" y="-249.0" w="394.0" h="500.0" h-a-x="434" />
-	<g c="E087" x="20.0" y="-250.0" w="401.0" h="499.0" h-a-x="441" />
-	<g c="E088" x="20.0" y="-259.0" w="396.0" h="518.0" h-a-x="436" />
-	<g c="E089" x="20.0" y="-249.0" w="394.0" h="500.0" h-a-x="434" />
-	<g c="E08A" x="5.0" y="-249.0" w="419.0" h="500.0" h-a-x="424" />
-	<g c="E08B" x="0.0" y="-359.0" w="418.0" h="720.0" h-a-x="417" />
-	<g c="E08C" x="-1.0" y="-250.0" w="500.0" h="500.0" />
-	<g c="E08D" x="-1.0" y="-133.0" w="256.0" h="256.0" h-a-x="254" />
-	<g c="E08E" x="0.0" y="-190.0" w="378.0" h="379.0" h-a-x="378" />
-	<g c="E08F" x="0.0" y="-125.0" w="448.0" h="249.0" h-a-x="448" />
-	<g c="E090" x="0.0" y="-35.0" w="448.0" h="75.0" h-a-x="448" />
-	<g c="E091" x="0.0" y="-198.0" w="395.0" h="396.0" h-a-x="396" />
-	<g c="E092" x="0.0" y="-251.0" w="110.0" h="500.0" h-a-x="110" />
-	<g c="E093" x="0.0" y="-251.0" w="110.0" h="500.0" h-a-x="110" />
-	<g c="E094" x="0.0" y="-489.0" w="184.0" h="980.0" h-a-x="184" />
-	<g c="E095" x="0.0" y="-489.0" w="184.0" h="980.0" h-a-x="184" />
-	<g c="E0A0" x="0.0" y="-155.0" w="599.0" h="310.0" h-a-x="599" >
-		<a n="noteheadOrigin" x="0.36" y="0"/>
-	</g>
-	<g c="E0A1" x="0.0" y="-190.0" w="416.0" h="388.0" h-a-x="416" />
-	<g c="E0A2" x="0.0" y="-125.0" w="422.0" h="250.0" h-a-x="422" >
-		<a n="cutOutNW" x="0.172" y="0.332"/>
-		<a n="cutOutSE" x="1.532" y="-0.364"/>
-	</g>
-	<g c="E0A3" x="0.0" y="-125.0" w="295.0" h="250.0" h-a-x="295" >
-		<a n="cutOutNW" x="0.204" y="0.296"/>
-		<a n="cutOutSE" x="0.98" y="-0.3"/>
-		<a n="splitStemDownNE" x="0.956" y="-0.3"/>
-		<a n="splitStemDownNW" x="0.128" y="-0.428"/>
-		<a n="splitStemUpSE" x="1.108" y="0.372"/>
-		<a n="splitStemUpSW" x="0.328" y="0.38"/>
-		<a n="stemDownNW" x="0" y="-0.168"/>
-		<a n="stemUpSE" x="1.18" y="0.168"/>
-	</g>
-	<g c="E0A4" x="0.0" y="-125.0" w="295.0" h="250.0" h-a-x="295" >
-		<a n="cutOutNW" x="0.208" y="0.3"/>
-		<a n="cutOutSE" x="0.94" y="-0.296"/>
-		<a n="splitStemDownNE" x="0.968" y="-0.248"/>
-		<a n="splitStemDownNW" x="0.12" y="-0.416"/>
-		<a n="splitStemUpSE" x="1.092" y="0.392"/>
-		<a n="splitStemUpSW" x="0.312" y="0.356"/>
-		<a n="stemDownNW" x="0" y="-0.168"/>
-		<a n="stemUpSE" x="1.18" y="0.168"/>
-	</g>
-	<g c="E0A5" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="295" />
-	<g c="E0A9" x="0.0" y="-125.0" w="290.0" h="250.0" h-a-x="290" >
-		<a n="stemDownNW" x="0" y="-0.44"/>
-		<a n="stemUpSE" x="1.16" y="0.444"/>
-	</g>
-	<g c="E0AF" x="-1.0" y="-125.0" w="250.0" h="250.0" h-a-x="249" >
-		<a n="stemDownNW" x="-0.004" y="0"/>
-		<a n="stemUpSE" x="0.996" y="0"/>
-	</g>
-	<g c="E0B5" x="0.0" y="-125.0" w="420.0" h="250.0" h-a-x="420" />
-	<g c="E0B6" x="0.0" y="-125.0" w="294.0" h="250.0" h-a-x="294" >
-		<a n="stemDownNW" x="0" y="-0.168"/>
-		<a n="stemUpSE" x="1.176" y="0.164"/>
-	</g>
-	<g c="E0B7" x="0.0" y="-125.0" w="289.0" h="250.0" h-a-x="289" >
-		<a n="stemDownNW" x="0" y="-0.148"/>
-		<a n="stemUpSE" x="1.156" y="0.148"/>
-	</g>
-	<g c="E0D9" x="0.0" y="-125.0" w="251.0" h="250.0" h-a-x="251" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.004" y="0"/>
-	</g>
-	<g c="E0DA" x="0.0" y="-125.0" w="351.0" h="250.0" h-a-x="351" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.404" y="0"/>
-	</g>
-	<g c="E0DB" x="0.0" y="-125.0" w="250.0" h="250.0" h-a-x="250" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1" y="0"/>
-	</g>
-	<g c="E0DC" x="0.0" y="-125.0" w="350.0" h="250.0" h-a-x="350" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.4" y="0"/>
-	</g>
-	<g c="E0DD" x="0.0" y="-125.0" w="250.0" h="250.0" h-a-x="250" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1" y="0"/>
-	</g>
-	<g c="E0DE" x="0.0" y="-125.0" w="350.0" h="250.0" h-a-x="350" >
-		<a n="stemDownNW" x="0" y="0.004"/>
-		<a n="stemUpSE" x="1.4" y="0"/>
-	</g>
-	<g c="E0F5" x="0.0" y="-181.0" w="109.0" h="362.0" h-a-x="73" />
-	<g c="E0F6" x="-36.0" y="-181.0" w="109.0" h="362.0" h-a-x="73" />
-	<g c="E0FA" x="0.0" y="-125.0" w="422.0" h="250.0" h-a-x="422" />
-	<g c="E101" x="0.0" y="-250.0" w="530.0" h="500.0" h-a-x="531" >
-		<a n="stemDownNW" x="0" y="-1"/>
-		<a n="stemUpSE" x="2.12" y="1"/>
-	</g>
-	<g c="E102" x="0.0" y="-250.0" w="980.0" h="500.0" h-a-x="980" />
-	<g c="E103" x="0.0" y="-250.0" w="780.0" h="500.0" h-a-x="780" >
-		<a n="stemDownNW" x="0" y="-1"/>
-		<a n="stemUpSE" x="3.12" y="1"/>
-	</g>
-	<g c="E220" x="-150.0" y="-93.0" w="300.0" h="187.0" h-a-x="150" />
-	<g c="E221" x="-151.0" y="-187.0" w="300.0" h="374.0" h-a-x="149" />
-	<g c="E222" x="-150.0" y="-280.0" w="300.0" h="558.0" h-a-x="150" />
-	<g c="E223" x="-150.0" y="-370.0" w="300.0" h="744.0" h-a-x="149" />
-	<g c="E224" x="-151.0" y="-460.0" w="301.0" h="930.0" h-a-x="149" />
-	<g c="E22A" x="-155.0" y="-116.0" w="311.0" h="232.0" h-a-x="156" />
-	<g c="E240" x="0.0" y="-810.2" w="264.0" h="819.2" h-a-x="264" >
-		<a n="graceNoteSlashNE" x="1.284" y="-0.796"/>
-		<a n="graceNoteSlashSW" x="-0.644" y="-2.456"/>
-		<a n="stemUpNW" x="0" y="-0.04"/>
-	</g>
-	<g c="E241" x="0.0" y="-14.0" w="306.0" h="822.0" h-a-x="306" >
-		<a n="graceNoteSlashNW" x="-0.596" y="2.168"/>
-		<a n="graceNoteSlashSE" x="1.328" y="0.628"/>
-		<a n="stemDownSW" x="0" y="0.132"/>
-	</g>
-	<g c="E242" x="0.0" y="-813.0" w="279.0" h="815.0" h-a-x="279" >
-		<a n="stemUpNW" x="0" y="-0.088"/>
-	</g>
-	<g c="E243" x="0.0" y="-9.0" w="290.9" h="821.0" h-a-x="292" >
-		<a n="stemDownSW" x="0" y="0.128"/>
-	</g>
-	<g c="E244" x="0.0" y="-812.0" w="261.0" h="961.0" h-a-x="262" >
-		<a n="stemUpNW" x="0" y="0.376"/>
-	</g>
-	<g c="E245" x="0.0" y="-172.0" w="273.0" h="984.0" h-a-x="274" >
-		<a n="stemDownSW" x="0" y="-0.448"/>
-	</g>
-	<g c="E246" x="0.0" y="-812.0" w="261.0" h="1159.0" h-a-x="262" >
-		<a n="stemUpNW" x="0" y="1.172"/>
-	</g>
-	<g c="E247" x="0.0" y="-376.0" w="273.0" h="1188.0" h-a-x="275" >
-		<a n="stemDownSW" x="0" y="-1.244"/>
-	</g>
-	<g c="E248" x="0.0" y="-812.0" w="261.0" h="1345.0" h-a-x="259" >
-		<a n="stemUpNW" x="0" y="1.9"/>
-	</g>
-	<g c="E249" x="0.0" y="-580.0" w="273.0" h="1392.0" h-a-x="275" >
-		<a n="stemDownSW" x="0" y="-2.076"/>
-	</g>
-	<g c="E24A" x="0.0" y="-812.0" w="264.0" h="1516.0" h-a-x="268" >
-		<a n="stemUpNW" x="0" y="2.592"/>
-	</g>
-	<g c="E24B" x="0.0" y="-751.0" w="299.0" h="1563.0" h-a-x="301" >
-		<a n="stemDownSW" x="0" y="-2.812"/>
-	</g>
-	<g c="E24C" x="0.0" y="-812.0" w="265.0" h="1703.0" h-a-x="268" >
-		<a n="stemUpNW" x="0" y="3.324"/>
-	</g>
-	<g c="E24D" x="0.0" y="-939.0" w="300.0" h="1750.0" h-a-x="301" >
-		<a n="stemDownSW" x="0" y="-3.608"/>
-	</g>
-	<g c="E24E" x="0.0" y="-812.0" w="265.0" h="1891.0" h-a-x="272" >
-		<a n="stemUpNW" x="0" y="4.064"/>
-	</g>
-	<g c="E24F" x="0.0" y="-1202.0" w="301.0" h="1944.0" h-a-x="310" >
-		<a n="stemDownSW" x="0" y="-4.684"/>
-	</g>
-	<g c="E260" x="0.0" y="-175.0" w="226.0" h="614.0" h-a-x="226" >
-		<a n="cutOutNE" x="0.252" y="0.656"/>
-		<a n="cutOutSE" x="0.504" y="-0.476"/>
-	</g>
-	<g c="E261" x="0.0" y="-335.0" w="168.0" h="676.0" h-a-x="168" >
-		<a n="cutOutNE" x="0.192" y="0.776"/>
-		<a n="cutOutSW" x="0.476" y="-0.828"/>
-	</g>
-	<g c="E262" x="0.0" y="-348.0" w="249.0" h="698.0" h-a-x="249" >
-		<a n="cutOutNE" x="0.84" y="0.896"/>
-		<a n="cutOutNW" x="0.144" y="0.568"/>
-		<a n="cutOutSE" x="0.84" y="-0.596"/>
-		<a n="cutOutSW" x="0.144" y="-0.896"/>
-	</g>
-	<g c="E263" x="0.0" y="-125.0" w="247.0" h="252.0" h-a-x="250" />
-	<g c="E264" x="0.0" y="-175.0" w="411.0" h="612.0" h-a-x="413" >
-		<a n="cutOutNE" x="0.988" y="0.644"/>
-		<a n="cutOutSE" x="1.336" y="-0.396"/>
-	</g>
-	<g c="E265" x="0.0" y="-348.0" w="513.0" h="698.0" h-a-x="513" >
-		<a n="cutOutNE" x="0.86" y="0.916"/>
-		<a n="cutOutNW" x="0.12" y="0.596"/>
-		<a n="cutOutSE" x="0.86" y="-0.588"/>
-		<a n="cutOutSW" x="0.12" y="-0.9"/>
-	</g>
-	<g c="E266" x="0.0" y="-175.0" w="596.0" h="614.0" h-a-x="600" >
-		<a n="cutOutNE" x="1.748" y="0.656"/>
-		<a n="cutOutSE" x="2.048" y="-0.436"/>
-	</g>
-	<g c="E267" x="0.0" y="-335.0" w="459.0" h="774.0" h-a-x="459" >
-		<a n="cutOutNE" x="1.18" y="0.648"/>
-		<a n="cutOutSE" x="0.748" y="-0.828"/>
-		<a n="cutOutSW" x="0.436" y="-0.828"/>
-	</g>
-	<g c="E268" x="0.0" y="-348.0" w="481.0" h="698.0" h-a-x="480" >
-		<a n="cutOutNE" x="1.784" y="0.9"/>
-		<a n="cutOutSE" x="1.784" y="-0.608"/>
-		<a n="cutOutSW" x="0.452" y="-0.836"/>
-	</g>
-	<g c="E269" x="0.0" y="-348.0" w="519.0" h="698.0" h-a-x="519" >
-		<a n="cutOutNE" x="1.928" y="0.9"/>
-		<a n="cutOutNW" x="0.144" y="0.596"/>
-		<a n="cutOutSE" x="1.936" y="-0.604"/>
-		<a n="cutOutSW" x="0.144" y="-0.896"/>
-	</g>
-	<g c="E26A" x="0.0" y="-248.0" w="141.0" h="495.0" h-a-x="141" />
-	<g c="E26B" x="0.0" y="-248.0" w="141.0" h="495.0" h-a-x="141" />
-	<g c="E26C" x="0.0" y="-187.0" w="77.0" h="375.0" h-a-x="77" />
-	<g c="E26D" x="0.0" y="-187.0" w="77.0" h="375.0" h-a-x="77" />
-	<g c="E270" x="-42.0" y="-177.0" w="290.0" h="756.0" h-a-x="248" >
-		<a n="cutOutNE" x="0.604" y="0.664"/>
-		<a n="cutOutSE" x="0.62" y="-0.452"/>
-	</g>
-	<g c="E271" x="-39.0" y="-418.0" w="290.0" h="860.0" h-a-x="251" >
-		<a n="cutOutNE" x="0.356" y="0.648"/>
-		<a n="cutOutNW" x="0.032" y="-0.8"/>
-		<a n="cutOutSE" x="0.648" y="-0.5"/>
-	</g>
-	<g c="E272" x="-26.0" y="-340.0" w="238.0" h="887.0" h-a-x="212" >
-		<a n="cutOutSW" x="0.616" y="-0.868"/>
-	</g>
-	<g c="E273" x="3.0" y="-543.0" w="247.0" h="879.0" h-a-x="171" >
-		<a n="cutOutNE" x="0.232" y="0.788"/>
-	</g>
-	<g c="E274" x="0.0" y="-347.0" w="275.0" h="877.0" h-a-x="249" >
-		<a n="cutOutNW" x="0.272" y="1.304"/>
-		<a n="cutOutSE" x="0.86" y="-0.584"/>
-		<a n="cutOutSW" x="0.132" y="-0.888"/>
-	</g>
-	<g c="E275" x="-28.0" y="-534.0" w="277.0" h="883.0" h-a-x="249" >
-		<a n="cutOutNE" x="0.856" y="0.908"/>
-		<a n="cutOutNW" x="0.132" y="0.608"/>
-		<a n="cutOutSE" x="0.856" y="-0.588"/>
-	</g>
-	<g c="E280" x="1.0" y="-175.0" w="226.0" h="614.0" h-a-x="227" >
-		<a n="cutOutNW" x="0.628" y="0.676"/>
-		<a n="cutOutSW" x="0.336" y="-0.428"/>
-	</g>
-	<g c="E281" x="1.0" y="-175.0" w="465.0" h="614.0" h-a-x="466" >
-		<a n="cutOutNE" x="1.22" y="0.668"/>
-		<a n="cutOutNW" x="0.636" y="0.668"/>
-	</g>
-	<g c="E282" x="0.0" y="-353.0" w="179.0" h="660.0" h-a-x="179" >
-		<a n="cutOutNE" x="0.476" y="0.748"/>
-		<a n="cutOutNW" x="0.224" y="0.604"/>
-		<a n="cutOutSE" x="0.492" y="-0.8"/>
-		<a n="cutOutSW" x="0.224" y="-0.92"/>
-	</g>
-	<g c="E283" x="3.0" y="-347.0" w="314.0" h="716.0" h-a-x="317" >
-		<a n="cutOutNE" x="1.128" y="1"/>
-		<a n="cutOutNW" x="0.144" y="0.604"/>
-		<a n="cutOutSE" x="1.128" y="-0.5"/>
-		<a n="cutOutSW" x="0.144" y="-0.896"/>
-	</g>
-	<g c="E440" x="1.0" y="-174.0" w="286.0" h="612.0" h-a-x="287" >
-		<a n="cutOutSE" x="0.812" y="-0.42"/>
-		<a n="cutOutSW" x="0.18" y="0.536"/>
-	</g>
-	<g c="E441" x="0.0" y="-175.0" w="226.0" h="614.0" h-a-x="227" >
-		<a n="cutOutNE" x="0.284" y="0.704"/>
-		<a n="cutOutSE" x="0.576" y="-0.424"/>
-	</g>
-	<g c="E442" x="-1.0" y="-175.0" w="287.0" h="614.0" h-a-x="287" >
-		<a n="cutOutNE" x="0.536" y="1.392"/>
-		<a n="cutOutNW" x="0.152" y="1.112"/>
-		<a n="cutOutSE" x="0.816" y="-0.444"/>
-		<a n="cutOutSW" x="0.152" y="0.5"/>
-	</g>
-	<g c="E443" x="1.0" y="-175.0" w="226.0" h="614.0" h-a-x="229" >
-		<a n="cutOutNW" x="0.608" y="0.724"/>
-		<a n="cutOutSW" x="0.36" y="-0.448"/>
-	</g>
-	<g c="E444" x="0.0" y="-337.0" w="229.0" h="659.0" h-a-x="231" >
-		<a n="cutOutNE" x="0.596" y="0.88"/>
-		<a n="cutOutNW" x="0.28" y="0.708"/>
-		<a n="cutOutSE" x="0.596" y="-0.776"/>
-		<a n="cutOutSW" x="0.28" y="-0.92"/>
-	</g>
-	<g c="E445" x="0.0" y="-348.0" w="249.0" h="698.0" h-a-x="250" >
-		<a n="cutOutNE" x="0.86" y="0.94"/>
-		<a n="cutOutNW" x="0.12" y="0.616"/>
-		<a n="cutOutSE" x="0.86" y="-0.616"/>
-		<a n="cutOutSW" x="0.124" y="-0.924"/>
-	</g>
-	<g c="E446" x="-1.0" y="-338.0" w="340.0" h="659.0" h-a-x="339" >
-		<a n="cutOutNE" x="0.82" y="0.876"/>
-		<a n="cutOutNW" x="0.492" y="0.708"/>
-		<a n="cutOutSE" x="0.836" y="-0.768"/>
-		<a n="cutOutSW" x="0.504" y="-0.948"/>
-	</g>
-	<g c="E447" x="0.0" y="-350.0" w="341.0" h="698.0" h-a-x="343" >
-		<a n="cutOutNE" x="1.052" y="0.94"/>
-		<a n="cutOutNW" x="0.26" y="0.628"/>
-		<a n="cutOutSE" x="1.048" y="-0.624"/>
-		<a n="cutOutSW" x="0.264" y="-0.956"/>
-	</g>
-	<g c="E4A0" x="0.0" y="1.0" w="339.0" h="244.0" h-a-x="339" />
-	<g c="E4A1" x="0.0" y="-244.0" w="339.0" h="244.0" h-a-x="339" />
-	<g c="E4A2" x="0.0" y="0.0" w="84.0" h="84.0" h-a-x="84" />
-	<g c="E4A3" x="0.0" y="-84.0" w="84.0" h="84.0" h-a-x="84" />
-	<g c="E4A4" x="-1.0" y="0.0" w="339.0" h="48.0" h-a-x="338" />
-	<g c="E4A5" x="-1.0" y="-48.0" w="339.0" h="48.0" h-a-x="338" />
-	<g c="E4A6" x="1.0" y="-2.0" w="99.0" h="295.0" h-a-x="102" />
-	<g c="E4A7" x="1.0" y="-295.0" w="99.0" h="295.0" h-a-x="102" />
-	<g c="E4A8" x="1.0" y="0.0" w="88.0" h="290.0" h-a-x="89" />
-	<g c="E4A9" x="1.0" y="-290.0" w="88.0" h="290.0" h-a-x="89" />
-	<g c="E4AA" x="0.0" y="0.0" w="48.0" h="290.0" h-a-x="48" />
-	<g c="E4AB" x="0.0" y="-290.0" w="48.0" h="290.0" h-a-x="48" />
-	<g c="E4AC" x="-1.0" y="-1.0" w="236.0" h="254.0" h-a-x="236" />
-	<g c="E4AD" x="-1.0" y="-254.0" w="236.0" h="254.0" h-a-x="236" />
-	<g c="E4AE" x="-1.0" y="0.0" w="236.0" h="443.0" h-a-x="236" />
-	<g c="E4AF" x="-1.0" y="-453.0" w="236.0" h="453.0" h-a-x="236" />
-	<g c="E4B0" x="0.0" y="0.0" w="339.0" h="420.0" h-a-x="340" />
-	<g c="E4B1" x="-1.0" y="-411.0" w="339.0" h="411.0" h-a-x="339" />
-	<g c="E4B2" x="-1.0" y="0.0" w="339.0" h="240.0" h-a-x="339" />
-	<g c="E4B3" x="-1.0" y="-242.0" w="339.0" h="242.0" h-a-x="338" />
-	<g c="E4B4" x="-1.0" y="0.0" w="340.0" h="345.0" h-a-x="339" />
-	<g c="E4B5" x="-1.0" y="-345.0" w="340.0" h="345.0" h-a-x="339" />
-	<g c="E4B6" x="0.0" y="5.0" w="233.0" h="232.0" h-a-x="235" />
-	<g c="E4B7" x="4.0" y="-234.0" w="232.0" h="234.0" h-a-x="238" />
-	<g c="E4B8" x="0.0" y="0.0" w="382.0" h="207.0" h-a-x="382" />
-	<g c="E4B9" x="1.0" y="-207.0" w="382.0" h="207.0" h-a-x="383" />
-	<g c="E4BA" x="1.0" y="1.0" w="366.0" h="143.0" h-a-x="367" />
-	<g c="E4BB" x="0.0" y="-143.0" w="365.0" h="143.0" h-a-x="365" />
-	<g c="E4BC" x="-1.0" y="0.0" w="339.0" h="427.0" h-a-x="338" />
-	<g c="E4BD" x="-1.0" y="-429.0" w="339.0" h="429.0" h-a-x="338" />
-	<g c="E4C0" x="3.0" y="-3.0" w="602.0" h="332.0" h-a-x="605" />
-	<g c="E4C1" x="3.0" y="-332.0" w="602.0" h="332.0" h-a-x="605" />
-	<g c="E4C2" x="0.0" y="0.0" w="726.0" h="449.0" h-a-x="735" />
-	<g c="E4C3" x="0.0" y="-449.0" w="726.0" h="449.0" h-a-x="735" />
-	<g c="E4C4" x="0.0" y="0.0" w="604.0" h="341.0" h-a-x="603" />
-	<g c="E4C5" x="0.0" y="-341.0" w="604.0" h="341.0" h-a-x="603" />
-	<g c="E4C6" x="0.0" y="-1.0" w="603.0" h="334.0" h-a-x="605" />
-	<g c="E4C7" x="0.0" y="-333.0" w="603.0" h="334.0" h-a-x="605" />
-	<g c="E4C8" x="0.0" y="0.0" w="715.0" h="408.0" h-a-x="716" />
-	<g c="E4C9" x="0.0" y="-408.0" w="715.0" h="408.0" h-a-x="716" />
-	<g c="E4CE" x="1.0" y="2.0" w="151.0" h="249.0" h-a-x="153" />
-	<g c="E4E0" x="0.0" y="-249.0" w="381.0" h="499.0" h-a-x="381" />
-	<g c="E4E1" x="0.0" y="-249.0" w="125.0" h="499.0" h-a-x="125" />
-	<g c="E4E2" x="0.0" y="0.0" w="125.0" h="250.0" h-a-x="126" />
-	<g c="E4E3" x="0.0" y="-135.0" w="282.0" h="144.0" h-a-x="283" />
-	<g c="E4E4" x="0.0" y="-2.0" w="282.0" h="144.0" h-a-x="283" />
-	<g c="E4E5" x="1.0" y="-375.0" w="269.0" h="748.0" h-a-x="270" />
-	<g c="E4E6" x="0.0" y="-251.0" w="247.0" h="425.0" h-a-x="250" />
-	<g c="E4E7" x="0.0" y="-500.0" w="320.0" h="679.0" h-a-x="320" />
-	<g c="E4E8" x="0.0" y="-500.0" w="363.0" h="926.0" h-a-x="363" />
-	<g c="E4E9" x="0.0" y="-753.0" w="423.0" h="1183.0" h-a-x="424" />
-	<g c="E4EA" x="0.0" y="-750.0" w="485.0" h="1439.0" h-a-x="485" />
-	<g c="E4EB" x="0.0" y="-1000.0" w="541.0" h="1696.0" h-a-x="541" />
-	<g c="E4EC" x="0.0" y="-1000.0" w="604.0" h="1944.0" h-a-x="604" />
-	<g c="E4ED" x="0.0" y="-993.0" w="668.0" h="2190.0" h-a-x="668" />
-	<g c="E4F2" x="0.0" y="-251.0" w="247.0" h="425.0" h-a-x="250" />
-	<g c="E4F6" x="0.0" y="-214.0" w="250.0" h="428.0" h-a-x="250" />
-	<g c="E500" x="0.0" y="-250.0" w="532.0" h="529.0" h-a-x="533" />
-	<g c="E501" x="0.0" y="-250.0" w="762.0" h="529.0" h-a-x="761" />
-	<g c="E502" x="0.0" y="-250.0" w="1232.0" h="529.0" h-a-x="1233" />
-	<g c="E503" x="0.0" y="75.0" w="125.0" h="125.0" h-a-x="125" />
-	<g c="E504" x="0.0" y="-250.0" w="532.0" h="529.0" h-a-x="532" />
-	<g c="E505" x="0.0" y="-174.0" w="125.0" h="125.0" h-a-x="124" />
-	<g c="E510" x="0.0" y="-10.0" w="386.0" h="473.0" h-a-x="386" />
-	<g c="E511" x="0.0" y="-10.0" w="885.0" h="473.0" h-a-x="885" />
-	<g c="E512" x="0.0" y="-10.0" w="839.0" h="473.0" h-a-x="839" />
-	<g c="E513" x="0.0" y="-10.0" w="875.0" h="473.0" h-a-x="875" />
-	<g c="E514" x="0.0" y="-10.0" w="667.0" h="471.0" h-a-x="667" />
-	<g c="E515" x="0.0" y="-10.0" w="1315.0" h="471.0" h-a-x="1315" />
-	<g c="E516" x="0.0" y="-10.0" w="1285.0" h="471.0" h-a-x="1285" />
-	<g c="E517" x="4.0" y="-7.0" w="746.0" h="470.0" h-a-x="750" />
-	<g c="E518" x="4.0" y="-7.0" w="1424.0" h="470.0" h-a-x="1428" />
-	<g c="E519" x="4.0" y="-7.0" w="1374.0" h="470.0" h-a-x="1378" />
-	<g c="E51A" x="0.0" y="-17.0" w="163.0" h="501.0" h-a-x="137" />
-	<g c="E51B" x="-26.0" y="-17.0" w="163.0" h="501.0" h-a-x="137" />
-	<g c="E51C" x="0.0" y="-10.0" w="796.0" h="473.0" h-a-x="796" />
-	<g c="E51D" x="0.0" y="-10.0" w="1232.0" h="471.0" h-a-x="1231" />
-	<g c="E51E" x="4.0" y="-7.0" w="1331.0" h="470.0" h-a-x="1335" />
-	<g c="E520" x="-89.0" y="-142.0" w="455.0" h="416.0" h-a-x="365" >
-		<a n="opticalCenter" x="1.22" y="0"/>
-	</g>
-	<g c="E521" x="-20.0" y="-10.0" w="466.0" h="284.0" h-a-x="437" >
-		<a n="opticalCenter" x="0.872" y="0"/>
-	</g>
-	<g c="E522" x="-141.0" y="-152.0" w="505.0" h="596.0" h-a-x="364" >
-		<a n="opticalCenter" x="1.256" y="0"/>
-	</g>
-	<g c="E523" x="-20.0" y="0.0" w="297.0" h="274.0" h-a-x="277" >
-		<a n="opticalCenter" x="0.612" y="0"/>
-	</g>
-	<g c="E524" x="0.0" y="-10.0" w="229.0" h="283.0" h-a-x="229" >
-		<a n="opticalCenter" x="0.444" y="0"/>
-	</g>
-	<g c="E525" x="-30.0" y="-10.0" w="274.0" h="278.0" h-a-x="244" >
-		<a n="opticalCenter" x="0.5" y="0"/>
-	</g>
-	<g c="E526" x="-23.0" y="-10.0" w="331.0" h="284.0" h-a-x="308" >
-		<a n="opticalCenter" x="0.616" y="0"/>
-	</g>
-	<g c="E527" x="-102.0" y="-142.0" w="2230.0" h="416.0" h-a-x="2124" >
-		<a n="opticalCenter" x="4.248" y="0"/>
-	</g>
-	<g c="E528" x="-102.0" y="-142.0" w="1875.0" h="416.0" h-a-x="1776" >
-		<a n="opticalCenter" x="3.552" y="0"/>
-	</g>
-	<g c="E529" x="-102.0" y="-142.0" w="1520.0" h="416.0" h-a-x="1417" >
-		<a n="opticalCenter" x="3.004" y="0"/>
-	</g>
-	<g c="E52A" x="-92.0" y="-142.0" w="1165.0" h="416.0" h-a-x="1072" >
-		<a n="opticalCenter" x="2.368" y="0"/>
-	</g>
-	<g c="E52B" x="-82.0" y="-142.0" w="810.0" h="416.0" h-a-x="727" >
-		<a n="opticalCenter" x="1.708" y="0"/>
-	</g>
-	<g c="E52C" x="-20.0" y="-142.0" w="845.0" h="416.0" h-a-x="826" >
-		<a n="opticalCenter" x="1.848" y="0"/>
-	</g>
-	<g c="E52D" x="-20.0" y="-165.0" w="838.0" h="596.0" h-a-x="797" >
-		<a n="opticalCenter" x="1.796" y="0"/>
-	</g>
-	<g c="E52E" x="-72.0" y="-152.0" w="842.0" h="596.0" h-a-x="770" >
-		<a n="opticalCenter" x="1.68" y="0"/>
-	</g>
-	<g c="E52F" x="-135.0" y="-152.0" w="745.0" h="596.0" h-a-x="609" >
-		<a n="opticalCenter" x="1.852" y="0"/>
-	</g>
-	<g c="E530" x="-155.0" y="-152.0" w="985.0" h="596.0" h-a-x="831" >
-		<a n="opticalCenter" x="2.472" y="0"/>
-	</g>
-	<g c="E531" x="-155.0" y="-152.0" w="1225.0" h="596.0" h-a-x="1070" >
-		<a n="opticalCenter" x="2.824" y="0"/>
-	</g>
-	<g c="E532" x="-155.0" y="-152.0" w="1465.0" h="596.0" h-a-x="1310" >
-		<a n="opticalCenter" x="2.976" y="0"/>
-	</g>
-	<g c="E533" x="-155.0" y="-152.0" w="1705.0" h="596.0" h-a-x="1550" >
-		<a n="opticalCenter" x="3.504" y="0"/>
-	</g>
-	<g c="E534" x="-141.0" y="-152.0" w="760.0" h="596.0" h-a-x="619" >
-		<a n="opticalCenter" x="1.5" y="0"/>
-	</g>
-	<g c="E535" x="-141.0" y="-152.0" w="638.0" h="596.0" h-a-x="497" >
-		<a n="opticalCenter" x="1.352" y="0"/>
-	</g>
-	<g c="E536" x="0.0" y="-152.0" w="604.0" h="596.0" h-a-x="604" >
-		<a n="opticalCenter" x="1.3" y="0"/>
-	</g>
-	<g c="E537" x="0.0" y="-152.0" w="845.0" h="596.0" h-a-x="846" >
-		<a n="opticalCenter" x="1.904" y="0"/>
-	</g>
-	<g c="E538" x="0.0" y="-152.0" w="1199.0" h="596.0" h-a-x="1198" >
-		<a n="opticalCenter" x="1.972" y="0"/>
-	</g>
-	<g c="E539" x="0.0" y="-152.0" w="733.0" h="596.0" h-a-x="732" >
-		<a n="opticalCenter" x="1.76" y="0"/>
-	</g>
-	<g c="E53A" x="0.0" y="-152.0" w="1076.0" h="596.0" h-a-x="1075" >
-		<a n="opticalCenter" x="1.848" y="0"/>
-	</g>
-	<g c="E53B" x="0.0" y="-152.0" w="964.0" h="596.0" h-a-x="964" >
-		<a n="opticalCenter" x="2.276" y="0"/>
-	</g>
-	<g c="E53C" x="-20.0" y="-152.0" w="645.0" h="596.0" h-a-x="625" >
-		<a n="opticalCenter" x="1.564" y="0"/>
-	</g>
-	<g c="E53D" x="-20.0" y="-152.0" w="764.0" h="596.0" h-a-x="744" >
-		<a n="opticalCenter" x="2.084" y="0"/>
-	</g>
-	<g c="E566" x="0.0" y="-10.0" w="521.0" h="400.0" h-a-x="521" />
-	<g c="E567" x="0.0" y="0.0" w="460.0" h="218.0" h-a-x="460" />
-	<g c="E568" x="-3.0" y="0.0" w="460.0" h="218.0" h-a-x="457" />
-	<g c="E569" x="0.0" y="-90.0" w="460.0" h="396.0" h-a-x="460" />
-	<g c="E56A" x="0.0" y="0.0" w="218.0" h="460.0" h-a-x="218" />
-	<g c="E56B" x="-3.0" y="0.0" w="218.0" h="460.0" h-a-x="217" />
-	<g c="E56C" x="0.0" y="0.0" w="725.0" h="245.0" h-a-x="730" />
-	<g c="E56D" x="1.0" y="-73.0" w="728.0" h="392.0" h-a-x="729" />
-	<g c="E56E" x="1.0" y="0.0" w="984.0" h="244.0" h-a-x="985" />
-	<g c="E56F" x="0.0" y="-40.0" w="499.0" h="253.0" />
-	<g c="E583" x="1.0" y="109.0" w="24.0" h="280.0" h-a-x="27" />
-	<g c="E587" x="0.0" y="0.0" w="1143.0" h="660.0" h-a-x="1143" />
-	<g c="E59D" x="-52.0" y="0.0" w="337.0" h="245.0" h-a-x="262" >
-		<a n="repeatOffset" x="1.048" y="0"/>
-	</g>
-	<g c="E59E" x="-54.0" y="0.0" w="460.0" h="245.0" h-a-x="357" >
-		<a n="repeatOffset" x="1.428" y="0"/>
-	</g>
-	<g c="E5B0" x="0.0" y="0.0" w="1108.0" h="308.0" h-a-x="1108" />
-	<g c="E5B1" x="0.0" y="-185.0" w="1129.0" h="429.0" h-a-x="1128" />
-	<g c="E5B2" x="0.0" y="0.0" w="1119.0" h="481.0" h-a-x="1119" />
-	<g c="E5B3" x="0.0" y="0.0" w="876.0" h="619.0" h-a-x="876" />
-	<g c="E5B4" x="0.0" y="0.0" w="1494.0" h="510.0" h-a-x="1495" />
-	<g c="E5B5" x="2.0" y="-367.0" w="1148.0" h="612.0" h-a-x="1150" />
-	<g c="E5B6" x="0.0" y="-367.0" w="1112.0" h="748.0" h-a-x="1112" />
-	<g c="E5B7" x="0.0" y="-62.0" w="1474.0" h="407.0" h-a-x="1473" />
-	<g c="E5B8" x="0.0" y="-367.0" w="1048.0" h="698.0" h-a-x="1048" />
-	<g c="E5B9" x="4.0" y="-197.0" w="1407.0" h="701.0" h-a-x="1410" />
-	<g c="E5BA" x="0.0" y="-196.0" w="1082.0" h="577.0" h-a-x="1082" />
-	<g c="E5BB" x="0.0" y="0.0" w="949.0" h="381.0" h-a-x="949" />
-	<g c="E5BC" x="0.0" y="-62.0" w="1305.0" h="392.0" h-a-x="1306" />
-	<g c="E5BD" x="0.0" y="-62.0" w="990.0" h="395.0" h-a-x="990" />
-	<g c="E5BE" x="0.0" y="0.0" w="1106.0" h="291.0" h-a-x="1106" />
-	<g c="E5BF" x="0.0" y="-62.0" w="1106.0" h="395.0" h-a-x="1106" />
-	<g c="E5C0" x="0.0" y="0.0" w="1369.0" h="291.0" h-a-x="1369" />
-	<g c="E5C1" x="0.0" y="0.0" w="1013.0" h="247.0" h-a-x="1013" />
-	<g c="E5C2" x="0.0" y="-62.0" w="1013.0" h="395.0" h-a-x="1013" />
-	<g c="E5C3" x="0.0" y="0.0" w="1278.0" h="247.0" h-a-x="1278" />
-	<g c="E5C4" x="0.0" y="-62.0" w="1277.0" h="395.0" h-a-x="1277" />
-	<g c="E5C5" x="0.0" y="0.0" w="693.0" h="384.0" h-a-x="693" />
-	<g c="E5C6" x="0.0" y="0.0" w="1223.0" h="391.0" h-a-x="1223" />
-	<g c="E5C7" x="0.0" y="-62.0" w="1222.0" h="452.0" h-a-x="1222" />
-	<g c="E5C8" x="0.0" y="-222.0" w="859.0" h="468.0" h-a-x="859" />
-	<g c="E5E5" x="0.0" y="0.0" w="272.0" h="272.0" h-a-x="272" />
-	<g c="E5E6" x="1.0" y="0.0" w="304.0" h="304.0" h-a-x="305" />
-	<g c="E5E7" x="0.0" y="0.0" w="304.0" h="304.0" h-a-x="305" />
-	<g c="E610" x="0.0" y="0.0" w="312.0" h="318.0" h-a-x="312" />
-	<g c="E611" x="0.0" y="0.0" w="312.0" h="318.0" h-a-x="312" />
-	<g c="E612" x="1.0" y="1.0" w="248.0" h="494.0" h-a-x="250" />
-	<g c="E613" x="1.0" y="1.0" w="248.0" h="494.0" h-a-x="250" />
-	<g c="E614" x="0.0" y="0.0" w="200.0" h="200.0" h-a-x="200" />
-	<g c="E630" x="0.0" y="0.0" w="200.0" h="300.0" h-a-x="200" />
-	<g c="E631" x="0.0" y="0.0" w="200.0" h="300.0" h-a-x="200" />
-	<g c="E632" x="0.0" y="0.0" w="300.0" h="200.0" h-a-x="300" />
-	<g c="E633" x="0.0" y="0.0" w="272.0" h="272.0" h-a-x="272" />
-	<g c="E638" x="0.0" y="0.0" w="324.0" h="324.0" h-a-x="325" />
-	<g c="E645" x="-161.0" y="-1.0" w="322.0" h="322.0" h-a-x="161" />
-	<g c="E650" x="0.0" y="-8.0" w="1019.0" h="563.0" h-a-x="1019" />
-	<g c="E651" x="0.0" y="-8.0" w="500.0" h="563.0" h-a-x="493" />
-	<g c="E655" x="0.0" y="0.0" w="450.0" h="450.0" h-a-x="450" />
-	<g c="E659" x="0.0" y="-15.0" w="1107.0" h="606.0" h-a-x="1107" />
-	<g c="E65A" x="0.0" y="-15.0" w="419.0" h="606.0" h-a-x="419" />
-	<g c="E880" x="-0.3" y="-8.0" w="318.6" h="383.0" h-a-x="319" />
-	<g c="E881" x="10.0" y="0.0" w="246.0" h="372.0" h-a-x="246" />
-	<g c="E882" x="10.0" y="-6.0" w="319.0" h="381.0" h-a-x="319" />
-	<g c="E883" x="10.0" y="-8.0" w="296.0" h="383.0" h-a-x="296" />
-	<g c="E884" x="10.0" y="0.0" w="303.0" h="372.0" h-a-x="303" />
-	<g c="E885" x="10.0" y="-8.0" w="317.0" h="381.0" h-a-x="317" />
-	<g c="E886" x="10.3" y="-8.0" w="303.7" h="383.0" h-a-x="304" />
-	<g c="E887" x="30.0" y="-4.0" w="303.0" h="376.0" h-a-x="303" />
-	<g c="E888" x="10.0" y="-8.0" w="313.0" h="383.0" h-a-x="313" />
-	<g c="E889" x="10.0" y="-8.0" w="303.7" h="383.0" h-a-x="304" />
-	<g c="E88A" x="10.0" y="58.0" w="111.0" h="210.0" h-a-x="111" />
-	<g c="E901" x="0.0" y="-169.0" w="339.0" h="1091.0" h-a-x="339" />
-	<g c="E902" x="0.0" y="-231.0" w="264.0" h="452.0" h-a-x="264" />
-	<g c="E904" x="0.0" y="-1069.0" w="488.0" h="1660.0" h-a-x="488" />
-	<g c="E906" x="0.0" y="-221.0" w="134.0" h="442.0" h-a-x="134" />
-	<g c="E907" x="0.0" y="-349.0" w="244.0" h="1149.0" h-a-x="244" />
-	<g c="E908" x="0.0" y="-600.0" w="244.0" h="1400.0" h-a-x="244" />
-	<g c="E909" x="0.0" y="-800.0" w="244.0" h="1600.0" h-a-x="244" />
-	<g c="E90A" x="0.0" y="-800.0" w="244.0" h="1400.0" h-a-x="244" />
-	<g c="E90B" x="0.0" y="-795.0" w="244.0" h="1149.0" h-a-x="244" />
-	<g c="E910" x="1.0" y="-266.0" w="531.0" h="531.0" h-a-x="532" />
-	<g c="E911" x="1.0" y="-266.0" w="531.0" h="531.0" h-a-x="532" />
-	<g c="E912" x="1.0" y="-380.0" w="531.0" h="743.0" h-a-x="532" />
-	<g c="E913" x="0.0" y="-380.0" w="531.0" h="743.0" h-a-x="531" />
-	<g c="E914" x="0.0" y="-266.0" w="494.0" h="531.0" h-a-x="495" />
-	<g c="E915" x="0.0" y="-266.0" w="494.0" h="531.0" h-a-x="495" />
-	<g c="E916" x="-3.0" y="-250.0" w="495.0" h="531.0" h-a-x="492" />
-	<g c="E917" x="1.0" y="-380.0" w="494.0" h="743.0" h-a-x="493" />
-	<g c="E918" x="1.0" y="-380.0" w="494.0" h="743.0" h-a-x="495" />
-	<g c="E919" x="0.0" y="-380.0" w="495.0" h="743.0" />
-	<g c="E91A" x="0.0" y="-267.0" w="495.0" h="531.0" h-a-x="494" />
-	<g c="E91B" x="0.0" y="-276.0" w="547.0" h="551.0" h-a-x="547" />
-	<g c="E91C" x="0.0" y="-266.0" w="743.0" h="531.0" h-a-x="743" />
-	<g c="E91D" x="0.0" y="-269.0" w="540.0" h="539.0" h-a-x="540" />
-	<g c="E91E" x="0.0" y="-269.0" w="540.0" h="539.0" h-a-x="540" />
-	<g c="E91F" x="0.0" y="-270.0" w="539.0" h="539.0" h-a-x="539" />
-	<g c="E920" x="0.0" y="-63.0" w="125.0" h="125.0" h-a-x="125" />
-	<g c="E921" x="0.0" y="-52.0" w="266.0" h="104.0" h-a-x="266" />
-	<g c="E922" x="0.0" y="-49.0" w="362.0" h="98.0" h-a-x="362" />
-	<g c="E923" x="0.0" y="-125.0" w="266.0" h="251.0" h-a-x="266" />
-	<g c="E924" x="0.0" y="-162.0" w="324.0" h="324.0" h-a-x="324" />
-	<g c="E925" x="0.0" y="-371.0" w="48.0" h="743.0" h-a-x="48" />
-	<g c="E938" x="0.0" y="-141.0" w="282.0" h="282.0" h-a-x="282" />
-	<g c="E939" x="1.0" y="-141.0" w="282.0" h="282.0" h-a-x="283" />
-	<g c="E93C" x="0.0" y="-184.0" w="320.0" h="369.0" h-a-x="320" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.28" y="0"/>
-	</g>
-	<g c="E93D" x="0.0" y="-184.0" w="320.0" h="369.0" h-a-x="320" />
-	<g c="E93E" x="0.0" y="0.0" w="32.0" h="782.0" h-a-x="32" />
-	<g c="E93F" x="0.0" y="-782.0" w="32.0" h="782.0" h-a-x="32" />
-	<g c="E949" x="0.0" y="0.0" w="219.0" h="782.0" h-a-x="219" />
-	<g c="E94A" x="0.0" y="-782.0" w="219.0" h="782.0" h-a-x="219" />
-	<g c="E94B" x="0.0" y="0.0" w="219.0" h="782.0" h-a-x="219" />
-	<g c="E94C" x="0.0" y="-782.0" w="219.0" h="782.0" h-a-x="219" />
-	<g c="E990" x="0.0" y="-101.0" w="160.0" h="203.0" h-a-x="160" />
-	<g c="E991" x="0.0" y="-113.0" w="150.0" h="226.0" h-a-x="150" />
-	<g c="E996" x="0.0" y="-401.0" w="160.0" h="503.0" h-a-x="160" />
-	<g c="E99B" x="0.0" y="-115.0" w="154.0" h="230.0" h-a-x="154" />
-	<g c="E99E" x="0.0" y="-246.0" w="153.0" h="360.0" h-a-x="153" />
-	<g c="E99F" x="0.0" y="-92.0" w="124.0" h="185.0" h-a-x="124" />
-	<g c="E9B4" x="0.0" y="-150.0" w="14.0" h="300.0" h-a-x="14" />
-	<g c="E9B5" x="0.0" y="-150.0" w="14.0" h="450.0" h-a-x="14" />
-	<g c="E9B6" x="0.0" y="-150.0" w="14.0" h="600.0" h-a-x="14" />
-	<g c="E9B7" x="0.0" y="-150.0" w="14.0" h="750.0" h-a-x="14" />
-	<g c="E9B9" x="0.0" y="-228.0" w="465.0" h="332.0" h-a-x="465" />
-	<g c="E9BA" x="0.0" y="-400.0" w="579.0" h="504.0" h-a-x="579" />
-	<g c="E9BB" x="0.0" y="-553.0" w="579.0" h="657.0" h-a-x="579" />
-	<g c="E9BC" x="0.0" y="-703.0" w="579.0" h="807.0" h-a-x="579" />
-	<g c="E9E0" x="0.0" y="-151.0" w="205.0" h="564.0" h-a-x="205" />
-	<g c="E9E1" x="0.0" y="-141.0" w="186.0" h="561.0" h-a-x="186" />
-	<g c="E9E2" x="0.0" y="-254.0" w="102.0" h="507.0" h-a-x="102" />
-	<g c="E9E3" x="0.0" y="-142.0" w="430.0" h="284.0" h-a-x="430" />
-	<g c="E9F0" x="0.0" y="-500.0" w="147.0" h="1000.0" h-a-x="147" />
-	<g c="E9F1" x="0.0" y="-500.0" w="48.0" h="1000.0" h-a-x="48" />
-	<g c="E9F2" x="0.0" y="-250.0" w="48.0" h="500.0" h-a-x="48" />
-	<g c="E9F3" x="0.0" y="0.0" w="48.0" h="250.0" h-a-x="48" />
-	<g c="E9F4" x="0.0" y="125.0" w="48.0" h="125.0" h-a-x="48" />
-	<g c="E9F5" x="0.0" y="0.0" w="48.0" h="125.0" h-a-x="48" />
-	<g c="E9F6" x="0.0" y="0.0" w="139.0" h="165.0" h-a-x="139" />
-	<g c="E9F7" x="0.0" y="0.0" w="139.0" h="165.0" h-a-x="139" />
-	<g c="E9F8" x="0.0" y="0.0" w="138.0" h="165.0" h-a-x="138" />
-	<g c="EA02" x="1.0" y="0.0" w="613.0" h="411.0" h-a-x="615" />
-	<g c="EA06" x="0.0" y="-101.0" w="60.0" h="416.0" h-a-x="60" />
-	<g c="EAA4" x="-36.0" y="98.0" w="306.0" h="111.0" h-a-x="237" >
-		<a n="repeatOffset" x="0.948" y="0"/>
-	</g>
-	<g c="EAA9" x="-33.0" y="0.0" w="325.0" h="119.0" h-a-x="255" >
-		<a n="repeatOffset" x="1.02" y="0"/>
-	</g>
-	<g c="EAAA" x="-33.0" y="0.0" w="325.0" h="119.0" h-a-x="255" >
-		<a n="repeatOffset" x="1.02" y="0"/>
-	</g>
-	<g c="EAAD" x="-47.0" y="-80.0" w="563.0" h="235.0" h-a-x="516" >
-		<a n="repeatOffset" x="2.064" y="0"/>
-	</g>
-	<g c="EAAE" x="1.0" y="-65.0" w="563.0" h="235.0" h-a-x="516" >
-		<a n="repeatOffset" x="2.064" y="0"/>
-	</g>
-	<g c="EAAF" x="-25.0" y="0.0" w="306.0" h="111.0" h-a-x="240" >
-		<a n="repeatOffset" x="0.96" y="0"/>
-	</g>
-	<g c="EBA7" x="0.0" y="0.0" w="36.0" h="790.0" h-a-x="36" />
-	<g c="EBA8" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" />
-	<g c="EBA9" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" />
-	<g c="EBAA" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" />
-	<g c="EBAB" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" />
-	<g c="EBAC" x="0.0" y="-9.0" w="228.0" h="795.0" h-a-x="228" />
-	<g c="EBC0" x="0.0" y="0.0" w="276.0" h="242.0" h-a-x="276" />
-	<g c="EBC1" x="0.0" y="0.0" w="219.0" h="300.0" h-a-x="219" />
-	<g c="EBC2" x="1.0" y="1.0" w="291.0" h="265.0" h-a-x="292" />
-	<g c="EBC3" x="0.0" y="0.0" w="429.0" h="245.0" h-a-x="429" />
-	<g c="EBC4" x="0.0" y="0.0" w="313.0" h="238.0" h-a-x="313" />
-	<g c="EBC5" x="0.0" y="0.0" w="251.0" h="264.0" h-a-x="251" />
-	<g c="EBC6" x="0.0" y="0.0" w="404.0" h="283.0" h-a-x="404" />
-	<g c="EBC7" x="0.0" y="0.0" w="234.0" h="290.0" h-a-x="234" />
-	<g c="EBC8" x="0.0" y="1.0" w="124.0" h="305.0" h-a-x="124" />
-	<g c="EBC9" x="1.0" y="1.0" w="213.0" h="299.0" h-a-x="214" />
-	<g c="EBCA" x="0.0" y="0.0" w="131.0" h="296.0" h-a-x="131" />
-	<g c="EBCB" x="0.0" y="0.0" w="411.0" h="275.0" h-a-x="411" />
-	<g c="EBCC" x="0.0" y="0.0" w="321.0" h="302.0" h-a-x="321" />
-	<g c="EBE0" x="24.0" y="-1.0" w="257.0" h="301.0" h-a-x="256" />
-	<g c="EBE1" x="24.0" y="0.0" w="138.0" h="300.0" h-a-x="138" />
-	<g c="EBE2" x="24.0" y="-3.0" w="239.0" h="304.0" h-a-x="239" />
-	<g c="EBE3" x="24.0" y="0.0" w="220.0" h="300.0" h-a-x="220" />
-	<g c="EBE4" x="24.0" y="1.0" w="233.0" h="300.0" h-a-x="234" />
-	<g c="EBE5" x="23.0" y="0.0" w="215.0" h="300.0" h-a-x="216" />
-	<g c="EBE6" x="24.0" y="0.0" w="235.0" h="300.0" h-a-x="236" />
-	<g c="EBE7" x="25.0" y="0.0" w="242.0" h="301.0" h-a-x="242" />
-	<g c="EBE8" x="24.0" y="0.0" w="230.0" h="301.0" h-a-x="230" />
-	<g c="EBE9" x="24.0" y="0.0" w="235.0" h="300.0" h-a-x="235" />
-	<g c="ED40" x="0.0" y="1.0" w="708.0" h="244.0" h-a-x="708" />
-	<g c="ED41" x="0.0" y="-245.0" w="708.0" h="244.0" h-a-x="708" />
-</bounding-boxes>
diff --git a/data/Bravura/E000-brace.xml b/data/Bravura/E000-brace.xml
deleted file mode 100644
index d041eb14545..00000000000
--- a/data/Bravura/E000-brace.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M49 397c0 65 -29 81 -47 101c28 32 47 58 47 105c0 63 -35 103 -35 202c0 100 27 158 49 185c4 5 6 7 8 7s3 -2 4 -3c1 0 2 -2 2 -4c0 -3 -1 -6 -5 -10c-5 -9 -28 -59 -28 -111c0 -54 30 -147 37 -207c1 -5 1 -11 1 -16c0 -59 -33 -130 -62 -148c29 -18 62 -89 62 -148 c0 -6 0 -11 -1 -16c-7 -59 -37 -153 -37 -206s23 -103 28 -111c4 -5 5 -8 5 -11s-3 -6 -6 -6c-2 0 -4 1 -8 6c-22 28 -49 86 -49 186c0 73 35 135 35 205z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E003-bracketTop.xml b/data/Bravura/E003-bracketTop.xml
deleted file mode 100644
index 505f66f59ca..00000000000
--- a/data/Bravura/E003-bracketTop.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 117c0 6 2 7 8 7h101c191 14 317 146 327 157c5 7 16 14 25 14c5 -2 8 -6 8 -14c0 -3 0 -6 -1 -10c-40 -167 -183 -241 -343 -271h-125v117z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E004-bracketBottom.xml b/data/Bravura/E004-bracketBottom.xml
deleted file mode 100644
index 6052aa6ab71..00000000000
--- a/data/Bravura/E004-bracketBottom.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0h125c160 -30 303 -104 343 -271c1 -4 1 -7 1 -10c0 -8 -3 -12 -8 -14c-9 0 -20 7 -25 14c-10 11 -136 143 -327 157h-101c-6 0 -8 1 -8 7v117z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E043-repeatDots.xml b/data/Bravura/E043-repeatDots.xml
deleted file mode 100644
index 7152109f60d..00000000000
--- a/data/Bravura/E043-repeatDots.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M50 318c-28 0 -50 22 -50 50s22 50 50 50c27 0 50 -22 50 -50s-23 -50 -50 -50zM0 620c0 28 22 50 50 50c27 0 50 -22 50 -50c0 -27 -23 -50 -50 -50c-28 0 -50 23 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E044-repeatDot.xml b/data/Bravura/E044-repeatDot.xml
deleted file mode 100644
index ac02dc32e29..00000000000
--- a/data/Bravura/E044-repeatDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 28 22 50 50 50c27 0 50 -22 50 -50s-23 -50 -50 -50c-28 0 -50 22 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E045-dalSegno.xml b/data/Bravura/E045-dalSegno.xml
deleted file mode 100644
index 7f470fe9cb9..00000000000
--- a/data/Bravura/E045-dalSegno.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E045" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 433h214c85 0 129 -8 165 -32c56 -37 86 -99 86 -180c0 -82 -30 -147 -83 -184c-37 -26 -85 -37 -161 -37h-221v32h9c32 0 44 3 50 9c4 5 4 8 4 45v261c0 38 0 40 -4 45c-6 6 -18 9 -50 9h-9v32zM630 -4h-31v170h31c33 -90 92 -144 160 -144c52 0 87 28 87 70 c0 21 -10 39 -27 48c-11 5 -21 8 -42 13c-4 0 -10 2 -14 3c-3 1 -6 1 -9 2l-37 8c-94 17 -148 69 -148 142c0 80 63 134 155 134c42 0 75 -9 108 -32l32 27h27l7 -155h-31c-36 85 -86 129 -148 129c-47 0 -81 -26 -81 -63c0 -25 14 -42 41 -52c15 -5 15 -3 61 -14l29 -7 c104 -22 149 -65 149 -141c0 -84 -65 -143 -159 -143c-48 0 -86 13 -123 40zM218 401c-29 0 -36 -7 -36 -36v-294c0 -31 6 -39 36 -39h12c90 0 126 59 126 191c0 120 -40 178 -123 178h-15zM1025 -9c-31 0 -56 26 -56 56c0 32 25 57 56 57c32 0 57 -25 57 -57 c0 -31 -25 -56 -57 -56zM459 47c0 32 25 57 56 57c32 0 57 -25 57 -57c0 -31 -25 -56 -57 -56c-31 0 -56 26 -56 56z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E046-daCapo.xml b/data/Bravura/E046-daCapo.xml
deleted file mode 100644
index 8b10a53a9c2..00000000000
--- a/data/Bravura/E046-daCapo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E046" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 0h-221v32h9c32 0 44 3 50 9c4 5 4 8 4 45v261c0 38 0 40 -4 45c-6 6 -18 9 -50 9h-9v32h214c85 0 129 -8 165 -32c56 -37 86 -99 86 -180c0 -82 -30 -147 -83 -184c-37 -26 -85 -37 -161 -37zM564 211c0 135 95 231 227 231c42 0 70 -8 110 -32l32 30h26l6 -172 l-32 -3c-27 100 -71 146 -137 146c-74 0 -113 -65 -113 -189c0 -132 39 -194 120 -194c69 0 117 48 134 131l37 -9c-23 -107 -84 -159 -190 -159c-71 0 -122 20 -163 66c-38 43 -57 92 -57 154zM182 365v-294c0 -31 6 -39 36 -39h12c90 0 126 59 126 191 c0 120 -40 178 -123 178h-15c-29 0 -36 -7 -36 -36zM1025 -9c-31 0 -56 26 -56 56c0 32 25 57 56 57c32 0 57 -25 57 -57c0 -31 -25 -56 -57 -56zM515 -9c-31 0 -56 26 -56 56c0 32 25 57 56 57c32 0 57 -25 57 -57c0 -31 -25 -56 -57 -56z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E047-segno.xml b/data/Bravura/E047-segno.xml
deleted file mode 100644
index aad8401b5f3..00000000000
--- a/data/Bravura/E047-segno.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 477c-11 25 -16 50 -16 74c0 99 79 185 149 185c51 0 118 -17 134 -63c5 -16 8 -32 8 -47c0 -43 -28 -67 -69 -67c-51 0 -66 59 -73 86l-2 7c-3 11 -10 13 -16 13h-6c-42 -7 -54 -35 -54 -62c0 -21 8 -42 14 -53c26 -45 177 -103 186 -106c4 -2 7 -3 10 -3 c4 0 6 3 9 8c6 9 165 296 165 296c5 9 15 14 25 14c15 0 28 -12 28 -28c0 -5 -1 -9 -4 -14c0 0 -155 -279 -160 -287c-1 -2 -2 -4 -2 -6c0 -5 5 -9 17 -16c12 -6 170 -95 185 -205c1 -10 2 -20 2 -29c0 -83 -53 -148 -133 -175c-15 -5 -29 -7 -42 -7c-59 0 -121 53 -121 114 c0 40 34 56 71 65c4 1 8 2 12 2c28 0 53 -28 53 -66v-11c0 -31 17 -45 36 -45c2 0 5 1 7 1c32 5 56 31 56 70c0 95 -200 154 -215 157c-4 0 -12 -6 -12 -5c-3 -6 -158 -286 -158 -286c-5 -9 -15 -15 -25 -15c-16 0 -28 13 -28 29c0 4 1 9 3 13c0 0 144 259 151 273 c4 7 6 12 6 16s-2 6 -6 8c-8 3 -153 92 -185 165zM472 409c-31 0 -57 26 -57 57c0 32 26 57 57 57c32 0 57 -25 57 -57c0 -31 -25 -57 -57 -57zM83 207c-31 0 -57 25 -57 57c0 31 26 57 57 57c32 0 57 -26 57 -57c0 -32 -25 -57 -57 -57z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E048-coda.xml b/data/Bravura/E048-coda.xml
deleted file mode 100644
index 2fdbc2f88bb..00000000000
--- a/data/Bravura/E048-coda.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-4 376c0 13 4 24 18 24h132c11 189 150 339 312 352v129c0 13 11 17 24 17s24 -4 24 -17v-129c162 -13 302 -164 312 -352h119c14 0 18 -11 18 -24s-4 -24 -18 -24h-119c-10 -187 -150 -339 -312 -352v-140c0 -14 -11 -18 -24 -18s-24 4 -24 18v140 c-162 13 -301 165 -312 352h-132c-14 0 -18 11 -18 24zM653 400c0 162 -7 284 -147 296v-296h147zM506 352v-304c125 15 144 151 147 304h-147zM316 400h142v296c-142 -12 -142 -134 -142 -296zM458 352h-142c1 -154 13 -289 142 -304v304z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E049-codaSquare.xml b/data/Bravura/E049-codaSquare.xml
deleted file mode 100644
index cb79a2c3fcd..00000000000
--- a/data/Bravura/E049-codaSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 350c-9 0 -16 8 -16 21v8c0 12 7 21 16 21h123v323c0 8 6 15 14 15h234v144c0 12 9 21 21 21h6c13 0 21 -9 21 -21v-144h234c7 0 14 -7 14 -15v-323h124c8 0 15 -9 15 -21v-8c0 -13 -7 -21 -15 -21h-124v-340c0 -10 -7 -17 -14 -17h-234v-126c0 -11 -8 -21 -21 -21h-6 c-12 0 -21 10 -21 21v126h-234c-8 0 -14 7 -14 17v340h-123zM435 43h107c7 0 10 5 10 15v292h-117v-307zM270 58c0 -10 5 -15 12 -15h105v307h-117v-292zM270 400h117v288h-108c-5 0 -9 -2 -9 -9v-279zM541 688h-106v-288h117v275c0 8 -3 13 -11 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E04B-segnoSerpent2.xml b/data/Bravura/E04B-segnoSerpent2.xml
deleted file mode 100644
index ff3ec28428d..00000000000
--- a/data/Bravura/E04B-segnoSerpent2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M143 227c-63 36 -142 91 -142 177c0 44 38 97 44 108c3 5 5 9 5 13s-2 9 -8 16c-12 13 -38 49 -38 95s40 94 56 104c5 3 8 8 8 14c0 4 -2 9 -8 17c-12 13 -43 46 -43 112c0 69 62 148 184 148h5c45 -1 162 -28 162 -95c0 -54 -29 -63 -55 -63c-28 0 -49 7 -69 54 c-15 36 -66 53 -81 53c-21 0 -76 -9 -76 -59c0 -26 29 -53 63 -78c1 -1 3 -2 5 -2s4 1 5 3v6c0 8 6 15 14 15c7 0 15 -7 15 -15v-24c0 -6 3 -10 5 -11c6 -4 24 -16 28 -16c3 0 4 6 4 10v41c0 8 7 15 14 15c9 0 15 -7 15 -15v-58c0 -8 4 -14 8 -16c47 -27 139 -80 139 -145 c0 -74 -34 -100 -49 -119c-6 -8 -8 -13 -8 -18s4 -12 8 -16c6 -7 42 -50 42 -107c0 -55 -48 -96 -58 -110c-4 -6 -6 -11 -6 -16c0 -6 3 -11 7 -16c6 -9 44 -44 44 -103v-7c-3 -63 -43 -152 -176 -152c-132 0 -172 82 -172 113c0 32 17 54 49 54c31 0 46 -18 60 -39 c15 -23 38 -92 92 -92c55 0 76 40 77 72c0 0 -24 74 -52 74c-3 0 -5 -2 -5 -4c0 -7 -6 -14 -15 -14c-7 0 -14 7 -14 14v24c0 4 -6 11 -9 14l-16 11c-1 0 -4 2 -4 2c-3 0 -8 -4 -8 -8v-43c0 -7 -8 -14 -15 -14c-8 0 -14 7 -14 14v61c0 6 -12 17 -17 21zM101 479 c-22 0 -48 -23 -48 -46c0 -24 32 -52 52 -59l40 -22c2 -1 5 -2 8 -2c4 0 7 2 7 5v86c0 9 -8 15 -11 17c-18 10 -31 16 -33 17c-3 2 -8 4 -15 4zM255 634v-76c0 -6 3 -13 8 -15c9 -4 17 -6 21 -8c7 -1 13 -2 18 -2c21 0 38 22 38 42c0 15 -10 30 -19 37c0 1 -39 31 -59 31 c-3 0 -7 -3 -7 -9zM72 670c0 -23 28 -42 47 -54l6 -4s9 -5 23 -12h4c4 0 8 1 8 6v81c0 5 -6 10 -8 11l-19 9c-3 2 -8 3 -15 3c-21 0 -46 -18 -46 -40zM255 391v-80c0 -9 2 -15 7 -17c5 -3 9 -4 11 -5c7 -2 13 -3 18 -3c16 0 25 9 35 26c3 7 5 13 5 20c0 17 -10 33 -20 40 c-4 4 -21 12 -43 24c-1 1 -3 2 -5 2c-4 0 -8 -2 -8 -7zM189 425c-1 -4 -1 -56 -1 -82c0 -8 1 -13 6 -17l22 -11c1 -1 2 -1 3 -1c3 0 7 3 7 8v83c0 12 -6 17 -9 19c-5 2 -16 10 -21 10c-3 0 -7 -3 -7 -9zM188 638c0 -17 0 -37 1 -49c0 -6 4 -12 6 -13c6 -4 20 -13 27 -13 c2 0 4 1 4 5v82c0 10 -4 13 -6 14c-9 4 -25 13 -26 13c-2 0 -5 -2 -5 -5c-1 -2 -1 -17 -1 -34z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E050-gClef.xml b/data/Bravura/E050-gClef.xml
deleted file mode 100644
index 708ea67125e..00000000000
--- a/data/Bravura/E050-gClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M364 -252c-245 0 -364 165 -364 339c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18 c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -170 -130 -200 -197 -200c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29 c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13 c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM470 943c-61 0 -133 -96 -133 -252c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8 c79 69 174 159 174 270c0 55 -27 82 -60 82zM441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E051-gClef15mb.xml b/data/Bravura/E051-gClef15mb.xml
deleted file mode 100644
index 442aebca255..00000000000
--- a/data/Bravura/E051-gClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M364 -252c-245 0 -364 165 -364 339c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18 c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -132 -79 -180 -146 -194c8 -2 19 -4 33 -4c18 0 33 2 46 6c8 2 11 4 15 4c3 0 6 -3 6 -6c0 -4 -3 -8 -9 -13c-19 -18 -47 -35 -83 -35c-8 0 -17 1 -24 2 c-6 1 -9 1 -11 -5l-9 -28c-2 -6 -1 -10 8 -7c8 3 17 4 29 4c40 0 65 -14 65 -50c0 -58 -42 -97 -99 -97c-43 0 -63 23 -63 47c0 21 13 36 30 36c13 0 24 -7 24 -22c0 -16 -9 -24 -16 -27c-5 -2 -8 -3 -8 -7c0 -6 10 -11 22 -11c41 0 60 50 60 80c0 17 -7 31 -28 31 c-19 0 -32 -13 -37 -18s-8 -7 -12 -7c-6 0 -10 4 -10 10c0 3 1 5 3 11l34 100v1c-6 -1 -12 -1 -17 -1c-11 0 -21 1 -31 2c0 -1 -1 -2 -1 -4l-60 -189c-1 -5 -2 -8 2 -8l21 -2c6 -1 9 -4 9 -9s-3 -8 -10 -8h-103c-7 0 -10 3 -10 8s3 8 9 9l21 2c6 0 6 2 8 6l42 132 c1 3 1 5 1 7c0 3 -1 4 -3 4c-3 0 -5 -2 -8 -6l-23 -25c-3 -4 -6 -6 -11 -6s-10 4 -10 9c0 3 2 6 5 10l66 74c2 3 4 5 7 5c-86 28 -111 101 -111 152c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29 c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13 c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM337 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270 c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252zM441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E052-gClef8vb.xml b/data/Bravura/E052-gClef8vb.xml
deleted file mode 100644
index 7f70c6f9947..00000000000
--- a/data/Bravura/E052-gClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 87c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18c147 0 241 -113 241 -241 c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -121 -67 -171 -129 -190c21 -9 31 -26 31 -46c0 -18 -10 -39 -37 -53c-12 -6 -10 -8 -3 -16c12 -13 16 -26 16 -44c0 -46 -42 -71 -91 -71c-54 0 -78 26 -78 59c0 24 13 46 45 59 c12 5 10 7 5 14c-8 10 -12 22 -12 37c0 23 10 41 28 52c-128 12 -162 101 -162 162c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9 c-20 -4 -46 -6 -69 -6c-245 0 -364 165 -364 339zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6 c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM337 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252z M441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163zM267 -825c0 -18 10 -38 40 -38c24 0 43 14 43 40c0 15 -8 22 -40 47c-7 5 -10 6 -15 3c-21 -13 -28 -36 -28 -52zM351 -657c-22 0 -38 -13 -38 -35c0 -14 8 -23 31 -41 c8 -5 11 -5 15 -2c17 12 24 29 24 46c0 16 -8 32 -32 32z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E053-gClef8va.xml b/data/Bravura/E053-gClef8va.xml
deleted file mode 100644
index ac3893c211f..00000000000
--- a/data/Bravura/E053-gClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 87c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 118 33 274 137 346c-35 8 -50 30 -50 57c0 24 13 46 45 59c12 5 10 8 5 15c-8 9 -12 22 -12 36c0 43 35 68 86 68c49 0 69 -24 69 -52c0 -19 -10 -39 -37 -53c-12 -6 -10 -9 -3 -17 c12 -12 16 -25 16 -44c0 -39 -32 -64 -72 -70c68 -62 96 -181 96 -269c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214 c0 -170 -130 -200 -197 -200c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6 c-245 0 -364 165 -364 339zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177 c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM470 943c-61 0 -133 -96 -133 -252c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270c0 55 -27 82 -60 82zM441 117 c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163zM418 1137c0 -17 9 -37 35 -39h5c24 0 43 15 43 40c0 15 -8 22 -40 47c-7 6 -10 6 -15 3c-21 -13 -28 -36 -28 -51zM502 1305c-22 0 -38 -13 -38 -35c0 -15 8 -24 31 -41 c8 -6 11 -5 15 -2c17 11 24 29 24 45c0 17 -8 33 -32 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E054-gClef15ma.xml b/data/Bravura/E054-gClef15ma.xml
deleted file mode 100644
index 1a800dd6a77..00000000000
--- a/data/Bravura/E054-gClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M364 -252c-245 0 -364 165 -364 339c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18 c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -170 -130 -200 -197 -200c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29 c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6zM173 252c-83 -94 -93 -173 -93 -232c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107 c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142zM470 943c-61 0 -133 -96 -133 -252c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8 c79 69 174 159 174 270c0 55 -27 82 -60 82zM441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163zM514 1083c-43 0 -63 23 -63 48c0 20 13 36 30 36c13 0 24 -8 24 -23c0 -16 -9 -23 -16 -26c-5 -3 -8 -4 -8 -8 c0 -6 10 -11 22 -11c41 0 60 50 60 80c0 18 -7 32 -28 32c-19 0 -32 -13 -37 -19c-5 -4 -8 -6 -12 -6c-6 0 -10 3 -10 9c0 4 1 6 3 12l34 99c2 7 6 11 13 11c5 0 8 -1 17 -4c7 -2 20 -4 37 -4c18 0 33 2 46 5c8 3 13 5 15 5c3 0 6 -3 6 -6c0 -4 -3 -8 -9 -14 c-19 -17 -47 -34 -83 -34c-8 0 -17 1 -24 2c-6 1 -9 1 -11 -5l-9 -28c-2 -6 -1 -10 8 -7c8 2 17 4 29 4c40 0 65 -15 65 -51c0 -58 -42 -97 -99 -97zM323 1088c-7 0 -10 4 -10 9s3 8 9 8l21 2c6 1 6 2 8 7l42 131c1 3 1 5 1 7c0 3 -1 4 -3 4c-3 0 -5 -1 -8 -5l-23 -25 c-3 -4 -6 -7 -11 -7s-10 5 -10 9s2 7 5 11l66 74c3 3 5 5 9 5c8 0 12 -6 19 -6s15 6 21 6c4 0 6 -3 6 -6c0 -2 0 -4 -1 -7l-60 -189c-1 -5 -2 -8 2 -9l21 -2c6 0 9 -3 9 -8s-3 -9 -10 -9h-103z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E055-gClef8vbOld.xml b/data/Bravura/E055-gClef8vbOld.xml
deleted file mode 100644
index 7d41455ba98..00000000000
--- a/data/Bravura/E055-gClef8vbOld.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 87c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c2 -14 2 -18 8 -19c54 122 161 217 261 300 c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238 c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -170 -130 -200 -197 -200c-125 0 -173 67 -186 127c-32 -106 -131 -127 -187 -127c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29 c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6c-245 0 -364 165 -364 339zM173 252c-83 -94 -93 -173 -93 -232c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-18 106c-32 54 -47 115 -47 178v23c-1 0 -3 -1 -5 -1 c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142zM503 -227c-14 -6 -15 -5 -13 -17 c9 -54 25 -135 28 -192c17 33 50 56 94 56c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6c-77 0 -142 17 -194 45c-13 -8 -26 -14 -40 -20z M337 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252zM710 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252zM642 -108 c-15 -28 -36 -53 -61 -74c44 -21 98 -34 160 -34c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-32 -9 -58 -25 -75 -46c3 -17 5 -35 5 -52c0 -28 -4 -55 -12 -79c13 -21 31 -37 54 -47c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-22 0 -58 18 -74 31zM814 117 c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163zM453 20c0 -73 31 -135 87 -177c30 29 49 67 49 111v9c-7 17 -12 37 -14 57c-20 47 -61 81 -110 93c-10 -35 -12 -66 -12 -93zM529 232c36 -15 65 -38 88 -66c25 32 60 57 102 72 c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-6 -7 -12 -13 -17 -20zM475 -159l4 -23c2 -12 4 -12 16 -6l8 5c-10 7 -19 15 -28 24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E056-gClef8vbCClef.xml b/data/Bravura/E056-gClef8vbCClef.xml
deleted file mode 100644
index 84576a5ed3a..00000000000
--- a/data/Bravura/E056-gClef8vbCClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E056" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 87c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18c147 0 241 -113 241 -241 c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -170 -130 -200 -197 -200c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29c59 0 159 18 159 166 c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6c-245 0 -364 165 -364 339zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13 c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM337 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270 c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252zM615 419v66c0 9 4 13 13 13h166c7 0 10 3 10 10v383c0 13 6 21 19 21s19 -8 19 -21v-472c0 -9 -4 -13 -13 -13h-201c-9 0 -13 4 -13 13zM615 331c0 9 4 13 13 13h201c9 0 13 -4 13 -13v-472c0 -13 -6 -21 -19 -21 s-19 8 -19 21v383c0 7 -3 10 -10 10h-166c-9 0 -13 4 -13 13v66zM441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E05C-cClef.xml b/data/Bravura/E05C-cClef.xml
deleted file mode 100644
index ac0782156c0..00000000000
--- a/data/Bravura/E05C-cClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 -482v964c0 14 7 21 21 21h1c14 0 21 -7 21 -21v-438c0 -8 5 -7 9 -6c26 7 68 33 89 146c3 16 9 25 19 25c11 0 16 -10 21 -27c13 -44 36 -93 107 -93c65 0 83 64 83 195s-23 190 -106 190c-14 0 -85 -6 -85 -27c0 -5 16 -11 27 -15c20 -7 40 -27 40 -65 c0 -44 -29 -69 -68 -69c-43 0 -77 29 -77 82c0 63 55 126 174 126c164 0 236 -115 236 -219c0 -138 -76 -234 -209 -234c-29 0 -48 5 -61 9c-10 3 -20 5 -29 -1c-14 -9 -36 -41 -36 -61s22 -52 36 -61c9 -6 19 -4 29 -1c13 4 32 9 61 9c133 0 209 -96 209 -234 c0 -104 -72 -219 -236 -219c-119 0 -174 63 -174 126c0 53 34 82 77 82c39 0 68 -25 68 -69c0 -38 -20 -58 -40 -65c-11 -4 -27 -10 -27 -15c0 -21 71 -27 85 -27c83 0 106 59 106 190s-18 195 -83 195c-71 0 -94 -49 -107 -93c-5 -17 -10 -27 -21 -27c-10 0 -16 9 -19 25 c-21 113 -63 139 -89 146c-4 1 -9 2 -9 -6v-438c0 -14 -7 -21 -21 -21h-1c-14 0 -21 7 -21 21zM21 -503c-14 0 -21 7 -21 21v964c0 14 7 21 21 21h86c14 0 21 -7 21 -21v-964c0 -14 -7 -21 -21 -21h-86z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E05D-cClef8vb.xml b/data/Bravura/E05D-cClef8vb.xml
deleted file mode 100644
index ad46fa632f5..00000000000
--- a/data/Bravura/E05D-cClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 -503c-14 0 -21 7 -21 21v964c0 14 7 21 21 21h1c14 0 21 -7 21 -21v-438c0 -8 5 -7 9 -6c26 7 68 33 89 146c3 16 9 25 19 25c11 0 16 -10 21 -27c13 -44 36 -93 107 -93c65 0 83 64 83 195s-23 190 -106 190c-14 0 -85 -6 -85 -27c0 -5 16 -11 27 -15 c20 -7 40 -27 40 -65c0 -44 -29 -69 -68 -69c-43 0 -77 29 -77 82c0 63 55 126 174 126c164 0 236 -115 236 -219c0 -138 -76 -234 -209 -234c-29 0 -48 5 -61 9c-10 3 -20 5 -29 -1c-14 -9 -36 -41 -36 -61s22 -52 36 -61c9 -6 19 -4 29 -1c13 4 32 9 61 9 c133 0 209 -96 209 -234c0 -104 -72 -219 -236 -219c-119 0 -174 63 -174 126c0 53 34 82 77 82c39 0 68 -25 68 -69c0 -38 -20 -58 -40 -65c-11 -4 -27 -10 -27 -15c0 -21 71 -27 85 -27c83 0 106 59 106 190s-18 195 -83 195c-71 0 -94 -49 -107 -93 c-5 -17 -10 -27 -21 -27c-10 0 -16 9 -19 25c-21 113 -63 139 -89 146c-4 1 -9 2 -9 -6v-438c0 -14 -7 -21 -21 -21h-1zM0 -482v964c0 14 7 21 21 21h86c14 0 21 -7 21 -21v-964c0 -14 -7 -21 -21 -21h-86c-14 0 -21 7 -21 21zM224 -682c0 24 13 46 45 59c12 5 10 7 5 14 c-8 10 -12 22 -12 37c0 42 35 67 86 67c49 0 69 -23 69 -52c0 -18 -10 -39 -37 -53c-12 -6 -10 -8 -3 -16c12 -13 16 -26 16 -44c0 -46 -42 -71 -91 -71c-54 0 -78 26 -78 59zM263 -688c0 -18 10 -38 40 -38c24 0 43 14 43 40c0 15 -8 22 -40 47c-7 5 -10 6 -15 3 c-21 -13 -28 -36 -28 -52zM309 -555c0 -14 8 -23 31 -41c8 -5 11 -5 15 -2c17 12 24 29 24 46c0 16 -8 32 -32 32c-22 0 -38 -13 -38 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E062-fClef.xml b/data/Bravura/E062-fClef.xml
deleted file mode 100644
index e78d3771932..00000000000
--- a/data/Bravura/E062-fClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -635c-9 0 -13 6 -13 12c0 8 6 13 15 18c233 133 371 289 371 568c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 96 78 223 252 223 c173 0 279 -116 279 -290c0 -304 -260 -482 -506 -602c-6 -3 -12 -5 -17 -5zM629 70c-31 0 -55 24 -55 55s24 55 55 55s55 -24 55 -55s-24 -55 -55 -55zM630 -179c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E063-fClef15mb.xml b/data/Bravura/E063-fClef15mb.xml
deleted file mode 100644
index a89896b2220..00000000000
--- a/data/Bravura/E063-fClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-5 -623c0 8 6 13 15 18c233 133 371 289 371 568c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 96 78 223 252 223c173 0 279 -116 279 -290 c0 -217 -129 -363 -295 -481c3 -1 7 -4 11 -4c7 0 15 6 21 6c4 0 6 -3 6 -6c0 -2 0 -4 -1 -7l-60 -189c-1 -5 -2 -8 2 -9l21 -2c6 0 9 -3 9 -8s-3 -9 -10 -9h-103c-7 0 -10 4 -10 9s3 8 9 8l21 2c6 1 6 2 8 7l42 131c1 3 1 5 1 7c0 3 -1 4 -3 4c-3 0 -5 -1 -8 -5l-23 -25 c-3 -4 -6 -7 -11 -7s-10 5 -10 9s2 7 5 11l47 54c-25 -17 -169 -103 -192 -103c-9 0 -13 6 -13 12zM260 -694c0 20 13 36 30 36c13 0 24 -8 24 -23c0 -16 -9 -23 -16 -26c-5 -3 -8 -4 -8 -8c0 -6 10 -11 22 -11c41 0 60 50 60 80c0 18 -7 32 -28 32c-19 0 -32 -13 -37 -19 c-5 -4 -8 -6 -12 -6c-6 0 -10 3 -10 9c0 4 1 6 3 12l34 99c2 7 6 11 13 11c5 0 8 -1 17 -4c7 -2 20 -4 37 -4c18 0 33 2 46 5c8 3 13 5 15 5c3 0 6 -3 6 -6c0 -4 -3 -8 -9 -14c-19 -17 -47 -34 -83 -34c-8 0 -17 1 -24 2c-6 1 -9 1 -11 -5l-9 -28c-2 -6 -1 -10 8 -7 c8 2 17 4 29 4c40 0 65 -15 65 -51c0 -58 -42 -97 -99 -97c-43 0 -63 23 -63 48zM629 70c-31 0 -55 24 -55 55s24 55 55 55s55 -24 55 -55s-24 -55 -55 -55zM576 -125c0 31 23 54 54 54s54 -23 54 -54s-23 -54 -54 -54s-54 23 -54 54z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E064-fClef8vb.xml b/data/Bravura/E064-fClef8vb.xml
deleted file mode 100644
index 95337d24f13..00000000000
--- a/data/Bravura/E064-fClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -635c-9 0 -13 6 -13 12c0 8 6 13 15 18c233 133 371 289 371 568c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 96 78 223 252 223 c173 0 279 -116 279 -290c0 -219 -133 -369 -302 -486c12 5 26 7 42 7c49 0 69 -24 69 -52c0 -19 -10 -39 -37 -53c-12 -6 -10 -9 -3 -17c12 -12 16 -25 16 -44c0 -45 -42 -71 -91 -71c-54 0 -78 26 -78 59c0 24 13 46 45 59c12 5 10 8 5 15c-8 9 -12 22 -12 36 c0 17 5 31 15 42c-57 -36 -115 -68 -175 -97c-6 -3 -12 -5 -17 -5zM629 70c-31 0 -55 24 -55 55s24 55 55 55s55 -24 55 -55s-24 -55 -55 -55zM576 -125c0 31 23 54 54 54s54 -23 54 -54s-23 -54 -54 -54s-54 23 -54 54zM186 -690c0 -18 10 -39 40 -39c24 0 43 15 43 40 c0 15 -8 22 -40 47c-7 6 -10 6 -15 3c-21 -13 -28 -36 -28 -51zM232 -557c0 -15 8 -24 31 -41c8 -6 11 -5 15 -2c17 11 24 29 24 45c0 17 -8 33 -32 33c-22 0 -38 -13 -38 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E065-fClef8va.xml b/data/Bravura/E065-fClef8va.xml
deleted file mode 100644
index d37854d647f..00000000000
--- a/data/Bravura/E065-fClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-5 -623c0 8 6 13 15 18c124 71 227 156 287 249c62 96 84 216 84 319c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 93 73 216 238 223 c-31 8 -45 29 -45 55c0 24 13 46 45 59c12 5 10 8 5 15c-8 9 -12 22 -12 36c0 43 35 68 86 68c49 0 69 -24 69 -52c0 -19 -10 -39 -37 -53c-12 -6 -10 -9 -3 -17c12 -12 16 -25 16 -44c0 -38 -30 -63 -69 -70c148 -17 238 -127 238 -287c0 -304 -260 -482 -506 -602 c-6 -3 -12 -5 -17 -5c-9 0 -13 6 -13 12zM574 125c0 31 24 55 55 55s55 -24 55 -55s-24 -55 -55 -55s-55 24 -55 55zM630 -179c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54zM232 312c0 -18 10 -39 40 -39c24 0 43 15 43 40c0 15 -8 22 -40 47 c-7 6 -10 6 -15 3c-21 -13 -28 -36 -28 -51zM278 445c0 -15 8 -24 31 -41c8 -6 11 -5 15 -2c17 11 24 29 24 45c0 17 -8 33 -32 33c-22 0 -38 -13 -38 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E066-fClef15ma.xml b/data/Bravura/E066-fClef15ma.xml
deleted file mode 100644
index 16f39468496..00000000000
--- a/data/Bravura/E066-fClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-5 -623c0 8 6 13 15 18c233 133 371 289 371 568c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 96 78 223 252 223c173 0 279 -116 279 -290 c0 -304 -260 -482 -506 -602c-6 -3 -12 -5 -17 -5c-9 0 -13 6 -13 12zM263 308c0 20 13 36 30 36c13 0 24 -8 24 -23c0 -16 -9 -23 -16 -26c-5 -3 -8 -4 -8 -8c0 -6 10 -11 22 -11c41 0 60 50 60 80c0 18 -7 32 -28 32c-19 0 -32 -13 -37 -19c-5 -4 -8 -6 -12 -6 c-6 0 -10 3 -10 9c0 4 1 6 3 12l34 99c2 7 6 11 13 11c5 0 8 -1 17 -4c7 -2 20 -4 37 -4c18 0 33 2 46 5c8 3 13 5 15 5c3 0 6 -3 6 -6c0 -4 -3 -8 -9 -14c-19 -17 -47 -34 -83 -34c-8 0 -17 1 -24 2c-6 1 -9 1 -11 -5l-9 -28c-2 -6 -1 -10 8 -7c8 2 17 4 29 4 c40 0 65 -15 65 -51c0 -58 -42 -97 -99 -97c-43 0 -63 23 -63 48zM135 265c-7 0 -10 4 -10 9s3 8 9 8l21 2c6 1 6 2 8 7l42 131c1 3 1 5 1 7c0 3 -1 4 -3 4c-3 0 -5 -1 -8 -5l-23 -25c-3 -4 -6 -7 -11 -7s-10 5 -10 9s2 7 5 11l66 74c3 3 5 5 9 5c8 0 12 -6 19 -6s15 6 21 6 c4 0 6 -3 6 -6c0 -2 0 -4 -1 -7l-60 -189c-1 -5 -2 -8 2 -9l21 -2c6 0 9 -3 9 -8s-3 -9 -10 -9h-103zM629 70c-31 0 -55 24 -55 55s24 55 55 55s55 -24 55 -55s-24 -55 -55 -55zM630 -179c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E069-unpitchedPercussionClef1.xml b/data/Bravura/E069-unpitchedPercussionClef1.xml
deleted file mode 100644
index 11faf207b92..00000000000
--- a/data/Bravura/E069-unpitchedPercussionClef1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 235c0 8 6 15 14 15h132c8 0 14 -7 14 -15v-470c0 -8 -6 -15 -14 -15h-132c-8 0 -14 7 -14 15v470zM14 -250c-8 0 -14 7 -14 15v470c0 8 6 15 14 15h132c8 0 14 -7 14 -15v-470c0 -8 -6 -15 -14 -15h-132z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E06A-unpitchedPercussionClef2.xml b/data/Bravura/E06A-unpitchedPercussionClef2.xml
deleted file mode 100644
index bf597710b52..00000000000
--- a/data/Bravura/E06A-unpitchedPercussionClef2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -450v896c0 8 7 15 16 15h280c9 0 16 -7 16 -15v-896c0 -8 -7 -15 -16 -15h-280c-9 0 -16 7 -16 15zM40 344v-692c0 -8 7 -15 15 -15h202c8 0 15 7 15 15v692c0 8 -7 15 -15 15h-202c-8 0 -15 -7 -15 -15z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E073-gClefReversed.xml b/data/Bravura/E073-gClefReversed.xml
deleted file mode 100644
index 2b7cead805c..00000000000
--- a/data/Bravura/E073-gClefReversed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E073" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M6 11c0 128 94 241 241 241c26 0 26 0 29 18l25 145c2 12 0 13 -6 19c-108 101 -190 228 -190 381c0 87 24 173 65 233c15 22 41 50 52 50c14 0 45 -26 65 -48c74 -82 98 -207 98 -311c0 -58 -7 -123 -14 -164c-2 -12 -3 -14 9 -24c144 -119 297 -262 297 -464 c0 -174 -119 -339 -364 -339c-23 0 -49 2 -69 6c-11 2 -13 3 -15 -9c-12 -67 -27 -154 -27 -201c0 -148 100 -166 159 -166c54 0 80 16 80 29c0 7 -9 10 -32 17c-31 9 -67 36 -67 94c0 55 35 102 96 102c67 0 107 -53 107 -115c0 -65 -39 -163 -190 -163 c-67 0 -197 30 -197 200c0 57 18 152 29 214c2 12 1 11 -13 17c-101 40 -168 125 -168 238zM239 -197c-2 -11 -1 -11 14 -14c16 -3 36 -5 56 -5c175 0 288 97 288 236c0 59 -10 138 -93 232c-60 67 -106 104 -153 142c-10 8 -12 7 -14 -4l-21 -128c-3 -19 -3 -18 15 -24 c88 -30 145 -109 145 -194c0 -90 -47 -154 -115 -177c-8 -3 -20 -6 -27 -6c-8 0 -12 5 -12 11c0 7 8 10 15 13c42 18 72 61 72 107c0 57 -39 100 -100 117c-16 4 -18 3 -20 -8zM147 861c0 -111 95 -201 174 -270c7 -6 11 -5 13 8c4 26 6 60 6 92c0 156 -72 252 -133 252 c-33 0 -60 -27 -60 -82zM88 -46c0 -63 38 -114 94 -142c12 -6 14 -6 16 6l49 285c2 12 1 15 -11 14c-81 -7 -148 -75 -148 -163z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E074-gClefTurned.xml b/data/Bravura/E074-gClefTurned.xml
deleted file mode 100644
index 599e2b5b97a..00000000000
--- a/data/Bravura/E074-gClefTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E074" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M6 485c0 113 67 198 168 238c14 6 15 5 13 17c-11 62 -29 157 -29 214c0 170 130 200 197 200c151 0 190 -98 190 -163c0 -62 -40 -115 -107 -115c-61 0 -96 47 -96 102c0 58 36 85 67 94c23 7 32 10 32 17c0 13 -26 29 -80 29c-59 0 -159 -18 -159 -166 c0 -47 15 -134 27 -201c2 -12 4 -11 15 -9c20 4 46 6 69 6c245 0 364 -165 364 -339c0 -202 -153 -345 -297 -464c-12 -10 -11 -12 -9 -24c7 -41 14 -106 14 -164c0 -104 -24 -229 -98 -311c-20 -22 -51 -48 -65 -48c-11 0 -37 28 -52 50c-41 60 -65 146 -65 233 c0 153 82 280 190 381c6 6 8 7 6 19l-25 145c-3 18 -3 18 -29 18c-147 0 -241 113 -241 241zM253 707c-15 -3 -16 -3 -14 -14l50 -298c2 -11 4 -12 20 -8c61 17 100 60 100 117c0 46 -30 89 -72 107c-7 3 -15 6 -15 13c0 6 4 11 12 11c7 0 19 -3 27 -6 c68 -23 115 -87 115 -177c0 -85 -57 -164 -145 -194c-18 -6 -18 -5 -15 -24l21 -128c2 -11 4 -12 14 -4c47 38 93 75 153 142c83 94 93 173 93 232c0 139 -113 236 -288 236c-20 0 -40 -2 -56 -5zM147 -365c0 -55 27 -82 60 -82c61 0 133 96 133 252c0 32 -2 66 -6 92 c-2 13 -6 14 -13 8c-79 -69 -174 -159 -174 -270zM88 542c0 -88 67 -156 148 -163c12 -1 13 2 11 14l-49 285c-2 12 -4 12 -16 6c-56 -28 -94 -79 -94 -142z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E075-cClefReversed.xml b/data/Bravura/E075-cClefReversed.xml
deleted file mode 100644
index 9d2137cb700..00000000000
--- a/data/Bravura/E075-cClefReversed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E075" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M209 53c-133 0 -209 96 -209 234c0 104 72 219 236 219c119 0 174 -63 174 -126c0 -53 -34 -82 -77 -82c-39 0 -68 25 -68 69c0 38 20 58 40 65c11 4 27 10 27 15c0 21 -71 27 -85 27c-83 0 -106 -59 -106 -190s18 -195 83 -195c71 0 94 49 107 93c5 17 10 27 21 27 c10 0 16 -9 19 -25c21 -113 63 -139 89 -146c4 -1 9 -2 9 6v438c0 14 7 21 21 21h1c14 0 21 -7 21 -21v-964c0 -14 -7 -21 -21 -21h-1c-14 0 -21 7 -21 21v438c0 8 -5 7 -9 6c-26 -7 -68 -33 -89 -146c-3 -16 -9 -25 -19 -25c-11 0 -16 10 -21 27c-13 44 -36 93 -107 93 c-65 0 -83 -64 -83 -195s23 -190 106 -190c14 0 85 6 85 27c0 5 -16 11 -27 15c-20 7 -40 27 -40 65c0 44 29 69 68 69c43 0 77 -29 77 -82c0 -63 -55 -126 -174 -126c-164 0 -236 115 -236 219c0 138 76 234 209 234c29 0 48 -5 61 -9c10 -3 20 -5 29 1c14 9 36 41 36 61 s-22 52 -36 61c-9 6 -19 4 -29 1c-13 -4 -32 -9 -61 -9zM592 -503c-14 0 -21 7 -21 21v964c0 14 7 21 21 21h86c14 0 21 -7 21 -21v-964c0 -14 -7 -21 -21 -21h-86z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E076-fClefReversed.xml b/data/Bravura/E076-fClefReversed.xml
deleted file mode 100644
index a35a1c0c588..00000000000
--- a/data/Bravura/E076-fClefReversed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E076" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M153 -28c0 174 106 290 279 290c174 0 252 -127 252 -223c0 -80 -42 -149 -123 -149c-63 0 -106 44 -106 106c0 64 47 104 96 104c27 0 37 -7 50 -7s16 8 16 18c0 40 -60 113 -162 113c-106 0 -152 -104 -152 -261c0 -279 138 -435 371 -568c9 -5 15 -10 15 -18 c0 -6 -4 -12 -13 -12c-5 0 -11 2 -17 5c-246 120 -506 298 -506 602zM0 125c0 31 24 55 55 55s55 -24 55 -55s-24 -55 -55 -55s-55 24 -55 55zM54 -179c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E077-fClefTurned.xml b/data/Bravura/E077-fClefTurned.xml
deleted file mode 100644
index 61e89fa7256..00000000000
--- a/data/Bravura/E077-fClefTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E077" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M432 -264c-173 0 -279 116 -279 290c0 304 260 482 506 602c6 3 12 5 17 5c9 0 13 -6 13 -12c0 -8 -6 -13 -15 -18c-233 -133 -371 -289 -371 -568c0 -157 46 -261 152 -261c102 0 162 73 162 113c0 10 -3 18 -16 18s-23 -7 -50 -7c-49 0 -96 40 -96 104 c0 62 43 106 106 106c81 0 123 -69 123 -149c0 -96 -78 -223 -252 -223zM0 -127c0 31 24 55 55 55s55 -24 55 -55s-24 -55 -55 -55s-55 24 -55 55zM54 69c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E080-timeSig0.xml b/data/Bravura/E080-timeSig0.xml
deleted file mode 100644
index 65888083b1e..00000000000
--- a/data/Bravura/E080-timeSig0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M235 -250c-119 0 -215 112 -215 250c0 139 96 251 215 251s215 -112 215 -251c0 -138 -96 -250 -215 -250zM160 7c0 -117 33 -212 75 -212c41 0 75 95 75 212c0 118 -34 213 -75 213c-42 0 -75 -95 -75 -213z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E081-timeSig1.xml b/data/Bravura/E081-timeSig1.xml
deleted file mode 100644
index 77f884eaa73..00000000000
--- a/data/Bravura/E081-timeSig1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 0c0 7 4 13 4 13l96 219c4 9 8 19 18 19c1 0 3 -1 5 -1c15 -2 33 -3 52 -3c13 0 38 4 52 4c14 -1 20 -7 20 -23v-412c0 -17 18 -35 32 -35c15 0 15 -15 15 -15s0 -16 -16 -16h-213c-13 0 -22 5 -22 16c0 12 10 15 17 15c21 0 44 15 44 38v258c0 6 -2 14 -6 14 c-2 0 -6 -3 -10 -10c-11 -19 -54 -88 -54 -88s-4 -9 -14 -9c-1 0 -5 1 -9 2c-8 3 -11 9 -11 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E082-timeSig2.xml b/data/Bravura/E082-timeSig2.xml
deleted file mode 100644
index 7f4b11309cb..00000000000
--- a/data/Bravura/E082-timeSig2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 118c0 27 11 52 28 73c49 57 111 63 181 63c93 0 197 -46 197 -152c0 -83 -63 -112 -133 -131c-22 -6 -107 -36 -129 -72c11 4 24 6 37 6c41 0 88 -16 108 -24c10 -5 17 -6 30 -11c7 -2 12 -3 17 -3c21 0 29 19 39 43c0 1 1 2 1 3c2 6 5 10 13 10c7 0 12 -2 12 -14 c-16 -155 -93 -159 -136 -159c-89 0 -104 54 -144 54c-59 0 -71 -61 -93 -61c-20 0 -25 24 -25 39c17 63 56 112 111 147c72 44 147 113 147 204c0 29 -1 96 -90 96c-59 0 -77 -24 -79 -38c0 -20 69 -23 69 -83c0 -25 -9 -88 -70 -88c-36 0 -67 24 -82 55c-6 15 -9 29 -9 43 z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E083-timeSig3.xml b/data/Bravura/E083-timeSig3.xml
deleted file mode 100644
index f28b29b2cb1..00000000000
--- a/data/Bravura/E083-timeSig3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -141c0 22 5 46 22 61c12 13 31 23 48 26c4 1 7 1 11 1c43 0 72 -30 72 -72c-1 -29 -23 -44 -23 -66v-5c1 -15 20 -15 28 -16c1 0 5 -1 9 -1c22 0 76 12 76 118c0 13 -9 91 -124 91c-8 0 -25 0 -25 12c0 11 14 16 24 17c63 3 122 32 122 106v7c0 24 -8 77 -93 77 c-9 0 -40 -8 -42 -25v-4c0 -14 15 -12 20 -14s30 -4 33 -41v-8c0 -33 -22 -65 -66 -65h-5c-62 4 -81 48 -81 81c0 53 86 110 172 110c5 0 10 -1 15 -1c42 -3 167 -30 167 -122c0 -46 -21 -72 -61 -91c-9 -5 -20 -6 -31 -9c-3 -1 -4 -5 -4 -9c0 -2 0 -3 1 -5c2 -4 5 -4 10 -5 l33 -9l21 -12c10 -6 18 -13 24 -21c19 -22 26 -41 28 -70v-7c0 -88 -102 -139 -201 -139h-9c-98 2 -169 32 -171 110z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E084-timeSig4.xml b/data/Bravura/E084-timeSig4.xml
deleted file mode 100644
index f51550c12df..00000000000
--- a/data/Bravura/E084-timeSig4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M40 -112c-12 0 -20 7 -20 17c0 3 1 7 3 11c0 1 1 2 1 3l6 8c30 42 128 181 128 305c0 16 14 19 23 19c8 0 53 -2 71 -2s59 2 68 2c8 0 15 -6 15 -14c0 -2 -1 -3 -1 -5c-3 -11 -163 -238 -243 -306h135v84c0 12 5 18 9 23l95 115c6 7 11 9 20 9c11 0 12 -9 12 -17v-214h73 c11 0 15 -7 15 -19s-5 -19 -15 -19h-73v-59c0 -32 21 -38 31 -38s22 -6 22 -20s-10 -21 -20 -21h-213c-15 0 -19 11 -19 21s7 19 23 19c18 0 40 8 40 35v63h-186z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E085-timeSig5.xml b/data/Bravura/E085-timeSig5.xml
deleted file mode 100644
index b820a814c9b..00000000000
--- a/data/Bravura/E085-timeSig5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -127c0 6 0 12 1 18c3 35 25 74 79 74c43 0 78 -34 78 -78c0 -28 -15 -53 -38 -67c-5 -3 -12 -7 -12 -14c1 -7 7 -11 12 -14c7 -3 15 -3 23 -3c26 0 85 14 85 124c0 111 -69 130 -103 130s-58 -23 -68 -33c-11 -11 -12 -20 -22 -20s-20 2 -20 15v2l11 222 c1 8 6 17 24 17c17 -2 103 -10 135 -10s110 9 123 9c11 0 14 -8 14 -21c0 -16 -5 -96 -144 -96c-41 0 -88 7 -98 9h-4c-9 0 -14 -5 -15 -13c-1 -9 -5 -65 -5 -65v-4c0 -3 0 -7 4 -7c1 0 3 0 5 1c32 19 75 29 133 29c91 0 165 -74 165 -165c0 -90 -66 -164 -186 -164 c-123 0 -177 41 -177 124z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E086-timeSig6.xml b/data/Bravura/E086-timeSig6.xml
deleted file mode 100644
index 5b88da2bb4b..00000000000
--- a/data/Bravura/E086-timeSig6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 3c0 47 17 100 39 142c36 68 107 105 183 106c54 0 132 -17 142 -81c1 -4 1 -7 1 -11c0 -43 -38 -76 -80 -76c-13 0 -42 8 -49 21c-10 11 -15 26 -15 41c0 10 2 20 7 29c6 12 25 24 25 38c0 10 -13 15 -33 15c-21 0 -80 -5 -83 -190c0 -16 3 -24 9 -24c2 0 4 0 6 2 c26 23 59 35 91 35c77 0 151 -67 151 -145c0 -45 -23 -90 -58 -118c-36 -29 -86 -36 -131 -36c-84 0 -133 36 -174 110c-22 40 -30 92 -31 138v4zM222 2c-32 0 -58 -50 -58 -112s26 -112 58 -112s59 50 59 112s-27 112 -59 112z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E087-timeSig7.xml b/data/Bravura/E087-timeSig7.xml
deleted file mode 100644
index 3dc69f16f5b..00000000000
--- a/data/Bravura/E087-timeSig7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 49v165c0 9 5 12 10 12s10 -3 12 -7c5 -10 18 -24 26 -24c7 1 13 5 27 18s29 36 87 36c83 0 130 -85 155 -85s39 57 46 69c4 7 20 11 21 11c17 0 17 -13 17 -40v-4c0 -103 -119 -246 -119 -413c0 -29 -6 -37 -16 -37s-57 9 -82 9s-47 -9 -65 -9c-19 0 -19 10 -19 31 c0 39 31 97 69 141c60 71 137 127 137 155c-1 6 -3 9 -7 9c-2 0 -6 -2 -9 -4c-8 -6 -22 -21 -50 -21c-58 0 -106 75 -146 75c-45 0 -58 -58 -68 -83c-4 -11 -7 -20 -15 -20c-10 0 -11 16 -11 16z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E088-timeSig8.xml b/data/Bravura/E088-timeSig8.xml
deleted file mode 100644
index 9b629ed6de2..00000000000
--- a/data/Bravura/E088-timeSig8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -132c0 63 40 96 92 121c-48 27 -87 64 -87 133c0 84 79 137 195 137c27 0 174 -15 174 -117c0 -50 -24 -83 -60 -106c47 -24 82 -57 82 -117c0 -135 -107 -178 -207 -178c-99 0 -189 40 -189 127zM77 -127c0 -65 61 -99 128 -99s98 34 98 74c0 66 -74 87 -147 119 c-44 -17 -79 -54 -79 -94zM218 230c-44 0 -101 -21 -101 -63c0 -63 85 -80 165 -108c33 19 53 45 53 85c0 70 -85 86 -117 86z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E089-timeSig9.xml b/data/Bravura/E089-timeSig9.xml
deleted file mode 100644
index 5e0a5e7d394..00000000000
--- a/data/Bravura/E089-timeSig9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M171 -48c-77 0 -151 67 -151 145c0 45 23 90 58 118c36 29 86 36 131 36c84 0 133 -36 174 -110c22 -40 30 -92 31 -138v-4c0 -47 -17 -100 -39 -142c-36 -68 -107 -105 -183 -106c-54 0 -132 17 -142 81c-1 4 -1 7 -1 11c0 43 38 76 80 76c13 0 42 -8 49 -21 c10 -11 15 -26 15 -41c0 -10 -2 -20 -7 -29c-6 -12 -25 -24 -25 -38c0 -10 13 -15 33 -15c21 0 80 5 83 190c0 16 -3 24 -9 24c-2 0 -4 0 -6 -2c-26 -23 -59 -35 -91 -35zM153 112c0 -62 27 -112 59 -112s58 50 58 112s-26 112 -58 112s-59 -50 -59 -112z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08A-timeSigCommon.xml b/data/Bravura/E08A-timeSigCommon.xml
deleted file mode 100644
index cffb2ae8911..00000000000
--- a/data/Bravura/E08A-timeSigCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M70 -182c-41 50 -65 107 -65 172c0 135 86 261 228 261c19 0 170 -12 170 -143c0 -83 -76 -86 -76 -86c-28 0 -77 18 -77 75c0 31 23 74 63 74c15 0 18 13 18 22c0 10 -21 34 -73 34c-54 0 -130 -34 -130 -199s43 -244 124 -244c32 0 142 30 142 159c0 17 7 18 15 18 c4 0 15 0 15 -22c0 -29 -26 -188 -201 -188c-60 0 -115 21 -153 67z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08B-timeSigCutCommon.xml b/data/Bravura/E08B-timeSigCutCommon.xml
deleted file mode 100644
index a63297775a5..00000000000
--- a/data/Bravura/E08B-timeSigCutCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M156 -240c-96 25 -156 136 -156 230c0 95 46 201 136 240l27 10c2 0 12 9 12 16v88c0 8 9 17 17 17c11 0 18 -9 18 -17v-73c0 -5 5 -22 11 -23c85 0 176 -43 176 -141c0 -83 -76 -86 -76 -86c-28 0 -77 18 -77 74c0 31 23 74 63 74c15 0 18 14 18 22c0 10 -22 34 -73 34 c-5 0 -11 0 -17 -1c-7 -1 -25 -18 -25 -25v-396c0 -8 6 -14 10 -15c8 -2 16 -3 26 -3c32 0 142 30 142 158c0 15 6 17 10 17h4c5 0 15 0 16 -19c0 -31 -27 -187 -197 -190c-7 -3 -11 -8 -11 -14v-79c0 -9 -7 -17 -18 -17c-8 0 -17 8 -17 17v77c0 9 -12 22 -19 25zM161 180 c-22 -31 -38 -78 -38 -154c0 -93 14 -160 41 -198c1 -2 3 -3 5 -3c3 0 6 3 6 12v329c0 8 -6 16 -11 16c-1 0 -2 0 -3 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08C-timeSigPlus.xml b/data/Bravura/E08C-timeSigPlus.xml
deleted file mode 100644
index eeba8038c0d..00000000000
--- a/data/Bravura/E08C-timeSigPlus.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 23c0 9 7 14 14 14h184c6 0 15 9 15 18v181c0 7 5 14 14 14h46c9 0 15 -7 15 -14v-181c0 -10 5 -18 13 -18h185c7 0 14 -5 14 -14v-46c0 -9 -7 -15 -14 -15h-184c-7 0 -14 -6 -14 -16v-182c0 -7 -6 -14 -15 -14h-46c-9 0 -14 7 -14 14v184c0 5 -5 14 -15 14h-184 c-7 0 -14 6 -14 15v46z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08D-timeSigPlusSmall.xml b/data/Bravura/E08D-timeSigPlusSmall.xml
deleted file mode 100644
index 9df2c847d10..00000000000
--- a/data/Bravura/E08D-timeSigPlusSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 7c0 4 4 7 8 7h94c3 0 7 5 7 9v92c0 4 3 8 7 8h24c4 0 7 -4 7 -8v-92c0 -5 3 -9 7 -9h94c4 0 8 -3 8 -7v-24c0 -4 -4 -7 -8 -7h-93c-4 0 -8 -3 -8 -9v-92c0 -4 -3 -8 -7 -8h-24c-4 0 -7 4 -7 8v93c0 3 -2 8 -7 8h-94c-4 0 -8 3 -8 7v24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08E-timeSigFractionalSlash.xml b/data/Bravura/E08E-timeSigFractionalSlash.xml
deleted file mode 100644
index 4a3343e913b..00000000000
--- a/data/Bravura/E08E-timeSigFractionalSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -162c0 4 2 8 5 12l333 333c4 4 8 6 12 6c2 0 4 -1 5 -2l21 -21c1 -1 2 -3 2 -5c0 -4 -2 -9 -6 -12l-333 -333c-3 -4 -7 -6 -11 -6c-2 0 -4 1 -5 2l-22 21c-1 1 -1 3 -1 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08F-timeSigEquals.xml b/data/Bravura/E08F-timeSigEquals.xml
deleted file mode 100644
index 4f2ac8177c2..00000000000
--- a/data/Bravura/E08F-timeSigEquals.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 62v49c0 7 8 13 19 13h411c10 0 18 -6 18 -13v-49c0 -7 -8 -13 -18 -13h-411c-11 0 -19 6 -19 13zM19 -125c-11 0 -19 6 -19 13v49c0 7 8 13 19 13h411c10 0 18 -6 18 -13v-49c0 -7 -8 -13 -18 -13h-411z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E090-timeSigMinus.xml b/data/Bravura/E090-timeSigMinus.xml
deleted file mode 100644
index 0d8b9103ec8..00000000000
--- a/data/Bravura/E090-timeSigMinus.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E090" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 27c0 7 8 13 19 13h411c10 0 18 -6 18 -13v-49c0 -7 -8 -13 -18 -13h-411c-11 0 -19 6 -19 13v49z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E091-timeSigMultiply.xml b/data/Bravura/E091-timeSigMultiply.xml
deleted file mode 100644
index 2440f6894e5..00000000000
--- a/data/Bravura/E091-timeSigMultiply.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E091" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 141c-3 3 -4 6 -4 10c0 3 1 7 4 10l32 32c4 3 8 5 12 5s7 -2 9 -4l128 -128c4 -4 9 -7 14 -7c3 0 6 1 8 3l131 131c3 3 6 4 10 4c3 0 7 -1 10 -4l32 -32c3 -4 5 -8 5 -12s-2 -7 -4 -9l-130 -130c-3 -3 -4 -6 -4 -10s1 -8 5 -11l129 -129c2 -2 4 -5 4 -9s-2 -8 -5 -12 l-32 -32c-3 -3 -7 -4 -10 -4c-4 0 -7 1 -10 4c0 0 -128 127 -130 130c-2 2 -6 4 -10 4s-8 -2 -11 -5l-130 -130c-2 -2 -5 -4 -9 -4s-8 2 -12 5l-32 32c-3 3 -4 7 -4 10c0 4 1 7 4 10l130 130c2 2 3 6 3 10c0 5 -2 10 -5 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E092-timeSigParensLeftSmall.xml b/data/Bravura/E092-timeSigParensLeftSmall.xml
deleted file mode 100644
index 356eebb803c..00000000000
--- a/data/Bravura/E092-timeSigParensLeftSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M108 -251c-76 62 -108 150 -108 251c0 102 34 189 107 249c1 0 3 -1 3 -4v-10s0 -6 -2 -8c-40 -56 -61 -116 -61 -227s20 -173 60 -228c1 -1 3 -3 3 -6v-13c0 -1 -1 -4 -2 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E093-timeSigParensRightSmall.xml b/data/Bravura/E093-timeSigParensRightSmall.xml
deleted file mode 100644
index 86964768210..00000000000
--- a/data/Bravura/E093-timeSigParensRightSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 245c0 3 2 4 3 4c73 -60 107 -147 107 -249c0 -101 -32 -189 -108 -251c-1 0 -2 3 -2 4v13c0 3 2 5 3 6c40 55 60 117 60 228s-21 171 -61 227c-2 2 -2 8 -2 8v10z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E094-timeSigParensLeft.xml b/data/Bravura/E094-timeSigParensLeft.xml
deleted file mode 100644
index 76e990bbf0b..00000000000
--- a/data/Bravura/E094-timeSigParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 -488c-125 120 -179 292 -179 489c0 200 54 368 176 486c0 0 4 4 5 4c2 0 3 -3 3 -8v-21s0 -10 -3 -15c-75 -98 -113 -228 -113 -446c0 -217 40 -346 112 -446c2 -2 4 -7 4 -12v-26c0 -2 -1 -6 -2 -6s-2 0 -3 1z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E095-timeSigParensRight.xml b/data/Bravura/E095-timeSigParensRight.xml
deleted file mode 100644
index 58f6436e70a..00000000000
--- a/data/Bravura/E095-timeSigParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 483c0 5 1 8 3 8c1 0 5 -4 5 -4c122 -118 176 -286 176 -486c0 -197 -54 -369 -179 -489c-1 -1 -2 -1 -3 -1s-2 4 -2 6v26c0 5 2 10 4 12c72 100 112 229 112 446c0 218 -38 348 -113 446c-3 5 -3 15 -3 15v21z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A0-noteheadDoubleWhole.xml b/data/Bravura/E0A0-noteheadDoubleWhole.xml
deleted file mode 100644
index efed65b7485..00000000000
--- a/data/Bravura/E0A0-noteheadDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M294 -125c-148 0 -204 61 -204 126c0 69 82 124 214 124c93 0 205 -53 205 -124v146c0 4 5 8 10 8h13c5 0 10 -4 10 -8v-295c0 -4 -5 -7 -10 -7h-13c-5 0 -10 3 -10 7v149c0 -69 -53 -126 -215 -126zM197 40c0 -32 15 -66 33 -89c26 -29 54 -52 96 -52c44 0 75 21 75 70 c0 60 -55 133 -123 133c-47 0 -81 -11 -81 -62zM566 -148v295c0 4 6 8 10 8h13c6 0 10 -4 10 -8v-295c0 -4 -4 -7 -10 -7h-13c-4 0 -10 3 -10 7zM57 147c0 4 4 8 10 8h12c5 0 10 -4 10 -8v-295c0 -4 -5 -7 -10 -7h-12c-6 0 -10 3 -10 7v295zM9 -155c-6 0 -9 3 -9 7v295 c0 4 3 8 9 8h13c5 0 9 -4 9 -8v-295c0 -4 -4 -7 -9 -7h-13z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A1-noteheadDoubleWholeSquare.xml b/data/Bravura/E0A1-noteheadDoubleWholeSquare.xml
deleted file mode 100644
index e09614fb0b0..00000000000
--- a/data/Bravura/E0A1-noteheadDoubleWholeSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 186c0 7 5 12 12 12s13 -5 13 -12v-37c0 -16 11 -24 18 -24h324c11 0 24 8 24 26v35c0 7 5 12 12 12s13 -5 13 -12v-363c0 -6 -6 -13 -13 -13s-12 7 -12 13v32c0 9 -10 20 -24 20h-321c-9 0 -21 -12 -21 -23v-29c0 -6 -6 -13 -13 -13s-12 7 -12 13v363zM25 16v-31 c0 -19 21 -32 56 -32h257c32 0 53 10 53 32v36c0 16 -21 28 -53 28h-261c-37 0 -52 -11 -52 -33z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A2-noteheadWhole.xml b/data/Bravura/E0A2-noteheadWhole.xml
deleted file mode 100644
index 7668a0969b0..00000000000
--- a/data/Bravura/E0A2-noteheadWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 2c0 68 83 123 216 123c93 0 206 -52 206 -123c0 -70 -52 -127 -216 -127c-149 0 -206 60 -206 127zM108 39c0 -32 15 -66 35 -89c21 -28 58 -52 94 -52c10 0 21 1 31 4c33 8 46 36 46 67c0 60 -55 134 -124 134c-31 0 -68 -5 -79 -40c-2 -8 -3 -16 -3 -24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A3-noteheadHalf.xml b/data/Bravura/E0A3-noteheadHalf.xml
deleted file mode 100644
index a71b697d242..00000000000
--- a/data/Bravura/E0A3-noteheadHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M97 -125c-55 0 -97 30 -97 83c0 52 47 167 196 167c58 0 99 -32 99 -83c0 -33 -33 -167 -198 -167zM29 -44c0 -7 3 -14 6 -20c7 -12 19 -23 40 -23c48 0 189 88 189 131c0 7 -3 13 -6 19c-7 12 -18 21 -37 21c-47 0 -192 -79 -192 -128z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A4-noteheadBlack.xml b/data/Bravura/E0A4-noteheadBlack.xml
deleted file mode 100644
index b225dc3f7d7..00000000000
--- a/data/Bravura/E0A4-noteheadBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -42c0 86 88 167 198 167c57 0 97 -32 97 -83c0 -85 -109 -167 -198 -167c-54 0 -97 31 -97 83z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A5-noteheadNull.xml b/data/Bravura/E0A5-noteheadNull.xml
deleted file mode 100644
index 1445fb5f59a..00000000000
--- a/data/Bravura/E0A5-noteheadNull.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A9-noteheadXBlack.xml b/data/Bravura/E0A9-noteheadXBlack.xml
deleted file mode 100644
index 552d775249b..00000000000
--- a/data/Bravura/E0A9-noteheadXBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -110c0 4 1 8 5 11l119 99l-119 100c-3 3 -5 8 -5 12c0 6 5 13 12 13c3 0 6 -1 8 -2l124 -105l126 105c2 1 5 2 7 2c6 0 13 -6 13 -14c0 -4 -2 -9 -5 -11l-119 -100l119 -99c3 -3 5 -7 5 -12c0 -6 -5 -14 -13 -14c-2 0 -5 1 -7 3l-126 105l-124 -105c-2 -2 -4 -3 -7 -3 c-8 0 -13 7 -13 15z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0AF-noteheadPlusBlack.xml b/data/Bravura/E0AF-noteheadPlusBlack.xml
deleted file mode 100644
index 1eafa3dce03..00000000000
--- a/data/Bravura/E0AF-noteheadPlusBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 0c0 8 6 14 14 14h97v97c0 8 6 14 14 14c7 0 14 -6 14 -14v-97h97c7 0 14 -6 14 -14s-7 -14 -14 -14h-97v-97c0 -8 -7 -14 -14 -14c-8 0 -14 6 -14 14v97h-97c-8 0 -14 6 -14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0B5-noteheadWholeWithX.xml b/data/Bravura/E0B5-noteheadWholeWithX.xml
deleted file mode 100644
index acce0c48a81..00000000000
--- a/data/Bravura/E0B5-noteheadWholeWithX.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 1c0 68 82 124 215 124c93 0 205 -53 205 -124c0 -69 -51 -126 -215 -126c-149 0 -205 60 -205 126zM106 37c0 -28 14 -58 30 -80l61 48l-71 82c-7 -6 -12 -14 -15 -24c-3 -8 -5 -17 -5 -26zM155 -65l8 -7c21 -18 46 -30 74 -30c10 0 20 1 30 4c5 1 10 3 14 5l-64 76z M155 99l66 -76l52 39c-22 24 -51 40 -84 40c-11 0 -22 -1 -34 -3zM240 0l62 -72c5 7 7 14 8 22c1 5 2 12 2 18c0 24 -8 48 -22 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0B6-noteheadHalfWithX.xml b/data/Bravura/E0B6-noteheadHalfWithX.xml
deleted file mode 100644
index b42bcad3e3b..00000000000
--- a/data/Bravura/E0B6-noteheadHalfWithX.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M97 -125c-55 0 -97 30 -97 83c0 52 47 167 196 167c57 0 98 -33 98 -84c0 -32 -32 -166 -197 -166zM256 63l-94 -65l23 -46c54 32 73 58 73 92c0 6 -1 12 -2 19zM29 -42c0 -6 2 -12 4 -17l93 66l-19 38c-59 -35 -78 -65 -78 -87zM48 -79c8 -6 20 -11 36 -11 c19 0 43 7 77 27l-22 45zM131 58l18 -36l88 61c-6 3 -13 4 -22 4c-18 0 -45 -7 -84 -29z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0B7-noteheadVoidWithX.xml b/data/Bravura/E0B7-noteheadVoidWithX.xml
deleted file mode 100644
index 97e2c175792..00000000000
--- a/data/Bravura/E0B7-noteheadVoidWithX.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37c0 24 10 65 41 100c24 28 69 62 148 62c53 0 100 -31 100 -88c0 -16 -7 -56 -36 -93c-38 -50 -92 -69 -154 -69c-53 0 -99 32 -99 88zM237 87l-80 -81l63 -63l13 16c14 17 21 35 25 46c4 14 6 27 6 32c0 19 -7 34 -20 45zM25 -37c0 -16 5 -30 14 -40l83 83l-52 52 l-11 -12c-24 -27 -34 -62 -34 -83zM139 -12l-80 -79c12 -6 25 -9 40 -9c32 0 61 6 85 18c5 3 11 6 16 10zM109 84l-20 -10l50 -51l74 75c-7 1 -16 2 -24 2c-30 0 -57 -5 -80 -16z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0D9-noteheadDiamondHalf.xml b/data/Bravura/E0D9-noteheadDiamondHalf.xml
deleted file mode 100644
index 13c19f237f9..00000000000
--- a/data/Bravura/E0D9-noteheadDiamondHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -5c-2 1 -3 3 -3 5s1 3 3 5l118 118c1 1 3 2 4 2c2 0 4 -1 6 -2l118 -118c1 -2 2 -3 2 -5s-1 -4 -2 -5l-118 -118c-2 -2 -4 -2 -6 -2c-1 0 -3 0 -4 2zM149 51c-26 0 -88 -42 -88 -68c0 -5 1 -13 6 -18c8 -9 17 -14 29 -14c26 0 89 41 89 67c0 17 -20 33 -36 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DA-noteheadDiamondHalfWide.xml b/data/Bravura/E0DA-noteheadDiamondHalfWide.xml
deleted file mode 100644
index f517c709444..00000000000
--- a/data/Bravura/E0DA-noteheadDiamondHalfWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -6c-3 2 -4 3 -4 5s1 3 4 5l165 119c1 1 4 2 6 2c3 0 6 -1 7 -2l167 -119c1 -2 2 -3 2 -5s-1 -4 -2 -5l-166 -117c-2 -1 -5 -2 -8 -2c-2 0 -5 1 -7 2zM207 50c-28 0 -122 -39 -122 -68c0 -5 3 -11 9 -16c10 -12 24 -16 40 -16c28 0 125 37 125 67c0 20 -36 33 -52 33z " /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DB-noteheadDiamondBlack.xml b/data/Bravura/E0DB-noteheadDiamondBlack.xml
deleted file mode 100644
index 409994715ac..00000000000
--- a/data/Bravura/E0DB-noteheadDiamondBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -5c-2 2 -3 4 -3 6s0 3 2 5l117 117c1 1 4 2 6 2c3 0 5 -1 6 -2l117 -117c1 -1 2 -3 2 -5s-1 -4 -2 -5l-118 -119c-2 -2 -4 -2 -5 -2c-2 0 -3 0 -5 2z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DC-noteheadDiamondBlackWide.xml b/data/Bravura/E0DC-noteheadDiamondBlackWide.xml
deleted file mode 100644
index cbe6f7951dd..00000000000
--- a/data/Bravura/E0DC-noteheadDiamondBlackWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -4c-3 0 -3 3 -3 5s0 3 3 5l162 116c3 2 7 3 9 3c3 0 7 -1 10 -3l163 -116c2 -2 3 -3 3 -5s-1 -4 -3 -5l-164 -118c-3 -2 -6 -3 -9 -3c-2 0 -5 1 -7 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DD-noteheadDiamondWhite.xml b/data/Bravura/E0DD-noteheadDiamondWhite.xml
deleted file mode 100644
index 1fc9b8951da..00000000000
--- a/data/Bravura/E0DD-noteheadDiamondWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -4c-1 1 -2 3 -2 5s1 4 2 5l116 116c1 1 4 3 7 3s6 -2 7 -3l116 -116c1 -1 2 -3 2 -5s-1 -4 -2 -5l-118 -119c-1 -1 -3 -2 -5 -2s-4 1 -5 2zM125 90l-89 -89l89 -88l89 88z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DE-noteheadDiamondWhiteWide.xml b/data/Bravura/E0DE-noteheadDiamondWhiteWide.xml
deleted file mode 100644
index aa35f276c3f..00000000000
--- a/data/Bravura/E0DE-noteheadDiamondWhiteWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -6c-3 2 -5 4 -5 6s1 4 4 6l159 114c4 3 8 5 12 5c5 0 8 -2 11 -4l161 -116c2 -2 3 -3 3 -5s-1 -4 -3 -5l-164 -117c-3 -2 -6 -3 -9 -3c-2 0 -4 1 -7 3zM174 93l-130 -93l130 -94l131 94z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0F5-noteheadParenthesisLeft.xml b/data/Bravura/E0F5-noteheadParenthesisLeft.xml
deleted file mode 100644
index 1c7428523e1..00000000000
--- a/data/Bravura/E0F5-noteheadParenthesisLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 1c0 84 39 135 105 180l4 -7c-61 -51 -72 -93 -72 -172c0 -42 5 -74 15 -103c11 -32 23 -47 57 -73l-5 -7c-64 41 -104 104 -104 182z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0F6-noteheadParenthesisRight.xml b/data/Bravura/E0F6-noteheadParenthesisRight.xml
deleted file mode 100644
index 476df581fdb..00000000000
--- a/data/Bravura/E0F6-noteheadParenthesisRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M37 2c0 79 -11 122 -73 172l4 7c66 -43 105 -97 105 -180c0 -77 -39 -142 -103 -182l-6 7c34 26 46 41 58 73c10 29 15 61 15 103z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0FA-noteheadWholeFilled.xml b/data/Bravura/E0FA-noteheadWholeFilled.xml
deleted file mode 100644
index c69596f769e..00000000000
--- a/data/Bravura/E0FA-noteheadWholeFilled.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0FA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 2c0 68 83 123 216 123c93 0 206 -52 206 -123c0 -70 -52 -127 -216 -127c-149 0 -206 60 -206 127z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E101-noteheadSlashHorizontalEnds.xml b/data/Bravura/E101-noteheadSlashHorizontalEnds.xml
deleted file mode 100644
index cb9bd307cf0..00000000000
--- a/data/Bravura/E101-noteheadSlashHorizontalEnds.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E101" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M430 250h100l-430 -500h-100z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E102-noteheadSlashWhiteWhole.xml b/data/Bravura/E102-noteheadSlashWhiteWhole.xml
deleted file mode 100644
index 054464693f0..00000000000
--- a/data/Bravura/E102-noteheadSlashWhiteWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E102" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M845 220h-350l-370 -440h350zM430 250h550l-430 -500h-550z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E103-noteheadSlashWhiteHalf.xml b/data/Bravura/E103-noteheadSlashWhiteHalf.xml
deleted file mode 100644
index e92d2e47a0b..00000000000
--- a/data/Bravura/E103-noteheadSlashWhiteHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E103" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M645 220h-150l-370 -440h150zM430 250h350l-430 -500h-350z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E220-tremolo1.xml b/data/Bravura/E220-tremolo1.xml
deleted file mode 100644
index 0febed16fd0..00000000000
--- a/data/Bravura/E220-tremolo1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E220" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 -31l-300 -62v125l300 62v-125z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E221-tremolo2.xml b/data/Bravura/E221-tremolo2.xml
deleted file mode 100644
index 71f7e784f85..00000000000
--- a/data/Bravura/E221-tremolo2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E221" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M149 62l-300 -62v125l300 62v-125zM-151 -62l300 63v-125l-300 -63v125z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E222-tremolo3.xml b/data/Bravura/E222-tremolo3.xml
deleted file mode 100644
index 05a1751fdb7..00000000000
--- a/data/Bravura/E222-tremolo3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E222" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-150 -155l300 62v-125l-300 -62v125zM-150 -96v125l300 62v-125zM150 153l-300 -63v125l300 63v-125z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E223-tremolo4.xml b/data/Bravura/E223-tremolo4.xml
deleted file mode 100644
index 4bb89434a78..00000000000
--- a/data/Bravura/E223-tremolo4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E223" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 63l-300 -63v125l300 63v-125zM150 -308l-300 -62v125l300 62v-125zM-150 -61l300 62v-125l-300 -62v125zM-150 312l300 62v-125l-300 -62v125z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E224-tremolo5.xml b/data/Bravura/E224-tremolo5.xml
deleted file mode 100644
index 5769f29c692..00000000000
--- a/data/Bravura/E224-tremolo5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E224" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 -214l-300 -62v125l300 62v-125zM-151 408l300 62v-125l-300 -62v125zM-150 35l300 63v-125l-300 -63v125zM-151 96v125l300 63v-125zM150 -398l-300 -62v125l300 62v-125z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E22A-buzzRoll.xml b/data/Bravura/E22A-buzzRoll.xml
deleted file mode 100644
index 7d7bd05b7ef..00000000000
--- a/data/Bravura/E22A-buzzRoll.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E22A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-155 116h311v-49l-220 -134h220v-49h-311v49l216 134h-216v49z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E240-flag8thUp.xml b/data/Bravura/E240-flag8thUp.xml
deleted file mode 100644
index 1ee624d6732..00000000000
--- a/data/Bravura/E240-flag8thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M197 -478c-36 85 -131 221 -197 233v239c0 12 8 15 19 15c10 0 18 -6 21 -22c16 -96 58 -182 109 -261c63 -100 115 -218 115 -343c0 -78 -26 -173 -26 -173c-5 -17 -22 -23 -28 -19s-16 13 -16 29c0 4 1 9 3 15c17 45 24 92 24 137c0 59 -9 116 -24 150z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E241-flag8thDown.xml b/data/Bravura/E241-flag8thDown.xml
deleted file mode 100644
index 6c895e000f9..00000000000
--- a/data/Bravura/E241-flag8thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -14c-8 0 -16 5 -16 15v235c134 45 184 126 221 210c15 34 40 118 40 177c0 45 -7 95 -21 137c-10 29 7 48 22 48c7 0 13 -4 16 -15c8 -32 28 -103 28 -181c0 -125 -61 -244 -124 -343c-51 -79 -125 -166 -142 -261c-2 -16 -15 -22 -24 -22z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E242-flag16thUp.xml b/data/Bravura/E242-flag16thUp.xml
deleted file mode 100644
index 3d1c4b1f708..00000000000
--- a/data/Bravura/E242-flag16thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -396h-5v388c0 7 11 10 17 10s18 -2 20 -13c17 -106 73 -122 127 -180c72 -78 98 -106 108 -174c2 -12 3 -23 3 -36c0 -61 -22 -121 -25 -127c-1 -3 -1 -5 -1 -7c0 -4 1 -6 1 -9c18 -37 29 -78 29 -120v-22c0 -48 -3 -105 -7 -110c-6 -13 -13 -17 -20 -17 c-14 0 -22 13 -22 26c0 3 0 5 1 9c5 30 8 60 8 89c0 52 -9 101 -32 149c-69 140 -140 142 -202 144zM54 -217c-8 0 -14 -6 -14 -10c0 -1 0 -2 1 -3c21 -82 67 -106 114 -160c21 -24 38 -44 54 -69c2 -3 4 -4 7 -4c5 0 12 3 13 6c5 8 5 18 7 26c1 7 1 13 1 20 c0 32 -9 63 -27 89c-33 49 -87 105 -148 105h-8z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E243-flag16thDown.xml b/data/Bravura/E243-flag16thDown.xml
deleted file mode 100644
index 337253eeebe..00000000000
--- a/data/Bravura/E243-flag16thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M17 -9c-10 0 -17 5 -17 10v387h5c62 2 143 5 212 145c38 78 38 169 23 253c-3 17 5 25 17 26c12 0 19 1 24 -22c16 -80 15 -178 -21 -253c0 -3 -1 -5 -1 -9c0 -3 0 -5 1 -7c3 -6 25 -66 25 -127c0 -13 -1 -25 -3 -36c-24 -157 -221 -200 -245 -354 c-2 -11 -13 -13 -20 -13zM40 220c0 -5 6 -10 14 -10h8c61 0 125 56 158 105c18 26 27 56 27 89c0 6 0 13 -1 20c-2 8 -2 18 -7 25c-1 4 -8 7 -13 7c-3 0 -5 -1 -7 -4c-16 -26 -33 -46 -54 -69c-47 -55 -103 -78 -124 -160c-1 -1 -1 -2 -1 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E244-flag32ndUp.xml b/data/Bravura/E244-flag32ndUp.xml
deleted file mode 100644
index 0c1f6c7d366..00000000000
--- a/data/Bravura/E244-flag32ndUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -423h-5v560c0 7 8 12 14 12c10 0 17 -10 18 -19c17 -100 71 -116 121 -170c67 -73 90 -100 101 -161c2 -9 2 -18 2 -28c0 -39 -11 -80 -20 -106c14 -29 21 -61 21 -93c0 -57 -21 -112 -23 -119c-1 -2 -1 -4 -1 -6c0 -3 0 -5 1 -7c15 -36 24 -74 26 -113 c0 -9 1 -18 1 -28c0 -43 -4 -89 -7 -95c-7 -11 -14 -16 -20 -16c-2 0 -4 1 -6 2c-7 3 -13 12 -13 24c0 2 1 4 1 7c5 29 8 57 8 85c0 48 -9 93 -31 137c-64 130 -130 132 -188 134zM208 -181c-55 93 -114 117 -169 117c16 -97 65 -114 114 -168c23 -25 41 -44 55 -62 c5 17 10 34 12 44c1 7 3 13 3 21c0 13 -4 28 -15 48zM51 -255c-9 0 -14 -9 -12 -16c22 -73 63 -95 106 -146l5 -5c17 -20 31 -37 46 -59c1 -3 4 -4 7 -4c5 0 10 3 11 6c3 7 3 15 5 23c1 8 2 16 2 24c0 81 -90 177 -170 177z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E245-flag32ndDown.xml b/data/Bravura/E245-flag32ndDown.xml
deleted file mode 100644
index 1bf31b78f2a..00000000000
--- a/data/Bravura/E245-flag32ndDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -172c-8 0 -14 4 -14 13v589c61 2 125 4 201 140c23 41 31 70 31 98c0 34 -12 65 -20 110c0 3 -1 5 -1 7c0 13 7 23 14 26c2 1 4 1 6 1c35 0 42 -116 42 -136v-11c-4 -64 -9 -75 -22 -100l-4 -7c-2 -3 -3 -5 -3 -7c0 -3 3 -6 3 -9c4 -10 20 -53 20 -105 c0 -34 -7 -72 -23 -101c9 -27 22 -71 22 -114c0 -10 0 -20 -2 -29c-11 -64 -35 -92 -105 -168c-52 -57 -109 -73 -126 -177c-1 -9 -9 -20 -19 -20zM39 53c0 -1 0 -2 2 -3c57 0 118 26 175 122c12 21 16 37 16 50c0 8 -2 14 -3 21c-3 11 -8 32 -14 51 c-14 -18 -32 -38 -56 -64c-52 -57 -103 -73 -120 -177zM39 268c0 -5 4 -13 13 -13h5c81 0 173 103 173 185c0 8 -1 17 -2 25c-2 8 -2 16 -5 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-16 -25 -32 -44 -52 -67c-45 -53 -91 -75 -112 -155z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E246-flag64thUp.xml b/data/Bravura/E246-flag64thUp.xml
deleted file mode 100644
index 6fc7123f3d8..00000000000
--- a/data/Bravura/E246-flag64thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -423v758c0 7 7 12 14 12c8 0 17 -10 18 -19c17 -100 71 -116 121 -170c67 -73 90 -100 101 -161c1 -9 2 -18 2 -27c0 -42 -13 -86 -22 -111c15 -27 22 -58 22 -88c0 -39 -11 -80 -20 -106c14 -29 21 -61 21 -93c0 -57 -21 -112 -23 -119c-1 -2 -1 -4 -1 -6 c0 -3 0 -5 1 -7c15 -36 24 -74 26 -113c0 -9 1 -18 1 -28c0 -43 -4 -89 -7 -95c-7 -11 -14 -16 -20 -16c-2 0 -4 1 -6 2c-7 3 -13 12 -13 24c0 2 1 4 1 7c5 29 8 57 8 85c0 48 -9 93 -31 137c-64 130 -130 132 -188 134h-5zM39 134c1 -1 1 -3 1 -4c17 -100 63 -116 113 -170 c23 -25 40 -44 54 -61l13 49c1 7 3 13 3 21c0 13 -4 28 -15 48c-55 92 -112 117 -169 117zM208 -181c-55 93 -114 117 -169 117c16 -97 65 -114 114 -168c23 -25 41 -44 55 -62c5 17 10 34 12 44c1 7 3 13 3 21c0 13 -4 28 -15 48zM51 -255c-7 0 -15 -6 -13 -13 c20 -77 64 -98 107 -149l5 -5c17 -20 31 -37 46 -59c1 -3 4 -4 7 -4c5 0 10 3 11 6c3 7 3 15 5 23c1 8 2 16 2 24c0 81 -90 177 -170 177z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E247-flag64thDown.xml b/data/Bravura/E247-flag64thDown.xml
deleted file mode 100644
index df79fd2c0a8..00000000000
--- a/data/Bravura/E247-flag64thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -376c-8 0 -14 5 -14 13v793c61 2 125 4 201 140c23 41 31 70 31 98c0 34 -12 65 -20 110c0 3 -1 5 -1 7c0 13 7 23 14 26c2 1 4 1 6 1c35 0 42 -116 42 -136v-11c-4 -64 -9 -75 -22 -100l-4 -7c-2 -3 -3 -5 -3 -7c0 -3 3 -6 3 -9c4 -10 20 -53 20 -105 c0 -34 -7 -72 -23 -101c9 -27 22 -71 22 -114c0 -10 0 -20 -2 -29c-4 -24 -10 -43 -20 -62c10 -26 23 -70 23 -112c0 -10 -1 -20 -3 -30c-11 -64 -35 -92 -105 -168c-52 -57 -109 -73 -126 -177c-1 -9 -9 -20 -19 -20zM39 53c0 -1 0 -2 2 -3c57 0 118 26 175 122 c12 21 16 37 16 50c0 8 -2 14 -3 21c-3 11 -8 32 -14 51c-14 -18 -32 -38 -56 -64c-52 -57 -103 -73 -120 -177zM159 25c-58 -63 -107 -85 -120 -179c56 0 120 26 177 122c12 21 16 37 16 50c0 8 -2 14 -3 21l-13 50c-15 -18 -33 -38 -57 -64zM151 423 c-45 -53 -91 -75 -112 -155c0 -5 4 -13 13 -13h5c81 0 173 103 173 185c0 8 -1 17 -2 25c-2 8 -2 16 -5 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-16 -25 -32 -44 -52 -67z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E248-flag128thUp.xml b/data/Bravura/E248-flag128thUp.xml
deleted file mode 100644
index 367fb10d650..00000000000
--- a/data/Bravura/E248-flag128thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -423h-5v944c0 7 7 12 15 12c9 0 16 -10 17 -19c17 -100 71 -116 121 -170c67 -73 90 -100 101 -161c2 -9 2 -19 2 -29c0 -38 -10 -77 -19 -102c8 -17 13 -34 17 -55c1 -9 2 -18 2 -27c0 -42 -13 -86 -22 -111c15 -27 22 -58 22 -88c0 -39 -11 -80 -20 -106 c14 -29 21 -61 21 -93c0 -57 -21 -112 -23 -119c-1 -2 -1 -4 -1 -6c0 -3 0 -5 1 -7c15 -36 24 -74 26 -113c0 -9 1 -18 1 -28c0 -43 -4 -89 -7 -95c-7 -11 -14 -16 -20 -16c-2 0 -4 1 -6 2c-7 3 -13 12 -13 24c0 2 1 4 1 7c5 29 8 57 8 85c0 48 -9 93 -31 137 c-64 130 -130 132 -188 134zM208 17c-55 92 -113 117 -170 117c1 -1 1 -3 1 -4c17 -100 64 -116 114 -170c23 -25 40 -44 54 -61l13 49c1 7 3 13 3 21c0 13 -4 28 -15 48zM208 -181c-55 93 -114 117 -169 117c16 -97 65 -114 114 -168c23 -25 41 -44 55 -62 c5 17 10 34 12 44c1 7 3 13 3 21c0 13 -4 28 -15 48zM51 -255c-8 0 -14 -6 -13 -13c20 -77 64 -98 107 -149l5 -5c17 -20 31 -37 46 -59c1 -3 4 -4 7 -4c5 0 10 3 11 6c3 7 3 15 5 23c1 8 2 16 2 24c0 81 -90 177 -170 177zM208 203c-55 93 -115 117 -170 117 c17 -93 67 -109 115 -162c24 -26 42 -46 56 -64c5 16 9 31 11 40c1 7 3 13 3 21c0 13 -4 28 -15 48z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E249-flag128thDown.xml b/data/Bravura/E249-flag128thDown.xml
deleted file mode 100644
index ae1da108d72..00000000000
--- a/data/Bravura/E249-flag128thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -580c-9 0 -14 5 -14 13v997c61 2 125 4 201 140c23 41 31 70 31 98c0 34 -12 65 -20 110c0 3 -1 5 -1 7c0 13 7 23 14 26c2 1 4 1 6 1c35 0 42 -116 42 -136v-11c-4 -64 -9 -75 -22 -100l-4 -7c-2 -3 -3 -5 -3 -7c0 -3 3 -6 3 -9c4 -10 20 -53 20 -105 c0 -34 -7 -72 -23 -101c9 -27 22 -71 22 -114c0 -10 0 -20 -2 -29c-4 -24 -10 -43 -20 -62c10 -26 23 -70 23 -112c0 -30 -9 -65 -23 -92c10 -26 23 -70 23 -112c0 -10 -1 -20 -3 -30c-11 -64 -35 -92 -105 -168c-52 -57 -109 -73 -126 -177c-1 -9 -10 -20 -19 -20zM159 230 c-52 -57 -103 -73 -120 -177c0 -1 0 -2 2 -3c57 0 118 26 175 122c12 21 16 37 16 50c0 8 -2 14 -3 21c-3 11 -8 32 -14 51c-14 -18 -32 -38 -56 -64zM39 -358c56 0 120 26 177 122c12 21 16 37 16 50c0 8 -2 14 -3 21l-13 50c-15 -18 -33 -38 -57 -64 c-58 -63 -107 -85 -120 -179zM39 -154c56 0 120 26 177 122c12 21 16 37 16 50c0 8 -2 14 -3 21l-13 50c-15 -18 -33 -38 -57 -64c-58 -63 -107 -85 -120 -179zM151 423c-45 -53 -91 -75 -112 -155c0 -5 4 -13 13 -13h5c81 0 173 103 173 185c0 8 -1 17 -2 25 c-2 8 -2 16 -5 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-16 -25 -32 -44 -52 -67z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24A-flag256thUp.xml b/data/Bravura/E24A-flag256thUp.xml
deleted file mode 100644
index 4699bf88588..00000000000
--- a/data/Bravura/E24A-flag256thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 691c0 6 6 13 14 13s15 -5 17 -18c17 -97 72 -124 124 -179l18 -19c54 -59 79 -88 88 -141c2 -10 2 -20 2 -31c0 -39 -9 -80 -18 -107c13 -25 18 -52 18 -80c0 -38 -9 -80 -18 -107c13 -25 18 -52 18 -80c0 -38 -9 -80 -18 -107c13 -24 19 -54 19 -81 c0 -37 -9 -75 -17 -102c8 -24 12 -51 12 -76c0 -58 -21 -113 -23 -120c-1 -1 -1 -3 -1 -5c0 -3 1 -7 1 -8c16 -37 25 -75 27 -113c0 -9 1 -18 1 -28c0 -44 -4 -92 -8 -97c-6 -12 -12 -17 -19 -17c-3 0 -6 1 -8 2c-7 2 -13 11 -13 23c0 3 0 5 1 8c5 30 8 58 8 86 c0 48 -9 94 -30 138c-65 134 -134 136 -191 138h-4v1108zM51 -249c-8 0 -14 -6 -12 -13c18 -76 62 -99 108 -151c19 -21 34 -40 49 -65c2 -3 5 -4 8 -4c5 0 10 4 11 7c4 8 4 16 6 25c1 7 2 14 2 21c0 78 -89 180 -166 180h-6zM209 -7c-55 93 -115 117 -170 117 c20 -85 68 -110 116 -164l55 -61c4 14 9 29 11 38c2 7 3 14 3 22c0 13 -3 28 -15 48zM39 297c20 -85 68 -110 116 -164l55 -61c4 14 9 29 11 38c2 7 3 14 3 22c0 13 -4 27 -15 46c-55 95 -115 119 -170 119zM39 484c20 -85 68 -110 116 -164l55 -61c4 14 9 29 11 38 c2 7 3 14 3 22c0 13 -4 27 -16 46c-54 95 -114 119 -169 119zM39 -77c20 -80 68 -96 116 -147c25 -27 44 -48 58 -67c6 15 11 33 11 49c0 13 -3 27 -15 47c-54 91 -116 117 -170 118z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24B-flag256thDown.xml b/data/Bravura/E24B-flag256thDown.xml
deleted file mode 100644
index 14395eace49..00000000000
--- a/data/Bravura/E24B-flag256thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -751c-9 0 -14 6 -14 16v1160c62 3 124 5 202 143c23 41 31 72 31 100c0 34 -12 65 -20 110c-1 3 -1 6 -1 9c0 13 7 22 14 25c13 0 20 0 27 -15c5 -8 21 -73 21 -122v-11c-4 -65 -9 -76 -24 -103l-3 -6c-1 -3 -2 -5 -2 -7s0 -4 2 -8c15 -46 22 -97 22 -145 c0 -1 1 -3 1 -4c8 -21 29 -80 29 -138c0 -29 -6 -58 -17 -85c8 -28 17 -66 17 -103c0 -29 -6 -57 -17 -84c8 -28 17 -66 17 -103c0 -29 -6 -57 -17 -84c8 -28 17 -66 17 -103c0 -12 -1 -23 -3 -34c-12 -72 -40 -103 -118 -188c-59 -63 -122 -81 -140 -199 c-2 -11 -14 -21 -24 -21zM160 224c-50 -54 -105 -72 -122 -166c64 0 140 28 203 137c13 23 16 40 16 54c0 27 -4 51 -11 77c0 1 -1 3 -1 4c-16 -30 -42 -59 -85 -106zM151 419c-47 -52 -92 -76 -114 -156c0 -5 5 -13 15 -13h8c77 0 171 105 171 184c0 9 -1 19 -3 28 c0 6 -2 15 -4 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-17 -25 -34 -45 -53 -68zM178 30c-51 -55 -114 -76 -139 -159c62 2 141 32 202 137c13 23 16 40 16 54c0 18 -2 35 -5 53c-18 -24 -41 -50 -74 -85zM178 -157c-51 -55 -114 -76 -139 -159c62 2 141 32 202 137 c13 23 16 40 16 54c0 18 -2 35 -5 53c-18 -24 -41 -50 -74 -85zM39 -503c62 2 141 33 202 137c13 23 16 41 16 55c0 9 -1 17 -1 25c0 6 -2 16 -4 27c-18 -24 -41 -49 -74 -85c-51 -55 -114 -76 -139 -159z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24C-flag512thUp.xml b/data/Bravura/E24C-flag512thUp.xml
deleted file mode 100644
index 3438d8c3093..00000000000
--- a/data/Bravura/E24C-flag512thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -417h-4v1296c0 9 7 12 15 12s15 -4 16 -18c17 -97 74 -122 124 -179l16 -17c56 -60 82 -89 91 -144c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109c7 -15 12 -31 16 -50c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109c7 -15 12 -31 16 -50c1 -9 2 -18 2 -28 c0 -39 -10 -81 -18 -109c7 -15 12 -31 16 -49c1 -9 2 -18 2 -28c0 -39 -10 -82 -18 -110c7 -15 12 -31 16 -49c1 -9 2 -19 2 -29c0 -37 -9 -77 -17 -105c8 -24 13 -50 13 -76c0 -58 -21 -113 -23 -120c-1 -1 -1 -3 -1 -5c0 -3 1 -7 1 -8c16 -37 25 -75 27 -113 c0 -9 1 -18 1 -28c0 -44 -4 -92 -8 -97c-6 -12 -12 -17 -19 -17c-3 0 -6 1 -8 2c-7 2 -13 11 -13 23c0 3 0 5 1 8c5 29 8 58 8 86c0 48 -9 94 -31 138c-65 134 -134 136 -191 138zM51 -249c-8 0 -13 -6 -12 -13c18 -77 62 -100 108 -151c19 -21 35 -40 50 -65 c2 -3 5 -4 8 -4c5 0 10 4 11 7c4 8 4 16 6 25c1 7 2 14 2 21c0 78 -90 180 -167 180h-6zM210 -8c-56 94 -117 118 -171 118c20 -85 69 -110 116 -164c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 13 -3 27 -15 47zM39 484c20 -85 69 -110 116 -164 c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 12 -3 26 -15 46c-56 94 -117 119 -171 119zM210 178c-56 94 -117 119 -171 119c20 -85 69 -110 116 -164c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 12 -3 26 -15 46zM209 552 c-55 94 -116 119 -170 119c20 -85 69 -110 116 -164c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 13 3 21c0 12 -4 27 -16 47zM209 -195c-54 91 -117 117 -170 118c19 -80 68 -96 116 -147c25 -27 44 -48 59 -67l8 27c2 7 3 14 3 22c0 13 -4 27 -16 47z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24D-flag512thDown.xml b/data/Bravura/E24D-flag512thDown.xml
deleted file mode 100644
index 18a32803398..00000000000
--- a/data/Bravura/E24D-flag512thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -925v1349c62 3 126 5 204 143c23 41 31 72 31 100c0 34 -12 65 -20 110c-1 3 -1 6 -1 9c0 13 7 22 14 25c13 0 20 0 27 -15c4 -8 20 -73 20 -122v-11c-4 -62 -9 -74 -21 -99l-5 -10c-1 -3 -2 -5 -2 -7s0 -4 2 -8c1 -5 21 -51 21 -107c0 -11 0 -22 -2 -33 c1 0 32 -75 32 -147c0 -27 -6 -60 -16 -85c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36c-12 -72 -39 -103 -118 -187 c-58 -63 -122 -82 -140 -200c-2 -11 -14 -21 -24 -21s-15 9 -15 14zM40 57c64 0 139 28 202 137c14 24 17 40 17 55c0 28 -5 53 -13 80c-16 -30 -41 -59 -84 -106c-51 -54 -106 -72 -122 -166zM38 262c0 -5 5 -13 15 -13h8c78 0 172 105 172 184c0 9 -1 19 -3 28 c0 6 -2 15 -4 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-17 -25 -34 -45 -53 -68c-47 -52 -93 -76 -115 -156zM40 -317c62 2 142 32 203 137c13 24 16 41 16 56c0 17 -1 34 -6 51c-16 -22 -37 -46 -67 -77l-7 -7c-51 -56 -114 -77 -139 -160zM39 -691c62 2 143 33 203 137 c14 24 17 41 17 56c0 8 -1 16 -1 24c0 6 -2 16 -5 27c-17 -23 -41 -49 -74 -84c-51 -56 -115 -77 -140 -160zM40 -130c62 2 142 32 203 137c13 24 16 42 16 56c0 17 -1 34 -6 51c-15 -22 -37 -45 -65 -76l-8 -9c-52 -55 -115 -76 -140 -159zM40 -504c62 2 142 33 202 137 c14 24 17 41 17 56c0 17 -1 34 -6 51c-17 -23 -41 -49 -74 -84c-51 -56 -114 -77 -139 -160z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24E-flag1024thUp.xml b/data/Bravura/E24E-flag1024thUp.xml
deleted file mode 100644
index 214a4155580..00000000000
--- a/data/Bravura/E24E-flag1024thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -417h-5v1483c0 9 8 13 15 13c8 0 15 -4 17 -18c17 -98 73 -123 123 -180l15 -16c57 -61 83 -89 92 -144c1 -9 2 -18 2 -28c0 -39 -10 -82 -18 -110c13 -24 18 -51 18 -78c0 -39 -10 -81 -18 -109c13 -24 18 -51 18 -78c0 -39 -10 -81 -18 -109c13 -24 18 -51 18 -78 c0 -39 -10 -81 -18 -109c8 -15 13 -31 16 -49c1 -9 2 -18 2 -28c0 -39 -10 -82 -18 -110c8 -15 13 -31 16 -49c1 -9 2 -19 2 -29c0 -37 -9 -77 -17 -105c8 -25 13 -50 13 -76c0 -58 -21 -113 -23 -120c-1 -1 -1 -3 -1 -5c0 -3 1 -7 1 -8c16 -37 25 -75 27 -113 c0 -9 1 -18 1 -28c0 -44 -4 -92 -8 -97c-6 -12 -12 -17 -19 -17c-3 0 -6 1 -8 2c-7 2 -13 11 -13 23c0 3 0 5 1 8c5 29 8 58 8 86c0 48 -9 94 -31 138c-65 134 -134 136 -190 138zM51 -249c-6 0 -13 -5 -11 -13c17 -77 61 -99 107 -151c19 -21 35 -40 50 -65c2 -3 5 -4 8 -4 c5 0 10 4 11 7c4 8 4 16 6 25c1 7 2 14 2 21c0 78 -90 180 -167 180h-6zM39 297c20 -85 69 -110 116 -164c23 -24 41 -44 56 -61l11 38c2 7 3 14 3 22c0 13 -3 27 -15 47c-56 94 -117 118 -171 118zM39 110c20 -85 69 -110 116 -164c23 -24 41 -44 55 -61c5 14 9 29 12 38 c2 7 3 14 3 22c0 13 -3 27 -15 47c-56 94 -117 118 -171 118zM209 740c-55 94 -116 118 -170 118c20 -85 69 -110 116 -164c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 13 -4 27 -16 47zM210 552c-56 94 -117 119 -171 119c20 -85 69 -110 116 -164 c23 -24 41 -44 56 -61l11 38c2 7 3 14 3 22c0 12 -3 26 -15 46zM39 484c20 -85 69 -110 116 -164c23 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 12 -3 26 -15 46c-56 94 -117 119 -171 119zM210 -195c-54 91 -117 117 -171 118c19 -80 69 -96 116 -147 c25 -27 44 -48 59 -67l8 27c2 7 3 14 3 22c0 13 -3 27 -15 47z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24F-flag1024thDown.xml b/data/Bravura/E24F-flag1024thDown.xml
deleted file mode 100644
index b5de10ac352..00000000000
--- a/data/Bravura/E24F-flag1024thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 -1202c-9 0 -15 6 -15 14v1543c62 3 126 5 204 143c23 42 30 72 30 100c0 34 -11 65 -19 110c-1 3 -1 6 -1 9c0 13 7 22 14 25c13 0 19 0 26 -15c5 -8 21 -72 21 -122v-11c-4 -65 -9 -76 -24 -103l-3 -6c-1 -4 -2 -5 -2 -8c0 -2 1 -3 2 -7c0 -1 0 -2 1 -3 c5 -12 21 -54 21 -104c0 -11 0 -22 -2 -33c1 0 32 -75 32 -147c0 -27 -6 -60 -16 -85c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -30 -6 -61 -17 -89 c9 -29 18 -68 18 -107c0 -11 -1 -23 -3 -34c-13 -72 -41 -103 -119 -187c-58 -63 -122 -82 -140 -200c-2 -12 -15 -21 -24 -21zM40 -12c64 0 139 28 203 137c13 23 15 39 15 53c0 28 -4 55 -12 82c-16 -30 -41 -59 -84 -106c-51 -54 -106 -72 -122 -166zM38 193 c0 -5 5 -13 15 -13h8c78 0 172 105 172 184c0 9 -1 19 -3 28c0 6 -2 15 -4 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-17 -25 -34 -45 -53 -68c-47 -52 -93 -76 -115 -156zM39 -954c63 2 142 32 204 137c13 23 15 40 15 54c0 9 -1 18 -1 26c0 7 -2 20 -5 32 c-16 -21 -37 -43 -65 -73l-8 -9c-52 -57 -116 -78 -140 -167zM39 -573c62 2 143 33 204 137c13 23 15 40 15 54c0 17 0 36 -5 53c-17 -23 -41 -49 -74 -84c-51 -56 -115 -77 -140 -160zM39 -760c62 2 143 33 204 137c13 23 15 40 15 54c0 17 0 36 -5 53 c-17 -23 -41 -49 -74 -84c-51 -56 -115 -77 -140 -160zM179 -226c-51 -56 -115 -77 -140 -160c62 2 143 33 204 137c13 23 15 40 15 54c0 17 0 36 -5 53c-16 -22 -37 -46 -67 -77zM39 -199c62 2 143 32 204 137c13 23 15 39 15 53c0 18 0 37 -5 54c-15 -22 -37 -45 -65 -76 l-8 -9c-52 -55 -116 -76 -141 -159z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E260-accidentalFlat.xml b/data/Bravura/E260-accidentalFlat.xml
deleted file mode 100644
index 0e56beae4af..00000000000
--- a/data/Bravura/E260-accidentalFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -170c-8 10 -12 581 -12 581c1 18 17 28 31 28c10 0 19 -6 19 -17c0 -20 -6 -260 -7 -282c0 -7 4 -14 11 -17c2 -1 3 -1 5 -1c5 0 16 9 22 14c14 9 38 17 55 17c46 -3 90 -39 90 -96c0 -46 -31 -107 -120 -169c-25 -17 -49 -44 -79 -61c0 0 -3 -2 -6 -2s-6 1 -9 5z M46 51c-1 -4 -2 -16 -2 -32c0 -40 3 -100 3 -100c0 -5 2 -15 11 -15c3 0 6 1 10 3c43 27 89 81 89 135c0 25 -12 58 -41 58c-23 0 -63 -29 -70 -49z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E261-accidentalNatural.xml b/data/Bravura/E261-accidentalNatural.xml
deleted file mode 100644
index efa0ca04899..00000000000
--- a/data/Bravura/E261-accidentalNatural.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -186v515c0 7 5 12 12 12h13c6 0 12 -5 12 -12v-167c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-502c0 -7 -6 -12 -12 -12h-13c-7 0 -12 5 -12 12v149c0 8 -7 11 -17 11c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2c-5 0 -8 3 -8 9z M122 79c-24 0 -85 -26 -85 -40v-103c0 -4 5 -6 12 -6c25 0 82 23 82 41v103c0 4 -3 5 -9 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E262-accidentalSharp.xml b/data/Bravura/E262-accidentalSharp.xml
deleted file mode 100644
index 02417421b0e..00000000000
--- a/data/Bravura/E262-accidentalSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 26c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1 c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18 c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18 c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11zM77 -30c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38c-2 -8 -3 -43 -3 -74z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E263-accidentalDoubleSharp.xml b/data/Bravura/E263-accidentalDoubleSharp.xml
deleted file mode 100644
index 530b54a8064..00000000000
--- a/data/Bravura/E263-accidentalDoubleSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -77c0 18 2 35 5 38c6 5 25 7 43 7h10c14 5 46 21 46 34c0 7 -36 27 -47 33c-3 0 -6 -1 -10 -1c-17 0 -35 4 -42 10c-3 3 -5 21 -5 39s2 35 5 37c6 5 24 7 41 7c16 0 32 -2 36 -7c5 -4 8 -22 8 -39c4 -14 20 -47 34 -47c12 0 28 36 33 47c0 18 1 36 5 39c5 5 23 7 41 7 c41 0 44 -6 44 -47c0 -16 -2 -31 -7 -36c-7 -6 -22 -10 -38 -10c-4 0 -8 1 -12 1c-14 -5 -47 -20 -47 -34c0 -7 36 -27 47 -33h10c17 0 35 -2 40 -7c4 -5 7 -23 7 -40c0 -36 -7 -46 -45 -46c-17 0 -33 4 -40 10c-4 3 -5 20 -5 38c-4 14 -21 46 -34 46s-25 -28 -31 -42 c-1 -1 -2 -3 -2 -4c0 -16 -2 -33 -8 -38c-6 -7 -22 -10 -37 -10c-17 0 -33 4 -40 10c-3 2 -5 20 -5 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E264-accidentalDoubleFlat.xml b/data/Bravura/E264-accidentalDoubleFlat.xml
deleted file mode 100644
index 5d3fef3484d..00000000000
--- a/data/Bravura/E264-accidentalDoubleFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -170c-7 9 -12 581 -12 581c1 17 17 26 31 26c10 0 19 -5 19 -16c0 -19 -7 -260 -7 -281c0 -8 4 -15 11 -17c2 -1 3 -1 5 -1c9 0 16 9 24 13c16 9 28 16 47 16h6c19 0 36 -6 51 -16c-2 139 -3 276 -3 276c2 17 18 26 31 26c10 0 19 -5 19 -16c0 -19 -6 -260 -6 -281 c0 -8 3 -15 10 -17c1 -1 3 -1 5 -1c9 0 17 9 24 13c16 9 29 16 47 16h6c47 -1 91 -38 91 -94c0 -46 -32 -107 -122 -170c-23 -16 -47 -44 -78 -60c0 0 -3 -2 -6 -2c-2 0 -5 1 -8 5c-3 3 -5 60 -7 135c-19 -24 -47 -51 -84 -77c-23 -17 -48 -45 -79 -61c0 0 -3 -2 -6 -2 s-6 1 -9 5zM46 50c-1 -4 -2 -16 -2 -32c0 -39 3 -98 3 -98c0 -6 3 -16 11 -16c2 0 6 1 9 3c45 28 90 78 90 134c0 25 -10 59 -40 59c-24 0 -65 -30 -71 -50zM228 27c0 -38 3 -107 3 -107c0 -6 3 -16 11 -16c2 0 5 1 9 3c45 28 89 78 89 134c0 20 -6 37 -15 49 c-6 7 -14 10 -24 10c-24 0 -66 -30 -72 -50c-1 -3 -1 -12 -1 -23z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E265-accidentalTripleSharp.xml b/data/Bravura/E265-accidentalTripleSharp.xml
deleted file mode 100644
index 4f9bb7f5590..00000000000
--- a/data/Bravura/E265-accidentalTripleSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 35v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71 c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25 c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1 c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9zM271 -115c-3 2 -5 20 -5 38s2 35 5 38c6 5 25 7 43 7h10c14 5 46 21 46 34c0 7 -36 27 -47 33c-3 0 -6 -1 -10 -1c-17 0 -35 4 -42 10c-3 3 -5 21 -5 39s2 35 5 37c6 5 24 7 41 7c16 0 32 -2 36 -7c5 -4 8 -22 8 -39 c4 -14 20 -47 34 -47c12 0 28 36 33 47c0 18 1 36 5 39c5 5 23 7 41 7c41 0 44 -6 44 -47c0 -16 -2 -31 -7 -36c-7 -6 -22 -10 -38 -10c-4 0 -8 1 -12 1c-14 -5 -47 -20 -47 -34c0 -7 36 -27 47 -33h10c17 0 35 -2 40 -7c4 -5 7 -23 7 -40c0 -36 -7 -46 -45 -46 c-17 0 -33 4 -40 10c-4 3 -5 20 -5 38c-4 14 -21 46 -34 46s-25 -28 -31 -42c-1 -1 -2 -3 -2 -4c0 -16 -2 -33 -8 -38c-6 -7 -22 -10 -37 -10c-17 0 -33 4 -40 10zM80 44c-2 -8 -3 -43 -3 -74c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64 s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E266-accidentalTripleFlat.xml b/data/Bravura/E266-accidentalTripleFlat.xml
deleted file mode 100644
index fd272217312..00000000000
--- a/data/Bravura/E266-accidentalTripleFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 411c1 17 17 26 31 26c10 0 19 -5 19 -16c0 -19 -7 -260 -7 -281c0 -8 4 -15 11 -17c2 -1 3 -1 5 -1c9 0 16 9 24 13c16 9 28 16 47 16h6c19 0 36 -6 51 -16c-2 139 -3 276 -3 276c2 17 18 26 31 26c10 0 19 -5 19 -16c0 -19 -6 -260 -6 -281c0 -8 3 -15 10 -17 c1 -1 3 -1 5 -1c9 0 17 9 24 13c16 9 29 16 47 16h6c19 0 38 -7 53 -18c-2 141 -3 278 -3 278c1 18 17 28 31 28c10 0 19 -6 19 -17c0 -20 -6 -260 -7 -282c0 -7 4 -14 11 -17c2 -1 3 -1 5 -1c5 0 16 9 22 14c14 9 38 17 55 17c46 -3 90 -39 90 -96 c0 -46 -31 -107 -120 -169c-25 -17 -49 -44 -79 -61c0 0 -3 -2 -6 -2s-6 1 -9 5c-2 3 -5 60 -6 137c-20 -26 -48 -53 -87 -80c-23 -16 -47 -44 -78 -60c0 0 -3 -2 -6 -2c-2 0 -5 1 -8 5c-3 3 -5 60 -7 135c-19 -24 -47 -51 -84 -77c-23 -17 -48 -45 -79 -61c0 0 -3 -2 -6 -2 s-6 1 -9 5c-7 9 -12 581 -12 581zM44 18c0 -39 3 -98 3 -98c0 -6 3 -16 11 -16c2 0 6 1 9 3c45 28 90 78 90 134c0 25 -10 59 -40 59c-24 0 -65 -30 -71 -50c-1 -4 -2 -16 -2 -32zM416 51c-1 -4 -2 -16 -2 -32c0 -40 3 -100 3 -100c0 -5 2 -15 11 -15c3 0 6 1 10 3 c43 27 89 81 89 135c0 25 -12 58 -41 58c-23 0 -63 -29 -70 -49zM229 50c-1 -3 -1 -12 -1 -23c0 -38 3 -107 3 -107c0 -6 3 -16 11 -16c2 0 5 1 9 3c45 28 89 78 89 134c0 20 -6 37 -15 49c-6 7 -14 10 -24 10c-24 0 -66 -30 -72 -50z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E267-accidentalNaturalFlat.xml b/data/Bravura/E267-accidentalNaturalFlat.xml
deleted file mode 100644
index e9279c9fb97..00000000000
--- a/data/Bravura/E267-accidentalNaturalFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -195c-5 0 -8 3 -8 9v515c0 7 5 12 12 12h13c6 0 12 -5 12 -12v-167c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-502c0 -7 -6 -12 -12 -12h-13c-7 0 -12 5 -12 12v149c0 8 -7 11 -17 11c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2z M245 -170c-8 10 -12 581 -12 581c1 18 17 28 31 28c10 0 19 -6 19 -17c0 -20 -6 -260 -7 -282c0 -7 4 -14 11 -17c2 -1 3 -1 5 -1c5 0 16 9 22 14c14 9 38 17 55 17c46 -3 90 -39 90 -96c0 -46 -31 -107 -120 -169c-25 -17 -49 -44 -79 -61c0 0 -3 -2 -6 -2s-6 1 -9 5z M277 19c0 -40 3 -100 3 -100c0 -5 2 -15 11 -15c3 0 6 1 10 3c43 27 89 81 89 135c0 25 -12 58 -41 58c-23 0 -63 -29 -70 -49c-1 -4 -2 -16 -2 -32zM37 39v-103c0 -4 5 -6 12 -6c25 0 82 23 82 41v103c0 4 -3 5 -9 5c-24 0 -85 -26 -85 -40z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E268-accidentalNaturalSharp.xml b/data/Bravura/E268-accidentalNaturalSharp.xml
deleted file mode 100644
index f7f1a587f2a..00000000000
--- a/data/Bravura/E268-accidentalNaturalSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 106c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71 c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25 c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1 c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71zM0 -186v515c0 7 5 12 12 12h13c6 0 12 -5 12 -12v-167c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-502c0 -7 -6 -12 -12 -12h-13c-7 0 -12 5 -12 12v149c0 8 -7 11 -17 11 c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2c-5 0 -8 3 -8 9zM312 44c-2 -8 -3 -43 -3 -74c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38zM37 39v-103c0 -4 5 -6 12 -6c25 0 82 23 82 41v103 c0 4 -3 5 -9 5c-24 0 -85 -26 -85 -40z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E269-accidentalSharpSharp.xml b/data/Bravura/E269-accidentalSharpSharp.xml
deleted file mode 100644
index d5f5252e7e5..00000000000
--- a/data/Bravura/E269-accidentalSharpSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 26c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1 c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18 c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18 c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11zM270 106c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13 c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11 v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99 c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71zM350 44c-2 -8 -3 -43 -3 -74c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38zM77 -30c0 -24 1 -46 3 -50 c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38c-2 -8 -3 -43 -3 -74z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E26A-accidentalParensLeft.xml b/data/Bravura/E26A-accidentalParensLeft.xml
deleted file mode 100644
index b0f23f0f78d..00000000000
--- a/data/Bravura/E26A-accidentalParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M138 -248c-96 61 -138 148 -138 248c0 97 42 195 140 247c1 0 1 -1 1 -3v-14c0 -3 -1 -4 -2 -5c-56 -51 -79 -115 -79 -225c0 -111 22 -176 79 -227c1 -1 2 -2 2 -4v-15c0 -1 -2 -2 -3 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E26B-accidentalParensRight.xml b/data/Bravura/E26B-accidentalParensRight.xml
deleted file mode 100644
index ec2a01943e1..00000000000
--- a/data/Bravura/E26B-accidentalParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 230v14c0 2 0 3 1 3c98 -52 140 -150 140 -247c0 -100 -42 -187 -138 -248c-1 0 -3 1 -3 2v15c0 2 1 3 2 4c57 51 79 116 79 227c0 110 -23 174 -79 225c-1 1 -2 2 -2 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E26C-accidentalBracketLeft.xml b/data/Bravura/E26C-accidentalBracketLeft.xml
deleted file mode 100644
index 60b8fbf9bae..00000000000
--- a/data/Bravura/E26C-accidentalBracketLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 186c0 1 1 2 2 2h73c1 0 2 -2 2 -3v-16c0 -1 -1 -3 -2 -3h-43v-332h43c1 0 2 -1 2 -3v-15c0 -1 -1 -3 -2 -3h-73c-1 0 -2 1 -2 2v371z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E26D-accidentalBracketRight.xml b/data/Bravura/E26D-accidentalBracketRight.xml
deleted file mode 100644
index f8a58735f7d..00000000000
--- a/data/Bravura/E26D-accidentalBracketRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -184v15c0 2 1 3 2 3h43v332h-43c-1 0 -2 2 -2 3v16c0 1 1 3 2 3h73c1 0 2 -1 2 -2v-371c0 -1 -1 -2 -2 -2h-73c-1 0 -2 2 -2 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E270-accidentalQuarterToneFlatArrowUp.xml b/data/Bravura/E270-accidentalQuarterToneFlatArrowUp.xml
deleted file mode 100644
index 6438387ea1f..00000000000
--- a/data/Bravura/E270-accidentalQuarterToneFlatArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-42 381l90 198l89 -198h-65c-2 -73 -5 -227 -6 -244c0 -8 4 -15 10 -17c2 -1 3 -1 5 -1c8 0 15 9 23 14c17 11 35 16 54 16c47 -2 90 -39 90 -94c0 -47 -32 -107 -121 -169c-23 -17 -48 -44 -78 -61c0 0 -3 -2 -6 -2c-2 0 -5 1 -8 5c-7 8 -11 441 -12 553h-65zM68 48 c-1 -4 -1 -14 -1 -27c0 -39 3 -104 3 -104c0 -6 1 -15 9 -15c3 0 6 1 10 3c46 29 89 78 89 135c0 25 -11 57 -40 57c-24 0 -64 -28 -70 -49z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E271-accidentalThreeQuarterTonesFlatArrowDown.xml b/data/Bravura/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
deleted file mode 100644
index 87e35c8468f..00000000000
--- a/data/Bravura/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-39 -215h71c-5 128 -11 629 -11 629c1 18 17 28 31 28c11 0 20 -6 20 -17c0 -20 -6 -266 -7 -288c0 -8 4 -14 11 -16c2 -1 4 -1 6 -1c5 0 16 8 23 13c10 6 21 10 31 14c1 0 2 1 3 1c7 1 13 2 20 2c47 -2 92 -38 92 -96c0 -48 -32 -110 -123 -173c-10 -7 -17 -15 -30 -25 c-26 -21 -28 -49 -29 -71h76l-92 -203zM66 13c0 -40 3 -101 3 -101c0 -5 2 -14 11 -14c3 0 6 1 10 3c32 19 60 51 74 75c11 22 16 43 16 62c0 20 -6 37 -15 48c-7 7 -16 11 -26 11c-24 0 -65 -30 -71 -51c-1 -4 -2 -17 -2 -33z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E272-accidentalQuarterToneSharpNaturalArrowUp.xml b/data/Bravura/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
deleted file mode 100644
index 9698bc84f1e..00000000000
--- a/data/Bravura/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M44 348h-70l91 199l90 -199h-74v-191c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-502c0 -7 -6 -12 -12 -12h-13c-7 0 -12 5 -12 12v149c0 8 -7 11 -17 11c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2c-5 0 -8 3 -8 9v539zM81 -69 c0 -4 5 -6 12 -6c25 0 82 23 82 41v103c0 4 -3 5 -9 5c-24 0 -85 -26 -85 -40v-103z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E273-accidentalQuarterToneFlatNaturalArrowDown.xml b/data/Bravura/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
deleted file mode 100644
index 7aa6ea4d87d..00000000000
--- a/data/Bravura/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 324c0 7 5 12 12 12h13c6 0 12 -5 12 -12v-167c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-503h79l-97 -214l-97 214h78v150c0 8 -7 11 -17 11c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2c-5 0 -8 3 -8 9v515zM40 34v-103 c0 -4 5 -6 12 -6c25 0 82 23 82 41v103c0 4 -3 5 -9 5c-24 0 -85 -26 -85 -40z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E274-accidentalThreeQuarterTonesSharpArrowUp.xml b/data/Bravura/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
deleted file mode 100644
index 659806b4409..00000000000
--- a/data/Bravura/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 107c0 6 5 14 12 17c0 0 20 7 26 10s12 13 12 27v135c0 7 6 11 16 11c7 0 14 -4 14 -11v-119c0 -9 3 -21 12 -21c17 4 51 18 63 25c9 6 12 19 13 29v116h-78l92 204l93 -204h-77v-108c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71 c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25 c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 12c6 2 11 11 11 22v99c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1 c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71zM80 45c-2 -8 -3 -43 -3 -74c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 53 -4 58c-2 4 -7 5 -14 5c-25 0 -72 -21 -74 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E275-accidentalQuarterToneSharpArrowDown.xml b/data/Bravura/E275-accidentalQuarterToneSharpArrowDown.xml
deleted file mode 100644
index 1878535920e..00000000000
--- a/data/Bravura/E275-accidentalQuarterToneSharpArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-28 -330h78v115c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 12c6 2 11 11 11 22v99c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71c0 6 5 14 12 17 c0 0 20 7 26 10s12 13 12 27v135c0 7 6 11 16 11c7 0 14 -4 14 -11v-119c0 -9 3 -21 12 -21c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10 c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-130h77 l-91 -205zM77 -31c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 53 -4 58c-2 4 -7 5 -14 5c-25 0 -72 -21 -74 -38c-2 -8 -3 -43 -3 -74z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E280-accidentalQuarterToneFlatStein.xml b/data/Bravura/E280-accidentalQuarterToneFlatStein.xml
deleted file mode 100644
index b0f740ca38e..00000000000
--- a/data/Bravura/E280-accidentalQuarterToneFlatStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M121 -112c-89 62 -120 123 -120 171c0 55 44 91 90 94c17 0 41 -8 55 -17c6 -5 17 -14 22 -14c2 0 3 0 5 1c7 3 11 10 11 17c-1 22 -7 262 -7 282c0 11 9 17 19 17c14 0 30 -10 31 -28c0 0 -4 -571 -12 -581c-3 -4 -6 -5 -9 -5s-6 2 -6 2c-30 17 -54 44 -79 61zM70 42 c0 -54 46 -108 89 -135c4 -2 7 -3 10 -3c9 0 11 10 11 15c0 0 3 60 3 100c0 16 -1 28 -2 32c-7 20 -47 49 -70 49c-29 0 -41 -33 -41 -58z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E281-accidentalThreeQuarterTonesFlatZimmermann.xml b/data/Bravura/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
deleted file mode 100644
index f33360cdeaa..00000000000
--- a/data/Bravura/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M252 -170c-8 10 -12 581 -12 581c1 18 18 28 32 28c10 0 19 -5 19 -17l-8 -282c0 -8 4 -15 11 -17c2 -1 3 -1 5 -1c8 0 15 9 23 14c11 7 22 11 34 15c7 1 13 2 20 2c45 -2 90 -39 90 -95c0 -47 -32 -108 -121 -170c-23 -17 -48 -45 -78 -61c0 0 -3 -2 -6 -2s-6 1 -9 5z M123 -113c-90 63 -122 124 -122 171c0 55 44 93 91 95c7 0 13 -1 20 -2c1 0 2 -1 3 -1c10 -4 21 -8 31 -14c8 -5 15 -14 23 -14c2 0 3 0 5 1c7 2 11 9 11 17l-8 282c0 11 9 16 19 16c14 0 31 -9 32 -27c0 0 -5 -571 -13 -581c-3 -4 -7 -5 -9 -5c-3 0 -5 2 -5 2 c-31 16 -55 44 -78 60zM71 42c0 -56 44 -106 89 -135c4 -2 7 -3 10 -3c9 0 11 10 11 16c0 0 3 59 3 98c0 16 -1 28 -2 32c-4 14 -30 35 -44 43c-10 5 -18 7 -26 7c-10 0 -19 -4 -26 -11c-9 -11 -15 -28 -15 -47zM284 18c0 -39 3 -98 3 -98c0 -6 3 -16 11 -16c3 0 5 1 9 3 c46 30 89 77 89 135c0 25 -9 58 -39 58c-24 0 -65 -29 -71 -50c-1 -4 -2 -16 -2 -32z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E282-accidentalQuarterToneSharpStein.xml b/data/Bravura/E282-accidentalQuarterToneSharpStein.xml
deleted file mode 100644
index c98e97805fa..00000000000
--- a/data/Bravura/E282-accidentalQuarterToneSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -219c-5 0 -8 3 -8 9v71c0 6 6 14 12 16l52 22c6 2 10 11 10 22v100c0 8 -6 17 -12 17c-1 0 -2 -1 -3 -1c-8 -3 -47 -20 -47 -20c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 6 14 12 16c17 7 33 15 51 22c7 6 10 18 10 26v130c0 8 2 17 17 17c8 0 14 -5 14 -11v-120 c0 -9 4 -20 13 -20c2 0 50 18 50 18c1 1 3 1 4 1c4 0 8 -3 8 -8v-71c0 -7 -6 -14 -12 -17c0 0 -42 -16 -51 -20c-8 -3 -13 -21 -13 -29v-93c0 -11 7 -17 14 -17c4 1 50 20 50 20v-1c1 0 3 1 4 1c5 0 8 -3 8 -9v-71c0 -6 -6 -14 -12 -16c0 0 -45 -18 -53 -20 c-4 -2 -8 -8 -9 -14c-1 -3 -1 -5 -1 -8v-138c0 -10 -2 -17 -17 -17c-8 0 -14 5 -14 11v125c0 8 -9 21 -14 19c-6 -3 -47 -21 -51 -21z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E283-accidentalThreeQuarterTonesSharpStein.xml b/data/Bravura/E283-accidentalThreeQuarterTonesSharpStein.xml
deleted file mode 100644
index 84ad6017781..00000000000
--- a/data/Bravura/E283-accidentalThreeQuarterTonesSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -209c-4 0 -7 4 -7 8v78c0 4 3 6 8 8l29 11c5 2 10 9 10 17v116c0 6 -1 10 -6 10c-1 0 -2 0 -4 -1c-8 -4 -29 -11 -31 -11c-3 0 -6 4 -6 8v77c0 4 3 6 8 8l31 12c5 2 8 5 8 15v145c0 13 3 16 16 16s16 -3 16 -16v-133c0 -6 3 -9 7 -9c1 0 2 1 3 1l43 16c7 3 9 9 9 16 v139c0 13 3 16 16 16s16 -2 16 -16v-127c0 -5 2 -9 10 -9c13 6 36 14 40 16c6 2 8 6 8 19v132c0 13 3 16 16 16s16 -2 16 -16v-127c0 -5 2 -7 4 -7c1 0 2 0 3 1c5 2 36 13 38 13c4 0 6 -4 6 -8v-77c0 -4 -3 -7 -8 -8c0 0 -33 -13 -37 -14c-5 -2 -6 -6 -6 -13v-117 c0 -11 3 -11 11 -11c6 3 32 13 34 13c4 0 6 -5 6 -8v-78c0 -4 -3 -6 -8 -8l-35 -13c-3 -1 -8 -6 -8 -12v-148c0 -13 -3 -16 -16 -16s-16 2 -16 16v134c0 5 -2 8 -6 8c-2 0 -4 -1 -6 -2l-36 -13c-6 -2 -10 -8 -10 -16v-142c0 -13 -3 -16 -16 -16s-16 2 -16 16v131 c0 6 -2 8 -8 8l-48 -19c-4 -1 -6 -7 -6 -13v-138c0 -13 -3 -16 -16 -16s-16 3 -16 16v124c0 6 -2 9 -7 9c-2 0 -4 0 -6 -1c-9 -3 -26 -10 -27 -10zM79 -33c0 -27 0 -51 3 -55c1 -1 3 -2 6 -2c15 0 53 15 56 25c2 6 3 45 3 80c0 31 -1 59 -3 62c-1 1 -2 2 -5 2 c-14 0 -54 -16 -57 -25c-2 -7 -3 -50 -3 -87zM176 13c0 -32 1 -62 3 -65c1 -1 3 -2 6 -2c14 0 46 15 49 23c2 5 3 48 3 85c0 29 -1 55 -3 58c0 0 -2 1 -3 1c-12 0 -48 -15 -52 -23c-2 -5 -3 -42 -3 -77z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E440-accidentalBuyukMucennebFlat.xml b/data/Bravura/E440-accidentalBuyukMucennebFlat.xml
deleted file mode 100644
index c6b6c11126d..00000000000
--- a/data/Bravura/E440-accidentalBuyukMucennebFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 333c0 4 3 7 10 8c0 0 42 16 45 18c5 1 6 6 6 8v43c1 18 17 28 31 28c10 0 19 -5 19 -16c0 -4 -1 -16 -1 -35c0 -2 2 -5 7 -5c3 1 136 50 139 50c5 0 6 -4 6 -8v-49c0 -4 -3 -8 -9 -10c0 0 -134 -49 -138 -51s-7 -5 -7 -11s0 -19 -1 -28c0 -2 5 -5 6 -5 c4 2 140 52 143 52c5 0 6 -4 6 -8v-48c0 -5 -3 -9 -9 -11c0 0 -134 -49 -141 -52c-7 -2 -7 -12 -7 -16c-1 -23 -1 -41 -1 -46c0 -8 4 -15 11 -18c1 0 2 -1 3 -1c9 0 17 10 25 14c15 9 36 17 53 17c46 -3 90 -38 90 -95c0 -47 -32 -107 -120 -169c-23 -17 -48 -45 -78 -61 c0 0 -3 -2 -6 -2s-6 1 -9 6c-4 4 -8 184 -10 342c0 4 -2 8 -9 8c-6 -3 -44 -18 -46 -18c-6 0 -8 4 -8 8v51c0 5 3 7 10 7c0 0 42 17 46 19c5 2 6 4 6 12c-1 7 -1 16 -1 25c0 2 -2 5 -7 5c-2 -1 -45 -17 -47 -17c-5 0 -7 4 -7 8v51zM107 51c-1 -4 -1 -14 -1 -27 c0 -39 3 -103 3 -103c0 -6 3 -16 11 -16c2 0 5 1 9 3c45 27 89 80 89 135c0 20 -6 36 -15 47c-7 7 -16 10 -26 10c-8 0 -16 -2 -25 -6c-15 -8 -41 -30 -45 -43z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E441-accidentalKucukMucennebFlat.xml b/data/Bravura/E441-accidentalKucukMucennebFlat.xml
deleted file mode 100644
index 528e2ad1a9b..00000000000
--- a/data/Bravura/E441-accidentalKucukMucennebFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E441" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -170c-8 10 -12 581 -12 581c1 18 17 28 31 28c10 0 19 -6 19 -17c0 -20 -6 -260 -7 -282c0 -7 4 -14 11 -17c2 -1 3 -1 5 -1c5 0 16 9 22 14c14 9 38 17 55 17c46 -3 90 -39 90 -96c0 -46 -31 -107 -120 -169c-25 -17 -49 -44 -79 -61c0 0 -3 -2 -6 -2s-6 1 -9 5z M46 51c-1 -4 -2 -16 -2 -32c0 -40 3 -100 3 -100c0 -5 2 -15 11 -15c3 0 6 1 10 3c43 27 89 81 89 135c0 25 -12 58 -41 58c-23 0 -63 -29 -70 -49z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E442-accidentalBakiyeFlat.xml b/data/Bravura/E442-accidentalBakiyeFlat.xml
deleted file mode 100644
index 77e3ea29ab7..00000000000
--- a/data/Bravura/E442-accidentalBakiyeFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 172v50c0 5 3 7 9 8l45 17c8 3 8 12 8 15c-1 86 -1 149 -1 149c1 18 17 28 30 28c10 0 19 -6 19 -17c0 -10 -2 -79 -3 -145c0 -3 1 -6 6 -6c4 2 140 52 140 52c1 1 3 1 4 1c5 0 6 -6 6 -9v-48c0 -4 -3 -8 -10 -10c0 0 -139 -54 -142 -55s-6 -3 -6 -10 c0 -6 -2 -46 -2 -52c0 -7 4 -14 11 -16c2 -1 4 -1 6 -1c4 0 15 8 22 13c13 7 24 11 36 14c6 2 13 3 19 3c46 -3 90 -38 90 -95c0 -46 -31 -108 -120 -170c-25 -17 -50 -45 -80 -61c0 0 -3 -2 -6 -2c-2 0 -5 1 -8 5c-5 6 -8 191 -10 349c0 2 -2 4 -6 4c-2 -2 -48 -19 -50 -19 c-5 0 -7 4 -7 8zM103 19c0 -40 3 -100 3 -100c0 -6 2 -15 10 -15c3 0 6 1 10 3c47 26 91 80 91 136c0 26 -10 57 -40 57c-25 0 -65 -27 -72 -49c-1 -4 -2 -16 -2 -32z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E443-accidentalKomaFlat.xml b/data/Bravura/E443-accidentalKomaFlat.xml
deleted file mode 100644
index 6e8011ffce0..00000000000
--- a/data/Bravura/E443-accidentalKomaFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E443" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M121 -112c-89 62 -120 123 -120 171c0 55 44 91 90 94c17 0 41 -8 55 -17c6 -5 17 -14 22 -14c2 0 3 0 5 1c7 3 11 10 11 17c-1 22 -7 262 -7 282c0 11 9 17 19 17c14 0 30 -10 31 -28c0 0 -4 -571 -12 -581c-3 -4 -6 -5 -9 -5s-6 2 -6 2c-30 17 -54 44 -79 61zM70 42 c0 -54 46 -108 89 -135c4 -2 7 -3 10 -3c9 0 11 10 11 15c0 0 3 60 3 100c0 16 -1 28 -2 32c-7 20 -47 49 -70 49c-29 0 -41 -33 -41 -58z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E444-accidentalKomaSharp.xml b/data/Bravura/E444-accidentalKomaSharp.xml
deleted file mode 100644
index d17c08d3fbb..00000000000
--- a/data/Bravura/E444-accidentalKomaSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E444" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 27c-4 0 -7 3 -7 8v71c0 7 5 14 12 17c19 0 52 18 73 26c7 7 10 18 11 27v130c0 8 1 16 17 16c7 0 13 -5 13 -11v-120c0 -8 4 -20 13 -20c2 1 78 29 78 29c2 1 4 1 5 1c5 0 7 -3 7 -8v-71c0 -7 -5 -14 -12 -17l-78 -30c-8 -3 -13 -11 -13 -29v-93c0 -12 1 -19 8 -19 c1 0 3 0 5 1l78 30c2 1 4 1 5 1c5 0 7 -3 7 -8v-71c0 -7 -5 -14 -12 -17c0 0 -73 -28 -80 -31c-5 -2 -8 -8 -10 -14c-1 -2 -1 -4 -1 -7v-139c0 -9 -2 -16 -17 -16c-7 0 -13 5 -13 11v134c0 10 0 11 -8 11c-7 -2 -76 -30 -76 -30c-2 -1 -3 -1 -5 -1c-4 0 -7 3 -7 8v71 c0 7 5 14 12 17c0 0 68 28 74 30c6 3 10 12 10 23v99c0 8 0 20 -7 20l-77 -28c-2 -1 -3 -1 -5 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E445-accidentalBakiyeSharp.xml b/data/Bravura/E445-accidentalBakiyeSharp.xml
deleted file mode 100644
index 860088a94fd..00000000000
--- a/data/Bravura/E445-accidentalBakiyeSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E445" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 26c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1 c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18 c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18 c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11zM77 -30c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38c-2 -8 -3 -43 -3 -74z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E446-accidentalKucukMucennebSharp.xml b/data/Bravura/E446-accidentalKucukMucennebSharp.xml
deleted file mode 100644
index 0743eeb95f7..00000000000
--- a/data/Bravura/E446-accidentalKucukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 -31c0 6 4 9 12 11c0 0 135 51 139 52c3 1 3 4 3 7v15c0 1 -1 2 -3 2c-1 0 -3 0 -4 -1l-77 -28c-2 -1 -3 -1 -5 -1c-4 0 -7 3 -7 8v71c0 7 5 14 12 17c19 0 52 18 73 26c7 7 10 18 11 27v130c0 8 1 16 17 16c7 0 13 -5 13 -11v-120c0 -8 4 -20 13 -20c2 1 78 29 78 29 c2 1 4 1 5 1c5 0 7 -3 7 -8v-71c0 -7 -5 -14 -12 -17l-86 -33c-4 -2 -5 -3 -5 -7v-15c0 -1 0 -3 3 -3c1 0 3 1 4 1c6 2 137 52 137 52v-1c1 0 3 2 4 2c7 0 8 -7 8 -12v-63c0 -6 -3 -10 -12 -13c0 0 -137 -52 -140 -53s-4 -2 -4 -6v-13c0 -5 3 -7 10 -7l81 31c2 1 4 1 5 1 c5 0 7 -3 7 -8v-71c0 -7 -5 -14 -12 -17c0 0 -73 -28 -80 -31c-5 -2 -8 -8 -10 -14c-1 -2 -1 -4 -1 -7v-139c0 -9 -2 -16 -17 -16c-7 0 -13 5 -13 11v134c0 10 0 11 -8 11c-7 -2 -76 -30 -76 -30c-2 -1 -3 -1 -5 -1c-4 0 -7 3 -7 8v71c0 7 5 14 12 17c0 0 71 29 77 32 c6 2 7 5 7 12v15c0 2 -1 3 -4 3l-141 -52c-6 0 -9 6 -9 11v65z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E447-accidentalBuyukMucennebSharp.xml b/data/Bravura/E447-accidentalBuyukMucennebSharp.xml
deleted file mode 100644
index d748bf4cbb5..00000000000
--- a/data/Bravura/E447-accidentalBuyukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 -100c-6 0 -9 5 -9 10v66c0 6 5 8 12 10c0 0 75 28 77 29c3 1 3 3 3 5v15c0 2 -2 3 -4 3c-3 0 -7 -2 -11 -3c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20 c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-12 -5 -14 -7 -14 -17c0 -1 1 -8 1 -13c0 -2 1 -3 3 -3c2 1 85 32 85 32v-1c1 0 3 2 4 2 c6 0 8 -7 8 -11v-63c0 -6 -4 -11 -12 -13l-85 -32c-3 -1 -3 -3 -3 -5v-10c0 -6 1 -9 4 -9c2 0 5 1 9 3l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18 c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 24 10 30 13c7 3 8 6 8 14v12c0 2 0 5 -3 5 c-1 0 -2 -1 -3 -1c-4 -2 -75 -28 -78 -28zM124 -58c-3 -1 -4 -2 -4 -6c1 -9 1 -16 3 -18c1 -1 2 -2 5 -2c18 0 81 25 84 39c1 4 1 9 1 16c0 1 -2 3 -3 3c-16 -6 -85 -32 -86 -32zM121 30c0 -1 2 -2 3 -2c1 1 73 28 87 33c2 1 2 3 2 4c-1 2 -1 8 -1 12s0 8 -3 8 c-27 0 -73 -23 -86 -35c-2 -2 -1 -15 -2 -20z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A0-articAccentAbove.xml b/data/Bravura/E4A0-articAccentAbove.xml
deleted file mode 100644
index 69dcb183cd0..00000000000
--- a/data/Bravura/E4A0-articAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 221c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z " /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A1-articAccentBelow.xml b/data/Bravura/E4A1-articAccentBelow.xml
deleted file mode 100644
index c75f0de0456..00000000000
--- a/data/Bravura/E4A1-articAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -24c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z " /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A2-articStaccatoAbove.xml b/data/Bravura/E4A2-articStaccatoAbove.xml
deleted file mode 100644
index 7d109f9a8b5..00000000000
--- a/data/Bravura/E4A2-articStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42 0c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A3-articStaccatoBelow.xml b/data/Bravura/E4A3-articStaccatoBelow.xml
deleted file mode 100644
index 537aba00dc1..00000000000
--- a/data/Bravura/E4A3-articStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42 -84c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A4-articTenutoAbove.xml b/data/Bravura/E4A4-articTenutoAbove.xml
deleted file mode 100644
index f664beb6cf8..00000000000
--- a/data/Bravura/E4A4-articTenutoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 0c-24 0 -24 11 -24 24s0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A5-articTenutoBelow.xml b/data/Bravura/E4A5-articTenutoBelow.xml
deleted file mode 100644
index fe7147469c4..00000000000
--- a/data/Bravura/E4A5-articTenutoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 -48c-24 0 -24 11 -24 24s0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A6-articStaccatissimoAbove.xml b/data/Bravura/E4A6-articStaccatissimoAbove.xml
deleted file mode 100644
index 1e3131d0fc7..00000000000
--- a/data/Bravura/E4A6-articStaccatissimoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 271c1 13 23 22 49 22c27 0 50 -8 50 -23c0 -23 -25 -272 -50 -272c-23 0 -49 258 -49 273z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A7-articStaccatissimoBelow.xml b/data/Bravura/E4A7-articStaccatissimoBelow.xml
deleted file mode 100644
index f8565946ae9..00000000000
--- a/data/Bravura/E4A7-articStaccatissimoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 -273c0 15 26 273 49 273c25 0 50 -249 50 -272c0 -15 -23 -23 -50 -23c-26 0 -48 9 -49 22z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A8-articStaccatissimoWedgeAbove.xml b/data/Bravura/E4A8-articStaccatissimoWedgeAbove.xml
deleted file mode 100644
index 785dd49a688..00000000000
--- a/data/Bravura/E4A8-articStaccatissimoWedgeAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 287c0 2 0 3 2 3c1 0 21 -4 42 -4c20 0 41 4 42 4c2 0 2 -2 2 -3c-17 -43 -35 -186 -37 -284c0 -3 -6 -3 -7 -3s-7 0 -7 3c-2 99 -20 242 -37 284z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A9-articStaccatissimoWedgeBelow.xml b/data/Bravura/E4A9-articStaccatissimoWedgeBelow.xml
deleted file mode 100644
index 5317c818a26..00000000000
--- a/data/Bravura/E4A9-articStaccatissimoWedgeBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 -287c17 42 35 185 37 284c0 3 6 3 7 3s7 0 7 -3c2 -98 20 -241 37 -284c0 -1 0 -3 -2 -3c-1 0 -22 4 -42 4c-21 0 -41 -4 -42 -4c-2 0 -2 1 -2 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AA-articStaccatissimoStrokeAbove.xml b/data/Bravura/E4AA-articStaccatissimoStrokeAbove.xml
deleted file mode 100644
index a708758ab0a..00000000000
--- a/data/Bravura/E4AA-articStaccatissimoStrokeAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 281c0 5 4 9 9 9h30c5 0 9 -4 9 -9v-272c0 -5 -4 -9 -9 -9h-30c-5 0 -9 4 -9 9v272z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AB-articStaccatissimoStrokeBelow.xml b/data/Bravura/E4AB-articStaccatissimoStrokeBelow.xml
deleted file mode 100644
index e66603f1891..00000000000
--- a/data/Bravura/E4AB-articStaccatissimoStrokeBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -9c0 5 4 9 9 9h30c5 0 9 -4 9 -9v-272c0 -5 -4 -9 -9 -9h-30c-5 0 -9 4 -9 9v272z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AC-articMarcatoAbove.xml b/data/Bravura/E4AC-articMarcatoAbove.xml
deleted file mode 100644
index 1bccb8af598..00000000000
--- a/data/Bravura/E4AC-articMarcatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 11c0 2 0 3 1 5l106 231s3 6 10 6c4 0 7 -2 10 -6l108 -231c1 -1 1 -3 1 -5c0 -6 -4 -10 -11 -11h-68c-4 0 -8 2 -11 6c0 0 -56 119 -57 123c-2 2 -4 3 -6 3s-3 -1 -4 -3c-2 -4 -56 -123 -56 -123c-2 -5 -7 -7 -11 -7c-1 0 -4 0 -5 1c-5 1 -7 6 -7 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AD-articMarcatoBelow.xml b/data/Bravura/E4AD-articMarcatoBelow.xml
deleted file mode 100644
index 256559974ed..00000000000
--- a/data/Bravura/E4AD-articMarcatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 -12c0 6 4 10 11 11h68c4 0 8 -2 11 -6c0 0 56 -119 57 -123c2 -2 4 -3 6 -3s3 1 4 3c2 4 56 123 56 123c2 5 7 7 11 7c1 0 4 0 5 -1c5 -1 7 -6 7 -11c0 -2 0 -3 -1 -5l-106 -231s-3 -6 -10 -6c-4 0 -7 2 -10 6l-108 231c-1 1 -1 3 -1 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AE-articMarcatoStaccatoAbove.xml b/data/Bravura/E4AE-articMarcatoStaccatoAbove.xml
deleted file mode 100644
index b36ae79d3a2..00000000000
--- a/data/Bravura/E4AE-articMarcatoStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 201c0 2 0 3 1 5l106 231s3 6 10 6c4 0 7 -2 10 -6l108 -231c1 -1 1 -3 1 -5c0 -6 -4 -10 -11 -11h-68c-4 0 -8 2 -11 6c0 0 -56 119 -57 123c-2 2 -4 3 -6 3s-3 -1 -4 -3c-2 -4 -56 -123 -56 -123c-2 -5 -7 -7 -11 -7c-1 0 -4 0 -5 1c-5 1 -7 6 -7 11zM76 42 c0 23 19 42 42 42s42 -19 42 -42s-19 -42 -42 -42s-42 19 -42 42z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AF-articMarcatoStaccatoBelow.xml b/data/Bravura/E4AF-articMarcatoStaccatoBelow.xml
deleted file mode 100644
index 427ffd0b3d1..00000000000
--- a/data/Bravura/E4AF-articMarcatoStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 -211c0 6 4 10 11 11h68c4 0 8 -2 11 -6c0 0 56 -119 57 -123c2 -2 4 -3 6 -3s3 1 4 3c2 4 56 123 56 123c2 5 7 7 11 7c1 0 4 0 5 -1c5 -1 7 -6 7 -11c0 -2 0 -3 -1 -5l-106 -231s-3 -6 -10 -6c-4 0 -7 2 -10 6l-108 231c-1 1 -1 3 -1 5zM116 -84 c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B0-articAccentStaccatoAbove.xml b/data/Bravura/E4B0-articAccentStaccatoAbove.xml
deleted file mode 100644
index f0e77ef3a4a..00000000000
--- a/data/Bravura/E4B0-articAccentStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 191c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15z M171 0c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B1-articAccentStaccatoBelow.xml b/data/Bravura/E4B1-articAccentStaccatoBelow.xml
deleted file mode 100644
index 6a17dad45cc..00000000000
--- a/data/Bravura/E4B1-articAccentStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 -396c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15z M170 -84c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B2-articTenutoStaccatoAbove.xml b/data/Bravura/E4B2-articTenutoStaccatoAbove.xml
deleted file mode 100644
index 399782635ba..00000000000
--- a/data/Bravura/E4B2-articTenutoStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 216c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24zM172 0c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B3-articTenutoStaccatoBelow.xml b/data/Bravura/E4B3-articTenutoStaccatoBelow.xml
deleted file mode 100644
index f3c8a2a6906..00000000000
--- a/data/Bravura/E4B3-articTenutoStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 -218c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24zM167 -84c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B4-articTenutoAccentAbove.xml b/data/Bravura/E4B4-articTenutoAccentAbove.xml
deleted file mode 100644
index 71b828bf314..00000000000
--- a/data/Bravura/E4B4-articTenutoAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 321c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M-1 24c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B5-articTenutoAccentBelow.xml b/data/Bravura/E4B5-articTenutoAccentBelow.xml
deleted file mode 100644
index 31e66fdb125..00000000000
--- a/data/Bravura/E4B5-articTenutoAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -125c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M-1 -24c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B6-articStressAbove.xml b/data/Bravura/E4B6-articStressAbove.xml
deleted file mode 100644
index 20311f8b55e..00000000000
--- a/data/Bravura/E4B6-articStressAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 9c0 31 149 214 159 224c3 2 6 4 10 4c24 0 64 -40 64 -64c0 -4 -1 -7 -4 -10c-9 -10 -190 -158 -224 -158c-2 0 -3 0 -4 1c0 0 -1 2 -1 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B7-articStressBelow.xml b/data/Bravura/E4B7-articStressBelow.xml
deleted file mode 100644
index 8022dc7d01c..00000000000
--- a/data/Bravura/E4B7-articStressBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 -230c-10 10 -159 192 -159 225c0 4 1 5 5 5c32 0 214 -150 224 -160c2 -3 3 -6 3 -10c0 -23 -40 -64 -63 -64c-4 0 -8 1 -10 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B8-articUnstressAbove.xml b/data/Bravura/E4B8-articUnstressAbove.xml
deleted file mode 100644
index 17486953899..00000000000
--- a/data/Bravura/E4B8-articUnstressAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M191 0c-105 0 -191 86 -191 191v16h32v-16c0 -88 72 -159 159 -159c88 0 159 71 159 159v16h32v-16c0 -105 -85 -191 -191 -191z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B9-articUnstressBelow.xml b/data/Bravura/E4B9-articUnstressBelow.xml
deleted file mode 100644
index ff5143c2c2f..00000000000
--- a/data/Bravura/E4B9-articUnstressBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 -191c0 105 86 191 191 191s191 -86 191 -191v-16h-32v16c0 88 -71 159 -159 159s-159 -71 -159 -159v-16h-32v16z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4BA-articLaissezVibrerAbove.xml b/data/Bravura/E4BA-articLaissezVibrerAbove.xml
deleted file mode 100644
index 99ccb98782e..00000000000
--- a/data/Bravura/E4BA-articLaissezVibrerAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 1c33 95 111 143 187 143c75 0 150 -47 179 -143h-5c-30 61 -102 92 -175 92s-147 -31 -182 -92h-4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4BB-articLaissezVibrerBelow.xml b/data/Bravura/E4BB-articLaissezVibrerBelow.xml
deleted file mode 100644
index 7a1cd43167f..00000000000
--- a/data/Bravura/E4BB-articLaissezVibrerBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0h4c30 -61 102 -92 175 -92s147 31 182 92h4c-32 -95 -110 -143 -187 -143c-75 0 -149 47 -178 143z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4BC-articMarcatoTenutoAbove.xml b/data/Bravura/E4BC-articMarcatoTenutoAbove.xml
deleted file mode 100644
index 24f5193f74e..00000000000
--- a/data/Bravura/E4BC-articMarcatoTenutoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M60 174c-5 1 -7 6 -7 11c0 2 0 3 1 5l106 231s3 6 10 6c4 0 7 -2 10 -6l108 -231c1 -1 1 -3 1 -5c0 -6 -4 -10 -11 -11h-68c-4 0 -8 2 -11 6c0 0 -56 119 -57 123c-2 2 -4 3 -6 3s-3 -1 -4 -3c-2 -4 -56 -123 -56 -123c-2 -5 -7 -7 -11 -7c-1 0 -4 0 -5 1zM-1 24 c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4BD-articMarcatoTenutoBelow.xml b/data/Bravura/E4BD-articMarcatoTenutoBelow.xml
deleted file mode 100644
index ca753958e92..00000000000
--- a/data/Bravura/E4BD-articMarcatoTenutoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M52 -192c-1 1 -1 3 -1 5c0 6 4 10 11 11h68c4 0 8 -2 11 -6c0 0 56 -119 57 -123c2 -2 4 -3 6 -3s3 1 4 3c2 4 56 123 56 123c2 5 7 7 11 7c1 0 4 0 5 -1c5 -1 7 -6 7 -11c0 -2 0 -3 -1 -5l-106 -231s-3 -6 -10 -6c-4 0 -7 2 -10 6zM23 -48c-24 0 -24 11 -24 24 s0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C0-fermataAbove.xml b/data/Bravura/E4C0-fermataAbove.xml
deleted file mode 100644
index 887e71c1388..00000000000
--- a/data/Bravura/E4C0-fermataAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 10c0 3 0 7 1 11c61 306 268 308 300 308c29 0 238 -2 300 -308c1 -4 1 -7 1 -10c0 -10 -5 -14 -14 -14c-10 0 -14 7 -21 21c-1 1 -1 4 -2 7c-10 38 -53 196 -266 196c-206 0 -251 -153 -263 -194c-1 -4 -2 -8 -3 -9c-6 -14 -11 -21 -20 -21c-8 0 -13 3 -13 13zM249 52 c0 29 25 54 54 54c30 0 55 -25 55 -54c0 -30 -25 -55 -55 -55c-29 0 -54 25 -54 55z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C1-fermataBelow.xml b/data/Bravura/E4C1-fermataBelow.xml
deleted file mode 100644
index 8503168a015..00000000000
--- a/data/Bravura/E4C1-fermataBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -24c-1 4 -1 8 -1 11c0 10 5 13 13 13c9 0 14 -7 20 -21c1 -1 2 -5 3 -9c12 -41 57 -194 263 -194c213 0 256 158 266 196c1 3 1 6 2 7c7 14 11 21 21 21c9 0 14 -4 14 -14c0 -3 0 -6 -1 -10c-62 -306 -271 -308 -300 -308c-32 0 -239 2 -300 308zM303 -109 c-29 0 -54 25 -54 54c0 30 25 55 54 55c30 0 55 -25 55 -55c0 -29 -25 -54 -55 -54z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C2-fermataVeryShortAbove.xml b/data/Bravura/E4C2-fermataVeryShortAbove.xml
deleted file mode 100644
index ff95516fb87..00000000000
--- a/data/Bravura/E4C2-fermataVeryShortAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 0c0 0 -4 2 -4 5c0 1 0 2 2 4c61 59 348 440 356 440c14 0 310 -386 366 -440c2 -2 2 -4 2 -5c0 -3 -3 -4 -3 -4h-37s-6 1 -9 3c-38 33 -311 356 -319 356c-6 0 -275 -318 -317 -354c-5 -2 -6 -5 -9 -5h-28zM116 0c0 0 -3 1 -3 3c0 1 1 3 2 4c44 44 230 277 243 277 c11 0 202 -237 244 -277c1 -1 2 -3 2 -4c0 -2 -3 -3 -3 -3h-48s-5 1 -7 2c-28 24 -172 162 -188 162c-15 0 -155 -134 -186 -160c-4 -2 -5 -4 -7 -4h-49zM304 63c0 29 24 53 54 53c29 0 53 -24 53 -53c0 -30 -24 -54 -53 -54c-30 0 -54 24 -54 54z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C3-fermataVeryShortBelow.xml b/data/Bravura/E4C3-fermataVeryShortBelow.xml
deleted file mode 100644
index c97f5e2eb34..00000000000
--- a/data/Bravura/E4C3-fermataVeryShortBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -5c0 3 4 5 4 5h28c3 0 4 -3 9 -5c42 -36 311 -354 317 -354c8 0 281 323 319 356c3 2 9 3 9 3h37s3 -1 3 -4c0 -1 0 -3 -2 -5c-56 -54 -352 -440 -366 -440c-8 0 -295 381 -356 440c-2 2 -2 3 -2 4zM115 -7c-1 1 -2 3 -2 4c0 2 3 3 3 3h49c2 0 3 -2 7 -4 c31 -26 171 -160 186 -160c16 0 160 138 188 162c2 1 7 2 7 2h48s3 -1 3 -3c0 -1 -1 -3 -2 -4c-42 -40 -233 -277 -244 -277c-13 0 -199 233 -243 277zM304 -63c0 30 24 54 54 54c29 0 53 -24 53 -54c0 -29 -24 -53 -53 -53c-30 0 -54 24 -54 53z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C4-fermataShortAbove.xml b/data/Bravura/E4C4-fermataShortAbove.xml
deleted file mode 100644
index f9c9e86ef29..00000000000
--- a/data/Bravura/E4C4-fermataShortAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 0c0 0 -3 1 -3 3c0 1 1 3 2 4c46 45 274 334 300 334c27 0 257 -293 300 -334c1 -1 2 -3 2 -4c0 -2 -3 -3 -3 -3h-50s-5 1 -7 2c-29 25 -226 226 -242 226s-209 -197 -241 -224c-4 -2 -5 -4 -7 -4h-51zM246 65c0 29 25 54 55 54s55 -25 55 -54c0 -31 -25 -56 -55 -56 s-55 25 -55 56z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C5-fermataShortBelow.xml b/data/Bravura/E4C5-fermataShortBelow.xml
deleted file mode 100644
index c2f9efc9676..00000000000
--- a/data/Bravura/E4C5-fermataShortBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -3c0 2 3 3 3 3h51c2 0 3 -2 7 -4c32 -27 225 -224 241 -224s213 201 242 226c2 1 7 2 7 2h50s3 -1 3 -3c0 -1 -1 -3 -2 -4c-43 -41 -273 -334 -300 -334c-26 0 -254 289 -300 334c-1 1 -2 3 -2 4zM246 -65c0 31 25 56 55 56s55 -25 55 -56c0 -29 -25 -54 -55 -54 s-55 25 -55 54z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C6-fermataLongAbove.xml b/data/Bravura/E4C6-fermataLongAbove.xml
deleted file mode 100644
index 32d40d209db..00000000000
--- a/data/Bravura/E4C6-fermataLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 0c-13 0 -24 6 -24 13v293c0 15 22 27 50 27h503c28 0 50 -12 50 -27v-293c0 -7 -11 -13 -25 -13c-13 0 -24 6 -24 13v188c0 12 -127 18 -253 18s-252 -6 -252 -18v-188c0 -7 -11 -13 -25 -13zM301 -1c-30 0 -54 25 -54 55s24 54 54 54c31 0 55 -24 55 -54 s-24 -55 -55 -55z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C7-fermataLongBelow.xml b/data/Bravura/E4C7-fermataLongBelow.xml
deleted file mode 100644
index 8da986c3763..00000000000
--- a/data/Bravura/E4C7-fermataLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -306v293c0 7 11 13 24 13c14 0 25 -6 25 -13v-188c0 -12 126 -18 252 -18s253 6 253 18v188c0 7 11 13 24 13c14 0 25 -6 25 -13v-293c0 -15 -22 -27 -50 -27h-503c-28 0 -50 12 -50 27zM247 -54c0 30 24 55 54 55c31 0 55 -25 55 -55s-24 -54 -55 -54 c-30 0 -54 24 -54 54z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C8-fermataVeryLongAbove.xml b/data/Bravura/E4C8-fermataVeryLongAbove.xml
deleted file mode 100644
index 74cd2194008..00000000000
--- a/data/Bravura/E4C8-fermataVeryLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 379c0 16 24 29 53 29h609c29 0 53 -13 53 -29v-364c0 -8 -12 -14 -27 -14c-14 0 -25 6 -25 14v284c0 13 -153 19 -306 19s-305 -6 -305 -19v-284c0 -8 -11 -14 -26 -14c-14 0 -26 6 -26 14v364zM121 1c-14 0 -25 6 -25 14v226c0 16 23 29 53 29h417 c30 0 53 -13 53 -29v-226c0 -8 -11 -14 -26 -14c-14 0 -26 6 -26 14v136c0 12 -105 19 -210 19s-209 -7 -209 -19v-136c0 -8 -12 -14 -27 -14zM305 58c0 32 25 58 57 58c33 0 59 -26 59 -58c0 -31 -26 -58 -59 -58c-32 0 -57 27 -57 58z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C9-fermataVeryLongBelow.xml b/data/Bravura/E4C9-fermataVeryLongBelow.xml
deleted file mode 100644
index 8ffcb143815..00000000000
--- a/data/Bravura/E4C9-fermataVeryLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M53 -408c-29 0 -53 13 -53 29v364c0 8 12 14 26 14c15 0 26 -6 26 -14v-284c0 -13 152 -19 305 -19s306 6 306 19v284c0 8 11 14 25 14c15 0 27 -6 27 -14v-364c0 -16 -24 -29 -53 -29h-609zM96 -241v226c0 8 11 14 25 14c15 0 27 -6 27 -14v-136c0 -12 104 -19 209 -19 s210 7 210 19v136c0 8 12 14 26 14c15 0 26 -6 26 -14v-226c0 -16 -23 -29 -53 -29h-417c-30 0 -53 13 -53 29zM305 -58c0 31 25 58 57 58c33 0 59 -27 59 -58c0 -32 -26 -58 -59 -58c-32 0 -57 26 -57 58z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4CE-breathMarkComma.xml b/data/Bravura/E4CE-breathMarkComma.xml
deleted file mode 100644
index 0246c08fd19..00000000000
--- a/data/Bravura/E4CE-breathMarkComma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 188c0 35 28 63 71 63c46 0 80 -31 80 -78v-7c0 -29 -6 -64 -26 -95c-16 -25 -67 -69 -100 -69c-3 0 -6 2 -7 8c0 1 -1 2 -1 3c0 5 4 7 8 9c2 2 28 17 45 39c9 12 16 25 16 39c0 4 -1 7 -2 11c0 0 -3 21 -28 21c-33 0 -56 22 -56 56z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E0-restMaxima.xml b/data/Bravura/E4E0-restMaxima.xml
deleted file mode 100644
index 954651f5ab8..00000000000
--- a/data/Bravura/E4E0-restMaxima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 230c0 17 7 20 16 20h92c10 0 17 -3 17 -20v-459c0 -17 -7 -20 -17 -20h-92c-9 0 -16 3 -16 20v459zM16 -249c-9 0 -16 3 -16 20v459c0 17 7 20 16 20h92c10 0 17 -3 17 -20v-459c0 -17 -7 -20 -17 -20h-92z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E1-restLonga.xml b/data/Bravura/E4E1-restLonga.xml
deleted file mode 100644
index 489d9aadfa5..00000000000
--- a/data/Bravura/E4E1-restLonga.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -249c-9 0 -16 3 -16 20v459c0 17 7 20 16 20h92c10 0 17 -3 17 -20v-459c0 -17 -7 -20 -17 -20h-92z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E2-restDoubleWhole.xml b/data/Bravura/E4E2-restDoubleWhole.xml
deleted file mode 100644
index e682ef0923c..00000000000
--- a/data/Bravura/E4E2-restDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 0c-9 0 -16 7 -16 15v220c0 8 7 15 16 15h92c10 0 17 -7 17 -15v-220c0 -8 -7 -15 -17 -15h-92z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E3-restWhole.xml b/data/Bravura/E4E3-restWhole.xml
deleted file mode 100644
index 5ef49f33be5..00000000000
--- a/data/Bravura/E4E3-restWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -135c-15 0 -26 12 -26 26v92c0 15 11 26 26 26h230c14 0 26 -11 26 -26v-92c0 -14 -12 -26 -26 -26h-230z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E4-restHalf.xml b/data/Bravura/E4E4-restHalf.xml
deleted file mode 100644
index 908fe6586a3..00000000000
--- a/data/Bravura/E4E4-restHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -2c-15 0 -26 12 -26 26v92c0 15 11 26 26 26h230c14 0 26 -11 26 -26v-92c0 -14 -12 -26 -26 -26h-230z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E5-restQuarter.xml b/data/Bravura/E4E5-restQuarter.xml
deleted file mode 100644
index 04f1d1238c4..00000000000
--- a/data/Bravura/E4E5-restQuarter.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M117 -366c-73 56 -116 105 -116 155c0 53 39 96 82 96c5 0 11 -3 16 -3c4 -1 12 -3 16 -3c5 0 9 1 11 5c1 1 1 3 1 4c0 2 -4 10 -6 14c-13 21 -27 40 -43 60l-49 60s-10 10 -10 24c0 8 4 19 14 29c45 47 60 90 60 127c0 72 -57 123 -61 134c-3 6 -4 11 -4 16 c0 14 10 21 20 21c6 0 13 -3 18 -8c17 -17 165 -193 165 -193s4 -9 4 -19c0 -5 -1 -10 -4 -15c-26 -41 -62 -89 -66 -147c0 -4 -1 -9 -1 -13c0 -56 31 -93 69 -139c11 -12 37 -45 37 -57c0 -3 -2 -4 -5 -4c-2 0 -4 0 -7 1c-1 0 -2 1 -3 1c-16 6 -49 17 -78 17 c-42 0 -63 -32 -63 -73c0 -9 1 -18 4 -26c2 -9 13 -36 26 -36c8 -7 16 -15 16 -24c0 -2 -1 -4 -2 -7c-1 -4 -8 -6 -15 -6c-8 0 -18 3 -26 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E6-rest8th.xml b/data/Bravura/E4E6-rest8th.xml
deleted file mode 100644
index b5622052823..00000000000
--- a/data/Bravura/E4E6-rest8th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 56c-15 12 -27 30 -27 51c0 37 30 67 67 67s67 -30 67 -67v-10c33 0 83 60 90 66c6 4 9 4 11 4c2 -1 12 -6 12 -16c-1 -5 -6 -21 -10 -39c0 0 -98 -351 -101 -353c-10 -8 -24 -10 -35 -10c-6 0 -29 1 -29 13c18 66 90 265 93 280c1 4 1 8 1 11c0 5 -1 9 -5 9 c-1 0 -3 0 -5 -1c-13 -7 -22 -11 -36 -15c-11 -4 -25 -7 -39 -7c-19 0 -38 6 -54 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E7-rest16th.xml b/data/Bravura/E4E7-rest16th.xml
deleted file mode 100644
index cd50c5db1d6..00000000000
--- a/data/Bravura/E4E7-rest16th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 -209c-38 0 -80 27 -80 68c0 38 30 68 68 68c37 0 68 -30 68 -68c0 -3 0 -6 -1 -10c14 0 41 12 49 31c7 15 58 164 58 180c0 5 -2 7 -5 7c-2 0 -4 -1 -7 -2c-23 -13 -51 -22 -78 -22c-38 0 -80 27 -80 68c0 38 31 68 68 68c38 0 68 -30 68 -68v-10c34 1 84 61 91 67 c3 2 6 4 11 4c2 -1 10 -5 10 -11c0 -1 -1 -2 -1 -4c-2 -13 -27 -101 -27 -101s-19 -67 -45 -152l-116 -381c-4 -11 -9 -23 -38 -23c-22 0 -31 10 -31 18c0 1 1 2 1 3l95 283c0 1 1 2 1 3c0 3 -2 5 -4 5c-23 -12 -49 -21 -75 -21z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E8-rest32nd.xml b/data/Bravura/E4E8-rest32nd.xml
deleted file mode 100644
index be9a83d813d..00000000000
--- a/data/Bravura/E4E8-rest32nd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -141c0 38 31 68 68 68c38 0 68 -30 68 -68c0 -3 0 -6 -1 -10c15 1 46 14 51 35l40 164c0 5 -2 13 -7 13c-1 0 -2 0 -3 -1c-23 -12 -49 -22 -75 -22c-10 0 -19 2 -27 4c-10 3 -19 7 -27 14c-16 12 -28 30 -28 50c0 38 30 68 68 68c37 0 68 -30 68 -68c0 -3 0 -6 -1 -9 c16 0 49 20 54 36l39 160c0 1 1 3 1 4c0 6 -4 16 -11 16c-1 0 -3 0 -4 -1c-23 -12 -50 -22 -76 -22c-10 0 -18 2 -26 4c-10 3 -20 7 -28 14c-16 12 -28 30 -28 50c0 38 31 68 68 68c38 0 68 -30 68 -68v-9c34 0 84 61 91 66c3 2 6 4 11 4c2 0 10 -2 10 -11c0 -1 -1 -2 -1 -4 c-2 -12 -26 -101 -26 -101s-172 -770 -175 -782c-4 -11 -7 -21 -39 -21c-21 0 -27 8 -27 16c0 2 0 4 1 6c2 7 71 282 71 286c0 3 -3 6 -6 6c-1 0 -2 0 -3 -1c-23 -13 -51 -22 -78 -22c-38 0 -80 27 -80 68z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E9-rest64th.xml b/data/Bravura/E4E9-rest64th.xml
deleted file mode 100644
index 04e2162cfc7..00000000000
--- a/data/Bravura/E4E9-rest64th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -385c0 38 31 68 68 68c38 0 68 -30 68 -68c0 -3 0 -6 -1 -9c13 0 39 9 45 30c4 11 39 154 40 159c0 1 1 5 1 8c0 6 -1 14 -6 14c-1 0 -2 0 -3 -1c-13 -6 -16 -10 -30 -15c-12 -4 -26 -7 -40 -7c-9 0 -19 2 -27 4c-10 3 -19 8 -28 14c-16 12 -28 30 -28 51 c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c14 0 41 9 49 35c3 8 39 153 41 162c1 2 1 3 1 5c0 5 -2 9 -6 9c-1 0 -2 0 -4 -1c-26 -12 -54 -21 -82 -21c-9 0 -17 1 -25 3c-29 9 -56 33 -56 65c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c17 0 53 21 60 40c4 11 38 153 39 156 c1 4 2 7 2 10c0 7 -4 11 -9 11c-2 0 -5 -1 -7 -2c-24 -11 -49 -22 -76 -22c-38 0 -82 27 -82 69c0 37 30 68 68 68c37 0 68 -31 68 -68c0 -4 0 -7 -1 -10c34 0 84 61 92 67c3 2 6 4 11 4c4 -1 9 -4 9 -15c-3 -13 -27 -102 -27 -102l-93 -400c-4 -18 -23 -99 -24 -99 c-120 -516 -128 -534 -130 -543c-4 -11 -9 -17 -33 -17c-23 0 -32 5 -32 14c0 2 0 4 1 7l72 279c0 2 1 4 1 6c0 6 -3 11 -8 11c-1 0 -2 0 -4 -1c-17 -9 -45 -16 -64 -16c-18 0 -40 6 -54 18c-16 12 -28 30 -28 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4EA-rest128th.xml b/data/Bravura/E4EA-rest128th.xml
deleted file mode 100644
index 63a2df0be58..00000000000
--- a/data/Bravura/E4EA-rest128th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M82 -453c-38 0 -82 26 -82 68c0 38 31 68 68 68c38 0 68 -30 68 -68l3 -10c14 1 33 2 46 36c8 19 40 160 42 168c0 4 -2 8 -6 8c-1 0 -3 0 -4 -1c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7c-38 0 -82 27 -82 69c0 37 30 68 68 68c37 0 68 -31 68 -68 c0 -4 -1 -7 -1 -10c15 0 45 11 53 38c5 16 35 138 38 153c1 4 2 8 2 11c0 6 -2 10 -6 10c-2 0 -4 -1 -6 -2c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7c-38 0 -83 27 -83 69c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c16 0 51 20 56 40l39 156c1 4 2 9 2 14 c0 7 -1 13 -5 13c-1 0 -2 0 -3 -1c-13 -6 -31 -15 -45 -20c-12 -4 -28 -6 -42 -6c-22 0 -35 5 -53 17c-16 12 -28 30 -28 51c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c19 0 60 30 64 45c4 14 35 138 39 157c1 3 1 6 1 8c0 9 -6 13 -12 13c-2 0 -6 -1 -8 -2 c-12 -6 -21 -10 -33 -14c-1 0 -2 -1 -3 -1c-11 -4 -26 -7 -40 -7c-18 0 -40 6 -54 18c-16 12 -28 30 -28 50c0 38 31 68 68 68c38 0 68 -30 68 -68v-10c34 1 84 62 91 67c3 2 6 4 11 4c2 -1 10 -5 10 -11c0 -1 -1 -2 -1 -4c-2 -13 -27 -101 -27 -101l-297 -1300 c-4 -12 -8 -16 -40 -16c-23 0 -29 6 -29 16c2 5 72 288 74 295c1 1 1 3 1 4c0 3 -2 5 -5 5c-1 0 -2 -1 -3 -1c-12 -6 -21 -10 -33 -14c-1 0 -2 -1 -3 -1c-11 -4 -26 -7 -40 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4EB-rest256th.xml b/data/Bravura/E4EB-rest256th.xml
deleted file mode 100644
index bc1010eb49d..00000000000
--- a/data/Bravura/E4EB-rest256th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M82 -703c-38 0 -82 27 -82 69c0 37 30 68 68 68s68 -31 68 -68c0 -4 0 -7 -1 -10c12 0 35 1 45 38c7 24 24 95 40 158c0 1 1 2 1 4c1 4 1 8 1 11c0 5 -1 9 -5 9c-2 0 -4 -1 -6 -2c-23 -11 -47 -20 -72 -20c-38 0 -82 26 -82 68c0 38 30 68 68 68s68 -30 68 -68 c0 -3 0 -6 -1 -10c15 1 44 10 53 42c5 15 21 85 34 139c2 2 5 20 5 23c0 5 -2 9 -5 9c-1 0 -3 -1 -5 -2c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7c-38 0 -83 27 -83 69c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c15 0 44 10 55 42c5 14 34 137 37 149c0 3 1 6 1 8 c0 7 -3 13 -7 13c-1 0 -3 -1 -5 -2c-24 -11 -49 -22 -76 -22c-10 0 -19 2 -27 4c-28 9 -55 33 -55 65c0 37 31 68 68 68c38 0 68 -31 68 -68c0 -4 0 -7 -1 -10c17 0 52 14 59 43l38 157c1 4 1 7 1 10c0 6 -2 10 -7 10c-2 0 -4 0 -6 -1c-25 -13 -53 -23 -82 -23 c-38 0 -81 26 -81 68c0 37 31 68 68 68c38 0 68 -31 68 -68c0 -3 0 -7 -1 -10c20 0 58 20 65 47c4 11 34 136 39 155c0 2 1 4 1 6c0 10 -6 15 -13 15c-2 0 -5 -1 -7 -2c-12 -6 -21 -10 -33 -14c-1 0 -2 -1 -3 -1c-11 -4 -26 -7 -40 -7c-19 0 -40 5 -54 18 c-16 12 -28 30 -28 50c0 38 30 68 68 68s68 -30 68 -68c0 -3 0 -6 -1 -10c34 1 85 62 92 67c3 2 6 4 11 4c2 -1 9 -4 9 -11v-4c-3 -13 -27 -101 -27 -101l-359 -1549c-3 -11 -7 -24 -40 -24c-21 0 -26 8 -26 15c0 3 0 5 1 7c2 5 63 261 67 278c1 5 2 10 2 13c0 4 -1 6 -4 6 c-2 0 -3 -1 -6 -2c-13 -6 -13 -8 -27 -13c-11 -4 -26 -7 -40 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4EC-rest512th.xml b/data/Bravura/E4EC-rest512th.xml
deleted file mode 100644
index 6b9b3ac9d1c..00000000000
--- a/data/Bravura/E4EC-rest512th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -639c0 38 31 68 68 68c38 0 68 -30 68 -68v-9c13 0 40 5 46 29l43 180c0 6 -3 12 -7 12c-1 0 -2 0 -3 -1c-13 -7 -21 -11 -36 -15c-12 -4 -28 -7 -42 -7c-38 0 -80 27 -80 68c0 38 31 68 68 68c38 0 68 -30 68 -68v-10c15 0 48 15 55 44l36 152c1 3 1 5 1 7 c0 5 -2 9 -6 9c-1 0 -3 0 -5 -1c-23 -12 -49 -22 -75 -22c-18 0 -40 6 -54 18c-16 12 -28 30 -28 50c0 38 30 68 68 68c37 0 68 -30 68 -68c0 -3 0 -6 -1 -9c16 0 45 10 54 37c4 14 33 136 37 154c1 5 2 9 2 12c0 6 -2 9 -6 9c-2 0 -3 -1 -6 -2c-13 -6 -21 -10 -35 -15 c-12 -4 -26 -7 -40 -7c-21 0 -38 7 -55 18c-16 12 -27 30 -27 51c0 37 30 68 68 68c37 0 68 -31 68 -68c0 -4 -1 -7 -1 -10c16 0 47 10 55 40c6 21 25 101 38 155c1 1 2 8 2 9c0 9 -4 15 -10 15c-2 0 -4 -1 -6 -2c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7 c-21 0 -38 7 -55 18c-15 12 -27 30 -27 51c0 37 30 68 68 68c37 0 68 -31 68 -68c0 -4 -1 -7 -1 -10c18 0 53 14 61 44c4 16 36 147 38 159c1 2 1 3 1 5c0 7 -5 14 -11 14c-2 0 -3 0 -5 -1c-13 -7 -21 -11 -36 -15c-12 -4 -28 -7 -42 -7c-38 0 -80 27 -80 68 c0 38 31 68 68 68c38 0 68 -30 68 -68v-10c18 0 54 21 62 46c4 14 35 147 36 150s1 6 1 9c0 9 -4 13 -9 13c-2 0 -4 -1 -6 -2c-23 -13 -51 -22 -78 -22c-38 0 -80 27 -80 68c0 38 31 68 68 68c38 0 68 -30 68 -68c0 -3 0 -6 -1 -10c35 1 85 61 92 67c3 2 6 4 11 4 c2 -1 10 -5 10 -11c0 -1 -1 -2 -1 -4c-2 -13 -27 -101 -27 -101s-413 -1786 -416 -1797c-4 -12 -7 -24 -40 -24c-23 0 -27 10 -27 19c0 3 0 6 1 8c2 4 64 261 68 275c1 2 1 4 1 6c0 5 -3 6 -5 6s-3 0 -4 -1c-21 -11 -49 -20 -72 -20c-17 0 -41 7 -54 18 c-16 12 -28 30 -28 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4ED-rest1024th.xml b/data/Bravura/E4ED-rest1024th.xml
deleted file mode 100644
index 572a5d4e7f9..00000000000
--- a/data/Bravura/E4ED-rest1024th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -634c0 32 29 67 67 67c33 0 65 -29 65 -81c15 0 38 9 49 33c4 13 37 170 43 175c0 5 -6 15 -11 15c-14 -10 -23 -10 -38 -15c-8 -5 -23 -9 -37 -9c-9 0 -20 4 -28 4l-29 15c-14 9 -24 27 -24 52c0 32 29 67 67 67c33 0 66 -29 66 -81c14 4 47 18 57 46 c4 15 33 139 33 153c0 4 -5 14 -10 14c-9 -10 -19 -10 -33 -14c-9 -5 -24 -11 -38 -11c-9 0 -18 6 -29 6l-27 14c-14 9 -29 28 -29 51c0 34 33 66 67 66c32 0 70 -28 70 -80c15 5 43 14 52 38c20 52 39 157 39 161c0 5 -5 14 -11 14c-14 -9 -22 -9 -37 -14 c-9 -4 -24 -9 -38 -9c-9 0 -19 5 -28 5l-29 14c-14 10 -29 28 -29 52c0 33 34 66 72 66s61 -80 71 -80c15 4 43 14 53 42l36 157c0 4 0 18 -13 18l-38 -14c-14 -4 -34 -4 -48 -4h-18l-29 14c-14 15 -28 33 -28 52c0 37 33 66 71 66s67 -29 67 -76c18 0 50 15 60 42l38 161 c0 5 0 14 -15 14l-38 -14c-9 -4 -22 -4 -37 -4c-8 0 -18 0 -28 4c-7 0 -18 5 -29 10c-14 14 -28 33 -28 51c0 39 34 67 71 67s66 -28 66 -75c19 0 52 19 62 47c4 14 38 147 38 147s3 13 3 19c0 2 -2 5 -3 5c-5 0 -11 -5 -15 -5l-38 -14c-9 -5 -24 -5 -37 -5 c-10 0 -20 0 -28 5c-11 0 -18 6 -28 8c-14 14 -29 34 -29 53c0 39 33 66 71 66c37 0 66 -27 66 -76c19 0 56 24 62 43c14 47 42 118 42 165c0 4 -5 10 -14 10l-38 -14c-11 -6 -25 -10 -38 -10c-10 0 -19 4 -29 4l-28 14c-15 15 -29 35 -29 53c0 38 33 71 72 71 c38 0 66 -33 66 -81c47 0 67 57 104 72c0 0 10 -5 10 -15c0 -9 -104 -387 -104 -387c-53 -246 -407 -1750 -407 -1760c-5 -14 -10 -19 -39 -19c-8 0 -28 19 -28 23c5 6 67 261 71 275c0 4 0 9 -9 9l-34 -9c-8 -6 -23 -10 -37 -10c-10 0 -19 4 -29 4l-27 15 c-14 9 -25 28 -25 52z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4F2-restQuarterOld.xml b/data/Bravura/E4F2-restQuarterOld.xml
deleted file mode 100644
index 20e70b0aaf3..00000000000
--- a/data/Bravura/E4F2-restQuarterOld.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 151c0 10 10 15 12 16c2 0 5 0 11 -4c7 -6 57 -66 90 -66v10c0 37 30 67 67 67s67 -30 67 -67c0 -21 -12 -39 -27 -51c-16 -11 -35 -17 -54 -17c-14 0 -28 3 -39 7c-14 4 -23 8 -36 15c-2 1 -4 1 -5 1c-4 0 -5 -4 -5 -9c0 -3 0 -7 1 -11c3 -15 75 -214 93 -280 c0 -12 -23 -13 -29 -13c-11 0 -25 2 -35 10c-3 2 -101 353 -101 353c-4 18 -9 34 -10 39z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4F6-restQuarterZ.xml b/data/Bravura/E4F6-restQuarterZ.xml
deleted file mode 100644
index b9e07171a3c..00000000000
--- a/data/Bravura/E4F6-restQuarterZ.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M67 -214c-37 0 -67 30 -67 67c0 21 12 39 27 51c16 11 35 17 54 17c14 0 28 -3 39 -7c6 -2 19 -10 27 -10c5 0 8 5 8 10c0 16 -24 45 -30 54c-17 30 -36 59 -54 89c-12 18 -21 37 -34 55c-13 19 -30 45 -33 68v6c0 10 4 21 12 21c3 0 6 -2 10 -4c7 -6 57 -66 90 -66v10 c0 37 30 67 67 67s67 -30 67 -67c0 -21 -12 -39 -27 -51c-16 -11 -35 -17 -54 -17c-14 0 -28 3 -39 7c-7 2 -23 14 -33 14c-4 0 -6 -2 -7 -6c0 -3 1 -8 2 -12c3 -9 9 -18 12 -23l102 -161c7 -11 41 -66 41 -92c0 -8 -3 -13 -12 -13c-2 0 -5 0 -11 4c-7 6 -57 66 -90 66v-10 c0 -37 -30 -67 -67 -67z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E500-repeat1Bar.xml b/data/Bravura/E500-repeat1Bar.xml
deleted file mode 100644
index 1ae0e5e0040..00000000000
--- a/data/Bravura/E500-repeat1Bar.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99c-5 0 -8 3 -8 7zM407 -112c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62zM0 137c0 35 28 63 62 63 c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E501-repeat2Bars.xml b/data/Bravura/E501-repeat2Bars.xml
deleted file mode 100644
index 38d4000c8ea..00000000000
--- a/data/Bravura/E501-repeat2Bars.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99c-5 0 -8 3 -8 7zM238 -250c-5 0 -8 3 -8 7c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14 h-99zM637 -112c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62zM62 75c-34 0 -62 28 -62 62c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E502-repeat4Bars.xml b/data/Bravura/E502-repeat4Bars.xml
deleted file mode 100644
index 5a741a57049..00000000000
--- a/data/Bravura/E502-repeat4Bars.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M230 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99c-5 0 -8 3 -8 7zM700 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99 c-5 0 -8 3 -8 7zM478 -250c-5 0 -8 3 -8 7c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99zM0 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99 c-5 0 -8 3 -8 7zM1169 -174c-34 0 -62 28 -62 62c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62zM0 137c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E503-repeatBarUpperDot.xml b/data/Bravura/E503-repeatBarUpperDot.xml
deleted file mode 100644
index 6142d1673d2..00000000000
--- a/data/Bravura/E503-repeatBarUpperDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 137c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E504-repeatBarSlash.xml b/data/Bravura/E504-repeatBarSlash.xml
deleted file mode 100644
index 9158d3af0d6..00000000000
--- a/data/Bravura/E504-repeatBarSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -250c-5 0 -8 3 -8 7c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E505-repeatBarLowerDot.xml b/data/Bravura/E505-repeatBarLowerDot.xml
deleted file mode 100644
index d7935b98fe8..00000000000
--- a/data/Bravura/E505-repeatBarLowerDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -112c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E510-ottava.xml b/data/Bravura/E510-ottava.xml
deleted file mode 100644
index ffba9fabca7..00000000000
--- a/data/Bravura/E510-ottava.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 108c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142c-108 0 -156 52 -156 118z M78 97c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4c-42 -26 -56 -72 -56 -103zM170 363c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65c-45 0 -76 -26 -76 -70z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E511-ottavaAlta.xml b/data/Bravura/E511-ottavaAlta.xml
deleted file mode 100644
index 6e58362829a..00000000000
--- a/data/Bravura/E511-ottavaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 108c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142c-108 0 -156 52 -156 118z M703 216c-28 0 -60 23 -60 81c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33zM422 347c-5 0 -11 3 -11 10c0 4 1 9 4 17c14 39 34 77 71 77c26 0 42 -23 42 -52c0 -48 -38 -89 -38 -127c0 -14 8 -27 28 -27 c34 0 74 59 74 104c0 17 -7 25 -18 33c-10 7 -21 17 -21 32c0 18 14 35 33 35c25 0 39 -28 39 -60c0 -97 -56 -173 -119 -173c-36 0 -67 21 -67 60c0 49 43 98 43 133c0 6 -3 10 -9 10c-17 0 -32 -37 -40 -63c-2 -6 -6 -9 -11 -9zM134 200c-42 -26 -56 -72 -56 -103 c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4zM170 363c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65c-45 0 -76 -26 -76 -70zM768 423c-43 0 -76 -91 -76 -139 c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E512-ottavaBassa.xml b/data/Bravura/E512-ottavaBassa.xml
deleted file mode 100644
index e51a616a297..00000000000
--- a/data/Bravura/E512-ottavaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 108c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142c-108 0 -156 52 -156 118z M657 -10c-28 0 -60 23 -60 81c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33zM376 121c-5 0 -11 3 -11 10c0 4 1 9 4 17c14 39 34 77 71 77c26 0 42 -23 42 -52c0 -48 -38 -89 -38 -127c0 -14 8 -27 28 -27 c34 0 74 59 74 104c0 17 -7 25 -18 33c-10 7 -21 17 -21 32c0 18 14 35 33 35c25 0 39 -28 39 -60c0 -97 -56 -173 -119 -173c-36 0 -67 21 -67 60c0 49 43 98 43 133c0 6 -3 10 -9 10c-17 0 -32 -37 -40 -63c-2 -6 -6 -9 -11 -9zM134 200c-42 -26 -56 -72 -56 -103 c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4zM170 363c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65c-45 0 -76 -26 -76 -70zM722 197c-43 0 -76 -91 -76 -139 c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E513-ottavaBassaBa.xml b/data/Bravura/E513-ottavaBassaBa.xml
deleted file mode 100644
index 891082dd249..00000000000
--- a/data/Bravura/E513-ottavaBassaBa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 108c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142c-108 0 -156 52 -156 118z M485 -10c-41 0 -69 28 -69 71c0 19 3 35 7 49l50 183c1 4 2 8 2 10c0 5 -4 6 -13 6h-19c-14 0 -15 7 -15 11s1 12 16 13l77 5c8 0 12 -4 12 -10c0 -3 -1 -6 -2 -9l-25 -83c-6 -21 -9 -26 -9 -31c0 -2 1 -3 3 -3c5 0 13 10 28 17c9 4 18 6 28 6c39 0 59 -32 59 -67 c0 -90 -59 -168 -130 -168zM633 71c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM78 97c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4 c-42 -26 -56 -72 -56 -103zM246 433c-45 0 -76 -26 -76 -70c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65zM542 199c-45 0 -81 -96 -81 -153c0 -19 8 -31 23 -31c47 0 81 110 81 150c0 19 -5 34 -23 34zM682 58c0 -24 8 -38 22 -38 c33 0 76 102 76 146c0 16 -6 31 -22 31c-43 0 -76 -91 -76 -139z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E514-quindicesima.xml b/data/Bravura/E514-quindicesima.xml
deleted file mode 100644
index aea1a12a52c..00000000000
--- a/data/Bravura/E514-quindicesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M275 85c0 41 26 72 60 72c26 0 48 -15 48 -45c0 -32 -18 -47 -31 -53c-10 -5 -16 -7 -16 -15c0 -12 19 -22 44 -22c81 0 120 100 120 160c0 35 -15 63 -57 63c-38 0 -63 -26 -74 -37c-9 -9 -15 -13 -24 -13c-11 0 -19 7 -19 19c0 7 1 11 5 23l68 199c5 14 13 21 27 21 c9 0 16 -2 33 -7c15 -4 40 -9 74 -9c36 0 67 4 92 11c17 5 23 9 30 9s12 -6 12 -12c0 -8 -5 -16 -17 -27c-38 -35 -94 -69 -166 -69c-16 0 -35 2 -48 4c-4 1 -6 1 -9 1c-6 0 -10 -2 -13 -11l-19 -56c-1 -3 -2 -6 -2 -8c0 -5 3 -8 9 -8c3 0 6 1 10 2c16 5 34 8 58 8 c80 0 130 -29 130 -101c0 -116 -84 -194 -198 -194c-87 0 -127 46 -127 95zM19 0c-13 0 -19 7 -19 17s6 16 17 17l43 4c11 1 12 4 15 13l84 263c2 6 3 10 3 14c0 6 -3 8 -7 8c-5 0 -9 -3 -16 -11l-45 -50c-7 -8 -13 -13 -23 -13s-19 9 -19 18c0 7 3 13 10 21l131 148 c6 7 11 10 19 10c15 0 23 -11 38 -11c13 0 29 11 42 11c8 0 12 -5 12 -12c0 -4 -1 -8 -3 -14l-119 -378c-1 -5 -3 -8 -3 -11s2 -5 7 -6l42 -4c11 -1 17 -7 17 -17s-6 -17 -19 -17h-207z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E515-quindicesimaAlta.xml b/data/Bravura/E515-quindicesimaAlta.xml
deleted file mode 100644
index 66ac15b5571..00000000000
--- a/data/Bravura/E515-quindicesimaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M402 -10c-87 0 -127 46 -127 95c0 41 26 72 60 72c26 0 48 -15 48 -45c0 -32 -18 -47 -31 -53c-10 -5 -16 -7 -16 -15c0 -12 19 -22 44 -22c81 0 120 100 120 160c0 35 -15 63 -57 63c-38 0 -63 -26 -74 -37c-9 -9 -15 -13 -24 -13c-11 0 -19 7 -19 19c0 7 1 11 5 23 l68 199c5 14 13 21 27 21c9 0 16 -2 33 -7c15 -4 40 -9 74 -9c36 0 67 4 92 11c17 5 23 9 30 9s12 -6 12 -12c0 -8 -5 -16 -17 -27c-38 -35 -94 -69 -166 -69c-16 0 -35 2 -48 4c-4 1 -6 1 -9 1c-6 0 -10 -2 -13 -11l-19 -56c-1 -3 -2 -6 -2 -8c0 -5 3 -8 9 -8c3 0 6 1 10 2 c16 5 34 8 58 8c80 0 130 -29 130 -101c0 -116 -84 -194 -198 -194zM19 0c-13 0 -19 7 -19 17s6 16 17 17l43 4c11 1 12 4 15 13l84 263c2 6 3 10 3 14c0 6 -3 8 -7 8c-5 0 -9 -3 -16 -11l-45 -50c-7 -8 -13 -13 -23 -13s-19 9 -19 18c0 7 3 13 10 21l131 148 c6 7 11 10 19 10c15 0 23 -11 38 -11c13 0 29 11 42 11c8 0 12 -5 12 -12c0 -4 -1 -8 -3 -14l-119 -378c-1 -5 -3 -8 -3 -11s2 -5 7 -6l42 -4c11 -1 17 -7 17 -17s-6 -17 -19 -17h-207zM667 355c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21 c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57 c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5 c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9c-5 0 -11 3 -11 10zM1073 297c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162 c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM1198 423 c-43 0 -76 -91 -76 -139c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E516-quindicesimaBassa.xml b/data/Bravura/E516-quindicesimaBassa.xml
deleted file mode 100644
index ddad82c5942..00000000000
--- a/data/Bravura/E516-quindicesimaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M402 -10c-87 0 -127 46 -127 95c0 41 26 72 60 72c26 0 48 -15 48 -45c0 -32 -18 -47 -31 -53c-10 -5 -16 -7 -16 -15c0 -12 19 -22 44 -22c81 0 120 100 120 160c0 35 -15 63 -57 63c-38 0 -63 -26 -74 -37c-9 -9 -15 -13 -24 -13c-11 0 -19 7 -19 19c0 7 1 11 5 23 l68 199c5 14 13 21 27 21c9 0 16 -2 33 -7c15 -4 40 -9 74 -9c36 0 67 4 92 11c17 5 23 9 30 9s12 -6 12 -12c0 -8 -5 -16 -17 -27c-38 -35 -94 -69 -166 -69c-16 0 -35 2 -48 4c-4 1 -6 1 -9 1c-6 0 -10 -2 -13 -11l-19 -56c-1 -3 -2 -6 -2 -8c0 -5 3 -8 9 -8c3 0 6 1 10 2 c16 5 34 8 58 8c80 0 130 -29 130 -101c0 -116 -84 -194 -198 -194zM19 0c-13 0 -19 7 -19 17s6 16 17 17l43 4c11 1 12 4 15 13l84 263c2 6 3 10 3 14c0 6 -3 8 -7 8c-5 0 -9 -3 -16 -11l-45 -50c-7 -8 -13 -13 -23 -13s-19 9 -19 18c0 7 3 13 10 21l131 148 c6 7 11 10 19 10c15 0 23 -11 38 -11c13 0 29 11 42 11c8 0 12 -5 12 -12c0 -4 -1 -8 -3 -14l-119 -378c-1 -5 -3 -8 -3 -11s2 -5 7 -6l42 -4c11 -1 17 -7 17 -17s-6 -17 -19 -17h-207zM637 134c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21 c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57 c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5 c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9c-5 0 -11 3 -11 10zM1043 76c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162 c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM1168 202 c-43 0 -76 -91 -76 -139c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E517-ventiduesima.xml b/data/Bravura/E517-ventiduesima.xml
deleted file mode 100644
index 22213ef5469..00000000000
--- a/data/Bravura/E517-ventiduesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M375 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138c93 0 148 -41 148 -106 c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53 c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM4 15c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138 c93 0 148 -41 148 -106c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108 c-82 0 -114 53 -157 53c-18 0 -26 -11 -32 -27s-12 -23 -25 -23c-12 0 -19 8 -19 19z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E518-ventiduesimaAlta.xml b/data/Bravura/E518-ventiduesimaAlta.xml
deleted file mode 100644
index 17e3ba2bc56..00000000000
--- a/data/Bravura/E518-ventiduesimaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138c93 0 148 -41 148 -106 c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53 c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM375 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54 c0 70 64 138 163 138c93 0 148 -41 148 -106c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18 c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM780 355c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17 c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76 l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9 c-5 0 -11 3 -11 10zM1186 297c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM1311 423c-43 0 -76 -91 -76 -139c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E519-ventiduesimaBassa.xml b/data/Bravura/E519-ventiduesimaBassa.xml
deleted file mode 100644
index 57832c3fdad..00000000000
--- a/data/Bravura/E519-ventiduesimaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138c93 0 148 -41 148 -106 c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53 c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM375 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54 c0 70 64 138 163 138c93 0 148 -41 148 -106c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18 c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM730 133c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17 c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76 l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9 c-5 0 -11 3 -11 10zM1136 75c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM1261 201c-43 0 -76 -91 -76 -139c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51A-octaveParensLeft.xml b/data/Bravura/E51A-octaveParensLeft.xml
deleted file mode 100644
index 42eec0fc78e..00000000000
--- a/data/Bravura/E51A-octaveParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 102 50 189 159 249v1c3 0 4 -2 4 -4v-11s0 -5 -3 -8c-67 -49 -91 -116 -91 -227s27 -177 90 -228c3 -1 4 -3 4 -6v-13c0 -1 -1 -4 -1 -4c-2 0 -3 0 -3 1c-111 61 -159 149 -159 250z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51B-octaveParensRight.xml b/data/Bravura/E51B-octaveParensRight.xml
deleted file mode 100644
index 47c7df910ea..00000000000
--- a/data/Bravura/E51B-octaveParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-26 480c0 2 1 4 4 4v-1c109 -60 159 -147 159 -249c0 -101 -48 -189 -159 -250c0 -1 -1 -1 -3 -1c0 0 -1 3 -1 4v13c0 3 1 5 4 6c63 51 90 117 90 228s-24 178 -91 227c-3 3 -3 8 -3 8v11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51C-ottavaBassaVb.xml b/data/Bravura/E51C-ottavaBassaVb.xml
deleted file mode 100644
index 000f876304b..00000000000
--- a/data/Bravura/E51C-ottavaBassaVb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M156 -10c-108 0 -156 52 -156 118c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142z M666 -10c-41 0 -69 28 -69 71c0 19 3 35 7 49l50 183c1 4 2 8 2 10c0 5 -4 6 -13 6h-19c-14 0 -15 7 -15 11s1 12 16 13l77 5c8 0 12 -4 12 -10c0 -3 -1 -6 -2 -9l-25 -83c-6 -21 -9 -26 -9 -31c0 -2 1 -3 3 -3c5 0 13 10 28 17c9 4 18 6 28 6c39 0 59 -32 59 -67 c0 -90 -59 -168 -130 -168zM361 131c0 4 1 9 4 17c14 39 34 77 71 77c26 0 42 -23 42 -52c0 -48 -38 -89 -38 -127c0 -14 8 -27 28 -27c34 0 74 59 74 104c0 17 -7 25 -18 33c-10 7 -21 17 -21 32c0 18 14 35 33 35c25 0 39 -28 39 -60c0 -97 -56 -173 -119 -173 c-36 0 -67 21 -67 60c0 49 43 98 43 133c0 6 -3 10 -9 10c-17 0 -32 -37 -40 -63c-2 -6 -6 -9 -11 -9s-11 3 -11 10zM134 200c-42 -26 -56 -72 -56 -103c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4zM246 433 c-45 0 -76 -26 -76 -70c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65zM723 199c-45 0 -81 -96 -81 -153c0 -19 8 -31 23 -31c47 0 81 110 81 150c0 19 -5 34 -23 34z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51D-quindicesimaBassaMb.xml b/data/Bravura/E51D-quindicesimaBassaMb.xml
deleted file mode 100644
index 0ef7e2d4434..00000000000
--- a/data/Bravura/E51D-quindicesimaBassaMb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M402 -10c-87 0 -127 46 -127 95c0 41 26 72 60 72c26 0 48 -15 48 -45c0 -32 -18 -47 -31 -53c-10 -5 -16 -7 -16 -15c0 -12 19 -22 44 -22c81 0 120 100 120 160c0 35 -15 63 -57 63c-38 0 -63 -26 -74 -37c-9 -9 -15 -13 -24 -13c-11 0 -19 7 -19 19c0 7 1 11 5 23 l68 199c5 14 13 21 27 21c9 0 16 -2 33 -7c15 -4 40 -9 74 -9c36 0 67 4 92 11c17 5 23 9 30 9s12 -6 12 -12c0 -8 -5 -16 -17 -27c-38 -35 -94 -69 -166 -69c-16 0 -35 2 -48 4c-4 1 -6 1 -9 1c-6 0 -10 -2 -13 -11l-19 -56c-1 -3 -2 -6 -2 -8c0 -5 3 -8 9 -8c3 0 6 1 10 2 c16 5 34 8 58 8c80 0 130 -29 130 -101c0 -116 -84 -194 -198 -194zM0 17c0 10 6 16 17 17l43 4c11 1 12 4 15 13l84 263c2 6 3 10 3 14c0 6 -3 8 -7 8c-5 0 -9 -3 -16 -11l-45 -50c-7 -8 -13 -13 -23 -13s-19 9 -19 18c0 7 3 13 10 21l131 148c6 7 11 10 19 10 c15 0 23 -11 38 -11c13 0 29 11 42 11c8 0 12 -5 12 -12c0 -4 -1 -8 -3 -14l-119 -378c-1 -5 -3 -8 -3 -11s2 -5 7 -6l42 -4c11 -1 17 -7 17 -17s-6 -17 -19 -17h-207c-13 0 -19 7 -19 17zM1033 66c0 19 3 35 7 49l50 183c1 4 2 8 2 10c0 5 -4 6 -13 6h-19 c-14 0 -15 7 -15 11s1 12 16 13l77 5c8 0 12 -4 12 -10c0 -3 -1 -6 -2 -9l-25 -83c-6 -21 -9 -26 -9 -31c0 -2 1 -3 3 -3c5 0 13 10 28 17c9 4 18 6 28 6c39 0 59 -32 59 -67c0 -90 -59 -168 -130 -168c-41 0 -69 28 -69 71zM627 134c0 6 2 11 5 18c16 36 40 79 83 79 c18 0 30 -9 35 -22s2 -21 7 -21c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9 c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102 c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9c-5 0 -11 3 -11 10zM1078 51c0 -19 8 -31 23 -31c47 0 81 110 81 150c0 19 -5 34 -23 34c-45 0 -81 -96 -81 -153z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51E-ventiduesimaBassaMb.xml b/data/Bravura/E51E-ventiduesimaBassaMb.xml
deleted file mode 100644
index 2e752adaf37..00000000000
--- a/data/Bravura/E51E-ventiduesimaBassaMb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M356 15c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138c93 0 148 -41 148 -106 c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53 c-18 0 -26 -11 -32 -27s-12 -23 -25 -23c-12 0 -19 8 -19 19zM4 15c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54 c0 70 64 138 163 138c93 0 148 -41 148 -106c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18 c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53c-18 0 -26 -11 -32 -27s-12 -23 -25 -23c-12 0 -19 8 -19 19zM1136 65c0 19 3 35 7 49l50 183c1 4 2 8 2 10c0 5 -4 6 -13 6h-19c-14 0 -15 7 -15 11s1 12 16 13l77 5c8 0 12 -4 12 -10c0 -3 -1 -6 -2 -9l-25 -83 c-6 -21 -9 -26 -9 -31c0 -2 1 -3 3 -3c5 0 13 10 28 17c9 4 18 6 28 6c39 0 59 -32 59 -67c0 -90 -59 -168 -130 -168c-41 0 -69 28 -69 71zM741 123c-5 0 -11 3 -11 10c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21c1 0 8 8 16 17c13 15 29 27 53 27 c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57c-28 0 -48 12 -48 39 c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l47 143 c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9zM1181 50c0 -19 8 -31 23 -31c47 0 81 110 81 150c0 19 -5 34 -23 34c-45 0 -81 -96 -81 -153z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E520-dynamicPiano.xml b/data/Bravura/E520-dynamicPiano.xml
deleted file mode 100644
index 77e0893f308..00000000000
--- a/data/Bravura/E520-dynamicPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-89 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM144 56c0 -21 8 -32 25 -32c48 0 101 127 101 176 c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E521-dynamicMezzo.xml b/data/Bravura/E521-dynamicMezzo.xml
deleted file mode 100644
index 4f43d49f9cb..00000000000
--- a/data/Bravura/E521-dynamicMezzo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-20 155c0 5 2 10 7 19c31 56 62 99 115 99c19 0 33 -10 39 -23c6 -14 3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c25 0 38 -11 44 -24s3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c41 0 54 -29 54 -54c0 -55 -58 -142 -58 -177c0 -6 2 -9 8 -9c13 0 32 24 51 54 c5 8 8 13 15 13c5 0 9 -3 9 -9c0 -5 -3 -11 -9 -21c-32 -53 -67 -81 -105 -81c-29 0 -45 14 -45 40c0 42 62 145 62 180c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11c62 155 63 155 63 156c6 14 10 25 10 37 c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -27 -68 -78c-5 -8 -8 -13 -15 -13c-6 0 -11 4 -11 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E522-dynamicForte.xml b/data/Bravura/E522-dynamicForte.xml
deleted file mode 100644
index 1045c221096..00000000000
--- a/data/Bravura/E522-dynamicForte.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-141 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E523-dynamicRinforzando.xml b/data/Bravura/E523-dynamicRinforzando.xml
deleted file mode 100644
index 3eb35c50987..00000000000
--- a/data/Bravura/E523-dynamicRinforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-9 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c32 60 65 99 114 99c20 0 34 -10 40 -23c7 -16 3 -21 8 -21c4 0 5 4 14 14c15 17 36 31 62 31c37 0 52 -24 52 -53c0 -35 -18 -55 -42 -55c-21 0 -36 12 -36 32c0 28 22 31 22 40c0 4 -4 6 -10 6c-22 0 -54 -37 -67 -70l-65 -162 c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -68 -78c-4 -8 -8 -13 -15 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E524-dynamicSforzando.xml b/data/Bravura/E524-dynamicSforzando.xml
deleted file mode 100644
index 6b2f34dd583..00000000000
--- a/data/Bravura/E524-dynamicSforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M87 -10c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38 c-20 0 -35 12 -35 32c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E525-dynamicZ.xml b/data/Bravura/E525-dynamicZ.xml
deleted file mode 100644
index 2b91f98aad3..00000000000
--- a/data/Bravura/E525-dynamicZ.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-17 -1c-8 0 -13 5 -13 12c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6 c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31 c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E526-dynamicNiente.xml b/data/Bravura/E526-dynamicNiente.xml
deleted file mode 100644
index 97681155dec..00000000000
--- a/data/Bravura/E526-dynamicNiente.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-12 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 56 62 99 115 99c19 0 33 -10 39 -23c6 -14 3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c41 0 54 -29 54 -54c0 -55 -58 -142 -58 -177c0 -6 2 -9 8 -9c13 0 32 24 51 54c5 8 8 13 15 13c5 0 9 -3 9 -9c0 -5 -3 -11 -9 -21 c-32 -53 -67 -81 -105 -81c-29 0 -45 14 -45 40c0 42 62 145 62 180c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -27 -68 -78c-5 -8 -8 -13 -15 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E527-dynamicPPPPPP.xml b/data/Bravura/E527-dynamicPPPPPP.xml
deleted file mode 100644
index 89dcaf02197..00000000000
--- a/data/Bravura/E527-dynamicPPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-102 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM1685 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31 c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM975 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM1318 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30 c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12 l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM265 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6 c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112 c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM608 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19 c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12 c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM1570 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM1925 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37 c-24 0 -50 -29 -64 -63zM841 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM486 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49 c-11 -28 -19 -48 -19 -69zM150 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM1215 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E528-dynamicPPPPP.xml b/data/Bravura/E528-dynamicPPPPP.xml
deleted file mode 100644
index a9486ab443a..00000000000
--- a/data/Bravura/E528-dynamicPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-102 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM1318 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305 c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM963 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM620 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM253 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30 c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12 l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM1196 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM1570 125 c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM505 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM131 56c0 -21 8 -32 25 -32c48 0 101 127 101 176 c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM860 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E529-dynamicPPPP.xml b/data/Bravura/E529-dynamicPPPP.xml
deleted file mode 100644
index d3cdc43721e..00000000000
--- a/data/Bravura/E529-dynamicPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-102 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM963 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305 c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM253 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM608 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12 c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9 c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM860 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM486 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM131 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM1196 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52A-dynamicPPP.xml b/data/Bravura/E52A-dynamicPPP.xml
deleted file mode 100644
index 961198132f2..00000000000
--- a/data/Bravura/E52A-dynamicPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-92 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM618 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305 c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM263 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM515 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37 c-24 0 -50 -29 -64 -63zM851 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM160 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52B-dynamicPP.xml b/data/Bravura/E52B-dynamicPP.xml
deleted file mode 100644
index 10f7b1f7a5d..00000000000
--- a/data/Bravura/E52B-dynamicPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-70 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20 c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM285 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31 c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM506 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63 l-20 -49c-11 -28 -19 -48 -19 -69zM151 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52C-dynamicMP.xml b/data/Bravura/E52C-dynamicMP.xml
deleted file mode 100644
index 5ac29c602bf..00000000000
--- a/data/Bravura/E52C-dynamicMP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-9 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 56 62 99 115 99c19 0 33 -10 39 -23c6 -14 3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c25 0 38 -11 44 -24s3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c41 0 54 -29 54 -54c0 -55 -58 -142 -58 -177c0 -6 2 -9 8 -9 c20 0 45 37 73 98l7 16c24 54 56 125 131 125c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40 c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -2 12 -10 12c-26 0 -52 -51 -82 -119c-31 -71 -71 -126 -134 -126c-29 0 -45 14 -45 40c0 42 62 145 62 180c0 8 -3 14 -15 14 c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11c62 155 63 155 63 156c6 14 10 25 10 37c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25 c0 7 -3 12 -11 12c-18 0 -38 -27 -68 -78c-5 -8 -8 -13 -15 -13zM603 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52D-dynamicMF.xml b/data/Bravura/E52D-dynamicMF.xml
deleted file mode 100644
index a19a838cd7a..00000000000
--- a/data/Bravura/E52D-dynamicMF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M388 -165c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14 c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164zM-20 155c0 5 2 10 7 19c31 56 62 99 115 99c19 0 33 -10 39 -23c6 -14 3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c25 0 38 -11 44 -24s3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c41 0 54 -29 54 -54 c0 -55 -58 -142 -58 -177c0 -6 2 -9 8 -9c13 0 32 24 51 54c5 8 8 13 15 13c5 0 9 -3 9 -9c0 -5 -3 -11 -9 -21c-32 -53 -67 -81 -105 -81c-29 0 -45 14 -45 40c0 42 62 145 62 180c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49 c-8 0 -11 2 -11 6c0 3 1 6 3 11c62 155 63 155 63 156c6 14 10 25 10 37c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -27 -68 -78c-5 -8 -8 -13 -15 -13 c-6 0 -11 4 -11 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52E-dynamicPF.xml b/data/Bravura/E52E-dynamicPF.xml
deleted file mode 100644
index 24987d5cf1f..00000000000
--- a/data/Bravura/E52E-dynamicPF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM265 -85c0 31 22 55 52 55c27 0 45 -15 45 -41 c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM161 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52F-dynamicFF.xml b/data/Bravura/E52F-dynamicFF.xml
deleted file mode 100644
index 2abab9cdec5..00000000000
--- a/data/Bravura/E52F-dynamicFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-135 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 97 80 165 178 165 c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62 c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E530-dynamicFFF.xml b/data/Bravura/E530-dynamicFFF.xml
deleted file mode 100644
index a35d1201705..00000000000
--- a/data/Bravura/E530-dynamicFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-80 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51 c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8 c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39 c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39 c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E531-dynamicFFFF.xml b/data/Bravura/E531-dynamicFFFF.xml
deleted file mode 100644
index 7d0476081f6..00000000000
--- a/data/Bravura/E531-dynamicFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-80 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51 c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4 c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12 c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5 c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5 c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5 c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E532-dynamicFFFFF.xml b/data/Bravura/E532-dynamicFFFFF.xml
deleted file mode 100644
index 4181676b123..00000000000
--- a/data/Bravura/E532-dynamicFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-80 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51 c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4 c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107 c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E533-dynamicFFFFFF.xml b/data/Bravura/E533-dynamicFFFFFF.xml
deleted file mode 100644
index 43c131dcc41..00000000000
--- a/data/Bravura/E533-dynamicFFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-80 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51 c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4 c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107 c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67 s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E534-dynamicFortePiano.xml b/data/Bravura/E534-dynamicFortePiano.xml
deleted file mode 100644
index 8c69668cccb..00000000000
--- a/data/Bravura/E534-dynamicFortePiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM-141 -85c0 31 22 55 52 55c27 0 45 -15 45 -41 c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM397 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E535-dynamicForzando.xml b/data/Bravura/E535-dynamicForzando.xml
deleted file mode 100644
index 2a7982a57fb..00000000000
--- a/data/Bravura/E535-dynamicForzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-141 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM236 -1c-8 0 -13 5 -13 12c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13 c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44 c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E536-dynamicSforzando1.xml b/data/Bravura/E536-dynamicSforzando1.xml
deleted file mode 100644
index 06b1ee7ed38..00000000000
--- a/data/Bravura/E536-dynamicSforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM87 -10c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83 c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E537-dynamicSforzandoPiano.xml b/data/Bravura/E537-dynamicSforzandoPiano.xml
deleted file mode 100644
index 8abd2dcc2fb..00000000000
--- a/data/Bravura/E537-dynamicSforzandoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M390 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM89 -85c0 31 22 55 52 55c27 0 45 -15 45 -41 c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM0 54 c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32c0 11 4 19 10 24 c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93c-53 0 -87 31 -87 64zM623 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49 c-11 -28 -19 -48 -19 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E538-dynamicSforzandoPianissimo.xml b/data/Bravura/E538-dynamicSforzandoPianissimo.xml
deleted file mode 100644
index 2a21246cedb..00000000000
--- a/data/Bravura/E538-dynamicSforzandoPianissimo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M401 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20 c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM744 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305 c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-3 -5 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM100 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37 c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 186 165c61 0 84 -30 84 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38 c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h44c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-49c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM87 -10c-53 0 -87 31 -87 64 c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32c0 11 4 19 10 24 c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93zM977 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM622 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E539-dynamicSforzato.xml b/data/Bravura/E539-dynamicSforzato.xml
deleted file mode 100644
index 388a0760d76..00000000000
--- a/data/Bravura/E539-dynamicSforzato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M94 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM87 -10c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83 c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93zM472 -1c-8 0 -13 5 -13 12c0 8 4 12 12 20l154 156 c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158 c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E53A-dynamicSforzatoPiano.xml b/data/Bravura/E53A-dynamicSforzatoPiano.xml
deleted file mode 100644
index 4048cd8b0e1..00000000000
--- a/data/Bravura/E53A-dynamicSforzatoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M633 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20 c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM99 -85c0 31 22 55 52 55c27 0 45 -15 45 -41 c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM87 -10 c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32 c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93zM465 11c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21 c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10 s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12c-8 0 -13 5 -13 12zM873 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176 c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E53B-dynamicSforzatoFF.xml b/data/Bravura/E53B-dynamicSforzatoFF.xml
deleted file mode 100644
index 31c249b417c..00000000000
--- a/data/Bravura/E53B-dynamicSforzatoFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M175 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 186 165c61 0 84 -30 84 -67s-23 -54 -49 -54 c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h44c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-49c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164 c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164z M87 -10c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38 c-20 0 -35 12 -35 32c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93zM690 11c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3 c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35 c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12c-8 0 -13 5 -13 12z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E53C-dynamicRinforzando1.xml b/data/Bravura/E53C-dynamicRinforzando1.xml
deleted file mode 100644
index 4a326fa4811..00000000000
--- a/data/Bravura/E53C-dynamicRinforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-32c-10 0 -15 5 -15 15c0 11 5 16 16 16h32c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM-9 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c32 60 65 99 114 99c20 0 34 -10 40 -23c7 -16 3 -21 8 -21c4 0 5 4 14 14c15 17 36 31 62 31c37 0 52 -24 52 -53c0 -35 -18 -55 -42 -55c-21 0 -36 12 -36 32 c0 28 22 31 22 40c0 4 -4 6 -10 6c-22 0 -54 -37 -67 -70l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -68 -78c-4 -8 -8 -13 -15 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E53D-dynamicRinforzando2.xml b/data/Bravura/E53D-dynamicRinforzando2.xml
deleted file mode 100644
index 77f62cdb60a..00000000000
--- a/data/Bravura/E53D-dynamicRinforzando2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-32c-10 0 -15 5 -15 15c0 11 5 16 16 16h32c14 0 15 0 20 15c33 96 87 165 186 165 c61 0 84 -30 84 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h44c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-49c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM483 -1c-8 0 -13 5 -13 12c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13 c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44 c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12zM-9 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c32 60 65 99 114 99c20 0 34 -10 40 -23c7 -16 3 -21 8 -21c4 0 5 4 14 14c15 17 36 31 62 31c37 0 52 -24 52 -53c0 -35 -18 -55 -42 -55 c-21 0 -36 12 -36 32c0 28 22 31 22 40c0 4 -4 6 -10 6c-22 0 -54 -37 -67 -70l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -68 -78c-4 -8 -8 -13 -15 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E566-ornamentTrill.xml b/data/Bravura/E566-ornamentTrill.xml
deleted file mode 100644
index 4273068d3d8..00000000000
--- a/data/Bravura/E566-ornamentTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M66 146c-45 0 -66 26 -66 57c0 42 35 70 82 70c15 0 28 -3 42 -9c9 -4 15 -9 19 -9c3 0 4 2 8 12l36 88c4 10 8 13 17 16l49 16c3 1 9 3 13 3s6 -2 6 -6c0 -3 -1 -6 -3 -11l-50 -124c-2 -5 -5 -11 -5 -15c0 -2 1 -3 3 -3c5 0 11 4 24 11c21 11 59 31 99 31 c22 0 37 -9 44 -22c8 -15 4 -22 9 -22c4 0 5 4 14 14c15 17 36 31 62 31c37 0 52 -24 52 -53c0 -35 -18 -55 -42 -55c-21 0 -36 12 -36 32c0 28 22 31 22 40c0 4 -4 6 -10 6c-22 0 -54 -37 -67 -70l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11 l73 181c3 7 6 19 6 29c0 12 -4 15 -13 15c-19 0 -43 -14 -78 -35l-6 -3c-16 -9 -22 -14 -22 -20c0 -3 1 -5 3 -10c9 -22 13 -44 13 -68c0 -74 -50 -116 -102 -116c-38 0 -57 22 -57 50c0 21 8 41 19 68l11 27c2 5 3 8 3 10s-1 3 -3 3c-6 0 -19 -2 -31 -2zM82 250 c-40 0 -55 -23 -55 -41c0 -14 8 -30 41 -30c10 0 22 2 35 5s17 6 22 19l4 10c2 5 4 10 4 13c0 15 -40 24 -51 24zM136 33c0 -7 3 -12 11 -12c29 0 56 40 56 84c0 9 -5 62 -14 62c-3 0 -4 -2 -6 -7c-38 -95 -39 -95 -39 -96c-4 -10 -8 -23 -8 -31z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E567-ornamentTurn.xml b/data/Bravura/E567-ornamentTurn.xml
deleted file mode 100644
index 358a40a3b49..00000000000
--- a/data/Bravura/E567-ornamentTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 103c0 64 38 114 104 114c65 0 109 -38 158 -92c43 -48 76 -75 108 -75c35 0 65 21 65 64c0 26 -16 47 -33 47c-21 0 -22 -23 -51 -23c-21 0 -36 14 -36 36c0 30 25 44 56 44c43 0 89 -31 89 -103c0 -64 -38 -114 -104 -114c-65 0 -109 38 -158 92 c-43 48 -76 75 -108 75c-35 0 -65 -21 -65 -64c0 -26 16 -47 33 -47c21 0 22 23 51 23c21 0 36 -14 36 -36c0 -30 -25 -44 -56 -44c-43 0 -89 31 -89 103z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E568-ornamentTurnInverted.xml b/data/Bravura/E568-ornamentTurnInverted.xml
deleted file mode 100644
index 2423871589f..00000000000
--- a/data/Bravura/E568-ornamentTurnInverted.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-3 115c0 72 46 103 89 103c31 0 56 -14 56 -44c0 -22 -15 -36 -36 -36c-29 0 -30 23 -51 23c-17 0 -33 -21 -33 -47c0 -43 30 -64 65 -64c32 0 65 27 108 75c49 54 93 92 158 92c66 0 104 -50 104 -114c0 -72 -46 -103 -89 -103c-31 0 -56 14 -56 44c0 22 15 36 36 36 c29 0 30 -23 51 -23c17 0 33 21 33 47c0 43 -30 64 -65 64c-32 0 -65 -27 -108 -75c-49 -54 -93 -92 -158 -92c-66 0 -104 50 -104 114z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E569-ornamentTurnSlash.xml b/data/Bravura/E569-ornamentTurnSlash.xml
deleted file mode 100644
index ada260058dd..00000000000
--- a/data/Bravura/E569-ornamentTurnSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 64 38 114 104 114c29 0 54 -9 77 -23c18 -11 23 -18 29 -18c4 0 5 4 5 15v100c0 11 4 16 16 16s16 -5 16 -16v-129c0 -18 2 -20 15 -34c44 -48 76 -78 108 -78c35 0 65 21 65 64c0 26 -16 47 -33 47c-21 0 -22 -23 -51 -23c-21 0 -36 14 -36 36 c0 30 25 44 56 44c43 0 89 -31 89 -103c0 -64 -38 -114 -104 -114c-29 0 -54 9 -77 23c-18 11 -23 18 -29 18c-5 0 -5 -4 -5 -15v-100c0 -11 -4 -16 -16 -16s-16 5 -16 16v129c0 18 -2 20 -15 34c-44 48 -76 78 -108 78c-35 0 -65 -21 -65 -64c0 -26 16 -47 33 -47 c21 0 22 23 51 23c21 0 36 -14 36 -36c0 -30 -25 -44 -56 -44c-43 0 -89 31 -89 103z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56A-ornamentTurnUp.xml b/data/Bravura/E56A-ornamentTurnUp.xml
deleted file mode 100644
index d421ab83d4e..00000000000
--- a/data/Bravura/E56A-ornamentTurnUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 371c0 43 31 89 103 89c64 0 114 -38 114 -104c0 -65 -38 -109 -92 -158c-48 -43 -75 -76 -75 -108c0 -35 21 -65 64 -65c26 0 47 16 47 33c0 21 -23 22 -23 51c0 21 14 36 36 36c30 0 44 -25 44 -56c0 -43 -31 -89 -103 -89c-64 0 -114 38 -114 104 c0 65 38 109 92 158c48 43 75 76 75 108c0 35 -21 65 -64 65c-26 0 -47 -16 -47 -33c0 -21 23 -22 23 -51c0 -21 -14 -36 -36 -36c-30 0 -44 25 -44 56z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56B-ornamentTurnUpS.xml b/data/Bravura/E56B-ornamentTurnUpS.xml
deleted file mode 100644
index af2eeef183f..00000000000
--- a/data/Bravura/E56B-ornamentTurnUpS.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-3 89c0 31 14 56 44 56c22 0 36 -15 36 -36c0 -29 -23 -30 -23 -51c0 -17 21 -33 47 -33c43 0 64 30 64 65c0 32 -27 65 -75 108c-54 49 -92 93 -92 158c0 66 50 104 114 104c72 0 103 -46 103 -89c0 -31 -14 -56 -44 -56c-22 0 -36 15 -36 36c0 29 23 30 23 51 c0 17 -21 33 -47 33c-43 0 -64 -30 -64 -65c0 -32 27 -65 75 -108c54 -49 92 -93 92 -158c0 -66 -50 -104 -114 -104c-72 0 -103 46 -103 89z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56C-ornamentShortTrill.xml b/data/Bravura/E56C-ornamentShortTrill.xml
deleted file mode 100644
index ffde74903a6..00000000000
--- a/data/Bravura/E56C-ornamentShortTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 40c-15 0 -20 4 -20 10c0 10 6 17 11 23c50 56 99 113 145 163c9 7 15 9 22 9c18 -2 24 -10 31 -19l89 -110c3 -4 7 -4 10 0c33 32 62 64 90 95c7 8 14 17 23 25c9 7 15 8 24 8c7 0 15 -6 23 -14c10 -9 76 -90 85 -99c5 -5 10 -10 17 -10c5 0 11 3 19 10 c11 11 80 98 91 107c6 4 12 7 18 7c9 0 27 -8 27 -18c0 -4 -8 -15 -14 -23c-13 -15 -177 -193 -184 -199c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-9 10 -82 87 -87 92c-8 9 -11 12 -16 12c-3 0 -8 -1 -15 -8l-108 -98c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 92 c-7 8 -11 12 -16 12c-4 0 -8 -1 -11 -4l-61 -54c-11 -10 -20 -13 -29 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56D-ornamentMordent.xml b/data/Bravura/E56D-ornamentMordent.xml
deleted file mode 100644
index fcbe4509864..00000000000
--- a/data/Bravura/E56D-ornamentMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M21 41c-15 0 -20 4 -20 10c0 7 7 17 13 23l143 162c8 6 13 9 22 9c17 -1 23 -10 31 -18c5 -7 59 -69 95 -111c4 -5 10 -5 14 0l29 34v169h31v-135l24 27c7 8 14 18 23 25s14 9 22 9s16 -6 25 -14c10 -9 76 -91 84 -99c5 -5 11 -10 18 -10c5 0 10 3 18 10 c12 11 81 97 92 106c5 4 11 7 18 7c8 0 26 -7 26 -17c0 -7 -6 -14 -12 -20l-2 -3c-13 -15 -176 -193 -184 -199c-4 -4 -11 -6 -19 -6c-7 0 -15 2 -19 7c-9 10 -83 87 -87 93c-6 8 -11 11 -16 11c-4 0 -8 -2 -12 -5v-179h-32v152c-16 -14 -74 -67 -84 -73 c-4 -4 -11 -6 -18 -6c-8 0 -16 2 -20 7l-87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -34c-10 -10 -24 -24 -40 -24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56E-ornamentTremblement.xml b/data/Bravura/E56E-ornamentTremblement.xml
deleted file mode 100644
index abe74888361..00000000000
--- a/data/Bravura/E56E-ornamentTremblement.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 50c0 3 8 17 12 24l121 137c8 8 15 17 24 24c7 7 12 9 21 9c16 -1 23 -9 31 -18l95 -110c1 -2 5 -2 6 0l107 119c8 7 13 9 22 9c16 -1 23 -9 31 -18c37 -43 57 -69 95 -111c2 -2 6 -2 8 0c27 32 56 64 84 96c7 8 14 17 23 24c9 8 15 9 22 9c8 0 16 -6 25 -14 c10 -9 76 -91 85 -99c5 -5 10 -10 17 -10c5 0 11 3 19 10c11 11 80 97 91 106c6 5 12 7 19 7c9 0 26 -6 26 -17c0 -4 -8 -15 -14 -23c-13 -15 -177 -193 -184 -199c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -21 7l-87 92c-6 8 -10 12 -15 12s-6 -1 -16 -9l-106 -97 c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 9 -82 86 -86 92c-7 8 -11 12 -16 12c-4 0 -11 -4 -15 -8l-105 -98c-4 -3 -11 -5 -19 -5s-15 2 -19 7c-9 9 -83 86 -87 92c-7 8 -11 12 -16 12c-4 0 -11 -5 -19 -11c-1 0 -1 -1 -3 -2l-38 -34c-11 -10 -26 -24 -41 -24s-20 4 -20 10z " /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56F-ornamentHaydn.xml b/data/Bravura/E56F-ornamentHaydn.xml
deleted file mode 100644
index 2e092ac4d88..00000000000
--- a/data/Bravura/E56F-ornamentHaydn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 55c0 18 19 128 112 128c62 0 123 -39 157 -64l66 88c3 4 7 6 12 6c3 0 6 -1 9 -3c4 -3 6 -7 6 -12c0 -3 -1 -7 -3 -9l-66 -88c28 -21 74 -51 104 -51c35 0 67 52 67 82c0 29 10 45 22 45c10 0 13 -13 13 -32c0 -18 -13 -144 -109 -144h-3c-11 0 -59 4 -131 52l-66 -87 c-3 -4 -8 -6 -12 -6c-3 0 -6 1 -9 3c-4 3 -6 8 -6 12c0 3 1 6 3 9l66 87c-15 11 -86 63 -120 63c-35 0 -72 -26 -75 -87v-7c0 -12 -2 -36 -15 -36c-19 0 -22 32 -22 51z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E583-ornamentVerticalLine.xml b/data/Bravura/E583-ornamentVerticalLine.xml
deleted file mode 100644
index f0370d67fb3..00000000000
--- a/data/Bravura/E583-ornamentVerticalLine.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E583" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 109h-24v280h24v-280z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E587-ornamentSchleifer.xml b/data/Bravura/E587-ornamentSchleifer.xml
deleted file mode 100644
index 92e8508d917..00000000000
--- a/data/Bravura/E587-ornamentSchleifer.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M19 40c-15 0 -19 4 -19 10c0 5 7 17 11 24l122 137c7 8 14 17 23 25c7 6 12 8 18 8h4c17 -1 24 -9 31 -18c5 -6 63 -74 100 -116l4 6l84 95c8 8 15 17 23 24c9 8 15 9 24 9c7 0 15 -6 24 -14c10 -10 76 -91 85 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10 c11 11 405 522 524 528l17 1c12 0 13 -7 14 -15c0 -10 -16 -26 -29 -27c-119 -7 -521 -591 -588 -613c-5 -2 -14 -4 -22 -4c-7 0 -13 2 -17 6c-8 10 -82 87 -86 92c-7 8 -11 12 -16 12c-4 0 -11 -5 -19 -11c-1 0 -1 -1 -3 -2l-38 -34c-7 -6 -13 -14 -22 -19 c-20 -20 -39 -37 -42 -40c-4 -3 -11 -5 -19 -5s-15 2 -19 7c-9 10 -83 87 -87 92c-6 8 -11 12 -16 12c-3 0 -9 -4 -15 -8c-1 0 -1 -1 -3 -2l-3 -3c-14 -11 -26 -22 -39 -34c-11 -10 -26 -24 -41 -24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E59D-ornamentZigZagLineNoRightEnd.xml b/data/Bravura/E59D-ornamentZigZagLineNoRightEnd.xml
deleted file mode 100644
index 02fa87ea4df..00000000000
--- a/data/Bravura/E59D-ornamentZigZagLineNoRightEnd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-32 40c-15 0 -20 5 -20 11c0 7 7 17 12 22c13 15 24 29 37 43c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c7 -10 128 -149 128 -149c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12 s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E59E-ornamentZigZagLineWithRightEnd.xml b/data/Bravura/E59E-ornamentZigZagLineWithRightEnd.xml
deleted file mode 100644
index 0d3bedcd1ae..00000000000
--- a/data/Bravura/E59E-ornamentZigZagLineWithRightEnd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-54 50c0 3 8 17 12 24l121 137c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5 s-16 2 -20 7c-8 10 -82 87 -86 93c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-13 -11 -26 -23 -38 -35c-11 -10 -26 -24 -41 -24s-20 4 -20 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B0-ornamentPrecompSlide.xml b/data/Bravura/E5B0-ornamentPrecompSlide.xml
deleted file mode 100644
index 906b4f4629e..00000000000
--- a/data/Bravura/E5B0-ornamentPrecompSlide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 40c-15 0 -20 5 -20 11c0 7 7 17 12 22c13 15 24 29 37 43c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c4 -7 62 -73 98 -115l4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c4 -7 63 -75 99 -117l3 4 c46 57 178 170 274 188c22 4 44 6 64 6c84 0 151 -30 189 -57c5 -4 8 -11 8 -16c0 -3 -1 -5 -3 -7c-2 -1 -4 -2 -6 -2c-9 0 -20 9 -30 14c-42 21 -88 29 -135 29c-91 0 -166 -28 -227 -80c-60 -51 -115 -125 -136 -148c-12 -14 -35 -40 -57 -40c-3 -1 -6 -1 -9 -1 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13l-24 -21c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B1-ornamentPrecompDescendingSlide.xml b/data/Bravura/E5B1-ornamentPrecompDescendingSlide.xml
deleted file mode 100644
index a07ec907723..00000000000
--- a/data/Bravura/E5B1-ornamentPrecompDescendingSlide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 39c-15 0 -20 5 -20 11c0 7 7 17 12 22c13 15 24 29 37 43c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 98 -115c2 1 3 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 98 -115c2 1 3 3 4 4 c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c21 -1 32 -37 52 -72c56 -99 196 -327 356 -327c15 0 19 -5 19 -10c0 -9 -11 -20 -18 -20h-12c-199 0 -388 221 -435 294c-4 6 -8 8 -12 8s-16 -9 -29 -19c-8 -7 -16 -13 -24 -21c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B2-ornamentPrecompAppoggTrill.xml b/data/Bravura/E5B2-ornamentPrecompAppoggTrill.xml
deleted file mode 100644
index 629ea0e20f6..00000000000
--- a/data/Bravura/E5B2-ornamentPrecompAppoggTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M84 0c-37 0 -84 28 -84 144v284c0 6 2 39 36 52c2 1 4 1 6 1c7 0 13 -7 13 -31v-313c0 -6 1 -76 45 -76c19 0 61 25 68 39l15 17c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -73 99 -115c2 1 3 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25 s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -73 99 -115l87 99c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200 c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 93c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-13 -11 -26 -23 -38 -35c-5 -5 -10 -11 -17 -16l-45 -43c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13 c-14 -11 -26 -23 -39 -35l-15 -14c-22 -21 -42 -41 -47 -45c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-6 -5 -12 -13 -21 -18c-12 -10 -56 -47 -89 -47z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B3-ornamentPrecompAppoggTrillSuffix.xml b/data/Bravura/E5B3-ornamentPrecompAppoggTrillSuffix.xml
deleted file mode 100644
index 0c75924fa1f..00000000000
--- a/data/Bravura/E5B3-ornamentPrecompAppoggTrillSuffix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 428c0 6 2 39 36 52c2 1 4 1 6 1c7 0 13 -7 13 -31v-313c0 -6 1 -76 45 -76c23 0 47 19 63 33l19 23c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116l4 5c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 60 -71 96 -113c26 31 78 99 104 165c19 46 24 113 24 172c0 53 -4 101 -5 121v8c0 23 4 38 8 38c3 0 7 -7 11 -23c5 -19 33 -93 33 -183c0 -121 -55 -251 -143 -334c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93 c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-5 -5 -9 -10 -15 -15c-22 -21 -43 -41 -47 -44s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35l-13 -12s-59 -53 -96 -53s-84 28 -84 144 v284z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B4-ornamentPrecompTurnTrillDAnglebert.xml b/data/Bravura/E5B4-ornamentPrecompTurnTrillDAnglebert.xml
deleted file mode 100644
index 77e58232029..00000000000
--- a/data/Bravura/E5B4-ornamentPrecompTurnTrillDAnglebert.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 11c-64 33 -99 93 -99 186c0 71 64 154 165 154c18 0 82 -9 82 -25c0 -3 -1 -8 -4 -8c-11 0 -31 8 -51 8c-89 0 -158 -60 -158 -130c0 -65 55 -147 125 -147c42 0 77 42 112 68l4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 62 -73 99 -115l3 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -72 98 -114l3 3c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c29 -40 65 -77 98 -113l24 29c106 132 285 355 383 361l19 1c10 0 11 -7 12 -15 c0 -10 -16 -26 -29 -27c-75 -5 -250 -224 -351 -350c-10 -13 -20 -25 -28 -35c-1 -1 -3 -2 -4 -4l-28 -33c-14 -16 -38 -41 -62 -41c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-10 0 -38 -26 -45 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-7 -6 -15 -16 -26 -21 c-32 -25 -71 -48 -113 -48c-16 0 -32 3 -48 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B5-ornamentPrecompSlideTrillDAnglebert.xml b/data/Bravura/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
deleted file mode 100644
index 6797d1da571..00000000000
--- a/data/Bravura/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -100c0 118 177 339 289 339c72 0 113 -48 136 -76l45 -52l4 5c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116l88 100c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10 c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 93c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-13 -11 -26 -23 -38 -35c-6 -6 -13 -13 -21 -18 c-20 -20 -38 -38 -42 -41s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-3 -3 -11 -5 -18 -5c-8 0 -15 2 -20 7c-5 6 -34 36 -57 60c-16 15 -44 60 -103 60c-49 0 -88 -45 -100 -60 c-39 -48 -80 -109 -80 -172c0 -89 87 -166 87 -166c72 -68 165 -72 214 -74h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2c-33 0 -82 5 -147 32c-102 42 -154 116 -168 218c-1 6 -1 11 -1 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B6-ornamentPrecompSlideTrillMarpurg.xml b/data/Bravura/E5B6-ornamentPrecompSlideTrillMarpurg.xml
deleted file mode 100644
index 811ae026bd0..00000000000
--- a/data/Bravura/E5B6-ornamentPrecompSlideTrillMarpurg.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -100c0 118 177 339 289 339c72 0 113 -48 136 -76l3 -3c14 -17 29 -34 42 -48l4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 98 -115l4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -6 59 -70 96 -112 c2 2 4 4 5 4c41 33 85 68 85 125c0 94 -95 115 -170 117c-6 0 -9 3 -9 6c0 4 4 8 12 12c3 2 9 2 17 2c26 0 72 -8 99 -19c47 -27 81 -71 81 -144c0 -55 -48 -107 -91 -143c-29 -27 -67 -65 -73 -70c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93 c-6 8 -10 12 -15 12s-12 -5 -22 -13c-8 -6 -16 -14 -24 -21c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-8 -6 -16 -14 -24 -21c-29 -27 -70 -68 -76 -73c-3 -3 -11 -5 -18 -5c-8 0 -15 2 -20 7 c-5 6 -34 36 -57 60c-16 15 -44 60 -103 60c-49 0 -88 -45 -100 -60c-39 -48 -80 -109 -80 -172c0 -89 87 -166 87 -166c72 -68 165 -72 214 -74h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2c-33 0 -82 5 -147 32c-102 42 -154 116 -168 218 c-1 6 -1 11 -1 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B7-ornamentPrecompTurnTrillBach.xml b/data/Bravura/E5B7-ornamentPrecompTurnTrillBach.xml
deleted file mode 100644
index 3496c17ce74..00000000000
--- a/data/Bravura/E5B7-ornamentPrecompTurnTrillBach.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 191c0 71 64 154 165 154c18 0 82 -9 82 -25c0 -3 -1 -8 -4 -8c-11 0 -31 8 -51 8c-89 0 -158 -60 -158 -130c0 -65 55 -147 125 -147c43 0 77 43 112 68c2 1 3 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l99 -114l3 3c27 32 55 64 84 95 c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l99 -115c2 1 3 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l99 -115l57 64v155h21v-131l10 11c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9 c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 11 -82 90 -87 95c-5 6 -8 9 -13 9v-172h-21v163l-3 -3c-13 -11 -26 -23 -38 -35c-6 -5 -12 -13 -20 -18 c-21 -19 -39 -37 -43 -41c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35l-15 -14c-22 -21 -42 -41 -47 -45c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12 s-12 -5 -22 -13l-24 -21c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-7 -6 -15 -15 -26 -20c-31 -26 -71 -49 -113 -49c-16 0 -32 3 -48 11c-64 33 -99 93 -99 186z " /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B8-ornamentPrecompSlideTrillBach.xml b/data/Bravura/E5B8-ornamentPrecompSlideTrillBach.xml
deleted file mode 100644
index 78f8fdfc2b7..00000000000
--- a/data/Bravura/E5B8-ornamentPrecompSlideTrillBach.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -100c0 67 47 143 81 185c36 44 72 84 110 126c7 8 14 18 23 25s15 9 22 9h4c13 -1 22 -7 31 -18c4 -7 62 -74 99 -115c1 1 2 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c4 -7 62 -74 99 -116l47 54v166h41v-120c8 8 14 17 23 25 c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 93l-5 5v-166h-40v154 c-11 -9 -21 -19 -31 -29c-7 -6 -13 -13 -21 -18c-20 -20 -38 -38 -42 -41s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-5 -4 -10 -10 -16 -14l-46 -45c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7 c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-11 -8 -20 -17 -30 -26c-43 -49 -85 -113 -85 -178c0 -60 42 -128 87 -166c72 -68 165 -72 214 -74h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2c-33 0 -82 5 -147 32c-102 42 -154 116 -168 218 c-1 6 -1 11 -1 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B9-ornamentPrecompSlideTrillMuffat.xml b/data/Bravura/E5B9-ornamentPrecompSlideTrillMuffat.xml
deleted file mode 100644
index 42da135721d..00000000000
--- a/data/Bravura/E5B9-ornamentPrecompSlideTrillMuffat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -195c0 0 -6 2 -6 4c0 1 2 2 7 2h7c50 0 181 56 253 123c42 39 119 114 167 172l42 50l49 54c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -74 99 -115c1 1 2 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 65 -76 101 -118 l28 34c106 132 285 355 383 361l19 1c10 0 11 -7 12 -15c0 -10 -16 -26 -29 -27c-122 -7 -344 -347 -411 -422c-19 -23 -38 -41 -69 -41c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-5 -4 -10 -10 -16 -14 c-22 -21 -42 -42 -46 -45s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-6 0 -21 -9 -23 -14c-53 -57 -138 -145 -202 -188c-78 -51 -189 -106 -260 -106c-8 0 -15 1 -22 2z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml b/data/Bravura/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml
deleted file mode 100644
index e1dd22353b1..00000000000
--- a/data/Bravura/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -190c0 1 2 2 7 2h7c50 0 181 56 253 123c42 39 113 119 166 173c8 8 23 24 35 38c5 5 10 12 17 19l41 46c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116l4 5c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 60 -71 97 -113c2 3 5 5 5 5c41 33 85 68 85 125c0 94 -95 115 -170 117c-6 0 -9 3 -9 6c0 4 4 8 12 12c3 2 9 2 17 2c26 0 72 -8 99 -19c47 -27 81 -71 81 -144c0 -59 -54 -113 -98 -149c-28 -27 -61 -60 -67 -64c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7 c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-4 -4 -9 -10 -15 -14c-22 -21 -42 -42 -47 -45c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13l-4 -4c-54 -58 -137 -143 -200 -185 c-78 -51 -189 -106 -260 -106c-8 0 -15 1 -22 2c0 0 -6 2 -6 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BB-ornamentPrecompTrillSuffixDandrieu.xml b/data/Bravura/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
deleted file mode 100644
index 3c941f0ba2b..00000000000
--- a/data/Bravura/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 51c0 7 7 17 12 22c13 15 24 29 37 43c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 99 -115l3 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 99 -115l3 4c27 32 55 64 84 95c7 8 14 18 23 25 s14 9 22 9c13 -1 22 -7 31 -18c5 -7 60 -70 96 -112c3 2 5 4 5 4c41 33 85 68 85 125c0 94 -95 115 -170 117c-6 0 -9 3 -9 6c0 4 4 8 12 12c3 2 9 2 17 2c26 0 72 -8 99 -19c47 -27 81 -71 81 -144c0 -56 -48 -107 -91 -143c-28 -27 -67 -65 -73 -70c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24c-15 0 -20 5 -20 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BC-ornamentPrecompPortDeVoixMordent.xml b/data/Bravura/E5BC-ornamentPrecompPortDeVoixMordent.xml
deleted file mode 100644
index 1e9854f9366..00000000000
--- a/data/Bravura/E5BC-ornamentPrecompPortDeVoixMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 83c0 102 71 182 177 186h6c87 0 152 -91 185 -147l3 -5c27 32 54 63 82 93c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 99 -115l3 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -115l48 54v165h30v-131l10 11 c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 93 c-6 7 -10 10 -14 11v-172h-30v155l-32 -30c-6 -6 -12 -13 -20 -18c-21 -20 -39 -38 -43 -41s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7 c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24h-7c-10 0 -16 2 -19 5c0 1 -1 2 -1 3c-4 10 -7 20 -11 29c-43 109 -59 148 -137 148c-126 0 -140 -124 -140 -187c0 -12 1 -22 1 -28v-7c0 -13 -3 -19 -7 -19 c-17 0 -19 81 -19 94v6z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BD-ornamentPrecompTrillWithMordent.xml b/data/Bravura/E5BD-ornamentPrecompTrillWithMordent.xml
deleted file mode 100644
index 27f15a1efbd..00000000000
--- a/data/Bravura/E5BD-ornamentPrecompTrillWithMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 51c0 7 7 17 12 22c13 15 24 29 38 43c27 32 55 65 84 96c7 8 14 18 23 25s15 9 23 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116c1 1 2 3 4 4c27 32 55 65 84 96c7 8 14 18 23 25c10 7 15 9 23 9c13 -1 22 -7 31 -18c4 -6 55 -65 92 -107v212h30v-193l63 72 c8 8 15 17 24 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -179 -195 -186 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -83 88 -87 94 c-7 8 -11 11 -16 11c-12 0 -36 -24 -44 -33c-2 -2 -5 -4 -7 -7v-133h-30v104c-19 -18 -36 -35 -40 -38s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-9 -7 -16 -14 -24 -21c-29 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -22 -23 -41 -24c-15 0 -20 5 -20 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BE-ornamentPrecompCadence.xml b/data/Bravura/E5BE-ornamentPrecompCadence.xml
deleted file mode 100644
index caca381e024..00000000000
--- a/data/Bravura/E5BE-ornamentPrecompCadence.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 206c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 48 61 176 61c59 0 202 -57 236 -175c0 -2 1 -3 2 -5c1 2 3 4 5 6c27 32 55 65 84 96c7 8 15 18 24 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 98 -115l87 99c9 8 15 17 24 25c9 7 15 9 22 9c8 0 16 -6 26 -15 c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -178 -195 -185 -202c-4 -3 -12 -5 -20 -5s-16 2 -20 7c-8 10 -82 88 -86 94c-8 8 -12 11 -17 11c-6 0 -12 -4 -22 -12 c-7 -7 -15 -13 -22 -21c-29 -27 -70 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -24 -40 -25h-7c-13 0 -19 2 -21 9c-6 22 -52 193 -186 208c0 0 -9 1 -22 1 c-32 0 -92 -6 -142 -45c0 0 -13 -7 -19 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BF-ornamentPrecompCadenceWithTurn.xml b/data/Bravura/E5BF-ornamentPrecompCadenceWithTurn.xml
deleted file mode 100644
index 230b9d157ef..00000000000
--- a/data/Bravura/E5BF-ornamentPrecompCadenceWithTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 208c0 3 3 10 11 21c0 0 48 61 176 61c59 0 202 -57 235 -175c1 -2 2 -3 2 -5c2 2 4 4 5 6c28 32 56 65 85 96c7 8 14 18 23 25s14 9 22 9c14 -1 23 -7 32 -18c4 -6 55 -65 91 -107v212h31v-193l63 72c8 8 14 17 23 25c9 7 16 9 23 9c8 0 16 -6 26 -15 c9 -8 76 -91 85 -100c4 -4 11 -9 17 -9c5 0 11 3 19 10c11 10 81 98 92 107c6 4 13 7 19 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -179 -195 -186 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -83 88 -87 94c-7 8 -11 11 -16 11c-8 0 -22 -12 -23 -13 c-7 -6 -14 -12 -21 -20c-3 -2 -5 -5 -7 -7v-133h-31v104c-19 -18 -35 -35 -39 -38s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-11 -9 -22 -24 -41 -25c-1 0 -3 -1 -4 -1c-7 0 -20 1 -23 9 c-6 23 -52 194 -186 209c0 0 -10 1 -23 1c-31 0 -91 -6 -142 -45c0 0 -12 -7 -18 -7c-2 0 -4 1 -4 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml b/data/Bravura/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
deleted file mode 100644
index 8a64ec92b31..00000000000
--- a/data/Bravura/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 206c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 47 61 175 61c60 0 203 -57 236 -175l2 -5c1 2 3 4 5 6c27 32 55 64 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116c2 1 3 3 4 4c27 32 55 64 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 62 -73 99 -115l87 99c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -16 -178 -195 -185 -202c-4 -3 -11 -5 -19 -5 s-16 2 -20 7c-9 10 -83 88 -87 94c-7 8 -11 11 -16 11c-6 0 -12 -4 -23 -12l-22 -21c-29 -28 -70 -69 -76 -74c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-12 -5 -23 -13c-8 -7 -16 -13 -24 -21c-29 -28 -70 -69 -76 -74 c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12c-6 0 -13 -5 -23 -13c-14 -11 -26 -23 -39 -36c-10 -9 -21 -23 -40 -24h-7c-12 0 -18 2 -20 8c0 1 -1 2 -1 4c-10 34 -58 191 -186 205c0 0 -9 1 -22 1c-31 0 -92 -6 -142 -45c0 0 -12 -7 -18 -7z " /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C1-ornamentPrecompCadenceUpperPrefix.xml b/data/Bravura/E5C1-ornamentPrecompCadenceUpperPrefix.xml
deleted file mode 100644
index cc78e1c7348..00000000000
--- a/data/Bravura/E5C1-ornamentPrecompCadenceUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 198c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 93 -166 186 -166c47 0 87 29 119 61l21 24c28 32 56 65 85 96c7 8 14 18 23 25s14 9 22 9c14 -1 23 -7 32 -18c4 -7 61 -72 98 -115l87 99c8 8 14 17 23 25c9 7 15 9 22 9c9 0 17 -6 27 -15c9 -8 76 -91 85 -100 c4 -4 10 -9 17 -9c5 0 11 3 19 10c11 10 81 98 92 107c5 4 13 7 19 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -179 -195 -186 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -83 88 -87 94c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-3 -2 -24 -20 -22 -21 c-30 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-7 -5 -14 -11 -20 -17c-33 -39 -80 -82 -154 -83c-104 0 -185 132 -212 198z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml b/data/Bravura/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml
deleted file mode 100644
index 8e052ef42a9..00000000000
--- a/data/Bravura/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 197c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 93 -166 187 -166c46 0 87 30 118 61c7 8 14 17 22 25c27 32 55 64 85 95c7 9 14 19 23 26s14 9 22 9c13 -1 22 -7 31 -18c5 -7 55 -66 92 -108v212h30v-192l64 71c8 9 14 18 23 26c9 7 15 9 22 9c8 0 16 -6 26 -15 c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -9 -13 -22 -14 -23c-13 -15 -178 -194 -185 -201c-4 -3 -11 -5 -19 -5c-9 0 -17 2 -21 7c-8 10 -82 87 -86 94c-7 8 -11 11 -16 11c-7 0 -13 -4 -23 -12 c-7 -7 -15 -14 -22 -22l-7 -6v-134h-30v105l-39 -38c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-9 10 -83 87 -87 94c-6 8 -10 12 -16 12c-5 0 -12 -5 -22 -13l-19 -17c-34 -40 -80 -83 -154 -83c-105 0 -186 132 -213 197z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml b/data/Bravura/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
deleted file mode 100644
index 7ac64bc2423..00000000000
--- a/data/Bravura/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 198c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 9 -7c11 -14 92 -166 186 -166c47 0 87 29 119 61l21 24c27 33 56 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 33 56 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 62 -72 99 -115l87 99c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 27 -15c9 -8 76 -91 85 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c12 10 82 98 93 107c5 4 12 7 18 7s13 -3 21 -8c4 -3 6 -7 6 -10c0 -7 -8 -15 -15 -22c-13 -15 -178 -195 -185 -202c-4 -3 -11 -5 -19 -5 s-16 2 -20 7c-8 10 -83 88 -87 94c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-3 -2 -24 -20 -22 -21c-30 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13l-25 -21c-29 -27 -70 -69 -76 -74 c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-10 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-7 -5 -14 -11 -20 -17c-33 -39 -80 -82 -154 -83c-105 0 -185 132 -213 198z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml b/data/Bravura/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml
deleted file mode 100644
index d3128a1dad8..00000000000
--- a/data/Bravura/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 201c0 1 1 3 2 3s4 -2 8 -7c11 -14 93 -166 187 -166c46 0 88 30 119 61c7 8 13 16 21 24c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l92 -107v212 h30v-193l64 72c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -90 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 11 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -178 -195 -185 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7 c-9 11 -83 88 -87 94c-7 8 -11 11 -16 11c-11 0 -37 -24 -45 -33l-7 -7v-133h-30v104l-39 -38c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 11 -83 88 -87 94c-6 8 -10 12 -15 12s-12 -5 -23 -13l-24 -21c-29 -27 -70 -69 -76 -74c-4 -3 -11 -5 -18 -5c-9 0 -17 2 -21 7 c-9 11 -83 88 -87 94c-6 8 -10 12 -15 12c-6 0 -13 -5 -23 -13c-7 -5 -13 -11 -19 -17c-34 -39 -80 -82 -154 -83c-105 0 -185 132 -213 198c0 0 -1 2 -1 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C5-ornamentPrecompMordentRelease.xml b/data/Bravura/E5C5-ornamentPrecompMordentRelease.xml
deleted file mode 100644
index 9d28b05d48b..00000000000
--- a/data/Bravura/E5C5-ornamentPrecompMordentRelease.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 51c0 7 7 17 12 22c13 15 24 30 37 44c27 32 55 64 85 95c7 9 14 19 23 26s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 32 56 64 85 95c7 9 14 19 23 26s14 9 22 9c13 -1 22 -7 31 -18c5 -7 61 -71 97 -114c3 3 6 4 6 5c42 33 86 68 86 126 c0 44 -24 76 -60 94c-33 19 -76 23 -111 24c-7 0 -10 3 -10 6c0 4 4 8 13 12c3 2 9 2 17 2c26 0 72 -8 99 -19c48 -28 82 -72 82 -145c0 -60 -54 -114 -99 -151c-28 -26 -62 -60 -67 -64c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-10 10 -84 88 -88 94c-6 8 -10 12 -15 12 c-10 0 -39 -27 -47 -35c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-13 -5 -23 -13c-14 -12 -26 -24 -39 -36c-10 -9 -21 -23 -40 -24c-15 0 -20 5 -20 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C6-ornamentPrecompMordentUpperPrefix.xml b/data/Bravura/E5C6-ornamentPrecompMordentUpperPrefix.xml
deleted file mode 100644
index 6563387704c..00000000000
--- a/data/Bravura/E5C6-ornamentPrecompMordentUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 104c-15 21 -22 45 -23 72v10c0 77 44 162 73 203c0 0 5 2 6 2c0 -1 0 -4 -2 -8c-4 -14 -54 -105 -54 -185c0 -120 129 -125 220 -127c1 1 2 2 2 3c13 15 24 29 38 43c27 32 55 65 84 96c7 8 14 18 23 25c10 7 15 9 23 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116 c1 2 2 3 4 4c27 32 55 65 84 96c7 8 14 18 24 25c9 7 14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -72 98 -115l87 99c8 8 15 17 24 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18 c0 -6 -8 -15 -14 -22c-13 -15 -178 -195 -186 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -83 88 -87 94c-7 8 -11 11 -16 11c-12 0 -36 -24 -44 -33c-29 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12 s-12 -5 -22 -13c-9 -7 -16 -14 -24 -21c-29 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-2 -1 -3 -2 -4 -4l-33 -40h-9c-47 0 -173 1 -225 83z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml b/data/Bravura/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
deleted file mode 100644
index 5dfbe9b2ce4..00000000000
--- a/data/Bravura/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 175v10c0 77 43 162 72 203c0 0 5 2 6 2c0 -1 0 -4 -2 -8c-4 -14 -54 -105 -54 -185c0 -120 130 -125 221 -127c0 1 1 2 2 3c13 15 24 29 37 43c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 33 55 65 85 96 c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l92 -107v212h30v-193l64 72c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22 c-13 -15 -178 -195 -185 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-9 10 -83 88 -87 94c-7 8 -11 11 -16 11c-11 0 -37 -24 -45 -33l-7 -7v-133h-30v104l-39 -38c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-12 -5 -23 -13l-24 -21 c-29 -27 -70 -69 -76 -74c-4 -3 -11 -5 -18 -5c-9 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12c-6 0 -13 -5 -23 -13c-14 -11 -26 -23 -39 -35l-36 -43h-9c-106 0 -243 24 -248 154z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C8-ornamentPrecompTrillLowerSuffix.xml b/data/Bravura/E5C8-ornamentPrecompTrillLowerSuffix.xml
deleted file mode 100644
index 93dc1c4ce97..00000000000
--- a/data/Bravura/E5C8-ornamentPrecompTrillLowerSuffix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 51c0 7 7 17 12 22c13 15 24 29 37 43c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -72 98 -114l3 2c40 35 86 86 127 118c9 7 6 10 14 10 c22 0 74 -64 92 -93c38 -66 51 -99 51 -186c0 -103 -101 -187 -201 -187c-47 0 -96 16 -102 22c-4 4 -6 14 -6 15l10 -3c30 -8 68 -18 98 -18c70 0 145 64 145 135v9c0 66 -20 106 -52 136c-35 32 -81 53 -88 53c-8 0 -53 -42 -60 -49c-29 -27 -70 -69 -76 -74 c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-12 -5 -23 -13l-24 -21c-29 -27 -70 -69 -76 -74c-4 -3 -11 -5 -18 -5c-9 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-13 -5 -23 -13c-14 -11 -26 -23 -39 -35 c-10 -9 -21 -23 -40 -24c-15 0 -20 5 -20 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5E5-brassMuteClosed.xml b/data/Bravura/E5E5-brassMuteClosed.xml
deleted file mode 100644
index 81647d32990..00000000000
--- a/data/Bravura/E5E5-brassMuteClosed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 152h120v120h32v-120h120v-32h-120v-120h-32v120h-120v32z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5E6-brassMuteHalfClosed.xml b/data/Bravura/E5E6-brassMuteHalfClosed.xml
deleted file mode 100644
index 1fbbc0421c9..00000000000
--- a/data/Bravura/E5E6-brassMuteHalfClosed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 152c0 84 69 152 152 152c84 0 152 -68 152 -152s-68 -152 -152 -152c-83 0 -152 68 -152 152zM169 136v-103c54 7 96 49 103 103h-103zM169 271v-103h103c-7 53 -49 96 -103 103zM34 136c8 -54 50 -96 103 -103v103h-103zM34 168h103v103c-53 -7 -95 -50 -103 -103z " /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5E7-brassMuteOpen.xml b/data/Bravura/E5E7-brassMuteOpen.xml
deleted file mode 100644
index 87739c7f744..00000000000
--- a/data/Bravura/E5E7-brassMuteOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 152c0 84 68 152 152 152s152 -68 152 -152s-68 -152 -152 -152s-152 68 -152 152zM152 272c-66 0 -120 -54 -120 -120s54 -120 120 -120s120 54 120 120s-54 120 -120 120z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E610-stringsDownBow.xml b/data/Bravura/E610-stringsDownBow.xml
deleted file mode 100644
index 803365cda34..00000000000
--- a/data/Bravura/E610-stringsDownBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 0c-6 0 -12 5 -12 12v280c0 14 12 26 26 26h260c14 0 26 -12 26 -26v-280c0 -7 -6 -12 -12 -12h-13c-7 0 -13 5 -13 12v164c0 11 -59 17 -118 17s-118 -6 -118 -17v-164c0 -7 -6 -12 -12 -12h-14z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E611-stringsDownBowTurned.xml b/data/Bravura/E611-stringsDownBowTurned.xml
deleted file mode 100644
index e43bfb41f43..00000000000
--- a/data/Bravura/E611-stringsDownBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 0c-14 0 -26 12 -26 26v280c0 7 6 12 12 12h14c6 0 12 -5 12 -12v-164c0 -11 59 -17 118 -17s118 6 118 17v164c0 7 6 12 13 12h13c6 0 12 -5 12 -12v-280c0 -14 -12 -26 -26 -26h-260z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E612-stringsUpBow.xml b/data/Bravura/E612-stringsUpBow.xml
deleted file mode 100644
index f7a6ba3e50a..00000000000
--- a/data/Bravura/E612-stringsUpBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 479c0 7 6 14 14 16h4c8 0 15 -5 18 -13l88 -385l89 385c2 8 9 13 17 13h4c9 -2 14 -9 14 -17v-4l-106 -459c-2 -8 -9 -14 -17 -14c-10 0 -17 6 -19 14l-105 459c-1 2 -1 3 -1 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E613-stringsUpBowTurned.xml b/data/Bravura/E613-stringsUpBowTurned.xml
deleted file mode 100644
index 53cdeff35e6..00000000000
--- a/data/Bravura/E613-stringsUpBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 1c-8 2 -14 9 -14 16c0 2 0 3 1 5l105 459c2 8 9 14 19 14c8 0 15 -6 17 -14l106 -459v-4c0 -8 -5 -15 -14 -17h-4c-8 0 -15 5 -17 13l-89 385l-88 -385c-3 -8 -10 -13 -18 -13h-4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E614-stringsHarmonic.xml b/data/Bravura/E614-stringsHarmonic.xml
deleted file mode 100644
index 94d81d52e2f..00000000000
--- a/data/Bravura/E614-stringsHarmonic.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 0c-55 0 -100 45 -100 100c0 56 45 100 100 100s100 -44 100 -100c0 -55 -45 -100 -100 -100zM27 100c0 -40 33 -73 73 -73c41 0 73 33 73 73c0 41 -32 73 -73 73c-40 0 -73 -32 -73 -73z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E630-pluckedSnapPizzicatoBelow.xml b/data/Bravura/E630-pluckedSnapPizzicatoBelow.xml
deleted file mode 100644
index 5f751f74b9d..00000000000
--- a/data/Bravura/E630-pluckedSnapPizzicatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M84 101c-48 8 -84 49 -84 99c0 56 45 100 100 100s100 -44 100 -100c0 -50 -37 -91 -84 -99v-101h-32v101zM27 200c0 -35 25 -64 57 -71v71h32v-71c33 7 57 36 57 71c0 41 -32 73 -73 73c-40 0 -73 -32 -73 -73z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E631-pluckedSnapPizzicatoAbove.xml b/data/Bravura/E631-pluckedSnapPizzicatoAbove.xml
deleted file mode 100644
index a85ce874a1b..00000000000
--- a/data/Bravura/E631-pluckedSnapPizzicatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 0c-55 0 -100 44 -100 100c0 49 36 91 84 98v102h32v-102c47 -7 84 -49 84 -98c0 -56 -45 -100 -100 -100zM27 100c0 -41 32 -73 73 -73c40 0 73 32 73 73c0 34 -25 64 -57 71v-71h-32v71c-33 -7 -57 -37 -57 -71z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E632-pluckedBuzzPizzicato.xml b/data/Bravura/E632-pluckedBuzzPizzicato.xml
deleted file mode 100644
index 964926aa03c..00000000000
--- a/data/Bravura/E632-pluckedBuzzPizzicato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 100c0 55 44 100 100 100c50 0 91 -37 99 -84h101v-32h-101c-8 -48 -49 -84 -99 -84c-56 0 -100 45 -100 100zM27 100c0 -40 32 -73 73 -73c34 0 64 24 71 57h-71v32h71c-7 33 -36 57 -71 57c-41 0 -73 -32 -73 -73z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E633-pluckedLeftHandPizzicato.xml b/data/Bravura/E633-pluckedLeftHandPizzicato.xml
deleted file mode 100644
index 69d2ea3a4bf..00000000000
--- a/data/Bravura/E633-pluckedLeftHandPizzicato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E633" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 152h120v120h32v-120h120v-32h-120v-120h-32v120h-120v32z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E638-pluckedDamp.xml b/data/Bravura/E638-pluckedDamp.xml
deleted file mode 100644
index b3cf4addec7..00000000000
--- a/data/Bravura/E638-pluckedDamp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E638" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M60 148h-60v28h60c6 46 42 83 88 89v59h28v-59c46 -6 82 -43 88 -89h60v-28h-60c-7 -45 -43 -81 -88 -87v-61h-28v61c-45 6 -81 42 -88 87zM88 176h60v60c-30 -5 -54 -30 -60 -60zM176 236v-60h60c-6 30 -30 55 -60 60zM148 148h-60c6 -30 30 -53 60 -59v59zM235 148h-59 v-59c30 6 54 29 59 59z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E645-vocalSprechgesang.xml b/data/Bravura/E645-vocalSprechgesang.xml
deleted file mode 100644
index 492da71e11c..00000000000
--- a/data/Bravura/E645-vocalSprechgesang.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E645" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-28 160l-133 133l28 28l133 -133l133 133l28 -28l-132 -133l132 -133l-28 -28l-133 133l-133 -133l-28 28z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E650-keyboardPedalPed.xml b/data/Bravura/E650-keyboardPedalPed.xml
deleted file mode 100644
index e89cde722aa..00000000000
--- a/data/Bravura/E650-keyboardPedalPed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M85 261c-59 0 -85 54 -85 98c0 80 74 136 124 161c57 28 103 34 163 35h6c92 0 201 -40 201 -147c0 -44 -29 -81 -75 -81c-65 0 -100 69 -100 92c0 8 4 13 10 13c9 0 13 -8 19 -14c13 -14 27 -19 44 -19c18 0 32 12 32 34c0 56 -49 97 -103 97c-11 0 -26 -3 -42 -30 c-12 -20 -23 -50 -23 -63c0 -21 13 -41 42 -75c35 -41 56 -60 56 -92c0 -34 -32 -83 -51 -110c-5 -7 -7 -10 -7 -13c0 -4 6 -3 17 -6c16 -4 32 -13 49 -30s35 -34 58 -34c14 0 24 5 40 16c5 4 6 6 6 9v4c-3 16 -4 31 -4 45c0 79 32 164 124 164c39 0 65 -22 65 -61 c0 -57 -49 -91 -95 -124l-10 -7c-7 -5 -9 -7 -9 -10s1 -6 2 -10c7 -22 28 -55 53 -55c17 0 32 5 63 36c20 20 22 27 22 48v18c0 84 33 133 82 160c11 6 18 8 23 8c7 0 11 -5 11 -11c0 -4 -1 -7 -7 -13c-32 -32 -41 -76 -41 -135c0 -67 22 -132 55 -132c37 0 49 58 49 127 c0 196 -135 277 -307 318c-17 4 -23 9 -23 16c0 6 3 12 13 12c6 0 13 -1 18 -2c177 -36 373 -112 373 -326c0 -115 -63 -175 -123 -175c-52 0 -85 28 -104 65c-4 7 -6 12 -10 12c-5 0 -12 -10 -29 -28c-36 -37 -64 -52 -95 -52c-39 0 -64 26 -79 58c-4 8 -5 10 -7 10 c-4 0 -8 -4 -12 -8l-26 -25c-31 -29 -44 -32 -61 -32c-53 0 -68 107 -108 107c-8 0 -12 -6 -17 -12l-14 -17c-44 -52 -72 -83 -102 -83c-17 0 -34 11 -34 28c0 41 86 96 130 112c19 7 20 8 33 26c15 20 21 33 21 53c0 33 -28 60 -41 78c-14 19 -55 64 -55 90 c0 27 39 90 54 113c6 10 15 22 15 30c0 6 -6 7 -14 7c-85 0 -183 -50 -186 -144v-4c0 -22 8 -48 37 -48c30 0 42 33 46 48c5 17 6 26 14 26c6 0 11 -5 11 -32c0 -61 -36 -114 -82 -114zM976 0c-25 0 -43 18 -43 43s18 43 43 43s43 -18 43 -43s-18 -43 -43 -43zM525 196 c0 -14 1 -26 2 -38c0 -5 2 -7 4 -7s6 2 11 6c30 24 47 48 47 81c0 28 -7 42 -23 42c-30 0 -41 -40 -41 -84z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E651-keyboardPedalP.xml b/data/Bravura/E651-keyboardPedalP.xml
deleted file mode 100644
index 56dd34a4fae..00000000000
--- a/data/Bravura/E651-keyboardPedalP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M85 261c-59 0 -85 54 -85 98c0 80 74 136 124 161c57 28 103 34 163 35h6c92 0 201 -40 201 -147c0 -44 -29 -81 -75 -81c-65 0 -100 69 -100 92c0 8 4 13 10 13c9 0 13 -8 19 -14c13 -14 27 -19 44 -19c18 0 32 12 32 34c0 56 -49 97 -103 97c-11 0 -26 -3 -42 -30 c-12 -20 -23 -50 -23 -63c0 -21 13 -41 42 -75c35 -41 56 -60 56 -92c0 -34 -32 -83 -51 -110c-5 -7 -7 -10 -7 -13c0 -4 6 -3 17 -6c16 -4 32 -13 49 -30s35 -34 58 -34c17 0 29 8 51 24c5 4 10 7 16 7c8 0 13 -7 13 -12c0 -4 -1 -7 -9 -15l-53 -52 c-31 -29 -44 -32 -61 -32c-53 0 -68 107 -108 107c-8 0 -12 -6 -17 -12l-14 -17c-44 -52 -72 -83 -102 -83c-17 0 -34 11 -34 28c0 41 86 96 130 112c19 7 20 8 33 26c15 20 21 33 21 53c0 33 -28 60 -41 78c-14 19 -55 64 -55 90c0 27 39 90 54 113c6 10 15 22 15 30 c0 6 -6 7 -14 7c-85 0 -183 -50 -186 -144v-4c0 -22 8 -48 37 -48c30 0 42 33 46 48c5 17 6 26 14 26c6 0 11 -5 11 -32c0 -61 -36 -114 -82 -114z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E655-keyboardPedalUp.xml b/data/Bravura/E655-keyboardPedalUp.xml
deleted file mode 100644
index 8412ed96093..00000000000
--- a/data/Bravura/E655-keyboardPedalUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M46 175c-30 0 -46 23 -46 50s16 50 46 50c19 0 34 -8 46 -20c14 -14 20 -19 35 -19h5c18 0 32 6 32 26c0 7 -5 13 -14 22l-4 4c-9 9 -18 10 -36 10c-31 0 -59 16 -59 50c0 28 23 51 51 51c34 0 50 -28 50 -59c0 -18 1 -27 10 -36l4 -4c9 -9 15 -14 22 -14 c20 0 26 14 26 32v5c0 15 -5 21 -19 35c-12 12 -20 27 -20 46c0 30 23 46 50 46s50 -16 50 -46c0 -19 -8 -34 -20 -46c-14 -14 -19 -20 -19 -35v-5c0 -18 6 -32 26 -32c7 0 13 5 22 14l4 4c9 9 10 18 10 36c0 31 16 59 50 59c28 0 51 -23 51 -51c0 -34 -28 -50 -59 -50 c-18 0 -27 -1 -36 -10l-4 -4c-9 -9 -14 -15 -14 -22c0 -20 14 -26 32 -26h5c15 0 21 5 35 19c12 12 27 20 46 20c30 0 46 -23 46 -50s-16 -50 -46 -50c-19 0 -34 8 -46 20c-14 14 -20 19 -35 19h-5c-18 0 -32 -6 -32 -26c0 -7 5 -13 14 -22l4 -4c9 -9 18 -10 36 -10 c31 0 59 -16 59 -50c0 -28 -23 -51 -51 -51c-34 0 -50 28 -50 59c0 18 -1 27 -10 36l-4 4c-9 9 -15 14 -22 14c-20 0 -26 -14 -26 -32v-5c0 -15 5 -21 19 -35c12 -12 20 -27 20 -46c0 -30 -23 -46 -50 -46s-50 16 -50 46c0 19 8 34 20 46c14 14 19 20 19 35v5 c0 18 -6 32 -26 32c-7 0 -13 -5 -22 -14l-4 -4c-9 -9 -10 -18 -10 -36c0 -31 -16 -59 -50 -59c-28 0 -51 23 -51 51c0 34 28 50 59 50c18 0 27 1 36 10l4 4c9 9 14 15 14 22c0 20 -14 26 -32 26h-5c-15 0 -21 -5 -35 -19c-12 -12 -27 -20 -46 -20zM188 225 c0 -23 14 -37 37 -37s37 14 37 37s-14 37 -37 37s-37 -14 -37 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E659-keyboardPedalSost.xml b/data/Bravura/E659-keyboardPedalSost.xml
deleted file mode 100644
index c076f4ba541..00000000000
--- a/data/Bravura/E659-keyboardPedalSost.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E659" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M474 39c-13 21 -30 50 -30 89c0 40 11 88 50 138c23 29 41 39 59 39c28 0 61 -42 75 -66c10 -17 11 -28 15 -28s6 8 13 21c16 30 41 69 80 69c4 0 13 1 13 2c0 4 -13 9 -13 32c0 45 39 79 104 79c73 0 105 -26 105 -81c0 -16 -1 -26 -1 -32s1 -7 6 -7h47 c11 0 17 -6 17 -17s-6 -17 -17 -17h-46c-8 0 -9 0 -10 -17c-3 -60 -6 -104 -6 -139c0 -39 3 -51 13 -51c13 0 21 27 27 70c1 8 4 16 14 16c7 0 13 -3 13 -15c0 -47 -19 -132 -78 -132c-48 0 -56 50 -56 100c0 55 2 92 7 155v6c0 7 -2 7 -8 7h-22c-11 0 -17 6 -17 17 s6 17 17 17h24c8 0 11 0 11 39c0 34 -14 50 -52 50c-36 0 -66 -17 -66 -48c0 -15 5 -25 15 -31c15 -9 28 -5 28 -23c0 -12 -5 -18 -14 -18c-7 0 -15 2 -26 6c-8 3 -17 7 -27 7c-9 0 -18 -12 -18 -25c0 -10 20 -29 45 -51l4 -3c31 -27 51 -54 51 -88c0 -60 -53 -119 -93 -119 c-29 0 -65 33 -65 71c0 13 4 26 40 78c4 6 5 7 5 9s-1 3 -5 8c-6 7 -15 18 -20 27c-8 14 -7 22 -10 22c-4 0 -29 -65 -33 -78c-12 -38 -62 -137 -105 -137c-23 0 -48 30 -60 49zM12 -15c-10 0 -12 7 -12 14c0 4 1 13 3 23c11 56 48 145 116 145c35 0 57 -24 107 -52 c39 -22 72 -28 102 -28c36 0 53 44 53 90c0 53 -33 94 -63 94c-39 0 -94 -45 -184 -45c-60 0 -110 54 -110 141c0 122 87 183 171 183c57 0 90 -42 146 -42c17 0 22 7 22 22c0 19 -12 35 -40 35c-19 0 -30 -4 -38 -4c-5 0 -10 4 -10 11c0 18 37 19 49 19c42 0 67 -24 67 -67 c0 -58 -36 -101 -89 -101c-85 0 -103 56 -161 56c-40 0 -80 -32 -80 -84c0 -49 26 -75 51 -75c51 0 107 41 190 41c60 0 117 -39 117 -151c0 -151 -98 -220 -157 -220c-45 0 -99 40 -132 65l-9 7c-15 11 -26 19 -37 19c-25 0 -44 -44 -56 -81c-3 -9 -5 -15 -16 -15zM536 241 c-25 0 -42 -41 -42 -65c0 -27 27 -113 59 -113c22 0 40 38 40 67c0 35 -13 60 -21 75c-7 13 -23 36 -36 36zM1021 35c0 25 18 43 43 43s43 -18 43 -43s-18 -43 -43 -43s-43 18 -43 43zM726 129c-7 0 -23 -37 -23 -45c0 -15 28 -40 55 -40c11 0 18 12 18 21 c0 12 -12 25 -34 49l-6 6c-6 7 -8 9 -10 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E65A-keyboardPedalS.xml b/data/Bravura/E65A-keyboardPedalS.xml
deleted file mode 100644
index be3d70f7df1..00000000000
--- a/data/Bravura/E65A-keyboardPedalS.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E65A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -15c-10 0 -12 7 -12 14c0 4 1 13 3 23c11 56 48 145 116 145c35 0 57 -24 107 -52c39 -22 72 -28 102 -28c36 0 53 44 53 90c0 53 -33 94 -63 94c-39 0 -94 -45 -184 -45c-60 0 -110 54 -110 141c0 122 87 183 171 183c57 0 90 -42 146 -42c17 0 22 7 22 22 c0 19 -12 35 -40 35c-19 0 -30 -4 -38 -4c-5 0 -10 4 -10 11c0 18 37 19 49 19c42 0 67 -24 67 -67c0 -58 -36 -101 -89 -101c-85 0 -103 56 -161 56c-40 0 -80 -32 -80 -84c0 -49 26 -75 51 -75c51 0 107 41 190 41c60 0 117 -39 117 -151c0 -151 -98 -220 -157 -220 c-45 0 -99 40 -132 65l-9 7c-15 11 -26 19 -37 19c-25 0 -44 -44 -56 -81c-3 -9 -5 -15 -16 -15z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E880-tuplet0.xml b/data/Bravura/E880-tuplet0.xml
deleted file mode 100644
index 13c8364cb61..00000000000
--- a/data/Bravura/E880-tuplet0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -8c-113 0 -127 107 -96 204c35 113 108 179 193 179c114 0 128 -107 97 -204c-36 -113 -109 -179 -194 -179zM99 183c-22 -68 -38 -165 10 -165c45 0 85 86 110 166c22 68 38 165 -11 165c-44 0 -84 -87 -109 -166z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E881-tuplet1.xml b/data/Bravura/E881-tuplet1.xml
deleted file mode 100644
index 36fca354a40..00000000000
--- a/data/Bravura/E881-tuplet1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E881" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 0c-10 0 -15 6 -15 14s5 13 14 14l35 3c9 1 9 3 12 10l68 213c1 5 2 10 2 12c0 5 -2 6 -5 6c-4 0 -8 -2 -13 -9l-37 -40c-6 -7 -10 -11 -18 -11c-9 0 -16 8 -16 15c0 5 3 10 8 17l106 120c5 5 9 8 16 8c12 0 18 -9 31 -9c10 0 23 9 34 9c6 0 9 -4 9 -10 c0 -1 -1 -6 -2 -11l-97 -306c-2 -9 -4 -13 4 -14l34 -3c9 -1 13 -6 13 -14s-4 -14 -15 -14h-168z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E882-tuplet2.xml b/data/Bravura/E882-tuplet2.xml
deleted file mode 100644
index b2625592bc6..00000000000
--- a/data/Bravura/E882-tuplet2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E882" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -3c-10 0 -16 6 -16 15c0 4 1 8 3 16c17 64 52 114 136 148c78 31 100 81 100 128c0 35 -25 43 -52 43c-34 0 -53 -16 -53 -28c0 -8 5 -12 11 -18s12 -16 12 -30c0 -27 -20 -51 -47 -51c-31 0 -43 21 -43 43c0 57 52 112 133 112c75 0 119 -33 119 -86 c0 -88 -70 -125 -149 -143c-39 -9 -73 -24 -95 -49c-8 -9 -11 -17 -4 -17c4 0 8 3 16 6c12 5 25 7 40 7c32 0 56 -18 85 -18c18 0 31 6 43 22c5 8 9 11 15 11c7 0 15 -4 15 -12c0 -4 -1 -7 -4 -14c-18 -56 -41 -88 -92 -88c-66 0 -92 43 -127 43c-15 0 -21 -9 -26 -22 s-10 -18 -20 -18z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E883-tuplet3.xml b/data/Bravura/E883-tuplet3.xml
deleted file mode 100644
index 0d44eb6d795..00000000000
--- a/data/Bravura/E883-tuplet3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 -8c-71 0 -103 37 -103 77c0 33 21 58 49 58c21 0 38 -12 38 -36c0 -26 -14 -38 -25 -43c-8 -4 -13 -6 -13 -12c0 -10 16 -18 36 -18c61 0 92 61 92 105c0 32 -18 54 -55 54h-10c-13 0 -20 6 -20 15s7 15 20 15h11c58 0 92 38 92 91c0 22 -13 46 -52 46 c-21 0 -33 -7 -33 -14c0 -3 5 -7 12 -13c5 -6 9 -14 9 -25c0 -27 -20 -47 -45 -47c-23 0 -39 17 -38 43c2 54 54 87 117 87c61 0 111 -32 111 -84c0 -40 -34 -72 -76 -89c-8 -4 -12 -6 -12 -9c0 -5 4 -6 11 -9c26 -13 39 -37 39 -62c0 -79 -70 -130 -155 -130z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E884-tuplet4.xml b/data/Bravura/E884-tuplet4.xml
deleted file mode 100644
index 324f0476a2c..00000000000
--- a/data/Bravura/E884-tuplet4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E884" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 116c0 7 4 11 10 17c65 65 129 138 155 228c2 6 5 11 13 11c13 0 29 -9 48 -9c18 0 32 9 47 9c8 0 11 -3 11 -8c0 -3 0 -6 -5 -12c-48 -63 -134 -147 -212 -209c-4 -3 -5 -5 -5 -7s1 -5 8 -5h90c7 0 8 3 10 8l18 57c2 7 4 11 11 19l64 69c8 9 13 13 23 13 c8 0 14 -2 14 -9c0 -3 -2 -11 -4 -19l-41 -130c-1 -6 1 -8 5 -8h29c8 0 14 -5 14 -14c0 -8 -6 -14 -15 -14h-34c-7 0 -9 -3 -10 -8l-16 -50c-2 -9 -4 -13 4 -14l34 -3c9 -1 13 -6 13 -14s-4 -14 -15 -14h-168c-10 0 -15 6 -15 14s5 13 14 14l35 3c9 1 9 3 12 10l17 55 c1 5 -1 7 -5 7h-136c-12 0 -18 5 -18 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E885-tuplet5.xml b/data/Bravura/E885-tuplet5.xml
deleted file mode 100644
index 6aa33760273..00000000000
--- a/data/Bravura/E885-tuplet5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E885" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 -8c-71 0 -103 37 -103 77c0 33 21 58 48 58c21 0 39 -12 39 -36c0 -26 -14 -38 -25 -43c-8 -4 -13 -6 -13 -12c0 -10 16 -18 36 -18c65 0 97 81 97 129c0 29 -12 51 -46 51c-31 0 -51 -21 -60 -30c-7 -7 -12 -10 -19 -10c-9 0 -16 6 -16 15c0 6 1 9 4 19l55 161 c4 12 11 17 22 17c7 0 13 -1 27 -5c12 -4 32 -8 60 -8c29 0 54 3 74 9c14 4 25 7 25 7c5 0 9 -4 9 -9c0 -7 -4 -13 -13 -22c-31 -29 -77 -56 -135 -56c-13 0 -28 2 -39 3c-10 2 -14 2 -18 -8l-15 -45c-3 -10 -1 -16 14 -12c13 4 27 7 47 7c65 0 105 -24 105 -82 c0 -94 -68 -157 -160 -157z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E886-tuplet6.xml b/data/Bravura/E886-tuplet6.xml
deleted file mode 100644
index f9fa797ef1f..00000000000
--- a/data/Bravura/E886-tuplet6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M128 -8c-124 0 -136 108 -100 217c36 111 105 166 191 166c59 0 95 -30 95 -71c0 -34 -20 -56 -49 -56c-22 0 -42 14 -42 38c0 21 12 36 27 43c5 2 14 6 14 10c0 6 -16 12 -35 11c-59 -3 -97 -68 -118 -127c-6 -19 3 -20 12 -14c20 15 44 21 71 21c58 0 89 -38 89 -86 c0 -102 -82 -152 -155 -152zM88 102c-7 -34 -10 -84 37 -84c39 0 77 57 77 127c0 29 -8 49 -37 49c-35 0 -67 -40 -77 -92z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E887-tuplet7.xml b/data/Bravura/E887-tuplet7.xml
deleted file mode 100644
index 55759e53033..00000000000
--- a/data/Bravura/E887-tuplet7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 241c0 2 1 5 2 8l34 108c4 10 9 12 18 12c8 0 13 -3 13 -9c0 -8 -4 -14 -4 -20c0 -3 2 -4 3 -4c2 0 6 4 13 11c16 14 35 25 57 25c49 0 68 -41 101 -41c15 0 25 8 31 25c4 10 8 13 20 13c8 0 15 -2 15 -11c0 -5 -1 -10 -2 -15c-21 -69 -56 -114 -90 -153 c-55 -63 -70 -120 -85 -183c-1 -7 -4 -11 -13 -11c-15 0 -28 9 -43 9c-16 0 -31 -9 -46 -9c-6 0 -9 3 -9 8c0 3 1 7 2 9c20 64 58 124 119 172c42 34 78 57 107 100c5 7 0 13 -8 8c-20 -13 -42 -20 -62 -20c-37 0 -70 19 -98 19c-24 0 -36 -21 -45 -48 c-3 -11 -9 -13 -18 -13c-8 0 -12 3 -12 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E888-tuplet8.xml b/data/Bravura/E888-tuplet8.xml
deleted file mode 100644
index 11385bab75f..00000000000
--- a/data/Bravura/E888-tuplet8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 87c0 39 20 75 72 96c20 8 17 12 8 24c-13 15 -19 35 -19 59c0 69 57 109 140 109c79 0 112 -38 112 -84c0 -30 -17 -63 -61 -86c-19 -10 -16 -14 -4 -27c18 -20 26 -41 26 -71c0 -74 -69 -115 -148 -115c-87 0 -126 42 -126 95zM119 162c-34 -21 -46 -58 -46 -83 c0 -30 16 -63 65 -63c38 0 69 24 69 65c0 24 -13 36 -65 76c-11 9 -15 10 -23 5zM148 294c0 -23 12 -38 50 -66c12 -9 17 -8 24 -4c27 19 39 47 39 74s-13 53 -52 53c-36 0 -61 -21 -61 -57z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E889-tuplet9.xml b/data/Bravura/E889-tuplet9.xml
deleted file mode 100644
index 9ecd012c9c1..00000000000
--- a/data/Bravura/E889-tuplet9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M105 -8c-59 0 -95 30 -95 71c0 34 20 56 49 56c22 0 42 -14 42 -38c0 -21 -12 -36 -27 -43c-5 -2 -14 -6 -14 -10c0 -6 16 -12 35 -11c59 3 97 68 118 127c6 19 -3 20 -12 14c-20 -15 -44 -21 -71 -21c-58 0 -89 38 -89 86c0 102 82 152 155 152c124 0 136 -108 100 -217 c-36 -111 -105 -166 -191 -166zM199 349c-39 0 -77 -57 -77 -127c0 -29 8 -49 37 -49c35 0 67 40 77 92c7 34 10 84 -37 84z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E88A-tupletColon.xml b/data/Bravura/E88A-tupletColon.xml
deleted file mode 100644
index c9d4858f898..00000000000
--- a/data/Bravura/E88A-tupletColon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E88A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 186c-23 0 -37 18 -37 39c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44zM10 97c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44c-23 0 -37 18 -37 39z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E901-mensuralGclefPetrucci.xml b/data/Bravura/E901-mensuralGclefPetrucci.xml
deleted file mode 100644
index 9c5c457d33c..00000000000
--- a/data/Bravura/E901-mensuralGclefPetrucci.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E901" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 229v5c0 25 8 50 19 73c38 73 106 123 157 185l-29 49c-31 58 -58 122 -58 189c0 85 51 192 147 192c51 0 66 -45 66 -100c0 -84 -41 -229 -86 -303c35 -62 75 -141 80 -194c1 -5 1 -11 1 -16c0 -50 -24 -101 -43 -142l-5 -10c29 0 46 0 72 -19c1 -1 2 -2 2 -7 c0 -7 -22 -44 -38 -54c-2 -1 -5 -2 -7 -2c-1 0 -2 1 -3 1c-12 7 -28 12 -46 13v-5c0 -23 7 -44 15 -64c3 3 5 6 7 6c3 2 14 3 26 3c24 0 56 -3 56 -3c4 -16 6 -32 6 -47c0 -87 -62 -144 -113 -148h-6c-41 0 -89 30 -103 67c-10 27 -17 55 -17 82c0 72 62 151 130 173l9 21 c16 36 23 69 23 102c0 75 -39 139 -77 201c-55 -64 -140 -115 -153 -205c-1 -4 -1 -8 -1 -12c0 -53 46 -92 62 -92c4 -3 6 -6 6 -8c0 -1 -2 -5 -3 -7c-2 -3 -6 -15 -17 -26c-4 -4 -8 -6 -11 -6c-4 0 -7 3 -7 3s-59 17 -61 105zM192 880c-57 0 -69 -50 -69 -98 c0 -70 28 -155 43 -179c7 -12 23 -36 40 -67l12 21c28 60 53 149 53 217c0 51 -19 106 -79 106zM149 65v-19c0 -131 71 -150 113 -150c10 0 19 1 24 2c4 0 5 11 5 24c0 15 -2 32 -5 39c-1 3 -9 4 -19 4c-11 0 -26 -1 -36 -1c-5 0 -10 0 -12 1c-13 12 -18 32 -18 56 c0 21 3 45 9 69c-22 -1 -45 -9 -61 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E902-chantFclef.xml b/data/Bravura/E902-chantFclef.xml
deleted file mode 100644
index 42595ae579f..00000000000
--- a/data/Bravura/E902-chantFclef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E902" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M130 -108v217c1 34 5 112 70 112h6c50 -3 58 -40 58 -56v-128s0 -3 -2 -3c-1 0 -3 1 -5 3c0 0 -24 24 -57 24s-61 -23 -61 -61c0 -37 28 -60 61 -60s57 23 57 23c2 2 4 3 5 3c2 0 2 -3 2 -3v-127c0 -16 -8 -54 -58 -57h-5c-66 0 -71 79 -71 113zM0 45c0 0 0 40 57 40 c29 0 58 -3 58 -43v-257c0 -11 -3 -16 -6 -16s-6 5 -6 16v140s0 7 -9 12c0 0 -12 10 -37 10c-20 0 -50 -15 -56 -15c-1 0 -1 1 -1 5v108z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E904-mensuralFclefPetrucci.xml b/data/Bravura/E904-mensuralFclefPetrucci.xml
deleted file mode 100644
index 8f0118969c4..00000000000
--- a/data/Bravura/E904-mensuralFclefPetrucci.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E904" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M327 -11c-7 11 -59 100 -59 110c0 6 5 10 6 16l80 140c8 16 16 25 24 29v297c0 5 4 10 10 10h13c5 0 10 -5 10 -10v-308l6 -8c11 -16 71 -114 71 -133c0 -4 -1 -7 -3 -11l-56 -95c-2 -4 -3 -7 -3 -10c0 -4 2 -7 4 -11c0 0 36 -65 49 -86c6 -9 7 -18 7 -24 c0 -22 -69 -133 -82 -153c-9 -14 -17 -22 -24 -27v-774c0 -6 -5 -10 -10 -10h-13c-6 0 -10 4 -10 10v779l-5 8c-8 12 -62 106 -70 116c-3 4 -4 9 -4 14c0 6 2 11 4 16c55 97 55 98 55 98c3 4 4 6 4 8s-1 5 -4 9zM0 -176v346c0 6 5 10 12 10h9c6 0 12 -4 12 -10v-10 c3 -26 15 -33 24 -33h117c24 0 28 20 30 39c1 13 6 14 12 14h8c7 0 12 -2 12 -19v-1105c0 -18 -5 -18 -12 -18h-8c-7 0 -12 0 -12 18v786c-7 20 -17 23 -27 23h-121c-7 0 -18 0 -23 -23v-18c0 -5 -6 -10 -12 -10h-9c-7 0 -12 5 -12 10zM33 22v-42c3 -26 15 -33 24 -33h117 c24 0 28 19 30 37v38c-7 20 -17 23 -27 23h-121c-7 0 -18 0 -23 -23zM367 -34l-39 -66l61 -106l40 68zM328 135l61 -106l40 68l-62 104z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E906-chantCclef.xml b/data/Bravura/E906-chantCclef.xml
deleted file mode 100644
index 5803bba2324..00000000000
--- a/data/Bravura/E906-chantCclef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E906" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -108v216c0 34 5 113 70 113h6c49 -3 58 -41 58 -56v-128s0 -3 -2 -3c-1 0 -3 1 -6 3c0 0 -24 24 -57 24s-61 -24 -61 -61s28 -61 61 -61s57 24 57 24c3 2 5 3 6 3c2 0 2 -3 2 -3v-128c0 -15 -9 -53 -58 -56h-5c-66 0 -71 79 -71 113z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E907-mensuralCclefPetrucciPosLowest.xml b/data/Bravura/E907-mensuralCclefPetrucciPosLowest.xml
deleted file mode 100644
index 35ba3368a75..00000000000
--- a/data/Bravura/E907-mensuralCclefPetrucciPosLowest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E907" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 783c0 17 6 17 13 17h8c7 0 13 0 13 -17v-474c3 -26 15 -33 25 -33h121c25 0 28 19 30 37v227c0 17 6 17 13 17h9c6 0 12 0 12 -17v-837c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17c-2 18 -5 28 -30 28h-116c-24 0 -28 -20 -30 -38v-25c0 -17 -6 -17 -13 -17h-8 c-7 0 -13 0 -13 17v1115zM58 174c-7 0 -18 0 -24 -23v-36c2 -18 6 -37 30 -37h121c17 0 25 20 25 35v38c-6 20 -17 23 -27 23h-125zM34 -132c2 -18 6 -37 30 -37h121c10 0 22 7 25 33v26c-1 18 -6 37 -27 37h-127c-17 -4 -21 -21 -22 -37v-22z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E908-mensuralCclefPetrucciPosLow.xml b/data/Bravura/E908-mensuralCclefPetrucciPosLow.xml
deleted file mode 100644
index 8cbc78dd7ed..00000000000
--- a/data/Bravura/E908-mensuralCclefPetrucciPosLow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E908" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -583v1366c0 17 6 17 13 17h8c7 0 13 0 13 -17v-476c2 -18 6 -38 30 -38h116c25 0 28 20 30 38v237c0 17 6 17 13 17h9c6 0 12 0 12 -17v-1074c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v227c-2 18 -5 37 -30 37h-121c-10 0 -22 -7 -25 -33v-284 c0 -17 -6 -17 -13 -17h-8c-7 0 -13 0 -13 17zM34 -115v-36c6 -23 17 -23 24 -23h125c10 0 21 3 27 23v38c0 15 -8 35 -25 35h-121c-24 0 -28 -19 -30 -37zM34 132v-22c1 -16 5 -33 22 -37h127c21 0 26 19 27 37v26c-3 26 -15 33 -25 33h-121c-24 0 -28 -19 -30 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E909-mensuralCclefPetrucciPosMiddle.xml b/data/Bravura/E909-mensuralCclefPetrucciPosMiddle.xml
deleted file mode 100644
index 6cbb14b530c..00000000000
--- a/data/Bravura/E909-mensuralCclefPetrucciPosMiddle.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E909" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -783v1566c0 17 6 17 13 17h8c7 0 13 0 13 -17v-474c3 -26 15 -33 25 -33h121c25 0 28 19 30 37v227c0 17 6 17 13 17h9c6 0 12 0 12 -17v-1084c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v237c-2 18 -5 38 -30 38h-116c-24 0 -28 -20 -30 -38v-476 c0 -17 -6 -17 -13 -17h-8c-7 0 -13 0 -13 17zM34 151v-36c2 -18 6 -37 30 -37h121c17 0 25 20 25 35v38c-6 20 -17 23 -27 23h-125c-7 0 -18 0 -24 -23zM34 -110v-22c2 -18 6 -37 30 -37h121c10 0 22 7 25 33v26c-1 18 -6 37 -27 37h-127c-17 -4 -21 -21 -22 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E90A-mensuralCclefPetrucciPosHigh.xml b/data/Bravura/E90A-mensuralCclefPetrucciPosHigh.xml
deleted file mode 100644
index 863c0b64ecb..00000000000
--- a/data/Bravura/E90A-mensuralCclefPetrucciPosHigh.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E90A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -783v1366c0 17 6 17 13 17h8c7 0 13 0 13 -17v-284c3 -26 15 -33 25 -33h121c25 0 28 19 30 37v227c0 17 6 17 13 17h9c6 0 12 0 12 -17v-1074c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v237c-2 18 -5 38 -30 38h-116c-24 0 -28 -20 -30 -38v-476 c0 -17 -6 -17 -13 -17h-8c-7 0 -13 0 -13 17zM34 151v-36c2 -18 6 -37 30 -37h121c17 0 25 20 25 35v38c-6 20 -17 23 -27 23h-125c-7 0 -18 0 -24 -23zM34 -110v-22c2 -18 6 -37 30 -37h121c10 0 22 7 25 33v26c-1 18 -6 37 -27 37h-127c-17 -4 -21 -21 -22 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E90B-mensuralCclefPetrucciPosHighest.xml b/data/Bravura/E90B-mensuralCclefPetrucciPosHighest.xml
deleted file mode 100644
index 84bd301c826..00000000000
--- a/data/Bravura/E90B-mensuralCclefPetrucciPosHighest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E90B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 337c0 17 6 17 13 17h8c7 0 13 0 13 -17v-25c2 -18 6 -38 30 -38h116c25 0 28 10 30 28c0 17 6 17 13 17h9c6 0 12 0 12 -17v-837c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v227c-2 18 -5 37 -30 37h-121c-10 0 -22 -7 -25 -33v-474c0 -17 -6 -17 -13 -17h-8 c-7 0 -13 0 -13 17v1115zM34 -110v-36c6 -23 17 -23 24 -23h125c10 0 21 3 27 23v38c0 15 -8 35 -25 35h-121c-24 0 -28 -19 -30 -37zM34 137v-22c1 -16 5 -33 22 -37h127c21 0 26 19 27 37v26c-3 26 -15 33 -25 33h-121c-24 0 -28 -19 -30 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E910-mensuralProlation1.xml b/data/Bravura/E910-mensuralProlation1.xml
deleted file mode 100644
index b70ea906c21..00000000000
--- a/data/Bravura/E910-mensuralProlation1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E910" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M266 -266c-146 0 -265 120 -265 266c0 145 120 265 265 265c146 0 266 -119 266 -265c0 -147 -119 -266 -266 -266zM49 0c0 -119 97 -218 217 -218s218 98 218 218s-99 217 -218 217s-217 -98 -217 -217zM266 -63c-34 0 -62 28 -62 63c0 34 28 62 62 62 c35 0 63 -28 63 -62c0 -35 -28 -63 -63 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E911-mensuralProlation2.xml b/data/Bravura/E911-mensuralProlation2.xml
deleted file mode 100644
index 64f8f93e448..00000000000
--- a/data/Bravura/E911-mensuralProlation2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E911" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M266 -266c-146 0 -265 120 -265 266c0 145 120 265 265 265c146 0 266 -119 266 -265c0 -147 -119 -266 -266 -266zM49 0c0 -119 97 -218 217 -218s218 98 218 218s-99 217 -218 217s-217 -98 -217 -217z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E912-mensuralProlation3.xml b/data/Bravura/E912-mensuralProlation3.xml
deleted file mode 100644
index 7bc67e8aea5..00000000000
--- a/data/Bravura/E912-mensuralProlation3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E912" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 0c0 137 105 251 241 264v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75c136 -13 242 -126 242 -264s-105 -252 -242 -265v-91c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v91c-136 13 -241 128 -241 265zM290 216v-432c110 11 194 105 194 216s-84 203 -194 216zM49 0 c0 -110 83 -205 193 -216v432c-109 -13 -193 -105 -193 -216z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E913-mensuralProlation4.xml b/data/Bravura/E913-mensuralProlation4.xml
deleted file mode 100644
index 3b1c3ebe663..00000000000
--- a/data/Bravura/E913-mensuralProlation4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E913" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 -265c-136 13 -241 128 -241 265s105 251 241 264v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75c136 -13 242 -126 242 -264s-105 -252 -242 -265v-91c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v91zM289 -58v-158c110 11 194 105 194 216s-84 203 -194 216v-158 c23 -10 39 -32 39 -58s-16 -48 -39 -58zM241 216c-109 -13 -193 -105 -193 -216c0 -110 83 -205 193 -216v158c-22 10 -38 32 -38 58s16 48 38 58v158z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E914-mensuralProlation5.xml b/data/Bravura/E914-mensuralProlation5.xml
deleted file mode 100644
index c63f501bd54..00000000000
--- a/data/Bravura/E914-mensuralProlation5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E914" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M266 -266c-147 0 -266 119 -266 266c0 146 120 265 266 265c89 0 172 -45 221 -120c3 -4 5 -9 5 -14c0 -8 -4 -15 -11 -19c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11c-40 61 -108 98 -181 98c-119 0 -218 -97 -218 -217s98 -218 218 -218c75 0 145 39 184 103 c4 7 12 11 20 11c13 0 24 -12 24 -25c0 -4 -1 -8 -3 -12c-50 -78 -132 -125 -225 -125zM268 -63c-34 0 -62 28 -62 63c0 34 28 62 62 62c35 0 63 -28 63 -62c0 -35 -28 -63 -63 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E915-mensuralProlation6.xml b/data/Bravura/E915-mensuralProlation6.xml
deleted file mode 100644
index 21495dc2e5e..00000000000
--- a/data/Bravura/E915-mensuralProlation6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E915" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 146 120 265 266 265c89 0 172 -45 221 -120c3 -4 5 -9 5 -14c0 -8 -4 -15 -11 -19c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11c-40 61 -108 98 -181 98c-119 0 -218 -97 -218 -217s98 -218 218 -218c75 0 145 39 184 103c4 7 12 11 20 11c13 0 24 -12 24 -25 c0 -4 -1 -8 -3 -12c-50 -78 -132 -125 -225 -125c-147 0 -266 119 -266 266z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E916-mensuralProlation7.xml b/data/Bravura/E916-mensuralProlation7.xml
deleted file mode 100644
index 39af68686ce..00000000000
--- a/data/Bravura/E916-mensuralProlation7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E916" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-3 -112c0 8 4 15 12 20c4 3 9 4 13 4c8 0 16 -4 20 -11c39 -64 109 -103 184 -103c120 0 218 98 218 218s-99 217 -218 217c-73 0 -141 -37 -182 -98c-4 -7 -12 -11 -20 -11c-4 0 -9 1 -13 4c-7 4 -11 12 -11 20c0 4 1 9 4 13c50 75 133 120 222 120 c146 0 266 -119 266 -265c0 -147 -119 -266 -266 -266c-91 0 -177 47 -225 125c-2 4 -4 9 -4 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E917-mensuralProlation8.xml b/data/Bravura/E917-mensuralProlation8.xml
deleted file mode 100644
index fd81b4ea85b..00000000000
--- a/data/Bravura/E917-mensuralProlation8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E917" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 0c0 137 107 253 244 264v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75c80 -8 151 -51 195 -119c3 -4 5 -9 5 -14c0 -8 -4 -15 -11 -19c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11c-35 54 -92 89 -155 96v-157c23 -10 39 -32 39 -58s-16 -48 -39 -58v-158 c66 7 124 45 158 101c4 7 12 11 20 11c13 0 24 -12 24 -25c0 -4 -1 -8 -3 -12c-44 -68 -118 -116 -199 -123v-92c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v91c-138 11 -244 127 -244 265zM49 0c0 -111 85 -206 196 -217v159c-22 10 -38 32 -38 58s16 48 38 58v158 c-110 -11 -196 -105 -196 -216z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E918-mensuralProlation9.xml b/data/Bravura/E918-mensuralProlation9.xml
deleted file mode 100644
index c8e3828b5a0..00000000000
--- a/data/Bravura/E918-mensuralProlation9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E918" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M245 -265c-138 11 -244 127 -244 265c0 137 107 253 244 264v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75c80 -8 151 -51 195 -119c3 -4 5 -9 5 -14c0 -8 -4 -15 -11 -19c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11c-35 54 -92 89 -155 96v-431c66 7 124 45 158 101 c4 7 12 11 20 11c13 0 24 -12 24 -25c0 -4 -1 -8 -3 -12c-44 -68 -118 -116 -199 -123v-92c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v91zM245 216c-110 -11 -196 -105 -196 -216s85 -206 196 -217v433z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E919-mensuralProlation10.xml b/data/Bravura/E919-mensuralProlation10.xml
deleted file mode 100644
index 0f099556917..00000000000
--- a/data/Bravura/E919-mensuralProlation10.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E919" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -128c0 8 4 15 12 20c4 3 9 4 13 4c8 0 16 -4 20 -11c34 -55 92 -94 157 -101v431c-63 -7 -119 -42 -155 -96c-4 -7 -12 -11 -20 -11c-4 0 -9 1 -13 4c-7 4 -11 12 -11 20c0 4 1 9 4 13c45 68 116 111 195 119v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75 c137 -11 245 -126 245 -264c0 -139 -107 -254 -245 -265v-91c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v92c-80 7 -156 56 -198 123c-2 4 -4 9 -4 13zM250 216v-433c111 11 197 105 197 217s-86 205 -197 216z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91A-mensuralProlation11.xml b/data/Bravura/E91A-mensuralProlation11.xml
deleted file mode 100644
index ac3395d6220..00000000000
--- a/data/Bravura/E91A-mensuralProlation11.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -129c0 8 4 15 12 20c4 3 9 4 13 4c8 0 16 -4 20 -11c39 -64 109 -103 184 -103c120 0 218 98 218 218s-99 217 -218 217c-73 0 -141 -37 -182 -98c-4 -7 -12 -11 -20 -11c-4 0 -9 1 -13 4c-7 4 -11 12 -11 20c0 4 1 9 4 13c50 75 133 120 222 120 c146 0 266 -119 266 -265c0 -147 -119 -266 -266 -266c-91 0 -177 47 -225 125c-2 4 -4 9 -4 13zM164 -1c0 34 28 62 62 62c35 0 63 -28 63 -62c0 -35 -28 -63 -63 -63c-34 0 -62 28 -62 63z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91B-mensuralProportionTempusPerfectum.xml b/data/Bravura/E91B-mensuralProportionTempusPerfectum.xml
deleted file mode 100644
index 6bd4925a16d..00000000000
--- a/data/Bravura/E91B-mensuralProportionTempusPerfectum.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 -257c-5 5 -7 11 -7 17s2 12 7 17l58 59c-32 44 -49 98 -49 154c0 146 119 265 265 265c56 0 110 -17 155 -49l62 62c4 5 11 7 17 7s12 -2 17 -7c4 -5 7 -11 7 -17s-3 -12 -7 -17l-60 -60c48 -49 75 -115 75 -184c0 -147 -119 -266 -266 -266c-69 0 -134 27 -184 75 l-56 -56c-5 -4 -11 -7 -17 -7s-12 3 -17 7zM131 -167c40 -39 94 -61 150 -61c120 0 218 98 218 218c0 56 -22 110 -61 150zM281 207c-119 0 -217 -98 -217 -217c0 -43 13 -85 36 -120l301 301c-35 24 -76 36 -120 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91C-mensuralProportionProportioDupla1.xml b/data/Bravura/E91C-mensuralProportionProportioDupla1.xml
deleted file mode 100644
index 31368c1098c..00000000000
--- a/data/Bravura/E91C-mensuralProportionProportioDupla1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 13 11 24 24 24h83c13 137 126 241 264 241s252 -104 265 -241h83c13 0 24 -11 24 -24s-11 -24 -24 -24h-83c-13 -137 -127 -242 -265 -242s-251 106 -264 242h-83c-13 0 -24 11 -24 24zM587 -24h-432c13 -110 105 -194 216 -194s205 84 216 194zM155 24h432 c-11 110 -106 193 -216 193c-111 0 -203 -84 -216 -193z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91D-mensuralProportionProportioDupla2.xml b/data/Bravura/E91D-mensuralProportionProportioDupla2.xml
deleted file mode 100644
index 7ff93a1360a..00000000000
--- a/data/Bravura/E91D-mensuralProportionProportioDupla2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -245c0 6 3 12 8 17l69 69c-35 46 -54 101 -54 160c0 146 120 265 266 265c58 0 114 -19 159 -53l51 50c4 5 11 7 17 7s12 -2 17 -7c4 -5 7 -11 7 -17s-3 -12 -7 -17l-49 -49c9 -9 31 -34 31 -47c0 -8 -4 -16 -11 -20c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11 c-6 9 -13 18 -20 26l-307 -307c40 -36 91 -56 146 -56c75 0 145 39 184 103c4 7 12 11 20 11c13 0 24 -11 24 -24c0 -4 -1 -9 -3 -13c-50 -78 -132 -125 -225 -125c-68 0 -131 25 -180 70l-67 -67c-5 -4 -11 -7 -17 -7s-12 3 -17 7c-5 5 -8 11 -8 17zM71 1 c0 -46 14 -89 40 -126l303 303c-36 26 -80 40 -125 40c-119 0 -218 -97 -218 -217z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91E-mensuralProportionProportioTripla.xml b/data/Bravura/E91E-mensuralProportionProportioTripla.xml
deleted file mode 100644
index 90c3ad07e67..00000000000
--- a/data/Bravura/E91E-mensuralProportionProportioTripla.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -262c-5 4 -8 11 -8 17s3 12 8 17l69 69c-35 45 -54 101 -54 159c0 146 119 266 265 266c59 0 115 -19 160 -54l51 51c4 4 11 7 17 7s12 -3 17 -7c4 -5 7 -11 7 -17s-3 -13 -7 -17l-49 -49c9 -10 18 -22 26 -34c3 -4 4 -8 4 -13c0 -8 -4 -16 -11 -20 c-4 -3 -8 -4 -13 -4c-7 0 -15 4 -20 11c-6 9 -13 18 -20 26l-122 -122c3 -7 5 -15 5 -24c0 -34 -28 -62 -63 -62c-8 0 -16 2 -24 5l-103 -104c40 -36 91 -56 145 -56c75 0 145 39 185 102c5 8 12 12 20 12c4 0 9 -2 13 -4c7 -5 11 -13 11 -21c0 -4 -1 -8 -3 -12 c-51 -78 -132 -125 -226 -125c-67 0 -130 25 -179 70l-67 -67c-5 -5 -11 -7 -17 -7s-13 2 -17 7zM71 0c0 -45 14 -89 40 -125l101 102c-3 7 -4 15 -4 23c0 35 28 63 62 63c9 0 17 -2 24 -5l120 120c-36 26 -80 40 -126 40c-120 0 -217 -99 -217 -218z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91F-mensuralProportionProportioQuadrupla.xml b/data/Bravura/E91F-mensuralProportionProportioQuadrupla.xml
deleted file mode 100644
index a6cbeef07d2..00000000000
--- a/data/Bravura/E91F-mensuralProportionProportioQuadrupla.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -246c0 6 2 12 7 17l49 49c-11 12 -21 25 -30 39c-2 4 -3 9 -3 13c0 13 11 24 24 24c8 0 16 -4 20 -11c7 -11 15 -21 23 -31l307 307c-40 36 -91 56 -145 56c-74 0 -142 -37 -182 -98c-4 -7 -12 -11 -20 -11c-4 0 -9 1 -13 4c-7 4 -11 12 -11 20c0 4 1 9 4 13 c49 75 132 120 222 120c67 0 130 -25 179 -70l67 67c5 5 11 7 17 7c13 0 24 -11 24 -24c0 -6 -2 -12 -7 -17l-68 -69c34 -45 53 -101 53 -159c0 -146 -119 -266 -265 -266c-46 0 -91 12 -131 35c-10 5 -20 12 -29 19l-51 -51c-4 -5 -10 -7 -17 -7c-13 0 -24 11 -24 24z M429 125l-303 -303l19 -12c32 -18 69 -28 107 -28c120 0 217 99 217 218c0 45 -14 89 -40 125z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E920-mensuralProlationCombiningDot.xml b/data/Bravura/E920-mensuralProlationCombiningDot.xml
deleted file mode 100644
index b2b7f32cc97..00000000000
--- a/data/Bravura/E920-mensuralProlationCombiningDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E920" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M62 -63c-34 0 -62 28 -62 63c0 34 28 62 62 62c35 0 63 -28 63 -62c0 -35 -28 -63 -63 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E921-mensuralProlationCombiningTwoDots.xml b/data/Bravura/E921-mensuralProlationCombiningTwoDots.xml
deleted file mode 100644
index 10daa97645c..00000000000
--- a/data/Bravura/E921-mensuralProlationCombiningTwoDots.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E921" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M214 -52c-29 0 -52 24 -52 52c0 29 23 52 52 52s52 -23 52 -52c0 -28 -23 -52 -52 -52zM52 -52c-29 0 -52 24 -52 52c0 29 23 52 52 52s52 -23 52 -52c0 -28 -23 -52 -52 -52z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E922-mensuralProlationCombiningThreeDots.xml b/data/Bravura/E922-mensuralProlationCombiningThreeDots.xml
deleted file mode 100644
index ddc1d48cf1f..00000000000
--- a/data/Bravura/E922-mensuralProlationCombiningThreeDots.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E922" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M313 -49c-27 0 -49 22 -49 49s22 49 49 49s49 -22 49 -49s-22 -49 -49 -49zM132 0c0 27 22 49 49 49s49 -22 49 -49s-22 -49 -49 -49s-49 22 -49 49zM49 -49c-27 0 -49 22 -49 49s22 49 49 49s49 -22 49 -49s-22 -49 -49 -49z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E923-mensuralProlationCombiningThreeDotsTri.xml b/data/Bravura/E923-mensuralProlationCombiningThreeDotsTri.xml
deleted file mode 100644
index e20212bddaa..00000000000
--- a/data/Bravura/E923-mensuralProlationCombiningThreeDotsTri.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E923" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M214 22c-29 0 -52 24 -52 52c0 29 23 52 52 52s52 -23 52 -52c0 -28 -23 -52 -52 -52zM133 -125c-29 0 -52 23 -52 52c0 28 23 52 52 52s52 -24 52 -52c0 -29 -23 -52 -52 -52zM0 74c0 29 23 52 52 52s52 -23 52 -52c0 -28 -23 -52 -52 -52s-52 24 -52 52z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E924-mensuralProlationCombiningDotVoid.xml b/data/Bravura/E924-mensuralProlationCombiningDotVoid.xml
deleted file mode 100644
index 4760f97b1cb..00000000000
--- a/data/Bravura/E924-mensuralProlationCombiningDotVoid.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E924" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 89 73 162 162 162s162 -73 162 -162s-73 -162 -162 -162s-162 73 -162 162zM162 114c-63 0 -114 -51 -114 -114s51 -114 114 -114s114 51 114 114s-51 114 -114 114z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E925-mensuralProlationCombiningStroke.xml b/data/Bravura/E925-mensuralProlationCombiningStroke.xml
deleted file mode 100644
index 7c9e17a0a84..00000000000
--- a/data/Bravura/E925-mensuralProlationCombiningStroke.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E925" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 348c0 13 11 24 24 24c14 0 24 -11 24 -24v-695c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v695z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E938-mensuralNoteheadSemibrevisBlack.xml b/data/Bravura/E938-mensuralNoteheadSemibrevisBlack.xml
deleted file mode 100644
index 66b04fd719b..00000000000
--- a/data/Bravura/E938-mensuralNoteheadSemibrevisBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E938" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -1c0 4 2 9 5 12l125 125c3 3 7 5 12 5c4 0 8 -2 11 -5l125 -125c3 -3 4 -8 4 -12s-1 -8 -4 -11l-125 -125c-3 -3 -7 -4 -11 -4c-5 0 -9 1 -12 4l-125 125c-3 3 -5 7 -5 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E939-mensuralNoteheadSemibrevisVoid.xml b/data/Bravura/E939-mensuralNoteheadSemibrevisVoid.xml
deleted file mode 100644
index 4c484092074..00000000000
--- a/data/Bravura/E939-mensuralNoteheadSemibrevisVoid.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E939" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M6 -12c-4 3 -5 8 -5 12s1 8 5 11l125 125c3 3 7 5 11 5s8 -2 11 -5l125 -125c3 -3 5 -7 5 -11s-2 -9 -5 -12l-125 -125c-3 -3 -7 -4 -11 -4s-8 1 -11 4zM40 0l102 -103l102 103l-102 102z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E93C-mensuralNoteheadMinimaWhite.xml b/data/Bravura/E93C-mensuralNoteheadMinimaWhite.xml
deleted file mode 100644
index 165ff1341fc..00000000000
--- a/data/Bravura/E93C-mensuralNoteheadMinimaWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 2 1 4 2 7l152 174c2 2 4 3 8 4c3 0 6 -1 8 -4l148 -174c1 -2 2 -5 2 -7c0 -3 -1 -5 -2 -7l-148 -174c-2 -2 -5 -3 -8 -3s-6 1 -8 3l-152 174c-1 2 -2 3 -2 7zM140 118l-80 -91l125 -144l75 90z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E93D-mensuralNoteheadSemiminimaWhite.xml b/data/Bravura/E93D-mensuralNoteheadSemiminimaWhite.xml
deleted file mode 100644
index 727718414bc..00000000000
--- a/data/Bravura/E93D-mensuralNoteheadSemiminimaWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 2 0 4 2 7l152 174c2 2 4 3 8 4c3 0 6 -1 8 -4l148 -174c1 -2 2 -5 2 -7c0 -3 -1 -5 -2 -7l-148 -174c-2 -2 -5 -3 -8 -3s-6 1 -8 3l-152 174c-1 2 -2 3 -2 7z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E93E-mensuralCombStemUp.xml b/data/Bravura/E93E-mensuralCombStemUp.xml
deleted file mode 100644
index ad143028f30..00000000000
--- a/data/Bravura/E93E-mensuralCombStemUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 766c0 8 8 16 16 16c9 0 16 -8 16 -16v-750c0 -9 -7 -16 -16 -16c-8 0 -16 7 -16 16v750z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E93F-mensuralCombStemDown.xml b/data/Bravura/E93F-mensuralCombStemDown.xml
deleted file mode 100644
index 4d1353c1e53..00000000000
--- a/data/Bravura/E93F-mensuralCombStemDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -16c0 8 8 16 16 16c9 0 16 -8 16 -16v-750c0 -9 -7 -16 -16 -16c-8 0 -16 7 -16 16v750z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E949-mensuralCombStemUpFlagSemiminima.xml b/data/Bravura/E949-mensuralCombStemUpFlagSemiminima.xml
deleted file mode 100644
index f32c725ce98..00000000000
--- a/data/Bravura/E949-mensuralCombStemUpFlagSemiminima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E949" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 766c0 7 5 13 12 15c1 0 3 1 4 1c5 0 11 -3 14 -8l186 -302c2 -3 3 -6 3 -9c0 -5 -3 -10 -8 -13c-2 -2 -5 -2 -8 -2c-5 0 -11 2 -14 7l-157 254v-693c0 -9 -7 -16 -16 -16c-8 0 -16 7 -16 16v750z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E94A-mensuralCombStemDownFlagSemiminima.xml b/data/Bravura/E94A-mensuralCombStemDownFlagSemiminima.xml
deleted file mode 100644
index 0b894fe377f..00000000000
--- a/data/Bravura/E94A-mensuralCombStemDownFlagSemiminima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E94A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -766v750c0 9 8 16 16 16c9 0 16 -7 16 -16v-693l157 254c3 5 9 7 14 7c3 0 6 0 8 -2c5 -3 8 -8 8 -13c0 -3 -1 -6 -3 -9l-186 -302c-3 -5 -9 -8 -14 -8c-1 0 -3 1 -4 1c-7 2 -12 8 -12 15z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E94B-mensuralCombStemUpFlagFusa.xml b/data/Bravura/E94B-mensuralCombStemUpFlagFusa.xml
deleted file mode 100644
index 0cb11ed3331..00000000000
--- a/data/Bravura/E94B-mensuralCombStemUpFlagFusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E94B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 16v750c0 7 5 13 12 15c2 0 3 1 5 1c5 0 10 -3 13 -8l186 -302c2 -3 3 -6 3 -9c0 -5 -3 -10 -8 -13c-2 -1 -5 -2 -8 -2c-5 0 -11 2 -14 7l-157 255v-117l184 -295c2 -3 3 -6 3 -9c0 -5 -3 -10 -8 -13c-2 -2 -5 -3 -8 -3c-6 0 -11 3 -14 8l-157 251v-516 c0 -9 -7 -16 -16 -16c-8 0 -16 7 -16 16z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E94C-mensuralCombStemDownFlagFusa.xml b/data/Bravura/E94C-mensuralCombStemDownFlagFusa.xml
deleted file mode 100644
index b222a91fe52..00000000000
--- a/data/Bravura/E94C-mensuralCombStemDownFlagFusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E94C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -766v750c0 9 8 16 16 16c9 0 16 -7 16 -16v-516l157 251c3 5 8 8 14 8c3 0 6 -1 8 -3c5 -3 8 -8 8 -13c0 -3 -1 -6 -3 -9l-184 -295v-117l157 255c3 5 9 7 14 7c3 0 6 -1 8 -2c5 -3 8 -8 8 -13c0 -3 -1 -6 -3 -9l-186 -302c-3 -5 -8 -8 -13 -8c-2 0 -3 1 -5 1 c-7 2 -12 8 -12 15z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E990-chantPunctum.xml b/data/Bravura/E990-chantPunctum.xml
deleted file mode 100644
index bf7a2bae504..00000000000
--- a/data/Bravura/E990-chantPunctum.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E990" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -97v147c0 35 37 52 76 52c41 0 84 -19 84 -54v-145s0 -4 -2 -4c-1 0 -2 1 -5 4c-8 8 -32 20 -68 20h-5c-32 -1 -60 -13 -72 -20c-1 -2 -4 -4 -6 -4c-1 0 -2 0 -2 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E991-chantPunctumInclinatum.xml b/data/Bravura/E991-chantPunctumInclinatum.xml
deleted file mode 100644
index 657043b5ff5..00000000000
--- a/data/Bravura/E991-chantPunctumInclinatum.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E991" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 2 0 4 3 6c2 4 67 103 67 103c1 3 2 4 5 4c1 0 3 -1 6 -4c0 0 63 -97 67 -102c1 -2 2 -5 2 -7c0 -1 0 -2 -1 -5l-67 -101c-4 -4 -5 -7 -7 -7c-1 0 -4 3 -6 7l-67 100c-2 2 -2 5 -2 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E996-chantPunctumVirga.xml b/data/Bravura/E996-chantPunctumVirga.xml
deleted file mode 100644
index e486c8b45f8..00000000000
--- a/data/Bravura/E996-chantPunctumVirga.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E996" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -93c0 0 -4 6 -4 10v140c0 42 50 45 80 45h10c21 0 70 -4 70 -47v-448c0 -3 -2 -8 -7 -8h-5c-3 0 -7 5 -7 8v311c-12 7 -31 12 -56 12h-5c-38 -1 -70 -17 -76 -23z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E99B-chantQuilisma.xml b/data/Bravura/E99B-chantQuilisma.xml
deleted file mode 100644
index d42efce7448..00000000000
--- a/data/Bravura/E99B-chantQuilisma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E99B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 56c9 -32 21 -48 34 -48c12 0 19 24 21 72c6 -19 11 -32 15 -39c5 -9 11 -12 19 -12s14 21 19 66c9 -35 17 -53 23 -53c8 0 17 24 23 73v-153c0 -28 -5 -41 -15 -41c-7 0 -14 9 -20 27c-4 -33 -12 -50 -28 -50c-12 0 -25 11 -38 34c-7 -32 -17 -47 -28 -47 c-15 0 -25 19 -25 39v132z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E99E-chantOriscusLiquescens.xml b/data/Bravura/E99E-chantOriscusLiquescens.xml
deleted file mode 100644
index 5795c6c8908..00000000000
--- a/data/Bravura/E99E-chantOriscusLiquescens.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E99E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50v163c0 1 1 1 3 1c1 0 3 0 3 -1c1 -27 8 -47 29 -47c7 0 21 4 41 15c20 9 33 14 41 14c24 0 36 -15 36 -46v-123c0 -45 0 -81 -12 -111c-11 -28 -39 -50 -85 -61c-4 0 -8 3 -10 10c0 6 3 10 8 13c29 9 61 23 69 56c6 21 5 46 6 68c0 12 0 33 -18 33 c-5 0 -15 -5 -35 -15c-20 -11 -34 -16 -41 -16c-23 0 -35 16 -35 47z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E99F-chantStrophicus.xml b/data/Bravura/E99F-chantStrophicus.xml
deleted file mode 100644
index 1f3d0718c1b..00000000000
--- a/data/Bravura/E99F-chantStrophicus.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E99F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -1c0 2 0 3 2 5l56 86c1 2 2 3 4 3c1 0 3 -1 5 -3c8 -29 25 -54 46 -75c5 -5 11 -10 11 -17c0 -8 -23 -48 -29 -55c-7 -10 -21 -27 -32 -32c-1 -1 -7 -3 -10 -3c-1 0 -3 0 -3 1s1 2 2 3c4 4 5 8 5 12c0 9 -7 18 -13 25l-32 34c-4 4 -8 7 -11 11c-1 2 -1 4 -1 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B4-chantEntryLineAsc2nd.xml b/data/Bravura/E9B4-chantEntryLineAsc2nd.xml
deleted file mode 100644
index dc5db66fd16..00000000000
--- a/data/Bravura/E9B4-chantEntryLineAsc2nd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 150h14v-300h-14v300z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B5-chantEntryLineAsc3rd.xml b/data/Bravura/E9B5-chantEntryLineAsc3rd.xml
deleted file mode 100644
index 7c7f78e6038..00000000000
--- a/data/Bravura/E9B5-chantEntryLineAsc3rd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 300h14v-450h-14v450z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B6-chantEntryLineAsc4th.xml b/data/Bravura/E9B6-chantEntryLineAsc4th.xml
deleted file mode 100644
index 9268b60f958..00000000000
--- a/data/Bravura/E9B6-chantEntryLineAsc4th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 450h14v-600h-14v600z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B7-chantEntryLineAsc5th.xml b/data/Bravura/E9B7-chantEntryLineAsc5th.xml
deleted file mode 100644
index 9ec5423ad2a..00000000000
--- a/data/Bravura/E9B7-chantEntryLineAsc5th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 600h14v-750h-14v750z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B9-chantLigaturaDesc2nd.xml b/data/Bravura/E9B9-chantLigaturaDesc2nd.xml
deleted file mode 100644
index 3fd9361cfd3..00000000000
--- a/data/Bravura/E9B9-chantLigaturaDesc2nd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M436 -228c-178 0 -323 50 -436 149v183c45 -44 118 -92 220 -146c47 -25 108 -37 183 -37c33 0 53 16 62 46v-178c0 -11 -10 -17 -29 -17z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9BA-chantLigaturaDesc3rd.xml b/data/Bravura/E9BA-chantLigaturaDesc3rd.xml
deleted file mode 100644
index aee076b3fa1..00000000000
--- a/data/Bravura/E9BA-chantLigaturaDesc3rd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 104c111 -149 330 -328 519 -355h11c25 0 41 15 49 45v-176c0 -12 -9 -18 -27 -18c-78 0 -171 35 -279 103c-122 78 -213 151 -273 219v182z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9BB-chantLigaturaDesc4th.xml b/data/Bravura/E9BB-chantLigaturaDesc4th.xml
deleted file mode 100644
index 08278dd0b65..00000000000
--- a/data/Bravura/E9BB-chantLigaturaDesc4th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M274 -372c-75 64 -168 161 -274 293v183c105 -130 222 -254 342 -370c31 -29 154 -136 198 -136c18 0 31 12 39 46v-175c0 -15 -5 -22 -15 -22c-4 0 -8 1 -12 3c-76 25 -168 85 -278 178z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9BC-chantLigaturaDesc5th.xml b/data/Bravura/E9BC-chantLigaturaDesc5th.xml
deleted file mode 100644
index e6d74cb8aed..00000000000
--- a/data/Bravura/E9BC-chantLigaturaDesc5th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -78v182c46 -87 129 -188 234 -327c105 -141 196 -258 285 -328c9 -6 16 -8 22 -8c17 0 30 18 38 54v-177c0 -14 -5 -21 -13 -21c-4 0 -8 1 -14 3c-128 60 -311 268 -552 622z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9E0-medRenFlatSoftB.xml b/data/Bravura/E9E0-medRenFlatSoftB.xml
deleted file mode 100644
index 5aad7787c6c..00000000000
--- a/data/Bravura/E9E0-medRenFlatSoftB.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -54v431c0 13 2 36 18 36c12 -1 12 -18 12 -39c0 -20 -3 -362 -3 -362c0 -3 2 -9 11 -18c28 -33 74 -65 120 -65c6 0 28 2 28 35c0 37 -44 69 -76 86l-42 24s-9 1 -9 27v42c0 3 1 9 14 9c14 -1 50 -6 83 -26c32 -22 49 -38 49 -71v-200c0 -1 -2 -6 -14 -6 c-16 0 -110 5 -173 66c0 0 -11 8 -18 31z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9E1-medRenFlatHardB.xml b/data/Bravura/E9E1-medRenFlatHardB.xml
deleted file mode 100644
index 2e083d40a04..00000000000
--- a/data/Bravura/E9E1-medRenFlatHardB.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -141c-7 0 -12 6 -12 14v535c0 7 4 12 9 12h18c5 0 9 -5 9 -12v-270h141c5 0 9 -5 9 -12v-255c0 -6 -5 -12 -12 -12h-162zM36 -66h114v130h-114v-130z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9E2-medRenNatural.xml b/data/Bravura/E9E2-medRenNatural.xml
deleted file mode 100644
index 3840c1153ed..00000000000
--- a/data/Bravura/E9E2-medRenNatural.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -118c-6 2 -8 4 -10 10v359c4 1 8 2 10 2c4 0 8 -1 13 -2v-148c46 9 60 11 72 11c4 0 6 -4 7 -7v-355c0 -4 -3 -6 -7 -6c-1 0 -6 1 -14 4c1 2 1 34 1 99v45zM22 49c-1 0 -1 -37 -1 -111l63 10v111z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9E3-medRenSharpCroix.xml b/data/Bravura/E9E3-medRenSharpCroix.xml
deleted file mode 100644
index b860f0b45ca..00000000000
--- a/data/Bravura/E9E3-medRenSharpCroix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -136c-2 3 -3 6 -3 9c0 5 2 10 6 14l135 113l-135 113c-4 4 -6 9 -6 14c0 3 1 6 3 9c3 4 7 6 11 6c3 0 6 -1 9 -3l141 -119l27 23l-85 70c-4 4 -6 9 -6 14c0 3 1 6 3 9c3 4 7 6 11 6c3 0 6 -1 9 -3l92 -77l92 77c2 2 5 3 8 3c4 0 9 -2 11 -6c3 -3 4 -7 4 -10 c0 -5 -3 -10 -6 -13l-85 -71l25 -22l143 119c2 2 5 3 8 3c4 0 9 -2 11 -6c3 -3 4 -7 4 -10c0 -5 -3 -10 -6 -13l-135 -113l135 -113c3 -3 6 -8 6 -13c0 -3 -1 -7 -4 -10c-2 -4 -7 -6 -11 -6c-3 0 -6 1 -8 3l-143 119l-25 -21l85 -72c3 -3 6 -8 6 -13c0 -3 -1 -7 -4 -10 c-2 -4 -7 -6 -11 -6c-3 0 -6 1 -8 3l-92 78l-92 -78c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -12 6c-2 3 -3 6 -3 9c0 5 2 10 6 14l85 71l-27 22l-141 -119c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -12 6zM215 22l-26 -22l26 -21l26 21z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F0-mensuralRestMaxima.xml b/data/Bravura/E9F0-mensuralRestMaxima.xml
deleted file mode 100644
index 4c20092e8a0..00000000000
--- a/data/Bravura/E9F0-mensuralRestMaxima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 484c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-968c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v968zM16 -500c-9 0 -16 7 -16 16v968c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-968c0 -9 -7 -16 -16 -16h-16z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F1-mensuralRestLongaPerfecta.xml b/data/Bravura/E9F1-mensuralRestLongaPerfecta.xml
deleted file mode 100644
index 7838423de84..00000000000
--- a/data/Bravura/E9F1-mensuralRestLongaPerfecta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 484c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-968c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v968z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F2-mensuralRestLongaImperfecta.xml b/data/Bravura/E9F2-mensuralRestLongaImperfecta.xml
deleted file mode 100644
index 74ce1e94d89..00000000000
--- a/data/Bravura/E9F2-mensuralRestLongaImperfecta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-468c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v468z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F3-mensuralRestBrevis.xml b/data/Bravura/E9F3-mensuralRestBrevis.xml
deleted file mode 100644
index 7e26de29165..00000000000
--- a/data/Bravura/E9F3-mensuralRestBrevis.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-218c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v218z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F4-mensuralRestSemibrevis.xml b/data/Bravura/E9F4-mensuralRestSemibrevis.xml
deleted file mode 100644
index 8f8b8cf224d..00000000000
--- a/data/Bravura/E9F4-mensuralRestSemibrevis.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-93c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v93z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F5-mensuralRestMinima.xml b/data/Bravura/E9F5-mensuralRestMinima.xml
deleted file mode 100644
index 9e5d520607d..00000000000
--- a/data/Bravura/E9F5-mensuralRestMinima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 109c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-93c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v93z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F6-mensuralRestSemiminima.xml b/data/Bravura/E9F6-mensuralRestSemiminima.xml
deleted file mode 100644
index 7fe3c3e1677..00000000000
--- a/data/Bravura/E9F6-mensuralRestSemiminima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 16v133c0 9 7 16 16 16h19c1 0 3 0 4 -1l89 -29c7 -2 11 -9 11 -16c0 -1 -1 -3 -1 -4l-5 -16c-2 -6 -9 -11 -16 -11c-2 0 -3 0 -5 1l-64 22v-95c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F7-mensuralRestFusa.xml b/data/Bravura/E9F7-mensuralRestFusa.xml
deleted file mode 100644
index 076913e2b61..00000000000
--- a/data/Bravura/E9F7-mensuralRestFusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 119c0 7 4 14 11 16l89 29c1 1 3 1 4 1h19c9 0 16 -7 16 -16v-133c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v95l-64 -22c-2 -1 -3 -1 -5 -1c-7 0 -14 5 -16 11l-5 16c0 1 -1 3 -1 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F8-mensuralRestSemifusa.xml b/data/Bravura/E9F8-mensuralRestSemifusa.xml
deleted file mode 100644
index aa4fb9522c8..00000000000
--- a/data/Bravura/E9F8-mensuralRestSemifusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 39c-1 2 -1 3 -1 5c0 6 4 13 11 15l79 26v26l-64 -22c-2 -1 -3 -1 -5 -1c-7 0 -13 5 -15 11l-5 16c-1 2 -1 3 -1 5c0 6 4 13 11 15l88 29c1 1 2 1 7 1h16c9 0 16 -7 16 -16v-133c0 -9 -7 -16 -16 -16h-16c-8 0 -16 7 -16 16v19l-64 -22c-2 -1 -3 -1 -5 -1 c-7 0 -13 5 -15 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EA02-mensuralCustosUp.xml b/data/Bravura/EA02-mensuralCustosUp.xml
deleted file mode 100644
index 7338e1a2743..00000000000
--- a/data/Bravura/EA02-mensuralCustosUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EA02" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 52c0 7 5 17 9 23l27 43c20 32 40 64 61 96c5 8 10 18 17 25c5 7 8 9 13 9c7 -1 21 -4 21 -14c5 -9 56 -92 62 -100c3 -5 7 -10 12 -10c4 0 9 3 14 10c9 11 59 98 67 107c4 5 9 7 14 7s9 -2 14 -7c10 -11 52 -100 58 -109l6 -9c1 -2 2 -4 3 -4c2 0 5 3 10 10 c0 1 1 1 4 4c12 15 155 257 163 267c5 5 17 11 18 11c9 0 20 -10 20 -19c0 -3 -1 -7 -3 -10c-10 -15 -223 -368 -230 -376c-3 -4 -9 -6 -16 -6c-6 0 -11 1 -16 6c-10 10 -61 90 -66 96c-3 5 -5 8 -8 8c-2 0 -5 -2 -9 -6c-7 -8 -69 -91 -74 -98c-3 -3 -9 -5 -14 -5 c-6 0 -11 2 -14 7l-64 94c-4 8 -7 12 -11 12s-9 -5 -16 -13c-10 -11 -19 -23 -28 -35c-8 -10 -19 -24 -30 -24s-14 4 -14 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EA06-chantCustosStemUpPosMiddle.xml b/data/Bravura/EA06-chantCustosStemUpPosMiddle.xml
deleted file mode 100644
index 1a5de6c4d7b..00000000000
--- a/data/Bravura/EA06-chantCustosStemUpPosMiddle.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EA06" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -59v150c0 5 0 9 2 9s3 -1 5 -4c6 -7 22 -11 39 -12v225c0 3 2 6 9 6c3 0 5 -3 5 -6v-405c0 -2 -2 -5 -5 -5h-5c-25 2 -50 15 -50 42z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAA4-wiggleTrill.xml b/data/Bravura/EAA4-wiggleTrill.xml
deleted file mode 100644
index 039200accf8..00000000000
--- a/data/Bravura/EAA4-wiggleTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-36 127c0 6 4 14 13 24l20 18c31 25 65 40 87 40c70 0 71 -53 123 -53c8 0 17 4 21 6c14 11 27 17 35 17c2 0 3 0 4 -1c2 -1 3 -3 3 -5c0 -7 -8 -19 -20 -31c-38 -34 -74 -44 -95 -44c-71 0 -72 53 -124 53c-6 0 -14 -3 -18 -6c-10 -10 -27 -24 -43 -24c-4 0 -6 2 -6 6z " /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAA9-wiggleArpeggiatoUp.xml b/data/Bravura/EAA9-wiggleArpeggiatoUp.xml
deleted file mode 100644
index 8e4808e96f8..00000000000
--- a/data/Bravura/EAA9-wiggleArpeggiatoUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-20 29c-7 0 -13 3 -13 8c0 3 2 6 6 10c17 16 38 72 117 72c27 0 55 -13 77 -23c17 -7 34 -18 54 -21c4 -1 8 -1 11 -1c13 0 23 7 36 16c4 3 12 7 18 7c3 0 6 -2 6 -5c0 -1 0 -2 -1 -4c-6 -16 -40 -88 -119 -88c-78 0 -88 44 -133 44c-19 0 -31 -5 -46 -12 c-4 -2 -9 -3 -13 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAAA-wiggleArpeggiatoDown.xml b/data/Bravura/EAAA-wiggleArpeggiatoDown.xml
deleted file mode 100644
index 865fb398af6..00000000000
--- a/data/Bravura/EAAA-wiggleArpeggiatoDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-33 92c0 3 3 5 6 5c6 0 14 -4 18 -7c13 -9 23 -16 36 -16c3 0 7 0 11 1c20 3 37 14 54 21c22 10 50 23 77 23c79 0 100 -56 117 -72c4 -4 6 -7 6 -10c0 -5 -6 -8 -13 -8c-4 0 -9 1 -13 3c-15 7 -27 12 -46 12c-45 0 -55 -44 -133 -44c-79 0 -113 72 -119 88 c-1 2 -1 3 -1 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAAD-wiggleArpeggiatoUpArrow.xml b/data/Bravura/EAAD-wiggleArpeggiatoUpArrow.xml
deleted file mode 100644
index 91f645779c2..00000000000
--- a/data/Bravura/EAAD-wiggleArpeggiatoUpArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 2c-3 0 -6 2 -6 5c0 1 0 2 1 4c6 16 41 79 120 79c77 0 139 -44 185 -44h18c-3 48 -18 92 -36 109l275 -113l-275 -122c23 22 33 54 36 89c-31 -6 -62 -9 -95 -9c-58 0 -96 22 -145 29c-3 0 -5 1 -8 1c-20 0 -40 -12 -52 -21c-4 -3 -12 -7 -18 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAAE-wiggleArpeggiatoDownArrow.xml b/data/Bravura/EAAE-wiggleArpeggiatoDownArrow.xml
deleted file mode 100644
index 0115ceadd54..00000000000
--- a/data/Bravura/EAAE-wiggleArpeggiatoDownArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 -65l-275 122l275 113c-18 -17 -33 -61 -36 -109h18c46 0 108 44 185 44c79 0 114 -63 120 -79c1 -2 1 -3 1 -4c0 -3 -3 -5 -6 -5c-6 0 -14 4 -18 7c-12 9 -32 21 -52 21c-3 0 -5 -1 -8 -1c-49 -7 -87 -29 -145 -29c-33 0 -64 3 -95 9c3 -35 13 -67 36 -89z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAAF-wiggleGlissando.xml b/data/Bravura/EAAF-wiggleGlissando.xml
deleted file mode 100644
index 520e0c96dd9..00000000000
--- a/data/Bravura/EAAF-wiggleGlissando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-25 29c0 6 4 14 13 24l20 18c31 25 65 40 87 40c70 0 71 -53 123 -53c8 0 17 4 21 6c14 11 27 17 35 17c2 0 3 0 4 -1c2 -1 3 -3 3 -5c0 -7 -8 -19 -20 -31c-38 -34 -74 -44 -95 -44c-71 0 -72 53 -124 53c-6 0 -14 -3 -18 -6c-10 -10 -27 -24 -43 -24c-4 0 -6 2 -6 6z " /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBA7-luteDurationWhole.xml b/data/Bravura/EBA7-luteDurationWhole.xml
deleted file mode 100644
index c686cfb6ddb..00000000000
--- a/data/Bravura/EBA7-luteDurationWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBA7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 772c0 10 8 18 18 18s18 -8 18 -18v-754c0 -10 -8 -18 -18 -18s-18 8 -18 18v754z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBA8-luteDurationHalf.xml b/data/Bravura/EBA8-luteDurationHalf.xml
deleted file mode 100644
index 073260463ce..00000000000
--- a/data/Bravura/EBA8-luteDurationHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBA8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18v750c0 10 8 18 18 18c4 0 9 -2 12 -5l191 -160c4 -3 7 -9 7 -14c0 -4 -2 -8 -5 -11c-3 -5 -8 -7 -13 -7s-9 2 -12 4l-162 136v-711c0 -10 -8 -18 -18 -18s-18 8 -18 18z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBA9-luteDurationQuarter.xml b/data/Bravura/EBA9-luteDurationQuarter.xml
deleted file mode 100644
index a4848a8ec5b..00000000000
--- a/data/Bravura/EBA9-luteDurationQuarter.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18v750c0 10 8 18 18 18c4 0 9 -2 12 -5l191 -160c4 -3 7 -9 7 -14c0 -4 -2 -8 -5 -11c-3 -5 -8 -7 -13 -7s-9 2 -12 4l-162 136v-102l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-562c0 -10 -8 -18 -18 -18s-18 8 -18 18z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBAA-luteDuration8th.xml b/data/Bravura/EBAA-luteDuration8th.xml
deleted file mode 100644
index f22cf9a7433..00000000000
--- a/data/Bravura/EBAA-luteDuration8th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18v750c0 10 8 18 18 18c5 0 9 -2 12 -5l192 -160c4 -3 6 -9 6 -14c0 -4 -1 -8 -4 -11c-4 -5 -9 -7 -14 -7c-4 0 -8 2 -12 4l-162 136v-102l186 -156c4 -3 6 -8 6 -13c0 -4 -1 -8 -4 -12c-4 -4 -9 -6 -14 -6c-4 0 -8 1 -12 4l-162 136v-103l186 -156c4 -3 6 -8 6 -13 c0 -4 -1 -8 -4 -12c-4 -4 -9 -6 -14 -6c-4 0 -8 1 -12 4l-162 136v-412c0 -10 -8 -18 -18 -18s-18 8 -18 18z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBAB-luteDuration16th.xml b/data/Bravura/EBAB-luteDuration16th.xml
deleted file mode 100644
index a80d9d55e46..00000000000
--- a/data/Bravura/EBAB-luteDuration16th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBAB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18v750c0 10 8 18 18 18c4 0 9 -2 12 -5l191 -160c4 -3 7 -9 7 -14c0 -4 -2 -8 -5 -11c-3 -5 -8 -7 -13 -7s-9 2 -12 4l-162 136v-102l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-103l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18 c-5 0 -9 1 -12 4l-162 136v-103l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-262c0 -10 -8 -18 -18 -18s-18 8 -18 18z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBAC-luteDuration32nd.xml b/data/Bravura/EBAC-luteDuration32nd.xml
deleted file mode 100644
index 6b8f4ab23dc..00000000000
--- a/data/Bravura/EBAC-luteDuration32nd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBAC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 768c0 10 8 18 18 18c4 0 9 -2 12 -5l191 -160c4 -3 7 -9 7 -14c0 -4 -2 -8 -5 -11c-3 -5 -8 -7 -13 -7s-9 2 -12 4l-162 136v-102l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-103l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18 c-5 0 -9 1 -12 4l-162 136v-103l185 -155c4 -4 7 -9 7 -14c0 -4 -2 -9 -5 -12c-3 -4 -8 -6 -13 -6s-9 1 -12 4l-162 136v-102l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-113c0 -10 -8 -18 -18 -18s-18 8 -18 18v750z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC0-luteFrenchFretA.xml b/data/Bravura/EBC0-luteFrenchFretA.xml
deleted file mode 100644
index 1befe6ef5da..00000000000
--- a/data/Bravura/EBC0-luteFrenchFretA.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 25c-8 11 -11 24 -11 38c0 40 27 91 58 128c35 41 63 51 115 51c15 0 29 -1 32 -1c17 -1 30 -4 30 -13c-1 -7 -22 -113 -22 -149c0 -7 1 -12 3 -12c13 0 38 22 43 25c3 1 6 2 9 2c4 0 8 -1 8 -8c0 -3 -1 -8 -3 -13c-9 -25 -31 -73 -84 -73c-35 0 -50 20 -50 52 c0 2 0 5 -1 5s-2 0 -3 -2c-32 -42 -59 -54 -79 -54c-29 0 -45 24 -45 24zM54 101c0 -24 8 -43 27 -43c28 0 54 13 62 43c7 27 14 67 17 78c0 2 -1 3 -3 3h-42c-27 0 -35 -5 -44 -18c-11 -17 -17 -42 -17 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC1-luteFrenchFretB.xml b/data/Bravura/EBC1-luteFrenchFretB.xml
deleted file mode 100644
index ce47f07443a..00000000000
--- a/data/Bravura/EBC1-luteFrenchFretB.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 262v5c0 2 1 3 3 5c11 6 40 24 43 26c4 2 7 2 9 2l23 -6c4 -2 6 -5 6 -8c-3 -22 -13 -118 -13 -122c0 -1 -1 -2 -1 -3c0 -3 3 -3 6 -3c20 8 55 22 71 27c7 2 16 4 25 4c21 0 45 -9 47 -37v-9c0 -39 -19 -87 -87 -126c-23 -13 -42 -17 -57 -17c-28 0 -44 16 -52 26 c-2 3 -5 9 -5 15v207c-1 5 -2 8 -8 10l-6 2c-2 0 -4 1 -4 2zM67 121c-1 -7 -3 -22 -4 -41c0 -19 22 -39 48 -39c36 0 59 29 59 64c0 4 -1 9 -1 14c-2 23 -20 31 -33 31c-3 0 -6 0 -8 -1c-12 -4 -42 -15 -56 -21c-2 0 -5 -3 -5 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC2-luteFrenchFretC.xml b/data/Bravura/EBC2-luteFrenchFretC.xml
deleted file mode 100644
index a41e93abe90..00000000000
--- a/data/Bravura/EBC2-luteFrenchFretC.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 100c0 40 18 90 65 144c3 4 6 6 11 7c6 0 170 13 208 15c1 0 7 -5 7 -9c0 -13 -28 -55 -28 -55c-2 -3 -8 -7 -13 -7c-35 -1 -168 -2 -172 -2c-5 0 -8 -3 -9 -5c-13 -15 -21 -37 -21 -59c0 -32 18 -62 67 -62c0 0 52 0 86 40c1 2 3 3 6 3l10 -5c1 -1 2 -4 2 -8 c-6 -21 -30 -96 -111 -96h-8c-57 4 -97 39 -100 93v6z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC3-luteFrenchFretD.xml b/data/Bravura/EBC3-luteFrenchFretD.xml
deleted file mode 100644
index 300f5b76c31..00000000000
--- a/data/Bravura/EBC3-luteFrenchFretD.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 206c0 12 8 25 27 38c1 1 2 1 3 1c9 0 15 -27 50 -27h5c27 2 75 3 123 3c56 0 112 -1 141 -3c24 -1 80 -18 80 -54s-34 -164 -170 -164c-29 0 -57 32 -57 58c2 29 40 80 56 93c4 3 5 6 5 7c0 2 -3 2 -7 2h-191c-29 0 -65 20 -65 46zM295 158c-10 -2 -40 -41 -40 -70 c0 -19 13 -34 51 -34h7c51 3 75 32 75 59c0 25 -21 49 -62 49c-9 0 -20 -1 -31 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC4-luteFrenchFretE.xml b/data/Bravura/EBC4-luteFrenchFretE.xml
deleted file mode 100644
index 0f1fce7fe90..00000000000
--- a/data/Bravura/EBC4-luteFrenchFretE.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 103c0 31 23 67 42 88c26 30 62 47 102 47c25 0 47 -17 47 -39c0 -9 -4 -20 -14 -30c0 0 -53 -50 -70 -64c-6 -5 -8 -13 -8 -21s2 -17 7 -22c16 -18 37 -26 82 -26c63 0 79 49 81 60c1 10 19 18 29 18c10 -1 15 -6 15 -15c0 -3 0 -7 -2 -11c-24 -60 -89 -88 -152 -88 c-39 0 -94 14 -123 38c-14 12 -33 39 -36 58v7zM59 144c0 -5 2 -10 4 -15c3 -5 5 -12 8 -19c1 -1 2 -2 4 -2c1 0 3 0 5 2c5 3 47 43 47 43c4 2 6 7 6 12c0 11 -9 26 -23 26c-3 0 -5 -1 -8 -2c-22 -9 -43 -24 -43 -45z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC5-luteFrenchFretF.xml b/data/Bravura/EBC5-luteFrenchFretF.xml
deleted file mode 100644
index 62d504fbeef..00000000000
--- a/data/Bravura/EBC5-luteFrenchFretF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 12c0 1 -1 2 -1 3c0 10 21 31 31 31c1 0 2 0 3 -1c7 -5 22 -24 38 -24c4 0 7 1 11 3c19 11 23 51 23 91c-32 0 -54 1 -57 1s-7 5 -7 6c0 13 32 32 41 32c3 1 8 3 22 4c-1 22 -4 37 -4 46c0 50 53 60 92 60c19 0 33 -2 37 -3c11 -3 21 -11 21 -22c-3 -9 -10 -12 -18 -12 c-16 0 -37 11 -49 15c-6 2 -11 2 -15 2c-13 0 -16 -8 -16 -25c0 -11 2 -34 4 -57c12 1 23 1 29 1h5c7 -2 13 -8 13 -14c0 -1 0 -3 -1 -4c-4 -7 -18 -22 -18 -22c-6 -6 -7 -7 -16 -8h-11c-6 -92 -67 -115 -111 -115c-23 0 -42 6 -46 12z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC6-luteFrenchFretG.xml b/data/Bravura/EBC6-luteFrenchFretG.xml
deleted file mode 100644
index 9092db8dcb2..00000000000
--- a/data/Bravura/EBC6-luteFrenchFretG.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 148c0 26 24 73 33 77c3 1 8 2 12 2c9 0 18 -3 18 -14v-9c0 -57 4 -179 136 -179c49 0 102 30 108 100c-30 -24 -64 -44 -90 -44c-7 0 -14 1 -20 5c-21 12 -28 30 -28 49c0 35 24 73 28 78c5 8 14 14 24 14l67 6c-1 5 -3 9 -5 14c-2 6 -3 11 -3 15c0 14 9 21 17 21 s41 -3 58 -43l36 3c7 -1 13 -3 13 -10c0 -3 -1 -8 -5 -14c-3 -5 -16 -20 -33 -38c-4 -102 -110 -181 -208 -181c-78 0 -128 58 -157 139c-1 3 -1 6 -1 9zM204 164c0 -15 37 -26 53 -28h5c16 0 36 14 38 32c0 18 -38 20 -57 21h-8c-15 0 -25 0 -31 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC7-luteFrenchFretH.xml b/data/Bravura/EBC7-luteFrenchFretH.xml
deleted file mode 100644
index 1ba8656085b..00000000000
--- a/data/Bravura/EBC7-luteFrenchFretH.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 260c0 4 2 7 8 9c14 4 58 21 68 21c9 0 16 -12 19 -21c2 -5 3 -16 3 -37c0 -15 0 -37 -3 -65c22 21 56 36 85 36c30 0 54 -16 54 -60c0 -51 -29 -143 -89 -143c-12 0 -22 4 -27 6c-3 1 -3 3 -3 5c0 6 14 44 22 44c1 0 2 -1 3 -1c10 -8 19 -12 27 -12c22 0 29 27 29 45 c0 35 -26 85 -54 85c-30 0 -48 -52 -54 -75l-9 -61c0 -3 -2 -4 -3 -4c-5 0 -15 15 -15 15c-1 21 -5 159 -5 168s-4 24 -46 33c-6 1 -10 7 -10 12z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC8-luteFrenchFretI.xml b/data/Bravura/EBC8-luteFrenchFretI.xml
deleted file mode 100644
index 8e8854e8ccb..00000000000
--- a/data/Bravura/EBC8-luteFrenchFretI.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 161c-4 1 -6 6 -7 9c0 3 1 6 2 10c4 9 79 41 87 43c5 0 9 -4 10 -11l-4 -148c0 -5 6 -15 7 -15c3 0 7 5 16 5c3 -1 6 -4 6 -7v-4c-1 -4 -3 -7 -6 -9c-2 -1 -33 -23 -56 -33c-4 0 -7 5 -8 10c0 5 -5 99 -7 135c-1 10 -15 18 -25 18c-7 0 -11 -3 -15 -3zM37 280 c0 1 1 2 2 3c7 6 23 20 25 21s4 2 6 2h24c3 -1 5 -1 6 -4c2 -4 3 -8 3 -12c0 -19 -17 -39 -28 -45c0 -1 -2 -1 -6 -1s-10 3 -10 7c0 1 0 2 1 3c2 2 3 5 3 7c0 10 -26 17 -26 19z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC9-luteFrenchFretK.xml b/data/Bravura/EBC9-luteFrenchFretK.xml
deleted file mode 100644
index 4fb9a7c7608..00000000000
--- a/data/Bravura/EBC9-luteFrenchFretK.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 258c-6 1 -10 7 -10 12c0 4 2 7 8 9c14 4 58 21 68 21c9 0 16 -12 19 -21c2 -5 3 -16 3 -37c0 -15 0 -37 -3 -65c30 28 71 60 95 60c12 0 19 -7 19 -26c0 -55 -38 -90 -92 -95c13 -6 24 -13 29 -18c20 -20 35 -57 47 -57c1 0 2 0 3 1c7 5 11 7 14 7c2 0 3 -1 3 -3 s0 -4 -1 -6c-3 -8 -30 -39 -48 -39c-4 0 -7 1 -10 5c-10 14 -41 60 -68 90l-7 -50c0 -3 -2 -4 -3 -4c-5 0 -15 15 -15 15c0 22 -4 65 -4 65c-7 3 -10 6 -10 8c0 5 6 7 11 8l-2 87c0 9 -4 24 -46 33zM160 193c-25 0 -51 -36 -60 -55c7 -4 16 -7 24 -7c19 0 37 13 43 36 c2 6 2 10 2 14c0 8 -3 12 -9 12z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBCA-luteFrenchFretL.xml b/data/Bravura/EBCA-luteFrenchFretL.xml
deleted file mode 100644
index 58c02fc570f..00000000000
--- a/data/Bravura/EBCA-luteFrenchFretL.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBCA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 0c-40 0 -41 73 -41 94v152c0 25 55 50 76 50c22 0 37 -15 37 -52c0 -64 -45 -115 -64 -142v-40c0 -11 6 -15 14 -15c17 0 45 17 50 21c2 3 6 4 10 4s8 -2 8 -5c0 -1 -1 -3 -3 -5c-40 -46 -68 -62 -87 -62zM49 244v-115c22 26 29 68 29 93c0 10 -1 18 -3 20 c-4 5 -8 8 -13 8c-4 0 -9 -2 -13 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBCB-luteFrenchFretM.xml b/data/Bravura/EBCB-luteFrenchFretM.xml
deleted file mode 100644
index e512c7dfbe5..00000000000
--- a/data/Bravura/EBCB-luteFrenchFretM.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBCB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 5 3 10 11 12c19 6 79 29 93 29c15 0 29 -28 29 -42c0 -4 -1 -10 -2 -21c17 30 41 46 62 46c24 0 45 -19 50 -59c19 45 49 64 78 64c46 0 90 -48 90 -125c0 -64 -25 -138 -101 -138c-16 0 -30 3 -38 7c-3 1 -4 7 -4 8c0 13 20 53 24 56c2 2 4 3 6 3s3 -1 4 -1 c13 -11 24 -17 33 -17c28 0 36 56 36 78c0 43 -16 90 -47 90c-5 0 -10 -1 -16 -4c-38 -17 -49 -120 -52 -147c0 -2 -1 -4 -1 -5c-1 -8 -8 -11 -15 -11c-9 0 -19 5 -19 13v17c0 39 -2 128 -43 128c-33 0 -47 -54 -56 -89l-2 -9c-3 -26 -7 -53 -12 -84c-1 -4 -2 -5 -4 -5 c-7 0 -21 20 -21 20c-1 29 -6 114 -6 126s-6 32 -63 43c-8 2 -14 10 -14 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBCC-luteFrenchFretN.xml b/data/Bravura/EBCC-luteFrenchFretN.xml
deleted file mode 100644
index 5df80d67025..00000000000
--- a/data/Bravura/EBCC-luteFrenchFretN.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBCC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 261c0 5 3 10 11 12c19 6 79 29 93 29c18 0 29 -31 29 -47c0 -4 -1 -15 -2 -26c29 29 75 50 115 50c41 0 75 -23 75 -83c0 -69 -40 -196 -121 -196c-17 0 -31 6 -38 9c-3 1 -4 7 -4 8c0 13 20 53 24 56c2 2 4 3 6 3s3 -1 4 -1c13 -11 25 -17 36 -17c28 0 41 38 41 62 c0 48 -35 116 -74 116c-42 0 -66 -70 -75 -102c-3 -26 -7 -53 -12 -84c-1 -4 -2 -5 -4 -5c-7 0 -20 20 -20 20c-2 29 -7 136 -7 148s-6 20 -63 31c-8 2 -14 10 -14 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE0-luteItalianFret0.xml b/data/Bravura/EBE0-luteItalianFret0.xml
deleted file mode 100644
index fa16c10ca9b..00000000000
--- a/data/Bravura/EBE0-luteItalianFret0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 -1c-71 0 -128 68 -128 150c0 83 57 151 128 151c72 0 129 -68 129 -151c0 -82 -57 -150 -129 -150zM96 154c0 -70 31 -128 56 -128s57 58 57 128c0 71 -32 127 -57 127s-56 -56 -56 -127z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE1-luteItalianFret1.xml b/data/Bravura/EBE1-luteItalianFret1.xml
deleted file mode 100644
index c6c59044704..00000000000
--- a/data/Bravura/EBE1-luteItalianFret1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 154c0 3 1 8 1 8l36 126c4 5 10 12 15 12c9 -2 11 -2 23 -2c7 0 14 2 23 2c8 0 11 -5 11 -14v-246c0 -10 11 -21 19 -21c10 0 10 -10 10 -10s0 -9 -10 -9h-99c-9 0 -15 2 -15 9c0 8 6 10 10 10c12 0 24 8 24 22v169c0 4 -1 9 -4 9c-1 0 -3 -2 -5 -6 c-8 -12 -22 -61 -23 -64c-1 -1 -3 -5 -7 -5c-1 0 -3 1 -6 3c-2 1 -3 3 -3 7z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE2-luteItalianFret2.xml b/data/Bravura/EBE2-luteItalianFret2.xml
deleted file mode 100644
index 5146ef08065..00000000000
--- a/data/Bravura/EBE2-luteItalianFret2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 20c10 38 33 72 66 92c30 19 69 29 90 56c12 17 19 37 19 58c0 14 -19 60 -75 60c-35 0 -47 -14 -47 -22c0 -12 30 -14 30 -42c0 -13 -4 -41 -34 -41c-16 0 -32 11 -39 25c-3 10 -7 20 -7 28c0 10 4 19 12 29c30 34 66 38 108 38c13 0 58 -4 89 -29 c15 -14 27 -33 27 -61c0 -45 -36 -72 -78 -77c-13 -4 -75 -34 -88 -56c7 2 14 4 23 4c23 0 52 -10 63 -15l18 -6c3 -1 5 -1 7 -1c18 0 31 22 37 38c1 4 4 7 8 7s7 -1 7 -9c-9 -91 -55 -94 -80 -94c-53 0 -62 32 -85 32c-36 0 -43 -37 -56 -37c-1 0 -3 0 -5 2 c-7 3 -10 13 -10 21z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE3-luteItalianFret3.xml b/data/Bravura/EBE3-luteItalianFret3.xml
deleted file mode 100644
index fa31144f075..00000000000
--- a/data/Bravura/EBE3-luteItalianFret3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 71c0 11 2 22 11 29c5 6 14 11 22 13h5c14 0 28 -7 33 -20c1 -4 3 -10 3 -14c-2 -12 -5 -27 -5 -40v-7c1 -6 13 -9 20 -9c14 0 70 2 70 71c0 18 -9 54 -78 54c-5 0 -16 0 -16 7s9 11 17 11c18 1 75 5 75 61c0 21 -18 53 -79 53c-4 0 -22 -5 -25 -18c0 -8 5 -13 7 -14 c3 -2 15 -3 16 -21v-4c0 -16 -11 -30 -33 -30c-30 1 -40 21 -40 38c0 25 29 69 94 69h10c26 -2 100 -18 100 -74c0 -13 -4 -28 -13 -38c-6 -8 -15 -12 -23 -17l-19 -5c-2 0 -4 -3 -4 -5c0 -1 0 -3 2 -4c1 -2 2 -1 6 -2l7 -3c2 0 3 -1 6 -1l7 -2l13 -7c5 -4 9 -7 13 -12 c5 -5 10 -11 12 -18c3 -7 6 -17 6 -29c0 -52 -61 -83 -119 -83h-7c-60 1 -93 33 -94 71z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE4-luteItalianFret4.xml b/data/Bravura/EBE4-luteItalianFret4.xml
deleted file mode 100644
index 9cf44d6d579..00000000000
--- a/data/Bravura/EBE4-luteItalianFret4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 95c0 4 2 7 5 10c15 21 77 108 77 184c0 10 8 12 14 12c5 0 12 -2 23 -2c10 0 35 2 41 2c4 0 9 -3 9 -8c0 -1 -2 -2 -2 -4c-1 -7 -77 -141 -126 -182h78v49c0 8 3 12 6 14l35 69c4 5 7 6 12 6c6 0 7 -4 7 -10v-128h44c7 0 10 -5 10 -12s-4 -12 -10 -12h-44v-34 c0 -19 13 -23 19 -23s13 -3 13 -12c0 -8 -6 -13 -11 -13h-103c-10 0 -13 7 -13 13s5 11 16 11c9 0 19 5 19 21v37h-107c-7 0 -12 6 -12 12z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE5-luteItalianFret5.xml b/data/Bravura/EBE5-luteItalianFret5.xml
deleted file mode 100644
index 035ade18de6..00000000000
--- a/data/Bravura/EBE5-luteItalianFret5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 78v8c1 16 18 36 44 36c20 0 38 -17 38 -38c0 -15 -13 -33 -33 -33c-5 0 -7 -2 -7 -6c0 -17 20 -22 33 -22h7c16 0 75 10 75 76c0 67 -51 79 -72 79s-49 -14 -56 -20c-5 -7 -10 -13 -12 -13c-6 0 -12 3 -12 11l7 135c0 4 3 9 14 9c10 0 63 -6 81 -6c20 0 68 6 76 6 c6 0 8 -6 8 -12c0 -8 -4 -45 -87 -45c-22 0 -49 5 -62 6c-6 0 -9 -4 -9 -8c-1 -6 -4 -54 -4 -54c0 -6 2 -6 6 -6c20 12 45 18 80 18c56 0 100 -44 100 -100c0 -55 -39 -99 -112 -99c-75 0 -103 35 -103 78z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE6-luteItalianFret6.xml b/data/Bravura/EBE6-luteItalianFret6.xml
deleted file mode 100644
index 13c75933cb5..00000000000
--- a/data/Bravura/EBE6-luteItalianFret6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 149v5c0 27 11 58 23 82c21 41 63 63 109 64c29 0 72 -5 77 -41v-5c0 -18 -12 -33 -30 -37c-3 0 -4 -1 -6 -1c-10 0 -17 5 -23 10c-7 4 -10 12 -10 19c0 5 2 11 4 15c2 5 7 16 7 17c0 6 -8 9 -20 9c-49 0 -63 -56 -63 -96c0 -12 3 -26 14 -26c1 0 3 2 4 2l10 2 c2 0 4 1 6 1c18 5 37 10 55 10c23 0 52 -10 62 -33c9 -14 15 -28 16 -45v-7c0 -65 -55 -94 -113 -94c-15 0 -33 2 -48 8c-52 24 -74 88 -74 141zM145 151c-33 0 -54 -23 -54 -60s18 -74 54 -74c34 0 53 37 53 74s-22 60 -53 60z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE7-luteItalianFret7.xml b/data/Bravura/EBE7-luteItalianFret7.xml
deleted file mode 100644
index fe4fa7224bc..00000000000
--- a/data/Bravura/EBE7-luteItalianFret7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 205v75c0 5 3 8 6 8c2 0 6 -3 7 -5c3 -5 11 -15 15 -15c5 1 8 4 17 11c9 9 22 22 52 22c50 0 82 -52 98 -52c15 0 23 35 27 42c2 4 11 6 12 6c6 0 8 -2 8 -8v-17c0 -63 -72 -149 -72 -250c0 -18 -3 -22 -9 -22c-7 0 -16 5 -32 5c-15 0 -19 -5 -30 -5s-11 5 -11 18 c0 24 18 58 42 85c35 42 58 95 58 118c-2 4 -3 6 -5 6s-4 -1 -5 -2c-4 -4 -16 -14 -33 -14c-36 0 -64 46 -89 46c-27 0 -37 -47 -42 -52c-2 -5 -5 -10 -8 -10c-6 0 -6 10 -6 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE8-luteItalianFret8.xml b/data/Bravura/EBE8-luteItalianFret8.xml
deleted file mode 100644
index 751aca77d40..00000000000
--- a/data/Bravura/EBE8-luteItalianFret8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 73c0 37 24 69 54 83c-29 16 -52 37 -52 77c0 49 47 68 114 68c16 0 101 -10 101 -68c0 -29 -15 -60 -35 -73c28 -15 48 -34 48 -69c0 -78 -62 -91 -120 -91c-57 0 -110 23 -110 73zM58 77c0 -39 34 -58 74 -58c38 0 68 19 68 43c0 39 -55 63 -97 81 c-26 -10 -45 -43 -45 -66zM139 284c-25 0 -71 -12 -71 -37c0 -36 61 -57 108 -74c19 11 30 38 30 61c0 41 -49 50 -67 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE9-luteItalianFret9.xml b/data/Bravura/EBE9-luteItalianFret9.xml
deleted file mode 100644
index f3b82cccb3b..00000000000
--- a/data/Bravura/EBE9-luteItalianFret9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 209c0 64 55 91 112 91c15 0 33 -2 47 -8c52 -24 76 -88 76 -141c0 -29 -10 -62 -23 -87c-21 -41 -64 -63 -110 -64c-16 0 -32 2 -48 7c-17 7 -26 18 -29 34v5c0 18 13 33 31 37c3 0 4 1 6 1c14 0 33 -14 33 -29c0 -5 -1 -11 -4 -15c-2 -5 -7 -16 -7 -17 c0 -6 8 -9 19 -9c12 0 31 6 40 16c19 19 22 56 22 83c0 12 -2 23 -11 23c-2 0 -4 -2 -5 -2c-22 -4 -48 -13 -72 -13c-26 0 -49 10 -63 33c-7 14 -13 28 -14 45v10zM138 283c-34 0 -53 -37 -53 -74s22 -60 53 -60c34 0 53 23 53 60s-17 74 -53 74z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/ED40-articSoftAccentAbove.xml b/data/Bravura/ED40-articSoftAccentAbove.xml
deleted file mode 100644
index 91ea60b6d8a..00000000000
--- a/data/Bravura/ED40-articSoftAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="ED40" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M369 221c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M0 123c0 8 0 14 13 18l300 102c4 1 8 2 9 2c9 0 12 -6 15 -14c1 -4 2 -7 2 -10c0 -5 -3 -10 -14 -14c0 0 -216 -73 -226 -77c-5 -1 -7 -4 -7 -7s2 -5 8 -7c11 -3 225 -76 225 -76c11 -5 14 -10 14 -15c0 -3 -1 -6 -2 -9c-3 -7 -7 -15 -14 -15c-1 0 -3 0 -4 1l-306 103 c-13 3 -13 10 -13 18z" /></symbol>
\ No newline at end of file
diff --git a/data/Bravura/ED41-articSoftAccentBelow.xml b/data/Bravura/ED41-articSoftAccentBelow.xml
deleted file mode 100644
index 2a2e778271c..00000000000
--- a/data/Bravura/ED41-articSoftAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="ED41" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M369 -25c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M0 -123c0 8 0 14 13 18l300 102c4 1 8 2 9 2c9 0 12 -6 15 -14c1 -4 2 -7 2 -10c0 -5 -3 -10 -14 -14c0 0 -216 -73 -226 -77c-5 -1 -7 -4 -7 -7s2 -5 8 -7c11 -3 225 -76 225 -76c11 -5 14 -10 14 -15c0 -3 -1 -6 -2 -9c-3 -7 -7 -15 -14 -15c-1 0 -3 0 -4 1l-306 103 c-13 3 -13 10 -13 18z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville.xml b/data/Gootville.xml
deleted file mode 100644
index 32cddd400a6..00000000000
--- a/data/Gootville.xml
+++ /dev/null
@@ -1,416 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bounding-boxes font-family="Gootville" units-per-em="1000">
-	<g c="E527" x="-72.0" y="-180.0" w="2148.0" h="452.0" h-a-x="2076" >
-		<a n="opticalCenter" x="4.248" y="0"/>
-	</g>
-	<g c="E528" x="-72.0" y="-180.0" w="1802.0" h="452.0" h-a-x="1730" >
-		<a n="opticalCenter" x="3.552" y="0"/>
-	</g>
-	<g c="E529" x="-72.0" y="-180.0" w="1456.0" h="452.0" h-a-x="1384" >
-		<a n="opticalCenter" x="3.004" y="0"/>
-	</g>
-	<g c="E52A" x="-72.0" y="-180.0" w="1110.0" h="452.0" h-a-x="1038" >
-		<a n="opticalCenter" x="2.368" y="0"/>
-	</g>
-	<g c="E52B" x="-72.0" y="-180.0" w="764.0" h="452.0" h-a-x="692" >
-		<a n="opticalCenter" x="1.708" y="0"/>
-	</g>
-	<g c="E52C" x="-41.0" y="-180.0" w="781.0" h="452.0" h-a-x="740" >
-		<a n="opticalCenter" x="1.848" y="0"/>
-	</g>
-	<g c="E52D" x="-41.0" y="-147.0" w="821.0" h="597.0" h-a-x="671" >
-		<a n="opticalCenter" x="1.796" y="0"/>
-	</g>
-	<g c="E52E" x="-72.0" y="-180.0" w="804.0" h="630.0" h-a-x="623" >
-		<a n="opticalCenter" x="1.68" y="0"/>
-	</g>
-	<g c="E52F" x="-144.0" y="-147.0" w="807.0" h="597.0" h-a-x="554" >
-		<a n="opticalCenter" x="1.852" y="0"/>
-	</g>
-	<g c="E530" x="-144.0" y="-147.0" w="1084.0" h="597.0" h-a-x="831" >
-		<a n="opticalCenter" x="2.472" y="0"/>
-	</g>
-	<g c="E531" x="-144.0" y="-147.0" w="1361.0" h="597.0" h-a-x="1108" >
-		<a n="opticalCenter" x="2.824" y="0"/>
-	</g>
-	<g c="E532" x="-144.0" y="-147.0" w="1638.0" h="597.0" h-a-x="1385" >
-		<a n="opticalCenter" x="2.976" y="0"/>
-	</g>
-	<g c="E533" x="-144.0" y="-147.0" w="1915.0" h="597.0" h-a-x="1662" >
-		<a n="opticalCenter" x="3.504" y="0"/>
-	</g>
-	<g c="E534" x="-144.0" y="-180.0" w="767.0" h="630.0" h-a-x="623" >
-		<a n="opticalCenter" x="1.5" y="0"/>
-	</g>
-	<g c="E535" x="-144.0" y="-147.0" w="711.0" h="597.0" h-a-x="567" >
-		<a n="opticalCenter" x="1.352" y="0"/>
-	</g>
-	<g c="E536" x="0.0" y="-147.0" w="612.0" h="597.0" h-a-x="503" >
-		<a n="opticalCenter" x="1.3" y="0"/>
-	</g>
-	<g c="E537" x="0.0" y="-180.0" w="849.0" h="630.0" h-a-x="849" >
-		<a n="opticalCenter" x="1.904" y="0"/>
-	</g>
-	<g c="E538" x="0.0" y="-180.0" w="1195.0" h="630.0" h-a-x="1195" >
-		<a n="opticalCenter" x="1.972" y="0"/>
-	</g>
-	<g c="E539" x="0.0" y="-147.0" w="793.0" h="597.0" h-a-x="793" >
-		<a n="opticalCenter" x="1.76" y="0"/>
-	</g>
-	<g c="E53A" x="0.0" y="-180.0" w="1139.0" h="630.0" h-a-x="1139" >
-		<a n="opticalCenter" x="1.848" y="0"/>
-	</g>
-	<g c="E53B" x="0.0" y="-147.0" w="1070.0" h="597.0" h-a-x="1070" >
-		<a n="opticalCenter" x="2.276" y="0"/>
-	</g>
-	<g c="E53C" x="-17.0" y="-147.0" w="696.0" h="597.0" h-a-x="570" >
-		<a n="opticalCenter" x="1.564" y="0"/>
-	</g>
-	<g c="E53D" x="-17.0" y="-147.0" w="877.0" h="597.0" h-a-x="860" >
-		<a n="opticalCenter" x="2.084" y="0"/>
-	</g>
-	<g c="E003" x="0.0" y="-77.0" w="414.0" h="240.0" h-a-x="414" />
-	<g c="E004" x="0.0" y="-163.0" w="414.0" h="240.0" h-a-x="414" />
-	<g c="E043" x="0.0" y="320.0" w="100.0" h="350.0" h-a-x="100" />
-	<g c="E044" x="0.0" y="75.0" w="100.0" h="100.0" h-a-x="100" />
-	<g c="E047" x="0.0" y="-348.0" w="486.0" h="696.0" h-a-x="486" />
-	<g c="E048" x="0.0" y="-316.0" w="464.0" h="632.0" h-a-x="464" />
-	<g c="E049" x="0.0" y="-316.0" w="464.0" h="632.0" h-a-x="464" />
-	<g c="E050" x="0.0" y="-633.0" w="626.0" h="1713.0" h-a-x="626" />
-	<g c="E051" x="0.0" y="-877.0" w="626.0" h="1957.0" h-a-x="626" />
-	<g c="E052" x="0.0" y="-877.0" w="626.0" h="1957.0" h-a-x="626" />
-	<g c="E053" x="0.0" y="-633.0" w="626.0" h="1957.0" h-a-x="626" />
-	<g c="E054" x="0.0" y="-633.0" w="626.0" h="1957.0" h-a-x="626" />
-	<g c="E05C" x="0.0" y="-500.0" w="642.0" h="1000.0" h-a-x="642" />
-	<g c="E05D" x="0.0" y="-744.0" w="642.0" h="1244.0" h-a-x="642" />
-	<g c="E062" x="0.0" y="-546.0" w="664.0" h="800.0" h-a-x="664" />
-	<g c="E063" x="0.0" y="-790.0" w="664.0" h="1044.0" h-a-x="664" />
-	<g c="E064" x="0.0" y="-790.0" w="664.0" h="1044.0" h-a-x="664" />
-	<g c="E065" x="0.0" y="-546.0" w="664.0" h="1044.0" h-a-x="664" />
-	<g c="E066" x="0.0" y="-546.0" w="664.0" h="1044.0" h-a-x="664" />
-	<g c="E069" x="0.0" y="-250.0" w="340.0" h="500.0" h-a-x="340" />
-	<g c="E06A" x="0.0" y="-420.0" w="270.0" h="840.0" h-a-x="270" />
-	<g c="E080" x="0.0" y="-243.0" w="424.0" h="486.0" h-a-x="424" />
-	<g c="E081" x="0.0" y="-243.0" w="284.0" h="486.0" h-a-x="284" />
-	<g c="E082" x="0.0" y="-243.0" w="376.0" h="486.0" h-a-x="376" />
-	<g c="E083" x="0.0" y="-243.0" w="337.0" h="486.0" h-a-x="337" />
-	<g c="E084" x="0.0" y="-243.0" w="384.0" h="486.0" h-a-x="384" />
-	<g c="E085" x="0.0" y="-243.0" w="337.0" h="486.0" h-a-x="337" />
-	<g c="E086" x="0.0" y="-243.0" w="390.0" h="486.0" h-a-x="390" />
-	<g c="E087" x="0.0" y="-243.0" w="363.0" h="486.0" h-a-x="363" />
-	<g c="E088" x="0.0" y="-243.0" w="400.0" h="486.0" h-a-x="400" />
-	<g c="E089" x="0.0" y="-243.0" w="390.0" h="486.0" h-a-x="390" />
-	<g c="E08A" x="0.0" y="-243.0" w="426.0" h="486.0" h-a-x="426" />
-	<g c="E08B" x="0.0" y="-412.0" w="426.0" h="824.0" h-a-x="426" />
-	<g c="E092" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="120" />
-	<g c="E093" x="16.0" y="-267.0" w="104.0" h="534.0" h-a-x="120" />
-	<g c="E094" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
-	<g c="E095" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
-	<g c="E0A0" x="0.0" y="-177.0" w="666.0" h="354.0" h-a-x="666" >
-		<a n="noteheadOrigin" x="0.36" y="0"/>
-	</g>
-	<g c="E0A1" x="0.0" y="-230.0" w="524.0" h="460.0" h-a-x="524" />
-	<g c="E0A2" x="0.0" y="-135.0" w="454.0" h="270.0" h-a-x="454" />
-	<g c="E0A3" x="0.0" y="-135.0" w="316.0" h="270.0" h-a-x="316" >
-		<a n="splitStemDownNE" x="0.956" y="-0.3"/>
-		<a n="splitStemDownNW" x="0.128" y="-0.428"/>
-		<a n="splitStemUpSE" x="1.108" y="0.372"/>
-		<a n="splitStemUpSW" x="0.328" y="0.38"/>
-		<a n="stemDownNW" x="0" y="-0.168"/>
-		<a n="stemUpSE" x="1.18" y="0.168"/>
-	</g>
-	<g c="E0A4" x="0.0" y="-135.0" w="316.0" h="270.0" h-a-x="316" >
-		<a n="splitStemDownNE" x="0.968" y="-0.248"/>
-		<a n="splitStemDownNW" x="0.12" y="-0.416"/>
-		<a n="splitStemUpSE" x="1.092" y="0.392"/>
-		<a n="splitStemUpSW" x="0.312" y="0.356"/>
-		<a n="stemDownNW" x="0" y="-0.168"/>
-		<a n="stemUpSE" x="1.18" y="0.168"/>
-	</g>
-	<g c="E0A9" x="0.0" y="-138.0" w="300.0" h="276.0" h-a-x="300" >
-		<a n="stemDownNW" x="0" y="-0.44"/>
-		<a n="stemUpSE" x="1.16" y="0.444"/>
-	</g>
-	<g c="E0D9" x="0.0" y="-139.0" w="322.0" h="278.0" h-a-x="322" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.004" y="0"/>
-	</g>
-	<g c="E0DA" x="0.0" y="-139.0" w="462.0" h="278.0" h-a-x="462" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.404" y="0"/>
-	</g>
-	<g c="E0DB" x="0.0" y="-139.0" w="322.0" h="278.0" h-a-x="322" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1" y="0"/>
-	</g>
-	<g c="E0DC" x="0.0" y="-139.0" w="462.0" h="278.0" h-a-x="462" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.4" y="0"/>
-	</g>
-	<g c="E0DD" x="0.0" y="-139.0" w="322.0" h="278.0" h-a-x="322" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1" y="0"/>
-	</g>
-	<g c="E0DE" x="0.0" y="-139.0" w="462.0" h="278.0" h-a-x="462" >
-		<a n="stemDownNW" x="0" y="0.004"/>
-		<a n="stemUpSE" x="1.4" y="0"/>
-	</g>
-	<g c="E0F5" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
-	<g c="E0F6" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
-	<g c="E101" x="0.0" y="-246.0" w="212.0" h="492.0" h-a-x="212" >
-		<a n="stemDownNW" x="0" y="-1"/>
-		<a n="stemUpSE" x="2.12" y="1"/>
-	</g>
-	<g c="E102" x="0.0" y="-246.0" w="400.0" h="492.0" h-a-x="400" />
-	<g c="E103" x="0.0" y="-246.0" w="286.0" h="492.0" h-a-x="286" >
-		<a n="stemDownNW" x="0" y="-1"/>
-		<a n="stemUpSE" x="3.12" y="1"/>
-	</g>
-	<g c="E240" x="0.0" y="-756.0" w="284.0" h="770.0" h-a-x="284" >
-		<a n="graceNoteSlashNE" x="1.284" y="-0.796"/>
-		<a n="graceNoteSlashSW" x="-0.644" y="-2.456"/>
-		<a n="stemUpNW" x="0" y="-0.04"/>
-	</g>
-	<g c="E241" x="0.0" y="-14.0" w="314.0" h="770.0" h-a-x="314" >
-		<a n="graceNoteSlashNW" x="-0.596" y="2.168"/>
-		<a n="graceNoteSlashSE" x="1.328" y="0.628"/>
-		<a n="stemDownSW" x="0" y="0.132"/>
-	</g>
-	<g c="E242" x="0.0" y="-880.0" w="284.0" h="894.0" h-a-x="284" >
-		<a n="stemUpNW" x="0" y="-0.088"/>
-	</g>
-	<g c="E243" x="0.0" y="-14.0" w="314.0" h="916.0" h-a-x="314" >
-		<a n="stemDownSW" x="0" y="0.128"/>
-	</g>
-	<g c="E244" x="0.0" y="-864.0" w="284.0" h="1098.0" h-a-x="284" >
-		<a n="stemUpNW" x="0" y="0.376"/>
-	</g>
-	<g c="E245" x="0.0" y="-204.0" w="314.0" h="1120.0" h-a-x="314" >
-		<a n="stemDownSW" x="0" y="-0.448"/>
-	</g>
-	<g c="E246" x="0.0" y="-878.0" w="284.0" h="1302.0" h-a-x="284" >
-		<a n="stemUpNW" x="0" y="1.172"/>
-	</g>
-	<g c="E247" x="0.0" y="-424.0" w="314.0" h="1324.0" h-a-x="314" >
-		<a n="stemDownSW" x="0" y="-1.244"/>
-	</g>
-	<g c="E248" x="0.0" y="-862.0" w="284.0" h="1506.0" h-a-x="284" >
-		<a n="stemUpNW" x="0" y="1.9"/>
-	</g>
-	<g c="E249" x="0.0" y="-614.0" w="314.0" h="1528.0" h-a-x="314" >
-		<a n="stemDownSW" x="0" y="-2.076"/>
-	</g>
-	<g c="E260" x="-15.0" y="-165.0" w="200.0" h="625.0" h-a-x="185" >
-		<a n="cutOutNE" x="0.252" y="0.656"/>
-		<a n="cutOutSE" x="0.504" y="-0.476"/>
-	</g>
-	<g c="E261" x="0.0" y="-337.0" w="176.0" h="674.0" h-a-x="176" >
-		<a n="cutOutNE" x="0.192" y="0.776"/>
-		<a n="cutOutSW" x="0.476" y="-0.828"/>
-	</g>
-	<g c="E262" x="0.0" y="-376.0" w="236.0" h="752.0" h-a-x="236" >
-		<a n="cutOutNE" x="0.84" y="0.896"/>
-		<a n="cutOutNW" x="0.144" y="0.568"/>
-		<a n="cutOutSE" x="0.84" y="-0.596"/>
-		<a n="cutOutSW" x="0.144" y="-0.896"/>
-	</g>
-	<g c="E263" x="0.0" y="-135.0" w="270.0" h="270.0" h-a-x="270" />
-	<g c="E264" x="-15.0" y="-165.0" w="370.0" h="625.0" h-a-x="355" >
-		<a n="cutOutNE" x="0.988" y="0.644"/>
-		<a n="cutOutSE" x="1.336" y="-0.396"/>
-	</g>
-	<g c="E26A" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
-	<g c="E26B" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
-	<g c="E270" x="-79.0" y="-165.0" w="264.0" h="788.0" h-a-x="185" >
-		<a n="cutOutNE" x="0.604" y="0.664"/>
-		<a n="cutOutSE" x="0.62" y="-0.452"/>
-	</g>
-	<g c="E271" x="-79.0" y="-372.0" w="264.0" h="832.0" h-a-x="185" >
-		<a n="cutOutNE" x="0.356" y="0.648"/>
-		<a n="cutOutNW" x="0.032" y="-0.8"/>
-		<a n="cutOutSE" x="0.648" y="-0.5"/>
-	</g>
-	<g c="E272" x="0.0" y="-337.0" w="240.0" h="837.0" h-a-x="240" >
-		<a n="cutOutSW" x="0.616" y="-0.868"/>
-	</g>
-	<g c="E273" x="0.0" y="-500.0" w="240.0" h="837.0" h-a-x="240" >
-		<a n="cutOutNE" x="0.232" y="0.788"/>
-	</g>
-	<g c="E274" x="0.0" y="-376.0" w="246.0" h="968.0" h-a-x="246" >
-		<a n="cutOutNW" x="0.272" y="1.304"/>
-		<a n="cutOutSE" x="0.86" y="-0.584"/>
-		<a n="cutOutSW" x="0.132" y="-0.888"/>
-	</g>
-	<g c="E275" x="-10.0" y="-592.0" w="246.0" h="968.0" h-a-x="236" >
-		<a n="cutOutNE" x="0.856" y="0.908"/>
-		<a n="cutOutNW" x="0.132" y="0.608"/>
-		<a n="cutOutSE" x="0.856" y="-0.588"/>
-	</g>
-	<g c="E280" x="0.0" y="-165.0" w="200.0" h="625.0" h-a-x="200" >
-		<a n="cutOutNW" x="0.628" y="0.676"/>
-		<a n="cutOutSW" x="0.336" y="-0.428"/>
-	</g>
-	<g c="E281" x="0.0" y="-165.0" w="446.0" h="625.0" h-a-x="446" >
-		<a n="cutOutNE" x="1.22" y="0.668"/>
-		<a n="cutOutNW" x="0.636" y="0.668"/>
-	</g>
-	<g c="E282" x="0.0" y="-364.0" w="138.0" h="728.0" h-a-x="138" >
-		<a n="cutOutNE" x="0.476" y="0.748"/>
-		<a n="cutOutNW" x="0.224" y="0.604"/>
-		<a n="cutOutSE" x="0.492" y="-0.8"/>
-		<a n="cutOutSW" x="0.224" y="-0.92"/>
-	</g>
-	<g c="E283" x="0.0" y="-388.0" w="334.0" h="776.0" h-a-x="334" >
-		<a n="cutOutNE" x="1.128" y="1"/>
-		<a n="cutOutNW" x="0.144" y="0.604"/>
-		<a n="cutOutSE" x="1.128" y="-0.5"/>
-		<a n="cutOutSW" x="0.144" y="-0.896"/>
-	</g>
-	<g c="E440" x="-129.0" y="-165.0" w="314.0" h="625.0" h-a-x="185" >
-		<a n="cutOutSE" x="0.812" y="-0.42"/>
-		<a n="cutOutSW" x="0.18" y="0.536"/>
-	</g>
-	<g c="E441" x="-15.0" y="-165.0" w="200.0" h="625.0" h-a-x="185" >
-		<a n="cutOutNE" x="0.284" y="0.704"/>
-		<a n="cutOutSE" x="0.576" y="-0.424"/>
-	</g>
-	<g c="E442" x="-129.0" y="-165.0" w="314.0" h="625.0" h-a-x="185" >
-		<a n="cutOutNE" x="0.536" y="1.392"/>
-		<a n="cutOutNW" x="0.152" y="1.112"/>
-		<a n="cutOutSE" x="0.816" y="-0.444"/>
-		<a n="cutOutSW" x="0.152" y="0.5"/>
-	</g>
-	<g c="E443" x="0.0" y="-165.0" w="200.0" h="625.0" h-a-x="200" >
-		<a n="cutOutNW" x="0.608" y="0.724"/>
-		<a n="cutOutSW" x="0.36" y="-0.448"/>
-	</g>
-	<g c="E444" x="0.0" y="-364.0" w="138.0" h="728.0" h-a-x="138" >
-		<a n="cutOutNE" x="0.596" y="0.88"/>
-		<a n="cutOutNW" x="0.28" y="0.708"/>
-		<a n="cutOutSE" x="0.596" y="-0.776"/>
-		<a n="cutOutSW" x="0.28" y="-0.92"/>
-	</g>
-	<g c="E445" x="0.0" y="-376.0" w="236.0" h="752.0" h-a-x="236" >
-		<a n="cutOutNE" x="0.86" y="0.94"/>
-		<a n="cutOutNW" x="0.12" y="0.616"/>
-		<a n="cutOutSE" x="0.86" y="-0.616"/>
-		<a n="cutOutSW" x="0.124" y="-0.924"/>
-	</g>
-	<g c="E446" x="0.0" y="-364.0" w="188.0" h="728.0" h-a-x="188" >
-		<a n="cutOutNE" x="0.82" y="0.876"/>
-		<a n="cutOutNW" x="0.492" y="0.708"/>
-		<a n="cutOutSE" x="0.836" y="-0.768"/>
-		<a n="cutOutSW" x="0.504" y="-0.948"/>
-	</g>
-	<g c="E447" x="0.0" y="-376.0" w="286.0" h="752.0" h-a-x="286" >
-		<a n="cutOutNE" x="1.052" y="0.94"/>
-		<a n="cutOutNW" x="0.26" y="0.628"/>
-		<a n="cutOutSE" x="1.048" y="-0.624"/>
-		<a n="cutOutSW" x="0.264" y="-0.956"/>
-	</g>
-	<g c="E4A0" x="0.0" y="0.0" w="442.0" h="254.0" h-a-x="442" />
-	<g c="E4A1" x="0.0" y="-254.0" w="442.0" h="254.0" h-a-x="442" />
-	<g c="E4A2" x="0.0" y="0.0" w="100.0" h="100.0" h-a-x="100" />
-	<g c="E4A3" x="0.0" y="-100.0" w="100.0" h="100.0" h-a-x="100" />
-	<g c="E4A4" x="0.0" y="0.0" w="304.0" h="30.0" h-a-x="304" />
-	<g c="E4A5" x="0.0" y="-30.0" w="304.0" h="30.0" h-a-x="304" />
-	<g c="E4A6" x="0.0" y="0.0" w="164.0" h="198.0" h-a-x="164" />
-	<g c="E4A7" x="0.0" y="-198.0" w="164.0" h="198.0" h-a-x="164" />
-	<g c="E4A8" x="0.0" y="0.0" w="164.0" h="198.0" h-a-x="164" />
-	<g c="E4A9" x="0.0" y="-198.0" w="164.0" h="198.0" h-a-x="164" />
-	<g c="E4AC" x="0.0" y="0.0" w="252.0" h="412.0" h-a-x="252" />
-	<g c="E4AD" x="0.0" y="-412.0" w="252.0" h="412.0" h-a-x="252" />
-	<g c="E4B2" x="0.0" y="0.0" w="304.0" h="195.0" h-a-x="304" />
-	<g c="E4B3" x="0.0" y="-195.0" w="304.0" h="195.0" h-a-x="304" />
-	<g c="E4B6" x="0.0" y="0.0" w="118.0" h="279.0" h-a-x="118" />
-	<g c="E4B7" x="0.0" y="-279.0" w="118.0" h="279.0" h-a-x="118" />
-	<g c="E4C0" x="0.0" y="0.0" w="650.0" h="354.0" h-a-x="650" />
-	<g c="E4C1" x="0.0" y="-354.0" w="650.0" h="354.0" h-a-x="650" />
-	<g c="E4C4" x="0.0" y="0.0" w="581.0" h="470.0" h-a-x="581" />
-	<g c="E4C5" x="0.0" y="-470.0" w="581.0" h="470.0" h-a-x="581" />
-	<g c="E4C6" x="0.0" y="0.0" w="572.0" h="364.0" h-a-x="572" />
-	<g c="E4C7" x="0.0" y="-364.0" w="572.0" h="364.0" h-a-x="572" />
-	<g c="E4C8" x="0.0" y="0.0" w="572.0" h="416.0" h-a-x="572" />
-	<g c="E4C9" x="0.0" y="-416.0" w="572.0" h="416.0" h-a-x="572" />
-	<g c="E4CE" x="0.0" y="0.0" w="142.0" h="262.0" h-a-x="142" />
-	<g c="E4E1" x="0.0" y="-250.0" w="284.0" h="500.0" h-a-x="284" />
-	<g c="E4E2" x="0.0" y="0.0" w="284.0" h="250.0" h-a-x="284" />
-	<g c="E4E3" x="0.0" y="-125.0" w="330.0" h="125.0" />
-	<g c="E4E4" x="0.0" y="0.0" w="330.0" h="125.0" />
-	<g c="E4E5" x="0.0" y="-363.0" w="222.0" h="728.0" h-a-x="222" />
-	<g c="E4E6" x="0.0" y="-224.0" w="256.0" h="424.0" h-a-x="256" />
-	<g c="E4E7" x="0.0" y="-468.0" w="328.0" h="668.0" h-a-x="328" />
-	<g c="E4E8" x="0.0" y="-468.0" w="400.0" h="912.0" h-a-x="400" />
-	<g c="E4E9" x="0.0" y="-712.0" w="472.0" h="1156.0" h-a-x="472" />
-	<g c="E4EA" x="0.0" y="-712.0" w="544.0" h="1400.0" h-a-x="544" />
-	<g c="E4F2" x="0.0" y="-224.0" w="256.0" h="424.0" h-a-x="256" />
-	<g c="E510" x="0.0" y="0.0" w="414.0" h="486.0" h-a-x="414" />
-	<g c="E514" x="0.0" y="0.0" w="661.0" h="486.0" h-a-x="661" />
-	<g c="E517" x="0.0" y="0.0" w="792.0" h="486.0" h-a-x="792" />
-	<g c="E51A" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
-	<g c="E51B" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" />
-	<g c="E520" x="-72.0" y="-180.0" w="418.0" h="452.0" h-a-x="346" >
-		<a n="opticalCenter" x="1.22" y="0"/>
-	</g>
-	<g c="E521" x="-41.0" y="-20.0" w="460.0" h="292.0" h-a-x="394" >
-		<a n="opticalCenter" x="0.872" y="0"/>
-	</g>
-	<g c="E522" x="-144.0" y="-147.0" w="530.0" h="597.0" h-a-x="277" >
-		<a n="opticalCenter" x="1.256" y="0"/>
-	</g>
-	<g c="E523" x="-17.0" y="-1.0" w="310.0" h="273.0" h-a-x="293" >
-		<a n="opticalCenter" x="0.612" y="0"/>
-	</g>
-	<g c="E524" x="0.0" y="-22.0" w="226.0" h="294.0" h-a-x="226" >
-		<a n="opticalCenter" x="0.444" y="0"/>
-	</g>
-	<g c="E525" x="-24.0" y="0.0" w="314.0" h="272.0" h-a-x="290" >
-		<a n="opticalCenter" x="0.5" y="0"/>
-	</g>
-	<g c="E526" x="-41.0" y="-20.0" w="340.0" h="292.0" h-a-x="274" >
-		<a n="opticalCenter" x="0.616" y="0"/>
-	</g>
-	<g c="E566" x="0.0" y="-9.0" w="531.0" h="376.0" h-a-x="600" />
-	<g c="E567" x="0.0" y="-141.0" w="620.0" h="282.0" h-a-x="620" />
-	<g c="E568" x="0.0" y="-141.0" w="620.0" h="282.0" h-a-x="620" />
-	<g c="E569" x="0.0" y="-200.0" w="620.0" h="400.0" h-a-x="620" />
-	<g c="E56C" x="0.0" y="-128.0" w="606.0" h="256.0" h-a-x="606" />
-	<g c="E56D" x="0.0" y="-200.0" w="606.0" h="400.0" h-a-x="606" />
-	<g c="E56E" x="0.0" y="-128.0" w="852.0" h="256.0" h-a-x="852" />
-	<g c="E59D" x="-77.0" y="-128.0" w="360.0" h="256.0" h-a-x="246" >
-		<a n="repeatOffset" x="1.048" y="0"/>
-	</g>
-	<g c="E59E" x="-77.0" y="-128.0" w="360.0" h="256.0" h-a-x="246" >
-		<a n="repeatOffset" x="1.428" y="0"/>
-	</g>
-	<g c="E5B0" x="0.0" y="-128.0" w="814.0" h="370.0" h-a-x="814" />
-	<g c="E5E5" x="0.0" y="-125.0" w="250.0" h="250.0" h-a-x="250" />
-	<g c="E5E7" x="0.0" y="-125.0" w="250.0" h="250.0" h-a-x="250" />
-	<g c="E610" x="0.0" y="0.0" w="336.0" h="352.0" h-a-x="336" />
-	<g c="E611" x="0.0" y="0.0" w="336.0" h="352.0" h-a-x="336" />
-	<g c="E612" x="0.0" y="0.0" w="252.0" h="412.0" h-a-x="252" />
-	<g c="E613" x="0.0" y="0.0" w="252.0" h="412.0" h-a-x="252" />
-	<g c="E630" x="0.0" y="0.0" w="220.0" h="313.0" h-a-x="220" />
-	<g c="E631" x="0.0" y="0.0" w="220.0" h="313.0" h-a-x="220" />
-	<g c="E650" x="0.0" y="0.0" w="782.0" h="500.0" h-a-x="782" />
-	<g c="E651" x="0.0" y="0.0" w="404.0" h="500.0" h-a-x="404" />
-	<g c="E655" x="0.0" y="66.0" w="430.0" h="434.0" h-a-x="430" />
-	<g c="EAA4" x="-12.0" y="152.0" w="270.0" h="120.0" h-a-x="246" >
-		<a n="repeatOffset" x="0.948" y="0"/>
-	</g>
-	<g c="EAA9" x="0.0" y="54.0" w="270.0" h="120.0" h-a-x="270" >
-		<a n="repeatOffset" x="1.02" y="0"/>
-	</g>
-	<g c="EAAA" x="0.0" y="54.0" w="270.0" h="120.0" h-a-x="270" >
-		<a n="repeatOffset" x="1.02" y="0"/>
-	</g>
-	<g c="EAAD" x="-26.0" y="0.0" w="276.0" h="228.0" h-a-x="250" >
-		<a n="repeatOffset" x="2.064" y="0"/>
-	</g>
-	<g c="EAAE" x="-26.0" y="0.0" w="276.0" h="228.0" h-a-x="250" >
-		<a n="repeatOffset" x="2.064" y="0"/>
-	</g>
-	<g c="EAAF" x="-12.0" y="0.0" w="270.0" h="120.0" h-a-x="246" >
-		<a n="repeatOffset" x="1.032" y="0"/>
-	</g>
-</bounding-boxes>
diff --git a/data/Gootville/E003-bracketTop.xml b/data/Gootville/E003-bracketTop.xml
deleted file mode 100644
index 172ed245dcb..00000000000
--- a/data/Gootville/E003-bracketTop.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 11 12 21 24 21c158 0 289 71 379 139c0 0 4 3 6 3c3 0 5 -2 5 -7c0 -31 -171 -233 -414 -233v77z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E004-bracketBottom.xml b/data/Gootville/E004-bracketBottom.xml
deleted file mode 100644
index 12b78940b95..00000000000
--- a/data/Gootville/E004-bracketBottom.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v77c243 0 414 -202 414 -233c0 -5 -2 -7 -5 -7c-2 0 -6 3 -6 3c-90 68 -221 139 -379 139c-12 0 -24 10 -24 21z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E043-repeatDots.xml b/data/Gootville/E043-repeatDots.xml
deleted file mode 100644
index 924f2c869af..00000000000
--- a/data/Gootville/E043-repeatDots.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 370c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50zM0 620c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E044-repeatDot.xml b/data/Gootville/E044-repeatDot.xml
deleted file mode 100644
index 8f01a774bb2..00000000000
--- a/data/Gootville/E044-repeatDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 125c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E047-segno.xml b/data/Gootville/E047-segno.xml
deleted file mode 100644
index 5acd758ba4f..00000000000
--- a/data/Gootville/E047-segno.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -84c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46zM25 -330c0 7 4 14 8 20l168 279c-80 46 -165 131 -165 236c0 75 42 143 121 143c47 0 112 -36 112 -96c0 -26 -18 -45 -45 -45c-22 0 -37 11 -46 38s-34 46 -58 46c-26 0 -44 -19 -44 -45 c0 -79 91 -153 174 -196l169 280c8 13 13 18 22 18c12 0 20 -7 20 -18c0 -7 -4 -14 -8 -20l-168 -279c80 -46 165 -131 165 -236c0 -75 -42 -143 -121 -143c-47 0 -112 36 -112 96c0 26 18 45 45 45c22 0 37 -11 46 -38s34 -46 58 -46c26 0 44 19 44 45 c0 79 -91 153 -174 196l-169 -280c-8 -13 -13 -18 -22 -18c-12 0 -20 7 -20 18zM394 84c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E048-coda.xml b/data/Gootville/E048-coda.xml
deleted file mode 100644
index 1d03b80bef3..00000000000
--- a/data/Gootville/E048-coda.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 20 20 20 20 20h35c6 109 57 218 157 231v45s0 20 20 20s20 -20 20 -20v-45c100 -13 151 -122 157 -231h35s20 0 20 -20s-20 -20 -20 -20h-35c-6 -109 -57 -218 -157 -231v-45s0 -20 -20 -20s-20 20 -20 20v45c-100 13 -151 122 -157 231h-35s-20 0 -20 20zM144 20 h68v194c-47 -20 -66 -110 -68 -194zM144 -20c2 -84 21 -174 68 -194v194h-68zM252 20h68c-2 84 -21 174 -68 194v-194zM252 -20v-194c47 20 66 110 68 194h-68z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E049-codaSquare.xml b/data/Gootville/E049-codaSquare.xml
deleted file mode 100644
index 33822621980..00000000000
--- a/data/Gootville/E049-codaSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 20 20 20 20 20h34c1 56 7 171 10 190c3 22 7 25 32 30c21 4 76 10 116 12v44s0 20 20 20s20 -20 20 -20v-44c40 -2 95 -8 116 -12c25 -5 29 -8 32 -30c3 -19 9 -134 10 -190h34s20 0 20 -20s-20 -20 -20 -20h-34c-1 -56 -7 -171 -10 -190c-3 -22 -7 -25 -32 -30 c-21 -4 -76 -10 -116 -12v-44s0 -20 -20 -20s-20 20 -20 20v44c-40 2 -95 8 -116 12c-25 5 -29 8 -32 30c-3 19 -9 134 -10 190h-34s-20 0 -20 20zM144 20h68v198c-28 -1 -58 -6 -62 -26c-5 -23 -6 -107 -6 -172zM144 -20c0 -65 1 -149 6 -172c4 -20 34 -25 62 -26v198h-68z M252 20h68c0 65 -1 149 -6 172c-4 20 -34 25 -62 26v-198zM252 -20v-198c28 1 58 6 62 26c5 23 6 107 6 172h-68z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E050-gClef.xml b/data/Gootville/E050-gClef.xml
deleted file mode 100644
index c3f5b9512cd..00000000000
--- a/data/Gootville/E050-gClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM262 723c0 -44 27 -160 27 -160 c80 78 159 190 159 296c0 43 -8 77 -49 77c-81 0 -137 -123 -137 -213zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E051-gClef15mb.xml b/data/Gootville/E051-gClef15mb.xml
deleted file mode 100644
index 24af8c55979..00000000000
--- a/data/Gootville/E051-gClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM153 -737c0 2 1 3 1 3l49 96s3 5 5 5h51 c2 0 3 -2 3 -4v-192c0 -18 11 -30 21 -30c4 0 12 0 12 -8c0 -7 -6 -10 -12 -10h-101c-6 0 -12 3 -12 10c0 8 8 8 12 8c10 0 20 12 20 30v142l-34 -54c-2 -4 -3 -4 -6 -4c-4 0 -9 4 -9 8zM262 723c0 -44 27 -160 27 -160c80 78 159 190 159 296c0 43 -8 77 -49 77 c-81 0 -137 -123 -137 -213zM304 -825c0 18 14 32 32 32s31 -14 31 -32c0 -12 -7 -23 -18 -28c2 -2 10 -8 22 -8c26 0 43 29 43 65s-23 59 -49 59c-20 0 -27 -3 -35 -9c-6 -4 -8 -5 -10 -5c-7 0 -7 2 -7 8c0 1 1 25 3 46s3 51 3 52c0 7 2 12 6 12c5 0 12 -2 22 -5 s26 -6 44 -6s39 3 49 6s18 5 24 5c3 0 5 -3 5 -7s0 -12 -9 -23s-35 -28 -69 -28c-21 0 -43 4 -61 10l-3 -50c20 13 37 14 53 14c48 0 93 -31 93 -79s-42 -81 -86 -81c-42 0 -83 17 -83 52zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z " /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E052-gClef8vb.xml b/data/Gootville/E052-gClef8vb.xml
deleted file mode 100644
index ef03e2dc34e..00000000000
--- a/data/Gootville/E052-gClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM213 -801c0 20 10 44 32 55c-14 9 -20 25 -20 43 c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM248 -801c0 -30 27 -58 65 -58c24 0 42 12 42 28c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM262 723c0 -44 27 -160 27 -160 c80 78 159 190 159 296c0 43 -8 77 -49 77c-81 0 -137 -123 -137 -213zM278 -672c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E053-gClef8va.xml b/data/Gootville/E053-gClef8va.xml
deleted file mode 100644
index 34b8b99ceb9..00000000000
--- a/data/Gootville/E053-gClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM213 1156c0 20 10 44 32 55c-14 9 -20 25 -20 43 c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM248 1156c0 -30 27 -58 65 -58c24 0 42 12 42 28c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM262 723c0 -44 27 -160 27 -160 c80 78 159 190 159 296c0 43 -8 77 -49 77c-81 0 -137 -123 -137 -213zM278 1285c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E054-gClef15ma.xml b/data/Gootville/E054-gClef15ma.xml
deleted file mode 100644
index cd9082e29c7..00000000000
--- a/data/Gootville/E054-gClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM153 1220c0 2 1 3 1 3l49 96s3 5 5 5h51 c2 0 3 -2 3 -4v-192c0 -18 11 -30 21 -30c4 0 12 0 12 -8c0 -7 -6 -10 -12 -10h-101c-6 0 -12 3 -12 10c0 8 8 8 12 8c10 0 20 12 20 30v142l-34 -54c-2 -4 -3 -4 -6 -4c-4 0 -9 4 -9 8zM262 723c0 -44 27 -160 27 -160c80 78 159 190 159 296c0 43 -8 77 -49 77 c-81 0 -137 -123 -137 -213zM304 1132c0 18 14 32 32 32s31 -14 31 -32c0 -12 -7 -23 -18 -28c2 -2 10 -8 22 -8c26 0 43 29 43 65s-23 59 -49 59c-20 0 -27 -3 -35 -9c-6 -4 -8 -5 -10 -5c-7 0 -7 2 -7 8c0 1 1 25 3 46s3 51 3 52c0 7 2 12 6 12c5 0 12 -2 22 -5 s26 -6 44 -6s39 3 49 6s18 5 24 5c3 0 5 -3 5 -7s0 -12 -9 -23s-35 -28 -69 -28c-21 0 -43 4 -61 10l-3 -50c20 13 37 14 53 14c48 0 93 -31 93 -79s-42 -81 -86 -81c-42 0 -83 17 -83 52zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z " /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E05C-cClef.xml b/data/Gootville/E05C-cClef.xml
deleted file mode 100644
index 572428e7c26..00000000000
--- a/data/Gootville/E05C-cClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -490v980c0 6 4 10 10 10h101c6 0 10 -4 10 -10v-980c0 -6 -4 -10 -10 -10h-101c-6 0 -10 4 -10 10zM167 -490v980c0 6 4 10 10 10h10c6 0 10 -4 10 -10v-468c54 43 108 116 108 198c0 11 5 17 13 17s13 -6 13 -17c0 -82 59 -136 119 -136c83 0 86 84 86 198 c0 134 -11 195 -108 195c-24 0 -53 -6 -73 -15c26 -7 45 -30 45 -58c0 -33 -27 -60 -60 -60s-60 27 -60 60c0 60 81 96 148 96c111 0 214 -87 214 -218c0 -122 -84 -222 -192 -222c-31 0 -53 13 -78 28l-53 -88l53 -88c25 15 47 28 78 28c108 0 192 -100 192 -222 c0 -131 -103 -218 -214 -218c-67 0 -148 36 -148 96c0 33 27 60 60 60s60 -27 60 -60c0 -28 -19 -51 -45 -58c20 -9 49 -15 73 -15c97 0 108 61 108 195c0 114 -3 198 -86 198c-60 0 -119 -54 -119 -136c0 -11 -5 -17 -13 -17s-13 6 -13 17c0 82 -54 155 -108 198v-468 c0 -6 -4 -10 -10 -10h-10c-6 0 -10 4 -10 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E05D-cClef8vb.xml b/data/Gootville/E05D-cClef8vb.xml
deleted file mode 100644
index 18b96c64f83..00000000000
--- a/data/Gootville/E05D-cClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -490v980c0 6 4 10 10 10h101c6 0 10 -4 10 -10v-980c0 -6 -4 -10 -10 -10h-101c-6 0 -10 4 -10 10zM167 -490v980c0 6 4 10 10 10h10c6 0 10 -4 10 -10v-468c54 43 108 116 108 198c0 11 5 17 13 17s13 -6 13 -17c0 -82 59 -136 119 -136c83 0 86 84 86 198 c0 134 -11 195 -108 195c-24 0 -53 -6 -73 -15c26 -7 45 -30 45 -58c0 -33 -27 -60 -60 -60s-60 27 -60 60c0 60 81 96 148 96c111 0 214 -87 214 -218c0 -122 -84 -222 -192 -222c-31 0 -53 13 -78 28l-53 -88l53 -88c25 15 47 28 78 28c108 0 192 -100 192 -222 c0 -131 -103 -218 -214 -218c-67 0 -148 36 -148 96c0 33 27 60 60 60s60 -27 60 -60c0 -28 -19 -51 -45 -58c20 -9 49 -15 73 -15c97 0 108 61 108 195c0 114 -3 198 -86 198c-60 0 -119 -54 -119 -136c0 -11 -5 -17 -13 -17s-13 6 -13 17c0 82 -54 155 -108 198v-468 c0 -6 -4 -10 -10 -10h-10c-6 0 -10 4 -10 10zM221 -668c0 20 10 44 32 55c-14 9 -20 25 -20 43c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM256 -668c0 -30 27 -58 65 -58c24 0 42 12 42 28 c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM286 -539c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E062-fClef.xml b/data/Gootville/E062-fClef.xml
deleted file mode 100644
index 83104c2242f..00000000000
--- a/data/Gootville/E062-fClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543 c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E063-fClef15mb.xml b/data/Gootville/E063-fClef15mb.xml
deleted file mode 100644
index 7e63888147d..00000000000
--- a/data/Gootville/E063-fClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543 c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM172 -650c0 2 1 3 1 3l49 96s3 5 5 5h51c2 0 3 -2 3 -4v-192c0 -18 11 -30 21 -30c4 0 12 0 12 -8c0 -7 -6 -10 -12 -10h-101c-6 0 -12 3 -12 10c0 8 8 8 12 8c10 0 20 12 20 30v142l-34 -54c-2 -4 -3 -4 -6 -4c-4 0 -9 4 -9 8z M323 -738c0 18 14 32 32 32s31 -14 31 -32c0 -12 -7 -23 -18 -28c2 -2 10 -8 22 -8c26 0 43 29 43 65s-23 59 -49 59c-20 0 -27 -3 -35 -9c-6 -4 -8 -5 -10 -5c-7 0 -7 2 -7 8c0 1 1 25 3 46s3 51 3 52c0 7 2 12 6 12c5 0 12 -2 22 -5s26 -6 44 -6s39 3 49 6s18 5 24 5 c3 0 5 -3 5 -7s0 -12 -9 -23s-35 -28 -69 -28c-21 0 -43 4 -61 10l-3 -50c20 13 37 14 53 14c48 0 93 -31 93 -79s-42 -81 -86 -81c-42 0 -83 17 -83 52zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38 s-17 -38 -38 -38s-38 17 -38 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E064-fClef8vb.xml b/data/Gootville/E064-fClef8vb.xml
deleted file mode 100644
index 6de57c7469a..00000000000
--- a/data/Gootville/E064-fClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543 c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM232 -714c0 20 10 44 32 55c-14 9 -20 25 -20 43c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM267 -714c0 -30 27 -58 65 -58c24 0 42 12 42 28 c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM297 -585c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38 s-38 17 -38 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E065-fClef8va.xml b/data/Gootville/E065-fClef8va.xml
deleted file mode 100644
index 7733db0fe45..00000000000
--- a/data/Gootville/E065-fClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543 c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM232 330c0 20 10 44 32 55c-14 9 -20 25 -20 43c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM267 330c0 -30 27 -58 65 -58c24 0 42 12 42 28 c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM297 459c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38 s-38 17 -38 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E066-fClef15ma.xml b/data/Gootville/E066-fClef15ma.xml
deleted file mode 100644
index 5f3d0701fca..00000000000
--- a/data/Gootville/E066-fClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200h-41c-6 0 -12 3 -12 10c0 8 8 8 12 8c10 0 20 12 20 30v142l-34 -54 c-2 -4 -3 -4 -6 -4c-4 0 -9 4 -9 8c0 2 1 3 1 3l49 96s3 5 5 5h51c2 0 3 -2 3 -4v-192c0 -18 11 -30 21 -30c4 0 12 0 12 -8c0 -7 -6 -10 -12 -10h-60c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM323 306c0 18 14 32 32 32 s31 -14 31 -32c0 -12 -7 -23 -18 -28c2 -2 10 -8 22 -8c26 0 43 29 43 65s-23 59 -49 59c-20 0 -27 -3 -35 -9c-6 -4 -8 -5 -10 -5c-7 0 -7 2 -7 8c0 1 1 25 3 46s3 51 3 52c0 7 2 12 6 12c5 0 12 -2 22 -5s26 -6 44 -6s39 3 49 6s18 5 24 5c3 0 5 -3 5 -7s0 -12 -9 -23 s-35 -28 -69 -28c-21 0 -43 4 -61 10l-3 -50c20 13 37 14 53 14c48 0 93 -31 93 -79s-42 -81 -86 -81c-42 0 -83 17 -83 52zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38 s-38 17 -38 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E069-unpitchedPercussionClef1.xml b/data/Gootville/E069-unpitchedPercussionClef1.xml
deleted file mode 100644
index 7555ffca9dc..00000000000
--- a/data/Gootville/E069-unpitchedPercussionClef1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 240c0 6 4 10 10 10h94c6 0 10 -4 10 -10v-480c0 -6 -4 -10 -10 -10h-94c-6 0 -10 4 -10 10v480zM226 240c0 6 4 10 10 10h94c6 0 10 -4 10 -10v-480c0 -6 -4 -10 -10 -10h-94c-6 0 -10 4 -10 10v480z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E06A-unpitchedPercussionClef2.xml b/data/Gootville/E06A-unpitchedPercussionClef2.xml
deleted file mode 100644
index d408b20318f..00000000000
--- a/data/Gootville/E06A-unpitchedPercussionClef2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 410c0 6 4 10 10 10h250c6 0 10 -4 10 -10v-820c0 -6 -4 -10 -10 -10h-250c-6 0 -10 4 -10 10v820zM45 330v-660h180v660h-180z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E080-timeSig0.xml b/data/Gootville/E080-timeSig0.xml
deleted file mode 100644
index 8c302f0f33e..00000000000
--- a/data/Gootville/E080-timeSig0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 132 100 243 212 243s212 -111 212 -243s-100 -243 -212 -243s-212 111 -212 243zM132 0c0 -96 0 -217 80 -217s80 121 80 217s0 217 -80 217s-80 -121 -80 -217z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E081-timeSig1.xml b/data/Gootville/E081-timeSig1.xml
deleted file mode 100644
index 0c7dd2ffc8b..00000000000
--- a/data/Gootville/E081-timeSig1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 35c0 4 2 7 2 7l98 192s5 9 9 9h103c4 0 7 -4 7 -8v-384c0 -35 22 -58 41 -58c8 0 24 -1 24 -18c0 -14 -11 -18 -24 -18h-202c-13 0 -24 4 -24 18c0 17 16 18 24 18c19 0 41 23 41 58v285l-68 -107c-4 -7 -7 -10 -13 -10c-9 0 -18 7 -18 16z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E082-timeSig2.xml b/data/Gootville/E082-timeSig2.xml
deleted file mode 100644
index 609e6f0368b..00000000000
--- a/data/Gootville/E082-timeSig2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -214c0 83 70 142 126 181s110 81 110 147c0 61 -22 98 -78 98c-33 0 -48 -9 -55 -14c21 -10 36 -32 36 -57c0 -35 -28 -63 -63 -63s-63 28 -63 63c0 70 80 102 165 102c91 0 177 -40 177 -129c0 -93 -95 -150 -159 -171s-111 -50 -142 -88c33 26 78 45 120 45 c30 0 52 -6 76 -18s40 -20 56 -20c20 0 32 12 38 18s16 12 22 12s10 -4 10 -12c0 -50 -64 -123 -116 -123c-32 0 -56 7 -80 23s-48 26 -72 26s-36 -4 -54 -18s-26 -20 -34 -20s-20 5 -20 18z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E083-timeSig3.xml b/data/Gootville/E083-timeSig3.xml
deleted file mode 100644
index 670a29e2c8c..00000000000
--- a/data/Gootville/E083-timeSig3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -140c0 35 28 63 63 63s63 -28 63 -63c0 -25 -15 -47 -37 -57c6 -5 21 -15 45 -15c54 0 83 47 83 98c0 67 -47 121 -97 121c-12 0 -16 7 -16 13s4 13 16 13c50 0 101 38 101 92c0 56 -31 87 -76 87c-33 0 -48 -9 -55 -14c21 -10 36 -32 36 -57c0 -35 -28 -63 -63 -63 s-63 28 -63 63c0 70 80 102 165 102c91 0 167 -30 167 -118c0 -59 -60 -83 -120 -105c85 -18 125 -51 125 -134c0 -70 -85 -129 -172 -129c-85 0 -165 33 -165 103z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E084-timeSig4.xml b/data/Gootville/E084-timeSig4.xml
deleted file mode 100644
index f50884bfc8a..00000000000
--- a/data/Gootville/E084-timeSig4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -106c0 3 0 9 9 19c72 78 126 214 126 308c0 14 1 22 9 22h174c7 0 9 -6 9 -12c0 -3 -2 -8 -5 -11l-272 -307h149v104c0 12 12 25 36 51l59 66s8 10 16 10c3 0 9 -1 9 -10v-221h39s13 -1 13 -17s-13 -17 -13 -17h-39v-28c0 -35 22 -58 41 -58c8 0 24 -1 24 -18 c0 -14 -11 -18 -24 -18h-202c-13 0 -24 4 -24 18c0 17 16 18 24 18c19 0 41 23 41 58v28h-180c-9 0 -19 6 -19 15z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E085-timeSig5.xml b/data/Gootville/E085-timeSig5.xml
deleted file mode 100644
index 8e4e434e8c7..00000000000
--- a/data/Gootville/E085-timeSig5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -140c0 35 28 63 63 63s63 -28 63 -63c0 -25 -15 -47 -37 -57c6 -5 21 -15 45 -15c51 0 85 58 85 130s-45 118 -97 118c-40 0 -54 -7 -70 -18s-18 -11 -25 -11c-10 0 -10 10 -10 18c0 2 3 50 6 92s7 102 7 104c0 14 3 22 11 22c12 0 25 -3 45 -9s52 -12 88 -12 s77 6 97 12s37 9 49 9c6 0 10 -6 10 -13s0 -25 -18 -47s-70 -55 -138 -55c-42 0 -88 9 -123 20l-6 -99c39 26 75 27 107 27c95 0 185 -63 185 -158s-84 -161 -172 -161c-85 0 -165 33 -165 103z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E086-timeSig6.xml b/data/Gootville/E086-timeSig6.xml
deleted file mode 100644
index cdb50b3162c..00000000000
--- a/data/Gootville/E086-timeSig6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 2c0 136 103 241 226 241c74 0 147 -38 147 -98c0 -35 -28 -63 -63 -63s-63 28 -63 63c0 28 17 51 42 60c-7 5 -22 12 -51 12c-81 0 -105 -99 -105 -199c31 18 54 22 80 22c89 0 177 -27 177 -141c0 -75 -87 -142 -177 -142c-127 0 -213 127 -213 245zM154 -101 c0 -60 10 -116 59 -116s59 56 59 116s-10 116 -59 116s-59 -56 -59 -116z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E087-timeSig7.xml b/data/Gootville/E087-timeSig7.xml
deleted file mode 100644
index 8b7ea7b1e60..00000000000
--- a/data/Gootville/E087-timeSig7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 109v115c0 8 7 10 13 10s11 -2 15 -5s7 -5 13 -5c12 0 29 5 45 10s33 9 51 9c42 0 87 -15 108 -32s31 -18 42 -18c21 0 34 11 51 33c4 6 7 8 13 8s12 -4 12 -11c0 -61 -54 -173 -83 -221s-56 -128 -56 -220c0 -20 0 -25 -10 -25h-132c-9 0 -10 5 -10 25 c0 98 82 206 134 254s81 83 107 126c-35 -26 -76 -42 -116 -42c-33 0 -65 11 -90 32c-17 14 -28 20 -38 20c-21 0 -29 -22 -39 -58c-3 -12 -10 -15 -17 -15s-13 3 -13 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E088-timeSig8.xml b/data/Gootville/E088-timeSig8.xml
deleted file mode 100644
index 5bfa451cbee..00000000000
--- a/data/Gootville/E088-timeSig8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -91c0 39 22 87 65 109c-28 18 -40 51 -40 87c0 86 70 138 175 138s175 -52 175 -138c0 -36 -20 -64 -40 -87c45 -31 65 -61 65 -109c0 -101 -109 -152 -200 -152s-200 62 -200 152zM70 -91c0 -61 54 -118 130 -118c47 0 83 26 83 57c0 51 -87 98 -176 141 c-17 -20 -37 -47 -37 -80zM130 166c0 -50 84 -90 146 -119c13 13 17 41 17 58c0 52 -34 104 -93 104c-46 0 -70 -21 -70 -43z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E089-timeSig9.xml b/data/Gootville/E089-timeSig9.xml
deleted file mode 100644
index bace0de1d4d..00000000000
--- a/data/Gootville/E089-timeSig9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 101c0 75 87 142 177 142c127 0 213 -127 213 -245c0 -136 -103 -241 -226 -241c-74 0 -147 38 -147 98c0 35 28 63 63 63s63 -28 63 -63c0 -28 -17 -51 -42 -60c7 -5 22 -12 51 -12c81 0 105 99 105 199c-31 -18 -54 -22 -80 -22c-89 0 -177 27 -177 141zM118 101 c0 -60 10 -116 59 -116s59 56 59 116s-10 116 -59 116s-59 -56 -59 -116z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E08A-timeSigCommon.xml b/data/Gootville/E08A-timeSigCommon.xml
deleted file mode 100644
index 8393e1c53d0..00000000000
--- a/data/Gootville/E08A-timeSigCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 124 97 243 244 243c75 0 173 -41 173 -120c0 -39 -32 -71 -71 -71s-71 32 -71 71c0 37 28 68 64 71c-17 10 -47 25 -95 25c-108 0 -132 -59 -132 -219s35 -219 132 -219c108 0 158 83 158 142c0 12 8 14 12 14s12 -2 12 -14c0 -98 -89 -166 -182 -166 c-147 0 -244 119 -244 243z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E08B-timeSigCutCommon.xml b/data/Gootville/E08B-timeSigCutCommon.xml
deleted file mode 100644
index 03d999a63c3..00000000000
--- a/data/Gootville/E08B-timeSigCutCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 115 84 226 214 241v157s0 14 15 14s15 -14 15 -14v-155c75 0 173 -41 173 -120c0 -39 -32 -71 -71 -71s-71 32 -71 71c0 37 28 68 64 71c-17 10 -47 25 -95 25v-438c108 0 158 83 158 142c0 12 8 14 12 14s12 -2 12 -14c0 -98 -89 -166 -182 -166v-155 s0 -14 -15 -14s-15 14 -15 14v157c-130 15 -214 126 -214 241zM112 0c0 -142 28 -205 102 -217v434c-83 -11 -102 -73 -102 -217z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E092-timeSigParensLeftSmall.xml b/data/Gootville/E092-timeSigParensLeftSmall.xml
deleted file mode 100644
index a70bfad9455..00000000000
--- a/data/Gootville/E092-timeSigParensLeftSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E093-timeSigParensRightSmall.xml b/data/Gootville/E093-timeSigParensRightSmall.xml
deleted file mode 100644
index 198c428d3bd..00000000000
--- a/data/Gootville/E093-timeSigParensRightSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E094-timeSigParensLeft.xml b/data/Gootville/E094-timeSigParensLeft.xml
deleted file mode 100644
index 4616037fe5b..00000000000
--- a/data/Gootville/E094-timeSigParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E095-timeSigParensRight.xml b/data/Gootville/E095-timeSigParensRight.xml
deleted file mode 100644
index 8b29dac8529..00000000000
--- a/data/Gootville/E095-timeSigParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A0-noteheadDoubleWhole.xml b/data/Gootville/E0A0-noteheadDoubleWhole.xml
deleted file mode 100644
index b2f9ef82a88..00000000000
--- a/data/Gootville/E0A0-noteheadDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -157v314s0 20 20 20s20 -20 20 -20v-314s0 -20 -20 -20s-20 20 -20 20zM68 -157v314s0 20 20 20s20 -20 20 -20v-139c15 66 110 117 224 117s211 -51 226 -117v139s0 20 20 20s20 -20 20 -20v-314s0 -20 -20 -20s-20 20 -20 20v139c-15 -66 -112 -117 -226 -117 s-209 51 -224 117v-139s0 -20 -20 -20s-20 20 -20 20zM231 30c0 -73 69 -148 128 -148c41 0 76 39 76 88c0 73 -69 148 -128 148c-41 0 -76 -39 -76 -88zM626 -157v314s0 20 20 20s20 -20 20 -20v-314s0 -20 -20 -20s-20 20 -20 20z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A1-noteheadDoubleWholeSquare.xml b/data/Gootville/E0A1-noteheadDoubleWholeSquare.xml
deleted file mode 100644
index 9766e573ca8..00000000000
--- a/data/Gootville/E0A1-noteheadDoubleWholeSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -210v420s0 20 20 20s20 -20 20 -20v-30s0 -40 30 -40h384c30 0 30 40 30 40v30s0 20 20 20s20 -20 20 -20v-420s0 -20 -20 -20s-20 20 -20 20v30s0 40 -30 40h-384c-30 0 -30 -40 -30 -40v-30s0 -20 -20 -20s-20 20 -20 20zM40 10v-20c0 -25 0 -50 60 -50h324 c60 0 60 25 60 50v20c0 25 0 50 -60 50h-324c-60 0 -60 -25 -60 -50z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A2-noteheadWhole.xml b/data/Gootville/E0A2-noteheadWhole.xml
deleted file mode 100644
index 7ace761da31..00000000000
--- a/data/Gootville/E0A2-noteheadWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 75 102 135 226 135s228 -60 228 -135s-104 -135 -228 -135s-226 60 -226 135zM125 30c0 -73 69 -148 128 -148c41 0 76 39 76 88c0 73 -69 148 -128 148c-41 0 -76 -39 -76 -88z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A3-noteheadHalf.xml b/data/Gootville/E0A3-noteheadHalf.xml
deleted file mode 100644
index 522159b9e16..00000000000
--- a/data/Gootville/E0A3-noteheadHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37c0 92 97 172 201 172c67 0 115 -40 115 -98c0 -92 -97 -172 -201 -172c-67 0 -115 40 -115 98zM35 -80c0 -11 8 -18 22 -18c62 0 224 129 224 178c0 11 -8 18 -22 18c-62 0 -224 -129 -224 -178z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A4-noteheadBlack.xml b/data/Gootville/E0A4-noteheadBlack.xml
deleted file mode 100644
index cc55ca5ad8b..00000000000
--- a/data/Gootville/E0A4-noteheadBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37c0 92 97 172 201 172c67 0 115 -40 115 -98c0 -92 -97 -172 -201 -172c-67 0 -115 40 -115 98z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A9-noteheadXBlack.xml b/data/Gootville/E0A9-noteheadXBlack.xml
deleted file mode 100644
index fc69f03b4f2..00000000000
--- a/data/Gootville/E0A9-noteheadXBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -116c0 6 4 13 9 17l109 99l-109 99c-5 4 -9 11 -9 17c0 12 10 22 22 22c5 0 11 -2 15 -6l113 -103l113 103c4 4 10 6 15 6c12 0 22 -10 22 -22c0 -6 -4 -13 -9 -17l-109 -99l109 -99c5 -4 9 -11 9 -17c0 -12 -10 -22 -22 -22c-5 0 -11 2 -15 6l-113 103l-113 -103 c-4 -4 -10 -6 -15 -6c-12 0 -22 10 -22 22z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0D9-noteheadDiamondHalf.xml b/data/Gootville/E0D9-noteheadDiamondHalf.xml
deleted file mode 100644
index de4b2eabe44..00000000000
--- a/data/Gootville/E0D9-noteheadDiamondHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 4 11 39 25s77 51 108 103c5 9 8 11 14 11s9 -2 14 -11c31 -52 73 -89 108 -103s39 -18 39 -25s-4 -11 -39 -25s-77 -51 -108 -103c-5 -9 -8 -11 -14 -11s-9 2 -14 11c-31 52 -73 89 -108 103s-39 18 -39 25zM66 -12c30 -20 64 -43 84 -73c10 23 83 87 106 97 c-30 20 -64 43 -84 73c-10 -23 -83 -87 -106 -97z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DA-noteheadDiamondHalfWide.xml b/data/Gootville/E0DA-noteheadDiamondHalfWide.xml
deleted file mode 100644
index d014c05f839..00000000000
--- a/data/Gootville/E0DA-noteheadDiamondHalfWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 6 11 56 25s111 51 155 103c7 9 11 11 20 11s13 -2 20 -11c44 -52 105 -89 155 -103s56 -18 56 -25s-6 -11 -56 -25s-111 -51 -155 -103c-7 -9 -11 -11 -20 -11s-13 2 -20 11c-44 52 -105 89 -155 103s-56 18 -56 25zM114 0c47 -28 85 -61 117 -104 c32 43 70 76 117 104c-47 28 -85 61 -117 104c-32 -43 -70 -76 -117 -104z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DB-noteheadDiamondBlack.xml b/data/Gootville/E0DB-noteheadDiamondBlack.xml
deleted file mode 100644
index 64b5632bcdc..00000000000
--- a/data/Gootville/E0DB-noteheadDiamondBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 4 11 39 25s77 51 108 103c5 9 8 11 14 11s9 -2 14 -11c31 -52 73 -89 108 -103s39 -18 39 -25s-4 -11 -39 -25s-77 -51 -108 -103c-5 -9 -8 -11 -14 -11s-9 2 -14 11c-31 52 -73 89 -108 103s-39 18 -39 25z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DC-noteheadDiamondBlackWide.xml b/data/Gootville/E0DC-noteheadDiamondBlackWide.xml
deleted file mode 100644
index 491cddc5f6e..00000000000
--- a/data/Gootville/E0DC-noteheadDiamondBlackWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 6 11 56 25s111 51 155 103c7 9 11 11 20 11s13 -2 20 -11c44 -52 105 -89 155 -103s56 -18 56 -25s-6 -11 -56 -25s-111 -51 -155 -103c-7 -9 -11 -11 -20 -11s-13 2 -20 11c-44 52 -105 89 -155 103s-56 18 -56 25z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DD-noteheadDiamondWhite.xml b/data/Gootville/E0DD-noteheadDiamondWhite.xml
deleted file mode 100644
index 5ee1714badb..00000000000
--- a/data/Gootville/E0DD-noteheadDiamondWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 4 11 39 25s77 51 108 103c5 9 8 11 14 11s9 -2 14 -11c31 -52 73 -89 108 -103s39 -18 39 -25s-4 -11 -39 -25s-77 -51 -108 -103c-5 -9 -8 -11 -14 -11s-9 2 -14 11c-31 52 -73 89 -108 103s-39 18 -39 25zM66 -12c30 -20 64 -43 84 -73c10 23 83 87 106 97 c-30 20 -64 43 -84 73c-10 -23 -83 -87 -106 -97z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DE-noteheadDiamondWhiteWide.xml b/data/Gootville/E0DE-noteheadDiamondWhiteWide.xml
deleted file mode 100644
index 8936cac6828..00000000000
--- a/data/Gootville/E0DE-noteheadDiamondWhiteWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 6 11 56 25s111 51 155 103c7 9 11 11 20 11s13 -2 20 -11c44 -52 105 -89 155 -103s56 -18 56 -25s-6 -11 -56 -25s-111 -51 -155 -103c-7 -9 -11 -11 -20 -11s-13 2 -20 11c-44 52 -105 89 -155 103s-56 18 -56 25zM114 0c47 -28 85 -61 117 -104 c32 43 70 76 117 104c-47 28 -85 61 -117 104c-32 -43 -70 -76 -117 -104z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0F5-noteheadParenthesisLeft.xml b/data/Gootville/E0F5-noteheadParenthesisLeft.xml
deleted file mode 100644
index d5f6beec4d6..00000000000
--- a/data/Gootville/E0F5-noteheadParenthesisLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0F6-noteheadParenthesisRight.xml b/data/Gootville/E0F6-noteheadParenthesisRight.xml
deleted file mode 100644
index 70ee196b732..00000000000
--- a/data/Gootville/E0F6-noteheadParenthesisRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E101-noteheadSlashHorizontalEnds.xml b/data/Gootville/E101-noteheadSlashHorizontalEnds.xml
deleted file mode 100644
index 95fcd0be4f1..00000000000
--- a/data/Gootville/E101-noteheadSlashHorizontalEnds.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E101" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -224c0 6 79 394 90 448c3 13 9 22 19 22h87c10 0 16 -11 16 -22c0 -6 -79 -394 -90 -448c-3 -13 -9 -22 -19 -22h-87c-10 0 -16 11 -16 22z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E102-noteheadSlashWhiteWhole.xml b/data/Gootville/E102-noteheadSlashWhiteWhole.xml
deleted file mode 100644
index 682e8c0dba3..00000000000
--- a/data/Gootville/E102-noteheadSlashWhiteWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E102" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -224c0 6 79 394 90 448c3 13 9 22 19 22h275c10 0 16 -11 16 -22c0 -6 -79 -394 -90 -448c-3 -13 -9 -22 -19 -22h-275c-10 0 -16 11 -16 22zM51 -200h217l81 400h-217z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E103-noteheadSlashWhiteHalf.xml b/data/Gootville/E103-noteheadSlashWhiteHalf.xml
deleted file mode 100644
index eb5d00e92b2..00000000000
--- a/data/Gootville/E103-noteheadSlashWhiteHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E103" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -224c0 6 79 394 90 448c3 13 9 22 19 22h161c10 0 16 -11 16 -22c0 -6 -79 -394 -90 -448c-3 -13 -9 -22 -19 -22h-161c-10 0 -16 11 -16 22zM51 -200h103l81 400h-103z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E240-flag8thUp.xml b/data/Gootville/E240-flag8thUp.xml
deleted file mode 100644
index e4ba9fc2348..00000000000
--- a/data/Gootville/E240-flag8thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 0 0 14 15 14s15 -14 15 -14c24 -66 58 -116 119 -191s135 -166 135 -282c0 -88 -33 -184 -101 -264c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210c0 159 -91 230 -215 273h-30v224z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E241-flag8thDown.xml b/data/Gootville/E241-flag8thDown.xml
deleted file mode 100644
index 48fb7a85db9..00000000000
--- a/data/Gootville/E241-flag8thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v224h30c156 0 245 121 245 273c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -143 -77 -226 -143 -291s-117 -116 -141 -182c0 0 0 -14 -15 -14s-15 14 -15 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E242-flag16thUp.xml b/data/Gootville/E242-flag16thUp.xml
deleted file mode 100644
index 18c197ae300..00000000000
--- a/data/Gootville/E242-flag16thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 0 0 14 15 14s15 -14 15 -14c24 -66 123 -161 171 -206s83 -109 83 -187c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -88 -33 -184 -101 -264c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210c0 140 -89 215 -215 215h-30v406zM30 -202v-2 c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E243-flag16thDown.xml b/data/Gootville/E243-flag16thDown.xml
deleted file mode 100644
index 44eb2b8c86e..00000000000
--- a/data/Gootville/E243-flag16thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v406h30c129 21 245 83 245 237c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -90 -50 -168 -108 -216s-152 -133 -176 -199c0 0 0 -14 -15 -14s-15 14 -15 14zM30 202 c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E244-flag32ndUp.xml b/data/Gootville/E244-flag32ndUp.xml
deleted file mode 100644
index 87c20821c3b..00000000000
--- a/data/Gootville/E244-flag32ndUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 220c0 0 0 14 15 14s15 -14 15 -14c24 -66 123 -161 171 -206s83 -109 83 -187c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -88 -33 -184 -101 -264c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210 c0 140 -89 215 -215 215h-30v610zM30 16c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2zM30 -186v-2c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E245-flag32ndDown.xml b/data/Gootville/E245-flag32ndDown.xml
deleted file mode 100644
index 3f073e0d965..00000000000
--- a/data/Gootville/E245-flag32ndDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -190v610h30c129 21 245 83 245 237c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -90 -50 -168 -108 -216s-152 -133 -176 -199 c0 0 0 -14 -15 -14s-15 14 -15 14zM30 12c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2zM30 216c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E246-flag64thUp.xml b/data/Gootville/E246-flag64thUp.xml
deleted file mode 100644
index 5caa85bff72..00000000000
--- a/data/Gootville/E246-flag64thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -404v814s0 14 15 14s15 -14 15 -14c24 -66 123 -161 171 -206s83 -109 83 -187c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -88 -33 -184 -101 -264 c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210c0 140 -89 215 -215 215h-30zM30 2c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2zM30 -200v-2c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41 c0 140 -89 215 -215 215zM30 206c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E247-flag64thDown.xml b/data/Gootville/E247-flag64thDown.xml
deleted file mode 100644
index 71e7994f3be..00000000000
--- a/data/Gootville/E247-flag64thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 404h30c129 21 245 83 245 237c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113 c0 -90 -50 -168 -108 -216s-152 -133 -176 -199c0 0 0 -14 -15 -14s-15 14 -15 14v814zM30 -2v-2c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185zM30 200c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89 s-135 -119 -159 -185v-2zM30 -206v-2c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E248-flag128thUp.xml b/data/Gootville/E248-flag128thUp.xml
deleted file mode 100644
index ab5844916e7..00000000000
--- a/data/Gootville/E248-flag128thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -388v1018s0 14 15 14s15 -14 15 -14c24 -66 123 -161 171 -206s83 -109 83 -187c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92 c0 -88 -33 -184 -101 -264c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210c0 140 -89 215 -215 215h-30zM30 18c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2zM30 -184v-2c24 -66 123 -161 155 -190s45 -46 57 -64 c2 13 3 27 3 41c0 140 -89 215 -215 215zM30 222c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2zM30 426c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E249-flag128thDown.xml b/data/Gootville/E249-flag128thDown.xml
deleted file mode 100644
index 83865377573..00000000000
--- a/data/Gootville/E249-flag128thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 418h30c129 21 245 83 245 237c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113 c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -90 -50 -168 -108 -216s-152 -133 -176 -199c0 0 0 -14 -15 -14s-15 14 -15 14v1018zM30 10c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2zM30 -192v-2c129 21 245 83 245 237 c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185zM30 214c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2zM30 -396v-2c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185z " /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E260-accidentalFlat.xml b/data/Gootville/E260-accidentalFlat.xml
deleted file mode 100644
index 68f4eb10093..00000000000
--- a/data/Gootville/E260-accidentalFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-15 -153v599s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E261-accidentalNatural.xml b/data/Gootville/E261-accidentalNatural.xml
deleted file mode 100644
index 9d813821f22..00000000000
--- a/data/Gootville/E261-accidentalNatural.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -169v492s0 14 15 14s15 -14 15 -14v-175l131 32c12 0 15 -11 15 -11v-492s0 -14 -15 -14s-15 14 -15 14v175l-131 -32c-12 0 -15 11 -15 11zM30 56v-140l116 28v140z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E262-accidentalSharp.xml b/data/Gootville/E262-accidentalSharp.xml
deleted file mode 100644
index 699ccb6ffc5..00000000000
--- a/data/Gootville/E262-accidentalSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 64v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181 s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10zM84 71v-159l68 17v159z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E263-accidentalDoubleSharp.xml b/data/Gootville/E263-accidentalDoubleSharp.xml
deleted file mode 100644
index 5aa1fa35e44..00000000000
--- a/data/Gootville/E263-accidentalDoubleSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -55c0 6 4 10 10 10h58s45 20 45 45s-45 45 -45 45h-58c-6 0 -10 4 -10 10v70c0 6 4 10 10 10h70c6 0 10 -4 10 -10v-58s20 -45 45 -45s45 45 45 45v58c0 6 4 10 10 10h70c6 0 10 -4 10 -10v-70c0 -6 -4 -10 -10 -10h-58s-45 -20 -45 -45s45 -45 45 -45h58 c6 0 10 -4 10 -10v-70c0 -6 -4 -10 -10 -10h-70c-6 0 -10 4 -10 10v58s-20 45 -45 45s-45 -45 -45 -45v-58c0 -6 -4 -10 -10 -10h-70c-6 0 -10 4 -10 10v70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E264-accidentalDoubleFlat.xml b/data/Gootville/E264-accidentalDoubleFlat.xml
deleted file mode 100644
index dd9dfea1957..00000000000
--- a/data/Gootville/E264-accidentalDoubleFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-15 -153v599s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c22 0 39 -6 53 -16v318s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12v123c-29 -44 -76 -81 -105 -103 s-44 -32 -50 -32c-8 0 -15 5 -15 12zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39zM185 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E26A-accidentalParensLeft.xml b/data/Gootville/E26A-accidentalParensLeft.xml
deleted file mode 100644
index e4080e976e5..00000000000
--- a/data/Gootville/E26A-accidentalParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E26B-accidentalParensRight.xml b/data/Gootville/E26B-accidentalParensRight.xml
deleted file mode 100644
index 13254143173..00000000000
--- a/data/Gootville/E26B-accidentalParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E270-accidentalQuarterToneFlatArrowUp.xml b/data/Gootville/E270-accidentalQuarterToneFlatArrowUp.xml
deleted file mode 100644
index d0a1de762fe..00000000000
--- a/data/Gootville/E270-accidentalQuarterToneFlatArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-79 444c0 6 3 11 3 11c18 31 48 93 56 128s10 40 20 40s12 -5 20 -40s38 -97 56 -128c0 0 3 -5 3 -11c0 -8 -6 -13 -13 -13c-8 0 -18 4 -26 8s-25 7 -25 7v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19 c-8 0 -15 5 -15 12v599s-17 -3 -25 -7s-18 -8 -26 -8c-7 0 -13 5 -13 13zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E271-accidentalThreeQuarterTonesFlatArrowDown.xml b/data/Gootville/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
deleted file mode 100644
index 5f55aa86418..00000000000
--- a/data/Gootville/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-79 -193c0 8 6 13 13 13c8 0 18 -4 26 -8s25 -7 25 -7v641s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208l-17 -13v-36s17 3 25 7s18 8 26 8c7 0 13 -5 13 -13c0 -6 -3 -11 -3 -11c-18 -31 -48 -93 -56 -128 s-10 -40 -20 -40s-12 5 -20 40s-38 97 -56 128c0 0 -3 5 -3 11zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E272-accidentalQuarterToneSharpNaturalArrowUp.xml b/data/Gootville/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
deleted file mode 100644
index f29ae12db4b..00000000000
--- a/data/Gootville/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 321c0 6 3 11 3 11c18 31 48 93 56 128s10 40 20 40s12 -5 20 -40s38 -97 56 -128c0 0 3 -5 3 -11c0 -8 -6 -13 -13 -13c-8 0 -18 4 -26 8s-25 7 -25 7v-175l131 32c12 0 15 -11 15 -11v-492s0 -14 -15 -14s-15 14 -15 14v175l-131 -32c-12 0 -15 11 -15 11v492 s-17 -3 -25 -7s-18 -8 -26 -8c-7 0 -13 5 -13 13zM94 56v-140l116 28v140z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E273-accidentalQuarterToneFlatNaturalArrowDown.xml b/data/Gootville/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
deleted file mode 100644
index 06c9c9efba9..00000000000
--- a/data/Gootville/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -169v492s0 14 15 14s15 -14 15 -14v-175l131 32c12 0 15 -11 15 -11v-492s17 3 25 7s18 8 26 8c7 0 13 -5 13 -13c0 -6 -3 -11 -3 -11c-18 -31 -48 -93 -56 -128s-10 -40 -20 -40s-12 5 -20 40s-38 97 -56 128c0 0 -3 5 -3 11c0 8 6 13 13 13c8 0 18 -4 26 -8 s25 -7 25 -7v175l-131 -32c-12 0 -15 11 -15 11zM30 56v-140l116 28v140z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E274-accidentalThreeQuarterTonesSharpArrowUp.xml b/data/Gootville/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
deleted file mode 100644
index 33c0c544b1b..00000000000
--- a/data/Gootville/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 64v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v234s-17 -3 -25 -7s-18 -8 -26 -8c-7 0 -13 5 -13 13c0 6 3 11 3 11c18 31 48 93 56 128s10 40 20 40s12 -5 20 -40s38 -97 56 -128c0 0 3 -5 3 -11c0 -8 -6 -13 -13 -13c-8 0 -18 4 -26 8 s-25 7 -25 7v-227s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10 c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10zM84 71v-159l68 17v159z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E275-accidentalQuarterToneSharpArrowDown.xml b/data/Gootville/E275-accidentalQuarterToneSharpArrowDown.xml
deleted file mode 100644
index c5a526f5f4a..00000000000
--- a/data/Gootville/E275-accidentalQuarterToneSharpArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-10 -413c0 8 6 13 13 13c8 0 18 -4 26 -8s25 -7 25 -7v227s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14 v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-234s17 3 25 7s18 8 26 8c7 0 13 -5 13 -13c0 -6 -3 -11 -3 -11 c-18 -31 -48 -93 -56 -128s-10 -40 -20 -40s-12 5 -20 40s-38 97 -56 128c0 0 -3 5 -3 11zM84 71v-159l68 17v159z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E280-accidentalQuarterToneFlatStein.xml b/data/Gootville/E280-accidentalQuarterToneFlatStein.xml
deleted file mode 100644
index dfa28971928..00000000000
--- a/data/Gootville/E280-accidentalQuarterToneFlatStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 62c0 46 30 82 83 82c35 0 56 -11 87 -36v338s0 14 15 14s15 -14 15 -14v-599c0 -7 -7 -12 -15 -12c-6 0 -20 10 -32 19c-77 58 -153 121 -153 208zM77 62c0 -90 59 -144 93 -174v170c-13 19 -32 39 -56 39c-26 0 -37 -14 -37 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E281-accidentalThreeQuarterTonesFlatZimmermann.xml b/data/Gootville/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
deleted file mode 100644
index 9e8a50d7fd4..00000000000
--- a/data/Gootville/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 62c0 46 30 82 83 82c35 0 56 -11 87 -36v338s0 14 15 14s15 -14 15 -14v-599c0 -7 -7 -12 -15 -12c-6 0 -20 10 -32 19c-77 58 -153 121 -153 208zM77 62c0 -90 59 -144 93 -174v170c-13 19 -32 39 -56 39c-26 0 -37 -14 -37 -35zM246 -153v599s0 14 15 14 s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12zM276 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E282-accidentalQuarterToneSharpStein.xml b/data/Gootville/E282-accidentalQuarterToneSharpStein.xml
deleted file mode 100644
index 2d03dc8f0fd..00000000000
--- a/data/Gootville/E282-accidentalQuarterToneSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 76v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10 c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E283-accidentalThreeQuarterTonesSharpStein.xml b/data/Gootville/E283-accidentalThreeQuarterTonesSharpStein.xml
deleted file mode 100644
index 2817f6302c0..00000000000
--- a/data/Gootville/E283-accidentalThreeQuarterTonesSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 52v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65 c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10 c-6 0 -12 1 -15 10zM84 59v-159l68 17v159zM182 -76l68 17v159l-68 -17v-159z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E440-accidentalBuyukMucennebFlat.xml b/data/Gootville/E440-accidentalBuyukMucennebFlat.xml
deleted file mode 100644
index a23ac0f6b52..00000000000
--- a/data/Gootville/E440-accidentalBuyukMucennebFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-129 155c0 6 3 10 8 13l106 53v82l-92 -46c-2 -1 -5 -2 -7 -2c-8 0 -15 6 -15 15c0 6 3 10 8 13l106 53v110s0 14 15 14s15 -14 15 -14v-95l92 46c2 1 5 2 7 2c8 0 15 -6 15 -15c0 -6 -3 -10 -8 -13l-106 -53v-82l92 46c2 1 5 2 7 2c8 0 15 -6 15 -15 c0 -6 -3 -10 -8 -13l-106 -53v-95c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12v341l-92 -46c-2 -1 -5 -2 -7 -2c-8 0 -15 6 -15 15zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35 c-24 0 -43 -20 -56 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E441-accidentalKucukMucennebFlat.xml b/data/Gootville/E441-accidentalKucukMucennebFlat.xml
deleted file mode 100644
index a3cd5ba934e..00000000000
--- a/data/Gootville/E441-accidentalKucukMucennebFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E441" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-15 -153v599s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E442-accidentalBakiyeFlat.xml b/data/Gootville/E442-accidentalBakiyeFlat.xml
deleted file mode 100644
index b8c9c4261f4..00000000000
--- a/data/Gootville/E442-accidentalBakiyeFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-129 200c0 6 3 10 8 13l106 53v180s0 14 15 14s15 -14 15 -14v-165l92 46c2 1 5 2 7 2c8 0 15 -6 15 -15c0 -6 -3 -10 -8 -13l-106 -53v-140c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12v386l-92 -46 c-2 -1 -5 -2 -7 -2c-8 0 -15 6 -15 15zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E443-accidentalKomaFlat.xml b/data/Gootville/E443-accidentalKomaFlat.xml
deleted file mode 100644
index bdd7c6e462d..00000000000
--- a/data/Gootville/E443-accidentalKomaFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E443" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 62c0 46 30 82 83 82c35 0 56 -11 87 -36v338s0 14 15 14s15 -14 15 -14v-599c0 -7 -7 -12 -15 -12c-6 0 -20 10 -32 19c-77 58 -153 121 -153 208zM77 62c0 -90 59 -144 93 -174v170c-13 19 -32 39 -56 39c-26 0 -37 -14 -37 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E444-accidentalKomaSharp.xml b/data/Gootville/E444-accidentalKomaSharp.xml
deleted file mode 100644
index 04240b8d4c6..00000000000
--- a/data/Gootville/E444-accidentalKomaSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E444" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 76v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10 c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E445-accidentalBakiyeSharp.xml b/data/Gootville/E445-accidentalBakiyeSharp.xml
deleted file mode 100644
index 7309eec8c2e..00000000000
--- a/data/Gootville/E445-accidentalBakiyeSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E445" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 64v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181 s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10zM84 71v-159l68 17v159z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E446-accidentalKucukMucennebSharp.xml b/data/Gootville/E446-accidentalKucukMucennebSharp.xml
deleted file mode 100644
index 955d07fd7c8..00000000000
--- a/data/Gootville/E446-accidentalKucukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 9c0 13 15 18 15 18l64 16v73s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v141s0 14 15 14s15 -14 15 -14v-134s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-73s61 16 64 16c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18 l-64 -16v-73s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-141s0 -14 -15 -14s-15 14 -15 14v134s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v73s-61 -16 -64 -16c-6 0 -12 1 -15 10v65z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E447-accidentalBuyukMucennebSharp.xml b/data/Gootville/E447-accidentalBuyukMucennebSharp.xml
deleted file mode 100644
index 5b6c437d7b1..00000000000
--- a/data/Gootville/E447-accidentalBuyukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -3c0 13 15 18 15 18l64 16v73s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v141s0 14 15 14s15 -14 15 -14v-134l68 17v141s0 14 15 14s15 -14 15 -14v-134s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-73s61 16 64 16 c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-64 -16v-73s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-141s0 -14 -15 -14s-15 14 -15 14v134l-68 -17v-141s0 -14 -15 -14s-15 14 -15 14v134s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18 l39 10v73s-61 -16 -64 -16c-6 0 -12 1 -15 10v65zM109 38l68 17v73l-68 -17v-73zM109 -55v-73l68 17v73z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A0-articAccentAbove.xml b/data/Gootville/E4A0-articAccentAbove.xml
deleted file mode 100644
index 59a79c428ca..00000000000
--- a/data/Gootville/E4A0-articAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 19c0 9 7 17 16 19l330 89l-330 89c-9 2 -16 10 -16 19c0 10 9 19 19 19c6 0 11 -2 11 -2l401 -109s11 -3 11 -16s-11 -16 -11 -16l-401 -109s-5 -2 -11 -2c-10 0 -19 9 -19 19z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A1-articAccentBelow.xml b/data/Gootville/E4A1-articAccentBelow.xml
deleted file mode 100644
index 1fcc16e6274..00000000000
--- a/data/Gootville/E4A1-articAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -19c0 10 9 19 19 19c6 0 11 -2 11 -2l401 -109s11 -3 11 -16s-11 -16 -11 -16l-401 -109s-5 -2 -11 -2c-10 0 -19 9 -19 19c0 9 7 17 16 19l330 89l-330 89c-9 2 -16 10 -16 19z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A2-articStaccatoAbove.xml b/data/Gootville/E4A2-articStaccatoAbove.xml
deleted file mode 100644
index e0fd016b270..00000000000
--- a/data/Gootville/E4A2-articStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 50c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A3-articStaccatoBelow.xml b/data/Gootville/E4A3-articStaccatoBelow.xml
deleted file mode 100644
index 76225326a2c..00000000000
--- a/data/Gootville/E4A3-articStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A4-articTenutoAbove.xml b/data/Gootville/E4A4-articTenutoAbove.xml
deleted file mode 100644
index 266d27975c6..00000000000
--- a/data/Gootville/E4A4-articTenutoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 0c0 0 -14 0 -14 15s14 15 14 15h276s14 0 14 -15s-14 -15 -14 -15h-276z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A5-articTenutoBelow.xml b/data/Gootville/E4A5-articTenutoBelow.xml
deleted file mode 100644
index 898c5dcf753..00000000000
--- a/data/Gootville/E4A5-articTenutoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -30c0 0 -14 0 -14 15s14 15 14 15h276s14 0 14 -15s-14 -15 -14 -15h-276z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A6-articStaccatissimoAbove.xml b/data/Gootville/E4A6-articStaccatissimoAbove.xml
deleted file mode 100644
index 24a5db0ba6f..00000000000
--- a/data/Gootville/E4A6-articStaccatissimoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 185c0 9 7 13 14 13c9 0 18 -4 27 -8s28 -10 41 -10s32 6 41 10s18 8 27 8c7 0 14 -4 14 -13c0 -6 -4 -11 -4 -11c-19 -32 -48 -97 -57 -133s-11 -41 -21 -41s-12 5 -21 41s-38 101 -57 133c0 0 -4 5 -4 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A7-articStaccatissimoBelow.xml b/data/Gootville/E4A7-articStaccatissimoBelow.xml
deleted file mode 100644
index dc7efb2fc52..00000000000
--- a/data/Gootville/E4A7-articStaccatissimoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -185c0 6 4 11 4 11c19 32 48 97 57 133s11 41 21 41s12 -5 21 -41s38 -101 57 -133c0 0 4 -5 4 -11c0 -9 -7 -13 -14 -13c-9 0 -18 4 -27 8s-28 10 -41 10s-32 -6 -41 -10s-18 -8 -27 -8c-7 0 -14 4 -14 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A8-articStaccatissimoWedgeAbove.xml b/data/Gootville/E4A8-articStaccatissimoWedgeAbove.xml
deleted file mode 100644
index 3b01b1281dc..00000000000
--- a/data/Gootville/E4A8-articStaccatissimoWedgeAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 185c0 9 7 13 14 13c9 0 18 -4 27 -8s28 -10 41 -10s32 6 41 10s18 8 27 8c7 0 14 -4 14 -13c0 -6 -4 -11 -4 -11c-19 -32 -48 -97 -57 -133s-11 -41 -21 -41s-12 5 -21 41s-38 101 -57 133c0 0 -4 5 -4 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A9-articStaccatissimoWedgeBelow.xml b/data/Gootville/E4A9-articStaccatissimoWedgeBelow.xml
deleted file mode 100644
index fc4fbdbdcfb..00000000000
--- a/data/Gootville/E4A9-articStaccatissimoWedgeBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -185c0 6 4 11 4 11c19 32 48 97 57 133s11 41 21 41s12 -5 21 -41s38 -101 57 -133c0 0 4 -5 4 -11c0 -9 -7 -13 -14 -13c-9 0 -18 4 -27 8s-28 10 -41 10s-32 -6 -41 -10s-18 -8 -27 -8c-7 0 -14 4 -14 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4AC-articMarcatoAbove.xml b/data/Gootville/E4AC-articMarcatoAbove.xml
deleted file mode 100644
index e38120321a2..00000000000
--- a/data/Gootville/E4AC-articMarcatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 3c0 2 2 8 2 8l115 391s1 10 9 10s9 -10 9 -10l116 -391s1 -3 1 -5c0 -3 -2 -6 -10 -6h-51c-7 0 -10 11 -10 11l-79 266l-78 -266s-3 -11 -10 -11h-8c-4 0 -6 1 -6 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4AD-articMarcatoBelow.xml b/data/Gootville/E4AD-articMarcatoBelow.xml
deleted file mode 100644
index b422ff09459..00000000000
--- a/data/Gootville/E4AD-articMarcatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -6c0 3 2 6 10 6h51c7 0 10 -11 10 -11l79 -266l78 266s3 11 10 11h8c4 0 6 -1 6 -3s-2 -8 -2 -8l-115 -391s-1 -10 -9 -10s-9 10 -9 10l-116 391s-1 3 -1 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4B2-articTenutoStaccatoAbove.xml b/data/Gootville/E4B2-articTenutoStaccatoAbove.xml
deleted file mode 100644
index b976cd35c39..00000000000
--- a/data/Gootville/E4B2-articTenutoStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 165c0 0 -14 0 -14 15s14 15 14 15h276s14 0 14 -15s-14 -15 -14 -15h-276zM102 50c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4B3-articTenutoStaccatoBelow.xml b/data/Gootville/E4B3-articTenutoStaccatoBelow.xml
deleted file mode 100644
index bd2c7d2bc61..00000000000
--- a/data/Gootville/E4B3-articTenutoStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -195c0 0 -14 0 -14 15s14 15 14 15h276s14 0 14 -15s-14 -15 -14 -15h-276zM102 -50c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4B6-articStressAbove.xml b/data/Gootville/E4B6-articStressAbove.xml
deleted file mode 100644
index 1fe4d43db98..00000000000
--- a/data/Gootville/E4B6-articStressAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 8c0 3 3 17 3 17s45 222 49 233s15 21 33 21s33 -15 33 -38c0 -13 -95 -216 -95 -216s-10 -25 -17 -25c-2 0 -6 0 -6 8z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4B7-articStressBelow.xml b/data/Gootville/E4B7-articStressBelow.xml
deleted file mode 100644
index 99ebf5be730..00000000000
--- a/data/Gootville/E4B7-articStressBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -8c0 8 4 8 6 8c7 0 17 -25 17 -25s95 -203 95 -216c0 -23 -15 -38 -33 -38s-29 10 -33 21s-49 233 -49 233s-3 14 -3 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C0-fermataAbove.xml b/data/Gootville/E4C0-fermataAbove.xml
deleted file mode 100644
index cdcbc93a0ab..00000000000
--- a/data/Gootville/E4C0-fermataAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 22c0 192 148 332 325 332s325 -140 325 -332c0 -14 -3 -22 -15 -22s-15 8 -15 22c0 127 -131 232 -295 232s-295 -105 -295 -232c0 -14 -3 -22 -15 -22s-15 8 -15 22zM279 46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C1-fermataBelow.xml b/data/Gootville/E4C1-fermataBelow.xml
deleted file mode 100644
index e9b281365a5..00000000000
--- a/data/Gootville/E4C1-fermataBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -22c0 14 3 22 15 22s15 -8 15 -22c0 -127 131 -232 295 -232s295 105 295 232c0 14 3 22 15 22s15 -8 15 -22c0 -192 -148 -332 -325 -332s-325 140 -325 332zM279 -46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C4-fermataShortAbove.xml b/data/Gootville/E4C4-fermataShortAbove.xml
deleted file mode 100644
index 99800d136bb..00000000000
--- a/data/Gootville/E4C4-fermataShortAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 8c0 5 3 10 3 10l274 444s4 8 14 8s14 -8 14 -8l269 -436s7 -10 7 -18c0 -4 -3 -8 -9 -8h-49c-14 0 -21 11 -21 11l-234 379l-229 -372s-10 -18 -17 -18h-13c-6 0 -9 4 -9 8zM245 46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C5-fermataShortBelow.xml b/data/Gootville/E4C5-fermataShortBelow.xml
deleted file mode 100644
index e8341eaa494..00000000000
--- a/data/Gootville/E4C5-fermataShortBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -8c0 4 3 8 9 8h13c7 0 17 -18 17 -18l229 -372l234 379s7 11 21 11h49c6 0 9 -4 9 -8c0 -8 -7 -18 -7 -18l-269 -436s-4 -8 -14 -8s-14 8 -14 8l-274 444s-3 5 -3 10zM245 -46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C6-fermataLongAbove.xml b/data/Gootville/E4C6-fermataLongAbove.xml
deleted file mode 100644
index beaea6ca569..00000000000
--- a/data/Gootville/E4C6-fermataLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 14v339c0 6 6 11 12 11h548c6 0 12 -5 12 -11v-339s0 -14 -15 -14s-15 14 -15 14v230h-512v-230s0 -14 -15 -14s-15 14 -15 14zM240 46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C7-fermataLongBelow.xml b/data/Gootville/E4C7-fermataLongBelow.xml
deleted file mode 100644
index 5728013d236..00000000000
--- a/data/Gootville/E4C7-fermataLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -14c0 0 0 14 15 14s15 -14 15 -14v-230h512v230s0 14 15 14s15 -14 15 -14v-339c0 -6 -6 -11 -12 -11h-548c-6 0 -12 5 -12 11v339zM240 -46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C8-fermataVeryLongAbove.xml b/data/Gootville/E4C8-fermataVeryLongAbove.xml
deleted file mode 100644
index 57ecedf7f38..00000000000
--- a/data/Gootville/E4C8-fermataVeryLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 14v391c0 6 6 11 12 11h548c6 0 12 -5 12 -11v-391s0 -14 -15 -14s-15 14 -15 14v280h-512v-280s0 -14 -15 -14s-15 14 -15 14zM76 14v221c0 6 6 11 12 11h396c6 0 12 -5 12 -11v-221s0 -14 -15 -14s-15 14 -15 14v132h-360v-132s0 -14 -15 -14s-15 14 -15 14zM240 46 c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C9-fermataVeryLongBelow.xml b/data/Gootville/E4C9-fermataVeryLongBelow.xml
deleted file mode 100644
index 77d5d755036..00000000000
--- a/data/Gootville/E4C9-fermataVeryLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -14c0 0 0 14 15 14s15 -14 15 -14v-280h512v280s0 14 15 14s15 -14 15 -14v-391c0 -6 -6 -11 -12 -11h-548c-6 0 -12 5 -12 11v391zM76 -14c0 0 0 14 15 14s15 -14 15 -14v-132h360v132s0 14 15 14s15 -14 15 -14v-221c0 -6 -6 -11 -12 -11h-396c-6 0 -12 5 -12 11 v221zM240 -46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4CE-breathMarkComma.xml b/data/Gootville/E4CE-breathMarkComma.xml
deleted file mode 100644
index 95a8b42a9f4..00000000000
--- a/data/Gootville/E4CE-breathMarkComma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 199c0 35 28 63 63 63c49 0 79 -49 79 -99c0 -57 -39 -117 -103 -155c-10 -6 -17 -8 -20 -8s-5 2 -5 5s2 5 7 8c34 23 52 56 52 87c0 14 -3 24 -10 37c-35 0 -63 27 -63 62z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E1-restLonga.xml b/data/Gootville/E4E1-restLonga.xml
deleted file mode 100644
index 9069c3e0874..00000000000
--- a/data/Gootville/E4E1-restLonga.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 240c0 6 4 10 10 10h264c6 0 10 -4 10 -10v-480c0 -6 -4 -10 -10 -10h-264c-6 0 -10 4 -10 10v480z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E2-restDoubleWhole.xml b/data/Gootville/E4E2-restDoubleWhole.xml
deleted file mode 100644
index deb9a04a4cd..00000000000
--- a/data/Gootville/E4E2-restDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v230c0 6 4 10 10 10h264c6 0 10 -4 10 -10v-230c0 -6 -4 -10 -10 -10h-264c-6 0 -10 4 -10 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E3-restWhole.xml b/data/Gootville/E4E3-restWhole.xml
deleted file mode 100644
index a60360819af..00000000000
--- a/data/Gootville/E4E3-restWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -10c0 6 4 10 10 10h310c6 0 10 -4 10 -10v-105c0 -6 -4 -10 -10 -10h-310c-6 0 -10 4 -10 10v105z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E4-restHalf.xml b/data/Gootville/E4E4-restHalf.xml
deleted file mode 100644
index d6b53001b15..00000000000
--- a/data/Gootville/E4E4-restHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v105c0 6 4 10 10 10h310c6 0 10 -4 10 -10v-105c0 -6 -4 -10 -10 -10h-310c-6 0 -10 4 -10 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E5-restQuarter.xml b/data/Gootville/E4E5-restQuarter.xml
deleted file mode 100644
index 358fb0d4d09..00000000000
--- a/data/Gootville/E4E5-restQuarter.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -188c0 58 52 87 110 87c14 0 48 -6 48 -6s-145 124 -145 135c0 4 0 6 7 13c46 50 61 117 61 175c0 50 -15 95 -47 127c-4 4 -6 8 -6 12c0 5 4 10 12 10c12 0 176 -110 176 -155c0 -19 -12 -52 -29 -85s-32 -71 -32 -98c0 -58 20 -115 43 -135s24 -24 24 -29 c0 -7 -5 -13 -13 -13c-5 0 -13 2 -16 3s-11 2 -17 2c-18 0 -32 -5 -46 -14c-31 -21 -45 -52 -45 -85s14 -67 43 -96c6 -6 8 -9 8 -14s-5 -9 -10 -9s-8 1 -14 5c-69 46 -112 106 -112 170z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E6-rest8th.xml b/data/Gootville/E4E6-rest8th.xml
deleted file mode 100644
index 7a56cd3ac63..00000000000
--- a/data/Gootville/E4E6-rest8th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 124c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15c0 0 0 -3 -1 -6l-107 -363c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E7-rest16th.xml b/data/Gootville/E4E7-rest16th.xml
deleted file mode 100644
index 6b017f7359d..00000000000
--- a/data/Gootville/E4E7-rest16th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -120c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15c0 0 0 -3 -1 -6 l-179 -607c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E8-rest32nd.xml b/data/Gootville/E4E8-rest32nd.xml
deleted file mode 100644
index 5e827146645..00000000000
--- a/data/Gootville/E4E8-rest32nd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -120c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36 c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15c0 0 0 -3 -1 -6l-251 -851c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E9-rest64th.xml b/data/Gootville/E4E9-rest64th.xml
deleted file mode 100644
index db163eae0e1..00000000000
--- a/data/Gootville/E4E9-rest64th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -364c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36 c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15 c0 0 0 -3 -1 -6l-323 -1095c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4EA-rest128th.xml b/data/Gootville/E4EA-rest128th.xml
deleted file mode 100644
index 129480e4f79..00000000000
--- a/data/Gootville/E4EA-rest128th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -364c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36 c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36 c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15c0 0 0 -3 -1 -6l-395 -1339c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4F2-restQuarterOld.xml b/data/Gootville/E4F2-restQuarterOld.xml
deleted file mode 100644
index 146cf831697..00000000000
--- a/data/Gootville/E4F2-restQuarterOld.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 156c0 9 7 15 14 15s13 -3 16 -11c18 -44 50 -74 93 -86c-12 13 -19 31 -19 50c0 42 34 76 76 76s76 -34 76 -76c0 -51 -48 -85 -104 -85c-35 0 -66 16 -97 36l82 -278c1 -3 1 -6 1 -6c0 -9 -7 -15 -14 -15s-13 3 -16 11l-107 363c-1 3 -1 6 -1 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E510-ottava.xml b/data/Gootville/E510-ottava.xml
deleted file mode 100644
index c08cb606717..00000000000
--- a/data/Gootville/E510-ottava.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 133c0 53 35 104 86 128c-19 14 -27 36 -27 62c0 105 92 163 202 163c94 0 153 -42 153 -113c0 -53 -28 -84 -58 -112c32 -25 48 -51 48 -85c0 -120 -134 -176 -229 -176c-84 0 -175 53 -175 133zM70 134c0 -54 43 -100 111 -100c49 0 94 27 94 65 c0 48 -75 92 -152 133c-24 -23 -53 -53 -53 -98zM176 401c0 -46 72 -84 126 -111c20 17 29 50 29 79c0 44 -25 83 -76 83c-49 0 -79 -22 -79 -51z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E514-quindicesima.xml b/data/Gootville/E514-quindicesima.xml
deleted file mode 100644
index 21efde12b5c..00000000000
--- a/data/Gootville/E514-quindicesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18c0 18 21 18 28 18c19 0 45 23 51 58l50 285l-87 -107c-5 -7 -9 -10 -15 -10c-8 0 -15 6 -15 14c0 4 3 9 3 9l132 192s7 9 11 9h103c5 0 5 -4 5 -8l-67 -384c-1 -5 -2 -10 -2 -14c0 -27 10 -44 26 -44c7 0 28 0 28 -18s-21 -18 -28 -18h-195c-7 0 -28 0 -28 18z M264 88c0 45 36 78 75 78c31 0 53 -22 53 -52c0 -32 -22 -57 -48 -68c5 -5 18 -15 42 -15c55 0 111 74 111 158c0 56 -34 90 -79 90c-40 0 -55 -7 -73 -18s-20 -11 -27 -11c-6 0 -8 4 -8 9c0 3 0 6 1 9c0 2 11 50 21 92s24 102 24 104c2 14 10 22 18 22c12 0 24 -3 43 -9 s50 -12 86 -12s78 6 99 12s39 9 51 9c5 0 8 -4 8 -10c0 -10 -4 -27 -27 -50c-22 -22 -80 -55 -148 -55c-42 0 -86 9 -119 20l-24 -99c44 26 80 27 112 27c86 0 160 -52 160 -133c0 -112 -112 -186 -203 -186c-79 0 -148 28 -148 88z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E517-ventiduesima.xml b/data/Gootville/E517-ventiduesima.xml
deleted file mode 100644
index 5f6f31fdb74..00000000000
--- a/data/Gootville/E517-ventiduesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 26c0 82 103 150 158 184c72 45 139 87 139 180c0 41 -19 65 -64 65c-33 0 -49 -9 -57 -14c16 -9 27 -26 27 -46c0 -42 -38 -74 -75 -74c-31 0 -53 22 -53 52c0 80 100 113 184 113c83 0 156 -33 156 -107c0 -109 -122 -171 -191 -193c-68 -21 -120 -50 -158 -88 c38 26 84 46 127 46c31 0 52 -6 73 -18s38 -20 54 -20c20 0 35 10 42 16s16 13 22 13c5 0 10 -3 10 -9c0 -52 -94 -126 -140 -126c-32 0 -53 6 -75 22s-38 26 -68 26s-41 -4 -60 -18s-26 -18 -34 -18c-7 0 -17 4 -17 14zM377 26c0 82 103 150 158 184c72 45 139 87 139 180 c0 41 -19 65 -64 65c-33 0 -49 -9 -57 -14c16 -9 27 -26 27 -46c0 -42 -38 -74 -75 -74c-31 0 -53 22 -53 52c0 80 100 113 184 113c83 0 156 -33 156 -107c0 -109 -122 -171 -191 -193c-68 -21 -120 -50 -158 -88c38 26 84 46 127 46c31 0 52 -6 73 -18s38 -20 54 -20 c20 0 35 10 42 16s16 13 22 13c5 0 10 -3 10 -9c0 -52 -94 -126 -140 -126c-32 0 -53 6 -75 22s-38 26 -68 26s-41 -4 -60 -18s-26 -18 -34 -18c-7 0 -17 4 -17 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E51A-octaveParensLeft.xml b/data/Gootville/E51A-octaveParensLeft.xml
deleted file mode 100644
index 897e90f1ced..00000000000
--- a/data/Gootville/E51A-octaveParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E51B-octaveParensRight.xml b/data/Gootville/E51B-octaveParensRight.xml
deleted file mode 100644
index bbff1d5ecf7..00000000000
--- a/data/Gootville/E51B-octaveParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E520-dynamicPiano.xml b/data/Gootville/E520-dynamicPiano.xml
deleted file mode 100644
index f976674cdef..00000000000
--- a/data/Gootville/E520-dynamicPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E521-dynamicMezzo.xml b/data/Gootville/E521-dynamicMezzo.xml
deleted file mode 100644
index d7152d29e2b..00000000000
--- a/data/Gootville/E521-dynamicMezzo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 161c0 5 2 15 13 38s48 73 94 73s60 -42 60 -42s29 42 60 42c46 0 60 -42 60 -42s29 42 60 42c38 0 64 -30 64 -66c0 -15 -23 -80 -23 -80s-25 -74 -25 -93c0 -8 2 -15 10 -15c25 0 54 35 62 58s12 26 17 26s8 -3 8 -8c0 -45 -56 -114 -110 -114c-30 0 -58 26 -58 63 c0 19 25 93 25 93s23 65 23 80c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20 c-30 0 -54 -41 -61 -62s-10 -21 -15 -21s-8 3 -8 8z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E522-dynamicForte.xml b/data/Gootville/E522-dynamicForte.xml
deleted file mode 100644
index 6e529d21c9d..00000000000
--- a/data/Gootville/E522-dynamicForte.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E523-dynamicRinforzando.xml b/data/Gootville/E523-dynamicRinforzando.xml
deleted file mode 100644
index e136304ac4f..00000000000
--- a/data/Gootville/E523-dynamicRinforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-17 218c0 5 3 12 16 25s33 27 71 27s51 -30 51 -30s33 32 81 32c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7c-38 0 -59 -19 -72 -42s-59 -191 -59 -191c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 60 170 60 212 c0 13 -7 21 -19 21c-15 0 -25 -5 -33 -15s-12 -14 -17 -14s-8 3 -8 8z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E524-dynamicSforzando.xml b/data/Gootville/E524-dynamicSforzando.xml
deleted file mode 100644
index b29ab4625c5..00000000000
--- a/data/Gootville/E524-dynamicSforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E525-dynamicZ.xml b/data/Gootville/E525-dynamicZ.xml
deleted file mode 100644
index faf27040b6d..00000000000
--- a/data/Gootville/E525-dynamicZ.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-24 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35 s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E526-dynamicNiente.xml b/data/Gootville/E526-dynamicNiente.xml
deleted file mode 100644
index 28aaaf6c598..00000000000
--- a/data/Gootville/E526-dynamicNiente.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 161c0 5 2 15 13 38s48 73 94 73s60 -42 60 -42s29 42 60 42c38 0 64 -30 64 -66c0 -15 -23 -80 -23 -80s-25 -74 -25 -93c0 -8 2 -15 10 -15c25 0 54 35 62 58s12 26 17 26s8 -3 8 -8c0 -45 -56 -114 -110 -114c-30 0 -58 26 -58 63c0 19 25 93 25 93s23 65 23 80 c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20c-30 0 -54 -41 -61 -62s-10 -21 -15 -21s-8 3 -8 8z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E527-dynamicPPPPPP.xml b/data/Gootville/E527-dynamicPPPPPP.xml
deleted file mode 100644
index 99288d85380..00000000000
--- a/data/Gootville/E527-dynamicPPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM620 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59 s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13z M831 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM966 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47 s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1177 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44 c-15 0 -36 -1 -61 -35zM1312 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192 c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1523 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM1658 -167c0 8 7 13 31 13 c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5 c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1869 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E528-dynamicPPPPP.xml b/data/Gootville/E528-dynamicPPPPP.xml
deleted file mode 100644
index 3ea48f9175a..00000000000
--- a/data/Gootville/E528-dynamicPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM620 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59 s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13z M831 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM966 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47 s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1177 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44 c-15 0 -36 -1 -61 -35zM1312 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192 c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1523 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E529-dynamicPPPP.xml b/data/Gootville/E529-dynamicPPPP.xml
deleted file mode 100644
index a5a9172eacd..00000000000
--- a/data/Gootville/E529-dynamicPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM620 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59 s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13z M831 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM966 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47 s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1177 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44 c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52A-dynamicPPP.xml b/data/Gootville/E52A-dynamicPPP.xml
deleted file mode 100644
index d12e41df2ac..00000000000
--- a/data/Gootville/E52A-dynamicPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM620 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59 s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13z M831 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52B-dynamicPP.xml b/data/Gootville/E52B-dynamicPP.xml
deleted file mode 100644
index 4695ce0742b..00000000000
--- a/data/Gootville/E52B-dynamicPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52C-dynamicMP.xml b/data/Gootville/E52C-dynamicMP.xml
deleted file mode 100644
index d62423a7399..00000000000
--- a/data/Gootville/E52C-dynamicMP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 161c0 5 2 15 13 38s48 73 94 73s60 -42 60 -42s29 42 60 42c46 0 60 -42 60 -42s29 42 60 42c38 0 64 -30 64 -66c0 -15 -23 -80 -23 -80s-25 -74 -25 -93c0 -8 2 -15 10 -15c25 0 54 35 62 58s12 26 17 26s8 -3 8 -8c0 -45 -56 -114 -110 -114c-30 0 -58 26 -58 63 c0 19 25 93 25 93s23 65 23 80c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20 c-30 0 -54 -41 -61 -62s-10 -21 -15 -21s-8 3 -8 8zM322 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96 c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM533 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52D-dynamicMF.xml b/data/Gootville/E52D-dynamicMF.xml
deleted file mode 100644
index 5219aa2982a..00000000000
--- a/data/Gootville/E52D-dynamicMF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 161c0 5 2 15 13 38s48 73 94 73s60 -42 60 -42s29 42 60 42c46 0 60 -42 60 -42s29 42 60 42c38 0 64 -30 64 -66c0 -15 -23 -80 -23 -80s-25 -74 -25 -93c0 -8 2 -15 10 -15c25 0 54 35 62 58s12 26 17 26s8 -3 8 -8c0 -45 -56 -114 -110 -114c-30 0 -58 26 -58 63 c0 19 25 93 25 93s23 65 23 80c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20 c-30 0 -54 -41 -61 -62s-10 -21 -15 -21s-8 3 -8 8zM250 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50 c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52E-dynamicPF.xml b/data/Gootville/E52E-dynamicPF.xml
deleted file mode 100644
index 66e4c103cda..00000000000
--- a/data/Gootville/E52E-dynamicPF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM202 -77c0 28 22 50 50 50s50 -22 50 -50 c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69 c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52F-dynamicFF.xml b/data/Gootville/E52F-dynamicFF.xml
deleted file mode 100644
index 9632008cb34..00000000000
--- a/data/Gootville/E52F-dynamicFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E530-dynamicFFF.xml b/data/Gootville/E530-dynamicFFF.xml
deleted file mode 100644
index dd3c702a6e4..00000000000
--- a/data/Gootville/E530-dynamicFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM410 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E531-dynamicFFFF.xml b/data/Gootville/E531-dynamicFFFF.xml
deleted file mode 100644
index 0de0e5a1ae3..00000000000
--- a/data/Gootville/E531-dynamicFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM410 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM687 -77c0 28 22 50 50 50s50 -22 50 -50 c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69 c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E532-dynamicFFFFF.xml b/data/Gootville/E532-dynamicFFFFF.xml
deleted file mode 100644
index 3fbd977bc26..00000000000
--- a/data/Gootville/E532-dynamicFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM410 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM687 -77c0 28 22 50 50 50s50 -22 50 -50 c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69 c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM964 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50 c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E533-dynamicFFFFFF.xml b/data/Gootville/E533-dynamicFFFFFF.xml
deleted file mode 100644
index a26e583740e..00000000000
--- a/data/Gootville/E533-dynamicFFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM410 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM687 -77c0 28 22 50 50 50s50 -22 50 -50 c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69 c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM964 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50 c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM1241 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E534-dynamicFortePiano.xml b/data/Gootville/E534-dynamicFortePiano.xml
deleted file mode 100644
index 892ee6449ec..00000000000
--- a/data/Gootville/E534-dynamicFortePiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM205 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43 c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM416 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44 c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E535-dynamicForzando.xml b/data/Gootville/E535-dynamicForzando.xml
deleted file mode 100644
index a55d82d2bf8..00000000000
--- a/data/Gootville/E535-dynamicForzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM253 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2 c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E536-dynamicSforzando1.xml b/data/Gootville/E536-dynamicSforzando1.xml
deleted file mode 100644
index 9234b708d29..00000000000
--- a/data/Gootville/E536-dynamicSforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E537-dynamicSforzandoPiano.xml b/data/Gootville/E537-dynamicSforzandoPiano.xml
deleted file mode 100644
index 4aee5df5dab..00000000000
--- a/data/Gootville/E537-dynamicSforzandoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM431 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23 c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13 s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM642 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E538-dynamicSforzandoPianissimo.xml b/data/Gootville/E538-dynamicSforzandoPianissimo.xml
deleted file mode 100644
index d199968bd91..00000000000
--- a/data/Gootville/E538-dynamicSforzandoPianissimo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM431 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23 c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13 s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM642 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM777 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8 s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM988 61c0 -21 15 -34 33 -34 c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E539-dynamicSforzato.xml b/data/Gootville/E539-dynamicSforzato.xml
deleted file mode 100644
index 25d660ef262..00000000000
--- a/data/Gootville/E539-dynamicSforzato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM479 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19 c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14 c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E53A-dynamicSforzatoPiano.xml b/data/Gootville/E53A-dynamicSforzatoPiano.xml
deleted file mode 100644
index 0d7dfaadeb0..00000000000
--- a/data/Gootville/E53A-dynamicSforzatoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM479 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19 c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14 c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13zM721 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96 c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM932 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E53B-dynamicSforzatoFF.xml b/data/Gootville/E53B-dynamicSforzatoFF.xml
deleted file mode 100644
index cf2ac0ea483..00000000000
--- a/data/Gootville/E53B-dynamicSforzatoFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM359 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38 c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381 c-38 0 -72 28 -72 70zM756 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34 c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E53C-dynamicRinforzando1.xml b/data/Gootville/E53C-dynamicRinforzando1.xml
deleted file mode 100644
index 9c5c8d24edb..00000000000
--- a/data/Gootville/E53C-dynamicRinforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-17 218c0 5 3 12 16 25s33 27 71 27s51 -30 51 -30s33 32 81 32c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7c-38 0 -59 -19 -72 -42s-59 -191 -59 -191c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 60 170 60 212 c0 13 -7 21 -19 21c-15 0 -25 -5 -33 -15s-12 -14 -17 -14s-8 3 -8 8zM149 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E53D-dynamicRinforzando2.xml b/data/Gootville/E53D-dynamicRinforzando2.xml
deleted file mode 100644
index db288f60490..00000000000
--- a/data/Gootville/E53D-dynamicRinforzando2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-17 218c0 5 3 12 16 25s33 27 71 27s51 -30 51 -30s33 32 81 32c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7c-38 0 -59 -19 -72 -42s-59 -191 -59 -191c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 60 170 60 212 c0 13 -7 21 -19 21c-15 0 -25 -5 -33 -15s-12 -14 -17 -14s-8 3 -8 8zM149 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM546 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9 h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14c-13 0 -26 -2 -33 -9s-11 -10 -18 -10 s-13 6 -13 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E566-ornamentTrill.xml b/data/Gootville/E566-ornamentTrill.xml
deleted file mode 100644
index 4156fe5c0d9..00000000000
--- a/data/Gootville/E566-ornamentTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 222c0 16 24 19 36 19c20 0 85 2 85 2l21 68c14 45 87 56 90 56s6 -2 6 -5c0 -7 -34 -111 -34 -111s99 19 131 19c24 0 24 -30 24 -30s33 32 81 32c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7c-38 0 -59 -19 -72 -42 s-59 -191 -59 -191c0 -3 -14 -5 -32 -5s-39 2 -39 7l9 33s-70 -48 -125 -48c-37 0 -49 27 -49 62c0 54 39 163 39 163s-43 -6 -82 -6c-15 0 -30 0 -30 12zM149 54c0 -15 5 -26 16 -26c51 0 95 55 95 55s42 118 42 140c0 6 -7 10 -15 10c-31 0 -91 -9 -91 -9 s-47 -133 -47 -170z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E567-ornamentTurn.xml b/data/Gootville/E567-ornamentTurn.xml
deleted file mode 100644
index eb7ba7652dd..00000000000
--- a/data/Gootville/E567-ornamentTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 74 56 141 125 141c88 0 165 -56 217 -108s117 -99 186 -99c44 0 61 33 61 66s-28 59 -61 59c-12 0 -24 -4 -38 -11c-8 -4 -17 -6 -25 -6c-24 0 -44 21 -44 45c0 37 36 54 74 54c70 0 125 -67 125 -141s-56 -141 -125 -141c-88 0 -165 56 -217 108s-117 99 -186 99 c-44 0 -61 -33 -61 -66s28 -59 61 -59c12 0 24 4 38 11c8 4 17 6 25 6c24 0 44 -21 44 -45c0 -37 -36 -54 -74 -54c-70 0 -125 67 -125 141z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E568-ornamentTurnInverted.xml b/data/Gootville/E568-ornamentTurnInverted.xml
deleted file mode 100644
index 8cdebf2b170..00000000000
--- a/data/Gootville/E568-ornamentTurnInverted.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 74 55 141 125 141c38 0 74 -17 74 -54c0 -24 -20 -45 -44 -45c-8 0 -17 2 -25 6c-14 7 -26 11 -38 11c-33 0 -61 -26 -61 -59s17 -66 61 -66c69 0 134 47 186 99s129 108 217 108c69 0 125 -67 125 -141s-55 -141 -125 -141c-38 0 -74 17 -74 54c0 24 20 45 44 45 c8 0 17 -2 25 -6c14 -7 26 -11 38 -11c33 0 61 26 61 59s-17 66 -61 66c-69 0 -134 -47 -186 -99s-129 -108 -217 -108c-69 0 -125 67 -125 141z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E569-ornamentTurnSlash.xml b/data/Gootville/E569-ornamentTurnSlash.xml
deleted file mode 100644
index f52c781c901..00000000000
--- a/data/Gootville/E569-ornamentTurnSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 74 56 141 125 141c64 0 123 -30 170 -66v111s0 14 15 14s15 -14 15 -14v-137c6 -5 12 -11 17 -16c52 -52 117 -99 186 -99c44 0 61 33 61 66s-28 59 -61 59c-12 0 -24 -4 -38 -11c-8 -4 -17 -6 -25 -6c-24 0 -44 21 -44 45c0 37 36 54 74 54 c70 0 125 -67 125 -141s-56 -141 -125 -141c-64 0 -123 30 -170 66v-111s0 -14 -15 -14s-15 14 -15 14v137c-6 5 -12 11 -17 16c-52 52 -117 99 -186 99c-44 0 -61 -33 -61 -66s28 -59 61 -59c12 0 24 4 38 11c8 4 17 6 25 6c24 0 44 -21 44 -45c0 -37 -36 -54 -74 -54 c-70 0 -125 67 -125 141z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E56C-ornamentShortTrill.xml b/data/Gootville/E56C-ornamentShortTrill.xml
deleted file mode 100644
index f36d40b5303..00000000000
--- a/data/Gootville/E56C-ornamentShortTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l105 124s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-105 -124s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53 c-5 -6 -10 -11 -17 -11s-15 5 -15 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E56D-ornamentMordent.xml b/data/Gootville/E56D-ornamentMordent.xml
deleted file mode 100644
index 18c937e2bd1..00000000000
--- a/data/Gootville/E56D-ornamentMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l5 6v180s0 14 15 14s15 -14 15 -14v-145l70 83s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-5 -6v-180s0 -14 -15 -14 s-15 14 -15 14v145l-70 -83s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E56E-ornamentTremblement.xml b/data/Gootville/E56E-ornamentTremblement.xml
deleted file mode 100644
index bb1684c3329..00000000000
--- a/data/Gootville/E56E-ornamentTremblement.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l105 124s3 4 8 4s8 -4 8 -4l125 -124l105 124s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-105 -124s-3 -4 -8 -4s-8 4 -8 4 l-125 124l-105 -124s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E59D-ornamentZigZagLineNoRightEnd.xml b/data/Gootville/E59D-ornamentZigZagLineNoRightEnd.xml
deleted file mode 100644
index 83e954676ea..00000000000
--- a/data/Gootville/E59D-ornamentZigZagLineNoRightEnd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-77 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E59E-ornamentZigZagLineWithRightEnd.xml b/data/Gootville/E59E-ornamentZigZagLineWithRightEnd.xml
deleted file mode 100644
index 20ee5452c39..00000000000
--- a/data/Gootville/E59E-ornamentZigZagLineWithRightEnd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-77 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E5B0-ornamentPrecompSlide.xml b/data/Gootville/E5B0-ornamentPrecompSlide.xml
deleted file mode 100644
index a2e149fdbe7..00000000000
--- a/data/Gootville/E5B0-ornamentPrecompSlide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l105 124s3 4 8 4s8 -4 8 -4l125 -124c10 14 53 88 77 130s66 112 194 112c0 0 14 0 14 -15s-14 -15 -14 -15c-116 0 -148 -60 -188 -136s-91 -142 -148 -200c0 0 -3 -4 -8 -4s-8 4 -8 4l-125 124l-105 -124 s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E5E5-brassMuteClosed.xml b/data/Gootville/E5E5-brassMuteClosed.xml
deleted file mode 100644
index 110985795ec..00000000000
--- a/data/Gootville/E5E5-brassMuteClosed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -12c0 0 -11 0 -11 12s11 12 11 12h102v102s0 11 12 11s12 -11 12 -11v-102h102s11 0 11 -12s-11 -12 -11 -12h-102v-102s0 -11 -12 -11s-12 11 -12 11v102h-102z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E5E7-brassMuteOpen.xml b/data/Gootville/E5E7-brassMuteOpen.xml
deleted file mode 100644
index 06a40662978..00000000000
--- a/data/Gootville/E5E7-brassMuteOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 69 56 125 125 125s125 -56 125 -125s-56 -125 -125 -125s-125 56 -125 125zM24 0c0 -56 45 -101 101 -101s101 45 101 101s-45 101 -101 101s-101 -45 -101 -101z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E610-stringsDownBow.xml b/data/Gootville/E610-stringsDownBow.xml
deleted file mode 100644
index 5a2b6e23ddb..00000000000
--- a/data/Gootville/E610-stringsDownBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 14v327c0 6 6 11 12 11h312c6 0 12 -5 12 -11v-327s0 -14 -15 -14s-15 14 -15 14v176h-276v-176s0 -14 -15 -14s-15 14 -15 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E611-stringsDownBowTurned.xml b/data/Gootville/E611-stringsDownBowTurned.xml
deleted file mode 100644
index b447a88bf6a..00000000000
--- a/data/Gootville/E611-stringsDownBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 11v327s0 14 15 14s15 -14 15 -14v-176h276v176s0 14 15 14s15 -14 15 -14v-327c0 -6 -6 -11 -12 -11h-312c-6 0 -12 5 -12 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E612-stringsUpBow.xml b/data/Gootville/E612-stringsUpBow.xml
deleted file mode 100644
index fcec6a4291d..00000000000
--- a/data/Gootville/E612-stringsUpBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 406c0 3 2 6 10 6h51c7 0 10 -11 10 -11l79 -266l78 266s3 11 10 11h8c4 0 6 -1 6 -3s-2 -8 -2 -8l-115 -391s-1 -10 -9 -10s-9 10 -9 10l-116 391s-1 3 -1 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E613-stringsUpBowTurned.xml b/data/Gootville/E613-stringsUpBowTurned.xml
deleted file mode 100644
index f392140254e..00000000000
--- a/data/Gootville/E613-stringsUpBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 6c0 2 1 5 1 5l116 391s1 10 9 10s9 -10 9 -10l115 -391s2 -6 2 -8s-2 -3 -6 -3h-8c-7 0 -10 11 -10 11l-78 266l-79 -266s-3 -11 -10 -11h-51c-8 0 -10 3 -10 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E630-pluckedSnapPizzicatoBelow.xml b/data/Gootville/E630-pluckedSnapPizzicatoBelow.xml
deleted file mode 100644
index b8b44df73b1..00000000000
--- a/data/Gootville/E630-pluckedSnapPizzicatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 203c0 61 49 110 110 110s110 -49 110 -110c0 -56 -41 -102 -95 -109v-80s0 -14 -15 -14s-15 14 -15 14v80c-54 7 -95 53 -95 109zM30 203c0 -39 28 -72 65 -79v80s0 14 15 14s15 -14 15 -14v-80c37 7 65 40 65 79c0 44 -36 80 -80 80s-80 -36 -80 -80z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E631-pluckedSnapPizzicatoAbove.xml b/data/Gootville/E631-pluckedSnapPizzicatoAbove.xml
deleted file mode 100644
index 6ab618bf70e..00000000000
--- a/data/Gootville/E631-pluckedSnapPizzicatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 110c0 56 41 102 95 109v80s0 14 15 14s15 -14 15 -14v-80c54 -7 95 -53 95 -109c0 -61 -49 -110 -110 -110s-110 49 -110 110zM30 110c0 -44 36 -80 80 -80s80 36 80 80c0 39 -28 72 -65 79v-80s0 -14 -15 -14s-15 14 -15 14v80c-37 -7 -65 -40 -65 -79z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E650-keyboardPedalPed.xml b/data/Gootville/E650-keyboardPedalPed.xml
deleted file mode 100644
index 95c9e92ae2c..00000000000
--- a/data/Gootville/E650-keyboardPedalPed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 307c0 108 113 193 231 193c98 0 173 -66 173 -141c0 -47 -33 -73 -68 -73c-33 0 -69 28 -69 73c0 8 3 13 10 13c6 0 10 -6 15 -16s15 -13 27 -13c23 0 42 15 42 39c0 55 -59 95 -122 95c-21 -38 -40 -74 -40 -98c0 -23 12 -41 34 -63s34 -38 34 -68 c0 -48 -31 -98 -60 -137c0 0 18 1 28 1c38 0 78 -13 107 -42l29 24s-3 18 -3 36c0 61 44 145 108 145c34 0 56 -27 56 -57c0 -16 -2 -31 -18 -44l-83 -68s10 -53 56 -53c25 0 52 9 70 35c-3 11 -4 22 -4 34c0 64 40 127 108 161c-48 61 -119 103 -202 123c0 0 -17 3 -17 14 c0 8 4 12 13 12c4 0 40 -4 109 -29s218 -119 218 -264c0 -75 -46 -139 -118 -139c-43 0 -77 22 -96 58c-26 -33 -71 -58 -107 -58c-40 0 -69 25 -83 63l-45 -37c-22 -18 -39 -26 -47 -26c-7 0 -8 0 -17 21s-37 55 -71 55c-8 0 -19 -2 -19 -2c-22 -29 -57 -74 -70 -74 c-7 0 -12 5 -12 12c0 36 44 73 74 88c36 46 51 77 51 101c0 15 -4 22 -28 43s-39 49 -39 85s23 89 56 148c-85 0 -170 -72 -170 -146c0 -26 8 -39 29 -39s43 19 43 46c0 10 4 14 11 14s12 -4 12 -19c0 -52 -27 -101 -78 -101c-39 0 -58 34 -58 75zM420 160 c0 -10 2 -24 2 -24l50 41c14 11 16 14 16 24c0 17 -12 35 -32 35c-27 0 -36 -43 -36 -76zM606 122c0 -43 23 -98 53 -98s55 69 55 115s-12 83 -35 118c-46 -23 -73 -86 -73 -135z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E651-keyboardPedalP.xml b/data/Gootville/E651-keyboardPedalP.xml
deleted file mode 100644
index 8b0e79d3d6f..00000000000
--- a/data/Gootville/E651-keyboardPedalP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 307c0 108 113 193 231 193c98 0 173 -66 173 -141c0 -47 -33 -73 -68 -73c-33 0 -69 28 -69 73c0 8 3 13 10 13c6 0 10 -6 15 -16s15 -13 27 -13c23 0 42 15 42 39c0 55 -59 95 -122 95c-21 -38 -40 -74 -40 -98c0 -23 12 -41 34 -63s34 -38 34 -68 c0 -48 -31 -98 -60 -137c0 0 18 1 28 1c38 0 78 -13 107 -42l29 24s10 9 20 9c7 0 10 -4 10 -10c0 -13 -23 -30 -23 -30l-45 -37c-22 -18 -39 -26 -47 -26c-7 0 -8 0 -17 21s-37 55 -71 55c-8 0 -19 -2 -19 -2c-22 -29 -57 -74 -70 -74c-7 0 -12 5 -12 12c0 36 44 73 74 88 c36 46 51 77 51 101c0 15 -4 22 -28 43s-39 49 -39 85s23 89 56 148c-85 0 -170 -72 -170 -146c0 -26 8 -39 29 -39s43 19 43 46c0 10 4 14 11 14s12 -4 12 -19c0 -52 -27 -101 -78 -101c-39 0 -58 34 -58 75z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E655-keyboardPedalUp.xml b/data/Gootville/E655-keyboardPedalUp.xml
deleted file mode 100644
index bec9b49e739..00000000000
--- a/data/Gootville/E655-keyboardPedalUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 283c0 30 23 46 46 46c12 0 25 -6 35 -16c10 -12 22 -19 31 -19c18 0 33 15 33 31c0 24 -17 33 -44 33c-34 0 -53 18 -53 46c0 26 21 46 47 46c30 0 45 -24 45 -51s9 -44 33 -44c16 0 31 15 31 33c0 9 -7 21 -19 31c-10 10 -16 23 -16 35c0 23 16 46 46 46 s46 -23 46 -46c0 -12 -6 -25 -16 -35c-12 -10 -19 -22 -19 -31c0 -18 15 -33 31 -33c24 0 33 17 33 44s15 51 45 51c26 0 47 -20 47 -46c0 -28 -19 -46 -53 -46c-27 0 -44 -9 -44 -33c0 -16 15 -31 33 -31c9 0 21 7 31 19c10 10 23 16 35 16c23 0 46 -16 46 -46 s-23 -46 -46 -46c-12 0 -25 6 -35 16c-10 12 -22 19 -31 19c-18 0 -33 -15 -33 -31c0 -24 17 -33 44 -33c34 0 53 -18 53 -46c0 -26 -21 -46 -47 -46c-30 0 -45 24 -45 51s-9 44 -33 44c-16 0 -31 -15 -31 -33c0 -9 7 -21 19 -31c10 -10 16 -23 16 -35 c0 -23 -16 -46 -46 -46s-46 23 -46 46c0 12 6 25 16 35c12 10 19 22 19 31c0 18 -15 33 -31 33c-24 0 -33 -17 -33 -44s-15 -51 -45 -51c-26 0 -47 20 -47 46c0 28 19 46 53 46c27 0 44 9 44 33c0 16 -15 31 -33 31c-9 0 -21 -7 -31 -19c-10 -10 -23 -16 -35 -16 c-23 0 -46 16 -46 46zM167 283c0 -26 22 -48 48 -48s48 22 48 48s-22 48 -48 48s-48 -22 -48 -48z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAA4-wiggleTrill.xml b/data/Gootville/EAA4-wiggleTrill.xml
deleted file mode 100644
index ca23b18113f..00000000000
--- a/data/Gootville/EAA4-wiggleTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-12 212c0 4 2 7 20 25s39 35 68 35c36 0 67 -38 67 -38s31 -38 59 -38c17 0 25 3 34 11s13 11 16 11s6 -2 6 -6s-2 -7 -20 -25s-39 -35 -68 -35c-36 0 -67 38 -67 38s-31 38 -59 38c-17 0 -25 -3 -34 -11s-13 -11 -16 -11s-6 2 -6 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAA9-wiggleArpeggiatoUp.xml b/data/Gootville/EAA9-wiggleArpeggiatoUp.xml
deleted file mode 100644
index 4b9fca28bf2..00000000000
--- a/data/Gootville/EAA9-wiggleArpeggiatoUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 114c0 4 2 7 20 25s39 35 68 35c36 0 67 -38 67 -38s31 -38 59 -38c17 0 25 3 34 11s13 11 16 11s6 -2 6 -6s-2 -7 -20 -25s-39 -35 -68 -35c-36 0 -67 38 -67 38s-31 38 -59 38c-17 0 -25 -3 -34 -11s-13 -11 -16 -11s-6 2 -6 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAAA-wiggleArpeggiatoDown.xml b/data/Gootville/EAAA-wiggleArpeggiatoDown.xml
deleted file mode 100644
index 65dadda1d3f..00000000000
--- a/data/Gootville/EAAA-wiggleArpeggiatoDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 114c0 4 3 6 6 6s7 -3 16 -11s17 -11 34 -11c28 0 59 38 59 38s31 38 67 38c29 0 50 -17 68 -35s20 -21 20 -25s-3 -6 -6 -6s-7 3 -16 11s-17 11 -34 11c-28 0 -59 -38 -59 -38s-31 -38 -67 -38c-29 0 -50 17 -68 35s-20 21 -20 25z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAAD-wiggleArpeggiatoUpArrow.xml b/data/Gootville/EAAD-wiggleArpeggiatoUpArrow.xml
deleted file mode 100644
index 3d5469db3d9..00000000000
--- a/data/Gootville/EAAD-wiggleArpeggiatoUpArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-26 19c0 5 1 9 4 13c16 21 22 51 22 82s-6 61 -22 82c-3 4 -4 8 -4 13c0 10 6 19 18 19c9 0 16 -4 16 -4c45 -26 135 -69 185 -81s57 -15 57 -29s-7 -17 -57 -29s-140 -55 -185 -81c0 0 -7 -4 -16 -4c-12 0 -18 9 -18 19z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAAE-wiggleArpeggiatoDownArrow.xml b/data/Gootville/EAAE-wiggleArpeggiatoDownArrow.xml
deleted file mode 100644
index 9c3b4238cdf..00000000000
--- a/data/Gootville/EAAE-wiggleArpeggiatoDownArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-26 19c0 5 1 9 4 13c16 21 22 51 22 82s-6 61 -22 82c-3 4 -4 8 -4 13c0 10 6 19 18 19c9 0 16 -4 16 -4c45 -26 135 -69 185 -81s57 -15 57 -29s-7 -17 -57 -29s-140 -55 -185 -81c0 0 -7 -4 -16 -4c-12 0 -18 9 -18 19z" /></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAAF-wiggleGlissando.xml b/data/Gootville/EAAF-wiggleGlissando.xml
deleted file mode 100644
index 482f9a26ac4..00000000000
--- a/data/Gootville/EAAF-wiggleGlissando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-12 60c0 4 2 7 20 25s39 35 68 35c36 0 67 -38 67 -38s31 -38 59 -38c17 0 25 3 34 11s13 11 16 11s6 -2 6 -6s-2 -7 -20 -25s-39 -35 -68 -35c-36 0 -67 38 -67 38s-31 38 -59 38c-17 0 -25 -3 -34 -11s-13 -11 -16 -11s-6 2 -6 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig.xml b/data/Leipzig.xml
deleted file mode 100644
index a5bdc56d21e..00000000000
--- a/data/Leipzig.xml
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bounding-boxes font-family="Leipzig" units-per-em="1000">
-	<g c="E0A3" x="0.0" y="-132.0" w="314.0" h="270.0" h-a-x="314" >
-		<a n="cutOutNW" x="0.14" y="0.24"/>
-		<a n="cutOutSE" x="1.076" y="-0.24"/>
-		<a n="stemDownNW" x="0" y="-0.144"/>
-		<a n="stemUpSE" x="1.256" y="0.164"/>
-	</g>
-	<g c="E080" x="20.0" y="-250.0" w="414.0" h="501.0" h-a-x="454" />
-	<g c="E081" x="20.0" y="-250.0" w="296.0" h="500.0" h-a-x="336" />
-	<g c="E082" x="20.0" y="-251.0" w="402.0" h="502.0" h-a-x="442" />
-	<g c="E083" x="20.0" y="-252.0" w="372.0" h="502.0" h-a-x="412" />
-	<g c="E084" x="20.0" y="-250.0" w="387.0" h="501.0" h-a-x="427" />
-	<g c="E085" x="20.0" y="-250.0" w="357.0" h="500.0" h-a-x="397" />
-	<g c="E086" x="20.0" y="-250.0" w="382.0" h="500.0" h-a-x="422" />
-	<g c="E087" x="20.0" y="-250.0" w="404.0" h="501.0" h-a-x="444" />
-	<g c="E088" x="10.0" y="-250.0" w="374.0" h="499.3" h-a-x="404" />
-	<g c="E089" x="20.0" y="-250.0" w="385.0" h="500.0" h-a-x="425" />
-	<g c="E0A2" x="0.0" y="-133.0" w="405.0" h="266.0" h-a-x="405" >
-		<a n="cutOutNW" x="0.06" y="0.244"/>
-		<a n="cutOutSE" x="1.568" y="-0.232"/>
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.62" y="0"/>
-	</g>
-	<g c="E0A4" x="0.0" y="-133.0" w="314.0" h="266.0" h-a-x="314" >
-		<a n="cutOutNW" x="0.144" y="0.24"/>
-		<a n="cutOutSE" x="1.088" y="-0.244"/>
-		<a n="stemDownNW" x="0" y="-0.156"/>
-		<a n="stemUpSE" x="1.256" y="0.156"/>
-	</g>
-	<g c="E05C" x="0.0" y="-502.0" w="606.0" h="1004.0" h-a-x="656" />
-	<g c="E05D" x="0.0" y="-735.0" w="606.0" h="1237.0" h-a-x="616" />
-	<g c="E051" x="-1.0" y="-893.0" w="647.0" h="1976.0" h-a-x="650" />
-	<g c="E050" x="-1.0" y="-655.0" w="647.0" h="1738.0" h-a-x="646" />
-	<g c="E052" x="-1.0" y="-890.0" w="647.0" h="1973.0" h-a-x="646" />
-	<g c="E053" x="-1.0" y="-655.0" w="647.0" h="1972.0" h-a-x="646" />
-	<g c="E054" x="-1.0" y="-655.0" w="651.0" h="1968.0" h-a-x="646" />
-	<g c="E062" x="4.0" y="-581.0" w="694.0" h="832.0" h-a-x="698" />
-	<g c="E063" x="4.0" y="-755.0" w="694.0" h="1006.0" h-a-x="698" />
-	<g c="E064" x="4.0" y="-750.0" w="694.0" h="1001.0" h-a-x="698" />
-	<g c="E065" x="4.0" y="-581.0" w="694.0" h="1048.0" h-a-x="698" />
-	<g c="E066" x="4.0" y="-581.0" w="694.0" h="1066.0" h-a-x="698" />
-	<g c="E262" x="0.0" y="-339.0" w="197.0" h="694.0" h-a-x="197" >
-		<a n="cutOutNE" x="0.624" y="0.844"/>
-		<a n="cutOutNW" x="0.16" y="0.644"/>
-		<a n="cutOutSE" x="0.624" y="-0.64"/>
-		<a n="cutOutSW" x="0.16" y="-0.82"/>
-	</g>
-	<g c="E261" x="0.0" y="-351.0" w="157.0" h="702.0" h-a-x="157" >
-		<a n="cutOutNE" x="0.08" y="0.736"/>
-		<a n="cutOutSW" x="0.548" y="-0.76"/>
-	</g>
-	<g c="E260" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="200" >
-		<a n="cutOutNE" x="0.096" y="0.564"/>
-		<a n="cutOutSE" x="0.432" y="-0.344"/>
-	</g>
-	<g c="E264" x="0.0" y="-175.0" w="388.0" h="644.0" h-a-x="388" >
-		<a n="cutOutNE" x="0.856" y="0.56"/>
-		<a n="cutOutSE" x="1.232" y="-0.3"/>
-	</g>
-	<g c="E266" x="0.0" y="-175.0" w="578.0" h="644.0" h-a-x="578" >
-		<a n="cutOutNE" x="1.616" y="0.568"/>
-		<a n="cutOutSE" x="1.968" y="-0.312"/>
-	</g>
-	<g c="E267" x="0.0" y="-351.0" w="378.0" h="820.0" h-a-x="378" >
-		<a n="cutOutNE" x="0.816" y="0.556"/>
-		<a n="cutOutSE" x="1.168" y="-0.32"/>
-		<a n="cutOutSW" x="0.54" y="-0.78"/>
-	</g>
-	<g c="E263" x="0.0" y="-120.0" w="257.0" h="240.0" h-a-x="258" />
-	<g c="E265" x="0.0" y="-339.0" w="475.0" h="694.0" h-a-x="475" >
-		<a n="cutOutNE" x="1.74" y="0.836"/>
-		<a n="cutOutNW" x="1.096" y="0.496"/>
-		<a n="cutOutSE" x="1.74" y="-0.644"/>
-		<a n="cutOutSW" x="1.096" y="-0.5"/>
-	</g>
-	<g c="E268" x="0.0" y="-351.0" w="377.0" h="706.0" h-a-x="377" >
-		<a n="cutOutNE" x="1.348" y="0.84"/>
-		<a n="cutOutSE" x="1.348" y="-0.648"/>
-		<a n="cutOutSW" x="0.544" y="-0.772"/>
-	</g>
-	<g c="E269" x="0.0" y="-339.0" w="412.0" h="694.0" h-a-x="412" >
-		<a n="cutOutNE" x="1.48" y="0.828"/>
-		<a n="cutOutNW" x="0.16" y="0.656"/>
-		<a n="cutOutSE" x="1.484" y="-0.636"/>
-		<a n="cutOutSW" x="0.16" y="-0.82"/>
-	</g>
-	<g c="E26A" x="0.0" y="-250.0" w="163.0" h="500.0" h-a-x="163" />
-	<g c="E26B" x="0.0" y="-250.0" w="163.0" h="500.0" h-a-x="163" />
-	<g c="E4C0" x="0.0" y="-3.0" w="605.0" h="323.0" h-a-x="605" />
-	<g c="E4C1" x="0.0" y="-320.0" w="605.0" h="323.0" h-a-x="605" />
-	<g c="E0FA" x="0.0" y="-133.0" w="405.0" h="266.0" h-a-x="405" >
-		<a n="cutOutNW" x="0.2" y="0.4"/>
-		<a n="cutOutSE" x="1.42" y="-0.4"/>
-	</g>
-	<g c="E240" x="0.0" y="-694.0" w="276.0" h="694.0" h-a-x="277" />
-	<g c="E241" x="0.0" y="0.0" w="276.0" h="694.0" h-a-x="277" />
-	<g c="E08B" x="0.0" y="-319.0" w="417.0" h="637.0" h-a-x="417" />
-	<g c="E08A" x="0.0" y="-249.0" w="414.0" h="500.0" h-a-x="422" />
-	<g c="E4E5" x="0.0" y="-388.0" w="305.0" h="760.0" h-a-x="304" />
-	<g c="E4E6" x="0.0" y="-250.0" w="276.0" h="433.0" h-a-x="277" />
-	<g c="E4E7" x="1.0" y="-492.0" w="324.0" h="666.0" h-a-x="324" />
-	<g c="E4E8" x="1.0" y="-485.0" w="398.0" h="898.0" h-a-x="404" />
-	<g c="E4E9" x="2.0" y="-718.0" w="478.0" h="1131.0" h-a-x="480" />
-	<g c="E4EA" x="7.0" y="-734.0" w="572.0" h="1411.0" h-a-x="578" />
-	<g c="E880" x="0.0" y="0.0" w="243.0" h="326.0" h-a-x="243" />
-	<g c="E881" x="0.0" y="0.0" w="207.0" h="311.0" h-a-x="207" />
-	<g c="E882" x="0.0" y="-15.0" w="260.0" h="326.0" h-a-x="260" />
-	<g c="E883" x="0.0" y="0.0" w="255.0" h="326.0" h-a-x="255" />
-	<g c="E884" x="0.0" y="0.0" w="259.0" h="311.0" h-a-x="259" />
-	<g c="E885" x="0.0" y="0.0" w="240.0" h="326.0" h-a-x="240" />
-	<g c="E886" x="0.0" y="0.0" w="214.0" h="326.0" h-a-x="214" />
-	<g c="E887" x="0.0" y="0.0" w="243.0" h="311.0" h-a-x="243" />
-	<g c="E888" x="0.0" y="0.0" w="274.0" h="326.0" h-a-x="274" />
-	<g c="E889" x="0.0" y="-1.0" w="225.0" h="327.0" h-a-x="225" />
-	<g c="E566" x="0.0" y="0.0" w="432.0" h="364.0" h-a-x="432" />
-	<g c="E56C" x="0.0" y="-2.0" w="605.0" h="242.0" h-a-x="605" />
-	<g c="E56D" x="0.0" y="-90.0" w="586.0" h="399.0" h-a-x="587" />
-	<g c="E004" x="0.0" y="-282.1" w="399.0" h="282.1" h-a-x="399" />
-	<g c="E003" x="0.0" y="0.0" w="399.0" h="282.1" h-a-x="399" />
-	<g c="E88A" x="17.0" y="50.0" w="110.0" h="194.0" h-a-x="144" />
-	<g c="E522" x="-143.0" y="-223.0" w="448.0" h="665.0" h-a-x="232" />
-	<g c="E521" x="-44.0" y="-18.0" w="472.0" h="280.0" h-a-x="405" />
-	<g c="E520" x="-49.0" y="-167.0" w="382.0" h="430.0" h-a-x="306" />
-	<g c="E523" x="-20.0" y="0.0" w="245.0" h="259.0" h-a-x="225" />
-	<g c="E524" x="0.0" y="0.0" w="194.0" h="270.0" h-a-x="194" />
-	<g c="E525" x="-36.0" y="-16.0" w="296.0" h="265.0" h-a-x="260" />
-	<g c="E650" x="0.0" y="0.0" w="695.0" h="514.0" h-a-x="695" />
-	<g c="E655" x="0.0" y="0.0" w="431.0" h="418.0" h-a-x="431" />
-	<g c="E046" x="0.0" y="-22.0" w="935.0" h="428.0" h-a-x="935" />
-	<g c="E045" x="0.0" y="-14.0" w="860.0" h="418.0" h-a-x="860" />
-	<g c="E047" x="0.0" y="0.0" w="411.0" h="513.0" h-a-x="411" />
-	<g c="E048" x="0.0" y="-73.0" w="537.0" h="653.0" h-a-x="537" />
-	<g c="E04B" x="0.0" y="-34.0" w="450.0" h="1192.0" h-a-x="477" />
-	<g c="E500" x="0.0" y="-242.0" w="508.0" h="484.0" h-a-x="508" />
-	<g c="E220" x="-163.0" y="-124.0" w="326.0" h="249.0" h-a-x="163" />
-	<g c="E222" x="-162.0" y="-258.0" w="324.0" h="516.0" h-a-x="162" />
-	<g c="E223" x="-162.0" y="-325.0" w="324.0" h="651.0" h-a-x="162" />
-	<g c="E224" x="-162.0" y="-392.0" w="324.0" h="785.0" h-a-x="162" />
-	<g c="E221" x="-163.0" y="-193.0" w="326.0" h="386.0" h-a-x="164" />
-	<g c="E530" x="-144.0" y="-223.0" w="908.0" h="667.0" h-a-x="692" />
-	<g c="E52F" x="-143.0" y="-223.0" w="698.0" h="665.0" h-a-x="479" />
-	<g c="E531" x="-144.0" y="-223.0" w="1140.0" h="667.0" h-a-x="925" />
-	<g c="E532" x="-144.0" y="-223.0" w="1374.0" h="667.0" h-a-x="1158" />
-	<g c="E4A0" x="0.0" y="0.0" w="347.0" h="236.0" h-a-x="347" />
-	<g c="E4A1" x="0.0" y="-236.0" w="347.0" h="236.0" h-a-x="347" />
-	<g c="E4A8" x="0.0" y="0.0" w="153.0" h="224.0" h-a-x="153" />
-	<g c="E4A9" x="0.0" y="-224.0" w="153.0" h="224.0" h-a-x="153" />
-	<g c="E4AA" x="0.0" y="0.0" w="33.0" h="240.0" />
-	<g c="E4AB" x="0.0" y="-240.0" w="33.0" h="240.0" h-a-x="34" />
-	<g c="E568" x="0.0" y="0.0" w="468.0" h="244.0" h-a-x="468" />
-	<g c="E567" x="0.0" y="0.0" w="468.0" h="244.0" h-a-x="468" />
-	<g c="E56E" x="0.0" y="-1.0" w="710.0" h="199.0" h-a-x="711" />
-	<g c="E56A" x="0.0" y="0.0" w="244.0" h="468.0" h-a-x="244" />
-	<g c="E569" x="0.0" y="-81.0" w="468.0" h="400.0" h-a-x="468" />
-	<g c="E4AC" x="0.0" y="0.0" w="273.0" h="265.0" h-a-x="274" />
-	<g c="E4AD" x="1.0" y="-265.0" w="273.0" h="265.0" h-a-x="274" />
-	<g c="E56B" x="0.0" y="0.0" w="244.0" h="468.0" h-a-x="244" />
-	<g c="E938" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" />
-	<g c="E939" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" />
-	<g c="E93C" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" />
-	<g c="E93D" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" />
-	<g c="E101" x="0.0" y="-250.0" w="460.0" h="500.0" h-a-x="460" >
-		<a n="stemDownNW" x="0" y="-1"/>
-		<a n="stemUpSE" x="1.84" y="1"/>
-	</g>
-	<g c="E501" x="0.0" y="-242.0" w="750.0" h="484.0" h-a-x="751" />
-	<g c="E502" x="0.0" y="-242.0" w="1234.0" h="484.0" h-a-x="1234" />
-	<g c="E901" x="0.0" y="-147.0" w="268.0" h="991.0" h-a-x="268" />
-	<g c="E904" x="0.0" y="-883.0" w="597.0" h="1208.0" h-a-x="596" />
-	<g c="E909" x="1.0" y="-652.0" w="205.6" h="1306.0" h-a-x="204" />
-	<g c="E526" x="-39.0" y="-18.0" w="352.0" h="280.0" h-a-x="290" />
-	<g c="E527" x="-49.0" y="-167.0" w="1882.0" h="430.0" h-a-x="1800" />
-	<g c="E52B" x="-49.0" y="-167.0" w="682.0" h="430.0" h-a-x="600" />
-	<g c="E52A" x="-49.0" y="-167.0" w="982.0" h="430.0" h-a-x="900" />
-	<g c="E529" x="-49.0" y="-167.0" w="1282.0" h="430.0" h-a-x="1200" />
-	<g c="E528" x="-49.0" y="-167.0" w="1582.0" h="430.0" h-a-x="1500" />
-	<g c="E533" x="-143.0" y="-223.0" w="1605.0" h="667.0" h-a-x="1390" />
-	<g c="E52C" x="-44.0" y="-167.0" w="782.0" h="430.0" h-a-x="711" />
-	<g c="E52D" x="-44.0" y="-223.0" w="754.0" h="665.0" h-a-x="637" />
-	<g c="E52E" x="-49.0" y="-223.0" w="687.0" h="665.0" h-a-x="306" />
-	<g c="E534" x="-143.0" y="-223.0" w="708.0" h="665.0" h-a-x="532" />
-	<g c="E535" x="-143.0" y="-223.0" w="635.0" h="665.0" h-a-x="492" />
-	<g c="E536" x="0.0" y="-223.0" w="499.0" h="665.0" h-a-x="428" />
-	<g c="E537" x="0.0" y="-223.0" w="761.0" h="665.0" h-a-x="728" />
-	<g c="E538" x="0.0" y="-223.0" w="1061.0" h="665.0" h-a-x="1028" />
-	<g c="E53B" x="0.0" y="-223.0" w="920.0" h="665.0" h-a-x="920" />
-	<g c="E539" x="0.0" y="-223.0" w="688.0" h="665.0" h-a-x="688" />
-	<g c="E53A" x="0.0" y="-223.0" w="1021.0" h="665.0" h-a-x="988" />
-	<g c="E53C" x="-20.0" y="-223.0" w="550.0" h="665.0" h-a-x="457" />
-	<g c="E53D" x="-20.0" y="-223.0" w="737.0" h="665.0" h-a-x="717" />
-	<g c="E510" x="0.0" y="1.0" w="266.0" h="331.0" h-a-x="266" />
-	<g c="E514" x="3.0" y="-8.0" w="423.0" h="329.0" h-a-x="426" />
-	<g c="E517" x="0.0" y="-15.0" w="504.0" h="326.0" h-a-x="504" />
-	<g c="E515" x="3.0" y="-8.0" w="923.0" h="335.0" h-a-x="926" />
-	<g c="E516" x="3.0" y="-8.0" w="913.0" h="329.0" h-a-x="916" />
-	<g c="E518" x="0.0" y="-15.0" w="1021.0" h="332.0" h-a-x="1021" />
-	<g c="E519" x="0.0" y="-15.0" w="991.0" h="326.0" h-a-x="991" />
-	<g c="E511" x="0.0" y="1.0" w="657.0" h="349.0" h-a-x="657" />
-	<g c="E512" x="0.0" y="0.0" w="650.0" h="332.0" h-a-x="650" />
-	<g c="E513" x="0.0" y="0.0" w="624.0" h="332.0" h-a-x="624" />
-	<g c="E504" x="0.0" y="-242.0" w="508.0" h="484.0" h-a-x="508" />
-	<g c="E069" x="0.0" y="-250.0" w="325.0" h="500.0" h-a-x="325" />
-	<g c="E06A" x="0.0" y="-396.0" w="257.0" h="791.0" h-a-x="257" />
-	<g c="E902" x="-189.0" y="-268.0" w="370.0" h="470.0" h-a-x="181" />
-	<g c="E906" x="-1.0" y="-202.0" w="182.0" h="404.0" h-a-x="181" />
-	<g c="E4A2" x="0.0" y="0.0" w="95.0" h="94.0" h-a-x="96" />
-	<g c="E4A3" x="0.0" y="-94.0" w="95.0" h="94.0" h-a-x="96" />
-	<g c="E4A4" x="0.0" y="0.0" w="346.0" h="36.0" h-a-x="346" />
-	<g c="E4A5" x="0.0" y="-36.0" w="346.0" h="36.0" h-a-x="346" />
-	<g c="E4A6" x="0.0" y="0.0" w="110.5" h="244.0" h-a-x="110" />
-	<g c="E4A7" x="0.0" y="-244.0" w="110.5" h="244.0" h-a-x="110" />
-	<g c="E4AE" x="0.0" y="0.0" w="273.0" h="375.0" h-a-x="274" />
-	<g c="E4AF" x="1.0" y="-375.0" w="273.0" h="375.0" h-a-x="274" />
-	<g c="E4B0" x="0.0" y="0.0" w="347.0" h="346.0" h-a-x="347" />
-	<g c="E4B1" x="0.0" y="-346.0" w="347.0" h="346.0" h-a-x="347" />
-	<g c="E4B2" x="0.0" y="0.0" w="347.0" h="173.0" h-a-x="347" />
-	<g c="E4B3" x="0.0" y="-173.0" w="347.0" h="173.0" h-a-x="347" />
-	<g c="E4B4" x="0.0" y="0.0" w="347.0" h="308.0" h-a-x="347" />
-	<g c="E4B5" x="0.0" y="-308.0" w="347.0" h="308.0" h-a-x="347" />
-	<g c="E4B6" x="0.0" y="0.0" w="195.9" h="194.5" h-a-x="196" />
-	<g c="E4B7" x="0.0" y="-194.5" w="195.9" h="194.5" h-a-x="196" />
-	<g c="E4B8" x="0.0" y="0.0" w="270.0" h="167.0" h-a-x="270" />
-	<g c="E4B9" x="0.0" y="-167.0" w="270.0" h="167.0" h-a-x="270" />
-	<g c="E4BA" x="-0.2" y="0.0" w="234.2" h="96.0" h-a-x="234" />
-	<g c="E4BB" x="-0.2" y="-96.0" w="234.2" h="96.0" h-a-x="234" />
-	<g c="E4C6" x="1.0" y="0.0" w="788.0" h="439.0" h-a-x="790" />
-	<g c="E4C7" x="1.0" y="-439.0" w="788.0" h="439.0" h-a-x="790" />
-	<g c="E4BC" x="0.0" y="0.0" w="347.0" h="350.0" h-a-x="347" />
-	<g c="E4BD" x="0.0" y="-350.0" w="347.0" h="350.0" h-a-x="347" />
-	<g c="E610" x="0.0" y="0.0" w="310.0" h="240.0" h-a-x="310" />
-	<g c="E612" x="0.0" y="0.0" w="283.0" h="338.0" h-a-x="284" />
-	<g c="E613" x="0.0" y="0.0" w="283.0" h="338.0" h-a-x="284" />
-	<g c="E611" x="0.0" y="0.0" w="310.0" h="240.0" h-a-x="310" />
-	<g c="E614" x="0.0" y="0.0" w="206.0" h="206.0" h-a-x="206" />
-	<g c="E4C8" x="1.0" y="0.0" w="788.0" h="439.0" h-a-x="790" />
-	<g c="E4C9" x="1.0" y="-439.0" w="788.0" h="439.0" h-a-x="790" />
-	<g c="E4C4" x="0.0" y="-0.2" w="779.0" h="449.2" h-a-x="779" />
-	<g c="E4C2" x="0.0" y="-0.2" w="779.0" h="449.2" h-a-x="779" />
-	<g c="E4C3" x="0.0" y="-449.0" w="779.0" h="449.2" h-a-x="779" />
-	<g c="E4C5" x="0.0" y="-449.0" w="779.0" h="449.2" h-a-x="779" />
-	<g c="E4CE" x="0.0" y="0.0" w="180.0" h="300.0" h-a-x="180" />
-	<g c="E93E" x="0.0" y="0.0" w="30.0" h="760.0" h-a-x="30" />
-	<g c="E93F" x="0.0" y="-760.0" w="30.0" h="760.0" h-a-x="30" />
-	<g c="E949" x="0.0" y="0.0" w="186.0" h="760.0" h-a-x="186" />
-	<g c="E94B" x="0.0" y="0.0" w="186.0" h="760.0" h-a-x="186" />
-	<g c="E94A" x="0.0" y="-760.0" w="186.0" h="760.0" h-a-x="186" />
-	<g c="E94C" x="0.0" y="-760.0" w="186.0" h="760.0" h-a-x="186" />
-	<g c="E9F3" x="0.0" y="0.0" w="40.0" h="250.0" />
-	<g c="E9F2" x="0.0" y="-250.0" w="40.0" h="500.0" />
-	<g c="E9F1" x="0.0" y="-500.0" w="40.0" h="1000.0" />
-	<g c="E9F0" x="0.0" y="-500.0" w="130.0" h="1000.0" />
-	<g c="E9F4" x="0.0" y="110.0" w="40.0" h="140.0" />
-	<g c="E9F5" x="0.0" y="0.0" w="40.0" h="140.0" />
-	<g c="E9F6" x="0.0" y="0.0" w="118.0" h="140.0" />
-	<g c="E9F7" x="0.0" y="0.0" w="118.0" h="140.0" />
-	<g c="E9F8" x="0.0" y="0.0" w="118.0" h="140.0" />
-	<g c="E26C" x="0.0" y="-260.0" w="90.0" h="520.0" h-a-x="90" />
-	<g c="E26D" x="0.0" y="-260.0" w="90.0" h="520.0" h-a-x="90" />
-	<g c="E270" x="-43.0" y="-184.0" w="263.0" h="786.0" h-a-x="221" >
-		<a n="cutOutNE" x="0.564" y="0.572"/>
-		<a n="cutOutSE" x="0.504" y="-0.364"/>
-	</g>
-	<g c="E271" x="-46.0" y="-354.0" w="266.0" h="848.0" h-a-x="220" >
-		<a n="cutOutNE" x="0.188" y="0.58"/>
-		<a n="cutOutSE" x="0.588" y="-0.272"/>
-	</g>
-	<g c="E272" x="-46.0" y="-377.0" w="223.0" h="862.0" h-a-x="178" >
-		<a n="cutOutNE" x="0.468" y="0.784"/>
-		<a n="cutOutSW" x="0.632" y="-0.828"/>
-	</g>
-	<g c="E273" x="0.0" y="-485.0" w="221.0" h="862.0" h-a-x="157" >
-		<a n="cutOutNE" x="0.08" y="0.772"/>
-		<a n="cutOutSW" x="0.268" y="-0.828"/>
-	</g>
-	<g c="E274" x="-24.0" y="-364.0" w="221.0" h="825.0" h-a-x="197" >
-		<a n="cutOutNE" x="0.62" y="0.88"/>
-		<a n="cutOutSE" x="0.624" y="-0.688"/>
-		<a n="cutOutSW" x="0.164" y="-0.872"/>
-	</g>
-	<g c="E275" x="-25.0" y="-473.0" w="222.0" h="855.0" h-a-x="197" >
-		<a n="cutOutNE" x="0.624" y="0.864"/>
-		<a n="cutOutNW" x="0.16" y="0.696"/>
-		<a n="cutOutSE" x="0.62" y="-0.684"/>
-	</g>
-	<g c="E280" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="198" >
-		<a n="cutOutNW" x="0.7" y="0.584"/>
-		<a n="cutOutSW" x="0.368" y="-0.332"/>
-	</g>
-	<g c="E281" x="0.0" y="-175.0" w="416.0" h="644.0" h-a-x="416" >
-		<a n="cutOutNE" x="0.972" y="0.588"/>
-		<a n="cutOutNW" x="0.7" y="0.584"/>
-		<a n="cutOutSE" x="1.336" y="-0.308"/>
-		<a n="cutOutSW" x="0.344" y="-0.32"/>
-	</g>
-	<g c="E282" x="0.0" y="-339.0" w="106.0" h="667.0" h-a-x="106" >
-		<a n="cutOutNE" x="0.252" y="0.72"/>
-		<a n="cutOutNW" x="0.16" y="0.652"/>
-		<a n="cutOutSE" x="0.256" y="-0.748"/>
-		<a n="cutOutSW" x="0.16" y="-0.812"/>
-	</g>
-	<g c="E283" x="0.0" y="-373.0" w="303.0" h="728.0" h-a-x="303" >
-		<a n="cutOutNE" x="1.052" y="0.816"/>
-		<a n="cutOutNW" x="0.156" y="0.516"/>
-		<a n="cutOutSE" x="1.052" y="-0.64"/>
-		<a n="cutOutSW" x="0.156" y="-0.948"/>
-	</g>
-	<g c="E242" x="0.0" y="-779.0" w="276.0" h="779.0" h-a-x="274" />
-	<g c="E244" x="0.0" y="-779.0" w="276.0" h="969.0" h-a-x="274" />
-	<g c="E246" x="0.0" y="-779.0" w="276.0" h="1159.0" h-a-x="274" />
-	<g c="E248" x="0.0" y="-779.0" w="276.0" h="1349.0" h-a-x="274" />
-	<g c="E24A" x="0.0" y="-779.0" w="276.0" h="1539.0" h-a-x="274" />
-	<g c="E243" x="0.0" y="0.0" w="276.0" h="761.0" h-a-x="274" />
-	<g c="E245" x="0.0" y="-190.0" w="276.0" h="950.0" h-a-x="274" />
-	<g c="E247" x="0.0" y="-380.0" w="276.0" h="1140.0" h-a-x="274" />
-	<g c="E249" x="0.0" y="-570.0" w="276.0" h="1329.0" h-a-x="274" />
-	<g c="E24B" x="0.0" y="-760.0" w="276.0" h="1518.0" h-a-x="274" />
-	<g c="E4EB" x="-1.0" y="-955.0" w="642.0" h="1632.0" h-a-x="642" />
-	<g c="E4EC" x="-1.0" y="-955.0" w="721.0" h="1868.0" h-a-x="720" />
-	<g c="E4ED" x="-1.0" y="-955.0" w="795.0" h="2099.0" h-a-x="795" />
-	<g c="E08D" x="0.0" y="-126.0" w="253.0" h="252.0" h-a-x="253" />
-	<g c="E08C" x="0.0" y="-171.0" w="342.0" h="342.0" h-a-x="342" />
-	<g c="E59E" x="0.0" y="0.0" w="375.0" h="192.0" h-a-x="375" />
-	<g c="E59D" x="0.0" y="0.0" w="306.0" h="192.0" h-a-x="244" />
-	<g c="EAAA" x="-6.3" y="0.0" w="210.7" h="112.0" h-a-x="198" />
-	<g c="EAA9" x="-6.3" y="0.0" w="210.7" h="112.0" h-a-x="198" />
-	<g c="EAAD" x="0.0" y="-44.0" w="370.0" h="200.0" h-a-x="370" />
-	<g c="EAAE" x="0.0" y="-44.0" w="370.0" h="200.0" h-a-x="370" />
-	<g c="E659" x="0.0" y="-14.0" w="969.0" h="549.0" h-a-x="969" />
-	<g c="E910" x="0.0" y="-240.0" w="480.0" h="480.0" />
-	<g c="E911" x="0.0" y="-240.0" w="480.0" h="480.0" />
-	<g c="E912" x="0.0" y="-408.0" w="480.0" h="816.0" />
-	<g c="E913" x="0.0" y="-408.0" w="480.0" h="816.0" />
-	<g c="E91B" x="-26.0" y="-266.0" w="532.0" h="532.0" />
-	<g c="E91C" x="-75.0" y="-240.0" w="625.0" h="480.0" />
-	<g c="E914" x="0.0" y="-240.0" w="450.0" h="480.0" />
-	<g c="E917" x="0.0" y="-408.0" w="450.0" h="816.0" />
-	<g c="E91E" x="-26.0" y="-266.0" w="532.0" h="532.0" />
-	<g c="E920" x="0.0" y="-63.0" w="126.0" h="126.0" />
-	<g c="E921" x="0.0" y="-47.0" w="223.0" h="93.0" h-a-x="223" />
-	<g c="E922" x="0.0" y="-40.0" w="292.0" h="80.0" h-a-x="292" />
-	<g c="E923" x="0.0" y="-88.0" w="196.0" h="176.0" h-a-x="196" />
-	<g c="E924" x="0.0" y="-131.0" w="264.0" h="262.0" h-a-x="264" />
-	<g c="E925" x="0.0" y="-408.0" w="36.0" h="816.0" h-a-x="36" />
-	<g c="E918" x="0.0" y="-408.0" w="450.0" h="816.0" />
-	<g c="E915" x="0.0" y="-240.0" w="450.0" h="480.0" />
-	<g c="E916" x="30.0" y="-240.0" w="450.0" h="480.0" />
-	<g c="E919" x="30.0" y="-408.0" w="450.0" h="816.0" />
-	<g c="E91A" x="30.0" y="-240.0" w="450.0" h="480.0" />
-	<g c="E91F" x="-26.0" y="-266.0" w="532.0" h="532.0" />
-	<g c="E91D" x="-26.0" y="-266.0" w="532.0" h="532.0" />
-	<g c="EBE0" x="-3.0" y="-3.0" w="226.0" h="252.0" h-a-x="220" />
-	<g c="EBE1" x="-2.1" y="-4.0" w="155.1" h="253.0" h-a-x="148" />
-	<g c="EBE2" x="-3.9" y="-3.0" w="172.9" h="252.0" h-a-x="166" />
-	<g c="EBE3" x="-3.0" y="-3.0" w="172.0" h="252.0" h-a-x="166" />
-	<g c="EBE4" x="-4.0" y="-3.0" w="205.0" h="252.0" h-a-x="198" />
-	<g c="EBE5" x="-3.0" y="-3.0" w="155.0" h="257.0" h-a-x="149" />
-	<g c="EBE6" x="-3.0" y="-3.0" w="182.0" h="252.0" h-a-x="176" />
-	<g c="EBE7" x="-3.0" y="-3.0" w="168.0" h="252.0" h-a-x="162" />
-	<g c="EBE8" x="-3.0" y="-3.0" w="194.0" h="252.0" h-a-x="188" />
-	<g c="EBE9" x="-3.0" y="-3.2" w="185.0" h="252.2" h-a-x="179" />
-	<g c="EBA7" x="-82.0" y="0.0" w="174.0" h="791.0" h-a-x="92" />
-	<g c="EBA8" x="-1.0" y="0.0" w="405.0" h="795.0" h-a-x="403" />
-	<g c="EBAA" x="0.0" y="0.0" w="392.0" h="781.0" h-a-x="393" />
-	<g c="EBA9" x="0.0" y="0.0" w="390.0" h="785.0" h-a-x="389" />
-	<g c="EBAB" x="0.0" y="-1.0" w="392.0" h="787.0" h-a-x="392" />
-	<g c="EBAC" x="0.0" y="-1.0" w="386.0" h="854.0" h-a-x="381" />
-	<g c="E24C" x="0.0" y="-779.0" w="277.0" h="1729.0" h-a-x="274" />
-	<g c="E24D" x="0.0" y="-950.0" w="277.0" h="1729.0" h-a-x="274" />
-	<g c="E24E" x="0.0" y="-779.0" w="280.0" h="1919.0" h-a-x="274" />
-	<g c="E24F" x="0.0" y="-1140.0" w="280.0" h="1919.0" h-a-x="274" />
-	<g c="EBC0" x="-0.6" y="0.0" w="279.6" h="202.8" h-a-x="280" />
-	<g c="EBC1" x="-1.0" y="-0.0" w="227.6" h="313.2" h-a-x="227" />
-	<g c="EBC2" x="0.6" y="0.8" w="251.6" h="233.2" h-a-x="253" />
-	<g c="EBC3" x="0.2" y="0.4" w="413.2" h="306.0" h-a-x="413" />
-	<g c="EBC4" x="0.0" y="0.0" w="187.6" h="276.4" h-a-x="187" />
-	<g c="EBC5" x="0.0" y="0.0" w="211.8" h="355.0" h-a-x="212" />
-	<g c="EBC6" x="-0.2" y="-0.2" w="321.2" h="319.6" h-a-x="321" />
-	<g c="EBC7" x="0.0" y="0.0" w="289.0" h="328.0" h-a-x="289" />
-	<g c="EBC8" x="1.0" y="0.0" w="151.0" h="267.0" h-a-x="153" />
-	<g c="EBC9" x="0.0" y="0.0" w="161.0" h="355.0" h-a-x="160" />
-	<g c="EBCA" x="1.0" y="0.0" w="232.0" h="348.0" h-a-x="233" />
-	<g c="EBCB" x="-1.0" y="-1.0" w="550.0" h="229.2" h-a-x="549" />
-	<g c="EBCC" x="0.2" y="-0.2" w="341.2" h="210.8" h-a-x="341" />
-	<g c="E000" x="0.1" y="1.1" w="92.6" h="997.7" />
-	<g c="E645" x="-150.0" y="0.0" w="300.0" h="300.0" h-a-x="150" />
-	<g c="E0A5" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="314" />
-	<g c="E0A9" x="0.0" y="-125.0" w="290.0" h="250.0" h-a-x="290" >
-		<a n="stemDownNW" x="0" y="-0.44"/>
-		<a n="stemUpSE" x="1.16" y="0.444"/>
-	</g>
-	<g c="E0AF" x="-1.0" y="-133.0" w="267.0" h="266.0" h-a-x="266" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.064" y="0"/>
-	</g>
-	<g c="E0DB" x="0.0" y="-160.0" w="314.0" h="320.0" h-a-x="314" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.256" y="0"/>
-	</g>
-	<g c="E0DC" x="0.0" y="-125.0" w="350.0" h="250.0" h-a-x="350" >
-		<a n="stemDownNW" x="0" y="0.004"/>
-		<a n="stemUpSE" x="1.4" y="0.004"/>
-	</g>
-	<g c="E0DD" x="0.0" y="-160.0" w="314.0" h="320.0" h-a-x="314" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.256" y="0"/>
-	</g>
-	<g c="E0DE" x="0.0" y="-125.0" w="350.0" h="250.0" h-a-x="350" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.4" y="0"/>
-	</g>
-	<g c="E0D9" x="0.0" y="-162.0" w="314.0" h="324.0" h-a-x="314" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.256" y="0"/>
-	</g>
-	<g c="E22A" x="-155.0" y="-116.0" w="311.0" h="232.0" h-a-x="156" />
-	<g c="E0B7" x="0.0" y="-125.0" w="289.0" h="250.0" h-a-x="289" >
-		<a n="stemDownNW" x="0" y="-0.148"/>
-		<a n="stemUpSE" x="1.156" y="0.148"/>
-	</g>
-	<g c="E0B5" x="0.0" y="-133.0" w="405.0" h="266.0" h-a-x="405" >
-		<a n="cutOutNW" x="0.06" y="0.244"/>
-		<a n="cutOutSE" x="1.568" y="-0.232"/>
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.62" y="0"/>
-	</g>
-	<g c="E0B6" x="0.0" y="-132.0" w="314.0" h="270.0" h-a-x="314" >
-		<a n="cutOutNW" x="0.14" y="0.24"/>
-		<a n="cutOutSE" x="1.076" y="-0.24"/>
-		<a n="stemDownNW" x="0" y="-0.144"/>
-		<a n="stemUpSE" x="1.256" y="0.164"/>
-	</g>
-	<g c="E5B0" x="0.0" y="-2.0" w="980.0" h="274.0" h-a-x="980" />
-	<g c="E5B1" x="0.0" y="-160.0" w="1040.0" h="400.0" h-a-x="1040" />
-	<g c="E5B2" x="0.0" y="-2.0" w="849.0" h="402.0" h-a-x="849" />
-	<g c="E5B3" x="0.0" y="-2.0" w="855.0" h="523.0" h-a-x="855" />
-	<g c="E5B4" x="1.0" y="-2.0" w="1498.0" h="374.0" h-a-x="1105" />
-	<g c="E5B5" x="0.0" y="-317.0" w="1076.0" h="590.0" h-a-x="1076" />
-	<g c="E5B6" x="0.0" y="-317.0" w="1292.0" h="867.9" h-a-x="1048" />
-	<g c="E5B7" x="1.0" y="-90.0" w="1329.0" h="444.0" h-a-x="1330" />
-	<g c="E5B8" x="0.0" y="-317.0" w="1076.0" h="636.0" h-a-x="1076" />
-	<g c="E5B9" x="0.0" y="-249.0" w="1369.0" h="621.0" h-a-x="1369" />
-	<g c="E5BA" x="-369.0" y="-249.0" w="1190.0" h="799.9" h-a-x="820" />
-	<g c="E5BB" x="0.0" y="-2.0" w="1064.0" h="552.9" h-a-x="820" />
-	<g c="E5BC" x="0.0" y="-91.0" w="1227.0" h="400.0" h-a-x="1227" />
-	<g c="E5BD" x="0.0" y="-90.0" w="830.0" h="399.0" h-a-x="830" />
-	<g c="E5BE" x="0.0" y="-2.0" w="983.0" h="271.0" h-a-x="983" />
-	<g c="E5BF" x="0.0" y="-80.0" w="983.0" h="400.0" h-a-x="983" />
-	<g c="E5C0" x="0.0" y="-2.0" w="1227.0" h="271.0" h-a-x="1227" />
-	<g c="E5C1" x="0.0" y="-90.0" w="1005.0" h="330.0" h-a-x="1005" />
-	<g c="E5C2" x="0.0" y="-90.0" w="1005.0" h="400.0" h-a-x="1005" />
-	<g c="E5C3" x="0.0" y="-90.0" w="1249.0" h="330.0" h-a-x="1249" />
-	<g c="E5C4" x="0.0" y="-90.0" w="1249.0" h="400.0" h-a-x="1249" />
-	<g c="E5C5" x="0.0" y="-2.0" w="821.0" h="552.9" h-a-x="820" />
-	<g c="E5C6" x="1.0" y="-2.0" w="1104.0" h="370.0" h-a-x="1105" />
-	<g c="E5C7" x="1.0" y="-80.0" w="1104.0" h="448.0" h-a-x="1105" />
-	<g c="E5C8" x="0.0" y="-243.0" w="756.0" h="483.0" h-a-x="756" />
-	<g c="E56F" x="0.0" y="-107.0" w="500.0" h="397.0" h-a-x="500" />
-	<g c="E587" x="0.0" y="-2.0" w="999.0" h="374.0" />
-	<g c="E651" x="0.0" y="0.0" w="320.0" h="514.0" h-a-x="320" />
-	<g c="E65A" x="0.0" y="-14.0" w="378.0" h="549.0" h-a-x="378" />
-	<g c="E4E4" x="0.0" y="0.0" w="300.0" h="125.0" h-a-x="300" />
-	<g c="E4E3" x="0.0" y="-125.0" w="300.0" h="125.0" h-a-x="300" />
-	<g c="E4E2" x="0.0" y="0.0" w="125.0" h="250.0" h-a-x="125" />
-	<g c="E4E1" x="0.0" y="-250.0" w="125.0" h="500.0" h-a-x="125" />
-	<g c="E4E0" x="0.0" y="-250.0" w="375.0" h="500.0" h-a-x="375" />
-	<g c="E583" x="0.0" y="0.0" w="26.0" h="330.0" />
-	<g c="E440" x="0.0" y="-175.0" w="247.0" h="644.0" h-a-x="247" >
-		<a n="cutOutNE" x="0.316" y="1.484"/>
-		<a n="cutOutSE" x="0.628" y="-0.344"/>
-	</g>
-	<g c="E441" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="200" >
-		<a n="cutOutNE" x="0.096" y="0.564"/>
-		<a n="cutOutSE" x="0.432" y="-0.344"/>
-	</g>
-	<g c="E442" x="0.0" y="-175.0" w="247.0" h="644.0" h-a-x="247" >
-		<a n="cutOutNE" x="0.312" y="1.32"/>
-		<a n="cutOutSE" x="0.628" y="-0.344"/>
-	</g>
-	<g c="E443" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="198" >
-		<a n="cutOutNW" x="0.7" y="0.584"/>
-		<a n="cutOutSW" x="0.368" y="-0.332"/>
-	</g>
-	<g c="E444" x="0.0" y="-339.0" w="106.0" h="667.0" h-a-x="106" >
-		<a n="cutOutNE" x="0.252" y="0.72"/>
-		<a n="cutOutNW" x="0.16" y="0.652"/>
-		<a n="cutOutSE" x="0.256" y="-0.748"/>
-		<a n="cutOutSW" x="0.16" y="-0.812"/>
-	</g>
-	<g c="E446" x="0.0" y="-339.0" w="210.0" h="667.0" h-a-x="210" >
-		<a n="cutOutNE" x="0.452" y="0.72"/>
-		<a n="cutOutNW" x="0.36" y="0.652"/>
-		<a n="cutOutSE" x="0.456" y="-0.748"/>
-		<a n="cutOutSW" x="0.36" y="-0.812"/>
-	</g>
-	<g c="E445" x="0.0" y="-339.0" w="197.0" h="694.0" h-a-x="197" >
-		<a n="cutOutNE" x="0.624" y="0.844"/>
-		<a n="cutOutNW" x="0.16" y="0.644"/>
-		<a n="cutOutSE" x="0.624" y="-0.64"/>
-		<a n="cutOutSW" x="0.16" y="-0.82"/>
-	</g>
-	<g c="E447" x="0.0" y="-339.0" w="239.0" h="694.0" h-a-x="239" >
-		<a n="cutOutNE" x="0.712" y="0.844"/>
-		<a n="cutOutNW" x="0.248" y="0.644"/>
-		<a n="cutOutSE" x="0.712" y="-0.64"/>
-		<a n="cutOutSW" x="0.248" y="-0.82"/>
-	</g>
-	<g c="E073" x="-1.0" y="-655.0" w="647.0" h="1738.0" h-a-x="646" />
-	<g c="E074" x="-1.0" y="-655.0" w="647.0" h="1738.0" h-a-x="646" />
-	<g c="E076" x="4.0" y="-581.0" w="694.0" h="832.0" h-a-x="698" />
-	<g c="E077" x="4.0" y="-581.0" w="694.0" h="832.0" h-a-x="698" />
-	<g c="E075" x="0.0" y="-502.0" w="606.0" h="1004.0" h-a-x="656" />
-	<g c="E055" x="-1.0" y="-655.0" w="1039.0" h="1738.0" h-a-x="646" />
-	<g c="E056" x="-1.0" y="-655.0" w="764.0" h="1738.0" h-a-x="750" />
-	<g c="E51A" x="0.0" y="-25.0" w="115.0" h="350.4" h-a-x="115" />
-	<g c="E51B" x="0.0" y="-25.0" w="115.0" h="350.0" h-a-x="115" />
-	<g c="E0F5" x="0.0" y="-240.0" w="153.0" h="480.0" h-a-x="100" />
-	<g c="E0F6" x="-53.0" y="-240.0" w="153.0" h="480.0" h-a-x="100" />
-	<g c="E102" x="0.0" y="-250.0" w="900.0" h="500.0" h-a-x="900" >
-		<a n="stemDownNW" x="0" y="-1"/>
-		<a n="stemUpSE" x="3.6" y="1"/>
-	</g>
-	<g c="E103" x="0.0" y="-250.0" w="735.0" h="500.0" h-a-x="735" >
-		<a n="stemDownNW" x="0" y="-1"/>
-		<a n="stemUpSE" x="2.94" y="1"/>
-	</g>
-	<g c="E0DA" x="0.0" y="-162.0" w="352.0" h="324.0" h-a-x="314" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.408" y="0"/>
-	</g>
-	<g c="E4F2" x="0.0" y="-250.0" w="276.0" h="433.0" h-a-x="277" />
-	<g c="E4F6" x="0.0" y="-260.0" w="304.0" h="443.0" h-a-x="304" />
-	<g c="E630" x="0.0" y="0.0" w="206.0" h="266.0" h-a-x="206" />
-	<g c="E631" x="0.0" y="0.0" w="206.0" h="266.0" h-a-x="206" />
-	<g c="E632" x="0.0" y="0.0" w="266.0" h="206.0" h-a-x="266" />
-	<g c="E633" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" />
-	<g c="E638" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" />
-	<g c="E9E3" x="0.0" y="-124.1" w="292.0" h="248.1" h-a-x="292" />
-	<g c="E9E0" x="0.0" y="-140.0" w="217.0" h="553.0" h-a-x="217" />
-	<g c="E9E1" x="0.0" y="-140.0" w="186.0" h="560.0" h-a-x="186" />
-	<g c="E9E2" x="0.0" y="-254.0" w="102.0" h="507.0" h-a-x="102" />
-	<g c="E51C" x="0.0" y="0.0" w="620.0" h="332.0" h-a-x="620" />
-	<g c="E51D" x="3.0" y="-8.0" w="881.0" h="329.0" h-a-x="884" />
-	<g c="E51E" x="0.0" y="-15.0" w="959.0" h="326.0" h-a-x="959" />
-	<g c="E908" x="1.0" y="-392.0" w="205.6" h="1046.0" h-a-x="204" />
-	<g c="E907" x="1.0" y="-302.0" w="205.6" h="956.0" h-a-x="204" />
-	<g c="E90A" x="1.0" y="-654.0" w="205.6" h="1046.0" h-a-x="204" />
-	<g c="E90B" x="1.0" y="-654.0" w="205.6" h="956.0" h-a-x="204" />
-	<g c="E08E" x="0.0" y="-243.0" w="186.0" h="486.0" h-a-x="186" />
-	<g c="E08F" x="0.0" y="-120.0" w="342.0" h="240.0" h-a-x="342" />
-	<g c="E090" x="0.0" y="-37.0" w="342.0" h="74.0" h-a-x="342" />
-	<g c="E091" x="0.0" y="-167.0" w="334.0" h="334.0" h-a-x="334" />
-	<g c="E092" x="0.0" y="-250.4" w="134.0" h="500.9" h-a-x="134" />
-	<g c="E093" x="0.0" y="-250.4" w="134.0" h="500.9" h-a-x="134" />
-	<g c="E094" x="0.0" y="-501.0" w="220.0" h="1002.0" h-a-x="220" />
-	<g c="E095" x="0.0" y="-501.0" w="220.0" h="1002.0" h-a-x="220" />
-	<g c="ED40" x="0.0" y="0.0" w="720.0" h="236.0" h-a-x="720" />
-	<g c="ED41" x="0.0" y="-236.0" w="720.0" h="236.0" h-a-x="720" />
-	<g c="EAAF" x="-9.1" y="0.0" w="215.9" h="112.0" h-a-x="198" />
-	<g c="EAA4" x="-12.2" y="0.0" w="222.4" h="112.0" h-a-x="198" />
-	<g c="E5E5" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" />
-	<g c="E5E6" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" />
-	<g c="E5E7" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" />
-	<g c="E0A0" x="0.0" y="-170.0" w="545.0" h="340.0" h-a-x="545" />
-	<g c="E0A1" x="0.0" y="-170.0" w="348.0" h="340.0" h-a-x="348" />
-	<g c="EA02" x="0.0" y="-2.0" w="772.0" h="396.0" h-a-x="772" />
-	<g c="EA06" x="0.0" y="-96.0" w="64.0" h="410.0" h-a-x="64" />
-	<g c="E043" x="0.0" y="325.0" w="100.0" h="350.0" h-a-x="100" />
-	<g c="E044" x="0.0" y="-50.0" w="100.0" h="100.0" h-a-x="100" />
-	<g c="E049" x="0.0" y="-73.0" w="537.0" h="653.0" h-a-x="537" />
-	<g c="E503" x="0.0" y="73.0" w="95.0" h="94.0" h-a-x="95" />
-	<g c="E505" x="0.0" y="-166.0" w="95.0" h="94.0" h-a-x="95" />
-</bounding-boxes>
diff --git a/data/Leipzig/E000-brace.xml b/data/Leipzig/E000-brace.xml
deleted file mode 100644
index d561b41803c..00000000000
--- a/data/Leipzig/E000-brace.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M92 7c3 -5 -4 -8 -7 -4c-54 81 -70 151 -70 214c0 46 9 89 16 125c6 29 12 54 12 77c0 31 -10 56 -41 77c-2 2 -3 5 0 7c31 21 41 46 41 77c0 23 -6 49 -12 78c-7 36 -16 79 -16 125c0 63 16 133 70 214c3 4 10 1 7 -4c-38 -69 -50 -132 -50 -187c0 -46 9 -88 16 -126 c6 -30 11 -58 11 -83c0 -39 -13 -72 -56 -97c43 -25 56 -58 56 -97c0 -25 -5 -53 -11 -83c-7 -38 -16 -80 -16 -126c0 -55 12 -118 50 -187z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E003-bracketTop.xml b/data/Leipzig/E003-bracketTop.xml
deleted file mode 100644
index d82c1d1c3b7..00000000000
--- a/data/Leipzig/E003-bracketTop.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -0v111c0 0 62 1 63 1c70 0 233 16 321 170c1 1 15 -5 15 -6c-5 -7 -57 -176 -263 -271c-24 -4 -53 -5 -83 -5h-53z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E004-bracketBottom.xml b/data/Leipzig/E004-bracketBottom.xml
deleted file mode 100644
index d1e019016af..00000000000
--- a/data/Leipzig/E004-bracketBottom.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0h53c30 0 59 -1 83 -5c206 -95 258 -264 263 -271c0 -1 -14 -7 -15 -6c-88 154 -251 170 -321 170c-1 0 -63 1 -63 1v111z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E043-repeatDots.xml b/data/Leipzig/E043-repeatDots.xml
deleted file mode 100644
index 02d0492fbef..00000000000
--- a/data/Leipzig/E043-repeatDots.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 375c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50zM0 625c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E044-repeatDot.xml b/data/Leipzig/E044-repeatDot.xml
deleted file mode 100644
index 0c439154146..00000000000
--- a/data/Leipzig/E044-repeatDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E045-dalSegno.xml b/data/Leipzig/E045-dalSegno.xml
deleted file mode 100644
index 3072c82ef04..00000000000
--- a/data/Leipzig/E045-dalSegno.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E045" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M133 363c0 24 -18 26 -48 32v9h152c134 0 201 -55 201 -166c0 -48 -13 -91 -39 -128c-47 -65 -138 -110 -244 -110h-155v10c32 0 51 23 51 54l79 285l2 9zM366 249c0 90 -39 136 -128 136c-17 0 -32 -1 -38 -11l-90 -323l-2 -11c2 -15 17 -23 45 -23 c139 0 213 92 213 232zM704 384c-35 0 -64 -26 -64 -61c0 -17 5 -33 15 -47c20 -24 26 -31 48 -50c13 -16 36 -43 48 -59c12 -19 18 -38 18 -59c0 -26 -9 -46 -19 -65c-13 -19 -29 -34 -46 -43c-15 -10 -34 -14 -59 -14c-11 0 -28 5 -51 14c-16 4 -32 5 -42 10 c-7 0 -12 -4 -16 -10c-4 -1 -7 -5 -8 -13h-12l21 135h15l-3 -17c0 -15 3 -26 5 -37c4 -11 11 -21 22 -32c15 -19 35 -28 62 -28c24 0 42 8 54 24c16 15 24 34 24 55c0 20 -5 36 -14 48c-12 13 -20 25 -33 38c-5 5 -11 11 -17 18c-22 21 -38 40 -49 58c-11 13 -16 31 -16 54 c0 38 8 53 31 72c19 19 44 29 75 29c24 0 42 -2 54 -7c11 -7 21 -10 31 -10c7 0 15 6 24 17h13l-24 -119h-10c0 66 -26 99 -77 99zM430 0c-20 0 -32 12 -32 33s17 34 32 34c8 0 15 -4 21 -12c7 -4 10 -11 10 -22c0 -16 -13 -33 -31 -33zM829 0c-20 0 -32 11 -35 28 c0 17 17 33 35 33c19 0 31 -12 31 -33c0 -18 -15 -28 -31 -28z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E046-daCapo.xml b/data/Leipzig/E046-daCapo.xml
deleted file mode 100644
index 04fb76adc5b..00000000000
--- a/data/Leipzig/E046-daCapo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E046" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10c33 0 48 23 51 54l79 285l2 9l1 5c0 8 -3 14 -8 19s-19 9 -40 13v9h152c134 0 201 -55 201 -166c0 -48 -13 -91 -39 -128c-49 -64 -136 -110 -244 -110h-155v10zM366 249c0 89 -39 136 -128 136c-17 0 -32 -1 -38 -11l-90 -323l-2 -11c2 -15 17 -23 45 -23 c40 0 77 11 110 34c34 20 58 46 76 82c18 30 27 69 27 116zM677 10c70 0 112 30 149 74l8 -10c-47 -64 -104 -96 -171 -96c-30 0 -58 7 -83 22c-22 15 -40 40 -55 64c-13 26 -19 54 -19 85c0 43 11 84 34 124c24 39 55 71 94 98c40 23 81 35 124 35h18c7 0 12 -1 15 -2 l36 -7l28 -8l25 15h10l-22 -125h-11c0 34 -8 60 -25 79c-19 17 -42 26 -71 26c-44 0 -73 -15 -97 -39c-29 -25 -50 -56 -64 -95c-9 -20 -15 -38 -18 -54s-6 -34 -6 -55c0 -43 6 -69 25 -94c17 -25 42 -37 76 -37zM430 0c-20 0 -32 12 -32 33s17 34 32 34c8 0 15 -4 21 -12 c7 -4 10 -11 10 -22c0 -16 -14 -33 -31 -33zM904 0c-18 0 -31 12 -33 28c0 11 3 19 10 23c6 7 14 10 23 10c8 0 16 -3 24 -9c5 -6 7 -14 7 -24c0 -17 -14 -28 -31 -28z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E047-segno.xml b/data/Leipzig/E047-segno.xml
deleted file mode 100644
index d0570b4e705..00000000000
--- a/data/Leipzig/E047-segno.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M108 474c-22 0 -38 -30 -38 -56c0 -54 73 -85 140 -116l138 205h41l-146 -221c41 -21 73 -44 96 -67c28 -29 42 -62 42 -97c0 -68 -54 -122 -124 -122c-40 0 -76 33 -76 73c0 22 21 38 43 38c23 0 34 -17 39 -38c6 -23 16 -34 31 -34c27 0 42 23 42 54c0 13 -3 23 -8 32 c-9 17 -33 36 -72 57l-60 30l-134 -208h-40l141 223c-49 23 -85 50 -109 80c-21 27 -32 55 -32 84c0 47 25 80 54 102c17 13 37 20 58 20c46 0 91 -32 91 -77c0 -22 -23 -36 -45 -36c-19 0 -30 8 -35 25l-7 23c-5 17 -15 26 -30 26zM75 192c0 -21 -16 -38 -36 -38 c-23 0 -39 13 -39 35c0 21 15 39 36 39c22 0 39 -15 39 -36zM337 322c0 24 16 38 37 38c23 0 37 -19 37 -37c0 -23 -17 -37 -37 -37c-23 0 -37 17 -37 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E048-coda.xml b/data/Leipzig/E048-coda.xml
deleted file mode 100644
index 556b420171f..00000000000
--- a/data/Leipzig/E048-coda.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M537 233h-64c0 -16 -4 -40 -13 -73l-14 -39l-16 -31c-13 -17 -30 -40 -47 -53c-22 -17 -57 -27 -97 -37v-73h-35v73l-39 6c-9 1 -16 3 -23 6c-57 31 -89 74 -111 148l-13 39v34h-65v40h65c0 34 2 43 12 73c6 24 18 52 30 70l23 30l24 25c21 16 30 23 61 28 c12 2 24 4 36 7v74h35v-74c21 -3 46 -4 61 -13c13 -5 25 -13 35 -22c16 -13 32 -32 48 -55c13 -23 43 -107 43 -143h64v-40zM369 273l-2 22v37c0 17 -3 37 -9 58c-6 35 -38 81 -72 81v-198h83zM251 273v198c-15 0 -30 -9 -46 -26c-15 -19 -24 -36 -27 -52 c-3 -18 -5 -36 -8 -54v-36c0 -13 -2 -23 -3 -30h84zM370 233h-84v-196c15 0 31 8 46 24c13 15 22 33 26 54l9 62zM251 37v196h-84v-21v-37c0 -42 15 -87 37 -114c15 -16 31 -24 47 -24z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E049-codaSquare.xml b/data/Leipzig/E049-codaSquare.xml
deleted file mode 100644
index 943738ef7e2..00000000000
--- a/data/Leipzig/E049-codaSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M537 233h-64v-233h-187v-73h-35v73h-186v199v34h-65v40h65v233h186v74h35v-74h187v-233h64v-40zM369 273v198h-83v-198h83zM251 273v198h-84v-198h84zM370 233h-84v-196h83zM251 37v196h-84v-196h84z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E04B-segnoSerpent2.xml b/data/Leipzig/E04B-segnoSerpent2.xml
deleted file mode 100644
index e9327f22306..00000000000
--- a/data/Leipzig/E04B-segnoSerpent2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 643l66 -38v146l-66 37v-145zM320 572c29 8 60 36 60 72c0 27 -16 54 -34 63l-64 38v-148zM159 381v149l-37 22c-19 0 -28 -7 -39 -19c-15 -13 -22 -26 -22 -37c0 -36 18 -63 39 -78zM187 375l66 -36v144l-66 37v-145zM320 305c32 5 60 32 60 68c0 29 -12 51 -36 67 l-62 36v-146zM159 924v38h28v-53l66 -35v88h29v-99c33 -14 59 -28 78 -41c41 -25 79 -63 82 -126c0 -10 -2 -20 -5 -29l-6 -16c-5 -13 -11 -25 -18 -34c-6 -11 -17 -22 -26 -32l-31 -32c22 -12 39 -25 51 -39c13 -13 21 -27 25 -42c7 -13 10 -32 10 -56 c0 -56 -29 -100 -86 -131c27 -19 50 -38 67 -59s26 -45 27 -74c0 -41 -11 -69 -30 -95c-19 -29 -45 -51 -77 -67c-29 -13 -62 -22 -99 -24c-43 0 -57 4 -95 16c-47 13 -103 45 -105 96l2 13c5 25 19 37 42 37h13c15 -2 33 -17 54 -44c23 -30 38 -50 61 -65 c7 -4 26 -9 34 -12c4 -1 9 -2 16 -1c42 0 73 21 91 45c8 13 12 27 12 40l-3 22c-1 8 -4 16 -9 23c-17 31 -43 48 -75 65v-37h-29v53l-66 32v-85h-28v98l-50 26c-14 8 -43 27 -55 38c-15 12 -28 27 -37 44l-12 29c-2 8 -3 13 -3 16s0 8 -1 15l2 20c9 38 30 65 53 90l32 32 c-32 19 -55 39 -68 58c-13 21 -19 47 -19 78c0 33 8 59 23 78s37 38 66 56c-27 17 -49 37 -65 60s-24 53 -25 90c0 34 10 63 29 86c36 47 95 79 172 80c69 0 132 -21 169 -55c20 -18 30 -36 30 -54l-2 -15c-7 -29 -22 -44 -46 -44c-15 0 -27 4 -34 11c-10 10 -39 53 -54 69 c-7 7 -15 15 -25 23c-17 11 -39 18 -65 21c-31 0 -56 -8 -73 -23c-15 -15 -29 -30 -30 -57l1 -5c0 -46 51 -89 87 -105zM161 649v148l-37 23c-13 -2 -23 -6 -30 -13c-7 -10 -10 -16 -15 -28l-11 -30v-10c0 -14 1 -18 9 -30c7 -11 15 -20 23 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E050-gClef.xml b/data/Leipzig/E050-gClef.xml
deleted file mode 100644
index 10d5248a61c..00000000000
--- a/data/Leipzig/E050-gClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M441 -245c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 54 15 111 45 170c29 57 65 106 110 148s96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 82 89 82 c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c59 -43 92 -104 98 -184c1 -7 1 -15 1 -22c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162 c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 29 7 55 20 76c18 28 45 42 79 44h6c49 0 93 -42 97 -87v-9c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85 c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8c-4 53 -22 81 -55 81h-2zM406 119l54 -326c73 25 110 78 110 161c0 7 0 15 -1 23c-7 95 -57 142 -151 142h-12 zM382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13c5 -68 35 -127 93 -176 s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E051-gClef15mb.xml b/data/Leipzig/E051-gClef15mb.xml
deleted file mode 100644
index bc706ee17b9..00000000000
--- a/data/Leipzig/E051-gClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M224 -392c52 0 98 -44 98 -96c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -2 42 -5 67c-9 53 -18 106 -26 159c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-28 47 -49 116 -49 197 c0 125 83 249 155 316c45 42 96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 81 89 82c21 0 43 -30 69 -92c29 -69 41 -117 41 -174c0 -110 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2 c58 0 102 -12 133 -35c63 -46 99 -113 99 -206c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162c4 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-24 -45 -58 -75 -99 -91h9h28c22 0 39 0 39 -4c0 -22 -34 -34 -55 -38l-29 -6c-11 -2 -22 -4 -34 -7l-14 -3c-5 -4 -7 -19 -7 -26 c0 -1 1 -3 4 -3c8 0 22 3 31 3c24 0 31 -12 43 -12l3 -3c15 -11 23 -33 23 -55c0 -60 -58 -97 -112 -97c-31 0 -62 20 -62 58c0 16 8 27 23 31h4c14 0 24 -12 24 -26c0 -15 -14 -18 -17 -36c0 -11 17 -14 29 -14c15 1 40 10 60 67c5 14 7 24 7 32c0 28 -22 32 -33 32 c-27 0 -47 -27 -57 -27c-11 0 -11 4 -11 9c0 13 23 83 38 112c-8 0 -17 0 -25 1c-10 -26 -86 -197 -87 -205c0 -21 27 -11 27 -22c0 -5 -5 -9 -12 -9c-5 1 -11 1 -17 1c-19 0 -43 -2 -64 -2c-22 0 -39 2 -39 10c8 18 29 -7 47 30c8 16 39 95 39 97c0 0 2 5 2 9s-1 7 -7 7 c-10 0 -14 -19 -34 -19c-6 0 -11 3 -11 8c0 2 0 3 2 6c6 7 80 93 87 99c1 1 3 2 4 3c-10 3 -19 8 -29 13c-54 26 -80 62 -80 117c0 66 40 119 104 119zM518 850c0 56 -22 89 -55 89h-2c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128 c40 53 60 100 60 140zM570 -46c0 109 -52 165 -152 165h-12l54 -326c73 25 110 78 110 161zM254 -3c0 -51 41 -105 75 -122c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73 c-50 -44 -86 -84 -109 -119c-45 -68 -68 -128 -68 -180c0 -78 33 -140 94 -191c58 -49 125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331c-72 -2 -128 -47 -128 -120z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E052-gClef8vb.xml b/data/Leipzig/E052-gClef8vb.xml
deleted file mode 100644
index d1f2a9bcd9b..00000000000
--- a/data/Leipzig/E052-gClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13 c5 -68 35 -127 93 -176s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331zM406 119l54 -326c73 25 110 78 110 161c0 7 0 15 -1 23c-7 95 -57 142 -151 142h-12zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8 c-4 53 -22 81 -55 81h-2zM441 -245c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 54 15 111 45 170c29 57 65 106 110 148s96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257 c34 54 64 82 89 82c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c59 -43 92 -104 98 -184c1 -7 1 -15 1 -22c0 -123 -87 -209 -181 -248 c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-25 -46 -59 -77 -102 -92c21 -1 85 -13 85 -60c0 -35 -22 -43 -31 -50c-6 -5 -8 -10 -8 -16s0 -11 4 -16c6 -11 9 -22 9 -34c0 -27 -18 -53 -46 -65c-11 -4 -27 -6 -41 -6c-34 0 -82 21 -90 58 c-1 5 -2 8 -2 12c0 28 25 57 51 66c4 1 6 2 6 5c0 2 -1 3 -2 3c-11 13 -16 27 -16 41c0 21 11 40 30 51h-5c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 29 7 55 20 76c18 28 45 42 79 44h6c49 0 93 -42 97 -87v-9c0 -51 -34 -86 -105 -106 c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159zM315 -781c-3 -2 -6 -5 -7 -8c-6 -8 -10 -19 -10 -30c0 -2 0 -4 1 -7c7 -32 34 -52 53 -52c20 0 37 20 37 36c0 5 -2 9 -4 14c-5 13 -14 24 -25 34c-6 5 -11 10 -17 14 c-4 2 -9 6 -14 6c-6 0 -11 -3 -14 -7zM349 -685c0 -14 10 -25 18 -34c8 -8 16 -18 26 -25c5 -2 10 -4 13 -4c17 0 22 30 23 48c0 9 -3 20 -9 26c-8 9 -23 14 -40 14c-15 -1 -29 -8 -31 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E053-gClef8va.xml b/data/Leipzig/E053-gClef8va.xml
deleted file mode 100644
index 89397ec048b..00000000000
--- a/data/Leipzig/E053-gClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13 c5 -68 35 -127 93 -176s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331zM406 119l54 -326c73 25 110 78 110 161c0 7 0 15 -1 23c-7 95 -57 142 -151 142h-12zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8 c-4 53 -22 81 -55 81h-2zM441 -245c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 54 15 111 45 170c29 57 65 106 110 148s96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257 c22 35 43 59 61 72c-29 7 -61 26 -67 55c-1 5 -2 8 -2 12c0 28 25 57 51 66c4 1 6 2 6 5c0 2 -1 3 -2 3c-11 13 -16 27 -16 41c0 24 14 46 40 56c10 5 22 6 34 6h4c16 0 88 -10 88 -60c0 -35 -22 -43 -31 -50c-6 -5 -8 -10 -8 -16s0 -11 4 -16c6 -11 9 -22 9 -34 c0 -27 -18 -53 -46 -65c-4 -1 -9 -3 -14 -4c15 -14 30 -40 47 -81c26 -62 39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c59 -43 92 -104 98 -184c1 -7 1 -15 1 -22 c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 29 7 55 20 76c18 28 45 42 79 44h6c49 0 93 -42 97 -87v-9 c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159zM405 1179c-3 -2 -6 -5 -7 -8c-6 -8 -10 -19 -10 -30c0 -2 0 -4 1 -7c7 -30 31 -50 50 -52c3 1 5 1 8 1h3c16 4 29 21 29 35c0 5 -2 9 -4 14 c-5 13 -14 24 -25 34c-6 5 -11 10 -17 14c-4 2 -9 6 -14 6c-6 0 -11 -3 -14 -7zM439 1275c0 -14 10 -25 18 -34c8 -8 16 -18 26 -25c5 -2 10 -4 13 -4c17 0 22 30 23 48c0 9 -3 20 -9 26c-8 9 -23 14 -40 14c-15 -1 -29 -8 -31 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E054-gClef15ma.xml b/data/Leipzig/E054-gClef15ma.xml
deleted file mode 100644
index 1774e8192d2..00000000000
--- a/data/Leipzig/E054-gClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 -3c0 -51 41 -105 75 -122c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182c0 -77 33 -138 93 -189c58 -49 125 -73 203 -73 c25 0 50 3 75 9c-19 111 -36 221 -54 331c-72 -2 -128 -47 -128 -120zM570 -46c0 109 -51 165 -152 165h-12l54 -326c73 25 110 78 110 161zM518 850c0 56 -22 89 -55 89h-2c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140z M225 -392c51 0 97 -45 97 -96s-34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-27 46 -49 115 -49 195c0 126 84 251 155 318 c45 42 96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c15 25 30 43 44 57h-6c-18 0 -42 -2 -63 -2c-23 0 -42 2 -42 11c8 18 29 -7 47 30c8 16 39 95 39 97c0 0 2 5 2 9s-1 7 -7 7c-10 0 -14 -19 -34 -19c-6 0 -11 3 -11 8c0 2 0 3 2 6 c6 7 80 93 87 99s11 9 16 9c10 0 17 -11 33 -11c6 0 11 4 14 4c4 0 5 -1 5 -5v-4c-1 -7 -87 -200 -88 -208c0 -15 14 -14 22 -17c10 7 20 11 29 11h1c-5 8 -7 18 -7 30c0 16 8 27 23 31h4c14 0 24 -12 24 -26c0 -15 -14 -18 -17 -36c0 -11 17 -14 29 -14c15 1 40 10 60 67 c5 14 7 24 7 32c0 28 -22 32 -33 32c-27 0 -47 -27 -57 -27c-11 0 -11 4 -11 9c0 16 36 123 48 125h65h28c22 0 39 0 39 -4c0 -22 -34 -34 -55 -38l-29 -6c-11 -2 -22 -4 -34 -7l-14 -3c-5 -4 -7 -19 -7 -26c0 -1 1 -3 4 -3c8 0 22 3 31 3c24 0 31 -12 43 -12l3 -3 c15 -11 23 -33 23 -55c0 -60 -58 -97 -112 -97c-7 0 -15 1 -22 3c11 -15 23 -38 35 -67c26 -62 39 -115 41 -159v-15c0 -110 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c63 -46 99 -113 99 -206 c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-37 -68 -93 -104 -174 -104c-36 0 -72 10 -108 27c-53 25 -80 61 -80 115c0 69 39 121 105 121z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E055-gClef8vbOld.xml b/data/Leipzig/E055-gClef8vbOld.xml
deleted file mode 100644
index 36acad0a37b..00000000000
--- a/data/Leipzig/E055-gClef8vbOld.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13 c5 -68 35 -127 93 -176s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8c-4 53 -22 81 -55 81h-2zM120 -512c0 68 38 116 99 120h6c49 0 93 -42 97 -87v-9 c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 127 82 250 155 318 c45 42 96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 82 89 82c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2h5c28 74 73 136 127 186 c45 42 96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 82 89 82c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35 c63 -46 99 -113 99 -206c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 68 38 116 99 120h6c49 0 93 -42 97 -87v-9 c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159c-23 -4 -48 -6 -76 -6c-108 0 -148 25 -207 63c-26 -21 -55 -39 -85 -51c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70 c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11zM774 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-32 15 -59 35 -80 60c-13 -36 -33 -66 -59 -92c53 -38 113 -56 181 -56c25 0 50 3 75 9 c-19 111 -36 221 -54 331zM962 -46c0 109 -50 165 -152 165h-12l54 -326c73 25 110 78 110 161zM853 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8c-4 53 -22 81 -55 81h-2zM544 -145c17 26 26 59 26 99 c0 88 -33 143 -100 159c-9 -26 -13 -51 -13 -74v-13c5 -66 33 -123 87 -171zM528 227c38 -22 67 -52 87 -88c16 28 39 51 61 68c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-47 -42 -82 -80 -105 -113zM438 -73l22 -134c26 9 48 22 65 38c-37 28 -69 59 -87 96z " /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E056-gClef8vbCClef.xml b/data/Leipzig/E056-gClef8vbCClef.xml
deleted file mode 100644
index 58a9eefe075..00000000000
--- a/data/Leipzig/E056-gClef8vbCClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E056" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M483 485h180c10 0 10 0 10 10v380h90c0 -50 -50 -25 -50 -50v-410c0 -10 0 -10 -10 -10h-220c-10 0 -10 0 -10 10v60c0 10 0 10 10 10zM483 265c-10 0 -10 0 -10 10v60c0 10 0 10 10 10h220c10 0 10 0 10 -10v-410c0 -25 50 0 50 -50h-90v380c0 10 0 10 -10 10h-180z M441 -245c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 54 15 111 45 170c29 57 65 106 110 148s96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 82 89 82 c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c59 -43 92 -104 98 -184c1 -7 1 -15 1 -22c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162 c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 29 7 55 20 76c18 28 45 42 79 44h6c49 0 93 -42 97 -87v-9c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85 c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8c-4 53 -22 81 -55 81h-2zM406 119l54 -326c73 25 110 78 110 161c0 7 0 15 -1 23c-7 95 -57 142 -151 142h-12 zM382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13c5 -68 35 -127 93 -176 s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E05C-cClef.xml b/data/Leipzig/E05C-cClef.xml
deleted file mode 100644
index 908bc1c6e44..00000000000
--- a/data/Leipzig/E05C-cClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M175 0v502h43v-456c13 7 25 18 37 29c10 12 20 24 27 38c6 14 10 31 14 49c3 20 5 41 5 62c7 -35 32 -54 73 -60c78 19 99 68 100 165c0 44 -9 77 -31 100c-18 23 -41 35 -69 35c-43 0 -65 -37 -66 -84c7 15 19 18 39 24c6 0 10 -2 16 -4l17 -10l10 -14l7 -18 c-4 -32 -23 -48 -56 -48c-56 0 -77 39 -77 98c8 28 13 44 30 61c7 7 14 13 23 17c3 3 22 9 27 11l34 3l35 2c120 0 190 -61 190 -178l3 -33c0 -52 -20 -97 -60 -134c-20 -17 -45 -29 -74 -39c-31 -9 -64 -13 -101 -13l-93 -88v-34l93 -88c37 0 70 -4 101 -13 c29 -10 54 -22 74 -39c40 -37 60 -82 60 -134l-3 -33c0 -117 -70 -178 -190 -178l-35 2l-34 3c-5 2 -24 8 -27 11c-31 13 -43 42 -53 78c0 59 21 98 77 98c33 0 52 -16 56 -48l-7 -18l-10 -14l-17 -10c-6 -2 -10 -4 -16 -4c-20 6 -32 9 -39 24c1 -47 23 -84 66 -84 c28 0 51 12 69 35c22 23 31 56 31 100c-1 97 -22 146 -100 165c-41 -6 -66 -25 -73 -60c0 21 -2 42 -5 62c-4 18 -8 35 -14 49c-7 14 -17 26 -27 38c-12 11 -24 22 -37 29v-456h-43v502zM0 502h118v-502v-502h-118v502v502z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E05D-cClef8vb.xml b/data/Leipzig/E05D-cClef8vb.xml
deleted file mode 100644
index 1ee4dc8b946..00000000000
--- a/data/Leipzig/E05D-cClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M380 -545c0 27 -21 40 -49 40c-15 0 -31 -8 -31 -25c0 -14 10 -25 18 -34c8 -8 16 -18 26 -25c5 -2 10 -4 13 -4c17 0 23 30 23 48zM266 -626c-3 -2 -6 -5 -7 -8c-6 -8 -10 -19 -10 -30c0 -2 0 -4 1 -7c7 -32 34 -52 53 -52c20 0 37 20 37 36c0 5 -2 9 -4 14 c-7 19 -25 37 -42 48c-4 2 -9 6 -14 6c-6 0 -11 -3 -14 -7zM0 502h118v-1004h-118v1004zM303 -735c-36 0 -92 24 -92 70c0 28 25 57 51 66c4 1 6 2 6 5c0 2 -1 3 -2 3c-11 13 -16 27 -16 41c0 34 29 61 71 62c-2 1 -3 1 -4 2c-31 13 -43 42 -53 78c0 59 21 98 77 98 c33 0 52 -16 56 -48l-7 -18l-10 -14l-17 -10c-6 -2 -10 -4 -16 -4c-20 6 -32 9 -39 24c1 -47 23 -84 66 -84c28 0 50 13 69 35c21 24 31 56 31 100c-1 97 -22 146 -100 165c-41 -6 -66 -25 -73 -60c0 89 -26 146 -83 178v-456h-43v1004h43v-456c57 32 83 89 83 178 c7 -35 32 -54 73 -60c78 19 99 68 100 165c0 44 -10 76 -31 100c-19 22 -41 35 -69 35c-43 0 -65 -37 -66 -84c7 15 19 18 39 24c6 0 10 -2 16 -4l17 -10l10 -14l7 -18c-4 -32 -23 -48 -56 -48c-56 0 -77 39 -77 98c10 36 22 65 53 78c3 3 22 9 27 11l34 3l35 2 c120 0 190 -61 190 -178l3 -33c0 -52 -19 -98 -60 -134c-40 -35 -101 -52 -175 -52l-93 -88v-34l93 -88c74 0 135 -17 175 -52c41 -36 60 -82 60 -134l-3 -33c0 -114 -66 -178 -180 -178h-10l-32 1c19 -9 35 -23 35 -47c0 -35 -22 -43 -31 -50c-6 -5 -8 -10 -8 -16 s1 -11 4 -16c7 -11 9 -22 9 -34c0 -27 -18 -53 -46 -65c-11 -4 -27 -6 -41 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E062-fClef.xml b/data/Leipzig/E062-fClef.xml
deleted file mode 100644
index 9ccc956cb30..00000000000
--- a/data/Leipzig/E062-fClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 96c51 0 73 -14 88 -49l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c30 52 71 79 137 93l36 6l26 2c154 0 235 -68 274 -182c11 -32 18 -68 18 -107 c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44 c-48 0 -84 -8 -113 -28c-28 -19 -42 -44 -42 -73v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM642 177c31 0 56 -27 56 -58 c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E063-fClef15mb.xml b/data/Leipzig/E063-fClef15mb.xml
deleted file mode 100644
index 6b17453a41c..00000000000
--- a/data/Leipzig/E063-fClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 96c51 0 73 -14 88 -49l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c30 52 71 79 137 93l36 6l26 2c154 0 235 -68 274 -182c11 -32 18 -68 18 -107 c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44 c-48 0 -84 -8 -113 -28c-28 -19 -42 -44 -42 -73v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM642 177c31 0 56 -27 56 -58 c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35zM254 -752h-104c-5 0 -11 3 -11 9c2 5 3 8 11 8s18 3 18 3s9 2 17 18s36 93 36 93s2 5 2 9c0 3 -1 6 -6 6c-4 0 -8 -3 -12 -8s-11 -10 -20 -10c-7 0 -12 3 -12 8c0 2 0 3 2 5c6 7 78 90 83 95 c7 7 12 10 16 10s11 -4 16 -8c5 -3 9 -4 16 -4c5 0 10 4 13 4c4 0 5 -1 5 -4v-4c-2 -6 -83 -192 -84 -200c0 -6 4 -14 13 -14c6 0 12 -2 12 -7s-4 -9 -11 -9zM305 -669h4c13 0 23 -11 23 -25c0 -5 -2 -11 -5 -15c-5 -6 -10 -9 -12 -17v-2c0 -11 17 -14 26 -14h2 c15 0 38 10 58 65c4 13 6 22 6 31c0 26 -20 30 -32 30c-18 0 -38 -19 -46 -24c-2 -2 -5 -2 -8 -2c-4 0 -7 1 -7 1c-2 1 -3 4 -3 7c0 4 1 8 1 10c0 1 1 1 1 2c4 18 13 36 19 54c3 9 12 27 12 34c2 7 6 19 13 20h62s55 0 63 -1c1 0 1 -1 1 -2c0 -4 -5 -12 -6 -13 c-2 -4 -6 -7 -9 -9c-4 -3 -8 -6 -13 -8c-8 -3 -16 -5 -25 -7c-9 -1 -18 -3 -27 -5c-11 -3 -22 -3 -33 -7c-4 -1 -9 -2 -13 -4c-5 -3 -6 -11 -6 -17c-1 -2 -1 -4 -1 -6s0 -3 2 -4l1 -1c2 0 5 2 8 2c2 1 4 1 6 1c6 1 12 1 17 1c22 0 30 -5 41 -12l2 -2c11 -8 16 -19 20 -32 c2 -6 3 -14 3 -22s-1 -16 -2 -22c-5 -24 -25 -42 -46 -54c-17 -9 -39 -17 -59 -17c-15 0 -30 4 -41 13s-19 27 -19 43c0 12 5 23 16 28c2 1 4 1 6 2z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E064-fClef8vb.xml b/data/Leipzig/E064-fClef8vb.xml
deleted file mode 100644
index fd12e856955..00000000000
--- a/data/Leipzig/E064-fClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 96c51 0 73 -14 88 -49l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c30 52 71 79 137 93l36 6l26 2c154 0 235 -68 274 -182c11 -32 18 -68 18 -107 c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44 c-48 0 -84 -8 -113 -28c-28 -19 -42 -44 -42 -73v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM642 177c31 0 56 -27 56 -58 c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35zM232 -572c0 33 29 59 71 59h5c15 0 84 -10 84 -57c0 -34 -21 -41 -30 -49c-6 -5 -8 -10 -8 -15s1 -10 4 -15c6 -10 8 -21 8 -32c0 -27 -16 -52 -43 -63c-12 -4 -27 -6 -39 -6c-35 0 -89 23 -89 67 c0 27 24 55 49 63c5 2 6 3 6 5s-1 3 -2 4c-11 11 -16 25 -16 39zM358 -567c0 25 -22 38 -46 38h-2c-15 -1 -28 -8 -30 -24v-2c0 -12 10 -23 17 -31c9 -9 23 -28 38 -28c17 0 22 29 23 44v3zM261 -638c-18 0 -29 -25 -29 -43v-7c7 -32 33 -50 51 -50c20 0 35 18 35 34 c0 5 -1 9 -3 13c-5 13 -13 24 -24 33c-5 5 -11 9 -16 14c-4 2 -9 6 -14 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E065-fClef8va.xml b/data/Leipzig/E065-fClef8va.xml
deleted file mode 100644
index e36533a3555..00000000000
--- a/data/Leipzig/E065-fClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M642 177c31 0 56 -27 56 -58c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM158 96c51 0 73 -14 88 -49 l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c30 52 71 79 137 93l36 6l26 2c34 0 65 -4 92 -10c-13 9 -23 22 -26 37c-1 5 -2 8 -2 12c0 28 25 57 51 66c4 1 6 2 6 5 c0 2 -1 3 -2 3c-11 13 -16 27 -16 41c0 24 14 46 40 56c10 5 22 6 34 6h4c16 0 88 -10 88 -60c0 -35 -22 -43 -31 -50c-6 -5 -8 -10 -8 -16s0 -11 4 -16c6 -11 9 -22 9 -34c0 -27 -18 -53 -46 -65c-11 -4 -27 -6 -41 -6h-5c61 -30 99 -82 123 -151c11 -32 18 -68 18 -107 c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44 c-48 0 -84 -8 -113 -28c-28 -19 -42 -44 -42 -73v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39zM355 329c-3 -2 -6 -5 -7 -8c-6 -8 -10 -19 -10 -30c0 -2 0 -4 1 -7c7 -32 34 -52 53 -52c20 0 37 20 37 36c0 5 -2 9 -4 14c-5 13 -14 24 -25 34c-6 5 -11 10 -17 14 c-4 2 -9 6 -14 6c-6 0 -11 -3 -14 -7zM389 425c0 -14 10 -25 18 -34c8 -8 16 -18 26 -25c5 -2 10 -4 13 -4c17 0 22 30 23 48c0 9 -3 20 -9 26c-8 9 -23 14 -40 14c-15 -1 -29 -8 -31 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E066-fClef15ma.xml b/data/Leipzig/E066-fClef15ma.xml
deleted file mode 100644
index 606970a24d6..00000000000
--- a/data/Leipzig/E066-fClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M642 177c31 0 56 -27 56 -58c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM225 185 c-78 0 -155 -30 -155 -101v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39c51 0 73 -14 88 -49l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c28 49 94 81 152 96c2 4 3 6 4 6 s1 -2 2 -2s4 3 12 19s39 95 39 97c0 0 2 5 2 9s-1 7 -7 7c-10 0 -14 -19 -34 -19c-6 0 -11 3 -11 8c0 2 0 3 2 6c6 7 80 93 87 99s11 9 16 9c10 0 17 -11 33 -11c6 0 11 4 14 4c4 0 5 -1 5 -5v-4c-1 -7 -87 -200 -88 -208c0 -6 2 -9 5 -11c22 -2 42 -4 61 -9 c-12 10 -21 24 -21 44c0 16 8 27 23 31h4c14 0 24 -12 24 -26c0 -15 -14 -18 -17 -36c0 -11 17 -14 29 -14c15 1 40 10 60 67c5 14 7 24 7 32c0 28 -22 32 -33 32c-27 0 -47 -27 -57 -27c-11 0 -11 4 -11 9c0 16 36 123 48 125h65h28c22 0 39 0 39 -4c0 -22 -34 -34 -55 -38 l-29 -6c-11 -2 -22 -4 -34 -7l-14 -3c-5 -4 -7 -19 -7 -26c0 -1 1 -3 4 -3c8 0 22 3 31 3c24 0 31 -12 43 -12l3 -3c15 -11 23 -33 23 -55c0 -60 -58 -97 -112 -97c69 -29 113 -84 138 -158c11 -32 18 -68 18 -107c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288 l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E069-unpitchedPercussionClef1.xml b/data/Leipzig/E069-unpitchedPercussionClef1.xml
deleted file mode 100644
index b391060e5eb..00000000000
--- a/data/Leipzig/E069-unpitchedPercussionClef1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M200 250h125v-500h-125v500zM0 250h125v-500h-125v500z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E06A-unpitchedPercussionClef2.xml b/data/Leipzig/E06A-unpitchedPercussionClef2.xml
deleted file mode 100644
index 9d373fbb1a0..00000000000
--- a/data/Leipzig/E06A-unpitchedPercussionClef2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 395h257v-791h-257v791zM41 311v-622h174v622h-174z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E073-gClefReversed.xml b/data/Leipzig/E073-gClefReversed.xml
deleted file mode 100644
index 92790ce14f3..00000000000
--- a/data/Leipzig/E073-gClefReversed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E073" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M204 -245c-8 -53 -18 -106 -26 -159c-4 -25 -5 -47 -5 -67c0 -33 4 -58 13 -74c24 -42 78 -85 140 -85c51 0 85 12 102 36c-71 20 -105 55 -105 106v9c4 45 48 87 97 87h6c34 -2 61 -16 79 -44c13 -21 20 -47 20 -76v-11c-3 -46 -30 -81 -80 -105 c-36 -17 -71 -27 -108 -27c-5 0 -11 1 -16 1c-70 4 -123 39 -158 103c-9 17 -14 40 -14 70c0 22 1 49 6 80c8 52 17 105 25 162c-94 39 -181 125 -181 248c0 7 0 15 1 22c6 80 39 141 98 184c31 23 75 35 133 35c10 0 20 -1 28 -2l31 181c-12 10 -24 20 -37 29 c-35 28 -85 98 -98 118c-46 79 -67 132 -67 241v15c2 44 15 97 41 159s48 92 69 92c25 0 55 -28 89 -82c53 -85 69 -140 69 -257c0 -16 -1 -46 -5 -89c-5 -46 -10 -76 -13 -92c57 -42 108 -85 153 -127s81 -91 110 -148c30 -59 45 -116 45 -170c0 -6 -1 -13 -1 -19 c-5 -73 -22 -132 -48 -176c-37 -61 -99 -112 -187 -154c-28 -13 -71 -20 -130 -20c-28 0 -53 2 -76 6zM184 939h-2c-33 0 -51 -28 -55 -81v-8c0 -40 20 -87 60 -140c35 -46 77 -89 127 -128c3 23 5 47 5 71c0 111 -40 286 -135 286zM239 119h-12c-94 0 -144 -47 -151 -142 c-1 -8 -1 -16 -1 -23c0 -83 37 -136 110 -161zM263 117c-18 -110 -35 -220 -54 -331c25 -6 50 -9 75 -9c78 0 145 24 203 73s88 108 93 176v13c0 52 -22 113 -67 182c-23 35 -59 75 -109 119c-40 36 -71 60 -92 73l-29 -170c29 -7 55 -19 78 -36c44 -33 88 -91 88 -159v-11 c-7 -84 -53 -139 -123 -172c-3 5 -7 8 -10 10c32 16 73 69 75 115v7c0 73 -56 118 -128 120z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E074-gClefTurned.xml b/data/Leipzig/E074-gClefTurned.xml
deleted file mode 100644
index 47fa348c661..00000000000
--- a/data/Leipzig/E074-gClefTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E074" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M204 673c23 4 48 6 76 6c59 0 102 -7 130 -20c88 -42 150 -93 187 -154c26 -44 43 -103 48 -176c0 -6 1 -13 1 -19c0 -54 -15 -111 -45 -170c-29 -57 -65 -106 -110 -148s-96 -85 -153 -127c3 -16 8 -46 13 -92c4 -43 5 -73 5 -89c0 -117 -16 -172 -69 -257 c-34 -54 -64 -82 -89 -82c-21 0 -43 30 -69 92s-39 115 -41 159v15c0 109 21 162 67 241c13 20 63 90 98 118c13 9 25 19 37 29l-31 181c-8 -1 -18 -2 -28 -2c-58 0 -102 12 -133 35c-59 43 -92 104 -98 184c-1 7 -1 15 -1 22c0 123 87 209 181 248c-8 57 -17 110 -25 162 c-5 31 -6 58 -6 80c0 30 5 53 14 70c35 64 88 99 158 103c5 0 11 1 16 1c37 0 72 -10 108 -27c50 -24 77 -59 80 -105v-11c0 -29 -7 -55 -20 -76c-18 -28 -45 -42 -79 -44h-6c-49 0 -93 42 -97 87v9c0 51 34 86 105 106c-17 24 -51 36 -102 36c-62 0 -116 -43 -140 -85 c-9 -16 -13 -41 -13 -74c0 -20 1 -42 5 -67c8 -53 18 -106 26 -159zM184 -511c95 0 135 175 135 286c0 24 -2 48 -5 71c-50 -39 -92 -82 -127 -128c-40 -53 -60 -100 -60 -140v-8c4 -53 22 -81 55 -81h2zM239 309l-54 326c-73 -25 -110 -78 -110 -161c0 -7 0 -15 1 -23 c7 -95 57 -142 151 -142h12zM263 311c72 2 128 47 128 120v7c-2 46 -43 99 -75 115c3 2 7 5 10 10c70 -33 116 -88 123 -172v-11c0 -68 -44 -126 -88 -159c-23 -17 -49 -29 -78 -36l29 -170c21 13 52 37 92 73c50 44 86 84 109 119c45 69 67 130 67 182v13 c-5 68 -35 127 -93 176s-125 73 -203 73c-25 0 -50 -3 -75 -9c19 -111 36 -221 54 -331z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E075-cClefReversed.xml b/data/Leipzig/E075-cClefReversed.xml
deleted file mode 100644
index 619b3a6a151..00000000000
--- a/data/Leipzig/E075-cClefReversed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E075" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M431 0v-502h-43v456c-13 -7 -25 -18 -37 -29c-10 -12 -20 -24 -27 -38c-6 -14 -10 -31 -14 -49c-3 -20 -5 -41 -5 -62c-7 35 -32 54 -73 60c-78 -19 -99 -68 -100 -165c0 -44 9 -77 31 -100c18 -23 41 -35 69 -35c43 0 65 37 66 84c-7 -15 -19 -18 -39 -24 c-6 0 -10 2 -16 4l-17 10l-10 14l-7 18c4 32 23 48 56 48c56 0 77 -39 77 -98c-10 -36 -22 -65 -53 -78c-3 -3 -22 -9 -27 -11l-34 -3l-35 -2c-120 0 -190 61 -190 178l-3 33c0 52 20 97 60 134c20 17 45 29 74 39c31 9 64 13 101 13l93 88v34l-93 88c-37 0 -70 4 -101 13 c-29 10 -54 22 -74 39c-40 37 -60 82 -60 134l3 33c0 117 70 178 190 178l35 -2l34 -3c5 -2 24 -8 27 -11c9 -4 16 -10 23 -17c17 -17 22 -33 30 -61c0 -59 -21 -98 -77 -98c-33 0 -52 16 -56 48l7 18l10 14l17 10c6 2 10 4 16 4c20 -6 32 -9 39 -24c-1 47 -23 84 -66 84 c-28 0 -51 -12 -69 -35c-22 -23 -31 -56 -31 -100c1 -97 22 -146 100 -165c41 6 66 25 73 60c0 -21 2 -42 5 -62c4 -18 8 -35 14 -49c7 -14 17 -26 27 -38c12 -11 24 -22 37 -29v456h43v-502zM606 502v-502v-502h-118v502v502h118z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E076-fClefReversed.xml b/data/Leipzig/E076-fClefReversed.xml
deleted file mode 100644
index dd735e8cc9a..00000000000
--- a/data/Leipzig/E076-fClefReversed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E076" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M544 96c32 0 60 -17 84 -39c1 2 2 6 4 11v16c0 29 -14 54 -42 73c-29 20 -65 28 -113 28c-56 0 -94 -23 -118 -44c-12 -11 -23 -22 -31 -34c-12 -18 -9 -15 -16 -40s-16 -71 -23 -140c1 -4 3 -17 6 -39c5 -40 13 -67 22 -100c35 -122 101 -201 197 -258l78 -43 c26 -14 61 -29 96 -44c5 -5 7 -6 10 -16c0 -5 -5 -8 -14 -8l-30 5c-178 58 -323 143 -412 288c-42 68 -68 147 -68 250c0 39 7 75 18 107c39 114 120 182 274 182l26 -2l36 -6c66 -14 107 -41 137 -93c18 -31 32 -66 32 -112c0 -45 -11 -79 -35 -100 c-35 -31 -57 -44 -112 -44c-35 0 -67 25 -84 43c-9 10 -16 20 -19 31c-5 10 -7 23 -7 40l16 39c15 35 37 49 88 49zM117 -118c0 -32 -23 -58 -57 -58c-24 0 -45 18 -51 37c-3 5 -5 12 -5 21c0 22 7 25 16 40c7 12 22 18 40 18c34 0 57 -26 57 -58zM60 177 c26 0 45 -15 54 -35l3 -23c0 -23 -15 -48 -34 -55l-23 -3c-31 0 -56 28 -56 58c0 31 25 58 56 58z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E077-fClefTurned.xml b/data/Leipzig/E077-fClefTurned.xml
deleted file mode 100644
index 15b04ea14a9..00000000000
--- a/data/Leipzig/E077-fClefTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E077" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M544 -426c-51 0 -73 14 -88 49l-16 39c0 17 2 30 7 40c3 11 10 21 19 31c17 18 49 43 84 43c55 0 77 -13 112 -44c24 -21 35 -55 35 -100c0 -46 -14 -81 -32 -112c-30 -52 -71 -79 -137 -93l-36 -6l-26 -2c-154 0 -235 68 -274 182c-11 32 -18 68 -18 107 c0 103 26 182 68 250c89 145 234 230 412 288l30 5c9 0 14 -3 14 -8c-3 -10 -5 -11 -10 -16c-35 -15 -70 -30 -96 -44l-78 -43c-96 -57 -162 -136 -197 -258c-9 -33 -17 -60 -22 -100c-3 -22 -5 -35 -6 -39c7 -69 16 -115 23 -140s4 -22 16 -40c8 -12 19 -23 31 -34 c24 -21 62 -44 118 -44c48 0 84 8 113 28c28 19 42 44 42 73v16c-2 5 -3 9 -4 11c-24 -22 -52 -39 -84 -39zM117 -212c0 -32 -23 -58 -57 -58c-18 0 -33 6 -40 18c-9 15 -16 18 -16 40c0 9 2 16 5 21c6 19 27 37 51 37c34 0 57 -26 57 -58zM60 -507c-31 0 -56 27 -56 58 c0 30 25 58 56 58l23 -3c19 -7 34 -32 34 -55l-3 -23c-9 -20 -28 -35 -54 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E080-timeSig0.xml b/data/Leipzig/E080-timeSig0.xml
deleted file mode 100644
index df277e4fee9..00000000000
--- a/data/Leipzig/E080-timeSig0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M229 251zM230 -250c-99 0 -210 94 -210 251c0 152 93 250 209 250s205 -119 205 -250c0 -139 -103 -251 -204 -251zM139 1c0 -79 13 -215 88 -215c68 0 84 112 84 215c0 76 -15 216 -84 216c-68 0 -88 -136 -88 -216z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E081-timeSig1.xml b/data/Leipzig/E081-timeSig1.xml
deleted file mode 100644
index c3a29ecfaea..00000000000
--- a/data/Leipzig/E081-timeSig1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -250v36c23 0 40 6 49 18c8 14 12 33 12 57v250l-82 -129l-27 13l107 255h128v-394c0 -24 5 -42 14 -53s25 -17 47 -17v-36h-248z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E082-timeSig2.xml b/data/Leipzig/E082-timeSig2.xml
deleted file mode 100644
index eb2c911a00e..00000000000
--- a/data/Leipzig/E082-timeSig2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M124 -185c-18 0 -55 -14 -65 -65h-36l-3 30c0 25 6 45 18 63c11 19 22 30 39 43l121 82l37 29c15 11 27 29 38 54c12 24 18 47 18 70c0 40 -19 88 -94 88c-25 0 -32 0 -50 -8c-14 -5 -23 -12 -26 -22c3 -9 7 -15 10 -18l24 -17c12 -7 17 -11 27 -21c5 -7 7 -16 7 -27 c0 -12 0 -57 -79 -74c-30 0 -76 26 -76 94c0 66 81 135 197 135c72 0 181 -32 181 -150c0 -53 -32 -95 -113 -133l-91 -41c-26 -11 -45 -23 -57 -37l49 7c84 0 115 -41 148 -41c20 0 33 20 39 61h35c0 -152 -68 -168 -114 -168c-17 0 -65 0 -79 7h10l-28 17 c-49 37 -69 40 -87 42z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E083-timeSig3.xml b/data/Leipzig/E083-timeSig3.xml
deleted file mode 100644
index b882754c809..00000000000
--- a/data/Leipzig/E083-timeSig3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 250c97 0 177 -52 177 -116c0 -69 -40 -111 -118 -125c56 -5 125 -44 125 -116c0 -31 -10 -57 -31 -78c-19 -21 -45 -38 -78 -49l-50 -11c-15 -3 -36 -7 -55 -7c-50 0 -86 16 -113 38c-16 10 -23 18 -34 34c-7 13 -11 25 -11 38c0 43 27 83 68 83l3 -2 c61 0 75 -42 75 -70c0 -19 -24 -42 -26 -57c7 -17 20 -25 37 -25c44 0 94 29 94 78c0 75 -34 125 -138 125v36c84 0 131 22 131 98c0 54 -37 88 -87 88c-26 0 -43 -7 -51 -22c15 -22 44 -16 44 -70c0 -37 -37 -62 -71 -62c-22 0 -69 15 -69 76c0 79 101 116 178 116z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E084-timeSig4.xml b/data/Leipzig/E084-timeSig4.xml
deleted file mode 100644
index 11b63c182a8..00000000000
--- a/data/Leipzig/E084-timeSig4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -78c84 97 114 180 134 329h170c-13 -32 -82 -132 -99 -151l-84 -97c-33 -36 -59 -63 -80 -81h162v102l127 123v-225h57v-39h-57v-34c0 -43 19 -65 57 -65v-34h-244v36c48 0 60 26 60 70v27h-203v39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E085-timeSig5.xml b/data/Leipzig/E085-timeSig5.xml
deleted file mode 100644
index 70182d50740..00000000000
--- a/data/Leipzig/E085-timeSig5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M161 38c-14 0 -56 -5 -92 -51h-32l5 263c55 -11 108 -18 158 -18c40 0 85 6 134 17c-8 -52 -39 -114 -159 -114l-50 2c-19 2 -31 4 -49 10l-5 -111c38 26 81 39 129 39c94 0 177 -64 177 -159c0 -100 -98 -166 -211 -166c-88 0 -146 53 -146 115c0 53 39 83 75 83 c37 0 69 -32 69 -72c0 -4 -1 -10 -4 -18l-27 -37c-2 -3 -3 -8 -3 -14c0 -15 12 -23 36 -23c74 0 92 77 92 132s-35 122 -97 122z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E086-timeSig6.xml b/data/Leipzig/E086-timeSig6.xml
deleted file mode 100644
index e5c77c5c360..00000000000
--- a/data/Leipzig/E086-timeSig6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M284 -91c0 37 -28 92 -67 92c-35 0 -65 -54 -65 -111c0 -52 22 -104 68 -104c47 0 64 68 64 123zM230 214c-36 0 -90 -33 -90 -184l2 -36c40 24 81 36 120 36c80 0 140 -48 140 -121c0 -99 -99 -159 -182 -159c-160 0 -200 173 -200 244c0 21 2 43 7 71l10 35 c26 85 73 115 98 126c41 19 74 24 103 24c93 0 142 -63 142 -105c0 -58 -52 -72 -73 -72c-33 0 -59 24 -65 35c-3 5 -6 14 -7 25l11 30c6 15 9 27 9 35c0 11 -9 16 -25 16z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E087-timeSig7.xml b/data/Leipzig/E087-timeSig7.xml
deleted file mode 100644
index 182a2898b7f..00000000000
--- a/data/Leipzig/E087-timeSig7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M350 125c-11 -9 -53 -46 -95 -46c-18 2 -33 8 -44 17c-17 19 -33 34 -48 45c-13 11 -27 17 -42 17c-23 0 -45 -22 -64 -66h-37v155h37c4 -18 11 -28 21 -30c8 1 15 3 22 8l10 5l14 10c3 2 14 6 21 7l11 2c8 1 33 1 42 1c39 0 57 -7 90 -43c11 -15 26 -23 44 -26 c27 3 45 29 54 70l38 -1c-1 -9 -11 -88 -29 -124c-5 -13 -12 -28 -21 -46l-33 -60c-55 -92 -69 -162 -69 -270h-174c0 45 11 86 33 122c23 35 59 74 106 117c99 84 113 96 113 136z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E088-timeSig8.xml b/data/Leipzig/E088-timeSig8.xml
deleted file mode 100644
index 1a0cf0e343e..00000000000
--- a/data/Leipzig/E088-timeSig8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M195 -214c76 0 88 58 90 68c0 34 -35 60 -57 73l-52 29c-21 10 -32 17 -34 20c-39 -33 -58 -54 -62 -92c5 -23 23 -98 115 -98zM301 135c0 61 -72 76 -113 76c-40 0 -77 -17 -77 -51c3 -21 15 -38 26 -50c17 -15 33 -26 48 -34l65 -28c34 27 51 56 51 87zM176 -250 c-57 0 -166 26 -166 132c0 47 30 86 89 116c-33 15 -79 60 -79 119c0 79 85 132 178 132h18c5 0 21 1 28 -1c25 0 126 -30 126 -110c0 -37 -23 -76 -69 -116c43 -25 83 -71 83 -119c0 -101 -118 -153 -208 -153z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E089-timeSig9.xml b/data/Leipzig/E089-timeSig9.xml
deleted file mode 100644
index daccf9ff50f..00000000000
--- a/data/Leipzig/E089-timeSig9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 107c0 -51 22 -104 66 -104c38 0 64 48 64 110c0 50 -31 100 -64 100c-40 0 -66 -56 -66 -106zM114 -74c40 0 72 -27 72 -65c0 -8 -3 -19 -9 -34l-7 -16l-5 -15c2 -8 12 -12 31 -12c56 0 84 73 84 219c-32 -24 -71 -36 -119 -36c-29 0 -56 6 -79 20 c-51 26 -57 78 -62 108c0 64 56 155 188 155c158 0 197 -151 197 -237c0 -145 -92 -263 -207 -263c-109 0 -155 68 -155 101c0 46 33 75 71 75z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08A-timeSigCommon.xml b/data/Leipzig/E08A-timeSigCommon.xml
deleted file mode 100644
index 341d84baa73..00000000000
--- a/data/Leipzig/E08A-timeSigCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M340 179c-9 24 -56 41 -89 41c-46 0 -81 -28 -100 -58c-17 -28 -25 -78 -25 -150c0 -65 2 -111 8 -135c8 -31 18 -49 40 -67c20 -17 43 -25 70 -25c54 0 92 36 115 75c14 25 23 54 28 88h27c0 -63 -24 -105 -58 -141c-35 -38 -82 -56 -140 -56c-45 0 -83 13 -115 39 c-57 45 -101 130 -101 226c0 59 33 127 68 163c36 37 97 72 160 72c36 0 93 -21 121 -40c11 -8 23 -17 33 -30c19 -23 27 -48 27 -76c0 -51 -35 -88 -86 -88c-43 0 -76 27 -76 68c0 26 7 35 21 51c15 17 32 27 58 32c7 2 14 7 14 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08B-timeSigCutCommon.xml b/data/Leipzig/E08B-timeSigCutCommon.xml
deleted file mode 100644
index c542cf8903d..00000000000
--- a/data/Leipzig/E08B-timeSigCutCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M188 200c-42 -22 -63 -69 -63 -141v-119c0 -39 7 -70 19 -94s26 -40 44 -48v402zM0 -0c0 127 80 220 186 246v72h32l-6 -72c33 0 71 0 101 -11c54 -20 102 -65 102 -135c0 -16 -4 -30 -13 -43s-20 -24 -32 -29l-20 -8l-23 -3c-22 2 -41 8 -55 21s-21 31 -26 51 c0 38 45 80 79 80c12 0 19 3 19 10c0 6 -6 12 -15 18c-19 13 -47 24 -79 24c-10 0 -20 -1 -32 -5v-431c15 -3 12 -4 30 -4c57 0 100 51 121 93l17 39c3 13 5 25 5 35h26c-6 -70 -28 -121 -66 -152s-82 -47 -133 -47v-68h-30v72c-57 10 -122 54 -153 109c-7 12 -13 26 -19 42 c-11 29 -16 61 -16 96z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08C-timeSigPlus.xml b/data/Leipzig/E08C-timeSigPlus.xml
deleted file mode 100644
index fc5ee4e7bf7..00000000000
--- a/data/Leipzig/E08C-timeSigPlus.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M342 -37h-134v-134h-74v134h-134v74h134v134h74v-134h134v-74z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08D-timeSigPlusSmall.xml b/data/Leipzig/E08D-timeSigPlusSmall.xml
deleted file mode 100644
index bdc63925d15..00000000000
--- a/data/Leipzig/E08D-timeSigPlusSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M253 -28h-99v-98h-56v98h-98v57h98v97h56v-97h99v-57z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08E-timeSigFractionalSlash.xml b/data/Leipzig/E08E-timeSigFractionalSlash.xml
deleted file mode 100644
index cf4e5c2447d..00000000000
--- a/data/Leipzig/E08E-timeSigFractionalSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M49 -243l-49 25l137 461l49 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08F-timeSigEquals.xml b/data/Leipzig/E08F-timeSigEquals.xml
deleted file mode 100644
index ced9691dd9b..00000000000
--- a/data/Leipzig/E08F-timeSigEquals.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -120v74h342v-74h-342zM0 46v74h342v-74h-342z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E090-timeSigMinus.xml b/data/Leipzig/E090-timeSigMinus.xml
deleted file mode 100644
index d0efad75833..00000000000
--- a/data/Leipzig/E090-timeSigMinus.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E090" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37v74h342v-74h-342z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E091-timeSigMultiply.xml b/data/Leipzig/E091-timeSigMultiply.xml
deleted file mode 100644
index 4d1067e75b5..00000000000
--- a/data/Leipzig/E091-timeSigMultiply.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E091" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M334 115l-115 -115l115 -115l-52 -52l-115 115l-115 -115l-52 52l115 115l-115 115l52 52l115 -115l115 115z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E092-timeSigParensLeftSmall.xml b/data/Leipzig/E092-timeSigParensLeftSmall.xml
deleted file mode 100644
index 916cde11d42..00000000000
--- a/data/Leipzig/E092-timeSigParensLeftSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M134 -235v-11c0 -3 -1 -4 -1 -4s-1 -1 -2 0c-108 82 -131 150 -131 250s23 168 131 250c1 1 2 0 2 0s1 -1 1 -4v-11s-1 -8 -3 -10c-68 -55 -81 -110 -81 -225s13 -170 81 -225c2 -2 3 -7 3 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E093-timeSigParensRightSmall.xml b/data/Leipzig/E093-timeSigParensRightSmall.xml
deleted file mode 100644
index 1635c8efd12..00000000000
--- a/data/Leipzig/E093-timeSigParensRightSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -235c0 3 1 8 3 10c68 55 81 110 81 225s-13 170 -81 225c-2 2 -3 10 -3 10v11c0 3 1 4 1 4s1 1 2 0c108 -82 131 -150 131 -250s-23 -168 -131 -250c-1 -1 -2 0 -2 0s-1 1 -1 4v11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E094-timeSigParensLeft.xml b/data/Leipzig/E094-timeSigParensLeft.xml
deleted file mode 100644
index 7d33b31e2ae..00000000000
--- a/data/Leipzig/E094-timeSigParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M220 -470v-22c0 -6 -2 -8 -2 -8s-1 -1 -2 -1s-1 1 -2 1c-212 181 -214 315 -214 490v10v10c0 175 2 309 214 490c1 0 1 1 2 1s2 -1 2 -1s2 -2 2 -8v-22s-2 -15 -6 -20c-136 -140 -144 -230 -144 -450s8 -310 144 -450c4 -5 6 -14 6 -20z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E095-timeSigParensRight.xml b/data/Leipzig/E095-timeSigParensRight.xml
deleted file mode 100644
index 77062ef6137..00000000000
--- a/data/Leipzig/E095-timeSigParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 -470c0 6 2 15 6 20c136 140 144 230 144 450s-8 310 -144 450c-4 5 -6 20 -6 20v22c0 6 2 8 2 8s1 1 2 1s1 -1 2 -1c212 -181 214 -315 214 -490v-10v-10c0 -175 -2 -309 -214 -490c-1 0 -1 -1 -2 -1s-2 1 -2 1s-2 2 -2 8v22z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A0-noteheadDoubleWhole.xml b/data/Leipzig/E0A0-noteheadDoubleWhole.xml
deleted file mode 100644
index 4bbba567745..00000000000
--- a/data/Leipzig/E0A0-noteheadDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M60 -165v330c0 5 6 5 12 5s13 0 13 -5v-109c30 51 103 77 183 77c79 0 159 -27 192 -80v112c0 5 6 5 12 5s13 0 13 -5v-330c0 -5 -7 -5 -13 -5s-12 0 -12 5v109c-31 -53 -109 -77 -192 -77c-77 0 -152 27 -183 78v-110c0 -5 -7 -5 -13 -5s-12 0 -12 5zM292 -108 c49 0 71 39 71 87c0 41 -19 74 -41 98c-20 21 -43 31 -68 31l-20 -2c-15 -5 -27 -14 -36 -28c-8 -17 -11 -28 -11 -51c0 -15 3 -34 9 -57s18 -41 34 -55c15 -15 36 -23 62 -23zM0 -165v330c0 5 6 5 12 5s13 0 13 -5v-330c0 -5 -7 -5 -13 -5s-12 0 -12 5zM520 -165v330 c0 5 6 5 12 5s13 0 13 -5v-330c0 -5 -7 -5 -13 -5s-12 0 -12 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A1-noteheadDoubleWholeSquare.xml b/data/Leipzig/E0A1-noteheadDoubleWholeSquare.xml
deleted file mode 100644
index 598c3329296..00000000000
--- a/data/Leipzig/E0A1-noteheadDoubleWholeSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 165c0 5 6 5 12 5s13 0 13 -5v-40h298v40c0 5 7 5 13 5s12 0 12 -5v-330c0 -5 -6 -5 -12 -5s-13 0 -13 5v40h-298v-40c0 -5 -7 -5 -13 -5s-12 0 -12 5v330zM25 0c0 -29 1 -55 25 -55h248c24 0 25 26 25 55s-1 55 -25 55h-248c-24 0 -25 -26 -25 -55z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A2-noteheadWhole.xml b/data/Leipzig/E0A2-noteheadWhole.xml
deleted file mode 100644
index 67327161079..00000000000
--- a/data/Leipzig/E0A2-noteheadWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 133c102 0 207 -45 207 -133c0 -92 -98 -133 -207 -133c-101 0 -198 46 -198 133c0 88 93 133 198 133zM293 -21c0 14 -3 29 -8 44c-7 20 -18 38 -33 54c-20 21 -43 31 -68 31l-20 -2c-15 -5 -27 -14 -36 -28c-4 -9 -6 -17 -8 -24s-3 -16 -3 -27c0 -15 3 -34 9 -57 s18 -41 34 -55c15 -15 36 -23 62 -23c4 0 10 1 18 2c19 5 32 15 40 30s13 34 13 55z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A3-noteheadHalf.xml b/data/Leipzig/E0A3-noteheadHalf.xml
deleted file mode 100644
index 1ae9fd4f5ca..00000000000
--- a/data/Leipzig/E0A3-noteheadHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M278 64c0 22 -17 39 -43 39c-12 0 -26 -3 -41 -10c-85 -43 -165 -94 -165 -156c5 -25 15 -32 49 -32c67 11 200 95 200 159zM0 -36c0 68 73 174 200 174c66 0 114 -39 114 -97c0 -84 -106 -173 -218 -173c-64 0 -96 32 -96 96z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A4-noteheadBlack.xml b/data/Leipzig/E0A4-noteheadBlack.xml
deleted file mode 100644
index e0640dff15e..00000000000
--- a/data/Leipzig/E0A4-noteheadBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -39c0 68 73 172 200 172c66 0 114 -37 114 -95c0 -84 -106 -171 -218 -171c-64 0 -96 30 -96 94z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A5-noteheadNull.xml b/data/Leipzig/E0A5-noteheadNull.xml
deleted file mode 100644
index 1445fb5f59a..00000000000
--- a/data/Leipzig/E0A5-noteheadNull.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A9-noteheadXBlack.xml b/data/Leipzig/E0A9-noteheadXBlack.xml
deleted file mode 100644
index 552d775249b..00000000000
--- a/data/Leipzig/E0A9-noteheadXBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -110c0 4 1 8 5 11l119 99l-119 100c-3 3 -5 8 -5 12c0 6 5 13 12 13c3 0 6 -1 8 -2l124 -105l126 105c2 1 5 2 7 2c6 0 13 -6 13 -14c0 -4 -2 -9 -5 -11l-119 -100l119 -99c3 -3 5 -7 5 -12c0 -6 -5 -14 -13 -14c-2 0 -5 1 -7 3l-126 105l-124 -105c-2 -2 -4 -3 -7 -3 c-8 0 -13 7 -13 15z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0AF-noteheadPlusBlack.xml b/data/Leipzig/E0AF-noteheadPlusBlack.xml
deleted file mode 100644
index 87eb34f9606..00000000000
--- a/data/Leipzig/E0AF-noteheadPlusBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 0c0 8 6 13 14 13h107v106c0 8 5 14 13 14c7 0 13 -6 13 -14v-106h106c7 0 14 -5 14 -13s-7 -13 -14 -13h-106v-106c0 -8 -6 -14 -13 -14c-8 0 -13 6 -13 14v106h-107c-8 0 -14 5 -14 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0B5-noteheadWholeWithX.xml b/data/Leipzig/E0B5-noteheadWholeWithX.xml
deleted file mode 100644
index c0b12a05ece..00000000000
--- a/data/Leipzig/E0B5-noteheadWholeWithX.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M293 -21c0 14 -3 29 -8 44c-3 8 -6 15 -10 22l-55 -45l68 -55c3 11 5 22 5 34zM198 133c102 0 207 -45 207 -133c0 -92 -98 -133 -207 -133c-101 0 -198 46 -198 133c0 88 93 133 198 133zM141 -64c5 -8 12 -15 19 -21c15 -15 36 -23 62 -23c4 0 10 1 18 2 c17 4 29 13 37 25l-79 64zM260 68c-2 3 -5 6 -8 9c-20 21 -43 31 -68 31l-20 -2c-15 -5 -27 -14 -36 -28c0 -1 -1 -1 -1 -2l71 -58zM119 48c-1 -6 -2 -13 -2 -21c0 -15 3 -34 9 -57l3 -9l49 39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0B6-noteheadHalfWithX.xml b/data/Leipzig/E0B6-noteheadHalfWithX.xml
deleted file mode 100644
index 8554af1a77b..00000000000
--- a/data/Leipzig/E0B6-noteheadHalfWithX.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -36c0 68 73 174 200 174c66 0 114 -39 114 -97c0 -84 -106 -173 -218 -173c-64 0 -96 32 -96 96zM52 -92c6 -2 15 -3 26 -3c29 5 70 23 107 47l-41 31zM208 -31c40 29 70 64 70 95c0 9 -3 16 -7 23l-105 -87zM246 102c-3 1 -7 1 -11 1c-12 0 -26 -3 -41 -10 c-30 -15 -60 -32 -86 -49l36 -26zM85 27c-33 -27 -56 -57 -56 -90c1 -4 2 -7 3 -11l92 74z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0B7-noteheadVoidWithX.xml b/data/Leipzig/E0B7-noteheadVoidWithX.xml
deleted file mode 100644
index c9df6ecb264..00000000000
--- a/data/Leipzig/E0B7-noteheadVoidWithX.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37c0 24 10 65 41 100c24 28 64 62 143 62c53 0 105 -31 105 -88c0 -16 -7 -56 -36 -93c-38 -50 -87 -69 -149 -69c-53 0 -104 32 -104 88zM237 87l-81 -82l64 -62l13 16c14 17 21 35 25 46c4 14 6 27 6 32c0 19 -7 34 -20 45zM25 -37c0 -16 6 -31 15 -41l83 83 l-53 53l-11 -12c-24 -27 -34 -62 -34 -83zM139 -11l-80 -80c12 -6 25 -9 40 -9c32 0 61 6 85 18c5 3 11 6 16 10zM109 84l-21 -11l51 -51l75 76c-7 1 -17 2 -25 2c-30 0 -57 -5 -80 -16z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0D9-noteheadDiamondHalf.xml b/data/Leipzig/E0D9-noteheadDiamondHalf.xml
deleted file mode 100644
index f82d553032d..00000000000
--- a/data/Leipzig/E0D9-noteheadDiamondHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 3 1 4 3 6c53 47 102 98 151 153c2 2 5 3 8 3s5 -1 7 -3c49 -55 89 -106 142 -153c2 -2 3 -3 3 -6s-1 -4 -3 -6c-53 -47 -93 -98 -142 -153c-2 -2 -4 -3 -7 -3s-6 1 -8 3c-49 55 -98 106 -151 153c-2 2 -3 3 -3 6zM83 36c-2 -2 -3 -4 -3 -6s1 -4 3 -6l96 -101 c2 -2 4 -3 7 -3s5 1 7 3l40 41c2 2 3 4 3 6s-1 4 -3 6l-96 101c-2 2 -4 3 -7 3s-5 -1 -7 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DA-noteheadDiamondHalfWide.xml b/data/Leipzig/E0DA-noteheadDiamondHalfWide.xml
deleted file mode 100644
index 49648bb8f98..00000000000
--- a/data/Leipzig/E0DA-noteheadDiamondHalfWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 3 1 4 3 6c53 47 102 98 151 153c2 2 5 3 8 3s5 -1 7 -3c49 -55 127 -106 180 -153c2 -2 3 -3 3 -6s-1 -4 -3 -6c-53 -47 -90 -98 -139 -153c-2 -2 -4 -3 -7 -3s-6 1 -8 3c-49 55 -139 106 -192 153c-2 2 -3 3 -3 6zM83 36c-2 -2 -3 -4 -3 -6s1 -4 3 -6l134 -101 c2 -2 4 -3 7 -3s5 1 7 3l40 41c2 2 3 4 3 6s-1 4 -3 6l-134 101c-2 2 -4 3 -7 3s-5 -1 -7 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DB-noteheadDiamondBlack.xml b/data/Leipzig/E0DB-noteheadDiamondBlack.xml
deleted file mode 100644
index ab38acb56bf..00000000000
--- a/data/Leipzig/E0DB-noteheadDiamondBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 3 1 4 3 6c53 47 102 96 151 151c2 2 5 3 8 3s5 -1 7 -3c49 -55 89 -104 142 -151c2 -2 3 -3 3 -6s-1 -4 -3 -6c-53 -47 -93 -96 -142 -151c-2 -2 -4 -3 -7 -3s-6 1 -8 3c-49 55 -98 104 -151 151c-2 2 -3 3 -3 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DC-noteheadDiamondBlackWide.xml b/data/Leipzig/E0DC-noteheadDiamondBlackWide.xml
deleted file mode 100644
index e4edc29556f..00000000000
--- a/data/Leipzig/E0DC-noteheadDiamondBlackWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -4c-2 1 -3 3 -3 5s0 3 3 5l162 116c3 2 7 3 9 3c3 0 7 -1 10 -3l163 -116c2 -2 3 -3 3 -5s-1 -4 -3 -5l-164 -118c-3 -2 -6 -3 -9 -3c-2 0 -5 1 -7 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DD-noteheadDiamondWhite.xml b/data/Leipzig/E0DD-noteheadDiamondWhite.xml
deleted file mode 100644
index 05bd41d8656..00000000000
--- a/data/Leipzig/E0DD-noteheadDiamondWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 3 1 4 3 6c53 47 102 96 151 151c2 2 5 3 8 3s5 -1 7 -3c49 -55 89 -104 142 -151c2 -2 3 -3 3 -6s-1 -4 -3 -6c-53 -47 -93 -96 -142 -151c-2 -2 -4 -3 -7 -3s-6 1 -8 3c-49 55 -98 104 -151 151c-2 2 -3 3 -3 6zM43 6c-2 -2 -3 -4 -3 -6s1 -4 3 -6l112 -111 c2 -2 4 -3 7 -3s5 1 7 3l102 111c2 2 3 4 3 6s-1 4 -3 6l-102 111c-2 2 -4 3 -7 3s-5 -1 -7 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DE-noteheadDiamondWhiteWide.xml b/data/Leipzig/E0DE-noteheadDiamondWhiteWide.xml
deleted file mode 100644
index a95113ba128..00000000000
--- a/data/Leipzig/E0DE-noteheadDiamondWhiteWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -6c-3 2 -5 4 -5 6s1 4 4 6l159 114c4 3 8 5 12 5c5 0 8 -2 11 -4l161 -116c2 -2 3 -3 3 -5s-1 -4 -3 -5l-164 -117c-3 -2 -6 -3 -9 -3c-2 0 -4 1 -7 3zM174 97l-134 -97l134 -98l135 98z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0F5-noteheadParenthesisLeft.xml b/data/Leipzig/E0F5-noteheadParenthesisLeft.xml
deleted file mode 100644
index 21aaba48ec8..00000000000
--- a/data/Leipzig/E0F5-noteheadParenthesisLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M153 -225v-11c0 -3 -1 -4 -1 -4h-2c-108 62 -150 140 -150 240s42 178 150 240h2s1 -1 1 -4v-11s0 -9 -3 -10c-78 -45 -100 -100 -100 -215s22 -170 100 -215c3 -1 3 -7 3 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0F6-noteheadParenthesisRight.xml b/data/Leipzig/E0F6-noteheadParenthesisRight.xml
deleted file mode 100644
index 9ef0a95e91b..00000000000
--- a/data/Leipzig/E0F6-noteheadParenthesisRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-53 -225c0 3 0 9 3 10c78 45 100 100 100 215s-22 170 -100 215c-3 1 -3 10 -3 10v11c0 3 1 4 1 4h2c108 -62 150 -140 150 -240s-42 -178 -150 -240h-2s-1 1 -1 4v11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0FA-noteheadWholeFilled.xml b/data/Leipzig/E0FA-noteheadWholeFilled.xml
deleted file mode 100644
index abace349678..00000000000
--- a/data/Leipzig/E0FA-noteheadWholeFilled.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0FA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 -133c-51 0 -96 11 -133 32c-43 24 -65 58 -65 101s21 77 64 102c37 21 82 31 134 31c53 0 99 -11 138 -32c46 -24 69 -58 69 -101c0 -46 -23 -81 -69 -104c-37 -19 -83 -29 -138 -29z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E101-noteheadSlashHorizontalEnds.xml b/data/Leipzig/E101-noteheadSlashHorizontalEnds.xml
deleted file mode 100644
index 416bebac135..00000000000
--- a/data/Leipzig/E101-noteheadSlashHorizontalEnds.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E101" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M460 250l-350 -500h-110l350 500h110z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E102-noteheadSlashWhiteWhole.xml b/data/Leipzig/E102-noteheadSlashWhiteWhole.xml
deleted file mode 100644
index afd1468a820..00000000000
--- a/data/Leipzig/E102-noteheadSlashWhiteWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E102" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M760 210h-330l-300 -420h330zM900 250l-350 -500h-550l350 500h550z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E103-noteheadSlashWhiteHalf.xml b/data/Leipzig/E103-noteheadSlashWhiteHalf.xml
deleted file mode 100644
index 15952659f2d..00000000000
--- a/data/Leipzig/E103-noteheadSlashWhiteHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E103" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M595 210h-165l-300 -420h165zM735 250l-350 -500h-385l350 500h385z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E220-tremolo1.xml b/data/Leipzig/E220-tremolo1.xml
deleted file mode 100644
index 7c32632a4ab..00000000000
--- a/data/Leipzig/E220-tremolo1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E220" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-163 -124v83l326 166v-86z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E221-tremolo2.xml b/data/Leipzig/E221-tremolo2.xml
deleted file mode 100644
index 96f48297e85..00000000000
--- a/data/Leipzig/E221-tremolo2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E221" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-163 -193v83l326 166v-86zM-163 -57v84l326 166v-83z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E222-tremolo3.xml b/data/Leipzig/E222-tremolo3.xml
deleted file mode 100644
index 2f510609ae1..00000000000
--- a/data/Leipzig/E222-tremolo3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E222" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 175l-324 -164v84l324 163v-83zM162 40l-324 -164v84l324 164v-84zM162 -95l-324 -163v83l324 164v-84z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E223-tremolo4.xml b/data/Leipzig/E223-tremolo4.xml
deleted file mode 100644
index fb97ddfcdc2..00000000000
--- a/data/Leipzig/E223-tremolo4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E223" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 108l-324 -164v84l324 163v-83zM162 -27l-324 -164v84l324 164v-84zM162 -162l-324 -163v83l324 164v-84zM162 242l-324 -164v84l324 164v-84z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E224-tremolo5.xml b/data/Leipzig/E224-tremolo5.xml
deleted file mode 100644
index 2b1e17307c5..00000000000
--- a/data/Leipzig/E224-tremolo5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E224" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 41l-324 -164v84l324 163v-83zM162 -94l-324 -164v84l324 164v-84zM162 -229l-324 -163v83l324 164v-84zM162 310l-324 -164v84l324 163v-83zM162 175l-324 -164v84l324 164v-84z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E22A-buzzRoll.xml b/data/Leipzig/E22A-buzzRoll.xml
deleted file mode 100644
index 6694908410e..00000000000
--- a/data/Leipzig/E22A-buzzRoll.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E22A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-155 -96c0 6 0 11 7 16l169 124c7 5 7 8 7 13c0 19 -8 19 -18 19h-145c-11 0 -20 0 -20 20s11 20 22 20h271c12 0 18 0 18 -20c0 -6 0 -11 -8 -16l-171 -124c-7 -5 -7 -8 -7 -13c0 -19 8 -19 18 -19h148c11 0 20 0 20 -20s-9 -20 -20 -20h-271c-12 0 -20 0 -20 20z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E240-flag8thUp.xml b/data/Leipzig/E240-flag8thUp.xml
deleted file mode 100644
index 62a189d8a41..00000000000
--- a/data/Leipzig/E240-flag8thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 -646c15 29 29 55 46 102c18 49 30 108 30 138c0 105 -80 173 -168 200c-18 5 -47 9 -87 16v190h22c8 0 33 -61 71 -95c4 -3 -2 3 61 -56c62 -58 122 -137 122 -241c0 -38 -13 -106 -35 -163c-20 -51 -43 -99 -66 -132c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10 c1 3 14 25 18 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E241-flag8thDown.xml b/data/Leipzig/E241-flag8thDown.xml
deleted file mode 100644
index 7c321810462..00000000000
--- a/data/Leipzig/E241-flag8thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 646c-4 8 -17 30 -18 33l-4 10c0 3 2 5 5 5s7 -2 13 -7c23 -33 46 -81 66 -132c22 -57 35 -125 35 -163c0 -104 -60 -183 -122 -241c-63 -59 -57 -53 -61 -56c-38 -34 -63 -95 -71 -95h-22v190c40 7 69 11 87 16c88 27 168 95 168 200c0 30 -12 89 -30 138 c-17 47 -31 73 -46 102z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E242-flag16thUp.xml b/data/Leipzig/E242-flag16thUp.xml
deleted file mode 100644
index 784a6e8242c..00000000000
--- a/data/Leipzig/E242-flag16thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190h22c8 0 33 -61 71 -95c4 -3 -2 3 61 -56c62 -58 122 -137 122 -241c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10 c1 3 6 8 11 16zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E243-flag16thDown.xml b/data/Leipzig/E243-flag16thDown.xml
deleted file mode 100644
index 1d89e4476af..00000000000
--- a/data/Leipzig/E243-flag16thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M216 730c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 57 -101 57 -172c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -104 -60 -183 -122 -241c-63 -59 -57 -53 -61 -56c-38 -34 -63 -95 -71 -95h-22v190v190c40 7 69 11 87 16c116 36 175 111 175 197 c0 44 -15 91 -46 137zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E244-flag32ndUp.xml b/data/Leipzig/E244-flag32ndUp.xml
deleted file mode 100644
index baa459327ca..00000000000
--- a/data/Leipzig/E244-flag32ndUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122zM206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190h22c8 0 33 -61 71 -95c4 -3 -2 3 61 -56 c61 -57 122 -134 122 -235v-6c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9 c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E245-flag32ndDown.xml b/data/Leipzig/E245-flag32ndDown.xml
deleted file mode 100644
index b6148da8869..00000000000
--- a/data/Leipzig/E245-flag32ndDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM215 729c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 58 -100 58 -171c0 -34 -6 -65 -17 -94 c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6c0 -101 -61 -178 -122 -235c-63 -59 -57 -53 -61 -56c-38 -34 -51 -95 -59 -95h-34v190v190v190c40 7 69 11 87 16c116 36 174 110 174 196c0 44 -15 91 -46 137zM247 270c-23 -47 -58 -86 -93 -119 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 26 -4 43 -8 54z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E246-flag64thUp.xml b/data/Leipzig/E246-flag64thUp.xml
deleted file mode 100644
index 4ca2862dd80..00000000000
--- a/data/Leipzig/E246-flag64thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122z M206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190v190h34c8 0 21 -61 59 -95c4 -3 -2 3 61 -56c61 -57 122 -134 122 -235v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99 c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E247-flag64thDown.xml b/data/Leipzig/E247-flag64thDown.xml
deleted file mode 100644
index a51e297f7a3..00000000000
--- a/data/Leipzig/E247-flag64thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 79c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200 c0 19 -3 39 -7 57zM216 729c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 57 -100 57 -171c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -101 -61 -178 -122 -235 c-63 -59 -57 -53 -61 -56c-38 -34 -51 -95 -59 -95h-34v190v190v190v190c40 7 69 11 87 16c116 36 175 111 175 197c0 44 -15 90 -46 136zM247 270c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200 c0 26 -4 43 -8 54z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E248-flag128thUp.xml b/data/Leipzig/E248-flag128thUp.xml
deleted file mode 100644
index 82429c855d9..00000000000
--- a/data/Leipzig/E248-flag128thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 111c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122z M206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190v190v190h34c8 0 21 -61 59 -95c4 -3 -2 3 61 -56c61 -57 122 -134 122 -235v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6 c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88 c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM40 -7c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E249-flag128thDown.xml b/data/Leipzig/E249-flag128thDown.xml
deleted file mode 100644
index 5e24e108c8d..00000000000
--- a/data/Leipzig/E249-flag128thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -111c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9 c88 27 168 95 168 200c0 19 -3 39 -7 57zM215 728c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 58 -99 58 -170c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6 c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -101 -61 -178 -122 -235c-63 -59 -57 -53 -61 -56c-38 -34 -51 -95 -59 -95h-34v190v190v190v190v190c40 7 69 11 87 16c116 36 174 110 174 195c0 44 -15 91 -46 137zM247 79c-24 -46 -58 -86 -93 -118 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM40 7c20 3 36 6 47 9c88 27 168 95 168 200c0 26 -4 43 -8 54c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24A-flag256thUp.xml b/data/Leipzig/E24A-flag256thUp.xml
deleted file mode 100644
index 2c38724fd27..00000000000
--- a/data/Leipzig/E24A-flag256thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 111c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118z M247 301c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122z M206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190v190v190v190h34c8 0 21 -61 59 -95c4 -3 -2 3 61 -56c61 -57 122 -134 122 -235v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6 c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200 c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24B-flag256thDown.xml b/data/Leipzig/E24B-flag256thDown.xml
deleted file mode 100644
index 333314435cd..00000000000
--- a/data/Leipzig/E24B-flag256thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -111c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 79c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9 c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 -301c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56 c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM216 727c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 57 -98 57 -169c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6 c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -101 -61 -178 -122 -235c-63 -59 -57 -53 -61 -56c-38 -34 -51 -95 -59 -95h-34v190v190v190v190v190v190c40 7 69 11 87 16 c116 36 175 110 175 195c0 44 -15 90 -46 136zM247 270c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 26 -4 43 -8 54z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24C-flag512thUp.xml b/data/Leipzig/E24C-flag512thUp.xml
deleted file mode 100644
index 60e9c6d3cac..00000000000
--- a/data/Leipzig/E24C-flag512thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M251 484c4 19 4 34 4 49v11c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c37 -34 74 -75 97 -125zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119 zM276 -196c0 -58 -10 -86 -19 -97c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v1330h22 c8 0 33 -61 71 -95c4 -3 -2 3 61 -56c62 -58 122 -137 122 -241c0 -24 -5 -61 -15 -99c0 -1 1 -3 1 -4c10 39 15 52 15 52c0 -2 -8 -36 -14 -53c8 -25 13 -51 13 -80c0 -56 -10 -85 -18 -96c12 -29 18 -60 18 -94c0 -56 -10 -85 -18 -96c12 -29 18 -60 18 -94 c0 -56 -10 -85 -18 -96c12 -29 18 -60 18 -94zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122zM247 301c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88 c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 111c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88 c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24D-flag512thDown.xml b/data/Leipzig/E24D-flag512thDown.xml
deleted file mode 100644
index 724eec4be58..00000000000
--- a/data/Leipzig/E24D-flag512thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M251 -484c-23 -50 -60 -91 -97 -125c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200v11c0 15 0 30 -4 49zM247 270c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9 c88 27 168 95 168 200c0 26 -4 43 -8 54zM258 -278c8 -11 18 -40 18 -96c0 -29 -5 -55 -13 -80c6 -17 14 -51 14 -53c0 0 -5 13 -15 52c0 -1 -1 -3 -1 -4c10 -38 15 -75 15 -99c0 -104 -60 -183 -122 -241c-63 -59 -57 -53 -61 -56c-38 -34 -63 -95 -71 -95h-22v1330 c40 7 69 11 87 16c113 35 168 114 168 203c0 49 -17 101 -49 149c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 67 -119 67 -190c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 19 -39 19 -97c0 -34 -6 -65 -18 -94 c8 -11 18 -40 18 -96c0 -34 -6 -65 -18 -94c8 -11 18 -40 18 -96c0 -34 -6 -65 -18 -94zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM247 -301c-24 -46 -58 -86 -93 -118 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 79c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 -111 c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24E-flag1024thUp.xml b/data/Leipzig/E24E-flag1024thUp.xml
deleted file mode 100644
index def923330e2..00000000000
--- a/data/Leipzig/E24E-flag1024thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119zM206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190v190v190v190v190v190h22c8 0 33 -61 71 -95 c4 -3 -2 3 61 -56c62 -58 122 -137 122 -241c0 -32 -7 -65 -17 -96c10 -27 21 -53 21 -85c0 -34 -7 -60 -19 -104c11 -27 15 -55 15 -87v-8c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -57 -9 -78 -18 -90 c12 -29 18 -60 18 -94v-6c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9 c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122zM247 301c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9 c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 111c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM248 677c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9 c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122zM40 753c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c33 -31 71 -77 94 -121c5 29 8 55 8 79c0 87 -41 141 -169 177c-11 3 -27 6 -47 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24F-flag1024thDown.xml b/data/Leipzig/E24F-flag1024thDown.xml
deleted file mode 100644
index 0e32ee81ced..00000000000
--- a/data/Leipzig/E24F-flag1024thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 270c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 26 -4 43 -8 54zM206 748c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 67 -119 67 -190c0 -34 -6 -65 -17 -94 c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-8c0 -32 -4 -60 -15 -87c12 -44 19 -70 19 -104 c0 -32 -11 -58 -21 -85c10 -31 17 -64 17 -96c0 -104 -60 -183 -122 -241c-63 -59 -57 -53 -61 -56c-38 -34 -63 -95 -71 -95h-22v190v190v190v190v190v190v190v190c40 7 69 11 87 16c113 35 168 114 168 203c0 49 -17 101 -49 149zM248 463c-23 -48 -58 -89 -94 -122 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM247 -301c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 79 c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 -111c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200 c0 25 -4 42 -8 53zM248 -677c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM40 -753c20 3 36 6 47 9c128 36 169 90 169 177c0 24 -3 50 -8 79c-23 -44 -61 -90 -94 -121 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E260-accidentalFlat.xml b/data/Leipzig/E260-accidentalFlat.xml
deleted file mode 100644
index 06e57abe91e..00000000000
--- a/data/Leipzig/E260-accidentalFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v644h20v-359zM90 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E261-accidentalNatural.xml b/data/Leipzig/E261-accidentalNatural.xml
deleted file mode 100644
index af41f558fe2..00000000000
--- a/data/Leipzig/E261-accidentalNatural.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -188v539h18v-191l139 22v-533h-17v186zM18 -100l122 17v176l-122 -19v-174z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E262-accidentalSharp.xml b/data/Leipzig/E262-accidentalSharp.xml
deleted file mode 100644
index 728cc2c2d86..00000000000
--- a/data/Leipzig/E262-accidentalSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M136 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM60 73v-167l76 22v168z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E263-accidentalDoubleSharp.xml b/data/Leipzig/E263-accidentalDoubleSharp.xml
deleted file mode 100644
index 72a661cf645..00000000000
--- a/data/Leipzig/E263-accidentalDoubleSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 120h74v-54l15 -17h79l15 16v55h74v-72h-59l-25 -28v-38l25 -32h59v-70h-75v55l-14 15h-80l-14 -15v-55h-74v72h60l26 30v38l-28 29h-58v71z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E264-accidentalDoubleFlat.xml b/data/Leipzig/E264-accidentalDoubleFlat.xml
deleted file mode 100644
index 9c370820ae4..00000000000
--- a/data/Leipzig/E264-accidentalDoubleFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M280 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM113 137c38 0 65 -13 77 -41v373h20v-359c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89 c-23 -25 -39 -44 -65 -68l-88 -79v199c-12 -28 -46 -63 -67 -87c-9 -11 -21 -22 -35 -33l-88 -79v644h20v-359c32 16 54 27 93 27zM90 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E265-accidentalTripleSharp.xml b/data/Leipzig/E265-accidentalTripleSharp.xml
deleted file mode 100644
index 8d58c86843e..00000000000
--- a/data/Leipzig/E265-accidentalTripleSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M414 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM338 73v-167l76 22v168zM0 120h74v-54l15 -17h79l15 16v55h74v-72h-59l-25 -28v-38l25 -32h59v-70h-75v55 l-14 15h-80l-14 -15v-55h-74v72h60l26 30v38l-28 29h-58v71z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E266-accidentalTripleFlat.xml b/data/Leipzig/E266-accidentalTripleFlat.xml
deleted file mode 100644
index e02597d70a5..00000000000
--- a/data/Leipzig/E266-accidentalTripleFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M280 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM303 137c38 0 65 -13 77 -41v373h20v-359c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89 c-23 -25 -39 -44 -65 -68l-88 -79v199c-12 -28 -46 -63 -67 -87c-9 -11 -21 -22 -35 -33l-88 -79v199c-12 -28 -46 -63 -67 -87c-9 -11 -21 -22 -35 -33l-88 -79v644h20v-359c32 16 54 27 93 27c38 0 65 -13 77 -41v373h20v-359c32 16 54 27 93 27zM470 106 c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM90 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E267-accidentalNaturalFlat.xml b/data/Leipzig/E267-accidentalNaturalFlat.xml
deleted file mode 100644
index f0d6ac46539..00000000000
--- a/data/Leipzig/E267-accidentalNaturalFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -188v539h18v-191l139 22v-533h-17v186zM18 -100l122 17v176l-122 -19v-174zM200 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v644h20v-359zM270 106c-32 0 -48 -10 -70 -29v-194 c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E268-accidentalNaturalSharp.xml b/data/Leipzig/E268-accidentalNaturalSharp.xml
deleted file mode 100644
index 4496a2de357..00000000000
--- a/data/Leipzig/E268-accidentalNaturalSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -188v539h18v-191l139 22v-533h-17v186zM18 -100l122 17v176l-122 -19v-174zM316 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM240 73v-167l76 22v168z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E269-accidentalSharpSharp.xml b/data/Leipzig/E269-accidentalSharpSharp.xml
deleted file mode 100644
index 76b899b5604..00000000000
--- a/data/Leipzig/E269-accidentalSharpSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M136 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM60 73v-167l76 22v168zM351 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22 v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM275 73v-167l76 22v168z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E26A-accidentalParensLeft.xml b/data/Leipzig/E26A-accidentalParensLeft.xml
deleted file mode 100644
index 55cbfd1fa21..00000000000
--- a/data/Leipzig/E26A-accidentalParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 -235v-11c0 -3 -1 -4 -1 -4h-2c-108 62 -160 150 -160 250s52 188 160 250h2s1 -1 1 -4v-11s0 -9 -3 -10c-78 -45 -110 -110 -110 -225s32 -180 110 -225c3 -1 3 -7 3 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E26B-accidentalParensRight.xml b/data/Leipzig/E26B-accidentalParensRight.xml
deleted file mode 100644
index 87857f71071..00000000000
--- a/data/Leipzig/E26B-accidentalParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -235c0 3 0 9 3 10c78 45 110 110 110 225s-32 180 -110 225c-3 1 -3 10 -3 10v11c0 3 1 4 1 4h2c108 -62 160 -150 160 -250s-52 -188 -160 -250h-2s-1 1 -1 4v11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E26C-accidentalBracketLeft.xml b/data/Leipzig/E26C-accidentalBracketLeft.xml
deleted file mode 100644
index 7eafefccbe4..00000000000
--- a/data/Leipzig/E26C-accidentalBracketLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 260h90v-38h-52v-444h52v-38h-90v520z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E26D-accidentalBracketRight.xml b/data/Leipzig/E26D-accidentalBracketRight.xml
deleted file mode 100644
index 515c7ea63f0..00000000000
--- a/data/Leipzig/E26D-accidentalBracketRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 260v-520h-90v38h52v444h-52v38h90z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E270-accidentalQuarterToneFlatArrowUp.xml b/data/Leipzig/E270-accidentalQuarterToneFlatArrowUp.xml
deleted file mode 100644
index 0721998dcd6..00000000000
--- a/data/Leipzig/E270-accidentalQuarterToneFlatArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M135 106l-8 4l-15 2c-11 0 -22 -2 -33 -6s-23 -12 -37 -25v-204c31 33 54 62 71 88c21 33 32 63 32 89c1 9 1 16 1 21c0 6 -1 11 -2 16s-4 10 -9 15zM-43 441l75 161l73 -161h-26l-37 49v-374c20 11 37 18 51 22s28 6 42 6c11 0 21 -1 28 -3s16 -6 26 -11 c13 -8 22 -21 27 -40l4 -26c0 -30 -15 -61 -45 -94c-11 -13 -21 -25 -30 -36s-21 -23 -35 -35l-88 -83v673l-39 -48h-26z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E271-accidentalThreeQuarterTonesFlatArrowDown.xml b/data/Leipzig/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
deleted file mode 100644
index 82b9b845d3c..00000000000
--- a/data/Leipzig/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M47 -162zM41 -239l35 46h26l-73 -161l-75 161h26l37 -47s4 674 5 734h20v-378c20 11 37 18 51 22s28 6 42 6c11 0 21 -1 28 -3s16 -6 26 -11c13 -8 22 -21 27 -40l4 -26c0 -30 -15 -61 -45 -94c-11 -13 -21 -25 -30 -36s-21 -23 -35 -35l-63 -59z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E272-accidentalQuarterToneSharpNaturalArrowUp.xml b/data/Leipzig/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
deleted file mode 100644
index e38c368daa2..00000000000
--- a/data/Leipzig/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-46 324l75 161l73 -161h-26l-38 50v-202l139 24v-573h-17v200l-140 -25v575l-40 -49h-26zM38 -108l122 19v189l-122 -20v-188z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E273-accidentalQuarterToneFlatNaturalArrowDown.xml b/data/Leipzig/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
deleted file mode 100644
index b121182e803..00000000000
--- a/data/Leipzig/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M221 -324l-73 -161l-75 161h26l42 -52l-1 199l-140 -25v579h18v-205l139 24v-570l38 50h26zM140 -89v189l-122 -20v-188z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E274-accidentalThreeQuarterTonesSharpArrowUp.xml b/data/Leipzig/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
deleted file mode 100644
index daa6728bb1b..00000000000
--- a/data/Leipzig/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-24 300l75 161l73 -161h-26l-38 50v-173l76 23v182h17v-177l44 15v-97l-44 -15v-178l44 13v-98l-44 -14v-167h-17v162l-76 -24v-166h-17v160l-43 -14v97l43 15v179l-43 -15v99l43 14v180l-41 -51h-26zM60 78v-179l76 24v180z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E275-accidentalQuarterToneSharpArrowDown.xml b/data/Leipzig/E275-accidentalQuarterToneSharpArrowDown.xml
deleted file mode 100644
index 9dee676ec24..00000000000
--- a/data/Leipzig/E275-accidentalQuarterToneSharpArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M60 78v-179l76 24v180zM136 200v182h17v-177l44 15v-97l-44 -15v-178l44 13v-98l-44 -14v-167h-17v162l-76 -24v-163l37 49h26l-73 -161l-75 161h28l39 -50l1 158l-43 -14v97l43 15v179l-43 -15v99l43 14v182h17v-176z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E280-accidentalQuarterToneFlatStein.xml b/data/Leipzig/E280-accidentalQuarterToneFlatStein.xml
deleted file mode 100644
index 72ff658da2c..00000000000
--- a/data/Leipzig/E280-accidentalQuarterToneFlatStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M178 110v359h20v-644l-88 79c-26 24 -42 43 -65 68c-29 32 -45 61 -45 89l4 25c3 18 14 31 27 38c19 10 28 13 54 13c39 0 61 -11 93 -27zM108 106l-15 -2l-8 -3c-8 -9 -11 -16 -11 -30c0 -4 1 -11 1 -20c0 -25 11 -52 32 -84c17 -25 40 -53 71 -84v194 c-22 19 -38 29 -70 29z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E281-accidentalThreeQuarterTonesFlatZimmermann.xml b/data/Leipzig/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
deleted file mode 100644
index b5cff7e8acf..00000000000
--- a/data/Leipzig/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v644h20v-359zM308 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z M178 110v359h20v-644l-88 79c-26 24 -42 43 -65 68c-29 32 -45 61 -45 89l4 25c3 18 14 31 27 38c19 10 28 13 54 13c39 0 61 -11 93 -27zM108 106l-15 -2l-8 -3c-8 -9 -11 -16 -11 -30c0 -4 1 -11 1 -20c0 -25 11 -52 32 -84c17 -25 40 -53 71 -84v194 c-22 19 -38 29 -70 29z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E282-accidentalQuarterToneSharpStein.xml b/data/Leipzig/E282-accidentalQuarterToneSharpStein.xml
deleted file mode 100644
index 490b356faa7..00000000000
--- a/data/Leipzig/E282-accidentalQuarterToneSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M106 179v-91l-44 -14v-165l44 12v-91l-46 -14v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E283-accidentalThreeQuarterTonesSharpStein.xml b/data/Leipzig/E283-accidentalThreeQuarterTonesSharpStein.xml
deleted file mode 100644
index faf03525e7f..00000000000
--- a/data/Leipzig/E283-accidentalThreeQuarterTonesSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 73v-167l76 22v168zM242 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v-1l-46 -14v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163l46 14v1l43 13v169h17v-163zM106 54l-44 -14v-165 l44 12l43 14v167z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E440-accidentalBuyukMucennebFlat.xml b/data/Leipzig/E440-accidentalBuyukMucennebFlat.xml
deleted file mode 100644
index ae7e6b4ef10..00000000000
--- a/data/Leipzig/E440-accidentalBuyukMucennebFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM69 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v344.533 l-49 -27.5333v36l49 27.5333v41.9999l-49 -27.5332v36l49 27.5332v185.467h20v-174.229l147 85.2285v-36l-147 -85.2285v-42.0001l147 85.2286v-36l-147 -85.2286v-70.7714z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E441-accidentalKucukMucennebFlat.xml b/data/Leipzig/E441-accidentalKucukMucennebFlat.xml
deleted file mode 100644
index 0cbd046cccf..00000000000
--- a/data/Leipzig/E441-accidentalKucukMucennebFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E441" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v644h20v-359zM90 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E442-accidentalBakiyeFlat.xml b/data/Leipzig/E442-accidentalBakiyeFlat.xml
deleted file mode 100644
index ee44327f682..00000000000
--- a/data/Leipzig/E442-accidentalBakiyeFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM69 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v363.467 l-49 -28.4667v36l49 28.4667v244.533h20v-232.914l147 87.9143v-36l-147 -87.9143v-90.0857z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E443-accidentalKomaFlat.xml b/data/Leipzig/E443-accidentalKomaFlat.xml
deleted file mode 100644
index 69c745a95ae..00000000000
--- a/data/Leipzig/E443-accidentalKomaFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E443" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M178 110v359h20v-644l-88 79c-26 24 -42 43 -65 68c-29 32 -45 61 -45 89l4 25c3 18 14 31 27 38c19 10 28 13 54 13c39 0 61 -11 93 -27zM108 106l-15 -2l-8 -3c-8 -9 -11 -16 -11 -30c0 -4 1 -11 1 -20c0 -25 11 -52 32 -84c17 -25 40 -53 71 -84v194 c-22 19 -38 29 -70 29z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E444-accidentalKomaSharp.xml b/data/Leipzig/E444-accidentalKomaSharp.xml
deleted file mode 100644
index a5e54bbcd34..00000000000
--- a/data/Leipzig/E444-accidentalKomaSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E444" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M106 179v-91l-44 -14v-165l44 12v-91l-46 -14v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E445-accidentalBakiyeSharp.xml b/data/Leipzig/E445-accidentalBakiyeSharp.xml
deleted file mode 100644
index 89a0a3f5f79..00000000000
--- a/data/Leipzig/E445-accidentalBakiyeSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E445" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M136 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM60 73v-167l76 22v168z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E446-accidentalKucukMucennebSharp.xml b/data/Leipzig/E446-accidentalKucukMucennebSharp.xml
deleted file mode 100644
index a5287d38d16..00000000000
--- a/data/Leipzig/E446-accidentalKucukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M156 179v-91l-44 -14v-51.2667l98 31.2667v-56l-98 -31.2667v-57.7333l44 12v-91l-46 -14v-155h-17v149l-43 -13v90l43 14v59.6714l-93 -29.6714v56l93 29.6714v51.3286l-43 -14v92l43 13v169h17v-163z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E447-accidentalBuyukMucennebSharp.xml b/data/Leipzig/E447-accidentalBuyukMucennebSharp.xml
deleted file mode 100644
index db210d74847..00000000000
--- a/data/Leipzig/E447-accidentalBuyukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 186v169h17v-164l44 14v-91l-44 -14v-52.5481l64 19.5481v-56l-64 -19.5481v-56.4519l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v56.8536l-65 -19.8536v56l65 19.8536v54.1464l-43 -14v92l43 13v169h17v-163zM82 -36.954v-57.046l76 22 v58.2594zM82 19.046l76 23.2134v53.7406l-76 -23v-53.954z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A0-articAccentAbove.xml b/data/Leipzig/E4A0-articAccentAbove.xml
deleted file mode 100644
index afcdba6200b..00000000000
--- a/data/Leipzig/E4A0-articAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 236l347 -119l-347 -117v33l252 84l-252 86v33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A1-articAccentBelow.xml b/data/Leipzig/E4A1-articAccentBelow.xml
deleted file mode 100644
index 5425d8a5ff7..00000000000
--- a/data/Leipzig/E4A1-articAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -236v33l252 86l-252 84v33l347 -117z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A2-articStaccatoAbove.xml b/data/Leipzig/E4A2-articStaccatoAbove.xml
deleted file mode 100644
index 8b92c76c55d..00000000000
--- a/data/Leipzig/E4A2-articStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 45c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A3-articStaccatoBelow.xml b/data/Leipzig/E4A3-articStaccatoBelow.xml
deleted file mode 100644
index 88d61533a3d..00000000000
--- a/data/Leipzig/E4A3-articStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -45c1 14 6 25 15 33s21 12 35 12c13 -1 23 -6 32 -15s13 -21 13 -34c-1 -14 -6 -25 -15 -33s-21 -12 -35 -12c-13 1 -23 6 -32 15s-13 21 -13 34z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A4-articTenutoAbove.xml b/data/Leipzig/E4A4-articTenutoAbove.xml
deleted file mode 100644
index e070604ee5b..00000000000
--- a/data/Leipzig/E4A4-articTenutoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 36h330c8 0 8 -4 8 -12v-12c0 -8 0 -12 -8 -12h-330c-8 0 -8 4 -8 12v12c0 8 0 12 8 12z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A5-articTenutoBelow.xml b/data/Leipzig/E4A5-articTenutoBelow.xml
deleted file mode 100644
index edbf982d1a4..00000000000
--- a/data/Leipzig/E4A5-articTenutoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 0h330c8 0 8 -4 8 -12v-12c0 -8 0 -12 -8 -12h-330c-8 0 -8 4 -8 12v12c0 8 0 12 8 12z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A6-articStaccatissimoAbove.xml b/data/Leipzig/E4A6-articStaccatissimoAbove.xml
deleted file mode 100644
index f710bfde479..00000000000
--- a/data/Leipzig/E4A6-articStaccatissimoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 224l-55 -224l-55 224v5c3 5 4 5 14 8c14 4 28 5 42 7c11 -1 21 0 35 -5c12 -4 22 -6 19 -10v-5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A7-articStaccatissimoBelow.xml b/data/Leipzig/E4A7-articStaccatissimoBelow.xml
deleted file mode 100644
index fe80a62cf48..00000000000
--- a/data/Leipzig/E4A7-articStaccatissimoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -224v-5c3 -4 -7 -6 -19 -10c-14 -5 -24 -4 -35 -5c-14 2 -28 3 -42 7c-10 3 -11 3 -14 8v5l55 224z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A8-articStaccatissimoWedgeAbove.xml b/data/Leipzig/E4A8-articStaccatissimoWedgeAbove.xml
deleted file mode 100644
index b5db6aa2696..00000000000
--- a/data/Leipzig/E4A8-articStaccatissimoWedgeAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M153 224l-77 -224l-76 224h36c9 -3 15 -9 20 -18c9 -16 16 -25 20 -26c6 2 11 7 14 14c7 16 16 26 26 30h37z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A9-articStaccatissimoWedgeBelow.xml b/data/Leipzig/E4A9-articStaccatissimoWedgeBelow.xml
deleted file mode 100644
index 5c22cd11ac5..00000000000
--- a/data/Leipzig/E4A9-articStaccatissimoWedgeBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M153 -224h-37c-10 4 -19 14 -26 30c-3 7 -8 12 -14 14c-4 -1 -11 -10 -20 -26c-5 -9 -11 -15 -20 -18h-36l76 224z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AA-articStaccatissimoStrokeAbove.xml b/data/Leipzig/E4AA-articStaccatissimoStrokeAbove.xml
deleted file mode 100644
index ecc36b670cd..00000000000
--- a/data/Leipzig/E4AA-articStaccatissimoStrokeAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v240h33v-240h-33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AB-articStaccatissimoStrokeBelow.xml b/data/Leipzig/E4AB-articStaccatissimoStrokeBelow.xml
deleted file mode 100644
index bf320c1ed4c..00000000000
--- a/data/Leipzig/E4AB-articStaccatissimoStrokeBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0h33v-240h-33v240z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AC-articMarcatoAbove.xml b/data/Leipzig/E4AC-articMarcatoAbove.xml
deleted file mode 100644
index 5ac0a419f8c..00000000000
--- a/data/Leipzig/E4AC-articMarcatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 0h-82l-84 154l-78 -154h-29l137 265z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AD-articMarcatoBelow.xml b/data/Leipzig/E4AD-articMarcatoBelow.xml
deleted file mode 100644
index 316c8423d1c..00000000000
--- a/data/Leipzig/E4AD-articMarcatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 0h82l84 -154l78 154h29l-137 -265z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AE-articMarcatoStaccatoAbove.xml b/data/Leipzig/E4AE-articMarcatoStaccatoAbove.xml
deleted file mode 100644
index f692e0697f8..00000000000
--- a/data/Leipzig/E4AE-articMarcatoStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 110h-82l-84 154l-78 -154h-29l137 265zM87 45c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AF-articMarcatoStaccatoBelow.xml b/data/Leipzig/E4AF-articMarcatoStaccatoBelow.xml
deleted file mode 100644
index 6d18b91ff05..00000000000
--- a/data/Leipzig/E4AF-articMarcatoStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 -45c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33zM1 -110h82l84 -154l78 154h29l-137 -265z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B0-articAccentStaccatoAbove.xml b/data/Leipzig/E4B0-articAccentStaccatoAbove.xml
deleted file mode 100644
index c95361530e3..00000000000
--- a/data/Leipzig/E4B0-articAccentStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 45c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33zM0 346l347 -119l-347 -117v33l252 84l-252 86v33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B1-articAccentStaccatoBelow.xml b/data/Leipzig/E4B1-articAccentStaccatoBelow.xml
deleted file mode 100644
index 5f4a3e5ed57..00000000000
--- a/data/Leipzig/E4B1-articAccentStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 -45c1 14 6 25 15 33s21 12 35 12c13 -1 23 -6 32 -15s13 -21 13 -34c-1 -14 -6 -25 -15 -33s-21 -12 -35 -12c-13 1 -23 6 -32 15s-13 21 -13 34zM0 -346v33l252 86l-252 84v33l347 -117z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B2-articTenutoStaccatoAbove.xml b/data/Leipzig/E4B2-articTenutoStaccatoAbove.xml
deleted file mode 100644
index 8a8a2e8906c..00000000000
--- a/data/Leipzig/E4B2-articTenutoStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 45c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33zM0 140v33h347v-33h-347z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B3-articTenutoStaccatoBelow.xml b/data/Leipzig/E4B3-articTenutoStaccatoBelow.xml
deleted file mode 100644
index a0cf617363f..00000000000
--- a/data/Leipzig/E4B3-articTenutoStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 -45c1 14 6 25 15 33s21 12 35 12c13 -1 23 -6 32 -15s13 -21 13 -34c-1 -14 -6 -25 -15 -33s-21 -12 -35 -12c-13 1 -23 6 -32 15s-13 21 -13 34zM0 -140h347v-33h-347v33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B4-articTenutoAccentAbove.xml b/data/Leipzig/E4B4-articTenutoAccentAbove.xml
deleted file mode 100644
index 10fed7b8ffd..00000000000
--- a/data/Leipzig/E4B4-articTenutoAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 308l347 -119l-347 -117v33l252 84l-252 86v33zM0 0v33h347v-33h-347z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B5-articTenutoAccentBelow.xml b/data/Leipzig/E4B5-articTenutoAccentBelow.xml
deleted file mode 100644
index 63a6371fd51..00000000000
--- a/data/Leipzig/E4B5-articTenutoAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -308v33l252 86l-252 84v33l347 -117zM0 0h347v-33h-347v33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B6-articStressAbove.xml b/data/Leipzig/E4B6-articStressAbove.xml
deleted file mode 100644
index 2225583a232..00000000000
--- a/data/Leipzig/E4B6-articStressAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M190 112l-190 -112l112 190l4 4c6 1 7 1 16 -4c13 -7 23 -17 34 -25c7 -8 14 -16 21 -29c6 -11 12 -19 7 -20z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B7-articStressBelow.xml b/data/Leipzig/E4B7-articStressBelow.xml
deleted file mode 100644
index 01354c10935..00000000000
--- a/data/Leipzig/E4B7-articStressBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M190 -112l4 -4c5 -1 -1 -9 -7 -20c-7 -13 -14 -21 -21 -29c-11 -8 -21 -18 -34 -25c-9 -5 -10 -5 -16 -4l-4 4l-112 190z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B8-articUnstressAbove.xml b/data/Leipzig/E4B8-articUnstressAbove.xml
deleted file mode 100644
index 1fda7702a64..00000000000
--- a/data/Leipzig/E4B8-articUnstressAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 166c11 -44 21 -74 32 -90c22 -34 55 -51 98 -51s75 17 97 51c12 18 23 48 32 90c1 0 1 0 2 1c3 -5 4 -12 4 -22c0 -34 -8 -64 -24 -89c-24 -37 -61 -56 -111 -56s-87 19 -110 56c-17 27 -25 57 -25 91c0 11 1 17 2 20c1 -1 2 -1 3 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B9-articUnstressBelow.xml b/data/Leipzig/E4B9-articUnstressBelow.xml
deleted file mode 100644
index a946ce2d603..00000000000
--- a/data/Leipzig/E4B9-articUnstressBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -166c-1 0 -2 0 -3 -1c-1 3 -2 9 -2 20c0 34 8 64 25 91c23 37 60 56 110 56s87 -19 111 -56c16 -25 24 -55 24 -89c0 -10 -1 -17 -4 -22c-1 1 -1 1 -2 1c-9 42 -20 72 -32 90c-22 34 -54 51 -97 51s-76 -17 -98 -51c-11 -16 -21 -46 -32 -90z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4BA-articLaissezVibrerAbove.xml b/data/Leipzig/E4BA-articLaissezVibrerAbove.xml
deleted file mode 100644
index b522089a123..00000000000
--- a/data/Leipzig/E4BA-articLaissezVibrerAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 25h16c17 0 41 1 55 11c19 13 14 10 36 40c0 1 12 19 13 20c1 -1 1 -3 1 -6c0 -21 -9 -36 -18 -49c-24 -37 -43 -41 -93 -41s-79 2 -99 37c-12 21 -1 1 -16 30c-7 13 -9 26 -8 29c1 -1 15 -18 15 -19c23 -27 18 -23 36 -38c16 -13 24 -14 46 -14h16z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4BB-articLaissezVibrerBelow.xml b/data/Leipzig/E4BB-articLaissezVibrerBelow.xml
deleted file mode 100644
index 8c1de3cfe79..00000000000
--- a/data/Leipzig/E4BB-articLaissezVibrerBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 -25h-16c-22 0 -30 -1 -46 -14c-18 -15 -13 -11 -36 -38c0 -1 -14 -18 -15 -19c-1 3 1 16 8 29c15 29 4 9 16 30c20 35 49 37 99 37s69 -4 93 -41c9 -13 18 -28 18 -49c0 -3 0 -5 -1 -6c-1 1 -13 19 -13 20c-22 30 -17 27 -36 40c-14 10 -38 11 -55 11h-16z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4BC-articMarcatoTenutoAbove.xml b/data/Leipzig/E4BC-articMarcatoTenutoAbove.xml
deleted file mode 100644
index 5086fcb8c97..00000000000
--- a/data/Leipzig/E4BC-articMarcatoTenutoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v33h347v-33h-347zM310 85h-82l-84 154l-78 -154h-29l137 265z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4BD-articMarcatoTenutoBelow.xml b/data/Leipzig/E4BD-articMarcatoTenutoBelow.xml
deleted file mode 100644
index 365c9f53f08..00000000000
--- a/data/Leipzig/E4BD-articMarcatoTenutoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M347 0v-33h-347v33h347zM37 -85h82l84 -154l78 154h29l-137 -265z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C0-fermataAbove.xml b/data/Leipzig/E4C0-fermataAbove.xml
deleted file mode 100644
index 720b8e210aa..00000000000
--- a/data/Leipzig/E4C0-fermataAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M605 21zM0 0c0 3 3 17 4 21c58 293 250 299 295 299h5h5c42 0 236 -6 295 -299c1 -4 1 -18 1 -21h-32c-1 1 -4 22 -5 25c-10 38 -52 202 -265 202c-208 0 -252 -159 -264 -200c-1 -4 -6 -26 -6 -27h-33zM358 52c0 -30 -25 -55 -55 -55c-29 0 -54 25 -54 55 c0 29 25 54 54 54c30 0 55 -25 55 -54z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C1-fermataBelow.xml b/data/Leipzig/E4C1-fermataBelow.xml
deleted file mode 100644
index 93f793975ba..00000000000
--- a/data/Leipzig/E4C1-fermataBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M605 -21zM0 0h33c0 -1 5 -23 6 -27c12 -41 56 -200 264 -200c213 0 255 164 265 202c1 3 4 24 5 25h32c0 -3 0 -17 -1 -21c-59 -293 -253 -299 -295 -299h-5h-5c-45 0 -237 6 -295 299c-1 4 -4 18 -4 21zM358 -52c0 -29 -25 -54 -55 -54c-29 0 -54 25 -54 54 c0 30 25 55 54 55c30 0 55 -25 55 -55z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C2-fermataVeryShortAbove.xml b/data/Leipzig/E4C2-fermataVeryShortAbove.xml
deleted file mode 100644
index 410b5e02518..00000000000
--- a/data/Leipzig/E4C2-fermataVeryShortAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 104c0 -16 -6 -30 -18 -41s-28 -17 -47 -17c-16 0 -30 6 -42 17s-18 25 -19 41c0 14 6 27 17 38s25 17 43 18c20 0 37 -6 48 -17s17 -24 18 -39zM390 449c0 0 347 -361 378 -390c8 -7 11 -18 11 -28c0 -9 -2 -16 -6 -21s-13 -10 -13 -10c-13 0 -7 -1 -19 4 c-11 5 -31 25 -42 35l-309 290l-298 -276s-32 -32 -41 -40c-12 -10 -12 -13 -25 -13c-10 0 -8 -2 -21 7c-4 3 -5 9 -5 16c0 11 4 24 10 30c127 126 380 396 380 396zM390 288c0 0 225 -230 245 -249c5 -5 7 -12 7 -18s-1 -11 -3 -14c-3 -3 -9 -6 -9 -6c-9 0 -4 -1 -12 2 c-7 3 -21 17 -28 24l-200 186v1l-194 -179s-21 -21 -27 -26c-8 -6 -8 -8 -16 -8c-6 0 -6 -2 -14 4c-2 2 -3 6 -3 10c0 7 3 16 7 20c83 82 247 253 247 253z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C3-fermataVeryShortBelow.xml b/data/Leipzig/E4C3-fermataVeryShortBelow.xml
deleted file mode 100644
index 4f2b00db8bc..00000000000
--- a/data/Leipzig/E4C3-fermataVeryShortBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 -104c-1 -15 -7 -28 -18 -39s-28 -17 -48 -17c-18 1 -32 7 -43 18s-17 24 -17 38c1 16 7 30 19 41s26 17 42 17c19 0 35 -6 47 -17s18 -25 18 -41zM390 -449c0 0 -253 270 -380 396c-6 6 -10 19 -10 30c0 7 1 13 5 16c13 9 11 7 21 7c13 0 13 -3 25 -13 c9 -8 41 -40 41 -40l298 -276l309 290c11 10 31 30 42 35c12 5 6 4 19 4c0 0 9 -5 13 -10s6 -12 6 -21c0 -10 -3 -21 -11 -28c-31 -29 -378 -390 -378 -390zM390 -288c0 0 -164 171 -247 253c-4 4 -7 13 -7 20c0 4 1 8 3 10c8 6 8 4 14 4c8 0 8 -2 16 -8c6 -5 27 -26 27 -26 l194 -179v1l200 186c7 7 21 21 28 24c8 3 3 2 12 2c0 0 6 -3 9 -6c2 -3 3 -8 3 -14s-2 -13 -7 -18c-20 -19 -245 -249 -245 -249z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C4-fermataShortAbove.xml b/data/Leipzig/E4C4-fermataShortAbove.xml
deleted file mode 100644
index 8dc9e1ce58e..00000000000
--- a/data/Leipzig/E4C4-fermataShortAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 104c0 -16 -6 -30 -18 -41s-28 -17 -47 -17c-16 0 -30 6 -42 17s-18 25 -19 41c0 14 6 27 17 38s25 17 43 18c20 0 37 -6 48 -17s17 -24 18 -39zM390 449c0 0 347 -361 378 -390c8 -7 11 -18 11 -28c0 -9 -2 -16 -6 -21s-13 -10 -13 -10c-13 0 -7 -1 -19 4 c-11 5 -31 25 -42 35l-309 290l-298 -276s-32 -32 -41 -40c-12 -10 -12 -13 -25 -13c-10 0 -8 -2 -21 7c-4 3 -5 9 -5 16c0 11 4 24 10 30c127 126 380 396 380 396z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C5-fermataShortBelow.xml b/data/Leipzig/E4C5-fermataShortBelow.xml
deleted file mode 100644
index f86ae7774dc..00000000000
--- a/data/Leipzig/E4C5-fermataShortBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 -104c-1 -15 -7 -28 -18 -39s-28 -17 -48 -17c-18 1 -32 7 -43 18s-17 24 -17 38c1 16 7 30 19 41s26 17 42 17c19 0 35 -6 47 -17s18 -25 18 -41zM390 -449c0 0 -253 270 -380 396c-6 6 -10 19 -10 30c0 7 1 13 5 16c13 9 11 7 21 7c13 0 13 -3 25 -13 c9 -8 41 -40 41 -40l298 -276l309 290c11 10 31 30 42 35c12 5 6 4 19 4c0 0 9 -5 13 -10s6 -12 6 -21c0 -10 -3 -21 -11 -28c-31 -29 -378 -390 -378 -390z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C6-fermataLongAbove.xml b/data/Leipzig/E4C6-fermataLongAbove.xml
deleted file mode 100644
index b4f45320d5b..00000000000
--- a/data/Leipzig/E4C6-fermataLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M391 204c36.8298 0 62.809 -23.1346 65 -56c0 -34.3531 -29.4543 -58 -65 -58c-32.6676 0 -59.0449 26.7191 -61 58c0 31.7398 28.9048 54.2169 61 56zM742 0c-28.0091 0 -48 18.0516 -48 47v297h-598v-297c0 -28.9412 -20.5747 -44.9673 -47 -47 c-28.0091 0 -48 18.0516 -48 47v345c0 28.7164 19.2113 45.1474 47 47h694c29.0826 0 45.1887 -19.8304 47 -47v-345c0 -28.9412 -20.5747 -44.9673 -47 -47z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C7-fermataLongBelow.xml b/data/Leipzig/E4C7-fermataLongBelow.xml
deleted file mode 100644
index f8fea2c160b..00000000000
--- a/data/Leipzig/E4C7-fermataLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M391 -90c35.5551 0 65 -23.6372 65 -58c-2.19013 -32.852 -28.1797 -56 -65 -56c-32.1124 1.78402 -61 24.2367 -61 56c1.95528 31.2845 28.3265 58 61 58zM49 0c26.4253 -2.03272 47 -18.0628 47 -47v-297h598v297c0 28.9498 19.98 47 48 47 c26.4253 -2.03272 47 -18.0628 47 -47v-345c-1 -15 -6 -27 -15 -35c-6.89933 -6.89933 -18.9516 -12 -32 -12h-694c-27.8043 1.85362 -47 18.2815 -47 47v345c0 28.9498 19.98 47 48 47z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C8-fermataVeryLongAbove.xml b/data/Leipzig/E4C8-fermataVeryLongAbove.xml
deleted file mode 100644
index 4b782485132..00000000000
--- a/data/Leipzig/E4C8-fermataVeryLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M391 204c36.8298 0 62.809 -23.1346 65 -56c0 -34.3531 -29.4543 -58 -65 -58c-32.6676 0 -59.0449 26.7191 -61 58c0 31.7398 28.9048 54.2169 61 56zM742 0c-28.0091 0 -48 18.0516 -48 47v297h-598v-297c0 -28.9412 -20.5747 -44.9673 -47 -47 c-28.0091 0 -48 18.0516 -48 47v345c0 28.7164 19.2113 45.1474 47 47h694c29.0826 0 45.1887 -19.8304 47 -47v-345c0 -28.9412 -20.5747 -44.9673 -47 -47zM139 271c0 17.9783 11.708 30 30 30h452s13 0 15 -1c13 -4 15 -19 15 -29v-239c0 -18.0353 -13.0788 -30 -30 -30 c-18.3958 0 -32 10.9571 -32 30v207h-388v-207c0 -18.5509 -13.5742 -30 -31 -30c-17.9071 0 -31 11.4604 -31 30v239z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C9-fermataVeryLongBelow.xml b/data/Leipzig/E4C9-fermataVeryLongBelow.xml
deleted file mode 100644
index ef2fd6ff5da..00000000000
--- a/data/Leipzig/E4C9-fermataVeryLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M391 -90c35.5551 0 65 -23.6372 65 -58c-2.19013 -32.852 -28.1797 -56 -65 -56c-32.1124 1.78402 -61 24.2367 -61 56c1.95528 31.2845 28.3265 58 61 58zM49 0c26.4253 -2.03272 47 -18.0628 47 -47v-297h598v297c0 28.9498 19.98 47 48 47 c26.4253 -2.03272 47 -18.0628 47 -47v-345c-1 -15 -6 -27 -15 -35c-6.89933 -6.89933 -18.9516 -12 -32 -12h-694c-27.8043 1.85362 -47 18.2815 -47 47v345c0 28.9498 19.98 47 48 47zM621 -2c16.9169 0 30 -11.9786 30 -30v-239c0 -10 -2 -25 -15 -29 c-2 -1 -15 -1 -15 -1h-452c-18.3027 0 -30 12.0274 -30 30v239c0 18.5509 13.0956 30 31 30c17.4146 0 31 -11.4604 31 -30v-207h388v207c0 19.0521 13.5999 30 32 30z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4CE-breathMarkComma.xml b/data/Leipzig/E4CE-breathMarkComma.xml
deleted file mode 100644
index d9884a7e448..00000000000
--- a/data/Leipzig/E4CE-breathMarkComma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 166l-12 -2h-8c-21 0 -37 7 -50 20s-19 29 -20 46c0 19 8 36 23 49c14 14 35 21 63 21c29 0 52 -10 69 -31s25 -46 25 -76c0 -20 -3 -39 -9 -58s-16 -38 -29 -57c-24 -35 -60 -61 -107 -78l-4 17c24 9 43 24 56 44s20 41 20 62c0 20 -6 34 -17 43z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E0-restMaxima.xml b/data/Leipzig/E4E0-restMaxima.xml
deleted file mode 100644
index 98b70b125fe..00000000000
--- a/data/Leipzig/E4E0-restMaxima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M250 -240v480c0 8 2 10 10 10h105c8 0 10 -2 10 -10v-480c0 -8 -2 -10 -10 -10h-105c-8 0 -10 2 -10 10zM0 -240v480c0 8 2 10 10 10h105c8 0 10 -2 10 -10v-480c0 -8 -2 -10 -10 -10h-105c-8 0 -10 2 -10 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E1-restLonga.xml b/data/Leipzig/E4E1-restLonga.xml
deleted file mode 100644
index fd440f3b392..00000000000
--- a/data/Leipzig/E4E1-restLonga.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -240v480c0 8 2 10 10 10h105c8 0 10 -2 10 -10v-480c0 -8 -2 -10 -10 -10h-105c-8 0 -10 2 -10 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E2-restDoubleWhole.xml b/data/Leipzig/E4E2-restDoubleWhole.xml
deleted file mode 100644
index 676c0e526ef..00000000000
--- a/data/Leipzig/E4E2-restDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v230c0 8 2 10 10 10h105c8 0 10 -2 10 -10v-230c0 -8 -2 -10 -10 -10h-105c-8 0 -10 2 -10 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E3-restWhole.xml b/data/Leipzig/E4E3-restWhole.xml
deleted file mode 100644
index d9749825ed1..00000000000
--- a/data/Leipzig/E4E3-restWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -115v105c0 9 1 10 10 10h280c9 0 10 -1 10 -10v-105c0 -9 -1 -10 -10 -10h-280c-9 0 -10 1 -10 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E4-restHalf.xml b/data/Leipzig/E4E4-restHalf.xml
deleted file mode 100644
index 3968014d39e..00000000000
--- a/data/Leipzig/E4E4-restHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v105c0 9 1 10 10 10h280c9 0 10 -1 10 -10v-105c0 -9 -1 -10 -10 -10h-280c-9 0 -10 1 -10 10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E5-restQuarter.xml b/data/Leipzig/E4E5-restQuarter.xml
deleted file mode 100644
index de94cab870f..00000000000
--- a/data/Leipzig/E4E5-restQuarter.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M107 292c-13 24 -30 49 -52 71c-1 1 0 2 0 3l-2 2c3 3 4 4 6 4c12 0 26 -7 40 -20s44 -40 89 -81c26 -24 28 -29 46 -47c4 -4 8 -9 10 -14c6 -8 8 -16 8 -27c0 -19 -12 -40 -36 -61c-28 -23 -49 -38 -61 -73c-4 -11 -7 -27 -10 -50c13 -43 34 -83 59 -121 c31 -47 59 -79 101 -129c-8 0 -26 7 -54 20l-62 29l-21 6l-23 1c-25 0 -45 -10 -60 -30l-4 -14l-1 -12c0 -33 20 -56 39 -78c8 -9 17 -18 26 -26c17 -15 27 -24 28 -30l-3 -3c-11 5 -19 10 -25 15c-9 3 -37 21 -45 26c-24 14 -45 32 -63 51c-19 21 -37 44 -37 71 c0 63 27 95 80 95c41 0 86 -18 136 -52c-19 26 -37 48 -55 66c-23 23 -48 44 -73 65c-28 23 -47 40 -58 53s-17 26 -18 39c75 64 113 125 113 183c0 27 -7 48 -18 68z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E6-rest8th.xml b/data/Leipzig/E4E6-rest8th.xml
deleted file mode 100644
index 83cc1834cb5..00000000000
--- a/data/Leipzig/E4E6-rest8th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 123c7 34 33 56 69 60c29 -3 43 -9 53 -29c4 -8 7 -15 10 -22c0 -21 -1 -25 -11 -35c-5 -8 -18 -14 -40 -20l12 -3l15 -1c44 0 97 26 122 56c10 11 18 26 24 42c7 1 15 2 22 3l-140 -424h-36l111 330c-10 -6 -27 -12 -53 -16l-52 -8h-10l-20 1c-1 0 -8 3 -21 6 c-37 9 -55 28 -55 60z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E7-rest16th.xml b/data/Leipzig/E4E7-rest16th.xml
deleted file mode 100644
index bee33381be1..00000000000
--- a/data/Leipzig/E4E7-rest16th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M133 -111c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 69 24 90 47l66 197c-36 -18 -64 -25 -112 -25c-23 0 -38 3 -45 8c-37 7 -55 27 -55 59c8 35 30 54 68 58c45 -6 49 -13 64 -48c0 -3 1 -5 1 -7c0 -27 -25 -46 -52 -49c6 -4 15 -6 26 -6c32 2 62 14 88 29 c32 19 44 36 59 71l7 1l10 2h4c-72 -220 -143 -439 -215 -659h-37l108 324c-20 -13 -51 -20 -82 -20c-21 0 -35 4 -43 10c-37 6 -55 26 -55 58c8 35 31 56 68 60c43 -8 48 -13 64 -51z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E8-rest32nd.xml b/data/Leipzig/E4E8-rest32nd.xml
deleted file mode 100644
index 2ef3182f0a6..00000000000
--- a/data/Leipzig/E4E8-rest32nd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M69 -54c44 -9 49 -10 63 -50c0 -14 -1 -24 -4 -29c-7 -11 -23 -20 -47 -26c6 -3 15 -4 25 -4c18 0 39 7 61 22c18 12 30 26 30 26l61 187c-22 -12 -48 -21 -81 -21c-18 0 -34 3 -46 9c-36 9 -54 29 -54 61c8 34 31 58 68 58c34 0 63 -24 63 -57c0 -11 -4 -21 -10 -30 c-4 -5 -16 -12 -39 -18c8 -3 16 -5 24 -5c35 0 71 25 88 45l66 198c-12 -11 -33 -12 -55 -17c-18 -4 -29 -8 -35 -8h-15l-28 2c-10 1 -17 3 -23 6c-37 7 -56 26 -56 59c9 33 33 59 72 59c33 0 53 -21 61 -49c0 -37 -17 -47 -51 -55c5 -4 13 -6 24 -6c14 0 29 3 45 8 c47 15 89 43 101 92l18 2l4 -1l-288 -889h-37l106 318c-17 -10 -43 -15 -72 -15c-22 0 -40 3 -52 9c-35 8 -55 23 -55 61c8 35 31 54 68 58z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E9-rest64th.xml b/data/Leipzig/E4E9-rest64th.xml
deleted file mode 100644
index 1e0d45115f9..00000000000
--- a/data/Leipzig/E4E9-rest64th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M270 413c40 0 56 -15 65 -47c-1 -39 -13 -49 -50 -57c3 -1 5 -2 7 -2s4 -1 6 -2l14 -1c28 1 57 10 85 26s49 41 63 73h6l7 4l7 -1c-78 -235 -154 -472 -231 -708c-10 -32 -21 -63 -32 -95c-36 -107 -71 -214 -107 -321h-34c36 108 70 218 108 324 c-27 -14 -47 -19 -84 -19c-20 0 -34 2 -43 7c-30 6 -55 24 -55 58c0 37 29 57 68 61c41 -8 51 -13 64 -49c0 -39 -16 -45 -51 -56c8 -3 16 -5 23 -5c30 0 60 15 90 46l63 189c-26 -14 -43 -19 -78 -19c-21 0 -34 5 -49 9c-34 9 -53 27 -53 58c0 35 29 55 68 60 c41 -8 51 -14 63 -51c0 -15 -1 -25 -5 -30c-6 -9 -22 -17 -45 -25c8 -3 16 -3 25 -3c39 2 65 22 89 46l61 187c-28 -12 -56 -18 -84 -18c-18 0 -32 3 -41 7c-37 7 -56 27 -56 61c10 35 33 54 69 58c45 -5 51 -12 64 -50c0 -37 -15 -44 -48 -55c8 -2 15 -3 23 -3 c41 0 67 25 91 50l62 191c-19 -10 -81 -24 -112 -24c-18 0 -34 1 -45 8c-36 8 -54 28 -54 60c0 33 33 58 66 58z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4EA-rest128th.xml b/data/Leipzig/E4EA-rest128th.xml
deleted file mode 100644
index 71ff81619f9..00000000000
--- a/data/Leipzig/E4EA-rest128th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 567c13 -3 15 -5 27 -5c28 0 57 10 89 28c28 16 52 40 61 74h8l9 2h6l-82 -247c-125 -385 -252 -769 -378 -1153h-35c36 112 72 224 109 335c-22 -13 -59 -19 -93 -19c-10 0 -16 -1 -18 0l-17 6c-39 8 -58 29 -58 62c8 35 31 56 70 62c41 -6 57 -15 67 -53 c-2 -39 -17 -45 -53 -57c7 -3 15 -3 25 -3c40 2 67 22 91 48l65 196c-21 -14 -46 -22 -78 -22c-23 0 -39 2 -52 9c-36 8 -54 28 -54 60c8 35 30 58 68 63c46 -5 51 -14 66 -52c0 -39 -18 -48 -53 -57c7 -2 17 -6 26 -6c40 2 66 22 93 48l62 197c-23 -16 -42 -21 -79 -21 c-13 1 -40 4 -49 8c-38 9 -57 30 -57 62c11 36 29 56 71 61c43 -8 52 -13 65 -51c0 -38 -17 -51 -53 -58c8 -3 17 -5 25 -5c37 1 77 28 94 50l64 194c-22 -16 -40 -20 -79 -20c-16 0 -28 0 -33 1l-18 7c-38 9 -57 30 -57 62c8 34 32 55 71 62c40 -8 53 -17 66 -53 c0 -40 -16 -49 -54 -57c11 -4 20 -5 29 -5c41 0 68 25 92 52l65 198c-26 -11 -82 -24 -119 -24c-22 0 -30 0 -44 7c-37 9 -56 29 -56 61c8 36 32 57 71 63c35 -3 66 -20 66 -56c0 -32 -23 -49 -52 -54z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4EB-rest256th.xml b/data/Leipzig/E4EB-rest256th.xml
deleted file mode 100644
index a3cdce24cad..00000000000
--- a/data/Leipzig/E4EB-rest256th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 -574c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 69 23 90 46c20 63 40 126 61 188c-22 -13 -59 -19 -93 -19c-10 0 -16 -1 -18 0l-17 6c-39 8 -58 29 -58 62c8 35 31 56 70 62c41 -6 57 -15 67 -53c-2 -39 -17 -45 -53 -57c7 -3 15 -3 25 -3c40 2 67 22 91 48 l65 196c-21 -14 -46 -22 -78 -22c-23 0 -39 2 -52 9c-36 8 -54 28 -54 60c8 35 30 58 68 63c46 -5 51 -14 66 -52c0 -39 -18 -48 -53 -57c7 -2 17 -6 26 -6c40 2 66 22 93 48l62 197c-23 -16 -42 -21 -79 -21c-13 1 -40 4 -49 8c-38 9 -57 30 -57 62c11 36 29 56 71 61 c43 -8 52 -13 65 -51c0 -38 -17 -51 -53 -58c8 -3 17 -5 25 -5c37 1 77 28 94 50l64 194c-22 -16 -40 -20 -79 -20c-16 0 -28 0 -33 1l-18 7c-38 9 -57 30 -57 62c8 34 32 55 71 62c40 -8 53 -17 66 -53c0 -40 -16 -49 -54 -57c11 -4 20 -5 29 -5c41 0 68 25 92 52l65 198 c-26 -11 -67 -26 -104 -26h-17c-8 0 -13 1 -27 5c-36 12 -56 33 -56 65c8 36 32 57 71 63c35 -3 66 -20 66 -56c0 -32 -23 -49 -52 -54c13 -3 15 -5 27 -5c28 0 42 10 74 28c28 16 52 40 61 74h8l9 2h6l-82 -247c-90 -277 -181 -553 -272 -829c0 -1 1 -1 1 -2l-179 -542 l-38 -1l108 324c-20 -13 -51 -20 -82 -20h-22c-9 0 -15 0 -20 4c-37 6 -56 32 -56 64c8 35 31 56 68 60c43 -8 48 -13 64 -51z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4EC-rest512th.xml b/data/Leipzig/E4EC-rest512th.xml
deleted file mode 100644
index bd832f7c49b..00000000000
--- a/data/Leipzig/E4EC-rest512th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 -574c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 69 23 90 46c20 63 40 126 61 188c-22 -13 -59 -19 -93 -19c-10 0 -16 -1 -18 0l-17 6c-39 8 -58 29 -58 62c8 35 31 56 70 62c41 -6 57 -15 67 -53c-2 -39 -17 -45 -53 -57c7 -3 15 -3 25 -3c40 2 67 22 91 48 l65 196c-21 -14 -46 -22 -78 -22c-23 0 -39 2 -52 9c-36 8 -54 28 -54 60c8 35 30 58 68 63c46 -5 51 -14 66 -52c0 -39 -18 -48 -53 -57c7 -2 17 -6 26 -6c40 2 66 22 93 48l62 197c-23 -16 -42 -21 -79 -21c-13 1 -40 4 -49 8c-38 9 -57 30 -57 62c11 36 29 56 71 61 c43 -8 52 -13 65 -51c0 -38 -17 -51 -53 -58c8 -3 17 -5 25 -5c37 1 77 28 94 50l64 194c-22 -16 -40 -20 -79 -20c-16 0 -28 0 -33 1l-18 7c-38 9 -57 30 -57 62c8 34 32 55 71 62c40 -8 53 -17 66 -53c0 -40 -16 -49 -54 -57c11 -4 20 -5 29 -5c41 0 68 25 92 52l34 108 c9 28 21 60 30 90c-26 -11 -64 -28 -101 -28h-12c-11 0 -16 1 -32 6c-36 12 -56 34 -56 66c8 36 32 57 71 63c35 -3 66 -20 66 -56c0 -32 -23 -49 -52 -54c13 -2 20 -6 30 -6c2 0 5 1 8 1c28 4 29 7 61 28c11 7 22 14 32 24l66 196c-10 -6 -27 -12 -53 -16l-52 -8h-10l-20 1 c-1 0 -8 3 -21 6c-37 9 -55 28 -55 60c7 34 33 56 69 60c29 -3 43 -9 53 -29c4 -8 7 -15 10 -22c0 -21 -1 -25 -11 -35c-5 -8 -18 -14 -40 -20l12 -3l15 -1c44 0 97 26 122 56c10 11 18 26 24 42c7 1 15 2 22 3l-140 -424h-1l-20 -61c-90 -277 -181 -553 -272 -829 c0 -1 1 -1 1 -2l-179 -542l-38 -1l108 324c-20 -13 -51 -20 -82 -20h-22c-9 0 -15 0 -20 4c-37 6 -56 32 -56 64c8 35 31 56 68 60c43 -8 48 -13 64 -51z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4ED-rest1024th.xml b/data/Leipzig/E4ED-rest1024th.xml
deleted file mode 100644
index c6dde38a6f4..00000000000
--- a/data/Leipzig/E4ED-rest1024th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 -574c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 69 23 90 46c20 63 40 126 61 188c-22 -13 -59 -19 -93 -19c-10 0 -16 -1 -18 0l-17 6c-39 8 -58 29 -58 62c8 35 31 56 70 62c41 -6 57 -15 67 -53c-2 -39 -17 -45 -53 -57c7 -3 15 -3 25 -3c40 2 67 22 91 48 l65 196c-21 -14 -46 -22 -78 -22c-23 0 -39 2 -52 9c-36 8 -54 28 -54 60c8 35 30 58 68 63c46 -5 51 -14 66 -52c0 -39 -18 -48 -53 -57c7 -2 17 -6 26 -6c40 2 66 22 93 48l62 197c-23 -16 -42 -21 -79 -21c-13 1 -40 4 -49 8c-38 9 -57 30 -57 62c11 36 29 56 71 61 c43 -8 52 -13 65 -51c0 -38 -17 -51 -53 -58c8 -3 17 -5 25 -5c37 1 77 28 94 50l64 194c-22 -16 -40 -20 -79 -20c-16 0 -28 0 -33 1l-18 7c-38 9 -57 30 -57 62c8 34 32 55 71 62c40 -8 53 -17 66 -53c0 -40 -16 -49 -54 -57c11 -4 20 -5 29 -5c41 0 68 25 92 52l35 106 h-1l31 92c-26 -11 -62 -26 -99 -26h-13c-13 0 -20 1 -31 6c-37 9 -56 32 -56 64c8 36 32 57 71 63c35 -3 57 -20 57 -56c0 -32 -14 -49 -43 -54c13 -3 16 -2 28 -2c28 0 36 7 68 25c12 7 23 15 33 25l62 187c-20 -13 -69 -25 -100 -25c-21 0 -35 1 -43 7 c-37 6 -55 34 -55 66c8 35 31 56 68 60c43 -8 48 -13 64 -51c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 87 24 108 47l66 197c-36 -18 -64 -25 -112 -25c-23 0 -38 3 -45 8c-37 7 -55 27 -55 59c8 35 30 54 68 58c45 -6 49 -13 64 -48c0 -3 1 -5 1 -7 c0 -27 -25 -46 -52 -49c6 -4 15 -6 26 -6c32 2 62 14 88 29c32 19 44 36 59 71l7 1l10 2h2c-74 -220 -148 -439 -216 -659c-5 -16 -13 -40 -20 -59c-90 -277 -180 -553 -271 -829c0 -1 1 -1 1 -2l-179 -542l-38 -1l108 324c-20 -13 -51 -20 -82 -20h-22c-9 0 -15 0 -20 4 c-37 6 -56 32 -56 64c8 35 31 56 68 60c43 -8 48 -13 64 -51z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4F2-restQuarterOld.xml b/data/Leipzig/E4F2-restQuarterOld.xml
deleted file mode 100644
index 710da4850e5..00000000000
--- a/data/Leipzig/E4F2-restQuarterOld.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 123c0 -32 -18 -51 -55 -60c-13 -3 -20 -6 -21 -6l-20 -1h-10l-52 8c-26 4 -43 10 -53 16l111 -330h-36l-140 424c7 -1 15 -2 22 -3c6 -16 14 -31 24 -42c25 -30 78 -56 122 -56l15 1l12 3c-22 6 -35 12 -40 20c-10 10 -11 14 -11 35c3 7 6 14 10 22 c10 20 24 26 53 29c36 -4 62 -26 69 -60z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4F6-restQuarterZ.xml b/data/Leipzig/E4F6-restQuarterZ.xml
deleted file mode 100644
index a30b330d267..00000000000
--- a/data/Leipzig/E4F6-restQuarterZ.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 123c0 -32 -18 -51 -55 -60c-13 -3 -20 -6 -21 -6l-20 -1h-10l-52 8c-26 4 -43 10 -53 16l211 -330h-28h-22l-2 7c-6 14 -13 27 -22 37c-25 30 -78 56 -122 56l-15 -1l-12 -3c22 -6 35 -12 40 -20c10 -10 11 -14 11 -35c-3 -7 -6 -14 -10 -22 c-10 -20 -24 -26 -53 -29c-36 4 -62 26 -69 60c0 32 18 51 55 60c13 3 20 6 21 6l20 1h10l52 -8c26 -4 43 -10 53 -16l-211 330h18h32l2 -7c6 -14 13 -27 22 -37c25 -30 78 -56 122 -56l15 1l12 3c-22 6 -35 12 -40 20c-10 10 -11 14 -11 35c3 7 6 14 10 22 c10 20 24 26 53 29c36 -4 62 -26 69 -60z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E500-repeat1Bar.xml b/data/Leipzig/E500-repeat1Bar.xml
deleted file mode 100644
index 9927ff9ac26..00000000000
--- a/data/Leipzig/E500-repeat1Bar.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M508 242l-362 -484h-146l362 484h146zM52 118c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33zM361 -121c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33 c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E501-repeat2Bars.xml b/data/Leipzig/E501-repeat2Bars.xml
deleted file mode 100644
index bd606f8362a..00000000000
--- a/data/Leipzig/E501-repeat2Bars.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33zM603 -121c0 13 4 25 13 34s19 14 32 15 c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E502-repeat4Bars.xml b/data/Leipzig/E502-repeat4Bars.xml
deleted file mode 100644
index 3abae54ead3..00000000000
--- a/data/Leipzig/E502-repeat4Bars.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1234 242l-362 -484h-146l362 484h146zM992 242l-362 -484h-146l362 484h146zM750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15 c-14 0 -26 4 -35 12s-14 19 -15 33zM1087 -121c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E503-repeatBarUpperDot.xml b/data/Leipzig/E503-repeatBarUpperDot.xml
deleted file mode 100644
index 65081725679..00000000000
--- a/data/Leipzig/E503-repeatBarUpperDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 118c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E504-repeatBarSlash.xml b/data/Leipzig/E504-repeatBarSlash.xml
deleted file mode 100644
index 93937e3589a..00000000000
--- a/data/Leipzig/E504-repeatBarSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M508 242l-362 -484h-146l362 484h146z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E505-repeatBarLowerDot.xml b/data/Leipzig/E505-repeatBarLowerDot.xml
deleted file mode 100644
index da3f0a977c0..00000000000
--- a/data/Leipzig/E505-repeatBarLowerDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -121c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E510-ottava.xml b/data/Leipzig/E510-ottava.xml
deleted file mode 100644
index 846530fecb6..00000000000
--- a/data/Leipzig/E510-ottava.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M86 180c-15 17 -25 40 -28 67c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58c0 -17 -6 -32 -17 -45s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60 c0 18 7 36 22 55c13 16 34 29 64 39zM98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18c17 0 29 4 38 12s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12 c7 -22 29 -48 64 -79z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E511-ottavaAlta.xml b/data/Leipzig/E511-ottavaAlta.xml
deleted file mode 100644
index f575e6fb906..00000000000
--- a/data/Leipzig/E511-ottavaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M584 213c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13 c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7c-15 0 -22 8 -22 25l1 12zM528 167c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8 c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM352 316c-11 -9 -21 -13 -32 -13l-6 1l-6 1l-17 4c-4 0 -6 -4 -6 -11c0 -3 -1 -5 -4 -6l-4 3l-2 2l-1 11l1 8l5 8c3 6 9 9 16 9h6h4l4 -1l6 -4l10 -5l13 -4 c5 0 9 1 13 4l1 3l4 11c3 7 6 12 11 13c3 -3 5 -6 5 -8l-2 -9c-5 -7 -9 -14 -12 -20s-7 -17 -14 -34l-9 -36l-3 -34l1 -15l4 -14c5 -10 13 -15 24 -15s23 6 34 17s22 32 32 61l4 24l2 24l-3 16l-1 20l2 16c2 4 6 6 11 7c5 0 9 -3 12 -9c1 -2 1 -5 2 -9s2 -9 3 -14l-2 -24 l-2 -11l-3 -11c-4 -18 -9 -33 -15 -46s-15 -26 -27 -40c-7 -10 -17 -18 -28 -24s-23 -9 -36 -9c-14 0 -25 4 -33 12s-12 19 -13 34c0 11 5 27 16 49zM86 180c-15 17 -25 40 -28 67c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58 c0 -17 -6 -32 -17 -45s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60c0 18 7 36 22 55c13 16 34 29 64 39zM98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18 c17 0 29 4 38 12s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12c7 -22 29 -48 64 -79z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E512-ottavaBassa.xml b/data/Leipzig/E512-ottavaBassa.xml
deleted file mode 100644
index 1a1e4b8e2e6..00000000000
--- a/data/Leipzig/E512-ottavaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M577 55c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13 c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7c-15 0 -22 8 -22 25l1 12zM521 9c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18 l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM345 163c-11 -9 -21 -13 -32 -13l-6 1l-6 1l-17 4c-4 0 -6 -4 -6 -11c0 -3 -1 -5 -4 -6l-4 3l-2 2l-1 11l1 8l5 8c3 6 9 9 16 9h6h4l4 -1l6 -4l10 -5l13 -4c5 0 9 1 13 4l1 3l4 11 c3 7 6 12 11 13c3 -3 5 -6 5 -8l-2 -9c-5 -7 -9 -14 -12 -20s-7 -17 -14 -34l-9 -36l-3 -34l1 -15l4 -14c5 -10 13 -15 24 -15s23 6 34 17s22 32 32 61l4 24l2 24l-3 16l-1 20l2 16c2 4 6 6 11 7c5 0 9 -3 12 -9c1 -2 1 -5 2 -9s2 -9 3 -14l-2 -24l-2 -11l-3 -11 c-4 -18 -9 -33 -15 -46s-15 -26 -27 -40c-7 -10 -17 -18 -28 -24s-23 -9 -36 -9c-14 0 -25 4 -33 12s-12 19 -13 34c0 11 5 27 16 49zM86 180c-15 17 -25 40 -28 67c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58c0 -17 -6 -32 -17 -45 s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60c0 18 7 36 22 55c13 16 34 29 64 39zM98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18c17 0 29 4 38 12 s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12c7 -22 29 -48 64 -79z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E513-ottavaBassaBa.xml b/data/Leipzig/E513-ottavaBassaBa.xml
deleted file mode 100644
index 414803ed0bf..00000000000
--- a/data/Leipzig/E513-ottavaBassaBa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M314 8l7 -1c18 0 36 19 53 57c14 32 21 60 21 83c0 19 -7 29 -20 29c-15 0 -32 -16 -50 -49c-8 -16 -15 -32 -20 -48c-5 -17 -7 -32 -7 -43c0 -15 5 -25 16 -28zM283 90l45 169l1 6l-2 9c-3 2 -8 3 -13 3h-11l3 9l61 8l-45 -156c11 17 21 30 31 37s20 11 29 12 c11 0 20 -5 28 -14s12 -24 12 -43c0 -5 0 -11 -1 -18s-3 -14 -6 -23c-5 -15 -13 -29 -23 -42c-22 -31 -48 -47 -78 -47l-13 2c-9 3 -16 7 -19 12c-5 5 -7 15 -7 28v11l2 10c1 6 1 10 2 11zM551 55c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37 c0 11 0 19 1 24s4 14 9 26s14 25 26 40c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14 s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7c-15 0 -22 8 -22 25l1 12zM495 9c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9z M86 180c-15 17 -25 40 -28 67c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58c0 -17 -6 -32 -17 -45s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60 c0 18 7 36 22 55c13 16 34 29 64 39zM98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18c17 0 29 4 38 12s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12 c7 -22 29 -48 64 -79z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E514-quindicesima.xml b/data/Leipzig/E514-quindicesima.xml
deleted file mode 100644
index 7d955f97bc1..00000000000
--- a/data/Leipzig/E514-quindicesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M108 41c0 -18 15 -22 33 -24l12 1l14 2l-5 -20h-159l5 20h19c15 0 25 1 29 3c5 4 9 11 12 21l52 211l1 5c-4 4 -7 6 -9 6l-53 1l5 20c17 0 34 3 51 9c19 5 35 12 50 22h12l-67 -266l-2 -6v-5zM224 137c-9 2 -11 2 -13 13c0 7 5 15 16 24c9 28 17 57 25 85l16 61l47 -9 c5 -1 13 -2 25 -2c5 -1 9 -1 14 -1c26 0 48 4 66 13l6 -4c-18 -32 -41 -51 -89 -51c-11 0 -49 6 -58 7l-26 -86c20 11 32 14 59 16c51 0 81 -33 81 -84c0 -31 -12 -60 -37 -87s-56 -40 -93 -40c-44 0 -83 24 -83 70c0 24 11 41 34 41c14 0 26 -13 26 -28c0 -7 -1 -11 -3 -13 l-16 -13l-8 -5l-2 -4c0 -18 25 -29 47 -29c21 0 40 10 59 30s28 47 29 81c0 37 -21 57 -55 57c-26 0 -33 -5 -46 -17c-3 -13 -7 -25 -21 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E515-quindicesimaAlta.xml b/data/Leipzig/E515-quindicesimaAlta.xml
deleted file mode 100644
index 40d33278b44..00000000000
--- a/data/Leipzig/E515-quindicesimaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M445 145l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16 c11 11 23 21 41 21c22 0 30 -16 30 -35c0 -39 -35 -96 -35 -125c0 -9 6 -18 16 -18c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -21 -44 -48 -44c-22 0 -32 9 -32 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -53 -36 -64 -69l-29 -87 c-1 -2 0 -3 0 -3h-25s-1 1 -1 2l39 116c3 8 3 14 3 20c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22v2zM853 196c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40 c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7 c-15 0 -22 8 -22 25l1 12zM797 150c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM108 41c0 -18 15 -22 33 -24l12 1 l14 2l-5 -20h-159l5 20h19c15 0 25 1 29 3c5 4 9 11 12 21l52 211l1 5c-4 4 -7 6 -9 6l-53 1l5 20c17 0 34 3 51 9c19 5 35 12 50 22h12l-67 -266l-2 -6v-5zM224 137c-9 2 -11 2 -13 13c0 7 5 15 16 24c9 28 17 57 25 85l16 61l47 -9c5 -1 13 -2 25 -2c5 -1 9 -1 14 -1 c26 0 48 4 66 13l6 -4c-18 -32 -41 -51 -89 -51c-11 0 -49 6 -58 7l-26 -86c20 11 32 14 59 16c51 0 81 -33 81 -84c0 -31 -12 -60 -37 -87s-56 -40 -93 -40c-44 0 -83 24 -83 70c0 24 11 41 34 41c14 0 26 -13 26 -28c0 -7 -1 -11 -3 -13l-16 -13l-8 -5l-2 -4 c0 -18 25 -29 47 -29c21 0 40 10 59 30s28 47 29 81c0 37 -21 57 -55 57c-26 0 -33 -5 -46 -17c-3 -13 -7 -25 -21 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E516-quindicesimaBassa.xml b/data/Leipzig/E516-quindicesimaBassa.xml
deleted file mode 100644
index bdfd714063e..00000000000
--- a/data/Leipzig/E516-quindicesimaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M435 2l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16 c11 11 23 21 41 21c22 0 30 -16 30 -35c0 -39 -35 -97 -35 -126c0 -9 6 -17 16 -17c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -21 -44 -48 -44c-22 0 -32 9 -32 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87 c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c-1 -2 0 -3 0 -3h-26v2zM843 56c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40 c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7 c-15 0 -22 8 -22 25l1 12zM787 10c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM108 41c0 -18 15 -22 33 -24l12 1l14 2 l-5 -20h-159l5 20h19c15 0 25 1 29 3c5 4 9 11 12 21l52 211l1 5c-4 4 -7 6 -9 6l-53 1l5 20c17 0 34 3 51 9c19 5 35 12 50 22h12l-67 -266l-2 -6v-5zM224 137c-9 2 -11 2 -13 13c0 7 5 15 16 24c9 28 17 57 25 85l16 61l47 -9c5 -1 13 -2 25 -2c5 -1 9 -1 14 -1 c26 0 48 4 66 13l6 -4c-18 -32 -41 -51 -89 -51c-11 0 -49 6 -58 7l-26 -86c20 11 32 14 59 16c51 0 81 -33 81 -84c0 -31 -12 -60 -37 -87s-56 -40 -93 -40c-44 0 -83 24 -83 70c0 24 11 41 34 41c14 0 26 -13 26 -28c0 -7 -1 -11 -3 -13l-16 -13l-8 -5l-2 -4 c0 -18 25 -29 47 -29c21 0 40 10 59 30s28 47 29 81c0 37 -21 57 -55 57c-26 0 -33 -5 -46 -17c-3 -13 -7 -25 -21 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E517-ventiduesima.xml b/data/Leipzig/E517-ventiduesima.xml
deleted file mode 100644
index bd8d734c9b1..00000000000
--- a/data/Leipzig/E517-ventiduesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11 c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28 c0 48 52 92 100 92zM410 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10 c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16 c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E518-ventiduesimaAlta.xml b/data/Leipzig/E518-ventiduesimaAlta.xml
deleted file mode 100644
index c21feabba35..00000000000
--- a/data/Leipzig/E518-ventiduesimaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M540 135l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16 c11 11 22 21 40 21c22 0 31 -16 31 -35c0 -39 -35 -96 -35 -125c0 -9 6 -18 16 -18c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -22 -44 -49 -44c-22 0 -31 9 -31 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87 c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22v2zM948 186c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40 c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7 c-15 0 -22 8 -22 25l1 12zM892 140c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM166 311c60 0 94 -21 94 -80 c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10 c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92z M410 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11 c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28 c0 48 52 92 100 92z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E519-ventiduesimaBassa.xml b/data/Leipzig/E519-ventiduesimaBassa.xml
deleted file mode 100644
index 735594bb080..00000000000
--- a/data/Leipzig/E519-ventiduesimaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M510 2l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16 c11 11 22 21 40 21c22 0 31 -16 31 -35c0 -39 -35 -97 -35 -126c0 -9 6 -17 16 -17c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -22 -44 -49 -44c-22 0 -31 9 -31 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87 c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22v2zM918 56c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40 c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7 c-15 0 -22 8 -22 25l1 12zM862 10c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM166 311c60 0 94 -21 94 -80 c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10 c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92z M410 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11 c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28 c0 48 52 92 100 92z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51A-octaveParensLeft.xml b/data/Leipzig/E51A-octaveParensLeft.xml
deleted file mode 100644
index 06b596de7b8..00000000000
--- a/data/Leipzig/E51A-octaveParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M115 -14v-9c0 -1 -1 -2 -1 -2h-2c-78 43 -112 104 -112 175s37 132 112 175c1 1 2 0 2 0s1 -2 1 -3v-8s-1 -3 -3 -5c-47 -34 -70 -81 -70 -159s26 -124 70 -160c3 -2 3 -2 3 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51B-octaveParensRight.xml b/data/Leipzig/E51B-octaveParensRight.xml
deleted file mode 100644
index b71c020c747..00000000000
--- a/data/Leipzig/E51B-octaveParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -14c0 2 0 2 3 4c44 36 70 82 70 160s-23 125 -70 159c-2 2 -3 5 -3 5v8c0 1 1 3 1 3h2c75 -43 112 -104 112 -175s-34 -132 -112 -175h-2s-1 1 -1 2v9z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51C-ottavaBassaVb.xml b/data/Leipzig/E51C-ottavaBassaVb.xml
deleted file mode 100644
index b0aea0d5e42..00000000000
--- a/data/Leipzig/E51C-ottavaBassaVb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M512 8l7 -1c18 0 36 19 53 57c14 32 21 60 21 83c0 19 -7 29 -20 29c-15 0 -32 -16 -50 -49c-8 -16 -15 -32 -20 -48c-5 -17 -7 -32 -7 -43c0 -15 5 -25 16 -28zM481 90l45 169l1 6l-2 9c-3 2 -8 3 -13 3h-11l3 9l61 8l-45 -156c11 17 21 30 31 37s20 11 29 12 c11 0 20 -5 28 -14s12 -24 12 -43c0 -5 0 -11 -1 -18s-3 -14 -6 -23c-5 -15 -13 -29 -23 -42c-22 -31 -48 -47 -78 -47l-13 2c-9 3 -16 7 -19 12c-5 5 -7 15 -7 28v11l2 10c1 6 1 10 2 11zM345 163c-11 -9 -21 -13 -32 -13l-6 1l-6 1l-17 4c-4 0 -6 -4 -6 -11 c0 -3 -1 -5 -4 -6l-4 3l-2 2l-1 11l1 8l5 8c3 6 9 9 16 9h6h4l4 -1l6 -4l10 -5l13 -4c5 0 9 1 13 4l1 3l4 11c3 7 6 12 11 13c3 -3 5 -6 5 -8l-2 -9c-5 -7 -9 -14 -12 -20s-7 -17 -14 -34l-9 -36l-3 -34l1 -15l4 -14c5 -10 13 -15 24 -15s23 6 34 17s22 32 32 61l4 24l2 24 l-3 16l-1 20l2 16c2 4 6 6 11 7c5 0 9 -3 12 -9c1 -2 1 -5 2 -9s2 -9 3 -14l-2 -24l-2 -11l-3 -11c-4 -18 -9 -33 -15 -46s-15 -26 -27 -40c-7 -10 -17 -18 -28 -24s-23 -9 -36 -9c-14 0 -25 4 -33 12s-12 19 -13 34c0 11 5 27 16 49zM86 180c-15 17 -25 40 -28 67 c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58c0 -17 -6 -32 -17 -45s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60c0 18 7 36 22 55c13 16 34 29 64 39z M98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18c17 0 29 4 38 12s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12c7 -22 29 -48 64 -79z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51D-quindicesimaBassaMb.xml b/data/Leipzig/E51D-quindicesimaBassaMb.xml
deleted file mode 100644
index 37abc267db8..00000000000
--- a/data/Leipzig/E51D-quindicesimaBassaMb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M776 8l7 -1c18 0 36 19 53 57c14 32 21 60 21 83c0 19 -7 29 -20 29c-15 0 -32 -16 -50 -49c-8 -16 -15 -32 -20 -48c-5 -17 -7 -32 -7 -43c0 -15 5 -25 16 -28zM745 90l45 169l1 6l-2 9c-3 2 -8 3 -13 3h-11l3 9l61 8l-45 -156c11 17 21 30 31 37s20 11 29 12 c11 0 20 -5 28 -14s12 -24 12 -43c0 -5 0 -11 -1 -18s-3 -14 -6 -23c-5 -15 -13 -29 -23 -42c-22 -31 -48 -47 -78 -47l-13 2c-9 3 -16 7 -19 12c-5 5 -7 15 -7 28v11l2 10c1 6 1 10 2 11zM435 2l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58 c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16c11 11 23 21 41 21c22 0 30 -16 30 -35c0 -39 -35 -97 -35 -126 c0 -9 6 -17 16 -17c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -21 -44 -48 -44c-22 0 -32 9 -32 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20 c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c-1 -2 0 -3 0 -3h-26v2zM108 41c0 -18 15 -22 33 -24l12 1l14 2l-5 -20h-159l5 20h19c15 0 25 1 29 3c5 4 9 11 12 21l52 211l1 5c-4 4 -7 6 -9 6l-53 1l5 20c17 0 34 3 51 9c19 5 35 12 50 22h12l-67 -266l-2 -6v-5z M224 137c-9 2 -11 2 -13 13c0 7 5 15 16 24c9 28 17 57 25 85l16 61l47 -9c5 -1 13 -2 25 -2c5 -1 9 -1 14 -1c26 0 48 4 66 13l6 -4c-18 -32 -41 -51 -89 -51c-11 0 -49 6 -58 7l-26 -86c20 11 32 14 59 16c51 0 81 -33 81 -84c0 -31 -12 -60 -37 -87s-56 -40 -93 -40 c-44 0 -83 24 -83 70c0 24 11 41 34 41c14 0 26 -13 26 -28c0 -7 -1 -11 -3 -13l-16 -13l-8 -5l-2 -4c0 -18 25 -29 47 -29c21 0 40 10 59 30s28 47 29 81c0 37 -21 57 -55 57c-26 0 -33 -5 -46 -17c-3 -13 -7 -25 -21 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51E-ventiduesimaBassaMb.xml b/data/Leipzig/E51E-ventiduesimaBassaMb.xml
deleted file mode 100644
index 0bcebe4e77b..00000000000
--- a/data/Leipzig/E51E-ventiduesimaBassaMb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M851 8l7 -1c18 0 36 19 53 57c14 32 21 60 21 83c0 19 -7 29 -20 29c-15 0 -32 -16 -50 -49c-8 -16 -15 -32 -20 -48c-5 -17 -7 -32 -7 -43c0 -15 5 -25 16 -28zM820 90l45 169l1 6l-2 9c-3 2 -8 3 -13 3h-11l3 9l61 8l-45 -156c11 17 21 30 31 37s20 11 29 12 c11 0 20 -5 28 -14s12 -24 12 -43c0 -5 0 -11 -1 -18s-3 -14 -6 -23c-5 -15 -13 -29 -23 -42c-22 -31 -48 -47 -78 -47l-13 2c-9 3 -16 7 -19 12c-5 5 -7 15 -7 28v11l2 10c1 6 1 10 2 11zM510 2l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58 c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16c11 11 22 21 40 21c22 0 31 -16 31 -35c0 -39 -35 -97 -35 -126 c0 -9 6 -17 16 -17c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -22 -44 -49 -44c-22 0 -31 9 -31 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20 c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22v2zM166 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28 c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14 c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92zM410 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26 l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31 c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E520-dynamicPiano.xml b/data/Leipzig/E520-dynamicPiano.xml
deleted file mode 100644
index 170fb7fd183..00000000000
--- a/data/Leipzig/E520-dynamicPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 124h-23c22 43 43 76 62 101s45 37 76 38c6 0 12 -4 18 -13c7 -7 10 -16 10 -27l24 14l25 13c12 5 24 7 37 7c24 0 43 -9 58 -28s22 -44 23 -77c0 -14 -1 -27 -3 -38s-5 -21 -10 -29s-11 -17 -19 -27c-14 -18 -30 -32 -47 -42s-35 -15 -54 -15c-9 0 -20 3 -33 10 c-5 3 -10 7 -15 10s-9 8 -13 14l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-9 0 -17 -4 -25 -12s-16 -18 -23 -31l-11 -17l-10 -20zM197 201c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62 c0 -24 7 -36 22 -36c13 0 23 2 31 7s15 11 21 20c10 17 15 26 16 28c5 11 8 26 10 44s3 31 4 39c0 7 -1 13 -2 18s-3 9 -6 14c-5 9 -15 14 -28 14c-14 0 -24 -5 -29 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E521-dynamicMezzo.xml b/data/Leipzig/E521-dynamicMezzo.xml
deleted file mode 100644
index 5b700da4f76..00000000000
--- a/data/Leipzig/E521-dynamicMezzo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M337 262c21 0 43 -14 43 -35v-7l-63 -183c0 -13 4 -20 12 -21c8 0 17 5 26 15s15 16 16 17c4 7 19 32 20 35l14 41h23l-24 -63c-8 -22 -31 -45 -44 -58s-29 -20 -46 -21c-18 0 -34 5 -49 14l-16 15c-3 7 -5 12 -5 17c20 63 44 124 65 186c0 7 -5 12 -15 13 c-16 0 -31 -15 -44 -45l-64 -182h-71l77 214c0 9 -6 13 -17 13c-9 0 -17 -4 -22 -11s-12 -19 -20 -34l-64 -182h-69l77 210v4c0 10 -5 12 -12 16c-25 0 -52 -47 -66 -73c-5 -9 -12 -23 -21 -42h-22c19 39 40 76 64 107c21 27 47 40 79 40c21 0 31 -19 34 -41 c19 17 34 27 45 32c11 6 24 9 39 9c21 0 32 -19 35 -41c22 17 49 41 85 41z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E522-dynamicForte.xml b/data/Leipzig/E522-dynamicForte.xml
deleted file mode 100644
index 620da5029d7..00000000000
--- a/data/Leipzig/E522-dynamicForte.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-91 -179c-2 -3 -3 -5 -2 -7s4 -3 11 -4c19 0 34 14 47 41c7 14 13 30 20 48s12 35 15 52l14 61l44 208h-58v38h70c7 21 13 36 18 47c7 18 15 33 22 44c21 30 42 53 65 69s48 24 75 24c9 0 17 -1 23 -3s12 -7 19 -16c5 -7 8 -13 9 -19l4 -16c0 -15 -1 -25 -2 -32 s-5 -16 -11 -28c-3 -6 -9 -13 -18 -21c-4 -3 -8 -5 -13 -6s-10 -1 -17 0c-6 1 -10 5 -13 11s-5 13 -6 20c0 12 2 23 7 32s12 17 22 24l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-5 -12 -10 -30 -17 -53s-11 -40 -14 -50h77v-40h-85 c-12 -69 -29 -137 -51 -206c-18 -55 -35 -99 -52 -131c-13 -26 -27 -47 -41 -63c-25 -29 -50 -43 -76 -43c-25 0 -43 10 -56 29c-10 15 -15 33 -15 54c0 17 4 33 12 48c5 7 10 13 17 17s13 6 20 6c9 0 16 -4 21 -12s9 -15 11 -22s3 -12 3 -17c0 -9 -2 -17 -7 -24 s-9 -14 -14 -21s-8 -12 -11 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E523-dynamicRinforzando.xml b/data/Leipzig/E523-dynamicRinforzando.xml
deleted file mode 100644
index 3442ac8214f..00000000000
--- a/data/Leipzig/E523-dynamicRinforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M194 174c-14 0 -23 12 -23 29l1 11l3 12c0 5 -3 7 -8 7c-13 0 -26 -10 -38 -31l-16 -32c-21 -54 -35 -113 -53 -170h-60l57 194v5c0 11 -3 16 -8 16c-15 0 -20 -9 -30 -21c-9 -11 -17 -23 -25 -36l-14 8c6 15 16 25 28 38c19 19 50 48 83 48c15 0 22 -9 22 -28 c-1 -7 -1 -14 -2 -21c16 24 39 56 74 56c21 0 40 -19 40 -40c0 -30 -10 -45 -31 -45z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E524-dynamicSforzando.xml b/data/Leipzig/E524-dynamicSforzando.xml
deleted file mode 100644
index 5d8d23f5736..00000000000
--- a/data/Leipzig/E524-dynamicSforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M81 33c21 0 38 15 40 34c0 7 -3 15 -8 22c-3 5 -9 11 -19 18c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4 c-17 0 -28 -17 -31 -36c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z " /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E525-dynamicZ.xml b/data/Leipzig/E525-dynamicZ.xml
deleted file mode 100644
index fa03c8bdf05..00000000000
--- a/data/Leipzig/E525-dynamicZ.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M173 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E526-dynamicNiente.xml b/data/Leipzig/E526-dynamicNiente.xml
deleted file mode 100644
index bc42be0ef81..00000000000
--- a/data/Leipzig/E526-dynamicNiente.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-39 115c2 2 19 36 24 43l41 70c19 17 14 17 25 22c11 6 36 12 51 12c21 0 32 -19 35 -41c22 17 49 41 85 41c21 0 43 -14 43 -35v-7l-63 -183c0 -13 4 -20 12 -21c8 0 17 5 26 15s15 16 16 17c4 7 19 32 20 35l14 41h23l-24 -63c-8 -22 -31 -45 -44 -58s-29 -20 -46 -21 c-18 0 -34 5 -49 14l-16 15c-3 7 -5 12 -5 17c20 63 44 124 65 186c0 7 -5 12 -15 13c-16 0 -31 -15 -44 -45l-64 -182h-71l77 214c0 9 -6 13 -17 13c-9 0 -17 -4 -22 -11s-47 -86 -55 -101h-22z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E527-dynamicPPPPPP.xml b/data/Leipzig/E527-dynamicPPPPPP.xml
deleted file mode 100644
index 6ff1a520766..00000000000
--- a/data/Leipzig/E527-dynamicPPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1762 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM1700 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6 l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43 l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26 c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87 c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40 l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78 c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38 c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM1462 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39zM1162 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM862 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14 c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM562 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39zM262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E528-dynamicPPPPP.xml b/data/Leipzig/E528-dynamicPPPPP.xml
deleted file mode 100644
index 32ccd476ec2..00000000000
--- a/data/Leipzig/E528-dynamicPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1462 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM1400 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6 l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43 l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26 c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38 c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7 c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94 c-23 -29 -55 -57 -101 -57zM1162 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM862 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14 c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM562 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39zM262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E529-dynamicPPPP.xml b/data/Leipzig/E529-dynamicPPPP.xml
deleted file mode 100644
index 92e21829719..00000000000
--- a/data/Leipzig/E529-dynamicPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1162 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM1100 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6 l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43 l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23 c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40 l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM862 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14 c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM562 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39zM262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52A-dynamicPPP.xml b/data/Leipzig/E52A-dynamicPPP.xml
deleted file mode 100644
index e23d2828d31..00000000000
--- a/data/Leipzig/E52A-dynamicPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM200 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38 c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4 c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57zM858 130c2 18 3 31 4 39c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72 c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72zM558 130c2 18 3 31 4 39c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52B-dynamicPP.xml b/data/Leipzig/E52B-dynamicPP.xml
deleted file mode 100644
index d5bde8f1eab..00000000000
--- a/data/Leipzig/E52B-dynamicPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M497 201c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c13 0 23 2 31 7s15 11 21 20c10 17 15 26 16 28c5 11 8 26 10 44s3 31 4 39c0 7 -1 13 -2 18s-3 9 -6 14c-5 9 -15 14 -28 14c-14 0 -24 -5 -29 -14zM197 201c-12 -21 -22 -45 -29 -72 c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c13 0 23 2 31 7s15 11 21 20c10 17 15 26 16 28c5 11 8 26 10 44s3 31 4 39c0 7 -1 13 -2 18s-3 9 -6 14c-5 9 -15 14 -28 14c-14 0 -24 -5 -29 -14zM23 124h-23c22 43 43 76 62 101s45 37 76 38c6 0 12 -4 18 -13 c7 -7 10 -16 10 -27l24 14l25 13c12 5 24 7 37 7c24 0 43 -9 58 -28c10 -13 18 -30 21 -50c11 18 21 33 31 46c19 25 45 37 76 38c6 0 12 -4 18 -13c7 -7 10 -16 10 -27l24 14l25 13c12 5 24 7 37 7c24 0 43 -9 58 -28s22 -44 23 -77c0 -14 -1 -27 -3 -38s-5 -21 -10 -29 s-11 -17 -19 -27c-14 -18 -30 -32 -47 -42s-35 -15 -54 -15c-9 0 -20 3 -33 10c-5 3 -10 7 -15 10s-9 8 -13 14l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-9 0 -17 -4 -25 -12s-16 -18 -23 -31l-11 -17l-10 -20 l-3 -6c0 -11 -1 -22 -3 -31c-2 -11 -5 -21 -10 -29s-11 -17 -19 -27c-14 -18 -30 -32 -47 -42s-35 -15 -54 -15c-9 0 -20 3 -33 10c-5 3 -10 7 -15 10s-9 8 -13 14l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3 c-9 0 -17 -4 -25 -12s-16 -18 -23 -31l-11 -17l-10 -20z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52C-dynamicMP.xml b/data/Leipzig/E52C-dynamicMP.xml
deleted file mode 100644
index 447ad216d0d..00000000000
--- a/data/Leipzig/E52C-dynamicMP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M605 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17l-10 -20c-13 -30 -25 -60 -37 -90c-9 -22 -31 -45 -44 -58s-29 -20 -46 -21c-18 0 -34 5 -49 14l-16 15 c-3 7 -5 12 -5 17c20 63 44 124 65 186c0 7 -5 12 -15 13c-16 0 -31 -15 -44 -45l-64 -182h-71l77 214c0 9 -6 13 -17 13c-9 0 -17 -4 -22 -11s-12 -19 -20 -34l-64 -182h-69l77 210v4c0 10 -5 12 -12 16c-25 0 -52 -47 -66 -73c-5 -9 -12 -23 -21 -42h-22 c19 39 40 76 64 107c21 27 47 40 79 40c21 0 31 -19 34 -41c19 17 34 27 45 32c11 6 24 9 39 9c21 0 32 -19 35 -41c22 17 49 41 85 41c21 0 43 -14 43 -35v-7l-63 -183c0 -13 4 -20 12 -21c8 0 17 5 26 15s15 16 16 17c4 7 19 32 20 35l27 65c22 43 30 52 49 77 s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM667 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36 c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52D-dynamicMF.xml b/data/Leipzig/E52D-dynamicMF.xml
deleted file mode 100644
index d71f9010298..00000000000
--- a/data/Leipzig/E52D-dynamicMF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M311 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71zM337 262c21 0 43 -14 43 -35v-7l-63 -183c0 -13 4 -20 12 -21c8 0 17 5 26 15s15 16 16 17c4 7 19 32 20 35l14 41h23l-24 -63c-8 -22 -31 -45 -44 -58s-29 -20 -46 -21c-18 0 -34 5 -49 14l-16 15c-3 7 -5 12 -5 17 c20 63 44 124 65 186c0 7 -5 12 -15 13c-16 0 -31 -15 -44 -45l-64 -182h-71l77 214c0 9 -6 13 -17 13c-9 0 -17 -4 -22 -11s-12 -19 -20 -34l-64 -182h-69l77 210v4c0 10 -5 12 -12 16c-25 0 -52 -47 -66 -73c-5 -9 -12 -23 -21 -42h-22c19 39 40 76 64 107 c21 27 47 40 79 40c21 0 31 -19 34 -41c19 17 34 27 45 32c11 6 24 9 39 9c21 0 32 -19 35 -41c22 17 49 41 85 41z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52E-dynamicPF.xml b/data/Leipzig/E52E-dynamicPF.xml
deleted file mode 100644
index 0ac6cdc403b..00000000000
--- a/data/Leipzig/E52E-dynamicPF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M239 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71zM200 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38 c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52F-dynamicFF.xml b/data/Leipzig/E52F-dynamicFF.xml
deleted file mode 100644
index 790202da673..00000000000
--- a/data/Leipzig/E52F-dynamicFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M555 376c0 -38 -19 -68 -50 -76c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 3 5 5 5 6l-6 9c-5 3 -10 5 -17 5c-37 0 -67 -52 -88 -156h75v-38h-83c-15 -93 -59 -250 -92 -318c-15 -31 -32 -58 -50 -80c-16 -21 -37 -36 -63 -43l-19 -2c-43 0 -66 40 -66 87 c0 39 18 53 44 67c24 0 38 -25 38 -49c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c7 29 13 59 20 89c13 61 26 121 39 182h-161c-14 -94 -56 -241 -94 -318c-33 -72 -69 -113 -110 -123l-18 -2c-21 0 -38 9 -49 26c-5 6 -10 15 -15 28c-2 12 -3 19 -4 33 c3 22 3 33 13 46c7 9 18 16 33 21c23 0 36 -26 37 -49c0 -11 -2 -17 -5 -23l-14 -23l-15 -19c0 -5 3 -7 10 -7c27 0 44 29 54 50l14 36l15 53c14 63 28 127 41 191l17 80h-57v38h70c20 67 51 121 103 159c25 17 52 25 83 25c33 0 49 -32 49 -66c0 -38 -18 -71 -51 -76 c-17 0 -26 11 -28 32c0 11 3 24 10 37c7 11 16 20 27 25c3 3 5 5 5 6c-7 10 -11 14 -25 14c-22 0 -40 -16 -54 -47s-25 -67 -33 -107h164c22 83 87 182 186 182c36 0 47 -31 49 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E530-dynamicFFF.xml b/data/Leipzig/E530-dynamicFFF.xml
deleted file mode 100644
index b79f4593013..00000000000
--- a/data/Leipzig/E530-dynamicFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M363 -69c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7c19 0 35 14 48 42c13 32 23 60 33 97c14 62 27 123 41 185l18 86h-140c-14 -89 -60 -256 -93 -318c-15 -31 -30 -57 -47 -79s-38 -37 -65 -44l-18 -2c-44 0 -67 40 -67 87 c0 39 18 53 45 67c6 0 11 -1 14 -4c15 -6 23 -25 23 -45c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21 89 40 181 59 271h-141c-13 -85 -62 -255 -93 -318c-33 -72 -70 -113 -110 -123l-19 -2c-35 0 -51 24 -63 54l-5 33c5 39 13 55 46 67 c23 0 38 -26 38 -49c0 -8 -2 -16 -6 -23l-14 -23l-14 -19c0 -5 3 -7 10 -7c11 0 21 5 30 15c18 15 26 46 37 71l15 53c17 77 34 155 50 233c3 13 6 26 9 38h-57v38h69c9 33 23 62 40 89c17 28 38 51 63 70c25 17 53 25 83 25c33 0 49 -30 49 -66c0 -38 -19 -70 -50 -76 c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9c-5 3 -11 5 -18 5c-23 0 -41 -16 -55 -48s-25 -67 -32 -106h144c23 84 85 182 185 182c36 0 47 -31 49 -66c0 -18 -4 -35 -13 -51c-8 -12 -20 -20 -37 -25c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 0 5 2 5 6 c-4 10 -11 14 -23 14c-37 0 -67 -52 -88 -156h144c15 49 39 93 72 132c31 36 69 54 114 54c34 0 49 -36 49 -70c0 -37 -19 -68 -51 -74c-16 0 -25 11 -27 32c0 26 18 52 35 62c4 0 6 2 6 6c-5 9 -11 14 -24 14c-37 0 -67 -52 -88 -156h76v-38h-85c-7 -44 -15 -84 -26 -121 c-18 -75 -39 -141 -66 -197c-15 -28 -31 -55 -50 -79c-16 -21 -36 -36 -61 -44l-18 -2c-35 0 -53 23 -62 54c-4 10 -6 21 -6 33c4 37 15 57 46 67z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E531-dynamicFFFF.xml b/data/Leipzig/E531-dynamicFFFF.xml
deleted file mode 100644
index e87dd2ed584..00000000000
--- a/data/Leipzig/E531-dynamicFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M132 -69c25 0 37 -24 37 -49c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21 89 40 181 59 271h-141c-13 -85 -62 -255 -93 -318c-33 -72 -70 -113 -110 -123l-19 -2c-35 0 -51 24 -63 54l-5 33c5 39 13 55 46 67c23 0 38 -26 38 -49c0 -8 -2 -16 -6 -23 l-14 -23l-14 -19c0 -5 3 -7 10 -7c11 0 21 5 30 15c18 15 26 46 37 71l15 53c17 77 34 155 50 233c3 13 6 26 9 38h-57v38h69c18 66 55 123 103 159c25 17 53 25 83 25c33 0 49 -30 49 -66c0 -38 -19 -70 -50 -76c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9 c-5 3 -11 5 -18 5c-23 0 -41 -16 -55 -48s-25 -67 -32 -106h144c23 84 85 182 185 182c36 0 47 -31 49 -66c0 -18 -4 -35 -13 -51c-8 -12 -20 -20 -37 -25c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 0 5 2 5 6c-4 10 -11 14 -23 14c-37 0 -67 -52 -88 -156h144 c15 49 39 93 72 132c31 36 69 54 114 54c34 0 49 -36 49 -70c0 -37 -19 -68 -51 -74c-16 0 -25 11 -27 32c0 26 18 52 35 62c4 0 6 2 6 6c-5 9 -11 14 -24 14c-37 0 -67 -52 -88 -156h146c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16 c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-143c-7 -44 -15 -84 -26 -121c-18 -75 -39 -141 -66 -197c-15 -28 -31 -55 -50 -79 c-16 -21 -36 -36 -61 -44l-18 -2c-35 0 -53 23 -62 54c-4 10 -6 21 -6 33c4 37 15 57 46 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7c19 0 35 14 48 42c13 32 23 60 33 97c14 62 27 123 41 185l18 86h-140 c-14 -89 -60 -256 -93 -318c-15 -31 -30 -57 -47 -79s-38 -37 -65 -44l-18 -2c-44 0 -67 40 -67 87c0 39 18 53 45 67z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E532-dynamicFFFFF.xml b/data/Leipzig/E532-dynamicFFFFF.xml
deleted file mode 100644
index 1630b3ae700..00000000000
--- a/data/Leipzig/E532-dynamicFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M782 -140c0 32 15 71 49 71c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c19 0 34 14 47 41s28 67 35 100l14 61l44 208h-144c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71 c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-143c-7 -44 -15 -84 -26 -121c-18 -75 -39 -141 -66 -197c-26 -48 -56 -105 -111 -123l-18 -2c-35 0 -53 23 -62 54c-4 10 -6 21 -6 33 c4 37 15 57 46 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7c19 0 35 14 48 42c13 32 23 60 33 97c14 62 27 123 41 185l18 86h-140c-14 -89 -60 -256 -93 -318c-15 -31 -30 -57 -47 -79s-38 -37 -65 -44l-18 -2 c-44 0 -67 40 -67 87c0 39 18 53 45 67c6 0 11 -1 14 -4c15 -6 23 -25 23 -45c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21 89 40 181 59 271h-141c-13 -85 -62 -255 -93 -318c-33 -72 -70 -113 -110 -123l-19 -2c-35 0 -51 24 -63 54l-5 33 c5 39 13 55 46 67c23 0 38 -26 38 -49c0 -8 -2 -16 -6 -23l-14 -23l-14 -19c0 -5 3 -7 10 -7c11 0 21 5 30 15c18 15 26 46 37 71l15 53c17 77 34 155 50 233c3 13 6 26 9 38h-57v38h69c18 66 55 123 103 159c25 17 53 25 83 25c33 0 49 -30 49 -66c0 -38 -19 -70 -50 -76 c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9c-5 3 -11 5 -18 5c-23 0 -41 -16 -55 -48s-25 -67 -32 -106h144c23 84 85 182 185 182c36 0 47 -31 49 -66c0 -18 -4 -35 -13 -51c-8 -12 -20 -20 -37 -25c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 0 5 2 5 6 c-4 10 -11 14 -23 14c-37 0 -67 -52 -88 -156h144c15 49 39 93 72 132c31 36 69 54 114 54c34 0 49 -36 49 -70c0 -37 -19 -68 -51 -74c-16 0 -25 11 -27 32c0 26 18 52 35 62c4 0 6 2 6 6c-5 9 -11 14 -24 14c-37 0 -67 -52 -88 -156h146c13 38 23 65 40 91 c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -86 -31 -105h148 c7 21 13 36 18 47c20 48 53 89 87 113c23 16 48 24 75 24c9 0 17 -1 23 -3c11 -4 25 -22 28 -35l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8 c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E533-dynamicFFFFFF.xml b/data/Leipzig/E533-dynamicFFFFFF.xml
deleted file mode 100644
index d308fe7bdf8..00000000000
--- a/data/Leipzig/E533-dynamicFFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1014 -140c0 32 15 71 49 71c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c19 0 34 14 47 41s28 67 35 100l14 61l44 208h-144c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71 c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-143c-7 -44 -15 -84 -26 -121c-18 -75 -39 -141 -66 -197c-26 -48 -56 -105 -111 -123l-18 -2c-35 0 -53 23 -62 54c-4 10 -6 21 -6 33 c4 37 15 57 46 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7c19 0 35 14 48 42c13 32 23 60 33 97c14 62 27 123 41 185l18 86h-140c-14 -89 -60 -256 -93 -318c-15 -31 -30 -57 -47 -79s-38 -37 -65 -44l-18 -2 c-44 0 -67 40 -67 87c0 39 18 53 45 67c6 0 11 -1 14 -4c15 -6 23 -25 23 -45c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21 89 40 181 59 271h-141c-13 -85 -62 -255 -93 -318c-33 -72 -70 -113 -110 -123l-19 -2c-35 0 -51 24 -63 54l-5 33 c5 39 13 55 46 67c23 0 38 -26 38 -49c0 -8 -2 -16 -6 -23l-14 -23l-14 -19c0 -5 3 -7 10 -7c11 0 21 5 30 15c18 15 26 46 37 71l15 53c17 77 34 155 50 233c3 13 6 26 9 38h-60h-81c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83 c0 32 15 71 49 71c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-30 -21 -48 -103 -60 -148h70h80c9 33 18 62 35 89c17 28 38 51 63 70c25 17 53 25 83 25c33 0 49 -30 49 -66c0 -38 -19 -70 -50 -76 c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9c-5 3 -11 5 -18 5c-23 0 -41 -16 -55 -48s-25 -67 -32 -106h144c23 84 85 182 185 182c36 0 47 -31 49 -66c0 -18 -4 -35 -13 -51c-8 -12 -20 -20 -37 -25c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 0 5 2 5 6 c-4 10 -11 14 -23 14c-37 0 -67 -52 -88 -156h144c15 49 39 93 72 132c31 36 69 54 114 54c34 0 49 -36 49 -70c0 -37 -19 -68 -51 -74c-16 0 -25 11 -27 32c0 26 18 52 35 62c4 0 6 2 6 6c-5 9 -11 14 -24 14c-37 0 -67 -52 -88 -156h146c13 38 23 65 40 91 c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -86 -31 -105h148 c7 21 13 36 18 47c20 48 53 89 87 113c23 16 48 24 75 24c9 0 17 -1 23 -3c11 -4 25 -22 28 -35l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8 c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E534-dynamicFortePiano.xml b/data/Leipzig/E534-dynamicFortePiano.xml
deleted file mode 100644
index a80c797c036..00000000000
--- a/data/Leipzig/E534-dynamicFortePiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M432 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13 c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM494 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z M-94 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E535-dynamicForzando.xml b/data/Leipzig/E535-dynamicForzando.xml
deleted file mode 100644
index 48b9e2b43ec..00000000000
--- a/data/Leipzig/E535-dynamicForzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M405 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM-94 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85 c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E536-dynamicSforzando1.xml b/data/Leipzig/E536-dynamicSforzando1.xml
deleted file mode 100644
index 7ffa7279a4a..00000000000
--- a/data/Leipzig/E536-dynamicSforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71z M81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36 c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E537-dynamicSforzandoPiano.xml b/data/Leipzig/E537-dynamicSforzandoPiano.xml
deleted file mode 100644
index e6de2b9692e..00000000000
--- a/data/Leipzig/E537-dynamicSforzandoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M628 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13 c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM690 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z M100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71z M81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36 c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E538-dynamicSforzandoPianissimo.xml b/data/Leipzig/E538-dynamicSforzandoPianissimo.xml
deleted file mode 100644
index 2e626cf6548..00000000000
--- a/data/Leipzig/E538-dynamicSforzandoPianissimo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M990 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM690 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72 c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM628 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17 c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 72 -35 79 -78c25 41 51 83 107 84c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94 c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-4 -9 -9 -17 -13 -26c-1 -43 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57zM100 -69 c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 54 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -24 13 -28 32c0 27 11 44 29 56l14 10c0 12 -10 16 -22 16c-11 0 -24 -4 -30 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71z M81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36 c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E539-dynamicSforzato.xml b/data/Leipzig/E539-dynamicSforzato.xml
deleted file mode 100644
index 8be6dbbaa7d..00000000000
--- a/data/Leipzig/E539-dynamicSforzato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M601 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337 c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10 c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4 c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E53A-dynamicSforzatoPiano.xml b/data/Leipzig/E53A-dynamicSforzatoPiano.xml
deleted file mode 100644
index 57eb85118d0..00000000000
--- a/data/Leipzig/E53A-dynamicSforzatoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M888 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13 c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM950 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z M601 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337 c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10 c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4 c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E53B-dynamicSforzatoFF.xml b/data/Leipzig/E53B-dynamicSforzatoFF.xml
deleted file mode 100644
index 9140f459219..00000000000
--- a/data/Leipzig/E53B-dynamicSforzatoFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M833 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM334 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85 c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70 c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85 c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10 c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9 l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E53C-dynamicRinforzando1.xml b/data/Leipzig/E53C-dynamicRinforzando1.xml
deleted file mode 100644
index 17f2ae5f1db..00000000000
--- a/data/Leipzig/E53C-dynamicRinforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71zM194 174c-14 0 -23 12 -23 29l1 11l3 12c0 5 -3 7 -8 7c-13 0 -26 -10 -38 -31l-16 -32c-21 -54 -35 -113 -53 -170h-60l57 194v5c0 11 -3 16 -8 16c-15 0 -20 -9 -30 -21c-9 -11 -17 -23 -25 -36l-14 8c6 15 16 25 28 38 c19 19 50 48 83 48c15 0 22 -9 22 -28c-1 -7 -1 -14 -2 -21c16 24 39 56 74 56c21 0 40 -19 40 -40c0 -30 -10 -45 -31 -45z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E53D-dynamicRinforzando2.xml b/data/Leipzig/E53D-dynamicRinforzando2.xml
deleted file mode 100644
index 9e4da21abe3..00000000000
--- a/data/Leipzig/E53D-dynamicRinforzando2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M630 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM131 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85 c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM194 174c-14 0 -23 12 -23 29l1 11l3 12c0 5 -3 7 -8 7c-13 0 -26 -10 -38 -31l-16 -32c-21 -54 -35 -113 -53 -170h-60l57 194v5c0 11 -3 16 -8 16c-15 0 -20 -9 -30 -21 c-9 -11 -17 -23 -25 -36l-14 8c6 15 16 25 28 38c19 19 50 48 83 48c15 0 22 -9 22 -28c-1 -7 -1 -14 -2 -21c16 24 39 56 74 56c21 0 40 -19 40 -40c0 -30 -10 -45 -31 -45z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E566-ornamentTrill.xml b/data/Leipzig/E566-ornamentTrill.xml
deleted file mode 100644
index 37ed1cbaa60..00000000000
--- a/data/Leipzig/E566-ornamentTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 167l-36 -115l-1 -10c0 -10 5 -16 16 -19c32 18 48 43 48 75c0 20 -9 43 -27 69zM432 225c0 -21 -11 -36 -31 -37c-15 0 -20 10 -23 25l3 14l2 11l1 9l-4 4c-1 -1 -2 -1 -3 -1c-23 -13 -36 -24 -47 -48l-12 -27c-18 -50 -31 -105 -47 -157h-60l58 214c0 7 -3 5 -5 9 c-7 0 -25 -8 -51 -28l-37 -28c20 -34 31 -67 31 -97c0 -12 -1 -21 -4 -28l-6 -15c-1 -3 -5 -10 -12 -19c-14 -18 -30 -26 -49 -26c-30 0 -67 18 -67 52c1 1 1 6 3 15l20 84c-9 -5 -21 -8 -36 -8c-21 0 -29 7 -40 19c-10 12 -16 27 -16 47c0 23 6 33 17 45s25 18 46 18 c19 0 39 -8 60 -25l34 117h63l-46 -158l38 31l32 20c21 10 35 13 62 15c16 0 24 -7 24 -21l-1 -10l-6 -24c21 37 44 55 70 55c23 0 39 -23 39 -47zM18 208c0 -27 17 -47 45 -47l3 -2l13 4l23 9l14 55c-17 15 -35 22 -55 22c-26 0 -43 -17 -43 -41z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E567-ornamentTurn.xml b/data/Leipzig/E567-ornamentTurn.xml
deleted file mode 100644
index a35e81d788a..00000000000
--- a/data/Leipzig/E567-ornamentTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M468 118c0 -69 -38 -116 -106 -118c-23 0 -44 5 -63 15c-21 13 -45 32 -64 49c-23 24 -46 47 -69 70c-16 14 -31 25 -45 33s-26 12 -37 13c-20 0 -28 -14 -37 -28l-12 -26c-3 -9 -5 -16 -5 -19v-8c0 -29 13 -43 40 -43l9 2l11 9l7 7c6 4 14 8 24 8c17 0 28 -9 33 -28 c0 -34 -27 -53 -58 -54h-5c-18 0 -22 0 -36 8c-33 14 -55 54 -55 97c0 50 21 87 49 114c18 15 36 23 55 25c26 0 51 -7 75 -21c9 -5 15 -9 18 -11l18 -15c9 -7 25 -22 33 -31l65 -67l10 -9l22 -16c13 -7 26 -11 37 -11c37 0 55 36 55 70c0 28 -12 55 -39 55 c-6 -2 -11 -5 -17 -9l-18 -13c-3 -3 -9 -4 -18 -4c-19 0 -30 17 -32 37c0 28 28 42 58 44c43 0 70 -31 85 -62c8 -16 12 -36 12 -58v-5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E568-ornamentTurnInverted.xml b/data/Leipzig/E568-ornamentTurnInverted.xml
deleted file mode 100644
index 6b02d1b62ce..00000000000
--- a/data/Leipzig/E568-ornamentTurnInverted.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M468 126v-5c0 -22 -4 -42 -12 -58c-15 -31 -42 -62 -85 -62c-30 2 -58 16 -58 44c2 20 13 37 32 37c9 0 15 -1 18 -4l18 -13c6 -4 11 -7 17 -9c27 0 39 27 39 55c0 34 -18 70 -55 70c-11 0 -24 -4 -37 -11l-22 -16l-10 -9l-65 -67c-8 -9 -24 -24 -33 -31l-18 -15 c-3 -2 -9 -6 -18 -11c-24 -14 -49 -21 -75 -21c-19 2 -37 10 -55 25c-28 27 -49 64 -49 114c0 43 22 83 55 97c14 8 18 8 36 8h5c31 -1 58 -20 58 -54c-5 -19 -16 -28 -33 -28c-10 0 -18 4 -24 8l-7 7l-11 9l-9 2c-27 0 -40 -14 -40 -43v-8c0 -3 2 -10 5 -19l12 -26 c9 -14 17 -28 37 -28c11 1 23 5 37 13s29 19 45 33c23 23 46 46 69 70c19 17 43 36 64 49c19 10 40 15 63 15c68 -2 106 -49 106 -118z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E569-ornamentTurnSlash.xml b/data/Leipzig/E569-ornamentTurnSlash.xml
deleted file mode 100644
index b99dc40e1ea..00000000000
--- a/data/Leipzig/E569-ornamentTurnSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M468 118c0 -69 -38 -116 -106 -118c-23 0 -44 5 -63 15c-16 10 -34 23 -50 37v-133h-30v162l-53 53c-16 14 -31 25 -45 33s-26 12 -37 13c-20 0 -28 -14 -37 -28l-12 -26c-3 -9 -5 -16 -5 -19v-8c0 -29 13 -43 40 -43l9 2l11 9l7 7c6 4 14 8 24 8c17 0 28 -9 33 -28 c0 -34 -27 -53 -58 -54h-5c-18 0 -22 0 -36 8c-33 14 -55 54 -55 97c0 50 21 87 49 114c18 15 36 23 55 25c26 0 51 -7 75 -21c9 -5 15 -9 18 -11l18 -15c1 -1 3 -2 4 -3v125h30v-154l64 -66l10 -9l22 -16c13 -7 26 -11 37 -11c37 0 55 36 55 70c0 28 -12 55 -39 55 c-6 -2 -11 -5 -17 -9l-18 -13c-3 -3 -9 -4 -18 -4c-19 0 -30 17 -32 37c0 28 28 42 58 44c43 0 70 -31 85 -62c8 -16 12 -36 12 -58v-5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56A-ornamentTurnUp.xml b/data/Leipzig/E56A-ornamentTurnUp.xml
deleted file mode 100644
index bcf05ddb10f..00000000000
--- a/data/Leipzig/E56A-ornamentTurnUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M126 468c69 0 116 -38 118 -106c0 -23 -5 -44 -15 -63c-13 -21 -32 -45 -49 -64c-24 -23 -47 -46 -70 -69c-14 -16 -25 -31 -33 -45s-12 -26 -13 -37c0 -20 14 -28 28 -37l26 -12c9 -3 16 -5 19 -5h8c29 0 43 13 43 40l-2 9l-9 11l-7 7c-4 6 -8 14 -8 24c0 17 9 28 28 33 c34 0 53 -27 54 -58c0 -23 0 -26 -8 -41c-14 -33 -54 -55 -97 -55c-50 0 -87 21 -114 49c-15 18 -23 36 -25 55c0 26 7 51 21 75c5 9 9 15 11 18l15 18c7 9 22 25 31 33l67 65l9 10l16 22c7 13 11 26 11 37c0 37 -36 55 -70 55c-28 0 -55 -12 -55 -39c2 -6 5 -11 9 -17 l13 -18c3 -3 4 -9 4 -18c0 -19 -17 -30 -37 -32c-28 0 -42 28 -44 58c0 43 31 70 62 85c16 8 35 12 58 12h5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56B-ornamentTurnUpS.xml b/data/Leipzig/E56B-ornamentTurnUpS.xml
deleted file mode 100644
index 4943a8a0b55..00000000000
--- a/data/Leipzig/E56B-ornamentTurnUpS.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M118 468h5c23 0 42 -4 58 -12c31 -15 62 -42 62 -85c-2 -30 -16 -58 -44 -58c-20 2 -37 13 -37 32c0 9 1 15 4 18l13 18c4 6 7 11 9 17c0 27 -27 39 -55 39c-34 0 -70 -18 -70 -55c0 -11 4 -24 11 -37l16 -22l9 -10l67 -65c9 -8 24 -24 31 -33l15 -18c2 -3 6 -9 11 -18 c14 -24 21 -49 21 -75c-2 -19 -10 -37 -25 -55c-27 -28 -64 -49 -114 -49c-43 0 -83 22 -97 55c-8 15 -8 18 -8 41c1 31 20 58 54 58c19 -5 28 -16 28 -33c0 -10 -4 -18 -8 -24l-7 -7l-9 -11l-2 -9c0 -27 14 -40 43 -40h8c3 0 10 2 19 5l26 12c14 9 28 17 28 37 c-1 11 -5 23 -13 37s-19 29 -33 45c-23 23 -46 46 -70 69c-17 19 -36 43 -49 64c-10 19 -15 40 -15 63c2 68 49 106 118 106z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56C-ornamentShortTrill.xml b/data/Leipzig/E56C-ornamentShortTrill.xml
deleted file mode 100644
index 2f1176fee1b..00000000000
--- a/data/Leipzig/E56C-ornamentShortTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10 c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56D-ornamentMordent.xml b/data/Leipzig/E56D-ornamentMordent.xml
deleted file mode 100644
index 8d4a5fc58ad..00000000000
--- a/data/Leipzig/E56D-ornamentMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l121 143c4 4 8 7 11 9s7 3 11 4c5 0 13 -6 25 -17l107 -94v184h30v-159l58 69c11 13 19 20 23 20l24 -16l84 -75l31 -25c3 1 7 5 13 12l14 15l34 44v-55l-106 -125c-8 -11 -16 -16 -23 -16c-3 1 -5 3 -7 4c-6 4 -12 9 -18 14l-78 70c-14 14 -25 21 -34 21l-5 -2 l-5 -5l-5 -6v-184h-30v149l-36 -45c-10 -11 -18 -16 -24 -16l-7 2l-10 8l-10 8l-88 80c-7 7 -14 11 -20 13c-3 0 -9 -4 -17 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56E-ornamentTremblement.xml b/data/Leipzig/E56E-ornamentTremblement.xml
deleted file mode 100644
index 8b4070d51db..00000000000
--- a/data/Leipzig/E56E-ornamentTremblement.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M710 134l-109 -127c-3 -3 -5 -5 -7 -6l-6 -2c-5 2 -9 4 -10 5l-89 78c-5 5 -10 7 -17 8c-4 -1 -7 -3 -8 -4l-66 -79c-3 -5 -8 -8 -13 -8l-11 5l-89 78c-6 5 -11 7 -16 8c-4 -1 -7 -3 -8 -4l-67 -79c-5 -5 -10 -8 -14 -8c-2 0 -5 2 -10 5l-88 78c-5 5 -11 7 -17 8 c-5 -1 -7 -3 -8 -4l-57 -68v49l108 127l10 4c1 0 2 0 4 -1s6 -3 12 -7l88 -78l10 -5c4 0 9 3 14 8l67 79c3 3 6 4 8 4c5 0 10 -3 16 -8l89 -78l11 -5l6 1l7 7l67 79c3 3 6 4 7 4c4 -1 7 -3 8 -4l7 -6l89 -77c3 -3 7 -5 11 -5s8 3 13 8l58 67v-47z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56F-ornamentHaydn.xml b/data/Leipzig/E56F-ornamentHaydn.xml
deleted file mode 100644
index ab45bc1f8a6..00000000000
--- a/data/Leipzig/E56F-ornamentHaydn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 55c0 35 19 128 112 128c45 0 89 -20 123 -41v148h30v-168c1 -1 3 -2 4 -3l24 -18c28 -21 67 -51 97 -51c35 0 65 53 74 82c6 20 10 45 22 45c10 0 14 -13 14 -32c0 -35 -14 -144 -110 -144h-3c-11 0 -55 4 -122 46v-154h-30v176l-3 2c-15 11 -86 63 -120 63 c-35 0 -75 -24 -75 -87v-7c0 -12 -2 -36 -15 -36c-19 0 -22 32 -22 51z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E583-ornamentVerticalLine.xml b/data/Leipzig/E583-ornamentVerticalLine.xml
deleted file mode 100644
index eaabecf03f2..00000000000
--- a/data/Leipzig/E583-ornamentVerticalLine.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E583" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v330h26v-330h-26z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E587-ornamentSchleifer.xml b/data/Leipzig/E587-ornamentSchleifer.xml
deleted file mode 100644
index fb209b4b6b1..00000000000
--- a/data/Leipzig/E587-ornamentSchleifer.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l11 6l80 93l18 10h1c5 0 9 -2 12 -6l105 -93c5 -4 10 -8 16 -12c135 102 189 145 262 175c121 49 188 68 207 68c4 0 6 0 6 -2c0 -9 -64 -42 -183 -86c-88 -45 -200 -137 -333 -269l-6 -7c-9 -7 -16 -10 -20 -10 h-1c-3 0 -7 2 -10 6l-105 94c-6 5 -12 7 -19 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10h-1c-3 0 -7 2 -10 6v1l-104 93c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E59D-ornamentZigZagLineNoRightEnd.xml b/data/Leipzig/E59D-ornamentZigZagLineNoRightEnd.xml
deleted file mode 100644
index e64269c3b2f..00000000000
--- a/data/Leipzig/E59D-ornamentZigZagLineNoRightEnd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 17v47l129 120c6 5 9 8 19 8c5 0 10 -3 13 -5c0 0 53 -38 142 -102c3 -2 3 -2 3 -6s-7 -10 -7 -10c-22 -21 -44 -42 -67 -63c-7 -6 -9 -6 -19 -6c-5 0 -7 1 -10 3l-105 75c-8 6 -8 6 -18 6c-5 0 -8 -2 -12 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E59E-ornamentZigZagLineWithRightEnd.xml b/data/Leipzig/E59E-ornamentZigZagLineWithRightEnd.xml
deleted file mode 100644
index f68ea5ce1ac..00000000000
--- a/data/Leipzig/E59E-ornamentZigZagLineWithRightEnd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 17v47l129 120c6 5 9 8 19 8c5 0 10 -3 13 -5l103 -74s7 -6 13 -7h2c9 0 14 4 14 4l82 74v-51l-143 -127c-7 -6 -9 -6 -19 -6c-5 0 -9 2 -13 5l-102 73c-8 6 -10 6 -18 6c-4 0 -6 -1 -12 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B0-ornamentPrecompSlide.xml b/data/Leipzig/E5B0-ornamentPrecompSlide.xml
deleted file mode 100644
index fc45adb1d2a..00000000000
--- a/data/Leipzig/E5B0-ornamentPrecompSlide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 6 -8 8 -5c112 117 270 143 367 143c50 0 85 -7 88 -12c0 0 -7 1 -19 1c-69 0 -316 -18 -484 -253c-5 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94 c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B1-ornamentPrecompDescendingSlide.xml b/data/Leipzig/E5B1-ornamentPrecompDescendingSlide.xml
deleted file mode 100644
index e345832025c..00000000000
--- a/data/Leipzig/E5B1-ornamentPrecompDescendingSlide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l26 30c7 10 17 24 33 42c5 7 6 9 16 15c2 1 3 1 5 1c16 0 30 -45 47 -77c56 -102 174 -276 356 -278c15 0 20 -10 20 -15c0 -9 -14 -15 -20 -15 h-20c-217 0 -381 233 -428 261l-95 -93c-8 -8 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B2-ornamentPrecompAppoggTrill.xml b/data/Leipzig/E5B2-ornamentPrecompAppoggTrill.xml
deleted file mode 100644
index 13727ead5fe..00000000000
--- a/data/Leipzig/E5B2-ornamentPrecompAppoggTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 400zM30 115l99 115l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h1h3c3 -1 6 -2 7 -4l2 -2l105 -93l17 -10l12 6l68 80v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6 l-105 94c-6 5 -13 7 -20 7c-3 0 -6 0 -8 -2l-81 -95c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-39 -45l-30 -36v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5 l-68 -81v379h30v-285z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B3-ornamentPrecompAppoggTrillSuffix.xml b/data/Leipzig/E5B3-ornamentPrecompAppoggTrillSuffix.xml
deleted file mode 100644
index 2679aafa0f6..00000000000
--- a/data/Leipzig/E5B3-ornamentPrecompAppoggTrillSuffix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 400zM30 115l99 115l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l118 130c121 128 172 254 191 254c7 0 9 -15 9 -51c0 -27 -378 -462 -378 -462c-7 -9 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94 c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81v379h30v-285z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B4-ornamentPrecompTurnTrillDAnglebert.xml b/data/Leipzig/E5B4-ornamentPrecompTurnTrillDAnglebert.xml
deleted file mode 100644
index fbe33766e1b..00000000000
--- a/data/Leipzig/E5B4-ornamentPrecompTurnTrillDAnglebert.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M646 240h4c3 -1 6 -2 7 -4c35 -32 71 -63 107 -95l17 -10l11 6l80 93l18 10h1c5 0 9 -2 12 -6l105 -93l9 -7l7 -5c6 5 12 9 17 13l64 48c80 60 125 91 181 114c121 49 188 68 207 68c4 0 6 0 6 -2c0 -9 -64 -42 -183 -86c-88 -45 -200 -137 -333 -269l-6 -7 c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -5 0 -7 -2l-81 -95c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6h-1c-3 0 -7 2 -10 6l-105 94c-5 4 -12 7 -19 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94 c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -27 -29 -36 -52 -63l-25 -18c-11 -8 -26 -11 -45 -11c-76 0 -197 61 -201 164v10c0 80 101 157 189 169c0 0 13 1 14 1c20 0 27 -15 24 -12h-1c-15 0 -203 -63 -203 -155v-1c0 -28 6 -43 24 -63c34 -38 73 -65 140 -65 c20 0 36 8 62 23c50 44 90 99 135 149l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B5-ornamentPrecompSlideTrillDAnglebert.xml b/data/Leipzig/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
deleted file mode 100644
index 938f0243ac0..00000000000
--- a/data/Leipzig/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 102l-5 5c-16 15 -35 60 -94 60c-49 0 -88 -45 -100 -60c-39 -48 -80 -116 -80 -179c0 -89 60 -141 60 -141c72 -68 192 -82 241 -82h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2h-7c-34 0 -89 1 -150 26c-102 42 -154 111 -158 214v5 c0 120 167 345 287 345h2c64 -1 97 -34 121 -60l16 -14l1 1c2 -3 5 -5 7 -8l58 -51l17 -10l10 5l81 94l17 10h2c5 0 9 -2 12 -6l105 -93l3 -2l13 -8l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-5 -7 -16 -10 -20 -10 c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-2 0 -4 0 -6 -1l-82 -96c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-1 1 -3 2 -4 3c-5 3 -10 4 -15 4c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-1 1 -2 2 -2 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B6-ornamentPrecompSlideTrillMarpurg.xml b/data/Leipzig/E5B6-ornamentPrecompSlideTrillMarpurg.xml
deleted file mode 100644
index 65fe1f11ece..00000000000
--- a/data/Leipzig/E5B6-ornamentPrecompSlideTrillMarpurg.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 102l-5 5c-16 15 -35 60 -94 60c-49 0 -88 -45 -100 -60c-39 -48 -80 -116 -80 -179c0 -89 60 -141 60 -141c72 -68 192 -82 241 -82h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2h-7c-34 0 -89 1 -150 26c-102 42 -154 111 -158 214v5 c0 120 167 345 287 345h2c64 -1 97 -34 121 -60l16 -14l1 1c2 -3 5 -5 7 -8l58 -51l17 -10l10 5l81 94l17 10h2c5 0 9 -2 12 -6l105 -93l3 -2l13 -8l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c102 72 250 125 250 204c0 20 -2 37 -30 67 c-113 121 -135 139 -135 150c0 2 2 0 5 0c23 0 105 -48 185 -145c24 -29 17 -44 20 -65c0 -3 1 -6 1 -10c0 -96 -215 -188 -344 -322c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-2 0 -4 0 -6 -1l-82 -96c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6 l-105 94c-1 1 -3 2 -4 3c-5 3 -10 4 -15 4c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-1 1 -2 2 -2 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B7-ornamentPrecompTurnTrillBach.xml b/data/Leipzig/E5B7-ornamentPrecompTurnTrillBach.xml
deleted file mode 100644
index c296166b25d..00000000000
--- a/data/Leipzig/E5B7-ornamentPrecompTurnTrillBach.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M598 98c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -27 -29 -36 -52 -63l-25 -18c-11 -8 -26 -11 -45 -11c-76 0 -197 61 -201 164v10c0 80 101 157 189 169 c0 0 13 1 14 1c20 0 27 -15 24 -12h-1c-15 0 -203 -63 -203 -155v-1c0 -28 6 -43 24 -63c34 -38 73 -65 140 -65c20 0 36 8 62 23c50 44 90 99 135 149l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h4c3 -1 6 -2 7 -4c35 -32 71 -63 107 -95l17 -10l12 6l72 86 c5 5 9 9 15 11l11 6c5 0 9 -2 12 -6l105 -93l9 -7l2 -1v176h30v-158c6 7 11 13 17 20l39 46c10 12 21 22 25 22l24 -16l84 -75l31 -25c3 1 7 5 13 12l14 15l34 44v-55l-106 -125c-8 -11 -16 -16 -23 -16c-10 3 -17 12 -25 18l-78 70c-14 14 -25 21 -34 21l-4 -2l-11 -13 v-182h-30v147c-12 -14 -24 -28 -36 -43c-10 -11 -18 -16 -24 -16h-2c-5 0 -11 7 -15 10c-28 23 -54 49 -81 73l-19 17c-5 4 -12 7 -20 7c-4 0 -6 -1 -8 -2l-81 -95c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B8-ornamentPrecompSlideTrillBach.xml b/data/Leipzig/E5B8-ornamentPrecompSlideTrillBach.xml
deleted file mode 100644
index 075612b711a..00000000000
--- a/data/Leipzig/E5B8-ornamentPrecompSlideTrillBach.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 102l-5 5c-16 15 -35 60 -94 60c-49 0 -88 -45 -100 -60c-39 -48 -80 -116 -80 -179c0 -89 60 -141 60 -141c72 -68 192 -82 241 -82h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2h-7c-34 0 -89 1 -150 26c-102 42 -154 111 -158 214v5 c0 120 167 345 287 345h2c64 -1 97 -34 121 -60l16 -14l1 1c2 -3 5 -5 7 -8l58 -51l17 -10l10 5l81 94l17 10h2c5 0 9 -2 12 -6l105 -93v178h30v-180l78 91l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-5 -7 -16 -10 -20 -10 c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-2 0 -4 0 -6 -1l-21 -25v-160h-30v125l-31 -36c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-1 1 -3 2 -4 3c-5 3 -10 4 -15 4c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-1 1 -2 2 -2 4z " /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B9-ornamentPrecompSlideTrillMuffat.xml b/data/Leipzig/E5B9-ornamentPrecompSlideTrillMuffat.xml
deleted file mode 100644
index 9633e0185a6..00000000000
--- a/data/Leipzig/E5B9-ornamentPrecompSlideTrillMuffat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M129 -217c-33 -23 -71 -32 -98 -32c-18 0 -31 5 -31 11c0 8 19 19 68 29c122 24 345 392 430 439l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c135 102 189 145 262 175c121 49 188 68 207 68c4 0 6 0 6 -2 c0 -9 -64 -42 -183 -86c-89 -46 -204 -140 -340 -276c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-123 -133 -118 -186 -308 -319z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml b/data/Leipzig/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml
deleted file mode 100644
index b96d4a78f41..00000000000
--- a/data/Leipzig/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-240 -217c-33 -23 -71 -32 -98 -32c-18 0 -31 5 -31 11c0 8 19 19 68 29c122 24 345 392 430 439l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c102 72 250 125 250 204c0 20 -2 37 -30 67 c-113 121 -135 139 -135 150c0 2 2 0 5 0c23 0 105 -48 185 -145c24 -29 17 -44 20 -65c0 -3 1 -6 1 -10c0 -96 -215 -188 -344 -322c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6 l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-123 -133 -118 -186 -308 -319z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BB-ornamentPrecompTrillSuffixDandrieu.xml b/data/Leipzig/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
deleted file mode 100644
index d031eb42bce..00000000000
--- a/data/Leipzig/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l10 5l81 94l17 10h2c5 0 9 -2 12 -6l105 -93l3 -2l13 -8l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c102 72 250 125 250 204c0 20 -2 37 -30 67c-113 121 -135 139 -135 150c0 2 2 0 5 0 c23 0 105 -48 185 -145c24 -29 17 -44 20 -65c0 -3 1 -6 1 -10c0 -96 -215 -188 -344 -322c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-2 0 -4 0 -6 -1l-82 -96c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-1 1 -3 2 -4 3c-5 3 -10 4 -15 4 c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BC-ornamentPrecompPortDeVoixMordent.xml b/data/Leipzig/E5BC-ornamentPrecompPortDeVoixMordent.xml
deleted file mode 100644
index 478e0c6f80d..00000000000
--- a/data/Leipzig/E5BC-ornamentPrecompPortDeVoixMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M768 240h4c3 -1 6 -2 7 -4c1 0 1 -1 2 -2l105 -93v168h30v-171l67 79v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 -1 -8 -2l-20 -23v-171h-30v135 l-31 -36c-2 -1 -4 -3 -5 -4c-6 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -26 -43 -52 -65 -77c0 15 -1 19 -3 25 c-15 52 -100 158 -187 158c-9 0 -18 -1 -27 -4c-50 -14 -135 -205 -158 -205c-4 0 -6 5 -6 17c0 1 59 233 183 233c59 0 178 -38 226 -132l98 113l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BD-ornamentPrecompTrillWithMordent.xml b/data/Leipzig/E5BD-ornamentPrecompTrillWithMordent.xml
deleted file mode 100644
index 8d12c034d84..00000000000
--- a/data/Leipzig/E5BD-ornamentPrecompTrillWithMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l11 5l73 87c5 5 9 9 15 11l11 6c5 0 9 -2 12 -6l105 -93l9 -7l2 -1v176h30v-158c19 23 39 45 58 68c11 13 19 20 23 20l24 -16l84 -75l31 -25c3 1 7 5 13 12l14 15l34 44v-55l-106 -125c-8 -11 -16 -16 -23 -16 c-10 3 -17 12 -25 18l-78 70c-14 14 -25 21 -34 21l-4 -2l-11 -13v-182h-30v147c-12 -14 -24 -28 -36 -43c-10 -11 -18 -16 -24 -16h-2c-5 0 -11 7 -15 10c-35 29 -67 61 -101 91c-6 4 -12 6 -19 6c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10 c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BE-ornamentPrecompCadence.xml b/data/Leipzig/E5BE-ornamentPrecompCadence.xml
deleted file mode 100644
index b1f1308ad3c..00000000000
--- a/data/Leipzig/E5BE-ornamentPrecompCadence.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M378 50c-17 57 -98 186 -215 186c-31 0 -91 -6 -141 -45c0 0 -12 -7 -18 -7c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 47 61 174 61c55 0 174 -53 224 -152l98 113l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8 l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -26 -43 -52 -65 -77c0 15 -3 19 -3 25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BF-ornamentPrecompCadenceWithTurn.xml b/data/Leipzig/E5BF-ornamentPrecompCadenceWithTurn.xml
deleted file mode 100644
index 6efcf1a4861..00000000000
--- a/data/Leipzig/E5BF-ornamentPrecompCadenceWithTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M378 50c-17 57 -98 186 -215 186c-31 0 -91 -6 -141 -45c0 0 -12 -7 -18 -7c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 47 61 174 61c55 0 174 -53 224 -152l98 113l17 10c7 0 11 -2 12 -6l106 -93v179h30v-182l79 92l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8 l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-19 -22v-160h-30v125l-32 -37c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -26 -43 -52 -65 -77c0 15 -3 19 -3 25z " /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml b/data/Leipzig/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
deleted file mode 100644
index be891810af2..00000000000
--- a/data/Leipzig/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M378 50c-17 57 -98 186 -215 186c-31 0 -91 -6 -141 -45c0 0 -12 -7 -18 -7c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 47 61 174 61c55 0 174 -53 224 -152l98 113l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h1h3c3 -1 6 -2 7 -4c1 0 1 -1 2 -2l105 -93l17 -10 l12 6l68 80v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 -1 -8 -2l-81 -95c-2 -1 -4 -3 -5 -4c-6 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94 c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-39 -45l-30 -36v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -26 -43 -52 -65 -77c0 15 -3 19 -3 25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C1-ornamentPrecompCadenceUpperPrefix.xml b/data/Leipzig/E5C1-ornamentPrecompCadenceUpperPrefix.xml
deleted file mode 100644
index 87cd06a8c07..00000000000
--- a/data/Leipzig/E5C1-ornamentPrecompCadenceUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 87c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 92 -152 185 -152c4 0 10 -1 15 0c65 11 102 43 172 125c50 56 98 113 147 170l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150 c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81c-34 -41 -86 -110 -190 -111c-104 0 -182 112 -209 177z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml b/data/Leipzig/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml
deleted file mode 100644
index f1828043385..00000000000
--- a/data/Leipzig/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 87c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 92 -152 185 -152c4 0 10 -1 15 0c65 11 102 43 172 125c50 56 98 113 147 170l17 10c7 0 11 -2 12 -6l106 -93l16 -9v178h30v-153l63 73l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150 c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-3 -3v-189h-30v154l-48 -56c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81c-34 -41 -86 -110 -190 -111c-104 0 -182 112 -209 177z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml b/data/Leipzig/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
deleted file mode 100644
index e0eeb43657b..00000000000
--- a/data/Leipzig/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 87c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 92 -152 185 -152c4 0 10 -1 15 0c65 11 102 43 172 125c50 56 98 113 147 170l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h1c6 0 9 -3 12 -6l105 -93l17 -10l12 6l68 80v-1l12 14l18 10c5 0 9 -2 12 -6 l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 -1 -8 -2l-81 -95c-5 -4 -14 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14 c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81c-34 -41 -86 -110 -190 -111c-104 0 -182 112 -209 177z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml b/data/Leipzig/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml
deleted file mode 100644
index 5b4c68317e1..00000000000
--- a/data/Leipzig/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 87c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 92 -152 185 -152c4 0 10 -1 15 0c65 11 102 43 172 125c50 56 98 113 147 170l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h1c6 0 9 -3 12 -6l105 -93l16 -9v178h30v-153l51 60v-1l12 14l18 10 c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 -1 -8 -2l-4 -5v-188h-30v153l-47 -55c-5 -4 -14 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3 l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81c-34 -41 -86 -110 -190 -111c-104 0 -182 112 -209 177z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C5-ornamentPrecompMordentRelease.xml b/data/Leipzig/E5C5-ornamentPrecompMordentRelease.xml
deleted file mode 100644
index fe0bd76fe7a..00000000000
--- a/data/Leipzig/E5C5-ornamentPrecompMordentRelease.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c102 72 250 125 250 204c0 20 -2 37 -30 67c-113 121 -135 139 -135 150c0 2 2 0 5 0c23 0 105 -48 185 -145c24 -29 17 -44 20 -65 c0 -3 1 -6 1 -10c0 -96 -215 -188 -344 -322c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C6-ornamentPrecompMordentUpperPrefix.xml b/data/Leipzig/E5C6-ornamentPrecompMordentUpperPrefix.xml
deleted file mode 100644
index bf5009f17f2..00000000000
--- a/data/Leipzig/E5C6-ornamentPrecompMordentUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 71zM646 240h4c3 -1 6 -2 7 -4c35 -32 71 -63 107 -95l17 -10l12 6l68 80v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 0 -8 -2l-81 -95 c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -27 -45 -54 -68 -81h-9c-105 0 -241 25 -246 153v10 c0 77 63 141 92 182c0 0 5 2 6 2c0 -1 0 -4 -2 -8c-4 -14 -74 -85 -74 -164c0 -28 7 -53 25 -73c34 -38 72 -58 139 -58c20 0 43 2 69 6l30 44l99 115l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml b/data/Leipzig/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
deleted file mode 100644
index 08f16c4f618..00000000000
--- a/data/Leipzig/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 71zM646 240h4c3 -1 6 -2 7 -4c35 -32 71 -63 107 -95v179h30v-182l67 79v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 0 -8 -2l-20 -23v-160h-30 v124l-31 -36c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -27 -45 -54 -68 -81h-9 c-105 0 -241 25 -246 153v10c0 77 63 141 92 182c0 0 5 2 6 2c0 -1 0 -4 -2 -8c-4 -14 -74 -85 -74 -164c0 -28 7 -53 25 -73c34 -38 72 -58 139 -58c20 0 43 2 69 6l30 44l99 115l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C8-ornamentPrecompTrillLowerSuffix.xml b/data/Leipzig/E5C8-ornamentPrecompTrillLowerSuffix.xml
deleted file mode 100644
index 92dd0a738c2..00000000000
--- a/data/Leipzig/E5C8-ornamentPrecompTrillLowerSuffix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80c1 2 3 3 6 3c22 0 90 -73 103 -102c27 -59 42 -84 42 -133c0 -12 -1 -26 -3 -42c-11 -101 -101 -186 -200 -186c-46 0 -95 16 -101 22 c-4 4 -6 14 -6 15l10 -3c30 -8 67 -18 97 -18c68 0 144 74 144 134v9c0 75 -16 119 -44 153c-25 31 -56 57 -68 66l-108 -127c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94 c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5E5-brassMuteClosed.xml b/data/Leipzig/E5E5-brassMuteClosed.xml
deleted file mode 100644
index 33f7599e87b..00000000000
--- a/data/Leipzig/E5E5-brassMuteClosed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 152h-152v26h152v152h26v-152h152v-26h-152v-152h-26v152z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5E6-brassMuteHalfClosed.xml b/data/Leipzig/E5E6-brassMuteHalfClosed.xml
deleted file mode 100644
index 1e0294918f2..00000000000
--- a/data/Leipzig/E5E6-brassMuteHalfClosed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 165c0 106 59 165 165 165s165 -59 165 -165s-59 -165 -165 -165s-165 59 -165 165zM28 152c4 -77 47 -120 124 -124v124h-124zM178 28c77 4 120 47 124 124h-124v-124zM178 178h124c-4 77 -47 120 -124 124v-124zM28 178h124v124c-77 -4 -120 -47 -124 -124z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5E7-brassMuteOpen.xml b/data/Leipzig/E5E7-brassMuteOpen.xml
deleted file mode 100644
index 306dd0f0241..00000000000
--- a/data/Leipzig/E5E7-brassMuteOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 165c0 106 59 165 165 165s165 -59 165 -165s-59 -165 -165 -165s-165 59 -165 165zM28 165c0 -90 47 -137 137 -137s137 47 137 137s-47 137 -137 137s-137 -47 -137 -137z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E610-stringsDownBow.xml b/data/Leipzig/E610-stringsDownBow.xml
deleted file mode 100644
index ea9ed89a9b8..00000000000
--- a/data/Leipzig/E610-stringsDownBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 240h310v-240h-33v116h-244v-116h-33v240z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E611-stringsDownBowTurned.xml b/data/Leipzig/E611-stringsDownBowTurned.xml
deleted file mode 100644
index 0fce7c493ab..00000000000
--- a/data/Leipzig/E611-stringsDownBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v240h33v-116h244v116h33v-240h-310z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E612-stringsUpBow.xml b/data/Leipzig/E612-stringsUpBow.xml
deleted file mode 100644
index cc7ecc4067d..00000000000
--- a/data/Leipzig/E612-stringsUpBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M283 338l-141 -338l-142 338h38l104 -248l104 248h37z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E613-stringsUpBowTurned.xml b/data/Leipzig/E613-stringsUpBowTurned.xml
deleted file mode 100644
index 1bd6751f8ca..00000000000
--- a/data/Leipzig/E613-stringsUpBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M283 0h-37l-104 248l-104 -248h-38l142 338z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E614-stringsHarmonic.xml b/data/Leipzig/E614-stringsHarmonic.xml
deleted file mode 100644
index f8dc3a258ed..00000000000
--- a/data/Leipzig/E614-stringsHarmonic.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 103c0 57 46 103 103 103s103 -46 103 -103s-46 -103 -103 -103s-103 46 -103 103zM28 103c0 -41 34 -75 75 -75s75 34 75 75s-34 75 -75 75s-75 -34 -75 -75z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E630-pluckedSnapPizzicatoBelow.xml b/data/Leipzig/E630-pluckedSnapPizzicatoBelow.xml
deleted file mode 100644
index 80eb9d72db3..00000000000
--- a/data/Leipzig/E630-pluckedSnapPizzicatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 163c0 57 46 103 103 103s103 -46 103 -103c0 -53 -39 -96 -90 -102v-61h-26v61c-51 6 -90 49 -90 102zM116 89c35 6 62 37 62 74c0 41 -34 75 -75 75s-75 -34 -75 -75c0 -37 27 -68 62 -74v81h26v-81z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E631-pluckedSnapPizzicatoAbove.xml b/data/Leipzig/E631-pluckedSnapPizzicatoAbove.xml
deleted file mode 100644
index d709748615e..00000000000
--- a/data/Leipzig/E631-pluckedSnapPizzicatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 103c0 53 39 96 90 102v61h26v-61c51 -6 90 -49 90 -102c0 -57 -46 -103 -103 -103s-103 46 -103 103zM116 177v-81h-26v81c-35 -6 -62 -37 -62 -74c0 -41 34 -75 75 -75s75 34 75 75c0 37 -27 68 -62 74z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E632-pluckedBuzzPizzicato.xml b/data/Leipzig/E632-pluckedBuzzPizzicato.xml
deleted file mode 100644
index e64ff19e941..00000000000
--- a/data/Leipzig/E632-pluckedBuzzPizzicato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M103 206c53 0 96 -39 102 -90h61v-26h-61c-6 -51 -49 -90 -102 -90c-57 0 -103 46 -103 103s46 103 103 103zM177 90h-81v26h81c-6 35 -37 62 -74 62c-41 0 -75 -34 -75 -75s34 -75 75 -75c37 0 68 27 74 62z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E633-pluckedLeftHandPizzicato.xml b/data/Leipzig/E633-pluckedLeftHandPizzicato.xml
deleted file mode 100644
index 504a3e68f19..00000000000
--- a/data/Leipzig/E633-pluckedLeftHandPizzicato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E633" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 152h-152v26h152v152h26v-152h152v-26h-152v-152h-26v152z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E638-pluckedDamp.xml b/data/Leipzig/E638-pluckedDamp.xml
deleted file mode 100644
index 01499f882d9..00000000000
--- a/data/Leipzig/E638-pluckedDamp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E638" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 178h62v59c-31 -5 -56 -29 -62 -59zM178 236v-58h58c-6 29 -29 52 -58 58zM237 152h-59v-62c30 6 54 31 59 62zM89 152c5 -32 31 -58 63 -63v63h-63zM61 152h-61v26h61c7 46 44 82 91 87v65h26v-65c45 -7 80 -42 87 -87h65v-26h-65c-5 -47 -41 -84 -87 -91v-61h-26v61 c-48 5 -86 43 -91 91z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E645-vocalSprechgesang.xml b/data/Leipzig/E645-vocalSprechgesang.xml
deleted file mode 100644
index 5de369ecaa5..00000000000
--- a/data/Leipzig/E645-vocalSprechgesang.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E645" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 280l-130 -130l130 -130l-20 -20l-130 134l-130 -134l-20 20l130 130l-130 130l20 20l130 -130l130 130z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E650-keyboardPedalPed.xml b/data/Leipzig/E650-keyboardPedalPed.xml
deleted file mode 100644
index f62ba204c86..00000000000
--- a/data/Leipzig/E650-keyboardPedalPed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M657 134c0 -35 -12 -66 -37 -93s-54 -41 -87 -41h-14c-6 8 -11 14 -14 17c-11 12 -21 18 -29 18c-15 0 -27 -3 -38 -10c-13 -11 -24 -19 -32 -25h-66l-40 47l-33 -47h-77c-5 19 -10 33 -13 42c-6 15 -13 22 -24 22h-3c-17 -2 -33 -12 -49 -30c-9 -11 -19 -23 -29 -34h-34 c0 29 34 67 103 113c33 22 49 46 49 72c0 17 -11 41 -32 71s-32 65 -33 106c0 15 1 30 3 47s6 37 11 61c-1 4 -4 7 -7 9s-9 3 -18 3c-19 -5 -33 -11 -42 -18c-28 -21 -42 -54 -42 -97c0 -11 2 -20 5 -27s8 -12 13 -15c2 -1 4 -1 6 -1c14 0 26 14 36 42c3 3 6 5 9 8 c1 -2 1 -6 1 -11c0 -15 -4 -28 -12 -40c-11 -16 -28 -26 -50 -31c-9 0 -17 5 -24 15c-9 13 -14 32 -14 55c0 45 15 82 45 110s68 42 113 42c52 0 92 -10 119 -30s41 -48 42 -83c0 -14 -2 -28 -7 -42c-12 -21 -27 -31 -44 -31c-18 0 -36 9 -53 28s-26 34 -26 47c0 6 2 9 7 10 c4 -11 8 -20 12 -25c12 -17 27 -26 46 -26c15 0 25 4 30 12s8 19 8 32c0 21 -8 36 -23 47s-35 19 -60 24c-10 2 -17 3 -20 3c-4 0 -13 -1 -26 -3c-5 -15 -9 -31 -11 -46s-3 -34 -3 -57c0 -21 7 -43 21 -68l54 -90c3 -13 4 -25 4 -37c0 -22 -8 -42 -25 -61 c-9 -9 -13 -17 -13 -22c9 -9 15 -20 18 -33s15 -23 36 -28c17 5 29 10 36 15s10 12 10 21c0 7 -4 19 -12 38c-5 13 -9 23 -11 30c-1 6 -1 11 -1 14c0 28 8 53 24 76s38 34 67 34c21 0 36 -4 44 -12s14 -23 17 -46c0 -3 1 -6 1 -9c0 -18 -8 -35 -22 -49 c-23 -21 -45 -41 -68 -61c6 -11 13 -21 21 -31c17 -21 33 -31 50 -31c12 0 25 5 39 15c4 3 10 8 17 15c-1 12 -2 22 -2 31c0 37 7 68 20 95c19 38 51 67 97 87c-21 47 -53 88 -96 124c-41 29 -82 57 -123 86c29 -3 66 -17 111 -44c55 -32 98 -70 131 -115 c42 -57 63 -118 63 -184zM379 227c-10 0 -20 -1 -31 -2s-18 -6 -22 -15s-7 -17 -8 -25s-2 -17 -2 -26v-20c28 0 46 9 55 28c5 11 8 31 8 60zM513 54c6 -13 16 -19 30 -19c16 0 30 8 43 24s19 39 20 70c0 25 -3 52 -10 80s-15 42 -25 43c-21 -9 -38 -26 -50 -52 s-18 -55 -18 -87c0 -23 3 -43 10 -59zM671 50c7 0 12 -3 17 -8s7 -11 7 -18s-3 -12 -8 -17s-12 -7 -19 -7s-12 3 -17 8s-7 12 -7 19c0 15 9 23 27 23z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E651-keyboardPedalP.xml b/data/Leipzig/E651-keyboardPedalP.xml
deleted file mode 100644
index 1db5bec531f..00000000000
--- a/data/Leipzig/E651-keyboardPedalP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M267 0h-77c-5 19 -10 33 -13 42c-6 15 -13 22 -24 22h-3c-17 -2 -33 -12 -49 -30c-9 -11 -19 -23 -29 -34h-34c0 29 34 67 103 113c33 22 49 46 49 72c0 17 -11 41 -32 71s-32 65 -33 106c0 15 1 30 3 47s6 37 11 61c-1 4 -4 7 -7 9s-9 3 -18 3c-19 -5 -33 -11 -42 -18 c-28 -21 -42 -54 -42 -97c0 -11 2 -20 5 -27s8 -12 13 -15c2 -1 4 -1 6 -1c14 0 26 14 36 42c3 3 6 5 9 8c1 -2 1 -6 1 -11c0 -15 -4 -28 -12 -40c-11 -16 -28 -26 -50 -31c-9 0 -17 5 -24 15c-9 13 -14 32 -14 55c0 45 15 82 45 110s68 42 113 42c52 0 92 -10 119 -30 s41 -48 42 -83c0 -14 -2 -28 -7 -42c-12 -21 -27 -31 -44 -31c-18 0 -36 9 -53 28s-26 34 -26 47c0 6 2 9 7 10c4 -11 8 -20 12 -25c12 -17 27 -26 46 -26c15 0 25 4 30 12s8 19 8 32c0 21 -8 36 -23 47s-35 19 -60 24c-10 2 -17 3 -20 3c-4 0 -13 -1 -26 -3 c-5 -15 -9 -31 -11 -46s-3 -34 -3 -57c0 -21 7 -43 21 -68l54 -90c3 -13 4 -25 4 -37c0 -22 -8 -42 -25 -61c-9 -9 -13 -17 -13 -22c9 -9 15 -20 18 -33s15 -23 36 -28c17 5 30 9 36 15c24 27 35 37 39 37c1 0 1 -1 1 -2c0 -11 -47 -80 -53 -85z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E655-keyboardPedalUp.xml b/data/Leipzig/E655-keyboardPedalUp.xml
deleted file mode 100644
index 7d145d6daa3..00000000000
--- a/data/Leipzig/E655-keyboardPedalUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M217 245c-22 0 -39 -16 -39 -37c0 -18 21 -34 39 -35c20 0 35 18 35 37c0 21 -15 34 -35 35zM44 318c3 26 25 51 52 51c16 0 28 -4 32 -12c11 -14 14 -56 22 -76c6 -8 14 -12 25 -14l16 5c9 5 14 11 15 25c0 7 -2 13 -5 17l-11 18l-17 17l-9 22c0 28 25 47 53 47 s50 -23 50 -47c0 -20 -7 -25 -21 -39l-15 -20c-4 -7 -6 -13 -7 -18c1 -4 5 -11 5 -14l11 -11l14 -7c20 2 30 22 33 47c0 39 17 58 49 58c26 0 46 -21 46 -47c0 -29 -23 -46 -54 -46c-30 0 -45 -11 -48 -34l5 -12c1 -3 4 -5 7 -8c1 -2 6 -3 14 -5c10 2 17 6 23 12 c8 3 6 4 16 12l21 15c4 3 12 5 21 5c23 0 43 -26 44 -49c0 -20 -16 -41 -30 -49c-3 -1 -10 -3 -19 -4c-7 1 -16 7 -30 18l-26 19c-4 3 -11 4 -20 4c-8 0 -14 -1 -17 -4l-9 -19c2 -13 6 -21 14 -24l11 -4l27 -5c16 0 28 -4 37 -12c9 -6 13 -17 13 -34c0 -13 -5 -25 -14 -34 c-9 -8 -22 -13 -36 -16c-11 2 -23 8 -34 19c-8 11 -11 27 -11 47c0 11 -4 21 -7 27c-5 8 -14 12 -26 12c-19 0 -29 -15 -32 -31c3 -7 8 -14 11 -21c4 -8 8 -14 13 -21l8 -8l5 -10c3 -5 4 -13 5 -21c0 -26 -26 -39 -52 -39c-25 0 -45 15 -48 39c1 6 5 18 7 21 c11 14 22 29 33 43c2 4 3 10 4 19c0 17 -8 26 -24 29c-31 0 -40 -20 -40 -51s-17 -49 -48 -54c-33 7 -42 20 -50 52c3 31 25 46 66 46c19 0 37 12 37 31c0 8 -3 13 -8 16c-3 4 -8 7 -16 7c-10 0 -24 -6 -40 -18c-14 -9 -25 -16 -39 -21c-28 3 -45 20 -46 51 c0 26 18 47 44 47c19 0 31 -9 44 -19l18 -14l19 -7c18 4 26 12 26 23c0 23 -15 34 -46 34c-37 0 -57 14 -61 44z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E659-keyboardPedalSost.xml b/data/Leipzig/E659-keyboardPedalSost.xml
deleted file mode 100644
index 2aed7fbbe53..00000000000
--- a/data/Leipzig/E659-keyboardPedalSost.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E659" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M942 0c-14 0 -24 13 -24 27c0 15 9 23 27 23c13 0 24 -13 24 -26c0 -14 -13 -24 -27 -24zM887 111v9c0 3 1 5 6 5c6 0 11 -2 11 -13c0 -4 0 -7 -1 -15c-7 -58 -24 -97 -68 -97c-28 0 -33 16 -33 39c0 11 1 24 1 38v62c0 24 0 46 1 79l2 16v1c0 3 -2 4 -6 4s-11 -1 -18 -1 h-19c-10 0 -16 2 -16 12s6 10 16 10h21c7 0 25 7 25 42c0 31 -28 57 -62 57c-32 0 -59 -29 -59 -57c0 -14 4 -30 13 -35c14 -8 26 -6 26 -13c0 -11 -5 -13 -13 -13s-20 9 -32 9c-5 0 -10 -1 -16 -1c-8 0 -16 -10 -16 -22c0 -3 -1 -10 -1 -18c0 -12 2 -28 14 -40l33 -29 c2 -2 22 -13 33 -42c4 -10 6 -19 6 -28c0 -44 -48 -70 -82 -70c-25 0 -56 22 -56 55c0 12 5 23 37 70c4 5 4 7 4 9s0 2 -4 7c-6 7 -23 44 -28 44c-3 0 -3 -4 -8 -15c-19 -40 -28 -82 -50 -118c-14 -23 -41 -52 -66 -52c-21 0 -43 18 -54 35c-12 19 -27 46 -27 81 c0 36 10 79 45 124c21 26 37 35 53 35c27 0 56 -37 68 -59c9 -15 9 -26 13 -26s6 7 12 19c15 29 33 59 72 59c4 0 12 0 12 1c0 4 -12 12 -12 33c0 41 35 72 94 72c66 0 90 -23 90 -73v-37c0 -5 7 -5 12 -5l40 -1c8 0 27 5 35 5c2 0 3 0 3 -1c0 -17 -26 -24 -37 -24h-43 c-10 0 -14 -4 -15 -19c-3 -54 -3 -93 -3 -125c0 -35 7 -46 16 -46c12 0 26 24 31 63zM476 232c-23 0 -36 -51 -36 -73c0 -15 5 -36 15 -60s30 -60 48 -60c20 0 42 52 42 78c0 32 -7 54 -14 68c-6 12 -43 47 -55 47zM651 116c-2 0 -3 -3 -7 -8c-9 -15 -10 -22 -10 -30v-2 c0 -14 26 -36 50 -36c10 0 16 11 16 19c0 10 -17 30 -36 49c-5 6 -11 8 -13 8zM302 535c37 0 47 -24 47 -62c0 -46 -31 -61 -61 -61c-4 0 -9 -1 -13 0c-76 10 -78 30 -130 30c-36 0 -106 -44 -106 -104c0 -59 38 -83 61 -83c46 0 93 52 168 52c54 0 110 -16 110 -117 c0 -136 -89 -190 -142 -190c-45.6821 0 -94.8746 31.906 -127 56c-13 10 -35 23 -45 23c-23 0 -34 -35 -45 -68c-3 -8 -1 -25 -11 -25c-7 0 -8 4 -8 9v4c0 36 19 77 32 99c16 26 33 33 51 33c54 0 62 -32 115 -62c26 -15 44 -26 62 -26c6 0 13 1 20 4c21 9 77 27 77 118 c0 56 -44 78 -70 80c-6 1 -12 0 -17 0c-68 0 -74 -41 -149 -41c-54 0 -99 48 -99 127c0 110 78 152 154 152c51 0 81 -25 132 -25c17 0 26 15 26 31c0 17 -8 33 -25 33c-11 0 -16 4 -16 7s3 5 9 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E65A-keyboardPedalS.xml b/data/Leipzig/E65A-keyboardPedalS.xml
deleted file mode 100644
index 780e2191b16..00000000000
--- a/data/Leipzig/E65A-keyboardPedalS.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E65A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M302 535c37 0 47 -24 47 -62c0 -46 -31 -61 -61 -61c-4 0 -9 -1 -13 0c-76 10 -78 30 -130 30c-36 0 -106 -44 -106 -104c0 -59 38 -83 61 -83c46 0 93 52 168 52c54 0 110 -16 110 -117c0 -136 -89 -190 -142 -190c-46 0 -95 32 -127 56c-13 10 -35 23 -45 23 c-23 0 -34 -35 -45 -68c-3 -8 -1 -25 -11 -25c-7 0 -8 4 -8 9v4c0 36 19 77 32 99c16 26 33 33 51 33c54 0 62 -32 115 -62c26 -15 44 -26 62 -26c6 0 13 1 20 4c21 9 77 27 77 118c0 56 -44 78 -70 80c-6 1 -12 0 -17 0c-68 0 -74 -41 -149 -41c-54 0 -99 48 -99 127 c0 110 78 152 154 152c51 0 81 -25 132 -25c17 0 26 15 26 31c0 17 -8 33 -25 33c-11 0 -16 4 -16 7s3 5 9 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E880-tuplet0.xml b/data/Leipzig/E880-tuplet0.xml
deleted file mode 100644
index eb710651a0e..00000000000
--- a/data/Leipzig/E880-tuplet0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 326c47 0 77 -43 77 -90c0 -112 -68 -236 -164 -236c-50 0 -79 43 -79 93c0 52 14 102 43 149c28 46 61 84 123 84zM191 268c0 21 -10 34 -25 39c-33 0 -61 -36 -85 -107c-19 -57 -29 -104 -29 -143l2 -14c3 -5 3 -8 7 -12c5 -7 11 -12 20 -12c30 0 62 34 82 107 l21 78c5 21 7 43 7 64z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E881-tuplet1.xml b/data/Leipzig/E881-tuplet1.xml
deleted file mode 100644
index 272b4307448..00000000000
--- a/data/Leipzig/E881-tuplet1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E881" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M207 311l-85 -275c-4 -6 7 -11 13 -13l18 -2h11l-6 -21h-158l6 21h15c7 0 14 2 21 5c9 1 16 8 20 20l55 176l-71 -56l-10 10l109 135h62z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E882-tuplet2.xml b/data/Leipzig/E882-tuplet2.xml
deleted file mode 100644
index 1f79b8b5840..00000000000
--- a/data/Leipzig/E882-tuplet2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E882" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11 c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c16 7 29 18 39 30c12 15 19 30 19 45l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29 c-14 0 -26 13 -26 28c0 48 52 92 100 92z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E883-tuplet3.xml b/data/Leipzig/E883-tuplet3.xml
deleted file mode 100644
index 77649644b34..00000000000
--- a/data/Leipzig/E883-tuplet3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M161 326c52 0 94 -17 94 -68c0 -50 -40 -76 -82 -94c26 -21 39 -42 39 -64c0 -52 -56 -100 -118 -100h-12c-40 0 -82 23 -82 56c0 30 12 49 37 49c17 0 31 -16 34 -31c0 -5 -4 -12 -11 -21c-7 -5 -13 -10 -13 -21l11 -9l17 -4c21 0 40 12 56 37c13 21 19 45 19 70 c-9 30 -28 35 -66 35l6 23c34 0 60 4 77 13c20 11 30 35 30 70c0 28 -12 38 -39 40l-20 -3c-8 -3 -12 -9 -12 -16c2 -7 4 -11 5 -14l4 -11l3 -10l-3 -12c-5 -6 -11 -11 -20 -13c-2 0 -4 -1 -6 -1c-16 0 -30 13 -30 28c0 39 43 71 82 71z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E884-tuplet4.xml b/data/Leipzig/E884-tuplet4.xml
deleted file mode 100644
index 291d25906ef..00000000000
--- a/data/Leipzig/E884-tuplet4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E884" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M259 110l-6 -21h-59l-16 -52c-3 -6 0 -11 9 -14l34 -2l-6 -21h-155l6 21l18 1l15 4c9 3 16 11 20 23l13 40h-132l5 21c12 10 26 22 39 39l33 43c13 18 27 41 40 68l21 51h97l-36 -49c-13 -16 -33 -34 -49 -49c-36 -35 -76 -67 -115 -100l108 -3l20 72l80 77h5l-44 -149 h55z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E885-tuplet5.xml b/data/Leipzig/E885-tuplet5.xml
deleted file mode 100644
index c72c1db74b5..00000000000
--- a/data/Leipzig/E885-tuplet5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E885" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M84 0c-49 0 -84 18 -84 66l1 14c2 5 4 9 7 14c7 7 16 11 27 14c7 0 13 -3 19 -9l4 -9l2 -11l-4 -13c-3 -5 -3 -6 -8 -11l-7 -16c0 -8 3 -13 10 -16l13 -4h15c22 0 42 15 59 45c15 27 23 52 23 75l-3 13c-2 8 -13 17 -21 20l-15 4l-17 -1l-16 -3l-17 -10l-23 -18h-21 l62 182c9 -3 25 -6 35 -9l33 -3h10l23 3l49 9c-19 -27 -53 -58 -89 -58h-10l-22 2c-9 3 -17 7 -26 11l-36 -108l18 12l20 9l22 5l26 3c9 0 19 -1 30 -5c14 -5 14 -6 24 -17c14 -15 22 -33 22 -58c0 -32 -13 -62 -41 -87c-28 -24 -60 -35 -94 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E886-tuplet6.xml b/data/Leipzig/E886-tuplet6.xml
deleted file mode 100644
index 6d182f7c56c..00000000000
--- a/data/Leipzig/E886-tuplet6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M154 326c35 0 57 -16 60 -49c0 -7 -1 -13 -2 -16l-8 -14c-4 -7 -13 -12 -28 -15l-13 1l-12 7c-4 4 -7 11 -6 20l1 11l8 10l17 16c-2 7 -9 10 -20 10c-30 0 -53 -25 -69 -74l-9 -31l-6 -36c25 21 42 34 83 34c28 0 56 -29 56 -61c0 -65 -45 -139 -118 -139 c-69 0 -88 38 -88 108v18c0 6 1 13 3 20c0 21 2 20 9 39c17 50 45 95 83 120c20 13 39 21 59 21zM58 58c0 -24 5 -39 27 -39c18 0 35 15 48 47c10 25 16 42 16 72l-3 10l-6 12c-6 7 -14 12 -26 12c-11 0 -24 -11 -37 -33l-14 -40c-3 -15 -5 -28 -5 -41z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E887-tuplet7.xml b/data/Leipzig/E887-tuplet7.xml
deleted file mode 100644
index 1e8d153b8a1..00000000000
--- a/data/Leipzig/E887-tuplet7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 311c-3 -25 -10 -47 -18 -67c-9 -23 -28 -58 -57 -105l-17 -35l-13 -35c-5 -19 -10 -45 -10 -69h-100c2 15 10 33 24 54c19 30 57 76 86 105c30 31 53 62 70 104l-2 2c-16 -16 -31 -26 -43 -32c-7 -3 -12 -5 -23 -5h-8l-27 16c-9 5 -19 8 -30 8c-5 0 -12 -1 -17 -6 l-16 -14c-7 -11 -14 -25 -21 -42h-21l38 121h20c-5 -9 -8 -16 -8 -21c0 -4 1 -7 2 -8l9 -6l24 20c10 8 24 15 40 15c11 0 29 -12 33 -21c10 -8 21 -14 31 -14h2l13 1l9 7c4 4 8 19 11 27h19z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E888-tuplet8.xml b/data/Leipzig/E888-tuplet8.xml
deleted file mode 100644
index a49a3242188..00000000000
--- a/data/Leipzig/E888-tuplet8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M61 247c0 51 57 79 108 79c33 0 52 -12 72 -27c11 -9 19 -20 24 -31c5 -12 9 -24 9 -37c0 -11 -4 -21 -13 -32s-27 -23 -56 -37l14 -20l10 -16c4 -8 6 -14 7 -18l3 -19c0 -62 -58 -89 -124 -89c-58 0 -115 33 -115 87c0 48 48 72 89 88c-10 14 -15 18 -21 35l-6 18z M192 174c27 16 40 39 44 73c0 7 -2 13 -4 19c-3 7 -7 13 -12 19c-12 14 -26 22 -44 22c-27 0 -50 -13 -50 -37c0 -21 11 -44 34 -66zM175 62c0 17 -9 26 -19 42c-1 1 -3 4 -7 8c-16 16 -32 33 -48 50l-25 -17l-18 -16l-12 -21c-3 -7 -4 -17 -4 -28c0 -17 8 -32 23 -45 l24 -12c7 -3 16 -4 26 -4c21 0 35 5 46 12c9 6 15 14 15 25z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E889-tuplet9.xml b/data/Leipzig/E889-tuplet9.xml
deleted file mode 100644
index b77e92a7f6d..00000000000
--- a/data/Leipzig/E889-tuplet9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 326c61 0 94 -45 94 -111c0 -25 -4 -47 -11 -69s-18 -44 -32 -66c-32 -48 -70 -81 -120 -81c-32 0 -60 25 -62 60v8c4 13 13 22 27 22c7 0 13 -3 18 -8c3 -1 6 -8 8 -19c-2 -8 -5 -20 -5 -29c0 -8 3 -14 13 -14c20 0 40 18 61 54l14 35c5 9 12 34 15 44l-24 -13 l-13 -8c-13 -5 -21 -8 -37 -8c-43 0 -69 29 -69 72c0 33 11 63 32 90s52 41 91 41zM167 264c0 22 -9 38 -27 43c-21 0 -38 -12 -52 -36s-21 -48 -22 -71c0 -29 6 -43 31 -48h4c25 0 51 40 60 72c3 12 5 25 6 40z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E88A-tupletColon.xml b/data/Leipzig/E88A-tupletColon.xml
deleted file mode 100644
index 3481055de89..00000000000
--- a/data/Leipzig/E88A-tupletColon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E88A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M17 87c0 11 3 19 10 26s16 10 27 10s19 -3 26 -10s11 -16 11 -26s-4 -19 -11 -27c-7 -7 -17 -10 -27 -10s-19 3 -26 10s-10 16 -10 27zM53 207c0 11 4 20 11 27s17 10 27 10s19 -4 26 -11s10 -16 10 -26s-4 -19 -11 -26s-16 -10 -26 -10s-19 3 -26 10s-11 15 -11 26z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E901-mensuralGclefPetrucci.xml b/data/Leipzig/E901-mensuralGclefPetrucci.xml
deleted file mode 100644
index 56aea5923b4..00000000000
--- a/data/Leipzig/E901-mensuralGclefPetrucci.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E901" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M144 488c30 28 83 110 83 176c0 77 -39 150 -104 150c-15 0 -33 -6 -61 -34c-15 -15 -23 -44 -23 -79c0 -44 14 -96 43 -133c23 -29 44 -58 62 -80zM159 69c-57 0 -104 -31 -104 -98c0 -61 35 -63 51 -75c8 0 23 52 39 92l32 80c-6 1 -12 1 -18 1zM256 -25 c0 -76 -24 -122 -98 -122h-3c-28 0 -66 7 -84 15c-38 17 -71 55 -71 112c0 55 56 114 124 123c25 3 49 8 61 8c12 33 26 89 26 128c0 104 -55 180 -76 211c-51 -65 -79 -110 -90 -178c-1 -6 -4 -25 -4 -46c0 -18 2 -38 10 -50c5 -7 7 -16 7 -24c0 -13 -6 -24 -15 -24 c-5 0 -12 5 -19 17c-12 21 -24 38 -24 96c0 77 23 115 54 151c38 44 26 28 65 68l1 -1c0 3 -16 27 -60 79c-19 22 -58 58 -58 145c0 76 30 100 53 123c25 25 57 38 102 38c62 0 110 -83 110 -168c0 -13 -2 -26 -4 -39c-10 -52 -83 -130 -111 -163c24 -38 8 -3 55 -91 c34 -63 42 -84 42 -119c0 -10 -1 -22 -2 -37c-4 -63 -11 -76 -20 -116c7 0 12 1 21 -1c14 -4 20 -11 20 -19c0 -19 -30 -19 -52 -24c-6 -13 -67 -174 -67 -181c0 -2 9 -4 19 -4c25 0 41 21 56 73c8 28 14 39 22 39s10 -8 10 -19z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E902-chantFclef.xml b/data/Leipzig/E902-chantFclef.xml
deleted file mode 100644
index 9a295bd77fd..00000000000
--- a/data/Leipzig/E902-chantFclef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E902" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 -131c0 -21 -3 -36 -10 -46c-11 -17 -33 -25 -64 -25c-47 0 -77 9 -91 28c-11 15 -17 47 -17 94v43c0 13 0 26 1 37v41c0 13 0 26 -1 39c0 48 5 79 16 94c14 19 45 28 92 28c32 0 53 -8 64 -24c7 -10 10 -26 10 -47c0 -28 -9 -47 -26 -58c-13 -8 -33 -12 -58 -12h-23 c-7 0 -14 0 -21 1c-17 0 -26 -4 -26 -11v-51v-51c0 -8 8 -12 24 -12c4 0 11 0 22 1s19 1 25 1c25 0 44 -4 56 -11c18 -11 27 -30 27 -59zM-33 -230l-1 9l-1 94v51c0 7 -9 11 -26 11c-7 -1 -14 -1 -21 -1h-23c-21 0 -46 -13 -61 -13c-3 0 -6 1 -8 2c-14 8 -15 37 -15 62v19 c0 21 3 37 10 47c11 16 32 24 64 24c47 0 78 -9 92 -28c11 -15 16 -46 16 -94c-1 -13 -1 -26 -1 -39v-41c1 -24 1 -36 1 -37l-1 -66c-2 -30 3 -38 -12 -38c-12 0 -12 6 -13 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E904-mensuralFclefPetrucci.xml b/data/Leipzig/E904-mensuralFclefPetrucci.xml
deleted file mode 100644
index 9e724514e3e..00000000000
--- a/data/Leipzig/E904-mensuralFclefPetrucci.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E904" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M428 -39l-54 -67l112 -138l52 66zM428 249l-54 -67l112 -138l52 66zM455 325l142 -178l-115 -144l115 -144l-129 -162v-580h-30v585l-127 157l116 144l-116 144zM232 -50v108h-199v-108h199zM266 -808h-34v693h-199v-93h-33v417h33v-86h199v86h34v-1017z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E906-chantCclef.xml b/data/Leipzig/E906-chantCclef.xml
deleted file mode 100644
index 836fc423de3..00000000000
--- a/data/Leipzig/E906-chantCclef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E906" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 -131c0 -21 -3 -36 -10 -46c-11 -17 -33 -25 -64 -25c-47 0 -77 9 -91 28c-11 15 -17 47 -17 94v43c0 13 0 26 1 37v41c0 13 0 26 -1 39c0 48 5 79 16 94c14 19 45 28 92 28c32 0 53 -8 64 -24c7 -10 10 -26 10 -47c0 -28 -9 -47 -26 -58c-13 -8 -33 -12 -58 -12h-23 c-7 0 -14 0 -21 1c-17 0 -26 -4 -26 -11v-51v-51c0 -8 8 -12 24 -12c4 0 11 0 22 1s19 1 25 1c25 0 44 -4 56 -11c18 -11 27 -30 27 -59z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E907-mensuralCclefPetrucciPosLowest.xml b/data/Leipzig/E907-mensuralCclefPetrucciPosLowest.xml
deleted file mode 100644
index 96f8f5dbcfe..00000000000
--- a/data/Leipzig/E907-mensuralCclefPetrucciPosLowest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E907" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 206l2 431c0 12 7 17 14 17c8 0 17 -7 17 -17l3 -204l2 -315h79h8c11 0 30 1 35 6c8 8 8 139 8 192v27l4 222s-1 20 19 20s12 -20 12 -20v-244s-1 -200 -1 -246c-1 -8 -1 -12 -4 -19c-7 -7 -8 -7 -16 -7c-45 0 -71 3 -71 3l-69 -3v-49v-48l64 -3l82 -5s5 0 8 -3 s5 -7 5 -7l1 -62v-154s0 -20 -13 -20c-10 0 -14 5 -16 14l-7 138l-2 19s0 4 -3 7s-9 2 -9 2h-40h-70l-3 -28l-3 -132s0 -20 -15 -20c-17 0 -19 17 -19 17c-1 22 -3 96 -3 336c0 49 1 100 1 155z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E908-mensuralCclefPetrucciPosLow.xml b/data/Leipzig/E908-mensuralCclefPetrucciPosLow.xml
deleted file mode 100644
index 9d679cc50a9..00000000000
--- a/data/Leipzig/E908-mensuralCclefPetrucciPosLow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E908" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 206l2 431c0 12 7 17 14 17c8 0 17 -7 17 -17l3 -204l2 -315h79h8c11 0 30 1 35 6c8 8 8 119 8 172v27l4 222s-1 20 19 20s12 -20 12 -20v-244s-1 -180 -1 -226c-1 -8 -1 -12 -4 -19c-7 -7 -8 -7 -16 -7c-45 0 -71 3 -71 3l-69 -3v-49v-48l64 -3l82 -5s5 0 8 -3 s5 -7 5 -7l1 -152v-154s0 -20 -13 -20c-10 0 -14 5 -16 14l-7 138l-2 109s0 4 -3 7s-9 2 -9 2h-40h-70l-3 -118l-3 -132s0 -20 -15 -20c-17 0 -19 17 -19 17c-1 22 -3 186 -3 426c0 49 1 100 1 155z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E909-mensuralCclefPetrucciPosMiddle.xml b/data/Leipzig/E909-mensuralCclefPetrucciPosMiddle.xml
deleted file mode 100644
index 9824fffaf4a..00000000000
--- a/data/Leipzig/E909-mensuralCclefPetrucciPosMiddle.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E909" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 206l2 431c0 12 7 17 14 17c8 0 17 -7 17 -17l3 -204l2 -315h79h8c11 0 30 1 35 6c8 8 8 69 8 122v27l4 222s-1 20 19 20s12 -20 12 -20v-244s-1 -130 -1 -176c-1 -8 -1 -12 -4 -19c-7 -7 -8 -7 -16 -7c-45 0 -71 3 -71 3l-69 -3v-49v-48l64 -3l82 -5s5 0 8 -3 s5 -7 5 -7l1 -262v-154s0 -20 -13 -20c-10 0 -14 5 -16 14l-7 138l-2 219s0 4 -3 7s-9 2 -9 2h-40h-70l-3 -378l-3 -132s0 -20 -15 -20c-17 0 -19 17 -19 17c-1 22 -3 446 -3 686c0 49 1 100 1 155z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E90A-mensuralCclefPetrucciPosHigh.xml b/data/Leipzig/E90A-mensuralCclefPetrucciPosHigh.xml
deleted file mode 100644
index 3c74dbf9732..00000000000
--- a/data/Leipzig/E90A-mensuralCclefPetrucciPosHigh.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E90A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -206c0 55 -1 106 -1 155c0 240 2 404 3 426c0 0 2 17 19 17c15 0 15 -20 15 -20l3 -132l3 -118h70h40s6 -1 9 2s3 7 3 7l2 109l7 138c2 9 6 14 16 14c13 0 13 -20 13 -20v-154l-1 -152s-2 -4 -5 -7s-8 -3 -8 -3l-82 -5l-64 -3v-48v-49l69 -3s26 3 71 3c8 0 9 0 16 -7 c3 -7 3 -11 4 -19c0 -46 1 -226 1 -226v-244s8 -20 -12 -20s-19 20 -19 20l-4 222v27c0 53 0 164 -8 172c-5 5 -24 6 -35 6h-8h-79l-2 -315l-3 -204c0 -10 -9 -17 -17 -17c-7 0 -14 5 -14 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E90B-mensuralCclefPetrucciPosHighest.xml b/data/Leipzig/E90B-mensuralCclefPetrucciPosHighest.xml
deleted file mode 100644
index cb707a3af09..00000000000
--- a/data/Leipzig/E90B-mensuralCclefPetrucciPosHighest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E90B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -206c0 55 -1 106 -1 155c0 240 2 314 3 336c0 0 2 17 19 17c15 0 15 -20 15 -20l3 -135l3 -25h70h40s6 -1 9 2s3 7 3 7l2 16l7 141c2 9 6 14 16 14c13 0 13 -20 13 -20v-154l-1 -62s-2 -4 -5 -7s-8 -3 -8 -3l-82 -5l-64 -3v-48v-49l69 -3s26 3 71 3c8 0 9 0 16 -7 c3 -7 3 -11 4 -19c0 -46 1 -246 1 -246v-244s8 -20 -12 -20s-19 20 -19 20l-4 222v27c0 53 0 184 -8 192c-5 5 -24 6 -35 6h-8h-79l-2 -315l-3 -204c0 -10 -9 -17 -17 -17c-7 0 -14 5 -14 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E910-mensuralProlation1.xml b/data/Leipzig/E910-mensuralProlation1.xml
deleted file mode 100644
index 4fba3749924..00000000000
--- a/data/Leipzig/E910-mensuralProlation1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E910" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M177 0c0 35 28 63 63 63s63 -28 63 -63s-28 -63 -63 -63s-63 28 -63 63zM36 0c0 -113 91 -204 204 -204s204 91 204 204s-91 204 -204 204s-204 -91 -204 -204zM0 0c0 132 108 240 240 240s240 -108 240 -240s-108 -240 -240 -240s-240 108 -240 240z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E911-mensuralProlation2.xml b/data/Leipzig/E911-mensuralProlation2.xml
deleted file mode 100644
index 082710efb45..00000000000
--- a/data/Leipzig/E911-mensuralProlation2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E911" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 0c0 -113 91 -204 204 -204s204 91 204 204s-91 204 -204 204s-204 -91 -204 -204zM0 0c0 132 108 240 240 240s240 -108 240 -240s-108 -240 -240 -240s-240 108 -240 240z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E912-mensuralProlation3.xml b/data/Leipzig/E912-mensuralProlation3.xml
deleted file mode 100644
index 8adab937c8a..00000000000
--- a/data/Leipzig/E912-mensuralProlation3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E912" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 408h36v-169c124 -9 222 -113 222 -239s-98 -230 -222 -239v-169h-36v169c-124 9 -222 113 -222 239s98 230 222 239v169zM222 -203v406c-105 -9 -186 -96 -186 -203s81 -194 186 -203zM258 -203c105 9 186 96 186 203s-81 194 -186 203v-406z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E913-mensuralProlation4.xml b/data/Leipzig/E913-mensuralProlation4.xml
deleted file mode 100644
index eec723d8a6e..00000000000
--- a/data/Leipzig/E913-mensuralProlation4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E913" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 408h36v-169c124 -9 222 -113 222 -239s-98 -230 -222 -239v-169h-36v169c-124 9 -222 113 -222 239s98 230 222 239v169zM258 60c26 -7 45 -31 45 -60s-19 -53 -45 -60v-143c105 9 186 96 186 203s-81 194 -186 203v-143zM222 -60c-26 7 -45 31 -45 60s19 53 45 60 v143c-105 -9 -186 -96 -186 -203s81 -194 186 -203v143z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E914-mensuralProlation5.xml b/data/Leipzig/E914-mensuralProlation5.xml
deleted file mode 100644
index ea63567909f..00000000000
--- a/data/Leipzig/E914-mensuralProlation5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E914" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M421 96c-46 77 -101 108 -181 108c-113 0 -204 -91 -204 -204s91 -204 204 -204c78 0 129 34 177 110c13 -8 15 -10 15 -10l-3 1s4 -2 21 -13c-41 -74 -120 -124 -210 -124c-132 0 -240 108 -240 240s108 240 240 240c89 0 163 -45 209 -122c-16 -13 -9 -8 -28 -22z M177 0c0 35 28 63 63 63s63 -28 63 -63s-28 -63 -63 -63s-63 28 -63 63z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E915-mensuralProlation6.xml b/data/Leipzig/E915-mensuralProlation6.xml
deleted file mode 100644
index a156a376170..00000000000
--- a/data/Leipzig/E915-mensuralProlation6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E915" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M421 96c-46 77 -101 108 -181 108c-113 0 -204 -91 -204 -204s91 -204 204 -204c78 0 129 34 177 110c13 -8 15 -10 15 -10l-3 1s4 -2 21 -13c-41 -74 -120 -124 -210 -124c-132 0 -240 108 -240 240s108 240 240 240c89 0 163 -45 209 -122c-16 -13 -9 -8 -28 -22z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E916-mensuralProlation7.xml b/data/Leipzig/E916-mensuralProlation7.xml
deleted file mode 100644
index d7adaf3e62c..00000000000
--- a/data/Leipzig/E916-mensuralProlation7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E916" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M59 96c-19 14 -12 9 -28 22c46 77 120 122 209 122c132 0 240 -108 240 -240s-108 -240 -240 -240c-90 0 -169 50 -210 124c17 11 21 13 21 13l-3 -1s2 2 15 10c48 -76 99 -110 177 -110c113 0 204 91 204 204s-91 204 -204 204c-80 0 -135 -31 -181 -108z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E917-mensuralProlation8.xml b/data/Leipzig/E917-mensuralProlation8.xml
deleted file mode 100644
index 29f1e8de704..00000000000
--- a/data/Leipzig/E917-mensuralProlation8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E917" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 60v143c-105 -9 -186 -96 -186 -203s81 -194 186 -203v143c-26 7 -45 31 -45 60s19 53 45 60zM222 408h36v-169c81 -5 148 -49 191 -121c-16 -13 -9 -8 -28 -22c-42 71 -93 103 -163 107v-143c26 -7 45 -31 45 -60s-19 -53 -45 -60v-143c68 5 115 39 159 109l12 -9 s4 -2 21 -13c-39 -69 -110 -117 -192 -123v-169h-36v169c-124 9 -222 113 -222 239s98 230 222 239v169z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E918-mensuralProlation9.xml b/data/Leipzig/E918-mensuralProlation9.xml
deleted file mode 100644
index eb43a50d1e5..00000000000
--- a/data/Leipzig/E918-mensuralProlation9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E918" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 408h36v-169c81 -5 148 -49 191 -121c-16 -13 -9 -8 -28 -22c-42 71 -93 103 -163 107v-406c68 5 115 39 159 109l12 -9s4 -3 21 -13c-39 -69 -110 -117 -192 -123v-169h-36v169c-124 9 -222 113 -222 239s98 230 222 239v169zM222 -203v406 c-105 -9 -186 -96 -186 -203s81 -194 186 -203z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E919-mensuralProlation10.xml b/data/Leipzig/E919-mensuralProlation10.xml
deleted file mode 100644
index 2ae7d417a2f..00000000000
--- a/data/Leipzig/E919-mensuralProlation10.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E919" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M59 96c-19 14 -12 9 -28 22c43 72 110 116 191 121v169h36v-169c124 -9 222 -113 222 -239s-98 -230 -222 -239v-169h-36v169c-82 6 -153 54 -192 123c17 10 21 13 21 13l12 9c44 -70 91 -104 159 -109v406c-70 -4 -121 -36 -163 -107zM258 -203c105 9 186 96 186 203 s-81 194 -186 203v-406z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91A-mensuralProlation11.xml b/data/Leipzig/E91A-mensuralProlation11.xml
deleted file mode 100644
index f9c992afa7b..00000000000
--- a/data/Leipzig/E91A-mensuralProlation11.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M177 0c0 35 28 63 63 63s63 -28 63 -63s-28 -63 -63 -63s-63 28 -63 63zM59 96c-19 14 -12 9 -28 22c46 77 120 122 209 122c132 0 240 -108 240 -240s-108 -240 -240 -240c-90 0 -169 50 -210 124c17 11 21 13 21 13l12 9c48 -76 99 -110 177 -110c113 0 204 91 204 204 s-91 204 -204 204c-80 0 -135 -31 -181 -108z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91B-mensuralProportionTempusPerfectum.xml b/data/Leipzig/E91B-mensuralProportionTempusPerfectum.xml
deleted file mode 100644
index 55fd7470f62..00000000000
--- a/data/Leipzig/E91B-mensuralProportionTempusPerfectum.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M480 266l26 -26l-84 -84c36 -42 58 -96 58 -156c0 -132 -108 -240 -240 -240c-60 0 -114 22 -156 58l-84 -84l-26 26l84 84c-36 42 -58 96 -58 156c0 132 108 240 240 240c60 0 114 -22 156 -58zM397 131l-288 -288c35 -29 81 -47 131 -47c113 0 204 91 204 204 c0 50 -18 96 -47 131zM371 157c-35 29 -81 47 -131 47c-113 0 -204 -91 -204 -204c0 -50 18 -96 47 -131z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91C-mensuralProportionProportioDupla1.xml b/data/Leipzig/E91C-mensuralProportionProportioDupla1.xml
deleted file mode 100644
index 12d33d8a6e4..00000000000
--- a/data/Leipzig/E91C-mensuralProportionProportioDupla1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M550 18v-36h-71c-9 -124 -113 -222 -239 -222s-230 98 -239 222h-76v36h76c9 124 113 222 239 222s230 -98 239 -222h71zM443 18c-9 105 -96 186 -203 186s-194 -81 -203 -186h406zM37 -18c9 -105 96 -186 203 -186s194 81 203 186h-406z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91D-mensuralProportionProportioDupla2.xml b/data/Leipzig/E91D-mensuralProportionProportioDupla2.xml
deleted file mode 100644
index a9184445d88..00000000000
--- a/data/Leipzig/E91D-mensuralProportionProportioDupla2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M480 266l26 -26l-84 -84c10 -12 19 -25 27 -38c-16 -13 -9 -8 -28 -22c-8 13 -16 25 -24 35l-288 -288c35 -29 81 -47 131 -47c78 0 129 34 177 110c17 -12 4 -3 33 -22c-41 -74 -120 -124 -210 -124c-60 0 -114 22 -156 58l-84 -84l-26 26l84 84c-36 42 -58 96 -58 156 c0 132 108 240 240 240c61 0 114 -21 156 -58zM83 -131l289 289c-36 32 -78 46 -132 46c-113 0 -204 -91 -204 -204c0 -50 18 -96 47 -131z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91E-mensuralProportionProportioTripla.xml b/data/Leipzig/E91E-mensuralProportionProportioTripla.xml
deleted file mode 100644
index 7b0ca3a70c2..00000000000
--- a/data/Leipzig/E91E-mensuralProportionProportioTripla.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M177 0c0 35 28 63 63 63c11 0 21 -3 30 -8l102 103c-36 32 -78 46 -132 46c-113 0 -204 -91 -204 -204c0 -50 18 -96 47 -131l102 101c-5 9 -8 19 -8 30zM480 266l26 -26l-84 -84c10 -12 19 -25 27 -38c-16 -13 -9 -8 -28 -22c-8 13 -16 25 -24 35l-102 -101 c5 -9 8 -19 8 -30c0 -35 -28 -63 -63 -63c-11 0 -21 3 -30 8l-101 -102c35 -29 81 -47 131 -47c78 0 129 34 177 110l12 -9s4 -3 21 -13c-41 -74 -120 -124 -210 -124c-60 0 -114 22 -156 58l-84 -84l-26 26l84 84c-36 42 -58 96 -58 156c0 132 108 240 240 240 c61 0 114 -21 156 -58z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91F-mensuralProportionProportioQuadrupla.xml b/data/Leipzig/E91F-mensuralProportionProportioQuadrupla.xml
deleted file mode 100644
index d8cae709906..00000000000
--- a/data/Leipzig/E91F-mensuralProportionProportioQuadrupla.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E91F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M59 96c-19 14 -12 9 -28 22c46 77 120 122 209 122c60 0 114 -22 156 -58l84 84l26 -26l-84 -84c36 -42 58 -96 58 -156c0 -132 -108 -240 -240 -240c-60 0 -114 22 -156 58l-84 -84l-26 26l84 84c-10 12 -20 25 -28 40c18 11 21 13 21 13l12 9c8 -12 16 -24 24 -34 l284 285c-35 29 -81 47 -131 47c-80 0 -135 -31 -181 -108zM111 -154c36 -34 76 -50 129 -50c113 0 204 91 204 204c0 50 -18 96 -47 131z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E920-mensuralProlationCombiningDot.xml b/data/Leipzig/E920-mensuralProlationCombiningDot.xml
deleted file mode 100644
index a1c6a04c142..00000000000
--- a/data/Leipzig/E920-mensuralProlationCombiningDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E920" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 35 28 63 63 63s63 -28 63 -63s-28 -63 -63 -63s-63 28 -63 63z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E921-mensuralProlationCombiningTwoDots.xml b/data/Leipzig/E921-mensuralProlationCombiningTwoDots.xml
deleted file mode 100644
index 9cecb651c58..00000000000
--- a/data/Leipzig/E921-mensuralProlationCombiningTwoDots.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E921" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M94 0c0 -26 -22 -47 -48 -47s-46 21 -46 47s20 46 46 46s48 -20 48 -46zM223 0c0 -26 -21 -47 -47 -47s-47 21 -47 47s21 46 47 46s47 -20 47 -46z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E922-mensuralProlationCombiningThreeDots.xml b/data/Leipzig/E922-mensuralProlationCombiningThreeDots.xml
deleted file mode 100644
index cc1ebad6fd3..00000000000
--- a/data/Leipzig/E922-mensuralProlationCombiningThreeDots.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E922" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 -0c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 39 40 39s40 -17 40 -39zM292 0c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 40 40 40s40 -18 40 -40zM186 0c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 40 40 40s40 -18 40 -40z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E923-mensuralProlationCombiningThreeDotsTri.xml b/data/Leipzig/E923-mensuralProlationCombiningThreeDotsTri.xml
deleted file mode 100644
index edf21952671..00000000000
--- a/data/Leipzig/E923-mensuralProlationCombiningThreeDotsTri.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E923" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 48c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 39 40 39s40 -17 40 -39zM139 -48c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 40 40 40s40 -18 40 -40zM196 48c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 40 40 40s40 -18 40 -40z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E924-mensuralProlationCombiningDotVoid.xml b/data/Leipzig/E924-mensuralProlationCombiningDotVoid.xml
deleted file mode 100644
index 5fe33bbcc85..00000000000
--- a/data/Leipzig/E924-mensuralProlationCombiningDotVoid.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E924" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 0c0 -60 48 -108 108 -108s107 48 107 108s-47 108 -107 108s-108 -48 -108 -108zM0 0c0 72 59 131 132 131s132 -59 132 -131s-59 -131 -132 -131s-132 59 -132 131z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E925-mensuralProlationCombiningStroke.xml b/data/Leipzig/E925-mensuralProlationCombiningStroke.xml
deleted file mode 100644
index 866262beadd..00000000000
--- a/data/Leipzig/E925-mensuralProlationCombiningStroke.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E925" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 408h36v-816h-36v816z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E938-mensuralNoteheadSemibrevisBlack.xml b/data/Leipzig/E938-mensuralNoteheadSemibrevisBlack.xml
deleted file mode 100644
index 128496f3d59..00000000000
--- a/data/Leipzig/E938-mensuralNoteheadSemibrevisBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E938" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 194l157 -194l-157 -192l-155 192z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E939-mensuralNoteheadSemibrevisVoid.xml b/data/Leipzig/E939-mensuralNoteheadSemibrevisVoid.xml
deleted file mode 100644
index 8e5f0ddd7a3..00000000000
--- a/data/Leipzig/E939-mensuralNoteheadSemibrevisVoid.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E939" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 194l157 -194l-157 -192l-155 192zM125 111l-57 -73l122 -149l56 71z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E93C-mensuralNoteheadMinimaWhite.xml b/data/Leipzig/E93C-mensuralNoteheadMinimaWhite.xml
deleted file mode 100644
index d13da51a8bd..00000000000
--- a/data/Leipzig/E93C-mensuralNoteheadMinimaWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 194l157 -194l-157 -192l-155 192zM125 111l-57 -73l122 -149l56 71z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E93D-mensuralNoteheadSemiminimaWhite.xml b/data/Leipzig/E93D-mensuralNoteheadSemiminimaWhite.xml
deleted file mode 100644
index 3eda617e957..00000000000
--- a/data/Leipzig/E93D-mensuralNoteheadSemiminimaWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 194l157 -194l-157 -192l-155 192z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E93E-mensuralCombStemUp.xml b/data/Leipzig/E93E-mensuralCombStemUp.xml
deleted file mode 100644
index 8e508ef71f9..00000000000
--- a/data/Leipzig/E93E-mensuralCombStemUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 760h30v-760h-30v760z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E93F-mensuralCombStemDown.xml b/data/Leipzig/E93F-mensuralCombStemDown.xml
deleted file mode 100644
index e7c84a4d4be..00000000000
--- a/data/Leipzig/E93F-mensuralCombStemDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -760v760h30v-760h-30z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E949-mensuralCombStemUpFlagSemiminima.xml b/data/Leipzig/E949-mensuralCombStemUpFlagSemiminima.xml
deleted file mode 100644
index 50edc5d38c9..00000000000
--- a/data/Leipzig/E949-mensuralCombStemUpFlagSemiminima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E949" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 716v-716h-30v760h30l156 -227h-30z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E94A-mensuralCombStemDownFlagSemiminima.xml b/data/Leipzig/E94A-mensuralCombStemDownFlagSemiminima.xml
deleted file mode 100644
index 346e874e719..00000000000
--- a/data/Leipzig/E94A-mensuralCombStemDownFlagSemiminima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E94A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M28 -760h-6h-22v760h30v-715l126 182h30z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E94B-mensuralCombStemUpFlagFusa.xml b/data/Leipzig/E94B-mensuralCombStemUpFlagFusa.xml
deleted file mode 100644
index 2659010d023..00000000000
--- a/data/Leipzig/E94B-mensuralCombStemUpFlagFusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E94B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 716v-73l156 -227h-30l-126 183v-599h-30v643v117h30l156 -227h-30z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E94C-mensuralCombStemDownFlagFusa.xml b/data/Leipzig/E94C-mensuralCombStemDownFlagFusa.xml
deleted file mode 100644
index bded688b359..00000000000
--- a/data/Leipzig/E94C-mensuralCombStemDownFlagFusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E94C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 -760h-30v117v10v633h30v-593l126 177h30l-156 -227v-73l125 186h31z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9E0-medRenFlatSoftB.xml b/data/Leipzig/E9E0-medRenFlatSoftB.xml
deleted file mode 100644
index b65e859863e..00000000000
--- a/data/Leipzig/E9E0-medRenFlatSoftB.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -49v426c0 13 2 36 18 36c12 -1 12 -18 12 -39c0 -20 -3 -362 -3 -362c0 -3 2 -9 11 -18c28 -33 74 -65 120 -65c6 0 28 2 28 35c0 37 -44 69 -76 86l-42 24s-9 1 -9 27v35c0 3 1 9 14 9c14 -1 50 -6 83 -26c32 -22 61 -38 61 -71v-185c0 -1 -14 -3 -26 -3h-2 c-20 0 -110 1 -171 60c0 0 -11 8 -18 31z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9E1-medRenFlatHardB.xml b/data/Leipzig/E9E1-medRenFlatHardB.xml
deleted file mode 100644
index eac080c8ada..00000000000
--- a/data/Leipzig/E9E1-medRenFlatHardB.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -140c-9 0 -12 5 -12 14v534c-0 8 2 12 9 12h18c5 0 9 -4 9 -12v-268h141c7 0 9 -4 9 -12v-256c0 -7 -3 -12 -12 -12h-162zM36 -75h114v150h-114v-150z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9E2-medRenNatural.xml b/data/Leipzig/E9E2-medRenNatural.xml
deleted file mode 100644
index 3840c1153ed..00000000000
--- a/data/Leipzig/E9E2-medRenNatural.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -118c-6 2 -8 4 -10 10v359c4 1 8 2 10 2c4 0 8 -1 13 -2v-148c46 9 60 11 72 11c4 0 6 -4 7 -7v-355c0 -4 -3 -6 -7 -6c-1 0 -6 1 -14 4c1 2 1 34 1 99v45zM22 49c-1 0 -1 -37 -1 -111l63 10v111z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9E3-medRenSharpCroix.xml b/data/Leipzig/E9E3-medRenSharpCroix.xml
deleted file mode 100644
index c08530a7d8e..00000000000
--- a/data/Leipzig/E9E3-medRenSharpCroix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -112c0 4 0 10 3 13l83 99l-83 100c-2 3 -3 10 -3 14c0 6 3 10 8 10c2 0 5 0 6 -1l86 -105l31 37l-38 45c-2 3 -11 15 -11 19c0 6 11 5 16 5c2 0 5 0 6 -1l42 -51l42 51c1 1 4 1 5 1c4 0 16 1 16 -7c0 -4 -8 -15 -10 -17l-38 -46l29 -36l88 105c1 1 4 1 5 1 c4 0 9 -3 9 -11c0 -4 -1 -11 -3 -13l-83 -100l83 -99c2 -3 3 -9 3 -14c0 -6 -3 -11 -9 -11c-1 0 -4 0 -5 2l-88 105l-30 -36l39 -46c6 -8 10 -15 10 -20c0 -6 -10 -5 -16 -5c-1 0 -4 0 -5 2l-42 51l-42 -51c-1 -2 -3 -2 -5 -2c-6 0 -16 -1 -16 7c0 4 3 10 10 18l38 45 l-31 37l-86 -105c-1 -2 -3 -2 -5 -2c-6 0 -9 4 -9 12zM146 36l-30 -36l30 -36l30 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F0-mensuralRestMaxima.xml b/data/Leipzig/E9F0-mensuralRestMaxima.xml
deleted file mode 100644
index a1f44ee149e..00000000000
--- a/data/Leipzig/E9F0-mensuralRestMaxima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 500h40v-1000h-40v1000zM90 500h40v-1000h-40v1000z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F1-mensuralRestLongaPerfecta.xml b/data/Leipzig/E9F1-mensuralRestLongaPerfecta.xml
deleted file mode 100644
index 29066ce5113..00000000000
--- a/data/Leipzig/E9F1-mensuralRestLongaPerfecta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 500h40v-1000h-40v1000z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F2-mensuralRestLongaImperfecta.xml b/data/Leipzig/E9F2-mensuralRestLongaImperfecta.xml
deleted file mode 100644
index e389b4b7594..00000000000
--- a/data/Leipzig/E9F2-mensuralRestLongaImperfecta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 250h40v-500h-40v500z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F3-mensuralRestBrevis.xml b/data/Leipzig/E9F3-mensuralRestBrevis.xml
deleted file mode 100644
index 5230f5c96a6..00000000000
--- a/data/Leipzig/E9F3-mensuralRestBrevis.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 250h40v-250h-40v250z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F4-mensuralRestSemibrevis.xml b/data/Leipzig/E9F4-mensuralRestSemibrevis.xml
deleted file mode 100644
index d61f6504d21..00000000000
--- a/data/Leipzig/E9F4-mensuralRestSemibrevis.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 250h40v-140h-40v140z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F5-mensuralRestMinima.xml b/data/Leipzig/E9F5-mensuralRestMinima.xml
deleted file mode 100644
index a4045c0f907..00000000000
--- a/data/Leipzig/E9F5-mensuralRestMinima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 140h40v-140h-40v140z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F6-mensuralRestSemiminima.xml b/data/Leipzig/E9F6-mensuralRestSemiminima.xml
deleted file mode 100644
index 277d4259deb..00000000000
--- a/data/Leipzig/E9F6-mensuralRestSemiminima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M40 96v-96h-40v140h40l78 -69h-48z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F7-mensuralRestFusa.xml b/data/Leipzig/E9F7-mensuralRestFusa.xml
deleted file mode 100644
index cecdcefa7a1..00000000000
--- a/data/Leipzig/E9F7-mensuralRestFusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M78 96l-30 -25h-48l78 69h40v-140h-40v96z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F8-mensuralRestSemifusa.xml b/data/Leipzig/E9F8-mensuralRestSemifusa.xml
deleted file mode 100644
index 93b389f00f5..00000000000
--- a/data/Leipzig/E9F8-mensuralRestSemifusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E9F8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M78 96l-30 -25h-48l78 69h40v-140h-40v39l-30 -25h-48l78 69v13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EA02-mensuralCustosUp.xml b/data/Leipzig/EA02-mensuralCustosUp.xml
deleted file mode 100644
index 4eb80e8e9fb..00000000000
--- a/data/Leipzig/EA02-mensuralCustosUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EA02" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 240c7 0 10 -4 12 -6l106 -93l17 -10l11 6l80 93l18 10h1c5 0 9 -2 12 -6l105 -93c5 -4 10 -8 16 -12c199 199 268 265 284 265c4 0 12 -6 12 -10c0 -16 -93 -126 -337 -369l-6 -7c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-6 5 -12 7 -19 7 c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10h-1c-3 0 -7 2 -10 6v1l-104 93c-6 6 -33 29 -50 39c0 16 98 103 98 103z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EA06-chantCustosStemUpPosMiddle.xml b/data/Leipzig/EA06-chantCustosStemUpPosMiddle.xml
deleted file mode 100644
index af3b2563f6a..00000000000
--- a/data/Leipzig/EA06-chantCustosStemUpPosMiddle.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EA06" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M50 311c0 2 3 3 7 3c3 0 7 -1 7 -3v-384c0 -16 0 -23 -9 -23c-28 0 -55 25 -55 40v152c3 0 25 -19 40 -19c7 0 10 1 10 25v209z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAA4-wiggleTrill.xml b/data/Leipzig/EAA4-wiggleTrill.xml
deleted file mode 100644
index 1b0f5758928..00000000000
--- a/data/Leipzig/EAA4-wiggleTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44c-20 20 -12 36 0 24s22 -20 38 -20s70 64 86 64s42 -12 74 -44c20 -20 12 -36 0 -24s-22 20 -38 20s-70 -64 -86 -64s-42 12 -74 44z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAA9-wiggleArpeggiatoUp.xml b/data/Leipzig/EAA9-wiggleArpeggiatoUp.xml
deleted file mode 100644
index cc9d56ea24c..00000000000
--- a/data/Leipzig/EAA9-wiggleArpeggiatoUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44c-12 0 -4 17 0 24c32 32 48 44 64 44c35 0 66 -64 96 -64c10 0 25 9 38 20c12 0 4 -17 0 -24c-32 -32 -48 -44 -64 -44c-35 0 -66 64 -96 64c-10 0 -25 -9 -38 -20z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAAA-wiggleArpeggiatoDown.xml b/data/Leipzig/EAAA-wiggleArpeggiatoDown.xml
deleted file mode 100644
index 37605f7ace8..00000000000
--- a/data/Leipzig/EAAA-wiggleArpeggiatoDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44c-4 7 -12 24 0 24c13 -11 28 -20 38 -20c30 0 61 64 96 64c16 0 32 -12 64 -44c4 -7 12 -24 0 -24c-13 11 -28 20 -38 20c-30 0 -61 -64 -96 -64c-16 0 -32 12 -64 44z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAAD-wiggleArpeggiatoUpArrow.xml b/data/Leipzig/EAAD-wiggleArpeggiatoUpArrow.xml
deleted file mode 100644
index 32f939a00e1..00000000000
--- a/data/Leipzig/EAAD-wiggleArpeggiatoUpArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44v24c32 32 48 44 64 44c35 0 66 -64 96 -64c10 0 24 8 37 19l-23 89l196 -100l-196 -100l22 86c-31 -31 -46 -42 -62 -42c-35 0 -66 64 -96 64c-10 0 -25 -9 -38 -20z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAAE-wiggleArpeggiatoDownArrow.xml b/data/Leipzig/EAAE-wiggleArpeggiatoDownArrow.xml
deleted file mode 100644
index 597edd885d4..00000000000
--- a/data/Leipzig/EAAE-wiggleArpeggiatoDownArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 56l196 100l-23 -89c13 -10 27 -19 37 -19c30 0 61 64 96 64c16 0 32 -12 64 -44v-24c-13 11 -28 20 -38 20c-30 0 -61 -64 -96 -64c-16 0 -31 12 -62 42l22 -86z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAAF-wiggleGlissando.xml b/data/Leipzig/EAAF-wiggleGlissando.xml
deleted file mode 100644
index d24f5e40a7d..00000000000
--- a/data/Leipzig/EAAF-wiggleGlissando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44c-17 -5 -6 17 0 24c32 32 58 44 74 44c45 0 46 -64 76 -64c10 0 26 0 48 20c17 5 5 -17 0 -24c-32 -32 -58 -44 -74 -44c-45 0 -46 64 -76 64c-10 0 -26 0 -48 -20z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA7-luteDurationWhole.xml b/data/Leipzig/EBA7-luteDurationWhole.xml
deleted file mode 100644
index cb7c7fee76b..00000000000
--- a/data/Leipzig/EBA7-luteDurationWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBA7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-82 763c12 4 35 8 70 14c38 6 61 10 67 12c7 2 12 2 14 2c7 0 11 -3 13 -9s3 -17 3 -33c0 -23 0 -42 -1 -58c-1 -11 -2.55285 -77.9923 -4 -201c-1 -85 2 -296 2 -335c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -23 496.965 -23 725c0 1 0 6 -1 16 c0 4 -2 5 -5 5c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10c-2 24 -2 37 -2 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA8-luteDurationHalf.xml b/data/Leipzig/EBA8-luteDurationHalf.xml
deleted file mode 100644
index 31a0c6c9a1a..00000000000
--- a/data/Leipzig/EBA8-luteDurationHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBA8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 1l10 770c0.128549 8.9984 1 15 2 19c2 3 6 5 12 5c0 0 12 -1 36 -4c79 -10 136 -17 172 -24c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5.13456 -104.997 -7 -202 c-2 -104 -9 -378 -20 -529z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA9-luteDurationQuarter.xml b/data/Leipzig/EBA9-luteDurationQuarter.xml
deleted file mode 100644
index 29d4700aabc..00000000000
--- a/data/Leipzig/EBA9-luteDurationQuarter.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0l8 740v36c0 6 3 9 8 9l35 -5l80 -9c37 -5 72 -13 107 -25c46 -15 90 -36 132 -63c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -4.63296 -62.9761 -9 -187 c-5 -142 -8 -371 -11 -396h-44z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAA-luteDuration8th.xml b/data/Leipzig/EBAA-luteDuration8th.xml
deleted file mode 100644
index 9320a94523e..00000000000
--- a/data/Leipzig/EBAA-luteDuration8th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M377 435c-10.2893 0 -30 5.49144 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -98 26 -125 26c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c1.65723 -1.6582 2 -7.52637 2 -13v-49c0 -11 2 -20 0 -27c3 0 6 1 9 1c43 0 91 -11 151 -31l99 -34 c44 -13 66 -34 66 -72c0 -11 -3 -26 -6 -42c-2 -2 -4 -3 -6 -3c-4.08008 0 -23.2266 5 -26 5c1 8 4 23 4 29c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31c-11 0 -23 -1 -29 -2c-5 -36 -3.61719 -80.0146 -6 -138c-3 -73 -8 -270 -10 -291h-44l8 740 c0.0216185 1.99971 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c0 0 -27 10.6258 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21c0 -11.5061 -9.94969 -66 -13 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAB-luteDuration16th.xml b/data/Leipzig/EBAB-luteDuration16th.xml
deleted file mode 100644
index 3000b69b0b6..00000000000
--- a/data/Leipzig/EBAB-luteDuration16th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBAB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M392 226v-3c0 -10 -4 -44 -9 -45c-4 0 -28 9 -31 9c1 8 5 25 5 31c0 14 -2 23 -8 27c-13 8 -47 27 -102 43c-68 20 -121 24 -159 24c-8 0 -17 -1 -27 -3c-1 -21 -9.38086 -128.922 -11 -166l-6 -144l-44 1l8 740c0.0429688 4.0127 0 8 0 13c0 0 -1 23 -1 24c0 6 3 9 12 9 s31 -3 63 -10l87 -17c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 20 -128 38l-117 16l1 -82h15c37 0 90 -13 160 -38c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19 c0 -11 -13 -55 -14 -62c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-11c-6 0 -8 -1 -8 -7c0 -14 1 -38 1 -50c0 -10 0 -18 -2 -25h10c44 0 98 -11 160 -36l105 -43c30 -11 45 -26 45 -51c0 -9 -4 -28 -11 -58h-1 c-7 0 -25 9 -29 9c2 10 4 26 5 35c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2v-17v-65v-5c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -33c44.2412 -16.0879 67 -40 67 -79z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAC-luteDuration32nd.xml b/data/Leipzig/EBAC-luteDuration32nd.xml
deleted file mode 100644
index 794441ef9c4..00000000000
--- a/data/Leipzig/EBAC-luteDuration32nd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBAC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M52 538v-54v-6h10c41 0 90 -10 150 -32l103 -37c45 -12 66 -35 66 -73c0 -9 -2 -31 -5 -50c-2 -2 -4 -2 -6 -2c-4 0 -22 11 -27 11c1 9 3 26 3 32c0 14 -3 22 -8 25c-15 9 -52 21 -105 38c-68 22 -119 34 -158 34c-12 0 -20 -1 -24 -2l-1 -67c3 0 5 -7 7 -7 c44 0 97 -1 158 -25l101 -40c44 -14 67 -41 67 -79c0 -10 -3 -24 -6 -42c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 3 16 3 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 4 -25 2c-1 -105 -2 -281 -4 -297l-44 1l3 826 c0.0762817 21.0029 -2 27 13 27c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28.7328 9.03846 -28 16c2 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1 c36 0 91 -12 164 -36c81 -27 128 -52 141 -73c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -14 1 -14 -8c0 -2 1 -7 2 -14c0 -6 -3 -14 -2 -19c1.76465 -8.8252 2 -18 -1 -29h9 c44 0 96 -13 163 -40l117 -50c26.8054 -11.4553 40 -25 40 -47c-2 -16 -5 -45 -8 -63c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v40c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 0 -14 0 -20z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC0-luteFrenchFretA.xml b/data/Leipzig/EBC0-luteFrenchFretA.xml
deleted file mode 100644
index fa6f1af4a25..00000000000
--- a/data/Leipzig/EBC0-luteFrenchFretA.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M186.601 129c0 1.65039 0.0234375 3.26562 0.0234375 4.90039c0 8.15625 -0.584961 14.7139 -2.22754 16.9033c-4.77539 6.36719 -10.8975 11.5977 -21.5967 11.5977c-12.377 0 -17.1211 -1.43555 -25.8789 -3.82324 c-9.25488 -2.52441 -24.0615 -10.2568 -43.3174 -23.3184c-10.2236 -6.93555 -20.9873 -15.1816 -29.626 -23.8213c-10.8789 -10.8789 -17.7783 -22.0332 -17.7783 -31.2383v-1.12012c0 -7.49512 0.143555 -12.0684 6.31738 -18.2422 c4.60645 -4.60645 11.3818 -8.43848 23.083 -8.43848c22.1777 0 47.5176 0.592773 78.3662 26.8135c3.80664 3.23633 7.25488 6.40918 10.3535 9.50781c15.8418 15.8418 22.2812 29.5859 22.2812 40.2793zM278.999 5c0 -2.68945 -2.30762 -4.99902 -4.99902 -4.99902 h-59.2002c-2.06445 0 -3.94434 1.39648 -4.6416 3.1377c-3.51562 8.78906 -6.69336 23.4072 -9.12109 46.0615c-1.71484 14.2891 -3.94043 25.6143 -6.28516 33.0283c-13.4121 -14.4375 -27.4883 -28.5713 -41.5176 -41.041 c-32.7334 -27.8242 -58.5205 -35.3867 -98.4346 -35.3867c-11.2695 0 -22.5957 1.40918 -34.7012 9.19141c-12.1035 7.78027 -20.6973 26.9805 -20.6973 39.6074c0 36.9863 12.1719 53.3662 16.126 58.9023c1.67383 2.34277 5.18652 6.34961 10.5225 11.6855 c10.6113 10.6113 28.1133 25.9609 49.4111 38.5215c14.291 8.42676 68.5244 31.0898 98.5391 31.0898c4.73828 0 12.2168 -1.59961 16.7998 -1.59961c5.25977 0 32.0234 5.59668 43.9258 8.17871c4.03418 0.875 5.07129 1.4209 7.27441 1.4209 c2.68945 0 4.99902 -2.30762 4.99902 -4.99902v-4c0 -19.7256 -4.7998 -62.0996 -4.7998 -81.5996c0 -44.6494 12.4473 -78.4775 35.5029 -103.84c0.864258 -0.950195 1.29688 -2.15527 1.29688 -3.36035z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC1-luteFrenchFretB.xml b/data/Leipzig/EBC1-luteFrenchFretB.xml
deleted file mode 100644
index f54751de894..00000000000
--- a/data/Leipzig/EBC1-luteFrenchFretB.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M116.8 148.001c-16.5664 0 -29.7793 -5.56348 -38.2012 -15.2148v-99.5869h45.4014c13.2275 0 24.3896 6.89258 32.0918 16.5195c0.0771484 0.0966797 0.157227 0.189453 0.242188 0.28125c9.40723 10.1299 13.8672 23.1201 13.8672 39.7998 c0 17.4912 -4.46094 31.2305 -14.5986 42.127c-10.3203 10.291 -23.3682 16.0742 -38.8027 16.0742zM78.5986 277.8c0 -22.3086 -0.799805 -50.1299 -0.799805 -72v-33.4004h10.2012c80.1406 0 138.599 -11.4727 138.599 -88.999 c0 -19.3984 -7.02637 -35.7627 -20.9609 -49.6973c-4.50879 -4.50879 -9.77441 -8.80273 -15.667 -12.8662c-19.6074 -13.0713 -38.1455 -20.8359 -57.1709 -20.8359l-1.59961 -0.00390625l-99.4033 4.00781c-2.58398 0.104492 -4.7959 2.35547 -4.7959 4.99512 c0 20.749 1.59961 29.7715 1.59961 42.4004c0 102.892 -9.59277 188.052 -29.3955 255.383c-0.135742 0.461914 -0.204102 0.939453 -0.204102 1.41699c0 2.68945 2.30762 4.99902 4.99902 4.99902h66.4004c1.90234 0 3.69531 -1.20605 4.47266 -2.76172 c2.30566 -4.61328 3.72559 -12.9824 3.72559 -25.4375v-7.2002z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC2-luteFrenchFretC.xml b/data/Leipzig/EBC2-luteFrenchFretC.xml
deleted file mode 100644
index f14b6fec755..00000000000
--- a/data/Leipzig/EBC2-luteFrenchFretC.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247.398 182.6c0 -2.68945 -2.30762 -4.99902 -4.99902 -4.99902c-16.2461 0 -87.0928 10.9814 -104.494 14.4004h-1.10547c-7.91016 0 -13.4014 -12.207 -13.4014 -19.001c0 -3.55762 1.0791 -6.23242 1.55469 -9.7207l7.19238 -52.7471 c3.56738 -24.2559 8.41895 -43.1943 14.3818 -57.332c8.00391 3.57812 20.8232 9.39355 38.502 17.9043c7.04102 3.38965 15.4229 6.89453 18.9707 6.89453c0.0458984 0 0.400391 0.102539 0.955078 0.102539c2.45801 0 5.64355 -2.90918 5.64355 -5.90137 c0 -3.4209 -1.50977 -6.57715 -3.77832 -8.12988c-35.6797 -24.4131 -51.3916 -36.499 -101.295 -62.6982c-0.725586 -0.380859 -1.52539 -0.571289 -2.3252 -0.571289c-2.31738 0 -4.33887 1.7168 -4.85156 3.79199c-11.9365 48.2246 -26.6865 103.349 -33.8379 154.088 c-3.50293 -0.753906 -9.28125 -2.41406 -17.126 -5.55176c-16.9746 -6.46777 -28.3154 -9.92773 -36.1846 -9.92773c-4.24023 0 -10.5996 1.62012 -10.5996 7.39844c0 3.43652 2.27734 6.80859 4.88965 8.3252c28.9277 16.7979 95.0635 61.5615 120.219 74.5205 c0.716797 0.369141 1.50391 0.553711 2.29102 0.553711c0.276367 0 0.553711 -0.0224609 0.827148 -0.0683594l52.9189 -8.81934c36.7783 -7.04297 57.2969 -12.3232 65.4209 -16.1152c3.10742 -0.816406 5.03223 -4.00781 5.03223 -7.19629 c0 -3.69629 -4.80078 -16.9365 -4.80078 -19.2002z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC3-luteFrenchFretD.xml b/data/Leipzig/EBC3-luteFrenchFretD.xml
deleted file mode 100644
index 11dfb08f562..00000000000
--- a/data/Leipzig/EBC3-luteFrenchFretD.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 182.001h-4.71582c-5.61426 -14.0156 -11.8857 -43.1748 -11.8857 -65.4004v-7.0166c1.15918 -15.5898 8.14746 -29.0996 20.2012 -41.1533c13.9413 -13.9448 31.1242 -22.8311 52.4004 -22.8311c16.0332 0 28.2695 5.13965 39.2207 16.0908 c10.5567 10.5567 17.3799 29.7745 17.3799 46.125v0.785156c0 21.1797 -9.44922 35.7607 -22.7627 45.5713c-9.0459 6.78418 -27.6777 17.7129 -55.7119 24.7432c-12.4785 2.33203 -33.001 2.98438 -34.126 3.08594zM8.39941 222.802 c-3.73926 0 -8.19824 2.13965 -8.19824 6.59863c0 0.632812 0.119141 1.26465 0.357422 1.86035l3.11621 7.79199c4.54785 15.2793 6.94629 36.5205 7.73047 54.5664c0.243164 5.59375 1.30762 12.7803 7.39453 12.7803c3.08008 0 6.40234 -1.99512 8.47168 -2.81055 c3.83496 -1.51172 6.90625 -2.72559 11.7148 -3.6875c0.183594 -0.0361328 0.364258 -0.0830078 0.542969 -0.140625l99.9648 -31.9893c74.3359 -23.1787 136.768 -37.5835 182.124 -52.7217c35.8223 -11.9561 67.9062 -36.7168 78.3105 -54.3457 c9.33311 -15.8139 13.4697 -32.0791 13.4697 -49.7041c0 -68.3848 -41.0693 -107.897 -103.982 -110.594c-0.0722656 -0.00292969 -0.143555 -0.00488281 -0.21582 -0.00488281h-1.60059c-29.5791 0 -43.1963 7.40625 -56.6367 14.126 c-7.2373 3.61914 -19.4033 12.165 -30.1455 22.9082c-5.07617 5.0752 -9.80566 10.6309 -13.4287 16.4658c-5.7002 8.6084 -9.58789 24.8477 -9.58789 36.2988c0 36.1631 5.11523 69.5273 15.3975 100.021c-18.6914 5.91211 -44.9824 12.5449 -80.1357 19.8682 c-46.2373 8.77051 -83.6094 13.5127 -111.862 13.5127c-4.87598 0 -8.3125 -0.799805 -12.8008 -0.799805z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC4-luteFrenchFretE.xml b/data/Leipzig/EBC4-luteFrenchFretE.xml
deleted file mode 100644
index 07334e3fe75..00000000000
--- a/data/Leipzig/EBC4-luteFrenchFretE.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 107.599c2.68945 0 4.99902 -2.30762 4.99902 -4.99902c0 -0.625977 -0.117188 -1.25195 -0.350586 -1.84277l-13.5996 -34.3994c-0.62793 -1.58984 -1.95996 -2.49805 -3.55566 -3.0498c-3.86328 -1.50488 -10.8779 -9.6123 -14.8682 -14.3281 c-21.0625 -24.9639 -58.8965 -48.9785 -87.8252 -48.9785h-2.39941c-12.5586 0 -30.9932 13.084 -39.6611 22.3936c-11.3145 12.1523 -23.7383 29.1719 -23.7383 48.2051c0 18.4951 4.95801 42.1279 15.4941 70.4951c8.16797 22.751 16.2881 38.71 25.3633 47.7861 c2.32812 2.32715 4.76562 4.23633 7.35742 5.61426c-0.202148 2.03711 -0.214844 3.96289 -0.214844 5.75v0.754883c0 20.5254 12.3271 44.5625 27.7812 60.0166c7.8125 7.8125 16.6553 13.7051 25.9629 15.3096c0.282227 0.0488281 0.568359 0.0732422 0.854492 0.0732422 c3.86816 0 5.19531 -4.1084 5.79492 -6.12598c1.46484 -4.92773 3.03418 -11.5742 4.63574 -17.5791c0.112305 -0.422852 0.168945 -0.858398 0.168945 -1.29395c0 -1.74902 -1.0332 -3.45215 -2.42773 -4.28906c-7.44922 -4.46973 -15.1729 -11.1357 -15.1729 -20.5117 c0 -1.03125 4.41602 -14.2207 10.3604 -24.8066c1.25879 -2.24316 2.05176 -3.46191 2.47266 -3.88281c0.609375 -0.609375 2.62402 -1.51074 15.7686 -1.51074c14.6572 0 32.0156 9.28711 52.4648 29.7354c0.975586 0.975586 2.25488 1.46387 3.53516 1.46387 c4.69922 0 4.96875 -4.57715 5.77734 -8.68262c0.749023 -3.80273 1.62109 -7.86035 1.62109 -11.5156c0 -11.9629 -8.74609 -20.4453 -17.5957 -25.4346c-13.3037 -18.1318 -43.1738 -38.7646 -67.4033 -38.7646c-8.9082 0 -17.4824 2.27246 -24.6016 7.69238 c-0.711914 -0.301758 -1.54785 -0.862305 -2.52148 -1.83496c-8.55762 -8.55762 -15.0771 -38.9395 -15.0771 -51.2588c0 -22.9434 16.0596 -39.001 39.001 -39.001c7.76465 0 20.6719 4.94922 36.2627 15.8496l42.3291 31.9453 c0.886719 0.669922 1.94727 1.00488 3.00781 1.00488z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC5-luteFrenchFretF.xml b/data/Leipzig/EBC5-luteFrenchFretF.xml
deleted file mode 100644
index 85918e4303c..00000000000
--- a/data/Leipzig/EBC5-luteFrenchFretF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M128 225c15 13 41 40 43 55v5c0 19 -8 28 -24 31c-18 -5 -28 -31 -28 -51c0 -6 7 -31 9 -40zM168 173c14 0 28 0 28 -6v-20c0 -3 -2 -5 -5 -5h-18c-10 0 -30 0 -38 -1c-3 -19 -9 -115 -11 -136c0 -2 -2 -4 -5 -4c-8 0 -18 -1 -26 -1c-3 0 -5 2 -5 5c0 6 1 13 1 19 c0 22 -1 37 -7 68l-8 40c-22 2 -60 3 -61 3h-8c-2 0 -3 1 -4 3c0 1 -1 3 -1 7v15c0 3 2 5 5 5h12c7 0 25 2 29 2c4 3 19 17 26 23c-4 29 -6 52 -6 67c0 63 26 98 87 98c39 0 58 -17 58 -55c1 -2 1 -6 0 -8c0 -52 -25 -69 -60 -87c-9 -4 -15 -10 -18 -13c-1 -1 -3 -2 -3 -2 c0 -4 -1 -12 -1 -17h39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC6-luteFrenchFretG.xml b/data/Leipzig/EBC6-luteFrenchFretG.xml
deleted file mode 100644
index c59e8b060fb..00000000000
--- a/data/Leipzig/EBC6-luteFrenchFretG.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M116.199 225.6c0 -11.2432 1.61328 -16.2793 3.67578 -18.3418c1.81836 -1.81836 5.58301 -3.05859 13.7246 -3.05859c24.3242 0 63.7881 22.3799 84.5508 38.0498c0.0253906 0.755859 0.0507812 1.88672 0.0507812 3.35059 c0 2.65234 -0.452148 6.84082 -0.452148 12.667c-16.7266 3.36914 -32.7637 4.73438 -48.1494 4.73438c-20.3193 0 -34.5986 -3.16016 -44.7188 -8.94336c-6.33203 -3.79883 -8.68164 -12.2314 -8.68164 -28.458zM219.001 211.026 c-25.1074 -20.4629 -61.9219 -50.4902 -94.5811 -50.4902c-29.1387 0 -44.915 24.2773 -44.915 52.3271c0 21.5498 8.90625 45.2891 25.9395 62.3223c14.4121 14.4121 34.8936 24.2139 60.9561 24.2139c20.2949 0 37.6807 -2.57812 53.0898 -8.44922 c0.657227 5.2002 1.11035 13.2451 1.11035 23.4502c0 2.68945 2.30762 4.99902 4.99902 4.99902h40.8008c2.64258 0 4.89941 -2.21875 4.99512 -4.8125c0.268555 -7.24707 0.803711 -14.5303 0.803711 -21.7871c0 -2.64258 0.165039 -4.87598 0.375 -6.64941 c8.41797 5.87891 21.6113 9.64453 39.4609 12.3896c0.25293 0.0390625 0.508789 0.0585938 0.764648 0.0585938c2.3125 0 4.33203 -1.71191 4.84863 -3.78027c1.59766 -6.38477 3.35059 -13.2617 3.35059 -21.2188c0 -2.60254 -2.14746 -4.82031 -4.66406 -4.98828 c-10.165 -0.676758 -22.334 -5.3623 -36.2451 -13.8613c-0.000976562 -0.113281 -0.000976562 -0.228516 -0.000976562 -0.345703c0 -9.60156 0.978516 -17.8467 0.978516 -29.4629c0 -8.43945 -0.398438 -18.2852 -1.70117 -29.5215 c-8.07812 -69.6367 -24.3174 -127.102 -58.9062 -161.69c-20.0391 -20.0391 -46.1484 -32.0273 -79.374 -33.9209c-0.447266 -0.0253906 -0.901367 -0.0380859 -1.3623 -0.0380859c-17.7275 0 -45.5029 18.7656 -85.8437 50.5645 c-3.46094 2.21973 -10.5 3.86621 -19.4795 3.86621h-12.4482c-5.6582 -0.78418 -9.45215 -0.912109 -13.085 -0.912109c-5.22852 0 -6.18164 4.78711 -7.20605 7.69238c-1.01074 2.86719 -1.86035 4.36621 -1.86035 7.01855c0 1.94531 0.960938 3.5459 1.91602 4.50195 c3.80664 3.80664 9.78418 3.8623 17.1133 4.46484c11.8232 0.972656 32.6201 1.63184 48.3701 1.63184c9.82227 0 23.5039 -7.99121 44.333 -21.6113c0.0625 -0.0410156 0.124023 -0.0830078 0.18457 -0.126953c19.9131 -14.3369 33.3184 -20.6611 37.8818 -20.6611 h0.800781c10.7021 0 20.3242 4.08594 29.2764 13.0381c9.39941 9.39941 17.9932 24.3838 25.209 45.2314c9.48145 26.8613 14.1152 49.5645 14.1152 67.9316v48.626z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC7-luteFrenchFretH.xml b/data/Leipzig/EBC7-luteFrenchFretH.xml
deleted file mode 100644
index 6c89618043b..00000000000
--- a/data/Leipzig/EBC7-luteFrenchFretH.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 287c-35 0 -49 -43 -49 -77c0 -6 0 -11 1 -15c11 8 37 21 47 31c7 7 11 17 11 36c0 17 0 25 -10 25zM134 110c35 17 60 55 112 55c31 0 43 -30 43 -60c0 -22 -12 -44 -30 -59l-57 -45c-1 -1 -2 -1 -3 -1h-1l-32 5c-2 0 -4 3 -4 5s1 4 3 5c23 8 77 45 77 72 c0 19 -14 33 -33 33c-5 0 -24 -9 -51 -30l-70 -53c-1 -1 -2 -1 -3 -1c-3 0 -5 2 -5 5l-2 57c-1 18 -5 28 -7 30c-7 0 -14 -3 -23 -8l-24 -15c-1 0 -1 -1 -2 -1s-3 1 -4 2l-17 19c-1 1 -1 3 -1 4c0 5 7 5 11 6c26 7 54 14 60 35l20 64c11 32 24 56 40 74c1 1 2 2 4 2 c5 1 17 2 33 8s28 10 37 10c29 0 47 -14 47 -43c0 -19 -13 -42 -37 -66c-27 -27 -63 -54 -86 -66v-37zM71 128v0z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC8-luteFrenchFretI.xml b/data/Leipzig/EBC8-luteFrenchFretI.xml
deleted file mode 100644
index 06aaa70515a..00000000000
--- a/data/Leipzig/EBC8-luteFrenchFretI.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 113c0 6 4 7 4 20c0 10 2 23 10 23c3 0 5 -1 14 -1c19 0 30 4 35 10l11 28c1 2 3 3 5 3h1c20 -5 34 -7 39 -7c3 0 5 -2 5 -5v-2c-7 -19 -19 -41 -33 -65c-2 -3 -3 -13 -3 -28v-6c0 -13 0 -21 7 -21c10 0 34 17 39 29c1 2 3 3 5 3c3 0 5 -2 5 -5c1 -4 7 -11 7 -17 c0 -3 -1 -5 -3 -6c-17 -22 -42 -44 -63 -64c-1 -1 -3 -2 -4 -2l-31 4c-2 0 -4 2 -4 5c0 11 -3 29 -3 41c0 16 2 36 5 58c-2 2 -5 3 -11 3s-26 -3 -32 -3c-3 0 -5 2 -5 5zM100 209h-3c-15 0 -27 13 -27 27c0 17 15 31 32 31h1c16 0 29 -10 29 -26c0 -20 -13 -32 -32 -32z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC9-luteFrenchFretK.xml b/data/Leipzig/EBC9-luteFrenchFretK.xml
deleted file mode 100644
index 216d5fdfdb8..00000000000
--- a/data/Leipzig/EBC9-luteFrenchFretK.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBC9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 183c14 1 45 6 45 19s-23 27 -35 31c-1 -1 -7 -4 -16 -11zM73 247c7 7 46 38 46 50v1c0 7 -12 16 -13 17h-2c-19 -19 -29 -42 -31 -68zM161 308c0 -19 -22 -39 -37 -52c14 -8 33 -28 33 -46c0 -22 -20 -41 -39 -44l-38 -6c0 -5 -1 -15 -1 -19v-4c15 0 48 4 65 5 c3 0 5 -2 5 -5v-8c0 -5 -4 -10 -9 -10h-1c-13 -1 -31 -4 -55 -8c-2 0 -3 -1 -3 -2v-79h1c2 1 16 11 22 15c1 1 2 1 3 1c3 0 5 -2 5 -5v-1c0 -3 4 -10 4 -14s-6 -10 -8 -12c-9 -9 -19 -10 -38 -12h-3c-9 0 -13 12 -19 12c-1 -5 0 -14 -6 -14h-3c-6 0 -9 3 -14 3 c-3 0 -5 2 -5 5c0 1 1 2 2 3s3 7 5 17c2 12 4 24 4 49l-1 31c-5 0 -19 -1 -23 -1c-5 0 -7 6 -7 12c0 12 13 14 23 14h8c0 17 -2 68 -2 83c0 18 1 29 3 37v1c7 20 15 39 26 55c13 22 33 44 60 46h4c6 0 17 -5 22 -12c0 0 17 -20 17 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBCA-luteFrenchFretL.xml b/data/Leipzig/EBCA-luteFrenchFretL.xml
deleted file mode 100644
index 0a7ba912be2..00000000000
--- a/data/Leipzig/EBCA-luteFrenchFretL.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBCA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 87c4 0 10 -9 10 -13c0 -1 0 -2 -1 -3c-16 -16 -46 -40 -62 -56c-6 -6 -10 -11 -11 -13s-2 -2 -4 -2h-24c-3 0 -5 2 -5 5c0 1 0 2 1 3c3 3 5 11 5 22c0 20 3 54 3 74c0 8 0 15 -1 21c-16 -11 -37 -25 -60 -25h-4c-4 0 -9 1 -9 6s6 12 7 15c0 2 -1 3 -1 4c0 2 3 5 5 5 c11 2 24 5 37 14c9 7 14 9 19 13l7 65c8 60 32 126 100 126h3c38 0 55 -24 55 -63c0 -49 -42 -84 -77 -109c-12 -9 -20 -13 -24 -19l-8 -87h1c6 0 33 17 38 17zM182 287c0 10 -6 17 -15 18h-2c-32 0 -39 -35 -39 -65v-9l3 -34l13 8c22 17 32 39 40 76v6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBCB-luteFrenchFretM.xml b/data/Leipzig/EBCB-luteFrenchFretM.xml
deleted file mode 100644
index 4bd0a492e65..00000000000
--- a/data/Leipzig/EBCB-luteFrenchFretM.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBCB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 101.4c-2.68945 0 -4.99902 2.30762 -4.99902 4.99902c0 0.767578 0.175781 1.53516 0.526367 2.2373c4.79883 9.59961 12.3809 19.7539 22.9521 30.3252c4.49805 4.49805 9.4668 9.00879 15.0703 13.6377c11.4033 9.77344 28.3721 22.6904 50.1162 37.1875 c20.6934 13.5293 34.998 23.8975 42.5918 30.7314c0.948242 0.853516 2.14453 1.28027 3.3418 1.28027c2.06445 0 3.94531 -1.39648 4.6416 -3.1377c5.12793 -12.8213 9.08496 -33.0137 13.9004 -61.9043c4.30176 -28.2686 8.14844 -48.5273 10.7344 -60.167 l66.5352 60.6855c9.31738 8.60156 17.7656 16.6924 25.3408 24.2676c17.6738 17.6729 30.5996 32.5703 38.7139 44.4697c0.874023 1.28223 2.50098 2.18555 4.13379 2.18555c2.47266 0 4.59375 -1.94141 4.94238 -4.24609l14.3721 -95.0146l4.60547 -20.1475 l148.203 115.951c0.901367 0.705078 1.98926 1.05762 3.07715 1.05762c2.17676 0 4.11621 -1.53516 4.74219 -3.41211c5.0166 -15.0518 10.5918 -43.1777 17.0117 -86.5156c4.71484 -35.0205 8.2793 -56.5254 9.30664 -62.5527 c2.0625 0.923828 7.07324 3.71777 14.085 8.38867c8.27246 6.00586 20.6045 9.81934 21.4434 9.80664c0 -0.0185547 -0.0605469 -0.0566406 -0.188477 -0.115234c6.30469 0 9.79883 -5.62109 9.79883 -11.3984c0 -1.36719 -0.59375 -2.75488 -1.64258 -3.70605 l-34.457 -31.251c-20.2344 -17.8066 -39.7021 -31.624 -56.9785 -40.6729c-0.724609 -0.379883 -1.52344 -0.569336 -2.32129 -0.569336c-2.56055 0 -4.75195 2.08008 -4.97754 4.53809l-6.39453 69.5439c-2.73926 23.9551 -6.06738 44.3535 -9.45898 60.6475 c-69.5195 -52.2119 -120.901 -95.3037 -153.276 -126.909c-0.970703 -0.947266 -2.23145 -1.4209 -3.49219 -1.4209c-2.125 0 -4.03711 1.46777 -4.69824 3.28516c-3.62891 9.98047 -5.87012 29.1289 -8.28125 57.2715c-1.94727 22.0615 -4.46777 38.2842 -6.93066 48.292 c-16.4873 -9.4502 -39.2832 -27.3691 -67.9043 -53.1289l-71.2002 -65.5996c-0.955078 -0.879883 -2.16992 -1.31934 -3.38574 -1.31934c-2.5 0 -4.6416 1.98242 -4.95508 4.33398c-1.62988 12.2285 -4.0127 37.7002 -7.2168 75.3369 c-2.94531 27.9893 -6.57227 51.1465 -10.833 69.3877c-3.82129 -1.36914 -11.6016 -5.41406 -22.9268 -12.959c-8.69141 -6.40723 -15.457 -11.9863 -20.0371 -16.5674c-3.29395 -3.29297 -5.41406 -6.08203 -6.3584 -7.97168 c-0.657227 -1.3125 -2.0127 -2.37598 -3.50977 -2.66797l-32.7998 -6.40039c-0.317383 -0.0615234 -0.640625 -0.0927734 -0.962891 -0.0927734z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBCC-luteFrenchFretN.xml b/data/Leipzig/EBCC-luteFrenchFretN.xml
deleted file mode 100644
index bf448db58c5..00000000000
--- a/data/Leipzig/EBCC-luteFrenchFretN.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBCC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330.8 100.199c4.38184 0 10.5986 -2.13574 10.5986 -7.39941c0 -1.26562 -0.476562 -2.53027 -1.42969 -3.50195l-49.9658 -50.9082c-17.7256 -17.7256 -33.041 -30.5537 -46.376 -37.9619c-0.751953 -0.417969 -1.58984 -0.626953 -2.42773 -0.626953 c-2.49316 0 -4.62891 1.97168 -4.95215 4.31152c-5.25781 38.1328 -11.416 87.7646 -18.875 119.353c-15.0859 -11.6533 -32.2412 -27.1016 -51.4629 -46.3232c-20.7949 -20.7949 -44.0166 -46.0059 -69.7314 -75.6172 c-0.939453 -1.08105 -2.37207 -1.72363 -3.77832 -1.72363c-2.44336 0 -4.54297 1.89648 -4.92773 4.15332c-10.751 63.0732 -16.4033 104.861 -17.4805 127.289c-11.5273 -6.55859 -25.2822 -17.8213 -33.0518 -26.5625 c-0.945312 -1.0625 -2.35547 -1.67969 -3.74023 -1.67969c-0.19043 0 -0.381836 0.0107422 -0.571289 0.0322266l-28 3.2002c-2.39941 0.274414 -4.42773 2.4375 -4.42773 4.9668c0 1.21191 0.4375 2.42285 1.31152 3.37695 c1.95117 2.12891 4.26367 4.54004 6.94922 7.22559c9.78516 9.78516 24.5469 23.2305 44.7178 39.623c16.1895 14.1641 39.7725 33.0928 50.7188 45.1348c0.951172 1.04688 2.33789 1.63867 3.70215 1.63867c2.17676 0 4.11621 -1.53516 4.74219 -3.41211 c3.34766 -10.043 7.37793 -27.0684 10.6084 -52.0879c3.33594 -22.0088 6.6709 -40.6104 10.4209 -55.7148c13.0459 12.8945 33.3633 30.6465 60.666 52.4883c35.1465 28.7568 58.3164 48.7363 70.1533 59.7842c0.958008 0.894531 2.18359 1.3418 3.40918 1.3418 c2.31348 0 4.33203 -1.71191 4.84961 -3.78027c4.02051 -16.083 9.65723 -40.2295 14.4873 -72.4287c3.94141 -24.7734 6.75195 -42.2393 8.28125 -51.2324c8.62207 5.10938 26.0996 17.042 35.582 17.042z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE0-luteItalianFret0.xml b/data/Leipzig/EBE0-luteItalianFret0.xml
deleted file mode 100644
index 0f2a8b89085..00000000000
--- a/data/Leipzig/EBE0-luteItalianFret0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M46.9994 122c0 -31.6546 6.02829 -59.1559 16.5208 -75.3716c9.92803 -15.8848 18.7864 -28.6289 45.4798 -28.6289c26.1589 0 40.2571 16.2734 50.4547 32.5895c10.4579 16.1622 14.5459 40.6011 14.5459 73.4111c0 32.8236 -4.07153 57.1476 -15.4534 73.2719 c-11.5721 16.0229 -16.8963 28.7287 -45.5472 28.7287c-27.6659 0 -42.7777 -17.5063 -53.4547 -34.5895c-10.4399 -16.1343 -12.5459 -36.4399 -12.5459 -69.4111zM-2.99941 123c0 40.9423 18.417 72.5943 35.7116 92.9409c1.0816 1.27247 2.67619 2.30745 3.90212 3.34154 c22.5969 19.0608 35.6405 29.717 74.3856 29.717c40.7644 0 53.134 -11.7138 76.9274 -31.7003c0.0665658 -0.0559153 0.131266 -0.115179 0.193878 -0.177791c21.6304 -21.6304 34.8781 -53.4598 34.8781 -94.1213c0 -44.2834 -18.2069 -78.6745 -38.5026 -98.9701 c-19.863 -19.863 -39.9728 -27.0293 -76.4969 -27.0293h-1c-34.2852 0 -52.5574 7.05298 -71.8206 26.3162c-20.7184 20.7184 -38.1788 54.682 -38.1788 99.6832z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE1-luteItalianFret1.xml b/data/Leipzig/EBE1-luteItalianFret1.xml
deleted file mode 100644
index fc86101061b..00000000000
--- a/data/Leipzig/EBE1-luteItalianFret1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1.30977 212.912c-1.41382 0 -3.39737 1.98033 -3.39737 3.39737c0 0.38667 0.088179 0.64011 0.088179 0.690225c0 1.82277 0.928332 3.29656 2.01872 4.38695c3.17118 3.17118 9.26313 5.45433 19.095 8.47951c4.90221 1.50837 9.80738 2.56603 14.5117 3.99732 c7.07189 2.1516 14.183 4.01193 21.3811 5.97506c14.0485 6.01065 24.0361 9.16057 29.9929 9.16057c7.26384 0 24.9994 -5.55225 24.9994 -16.9994c0 -8.75675 -0.931436 -34.5712 -1.88928 -48.4439c-0.632443 -9.15987 -1.11072 -16.1558 -1.11072 -21.5561v-7.94555 l2 -111.054v-9c0 -9.32659 1.01343 -11.2529 2.34968 -14.0172c1.28293 -2.65403 0.402619 -2.32948 3.30524 -3.05514c6.80411 -1.51202 13.4558 -3.18221 20.4211 -4.43452c7.53715 -1.35512 13.3137 -1.85919 16.4037 -4.94926 c0.848666 -0.848666 1.52025 -2.1162 1.52025 -3.54387c0 -1.33328 -0.619167 -2.5443 -1.43139 -3.35653c-3.62724 -3.62724 -11.9128 -3.64289 -24.2452 -3.64289c-0.107305 0 -0.214916 1.18442e-06 -0.322833 1.18442e-06h-83.9112 c-5.66508 -0.33324 -11.4073 -1 -17.0888 -1c-7.12644 0 -11.875 0.923094 -14.4736 3.52164c-0.833434 0.833434 -1.52585 2.0391 -1.52585 3.47777c0 1.6481 0.75802 3.12625 1.81559 4.18382c2.95421 2.95421 8.24485 4.03202 15.7844 4.79069l23.5671 3.92785 c7.62797 3.25191 7.83285 12.2838 7.83285 24.0976v4.98087l-1 158.019v4c0 6.67177 -5.94482 11.0006 -12.0006 11.0006c-3.51967 0 -9.34253 -0.926483 -18.2688 -2.91009c-8.25978 -2.06495 -15.3671 -2.08992 -20.3635 -2.08992 c-0.123871 0 -0.246444 1.5352e-05 -0.367705 1.5352e-05h-5c-0.0501153 0 -0.303556 -0.088179 -0.690225 -0.088179z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE2-luteItalianFret2.xml b/data/Leipzig/EBE2-luteItalianFret2.xml
deleted file mode 100644
index 658537028da..00000000000
--- a/data/Leipzig/EBE2-luteItalianFret2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M87 248.999c40.5608 0 81.9994 -20.5017 81.9994 -62.9994c0 -13.9743 -6.44598 -27.5914 -17.5973 -42.7978c-9.15411 -12.2055 -18.1178 -25.8684 -31.3392 -39.3836c0 0 -44.9179 -45.9161 -44.9415 -45.94 c-0.0360394 -0.0360394 -0.0727707 -0.0709694 -0.110151 -0.10479c-9.04812 -8.18639 -14.5859 -13.0465 -17.9427 -15.9925c-2.37929 -2.08807 -4.34297 -3.09081 -4.34297 -4.44546c0 -0.119359 0.0103543 -0.231754 0.0279685 -0.336602 c6.72911 0 13.4582 -0.000534409 20.1873 -0.000534409l51.0593 1.00058c12.16 0 19.8895 1.017 22.0753 1.51372c1.6937 2.48891 4.94015 7.04395 8.03143 10.1352c1.48929 1.48929 3.14134 3.35105 5.89332 3.35105c2.14714 0 4.26322 -0.473588 5.82113 -2.03151 c1.96544 -1.96544 2.17828 -4.56794 2.17828 -6.9679c0 -0.0529648 -0.00139223 -0.10593 -0.0041767 -0.158834l-1.99623 -37.9284c-0.0594922 -6.37994 -5.99201 -7.94599 -12.0034 -7.94599c-1.30178 0 -2.64246 0.0337757 -3.99559 0.0337757h-50 c-35.9978 0 -66.9789 -0.00174341 -90.8742 -0.99738c-0.0419184 -0.0017466 -0.0838665 -0.0026199 -0.125815 -0.0026199h-2c-4.82697 0 -8.99941 1.66876 -8.99941 5.99941c-0.218042 2.45942 -1.89886 4.96481 -1.89886 8.62991 c0 2.69654 0.835286 6.54975 3.77695 9.49141c5.64272 5.64272 15.3719 14.3676 21.0985 20.0942c22.7972 20.8431 37.3098 35.4762 53.8285 53.8303c27.4438 29.4041 40.1949 68.9932 40.1949 86.9542c0 18.46 -11.7323 36.0006 -31.0006 36.0006h-10 c-20.2557 0 -30.3096 -5.48741 -49.2022 -20.4027c-4.16744 -3.12558 -6.64633 -3.59734 -9.79778 -3.59734c-5.33434 0 -7.99941 4.45552 -7.99941 8.99941c0 4.43645 2.78243 9.02565 9.87809 16.1213c20.5221 20.5221 44.3554 29.8781 70.1213 29.8781z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE3-luteItalianFret3.xml b/data/Leipzig/EBE3-luteItalianFret3.xml
deleted file mode 100644
index 0700c87b51a..00000000000
--- a/data/Leipzig/EBE3-luteItalianFret3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M145.999 206c0 -21.589 -24.2937 -41.2395 -41.8466 -52.775c24.8193 -3.16322 36.9661 -11.9435 48.8951 -23.8725c9.64163 -9.64163 15.9514 -20.4636 15.9514 -34.3525c0 -17.9611 -8.18608 -38.7166 -26.1478 -56.6783 c-5.22496 -5.22496 -11.3273 -10.2441 -18.2422 -14.8541c-22.0307 -14.0195 -26.839 -15.3679 -43.8028 -20.3572c-18.3972 -5.11034 -36.6822 -6.10978 -52.8065 -6.10978c-12.7325 0 -22.2024 2.2669 -27.3393 7.40381 c-2.32806 2.32806 -3.66007 5.31475 -3.66007 8.5956c0 9.20231 8.46001 11.9994 17.9994 11.9994c5.41559 0 11.8063 -1.09736 20.0562 -4.19109c0.0970953 -0.0364107 0.192676 -0.0780247 0.286311 -0.124842c4.81861 -2.40931 7.28149 -2.81659 8.96553 -2.81659 c1.04633 0 1.66611 0.132522 2.69192 0.132522c5.68834 0 18.6947 5.70797 27.5431 10.6238c0.984545 0.54697 2.14935 0.929429 2.97915 1.27672c4.7487 1.98742 5.56735 2.24498 10.6311 6.46474c5.05039 3.95248 9.3383 7.6879 12.9402 11.2898 c12.5409 12.5409 16.907 23.3486 16.907 37.3455c0 24.7573 -19.3288 41.0006 -43.0006 41.0006c-6.91145 0 -21.5153 -2.64287 -26.2234 -3.89837l-15 -4c-0.254078 -0.0677541 -0.515344 -0.101631 -0.776611 -0.101631c-4.94713 0 -9.99941 5.05824 -9.99941 9.99941 c0 2.04589 1.12479 3.5264 2.27716 4.67878c3.2874 3.2874 9.56905 6.33938 18.5085 10.066l14.8033 6.90821c12.7391 7.65084 20.9397 13.6464 26.212 18.9186c8.93826 8.93826 9.95934 15.8086 11.2176 27.762c0.199293 1.79363 0.308637 3.49435 0.308637 5.09867 c0 7.06562 -2.3472 11.3286 -6.75797 14.6404c-7.6682 5.75758 -11.6876 8.92794 -22.5697 8.92794c-12.7577 0 -16.663 -0.687927 -33.5959 -9.65241c-2.16841 -1.14798 -4.5954 -1.98034 -6.85683 -2.94952c-5.41469 -4.23079 -11.3695 -6.39807 -14.5472 -6.39807 c-2.48393 0 -7.99941 2.28272 -7.99941 5.99941c0 7.3303 9.46566 14.9413 15.1482 19.3611c14.5228 11.4108 32.2311 17.6383 52.8512 17.6383c15.482 0 36.7456 -3.98959 48.5111 -10.4071c10.5741 -6.16822 25.4883 -17.6291 25.4883 -32.5923z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE4-luteItalianFret4.xml b/data/Leipzig/EBE4-luteItalianFret4.xml
deleted file mode 100644
index 36e893c74fd..00000000000
--- a/data/Leipzig/EBE4-luteItalianFret4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M118 -1.99941c-2.5413 0 -5.33271 -1 -8 -1h-3c-0.587337 0 -1.22426 -0.0306072 -1.88533 -0.0306072c-1.77718 0 -3.72884 0.221205 -5.36061 1.85297c-1.43836 1.43836 -1.75348 3.34213 -1.75348 5.17705c0 1.84945 0.977486 3.26123 2.00752 4.29127 c1.90349 1.90349 4.69859 3.41683 8.64935 5.39221c0.147975 0.0739875 0.300812 0.13498 0.456803 0.182977c5.99451 1.84447 15.7112 3.08963 17.8863 8.65803v37.4485l-106.001 -0.972359h-8c-8.26364 0 -16.9994 2.31834 -16.9994 9.99941 c0 3.99237 2.95192 6.99517 6.34409 11.2999c1.28791 1.63437 2.67705 3.78641 4.43535 5.71807l142.096 156.106c4.15577 4.15577 8.11664 6.87583 14.1238 6.87583c7.23857 0 14.9994 -2.29158 14.9994 -9.99941c0 0 0.0144199 -0.241523 0.0144199 -0.663211 c0 -1.97145 -0.315176 -7.88077 -3.89251 -11.4581l-142 -142c-0.39664 -0.39664 -1.31355 -1.84419 -2.05166 -3.06038c1.25385 0.0685571 2.4736 0.181111 3.93034 0.181111h71.8157c0.680409 0.488995 1.73622 1 3.18429 1h16.4595 c1.17974 0.498129 1.54142 0.862722 1.54142 3.04376l0.999692 69.9568c0 11.8317 11.2352 14.9994 23.9994 14.9994c6.52169 0 19.9994 -3.01195 19.9994 -11.9994v-71c0 -5.07909 -0.787003 -5.00059 3.00059 -5.00059c0 0 25.9994 -1.60847 25.9994 -9.99941 c0 -4.79378 -0.560611 -8.71897 -3.31925 -11.4776c-3.15563 -3.15563 -7.78162 -3.5218 -13.6802 -3.5218c-2.22657 0 -3.65938 0.67535 -5.08123 0.999785c-4.521 -0.0241309 -5.91936 -1.44445 -5.91936 -6.00037v-15.8836 c0.908781 -11.7416 1.84429 -18.1835 4.34313 -19.4329c1.19235 -0.596177 1.79082 -1.71349 2.55949 -2.48216c0.298658 -0.298658 1.64983 -0.996972 6.82919 -2.29181c6.23073 -1.55768 10.3519 -2.13294 12.8674 -4.64841 c0.761056 -0.761056 1.40082 -1.93407 1.40082 -3.26109c0 -1.75654 -0.254894 -3.99812 -2.00309 -5.74632c-1.73384 -1.73384 -4.16955 -2.25309 -6.99632 -2.25309c-15.532 0 -31.085 2 -43 2c-4.99257 0 -11.8328 -2.19098e-05 -20.6664 -0.981529 c-0.110824 -0.0123138 -0.222206 -0.0184707 -0.333587 -0.0184707h-10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE5-luteItalianFret5.xml b/data/Leipzig/EBE5-luteItalianFret5.xml
deleted file mode 100644
index bb0a7f7fbd8..00000000000
--- a/data/Leipzig/EBE5-luteItalianFret5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -2.99941c-6.36094 0 -11.9994 2.5276 -11.9994 8.99941c0 1.33474 0.692379 2.08462 1.05652 2.44876c2.45825 2.45825 8.47519 3.8234 21.1364 7.44087c17.1554 4.76539 26.815 8.54848 27.6332 8.87271c19.3655 8.72423 29.0341 17.2416 39.8812 29.1734 c10.5617 12.482 16.2927 27.7874 16.2927 44.0643c0 18.5045 -5.99919 32.6829 -17.1219 42.8787c-9.67657 9.67657 -21.0616 17.3343 -42.6716 23.228c-5.35366 1.46009 -12.3406 2.913 -19.949 4.9861c-12.3519 2.90877 -20.3506 5.67392 -24.506 9.82933 c-1.64511 1.64511 -2.75138 3.72772 -2.75138 6.07794c0 3.39968 2.22443 8.14522 6.23535 17.1688c6.04583 15.1182 8.61928 23.8845 9.91884 27.7832c1.87005 5.61015 3.61258 10.4664 7.89324 11.8932c2.99915 0.999717 6.54203 2.15419 11.952 2.15419 l0.21889 0.0100674c1.12415 0.0709809 4.63378 0.494013 10.2018 1.17826c8.81906 1.08376 33.2751 3.8367 46.6527 5.80584c10.4889 1.54394 20.301 3.00583 28.9266 3.00583c5.93671 0 8.99941 -5.74455 8.99941 -10.9994c0 -13.472 -6.12911 -26.9994 -20.9994 -26.9994 c-3.42812 0 -5.16391 -0.948126 -7.85859 -0.998689c-18.0179 -1.50133 -36.1178 -3.02318 -54.072 -4.55053c-8.25461 -0.702209 -9.99305 -1.28145 -12.937 -2.73504c-2.16811 -1.07051 -3.26491 -1.70594 -3.68952 -2.13055 c-0.0257041 -0.0257041 -1.70263 -3.32985 -1.70263 -6.21497c0 -0.847385 4.16448 -2.24445 11.6868 -3.40173c6.97486 -0.996409 14.1004 -1.99249 20.4548 -4.10053c25.1581 -7.04944 47.5233 -16.122 62.1012 -28.6173 c15.753 -13.8997 31.0164 -33.5846 31.0164 -55.2512c0 -24.8488 -10.5204 -46.2169 -28.1848 -63.8813c-17.4873 -17.4873 -39.7427 -29.7961 -66.7584 -39.927c-0.0345648 -0.0129618 -0.0693214 -0.0252642 -0.10425 -0.0369072 c-18.3822 -6.12741 -33.7933 -7.15419 -46.952 -7.15419z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE6-luteItalianFret6.xml b/data/Leipzig/EBE6-luteItalianFret6.xml
deleted file mode 100644
index 24f00e73bb0..00000000000
--- a/data/Leipzig/EBE6-luteItalianFret6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M102 138.999c41.5302 0 76.9994 -23.4296 76.9994 -65.9994c0 -21.5221 -3.9846 -41.2214 -19.9536 -55.1943c-16.038 -14.9688 -47.6663 -20.8051 -71.0458 -20.8051c-52.5273 0 -90.9994 37.3419 -90.9994 89.9994c0 34.2408 14.352 65.5953 43.7022 94.9454 c5.8701 5.8701 12.2824 11.6159 19.3564 17.3424c20.1563 17.1329 66.2479 49.7116 96.9409 49.7116c4.1359 0 7.99941 -2.81745 7.99941 -6.99941c0 -0.591571 0.0812094 -1.44111 0.0812094 -2.4051c0 -1.81924 -0.289223 -4.04614 -1.9593 -5.71622 c-1.61729 -1.61729 -3.8716 -2.76598 -5.95493 -3.64317c-18.6396 -7.84825 -36.4625 -19.7095 -53.3601 -32.6312c-8.00357 -6.04714 -15.0912 -12.1759 -21.331 -18.4157c-28.3796 -28.3796 -39.4758 -59.1306 -39.4758 -96.1886 c0 -21.2827 6.52843 -41.5646 18.4909 -53.5271c7.18645 -7.18645 16.2986 -11.4735 27.5097 -11.4735c16.5621 0 23.4919 2.61059 37.2583 12.4437c5.69568 4.06834 7.74226 22.2106 7.74226 37.5569c0 28.4356 -14.4777 48.0006 -43.0006 48.0006 c-4.83073 0 -14.7758 -3 -20 -3c-3.39057 0 -6.48672 2.20297 -8.55013 4.26638c-1.08747 1.08747 -2.44929 2.44066 -2.44929 4.73303c0 2.06366 1.09146 3.64045 2.26299 4.81198c7.30205 7.30205 31.2167 12.1874 39.7364 12.1874z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE7-luteItalianFret7.xml b/data/Leipzig/EBE7-luteItalianFret7.xml
deleted file mode 100644
index 265215a6c5d..00000000000
--- a/data/Leipzig/EBE7-luteItalianFret7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M115.001 202c0 1.74074 0.846645 3.51149 0.968316 6.57022c-0.834553 0.620516 -1.93898 1.43051 -1.93898 1.43051l-101.03 -1.00015c-6.01323 0 -10.2837 0.131807 -13.1879 3.03602c-2.5545 2.5545 -2.83328 5.97425 -2.83328 10.2175 c0 1.18474 0.0217328 2.43368 0.0217328 3.74591c0 7.7221 0.0403777 14.101 4.20464 18.2653c2.75799 2.75799 6.73796 3.73411 11.7948 3.73411c6.53019 0 26.3529 -1 33 -1c15.0338 0 30.1291 -0.444336 45.333 -0.444336c20.4401 0 40.0413 1.35868 59.4994 2.43968 c0.0558297 0.00310165 0.11173 0.00465247 0.16763 0.00465247c4.58104 0 8.58802 -0.0652331 11.4026 -2.87986c2.06451 -2.06451 2.59677 -4.91777 2.59677 -8.11956c0 -4.12021 -15.6827 -39.1114 -19.3119 -45.3498l-75.9463 -180.87 c-2.94735 -6.63153 -10.9711 -14.7791 -17.7412 -14.7791c-5.44442 0 -16.9994 2.76915 -16.9994 9.99941c0 0.686781 -0.147067 3.87762 1.23409 7.16443l78.7659 187.443v0.392654z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE8-luteItalianFret8.xml b/data/Leipzig/EBE8-luteItalianFret8.xml
deleted file mode 100644
index a1cd24ab817..00000000000
--- a/data/Leipzig/EBE8-luteItalianFret8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M51.9994 192c0 -9.69122 2.68532 -19.0747 11.0869 -27.4763c1.40654 -1.40654 2.98092 -2.79013 4.74053 -4.14367c15.7309 -12.7813 22.6559 -14.3806 35.1731 -14.3806c11.5056 0 24.3628 5.92241 32.6933 15.919c7.35835 9.19794 8.30728 19.2245 8.30728 30.0816 c0 11.8338 -5.22379 18.9676 -13.0721 27.8145c-9.56569 7.60375 -19.7537 12.186 -33.9285 12.186c-15.9695 0 -28.2493 -6.15498 -36.977 -14.8827c-6.55323 -6.55323 -8.02354 -13.8173 -8.02354 -25.1179zM39.9994 57c0 -13.044 6.96956 -23.6359 16.0059 -31.7686 c9.2866 -8.35794 20.3489 -11.232 35.9947 -11.232c20.102 0 32.3158 6.78876 43.166 17.639c7.11857 7.11857 11.8346 14.8845 11.8346 25.3616c0 11.0133 -1.22633 16.9831 -4.12191 19.8787c-3.09935 3.09935 -5.15338 8.07694 -8.67646 10.7192 c-3.8997 2.92478 -6.86386 4.90691 -10.7806 7.8357c-6.34884 3.13056 -19.0783 5.47325 -27.8988 7.43912c-3.63566 0.810295 -4.95356 1.12784 -8.52278 1.12784c-6.80358 0 -25.4377 -7.26339 -36.719 -18.5447c-6.83543 -6.83543 -10.2816 -15.2204 -10.2816 -28.4559z M-2.99941 56c0 15.1782 2.87248 29.6765 15.6899 42.4939c2.74316 2.74316 5.87686 5.36513 9.54716 7.93434c11.0552 8.04012 19.4469 13.3091 29.9347 16.4555c3.96942 1.13412 8.15864 1.29443 11.6582 2.17142c-6.54442 4.77272 -17.0529 8.64916 -25.0507 12.2037 c-0.163226 0.072545 -0.321282 0.160375 -0.471989 0.263491c-5.86208 4.01089 -10.9342 8.05325 -15.1843 12.3034c-9.7987 9.7987 -15.1228 20.7633 -15.1228 34.1743c0 21.1795 17.3036 37.4753 32.3711 47.5202c17.4388 11.2839 37.0392 17.4792 58.6284 17.4792 c29.3287 0 54.2945 -7.63584 68.771 -22.1124c9.04274 -9.04274 14.2284 -20.9093 14.2284 -34.887c0 -12.6511 -4.74303 -23.6187 -14.4509 -33.3266c-5.02871 -5.02871 -11.3483 -9.72221 -19.0229 -14.2572c-3.89967 -2.30435 -9.85301 -6.01003 -14.586 -7.27188 c-1.50316 -0.599945 -3.50577 -1.42757 -4.53201 -1.91363c3.28208 -2.38512 10.3078 -5.32418 14.6807 -6.91143c2.9579 -1.07365 5.08104 -1.45615 6.7373 -2.91981c9.73262 -6.01391 18.835 -13.0509 24.7146 -18.9305 c8.50479 -8.50479 15.4593 -24.2883 15.4593 -40.4689c0 -16.3424 -6.90542 -30.9377 -18.3913 -42.4236c-4.11893 -4.11893 -8.72311 -7.77416 -13.9103 -11.0503c-16.898 -11.6174 -43.4327 -15.5255 -68.6978 -15.5255c-23.0825 0 -44.6362 1.86811 -59.5709 11.4423 c-15.5417 9.15472 -33.4285 25.849 -33.4285 47.5571z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE9-luteItalianFret9.xml b/data/Leipzig/EBE9-luteItalianFret9.xml
deleted file mode 100644
index 2d0fa809190..00000000000
--- a/data/Leipzig/EBE9-luteItalianFret9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EBE9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M109 132.999c3.41418 0 5.99941 -2.58047 5.99941 -5.99941c0 -8.30426 -8.90271 -15.0516 -17.3451 -16.9277c-9.17045 -2.03788 -17.2844 -3.07176 -22.6543 -3.07176c-20.1432 0 -43.9297 2.68996 -57.0335 15.7937c-13.247 12.228 -20.9659 30.288 -20.9659 48.2057 c0 21.2944 10.6894 39.8402 26.0258 53.2595c16.5799 14.5074 42.1154 24.7399 64.9736 24.7399c26.6046 0 55.6606 -8.35346 72.1897 -26.9487c15.6938 -16.74 21.8097 -39.5771 21.8097 -64.0507c0 -6.3061 -1.03631 -17.4876 -4.07715 -31.6782 c-3.05489 -13.2379 -7.12531 -23.5065 -12.3403 -31.8506c-17.7025 -29.873 -43.5079 -51.9634 -73.993 -71.0166c-16.3703 -10.2314 -37.4682 -18.2402 -54.5326 -24.263c-5.22104 -1.95789 -9.42979 -2.34294 -12.3318 -2.34294 c-1.52019 0 -2.55487 0.151846 -3.72446 0.151846c-5.08589 0 -8.99941 4.62292 -8.99941 8.99941c0 2.71308 1.63305 4.92365 3.73597 7.02657c6.08035 6.08035 18.6085 10.9996 27.8514 15.621c29.5237 15.746 49.5195 29.4864 66.9755 53.1033 c17.6711 24.5432 27.4372 52.9492 27.4372 81.2492c0 17.607 -2.75619 26.7594 -10.5653 40.4404c-8.59035 13.2529 -22.1772 26.5602 -40.4353 26.5602c-16.4256 0 -28.7492 -8.46116 -36.4676 -19.6099c-6.82344 -10.7226 -10.533 -19.9402 -10.533 -35.3906 c0 -14.8027 7.45053 -27.4278 16.2003 -36.1777c6.4778 -6.4778 13.0667 -9.82293 21.8002 -9.82293c9.45771 0 21.5864 4 31 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/ED40-articSoftAccentAbove.xml b/data/Leipzig/ED40-articSoftAccentAbove.xml
deleted file mode 100644
index bf32f801058..00000000000
--- a/data/Leipzig/ED40-articSoftAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="ED40" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M347 236v-33l-252 -86l252 -84v-33l-347 117zM373 236l347 -119l-347 -117v33l252 84l-252 86v33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/ED41-articSoftAccentBelow.xml b/data/Leipzig/ED41-articSoftAccentBelow.xml
deleted file mode 100644
index f01bb829d7e..00000000000
--- a/data/Leipzig/ED41-articSoftAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="ED41" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M347 -236l-347 119l347 117v-33l-252 -84l252 -86v-33zM373 -236v33l252 86l-252 84v33l347 -117z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland.xml b/data/Leland.xml
deleted file mode 100644
index 4af642a74fe..00000000000
--- a/data/Leland.xml
+++ /dev/null
@@ -1,500 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bounding-boxes font-family="Leland" units-per-em="1000">
-	<g c="E527" x="-95.0" y="-163.0" w="2032.0" h="426.0" h-a-x="1970" >
-		<a n="opticalCenter" x="4.024" y="0"/>
-	</g>
-	<g c="E528" x="-95.0" y="-163.0" w="1708.0" h="425.0" h-a-x="1646" >
-		<a n="opticalCenter" x="3.376" y="0"/>
-	</g>
-	<g c="E529" x="-95.0" y="-163.0" w="1384.0" h="426.0" h-a-x="1322" >
-		<a n="opticalCenter" x="2.728" y="0"/>
-	</g>
-	<g c="E52A" x="-95.0" y="-163.0" w="1060.0" h="426.0" h-a-x="998" >
-		<a n="opticalCenter" x="2.08" y="0"/>
-	</g>
-	<g c="E52B" x="-95.0" y="-163.0" w="736.0" h="426.0" h-a-x="674" >
-		<a n="opticalCenter" x="1.432" y="0"/>
-	</g>
-	<g c="E52C" x="-7.0" y="-163.0" w="703.0" h="426.0" h-a-x="729" >
-		<a n="opticalCenter" x="1.496" y="0"/>
-	</g>
-	<g c="E52D" x="-7.0" y="-193.0" w="715.0" h="614.0" h-a-x="741" >
-		<a n="opticalCenter" x="1.52" y="0"/>
-	</g>
-	<g c="E52E" x="-95.0" y="-193.0" w="791.0" h="614.0" h-a-x="719" >
-		<a n="opticalCenter" x="1.544" y="0"/>
-	</g>
-	<g c="E52F" x="-137.0" y="-196.0" w="725.0" h="618.0" h-a-x="621" >
-		<a n="opticalCenter" x="1.264" y="0"/>
-	</g>
-	<g c="E530" x="-137.0" y="-196.0" w="975.0" h="619.0" h-a-x="871" >
-		<a n="opticalCenter" x="1.824" y="0"/>
-	</g>
-	<g c="E531" x="-137.0" y="-196.0" w="1225.0" h="619.0" h-a-x="1121" >
-		<a n="opticalCenter" x="2.324" y="0"/>
-	</g>
-	<g c="E532" x="-137.0" y="-199.0" w="1475.0" h="618.0" h-a-x="1371" >
-		<a n="opticalCenter" x="2.824" y="0"/>
-	</g>
-	<g c="E533" x="-137.0" y="-196.0" w="1725.0" h="619.0" h-a-x="1621" >
-		<a n="opticalCenter" x="3.324" y="0"/>
-	</g>
-	<g c="E534" x="-136.0" y="-193.0" w="717.0" h="614.0" h-a-x="614" >
-		<a n="opticalCenter" x="1.308" y="0"/>
-	</g>
-	<g c="E535" x="-137.0" y="-193.0" w="600.0" h="614.0" h-a-x="480" >
-		<a n="opticalCenter" x="1.068" y="0"/>
-	</g>
-	<g c="E536" x="0.0" y="-193.0" w="567.0" h="614.0" h-a-x="600" >
-		<a n="opticalCenter" x="1.204" y="0"/>
-	</g>
-	<g c="E537" x="0.0" y="-193.0" w="807.0" h="614.0" h-a-x="840" >
-		<a n="opticalCenter" x="1.62" y="0"/>
-	</g>
-	<g c="E538" x="0.0" y="-193.0" w="1131.0" h="614.0" h-a-x="1164" >
-		<a n="opticalCenter" x="1.62" y="0"/>
-	</g>
-	<g c="E539" x="0.0" y="-193.0" w="698.0" h="614.0" h-a-x="715" >
-		<a n="opticalCenter" x="1.464" y="0"/>
-	</g>
-	<g c="E53A" x="0.0" y="-198.0" w="1012.0" h="614.0" h-a-x="1045" >
-		<a n="opticalCenter" x="1.464" y="0"/>
-	</g>
-	<g c="E53B" x="0.0" y="-196.0" w="950.0" h="618.0" h-a-x="967" >
-		<a n="opticalCenter" x="1.968" y="0"/>
-	</g>
-	<g c="E53C" x="-12.0" y="-193.0" w="598.0" h="614.0" h-a-x="619" >
-		<a n="opticalCenter" x="1.268" y="0"/>
-	</g>
-	<g c="E53D" x="-12.0" y="-193.0" w="728.0" h="614.0" h-a-x="733" >
-		<a n="opticalCenter" x="1.528" y="0"/>
-	</g>
-	<g c="E000" x="-1.0" y="4.6" w="63.0" h="990.4" h-a-x="62" />
-	<g c="E003" x="0.0" y="0.0" w="491.0" h="279.0" h-a-x="491" />
-	<g c="E004" x="0.0" y="-279.0" w="491.0" h="279.0" h-a-x="491" />
-	<g c="E043" x="0.0" y="322.0" w="104.0" h="356.0" h-a-x="104" />
-	<g c="E044" x="0.0" y="-53.0" w="104.0" h="106.0" h-a-x="104" />
-	<g c="E047" x="0.0" y="0.0" w="654.0" h="869.0" h-a-x="654" />
-	<g c="E048" x="0.0" y="-113.0" w="745.0" h="848.0" h-a-x="745" />
-	<g c="E049" x="0.0" y="-113.0" w="738.0" h="848.0" h-a-x="738" />
-	<g c="E04B" x="0.0" y="-281.0" w="554.0" h="1562.0" h-a-x="554" />
-	<g c="E050" x="0.0" y="-666.0" w="640.0" h="1778.0" h-a-x="640" />
-	<g c="E051" x="0.0" y="-898.0" w="640.0" h="2010.0" h-a-x="640" />
-	<g c="E052" x="0.0" y="-898.0" w="640.0" h="2011.0" h-a-x="640" />
-	<g c="E053" x="0.0" y="-666.0" w="640.0" h="2003.0" h-a-x="640" />
-	<g c="E054" x="0.0" y="-667.0" w="640.0" h="2005.0" h-a-x="640" />
-	<g c="E055" x="0.0" y="-667.0" w="1044.0" h="1779.0" h-a-x="1044" />
-	<g c="E05C" x="0.0" y="-480.0" w="627.0" h="962.0" h-a-x="627" />
-	<g c="E05D" x="0.0" y="-740.0" w="627.0" h="1222.0" h-a-x="627" />
-	<g c="E062" x="0.0" y="-617.0" w="664.0" h="868.0" h-a-x="663" />
-	<g c="E063" x="0.0" y="-744.0" w="663.0" h="995.0" h-a-x="662" />
-	<g c="E064" x="0.0" y="-742.0" w="664.0" h="993.0" h-a-x="663" />
-	<g c="E065" x="0.0" y="-616.0" w="665.0" h="1104.0" h-a-x="664" />
-	<g c="E066" x="0.0" y="-616.0" w="665.0" h="1108.0" h-a-x="664" />
-	<g c="E069" x="0.0" y="-252.0" w="352.0" h="504.0" h-a-x="352" />
-	<g c="E080" x="15.0" y="-254.0" w="374.0" h="509.0" h-a-x="404" />
-	<g c="E081" x="15.0" y="-243.0" w="321.0" h="488.0" h-a-x="351" />
-	<g c="E082" x="15.0" y="-243.0" w="362.0" h="488.0" h-a-x="392" />
-	<g c="E083" x="15.0" y="-244.0" w="349.0" h="488.0" h-a-x="379" />
-	<g c="E084" x="14.0" y="-248.0" w="428.0" h="497.0" h-a-x="457" />
-	<g c="E085" x="15.0" y="-244.0" w="347.0" h="490.0" h-a-x="377" />
-	<g c="E086" x="15.0" y="-244.0" w="372.0" h="489.0" h-a-x="402" />
-	<g c="E087" x="15.0" y="-250.0" w="351.0" h="501.0" h-a-x="381" />
-	<g c="E088" x="15.0" y="-248.0" w="378.0" h="494.0" h-a-x="408" />
-	<g c="E089" x="15.0" y="-244.0" w="372.0" h="489.0" h-a-x="402" />
-	<g c="E08A" x="0.0" y="-256.0" w="463.0" h="514.0" h-a-x="463" />
-	<g c="E08B" x="0.0" y="-376.0" w="463.0" h="764.0" h-a-x="463" />
-	<g c="E08C" x="0.0" y="-204.0" w="408.0" h="408.0" h-a-x="408" />
-	<g c="E0A0" x="0.0" y="-178.0" w="538.0" h="357.0" h-a-x="539" />
-	<g c="E0A1" x="0.0" y="-179.0" w="432.0" h="356.0" h-a-x="432" />
-	<g c="E0A2" x="0.0" y="-134.0" w="373.0" h="270.0" h-a-x="373" >
-		<a n="cutOutNE" x="1.296" y="0.4"/>
-		<a n="cutOutNW" x="0.2" y="0.4"/>
-		<a n="cutOutSW" x="0.212" y="-0.4"/>
-		<a n="stemUpSE" x="1.284" y="-0.4"/>
-	</g>
-	<g c="E0A3" x="0.0" y="-133.0" w="325.0" h="265.0" >
-		<a n="cutOutNE" x="1.184" y="0.42"/>
-		<a n="cutOutNW" x="0.272" y="0.312"/>
-		<a n="cutOutSE" x="1.072" y="-0.284"/>
-		<a n="cutOutSW" x="0.156" y="-0.456"/>
-		<a n="stemDownNW" x="0" y="-0.168"/>
-		<a n="stemUpSE" x="1.3" y="0.16"/>
-	</g>
-	<g c="E0A4" x="0.0" y="-133.0" w="325.0" h="265.0" >
-		<a n="cutOutNE" x="1.184" y="0.42"/>
-		<a n="cutOutNW" x="0.272" y="0.312"/>
-		<a n="cutOutSE" x="1.072" y="-0.284"/>
-		<a n="cutOutSW" x="0.156" y="-0.456"/>
-		<a n="stemDownNW" x="0" y="-0.168"/>
-		<a n="stemUpSE" x="1.3" y="0.16"/>
-	</g>
-	<g c="E0A5" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" />
-	<g c="E0A9" x="0.0" y="-132.0" w="325.0" h="264.0" >
-		<a n="stemDownNW" x="0" y="-0.424"/>
-		<a n="stemUpSE" x="1.3" y="0.424"/>
-	</g>
-	<g c="E0AF" x="0.0" y="-132.0" w="325.0" h="264.0" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.3" y="0"/>
-	</g>
-	<g c="E0D9" x="0.0" y="-132.0" w="335.0" h="265.0" h-a-x="335" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.34" y="0"/>
-	</g>
-	<g c="E0DB" x="0.0" y="-132.0" w="335.0" h="265.0" h-a-x="335" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.34" y="0"/>
-	</g>
-	<g c="E220" x="0.0" y="-93.0" w="290.0" h="189.0" h-a-x="290" />
-	<g c="E221" x="0.0" y="-188.0" w="290.0" h="377.0" h-a-x="290" />
-	<g c="E222" x="0.0" y="-283.0" w="290.0" h="566.0" h-a-x="290" />
-	<g c="E223" x="0.0" y="-377.0" w="290.0" h="755.0" h-a-x="290" />
-	<g c="E224" x="0.0" y="-471.0" w="290.0" h="944.0" h-a-x="290" />
-	<g c="E22A" x="-150.0" y="-140.0" w="300.0" h="280.0" h-a-x="150" />
-	<g c="E240" x="0.0" y="-817.0" w="289.0" h="829.0" h-a-x="289" >
-		<a n="stemUpNW" x="0" y="-0.008"/>
-	</g>
-	<g c="E241" x="0.0" y="-12.0" w="309.0" h="829.0" h-a-x="309" >
-		<a n="stemDownSW" x="0" y="0.004"/>
-	</g>
-	<g c="E242" x="0.0" y="-820.0" w="279.0" h="832.0" h-a-x="280" >
-		<a n="stemUpNW" x="0" y="-0.004"/>
-	</g>
-	<g c="E243" x="0.0" y="-26.0" w="309.0" h="829.0" h-a-x="309" >
-		<a n="stemDownSW" x="0" y="-0.036"/>
-	</g>
-	<g c="E244" x="0.0" y="-821.0" w="279.0" h="1007.0" h-a-x="279" >
-		<a n="stemUpNW" x="0" y="0.692"/>
-	</g>
-	<g c="E245" x="0.0" y="-216.0" w="309.0" h="1019.0" h-a-x="309" >
-		<a n="stemDownSW" x="0" y="-0.796"/>
-	</g>
-	<g c="E246" x="0.0" y="-822.0" w="279.0" h="1195.0" h-a-x="279" >
-		<a n="stemUpNW" x="0" y="1.44"/>
-	</g>
-	<g c="E247" x="0.0" y="-403.0" w="309.0" h="1207.0" h-a-x="309" >
-		<a n="stemDownSW" x="0" y="-1.544"/>
-	</g>
-	<g c="E248" x="0.0" y="-821.0" w="279.0" h="1394.0" h-a-x="280" >
-		<a n="stemUpNW" x="0" y="2.24"/>
-	</g>
-	<g c="E249" x="0.0" y="-591.0" w="309.0" h="1394.0" h-a-x="309" >
-		<a n="stemDownSW" x="0" y="-2.296"/>
-	</g>
-	<g c="E24A" x="0.0" y="-820.1" w="279.0" h="1580.1" h-a-x="280" >
-		<a n="stemUpNW" x="0" y="2.988"/>
-	</g>
-	<g c="E24B" x="0.0" y="-779.0" w="309.0" h="1582.0" h-a-x="309" >
-		<a n="stemDownSW" x="0" y="-3.048"/>
-	</g>
-	<g c="E24C" x="0.0" y="-820.0" w="279.0" h="1763.0" h-a-x="279" >
-		<a n="stemUpNW" x="0" y="3.72"/>
-	</g>
-	<g c="E24D" x="0.0" y="-966.0" w="309.0" h="1770.0" h-a-x="309" >
-		<a n="stemDownSW" x="0" y="-3.796"/>
-	</g>
-	<g c="E24E" x="0.0" y="-820.0" w="279.0" h="1946.0" h-a-x="279" >
-		<a n="stemUpNW" x="0" y="4.452"/>
-	</g>
-	<g c="E24F" x="0.0" y="-1142.0" w="309.0" h="1945.0" h-a-x="309" >
-		<a n="stemDownSW" x="0" y="-4.5"/>
-	</g>
-	<g c="E260" x="0.0" y="-176.0" w="203.0" h="629.0" h-a-x="212" >
-		<a n="cutOutNE" x="0.18" y="0.64"/>
-		<a n="cutOutSE" x="0.544" y="-0.42"/>
-	</g>
-	<g c="E261" x="0.0" y="-323.0" w="171.0" h="648.0" h-a-x="171" >
-		<a n="cutOutNE" x="0.132" y="0.764"/>
-		<a n="cutOutSW" x="0.556" y="-0.752"/>
-	</g>
-	<g c="E262" x="0.0" y="-333.0" w="244.0" h="667.0" h-a-x="244" >
-		<a n="cutOutNE" x="0.8" y="0.76"/>
-		<a n="cutOutNW" x="0.18" y="0.64"/>
-		<a n="cutOutSE" x="0.8" y="-0.636"/>
-		<a n="cutOutSW" x="0.18" y="-0.756"/>
-	</g>
-	<g c="E263" x="0.0" y="-137.0" w="275.0" h="275.0" h-a-x="275" />
-	<g c="E264" x="0.0" y="-176.0" w="371.0" h="629.0" h-a-x="371" >
-		<a n="cutOutNE" x="0.84" y="0.64"/>
-		<a n="cutOutSE" x="1.208" y="-0.42"/>
-	</g>
-	<g c="E265" x="0.0" y="-333.0" w="586.0" h="667.0" h-a-x="586" >
-		<a n="cutOutNE" x="0.996" y="0.56"/>
-		<a n="cutOutNW" x="0.18" y="0.64"/>
-		<a n="cutOutSE" x="0.996" y="-0.568"/>
-		<a n="cutOutSW" x="0.18" y="-0.756"/>
-	</g>
-	<g c="E266" x="0.0" y="-176.0" w="539.0" h="629.0" h-a-x="539" >
-		<a n="cutOutNE" x="1.512" y="0.64"/>
-		<a n="cutOutSE" x="1.884" y="-0.42"/>
-	</g>
-	<g c="E267" x="0.0" y="-323.0" w="440.0" h="776.0" h-a-x="440" >
-		<a n="cutOutNE" x="1.116" y="0.64"/>
-		<a n="cutOutSE" x="1.488" y="-0.42"/>
-		<a n="cutOutSW" x="0.556" y="-0.752"/>
-	</g>
-	<g c="E268" x="0.0" y="-331.0" w="478.0" h="667.0" h-a-x="478" >
-		<a n="cutOutNE" x="1.736" y="0.796"/>
-		<a n="cutOutSE" x="1.736" y="-0.628"/>
-		<a n="cutOutSW" x="0.556" y="-0.752"/>
-	</g>
-	<g c="E269" x="0.0" y="-333.0" w="535.0" h="667.0" h-a-x="535" >
-		<a n="cutOutNE" x="1.964" y="0.76"/>
-		<a n="cutOutNW" x="0.18" y="0.64"/>
-		<a n="cutOutSE" x="1.964" y="-0.636"/>
-		<a n="cutOutSW" x="0.18" y="-0.756"/>
-	</g>
-	<g c="E26A" x="0.0" y="-212.0" w="75.0" h="421.4" h-a-x="75" />
-	<g c="E26B" x="0.0" y="-209.4" w="75.0" h="421.4" h-a-x="75" />
-	<g c="E26C" x="0.0" y="-205.0" w="73.0" h="411.0" h-a-x="73" />
-	<g c="E26D" x="0.0" y="-205.0" w="73.0" h="411.0" h-a-x="73" />
-	<g c="E270" x="0.0" y="-165.0" w="280.0" h="619.0" h-a-x="280" >
-		<a n="cutOutNE" x="0.796" y="0.684"/>
-		<a n="cutOutSE" x="0.804" y="-0.42"/>
-		<a n="cutOutSW" x="0.292" y="1.216"/>
-	</g>
-	<g c="E271" x="0.0" y="-448.0" w="280.0" h="911.0" h-a-x="280" >
-		<a n="cutOutNE" x="0.48" y="0.684"/>
-		<a n="cutOutNW" x="0.312" y="-1.192"/>
-		<a n="cutOutSE" x="0.804" y="-0.42"/>
-	</g>
-	<g c="E272" x="0.0" y="-323.0" w="255.0" h="773.0" h-a-x="255" >
-		<a n="cutOutNE" x="0.796" y="0.764"/>
-		<a n="cutOutSW" x="0.312" y="1.2"/>
-	</g>
-	<g c="E273" x="0.0" y="-448.0" w="255.0" h="773.0" h-a-x="255" >
-		<a n="cutOutNE" x="0.704" y="-1.192"/>
-		<a n="cutOutSW" x="0.22" y="-0.752"/>
-	</g>
-	<g c="E274" x="0.0" y="-333.0" w="278.0" h="792.0" h-a-x="278" >
-		<a n="cutOutNE" x="0.924" y="1.64"/>
-		<a n="cutOutNW" x="0.18" y="0.644"/>
-		<a n="cutOutSE" x="0.8" y="-0.64"/>
-		<a n="cutOutSW" x="0.18" y="-0.78"/>
-	</g>
-	<g c="E275" x="0.0" y="-458.0" w="278.0" h="792.0" h-a-x="277" >
-		<a n="cutOutNE" x="0.932" y="0.76"/>
-		<a n="cutOutNW" x="0.312" y="0.644"/>
-		<a n="cutOutSE" x="0.8" y="-1.12"/>
-		<a n="cutOutSW" x="0.176" y="-1.604"/>
-	</g>
-	<g c="E280" x="0.0" y="-176.0" w="193.0" h="628.0" h-a-x="193" >
-		<a n="cutOutNE" x="0.18" y="0.64"/>
-		<a n="cutOutNW" x="0.62" y="0.624"/>
-		<a n="cutOutSE" x="0.544" y="-0.42"/>
-		<a n="cutOutSW" x="0.272" y="-0.42"/>
-	</g>
-	<g c="E281" x="0.0" y="-176.0" w="422.0" h="628.0" h-a-x="422" >
-		<a n="cutOutNE" x="1.068" y="0.624"/>
-		<a n="cutOutNW" x="0.62" y="0.624"/>
-		<a n="cutOutSE" x="1.416" y="-0.42"/>
-		<a n="cutOutSW" x="0.272" y="-0.42"/>
-	</g>
-	<g c="E282" x="0.0" y="-316.0" w="180.0" h="636.0" h-a-x="180" >
-		<a n="cutOutNE" x="0.436" y="0.768"/>
-		<a n="cutOutNW" x="0.284" y="0.692"/>
-		<a n="cutOutSE" x="0.436" y="-0.68"/>
-		<a n="cutOutSW" x="0.284" y="-0.752"/>
-	</g>
-	<g c="E283" x="0.0" y="-328.0" w="290.0" h="667.0" h-a-x="290" >
-		<a n="cutOutNE" x="0.988" y="0.78"/>
-		<a n="cutOutNW" x="0.172" y="0.62"/>
-		<a n="cutOutSE" x="0.988" y="-0.616"/>
-		<a n="cutOutSW" x="0.172" y="-0.776"/>
-	</g>
-	<g c="E440" x="0.0" y="-176.0" w="277.0" h="630.0" h-a-x="277" >
-		<a n="cutOutNE" x="0.952" y="0.644"/>
-		<a n="cutOutNW" x="0.28" y="1.464"/>
-		<a n="cutOutSE" x="0.836" y="-0.42"/>
-		<a n="cutOutSW" x="0.284" y="0.6"/>
-	</g>
-	<g c="E442" x="0.0" y="-176.0" w="277.0" h="630.0" h-a-x="277" >
-		<a n="cutOutNE" x="0.952" y="0.644"/>
-		<a n="cutOutNW" x="0.284" y="1.08"/>
-		<a n="cutOutSE" x="0.836" y="-0.42"/>
-		<a n="cutOutSW" x="0.284" y="0.688"/>
-	</g>
-	<g c="E446" x="0.0" y="-316.0" w="348.0" h="634.0" h-a-x="348" >
-		<a n="cutOutNE" x="0.768" y="0.812"/>
-		<a n="cutOutNW" x="0.624" y="0.684"/>
-		<a n="cutOutSE" x="0.764" y="-0.676"/>
-		<a n="cutOutSW" x="0.624" y="-0.804"/>
-	</g>
-	<g c="E447" x="0.0" y="-332.0" w="348.0" h="666.0" h-a-x="348" >
-		<a n="cutOutNE" x="1.004" y="0.816"/>
-		<a n="cutOutNW" x="0.392" y="0.62"/>
-		<a n="cutOutSE" x="1.004" y="-0.616"/>
-		<a n="cutOutSW" x="0.392" y="-0.804"/>
-	</g>
-	<g c="E4A0" x="0.0" y="0.0" w="361.0" h="235.0" h-a-x="360" />
-	<g c="E4A1" x="0.0" y="-235.0" w="361.0" h="235.0" h-a-x="360" />
-	<g c="E4A2" x="-0.3" y="0.0" w="78.5" h="78.0" h-a-x="78" />
-	<g c="E4A3" x="-0.3" y="-78.0" w="78.5" h="78.0" h-a-x="78" />
-	<g c="E4A4" x="0.0" y="0.0" w="316.0" h="46.0" h-a-x="316" />
-	<g c="E4A5" x="0.0" y="-46.0" w="316.0" h="46.0" h-a-x="316" />
-	<g c="E4A6" x="0.0" y="0.0" w="127.0" h="248.0" h-a-x="127" />
-	<g c="E4A7" x="0.0" y="-248.0" w="127.0" h="248.0" h-a-x="127" />
-	<g c="E4AC" x="1.0" y="0.0" w="295.0" h="253.0" h-a-x="295" />
-	<g c="E4AD" x="0.0" y="-253.0" w="295.0" h="253.0" h-a-x="296" />
-	<g c="E4AE" x="1.0" y="0.0" w="295.0" h="386.0" h-a-x="296" />
-	<g c="E4AF" x="0.0" y="-386.0" w="295.0" h="386.0" h-a-x="296" />
-	<g c="E4B0" x="0.0" y="0.0" w="361.0" h="344.0" h-a-x="360" />
-	<g c="E4B1" x="0.0" y="-344.0" w="361.0" h="344.0" h-a-x="360" />
-	<g c="E4B2" x="0.0" y="0.0" w="316.0" h="187.0" h-a-x="316" />
-	<g c="E4B3" x="0.0" y="-187.0" w="316.0" h="187.0" h-a-x="316" />
-	<g c="E4B4" x="0.0" y="0.0" w="361.0" h="358.0" h-a-x="360" />
-	<g c="E4B5" x="0.0" y="-358.0" w="361.0" h="358.0" h-a-x="360" />
-	<g c="E4B6" x="0.0" y="0.0" w="212.0" h="212.0" h-a-x="212" />
-	<g c="E4B7" x="0.0" y="-212.0" w="212.0" h="212.0" h-a-x="212" />
-	<g c="E4B8" x="0.0" y="-162.0" w="342.0" h="162.0" h-a-x="342" />
-	<g c="E4B9" x="0.0" y="0.0" w="342.0" h="162.0" h-a-x="342" />
-	<g c="E4BA" x="0.0" y="0.0" w="488.0" h="122.0" h-a-x="489" />
-	<g c="E4BB" x="0.0" y="-122.0" w="488.0" h="122.0" h-a-x="489" />
-	<g c="E4BC" x="0.0" y="0.0" w="316.0" h="369.0" h-a-x="316" />
-	<g c="E4BD" x="0.0" y="-369.0" w="316.0" h="369.0" h-a-x="316" />
-	<g c="E4C0" x="0.0" y="0.0" w="622.0" h="368.0" h-a-x="622" />
-	<g c="E4C1" x="0.0" y="-368.0" w="622.0" h="368.0" h-a-x="622" />
-	<g c="E4C4" x="0.0" y="0.0" w="642.0" h="454.0" h-a-x="642" />
-	<g c="E4C5" x="0.0" y="-454.0" w="642.0" h="454.0" h-a-x="642" />
-	<g c="E4C6" x="0.0" y="0.0" w="623.0" h="368.0" h-a-x="623" />
-	<g c="E4C7" x="0.0" y="-368.0" w="623.0" h="368.0" h-a-x="623" />
-	<g c="E4C8" x="0.0" y="0.0" w="842.0" h="549.0" h-a-x="842" />
-	<g c="E4C9" x="0.0" y="-549.0" w="842.0" h="549.0" h-a-x="842" />
-	<g c="E4E0" x="0.0" y="-250.0" w="450.0" h="500.0" h-a-x="450" />
-	<g c="E4E1" x="0.0" y="-250.0" w="125.0" h="500.0" h-a-x="125" />
-	<g c="E4E2" x="0.0" y="-11.0" w="125.0" h="273.0" h-a-x="125" />
-	<g c="E4E3" x="0.0" y="-131.0" w="325.0" h="136.0" />
-	<g c="E4E4" x="0.0" y="-4.0" w="325.0" h="136.0" />
-	<g c="E4E5" x="0.0" y="-331.0" w="235.0" h="732.0" h-a-x="235" />
-	<g c="E4E6" x="0.0" y="-255.0" w="276.0" h="459.0" h-a-x="276" />
-	<g c="E4E7" x="1.0" y="-507.0" w="343.0" h="711.0" h-a-x="344" />
-	<g c="E4E8" x="0.0" y="-507.0" w="391.0" h="967.0" h-a-x="391" />
-	<g c="E4E9" x="0.0" y="-758.0" w="423.0" h="1222.0" h-a-x="423" />
-	<g c="E4EA" x="-1.0" y="-759.0" w="476.0" h="1476.0" h-a-x="475" />
-	<g c="E4EB" x="0.0" y="-998.0" w="527.0" h="1721.0" h-a-x="526" />
-	<g c="E4EC" x="0.0" y="-1004.0" w="579.0" h="1971.0" h-a-x="579" />
-	<g c="E4ED" x="1.0" y="-1004.0" w="633.0" h="2230.0" h-a-x="634" />
-	<g c="E4F2" x="0.0" y="-255.0" w="276.0" h="459.0" h-a-x="276" />
-	<g c="E510" x="0.0" y="0.0" w="332.0" h="433.0" h-a-x="332" />
-	<g c="E511" x="0.0" y="0.0" w="926.0" h="433.0" h-a-x="926" />
-	<g c="E512" x="0.0" y="0.0" w="909.0" h="433.0" h-a-x="909" />
-	<g c="E513" x="0.0" y="0.0" w="952.0" h="433.0" h-a-x="952" />
-	<g c="E514" x="0.0" y="-9.0" w="627.0" h="434.0" h-a-x="627" />
-	<g c="E515" x="0.0" y="-9.0" w="1422.0" h="434.0" h-a-x="1422" />
-	<g c="E516" x="0.0" y="-9.0" w="1398.0" h="434.0" h-a-x="1398" />
-	<g c="E517" x="0.0" y="0.0" w="681.0" h="424.0" h-a-x="681" />
-	<g c="E518" x="0.0" y="0.0" w="1483.0" h="424.0" h-a-x="1483" />
-	<g c="E519" x="0.0" y="-7.0" w="1483.0" h="431.0" h-a-x="1483" />
-	<g c="E51A" x="0.0" y="-43.0" w="160.0" h="515.0" h-a-x="160" />
-	<g c="E51B" x="0.0" y="-43.0" w="160.0" h="515.0" h-a-x="160" />
-	<g c="E51C" x="0.0" y="-21.0" w="866.0" h="454.0" h-a-x="866" />
-	<g c="E51D" x="0.0" y="-9.0" w="1354.0" h="434.0" h-a-x="1354" />
-	<g c="E51E" x="0.0" y="-7.0" w="1439.0" h="431.0" h-a-x="1439" />
-	<g c="E520" x="-95.0" y="-163.0" w="412.0" h="426.0" h-a-x="350" >
-		<a n="opticalCenter" x="0.784" y="0"/>
-	</g>
-	<g c="E521" x="-7.0" y="-2.0" w="381.0" h="253.0" h-a-x="391" >
-		<a n="opticalCenter" x="0.788" y="0"/>
-	</g>
-	<g c="E522" x="-137.0" y="-193.0" w="471.0" h="614.0" h-a-x="367" >
-		<a n="opticalCenter" x="0.812" y="0"/>
-	</g>
-	<g c="E523" x="-12.0" y="0.0" w="242.0" h="254.0" h-a-x="247" >
-		<a n="opticalCenter" x="0.556" y="0"/>
-	</g>
-	<g c="E524" x="0.0" y="-5.0" w="208.0" h="268.0" h-a-x="208" >
-		<a n="opticalCenter" x="0.484" y="0"/>
-	</g>
-	<g c="E525" x="-42.0" y="-1.0" w="281.0" h="258.0" h-a-x="256" >
-		<a n="opticalCenter" x="0.596" y="0"/>
-	</g>
-	<g c="E526" x="-12.0" y="-1.0" w="267.0" h="255.0" h-a-x="272" >
-		<a n="opticalCenter" x="0.54" y="0"/>
-	</g>
-	<g c="E566" x="-12.0" y="0.0" w="395.0" h="383.0" h-a-x="433" />
-	<g c="E567" x="0.0" y="0.0" w="456.0" h="232.0" h-a-x="456" />
-	<g c="E568" x="0.0" y="0.0" w="456.0" h="232.0" h-a-x="456" />
-	<g c="E569" x="0.0" y="-80.0" w="456.0" h="393.0" h-a-x="456" />
-	<g c="E56A" x="0.0" y="0.0" w="232.0" h="456.0" h-a-x="232" />
-	<g c="E56B" x="0.0" y="0.0" w="232.0" h="456.0" h-a-x="232" />
-	<g c="E56C" x="0.0" y="0.0" w="473.0" h="248.0" h-a-x="473" />
-	<g c="E56D" x="0.0" y="-77.0" w="473.0" h="393.0" h-a-x="473" />
-	<g c="E56E" x="0.0" y="0.0" w="654.0" h="248.0" h-a-x="654" />
-	<g c="E5B2" x="0.0" y="0.0" w="680.0" h="388.0" h-a-x="680" />
-	<g c="E5B5" x="0.0" y="-158.0" w="662.0" h="406.0" h-a-x="662" />
-	<g c="E5B8" x="0.0" y="-158.0" w="662.0" h="479.0" h-a-x="662" />
-	<g c="E5BB" x="0.0" y="0.0" w="662.0" h="406.0" h-a-x="662" />
-	<g c="E5BD" x="0.0" y="-73.0" w="653.0" h="393.0" h-a-x="653" />
-	<g c="E5C6" x="-1.0" y="0.0" w="703.0" h="389.0" h-a-x="702" />
-	<g c="E5C7" x="-0.0" y="-72.0" w="703.0" h="461.0" h-a-x="703" />
-	<g c="E5C8" x="0.0" y="-172.0" w="565.0" h="421.0" h-a-x="565" />
-	<g c="E5E5" x="0.0" y="0.0" w="312.0" h="312.0" h-a-x="312" />
-	<g c="E610" x="0.0" y="0.0" w="315.0" h="293.0" h-a-x="315" />
-	<g c="E611" x="0.0" y="0.0" w="315.0" h="293.0" h-a-x="315" />
-	<g c="E612" x="0.0" y="0.0" w="262.0" h="343.0" h-a-x="262" />
-	<g c="E613" x="0.0" y="37.0" w="262.0" h="343.0" h-a-x="262" />
-	<g c="E614" x="0.0" y="0.0" w="181.0" h="181.0" h-a-x="181" />
-	<g c="E630" x="0.0" y="0.0" w="269.0" h="389.0" h-a-x="269" />
-	<g c="E631" x="0.0" y="0.0" w="269.0" h="389.0" h-a-x="269" />
-	<g c="E632" x="0.0" y="0.0" w="389.0" h="269.0" h-a-x="389" />
-	<g c="E650" x="0.0" y="-10.0" w="981.0" h="555.0" h-a-x="981" />
-	<g c="E651" x="0.0" y="-10.0" w="450.0" h="555.0" h-a-x="450" />
-	<g c="E655" x="0.0" y="0.0" w="473.0" h="473.0" h-a-x="473" />
-	<g c="E880" x="0.0" y="-7.0" w="273.0" h="370.0" h-a-x="273" />
-	<g c="E881" x="0.0" y="0.0" w="239.0" h="363.0" h-a-x="239" />
-	<g c="E882" x="0.0" y="0.0" w="297.0" h="362.0" h-a-x="297" />
-	<g c="E883" x="0.0" y="-8.0" w="279.0" h="370.0" h-a-x="279" />
-	<g c="E884" x="0.0" y="0.0" w="286.0" h="363.0" h-a-x="286" />
-	<g c="E885" x="0.0" y="-6.0" w="295.0" h="370.0" h-a-x="295" />
-	<g c="E886" x="0.0" y="-5.0" w="279.0" h="370.0" h-a-x="279" />
-	<g c="E887" x="0.0" y="-5.0" w="272.0" h="370.0" h-a-x="272" />
-	<g c="E888" x="0.0" y="-5.0" w="283.0" h="370.0" h-a-x="283" />
-	<g c="E889" x="0.0" y="0.0" w="279.0" h="370.0" h-a-x="279" />
-	<g c="E88A" x="0.0" y="58.0" w="111.0" h="210.0" h-a-x="111" />
-	<g c="E93C" x="0.0" y="-132.0" w="335.0" h="265.0" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.372" y="0"/>
-	</g>
-	<g c="E93D" x="0.0" y="-132.0" w="335.0" h="265.0" >
-		<a n="stemDownNW" x="0" y="0"/>
-		<a n="stemUpSE" x="1.372" y="0"/>
-	</g>
-	<g c="EAA4" x="-27.0" y="117.0" w="264.0" h="164.0" h-a-x="220" >
-		<a n="repeatOffset" x="0.88" y="0"/>
-	</g>
-	<g c="EAA9" x="-22.0" y="0.0" w="264.0" h="164.0" h-a-x="220" >
-		<a n="repeatOffset" x="0.88" y="0"/>
-	</g>
-	<g c="EAAA" x="-22.0" y="0.0" w="264.0" h="164.0" h-a-x="220" >
-		<a n="repeatOffset" x="0.88" y="0"/>
-	</g>
-	<g c="EAAD" x="-24.0" y="-83.0" w="283.0" h="343.0" h-a-x="259" />
-	<g c="EAAE" x="-24.0" y="-84.0" w="283.0" h="343.0" h-a-x="259" />
-	<g c="E0F5" x="0.0" y="-212.0" w="75.0" h="421.4" h-a-x="75" />
-	<g c="E0F6" x="0.0" y="-209.4" w="75.0" h="421.4" h-a-x="75" />
-	<g c="E4F6" x="0.0" y="-202.0" w="317.0" h="409.0" h-a-x="317" />
-	<g c="E06A" x="0.0" y="-438.0" w="304.0" h="877.0" h-a-x="304" />
-	<g c="E4CE" x="0.0" y="0.0" w="191.0" h="321.0" h-a-x="191" />
-	<g c="E500" x="0.0" y="-250.0" w="481.0" h="500.0" h-a-x="481" />
-	<g c="E501" x="0.0" y="-250.0" w="735.0" h="500.0" h-a-x="735" />
-	<g c="E502" x="0.0" y="-250.0" w="1243.0" h="500.0" h-a-x="1243" />
-	<g c="E4A8" x="0.0" y="0.0" w="122.0" h="254.0" h-a-x="122" />
-	<g c="E4A9" x="0.0" y="-254.0" w="122.0" h="254.0" h-a-x="122" />
-	<g c="E56F" x="0.0" y="-13.0" w="503.0" h="250.0" h-a-x="503" />
-	<g c="E587" x="0.0" y="0.0" w="751.0" h="473.0" h-a-x="591" />
-	<g c="E5E6" x="0.0" y="0.0" w="280.0" h="280.0" h-a-x="280" />
-	<g c="E5E7" x="0.0" y="0.0" w="280.0" h="280.0" h-a-x="280" />
-	<g c="E59D" x="-43.0" y="0.0" w="231.0" h="247.0" h-a-x="172" >
-		<a n="repeatOffset" x="0.688" y="0"/>
-	</g>
-	<g c="E5BC" x="0.0" y="-72.0" w="918.0" h="393.0" h-a-x="918" />
-	<g c="E59E" x="-2.0" y="0.0" w="263.0" h="248.0" h-a-x="261" />
-	<g c="E5C0" x="0.0" y="0.0" w="884.0" h="248.0" h-a-x="884" />
-	<g c="E5C3" x="0.0" y="0.0" w="857.0" h="248.0" h-a-x="857" />
-	<g c="E5BE" x="0.0" y="0.0" w="704.0" h="248.0" h-a-x="704" />
-	<g c="E583" x="0.0" y="109.0" w="37.0" h="280.0" h-a-x="37" />
-	<g c="E503" x="1.0" y="62.0" w="126.0" h="126.0" h-a-x="127" />
-	<g c="E504" x="0.0" y="-250.0" w="481.0" h="500.0" h-a-x="481" />
-	<g c="E505" x="1.0" y="-190.0" w="126.0" h="126.0" h-a-x="127" />
-</bounding-boxes>
diff --git a/data/Leland/E000-brace.xml b/data/Leland/E000-brace.xml
deleted file mode 100644
index aed55e73cd8..00000000000
--- a/data/Leland/E000-brace.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 500c18 -19 53 -57 53 -130c0 -91 -39 -183 -39 -240c0 -61 35 -118 37 -120v-2c1 -1 0 -2 -1 -3s-3 0 -4 2c-1 1 -55 56 -55 137c0 88 35 150 35 265c0 22 -9 57 -34 88c-1 1 -2 2 -2 3c1 1 1 3 2 3c25 31 34 66 34 88c0 115 -35 177 -35 265c0 82 54 136 55 137 c1 2 3 2 4 2c1 -1 1 -2 1 -3v-2c-2 -2 -37 -59 -37 -120c0 -57 39 -149 39 -240c0 -72 -35 -111 -53 -130z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E003-bracketTop.xml b/data/Leland/E003-bracketTop.xml
deleted file mode 100644
index 0d14159d3d2..00000000000
--- a/data/Leland/E003-bracketTop.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 277c4 -3 7 -7 7 -12c0 -2 -1 -4 -1 -5c-1 -3 -60 -260 -368 -260h-122v104c0 8 6 13 14 13h159c191 0 291 154 293 157c2 4 7 5 11 5c2 0 5 -1 7 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E004-bracketBottom.xml b/data/Leland/E004-bracketBottom.xml
deleted file mode 100644
index 31ce43b7675..00000000000
--- a/data/Leland/E004-bracketBottom.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 -277c-2 -1 -5 -2 -7 -2c-4 0 -9 1 -11 5c-2 3 -102 157 -293 157h-159c-8 0 -14 5 -14 13v104h122c308 0 367 -257 368 -260c0 -1 1 -3 1 -5c0 -5 -3 -9 -7 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E043-repeatDots.xml b/data/Leland/E043-repeatDots.xml
deleted file mode 100644
index 85bd2aeb7d1..00000000000
--- a/data/Leland/E043-repeatDots.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M104 625c0 -29 -23 -53 -52 -53s-52 24 -52 53s23 53 52 53s52 -24 52 -53zM104 375c0 -29 -23 -53 -52 -53s-52 24 -52 53s23 53 52 53s52 -24 52 -53z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E044-repeatDot.xml b/data/Leland/E044-repeatDot.xml
deleted file mode 100644
index 8deb5791c33..00000000000
--- a/data/Leland/E044-repeatDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M104 0c0 -29 -23 -53 -52 -53s-52 24 -52 53s23 53 52 53s52 -24 52 -53z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E047-segno.xml b/data/Leland/E047-segno.xml
deleted file mode 100644
index 3758e600dc1..00000000000
--- a/data/Leland/E047-segno.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 479l191 -98c56 -29 84 -85 84 -164s-49 -199 -203 -199c-153 0 -167 76 -171 95c-1 3 -1 6 -1 10c0 34 26 59 60 59s67 -24 77 -59c12 -40 38 -63 74 -63c40 0 95 31 95 118c0 43 -43 73 -96 102l-172 89l-205 -362c-2 -3 -6 -6 -9 -7c-4 0 -8 0 -11 2l-15 11 c-3 2 -6 7 -6 11c0 2 0 5 1 7l204 360l-189 99c-58 33 -87 83 -87 162s50 199 204 199c153 0 167 -76 171 -95c1 -3 1 -6 1 -9c0 -36 -26 -61 -61 -61c-34 0 -67 24 -77 59c-12 40 -38 64 -74 64c-40 0 -95 -31 -95 -118c0 -49 33 -68 82 -94l187 -96l204 361c2 4 8 7 12 7 c2 0 6 -1 8 -2l16 -11c3 -2 6 -8 6 -12c0 -2 -1 -4 -2 -6zM573 488c-34 0 -64 30 -64 64c0 35 29 65 64 65s64 -30 64 -65c0 -34 -30 -64 -64 -64zM82 289c-35 0 -65 29 -65 64s30 64 65 64c34 0 64 -30 64 -64s-30 -64 -64 -64z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E048-coda.xml b/data/Leland/E048-coda.xml
deleted file mode 100644
index 06c8de2ed64..00000000000
--- a/data/Leland/E048-coda.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M642 324h90c8 0 13 -6 13 -14v-10c0 -8 -5 -14 -13 -14h-91c-11 -154 -118 -277 -252 -286v-99c0 -8 -6 -14 -14 -14h-11c-8 0 -13 6 -13 14v99c-131 12 -236 134 -247 286h-90c-8 0 -14 6 -14 14v10c0 8 6 14 14 14h90c6 157 112 285 247 298v99c0 8 5 14 13 14h11 c8 0 14 -6 14 -14v-99c137 -10 247 -138 253 -298zM389 324h148c0 142 -40 257 -148 268v-268zM351 324v267c-103 -14 -142 -127 -142 -267h142zM351 286h-142c0 -134 45 -241 142 -255v255zM389 286v-255c101 11 147 118 147 255h-147z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E049-codaSquare.xml b/data/Leland/E049-codaSquare.xml
deleted file mode 100644
index 64696c5d5b7..00000000000
--- a/data/Leland/E049-codaSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M632 324h93c8 0 13 -5 13 -13v-12c0 -8 -5 -13 -13 -13h-93v-256c0 -17 -13 -30 -30 -30h-213v-99c0 -8 -6 -14 -14 -14h-11c-8 0 -14 6 -14 14v99h-214c-17 0 -30 13 -30 30v256h-92c-8 0 -14 5 -14 13v12c0 8 6 13 14 13h92v268c0 17 13 30 30 30h214v99 c0 8 6 14 14 14h11c8 0 14 -6 14 -14v-99h213c17 0 30 -13 30 -30v-268zM526 324v268h-137v-268h137zM350 324v268h-137v-268h137zM213 286v-256h137v256h-137zM389 286v-256h137v256h-137z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E04B-segnoSerpent2.xml b/data/Leland/E04B-segnoSerpent2.xml
deleted file mode 100644
index f8b591a4892..00000000000
--- a/data/Leland/E04B-segnoSerpent2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M225 101v-97c0 -7 -6 -13 -12 -13h-11c-7 0 -13 6 -13 13v112c-100 42 -189 103 -189 217c0 112 61 165 89 187c-54 46 -89 112 -89 174c0 86 19 127 76 183c-46 43 -76 115 -76 181c0 106 69 223 231 223c175 0 228 -64 251 -106c9 -17 16 -35 16 -53 c0 -46 -31 -64 -73 -64c-48 0 -78 33 -98 89c-16 44 -43 86 -120 86s-127 -46 -127 -105c0 -95 63 -134 109 -159v34c0 6 6 12 13 12h11c7 0 12 -6 12 -12v-54c26 -14 55 -28 104 -49v103c0 6 6 12 13 12h10c7 0 13 -6 13 -12v-118c100 -43 189 -104 189 -218 c0 -108 -57 -161 -86 -184c51 -39 86 -89 86 -161c0 -111 -61 -164 -88 -187c53 -45 88 -121 88 -193c0 -90 -49 -223 -230 -223c-88 0 -265 40 -265 157c0 35 19 68 56 73c74 0 89 -25 113 -95c18 -54 42 -87 119 -87s128 39 128 98c0 95 -63 142 -110 167v-28 c0 -7 -5 -13 -13 -13h-10c-8 0 -13 6 -13 13v48c-26 14 -55 28 -104 49zM189 624v177c-30 15 -59 32 -84 52c-3 -2 -25 -20 -25 -62c0 -95 62 -142 109 -167zM329 555v179c-34 16 -75 36 -104 49v-179c26 -14 55 -28 104 -49zM365 716l1 -177c27 -11 53 -24 77 -39 c3 2 32 18 32 73c0 84 -45 111 -110 143zM79 427c0 -76 50 -112 110 -142v170c-26 14 -52 29 -76 46c-4 -1 -34 -15 -34 -74zM225 438v-171c35 -17 75 -36 104 -50v172c-34 16 -75 36 -104 49zM442 154c3 2 33 24 33 74c0 97 -56 114 -86 131c-5 2 -13 7 -24 12v-171 c27 -13 53 -28 77 -46z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E050-gClef.xml b/data/Leland/E050-gClef.xml
deleted file mode 100644
index a8effb793a2..00000000000
--- a/data/Leland/E050-gClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M123 -513c0 66 44 123 114 123c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 0 -5 -1 -5 -3c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 155 55 155 159c0 53 -12 123 -31 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 322 217 406c21 17 73 70 74 71 c-17 112 -22 161 -22 215c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -178 -395c8 -56 18 -115 28 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141 c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153zM332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 70 -24 118 -39 118c-52 0 -98 -105 -107 -145zM420 -206l-58 329c-58 -14 -104 -63 -104 -124 c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166c0 94 62 190 153 217c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM562 -21c0 89 -65 150 -155 150 c7 -44 34 -203 55 -323c71 29 100 102 100 173z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E051-gClef15mb.xml b/data/Leland/E051-gClef15mb.xml
deleted file mode 100644
index 66d9f45e63e..00000000000
--- a/data/Leland/E051-gClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M269 773c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -178 -395c8 -56 18 -115 28 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141 c0 -63 -14 -129 -68 -167c-43 -26 -87 -34 -136 -34l-48 -179c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19l-3 -23h-139l3 23h18c12 0 19 0 22 2c2 2 3 5 5 12l35 132c2 6 2 9 2 11c0 3 0 5 -11 5h-32l6 22h2c30 0 70 11 84 21c-81 11 -154 65 -154 152c0 66 44 123 114 123 c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 0 -5 -1 -5 -3c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 155 55 155 159c0 53 -12 123 -31 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 322 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215z M332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 70 -24 118 -39 118c-52 0 -98 -105 -107 -145zM420 -206l-58 329c-58 -14 -104 -63 -104 -124c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166 c0 94 62 190 153 217c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM562 -21c0 13 -1 23 -2 32c-9 48 -52 118 -153 118c7 -44 34 -203 55 -323c71 29 100 102 100 173zM329 -867c0 -3 11 -9 24 -9 c27 0 48 29 48 67c0 24 -11 38 -29 38c-8 0 -12 -1 -27 -7c-2 -12 -9 -19 -19 -19c-8 0 -13 6 -13 14c0 7 4 13 13 17l29 103l3 -1c26 -6 48 -9 69 -9c16 0 29 2 43 8c3 1 3 1 4 1c3 0 5 -2 5 -5c0 -39 -47 -54 -77 -54c-14 0 -15 0 -38 5l-10 -34c14 5 24 7 38 7 c35 0 67 -22 67 -60c0 -57 -45 -93 -99 -93c-42 0 -68 21 -68 53c0 21 13 34 32 34c16 0 28 -10 28 -26c0 -13 -10 -25 -21 -27c-2 -1 -2 -1 -2 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E052-gClef8vb.xml b/data/Leland/E052-gClef8vb.xml
deleted file mode 100644
index b00e899008b..00000000000
--- a/data/Leland/E052-gClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M640 3c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89c10 -57 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 114 123c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 4 -2c1 -1 22 -6 47 -6 c100 0 154 55 154 159c0 53 -12 123 -30 219c-24 -4 -51 -7 -80 -7c-186 0 -349 147 -349 335c0 199 126 321 217 405c21 18 73 71 74 71c-17 113 -22 162 -22 216c0 84 18 211 83 287c32 39 64 52 71 52c17 0 46 -36 70 -87c17 -36 45 -109 45 -201 c0 -158 -74 -284 -179 -395c9 -55 18 -115 28 -175c146 0 253 -102 253 -252zM332 822c-7 -31 -11 -64 -11 -102c0 -41 5 -81 11 -121c69 69 147 147 147 250c0 70 -25 118 -40 118c-52 0 -97 -105 -107 -145zM362 -212c20 0 38 2 58 7l-58 328c-58 -14 -104 -63 -104 -124 c0 -48 22 -75 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 216c-6 42 -14 88 -23 142c-15 -14 -31 -29 -48 -43c-87 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 28 101 101 101 173c0 12 -2 23 -3 31 c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322zM423 -717c0 -24 -14 -40 -43 -53c18 -13 28 -32 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 31 27 51 53 61c-15 14 -22 28 -22 47c0 45 41 71 83 71c33 0 67 -16 67 -53zM361 -757c15 12 21 23 21 39 c0 21 -11 33 -31 33s-34 -13 -34 -31c0 -12 5 -19 21 -28l1 -1c3 -2 7 -4 22 -12zM323 -877c22 0 38 15 38 34c0 14 -7 24 -27 35c-2 2 -2 2 -14 8c-3 1 -4 2 -8 4c-17 -10 -26 -27 -26 -46c0 -21 15 -35 37 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E053-gClef8va.xml b/data/Leland/E053-gClef8va.xml
deleted file mode 100644
index 11bb07ea17e..00000000000
--- a/data/Leland/E053-gClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M640 3c0 -104 -73 -205 -171 -238c6 -38 12 -69 15 -89c10 -56 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s44 123 114 123c75 0 116 -57 116 -110c0 -64 -47 -105 -94 -112c-3 -1 -5 -2 -5 -3c0 -2 2 -3 3 -3c2 -1 23 -6 47 -6 c101 0 155 55 155 159c0 53 -12 124 -31 220c-23 -5 -50 -8 -79 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 70c-17 113 -22 162 -22 216c0 110 29 267 131 330c-39 3 -64 24 -65 54c0 31 27 51 53 62c-15 13 -21 27 -22 46c0 45 41 71 83 71 c33 0 67 -16 67 -53c0 -24 -14 -40 -43 -52c18 -14 28 -33 28 -56c0 -35 -25 -61 -64 -69c17 -13 38 -43 56 -81c16 -36 44 -109 44 -200c0 -159 -73 -285 -178 -396c8 -55 18 -114 28 -175c146 0 253 -102 253 -252zM444 1316c-20 0 -34 -12 -34 -30c0 -13 5 -20 21 -29 l1 -1c3 -2 7 -4 22 -12c15 12 21 23 21 39c0 21 -11 33 -31 33zM379 1160c0 -22 15 -36 37 -36s38 15 38 34c0 14 -7 24 -26 35h-1c-2 2 -2 2 -14 8c-3 2 -4 2 -8 4c-17 -10 -26 -26 -26 -45zM332 822c-8 -31 -11 -64 -11 -102c0 -41 5 -80 11 -121c69 69 146 147 146 251 c0 69 -24 118 -39 118c-52 0 -98 -105 -107 -146zM362 -212c19 0 38 3 58 7l-58 328c-58 -14 -104 -62 -104 -124c0 -48 22 -74 61 -98c12 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-7 41 -14 87 -23 141 c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 29 100 101 100 173c0 12 -1 23 -2 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E054-gClef15ma.xml b/data/Leland/E054-gClef15ma.xml
deleted file mode 100644
index 7abb337847f..00000000000
--- a/data/Leland/E054-gClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 1131l-3 -23h-139l3 23h19c12 0 20 1 22 3c2 1 2 3 4 7c0 1 1 6 4 16l32 120c2 6 2 9 2 11c0 3 0 6 -11 6h-33l6 21h2c31 0 72 12 86 22v1h18l-49 -182c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19zM640 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89 c10 -56 16 -102 16 -141c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153s44 124 114 124c75 0 116 -58 116 -111c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -6 47 -6c101 0 155 55 155 159c0 53 -12 124 -30 220 c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 82 287c27 32 53 46 66 51c-20 8 -31 24 -31 45s13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27c-2 -1 -2 -2 -2 -3c0 -4 10 -9 23 -9 c27 0 49 29 49 67c0 24 -11 38 -30 38c-7 0 -12 -1 -26 -7c-2 -12 -9 -19 -20 -19c-7 0 -13 6 -13 14c0 7 4 13 13 17l30 103l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8c2 1 3 1 4 1c2 0 4 -2 4 -5c0 -11 -8 -27 -19 -37c-14 -12 -31 -17 -58 -17c-14 0 -14 0 -38 5l-9 -34 c14 5 25 7 38 7c37 0 67 -21 67 -60c0 -56 -46 -93 -100 -93c-5 0 -10 1 -15 1c17 -13 37 -42 54 -79c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c8 -55 18 -114 28 -174c146 0 253 -103 253 -253zM332 821c-7 -30 -11 -64 -11 -102c0 -41 5 -80 11 -121 c69 69 147 147 147 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM362 -212c19 0 38 2 58 6l-58 329c-58 -15 -104 -63 -104 -125c0 -48 22 -74 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-7 41 -14 87 -23 141 c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -307c0 -152 122 -251 265 -251zM462 -194c71 29 100 101 100 173c0 12 -1 23 -2 32c-9 47 -52 118 -153 118c7 -45 34 -204 55 -323z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E055-gClef8vbOld.xml b/data/Leland/E055-gClef8vbOld.xml
deleted file mode 100644
index 4a9bf52797b..00000000000
--- a/data/Leland/E055-gClef8vbOld.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1044 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 16 -89c9 -57 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -111c0 -63 -47 -104 -94 -111c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6 c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-74 0 -145 24 -203 64c-24 -20 -51 -36 -81 -46c7 -38 12 -69 16 -89c9 -57 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -111 c0 -63 -47 -104 -94 -111c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 83 288 c33 38 64 51 71 51c18 0 47 -36 70 -87c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -174c18 0 35 -2 51 -5c44 105 122 179 183 237c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 83 288c33 38 64 51 71 51c18 0 47 -36 70 -87 c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -174c146 0 253 -103 253 -253zM736 821c-7 -30 -11 -64 -11 -102c0 -41 6 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM332 821c-7 -30 -11 -64 -11 -102 c0 -41 6 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM676 346c-47 -40 -92 -90 -126 -145c27 -21 48 -47 63 -78c25 58 73 107 133 125c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43zM362 -213c20 0 38 3 58 7l-57 328 c-59 -14 -104 -62 -104 -124c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -134 96 -134 167c0 93 61 190 152 217c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43c-88 -77 -175 -186 -175 -308c0 -151 122 -251 265 -251zM462 -194 c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323zM866 -194c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323zM766 -213c20 0 38 3 58 7l-57 328c-59 -14 -104 -62 -104 -124 c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-42 0 -77 27 -100 62c-10 -27 -23 -53 -41 -76c48 -40 111 -63 179 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E05C-cClef.xml b/data/Leland/E05C-cClef.xml
deleted file mode 100644
index d19584c2226..00000000000
--- a/data/Leland/E05C-cClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 30 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13 c-11 56 -33 151 -92 175v-436c0 -7 -5 -13 -12 -13s-13 6 -13 13v910c0 7 6 13 13 13s12 -6 12 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73 c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM13 469h72c7 0 13 -6 13 -13v-910 c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E05D-cClef8vb.xml b/data/Leland/E05D-cClef8vb.xml
deleted file mode 100644
index 53e9d0410ba..00000000000
--- a/data/Leland/E05D-cClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 30 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13 c-11 56 -33 151 -92 175v-436c0 -7 -6 -13 -13 -13s-12 6 -12 13v910c0 7 5 13 12 13s13 -6 13 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73 c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM13 469h72c7 0 13 -6 13 -13v-910 c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13zM368 -559c0 -24 -14 -41 -43 -53c18 -13 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 21 -74 54c0 31 28 50 53 62c-15 14 -22 27 -22 46c0 46 41 72 83 72c31 0 67 -18 67 -53zM283 -587l1 -1l22 -11 c16 12 21 23 21 39c0 21 -11 32 -31 32s-34 -12 -34 -30c0 -13 5 -20 21 -29zM257 -639c-17 -10 -26 -26 -26 -45c0 -21 15 -35 37 -35s38 14 38 33c0 14 -7 25 -26 36h-1l-14 7c-3 2 -4 2 -8 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E062-fClef.xml b/data/Leland/E062-fClef.xml
deleted file mode 100644
index 41a91522ae5..00000000000
--- a/data/Leland/E062-fClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 251c180 0 274 -112 274 -286c0 -184 -158 -362 -298 -463c-91 -71 -205 -118 -207 -118l-3 -1c-7 0 -16 2 -19 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109 c8 7 25 17 35 21c9 3 20 5 32 5c56 0 106 -47 106 -104c0 -66 -50 -109 -114 -109c-74 0 -116 54 -116 127s38 139 97 182c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51 s-22 -51 -48 -51s-48 23 -48 51z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E063-fClef15mb.xml b/data/Leland/E063-fClef15mb.xml
deleted file mode 100644
index a2469eac716..00000000000
--- a/data/Leland/E063-fClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M253 251c180 0 275 -111 275 -286c0 -67 -25 -145 -69 -220c-59 -100 -135 -174 -229 -242c-91 -71 -205 -119 -207 -119l-4 -1c-7 0 -15 2 -18 12c0 2 -1 4 -1 5c0 12 11 19 11 19h1c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250 c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109c8 7 24 17 34 21c9 3 19 5 32 5c57 0 107 -46 107 -104c0 -65 -49 -109 -112 -109c-75 0 -118 52 -118 127c0 73 38 139 97 182c1 0 61 44 137 44zM567 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50z M567 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM259 -710c0 -4 1 -6 22 -6h19l-3 -23h-139l3 23h19c12 0 20 0 22 3v1c1 1 2 1 3 6l1 1c0 1 1 5 4 15l32 120c1 3 2 8 2 11s0 6 -11 6h-33l6 21h2c31 1 72 12 86 22v1h18l-49 -182 c-3 -11 -4 -16 -4 -19zM490 -510c2 0 4 -1 4 -5c0 -11 -9 -27 -19 -36c-14 -12 -32 -18 -58 -18c-14 0 -15 0 -38 5l-9 -34c14 5 25 7 38 7c38 0 66 -20 66 -60c0 -55 -45 -93 -99 -93c-41 0 -68 21 -68 53c0 21 13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27 c-1 0 -2 -1 -2 -1c0 -5 10 -11 23 -11c27 0 49 29 49 67c0 25 -11 39 -30 39c-7 0 -11 -2 -26 -8c-2 -12 -10 -19 -20 -19c-8 0 -13 6 -13 14s4 14 13 18l30 102l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8l1 1h3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E064-fClef8vb.xml b/data/Leland/E064-fClef8vb.xml
deleted file mode 100644
index 63bbec68d07..00000000000
--- a/data/Leland/E064-fClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 251c180 0 274 -112 274 -286c0 -187 -156 -359 -298 -462c-91 -71 -205 -119 -207 -119l-3 -1c-7 0 -16 2 -19 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109 c8 7 25 17 35 21c9 3 20 5 32 5c56 0 106 -47 106 -104c0 -67 -48 -109 -112 -109c-75 0 -118 52 -118 127c0 73 38 139 97 182c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51 s-22 -51 -48 -51s-48 23 -48 51zM352 -560v-1c0 -24 -14 -41 -43 -53c18 -13 29 -33 29 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 34 25 49 52 61c-15 14 -21 28 -21 47c0 46 40 71 82 71c31 0 67 -16 67 -52zM267 -588l1 -1c4 -2 8 -5 22 -12c16 12 21 23 21 39 c0 21 -11 33 -31 33s-33 -13 -33 -31c0 -13 4 -19 20 -28zM242 -640c-17 -10 -26 -27 -26 -46c0 -21 14 -35 36 -35s39 15 39 34c0 14 -8 24 -27 35c-2 1 -2 2 -14 8c-3 2 -4 2 -8 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E065-fClef8va.xml b/data/Leland/E065-fClef8va.xml
deleted file mode 100644
index c2681476384..00000000000
--- a/data/Leland/E065-fClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M282 248c176 -12 244 -137 244 -284c0 -122 -83 -308 -298 -461c-92 -72 -205 -119 -205 -119c-9 0 -19 0 -22 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140c69 63 182 240 182 406s-48 251 -153 251c-155 0 -169 -133 -169 -133s28 28 69 28c55 0 105 -47 105 -103 c0 -64 -52 -109 -114 -109c-77 0 -115 58 -115 128c0 58 26 127 97 180c0 0 50 36 117 42c-32 7 -53 27 -53 54c0 32 27 53 54 64c-16 15 -22 29 -22 48c0 47 41 74 85 74c20 0 38 -5 50 -15c11 -8 19 -26 19 -39v-1c0 -25 -14 -43 -44 -55c19 -14 29 -34 29 -57 c0 -37 -27 -65 -69 -73zM278 404h2c4 -2 7 -5 22 -13c16 12 23 24 23 41c0 22 -12 34 -33 34c-20 0 -35 -13 -35 -32c0 -13 5 -20 21 -30zM252 351c-17 -11 -27 -27 -27 -47c0 -22 15 -37 38 -37s40 15 40 35c0 15 -8 26 -28 37c-3 2 -3 2 -15 8zM569 124c0 28 22 51 48 51 s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E066-fClef15ma.xml b/data/Leland/E066-fClef15ma.xml
deleted file mode 100644
index 4f2311cdc17..00000000000
--- a/data/Leland/E066-fClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M225 278h20l-4 -23h-144l4 23h19c12 0 21 1 23 4c1 1 3 2 4 7c0 1 1 7 4 17l33 123c1 3 2 9 2 12s0 6 -12 6h-33l6 22h2c32 1 75 12 89 23h18l-50 -188c-3 -11 -4 -17 -4 -20c0 -4 1 -6 23 -6zM292 285l-2 -1v-1c0 -5 11 -11 25 -11c28 0 50 31 50 70c0 25 -11 40 -30 40 c-8 0 -13 -1 -28 -8c-2 -13 -9 -20 -20 -20c-8 0 -14 6 -14 14s5 15 14 19l30 105h3c27 -6 50 -10 71 -10c17 0 31 3 45 9h3l1 1c3 0 5 -2 5 -6c0 -11 -9 -28 -20 -37c-14 -12 -33 -18 -60 -18c-15 0 -15 0 -39 5l-10 -35c15 5 27 7 40 7c38 0 69 -22 69 -62 c0 -58 -48 -96 -103 -96c-43 0 -70 21 -70 54c0 21 13 36 33 36c17 0 29 -11 29 -27c0 -14 -8 -23 -22 -28zM252 249c198 0 273 -131 273 -285c0 -122 -82 -308 -297 -461c-92 -72 -206 -119 -206 -119c-9 0 -18 0 -21 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140 c69 63 181 240 181 406s-48 251 -153 251c-155 0 -168 -133 -168 -133s27 28 68 28c56 0 105 -48 105 -104c0 -64 -51 -108 -113 -108c-77 0 -116 57 -116 128c0 58 26 127 97 180c0 0 60 43 137 43zM569 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50 zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E069-unpitchedPercussionClef1.xml b/data/Leland/E069-unpitchedPercussionClef1.xml
deleted file mode 100644
index fb01ef04829..00000000000
--- a/data/Leland/E069-unpitchedPercussionClef1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M13 252h110c7 0 13 -6 13 -13v-478c0 -7 -6 -13 -13 -13h-110c-7 0 -13 6 -13 13v478c0 7 6 13 13 13zM229 252h110c7 0 13 -6 13 -13v-478c0 -7 -6 -13 -13 -13h-110c-7 0 -13 6 -13 13v478c0 7 6 13 13 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E06A-unpitchedPercussionClef2.xml b/data/Leland/E06A-unpitchedPercussionClef2.xml
deleted file mode 100644
index 4f5d7b7b3bd..00000000000
--- a/data/Leland/E06A-unpitchedPercussionClef2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 -422c0 -9 -7 -16 -16 -16h-272c-9 0 -16 7 -16 16v845c0 8 7 16 16 16h272c9 0 16 -8 16 -16v-845zM40 335v-669c0 -6 5 -10 10 -10h204c5 0 10 4 10 10v669c0 5 -4 10 -10 10h-204c-5 0 -10 -5 -10 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E080-timeSig0.xml b/data/Leland/E080-timeSig0.xml
deleted file mode 100644
index 51b50ae15d7..00000000000
--- a/data/Leland/E080-timeSig0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M202 255c106 0 187 -110 187 -255s-81 -254 -187 -254s-187 109 -187 254s81 255 187 255zM261 -139v278c0 36 -16 75 -59 75s-59 -39 -59 -75v-278c0 -36 16 -75 59 -75s59 39 59 75z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E081-timeSig1.xml b/data/Leland/E081-timeSig1.xml
deleted file mode 100644
index f515c56c25b..00000000000
--- a/data/Leland/E081-timeSig1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 -197h76c7 0 11 -5 11 -12v-22c0 -7 -4 -12 -11 -12h-274c-7 0 -12 5 -12 12v22c0 7 5 12 12 12h76v341l-71 -122c-2 -3 -6 -6 -10 -6c-2 0 -4 1 -6 2l-19 11c-3 2 -6 6 -6 10c0 2 0 4 1 6l112 194l4 4c2 1 4 2 6 2h99c7 0 12 -5 12 -12v-430z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E082-timeSig2.xml b/data/Leland/E082-timeSig2.xml
deleted file mode 100644
index 9161f7d7dc5..00000000000
--- a/data/Leland/E082-timeSig2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M342 -39c4 10 11 14 18 14c9 0 17 -6 17 -19c0 -27 -23 -102 -41 -139s-61 -60 -93 -60s-60 16 -78 42s-29 60 -58 60c-24 0 -32 -10 -33 -16c-1 -3 -1 -6 -1 -9c0 -8 2 -19 8 -33c2 -5 3 -9 3 -13c0 -18 -17 -31 -33 -31c-12 0 -36 3 -36 50s30 89 30 89 c58 87 197 112 197 229c0 51 -11 86 -68 86c-15 0 -29 -3 -34 -5c-18 -5 -23 -12 -23 -18c0 -5 4 -10 7 -11c26 -10 46 -41 46 -69c0 -41 -33 -74 -74 -74s-75 33 -75 74c0 46 28 137 179 137s170 -83 170 -125c0 -60 -27 -112 -133 -145s-131 -71 -131 -71c10 2 18 3 26 3 c54 0 68 -40 133 -40c49 0 69 72 77 94z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E083-timeSig3.xml b/data/Leland/E083-timeSig3.xml
deleted file mode 100644
index 360c7aff935..00000000000
--- a/data/Leland/E083-timeSig3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M272 16h-2c44 -14 94 -45 94 -118c0 -109 -104 -142 -200 -142c-74 0 -149 41 -149 123c0 36 29 65 65 65s64 -29 64 -65c0 -33 -27 -62 -60 -64c11 -8 37 -16 65 -16c42 0 87 18 87 85c0 70 -23 100 -67 106c-32 5 -55 5 -72 6c-11 1 -13 12 -13 12v20s1 14 13 14 s68 4 80 6s59 11 59 74c0 54 -45 79 -87 79c-19 0 -38 -5 -52 -15l-3 -3c28 -6 50 -34 50 -63c0 -36 -28 -64 -64 -64s-65 28 -65 64l1 2h-1s-5 122 167 122s175 -113 175 -122c0 -55 -35 -87 -85 -106z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E084-timeSig4.xml b/data/Leland/E084-timeSig4.xml
deleted file mode 100644
index 4f813c57c47..00000000000
--- a/data/Leland/E084-timeSig4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 -127h-172c-9 0 -11 6 -11 6s-6 11 -10 18c-1 2 -1 4 -1 6c0 6 3 11 3 11c26 37 56 87 82 168s31 155 31 155c1 6 6 12 14 12h148c4 0 8 -2 10 -4l22 -22c1 -1 3 -5 3 -10c0 -4 -1 -9 -5 -14c-118 -158 -229 -278 -229 -278h115v82c0 4 1 8 4 11l91 83c2 2 6 3 9 4 c2 0 5 -1 7 -2l12 -6c5 -2 8 -7 8 -13v-159h89c8 0 14 -7 14 -14v-19c0 -8 -6 -15 -14 -15h-89v-74h89c8 0 14 -6 14 -14v-19c0 -8 -6 -14 -14 -14h-303c-7 0 -14 6 -14 14v19c0 8 7 14 14 14h83v74z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E085-timeSig5.xml b/data/Leland/E085-timeSig5.xml
deleted file mode 100644
index b359c5261a1..00000000000
--- a/data/Leland/E085-timeSig5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 218c0 16 7 21 22 21c7 0 12 -1 12 -1c43 -6 78 -10 114 -10c37 0 75 4 124 16c6 1 10 2 14 2c13 0 18 -6 18 -14c0 -3 -1 -7 -2 -10c-28 -74 -82 -89 -154 -89c-35 0 -68 4 -83 5h-1c-6 0 -11 -5 -11 -11v-63c0 -4 3 -7 7 -7c1 0 3 0 4 1c29 20 64 28 97 28 c100 0 174 -56 174 -162c0 -107 -85 -168 -187 -168c-77 0 -160 37 -160 125c0 34 27 70 66 70s73 -19 73 -68s-31 -60 -40 -66c-3 -2 -4 -4 -4 -7c0 -2 2 -5 5 -6c6 -4 19 -7 42 -7c71 0 90 66 90 125c0 48 -13 109 -84 109c-63 0 -74 -52 -79 -65c-2 -6 -6 -8 -10 -8 c-2 0 -3 1 -5 1c-5 1 -26 6 -35 8c-6 1 -7 8 -7 13v3c3 45 5 90 5 135c0 52 -5 100 -5 100z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E086-timeSig6.xml b/data/Leland/E086-timeSig6.xml
deleted file mode 100644
index ff4f884f1f5..00000000000
--- a/data/Leland/E086-timeSig6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 48c63 0 140 -37 140 -135c0 -116 -131 -157 -166 -157s-72 2 -130 46c-59 52 -76 121 -76 182c0 56 15 105 25 129c20 46 85 132 175 132c100 0 142 -53 155 -89c4 -8 6 -23 6 -32v-3c0 -36 -29 -64 -65 -64s-64 28 -64 64c0 23 17 50 38 59c-10 11 -25 19 -50 19 c-70 0 -90 -74 -90 -131c0 -16 2 -32 5 -53c14 15 36 33 97 33zM210 -202c33 0 61 45 61 101s-28 102 -61 102s-60 -46 -60 -102s27 -101 60 -101z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E087-timeSig7.xml b/data/Leland/E087-timeSig7.xml
deleted file mode 100644
index 516a9040bcc..00000000000
--- a/data/Leland/E087-timeSig7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 -123c23 33 125 207 133 222c-10 -9 -47 -13 -67 -13c-80 0 -83 38 -118 38s-50 -31 -50 -54v-32c0 -6 -5 -11 -11 -11h-23c-6 0 -11 5 -11 11v185c0 6 5 11 11 11h23c6 0 11 -5 11 -11v-48c3 6 41 69 103 69c65 0 77 -85 119 -85c40 0 42 68 42 78c0 11 7 14 12 14 h18c6 0 10 -4 11 -14c1 -9 1 -14 1 -23c0 -22 -6 -78 -17 -109c-22 -63 -54 -148 -66 -195c-6 -22 -8 -46 -8 -67c0 -37 6 -68 6 -70v-3c1 -9 -16 -20 -25 -20c-7 0 -34 7 -62 6h-11c-32 -2 -42 -6 -58 -6c-11 0 -14 6 -14 17c0 37 29 77 51 110z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E088-timeSig8.xml b/data/Leland/E088-timeSig8.xml
deleted file mode 100644
index 1266aecdb2c..00000000000
--- a/data/Leland/E088-timeSig8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 18c52 -27 69 -72 69 -120c0 -81 -85 -146 -189 -146s-189 65 -189 146c0 48 25 85 70 111c-47 30 -57 66 -57 106c0 72 79 131 176 131s176 -59 176 -131c0 -40 -23 -72 -56 -97zM268 45c18 9 40 32 40 80c0 46 -42 75 -104 75c-43 0 -79 -16 -79 -55 c0 -45 75 -78 143 -100zM204 -192c64 0 98 35 98 62c0 55 -97 89 -165 112c0 0 -52 -16 -52 -83c0 -56 55 -91 119 -91z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E089-timeSig9.xml b/data/Leland/E089-timeSig9.xml
deleted file mode 100644
index 976507e5572..00000000000
--- a/data/Leland/E089-timeSig9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 -47c-63 0 -140 37 -140 135c0 116 131 157 166 157s72 -2 130 -46c59 -52 76 -121 76 -182c0 -56 -15 -105 -25 -129c-20 -46 -85 -132 -175 -132c-100 0 -142 53 -155 89c-4 8 -6 23 -6 32v3c0 36 29 64 65 64s64 -28 64 -64c0 -23 -17 -50 -38 -59 c10 -11 25 -19 50 -19c70 0 90 74 90 131c0 16 -2 32 -5 53c-14 -15 -36 -33 -97 -33zM192 204c-33 0 -61 -46 -61 -102s28 -101 61 -101s60 45 60 101s-27 102 -60 102z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E08A-timeSigCommon.xml b/data/Leland/E08A-timeSigCommon.xml
deleted file mode 100644
index cc2c5e9afd7..00000000000
--- a/data/Leland/E08A-timeSigCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M325 179c2 1 2 3 2 4c0 2 0 3 -1 5c-11 17 -32 34 -79 34c-89 0 -111 -64 -111 -120v-191c0 -88 42 -135 129 -135c88 0 147 50 151 133c0 4 4 8 8 8h13c5 0 8 -3 8 -8c-4 -107 -81 -165 -180 -165c-250 0 -265 149 -265 268c0 65 25 246 243 246c170 0 209 -92 218 -135 c2 -7 2 -14 2 -21c0 -50 -40 -90 -90 -90h-11c-41 5 -74 37 -79 78c-1 4 -1 8 -1 12c0 32 18 61 43 77z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E08B-timeSigCutCommon.xml b/data/Leland/E08B-timeSigCutCommon.xml
deleted file mode 100644
index b318e9570ab..00000000000
--- a/data/Leland/E08B-timeSigCutCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M424 -83h13c5 0 8 -3 8 -8c-4 -112 -84 -165 -189 -165v-109c0 -6 -5 -11 -11 -11h-27c-6 0 -11 5 -11 11v112c-195 21 -207 156 -207 265c0 61 22 225 207 244v121c0 6 5 11 11 11h27c6 0 11 -5 11 -11v-120c159 -4 196 -93 205 -134c2 -7 2 -14 2 -21 c0 -50 -40 -90 -90 -90h-10c-41 5 -75 37 -80 78c-1 4 -1 8 -1 12c0 32 18 61 43 77c2 1 2 2 2 4c0 1 0 2 -1 4c-10 16 -29 33 -70 35v-446c87 0 155 39 160 133c0 4 4 8 8 8zM136 102v-191c0 -66 23 -109 71 -126v432c-57 -16 -71 -68 -71 -115z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E08C-timeSigPlus.xml b/data/Leland/E08C-timeSigPlus.xml
deleted file mode 100644
index 849eb2f7957..00000000000
--- a/data/Leland/E08C-timeSigPlus.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M227 23h167c7 0 14 -6 14 -13v-19c0 -7 -7 -14 -14 -14h-167v-167c0 -7 -6 -14 -13 -14h-20c-7 0 -13 7 -13 14v167h-168c-7 0 -13 7 -13 14v19c0 7 6 13 13 13h168v168c0 7 6 13 13 13h20c7 0 13 -6 13 -13v-168z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A0-noteheadDoubleWhole.xml b/data/Leland/E0A0-noteheadDoubleWhole.xml
deleted file mode 100644
index 25a1df2940e..00000000000
--- a/data/Leland/E0A0-noteheadDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM451 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v79c-30 -30 -81 -50 -158 -50c-78 0 -129 20 -159 50v-79c0 -6 -7 -14 -14 -14c-10 0 -23 0 -23 14v329 s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 159 49c77 0 128 -20 158 -49v78c0 8 6 14 14 14h9zM524 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM321 -97c24 8 33 25 33 51s-19 90 -33 117s-32 33 -59 33c-16 0 -32 -3 -44 -6 c-22 -7 -32 -21 -32 -45c0 -31 18 -96 32 -123c13 -24 32 -33 60 -33c15 0 31 3 43 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A1-noteheadDoubleWholeSquare.xml b/data/Leland/E0A1-noteheadDoubleWholeSquare.xml
deleted file mode 100644
index 04f6ec88092..00000000000
--- a/data/Leland/E0A1-noteheadDoubleWholeSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M410 177h9c8 0 13 -6 13 -14v-328c0 -8 -5 -14 -13 -14h-9c-8 0 -14 6 -14 14v26h-359v-21c0 -8 -6 -14 -14 -14h-9c-8 0 -14 6 -14 14v323c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-22h359v22c0 8 6 14 14 14zM396 -70v143h-359v-143h359z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A2-noteheadWhole.xml b/data/Leland/E0A2-noteheadWhole.xml
deleted file mode 100644
index 9b676b3ae6f..00000000000
--- a/data/Leland/E0A2-noteheadWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 136c138 0 186 -70 186 -135s-48 -135 -186 -135s-187 70 -187 135s49 135 187 135zM195 -102c40 0 76 8 76 57c0 25 -19 90 -33 116c-14 27 -32 33 -59 33c-16 0 -32 -2 -44 -6c-24 -8 -34 -24 -32 -51c1 -26 19 -91 32 -116s32 -33 60 -33z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A3-noteheadHalf.xml b/data/Leland/E0A3-noteheadHalf.xml
deleted file mode 100644
index c070c60de44..00000000000
--- a/data/Leland/E0A3-noteheadHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M213 132c62 0 112 -33 112 -92c0 -88 -109 -173 -213 -173c-81 0 -112 48 -112 91c0 93 116 174 213 174zM75 -86c46 0 215 85 215 135c0 22 -16 36 -40 36c-47 0 -215 -86 -215 -135c0 -9 7 -36 40 -36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A4-noteheadBlack.xml b/data/Leland/E0A4-noteheadBlack.xml
deleted file mode 100644
index 8f4a8ad8ed5..00000000000
--- a/data/Leland/E0A4-noteheadBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -42c0 92 116 174 213 174c62 0 112 -33 112 -92c0 -88 -109 -173 -213 -173c-81 0 -112 48 -112 91z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A5-noteheadNull.xml b/data/Leland/E0A5-noteheadNull.xml
deleted file mode 100644
index 1445fb5f59a..00000000000
--- a/data/Leland/E0A5-noteheadNull.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A9-noteheadXBlack.xml b/data/Leland/E0A9-noteheadXBlack.xml
deleted file mode 100644
index 5e0a16056fa..00000000000
--- a/data/Leland/E0A9-noteheadXBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M320 96l-122 -96l122 -96c3 -2 5 -6 5 -10c0 -3 -2 -7 -4 -9l-12 -13c-2 -3 -6 -4 -10 -4c-3 0 -7 1 -9 3l-127 101l-128 -101c-2 -2 -6 -3 -9 -3c-4 0 -8 1 -10 4l-12 13c-2 2 -4 6 -4 9c0 4 2 8 5 10l122 96l-122 96c-3 2 -5 6 -5 10s2 8 4 10l13 12c3 2 5 4 9 4 c3 0 7 -1 9 -3l128 -101l127 101c2 2 6 3 9 3c4 0 7 -2 10 -4l12 -12c2 -2 4 -5 4 -9v-1c0 -4 -2 -8 -5 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0AF-noteheadPlusBlack.xml b/data/Leland/E0AF-noteheadPlusBlack.xml
deleted file mode 100644
index fc5eb98baf7..00000000000
--- a/data/Leland/E0AF-noteheadPlusBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M186 23h128c6 0 11 -6 11 -14v-19c0 -7 -5 -13 -11 -13h-128v-101c0 -4 -6 -8 -14 -8h-19c-7 0 -13 4 -13 8v101h-129c-6 0 -11 6 -11 13v19c0 8 5 14 11 14h129v100c0 5 6 9 13 9h19c8 0 14 -4 14 -9v-100z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0D9-noteheadDiamondHalf.xml b/data/Leland/E0D9-noteheadDiamondHalf.xml
deleted file mode 100644
index c6826b3662f..00000000000
--- a/data/Leland/E0D9-noteheadDiamondHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -9l-154 -120c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -8zM198 -80l73 57l-133 104l-74 -58z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0DB-noteheadDiamondBlack.xml b/data/Leland/E0DB-noteheadDiamondBlack.xml
deleted file mode 100644
index bc02f945cda..00000000000
--- a/data/Leland/E0DB-noteheadDiamondBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -10l-154 -119c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0F5-noteheadParenthesisLeft.xml b/data/Leland/E0F5-noteheadParenthesisLeft.xml
deleted file mode 100644
index b3cf0c60045..00000000000
--- a/data/Leland/E0F5-noteheadParenthesisLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0F6-noteheadParenthesisRight.xml b/data/Leland/E0F6-noteheadParenthesisRight.xml
deleted file mode 100644
index f93d5edd79d..00000000000
--- a/data/Leland/E0F6-noteheadParenthesisRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E220-tremolo1.xml b/data/Leland/E220-tremolo1.xml
deleted file mode 100644
index 69bc49dab41..00000000000
--- a/data/Leland/E220-tremolo1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E220" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 33l290 63v-126l-290 -63v126z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E221-tremolo2.xml b/data/Leland/E221-tremolo2.xml
deleted file mode 100644
index 7fe3b704aca..00000000000
--- a/data/Leland/E221-tremolo2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E221" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 126l290 63v-126l-290 -62v125zM0 -62l290 63v-126l-290 -63v126z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E222-tremolo3.xml b/data/Leland/E222-tremolo3.xml
deleted file mode 100644
index 33e0c9476ef..00000000000
--- a/data/Leland/E222-tremolo3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E222" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 220l290 63v-126l-290 -63v126zM0 31l290 63v-126l-290 -62v125zM0 -157l290 63v-126l-290 -63v126z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E223-tremolo4.xml b/data/Leland/E223-tremolo4.xml
deleted file mode 100644
index d14f04e267d..00000000000
--- a/data/Leland/E223-tremolo4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E223" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 315l290 63v-126l-290 -63v126zM0 126l290 63v-126l-290 -62v125zM0 -62l290 63v-126l-290 -63v126zM0 -251l290 63v-126l-290 -63v126z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E224-tremolo5.xml b/data/Leland/E224-tremolo5.xml
deleted file mode 100644
index 7c8fea648aa..00000000000
--- a/data/Leland/E224-tremolo5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E224" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 410l290 63v-126l-290 -63v126zM0 221l290 63v-126l-290 -63v126zM0 32l290 63v-126l-290 -63v126zM0 -156l290 62v-125l-290 -63v126zM0 -345l290 63v-126l-290 -63v126z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E22A-buzzRoll.xml b/data/Leland/E22A-buzzRoll.xml
deleted file mode 100644
index 6c6054fe635..00000000000
--- a/data/Leland/E22A-buzzRoll.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E22A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-76 -85h226v-55h-300v68l226 157h-226v55h300v-65z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E240-flag8thUp.xml b/data/Leland/E240-flag8thUp.xml
deleted file mode 100644
index 3925eeb7c1c..00000000000
--- a/data/Leland/E240-flag8thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -227v226c0 7 6 13 13 13c6 0 11 -4 12 -8c0 0 9 -36 10 -39c2 -4 19 -61 56 -118c27 -42 122 -165 119 -165c0 0 74 -95 79 -224c0 -91 -17 -184 -62 -264c-4 -7 -9 -11 -15 -11c-7 0 -11 3 -11 10c0 4 1 9 3 15c27 72 45 146 45 218c0 83 -29 126 -47 157 c-65 111 -151 165 -194 179c-7 2 -8 8 -8 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E241-flag8thDown.xml b/data/Leland/E241-flag8thDown.xml
deleted file mode 100644
index ea66b7ac65f..00000000000
--- a/data/Leland/E241-flag8thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 1v226c0 3 1 9 8 11c42 14 147 68 212 179c18 31 47 74 47 157c0 72 -16 125 -56 218c-2 5 -3 9 -3 12c0 6 2 10 7 12c1 1 3 1 5 1c6 0 12 -4 15 -11c54 -97 74 -173 74 -264c0 -88 -29 -154 -79 -224s-110 -117 -149 -182c-36 -59 -45 -97 -46 -101 c-1 -3 -10 -38 -10 -39c-1 -4 -7 -8 -12 -8c-7 0 -13 6 -13 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E242-flag16thUp.xml b/data/Leland/E242-flag16thUp.xml
deleted file mode 100644
index 7c3ac178e7e..00000000000
--- a/data/Leland/E242-flag16thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v381c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158c38 -56 89 -107 136 -169c34 -45 48 -92 48 -144c0 -49 -8 -86 -19 -123c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16 c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM209 -473c8 -11 17 -24 25 -40c1 10 2 20 2 30c0 37 -9 78 -48 129c-36 47 -101 115 -152 116c1 -8 2 -15 4 -20c6 -26 24 -60 63 -99c49 -49 79 -81 106 -116z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E243-flag16thDown.xml b/data/Leland/E243-flag16thDown.xml
deleted file mode 100644
index 5a937f9ef1d..00000000000
--- a/data/Leland/E243-flag16thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -10v398c0 2 8 24 15 27c77 17 223 106 244 190l2 3c3 12 4 25 4 38c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -26 -2 -44 -5 -57c5 -37 8 -74 8 -107c0 -185 -139 -262 -193 -313c-40 -38 -71 -68 -86 -171 c-2 -8 -7 -16 -15 -16s-15 8 -15 16zM37 240c48 13 122 34 183 109c27 34 45 82 47 159c-27 -48 -96 -104 -154 -149s-67 -82 -73 -107c-1 -3 -2 -7 -3 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E244-flag32ndUp.xml b/data/Leland/E244-flag32ndUp.xml
deleted file mode 100644
index 77e5e384920..00000000000
--- a/data/Leland/E244-flag32ndUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -382v556c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158c38 -56 89 -107 136 -169c34 -45 48 -92 48 -144c0 -32 -4 -63 -11 -94c7 -23 11 -48 11 -73c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1 c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 -180c-36 47 -102 116 -153 116c5 -22 13 -47 28 -69c38 -55 121 -125 168 -187c1 -2 3 -4 4 -6c0 5 1 10 1 16c0 38 -9 79 -48 130z M209 -474c8 -11 17 -24 25 -39c1 12 2 24 2 36c0 37 -9 78 -48 130c-36 47 -101 109 -152 109c1 -8 2 -16 4 -21c6 -26 24 -60 63 -99c49 -50 79 -81 106 -116z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E245-flag32ndDown.xml b/data/Leland/E245-flag32ndDown.xml
deleted file mode 100644
index 0e0e2434bf9..00000000000
--- a/data/Leland/E245-flag32ndDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -200v588c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 3 5 5c4 3 9 3 13 3c6 0 11 -2 15 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-1 -17 -4 -33 -7 -51 c6 -40 10 -80 10 -117c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM36 51 c49 14 127 39 189 115c26 33 42 75 42 149c-7 -13 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -27 -68z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E246-flag64thUp.xml b/data/Leland/E246-flag64thUp.xml
deleted file mode 100644
index 10dd7cd74bb..00000000000
--- a/data/Leland/E246-flag64thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -383v744c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169c34 -45 48 -92 48 -144c0 -35 -5 -67 -13 -101c9 -26 13 -52 13 -80c0 -34 -4 -67 -11 -100c7 -23 11 -48 11 -73c0 -50 -9 -94 -19 -131c3 -21 5 -46 5 -74c0 -56 -26 -110 -44 -139 c-4 -6 -8 -13 -14 -14c-2 0 -4 1 -6 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 5 1 11 1 16c-1 35 -8 71 -42 122c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9zM188 7c-37 47 -102 116 -153 116h-2c4 -24 13 -53 30 -78c38 -56 121 -130 168 -192c1 -1 2 -3 3 -4 c1 9 2 19 2 29c0 38 -9 78 -48 129zM231 -320c1 -2 3 -4 4 -6c0 7 1 15 1 22c0 38 -9 79 -48 130c-36 47 -101 110 -153 110c5 -23 14 -48 28 -69c38 -55 121 -126 168 -187zM209 -474c8 -11 17 -24 25 -39c1 12 2 23 2 35c0 38 -9 79 -48 130c-36 47 -101 110 -153 110 c2 -9 3 -17 5 -22c6 -25 24 -60 63 -99c49 -49 79 -80 106 -115z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E247-flag64thDown.xml b/data/Leland/E247-flag64thDown.xml
deleted file mode 100644
index 59a10680bea..00000000000
--- a/data/Leland/E247-flag64thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -387v775c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 -1 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -23 -6 -48 -12 -73 c7 -32 12 -64 12 -97v-20c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 43 229 109 229 243c0 6 0 11 -1 17 c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM35 48c112 42 231 109 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM36 -136c50 14 127 39 189 115c26 32 42 74 42 146c-7 -12 -16 -24 -26 -36 c-51 -58 -140 -105 -178 -160c-14 -20 -22 -44 -27 -65z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E248-flag128thUp.xml b/data/Leland/E248-flag128thUp.xml
deleted file mode 100644
index 8e0863389f8..00000000000
--- a/data/Leland/E248-flag128thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -382v943c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -9 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -13 -100c9 -25 13 -50 13 -78c0 -37 -4 -72 -13 -109c9 -26 13 -52 13 -80c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79 c0 -50 -8 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -139c-4 -6 -8 -14 -15 -14c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9zM188 215c-37 47 -102 111 -153 111 h-2c4 -24 13 -53 30 -78c38 -55 121 -129 168 -191c1 -2 2 -4 4 -6c0 9 1 17 1 26c0 41 -8 86 -48 138zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -5 c1 11 2 23 2 34c0 38 -9 79 -48 130c-37 48 -102 110 -153 110h-2c4 -26 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c10 -55 28 -84 69 -125c49 -49 79 -75 106 -110z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E249-flag128thDown.xml b/data/Leland/E249-flag128thDown.xml
deleted file mode 100644
index 01d09f79b04..00000000000
--- a/data/Leland/E249-flag128thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -575v963c0 2 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -24 -6 -48 -12 -73c7 -32 12 -64 12 -97v-20 c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-41 -34 -67 -68 -76 -121c110 42 229 109 229 243c0 5 0 11 -1 16 c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 48c112 42 231 108 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -23 -24 -48 -28 -71zM35 -139c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33 c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM36 -324c49 14 127 39 189 115c26 32 40 74 42 147c-7 -13 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24A-flag256thUp.xml b/data/Leland/E24A-flag256thUp.xml
deleted file mode 100644
index 6a6b13931f7..00000000000
--- a/data/Leland/E24A-flag256thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1129c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -9 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -12 -99c8 -25 12 -50 12 -77c0 -37 -4 -73 -13 -109c9 -25 13 -52 13 -79c0 -38 -4 -73 -13 -110c9 -25 13 -52 13 -80 c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79c0 -50 -8 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -138c-4 -6 -8 -15 -15 -14c-7 0 -12 5 -12 12c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10 zM188 402c-37 47 -102 111 -153 111h-2c5 -23 13 -52 30 -77c38 -55 121 -129 168 -191c1 -2 2 -4 4 -6c0 9 1 17 1 26c0 40 -8 85 -48 137zM231 57c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -25 13 -54 30 -79 c38 -55 121 -129 168 -191zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2 c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -26 24 -57 63 -96c49 -50 79 -76 106 -111z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24B-flag256thDown.xml b/data/Leland/E24B-flag256thDown.xml
deleted file mode 100644
index 00a55a2dd2b..00000000000
--- a/data/Leland/E24B-flag256thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -763v1151c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -60 11 -92v-18c-2 -23 -6 -48 -12 -72c7 -32 12 -64 12 -97v-20 c-2 -23 -5 -47 -12 -72c8 -31 12 -63 12 -95v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-43 -37 -65 -67 -76 -121 c111 42 229 108 229 243c0 5 0 11 -1 16c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 47c111 42 231 109 231 244c0 7 0 14 -1 20c-7 -11 -15 -22 -24 -32c-51 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72zM35 -140c112 43 231 109 231 245c0 5 0 11 -1 17 c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-14 -22 -23 -46 -28 -69zM35 -327c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM36 -512c49 14 127 39 189 115c26 32 40 74 42 147 c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24C-flag512thUp.xml b/data/Leland/E24C-flag512thUp.xml
deleted file mode 100644
index fae14c0309d..00000000000
--- a/data/Leland/E24C-flag512thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1312c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -33 -4 -65 -12 -97c8 -24 12 -49 12 -75c0 -37 -5 -72 -13 -108c9 -25 13 -52 13 -79c0 -37 -5 -73 -13 -109c9 -25 13 -51 13 -79c0 -38 -4 -73 -13 -110 c9 -25 13 -52 13 -80c0 -37 -5 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -8 -93 -19 -130c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121 c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 585c-37 47 -102 111 -153 111h-1c5 -23 13 -50 29 -73c38 -55 121 -129 168 -191c1 -2 3 -4 4 -6c0 8 1 15 1 23c0 41 -9 85 -48 136zM231 245c1 -2 2 -3 3 -5c1 11 2 23 2 34c0 38 -9 79 -48 130 c-37 48 -102 110 -153 110h-2c5 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2c4 -24 13 -54 30 -79c38 -55 121 -129 168 -191zM231 -133c1 -2 2 -3 3 -4c1 12 2 23 2 36 c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39 c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -26 24 -57 63 -96c49 -49 79 -76 106 -111z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24D-flag512thDown.xml b/data/Leland/E24D-flag512thDown.xml
deleted file mode 100644
index 1043d51ea02..00000000000
--- a/data/Leland/E24D-flag512thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -950v1338c0 3 8 25 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 0 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -23 -6 -48 -12 -73 c7 -32 12 -64 12 -97v-20c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -71c7 -32 12 -64 12 -97v-20c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312 c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 43 229 109 229 243c0 6 0 11 -1 17c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM35 48c112 42 231 109 231 244c0 6 0 13 -1 20 c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM35 -139c112 42 231 109 231 244c0 6 0 12 -1 18c-7 -12 -15 -23 -24 -34c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM35 -327c113 42 231 109 231 245c0 6 0 11 -1 17 c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -515c113 43 231 108 231 245c0 6 0 12 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -21 -23 -46 -28 -69zM36 -699c49 14 127 39 189 115c26 32 42 74 42 147 c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24E-flag1024thUp.xml b/data/Leland/E24E-flag1024thUp.xml
deleted file mode 100644
index c6aa7e2d1ad..00000000000
--- a/data/Leland/E24E-flag1024thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1495c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -33 -4 -65 -12 -97c8 -24 12 -49 12 -75c0 -36 -4 -71 -12 -106c8 -25 12 -50 12 -77c0 -37 -5 -72 -13 -108c9 -25 13 -52 13 -79c0 -37 -4 -72 -13 -108 c9 -26 13 -52 13 -80c0 -38 -5 -73 -13 -110c9 -25 13 -52 13 -80c0 -37 -5 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -8 -93 -19 -130c3 -21 5 -45 5 -73c0 -57 -26 -111 -44 -139c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c16 41 23 88 23 132 c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 768c-37 47 -102 111 -153 111l-1 1c4 -23 13 -50 29 -74c38 -55 121 -129 168 -191c1 -2 3 -4 4 -6c0 8 1 15 1 23c0 41 -9 85 -48 136zM231 432c1 -2 2 -3 3 -5c1 10 2 21 2 31c0 38 -9 78 -48 129 c-37 48 -102 110 -153 110h-1c5 -23 13 -50 29 -74c38 -55 121 -129 168 -191zM231 245c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c5 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 57c1 -1 2 -3 3 -4c1 11 2 22 2 34 c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 13 -53 30 -79c38 -55 121 -129 168 -191zM231 -133c1 -1 2 -3 3 -4c1 12 2 24 2 36c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -1 2 -3 3 -4 c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -23 25 -39c1 11 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -25 24 -57 63 -96 c49 -49 79 -76 106 -111z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24F-flag1024thDown.xml b/data/Leland/E24F-flag1024thDown.xml
deleted file mode 100644
index 0c52b44610d..00000000000
--- a/data/Leland/E24F-flag1024thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -1126v1514c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -60 11 -92v-18c-2 -23 -6 -47 -12 -72c7 -32 12 -64 12 -97v-20 c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -72c7 -32 12 -63 12 -96v-20c-1 -16 -4 -34 -7 -51c6 -41 10 -81 10 -118c0 -185 -139 -262 -193 -312 c-40 -38 -68 -83 -86 -156c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM113 359c-44 -37 -65 -67 -76 -121c111 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 47c112 43 231 109 231 245c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33 c-51 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72zM35 -139c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-14 -22 -23 -46 -28 -68zM35 -327c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33 c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -515c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -703c113 42 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33 c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -891c50 14 128 38 190 115c26 33 42 75 42 150c-7 -12 -16 -24 -26 -36c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E260-accidentalFlat.xml b/data/Leland/E260-accidentalFlat.xml
deleted file mode 100644
index a5dc2c8e915..00000000000
--- a/data/Leland/E260-accidentalFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E261-accidentalNatural.xml b/data/Leland/E261-accidentalNatural.xml
deleted file mode 100644
index cfdb58b6c54..00000000000
--- a/data/Leland/E261-accidentalNatural.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1c4 0 7 -1 9 -3zM28 -97l116 32v165l-116 -33v-164z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E262-accidentalSharp.xml b/data/Leland/E262-accidentalSharp.xml
deleted file mode 100644
index 496ca7fd365..00000000000
--- a/data/Leland/E262-accidentalSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E263-accidentalDoubleSharp.xml b/data/Leland/E263-accidentalDoubleSharp.xml
deleted file mode 100644
index fb9c31a1ce5..00000000000
--- a/data/Leland/E263-accidentalDoubleSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M86 -70v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h53l49 50v3l-49 49h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-53l-50 -50v-2 l50 -50h53c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 48h-3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E264-accidentalDoubleFlat.xml b/data/Leland/E264-accidentalDoubleFlat.xml
deleted file mode 100644
index ee6ae049446..00000000000
--- a/data/Leland/E264-accidentalDoubleFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 155c59 0 83 -48 83 -100c0 -103 -90 -185 -176 -228c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-36 -54 -87 -96 -145 -125c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301 c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -320c5 6 34 36 84 36zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM201 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E265-accidentalTripleSharp.xml b/data/Leland/E265-accidentalTripleSharp.xml
deleted file mode 100644
index ddf0d23562c..00000000000
--- a/data/Leland/E265-accidentalTripleSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM397 -70v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h53l49 50v3l-49 49h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59 c0 -8 -6 -14 -14 -14h-53l-50 -50v-2l50 -50h53c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 48h-3zM78 74v-166l89 19v165z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E266-accidentalTripleFlat.xml b/data/Leland/E266-accidentalTripleFlat.xml
deleted file mode 100644
index 8f340714c7d..00000000000
--- a/data/Leland/E266-accidentalTripleFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114c-36 -54 -87 -97 -145 -126c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114s0 -1 -1 -2l-3 -5l-2 -2l-1 -2s0 -1 -1 -1l-1 -3l-1 -1l-4 -4c-1 -1 -1 -2 -2 -3v-1l-1 -1 l-2 -1s0 -1 -1 -1l-1 -3c-55 -62 -120 -94 -124 -96h-1h-1l-1 -1h-2l-2 -1c-9 0 -15 6 -15 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37h10h1l1 -1h1h4c2 -1 2 -1 3 -1c3 -1 4 -1 6 -1l1 -1h1l1 -1h2l1 -1s1 0 2 -1h1h1l1 -1h1v-1 c4 -2 10 -5 13 -8l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM201 -127 c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM369 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E267-accidentalNaturalFlat.xml b/data/Leland/E267-accidentalNaturalFlat.xml
deleted file mode 100644
index e20d39e2a63..00000000000
--- a/data/Leland/E267-accidentalNaturalFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M357 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1 c4 0 7 -1 9 -3zM270 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM28 -97l116 32v165l-116 -33v-164z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E268-accidentalNaturalSharp.xml b/data/Leland/E268-accidentalNaturalSharp.xml
deleted file mode 100644
index 900bf4f3957..00000000000
--- a/data/Leland/E268-accidentalNaturalSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M467 107l-38 -7v-165l33 7c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1c4 0 7 -1 9 -3zM28 -97l116 32v165l-116 -33v-164zM312 76v-165l89 18v165z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E269-accidentalSharpSharp.xml b/data/Leland/E269-accidentalSharpSharp.xml
deleted file mode 100644
index 1df34c252e1..00000000000
--- a/data/Leland/E269-accidentalSharpSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M524 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147 h28v-141l89 18v155h28v-149l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM369 74v-166l89 19v165zM78 74v-166l89 19v165z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26A-accidentalParensLeft.xml b/data/Leland/E26A-accidentalParensLeft.xml
deleted file mode 100644
index 996343fb2f3..00000000000
--- a/data/Leland/E26A-accidentalParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26B-accidentalParensRight.xml b/data/Leland/E26B-accidentalParensRight.xml
deleted file mode 100644
index df3564cf342..00000000000
--- a/data/Leland/E26B-accidentalParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26C-accidentalBracketLeft.xml b/data/Leland/E26C-accidentalBracketLeft.xml
deleted file mode 100644
index 7846d1ec1a7..00000000000
--- a/data/Leland/E26C-accidentalBracketLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M73 -181v-24h-61c-7 0 -12 5 -12 12v387c0 7 5 12 12 12h61v-24h-49v-363h49z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26D-accidentalBracketRight.xml b/data/Leland/E26D-accidentalBracketRight.xml
deleted file mode 100644
index 8ec83819d17..00000000000
--- a/data/Leland/E26D-accidentalBracketRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M61 -205h-61v24h49v363h-49v24h61c7 0 12 -5 12 -12v-387c0 -7 -5 -12 -12 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E270-accidentalQuarterToneFlatArrowUp.xml b/data/Leland/E270-accidentalQuarterToneFlatArrowUp.xml
deleted file mode 100644
index f8d6a695a3e..00000000000
--- a/data/Leland/E270-accidentalQuarterToneFlatArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M197 166c59 0 83 -49 83 -101c0 -102 -90 -185 -175 -228c-2 -1 -5 -2 -8 -2h-1c-7 0 -13 6 -13 13l-5 506l-56 -42c-2 -2 -5 -3 -8 -3c-8 0 -14 6 -14 14c0 2 2 6 3 8l83 117c2 3 7 6 11 6s10 -3 12 -6l83 -117c1 -2 2 -6 2 -8c0 -8 -5 -14 -13 -14c-3 0 -7 1 -9 3 l-56 42l-2 -225c5 6 33 37 83 37zM111 -117c65 51 99 89 99 176c0 20 -3 57 -40 57c-40 0 -55 -29 -57 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E271-accidentalThreeQuarterTonesFlatArrowDown.xml b/data/Leland/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
deleted file mode 100644
index 69f7b8872b7..00000000000
--- a/data/Leland/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M197 166c59 0 83 -49 83 -101c0 -41 -15 -90 -53 -133c-46 -52 -98 -83 -116 -92v-192l61 47c2 2 6 2 9 2c8 0 13 -5 13 -13c0 -2 -1 -6 -2 -8l-84 -118c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-83 118c-1 2 -3 6 -3 8c0 8 6 13 14 13c3 0 6 0 8 -2l61 -47v201l-6 600v1 c0 8 6 13 14 13h12c8 0 14 -5 14 -13v-1l-3 -320c5 6 33 37 83 37zM111 -117c65 51 98 91 98 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E272-accidentalQuarterToneSharpNaturalArrowUp.xml b/data/Leland/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
deleted file mode 100644
index 50df4dd2385..00000000000
--- a/data/Leland/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 183c3 -2 6 -7 6 -11v-495h-28v175l-126 -35c-9 0 -18 2 -18 13v523l-61 -46c-2 -2 -5 -2 -8 -2c-8 0 -14 5 -14 13c0 2 2 6 3 8l83 118c2 3 7 6 11 6s10 -3 12 -6l83 -118c1 -2 2 -6 2 -8c0 -8 -5 -13 -13 -13c-3 0 -7 0 -9 2l-61 47v-204l126 35h1l2 1 c4 0 7 -1 9 -3zM111 -97l116 32v165l-116 -33v-164z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E273-accidentalQuarterToneFlatNaturalArrowDown.xml b/data/Leland/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
deleted file mode 100644
index 4c3ea878915..00000000000
--- a/data/Leland/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 -303c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8l-83 -118c-2 -3 -7 -5 -11 -5s-10 2 -12 5l-83 118c-1 2 -3 6 -3 8c0 8 6 14 14 14c3 0 7 -1 9 -3l61 -47v204l-126 -35c-9 0 -18 2 -18 13v496h28v-176l126 35h1l2 1c9 0 14 -6 14 -14v-523l62 46c2 2 5 3 8 3zM144 99 l-116 -33v-164l116 32v165z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E274-accidentalThreeQuarterTonesSharpArrowUp.xml b/data/Leland/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
deleted file mode 100644
index 01c06ebdba3..00000000000
--- a/data/Leland/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M192 454l84 -118c1 -2 2 -5 2 -8c0 -8 -6 -14 -14 -14c-3 1 -5 2 -8 3l-61 47v-180l33 7c9 0 16 -4 16 -14v-59c0 -6 -4 -12 -11 -13l-38 -8v-165l33 7c4 0 8 0 11 -3c3 -2 5 -6 5 -10v-59c0 -7 -4 -13 -11 -14l-38 -8v-149h-28v144l-89 -18v-155h-28v149l-33 -7 c-5 0 -8 0 -12 3c-3 3 -5 7 -5 11v58c0 6 5 12 11 13l39 8v166l-33 -7c-8 0 -17 3 -17 13v58c0 7 5 13 11 14l39 8v123h28v-117l89 18v185l-61 -46c-2 -1 -5 -2 -8 -2c-4 -1 -7 1 -10 3c-3 3 -4 7 -4 11c0 2 1 5 2 7l84 118c2 3 7 5 11 5c5 0 9 -2 11 -5zM78 -92l89 19v164 l-89 -18v-165z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E275-accidentalQuarterToneSharpArrowDown.xml b/data/Leland/E275-accidentalQuarterToneSharpArrowDown.xml
deleted file mode 100644
index 0fbac18fb0e..00000000000
--- a/data/Leland/E275-accidentalQuarterToneSharpArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M86 -452l-83 117c-2 3 -3 5 -3 8c0 4 2 7 4 10c3 2 6 4 9 4c4 0 7 -1 9 -3l61 -47v180l-32 -6c-8 0 -17 2 -17 13v59c0 7 5 13 11 14l38 8v164l-32 -7c-4 0 -9 1 -12 3c-3 3 -5 7 -5 11v59c0 7 5 12 11 14l38 7v150h28v-144l89 18v154h28v-149l34 7c1 0 1 1 2 1 c4 0 7 -2 9 -4c3 -2 5 -6 5 -10v-58c0 -7 -4 -12 -11 -14l-39 -8v-165l34 7h2c8 0 14 -6 14 -14v-58c0 -6 -4 -12 -11 -13l-39 -8v-123h-27v117l-90 -19v-185l61 46c3 2 6 3 9 3s7 -1 9 -4c3 -2 4 -5 4 -8c0 -1 1 -2 1 -2c-1 -3 -1 -6 -3 -8l-83 -117c-3 -4 -7 -6 -12 -6 c-4 0 -8 2 -11 6zM201 93l-90 -18v-165l90 18v165z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E280-accidentalQuarterToneFlatStein.xml b/data/Leland/E280-accidentalQuarterToneFlatStein.xml
deleted file mode 100644
index a474ae05f2a..00000000000
--- a/data/Leland/E280-accidentalQuarterToneFlatStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c-84 50 -170 124 -170 231zM103 107c-36 0 -39 -34 -39 -55c0 -80 41 -127 99 -176l-1 198c0 -3 -1 -5 -1 -3c0 9 -14 36 -58 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E281-accidentalThreeQuarterTonesFlatZimmermann.xml b/data/Leland/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
deleted file mode 100644
index e3bca3e287a..00000000000
--- a/data/Leland/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M422 58c0 -76 -45 -131 -74 -159c-41 -39 -96 -72 -96 -72c-2 -1 -3 -3 -6 -3c-7 0 -13 6 -13 13l-4 602c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-2 -318c6 8 28 30 74 30c50 0 87 -31 87 -93zM0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8 c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c-84 50 -170 124 -170 231zM319 107c-44 0 -58 -27 -58 -36c0 -2 -1 0 -1 3l-1 -198c58 49 99 96 99 176c0 21 -3 55 -39 55zM103 107c-36 0 -39 -34 -39 -55c0 -80 41 -127 99 -176l-1 198c0 -3 -1 -5 -1 -3 c0 9 -14 36 -58 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E282-accidentalQuarterToneSharpStein.xml b/data/Leland/E282-accidentalQuarterToneSharpStein.xml
deleted file mode 100644
index 89d4eaa92ca..00000000000
--- a/data/Leland/E282-accidentalQuarterToneSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M169 100l-65 -13v-165l59 12c9 0 17 -2 17 -13v-59c0 -6 -5 -13 -11 -14l-65 -13v-151h-28v145l-59 -12c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l65 14v165l-59 -12c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l65 14v152h28v-146l59 12h1l1 1c9 0 15 -6 15 -14v-59 c0 -6 -5 -13 -11 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E283-accidentalThreeQuarterTonesSharpStein.xml b/data/Leland/E283-accidentalThreeQuarterTonesSharpStein.xml
deleted file mode 100644
index df2c517cd01..00000000000
--- a/data/Leland/E283-accidentalThreeQuarterTonesSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M278 110l-36 -7v-165l31 7c9 0 17 -3 17 -14v-59c0 -6 -6 -13 -12 -14l-36 -7v-147h-28v141l-59 -12v-146h-27v141l-53 -11v-145h-27v139l-31 -6c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l37 8v166l-31 -7c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l37 8v157h27v-151l53 11v156 h27v-151l59 12v155h28v-149l31 7c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14zM155 85v-165l59 12v165zM128 -85v165l-53 -11v-165z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E440-accidentalBuyukMucennebFlat.xml b/data/Leland/E440-accidentalBuyukMucennebFlat.xml
deleted file mode 100644
index 1766dca60f9..00000000000
--- a/data/Leland/E440-accidentalBuyukMucennebFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M194 156c60 0 83 -49 83 -101c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-3 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 362l-76 -45v44l76 45l-1 74l-75 -44v44l75 44l-1 79c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-1 -57l120 71v-44l-121 -71v-75l121 71v-44 l-122 -71l-1 -101c4 5 32 37 84 37zM107 -128c65 52 99 91 99 179c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E442-accidentalBakiyeFlat.xml b/data/Leland/E442-accidentalBakiyeFlat.xml
deleted file mode 100644
index 341a77d7bd0..00000000000
--- a/data/Leland/E442-accidentalBakiyeFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M194 156c60 0 83 -49 83 -101c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-2 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 384l-76 -44v44l76 44l-2 175c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-2 -153l121 71v-44l-121 -72l-2 -123c4 5 32 37 84 37zM108 -128 c65 51 98 93 98 179c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E446-accidentalKucukMucennebSharp.xml b/data/Leland/E446-accidentalKucukMucennebSharp.xml
deleted file mode 100644
index 755a41c63df..00000000000
--- a/data/Leland/E446-accidentalKucukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 84c3 -2 5 -6 5 -10v-59c0 -6 -4 -10 -10 -12l-151 -41v-41l92 25h1l1 1c4 0 7 -1 9 -3c3 -2 5 -6 5 -10v-59c0 -6 -3 -11 -9 -13l-99 -26v-152h-26v145l-92 -25h-3c-3 0 -6 0 -8 2c-3 2 -5 7 -5 11v58c0 6 3 10 9 12l99 27v40l-145 -39c-4 0 -8 0 -11 3 c-3 2 -5 6 -5 10v58c0 6 4 10 10 12l151 42v40l-92 -24h-1l-1 -1c-4 0 -7 1 -9 3c-3 2 -5 6 -5 10v58c0 6 3 11 9 13l99 27v152h26v-145l92 25h3c3 0 6 0 8 -2c3 -2 5 -7 5 -11v-59c0 -6 -3 -10 -9 -12l-99 -26v-41l145 39h1l1 1c4 0 7 -1 9 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E447-accidentalBuyukMucennebSharp.xml b/data/Leland/E447-accidentalBuyukMucennebSharp.xml
deleted file mode 100644
index 94a16dd08e9..00000000000
--- a/data/Leland/E447-accidentalBuyukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 84c3 -2 5 -6 5 -10v-59c0 -5 -4 -11 -9 -12l-93 -25v-41l33 9h1l1 1c3 0 7 -2 9 -3c3 -2 5 -6 5 -10v-60c0 -5 -4 -11 -9 -12l-40 -11v-152h-26v145l-91 -24v-152h-26v145l-34 -9c-8 0 -16 3 -16 12v59c0 5 4 11 9 12l41 11v41l-87 -23h-1l-1 -1c-3 0 -7 2 -9 3 c-3 2 -5 6 -5 10v58c0 5 5 12 10 13l93 25v41l-34 -9c-4 0 -8 0 -11 2s-5 6 -5 10v59c0 5 4 11 9 12l41 11v153h26v-146l91 25v152h26v-145l33 9h1l2 1c8 0 13 -6 13 -13v-59c0 -5 -4 -12 -9 -13l-40 -11v-40l86 24h3c2 0 6 -2 8 -3zM220 96l-91 -24v-41l91 25v40zM129 -95 l91 25v41l-91 -25v-41z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A0-articAccentAbove.xml b/data/Leland/E4A0-articAccentAbove.xml
deleted file mode 100644
index 7ed454f0cd2..00000000000
--- a/data/Leland/E4A0-articAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 234l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A1-articAccentBelow.xml b/data/Leland/E4A1-articAccentBelow.xml
deleted file mode 100644
index f047b4a2c52..00000000000
--- a/data/Leland/E4A1-articAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -1l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A2-articStaccatoAbove.xml b/data/Leland/E4A2-articStaccatoAbove.xml
deleted file mode 100644
index c754f478063..00000000000
--- a/data/Leland/E4A2-articStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A3-articStaccatoBelow.xml b/data/Leland/E4A3-articStaccatoBelow.xml
deleted file mode 100644
index 0b2f9391576..00000000000
--- a/data/Leland/E4A3-articStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A4-articTenutoAbove.xml b/data/Leland/E4A4-articTenutoAbove.xml
deleted file mode 100644
index 8daefe2f772..00000000000
--- a/data/Leland/E4A4-articTenutoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A5-articTenutoBelow.xml b/data/Leland/E4A5-articTenutoBelow.xml
deleted file mode 100644
index df2742b4d55..00000000000
--- a/data/Leland/E4A5-articTenutoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A6-articStaccatissimoAbove.xml b/data/Leland/E4A6-articStaccatissimoAbove.xml
deleted file mode 100644
index af3bc700bf0..00000000000
--- a/data/Leland/E4A6-articStaccatissimoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 248c6 0 14 -4 14 -13c0 -11 -50 -220 -50 -220c-1 -4 -3 -15 -13 -15s-12 11 -13 15c0 0 -51 209 -51 220c0 9 9 13 15 13s9 -3 9 -3l35 -37c2 -2 3 -3 5 -3s3 1 5 3l35 37s3 3 9 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A7-articStaccatissimoBelow.xml b/data/Leland/E4A7-articStaccatissimoBelow.xml
deleted file mode 100644
index 4e8d7deeedb..00000000000
--- a/data/Leland/E4A7-articStaccatissimoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -248c-6 0 -14 4 -14 13c0 11 50 220 50 220c1 4 3 15 13 15s12 -11 13 -15c0 0 51 -209 51 -220c0 -9 -9 -13 -15 -13s-9 3 -9 3l-35 37c-2 2 -3 3 -5 3s-3 -1 -5 -3l-35 -37s-3 -3 -9 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A8-articStaccatissimoWedgeAbove.xml b/data/Leland/E4A8-articStaccatissimoWedgeAbove.xml
deleted file mode 100644
index 72e2b4cbd71..00000000000
--- a/data/Leland/E4A8-articStaccatissimoWedgeAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M118 254c2 0 4 -1 4 -5s-2 -12 -5 -21c-31 -101 -46 -220 -46 -220c-2 -5 -6 -8 -10 -8s-8 3 -10 8c0 0 -15 119 -46 220c-3 9 -5 17 -5 21s1 5 4 5c9 0 35 -23 57 -23c21 0 47 23 57 23z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A9-articStaccatissimoWedgeBelow.xml b/data/Leland/E4A9-articStaccatissimoWedgeBelow.xml
deleted file mode 100644
index c6b5390a125..00000000000
--- a/data/Leland/E4A9-articStaccatissimoWedgeBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -254c-2 0 -4 1 -4 5s2 12 5 21c31 101 46 220 46 220c2 5 6 8 10 8s8 -3 10 -8c0 0 15 -119 46 -220c3 -9 5 -17 5 -21s-2 -5 -4 -5c-10 0 -35 23 -57 23s-47 -23 -57 -23z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AC-articMarcatoAbove.xml b/data/Leland/E4AC-articMarcatoAbove.xml
deleted file mode 100644
index cffbc41e212..00000000000
--- a/data/Leland/E4AC-articMarcatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 7l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AD-articMarcatoBelow.xml b/data/Leland/E4AD-articMarcatoBelow.xml
deleted file mode 100644
index cbcf8cbaeba..00000000000
--- a/data/Leland/E4AD-articMarcatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M271 -7l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AE-articMarcatoStaccatoAbove.xml b/data/Leland/E4AE-articMarcatoStaccatoAbove.xml
deleted file mode 100644
index d33085ff393..00000000000
--- a/data/Leland/E4AE-articMarcatoStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 140l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159zM120 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AF-articMarcatoStaccatoBelow.xml b/data/Leland/E4AF-articMarcatoStaccatoBelow.xml
deleted file mode 100644
index 9306d4744a4..00000000000
--- a/data/Leland/E4AF-articMarcatoStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M176 -11c15 -16 15 -40 0 -56c-8 -8 -18 -11 -28 -11s-20 3 -28 11c-15 16 -15 40 0 56c8 7 18 11 28 11s20 -4 28 -11zM271 -140l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B0-articAccentStaccatoAbove.xml b/data/Leland/E4B0-articAccentStaccatoAbove.xml
deleted file mode 100644
index 3386239c678..00000000000
--- a/data/Leland/E4B0-articAccentStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 343l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1zM152 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56 c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B1-articAccentStaccatoBelow.xml b/data/Leland/E4B1-articAccentStaccatoBelow.xml
deleted file mode 100644
index b710d5dc582..00000000000
--- a/data/Leland/E4B1-articAccentStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11zM18 -110l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13 v23c0 8 6 14 15 14l2 -1h1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B2-articTenutoStaccatoAbove.xml b/data/Leland/E4B2-articTenutoStaccatoAbove.xml
deleted file mode 100644
index e880f82f15c..00000000000
--- a/data/Leland/E4B2-articTenutoStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 187h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM130 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B3-articTenutoStaccatoBelow.xml b/data/Leland/E4B3-articTenutoStaccatoBelow.xml
deleted file mode 100644
index 1a6af0e538f..00000000000
--- a/data/Leland/E4B3-articTenutoStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M130 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11zM14 -141h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B4-articTenutoAccentAbove.xml b/data/Leland/E4B4-articTenutoAccentAbove.xml
deleted file mode 100644
index 167de076d07..00000000000
--- a/data/Leland/E4B4-articTenutoAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 357l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1zM36 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18 c0 8 6 14 14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B5-articTenutoAccentBelow.xml b/data/Leland/E4B5-articTenutoAccentBelow.xml
deleted file mode 100644
index e87c9b8bcf0..00000000000
--- a/data/Leland/E4B5-articTenutoAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM18 -124l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14 l2 -1h1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B6-articStressAbove.xml b/data/Leland/E4B6-articStressAbove.xml
deleted file mode 100644
index 89b1dbb4b06..00000000000
--- a/data/Leland/E4B6-articStressAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 0c-4 0 -7 3 -7 7c0 36 140 199 140 199c3 3 9 6 14 6s11 -3 14 -6l38 -38c3 -3 6 -9 6 -14s-3 -11 -6 -14s-163 -140 -199 -140z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B7-articStressBelow.xml b/data/Leland/E4B7-articStressBelow.xml
deleted file mode 100644
index f7251e8ae2b..00000000000
--- a/data/Leland/E4B7-articStressBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -7c0 4 3 7 7 7c36 0 196 -137 199 -140s6 -9 6 -14s-3 -11 -6 -14l-38 -38c-3 -3 -9 -6 -14 -6s-11 3 -14 6c0 0 -140 163 -140 199z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B8-articUnstressAbove.xml b/data/Leland/E4B8-articUnstressAbove.xml
deleted file mode 100644
index 7c695a2e3d0..00000000000
--- a/data/Leland/E4B8-articUnstressAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M332 0c9 -2 10 -9 10 -17c-1 -5 -25 -145 -171 -145s-170 140 -171 145c0 8 1 15 10 17c10 0 14 -3 17 -12c2 -6 17 -93 144 -93s142 87 144 93c3 9 7 12 17 12z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B9-articUnstressBelow.xml b/data/Leland/E4B9-articUnstressBelow.xml
deleted file mode 100644
index 52cd172ecb6..00000000000
--- a/data/Leland/E4B9-articUnstressBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M332 0c-10 0 -14 3 -17 12c-2 6 -17 93 -144 93s-142 -87 -144 -93c-3 -9 -7 -12 -17 -12c-9 2 -10 9 -10 17c1 5 25 145 171 145s170 -140 171 -145c0 -8 -1 -15 -10 -17z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BA-articLaissezVibrerAbove.xml b/data/Leland/E4BA-articLaissezVibrerAbove.xml
deleted file mode 100644
index 7887dc4e325..00000000000
--- a/data/Leland/E4BA-articLaissezVibrerAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M368 48c-42 15 -82 21 -124 21s-80 -7 -124 -21c-40 -12 -94 -41 -100 -45c-4 -2 -7 -3 -10 -3c-5 0 -10 5 -10 10c0 3 1 6 4 9c0 1 21 26 61 52c37 23 97 51 179 51s143 -28 179 -51c40 -26 61 -51 61 -52c3 -3 4 -6 4 -9c0 -5 -5 -10 -10 -10c-3 0 -6 1 -10 3 c-6 4 -59 31 -100 45z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BB-articLaissezVibrerBelow.xml b/data/Leland/E4BB-articLaissezVibrerBelow.xml
deleted file mode 100644
index 3257923db4b..00000000000
--- a/data/Leland/E4BB-articLaissezVibrerBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 -48c42 -15 82 -21 124 -21s80 7 124 21c40 12 94 41 100 45c4 2 7 3 10 3c6 0 10 -5 10 -10c0 -3 -1 -6 -4 -9c0 -1 -21 -26 -61 -52c-36 -23 -97 -51 -179 -51s-142 28 -179 51c-40 26 -61 51 -61 52c-3 3 -4 6 -4 9c0 5 5 10 10 10c3 0 6 -1 10 -3 c6 -4 59 -31 100 -45z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BC-articMarcatoTenutoAbove.xml b/data/Leland/E4BC-articMarcatoTenutoAbove.xml
deleted file mode 100644
index 433d6fb6727..00000000000
--- a/data/Leland/E4BC-articMarcatoTenutoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 123l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159zM14 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BD-articMarcatoTenutoBelow.xml b/data/Leland/E4BD-articMarcatoTenutoBelow.xml
deleted file mode 100644
index b33fe22a1d6..00000000000
--- a/data/Leland/E4BD-articMarcatoTenutoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM280 -123l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C0-fermataAbove.xml b/data/Leland/E4C0-fermataAbove.xml
deleted file mode 100644
index c215ab17196..00000000000
--- a/data/Leland/E4C0-fermataAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M540 260c49 -53 82 -161 82 -215c0 -20 -4 -32 -14 -32c-28 0 -14 86 -98 171c-74 74 -173 75 -197 75h-4c-24 0 -123 -1 -197 -75c-84 -85 -70 -171 -98 -171c-10 0 -14 13 -14 32c0 54 34 161 83 215c94 102 176 108 228 108s135 -6 229 -108zM242 69c0 38 31 69 69 69 s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C1-fermataBelow.xml b/data/Leland/E4C1-fermataBelow.xml
deleted file mode 100644
index 80c3da27c26..00000000000
--- a/data/Leland/E4C1-fermataBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M242 -69c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM540 -260c-94 -102 -177 -108 -229 -108s-134 6 -228 108c-49 54 -83 161 -83 215c0 19 4 32 14 32c28 0 14 -86 98 -171c74 -74 173 -75 197 -75h4c24 0 123 1 197 75c84 85 70 171 98 171 c10 0 14 -12 14 -32c0 -54 -33 -162 -82 -215z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C4-fermataShortAbove.xml b/data/Leland/E4C4-fermataShortAbove.xml
deleted file mode 100644
index 51327554ae9..00000000000
--- a/data/Leland/E4C4-fermataShortAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M331 448l308 -426c1 -2 3 -6 3 -8c0 -8 -6 -14 -14 -14h-43c-4 0 -9 3 -11 6l-254 351l-252 -351c-2 -3 -7 -6 -11 -6h-43c-8 0 -14 6 -14 14c0 2 2 6 3 8l306 426c2 3 7 6 11 6s9 -3 11 -6zM252 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C5-fermataShortBelow.xml b/data/Leland/E4C5-fermataShortBelow.xml
deleted file mode 100644
index 0f2ee7ea49e..00000000000
--- a/data/Leland/E4C5-fermataShortBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M639 -22l-308 -426c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-306 426c-1 2 -3 6 -3 8c0 8 6 14 14 14h43c4 0 9 -3 11 -6l252 -351l254 351c2 3 7 6 11 6h43c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8zM252 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C6-fermataLongAbove.xml b/data/Leland/E4C6-fermataLongAbove.xml
deleted file mode 100644
index c856398ff52..00000000000
--- a/data/Leland/E4C6-fermataLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M28 0h-28v354c0 8 6 14 14 14h595c8 0 14 -6 14 -14v-354h-27v277h-568v-277zM243 103c0 38 31 69 69 69s68 -31 68 -69s-30 -69 -68 -69s-69 31 -69 69z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C7-fermataLongBelow.xml b/data/Leland/E4C7-fermataLongBelow.xml
deleted file mode 100644
index 14271b3efaa..00000000000
--- a/data/Leland/E4C7-fermataLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -354v354h28v-277h568v277h27v-354c0 -8 -6 -14 -14 -14h-595c-8 0 -14 6 -14 14zM243 -103c0 38 31 69 69 69s68 -31 68 -69s-30 -69 -68 -69s-69 31 -69 69z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C8-fermataVeryLongAbove.xml b/data/Leland/E4C8-fermataVeryLongAbove.xml
deleted file mode 100644
index 67d360d1ee9..00000000000
--- a/data/Leland/E4C8-fermataVeryLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M28 0h-28v536c0 8 6 13 14 13h814c8 0 14 -5 14 -13v-536h-28v459h-786v-459zM192 0h-28v354c0 8 6 14 14 14h486c8 0 14 -6 14 -14v-354h-28v277h-458v-277zM352 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C9-fermataVeryLongBelow.xml b/data/Leland/E4C9-fermataVeryLongBelow.xml
deleted file mode 100644
index 029ef76fa2f..00000000000
--- a/data/Leland/E4C9-fermataVeryLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 -354v354h28v-277h458v277h28v-354c0 -8 -6 -14 -14 -14h-486c-8 0 -14 6 -14 14zM0 -536v536h28v-459h786v459h28v-536c0 -8 -6 -13 -14 -13h-814c-8 0 -14 5 -14 13zM352 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4CE-breathMarkComma.xml b/data/Leland/E4CE-breathMarkComma.xml
deleted file mode 100644
index 1956f5e68d1..00000000000
--- a/data/Leland/E4CE-breathMarkComma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M57 0l-24 30c69 48 108 97 108 140c0 6 -1 9 -3 10c-1 1 -3 1 -4 1c-3 0 -5 -1 -8 -2s-17 -8 -46 -8c-43 0 -80 33 -80 76c0 40 32 74 80 74c67 0 111 -46 111 -122c0 -72 -42 -135 -134 -199z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E0-restMaxima.xml b/data/Leland/E4E0-restMaxima.xml
deleted file mode 100644
index 0e9ecbbe5f0..00000000000
--- a/data/Leland/E4E0-restMaxima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -250h-95c-9 0 -15 7 -15 15v470c0 8 6 15 15 15h95c8 0 15 -7 15 -15v-470c0 -8 -7 -15 -15 -15zM435 -250h-95c-9 0 -15 7 -15 15v470c0 8 6 15 15 15h95c8 0 15 -7 15 -15v-470c0 -8 -7 -15 -15 -15z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E1-restLonga.xml b/data/Leland/E4E1-restLonga.xml
deleted file mode 100644
index ae80e8cd20b..00000000000
--- a/data/Leland/E4E1-restLonga.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -250h-95c-8 0 -15 6 -15 15v470c0 8 7 15 15 15h95c8 0 15 -7 15 -15v-470c0 -9 -7 -15 -15 -15z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E2-restDoubleWhole.xml b/data/Leland/E4E2-restDoubleWhole.xml
deleted file mode 100644
index 966dfb8b5c7..00000000000
--- a/data/Leland/E4E2-restDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -11h-95c-8 0 -15 7 -15 15v243c0 8 7 15 15 15h95c9 0 15 -7 15 -15v-243c0 -8 -6 -15 -15 -15z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E3-restWhole.xml b/data/Leland/E4E3-restWhole.xml
deleted file mode 100644
index bb35a5683d5..00000000000
--- a/data/Leland/E4E3-restWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 5h297c8 0 14 -6 14 -14v-108c0 -8 -6 -14 -14 -14h-297c-8 0 -14 6 -14 14v108c0 8 6 14 14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E4-restHalf.xml b/data/Leland/E4E4-restHalf.xml
deleted file mode 100644
index 17320e9bafc..00000000000
--- a/data/Leland/E4E4-restHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v108c0 14 0 14 14 14h297c14 0 14 0 14 -14v-108c0 -14 0 -14 -14 -14h-297c-14 0 -14 0 -14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E5-restQuarter.xml b/data/Leland/E4E5-restQuarter.xml
deleted file mode 100644
index 953c9129d36..00000000000
--- a/data/Leland/E4E5-restQuarter.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M230 -166l2 -3c2 -3 3 -5 3 -8s-1 -6 -3 -9c-3 -4 -6 -5 -10 -5s-8 2 -8 2l-39 25c-8 5 -19 9 -32 9c-32 0 -56 -26 -56 -58c0 -18 7 -32 7 -32s32 -58 35 -63c1 -2 3 -5 3 -9s-2 -8 -7 -12c-2 -2 -4 -2 -6 -2c-7 0 -12 6 -12 6s-75 95 -96 127c-8 11 -11 25 -11 39 c0 51 40 93 91 93c12 0 21 -2 25 -3l-112 139c-2 2 -3 5 -3 8v9c0 2 1 6 2 8l101 154c2 3 3 8 3 12c0 5 -1 9 -3 12l-76 104s-3 5 -3 11c0 3 1 7 5 10c3 3 5 3 8 3c6 0 10 -6 10 -6l162 -219c2 -2 3 -5 3 -8v-9c0 -2 -1 -5 -2 -7l-102 -154c-1 -2 -2 -6 -2 -9 c0 -2 1 -5 2 -6l115 -142c3 -4 5 -6 6 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E6-rest8th.xml b/data/Leland/E4E6-rest8th.xml
deleted file mode 100644
index dff6f81aba9..00000000000
--- a/data/Leland/E4E6-rest8th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M267 203c6 -3 9 -7 9 -12c0 -2 0 -4 -1 -5l-140 -441l-27 8l114 356c-34 -37 -69 -62 -122 -62c-47 0 -100 25 -100 79c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -19 -7 -35 -18 -48c54 10 102 72 125 118c2 5 7 8 13 8c1 0 3 -1 4 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E7-rest16th.xml b/data/Leland/E4E7-rest16th.xml
deleted file mode 100644
index 2f698ee6a1e..00000000000
--- a/data/Leland/E4E7-rest16th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 186l-195 -693l-27 7l102 365c-30 -39 -69 -65 -119 -66c-20 0 -37 2 -56 10c-26 9 -47 34 -47 64c0 40 30 74 70 74c39 0 73 -29 73 -69c0 -17 -6 -34 -17 -48c51 13 108 77 122 125l45 159c-30 -39 -69 -64 -119 -66c-47 0 -101 19 -103 75c0 39 30 72 69 74 c39 0 74 -30 74 -69c0 -18 -5 -34 -17 -48c55 14 95 68 119 116c3 5 7 8 13 8c1 0 3 0 5 -1c6 -2 9 -7 9 -12c0 -2 0 -3 -1 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E8-rest32nd.xml b/data/Leland/E4E8-rest32nd.xml
deleted file mode 100644
index ccc044cc713..00000000000
--- a/data/Leland/E4E8-rest32nd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M151 49c-45 0 -90 29 -90 76c0 40 31 71 70 71s72 -27 72 -67c0 -18 -3 -33 -15 -48c56 14 99 84 119 134l39 161c-28 -39 -68 -67 -117 -70c-5 -1 -9 -1 -13 -1c-45 3 -92 23 -92 76c0 42 33 72 72 72s70 -29 70 -67c0 -18 -3 -33 -15 -48c49 12 94 71 113 113 c3 5 7 9 13 9c1 0 3 0 4 -1c6 -2 10 -6 10 -12c0 -1 0 -3 -1 -4l-232 -950l-27 6l91 371c-30 -41 -72 -70 -125 -70s-97 25 -97 77c0 40 32 70 71 70s71 -26 71 -66c0 -18 -3 -34 -14 -48c58 16 96 83 118 134l37 152c-4 -7 -41 -70 -132 -70z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E9-rest64th.xml b/data/Leland/E4E9-rest64th.xml
deleted file mode 100644
index 38321608504..00000000000
--- a/data/Leland/E4E9-rest64th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M144 -752l78 377c-3 -8 -37 -75 -130 -75c-75 0 -92 48 -92 75s20 71 71 71c50 0 71 -44 71 -71c0 -16 -5 -30 -13 -41c15 5 30 12 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -75 -129 -75s-93 56 -93 76c0 19 16 71 72 71c55 0 71 -48 71 -71c0 -22 -5 -30 -13 -42 c59 20 90 83 112 136l33 159c-4 -8 -41 -75 -129 -75c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-29 -45 -73 -75 -129 -75c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72 c0 -14 -5 -29 -14 -41c16 5 31 13 43 24c39 36 62 85 66 92s6 10 15 10c1 0 2 0 3 -1c6 -1 10 -6 10 -12c0 -1 0 -2 -1 -3c-2 -8 -226 -1086 -251 -1206z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4EA-rest128th.xml b/data/Leland/E4EA-rest128th.xml
deleted file mode 100644
index 9733c3227b7..00000000000
--- a/data/Leland/E4EA-rest128th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M470 714c4 -3 5 -6 5 -9c0 -1 -1 -4 -1 -5c-2 -8 -279 -1339 -304 -1459l-27 6l78 374c-8 -15 -43 -72 -129 -72c-75 0 -93 48 -93 75s21 72 72 72c50 0 71 -44 71 -72c0 -16 -5 -29 -13 -41c15 5 30 13 43 24c24 23 57 73 69 109l33 162c-3 -8 -37 -75 -130 -75 c-75 0 -92 48 -92 75s20 72 71 72c50 0 71 -45 71 -72c0 -16 -5 -30 -13 -41c15 5 30 13 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -74 -129 -74s-93 56 -93 75s16 71 72 71c55 0 71 -48 71 -70c0 -23 -5 -30 -13 -42c59 20 90 81 112 135l33 159c-4 -8 -41 -75 -129 -75 c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-29 -45 -73 -75 -129 -75c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72c0 -14 -5 -29 -14 -41c53 17 86 70 109 117c4 6 7 9 15 9c1 0 5 -1 8 -3 z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4EB-rest256th.xml b/data/Leland/E4EB-rest256th.xml
deleted file mode 100644
index 7cef136e770..00000000000
--- a/data/Leland/E4EB-rest256th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M516 723c6 -1 10 -7 11 -13c0 -1 -1 -2 -1 -3l-356 -1705l-27 6l79 375c-31 -40 -61 -67 -115 -73c-5 0 -10 -1 -15 -1c-42 0 -87 21 -92 68c0 41 21 74 64 79c40 0 73 -22 78 -64c0 -19 -2 -33 -13 -49c55 18 95 84 112 136l33 157c-27 -40 -64 -69 -114 -74 c-48 0 -101 9 -107 68c-1 3 -1 5 -1 8c1 36 28 66 64 70c39 0 75 -22 78 -64c1 -2 1 -5 1 -7c0 -15 -5 -30 -14 -41c16 4 31 12 43 24c37 33 65 96 70 112l33 155v3c-28 -40 -65 -69 -115 -74c-5 0 -10 -1 -15 -1c-43 0 -87 21 -92 68c-1 3 -1 5 -1 8c0 36 28 67 64 71 c41 0 74 -21 79 -64c0 -19 -2 -32 -13 -49c57 19 92 83 113 135c0 1 1 5 1 5l31 150c-28 -40 -63 -68 -114 -73c-4 -1 -9 -1 -13 -1c-15 0 -29 2 -43 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 36 27 67 64 71c3 1 5 1 7 1c37 0 68 -27 72 -64c0 -19 -2 -33 -13 -49 c15 5 30 13 43 24c35 33 61 89 68 107l33 158c-28 -40 -63 -68 -114 -73c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -49 31 -52 61c0 39 22 75 64 78c2 1 5 1 7 1c36 0 68 -27 71 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c58 18 93 84 113 137l33 154l-1 -1 c-9 -13 -20 -26 -31 -37c-25 -22 -55 -34 -83 -37c-5 0 -10 -1 -15 -1c-42 0 -88 21 -93 68c0 40 21 74 64 79c40 0 73 -22 78 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c16 5 31 13 43 25c39 35 63 81 66 92c3 8 9 9 17 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4EC-rest512th.xml b/data/Leland/E4EC-rest512th.xml
deleted file mode 100644
index 1ac3f619651..00000000000
--- a/data/Leland/E4EC-rest512th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M566 967c10 0 13 -8 13 -16c-2 -7 -384 -1835 -409 -1955l-27 6l77 371c-10 -18 -46 -69 -127 -69c-75 0 -93 48 -93 75c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c52 17 91 77 109 126l34 161c-10 -17 -46 -70 -128 -70c-75 0 -93 48 -93 75 c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c52 17 92 79 110 128l34 163c-8 -14 -43 -72 -129 -72c-75 0 -93 48 -93 75c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c53 18 95 83 112 133l33 156c-3 -7 -37 -75 -130 -75 c-75 0 -93 48 -93 75c0 28 21 72 72 72c50 0 71 -44 71 -72c0 -15 -5 -29 -13 -41c53 18 101 89 114 140l31 147c-4 -7 -45 -74 -129 -74s-93 56 -93 75c0 20 15 72 71 72s72 -49 72 -71s-5 -30 -13 -42c15 5 30 13 43 24c35 33 62 94 69 112l33 158c-4 -7 -41 -74 -129 -74 c-71 0 -93 42 -93 76c0 35 27 70 71 70s72 -37 72 -72c0 -21 -7 -34 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -13 -13 -18 -31 -37c-19 -18 -57 -38 -98 -38c-42 0 -93 19 -93 75c0 44 34 72 71 72s72 -29 72 -72c0 -13 -5 -29 -14 -41 c52 17 86 71 109 117c4 6 7 9 14 9z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4ED-rest1024th.xml b/data/Leland/E4ED-rest1024th.xml
deleted file mode 100644
index d2607a906ef..00000000000
--- a/data/Leland/E4ED-rest1024th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M558 986l33 156c-27 -41 -65 -70 -115 -75c-4 -1 -9 -1 -13 -1c-45 0 -88 17 -95 68c0 40 22 73 64 78c39 0 75 -21 78 -63c1 -3 1 -6 1 -8c0 -15 -5 -30 -14 -41c16 5 31 13 43 24c39 36 63 82 66 92c2 6 7 9 13 10h4c6 -2 10 -7 11 -13c0 -1 0 -2 -1 -4l-462 -2213 l-27 6l79 376c-28 -41 -64 -68 -115 -73c-5 -1 -10 -1 -16 -1c-14 0 -28 2 -39 6c-28 8 -49 32 -52 62c0 40 22 73 64 78c39 0 73 -21 78 -63c0 -18 -2 -34 -13 -49c59 20 92 83 113 138l32 152c-28 -40 -64 -68 -114 -73h-13c-14 0 -29 1 -42 6c-28 8 -49 31 -52 61 c0 3 -1 5 -1 8c0 36 28 67 64 71c41 0 74 -21 79 -64c0 -19 -2 -33 -13 -49c56 19 94 85 112 137l33 155c-10 -14 -20 -26 -31 -37c-25 -22 -55 -34 -83 -37h-13c-15 0 -29 1 -43 6c-27 8 -49 32 -52 61c0 41 21 74 64 79c40 0 73 -22 78 -64c0 -19 -2 -33 -13 -49 c57 19 93 83 113 136l32 158c-27 -41 -64 -69 -114 -74c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 37 27 68 64 71c3 1 5 1 8 1c36 0 67 -27 71 -64c0 -19 -2 -33 -13 -49c15 5 30 13 43 24c36 34 64 97 69 113l33 158 c-27 -42 -65 -69 -115 -74c-4 -1 -8 -1 -13 -1c-44 0 -89 18 -94 68c0 39 21 73 63 78c40 0 74 -20 79 -63c0 -18 -2 -34 -13 -49c52 17 102 84 113 135c9 39 32 155 32 155c-26 -41 -64 -69 -114 -74c-5 0 -10 -1 -15 -1c-42 0 -87 21 -92 68c0 3 -1 5 -1 8 c0 36 28 67 64 71c41 0 74 -21 79 -64c0 -19 -2 -33 -13 -49c55 18 95 84 112 136l33 159c-27 -41 -64 -69 -114 -74c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 3 -1 6 -1 9c1 35 28 66 64 69c3 1 5 1 8 1c36 0 67 -27 71 -64c0 -19 -2 -33 -13 -49 c15 5 30 13 43 24c36 34 64 97 69 113z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4F2-restQuarterOld.xml b/data/Leland/E4F2-restQuarterOld.xml
deleted file mode 100644
index bf39a0d8b86..00000000000
--- a/data/Leland/E4F2-restQuarterOld.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 203c1 0 3 1 4 1c6 0 11 -3 13 -8c4 -6 35 -65 80 -98c14 -10 29 -17 45 -20c-11 13 -18 29 -18 48c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -54 -53 -79 -100 -79c-52 0 -89 26 -122 62l114 -356l-26 -8l-141 441c-1 1 -1 3 -1 5c0 5 3 9 9 12z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4F6-restQuarterZ.xml b/data/Leland/E4F6-restQuarterZ.xml
deleted file mode 100644
index 518c5ddd0fe..00000000000
--- a/data/Leland/E4F6-restQuarterZ.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 -180l-7 9c-36 44 -80 92 -140 96c14 -12 23 -28 25 -47c1 -3 1 -6 1 -9c-1 -34 -25 -64 -60 -70c-4 -1 -8 -1 -12 -1c-35 0 -65 26 -71 61c0 32 6 56 35 73c21 14 51 21 76 21c17 0 34 -3 52 -10l-184 222c-2 3 -3 6 -3 8c0 5 2 8 6 11c2 1 5 1 7 2c1 0 2 -1 2 -1 c5 0 9 -2 12 -6c35 -44 81 -94 140 -98c-13 11 -22 27 -25 46c0 38 18 72 59 79c4 1 9 1 13 1c34 0 65 -25 70 -61c1 -3 1 -7 1 -10c0 -26 -14 -50 -36 -62c-14 -10 -32 -17 -52 -20c-7 -1 -14 -1 -22 -2c-18 0 -38 4 -56 12l194 -231c3 -4 4 -7 4 -10c0 -4 -2 -7 -5 -9 c-2 -1 -5 -2 -7 -2c-6 0 -13 3 -17 8z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E500-repeat1Bar.xml b/data/Leland/E500-repeat1Bar.xml
deleted file mode 100644
index e027e8011de..00000000000
--- a/data/Leland/E500-repeat1Bar.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E501-repeat2Bars.xml b/data/Leland/E501-repeat2Bars.xml
deleted file mode 100644
index 645086c7a3b..00000000000
--- a/data/Leland/E501-repeat2Bars.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM735 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E502-repeat4Bars.xml b/data/Leland/E502-repeat4Bars.xml
deleted file mode 100644
index 7d3ef576ead..00000000000
--- a/data/Leland/E502-repeat4Bars.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM989 250l-355 -500h-126l355 500h126zM1243 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM1243 -126 c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E503-repeatBarUpperDot.xml b/data/Leland/E503-repeatBarUpperDot.xml
deleted file mode 100644
index 7b7bea226d1..00000000000
--- a/data/Leland/E503-repeatBarUpperDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E504-repeatBarSlash.xml b/data/Leland/E504-repeatBarSlash.xml
deleted file mode 100644
index 305eb6bce50..00000000000
--- a/data/Leland/E504-repeatBarSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E505-repeatBarLowerDot.xml b/data/Leland/E505-repeatBarLowerDot.xml
deleted file mode 100644
index 2d27de46640..00000000000
--- a/data/Leland/E505-repeatBarLowerDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M127 -127c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E510-ottava.xml b/data/Leland/E510-ottava.xml
deleted file mode 100644
index 7e1b9252ff4..00000000000
--- a/data/Leland/E510-ottava.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E511-ottavaAlta.xml b/data/Leland/E511-ottavaAlta.xml
deleted file mode 100644
index f87b42850fe..00000000000
--- a/data/Leland/E511-ottavaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM496 425l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28 c41 0 79 81 79 116c0 10 -1 12 -21 31c-10 9 -15 17 -15 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -75 -55 -198 -142 -198c-43 0 -76 28 -76 72c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM825 418h77l-48 -164c-5 -18 -5 -19 -5 -22 c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-27 0 -42 17 -42 42c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25 c32 24 45 46 45 80zM773 397c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145c0 21 -12 35 -30 35zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E512-ottavaBassa.xml b/data/Leland/E512-ottavaBassa.xml
deleted file mode 100644
index 10a36f6be87..00000000000
--- a/data/Leland/E512-ottavaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM479 244l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c40 0 79 83 79 117c0 10 -2 12 -22 31c-10 9 -14 16 -14 27c0 19 13 32 34 32c23 0 39 -17 39 -43c0 -74 -56 -199 -142 -199c-43 0 -76 28 -76 72c0 11 3 28 6 38 l16 54c5 18 7 28 7 33c0 12 -6 15 -30 15h-12l3 23zM808 237h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153 c29 0 50 -10 62 -30zM756 217c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144c0 21 -12 36 -30 36zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E513-ottavaBassaBa.xml b/data/Leland/E513-ottavaBassaBa.xml
deleted file mode 100644
index 198afa48369..00000000000
--- a/data/Leland/E513-ottavaBassaBa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM506 371l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -86 -77 -158 -161 -158c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM851 237h77l-48 -163c-5 -18 -5 -20 -5 -23 c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-30 0 -42 17 -42 43c-23 -30 -46 -43 -80 -43c-50 0 -86 37 -86 89c0 79 68 153 141 153c29 0 50 -10 62 -30zM798 217c-50 0 -76 -104 -76 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144 c0 21 -13 36 -31 36zM496 209c-48 0 -78 -111 -78 -148c0 -22 13 -38 32 -38c48 0 77 113 77 150c0 21 -13 36 -31 36zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E514-quindicesima.xml b/data/Leland/E514-quindicesima.xml
deleted file mode 100644
index 467011cbe39..00000000000
--- a/data/Leland/E514-quindicesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E515-quindicesimaAlta.xml b/data/Leland/E515-quindicesimaAlta.xml
deleted file mode 100644
index 98924a48cc9..00000000000
--- a/data/Leland/E515-quindicesimaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM782 416l-14 -60c31 40 61 60 92 60c36 0 55 -22 55 -55c32 38 58 55 87 55c33 0 54 -21 54 -51 c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -69h-77l47 158c5 17 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM1321 409h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8 c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 4 -2 15c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM1269 388c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145 c0 21 -12 35 -30 35z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E516-quindicesimaBassa.xml b/data/Leland/E516-quindicesimaBassa.xml
deleted file mode 100644
index c275de27bf7..00000000000
--- a/data/Leland/E516-quindicesimaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM758 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 58 54 87 54c32 0 54 -20 54 -51 c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1297 228h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8 c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153c29 0 50 -10 62 -30zM1245 208c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144 c0 21 -12 36 -30 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E517-ventiduesima.xml b/data/Leland/E517-ventiduesima.xml
deleted file mode 100644
index e6071810db2..00000000000
--- a/data/Leland/E517-ventiduesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E518-ventiduesimaAlta.xml b/data/Leland/E518-ventiduesimaAlta.xml
deleted file mode 100644
index cad95d5ac4f..00000000000
--- a/data/Leland/E518-ventiduesimaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM842 416l-14 -60c30 40 61 60 92 60c36 0 55 -22 55 -55 c32 38 59 55 88 55c32 0 53 -21 53 -51c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12 c-11 0 -26 -11 -41 -29c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM1381 409h77l-48 -164c-5 -18 -5 -19 -5 -22 c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-22 -35 -59 -84 -104 -84c-27 0 -42 17 -42 42c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 68 153 141 153c29 0 49 -10 61 -30zM1329 388c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145 c0 21 -12 35 -30 35z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E519-ventiduesimaBassa.xml b/data/Leland/E519-ventiduesimaBassa.xml
deleted file mode 100644
index 60c19b5dfbe..00000000000
--- a/data/Leland/E519-ventiduesimaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM842 235l-14 -60c31 40 61 60 92 60c33 0 56 -22 56 -54 c32 38 58 54 87 54c33 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12 c-11 0 -26 -11 -41 -29c-19 -23 -32 -51 -49 -110l-17 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-11l3 23zM1381 228h77l-48 -163c-5 -18 -5 -20 -5 -23 c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-22 -35 -59 -84 -104 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 68 153 141 153c29 0 49 -10 61 -30zM1329 208c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38 c48 0 77 107 77 144c0 21 -12 36 -30 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51A-octaveParensLeft.xml b/data/Leland/E51A-octaveParensLeft.xml
deleted file mode 100644
index bf505fd7638..00000000000
--- a/data/Leland/E51A-octaveParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M160 -13v-30c-44 23 -71 45 -99 81c-34 43 -61 122 -61 176v1c0 112 63 206 160 257v-31c-33 -23 -47 -41 -61 -77c-16 -40 -24 -90 -24 -149c0 -66 10 -122 29 -162c13 -29 27 -45 56 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51B-octaveParensRight.xml b/data/Leland/E51B-octaveParensRight.xml
deleted file mode 100644
index 52c0804a84b..00000000000
--- a/data/Leland/E51B-octaveParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 442v30c44 -23 71 -45 99 -82c34 -43 61 -121 61 -175c0 -112 -62 -207 -160 -258v30c33 23 47 42 61 78c16 40 24 90 24 150c0 66 -10 121 -29 161c-13 29 -27 45 -56 66z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51C-ottavaBassaVb.xml b/data/Leland/E51C-ottavaBassaVb.xml
deleted file mode 100644
index 04e726a4fef..00000000000
--- a/data/Leland/E51C-ottavaBassaVb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM765 348l-45 -153c23 19 39 26 63 26c47 0 83 -37 83 -85c0 -86 -75 -157 -160 -157c-61 0 -100 31 -100 78c0 16 1 17 11 52l48 161c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 23zM479 221l-36 -122c-11 -45 -12 -47 -12 -57 c0 -15 14 -28 28 -28c41 0 79 81 79 116c0 10 -2 12 -22 31c-10 9 -14 17 -14 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -75 -55 -198 -142 -198c-43 0 -76 28 -76 72c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 16 -30 16h-12l4 23zM73 101c0 -43 29 -72 74 -72 s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM755 186c-50 0 -79 -111 -79 -149c0 -22 14 -37 33 -37c48 0 77 113 77 150c0 21 -13 36 -31 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51D-quindicesimaBassaMb.xml b/data/Leland/E51D-quindicesimaBassaMb.xml
deleted file mode 100644
index 71df519a46f..00000000000
--- a/data/Leland/E51D-quindicesimaBassaMb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM1253 362l-45 -152c23 19 39 25 63 25c47 0 83 -36 83 -84c0 -86 -75 -158 -160 -158 c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 24zM758 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 58 54 87 54c32 0 54 -20 54 -51c0 -15 -4 -31 -11 -52l-29 -82c-2 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7 c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12 c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1243 200c-49 0 -79 -110 -79 -148c0 -22 14 -38 33 -38c48 0 77 113 77 150c0 21 -13 36 -31 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51E-ventiduesimaBassaMb.xml b/data/Leland/E51E-ventiduesimaBassaMb.xml
deleted file mode 100644
index 7d6a3f6c685..00000000000
--- a/data/Leland/E51E-ventiduesimaBassaMb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM1337 362l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84 c0 -85 -76 -158 -160 -158c-61 0 -101 31 -101 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM842 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 59 54 88 54c32 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11 c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 56 15 66 c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1327 200c-48 0 -78 -111 -78 -148c0 -22 13 -38 32 -38c48 0 77 113 77 150c0 21 -13 36 -31 36z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E520-dynamicPiano.xml b/data/Leland/E520-dynamicPiano.xml
deleted file mode 100644
index ea36a870d3b..00000000000
--- a/data/Leland/E520-dynamicPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E521-dynamicMezzo.xml b/data/Leland/E521-dynamicMezzo.xml
deleted file mode 100644
index ee8da9c4c7f..00000000000
--- a/data/Leland/E521-dynamicMezzo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4 c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8 c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E522-dynamicForte.xml b/data/Leland/E522-dynamicForte.xml
deleted file mode 100644
index 7bac2fba2fb..00000000000
--- a/data/Leland/E522-dynamicForte.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E523-dynamicRinforzando.xml b/data/Leland/E523-dynamicRinforzando.xml
deleted file mode 100644
index 74302a1dd42..00000000000
--- a/data/Leland/E523-dynamicRinforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109 c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E524-dynamicSforzando.xml b/data/Leland/E524-dynamicSforzando.xml
deleted file mode 100644
index 238821bc612..00000000000
--- a/data/Leland/E524-dynamicSforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25 c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E525-dynamicZ.xml b/data/Leland/E525-dynamicZ.xml
deleted file mode 100644
index 4e61dcfcfc4..00000000000
--- a/data/Leland/E525-dynamicZ.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M159 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5 c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24 s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E526-dynamicNiente.xml b/data/Leland/E526-dynamicNiente.xml
deleted file mode 100644
index 5b2ac993997..00000000000
--- a/data/Leland/E526-dynamicNiente.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 211l3 4c13 18 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -41 -10 -79 -23 -117c-4 -12 -8 -24 -8 -33c0 -6 2 -10 8 -12c2 -1 3 -1 5 -1c5 0 10 2 15 11c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -36 -32 -73 -77 -73c-34 0 -50 26 -50 57 c0 13 3 28 9 43c10 26 27 77 27 106c-1 4 -2 6 -5 7l-1 1h-2l-1 -1c-25 -10 -57 -52 -77 -193c0 -3 -1 -6 -1 -7c-2 -11 -6 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77 c5 0 10 -1 15 -2c29 -7 38 -41 38 -41z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E527-dynamicPPPPPP.xml b/data/Leland/E527-dynamicPPPPPP.xml
deleted file mode 100644
index a5375832767..00000000000
--- a/data/Leland/E527-dynamicPPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1867 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26 c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2 c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43 c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1 c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43z M168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM554 112h1c6 18 16 54 16 81c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3c25 12 49 59 62 98zM816 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2 c3 0 9 1 12 3zM1140 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1464 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9 c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1788 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43 c2 -1 5 -2 7 -2c3 0 9 1 12 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E528-dynamicPPPPP.xml b/data/Leland/E528-dynamicPPPPP.xml
deleted file mode 100644
index 8b4bed08b78..00000000000
--- a/data/Leland/E528-dynamicPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1543 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136 c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26 c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 105 96 105 c4 0 7 0 11 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3 c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179 c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43 c2 -1 6 -2 8 -2c3 0 8 1 11 3zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM1140 14c42 20 79 133 79 180 c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1464 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E529-dynamicPPPP.xml b/data/Leland/E529-dynamicPPPP.xml
deleted file mode 100644
index eb5e7254885..00000000000
--- a/data/Leland/E529-dynamicPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1219 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136 c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4 c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65 c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1 c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3z M816 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1140 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1 c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52A-dynamicPPP.xml b/data/Leland/E52A-dynamicPPP.xml
deleted file mode 100644
index e5d1725cfde..00000000000
--- a/data/Leland/E52A-dynamicPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M895 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136 c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61 l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1 c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69 c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22 c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1c3 0 9 0 12 2c25 12 50 59 63 98z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52B-dynamicPP.xml b/data/Leland/E52B-dynamicPP.xml
deleted file mode 100644
index ebbe3a4d30f..00000000000
--- a/data/Leland/E52B-dynamicPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M571 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43 c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z M492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52C-dynamicMP.xml b/data/Leland/E52C-dynamicMP.xml
deleted file mode 100644
index ac3045504b4..00000000000
--- a/data/Leland/E52C-dynamicMP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M508 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192 c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70 c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86 c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11zM536 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52D-dynamicMF.xml b/data/Leland/E52D-dynamicMF.xml
deleted file mode 100644
index 200303b6f25..00000000000
--- a/data/Leland/E52D-dynamicMF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M289 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45 c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200 c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35 l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52E-dynamicPF.xml b/data/Leland/E52E-dynamicPF.xml
deleted file mode 100644
index 2ca03f720e5..00000000000
--- a/data/Leland/E52E-dynamicPF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M277 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c44 21 79 131 79 179 c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52F-dynamicFF.xml b/data/Leland/E52F-dynamicFF.xml
deleted file mode 100644
index d8c288d9edc..00000000000
--- a/data/Leland/E52F-dynamicFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 253l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1 c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53 c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170 c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E530-dynamicFFF.xml b/data/Leland/E530-dynamicFFF.xml
deleted file mode 100644
index 52f9451f93f..00000000000
--- a/data/Leland/E530-dynamicFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M837 357v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c5 4 6 7 6 13c0 4 -2 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11 v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 20 -16c3 0 5 0 7 1c3 1 7 2 9 4 c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 16 69 24 99l34 134h-159v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40 c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h156l1 2 c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h157v2 c25 75 66 171 160 171c41 0 84 -21 90 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E531-dynamicFFFF.xml b/data/Leland/E531-dynamicFFFF.xml
deleted file mode 100644
index c1885d2fae7..00000000000
--- a/data/Leland/E531-dynamicFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1018 381c0 1 -1 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81 c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 20 -16c3 0 5 0 7 1c3 1 7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 3h-156v-2c-7 -23 -16 -55 -25 -87 c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122 c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5 c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19 c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2 c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2 c24 75 67 171 160 171c41 0 84 -21 90 -66v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 8 6 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E532-dynamicFFFFF.xml b/data/Leland/E532-dynamicFFFFF.xml
deleted file mode 100644
index a556e8063b0..00000000000
--- a/data/Leland/E532-dynamicFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M947 -174c3 0 5 0 7 1c3 1 7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81 c0 27 25 53 52 53c36 0 46 -27 46 -41c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279 c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2 c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12 c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5 c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-63c-6 0 -10 4 -10 10v22c0 6 4 11 10 11h76l1 1c25 74 66 171 159 171c28 0 68 -13 82 -39c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4 c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c25 74 67 171 159 171c28 0 68 -13 82 -39c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19 c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c25 74 67 171 159 171c28 0 68 -13 82 -39 c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1 c25 74 67 171 159 171c46 0 92 -26 92 -77c0 -6 0 -12 -2 -17c-5 -20 -28 -36 -49 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1 c25 75 66 171 160 171c41 0 84 -21 90 -66v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 8 6 13c0 2 0 3 -1 5c-1 3 -5 6 -8 7c-4 1 -6 1 -8 1c-3 0 -7 0 -9 -1c-7 -2 -15 -10 -19 -16 c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-1 0 -9 -2 -9 -9s5 -16 20 -16z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E533-dynamicFFFFFF.xml b/data/Leland/E533-dynamicFFFFFF.xml
deleted file mode 100644
index e4fa1ec743c..00000000000
--- a/data/Leland/E533-dynamicFFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1177 -155c0 -10 9 -15 18 -15c5 0 14 1 18 5c9 6 16 14 22 26c10 20 17 50 30 101l3 12c9 37 17 70 24 100c2 8 3 15 5 22c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36 c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87 c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122 c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5 c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40 c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2 c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8 c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8 c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 75 66 170 159 170c45 0 92 -25 92 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1v1c25 75 67 171 160 171c40 0 85 -24 90 -67v-3l1 -5c0 -6 -1 -13 -2 -19c-6 -20 -28 -36 -49 -36c-15 0 -25 5 -34 17c-2 2 -3 6 -4 9c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 12 c0 2 0 3 -1 5c-1 3 -5 6 -8 7c-1 1 -2 1 -3 1l-3 1c-4 0 -8 0 -11 -2c-7 -2 -15 -10 -19 -16c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36 c-48 0 -82 31 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -3 -9 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E534-dynamicFortePiano.xml b/data/Leland/E534-dynamicFortePiano.xml
deleted file mode 100644
index 63bb4a22fb8..00000000000
--- a/data/Leland/E534-dynamicFortePiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-84 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM393 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM421 12c3 0 8 0 11 2c44 21 79 131 79 179 c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E535-dynamicForzando.xml b/data/Leland/E535-dynamicForzando.xml
deleted file mode 100644
index edd96bdca2f..00000000000
--- a/data/Leland/E535-dynamicForzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM383 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11 c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23 c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21 c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E536-dynamicSforzando1.xml b/data/Leland/E536-dynamicSforzando1.xml
deleted file mode 100644
index 7c88fabc820..00000000000
--- a/data/Leland/E536-dynamicSforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68 c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28 c0 7 3 19 17 27z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E537-dynamicSforzandoPiano.xml b/data/Leland/E537-dynamicSforzandoPiano.xml
deleted file mode 100644
index f425587af98..00000000000
--- a/data/Leland/E537-dynamicSforzandoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM619 -159h-225v21h62l99 275c5 10 22 52 22 77c0 7 -1 13 -5 16c-2 2 -4 2 -7 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 32 -44 32l-2 6l-59 -160h76v-21zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38 s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58 c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM646 16c3 0 9 0 12 2c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E538-dynamicSforzandoPianissimo.xml b/data/Leland/E538-dynamicSforzandoPianissimo.xml
deleted file mode 100644
index a9d63cf5718..00000000000
--- a/data/Leland/E538-dynamicSforzandoPianissimo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM1061 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20 h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4 c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 228c0 0 -8 13 -34 13 s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83 c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM658 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM982 14 c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E539-dynamicSforzato.xml b/data/Leland/E539-dynamicSforzato.xml
deleted file mode 100644
index 9cc1cfc6b02..00000000000
--- a/data/Leland/E539-dynamicSforzato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68 c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28 c0 7 3 19 17 27zM618 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6 c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25 c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53A-dynamicSforzatoPiano.xml b/data/Leland/E53A-dynamicSforzatoPiano.xml
deleted file mode 100644
index 4c87e5e3a55..00000000000
--- a/data/Leland/E53A-dynamicSforzatoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -65c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM824 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM168 223c0 0 -8 13 -34 13s-45 -21 -45 -38 s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58 c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM618 198c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3 c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34 c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6zM852 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32 c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53B-dynamicSforzatoFF.xml b/data/Leland/E53B-dynamicSforzatoFF.xml
deleted file mode 100644
index 53362b11923..00000000000
--- a/data/Leland/E53B-dynamicSforzatoFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M414 253l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1 c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53 c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170 c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133zM168 228 c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60 c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM870 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18 c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27 c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53C-dynamicRinforzando1.xml b/data/Leland/E53C-dynamicRinforzando1.xml
deleted file mode 100644
index 4311849be0a..00000000000
--- a/data/Leland/E53C-dynamicRinforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4 c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2 c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53D-dynamicRinforzando2.xml b/data/Leland/E53D-dynamicRinforzando2.xml
deleted file mode 100644
index 49ea3f90897..00000000000
--- a/data/Leland/E53D-dynamicRinforzando2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM636 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11 c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23 c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21 c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6zM189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12 h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E566-ornamentTrill.xml b/data/Leland/E566-ornamentTrill.xml
deleted file mode 100644
index 82e76243450..00000000000
--- a/data/Leland/E566-ornamentTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M322 275c39 0 61 -30 61 -61s-12 -52 -46 -52c-27 0 -40 26 -40 38s3 27 17 36c-1 1 -3 1 -4 1c-6 0 -15 -4 -24 -11c-11 -10 -21 -29 -21 -29l-42 -95s-16 -50 -16 -72v-19s-2 -11 -15 -11h-45s-9 1 -12 9s-6 15 -6 15s-34 -24 -65 -24s-64 11 -64 59 c0 22 24 100 46 166h-44s-14 1 -14 12v13s2 12 14 12h56c13 37 23 65 23 65s1 5 5 8s50 41 52 43s7 5 10 5h9c7 0 14 -7 14 -14v-2l-34 -105h103s8 0 13 -5l8 -8s22 26 61 26zM154 99c9 31 40 123 40 123s0 3 -3 3h-66l-30 -93s-11 -29 -11 -52c0 -13 4 -26 18 -26 c17 0 44 18 52 45z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E567-ornamentTurn.xml b/data/Leland/E567-ornamentTurn.xml
deleted file mode 100644
index 70c9220d079..00000000000
--- a/data/Leland/E567-ornamentTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M366 232c51 0 90 -47 90 -118c0 -75 -64 -114 -121 -114c-34 0 -60 12 -85 35l-105 98c-26 23 -41 31 -70 31c-25 0 -45 -20 -45 -45v-1c0 -28 11 -43 30 -43c21 0 26 15 48 15c23 0 41 -16 41 -45c0 -30 -31 -45 -58 -45c-51 0 -91 47 -91 118c0 75 64 114 121 114 c34 0 61 -12 86 -35l104 -98c26 -23 42 -31 71 -31c25 0 44 20 44 45v1c0 28 -11 43 -30 43c-21 0 -26 -15 -48 -15c-23 0 -41 16 -41 45c0 30 32 45 59 45z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E568-ornamentTurnInverted.xml b/data/Leland/E568-ornamentTurnInverted.xml
deleted file mode 100644
index a854537c6de..00000000000
--- a/data/Leland/E568-ornamentTurnInverted.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 232c27 0 59 -15 59 -45c0 -29 -18 -45 -41 -45c-22 0 -27 15 -48 15c-19 0 -30 -15 -30 -43v-1c0 -25 19 -45 44 -45c29 0 45 8 71 31l104 98c25 23 52 35 86 35c57 0 121 -39 121 -114c0 -71 -40 -118 -91 -118c-27 0 -58 15 -58 45c0 29 18 45 41 45 c22 0 27 -15 48 -15c19 0 30 15 30 43v1c0 25 -20 45 -45 45c-29 0 -44 -8 -70 -31l-105 -98c-25 -23 -51 -35 -85 -35c-57 0 -121 39 -121 114c0 71 39 118 90 118z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E569-ornamentTurnSlash.xml b/data/Leland/E569-ornamentTurnSlash.xml
deleted file mode 100644
index 1cfbfec2c30..00000000000
--- a/data/Leland/E569-ornamentTurnSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M366 232c51 0 90 -47 90 -118c0 -75 -64 -114 -121 -114c-34 0 -60 12 -85 35l-4 3v-105c0 -8 -5 -13 -13 -13h-9c-8 0 -14 5 -14 13v139l-65 61c-26 23 -41 31 -70 31c-25 0 -45 -20 -45 -45v-1c0 -28 11 -43 30 -43c21 0 26 15 48 15c23 0 41 -16 41 -45 c0 -30 -31 -45 -58 -45c-51 0 -91 47 -91 118c0 75 64 114 121 114c34 0 61 -12 86 -35l3 -3v105c0 8 6 14 14 14h9c8 0 13 -6 13 -14v-139l65 -61c26 -23 42 -31 71 -31c25 0 44 20 44 45v1c0 28 -11 43 -30 43c-21 0 -26 -15 -48 -15c-23 0 -41 16 -41 45 c0 30 32 45 59 45z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56A-ornamentTurnUp.xml b/data/Leland/E56A-ornamentTurnUp.xml
deleted file mode 100644
index 4aef71b0c1d..00000000000
--- a/data/Leland/E56A-ornamentTurnUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 91c0 -51 -47 -91 -118 -91c-75 0 -114 64 -114 121c0 34 12 61 35 86l98 104c23 26 31 42 31 71c0 25 -20 44 -45 44h-1c-28 0 -43 -11 -43 -30c0 -21 15 -26 15 -48c0 -23 -16 -41 -45 -41c-30 0 -45 32 -45 59c0 51 47 90 118 90c75 0 114 -64 114 -121 c0 -34 -12 -60 -35 -85l-98 -105c-23 -26 -31 -41 -31 -70c0 -25 20 -45 45 -45h1c28 0 43 11 43 30c0 21 -15 26 -15 48c0 23 16 41 45 41c30 0 45 -31 45 -58z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56B-ornamentTurnUpS.xml b/data/Leland/E56B-ornamentTurnUpS.xml
deleted file mode 100644
index 1cc8149d4ab..00000000000
--- a/data/Leland/E56B-ornamentTurnUpS.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 366c0 -27 -15 -59 -45 -59c-29 0 -45 18 -45 41c0 22 15 27 15 48c0 19 -15 30 -43 30h-1c-25 0 -45 -19 -45 -44c0 -29 8 -45 31 -71l98 -104c23 -25 35 -52 35 -86c0 -57 -39 -121 -114 -121c-71 0 -118 40 -118 91c0 27 15 58 45 58c29 0 45 -18 45 -41 c0 -22 -15 -27 -15 -48c0 -19 15 -30 43 -30h1c25 0 45 20 45 45c0 29 -8 44 -31 70l-98 105c-23 25 -35 51 -35 85c0 57 39 121 114 121c71 0 118 -39 118 -90z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56C-ornamentShortTrill.xml b/data/Leland/E56C-ornamentShortTrill.xml
deleted file mode 100644
index cb74be9fa38..00000000000
--- a/data/Leland/E56C-ornamentShortTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M449 210l24 -15l-117 -188c-2 -4 -8 -7 -12 -7s-10 2 -12 6l-78 125l-73 -124c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-74 124l-59 -98l-24 15l117 193c3 4 8 7 12 7s10 -3 12 -7l74 -122l72 122c2 4 8 7 12 7s9 -3 11 -7l80 -126z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56D-ornamentMordent.xml b/data/Leland/E56D-ornamentMordent.xml
deleted file mode 100644
index d71d56aff95..00000000000
--- a/data/Leland/E56D-ornamentMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M449 210l24 -15l-117 -188c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 124l-2 -3v-191c0 -8 -6 -14 -14 -14h-8c-8 0 -14 6 -14 14v129l-35 -59c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-74 124l-59 -98l-24 15l117 193c2 4 8 7 12 7s10 -3 12 -7l74 -122l1 1v182c0 8 6 14 14 14h8 c8 0 14 -6 14 -14v-120l35 59c2 4 7 7 11 7s10 -3 12 -7l80 -126z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56E-ornamentTremblement.xml b/data/Leland/E56E-ornamentTremblement.xml
deleted file mode 100644
index 5269d61f476..00000000000
--- a/data/Leland/E56E-ornamentTremblement.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M630 210l24 -14l-118 -189c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-79 126l-78 -126c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7h-1c-4 0 -10 3 -12 7l-74 125l-59 -99l-24 15l117 193v1c2 4 6 6 12 6c4 0 10 -2 12 -6l75 -123l72 121v1 c2 4 8 7 12 7s10 -2 12 -6l79 -127l59 95l18 31c2 4 8 7 12 7c7 0 9 -2 12 -6l79 -127z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56F-ornamentHaydn.xml b/data/Leland/E56F-ornamentHaydn.xml
deleted file mode 100644
index 2701933dcd1..00000000000
--- a/data/Leland/E56F-ornamentHaydn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M499 192c3 -16 4 -31 4 -44c0 -106 -68 -148 -125 -148c-56 0 -89 16 -115 39l-28 29l-64 -75c-3 -4 -8 -6 -12 -6s-7 1 -10 4c-4 3 -6 7 -6 12c0 4 1 7 4 11l65 77l-21 20c-20 20 -52 52 -91 52c-47 0 -64 -51 -64 -107c0 -9 0 -18 1 -26c0 -9 -3 -14 -16 -14 c-14 0 -17 14 -17 16c-3 15 -4 28 -4 41c0 108 68 151 125 151c56 0 89 -16 115 -40l28 -28l64 75c3 4 7 6 12 6c4 0 7 -1 11 -4c3 -3 5 -8 5 -12s-1 -8 -4 -11l-65 -77l21 -20c20 -20 52 -52 91 -52c47 0 64 51 64 107c0 9 0 17 -1 26c0 9 5 14 16 14c14 0 17 -15 17 -16z " /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E583-ornamentVerticalLine.xml b/data/Leland/E583-ornamentVerticalLine.xml
deleted file mode 100644
index 6f82578df84..00000000000
--- a/data/Leland/E583-ornamentVerticalLine.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E583" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 123v252c0 8 6 14 14 14h9c7 0 14 -6 14 -14v-252c0 -8 -7 -14 -14 -14h-9c-8 0 -14 6 -14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E587-ornamentSchleifer.xml b/data/Leland/E587-ornamentSchleifer.xml
deleted file mode 100644
index b689a2e5b30..00000000000
--- a/data/Leland/E587-ornamentSchleifer.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M737 473c8 0 14 -6 14 -14s-6 -14 -14 -14c-36 0 -80 -29 -133 -88s-156 -218 -239 -351c-2 -4 -6 -6 -12 -6c-2 0 -4 0 -6 2c-2 1 -4 3 -5 4l-79 127l-78 -126c-2 -4 -7 -7 -11 -7c-6 0 -10 2 -12 7l-79 126l-59 -95l-24 15l117 189h1c2 4 6 6 11 6s9 -2 12 -6l79 -126 l78 126c2 4 6 6 11 6s9 -2 12 -6l78 -124c75 119 134 202 184 258c60 66 109 97 154 97z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E59D-ornamentZigZagLineNoRightEnd.xml b/data/Leland/E59D-ornamentZigZagLineNoRightEnd.xml
deleted file mode 100644
index 59d5fccbc6f..00000000000
--- a/data/Leland/E59D-ornamentZigZagLineNoRightEnd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 240l90 -148l-50 -85c-3 -4 -5 -7 -12 -7c-6 0 -9 3 -12 7s-67 112 -74 124l-59 -98l-24 14c11 19 114 188 117 193s7 7 12 7c4 0 9 -2 12 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E59E-ornamentZigZagLineWithRightEnd.xml b/data/Leland/E59E-ornamentZigZagLineWithRightEnd.xml
deleted file mode 100644
index 78732667e97..00000000000
--- a/data/Leland/E59E-ornamentZigZagLineWithRightEnd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 89l-16 26l78 126c2 4 7 7 11 7c6 0 10 -2 12 -6l79 -127l59 95l24 -15l-117 -189h-1c-2 -4 -6 -6 -11 -6s-9 2 -12 6l-79 126z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5B2-ornamentPrecompAppoggTrill.xml b/data/Leland/E5B2-ornamentPrecompAppoggTrill.xml
deleted file mode 100644
index f55bf95981d..00000000000
--- a/data/Leland/E5B2-ornamentPrecompAppoggTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M597 118l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-79 -126c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-75 125l-76 -126c-3 -5 -9 -9 -16 -9l-3 1c-8 2 -14 10 -14 17v358c1 7 7 12 14 12s13 -5 14 -12 v-323l115 192c2 4 6 6 12 6c4 0 10 -2 12 -6l75 -123l72 122c2 4 8 7 12 7s10 -2 12 -6l79 -127l78 126c2 4 7 7 11 7c6 0 10 -2 12 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5B5-ornamentPrecompSlideTrillDAnglebert.xml b/data/Leland/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
deleted file mode 100644
index 259d6f4ea35..00000000000
--- a/data/Leland/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M579 115l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-9 3 -12 7l-78 126l-78 -126c-3 -4 -8 -7 -12 -7s-10 3 -12 7l-78 124l-73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7l-75 125l-19 -33c-29 -48 -44 -92 -44 -135c0 -35 10 -68 30 -101c1 -2 2 -5 2 -7 c0 -5 -3 -10 -7 -12c-2 -2 -5 -2 -7 -2c-5 0 -10 3 -12 6c-23 39 -34 77 -34 117c0 47 16 96 48 149l77 126v1c3 4 5 7 10 7h2c2 0 6 -1 8 -2l1 -1h1l1 -1v-1c1 0 1 -1 1 -2l75 -122l73 123c2 3 7 6 12 6c2 0 5 -1 7 -2l4 -4l79 -127l59 95h1l18 32c2 3 7 6 12 6 c6 0 9 -2 12 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5B8-ornamentPrecompSlideTrillBach.xml b/data/Leland/E5B8-ornamentPrecompSlideTrillBach.xml
deleted file mode 100644
index dd0dff58ad9..00000000000
--- a/data/Leland/E5B8-ornamentPrecompSlideTrillBach.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M579 115l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-4 -6v-185c0 -8 -6 -14 -14 -14h-9c-8 0 -14 6 -14 14v126l-37 -61c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 125l-73 -125c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-75 125l-19 -32 c-29 -48 -43 -92 -43 -135c0 -35 10 -69 29 -102c1 -2 2 -5 2 -7c0 -7 -7 -14 -14 -14c-4 0 -10 3 -12 7c-22 38 -34 77 -34 117c0 47 16 96 48 148l77 128c2 4 6 6 12 6c2 0 5 -1 7 -2h2v-1h1l1 -1v-1s1 -1 1 -2l75 -122l73 123c2 4 8 7 12 7c5 0 9 -3 11 -7l79 -127l3 5 v187c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-127l19 30v1l19 31c2 4 8 6 12 6c6 0 8 -2 11 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BB-ornamentPrecompTrillSuffixDandrieu.xml b/data/Leland/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
deleted file mode 100644
index 0ebcb0fcc9e..00000000000
--- a/data/Leland/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M628 399c23 -38 34 -77 34 -117c0 -47 -16 -95 -48 -148l-77 -128c-2 -4 -8 -6 -12 -6c-6 0 -11 4 -13 9l-74 120l-73 -122c-2 -4 -8 -7 -12 -7s-9 2 -11 6l-79 127l-78 -126c-2 -4 -8 -7 -12 -7c-6 0 -8 3 -11 7l-79 126l-59 -95l-24 15l117 189c2 4 8 6 12 6 s10 -2 12 -6l78 -126l78 126c2 4 8 6 12 6s10 -2 12 -6l78 -125l73 125c2 4 8 6 12 6s10 -2 12 -6l75 -126l19 32c29 48 43 92 43 135c0 35 -9 69 -29 102c-1 2 -2 5 -2 7c0 7 7 14 14 14c4 0 10 -3 12 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BC-ornamentPrecompPortDeVoixMordent.xml b/data/Leland/E5BC-ornamentPrecompPortDeVoixMordent.xml
deleted file mode 100644
index 83a8d44fce4..00000000000
--- a/data/Leland/E5BC-ornamentPrecompPortDeVoixMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M289 34c-3 -5 -6 -7 -12 -7c-10 0 -14 8 -15 15s-1 37 -16 70c-21 45 -55 68 -103 68c-47 0 -81 -23 -99 -68c-16 -37 -15 -66 -16 -72c0 -9 -5 -13 -15 -13s-13 9 -13 14s1 41 18 82c23 55 67 85 125 85c59 0 103 -30 129 -85c6 -15 11 -29 14 -42l96 161c2 3 5 6 9 6 c6 0 11 -1 14 -6l75 -123l73 123c2 3 7 6 12 6c2 0 5 0 7 -2c2 0 4 -3 5 -4l79 -127l4 7v185c0 8 6 14 13 14h9c8 0 14 -6 14 -14v-126l37 61c2 3 8 6 12 6c6 0 9 -2 12 -6l79 -127l59 95l23 -14l-117 -189c-2 -4 -7 -7 -11 -7h-1c-4 0 -9 3 -11 7l-79 126l-3 -5v-187 c0 -7 -6 -13 -14 -13h-9c-7 0 -13 6 -13 13v128c-4 -6 -36 -58 -39 -62c-3 -5 -8 -7 -12 -7s-9 2 -12 7c-2 4 -70 112 -77 124l-74 -124c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-74 124c-6 -9 -56 -92 -59 -97z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BD-ornamentPrecompTrillWithMordent.xml b/data/Leland/E5BD-ornamentPrecompTrillWithMordent.xml
deleted file mode 100644
index bb54059363a..00000000000
--- a/data/Leland/E5BD-ornamentPrecompTrillWithMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M570 115l59 95l24 -15l-117 -189c-2 -3 -8 -6 -12 -6s-9 3 -12 6l-78 126l-3 -4v-187c0 -7 -6 -14 -14 -14h-9c-7 0 -14 7 -14 14v128l-38 -62c-3 -4 -8 -7 -12 -7s-10 3 -12 6l-78 125l-73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7l-74 124l-59 -98l-24 14l116 194 c3 4 6 7 12 7c5 0 10 -3 12 -7l75 -122l73 122c2 4 7 7 12 7c2 0 5 -1 7 -2l4 -4l79 -127l4 6v186c0 7 7 13 14 13h9c8 0 14 -6 14 -13v-127l18 30h1l18 31c2 4 7 7 12 7c6 0 9 -2 12 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BE-ornamentPrecompCadence.xml b/data/Leland/E5BE-ornamentPrecompCadence.xml
deleted file mode 100644
index adc1e9a54cd..00000000000
--- a/data/Leland/E5BE-ornamentPrecompCadence.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M704 196l-117 -189c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -77 125c-8 -13 -72 -121 -74 -125c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -97c-2 -4 -6 -7 -13 -7c-6 0 -13 6 -14 13c0 1 -1 37 -17 72c-21 45 -55 68 -103 68 c-35 0 -63 -13 -83 -39c-3 -3 -7 -5 -11 -5c-3 0 -6 1 -8 3c-4 2 -6 6 -6 11c0 2 1 6 3 8c25 33 61 50 105 50c59 0 103 -29 129 -85c6 -15 11 -30 14 -43c25 41 95 159 97 162c1 3 5 6 11 6s10 -3 12 -6c2 -4 68 -111 75 -122c7 11 70 117 73 122c2 4 7 6 12 6 c4 0 9 -2 12 -6c2 -5 71 -114 79 -127l58 95z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml b/data/Leland/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
deleted file mode 100644
index 186cfc71298..00000000000
--- a/data/Leland/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M255 33c-2 -3 -6 -6 -13 -6s-14 6 -14 13c0 1 -1 37 -17 72c-21 45 -56 68 -103 68c-35 0 -63 -13 -83 -39c-3 -4 -7 -6 -11 -6c-3 1 -6 1 -9 3c-3 3 -5 7 -5 11c0 3 1 6 3 9c25 33 60 50 105 50c79 0 126 -56 143 -128c24 41 95 158 96 161c2 4 6 7 12 7s10 -3 12 -7 c2 -3 68 -110 75 -122c7 12 70 118 73 122c2 5 7 7 11 7c5 0 9 -2 12 -7c3 -4 72 -114 79 -126l78 126c2 4 7 7 11 7c6 0 10 -2 12 -7l79 -126l59 95l24 -14l-117 -189c-3 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126c-8 -13 -76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7 s-70 112 -78 124c-7 -12 -71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -98z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml b/data/Leland/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
deleted file mode 100644
index 1ff6c6266b1..00000000000
--- a/data/Leland/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M267 97c-27 -45 -61 -70 -119 -70s-103 29 -128 85c-18 40 -20 80 -20 81c0 8 6 15 14 15c7 0 14 -6 14 -14c0 -3 2 -36 18 -72c20 -44 53 -67 102 -67s74 22 100 65c25 43 71 120 72 122c2 3 6 6 12 6s10 -3 12 -6c2 -4 68 -111 75 -122c7 11 70 117 73 122 c2 4 7 6 12 6c4 0 8 -2 11 -6c3 -5 72 -114 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-2 -3 -8 -6 -12 -7c-4 0 -9 3 -12 7l-78 126c-8 -12 -76 -122 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -78 125c-7 -13 -71 -121 -73 -125 c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-1 -1 -10 -16 -20 -34z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C6-ornamentPrecompMordentUpperPrefix.xml b/data/Leland/E5C6-ornamentPrecompMordentUpperPrefix.xml
deleted file mode 100644
index 8f1cbff91c3..00000000000
--- a/data/Leland/E5C6-ornamentPrecompMordentUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M360 242c3 -5 79 -127 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-9 3 -12 7l-78 126s-76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-78 124 -78 124s-71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7 c-3 4 -74 124 -74 124s-57 -93 -59 -98c-3 -4 -8 -6 -12 -6c-5 0 -8 2 -11 5s-51 64 -51 168c0 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134c0 0 103 172 105 176c2 3 6 6 12 6s10 -3 12 -6 c2 -4 75 -123 75 -123s70 118 73 123c2 4 7 6 12 6c4 0 8 -2 11 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml b/data/Leland/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
deleted file mode 100644
index dd61baed291..00000000000
--- a/data/Leland/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M574 0c-5 0 -9 3 -12 7l-78 126l-3 -5v-187c0 -7 -6 -13 -14 -13h-9c-7 0 -14 6 -14 13v128c-3 -6 -35 -58 -38 -62c-4 -5 -8 -7 -12 -7s-9 2 -12 7c-3 4 -70 112 -78 124l-73 -124c-1 -1 -5 -7 -12 -7c-6 0 -10 3 -12 7l-74 124l-59 -97c-1 -1 -2 -3 -4 -4 c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -11 5c-33 41 -51 104 -51 168c-1 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134l105 176c3 3 6 6 11 6s10 -1 13 -6l75 -123l73 123c2 3 6 6 10 6c5 0 7 0 9 -2 c1 0 3 -3 4 -4l79 -127l4 7v185c0 8 7 14 14 14h9c8 0 14 -6 14 -14v-126l37 61c2 3 7 6 12 6c4 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-1 -1 -4 -7 -12 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C8-ornamentPrecompTrillLowerSuffix.xml b/data/Leland/E5C8-ornamentPrecompTrillLowerSuffix.xml
deleted file mode 100644
index dae7aa53512..00000000000
--- a/data/Leland/E5C8-ornamentPrecompTrillLowerSuffix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 117c7 12 72 121 74 125c2 3 7 7 12 7s9 -3 12 -7l74 -125c5 9 53 89 59 98c3 6 8 7 11 7c4 0 8 -2 11 -5c43 -49 71 -125 71 -203c0 -62 -17 -125 -56 -180c-3 -3 -7 -6 -11 -6c-3 1 -6 1 -8 3c-4 3 -7 8 -7 11s2 6 3 9c36 49 52 107 52 164c0 63 -21 125 -53 169 l-106 -177c-2 -4 -6 -7 -12 -7c-5 0 -9 3 -12 7l-75 122l-73 -122c-2 -4 -6 -7 -11 -7c-7 0 -10 4 -12 7s-72 114 -79 126l-79 -127c-2 -4 -6 -6 -11 -6c-8 0 -15 6 -15 14s123 204 139 228c3 3 6 7 12 7s9 -3 12 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5E5-brassMuteClosed.xml b/data/Leland/E5E5-brassMuteClosed.xml
deleted file mode 100644
index 2a2d97aece2..00000000000
--- a/data/Leland/E5E5-brassMuteClosed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 178h119v119c0 10 11 15 22 15s22 -5 22 -15v-119h119c10 0 15 -11 15 -22s-5 -22 -15 -22h-119v-119c0 -10 -11 -15 -22 -15s-22 5 -22 15v119h-119c-10 0 -15 11 -15 22s5 22 15 22z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5E6-brassMuteHalfClosed.xml b/data/Leland/E5E6-brassMuteHalfClosed.xml
deleted file mode 100644
index 119326046bf..00000000000
--- a/data/Leland/E5E6-brassMuteHalfClosed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140s-140 63 -140 140s63 140 140 140zM251 154c-6 50 -47 91 -97 97v-97h97zM61 219c-18 -17 -29 -40 -33 -65h98v97c-25 -3 -48 -14 -65 -32zM28 126c8 -50 47 -91 98 -97v97h-98zM154 29c50 6 91 47 97 97h-97v-97z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5E7-brassMuteOpen.xml b/data/Leland/E5E7-brassMuteOpen.xml
deleted file mode 100644
index b9954f5293a..00000000000
--- a/data/Leland/E5E7-brassMuteOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140s-140 63 -140 140s63 140 140 140zM140 28c62 0 112 50 112 112s-50 112 -112 112s-112 -50 -112 -112s50 -112 112 -112z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E610-stringsDownBow.xml b/data/Leland/E610-stringsDownBow.xml
deleted file mode 100644
index 6aa9b14d979..00000000000
--- a/data/Leland/E610-stringsDownBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M28 0h-28v279s6 14 14 14h287c8 0 14 -6 14 -14v-279h-28v202h-259v-202z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E611-stringsDownBowTurned.xml b/data/Leland/E611-stringsDownBowTurned.xml
deleted file mode 100644
index 84e8a1162f8..00000000000
--- a/data/Leland/E611-stringsDownBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 14v279h28v-202h259v202h28v-279c0 -8 -6 -14 -14 -14h-287c-8 0 -14 14 -14 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E612-stringsUpBow.xml b/data/Leland/E612-stringsUpBow.xml
deleted file mode 100644
index aff59f13669..00000000000
--- a/data/Leland/E612-stringsUpBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 337c1 -2 2 -6 2 -9l-1 -3v-1l-117 -315c-2 -5 -8 -9 -13 -9s-11 4 -13 9l-117 315v1l-1 3c0 9 6 15 14 15h14c5 0 11 -4 13 -9l90 -252l90 252c2 5 8 9 13 9h14c4 0 10 -3 12 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E613-stringsUpBowTurned.xml b/data/Leland/E613-stringsUpBowTurned.xml
deleted file mode 100644
index d05f225bdbc..00000000000
--- a/data/Leland/E613-stringsUpBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 43c-2 -3 -8 -6 -12 -6h-14c-5 0 -11 4 -13 9l-90 252l-90 -252c-2 -5 -8 -9 -13 -9h-14c-8 0 -14 6 -14 15l1 3v1l117 315c2 5 8 9 13 9s11 -4 13 -9l117 -315v-1l1 -3c0 -3 -1 -7 -2 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E614-stringsHarmonic.xml b/data/Leland/E614-stringsHarmonic.xml
deleted file mode 100644
index a3d06dd5f88..00000000000
--- a/data/Leland/E614-stringsHarmonic.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M91 181c50 0 90 -40 90 -90s-40 -91 -90 -91s-91 41 -91 91s41 90 91 90zM91 153c-35 0 -63 -27 -63 -62s28 -63 63 -63s62 28 62 63s-27 62 -62 62z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E630-pluckedSnapPizzicatoBelow.xml b/data/Leland/E630-pluckedSnapPizzicatoBelow.xml
deleted file mode 100644
index 14081882344..00000000000
--- a/data/Leland/E630-pluckedSnapPizzicatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 121v-107c0 -8 -6 -14 -13 -14c-8 0 -14 6 -14 14v107c-68 7 -121 64 -121 134c0 74 60 134 135 134c74 0 134 -60 134 -134c0 -70 -53 -127 -121 -134zM135 361c-59 0 -107 -47 -107 -106c0 -54 40 -99 93 -106v106c0 8 6 14 14 14c7 0 13 -6 13 -14v-106 c53 7 93 52 93 106c0 59 -48 106 -106 106z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E631-pluckedSnapPizzicatoAbove.xml b/data/Leland/E631-pluckedSnapPizzicatoAbove.xml
deleted file mode 100644
index cc192ab8f59..00000000000
--- a/data/Leland/E631-pluckedSnapPizzicatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 375v-107c68 -7 121 -64 121 -134c0 -74 -60 -134 -134 -134c-75 0 -135 60 -135 134c0 70 53 127 121 134v107c0 8 6 14 14 14c7 0 13 -6 13 -14zM135 28c58 0 106 48 106 106c0 54 -40 99 -93 106v-106c0 -7 -6 -14 -13 -14c-8 0 -14 7 -14 14v106 c-53 -7 -93 -52 -93 -106c0 -58 48 -106 107 -106z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E632-pluckedBuzzPizzicato.xml b/data/Leland/E632-pluckedBuzzPizzicato.xml
deleted file mode 100644
index 9278b65e2d2..00000000000
--- a/data/Leland/E632-pluckedBuzzPizzicato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M375 121h-107c-7 -68 -64 -121 -134 -121c-74 0 -134 60 -134 135c0 74 60 134 134 134c70 0 127 -53 134 -121h107c8 0 14 -6 14 -13c0 -8 -6 -14 -14 -14zM28 135c0 -59 48 -107 106 -107c54 0 99 40 106 93h-106c-7 0 -14 6 -14 14c0 7 7 13 14 13h106 c-7 53 -52 93 -106 93c-58 0 -106 -47 -106 -106z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E650-keyboardPedalPed.xml b/data/Leland/E650-keyboardPedalPed.xml
deleted file mode 100644
index ce58ce79ceb..00000000000
--- a/data/Leland/E650-keyboardPedalPed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M171 352c0 -54 -42 -98 -83 -98s-88 23 -88 98s90 193 244 193c88 0 206 -45 206 -148c0 -45 -28 -79 -74 -79c-34 0 -70 20 -92 66c-3 6 -7 14 -7 21c0 11 6 21 18 21c9 0 18 -9 24 -15c7 -6 25 -23 44 -23c14 0 24 9 24 23c0 25 -25 67 -89 84 c-19 -10 -52 -84 -52 -106c0 -7 1 -13 5 -19c15 -21 56 -79 61 -85c2 -4 23 -36 23 -69c0 -34 -34 -69 -59 -88c1 0 11 3 43 -31c14 -15 37 -29 56 -29c6 0 11 1 16 4c22 13 31 25 32 26c-4 16 -7 35 -7 56c0 74 32 163 110 163c40 0 74 -32 74 -74c0 -26 -13 -55 -45 -83 c-40 -34 -61 -53 -63 -55c1 -5 12 -51 54 -51c40 0 78 34 86 44c-1 7 -1 17 -1 28c0 52 15 142 113 176c-33 58 -136 104 -198 127c-2 1 -19 8 -20 22c0 1 0 2 1 3c1 8 7 10 14 11c2 0 3 -1 4 -1c7 0 14 -2 21 -3c64 -11 287 -83 311 -289c1 -8 1 -16 1 -24 c0 -71 -44 -156 -124 -156c-47 0 -94 34 -109 74c-7 -7 -71 -73 -131 -73c-51 0 -79 67 -82 74c-44 -37 -66 -74 -100 -74c-30 0 -43 8 -62 34c-11 15 -22 41 -39 41c-21 0 -36 -28 -47 -40c-15 -16 -42 -38 -64 -38c-11 0 -20 5 -26 18c-4 7 -5 13 -5 19c0 37 60 63 71 70 c15 10 49 28 83 57c18 16 26 30 26 43c0 10 -4 19 -10 27c-16 22 -53 65 -70 90c-6 9 -8 20 -8 30c0 23 9 43 10 45c15 39 48 98 56 112c-61 0 -113 -24 -149 -75c-20 -26 -27 -50 -27 -68c0 -20 10 -34 22 -35c2 -1 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25 c15 0 20 -14 20 -27zM522 273c-26 0 -44 -32 -44 -90c0 -13 1 -27 3 -42c3 3 31 32 54 57c12 13 17 28 17 41c0 19 -11 34 -30 34zM758 61c27 6 40 20 40 84c0 54 -14 88 -29 116c-7 -1 -72 -11 -72 -120c0 -45 23 -81 53 -81c3 0 6 0 8 1zM940 8c-23 0 -42 21 -42 46 c0 26 19 47 42 47c22 0 41 -21 41 -47c0 -25 -19 -46 -41 -46z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E651-keyboardPedalP.xml b/data/Leland/E651-keyboardPedalP.xml
deleted file mode 100644
index 15fe9251f2c..00000000000
--- a/data/Leland/E651-keyboardPedalP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 407c0 9 9 19 18 19c10 0 19 -9 25 -15c7 -6 25 -22 43 -22c16 0 25 7 25 23c0 24 -25 67 -89 83c-2 -1 -17 -14 -30 -42c-10 -21 -23 -44 -22 -64c0 -7 1 -13 5 -18c15 -22 56 -79 61 -86c2 -3 23 -35 23 -69c0 -32 -35 -70 -59 -88c1 0 11 3 43 -31 c14 -15 37 -29 56 -29c6 0 16 2 21 5c10 7 23 17 31 23c3 3 7 5 11 5c7 0 12 -4 12 -11c0 -4 -1 -7 -3 -12c-21 -34 -81 -85 -115 -85c-30 0 -43 8 -62 34c-11 16 -22 41 -39 41c-21 0 -36 -27 -48 -40c-15 -16 -41 -38 -63 -38c-11 0 -20 5 -27 18c-3 7 -4 13 -4 19 c0 38 60 63 71 70c15 10 49 28 83 57c18 16 26 30 26 44c0 9 -4 18 -10 27c-16 21 -53 64 -70 89c-6 9 -9 20 -9 30c0 23 10 43 11 45c15 40 48 98 56 112c-76 0 -176 -59 -176 -143c0 -20 10 -33 22 -35c2 0 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25 c16 0 19 -12 19 -26c0 -54 -41 -99 -82 -99s-88 23 -88 98c0 76 90 193 243 193c89 0 207 -43 207 -148c0 -46 -29 -79 -75 -79c-33 0 -69 21 -91 66c-1 1 -8 14 -8 23z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E655-keyboardPedalUp.xml b/data/Leland/E655-keyboardPedalUp.xml
deleted file mode 100644
index c0dd9905443..00000000000
--- a/data/Leland/E655-keyboardPedalUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 48c-32 0 -66 34 -66 66c0 19 12 32 31 32c6 0 11 -1 16 -3c6 -2 12 -4 16 -4s8 2 13 7l25 24c7 7 3 19 -1 28v1c-5 10 -12 22 -21 22h-34c-15 0 -15 -7 -22 -19s-18 -23 -31 -23c-22 0 -40 25 -40 57s18 58 40 58c13 0 24 -11 31 -23s7 -20 22 -20h34 c9 0 16 12 20 21c0 0 0 1 1 2c4 9 8 22 1 29l-24 24c-5 5 -9 6 -13 6c-5 0 -10 -2 -17 -4c-5 -1 -10 -2 -15 -2c-20 0 -32 12 -32 32c0 32 34 66 66 66c19 0 32 -12 32 -31c0 -6 -1 -11 -3 -16c-2 -6 -4 -11 -4 -16s2 -9 7 -14l24 -24c3 -3 6 -4 10 -4c6 0 13 3 18 5h1l1 1 c9 4 21 11 21 20v34c0 15 -7 15 -19 22s-23 18 -23 31c0 22 25 40 57 40s58 -18 58 -40c0 -13 -11 -24 -23 -31s-20 -7 -20 -22v-34c0 -9 12 -16 21 -20c0 0 1 0 2 -1c5 -2 12 -5 18 -5c4 0 8 1 11 4l24 24c5 5 6 9 6 13c0 5 -2 10 -4 17c-1 5 -2 10 -2 15c0 19 11 32 31 32 c32 0 67 -35 67 -67c0 -20 -13 -31 -32 -31c-5 0 -10 1 -15 2c-7 2 -12 4 -17 4c-4 0 -8 -1 -13 -6l-24 -24c-7 -7 -3 -20 1 -29c5 -11 12 -23 21 -23h34c15 0 15 8 22 20s18 23 31 23c22 0 40 -26 40 -58s-18 -57 -40 -57c-13 0 -24 11 -31 23s-7 19 -22 19h-34 c-9 0 -16 -12 -21 -22v-1c-4 -9 -8 -21 -1 -28l24 -24c5 -5 9 -7 14 -7s10 2 16 4c5 2 10 3 16 3c19 0 31 -13 31 -32c0 -32 -34 -66 -66 -66c-20 0 -32 12 -32 32c0 5 1 10 2 15c2 7 4 12 4 17c0 4 -1 7 -6 12l-24 25c-3 3 -7 4 -11 4c-12 0 -41 -13 -41 -26v-34 c0 -15 8 -15 20 -22s23 -18 23 -31c0 -22 -26 -40 -58 -40s-57 18 -57 40c0 13 11 24 23 31s19 7 19 22v34c0 9 -12 16 -21 20l-1 1h-1c-5 2 -12 5 -18 5c-4 0 -7 -1 -10 -4l-24 -25c-5 -5 -7 -9 -7 -13s2 -10 4 -16c2 -5 3 -10 3 -16c0 -19 -13 -31 -32 -31zM173 236 c0 -32 31 -63 63 -63c33 0 64 30 64 63c0 35 -29 64 -64 64s-63 -29 -63 -64z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E880-tuplet0.xml b/data/Leland/E880-tuplet0.xml
deleted file mode 100644
index 88d10cadfcd..00000000000
--- a/data/Leland/E880-tuplet0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 233c0 -128 -79 -240 -170 -240c-62 0 -103 51 -103 129c0 94 62 241 173 241c61 0 100 -50 100 -130zM170 337c-61 0 -96 -236 -96 -282c0 -22 12 -36 30 -36c24 0 40 23 60 89c18 58 34 146 34 186c0 27 -11 43 -28 43z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E881-tuplet1.xml b/data/Leland/E881-tuplet1.xml
deleted file mode 100644
index 1f3843008da..00000000000
--- a/data/Leland/E881-tuplet1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E881" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M239 363l-78 -289c-5 -17 -7 -27 -7 -32c0 -11 8 -14 41 -14h26l-5 -28h-216l4 28h26c24 1 34 2 39 7c3 3 5 5 7 13c1 2 3 11 7 26l52 194c3 8 3 14 3 19c0 10 -4 14 -22 14h-47l7 25c52 2 118 20 141 37h22z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E882-tuplet2.xml b/data/Leland/E882-tuplet2.xml
deleted file mode 100644
index 37d43ccbb37..00000000000
--- a/data/Leland/E882-tuplet2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E882" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 128l22 -8l-44 -120h-234v4c0 21 25 49 90 106c50 44 77 68 92 88c20 24 31 53 31 78c0 32 -23 55 -56 55c-28 0 -55 -18 -55 -36c0 -8 3 -10 20 -18c18 -8 27 -20 27 -37c0 -25 -17 -42 -42 -42c-29 0 -50 24 -50 57c0 62 54 107 129 107c32 0 61 -9 80 -24 c18 -16 31 -43 31 -69c0 -35 -21 -71 -62 -102c-10 -8 -10 -9 -99 -62c-29 -18 -43 -28 -51 -36h101c36 1 45 7 65 49z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E883-tuplet3.xml b/data/Leland/E883-tuplet3.xml
deleted file mode 100644
index 2851b612cdb..00000000000
--- a/data/Leland/E883-tuplet3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 185c42 -10 74 -27 74 -77c0 -66 -60 -116 -142 -116c-68 0 -111 32 -111 83c0 31 19 52 47 52c25 0 41 -16 41 -39c0 -18 -9 -30 -26 -36c-9 -3 -11 -4 -11 -10c0 -12 22 -24 44 -24c56 0 74 62 74 108c0 31 -11 48 -34 48c-5 0 -5 0 -16 -3c-3 -1 -9 -2 -12 -2 c-11 0 -18 6 -18 17s7 18 17 18c4 0 7 -1 13 -3c7 -3 11 -3 17 -3c40 0 63 53 63 87c0 31 -17 50 -45 50c-21 0 -42 -10 -42 -21c0 -3 0 -3 9 -10c11 -9 16 -19 16 -31c0 -21 -17 -37 -39 -37c-25 0 -42 18 -42 45c0 46 50 81 114 81c65 0 109 -34 109 -83 c0 -60 -50 -83 -100 -94z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E884-tuplet4.xml b/data/Leland/E884-tuplet4.xml
deleted file mode 100644
index 350a42ada23..00000000000
--- a/data/Leland/E884-tuplet4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E884" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M282 128l-6 -33h-62l-5 -21c-5 -17 -7 -27 -7 -32c0 -11 8 -14 41 -14h9l-4 -28h-186l3 28h13c24 1 34 2 39 7c3 3 5 5 7 13c2 5 2 10 7 26l5 21h-136v28l237 240h49l-63 -235h59zM145 129l39 141l-138 -141h99z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E885-tuplet5.xml b/data/Leland/E885-tuplet5.xml
deleted file mode 100644
index 65808b3d674..00000000000
--- a/data/Leland/E885-tuplet5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E885" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M54 201l47 163c42 -10 79 -15 113 -15c28 0 49 5 72 14c3 1 5 1 6 1c2 0 3 -1 3 -4c0 -16 -14 -42 -30 -56c-22 -19 -50 -27 -91 -27c-23 0 -23 0 -64 9l-20 -67c26 10 45 14 68 14c63 0 104 -36 104 -93c0 -84 -66 -146 -156 -146c-65 0 -106 32 -106 81 c0 31 18 52 47 52c25 0 41 -16 41 -39c0 -20 -10 -33 -30 -40c-5 -2 -6 -3 -6 -6c0 -11 20 -22 43 -22c46 0 82 50 82 113c0 42 -19 67 -52 67c-13 0 -21 -2 -47 -13c-3 -20 -12 -30 -27 -30c-10 0 -17 8 -17 18c0 11 7 20 20 26z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E886-tuplet6.xml b/data/Leland/E886-tuplet6.xml
deleted file mode 100644
index 6b45ebdab55..00000000000
--- a/data/Leland/E886-tuplet6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 224c55 0 94 -37 94 -91c0 -75 -64 -138 -142 -138c-67 0 -110 48 -110 126c0 108 71 244 193 244c50 0 86 -27 86 -64c0 -26 -17 -43 -43 -43c-23 0 -41 15 -41 36c0 10 4 19 12 28c3 4 4 5 4 8c0 5 -8 9 -18 9c-55 0 -82 -96 -93 -136c20 16 34 21 58 21zM136 193 c-50 0 -58 -83 -58 -119s11 -55 33 -55c47 0 58 89 58 123c0 33 -12 51 -33 51z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E887-tuplet7.xml b/data/Leland/E887-tuplet7.xml
deleted file mode 100644
index 33d786a1fa7..00000000000
--- a/data/Leland/E887-tuplet7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M271 365l1 -19c-95 -163 -117 -209 -131 -289c-7 -32 -13 -62 -54 -62c-27 0 -46 17 -46 42c0 34 13 52 149 228l19 25h-113c-29 0 -43 -12 -64 -50l-8 -15l-24 7l53 133c42 -5 63 -5 97 -5c36 0 64 1 121 5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E888-tuplet8.xml b/data/Leland/E888-tuplet8.xml
deleted file mode 100644
index b7b57a5d699..00000000000
--- a/data/Leland/E888-tuplet8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 109c0 -67 -60 -114 -145 -114c-69 0 -115 34 -115 84c0 51 45 82 88 98c-27 24 -38 46 -38 77c0 65 53 111 129 111c62 0 104 -33 104 -82c0 -39 -23 -65 -74 -84c33 -21 51 -53 51 -90zM226 282c0 36 -21 57 -55 57s-58 -23 -58 -54c0 -22 9 -34 35 -50 c7 -4 12 -8 40 -22c28 21 38 40 38 69zM62 81c0 -37 26 -61 64 -61s67 26 67 59c0 25 -14 43 -46 61c-4 3 -4 2 -24 12c-6 3 -7 4 -15 8c-30 -17 -46 -46 -46 -79z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E889-tuplet9.xml b/data/Leland/E889-tuplet9.xml
deleted file mode 100644
index 05a256f8334..00000000000
--- a/data/Leland/E889-tuplet9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M121 141c-55 0 -94 37 -94 91c0 75 65 138 143 138c67 0 109 -48 109 -126c0 -108 -72 -244 -193 -244c-50 0 -86 27 -86 64c0 26 18 43 44 43c23 0 40 -15 40 -36c0 -10 -4 -18 -12 -27c-3 -4 -4 -6 -4 -9c0 -5 8 -9 18 -9c55 0 82 96 93 136c-20 -16 -34 -21 -58 -21z M169 347c-49 0 -58 -88 -58 -123c0 -33 11 -52 32 -52c50 0 59 84 59 120s-11 55 -33 55z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E88A-tupletColon.xml b/data/Leland/E88A-tupletColon.xml
deleted file mode 100644
index 58c5644d128..00000000000
--- a/data/Leland/E88A-tupletColon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E88A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M70 186c-23 0 -37 18 -37 39c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44zM37 58c-23 0 -37 18 -37 39c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E93C-mensuralNoteheadMinimaWhite.xml b/data/Leland/E93C-mensuralNoteheadMinimaWhite.xml
deleted file mode 100644
index baca852c2a4..00000000000
--- a/data/Leland/E93C-mensuralNoteheadMinimaWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -9l-154 -120c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -8zM198 -80l73 57l-133 104l-74 -58z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/E93D-mensuralNoteheadSemiminimaWhite.xml b/data/Leland/E93D-mensuralNoteheadSemiminimaWhite.xml
deleted file mode 100644
index fd0d3569570..00000000000
--- a/data/Leland/E93D-mensuralNoteheadSemiminimaWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -10l-154 -119c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAA4-wiggleTrill.xml b/data/Leland/EAA4-wiggleTrill.xml
deleted file mode 100644
index d4a0fbd59cb..00000000000
--- a/data/Leland/EAA4-wiggleTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 202c0 0 4 -3 4 -8c0 -2 -1 -5 -4 -8l-48 -48c-8 -9 -27 -21 -48 -21c-10 0 -21 3 -32 11c-10 9 -74 63 -74 63s-3 3 -7 3c-2 0 -4 -1 -6 -3l-11 -11s-4 -3 -7 -3s-6 1 -9 4c-8 7 -14 14 -14 14s-4 4 -4 9c0 3 1 5 4 8l48 48c8 9 27 21 48 21c10 0 21 -3 32 -11 c10 -9 74 -64 74 -64s2 -3 6 -3c2 0 4 1 6 3l11 11s4 3 7 3s7 -1 10 -4c8 -7 14 -14 14 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAA9-wiggleArpeggiatoUp.xml b/data/Leland/EAA9-wiggleArpeggiatoUp.xml
deleted file mode 100644
index da617d667b3..00000000000
--- a/data/Leland/EAA9-wiggleArpeggiatoUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 85c0 0 4 -3 4 -8c0 -2 -1 -5 -4 -8l-48 -48c-8 -9 -27 -21 -48 -21c-10 0 -21 3 -32 11c-10 9 -74 63 -74 63s-3 3 -7 3c-2 0 -4 -1 -6 -3l-11 -11s-4 -3 -7 -3s-6 1 -9 4c-8 7 -14 14 -14 14s-4 4 -4 9c0 3 1 5 4 8l48 48c8 9 27 21 48 21c10 0 21 -3 32 -11 c10 -9 74 -64 74 -64s2 -3 6 -3c2 0 4 1 6 3l11 11s4 3 7 3s7 -1 10 -4c8 -7 14 -14 14 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAAA-wiggleArpeggiatoDown.xml b/data/Leland/EAAA-wiggleArpeggiatoDown.xml
deleted file mode 100644
index 84dc1a206ea..00000000000
--- a/data/Leland/EAAA-wiggleArpeggiatoDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-18 85c0 0 6 7 14 14c3 3 7 4 10 4s5 -1 7 -3l11 -11c2 -2 4 -3 6 -3c4 0 6 3 6 3s64 55 74 64c11 8 22 11 32 11c21 0 40 -12 48 -21l48 -48c3 -3 4 -5 4 -8c0 -5 -4 -9 -4 -9s-6 -7 -14 -14c-3 -3 -6 -4 -9 -4s-5 1 -7 3l-11 11c-2 2 -4 3 -6 3c-4 0 -7 -3 -7 -3 s-64 -54 -74 -63c-11 -8 -22 -11 -32 -11c-21 0 -40 12 -48 21l-48 48c-3 3 -4 6 -4 8c0 5 4 8 4 8z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAAD-wiggleArpeggiatoUpArrow.xml b/data/Leland/EAAD-wiggleArpeggiatoUpArrow.xml
deleted file mode 100644
index 6d346bf879d..00000000000
--- a/data/Leland/EAAD-wiggleArpeggiatoUpArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 255l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20l-208 -147c-4 -2 -10 -4 -14 -4c-13 0 -24 11 -24 24c0 5 2 11 5 15l54 71c3 4 5 9 5 14c0 16 -16 30 -34 30c-8 0 -16 -3 -23 -10c-2 -1 -4 -2 -7 -2s-6 1 -10 4s-10 10 -14 14c0 0 -3 2 -3 7c0 2 1 6 3 9 c27 32 50 42 93 42l-65 85c-3 4 -4 11 -4 15c0 14 10 25 24 25c4 0 10 -3 14 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAAE-wiggleArpeggiatoDownArrow.xml b/data/Leland/EAAE-wiggleArpeggiatoDownArrow.xml
deleted file mode 100644
index 74ab36afe0d..00000000000
--- a/data/Leland/EAAE-wiggleArpeggiatoDownArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 68l-208 -147c-4 -2 -10 -5 -14 -5c-14 0 -24 11 -24 25c0 4 1 11 4 15l65 85c-42 0 -66 9 -93 42c-2 3 -3 7 -3 9c0 5 3 7 3 7c4 4 10 11 14 14s7 4 10 4s5 -1 7 -2c7 -7 15 -10 23 -10c18 0 34 14 34 30c0 5 -2 10 -5 14l-54 71c-3 4 -5 10 -5 15c0 13 11 24 24 24 c4 0 10 -2 14 -4l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma.xml b/data/Petaluma.xml
deleted file mode 100644
index 7b3fc62ca95..00000000000
--- a/data/Petaluma.xml
+++ /dev/null
@@ -1,599 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bounding-boxes font-family="Petaluma" units-per-em="1000">
-	<g c="E440" x="1.9" y="-248.0" w="285.1" h="680.5" h-a-x="287" >
-		<a n="cutOutSE" x="0.8725230731272177" y="0.308"/>
-		<a n="cutOutSW" x="0.3245230731272177" y="1.456"/>
-	</g>
-	<g c="E441" x="-10.0" y="-231.0" w="208.0" h="680.0" h-a-x="198" >
-		<a n="cutOutNE" x="0.292" y="1.772"/>
-		<a n="cutOutSE" x="0.292" y="0.156"/>
-	</g>
-	<g c="E442" x="1.9" y="-236.0" w="285.1" h="680.0" h-a-x="287" >
-		<a n="cutOutNE" x="0.6405230731272177" y="2.592"/>
-		<a n="cutOutNW" x="0.3965230731272177" y="2.216"/>
-		<a n="cutOutSE" x="0.6685230731272177" y="0.164"/>
-		<a n="cutOutSW" x="0.2885230731272177" y="1.584"/>
-	</g>
-	<g c="E443" x="-10.0" y="-231.0" w="208.0" h="680.0" h-a-x="198" >
-		<a n="cutOutNW" x="0.548" y="1.724"/>
-		<a n="cutOutSW" x="0.492" y="0.116"/>
-	</g>
-	<g c="E444" x="0.0" y="-338.0" w="300.0" h="689.0" h-a-x="300" >
-		<a n="cutOutNE" x="0.72" y="2.168"/>
-		<a n="cutOutNW" x="0.512" y="2.036"/>
-		<a n="cutOutSE" x="0.66" y="0.708"/>
-		<a n="cutOutSW" x="0.428" y="0.52"/>
-	</g>
-	<g c="E445" x="-25.0" y="-356.0" w="412.0" h="767.0" h-a-x="377" >
-		<a n="cutOutNE" x="1.188" y="2.432"/>
-		<a n="cutOutNW" x="0.624" y="2.156"/>
-		<a n="cutOutSE" x="1.176" y="0.756"/>
-		<a n="cutOutSW" x="0.548" y="0.488"/>
-	</g>
-	<g c="E446" x="-0.2" y="-420.0" w="359.2" h="763.0" h-a-x="360" >
-		<a n="cutOutNE" x="0.9086082500723851" y="2.6"/>
-		<a n="cutOutNW" x="0.6646082500723851" y="2.464"/>
-		<a n="cutOutSE" x="0.8006082500723851" y="0.688"/>
-		<a n="cutOutSW" x="0.6126082500723851" y="0.628"/>
-	</g>
-	<g c="E447" x="-1.0" y="-460.0" w="468.0" h="810.0" h-a-x="468" >
-		<a n="cutOutNE" x="1.428" y="2.744"/>
-		<a n="cutOutNW" x="0.596" y="2.588"/>
-		<a n="cutOutSE" x="1.396" y="0.908"/>
-		<a n="cutOutSW" x="0.596" y="0.732"/>
-	</g>
-	<g c="E4A0" x="0.0" y="0.0" w="425.0" h="326.0" h-a-x="425" />
-	<g c="E4A1" x="0.0" y="-326.0" w="425.0" h="326.0" h-a-x="425" />
-	<g c="E4A2" x="1.4" y="0.0" w="110.6" h="156.0" h-a-x="111" />
-	<g c="E4A3" x="1.4" y="-156.0" w="110.7" h="156.0" h-a-x="111" />
-	<g c="E4A4" x="0.4" y="0.0" w="470.8" h="56.0" h-a-x="471" />
-	<g c="E4A5" x="0.4" y="-59.0" w="470.8" h="56.0" h-a-x="471" />
-	<g c="E4A6" x="0.0" y="0.0" w="139.0" h="411.0" h-a-x="139" />
-	<g c="E4A7" x="0.0" y="-411.0" w="139.0" h="411.0" h-a-x="139" />
-	<g c="E4A8" x="0.0" y="0.0" w="85.0" h="295.0" h-a-x="85" />
-	<g c="E4A9" x="0.0" y="-295.0" w="85.0" h="295.0" h-a-x="85" />
-	<g c="E4AA" x="-0.1" y="0.0" w="64.1" h="452.0" h-a-x="64" />
-	<g c="E4AB" x="0.0" y="-452.0" w="64.1" h="452.0" h-a-x="64" />
-	<g c="E4AC" x="0.0" y="0.0" w="396.0" h="328.0" h-a-x="396" />
-	<g c="E4AD" x="0.0" y="-328.0" w="396.0" h="328.0" h-a-x="396" />
-	<g c="E4AE" x="0.0" y="0.0" w="416.0" h="483.0" h-a-x="416" />
-	<g c="E4AF" x="0.0" y="-483.0" w="416.0" h="483.0" h-a-x="416" />
-	<g c="E4B0" x="0.0" y="0.0" w="385.0" h="505.0" h-a-x="385" />
-	<g c="E4B1" x="0.0" y="-505.7" w="385.0" h="504.7" h-a-x="385" />
-	<g c="E4B2" x="0.0" y="0.0" w="472.0" h="270.0" h-a-x="472" />
-	<g c="E4B3" x="0.0" y="-270.0" w="472.0" h="270.0" h-a-x="472" />
-	<g c="E4B4" x="0.0" y="0.0" w="521.0" h="438.0" h-a-x="521" />
-	<g c="E4B5" x="0.0" y="-438.0" w="521.0" h="438.0" h-a-x="521" />
-	<g c="E4B6" x="0.0" y="0.0" w="305.0" h="319.0" h-a-x="305" />
-	<g c="E4B7" x="0.0" y="-319.0" w="305.0" h="319.0" h-a-x="305" />
-	<g c="E4B8" x="0.0" y="0.0" w="492.0" h="296.0" h-a-x="492" />
-	<g c="E4B9" x="0.0" y="-296.0" w="492.0" h="296.0" h-a-x="492" />
-	<g c="E4BA" x="-0.4" y="0.0" w="412.4" h="181.0" h-a-x="413" />
-	<g c="E4BB" x="-0.4" y="-181.0" w="412.4" h="181.0" h-a-x="412" />
-	<g c="E4BC" x="0.0" y="0.0" w="537.0" h="422.0" h-a-x="537" />
-	<g c="E4BD" x="0.0" y="-422.0" w="537.0" h="422.0" h-a-x="537" />
-	<g c="E500" x="0.0" y="-250.0" w="599.1" h="425.0" h-a-x="599" />
-	<g c="E501" x="0.0" y="-246.9" w="775.0" h="609.7" h-a-x="775" />
-	<g c="E502" x="0.0" y="-304.0" w="1374.0" h="608.0" h-a-x="1374" />
-	<g c="E503" x="0.0" y="62.0" w="114.0" h="151.0" h-a-x="114" />
-	<g c="E504" x="0.0" y="-225.2" w="630.0" h="490.3" h-a-x="630" />
-	<g c="E505" x="0.0" y="-206.0" w="114.0" h="151.0" h-a-x="114" />
-	<g c="E5E5" x="0.0" y="0.0" w="274.0" h="260.0" h-a-x="274" />
-	<g c="E5E6" x="0.5" y="0.0" w="314.5" h="309.0" h-a-x="315" />
-	<g c="E5E7" x="1.0" y="0.0" w="312.0" h="309.0" h-a-x="312" />
-	<g c="E050" x="0.0" y="-559.0" w="664.0" h="1568.0" h-a-x="664" />
-	<g c="E051" x="0.0" y="-885.0" w="664.0" h="1894.0" h-a-x="664" />
-	<g c="E052" x="0.0" y="-840.0" w="664.0" h="1849.0" h-a-x="664" />
-	<g c="E053" x="0.0" y="-559.0" w="664.0" h="1872.2" h-a-x="664" />
-	<g c="E054" x="0.0" y="-559.0" w="664.0" h="1909.7" h-a-x="664" />
-	<g c="E055" x="0.0" y="-559.0" w="1040.0" h="1568.0" h-a-x="1040" />
-	<g c="E056" x="0.0" y="-561.0" w="822.0" h="1567.3" h-a-x="822" />
-	<g c="E05C" x="0.0" y="-543.0" w="731.0" h="1086.0" h-a-x="731" />
-	<g c="E05D" x="0.0" y="-921.0" w="731.0" h="1464.0" h-a-x="731" />
-	<g c="E062" x="0.0" y="-496.0" w="776.0" h="712.0" h-a-x="776" />
-	<g c="E063" x="0.0" y="-856.0" w="776.0" h="1072.0" h-a-x="776" />
-	<g c="E064" x="0.0" y="-814.0" w="776.0" h="1030.0" h-a-x="776" />
-	<g c="E065" x="0.0" y="-496.0" w="776.0" h="1053.2" h-a-x="776" />
-	<g c="E066" x="0.0" y="-496.0" w="776.0" h="1060.7" h-a-x="776" />
-	<g c="E069" x="0.0" y="-250.0" w="379.1" h="500.0" h-a-x="379" />
-	<g c="E06A" x="0.0" y="-447.0" w="298.3" h="894.0" h-a-x="298" />
-	<g c="E073" x="0.0" y="-559.0" w="664.0" h="1568.0" h-a-x="664" />
-	<g c="E074" x="0.0" y="-560.0" w="664.0" h="1568.0" h-a-x="664" />
-	<g c="E075" x="0.0" y="-543.0" w="731.0" h="1086.0" h-a-x="731" />
-	<g c="E076" x="0.0" y="-463.0" w="776.0" h="712.0" h-a-x="776" />
-	<g c="E077" x="0.0" y="-463.0" w="776.0" h="712.0" h-a-x="776" />
-	<g c="E566" x="1.0" y="-18.0" w="550.0" h="557.0" h-a-x="551" />
-	<g c="E567" x="0.0" y="0.0" w="574.0" h="312.0" h-a-x="574" />
-	<g c="E568" x="0.0" y="0.0" w="574.0" h="312.0" />
-	<g c="E569" x="0.0" y="-106.0" w="574.0" h="511.0" h-a-x="574" />
-	<g c="E56A" x="0.0" y="0.0" w="312.0" h="574.0" h-a-x="312" />
-	<g c="E56B" x="0.0" y="0.0" w="312.0" h="574.0" h-a-x="312" />
-	<g c="E56C" x="0.0" y="0.0" w="747.0" h="243.0" h-a-x="747" />
-	<g c="E56D" x="0.0" y="0.0" w="700.0" h="497.0" h-a-x="700" />
-	<g c="E56E" x="0.0" y="0.0" w="982.2" h="224.0" h-a-x="982" />
-	<g c="E56F" x="0.0" y="-101.1" w="500.0" h="361.1" h-a-x="500" />
-	<g c="E520" x="-49.0" y="-142.0" w="375.5" h="657.0" h-a-x="327" >
-		<a n="opticalCenter" x="1.22" y="0"/>
-	</g>
-	<g c="E521" x="-18.0" y="-50.0" w="577.0" h="415.0" h-a-x="500" >
-		<a n="opticalCenter" x="0.872" y="0"/>
-	</g>
-	<g c="E522" x="-144.0" y="-115.4" w="455.3" h="619.4" h-a-x="281" >
-		<a n="opticalCenter" x="1.256" y="0"/>
-	</g>
-	<g c="E523" x="-75.0" y="-90.0" w="397.1" h="415.0" h-a-x="310" >
-		<a n="opticalCenter" x="0.612" y="0"/>
-	</g>
-	<g c="E524" x="0.0" y="0.0" w="296.0" h="379.0" h-a-x="296" >
-		<a n="opticalCenter" x="0.444" y="0"/>
-	</g>
-	<g c="E525" x="-42.7" y="0.0" w="373.7" h="328.0" h-a-x="331" >
-		<a n="opticalCenter" x="0.5" y="0"/>
-	</g>
-	<g c="E526" x="-20.0" y="0.0" w="307.0" h="414.0" h-a-x="287" >
-		<a n="opticalCenter" x="0.616" y="0"/>
-	</g>
-	<g c="E527" x="-103.0" y="-274.0" w="1901.0" h="668.0" h-a-x="1798" >
-		<a n="opticalCenter" x="4.248" y="0"/>
-	</g>
-	<g c="E528" x="-99.0" y="-285.0" w="1595.0" h="658.0" h-a-x="1496" >
-		<a n="opticalCenter" x="3.552" y="0"/>
-	</g>
-	<g c="E529" x="-114.0" y="-277.1" w="1311.0" h="663.1" h-a-x="1197" >
-		<a n="opticalCenter" x="3.004" y="0"/>
-	</g>
-	<g c="E52A" x="-101.1" y="-321.0" w="994.1" h="679.0" h-a-x="893" >
-		<a n="opticalCenter" x="2.368" y="0"/>
-	</g>
-	<g c="E52B" x="-96.0" y="-282.6" w="683.0" h="663.0" h-a-x="587" >
-		<a n="opticalCenter" x="1.708" y="0"/>
-	</g>
-	<g c="E52C" x="-25.0" y="-243.0" w="835.0" h="654.0" h-a-x="810" >
-		<a n="opticalCenter" x="1.848" y="0"/>
-	</g>
-	<g c="E52D" x="-15.0" y="-186.0" w="886.4" h="618.0" h-a-x="866" >
-		<a n="opticalCenter" x="1.796" y="0"/>
-	</g>
-	<g c="E52E" x="-44.0" y="-274.0" w="712.0" h="715.0" h-a-x="668" >
-		<a n="opticalCenter" x="1.68" y="0"/>
-	</g>
-	<g c="E52F" x="-119.0" y="-197.0" w="702.0" h="625.0" h-a-x="583" >
-		<a n="opticalCenter" x="1.852" y="0"/>
-	</g>
-	<g c="E530" x="-49.0" y="-197.0" w="945.0" h="632.0" h-a-x="896" >
-		<a n="opticalCenter" x="2.472" y="0"/>
-	</g>
-	<g c="E531" x="-49.0" y="-197.0" w="1222.0" h="645.0" h-a-x="1173" >
-		<a n="opticalCenter" x="2.824" y="0"/>
-	</g>
-	<g c="E532" x="-49.0" y="-195.2" w="1423.0" h="669.2" h-a-x="1374" >
-		<a n="opticalCenter" x="2.976" y="0"/>
-	</g>
-	<g c="E533" x="-49.0" y="-197.0" w="1676.0" h="669.0" h-a-x="1627" >
-		<a n="opticalCenter" x="3.504" y="0"/>
-	</g>
-	<g c="E534" x="-49.0" y="-245.8" w="728.0" h="717.8" h-a-x="679" >
-		<a n="opticalCenter" x="1.5" y="0"/>
-	</g>
-	<g c="E535" x="-49.0" y="-195.4" w="753.0" h="619.4" h-a-x="704" >
-		<a n="opticalCenter" x="1.352" y="0"/>
-	</g>
-	<g c="E536" x="0.0" y="-155.0" w="655.5" h="619.0" h-a-x="685" >
-		<a n="opticalCenter" x="1.3" y="0"/>
-	</g>
-	<g c="E537" x="0.0" y="-232.0" w="946.5" h="696.0" h-a-x="947" >
-		<a n="opticalCenter" x="1.904" y="0"/>
-	</g>
-	<g c="E538" x="0.0" y="-242.0" w="1270.5" h="716.0" h-a-x="1271" >
-		<a n="opticalCenter" x="1.972" y="0"/>
-	</g>
-	<g c="E539" x="0.0" y="-166.0" w="936.0" h="619.0" h-a-x="936" >
-		<a n="opticalCenter" x="1.76" y="0"/>
-	</g>
-	<g c="E53A" x="0.0" y="-280.0" w="1259.5" h="734.0" h-a-x="1260" >
-		<a n="opticalCenter" x="1.848" y="0"/>
-	</g>
-	<g c="E53B" x="0.0" y="-169.0" w="1181.0" h="625.0" h-a-x="1181" >
-		<a n="opticalCenter" x="2.276" y="0"/>
-	</g>
-	<g c="E53C" x="-75.0" y="-115.4" w="729.5" h="619.4" h-a-x="654" >
-		<a n="opticalCenter" x="1.564" y="0"/>
-	</g>
-	<g c="E53D" x="-75.0" y="-155.4" w="1046.0" h="619.4" h-a-x="971" >
-		<a n="opticalCenter" x="2.084" y="0"/>
-	</g>
-	<g c="E240" x="0.0" y="-819.0" w="261.0" h="819.0" h-a-x="261" >
-		<a n="graceNoteSlashNE" x="1.284" y="-0.796"/>
-		<a n="graceNoteSlashSW" x="-0.644" y="-2.456"/>
-		<a n="stemUpNW" x="0" y="-0.176"/>
-	</g>
-	<g c="E241" x="0.0" y="0.0" w="261.0" h="819.0" h-a-x="261" >
-		<a n="graceNoteSlashNW" x="-0.596" y="2.168"/>
-		<a n="graceNoteSlashSE" x="1.328" y="0.628"/>
-		<a n="stemDownSW" x="0" y="0.176"/>
-	</g>
-	<g c="E242" x="0.0" y="-819.4" w="327.2" h="819.4" h-a-x="327" >
-		<a n="stemUpNW" x="0" y="-0.472"/>
-	</g>
-	<g c="E243" x="0.0" y="0.0" w="327.2" h="819.0" h-a-x="327" >
-		<a n="stemDownSW" x="0" y="0.412"/>
-	</g>
-	<g c="E244" x="-0.2" y="-849.5" w="268.3" h="998.5" h-a-x="268" >
-		<a n="stemUpNW" x="0" y="0.196"/>
-	</g>
-	<g c="E245" x="-2.8" y="-169.1" w="270.9" h="998.5" h-a-x="268" >
-		<a n="stemDownSW" x="0" y="-0.168"/>
-	</g>
-	<g c="E246" x="-4.0" y="-823.5" w="286.0" h="1170.5" h-a-x="282" >
-		<a n="stemUpNW" x="-0.016" y="1.172"/>
-	</g>
-	<g c="E247" x="-5.0" y="-375.0" w="286.0" h="1170.5" h-a-x="281" >
-		<a n="stemDownSW" x="-0.008" y="-0.94"/>
-	</g>
-	<g c="E248" x="0.0" y="-804.0" w="252.0" h="1334.0" h-a-x="252" >
-		<a n="stemUpNW" x="0" y="1.76"/>
-	</g>
-	<g c="E249" x="-0.9" y="-580.0" w="252.9" h="1334.0" >
-		<a n="stemDownSW" x="0" y="-1.852"/>
-	</g>
-	<g c="E24A" x="0.0" y="-827.0" w="272.0" h="1527.0" h-a-x="272" >
-		<a n="stemUpNW" x="0" y="2.572"/>
-	</g>
-	<g c="E24B" x="0.0" y="-750.0" w="272.0" h="1527.0" >
-		<a n="stemDownSW" x="0" y="-2.58"/>
-	</g>
-	<g c="E24C" x="-6.0" y="-843.0" w="290.0" h="1734.0" h-a-x="284" >
-		<a n="stemUpNW" x="0.004" y="3.312"/>
-	</g>
-	<g c="E24D" x="-6.0" y="-939.0" w="290.0" h="1734.0" h-a-x="594" >
-		<a n="stemDownSW" x="0.004" y="-3.54"/>
-	</g>
-	<g c="E24E" x="-6.0" y="-823.0" w="275.0" h="1903.0" h-a-x="269" >
-		<a n="stemUpNW" x="0" y="3.888"/>
-	</g>
-	<g c="E24F" x="-6.0" y="-1200.0" w="275.0" h="1903.0" h-a-x="594" >
-		<a n="stemDownSW" x="0" y="-4.28"/>
-	</g>
-	<g c="E270" x="-40.5" y="-239.0" w="240.5" h="828.0" h-a-x="200" >
-		<a n="cutOutNE" x="0.6178727167525812" y="1.656"/>
-		<a n="cutOutSE" x="0.5058727167525812" y="0.156"/>
-	</g>
-	<g c="E271" x="-49.3" y="-434.0" w="256.3" h="879.0" h-a-x="207" >
-		<a n="cutOutNE" x="0.477382162512297" y="2.484"/>
-		<a n="cutOutSE" x="0.597382162512297" y="1.044"/>
-	</g>
-	<g c="E272" x="-41.5" y="-471.0" w="257.0" h="1053.0" h-a-x="215" >
-		<a n="cutOutNE" x="0.5858727167525811" y="2.68"/>
-		<a n="cutOutSW" x="0.7898727167525812" y="1.104"/>
-	</g>
-	<g c="E273" x="0.0" y="-520.0" w="256.0" h="969.0" h-a-x="210" >
-		<a n="cutOutNE" x="0.236" y="2.884"/>
-		<a n="cutOutSW" x="0.412" y="1.332"/>
-	</g>
-	<g c="E274" x="-26.0" y="-363.0" w="412.0" h="868.0" h-a-x="376" >
-		<a n="cutOutNE" x="1.164" y="2.456"/>
-		<a n="cutOutSE" x="1.18" y="0.764"/>
-		<a n="cutOutSW" x="0.544" y="0.524"/>
-	</g>
-	<g c="E275" x="-21.0" y="-518.0" w="412.0" h="919.0" h-a-x="381" >
-		<a n="cutOutNE" x="1.164" y="3.068"/>
-		<a n="cutOutNW" x="0.548" y="1.152"/>
-		<a n="cutOutSW" x="-1.016" y="-0.9"/>
-	</g>
-	<g c="E4C0" x="-0.0" y="2.0" w="472.0" h="452.0" h-a-x="472" />
-	<g c="E4C1" x="-0.3" y="-430.0" w="518.9" h="429.1" h-a-x="519" />
-	<g c="E4C2" x="0.0" y="-31.0" w="711.0" h="527.0" h-a-x="711" />
-	<g c="E4C3" x="0.0" y="-475.0" w="697.0" h="488.0" h-a-x="697" />
-	<g c="E4C4" x="0.0" y="-18.1" w="545.0" h="366.1" h-a-x="545" />
-	<g c="E4C5" x="0.0" y="-335.0" w="565.0" h="345.0" h-a-x="565" />
-	<g c="E4C6" x="0.0" y="-6.0" w="591.5" h="343.1" h-a-x="591" />
-	<g c="E4C7" x="0.0" y="-335.0" w="602.0" h="342.0" h-a-x="602" />
-	<g c="E4C8" x="0.0" y="-14.1" w="715.0" h="451.1" h-a-x="715" />
-	<g c="E4C9" x="-0.0" y="-427.0" w="686.5" h="457.0" h-a-x="686" />
-	<g c="E4CE" x="0.0" y="0.0" w="148.0" h="275.0" h-a-x="148" />
-	<g c="E650" x="0.0" y="-13.0" w="944.0" h="563.0" h-a-x="944" />
-	<g c="E651" x="0.0" y="0.0" w="314.0" h="549.0" h-a-x="314" />
-	<g c="E655" x="0.0" y="0.0" w="436.6" h="461.0" h-a-x="437" />
-	<g c="E659" x="0.0" y="0.0" w="1140.0" h="539.0" h-a-x="1140" />
-	<g c="E65A" x="0.0" y="0.0" w="324.0" h="538.0" h-a-x="324" />
-	<g c="E938" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="E939" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="E93C" x="-0.1" y="-249.0" w="484.1" h="498.0" h-a-x="484" />
-	<g c="E93D" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="E93E" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="E93F" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="E949" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="E94A" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="E94B" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="E94C" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="EAA4" x="-56.2" y="109.8" w="424.3" h="176.2" h-a-x="340" >
-		<a n="repeatOffset" x="1.36" y="0"/>
-	</g>
-	<g c="EAA9" x="-22.0" y="0.0" w="322.0" h="176.0" h-a-x="259" >
-		<a n="repeatOffset" x="1.036" y="0"/>
-	</g>
-	<g c="EAAA" x="-41.0" y="0.0" w="322.0" h="176.0" h-a-x="259" >
-		<a n="repeatOffset" x="2.232" y="0"/>
-	</g>
-	<g c="EAAD" x="-22.0" y="-15.2" w="526.0" h="210.2" h-a-x="504" >
-		<a n="repeatOffset" x="2.016" y="0"/>
-	</g>
-	<g c="EAAE" x="0.0" y="-9.0" w="526.0" h="210.0" h-a-x="496" >
-		<a n="repeatOffset" x="2.064" y="0"/>
-	</g>
-	<g c="EAAF" x="-27.0" y="0.0" w="390.0" h="176.0" h-a-x="313" >
-		<a n="repeatOffset" x="1.252" y="0"/>
-	</g>
-	<g c="E0A0" x="-0.4" y="-223.0" w="614.6" h="446.0" h-a-x="614" >
-		<a n="noteheadOrigin" x="0.516" y="0"/>
-	</g>
-	<g c="E0A1" x="0.0" y="-209.4" w="474.0" h="420.4" h-a-x="474" >
-		<a n="noteheadOrigin" x="0.016" y="-0.028"/>
-	</g>
-	<g c="E0A2" x="0.0" y="-186.2" w="380.2" h="351.2" h-a-x="380" >
-		<a n="cutOutNW" x="0" y="0.3926841162823719"/>
-		<a n="cutOutSE" x="1.52" y="0.8566841162823718"/>
-	</g>
-	<g c="E0A3" x="0.0" y="-174.0" w="334.0" h="349.0" h-a-x="334" >
-		<a n="cutOutNW" x="0.204" y="0.492"/>
-		<a n="cutOutSE" x="1.116" y="0.732"/>
-		<a n="splitStemDownNE" x="0.956" y="-0.3"/>
-		<a n="splitStemDownNW" x="0.128" y="-0.428"/>
-		<a n="splitStemUpSE" x="1.108" y="0.372"/>
-		<a n="splitStemUpSW" x="0.328" y="0.38"/>
-		<a n="stemDownNW" x="0" y="-0.252"/>
-		<a n="stemUpSE" x="1.312" y="0.284"/>
-	</g>
-	<g c="E0A4" x="0.0" y="-164.0" w="334.0" h="328.0" h-a-x="334" >
-		<a n="cutOutNW" x="0.34" y="0.504"/>
-		<a n="cutOutSE" x="1.12" y="0.816"/>
-		<a n="splitStemDownNE" x="0.992" y="-0.3"/>
-		<a n="splitStemDownNW" x="0.12" y="-0.488"/>
-		<a n="splitStemUpSE" x="1.12" y="0.468"/>
-		<a n="splitStemUpSW" x="0.364" y="0.356"/>
-		<a n="stemDownNW" x="0" y="-0.236"/>
-		<a n="stemUpSE" x="1.336" y="0.288"/>
-	</g>
-	<g c="E0A5" x="0.0" y="0.0" w="0.0" h="0.0" />
-	<g c="E0A9" x="0.0" y="-156.0" w="289.0" h="313.0" h-a-x="289" >
-		<a n="stemDownNW" x="0.004" y="-0.604"/>
-		<a n="stemUpSE" x="1.116" y="0.56"/>
-	</g>
-	<g c="E0AF" x="1.0" y="-161.0" w="332.4" h="321.0" h-a-x="333" >
-		<a n="stemDownNW" x="0.004" y="0.012"/>
-		<a n="stemUpSE" x="1.332" y="-0.06"/>
-	</g>
-	<g c="E0B5" x="0.0" y="-157.0" w="476.0" h="314.0" h-a-x="476" />
-	<g c="E0B6" x="0.0" y="-148.7" w="520.0" h="300.7" h-a-x="520" >
-		<a n="stemDownNW" x="0" y="-0.016"/>
-		<a n="stemUpSE" x="2.08" y="0.124"/>
-	</g>
-	<g c="E0B7" x="0.0" y="-142.0" w="359.0" h="284.0" h-a-x="359" >
-		<a n="stemDownNW" x="0" y="-0.04"/>
-		<a n="stemUpSE" x="1.436" y="0.092"/>
-	</g>
-	<g c="E0D9" x="0.0" y="-148.0" w="295.0" h="296.0" h-a-x="294" >
-		<a n="stemDownNW" x="0" y="-0.004"/>
-		<a n="stemUpSE" x="1.18" y="-0.076"/>
-	</g>
-	<g c="E0DA" x="0.0" y="-147.0" w="499.0" h="294.0" h-a-x="499" >
-		<a n="stemDownNW" x="0" y="0.012"/>
-		<a n="stemUpSE" x="1.996" y="-0.024"/>
-	</g>
-	<g c="E0DB" x="0.0" y="-146.0" w="310.0" h="292.0" h-a-x="309" >
-		<a n="stemDownNW" x="0.008" y="0"/>
-		<a n="stemUpSE" x="1.24" y="-0.064"/>
-	</g>
-	<g c="E0DC" x="0.0" y="-132.5" w="647.0" h="266.5" h-a-x="647" >
-		<a n="stemDownNW" x="0" y="0.024"/>
-		<a n="stemUpSE" x="2.576" y="0.008"/>
-	</g>
-	<g c="E0DD" x="0.0" y="-129.0" w="262.0" h="257.1" h-a-x="262" >
-		<a n="stemDownNW" x="0" y="0.04"/>
-		<a n="stemUpSE" x="1.048" y="-0.056"/>
-	</g>
-	<g c="E0DE" x="0.0" y="-142.5" w="585.0" h="286.5" h-a-x="585" >
-		<a n="stemDownNW" x="0.012" y="0.02"/>
-		<a n="stemUpSE" x="2.34" y="-0.012"/>
-	</g>
-	<g c="E0F5" x="0.0" y="-197.0" w="106.0" h="394.0" h-a-x="76" />
-	<g c="E0F6" x="-30.0" y="-199.1" w="112.0" h="405.1" h-a-x="81" />
-	<g c="E0FA" x="0.0" y="-130.0" w="489.0" h="260.0" h-a-x="490" />
-	<g c="E510" x="10.0" y="0.0" w="212.0" h="422.0" h-a-x="222" />
-	<g c="E511" x="10.0" y="0.0" w="625.0" h="426.0" h-a-x="635" />
-	<g c="E512" x="10.0" y="-37.8" w="616.0" h="459.8" h-a-x="610" />
-	<g c="E513" x="10.0" y="-10.0" w="612.1" h="444.2" h-a-x="622" />
-	<g c="E514" x="0.0" y="0.0" w="317.0" h="478.5" h-a-x="317" />
-	<g c="E515" x="0.0" y="-1.0" w="784.1" h="486.8" h-a-x="784" />
-	<g c="E516" x="0.0" y="-20.0" w="784.1" h="499.5" h-a-x="784" />
-	<g c="E517" x="10.0" y="-5.0" w="426.0" h="527.0" h-a-x="446" />
-	<g c="E518" x="10.0" y="-5.0" w="901.1" h="527.0" h-a-x="921" />
-	<g c="E519" x="10.0" y="-30.4" w="901.1" h="552.4" h-a-x="921" />
-	<g c="E51A" x="-0.1" y="-20.0" w="147.1" h="520.0" h-a-x="122" />
-	<g c="E51B" x="-26.0" y="-20.0" w="156.0" h="543.0" h-a-x="130" />
-	<g c="E51C" x="0.0" y="0.0" w="613.0" h="422.0" />
-	<g c="E51D" x="0.0" y="-30.0" w="791.0" h="499.5" h-a-x="791" />
-	<g c="E51E" x="0.0" y="-17.0" w="856.0" h="537.0" h-a-x="856" />
-	<g c="E583" x="0.0" y="93.0" w="35.0" h="314.0" h-a-x="36" />
-	<g c="E587" x="-0.2" y="-50.0" w="1056.2" h="704.0" h-a-x="1056" />
-	<g c="E630" x="0.0" y="0.0" w="211.0" h="307.0" h-a-x="211" />
-	<g c="E631" x="0.0" y="0.0" w="201.0" h="325.0" h-a-x="201" />
-	<g c="E632" x="0.0" y="-0.0" w="311.0" h="187.0" h-a-x="311" />
-	<g c="E633" x="0.0" y="0.0" w="271.0" h="284.0" h-a-x="271" />
-	<g c="E638" x="0.1" y="0.0" w="363.9" h="316.0" h-a-x="364" />
-	<g c="E5B0" x="0.0" y="-12.0" w="1042.0" h="363.0" h-a-x="1042" />
-	<g c="E5B1" x="0.0" y="-70.0" w="1066.1" h="342.0" h-a-x="1066" />
-	<g c="E5B2" x="-0.1" y="-50.0" w="1066.1" h="583.2" h-a-x="1066" />
-	<g c="E5B3" x="0.0" y="-20.0" w="833.0" h="628.0" h-a-x="833" />
-	<g c="E5B4" x="0.0" y="-60.0" w="1565.5" h="578.8" h-a-x="1565" />
-	<g c="E5B5" x="0.0" y="-380.0" w="1088.0" h="632.0" h-a-x="1088" />
-	<g c="E5B6" x="0.0" y="-364.0" w="1101.1" h="757.0" h-a-x="1101" />
-	<g c="E5B7" x="0.0" y="-169.0" w="1387.0" h="611.0" h-a-x="1386" />
-	<g c="E5B8" x="0.0" y="-380.0" w="1185.0" h="845.0" h-a-x="1185" />
-	<g c="E5B9" x="0.0" y="-200.0" w="1425.0" h="692.0" h-a-x="1425" />
-	<g c="E5BA" x="0.0" y="-202.0" w="1109.0" h="704.0" h-a-x="1109" />
-	<g c="E5BB" x="0.0" y="-20.0" w="1003.0" h="541.0" h-a-x="1003" />
-	<g c="E5BC" x="-0.1" y="-290.0" w="1422.1" h="774.0" h-a-x="1423" />
-	<g c="E5BD" x="0.0" y="-160.0" w="945.8" h="637.0" h-a-x="946" />
-	<g c="E5BE" x="0.0" y="-3.0" w="1067.0" h="394.0" h-a-x="1067" />
-	<g c="E5BF" x="0.0" y="-174.0" w="1167.0" h="569.0" h-a-x="1167" />
-	<g c="E5C0" x="0.0" y="-10.0" w="1322.0" h="359.0" h-a-x="1322" />
-	<g c="E5C1" x="-0.6" y="-20.0" w="931.6" h="304.0" h-a-x="932" />
-	<g c="E5C2" x="0.0" y="-190.0" w="1082.0" h="670.0" h-a-x="1082" />
-	<g c="E5C3" x="0.0" y="-30.0" w="1246.0" h="326.0" h-a-x="1246" />
-	<g c="E5C4" x="0.0" y="-237.0" w="1226.0" h="673.0" h-a-x="1226" />
-	<g c="E5C5" x="0.0" y="0.0" w="736.0" h="559.0" h-a-x="736" />
-	<g c="E5C6" x="-0.1" y="-30.0" w="1151.1" h="463.6" h-a-x="1151" />
-	<g c="E5C7" x="0.0" y="-150.0" w="1151.0" h="622.1" h-a-x="1151" />
-	<g c="E5C8" x="0.0" y="-309.0" w="833.0" h="628.0" h-a-x="833" />
-	<g c="E043" x="0.0" y="291.0" w="144.0" h="401.0" h-a-x="144" />
-	<g c="E044" x="0.0" y="-83.0" w="143.0" h="159.0" h-a-x="143" />
-	<g c="E045" x="20.0" y="-12.0" w="1057.2" h="453.0" h-a-x="1077" />
-	<g c="E046" x="20.0" y="-32.0" w="1146.0" h="444.0" h-a-x="1166" />
-	<g c="E047" x="0.0" y="-65.0" w="798.0" h="871.0" h-a-x="798" />
-	<g c="E048" x="0.0" y="-196.0" w="1380.0" h="1233.0" h-a-x="1380" />
-	<g c="E049" x="0.0" y="-250.0" w="971.0" h="1213.0" h-a-x="971" />
-	<g c="E04B" x="0.0" y="-35.0" w="408.0" h="1031.0" h-a-x="408" />
-	<g c="E4E0" x="0.0" y="-255.0" w="366.0" h="510.0" h-a-x="366" />
-	<g c="E4E1" x="0.0" y="-249.2" w="139.1" h="496.8" h-a-x="139" />
-	<g c="E4E2" x="0.0" y="0.0" w="122.0" h="249.0" h-a-x="122" />
-	<g c="E4E3" x="0.9" y="-120.0" w="499.1" h="134.0" />
-	<g c="E4E4" x="0.0" y="0.0" w="518.4" h="162.0" h-a-x="518" />
-	<g c="E4E5" x="-0.4" y="-415.0" w="263.4" h="830.0" h-a-x="263" />
-	<g c="E4E6" x="0.0" y="-260.0" w="289.0" h="521.0" h-a-x="289" />
-	<g c="E4E7" x="0.0" y="-328.3" w="333.0" h="572.3" h-a-x="333" />
-	<g c="E4E8" x="0.0" y="-497.5" w="347.0" h="980.5" h-a-x="347" />
-	<g c="E4E9" x="0.0" y="-720.0" w="428.0" h="1193.7" h-a-x="428" />
-	<g c="E4EA" x="0.7" y="-711.0" w="490.3" h="1430.0" h-a-x="490" />
-	<g c="E4EB" x="0.0" y="-940.3" w="526.0" h="1675.3" h-a-x="526" />
-	<g c="E4EC" x="0.0" y="-1031.0" w="604.0" h="1970.0" h-a-x="604" />
-	<g c="E4ED" x="0.0" y="-952.0" w="662.1" h="2180.3" h-a-x="662" />
-	<g c="E4F2" x="0.0" y="-258.0" w="284.0" h="527.0" h-a-x="284" />
-	<g c="E4F6" x="0.0" y="-226.0" w="293.0" h="452.0" h-a-x="293" />
-	<g c="E101" x="0.0" y="-254.0" w="488.0" h="508.0" h-a-x="488" >
-		<a n="stemDownNW" x="0" y="-0.928"/>
-		<a n="stemUpSE" x="1.952" y="0.884"/>
-	</g>
-	<g c="E102" x="0.0" y="-254.5" w="954.5" h="510.5" h-a-x="955" />
-	<g c="E103" x="0.0" y="-243.0" w="730.0" h="486.0" h-a-x="730" >
-		<a n="stemDownNW" x="0" y="-0.84"/>
-		<a n="stemUpSE" x="2.92" y="0.836"/>
-	</g>
-	<g c="E000" x="0.0" y="0.0" w="78.0" h="998.5" h-a-x="78" />
-	<g c="E003" x="0.0" y="0.0" w="508.0" h="370.0" h-a-x="508" />
-	<g c="E004" x="0.0" y="-393.0" w="496.0" h="393.0" h-a-x="496" />
-	<g c="E260" x="1.0" y="-208.0" w="208.0" h="680.0" h-a-x="208" >
-		<a n="cutOutNE" x="0.272" y="1.716"/>
-		<a n="cutOutSE" x="0.388" y="0.172"/>
-	</g>
-	<g c="E261" x="0.0" y="-456.0" w="213.5" h="918.0" h-a-x="214" >
-		<a n="cutOutNE" x="0.24" y="2.672"/>
-		<a n="cutOutSW" x="0.568" y="1.104"/>
-	</g>
-	<g c="E262" x="-22.0" y="-384.0" w="412.0" h="767.0" h-a-x="380" >
-		<a n="cutOutNE" x="1.164" y="2.444"/>
-		<a n="cutOutNW" x="0.5" y="0.512"/>
-		<a n="cutOutSE" x="0.84" y="-0.452"/>
-		<a n="cutOutSW" x="0.144" y="-0.752"/>
-	</g>
-	<g c="E263" x="0.0" y="-159.0" w="287.0" h="318.0" h-a-x="287" />
-	<g c="E264" x="0.0" y="-220.0" w="359.0" h="666.0" h-a-x="359" >
-		<a n="cutOutNE" x="0.888" y="1.8"/>
-		<a n="cutOutSE" x="1.068" y="0.464"/>
-	</g>
-	<g c="E265" x="-40.0" y="-347.0" w="669.0" h="695.0" h-a-x="629" >
-		<a n="cutOutNE" x="1.276" y="2.072"/>
-		<a n="cutOutNW" x="0.58" y="1.836"/>
-		<a n="cutOutSE" x="2.028" y="0.644"/>
-		<a n="cutOutSW" x="0.572" y="0.364"/>
-	</g>
-	<g c="E266" x="0.0" y="-206.3" w="589.0" h="663.3" h-a-x="589" >
-		<a n="cutOutNE" x="1.748" y="1.5610396120253924"/>
-		<a n="cutOutSE" x="1.94" y="0.18503961202539243"/>
-	</g>
-	<g c="E267" x="0.0" y="-341.8" w="474.0" h="789.8" h-a-x="474" >
-		<a n="cutOutNE" x="1.22" y="2.1472432234745935"/>
-		<a n="cutOutSE" x="0.788" y="0.49124322347459337"/>
-		<a n="cutOutSW" x="0.568" y="0.5152432234745934"/>
-	</g>
-	<g c="E268" x="-4.5" y="-370.0" w="598.9" h="756.0" h-a-x="564" >
-		<a n="cutOutNE" x="1.9059078875756776" y="2.304"/>
-		<a n="cutOutSE" x="1.9419078875756777" y="0.696"/>
-		<a n="cutOutSW" x="0.5499078875756777" y="0.608"/>
-	</g>
-	<g c="E269" x="-20.0" y="-393.0" w="698.0" h="795.0" h-a-x="678" >
-		<a n="cutOutNE" x="2.248" y="2.392"/>
-		<a n="cutOutNW" x="0.56" y="2.164"/>
-		<a n="cutOutSE" x="2.256" y="0.868"/>
-		<a n="cutOutSW" x="0.492" y="0.676"/>
-	</g>
-	<g c="E26A" x="0.0" y="-270.0" w="130.2" h="537.6" h-a-x="130" />
-	<g c="E26B" x="-0.4" y="-275.0" w="139.4" h="552.0" h-a-x="139" />
-	<g c="E26C" x="0.0" y="-288.0" w="101.0" h="576.0" h-a-x="101" />
-	<g c="E26D" x="0.0" y="-282.6" w="90.4" h="568.6" h-a-x="90" />
-	<g c="E280" x="0.0" y="-240.0" w="208.0" h="680.0" h-a-x="208" >
-		<a n="cutOutNW" x="0.532" y="1.668"/>
-		<a n="cutOutSW" x="0.48" y="0.116"/>
-	</g>
-	<g c="E281" x="0.0" y="-240.0" w="422.0" h="680.0" h-a-x="422" >
-		<a n="cutOutNE" x="1.192" y="1.724"/>
-		<a n="cutOutNW" x="0.556" y="1.732"/>
-	</g>
-	<g c="E282" x="0.0" y="-338.0" w="300.0" h="689.0" h-a-x="300" >
-		<a n="cutOutNE" x="0.64" y="2.208"/>
-		<a n="cutOutNW" x="0.512" y="2.036"/>
-		<a n="cutOutSE" x="0.66" y="0.708"/>
-		<a n="cutOutSW" x="0.5" y="0.52"/>
-	</g>
-	<g c="E283" x="-23.0" y="-373.0" w="411.0" h="818.0" h-a-x="388" >
-		<a n="cutOutNE" x="1.396" y="2.492"/>
-		<a n="cutOutNW" x="0.396" y="2.152"/>
-		<a n="cutOutSE" x="1.292" y="0.844"/>
-		<a n="cutOutSW" x="0.32" y="0.64"/>
-	</g>
-	<g c="E610" x="0.0" y="-0.1" w="306.0" h="366.1" h-a-x="306" />
-	<g c="E611" x="0.0" y="0.0" w="298.0" h="348.0" h-a-x="298" />
-	<g c="E612" x="0.0" y="0.0" w="219.3" h="489.0" h-a-x="219" />
-	<g c="E613" x="0.0" y="0.0" w="218.0" h="502.1" h-a-x="218" />
-	<g c="E614" x="0.0" y="0.0" w="191.0" h="202.0" h-a-x="191" />
-	<g c="E080" x="20.0" y="-358.2" w="493.0" h="717.2" h-a-x="533" />
-	<g c="E081" x="20.0" y="-364.0" w="263.0" h="730.0" h-a-x="303" />
-	<g c="E082" x="20.0" y="-378.7" w="640.5" h="760.7" h-a-x="680" />
-	<g c="E083" x="19.8" y="-392.0" w="520.2" h="784.0" h-a-x="560" />
-	<g c="E084" x="20.0" y="-489.6" w="613.1" h="980.8" h-a-x="653" />
-	<g c="E085" x="19.7" y="-389.0" w="563.3" h="778.0" h-a-x="603" />
-	<g c="E086" x="20.0" y="-363.0" w="545.0" h="726.0" h-a-x="585" />
-	<g c="E087" x="20.4" y="-345.0" w="571.6" h="690.0" h-a-x="612" />
-	<g c="E088" x="20.0" y="-428.0" w="484.2" h="856.0" h-a-x="524" />
-	<g c="E089" x="20.0" y="-421.0" w="474.0" h="842.0" h-a-x="514" />
-	<g c="E08A" x="20.0" y="-298.0" w="565.0" h="592.5" h-a-x="605" />
-	<g c="E08B" x="20.0" y="-687.0" w="675.0" h="1374.0" h-a-x="715" />
-	<g c="E08C" x="0.0" y="-358.0" w="661.0" h="716.0" h-a-x="661" />
-	<g c="E08D" x="0.0" y="-197.0" w="418.0" h="396.0" h-a-x="418" />
-	<g c="E08E" x="0.0" y="-423.0" w="405.0" h="846.0" h-a-x="405" />
-	<g c="E08F" x="0.0" y="-177.0" w="559.0" h="353.0" h-a-x="559" />
-	<g c="E090" x="0.0" y="-54.0" w="662.0" h="109.0" h-a-x="662" />
-	<g c="E091" x="0.0" y="-305.0" w="574.1" h="610.0" h-a-x="574" />
-	<g c="E092" x="0.0" y="-405.0" w="173.5" h="809.0" h-a-x="173" />
-	<g c="E093" x="0.0" y="-422.0" w="154.4" h="844.0" h-a-x="154" />
-	<g c="E094" x="0.6" y="-728.0" w="399.1" h="1456.0" h-a-x="399" />
-	<g c="E095" x="0.0" y="-722.6" w="274.3" h="1447.6" h-a-x="274" />
-	<g c="E220" x="-158.0" y="-88.0" w="314.2" h="176.0" h-a-x="156" />
-	<g c="E221" x="-148.0" y="-177.0" w="297.0" h="354.0" h-a-x="149" />
-	<g c="E222" x="-146.6" y="-253.0" w="293.8" h="506.0" h-a-x="147" />
-	<g c="E223" x="-159.0" y="-342.0" w="318.0" h="684.0" h-a-x="159" />
-	<g c="E224" x="-161.0" y="-437.0" w="322.0" h="874.0" h-a-x="161" />
-	<g c="E22A" x="-175.0" y="-123.0" w="352.0" h="244.2" h-a-x="177" />
-	<g c="E880" x="10.0" y="3.0" w="272.0" h="449.0" h-a-x="292" />
-	<g c="E881" x="10.0" y="-40.0" w="210.5" h="534.0" h-a-x="231" />
-	<g c="E882" x="11.0" y="-20.0" w="350.0" h="484.0" h-a-x="370" />
-	<g c="E883" x="10.0" y="-20.0" w="326.0" h="489.0" h-a-x="356" />
-	<g c="E884" x="10.0" y="-50.0" w="329.0" h="556.2" h-a-x="349" />
-	<g c="E885" x="10.0" y="-10.0" w="351.0" h="523.0" h-a-x="351" />
-	<g c="E886" x="10.0" y="-10.0" w="281.0" h="514.0" h-a-x="301" />
-	<g c="E887" x="10.0" y="-24.0" w="310.0" h="515.0" h-a-x="310" />
-	<g c="E888" x="10.0" y="-40.0" w="267.4" h="594.0" h-a-x="287" />
-	<g c="E889" x="10.0" y="0.0" w="302.0" h="664.0" h-a-x="322" />
-	<g c="E88A" x="10.0" y="80.0" w="125.0" h="314.0" h-a-x="145" />
-	<g c="E645" x="-157.0" y="0.0" w="314.0" h="325.0" h-a-x="157" />
-</bounding-boxes>
diff --git a/data/Petaluma/E000-brace.xml b/data/Petaluma/E000-brace.xml
deleted file mode 100644
index 2b645f3c57b..00000000000
--- a/data/Petaluma/E000-brace.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M69 1c-1 -1 -2 -1 -3 -1c-3 0 -6 3 -8 5c-46 26 -58 70 -57 118v11c3 58 12 116 19 174c7 50 16 99 16 150c0 24 -4 48 -28 61c-6 3 -8 8 -8 13c0 6 3 11 9 14c13 5 21 14 26 27c7 20 10 41 13 62c1 9 1 18 1 28c0 48 -11 95 -19 142c-5 26 -9 53 -9 79c0 16 1 32 5 48 c4 18 10 36 23 51c3 3 6 7 10 10s9 7 14 5c3 -2 5 -6 5 -9c0 -8 -1 -12 -10 -16c-14 -5 -21 -20 -26 -34c-8 -21 -11 -43 -11 -64c0 -12 1 -25 3 -37c7 -50 21 -99 24 -150c1 -14 2 -28 2 -41c0 -25 -3 -50 -9 -74c-4 -15 -9 -30 -21 -41c-4 -3 -2 -5 0 -8 c15 -24 17 -51 17 -77c0 -37 -4 -73 -9 -109c-7 -50 -12 -100 -18 -150c-4 -32 -6 -65 -5 -98c2 -30 14 -52 44 -63c5 -2 9 -6 11 -12c1 -4 5 -10 -1 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E003-bracketTop.xml b/data/Petaluma/E003-bracketTop.xml
deleted file mode 100644
index 64453cc3c6b..00000000000
--- a/data/Petaluma/E003-bracketTop.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 0c-10 0 -15 3 -15 14c1 14 0 30 0 44c0 9 0 17 1 25c2 18 11 24 26 24c27 0 54 -2 80 -2c36 0 72 2 108 9c103 20 174 81 226 168c12 20 19 42 27 64c3 7 6 15 13 19c5 3 10 5 13 5c5 0 8 -3 10 -13c3 -11 4 -22 4 -33c0 -21 -5 -42 -13 -63 c-63 -166 -200 -261 -386 -261h-24c-23 0 -47 1 -70 0z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E004-bracketBottom.xml b/data/Petaluma/E004-bracketBottom.xml
deleted file mode 100644
index 4571c512ef0..00000000000
--- a/data/Petaluma/E004-bracketBottom.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M483 -393c-11 0 -20 6 -23 19c-5 29 -15 57 -29 83c-68 127 -159 197 -306 192c-31 -2 -63 -1 -94 -6c-15 -2 -24 4 -28 23c-2 7 -2 15 -2 22c0 9 1 17 1 25c0 6 -1 13 -2 19v3c0 10 8 12 18 12c28 -1 56 0 93 0c10 0 21 1 32 1c42 0 87 -5 129 -29 c84 -47 147 -112 187 -198c19 -40 31 -82 36 -126c0 -3 1 -6 1 -9c0 -4 -1 -8 -2 -12c-2 -7 1 -19 -11 -19z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E043-repeatDots.xml b/data/Petaluma/E043-repeatDots.xml
deleted file mode 100644
index ae7b3bbf2dc..00000000000
--- a/data/Petaluma/E043-repeatDots.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M58 544c-47 0 -45 0 -47 42c0 10 -1 19 -1 28c0 19 2 37 7 56c3 14 9 19 23 19c12 0 24 0 36 2c4 1 8 1 12 1c32 0 44 -24 44 -53c0 -63 -13 -95 -74 -95zM37 292c-3 -1 -5 -1 -7 -1c-13 0 -21 9 -21 19c-1 26 -9 51 -9 76c0 9 1 19 4 28c4 15 9 24 27 26c16 2 31 8 48 8 c4 0 7 -1 10 -1c6 2 10 3 14 3c19 0 25 -20 34 -34c5 -7 7 -16 7 -27c0 -32 -21 -75 -47 -83c-19 -6 -40 -8 -60 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E044-repeatDot.xml b/data/Petaluma/E044-repeatDot.xml
deleted file mode 100644
index 31047898e93..00000000000
--- a/data/Petaluma/E044-repeatDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M37 -82c-3 -1 -5 -1 -7 -1c-13 0 -21 9 -21 19c-1 27 -9 52 -9 78c0 9 1 17 3 26c5 15 10 24 28 26c16 2 31 8 48 8c4 0 7 -1 10 -1c5 2 10 3 14 3c18 0 25 -20 34 -34c4 -7 6 -16 6 -26c0 -33 -21 -76 -46 -84c-20 -6 -41 -8 -60 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E045-dalSegno.xml b/data/Petaluma/E045-dalSegno.xml
deleted file mode 100644
index 513a817fe51..00000000000
--- a/data/Petaluma/E045-dalSegno.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E045" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M773 -10c-33 5 -65 13 -96 26c-6 3 -12 5 -18 5c-7 0 -13 -3 -19 -10c-4 -5 -10 -8 -16 -8c-3 0 -7 1 -10 3c-10 4 -9 14 -9 23c0 7 1 14 1 22c0 26 -4 53 -14 79c-4 9 -3 21 -4 31v2c0 9 9 13 16 17c1 1 3 1 4 1c4 0 6 -8 8 -11c51 -68 124 -72 199 -72c1 0 2 0 3 1 c15 5 36 7 37 24c1 15 -19 19 -33 23c-33 10 -68 17 -102 26c-30 7 -57 21 -79 43c-18 18 -29 39 -32 65c-3 27 -2 54 -8 80c-5 25 22 56 52 68c10 4 20 7 30 8c15 3 30 3 46 5c43 0 83 -13 123 -26c6 -2 12 -3 18 -3c5 0 10 1 15 3c4 2 8 3 11 3c9 0 15 -7 17 -20 c5 -21 13 -41 18 -62c1 -5 2 -10 2 -15c0 -8 -2 -16 -7 -24c-9 -13 -14 -19 -21 -19c-6 0 -12 6 -22 17c-4 4 -9 8 -14 10c-39 15 -78 26 -119 26c-15 0 -30 -2 -46 -5c-9 -2 -22 -2 -23 -10v-2c0 -8 13 -11 20 -15c35 -19 74 -28 112 -39c14 -4 28 -8 41 -13 c54 -23 83 -59 83 -109c0 -13 -2 -26 -6 -41c-22 -82 -61 -109 -124 -109c-10 0 -22 1 -34 2zM489 -4c-9 0 -17 3 -19 14c-5 25 -15 49 -16 74h-2c-7 0 -10 -6 -13 -10c-36 -44 -84 -61 -139 -66c-38 -3 -76 -4 -114 -4h-76h-38c-24 -1 -35 15 -47 29c-3 4 -5 8 -5 11 c0 5 4 9 15 11c8 2 15 3 23 3c5 0 11 -1 17 -2h5c9 0 13 5 14 17c3 76 7 153 7 229c0 17 -1 34 -1 51c-1 22 -7 36 -32 35c-5 0 -11 1 -16 2c-15 4 -25 13 -25 29c1 15 17 14 26 14c27 0 54 1 80 1c43 0 86 -2 128 -12c25 -6 52 -8 77 -13c86 -17 141 -85 143 -171 c2 -49 -3 -96 -23 -142c13 8 27 8 40 11c10 2 22 10 32 10c4 0 7 -2 10 -5c16 -20 37 -39 33 -70c-3 -23 -18 -40 -41 -43zM222 71c76 25 132 100 133 179c1 81 -51 133 -130 132c-17 0 -23 -6 -22 -23c2 -27 5 -55 5 -83c-1 -64 -4 -128 -6 -191v-3c0 -10 3 -14 9 -14 c3 0 7 1 11 3zM1028 0c-13 -5 -24 -7 -32 -7c-19 0 -27 13 -34 46c-2 9 -3 16 -3 22c0 18 9 29 32 40c15 8 31 14 45 22c6 3 11 5 15 5c8 0 13 -6 18 -16c6 -15 9 -31 8 -47c0 -31 -18 -55 -49 -65z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E046-daCapo.xml b/data/Petaluma/E046-daCapo.xml
deleted file mode 100644
index a1b39dc6fbb..00000000000
--- a/data/Petaluma/E046-daCapo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E046" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M46 -1h-4c-13 0 -19 9 -22 19v3c0 11 14 11 19 13c16 5 33 6 49 8c9 1 14 3 14 12c5 73 13 145 13 217c0 24 -1 48 -3 71c-1 13 -5 18 -19 18c-17 0 -35 3 -52 5c-13 2 -17 12 -19 22v2c0 10 11 8 17 11c9 3 20 6 30 6c48 0 96 6 144 6c24 0 47 -1 71 -5 c31 -4 62 -8 91 -20c69 -28 101 -74 102 -149c0 -66 -19 -124 -65 -173c-28 -30 -64 -41 -102 -46c-70 -9 -140 -20 -211 -20h-27c-9 1 -17 0 -26 0zM839 -6h-26c-100 13 -184 52 -232 148c-10 20 -15 41 -15 61c0 39 16 75 40 109c44 63 114 100 183 100c14 0 28 -1 42 -5 c59 -17 95 -57 120 -111c2 -5 3 -12 3 -18c0 -9 -3 -14 -8 -14c-3 0 -6 2 -10 5c-12 9 -25 17 -32 28c-16 23 -35 30 -55 30c-15 0 -30 -4 -44 -7c-73 -22 -122 -70 -143 -144c-2 -7 -3 -14 -3 -22c0 -41 33 -78 77 -79c71 -2 134 17 183 71c7 7 12 10 18 10c4 0 8 -1 13 -3 c23 -11 39 -28 52 -48c4 -7 5 -12 5 -17c0 -11 -7 -21 -15 -30c-42 -42 -95 -59 -153 -64zM229 52c35 3 66 14 87 44c30 43 49 89 49 143c0 32 -2 65 -24 91c-27 32 -65 33 -103 35c-2 -1 -4 -1 -5 -1c-10 0 -15 -3 -15 -15c0 -42 6 -81 6 -122c0 -15 0 -31 -2 -46 c-5 -38 -5 -77 -7 -115c0 -11 2 -15 14 -14zM1101 -20c-13 -1 -65 60 -64 76c1 15 58 59 76 59c18 -1 53 -50 53 -76c1 -16 -46 -58 -65 -59zM527 -32c-16 0 -17 21 -26 31c-16 20 -24 34 -24 48c0 16 13 30 36 50c13 11 23 17 31 17c11 0 18 -10 27 -32 c5 -15 11 -30 11 -47c0 -14 -5 -25 -18 -33c-4 -3 -7 -7 -11 -9c-11 -6 -13 -25 -26 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E047-segno.xml b/data/Petaluma/E047-segno.xml
deleted file mode 100644
index 1ac07e85b3d..00000000000
--- a/data/Petaluma/E047-segno.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -65c-8 0 -11 2 -11 6s3 9 6 14c20 40 48 73 78 106c34 37 67 75 101 112c50 54 101 108 152 162c-4 2 -7 3 -11 4c-38 16 -76 31 -97 70c-13 24 -19 48 -19 72c0 25 7 50 21 74c33 53 70 104 127 133c18 10 36 14 54 14c26 0 52 -9 78 -19c25 -9 45 -27 67 -42 c7 -5 10 -9 10 -15c0 -4 -2 -8 -5 -13c-15 -21 -36 -34 -59 -43c-4 -1 -7 -2 -10 -2c-10 0 -18 4 -27 11c-28 21 -58 38 -95 38c-42 0 -71 -26 -71 -66c0 -49 21 -102 81 -124l29 -12l3 3c81 90 166 176 244 268c30 37 65 70 99 104c4 5 9 9 14 13c3 2 7 3 10 3 c5 0 11 -2 15 -5c2 -1 3 -3 3 -4c0 -4 -5 -9 -6 -13c-3 -13 -12 -22 -21 -32c-108 -117 -214 -236 -321 -355c39 -18 74 -41 105 -73c15 -15 28 -32 40 -50c14 -22 20 -44 20 -66c0 -20 -5 -40 -15 -60c-40 -76 -100 -129 -184 -152c-11 -3 -23 -4 -34 -5 c-34 -1 -67 1 -98 13c-9 3 -17 8 -25 13c-15 11 -22 22 -22 33c0 10 4 20 12 32c10 16 22 29 35 42c6 6 11 8 16 8c8 0 15 -5 20 -12c24 -31 58 -48 96 -48c13 0 26 2 39 6c44 13 68 40 68 73c0 18 -6 37 -19 57c-32 51 -77 84 -127 109c-85 -92 -170 -184 -254 -276 c-27 -29 -52 -59 -77 -89c-9 -11 -19 -16 -35 -17zM598 372c-15 1 -26 10 -34 20c-10 12 -32 17 -31 32c2 14 16 27 26 39c16 22 28 32 42 32c12 0 24 -8 42 -23s27 -25 27 -36c0 -10 -9 -21 -26 -37c-13 -12 -26 -25 -46 -27zM174 243h-4c-7 0 -14 4 -20 8 c-13 10 -25 22 -40 31c-8 5 -12 10 -12 15c0 6 4 11 11 18c13 13 23 28 37 41c8 7 15 11 23 11c6 0 12 -2 19 -7c19 -15 39 -29 58 -43c4 -3 8 -6 6 -14c-7 -23 -54 -61 -78 -60z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E048-coda.xml b/data/Petaluma/E048-coda.xml
deleted file mode 100644
index 95d9d0f4057..00000000000
--- a/data/Petaluma/E048-coda.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M714 -196c-12 0 -9 17 -11 27c-5 24 -5 49 -5 74c0 33 2 66 2 99c-14 0 -29 1 -43 2c-64 7 -127 22 -184 50c-61 30 -108 77 -134 142c-21 52 -42 104 -42 162c0 7 0 14 1 21l-272 -3h-26c20 33 33 64 55 87c5 6 15 7 27 7c10 0 21 -1 30 -1l201 3c15 58 41 112 82 161 c71 84 166 120 273 133l38 3c1 68 2 135 2 203c0 15 4 30 6 45c2 12 11 16 22 18h1c13 0 12 -12 12 -18c2 -34 3 -67 2 -101c-1 -48 -1 -96 -1 -144c5 0 11 0 16 -1c155 -4 260 -81 300 -234c4 -19 7 -37 7 -56l275 3h6c8 0 16 -1 24 -1c1 -6 2 -12 2 -17 c0 -25 -12 -45 -26 -64c-6 -9 -21 -16 -32 -16c-86 0 -172 -1 -258 -2c0 -3 -1 -6 -1 -9c-13 -89 -44 -170 -98 -242c-60 -79 -137 -120 -227 -129c-1 -49 -2 -98 -2 -147c0 -10 0 -20 -2 -29c-3 -11 -8 -26 -20 -26zM746 479c45 1 90 2 135 2c41 0 82 1 123 1 c-14 45 -42 83 -83 112c-53 37 -111 53 -172 55c-1 -57 -1 -113 -3 -170zM401 475l301 3c1 38 1 71 2 93c0 26 1 51 1 77c-6 0 -12 -1 -18 -1c-53 -6 -106 -14 -155 -40c-61 -32 -103 -77 -131 -132zM741 128c12 1 24 3 36 5c64 14 116 48 154 101c32 45 50 98 67 151 c0 0 1 0 1 1c-85 -1 -170 -2 -255 -2c-2 -86 -1 -171 -3 -256zM700 125c0 75 1 172 1 259c-50 -1 -100 0 -151 -1c-60 -1 -120 -1 -180 -2l-3 -17c-2 -13 -3 -25 -3 -37c0 -67 32 -115 94 -144c77 -36 157 -57 242 -58z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E049-codaSquare.xml b/data/Petaluma/E049-codaSquare.xml
deleted file mode 100644
index f9e1603bd20..00000000000
--- a/data/Petaluma/E049-codaSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M516 -250c-52 83 -34 170 -45 255c-71 -3 -142 -6 -212 -10c-21 -1 -36 10 -35 29l15 287v5c0 11 -3 15 -17 16c-62 4 -124 10 -186 15c-18 1 -35 5 -36 32c25 6 49 8 74 8c56 0 112 -11 169 -14c6 64 12 128 12 192c0 50 -4 99 -15 149c18 10 37 12 55 12s35 -2 53 -2 c40 1 81 1 125 1c-2 48 -5 98 -8 148c-1 17 -3 35 -5 52c-1 4 -1 8 -1 12c0 12 5 22 22 26c23 -20 21 -50 24 -78c6 -53 9 -108 12 -161c50 -5 100 -9 149 -16c96 -13 81 -36 88 -101c8 -73 7 -146 11 -219v-18c37 -3 73 -4 108 -8c34 -5 72 2 98 -31c-34 -8 -68 -9 -102 -9 h-105l-12 -312c-31 -6 -68 -19 -106 -19c-33 0 -66 8 -99 12c-8 1 -15 1 -28 2c3 -38 6 -73 8 -108s3 -69 3 -104c0 -12 -8 -25 -14 -43zM361 364h100c3 105 7 208 11 314c-38 1 -74 3 -110 5c7 -45 10 -89 10 -133c0 -62 -6 -124 -11 -186zM619 368h3c15 0 18 6 18 20 c0 31 0 62 -1 92c-1 63 -4 125 -7 187l-116 12v-310h51c17 0 35 0 52 -1zM515 320v-269h113l9 269h-122zM357 318l-12 -267h124c-3 90 -5 178 -8 267h-104z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E04B-segnoSerpent2.xml b/data/Petaluma/E04B-segnoSerpent2.xml
deleted file mode 100644
index 51f49e3db57..00000000000
--- a/data/Petaluma/E04B-segnoSerpent2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M168 -35c-45 0 -94 29 -132 80c-3 4 -5 8 -5 12c0 3 2 6 4 10c14 15 22 34 37 49c9 9 16 14 22 14s13 -5 22 -16c31 -38 71 -65 123 -68h6c12 0 16 4 16 14c0 2 0 6 -1 9c-3 14 -9 25 -16 36c-4 -6 -8 -12 -14 -12c-8 0 -9 6 -9 11c0 9 -2 21 -2 30l-12 12l-14 13 c0 -10 -1 -19 -1 -28c0 -7 0 -15 -2 -21c-3 -9 -7 -19 -17 -19c-11 2 -8 13 -9 22c-3 24 -4 48 -5 72c-29 20 -60 37 -87 59c-46 38 -71 76 -71 119c0 30 11 61 32 96c5 10 11 20 17 29c-32 30 -50 69 -50 106c0 13 2 25 6 37c12 35 40 60 67 84c-12 11 -22 23 -32 36 c-17 24 -26 48 -26 73c0 19 5 37 15 57c10 18 21 36 33 53c29 42 68 62 113 62c11 0 23 -1 35 -4c57 -12 108 -38 148 -83c7 -8 10 -15 10 -23c0 -5 -1 -10 -4 -16c-10 -22 -50 -54 -70 -55l-4 -1c-7 1 -10 8 -15 14c-32 39 -70 70 -122 79c-9 1 -20 3 -29 3 c-14 0 -27 -3 -34 -13c-2 -4 -3 -7 -3 -12c0 -14 13 -32 22 -46c10 -16 23 -31 37 -44v24c-1 16 2 32 2 48c1 14 13 14 21 16c1 0 2 1 2 1c6 0 5 -9 8 -14c3 -6 4 -12 4 -19c0 -6 -1 -12 -1 -18c1 -23 1 -46 2 -69c11 -9 24 -17 36 -24v30c0 16 3 31 5 47c2 12 11 13 19 15 c2 1 3 1 4 1c7 0 5 -10 8 -15c4 -8 3 -17 3 -25v-75c43 -24 85 -50 119 -86c19 -20 29 -41 29 -63c0 -17 -6 -34 -18 -51c-15 -22 -33 -41 -57 -55c0 0 -1 0 -1 -1c41 -23 67 -60 67 -113c0 -51 -31 -89 -76 -113c-11 -6 -22 -14 -35 -16c14 -12 28 -26 40 -42 c16 -22 25 -46 25 -69c0 -27 -11 -53 -32 -76c-50 -54 -76 -68 -153 -68zM152 543l-3 117c-14 8 -29 17 -42 27c-8 -13 -11 -28 -9 -46c5 -42 23 -74 54 -98zM219 506v27c0 9 1 19 1 28h1v57c-11 7 -22 14 -34 20c1 -21 1 -42 1 -64c1 -18 1 -37 2 -55c9 -5 19 -9 29 -13z M309 473c1 3 3 6 5 9c5 9 8 18 8 27c0 15 -8 31 -25 49c-12 13 -24 23 -37 34v-44c0 -14 0 -28 -1 -43v-14c16 -5 32 -11 47 -17c1 0 2 0 3 -1zM155 317c-1 38 -1 75 -1 113c-23 8 -45 17 -66 30c-3 -9 -4 -18 -4 -27c0 -27 13 -53 29 -74c12 -16 26 -29 42 -42zM216 275 l3 -3c1 15 1 30 1 45v93c-1 1 -2 1 -3 1c-8 2 -16 5 -25 7c1 -29 1 -55 1 -79v-49c7 -5 15 -10 23 -15zM255 246l9 -6c2 1 3 2 4 3c20 18 29 41 29 65c0 30 -16 62 -39 82c-1 -20 -1 -40 -1 -59c-1 -28 -2 -56 -2 -85z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E050-gClef.xml b/data/Petaluma/E050-gClef.xml
deleted file mode 100644
index eda04aecfd9..00000000000
--- a/data/Petaluma/E050-gClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 -559c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86 c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32c24 0 31 -25 36 -46c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14 l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3z M278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195 c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180 zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45c0 -20 3 -34 3 -34s34 -9 69 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E051-gClef15mb.xml b/data/Petaluma/E051-gClef15mb.xml
deleted file mode 100644
index 54de8392f63..00000000000
--- a/data/Petaluma/E051-gClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M287 -885c-42 0 -47 29 -52 55c-2 13 0 27 -1 41c0 6 4 12 10 12h1c6 0 7 -7 8 -12c1 -3 1 -6 1 -10c0 -24 11 -37 27 -37c8 0 17 3 26 8c26 14 38 39 46 66c3 11 7 23 7 35c0 5 0 10 -2 15c-9 25 -28 39 -48 39c-12 0 -23 -4 -35 -12c-6 -4 -11 -7 -14 -7 c-4 0 -6 6 -8 18c-1 7 -1 13 -1 20c0 31 8 61 15 92c1 4 1 7 2 10c1 1 1 2 2 4c-5 -3 -11 -6 -17 -8s-11 -3 -16 -3c-10 0 -18 5 -24 14l-3 -33c-6 -55 -7 -110 -8 -166c0 -36 -2 -71 -3 -107c0 -4 -1 -8 -2 -11c-2 -4 -5 -9 -10 -9s-6 6 -7 10c-3 20 -5 39 -4 59 c5 74 2 149 11 222c0 3 0 5 -1 10c-14 -12 -24 -24 -39 -29c-3 -1 -6 -2 -9 -2c-5 0 -8 3 -9 12c-2 9 -3 16 -3 20c0 10 6 13 24 21c16 7 26 21 36 34c3 3 5 7 8 9c-1 4 -3 9 -5 13c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14 l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32 c24 0 31 -25 36 -46c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236 c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -111 -34 -211 -108 -296c3 -1 7 -3 10 -3c21 -1 37 8 54 17c5 3 9 5 12 5c6 0 9 -7 9 -24c0 -28 -24 -41 -61 -47c-33 -5 -33 -3 -41 -36c-2 -6 -4 -12 -1 -18c11 3 21 5 31 5c38 0 62 -27 68 -74 c1 -10 2 -20 2 -30c0 -28 -5 -55 -14 -82c-7 -23 -21 -41 -38 -57c-12 -12 -25 -17 -40 -17zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52 c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5 c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45 c0 -20 3 -34 3 -34s34 -9 69 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E052-gClef8vb.xml b/data/Petaluma/E052-gClef8vb.xml
deleted file mode 100644
index 6d04deb54cb..00000000000
--- a/data/Petaluma/E052-gClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M217 -834c-28 13 -39 36 -41 66c-1 5 0 10 0 17c-3 26 8 48 27 67c5 5 8 9 6 18c-5 15 -7 30 -7 43c0 25 7 48 20 69c-5 4 -9 9 -12 16c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2 c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32c24 0 31 -25 36 -46 c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57 c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -99 -27 -189 -84 -267c4 -5 7 -13 9 -20c3 -11 5 -21 5 -31c0 -22 -7 -44 -14 -64c-2 -6 -4 -12 -4 -17c0 -6 2 -11 9 -18c16 -16 21 -36 21 -56c0 -9 -1 -17 -2 -25c-6 -37 -20 -70 -50 -95c-15 -13 -31 -19 -48 -19 c-9 0 -19 2 -29 6zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55 c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7 c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45c0 -20 3 -34 3 -34s34 -9 69 -9zM253 -625c4 -1 7 -2 11 -2c10 0 20 5 27 18 s11 27 13 41v4c0 8 -5 15 -14 15c-27 1 -55 -14 -57 -49c0 -10 6 -24 20 -27zM263 -792c26 4 45 21 55 46c2 6 3 11 3 17c0 14 -7 29 -17 41c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2c-23 -9 -43 -23 -61 -39c-14 -12 -20 -22 -20 -31c0 -14 13 -24 33 -34c9 -5 20 -6 34 -7z " /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E053-gClef8va.xml b/data/Petaluma/E053-gClef8va.xml
deleted file mode 100644
index 0147a76dde2..00000000000
--- a/data/Petaluma/E053-gClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 -559c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86 c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 86 30 167 80 237c-16 13 -23 33 -24 55c-1 5 0 10 0 17c-3 26 8 48 27 67c5 5 8 9 6 18c-4 15 -7 29 -7 43c0 39 17 73 46 104c4 4 8 8 10 13c8 20 25 22 43 21 s24 -16 28 -30c3 -11 5 -21 5 -31c0 -22 -7 -44 -14 -64c-2 -6 -4 -12 -4 -17c0 -6 2 -11 9 -18c16 -16 21 -36 21 -56c0 -9 -1 -17 -2 -25c-6 -37 -20 -70 -50 -95c-5 -5 -11 -8 -16 -11c1 -1 1 -2 1 -3c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81 c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309 c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3zM345 1173c4 -1 7 -2 11 -2c10 0 20 5 27 18s11 27 13 41v4c0 8 -5 15 -14 15c-27 1 -55 -14 -57 -49c0 -10 6 -24 20 -27zM355 1006c26 4 45 21 55 46c2 6 3 11 3 17c0 14 -7 29 -17 41c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2 c-23 -9 -43 -23 -61 -39c-14 -12 -20 -22 -20 -31c0 -14 13 -24 33 -34c3 -2 7 -3 12 -4h2c4 0 8 -1 11 -2s6 -1 9 -1zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13 c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177 c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45 c0 -20 3 -34 3 -34s34 -9 69 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E054-gClef15ma.xml b/data/Petaluma/E054-gClef15ma.xml
deleted file mode 100644
index 65127d62e3e..00000000000
--- a/data/Petaluma/E054-gClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 -559c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86 c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239l6 7c-2 -1 -4 -2 -6 -2c-5 0 -6 6 -7 10c-3 20 -5 39 -4 59c5 74 2 149 11 222c0 3 0 5 -1 10c-14 -12 -24 -24 -39 -29c-3 -1 -6 -2 -9 -2 c-5 0 -8 3 -9 12c-2 9 -3 16 -3 20c0 10 6 13 24 21c16 7 26 21 36 34c5 6 11 14 19 11c7 -3 9 -12 9 -20c-1 -18 -2 -37 -4 -55c-6 -55 -7 -110 -8 -166c0 -36 -2 -71 -3 -107c0 -4 -1 -8 -2 -11c-1 -1 -1 -2 -2 -4c9 12 20 22 34 22c3 0 6 0 8 -1l-3 15c-2 13 0 27 -1 41 c0 6 4 12 10 12h1c6 0 7 -7 8 -12c1 -3 1 -6 1 -10c0 -24 11 -37 27 -37c8 0 17 3 26 8c26 14 38 39 46 66c3 11 7 23 7 35c0 5 0 10 -2 15c-9 25 -28 39 -48 39c-12 0 -23 -4 -35 -12c-6 -4 -11 -7 -14 -7c-4 0 -6 6 -8 18c-1 7 -1 13 -1 20c0 31 8 61 15 92c1 4 1 7 2 10 c5 9 1 21 9 28c3 3 5 4 8 4c7 0 13 -7 20 -7c21 -1 37 8 54 17c5 3 9 5 12 5c6 0 9 -7 9 -24c0 -28 -24 -41 -61 -47c-33 -5 -33 -3 -41 -36c-2 -6 -4 -12 -1 -18c11 3 21 5 31 5c38 0 62 -27 68 -74c1 -10 2 -20 2 -30c0 -28 -5 -55 -14 -82c-7 -23 -21 -41 -38 -57 c-12 -12 -25 -17 -40 -17c-6 0 -13 1 -20 3c-1 0 -2 1 -3 1c1 -3 1 -6 2 -9c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124 c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112 c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26 c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176 c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45c0 -20 3 -34 3 -34s34 -9 69 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E055-gClef8vbOld.xml b/data/Petaluma/E055-gClef8vbOld.xml
deleted file mode 100644
index 5de589ec595..00000000000
--- a/data/Petaluma/E055-gClef8vbOld.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 -559c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86 c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32c24 0 31 -25 36 -46c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14 l26 -97s6 4 12 7c45 27 93 40 143 40h4c39 56 82 108 121 164c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32c24 0 31 -25 36 -46c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81 c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309 c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-19 7 -37 17 -54 28 c-13 -8 -27 -15 -41 -22c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM654 498 c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26 c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM656 191l9 11s-7 40 -15 65l-7 22l-33 -44c22 -14 38 -32 46 -54zM767 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7 c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM376 22c1 27 6 54 16 78c5 14 11 27 18 39c-18 0 -36 -2 -54 -6c-3 -4 -3 -9 -2 -16c7 -34 15 -64 22 -95zM463 -57c34 21 62 47 87 77c5 30 16 58 33 84c-17 15 -38 21 -60 26c-20 -30 -39 -60 -57 -91c-2 -3 -8 -20 -9 -26 c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c1 -3 3 -7 6 -9zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45c0 -20 3 -34 3 -34s34 -9 69 -9zM661 -111c29 -2 55 5 55 5 s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-8 -7 -15 -13 -22 -20c-13 -49 -34 -94 -63 -134v-5c0 -20 3 -34 3 -34s34 -9 69 -9zM394 -84l1 -7l2 1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E056-gClef8vbCClef.xml b/data/Petaluma/E056-gClef8vbCClef.xml
deleted file mode 100644
index 0c9b235390f..00000000000
--- a/data/Petaluma/E056-gClef8vbCClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E056" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M239 -561c-13 0 -22 9 -31 27c-7 13 -13 27 -18 41c-1 3 -2 6 -2 9c0 9 7 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 3 1 5 1 7c0 5 -3 6 -10 6c-17 0 -33 -2 -49 -2c-66 0 -130 13 -184 56c-47 37 -85 83 -96 145c-2 13 -3 26 -3 39c0 40 10 79 29 116 c38 75 87 141 136 209c18 25 36 51 57 73c11 12 15 25 15 38c0 17 -6 33 -8 49c-9 68 -18 135 -18 203c0 12 0 25 1 37c6 87 31 169 83 241c11 15 26 32 44 29c19 -4 26 -26 31 -45c17 -69 44 -136 54 -207c3 -23 5 -46 5 -68c0 -70 -15 -137 -44 -202 c-20 -44 -41 -87 -70 -125c-6 -8 -9 -16 -9 -25c0 -4 1 -8 2 -13c6 -25 13 -51 17 -76c2 -13 4 -19 10 -19c4 0 9 3 16 7c43 26 88 37 135 37c24 0 49 -3 73 -8c70 -15 104 -59 104 -133c0 -28 -8 -53 -18 -79c-42 -113 -111 -201 -225 -247c-12 -5 -17 -12 -16 -25 c0 -97 -26 -186 -79 -267c-16 -24 -34 -47 -58 -62c-11 -7 -20 -10 -28 -10zM783 439c-53 2 -107 3 -160 3c-7 1 -14 1 -17 10c-6 26 -13 52 -18 78v4c0 12 7 19 21 17c36 -4 73 -4 110 -4h45c17 0 20 5 20 20c-1 80 1 159 -5 239c-1 13 -1 25 -1 38c0 40 3 81 5 120 c0 10 5 16 13 18c1 0 2 1 3 1c7 0 6 -10 9 -15c4 -8 5 -18 5 -27c0 -11 -2 -23 -1 -34c1 -26 1 -51 1 -77c0 -15 -1 -29 -1 -44c0 -78 6 -155 7 -233c0 -17 2 -34 2 -51c0 -11 -1 -23 -4 -35c-5 -19 -13 -29 -34 -28zM278 501c35 47 73 187 73 289c0 41 -6 76 -21 97 c-47 -79 -66 -162 -66 -248c0 -45 5 -91 14 -138zM805 -140c-13 38 -14 73 -13 109c1 19 1 37 1 56c0 76 -4 153 -5 229c0 19 -7 24 -24 22c-52 -6 -103 -4 -155 -6c-10 0 -18 1 -18 13c1 21 -4 41 -4 62c0 25 6 34 27 34c31 0 62 -2 94 -2c26 0 53 1 79 7h4 c7 0 9 -6 12 -13c11 -34 11 -70 13 -104c4 -100 6 -200 6 -300v-60c-1 -16 -2 -31 -17 -47zM176 -98c-3 24 -6 48 -6 71c0 18 2 36 7 54c16 62 53 111 98 153c6 6 13 9 11 21c-7 28 -12 56 -18 88c-19 -24 -34 -43 -49 -63c-46 -59 -90 -119 -127 -185 c-10 -17 -15 -40 -15 -60c0 -17 4 -32 12 -40c24 -23 54 -33 87 -39zM399 -92c4 0 8 3 13 5c76 36 138 85 175 162c3 6 4 10 4 15c0 6 -3 10 -10 15c-9 7 -19 12 -30 16c-38 12 -77 16 -123 19c-17 1 -39 -5 -61 -7c-9 -1 -14 -3 -14 -12c0 -2 0 -5 1 -8 c15 -63 29 -126 35 -191c1 -10 5 -14 10 -14zM287 -114v1h31c18 0 23 7 22 28c-5 56 -20 111 -27 167c-1 8 -3 12 -6 12c-2 0 -6 -1 -10 -5c-39 -33 -74 -71 -82 -123c-3 -17 -5 -30 -5 -41c0 -29 14 -38 62 -38c5 0 10 -1 15 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E05C-cClef.xml b/data/Petaluma/E05C-cClef.xml
deleted file mode 100644
index ce512e1f29a..00000000000
--- a/data/Petaluma/E05C-cClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M91 -543c-3 0 -8 3 -15 7c-13 9 -28 16 -41 25c-16 11 -23 24 -23 44v258c-5 94 -3 187 -6 280c-3 65 -3 129 -3 194v149c0 26 0 53 -2 79l-1 10c0 4 1 8 2 11c7 19 16 29 29 29c7 0 15 -3 25 -10c36 -25 64 -54 61 -104c-7 -95 -3 -190 -6 -285c-5 -161 -7 -323 -9 -484 c-1 -61 -3 -123 -4 -184c-1 -13 -2 -19 -7 -19zM427 -535c-24 0 -48 3 -73 9c-45 12 -86 35 -118 70l-8 9l-5 8v-24c0 -14 1 -27 -6 -40c-2 -4 -4 -8 -9 -8c-6 0 -7 6 -7 10c0 22 -5 43 -5 64c0 53 1 107 1 160s-1 106 -3 159c-2 62 -1 125 -2 187c-1 65 -1 131 -1 196v197 c0 12 1 24 4 35c3 9 9 13 15 14h1c9 0 7 -9 8 -14c4 -12 5 -24 5 -37c0 -7 0 -15 -1 -22v-837c8 4 19 2 29 2h18c4 1 7 1 11 1c16 0 34 -8 51 -8c7 0 13 1 20 4c1 1 2 1 4 1c7 0 12 -10 15 -19c9 -30 26 -46 51 -46c10 0 21 3 34 8c51 22 94 52 116 104c11 25 17 49 17 71 c0 47 -24 89 -69 125c-24 18 -49 33 -78 40c-4 1 -7 2 -10 2c-6 0 -12 -3 -17 -9c-14 -17 -29 -33 -34 -54c-2 -11 -8 -17 -19 -19c-15 -2 -30 -5 -45 -5c-19 0 -38 4 -56 18c-10 3 -13 7 -13 19c0 18 2 37 4 57c3 27 4 54 4 81c0 30 -1 60 -3 90c-1 13 -2 26 -6 38 c-2 0 -5 1 -6 2c-3 3 -5 5 -5 8c0 2 2 4 6 5c0 5 5 7 10 8c8 1 15 4 22 6c14 8 26 17 41 22c10 3 19 6 29 6c7 0 14 -1 22 -4c38 -12 77 -21 116 -31c4 -1 7 -2 11 -2c7 0 15 3 23 8c36 21 57 55 61 94c1 11 2 23 2 34c0 68 -23 128 -82 174c-22 17 -48 21 -74 24h-2 c-9 0 -17 -5 -23 -12c-16 -20 -25 -41 -25 -65c0 -7 0 -15 2 -22c1 -4 1 -8 1 -11c0 -21 -12 -35 -34 -42c-23 -7 -47 -9 -70 -13c-17 -2 -27 6 -29 21c-1 13 -2 24 -2 35c0 56 19 89 80 115l114 48c22 9 43 13 63 13c51 0 96 -25 137 -61c50 -44 85 -100 94 -167 c2 -11 2 -22 2 -33c0 -65 -30 -113 -98 -153c-47 -28 -116 -44 -183 -40c-13 -3 -26 -4 -39 -4c-15 0 -30 1 -46 4c1 -14 2 -28 2 -42c0 -10 -1 -20 -1 -30c1 -7 1 -15 1 -22c0 -17 -2 -34 -3 -51c25 12 51 21 80 25c25 3 49 9 74 9c6 0 11 0 16 -1c88 -9 165 -102 172 -189 c1 -14 2 -28 2 -42c0 -80 -23 -151 -96 -201c-56 -38 -119 -60 -185 -60z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E05D-cClef8vb.xml b/data/Petaluma/E05D-cClef8vb.xml
deleted file mode 100644
index 7197852432f..00000000000
--- a/data/Petaluma/E05D-cClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M91 -543c-3 0 -8 3 -15 7c-13 9 -28 16 -41 25c-16 11 -23 24 -23 44v258c-5 94 -3 187 -6 280c-3 65 -3 129 -3 194v149c0 26 0 53 -2 79l-1 10c0 4 1 8 2 11c7 19 16 29 29 29c7 0 15 -3 25 -10c36 -25 64 -54 61 -104c-7 -95 -3 -190 -6 -285c-5 -161 -7 -323 -9 -484 c-1 -61 -3 -123 -4 -184c-1 -13 -2 -19 -7 -19zM304 -921c-12 0 -25 2 -37 8c-36 16 -50 45 -52 82c-1 6 0 13 0 21c-3 32 10 60 34 84c6 6 10 12 7 23c-5 18 -8 36 -8 53c0 48 21 91 57 130c2 3 5 6 8 9c-29 13 -55 31 -77 55l-8 9l-5 8v-24c0 -14 1 -27 -6 -40 c-2 -4 -4 -8 -9 -8c-6 0 -7 6 -7 10c0 22 -5 43 -5 64c0 53 1 107 1 160s-1 106 -3 159c-2 62 -1 125 -2 187c-1 65 -1 131 -1 196v197c0 12 1 24 4 35c3 9 9 13 15 14h1c9 0 7 -9 8 -14c4 -12 5 -24 5 -37c0 -7 0 -15 -1 -22v-837c8 4 19 2 29 2h18c4 1 7 1 11 1 c16 0 34 -8 51 -8c7 0 13 1 20 4c1 1 2 1 4 1c7 0 12 -10 15 -19c9 -30 26 -46 51 -46c10 0 21 3 34 8c51 22 94 52 116 104c11 25 17 49 17 71c0 47 -24 89 -69 125c-24 18 -49 33 -78 40c-4 1 -7 2 -10 2c-6 0 -12 -3 -17 -9c-14 -17 -29 -33 -34 -54 c-2 -11 -8 -17 -19 -19c-15 -2 -30 -5 -45 -5c-19 0 -38 4 -56 18c-10 3 -13 7 -13 19c0 18 2 37 4 57c3 27 4 54 4 81c0 30 -1 60 -3 90c-1 13 -2 26 -6 38c-2 0 -5 1 -6 2c-3 3 -5 5 -5 8c0 2 2 4 6 5c0 5 5 7 10 8c8 1 15 4 22 6c14 8 26 17 41 22c10 3 19 6 29 6 c7 0 14 -1 22 -4c38 -12 77 -21 116 -31c4 -1 7 -2 11 -2c7 0 15 3 23 8c36 21 57 55 61 94c1 11 2 23 2 34c0 68 -23 128 -82 174c-22 17 -48 21 -74 24h-2c-9 0 -17 -5 -23 -12c-16 -20 -25 -41 -25 -65c0 -7 0 -15 2 -22c1 -4 1 -8 1 -11c0 -21 -12 -35 -34 -42 c-23 -7 -47 -9 -70 -13c-17 -2 -27 6 -29 21c-1 13 -2 24 -2 35c0 56 19 89 80 115l114 48c22 9 43 13 63 13c51 0 96 -25 137 -61c50 -44 85 -100 94 -167c2 -11 2 -22 2 -33c0 -65 -30 -113 -98 -153c-47 -28 -116 -44 -183 -40c-13 -3 -26 -4 -39 -4c-15 0 -30 1 -46 4 c1 -14 2 -28 2 -42c0 -10 -1 -20 -1 -30c1 -7 1 -15 1 -22c0 -17 -2 -34 -3 -51c25 12 51 21 80 25c25 3 49 9 74 9c6 0 11 0 16 -1c88 -9 165 -102 172 -189c1 -14 2 -28 2 -42c0 -80 -23 -151 -96 -201c-61 -41 -130 -63 -202 -59c1 -7 1 -13 1 -20c0 -27 -7 -53 -17 -80 c-3 -7 -4 -14 -4 -20c0 -7 3 -15 11 -23c20 -20 27 -45 27 -71c0 -10 -1 -21 -3 -31c-7 -46 -25 -87 -63 -119c-18 -15 -38 -23 -58 -23zM325 -654c13 0 26 6 34 22c9 16 13 34 16 52v4c0 11 -7 19 -20 19c-33 0 -66 -18 -69 -61c0 -13 8 -30 25 -34c5 -1 10 -2 14 -2z M324 -861c32 5 56 27 69 58c3 7 4 13 4 20c0 18 -10 37 -22 53c-6 8 -13 11 -21 11c-4 0 -8 -1 -13 -3c-29 -11 -53 -29 -76 -49c-18 -15 -25 -28 -25 -39c0 -17 16 -30 41 -42c12 -6 26 -8 43 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E062-fClef.xml b/data/Petaluma/E062-fClef.xml
deleted file mode 100644
index c0c5c269ef7..00000000000
--- a/data/Petaluma/E062-fClef.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 -490c-27 -4 -53 -6 -79 -6c-44 0 -86 5 -130 14c-35 7 -46 32 -58 58c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21c40 -12 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-14 63 -39 120 -84 164 c-35 35 -79 49 -127 49c-7 0 -14 0 -22 -1c-32 -2 -48 -21 -48 -48c0 -6 1 -12 2 -18c4 -16 6 -32 6 -48c0 -45 -18 -85 -58 -117c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c14 47 46 80 79 113 c75 75 168 113 273 122c8 1 17 1 25 1c113 0 198 -65 214 -193c3 -22 5 -45 5 -60c-1 -90 -10 -170 -50 -244c-61 -112 -147 -190 -279 -209zM707 64l-7 -1c-15 0 -20 12 -17 23c9 32 4 67 23 96c5 8 8 24 20 18c16 -8 39 6 47 -25c2 -8 3 -16 3 -23c0 -27 -13 -48 -26 -70 c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 21 25 15c14 -5 31 0 31 -30c0 -43 -32 -91 -68 -92z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E063-fClef15mb.xml b/data/Petaluma/E063-fClef15mb.xml
deleted file mode 100644
index 89d6e3c0b20..00000000000
--- a/data/Petaluma/E063-fClef15mb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M242 -842c-5 0 -6 6 -7 10c-3 20 -5 39 -4 59c4 74 2 149 11 222c0 3 0 5 -1 10c-14 -12 -24 -24 -39 -29c-3 -1 -6 -2 -9 -2c-5 0 -8 3 -9 12c-2 9 -3 16 -3 20c0 10 6 13 24 21c12 5 20 15 28 24c-10 -1 -21 -1 -31 -1c-44 0 -88 5 -132 14c-35 7 -45 32 -58 58 c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21c40 -13 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-18 62 -39 119 -84 164c-35 35 -79 49 -127 49c-7 0 -14 0 -22 -1c-32 -4 -48 -21 -48 -48c0 -6 1 -12 2 -18 c3 -16 6 -32 6 -48c0 -45 -19 -84 -58 -117c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c13 47 46 80 79 113c75 75 168 109 273 122c8 1 17 1 25 1c113 0 197 -65 214 -193c3 -22 5 -45 5 -60 c0 -90 -10 -170 -50 -244c-61 -112 -147 -190 -279 -209l-10 -1v-3c-1 -18 -2 -37 -4 -55c-6 -55 -8 -110 -8 -166c0 -36 -3 -71 -3 -107c0 -4 -1 -8 -2 -11c-2 -4 -5 -9 -10 -9zM707 64l-7 -1c-15 0 -20 12 -17 23c9 32 5 67 23 96c5 8 8 24 20 18c16 -8 39 6 47 -25 c2 -8 3 -16 3 -23c0 -27 -14 -47 -26 -70c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 20 25 15c14 -5 31 0 31 -30c0 -43 -32 -91 -68 -92zM341 -856c-42 0 -47 29 -52 55c-2 13 0 27 -1 41c0 6 4 12 10 12h1c6 0 7 -7 8 -12 c1 -3 1 -6 1 -10c0 -24 11 -37 27 -37c8 0 17 3 26 8c26 14 39 39 46 66c3 11 7 23 7 35c0 5 0 10 -2 15c-10 25 -28 39 -48 39c-12 0 -23 -4 -35 -12c-6 -4 -11 -7 -14 -7c-4 0 -6 6 -8 18c-1 7 -1 13 -1 20c0 31 7 61 15 92c1 4 1 7 2 10c5 9 1 21 9 28c3 3 5 4 8 4 c7 0 13 -7 20 -7c21 -1 38 7 54 17c5 3 9 5 12 5c6 0 9 -7 9 -24c0 -28 -24 -41 -61 -47c-33 -5 -33 -3 -41 -36c-2 -6 -4 -12 -1 -18c11 3 21 5 31 5c38 0 63 -27 68 -74c1 -10 2 -20 2 -30c0 -28 -6 -55 -14 -82c-7 -23 -21 -41 -38 -57c-12 -12 -25 -17 -40 -17z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E064-fClef8vb.xml b/data/Petaluma/E064-fClef8vb.xml
deleted file mode 100644
index cab325b0da2..00000000000
--- a/data/Petaluma/E064-fClef8vb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M274 -814c-9 0 -19 2 -29 6c-28 13 -39 36 -41 66c-1 5 0 10 0 17c-3 26 8 48 27 67c5 5 8 9 6 18c-4 15 -7 29 -7 43c0 39 16 74 46 104l3 3c-27 -4 -53 -6 -79 -6c-44 0 -86 5 -130 14c-35 7 -45 32 -58 58c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21 c40 -13 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-14 63 -39 119 -84 164c-35 35 -79 49 -127 49c-7 0 -14 0 -22 -1c-32 -2 -48 -21 -48 -48c0 -6 1 -12 2 -18c4 -16 6 -32 6 -48c0 -45 -19 -84 -58 -117 c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c13 47 46 80 79 113c75 75 168 113 273 122c8 1 17 1 25 1c113 0 197 -65 214 -193c3 -22 5 -45 5 -60c0 -90 -10 -170 -50 -244c-49 -90 -115 -159 -208 -192 c3 -5 5 -11 7 -16c3 -11 5 -21 5 -31c0 -22 -7 -44 -14 -64c-2 -6 -4 -12 -4 -17c0 -6 2 -11 9 -18c16 -16 21 -36 21 -56c0 -9 -1 -17 -2 -25c-6 -37 -20 -69 -50 -95c-15 -13 -31 -19 -48 -19zM707 64l-7 -1c-15 0 -20 12 -17 23c9 32 5 67 23 96c5 8 8 24 20 18 c16 -8 39 6 47 -25c2 -8 3 -16 3 -23c0 -27 -13 -48 -26 -70c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 21 25 15c14 -5 31 0 31 -30c0 -43 -32 -92 -68 -92zM292 -601c10 0 20 5 27 18s11 27 13 41v4c0 8 -5 15 -14 15 c-27 1 -55 -14 -57 -49c0 -10 6 -24 20 -27c4 -1 7 -2 11 -2zM291 -766c26 4 45 21 55 46c2 6 3 11 3 17c0 14 -7 29 -17 41c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2c-23 -9 -43 -23 -61 -39c-14 -12 -20 -22 -20 -31c0 -14 13 -24 33 -34c9 -5 20 -6 34 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E065-fClef8va.xml b/data/Petaluma/E065-fClef8va.xml
deleted file mode 100644
index 9095568b9da..00000000000
--- a/data/Petaluma/E065-fClef8va.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M200 -496c-44 0 -86 5 -130 14c-35 7 -45 32 -58 58c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21c40 -13 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-14 63 -39 119 -84 164c-35 35 -79 49 -127 49 c-7 0 -14 0 -22 -1c-32 -2 -48 -21 -48 -48c0 -6 1 -12 2 -18c4 -16 6 -32 6 -48c0 -45 -19 -84 -58 -117c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c13 47 46 80 79 113c57 57 124 92 199 110c-6 1 -11 3 -17 5 c-28 13 -39 36 -41 66c-1 5 0 10 0 17c-3 26 8 48 27 67c5 5 8 9 6 18c-4 15 -7 29 -7 43c0 39 16 74 46 104c4 4 8 8 10 13c8 20 25 22 43 21s24 -16 28 -30c3 -11 5 -21 5 -31c0 -22 -7 -44 -14 -64c-2 -6 -4 -12 -4 -17c0 -6 2 -11 9 -18c16 -16 21 -36 21 -56 c0 -9 -1 -17 -2 -25c-6 -37 -20 -70 -50 -95c-4 -4 -8 -6 -12 -9l26 3c8 1 17 1 25 1c113 0 197 -65 214 -193c3 -22 5 -45 5 -60c0 -90 -10 -170 -50 -244c-61 -112 -147 -189 -279 -209c-27 -4 -53 -6 -79 -6zM320 415c10 0 20 5 27 18s11 27 13 41v4c0 8 -5 15 -14 15 c-27 1 -55 -14 -57 -49c0 -10 6 -24 20 -27c4 -1 7 -2 11 -2zM319 250c26 4 45 21 55 46c2 6 3 11 3 17c0 14 -7 29 -17 41c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2c-23 -9 -43 -23 -61 -39c-14 -12 -20 -22 -20 -31c0 -14 13 -24 33 -34c9 -5 20 -6 34 -7zM707 64l-7 -1 c-15 0 -20 12 -17 23c9 32 5 67 23 96c5 8 8 24 20 18c16 -8 39 6 47 -25c2 -8 3 -16 3 -23c0 -27 -13 -48 -26 -70c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 21 25 15c14 -5 31 0 31 -30c0 -43 -32 -92 -68 -92z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E066-fClef15ma.xml b/data/Petaluma/E066-fClef15ma.xml
deleted file mode 100644
index 52e91e1790f..00000000000
--- a/data/Petaluma/E066-fClef15ma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M200 -496c-44 0 -86 5 -130 14c-35 7 -45 32 -58 58c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21c40 -13 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-14 63 -39 119 -84 164c-35 35 -79 49 -127 49 c-7 0 -14 0 -22 -1c-32 -2 -48 -21 -48 -48c0 -6 1 -12 2 -18c4 -16 6 -32 6 -48c0 -45 -19 -84 -58 -117c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c13 47 46 80 79 113c52 52 114 87 182 106c-2 2 -2 5 -3 7 c-3 20 -5 39 -4 59c4 74 2 149 11 222c0 3 0 5 -1 10c-14 -12 -24 -24 -39 -29c-3 -1 -6 -2 -9 -2c-5 0 -8 3 -9 12c-2 9 -3 16 -3 20c0 10 6 13 24 21c16 7 26 21 36 34c5 6 11 14 19 11c7 -3 9 -12 9 -20c-1 -18 -2 -37 -4 -55c-6 -55 -8 -110 -8 -166 c0 -36 -3 -71 -3 -107c0 -4 -1 -8 -2 -11l-2 -3c15 4 30 7 46 9c-3 8 -5 18 -7 26c-2 13 0 27 -1 41c0 6 4 12 10 12h1c6 0 7 -7 8 -12c1 -3 1 -6 1 -10c0 -24 11 -37 27 -37c8 0 17 3 26 8c26 14 39 39 46 66c3 11 7 23 7 35c0 5 0 10 -2 15c-9 25 -28 39 -48 39 c-12 0 -23 -4 -35 -12c-6 -4 -11 -7 -14 -7c-4 0 -6 6 -8 18c-1 7 -1 13 -1 20c0 31 7 61 15 92c1 4 1 7 2 10c5 9 1 21 9 28c3 3 5 4 8 4c7 0 13 -7 20 -7c21 -1 37 8 54 17c5 3 9 5 12 5c6 0 9 -7 9 -24c0 -28 -24 -41 -61 -47c-33 -5 -33 -3 -41 -36c-2 -6 -4 -12 -1 -18 c11 3 21 5 31 5c38 0 63 -27 68 -74c1 -10 2 -20 2 -30c0 -28 -6 -55 -14 -82c-5 -16 -14 -30 -25 -43c93 -14 159 -78 174 -190c3 -22 5 -45 5 -60c0 -90 -10 -170 -50 -244c-61 -112 -147 -189 -279 -209c-27 -4 -53 -6 -79 -6zM707 64l-7 -1c-15 0 -20 12 -17 23 c9 32 5 67 23 96c5 8 8 24 20 18c16 -8 39 6 47 -25c2 -8 3 -16 3 -23c0 -27 -13 -48 -26 -70c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 21 25 15c14 -5 31 0 31 -30c0 -43 -32 -92 -68 -92z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E069-unpitchedPercussionClef1.xml b/data/Petaluma/E069-unpitchedPercussionClef1.xml
deleted file mode 100644
index 9b675dee4da..00000000000
--- a/data/Petaluma/E069-unpitchedPercussionClef1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M334 -250c-35 0 -85 21 -96 46c-3 7 -5 14 -5 21c1 44 1 88 1 132v255c2 37 8 41 44 45c6 1 11 1 17 1c12 0 24 -1 35 -1c23 0 30 -13 33 -33c8 -53 7 -107 9 -161c3 -87 5 -173 7 -260c1 -21 -3 -35 -27 -43c-5 -2 -11 -2 -18 -2zM100 -237c-4 0 -8 0 -12 1 c-33 8 -71 7 -86 49c-2 5 -2 9 -2 13c0 11 4 21 4 32v66c0 53 0 106 1 159c1 47 6 94 7 141c1 15 8 24 21 24c17 -1 34 1 50 1c13 0 26 -1 38 -4c33 -7 37 -12 37 -46c1 -23 0 -46 0 -69c-13 -104 -11 -208 -12 -312c0 -9 5 -19 5 -27c0 -5 -2 -10 -7 -13 c-13 -8 -28 -15 -44 -15z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E06A-unpitchedPercussionClef2.xml b/data/Petaluma/E06A-unpitchedPercussionClef2.xml
deleted file mode 100644
index 9fdcdfd8712..00000000000
--- a/data/Petaluma/E06A-unpitchedPercussionClef2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M76 -447c-14 0 -28 1 -42 1c-20 2 -28 10 -29 30c-1 22 -4 44 -5 66c0 10 2 16 6 20v569c1 31 -1 63 0 94c0 3 -1 7 -1 9c-3 21 -5 34 -5 45c0 27 14 27 56 37c69 16 141 16 211 23h3c5 0 9 -2 11 -5c0 1 1 1 1 1c10 0 7 -14 10 -19c6 -14 7 -30 6 -45 c-1 -135 -3 -270 -5 -405c-2 -95 -4 -189 -4 -284v-44c0 -17 -1 -34 -16 -49c0 -3 -1 -5 -2 -8c-4 -11 -13 -19 -26 -21c-56 -8 -112 -15 -169 -15zM84 -326c58 0 113 6 168 15h8v138c0 47 0 93 -1 139c-3 116 -3 232 -4 348v18h-4c-62 -7 -125 -8 -187 -19 c-4 0 -8 -1 -12 -2c-4 0 -8 -2 -12 -4v-141c0 -72 0 -143 -2 -214c-2 -92 -3 -183 -4 -275c18 0 35 -2 50 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E073-gClefReversed.xml b/data/Petaluma/E073-gClefReversed.xml
deleted file mode 100644
index b042b8f37c6..00000000000
--- a/data/Petaluma/E073-gClefReversed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E073" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M426 -559c-5 0 -10 1 -16 3c-12 4 -22 10 -30 19c-83 87 -117 192 -120 309c0 9 -1 24 -1 24s-14 8 -20 10c-33 16 -65 34 -94 57c-76 61 -120 144 -140 236c-4 15 -5 30 -5 44c0 63 35 109 115 124c20 4 40 6 60 6c50 0 98 -13 143 -40c6 -3 12 -7 12 -7l26 97 c1 5 1 14 1 14s-102 181 -116 274c-5 27 -7 54 -7 81c0 21 1 41 4 61c10 72 37 140 55 210c5 21 12 46 36 46c18 0 31 -17 42 -32c51 -71 76 -152 81 -239c1 -14 1 -28 1 -42c0 -81 -13 -162 -24 -242c0 -6 -2 -12 -3 -17c45 -64 95 -124 138 -190c30 -47 63 -94 84 -147 c11 -26 16 -56 16 -86c0 -62 -21 -125 -57 -160c-21 -20 -54 -42 -87 -54c-46 -17 -92 -28 -141 -28c-14 0 -29 1 -44 3l-12 2s-1 -9 0 -14c11 -60 26 -119 62 -169c19 -26 37 -55 75 -58c11 -1 16 -8 16 -17c0 -4 -1 -7 -2 -11c-6 -15 -13 -31 -20 -46 c-6 -14 -16 -21 -28 -21zM386 498c8 48 13 95 13 142c0 87 -18 172 -69 253c-12 -37 -18 -74 -18 -112c0 -19 2 -39 5 -59c13 -78 31 -154 69 -224zM489 -94c14 1 26 6 39 10c26 9 48 19 55 36c3 8 4 17 4 26c0 11 -2 23 -4 35c-1 6 -7 23 -9 26c-39 69 -86 132 -135 195 l-42 55l-7 -22c-8 -25 -15 -65 -15 -65s28 -36 46 -54c50 -49 74 -110 74 -177c0 -17 -2 -34 -5 -52c-1 -4 -1 -7 -1 -13zM251 -84l18 -7l4 28c8 65 23 117 37 180c0 3 1 5 1 7c0 4 -1 6 -3 9c-26 5 -51 7 -77 7c-25 0 -49 -2 -74 -7c-30 -6 -60 -11 -83 -35 c-2 -2 -4 -4 -6 -5c40 -80 99 -140 183 -177zM379 -111c35 0 69 9 69 9s3 14 3 34c0 13 -1 29 -5 45c-10 48 -44 82 -80 114c-3 3 -6 5 -8 5c-4 0 -5 -4 -6 -11c-9 -59 -24 -117 -28 -176c-1 -6 0 -15 0 -15s26 -7 55 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E074-gClefTurned.xml b/data/Petaluma/E074-gClefTurned.xml
deleted file mode 100644
index 1baccba0e96..00000000000
--- a/data/Petaluma/E074-gClefTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E074" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M329 -560c-24 0 -31 25 -36 46c-18 70 -45 138 -55 210c-3 20 -4 40 -4 61c0 27 2 54 7 81c14 93 116 274 116 274s0 9 -1 14l-26 97s-6 -4 -12 -7c-45 -27 -93 -40 -143 -40c-20 0 -40 2 -60 6c-80 15 -115 61 -115 124c0 14 1 29 5 44c20 92 64 175 140 236 c29 23 61 41 94 57c6 2 20 10 20 10s1 15 1 24c3 117 37 222 120 309c8 9 18 15 30 19c6 2 11 3 16 3c12 0 22 -7 28 -21c7 -15 14 -31 20 -46c1 -4 2 -7 2 -11c0 -9 -5 -16 -16 -17c-38 -3 -56 -32 -75 -58c-36 -50 -51 -109 -62 -169c-1 -5 0 -14 0 -14l12 2 c15 2 30 3 44 3c49 0 95 -11 141 -28c33 -12 66 -34 87 -54c36 -35 57 -98 57 -160c0 -30 -5 -60 -16 -86c-21 -53 -54 -100 -84 -147c-43 -66 -93 -126 -138 -190c1 -5 3 -11 3 -17c11 -80 24 -161 24 -242c0 -14 0 -28 -1 -42c-5 -87 -30 -168 -81 -239 c-11 -15 -24 -32 -42 -32zM358 353c2 0 5 2 8 5c36 32 70 66 80 114c4 16 5 32 5 45c0 20 -3 34 -3 34s-34 9 -69 9c-29 2 -55 -5 -55 -5s-1 -9 0 -15c4 -59 19 -117 28 -176c1 -7 2 -11 6 -11zM390 182l7 -22l42 55c49 63 96 126 135 195c2 3 8 20 9 26c2 12 4 24 4 35 c0 9 -1 18 -4 26c-7 17 -29 27 -55 36c-13 4 -25 9 -39 10c0 -6 0 -9 1 -13c3 -18 5 -35 5 -52c0 -67 -24 -128 -74 -177c-18 -18 -46 -54 -46 -54s7 -40 15 -65zM231 309c26 0 51 2 77 7c3 4 3 9 2 16c-14 63 -29 115 -37 180l-4 28l-18 -7c-84 -37 -143 -97 -183 -177 c2 -1 4 -3 6 -5c23 -24 53 -29 83 -35c25 -5 49 -7 74 -7zM330 -444c51 81 69 166 69 253c0 47 -5 94 -13 142c-38 -70 -56 -146 -69 -224c-3 -20 -5 -40 -5 -59c0 -38 6 -75 18 -112z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E075-cClefReversed.xml b/data/Petaluma/E075-cClefReversed.xml
deleted file mode 100644
index 76379820359..00000000000
--- a/data/Petaluma/E075-cClefReversed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E075" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M640 -543c-5 0 -6 6 -7 19c-1 61 -3 123 -4 184c-2 161 -4 323 -9 484c-3 95 1 190 -6 285c-3 50 25 79 61 104c10 7 18 10 25 10c13 0 22 -10 29 -29c1 -3 2 -7 2 -11l-1 -10c-2 -26 -2 -53 -2 -79v-149c0 -65 0 -129 -3 -194c-3 -93 -1 -186 -6 -280v-258 c0 -20 -7 -33 -23 -44c-13 -9 -28 -16 -41 -25c-7 -4 -12 -7 -15 -7zM304 -535c-66 0 -129 22 -185 60c-73 50 -96 121 -96 201c0 14 1 28 2 42c7 87 84 180 172 189c5 1 10 1 16 1c25 0 49 -6 74 -9c29 -4 55 -13 80 -25c-1 17 -3 34 -3 51c0 7 0 15 1 22c0 10 -1 20 -1 30 c0 14 1 28 2 42c-16 -3 -31 -4 -46 -4c-13 0 -26 1 -39 4c-67 -4 -136 12 -183 40c-68 40 -98 88 -98 153c0 11 0 22 2 33c9 67 44 123 94 167c41 36 86 61 137 61c20 0 41 -4 63 -13l114 -48c61 -26 80 -59 80 -115c0 -11 -1 -22 -2 -35c-2 -15 -12 -23 -29 -21 c-23 4 -47 6 -70 13c-22 7 -34 21 -34 42c0 3 0 7 1 11c2 7 2 15 2 22c0 24 -9 45 -25 65c-6 7 -14 12 -23 12h-2c-26 -3 -52 -7 -74 -24c-59 -46 -82 -106 -82 -174c0 -11 1 -23 2 -34c4 -39 25 -73 61 -94c8 -5 16 -8 23 -8c4 0 7 1 11 2c39 10 78 19 116 31 c8 3 15 4 22 4c10 0 19 -3 29 -6c15 -5 27 -14 41 -22c7 -2 14 -5 22 -6c5 -1 10 -3 10 -8c4 -1 6 -3 6 -5c0 -3 -2 -5 -5 -8c-1 -1 -4 -2 -6 -2c-4 -12 -5 -25 -6 -38c-2 -30 -3 -60 -3 -90c0 -27 1 -54 4 -81c2 -20 4 -39 4 -57c0 -12 -3 -16 -13 -19 c-18 -14 -37 -18 -56 -18c-15 0 -30 3 -45 5c-11 2 -17 8 -19 19c-5 21 -20 37 -34 54c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2c-29 -7 -54 -22 -78 -40c-45 -36 -69 -78 -69 -125c0 -22 6 -46 17 -71c22 -52 65 -82 116 -104c13 -5 24 -8 34 -8c25 0 42 16 51 46 c3 9 8 19 15 19c2 0 3 0 4 -1c7 -3 13 -4 20 -4c17 0 35 8 51 8c4 0 7 0 11 -1h18c10 0 21 2 29 -2v837c-1 7 -1 15 -1 22c0 13 1 25 5 37c1 5 -1 14 8 14h1c6 -1 12 -5 15 -14c3 -11 4 -23 4 -35v-197c0 -65 0 -131 -1 -196c-1 -62 0 -125 -2 -187c-2 -53 -3 -106 -3 -159 s1 -107 1 -160c0 -21 -5 -42 -5 -64c0 -4 -1 -10 -7 -10c-5 0 -7 4 -9 8c-7 13 -6 26 -6 40v24l-5 -8l-8 -9c-32 -35 -73 -58 -118 -70c-25 -6 -49 -9 -73 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E076-fClefReversed.xml b/data/Petaluma/E076-fClefReversed.xml
deleted file mode 100644
index 5157d92bf82..00000000000
--- a/data/Petaluma/E076-fClefReversed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E076" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M576 -463c-26 0 -52 2 -79 6c-132 19 -218 97 -279 209c-40 74 -49 154 -50 244c0 15 2 38 5 60c16 128 101 193 214 193c8 0 17 0 25 -1c105 -9 198 -47 273 -122c33 -33 65 -66 79 -113c4 -15 6 -29 6 -42c0 -45 -24 -81 -72 -103c-3 -1 -5 -3 -8 -4 c-15 -8 -29 -12 -43 -12c-20 0 -39 8 -57 23c-40 32 -58 72 -58 117c0 16 2 32 6 48c1 6 2 12 2 18c0 27 -16 46 -48 48c-8 1 -15 1 -22 1c-48 0 -92 -14 -127 -49c-45 -44 -70 -101 -84 -164c-2 -7 -2 -15 -2 -21c0 -23 8 -43 21 -64c20 -33 44 -61 76 -85 c62 -47 134 -67 209 -67h65c41 0 81 2 121 14c2 1 5 1 7 1c11 0 20 -10 20 -22c0 -3 0 -6 -1 -9c-3 -11 -6 -22 -11 -32c-12 -26 -23 -51 -58 -58c-44 -9 -86 -14 -130 -14zM69 97c-16 -1 -35 3 -43 18c-13 22 -26 43 -26 70c0 7 1 15 3 23c8 31 31 17 47 25c2 1 3 1 5 1 c8 0 11 -12 15 -19c19 -29 14 -64 23 -96c0 -2 1 -4 1 -5c0 -11 -8 -20 -25 -17zM101 -162c-36 1 -68 49 -68 92c0 30 17 25 31 30c3 1 5 2 7 2c10 0 13 -10 18 -17c18 -26 18 -57 28 -85c1 -3 1 -5 1 -8c0 -8 -5 -15 -17 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E077-fClefTurned.xml b/data/Petaluma/E077-fClefTurned.xml
deleted file mode 100644
index dde5bcee56b..00000000000
--- a/data/Petaluma/E077-fClefTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E077" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M412 -462c-8 -1 -17 -1 -25 -1c-113 0 -198 65 -214 193c-3 22 -5 45 -5 60c1 90 10 170 50 244c61 112 147 190 279 209c27 4 53 6 79 6c44 0 86 -5 130 -14c35 -7 46 -32 58 -58c5 -10 8 -21 11 -32c1 -3 1 -6 1 -9c0 -14 -12 -26 -27 -21c-40 12 -80 14 -121 14h-65 c-75 0 -147 -20 -209 -67c-32 -24 -56 -52 -76 -85c-13 -21 -21 -41 -21 -64c0 -6 0 -14 2 -21c14 -63 39 -120 84 -164c35 -35 79 -49 127 -49c7 0 14 0 22 1c32 2 48 21 48 48c0 6 -1 12 -2 18c-4 16 -6 32 -6 48c0 45 18 85 58 117c18 15 37 23 57 23c14 0 28 -4 43 -12 c3 -1 5 -3 8 -4c48 -22 72 -58 72 -103c0 -13 -2 -27 -6 -42c-14 -47 -46 -80 -79 -113c-75 -75 -168 -113 -273 -122zM64 -174c-14 5 -31 0 -31 30c0 43 32 91 68 92h2c14 0 18 -11 14 -22c-10 -28 -10 -59 -28 -85c-6 -9 -10 -21 -25 -15zM50 -447c-16 8 -39 -6 -47 25 c-2 8 -3 16 -3 23c0 27 13 48 26 70c8 15 27 19 43 18l7 1c15 0 20 -12 17 -23c-9 -32 -4 -67 -23 -96c-5 -8 -8 -24 -20 -18z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E080-timeSig0.xml b/data/Petaluma/E080-timeSig0.xml
deleted file mode 100644
index 2d6b61b2346..00000000000
--- a/data/Petaluma/E080-timeSig0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M237 -358c-35 -2 -63 15 -86 40c-90 101 -131 209 -131 324c0 69 15 141 43 214c25 66 70 111 138 132c11 4 22 3 33 5c15 2 30 2 44 2c95 0 154 -47 194 -147c28 -68 41 -152 41 -236c0 -13 0 -27 -1 -40c-2 -55 -15 -114 -43 -171c-37 -76 -99 -108 -177 -119 c-18 -3 -37 -4 -55 -4zM286 -314c13 0 26 7 39 21c28 31 47 66 61 105c20 54 21 110 21 168c0 80 -18 174 -48 245c-14 33 -32 62 -62 83c-5 4 -10 6 -15 6c-4 0 -8 -1 -13 -3c-40 -14 -64 -45 -83 -79c-39 -69 -52 -144 -56 -222c-6 -120 38 -219 119 -305 c12 -13 24 -19 37 -19z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E081-timeSig1.xml b/data/Petaluma/E081-timeSig1.xml
deleted file mode 100644
index e7c707535c8..00000000000
--- a/data/Petaluma/E081-timeSig1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M183 -364c-22 0 -32 6 -31 24c10 127 7 254 17 381c4 63 6 127 6 191c0 13 -3 19 -10 19c-3 -1 -7 -1 -11 -3c-13 -4 -27 -6 -40 -6c-24 0 -48 5 -73 10c-7 1 -16 2 -19 12c-1 4 -2 8 -2 11c0 5 3 8 14 9c54 3 99 25 133 69c3 3 6 6 9 8c7 4 16 5 24 5 c35 0 74 -25 78 -57c3 -34 5 -67 5 -100c0 -13 0 -25 -1 -38l-18 -475c0 -12 -3 -24 -4 -36c0 -8 -4 -13 -12 -14c-22 -4 -42 -10 -65 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E082-timeSig2.xml b/data/Petaluma/E082-timeSig2.xml
deleted file mode 100644
index b8e73c8e02f..00000000000
--- a/data/Petaluma/E082-timeSig2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M69 -377c-6 4 -7 12 -8 20c0 8 0 16 -1 23c-1 8 -2 16 -2 24c0 22 6 42 19 63c39 63 83 122 134 175c47 48 94 95 137 146c30 36 52 77 69 119c2 5 4 10 4 14c0 13 -11 22 -22 30c-30 22 -66 33 -104 33c-45 0 -92 -15 -130 -48s-72 -70 -105 -109c-3 -3 -5 -7 -9 -11 c-6 -6 -13 -15 -21 -15s-10 5 -10 10s3 12 2 17c-2 8 -2 16 -2 23c0 44 25 77 57 109c40 40 76 84 129 107c39 17 78 29 119 29c20 0 40 -3 61 -10c57 -19 84 -52 84 -116c0 -6 0 -13 -1 -20c-8 -111 -56 -206 -129 -287c-36 -40 -72 -79 -110 -117c-5 -5 -9 -10 -18 -21 c16 4 31 6 46 6c34 0 65 -10 96 -22c37 -16 76 -27 115 -27c23 0 46 4 69 12s42 19 60 37c11 11 23 20 35 30c6 5 14 11 21 7c6 -3 6 -14 6 -22c5 -64 -31 -106 -81 -138c-42 -27 -85 -39 -129 -39c-37 0 -75 10 -113 24c-22 8 -43 17 -65 22c-12 3 -25 4 -37 4 c-20 0 -39 -4 -58 -16c-29 -19 -60 -37 -87 -59c-6 -5 -13 -12 -21 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E083-timeSig3.xml b/data/Petaluma/E083-timeSig3.xml
deleted file mode 100644
index 80cbcd2ad50..00000000000
--- a/data/Petaluma/E083-timeSig3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 -375c-29 10 -54 25 -80 40c-16 10 -28 24 -32 41c-7 32 -15 61 -13 94c0 15 8 23 19 26c2 1 3 1 5 1c10 0 11 -13 12 -18c7 -24 24 -33 44 -45c47 -25 96 -41 146 -41c28 0 57 5 86 16c58 22 91 68 109 126c1 4 2 7 2 11c0 22 -21 37 -37 49c-24 20 -52 30 -81 30 c-11 0 -23 -2 -35 -5c-33 -8 -67 -16 -93 -42c-5 -5 -12 -9 -19 -6c-9 4 -9 13 -8 21v2c-3 11 -4 21 -4 30c0 53 37 85 75 120c63 58 117 123 172 197h-272c-36 0 -72 -2 -107 -5h-3c-14 0 -17 6 -16 19c2 21 1 42 5 62c3 21 13 29 33 31c60 6 121 6 182 6h39 c55 0 111 -2 166 -2c22 0 44 1 66 7c4 1 7 2 10 2c8 0 13 -5 16 -17c2 -9 3 -18 3 -26c0 -21 -6 -41 -19 -59c-51 -71 -100 -142 -158 -211c16 -4 31 -8 46 -13c56 -23 88 -67 94 -123c2 -18 3 -37 3 -55c0 -79 -22 -154 -86 -211c-52 -45 -111 -69 -174 -69 c-31 0 -63 6 -96 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E084-timeSig4.xml b/data/Petaluma/E084-timeSig4.xml
deleted file mode 100644
index 1eefc78826a..00000000000
--- a/data/Petaluma/E084-timeSig4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M422 -489c-8 3 -7 15 -7 24c-1 10 -1 20 -1 31c0 46 5 90 7 134c4 57 5 114 7 171c-7 -2 -14 -2 -21 -2c-7 1 -14 1 -21 2c-62 4 -124 14 -186 14c-47 0 -92 -10 -136 -29c-7 -4 -13 -6 -17 -6c-8 1 -11 6 -12 21c0 9 -5 18 -9 27s-6 18 -6 27c0 25 15 46 31 66 c50 63 84 135 125 204c29 49 62 96 91 145c23 40 48 79 62 124c2 6 6 11 9 17c5 8 15 11 23 10c8 0 8 -11 9 -17c1 -7 2 -14 2 -21c0 -24 -7 -47 -16 -70c-37 -97 -94 -183 -147 -270c-23 -38 -41 -77 -63 -119c22 3 44 4 66 4c62 1 122 -9 183 -13c11 -1 23 -1 35 0 c0 65 -2 131 -3 197c-1 18 4 36 5 54c1 15 10 23 22 23c13 0 12 -16 13 -24c3 -37 4 -75 6 -112c2 -44 4 -88 4 -132c36 7 71 19 105 34l7 3c11 6 20 9 26 9c13 -1 18 -12 18 -37c1 -53 -7 -65 -56 -88c-33 -15 -66 -27 -101 -34v-10c-4 -95 -2 -191 -13 -286 c-3 -20 -5 -40 -18 -57c-5 -8 -13 -17 -23 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E085-timeSig5.xml b/data/Petaluma/E085-timeSig5.xml
deleted file mode 100644
index eae788bf7c2..00000000000
--- a/data/Petaluma/E085-timeSig5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M92 -372c-17 8 -35 15 -53 21c-14 4 -21 16 -19 26c8 34 0 70 18 102c7 13 13 17 28 15c41 -5 77 -23 115 -36c20 -8 40 -11 60 -11c50 0 95 23 125 64c14 21 33 40 33 66c0 7 -1 13 -4 20c-15 43 -47 69 -86 87c-40 18 -83 23 -126 28c-19 3 -27 5 -27 14c0 4 2 11 6 20 c7 18 11 36 9 56c0 5 -1 10 -1 14c0 33 12 63 25 94c16 36 29 73 50 107c9 14 17 20 30 21c20 2 39 0 48 0c73 0 139 15 203 41c1 1 3 2 4 2c15 7 26 10 34 10c15 0 19 -14 19 -49c0 -40 -13 -68 -57 -82c-66 -20 -131 -41 -200 -41c-19 0 -27 -4 -29 -20 c-1 -20 -8 -39 -16 -57c-2 -4 -3 -8 -3 -10c0 -7 5 -9 15 -10c28 -4 55 -13 82 -24c71 -31 107 -88 107 -155c0 -22 -4 -45 -12 -68c-24 -74 -62 -140 -118 -194c-37 -36 -108 -68 -179 -68c-28 1 -56 5 -81 17z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E086-timeSig6.xml b/data/Petaluma/E086-timeSig6.xml
deleted file mode 100644
index 552509631ce..00000000000
--- a/data/Petaluma/E086-timeSig6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M271 -360c-10 -2 -20 -3 -30 -3c-29 0 -57 6 -84 18c-66 30 -100 85 -120 152c-12 37 -17 73 -17 109c0 72 22 141 60 207c34 60 71 116 126 157c58 43 122 73 194 82c4 1 8 1 12 1c26 -1 49 -13 63 -35c9 -15 13 -30 13 -47c0 -16 -4 -32 -11 -48c-4 -7 -9 -11 -15 -11 c-3 0 -8 1 -12 5c-16 13 -33 18 -51 18c-15 0 -31 -4 -46 -9c-112 -33 -189 -105 -237 -210c-15 -34 -30 -67 -42 -102c-4 -12 -6 -24 -6 -35c0 -16 4 -32 12 -47c19 -35 46 -60 82 -74c30 136 110 226 241 265c18 5 34 8 50 8c68 -1 112 -52 112 -134 c0 -102 -42 -178 -134 -225c-50 -25 -105 -34 -160 -42zM244 -248h5c48 2 96 11 142 25c49 15 88 44 116 87c5 8 7 14 7 20c0 10 -6 17 -16 24c-21 14 -43 20 -66 20c-18 1 -36 -3 -55 -11c-66 -27 -118 -71 -151 -136c-4 -8 -15 -17 -9 -25c5 -8 17 -3 27 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E087-timeSig7.xml b/data/Petaluma/E087-timeSig7.xml
deleted file mode 100644
index 7b9c32d9a78..00000000000
--- a/data/Petaluma/E087-timeSig7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M176 -345c-23 0 -34 7 -34 24c0 4 1 9 2 14c11 45 24 90 40 134c51 141 129 268 222 386c2 2 3 5 6 12c-44 -11 -87 -16 -130 -16c-26 0 -52 2 -77 6c-67 10 -126 35 -170 88c-8 10 -20 23 -12 33c4 6 13 9 23 9c5 0 10 -1 15 -2c30 -6 56 -17 78 -41 c34 -37 80 -52 127 -52c53 0 104 13 153 35c17 7 34 14 49 24c19 14 40 20 61 20c12 0 25 -2 37 -5c17 -4 26 -11 26 -21c0 -6 -4 -14 -12 -23c-93 -109 -177 -223 -242 -352c-37 -74 -67 -152 -84 -234c-4 -19 -12 -29 -33 -31c-15 -1 -29 -8 -45 -8z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E088-timeSig8.xml b/data/Petaluma/E088-timeSig8.xml
deleted file mode 100644
index 24b53c80f83..00000000000
--- a/data/Petaluma/E088-timeSig8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M184 -428c-81 0 -161 64 -161 157c0 11 1 22 3 33c9 44 18 87 38 128c15 31 34 59 67 77c-20 14 -43 22 -59 39c-40 44 -52 100 -52 156c0 105 50 189 142 242c29 17 58 24 85 24c77 0 141 -59 160 -141c5 -26 8 -52 8 -78c0 -36 -5 -73 -15 -109c-1 -4 -3 -8 -3 -12 c1 -5 3 -9 9 -13c71 -46 98 -108 98 -178c1 -27 -3 -56 -11 -85c-37 -149 -151 -223 -292 -239c-6 -1 -11 -1 -17 -1zM179 73c43 0 78 8 112 12c16 2 25 9 34 20c27 34 36 76 43 117v5v3c0 8 -5 16 -10 23c-30 40 -72 60 -115 60c-37 0 -75 -15 -106 -46 c-32 -33 -54 -72 -68 -116c-2 -6 -2 -11 -2 -15c0 -13 6 -23 19 -33c30 -22 63 -30 93 -30zM228 -304c61 4 119 25 167 67c18 16 29 37 29 63c0 36 -14 65 -34 92c-23 32 -49 48 -79 48c-17 0 -36 -5 -56 -16c-33 -18 -65 -37 -95 -59c-20 -15 -38 -32 -45 -57 c-3 -9 -5 -17 -5 -26c1 -57 52 -111 118 -112z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E089-timeSig9.xml b/data/Petaluma/E089-timeSig9.xml
deleted file mode 100644
index e693b775490..00000000000
--- a/data/Petaluma/E089-timeSig9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 -421c-63 0 -115 45 -129 110c-6 30 -14 60 -14 91c1 18 9 32 16 48c3 6 9 10 15 10c8 0 9 -9 11 -15c3 -11 4 -23 4 -35c2 -62 37 -99 90 -99c10 0 21 1 32 4c58 14 98 54 136 97c66 74 92 166 114 259c6 24 10 49 15 73c-21 -36 -46 -68 -75 -97 c-42 -42 -95 -62 -146 -62c-67 0 -132 35 -165 105c-19 40 -28 82 -28 121c0 117 80 218 205 231c9 1 17 1 26 1c98 0 187 -62 216 -181c6 -26 8 -52 8 -78c0 -25 -2 -49 -4 -74c-8 -85 -29 -167 -60 -247c-37 -95 -92 -176 -179 -233c-30 -20 -60 -29 -88 -29zM236 72 c95 0 151 56 187 123c3 6 5 12 5 17c0 11 -6 21 -15 30c-16 16 -34 30 -54 41c-35 20 -71 29 -105 29c-67 0 -126 -37 -159 -106c-5 -9 -7 -18 -7 -27c0 -12 4 -23 12 -34c35 -47 83 -70 136 -73z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08A-timeSigCommon.xml b/data/Petaluma/E08A-timeSigCommon.xml
deleted file mode 100644
index 5fbbd8bf61d..00000000000
--- a/data/Petaluma/E08A-timeSigCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M308 -281c-32 -11 -64 -17 -95 -17c-46 0 -90 13 -133 45c-44 34 -51 82 -59 131c-1 4 -1 8 -1 12c0 133 52 242 148 331c52 48 115 67 182 73c52 4 77 -16 92 -66c6 -17 9 -35 9 -53c0 -21 -4 -41 -13 -61c-31 -73 -73 -133 -152 -161c-7 -3 -14 -4 -20 -4 c-32 0 -67 24 -85 45c-11 13 -16 26 -16 39c0 15 6 31 18 49c20 30 48 45 77 45c22 -1 44 -9 64 -24c4 -3 8 -4 11 -4h2c8 0 15 7 22 10c11 6 23 14 20 32c-5 35 -20 52 -48 52c-6 -1 -12 -1 -19 -3c-106 -21 -181 -79 -214 -185c-4 -16 -6 -31 -6 -46c0 -9 1 -18 2 -28 c3 -22 13 -40 31 -54c38 -32 78 -45 121 -45c26 0 53 5 80 13c88 28 153 83 205 157c6 9 14 18 21 26c5 5 11 12 18 12c14 0 15 -13 15 -22c0 -17 0 -34 -9 -49c-62 -113 -141 -209 -268 -250z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08B-timeSigCutCommon.xml b/data/Petaluma/E08B-timeSigCutCommon.xml
deleted file mode 100644
index 16a3dd0e2a8..00000000000
--- a/data/Petaluma/E08B-timeSigCutCommon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M392 -687c-15 0 -9 19 -13 29c-9 28 -11 57 -11 86c0 20 1 39 2 59c4 61 2 122 4 182v38l-15 -6c-37 -11 -75 -14 -110 -17c-70 3 -130 20 -176 72c-37 42 -53 89 -53 141c0 12 1 25 3 38c8 58 23 114 55 164c60 96 132 178 243 216c22 7 44 11 67 11c1 59 3 118 4 177 c0 6 0 11 -1 21c-23 -16 -42 -31 -62 -44c-9 -6 -15 -9 -20 -9c-7 0 -11 8 -13 24c-4 21 -11 42 -10 64c1 9 0 19 7 24c41 34 78 73 126 98c7 4 12 6 16 6c6 0 8 -7 8 -22c-1 -102 -8 -205 -9 -308v-32c13 -2 27 -4 40 -7c33 -7 67 -11 94 -33c26 -20 41 -50 41 -81 c0 -10 -2 -20 -5 -30c-21 -63 -54 -117 -119 -144c-6 -2 -9 -5 -13 -10c-10 -14 -26 -25 -44 -34c-1 -55 -3 -110 -4 -166c29 7 58 17 85 30c57 27 112 58 151 109c6 7 12 11 19 11c3 0 5 -1 8 -2c6 -2 8 -7 8 -12s-2 -10 -3 -15c-14 -47 -45 -83 -82 -115 c-56 -48 -120 -78 -187 -103l-3 -159c-1 -68 -3 -136 -4 -204l-3 -16c-4 -13 -7 -32 -21 -31zM285 -200c11 0 23 1 35 2c19 3 38 5 57 9l3 161c-8 -1 -16 -2 -24 -2c-10 0 -18 1 -27 3c-18 5 -29 15 -34 35c-3 13 -6 26 -6 39c0 11 2 22 7 33c14 34 50 58 88 67 c1 21 1 43 1 64c-6 0 -12 1 -18 1c-21 0 -42 -3 -63 -10c-51 -17 -88 -53 -124 -92c-29 -32 -49 -70 -71 -106c-7 -12 -11 -28 -11 -46c0 -33 13 -70 36 -95c42 -46 94 -63 151 -63zM482 137c12 0 23 6 34 11c4 1 6 4 6 6c0 3 -2 6 -4 9c-8 10 -17 18 -28 23 c-19 7 -38 13 -58 18c0 -18 0 -36 -1 -54c12 -1 23 -4 33 -9c6 -3 12 -4 18 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08C-timeSigPlus.xml b/data/Petaluma/E08C-timeSigPlus.xml
deleted file mode 100644
index b8c4b541a2a..00000000000
--- a/data/Petaluma/E08C-timeSigPlus.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M420 -358c-3 0 -7 1 -11 2c-14 2 -30 1 -44 2c-24 2 -33 15 -34 37c-6 72 -9 144 -9 216v33s-16 -1 -35 -3c-69 -7 -139 -16 -209 -23c-15 -3 -27 -4 -36 -4c-38 1 -42 17 -42 75c0 27 6 32 34 32c5 0 11 0 17 1c69 7 138 15 207 24l65 7s0 43 1 63c2 69 5 138 8 206 c1 16 -2 38 14 45c3 2 6 3 9 3c14 -1 27 -12 39 -19c26 -15 36 -36 34 -67c-6 -70 -5 -230 -5 -230s148 -9 210 -15c15 -1 21 -9 25 -21c2 -8 3 -16 3 -23c0 -15 -4 -31 -8 -45s-15 -19 -30 -18c-58 4 -116 11 -174 12l-24 1s0 -12 1 -24c2 -30 7 -190 10 -239 c0 -4 1 -7 1 -10c0 -12 -4 -18 -17 -18z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08D-timeSigPlusSmall.xml b/data/Petaluma/E08D-timeSigPlusSmall.xml
deleted file mode 100644
index fb800da7982..00000000000
--- a/data/Petaluma/E08D-timeSigPlusSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M209 -197c-8 0 -10 6 -10 14c0 7 1 14 1 20c-1 44 0 87 5 130v5c0 9 -4 13 -14 13h-85c-11 1 -26 0 -43 0c-14 0 -29 0 -44 3c-14 3 -17 12 -19 21v3c0 9 12 7 17 9c15 5 30 7 45 7c18 0 36 -2 54 -1c10 1 20 1 30 1c14 0 28 0 42 -1h3c14 0 18 7 18 21l6 110 c0 6 1 13 1 19c2 12 9 22 21 22c14 -1 12 -16 12 -25v-51c0 -25 0 -51 -2 -76v-4c0 -14 5 -16 20 -16c33 0 65 -2 98 -4c9 0 19 -1 28 -3c11 -3 25 -7 25 -18c0 -13 -16 -7 -25 -8c-20 -5 -39 -6 -59 -6c-25 0 -50 1 -74 -2c-13 -2 -16 -5 -18 -18c-5 -45 1 -90 -13 -133 c-4 -12 -7 -32 -20 -32z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08E-timeSigFractionalSlash.xml b/data/Petaluma/E08E-timeSigFractionalSlash.xml
deleted file mode 100644
index c206958d3f2..00000000000
--- a/data/Petaluma/E08E-timeSigFractionalSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M37 -423c-9 0 -10 9 -14 14c-17 20 -23 40 -23 60c0 23 9 46 22 72c75 145 293 601 332 681c4 9 10 19 19 19s14 -11 18 -20c9 -16 11 -35 14 -49c-1 -16 -5 -27 -10 -38c-76 -159 -306 -642 -346 -725c-3 -5 -4 -13 -12 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08F-timeSigEquals.xml b/data/Petaluma/E08F-timeSigEquals.xml
deleted file mode 100644
index 09752f63592..00000000000
--- a/data/Petaluma/E08F-timeSigEquals.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E08F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M362 70c-135 0 -292 5 -310 4c-2 1 -3 1 -4 1h-3c-9 0 -13 4 -17 14c-7 18 -19 34 -24 54c-2 6 -3 11 -3 15c0 12 9 18 27 17c54 1 214 1 338 1c31 0 60 -1 84 -1c25 0 45 1 58 1c23 0 36 -7 41 -29c4 -15 10 -30 10 -45c0 -6 -1 -12 -4 -18c-5 -11 -92 -14 -193 -14z M54 -177h-4c-5 0 -9 2 -12 6c-11 21 -27 39 -36 61c-1 4 -2 8 -2 11c0 12 8 19 24 19c78 1 387 12 463 16c19 0 29 -8 37 -23c2 -4 4 -9 5 -13c7 -19 10 -33 10 -43c0 -19 -15 -24 -54 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E090-timeSigMinus.xml b/data/Petaluma/E090-timeSigMinus.xml
deleted file mode 100644
index 0d4ca1f6acf..00000000000
--- a/data/Petaluma/E090-timeSigMinus.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E090" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 -54c-5 1 -10 2 -11 8c-4 24 -16 46 -16 72c0 22 10 28 29 28h298c123 0 247 0 295 1c23 0 31 -11 35 -29c1 -2 1 -5 1 -7c2 -13 4 -24 4 -33c0 -32 -18 -41 -64 -39c-33 0 -159 1 -284 1s-249 0 -280 -1c-3 0 -5 -1 -7 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E091-timeSigMultiply.xml b/data/Petaluma/E091-timeSigMultiply.xml
deleted file mode 100644
index 2f53c752a98..00000000000
--- a/data/Petaluma/E091-timeSigMultiply.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E091" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M63 -305c-12 1 -22 12 -42 36c-14 16 -21 26 -21 35c0 11 9 20 27 34c73 57 141 120 210 182c6 5 9 9 9 14c0 4 -3 8 -9 13c-62 53 -121 108 -183 161c-27 22 -19 51 -23 78v4c0 7 2 15 3 22c3 12 9 19 18 19c4 -1 9 -3 14 -8c76 -71 160 -131 236 -202 c8 -7 14 -10 20 -10h2c5 0 12 5 19 13c59 61 112 128 163 197c11 15 19 22 27 22c9 -1 17 -10 26 -28c7 -15 15 -30 15 -52c1 -12 -8 -23 -16 -35c-44 -66 -92 -128 -148 -184c-6 -7 -9 -11 -9 -16c0 -4 2 -8 8 -15c45 -47 88 -95 130 -143c10 -12 15 -30 15 -49 c0 -23 -7 -47 -20 -60c-5 -5 -9 -7 -13 -7c-6 1 -12 5 -17 11l-120 132c-16 17 -32 34 -47 51c-4 4 -7 6 -11 6h-1c-3 0 -7 -3 -11 -6c-63 -63 -130 -122 -198 -180c-4 -2 -6 -5 -9 -8c-22 -18 -34 -27 -44 -27z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E092-timeSigParensLeftSmall.xml b/data/Petaluma/E092-timeSigParensLeftSmall.xml
deleted file mode 100644
index ca2b1555af3..00000000000
--- a/data/Petaluma/E092-timeSigParensLeftSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M137 -405h-1c-7 0 -11 10 -14 17c-49 99 -102 197 -113 310c-4 38 -6 76 -9 113c2 75 18 145 49 212c24 51 51 100 88 144c6 9 15 13 23 13c11 0 13 -13 13 -21c2 -32 -2 -60 -24 -87c-41 -49 -67 -108 -86 -169c-11 -34 -17 -70 -20 -106c-3 -50 11 -98 28 -144 c21 -59 49 -116 77 -172c8 -16 11 -33 11 -50c0 -13 -2 -26 -5 -39c-2 -9 -7 -20 -17 -21z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E093-timeSigParensRightSmall.xml b/data/Petaluma/E093-timeSigParensRightSmall.xml
deleted file mode 100644
index e1b8288c352..00000000000
--- a/data/Petaluma/E093-timeSigParensRightSmall.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 -422c-4 0 -7 3 -9 12l-9 44c-1 5 -2 11 -2 16c0 13 5 26 14 38c60 83 81 179 89 278c2 21 3 42 3 63c0 74 -12 146 -45 215c-13 27 -25 54 -55 69c-10 5 -16 39 -16 66c0 17 2 31 7 36c5 4 9 7 14 7c3 0 6 -1 10 -3c22 -11 38 -29 49 -50c41 -80 63 -165 68 -254 c2 -39 8 -77 6 -99c-2 -139 -20 -259 -73 -371c-10 -22 -24 -42 -39 -60c-5 -5 -9 -7 -12 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E094-timeSigParensLeft.xml b/data/Petaluma/E094-timeSigParensLeft.xml
deleted file mode 100644
index 09cc761c6b6..00000000000
--- a/data/Petaluma/E094-timeSigParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M390 -728c-7 0 -17 6 -25 5c-54 0 -86 32 -113 73c-45 70 -92 137 -127 213c-61 133 -116 267 -124 415c-1 14 0 28 0 43c5 142 38 279 87 412c33 90 69 179 124 259c14 22 26 36 41 36c13 0 28 -10 49 -37c11 -16 17 -23 17 -31c1 -8 -6 -17 -20 -34 c-35 -47 -56 -102 -80 -155c-51 -118 -88 -241 -108 -368c-5 -36 -8 -72 -8 -107c0 -82 15 -163 43 -242c45 -130 108 -252 182 -368c17 -25 38 -47 56 -72c8 -11 20 -26 14 -38c-2 -3 -5 -4 -8 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E095-timeSigParensRight.xml b/data/Petaluma/E095-timeSigParensRight.xml
deleted file mode 100644
index f85e020146c..00000000000
--- a/data/Petaluma/E095-timeSigParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -721c-2 1 -3 3 -3 5c0 5 3 10 4 15c19 81 56 156 76 238c24 99 55 196 72 297c9 54 13 109 13 165c0 50 -3 100 -8 150c-16 163 -82 309 -166 447c-10 16 -14 30 -14 44c0 16 5 30 13 46c12 25 22 39 34 39c11 0 22 -10 36 -33c101 -160 173 -330 187 -522 c2 -35 2 -70 4 -88c3 -123 -20 -224 -43 -326c-28 -127 -69 -250 -117 -371c-12 -33 -31 -63 -53 -90c-4 -4 -8 -8 -13 -11c-7 -5 -15 -9 -22 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A0-noteheadDoubleWhole.xml b/data/Petaluma/E0A0-noteheadDoubleWhole.xml
deleted file mode 100644
index 6ed5186a244..00000000000
--- a/data/Petaluma/E0A0-noteheadDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 -223c-13 -1 -8 21 -11 32c-7 27 -9 55 -9 83c0 24 1 48 1 72v11c0 8 0 17 -1 25c0 11 -1 22 -1 33c0 23 1 46 1 69c0 24 -1 47 -4 70c-1 10 0 21 0 31c0 12 9 18 18 20h2c7 0 8 -9 10 -15c12 -24 11 -51 12 -77c2 -32 2 -64 2 -96c0 -57 -1 -114 -1 -170v-50 c-3 -15 -3 -36 -19 -38zM588 -218c-8 2 -7 13 -8 21c-7 68 -6 137 -9 183v132c0 19 0 38 1 56c-1 3 -1 6 -1 10c0 9 2 19 15 25c3 2 6 2 8 2c5 0 8 -2 9 -9c3 -8 6 -16 6 -25c-1 -32 -1 -65 -1 -97c0 -70 2 -140 6 -210c1 -24 -2 -47 -9 -70c-3 -8 -8 -19 -17 -18zM526 -202 c-10 21 -12 42 -12 62c-1 22 -2 44 -2 66v88c1 37 0 73 -3 109c-1 14 3 27 4 41c1 11 9 12 16 14c1 0 2 1 3 1c7 0 7 -8 9 -12c3 -8 5 -16 5 -23c3 -60 6 -119 6 -178c0 -29 0 -57 -1 -85s2 -58 -25 -83zM89 -181c-5 1 -7 6 -7 11c-3 28 -9 54 -9 82c1 5 1 10 1 15 c1 11 1 22 1 33c1 34 -3 69 -3 103c0 30 3 61 4 91c0 14 7 20 17 22h2c12 0 13 -13 13 -20c2 -29 2 -58 2 -86v-17c-1 -11 -1 -22 -1 -32c0 -39 3 -77 3 -116c0 -15 0 -31 -2 -46c-1 -12 -2 -23 -10 -33c-2 -4 -6 -9 -11 -7zM339 -168c-51 1 -92 9 -131 26 c-36 16 -52 50 -64 85c-11 31 -15 63 -15 96c0 14 7 25 17 33c50 41 106 67 166 67c21 0 41 -3 63 -9c56 -16 100 -72 104 -130c1 -12 2 -25 2 -38v-17c-5 -60 -68 -118 -142 -113zM340 -61c27 0 50 4 71 21c12 11 18 19 18 26c1 8 -8 15 -26 24c-30 14 -58 20 -85 20 c-41 0 -82 -14 -122 -35c-7 -4 -17 -9 -17 -18c0 -10 12 -13 20 -16c38 -15 78 -20 113 -21c10 -1 19 -1 28 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A1-noteheadDoubleWholeSquare.xml b/data/Petaluma/E0A1-noteheadDoubleWholeSquare.xml
deleted file mode 100644
index 025657dd296..00000000000
--- a/data/Petaluma/E0A1-noteheadDoubleWholeSquare.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M450 -209c-7 1 -5 9 -6 14c-2 21 -3 43 -4 58h-250h-92l-46 -1c-12 0 -14 -5 -16 -15c-3 -13 -1 -28 -12 -38c-3 -4 -6 -9 -11 -8c-6 2 -4 8 -5 13c-4 32 -5 64 -5 96c0 27 1 55 1 83c0 14 0 28 -1 42c-1 32 -3 64 -3 95c0 18 0 35 3 53c2 14 7 24 21 24h1 c12 0 8 -15 12 -22c1 -2 1 -4 1 -6c0 -7 -2 -14 -2 -20s2 -11 8 -13c5 -2 11 -2 18 -2c8 -1 17 1 25 0c93 -4 186 -9 280 -9h38c19 0 33 2 33 21c0 2 -1 5 -1 8v3c0 8 4 18 4 27c0 12 8 15 16 17h2c8 0 6 -9 8 -14c3 -5 3 -12 3 -18c1 -108 3 -217 4 -324 c0 -18 -3 -37 -10 -54c-2 -6 -7 -12 -14 -10zM50 -46c22 4 43 5 65 5h37c53 0 107 -1 161 -1c36 0 71 0 107 2c16 0 21 6 21 19c0 25 -1 48 -1 77c-11 -7 -19 -11 -29 -11h-182c-58 -1 -116 1 -174 5l-7 1c-6 -1 -11 -3 -11 -14c1 -23 1 -48 1 -72v-4c0 -6 3 -9 12 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A2-noteheadWhole.xml b/data/Petaluma/E0A2-noteheadWhole.xml
deleted file mode 100644
index 568ec68a9ba..00000000000
--- a/data/Petaluma/E0A2-noteheadWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M380 28c1 30 -2 59 -23 82c-33 37 -81 55 -130 55c-54 0 -109 -23 -142 -67c-37 -49 -62 -104 -81 -161c-3 -9 -4 -17 -4 -25c0 -27 15 -49 43 -62l28 -12c28 -10 54 -26 84 -24c100 6 222 81 225 214zM172 -74c-32 0 -58 12 -85 22c-7 3 -10 7 -10 12s4 11 7 16 c25 38 60 61 105 72c7 2 13 3 20 3c29 0 52 -17 78 -29c10 -5 15 -12 15 -20c0 -6 -2 -12 -6 -18c-8 -12 -17 -21 -29 -28c-30 -17 -62 -27 -95 -30z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A3-noteheadHalf.xml b/data/Petaluma/E0A3-noteheadHalf.xml
deleted file mode 100644
index 30a0a9f5f3c..00000000000
--- a/data/Petaluma/E0A3-noteheadHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M333 39c1 5 1 10 1 15c0 64 -74 121 -123 121c-5 0 -10 -1 -14 -2c-109 -34 -197 -107 -197 -220c0 -16 2 -33 6 -51c8 -35 24 -61 59 -70c17 -4 34 -6 51 -6c114 0 216 94 217 213zM148 -71c-19 1 -27 1 -36 3c-23 5 -59 0 -64 25c-5 23 20 49 42 62c36 19 70 47 113 47 c5 0 9 0 13 -1c29 -4 43 -28 61 -46c1 -1 2 -4 2 -7s-1 -7 -2 -8c-40 -37 -87 -60 -129 -75z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A4-noteheadBlack.xml b/data/Petaluma/E0A4-noteheadBlack.xml
deleted file mode 100644
index cd3947b2a01..00000000000
--- a/data/Petaluma/E0A4-noteheadBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M78 -162c-56 13 -78 53 -78 103c0 6 1 12 1 18c8 82 124 205 231 205c17 0 33 -3 48 -10c52 -21 51 -56 54 -82c3 -105 -140 -236 -236 -236c-7 0 -13 1 -20 2z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A5-noteheadNull.xml b/data/Petaluma/E0A5-noteheadNull.xml
deleted file mode 100644
index 1445fb5f59a..00000000000
--- a/data/Petaluma/E0A5-noteheadNull.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A9-noteheadXBlack.xml b/data/Petaluma/E0A9-noteheadXBlack.xml
deleted file mode 100644
index e2cfb5f0cbc..00000000000
--- a/data/Petaluma/E0A9-noteheadXBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -156c-6 2 -13 -1 -15 5c-1 1 -1 3 -1 4c0 6 4 10 7 16c31 46 70 85 107 126c-4 3 -7 6 -11 10c-31 31 -60 63 -88 97c-5 7 -8 13 -8 18c0 6 3 12 8 18c3 4 5 5 8 5c6 0 13 -7 19 -9c11 -3 18 -13 25 -22c24 -29 49 -56 76 -83c29 36 58 70 89 104c8 9 18 24 29 24 c4 0 9 -2 13 -6c4 -3 5 -7 5 -11c0 -10 -10 -22 -17 -31c-26 -39 -56 -75 -87 -110c21 -19 42 -37 64 -55c16 -14 28 -31 41 -47c7 -7 9 -16 9 -26v-4c0 -5 0 -11 -6 -13h-3c-7 0 -13 5 -18 9c-39 34 -79 67 -117 102l-50 -56c-15 -18 -31 -34 -47 -51 c-9 -10 -20 -13 -32 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0AF-noteheadPlusBlack.xml b/data/Petaluma/E0AF-noteheadPlusBlack.xml
deleted file mode 100644
index ad8e1596899..00000000000
--- a/data/Petaluma/E0AF-noteheadPlusBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M178 -161c-8 0 -9 9 -9 15l-13 125c-46 2 -89 5 -133 6c-14 1 -20 9 -22 18v4c0 7 10 8 16 11c17 5 34 8 51 6c28 -1 56 -3 84 -5l-6 63c-1 20 5 39 8 59c2 12 9 19 21 19c13 -1 11 -13 12 -21l15 -123l85 -6c13 -1 25 -4 36 -10c5 -4 12 -8 10 -15c-1 -7 -10 -8 -16 -8 c-20 -1 -40 -4 -56 -4c-6 0 -11 1 -15 1c-14 1 -27 2 -40 2l5 -52c3 -27 -2 -53 -18 -75c-4 -5 -8 -10 -15 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0B5-noteheadWholeWithX.xml b/data/Petaluma/E0B5-noteheadWholeWithX.xml
deleted file mode 100644
index 7c099533226..00000000000
--- a/data/Petaluma/E0B5-noteheadWholeWithX.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 -157c-90 4 -171 41 -232 117c-16 20 -24 43 -24 65c0 31 16 61 48 80c56 34 115 52 178 52c19 0 39 -2 59 -5c82 -14 141 -55 179 -128c8 -17 12 -34 12 -51c0 -41 -23 -79 -61 -97c-41 -19 -102 -31 -159 -33zM238 26c12 11 24 21 36 31c11 10 22 19 33 28 c-15 14 -30 25 -45 32c-7 2 -13 6 -21 2c-25 -10 -52 -19 -75 -33l10 -9c21 -17 42 -34 62 -51zM145 -54c26 22 52 45 77 67l-75 61c-22 -18 -33 -41 -33 -64s10 -45 31 -64zM356 -70c5 10 9 22 9 33c0 32 -16 70 -39 101l-65 -56c31 -26 63 -52 95 -78zM261 -115 c5 -1 11 -2 16 -2c24 0 49 12 66 31c-19 14 -37 31 -57 47c-13 11 -27 22 -41 33c-26 -22 -51 -43 -76 -65c-1 0 -1 0 -1 -1c28 -20 59 -35 93 -43z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0B6-noteheadHalfWithX.xml b/data/Petaluma/E0B6-noteheadHalfWithX.xml
deleted file mode 100644
index 77b9ce3bb08..00000000000
--- a/data/Petaluma/E0B6-noteheadHalfWithX.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M195 -148c-46 -4 -89 10 -128 37c-40 27 -67 66 -67 107c0 34 18 69 62 101c30 22 63 32 97 38c10 3 24 3 28 4c29 3 57 13 86 13c7 -1 14 -1 21 -3c17 -3 33 -6 49 -16c14 -10 32 -11 49 -14c4 2 7 2 11 2c5 0 10 -2 12 -6c1 -1 1 -2 1 -2c28 -9 55 -19 78 -39 c17 -14 26 -28 26 -43c0 -12 -5 -24 -15 -37c-40 -55 -91 -92 -151 -115c2 -4 3 -8 4 -12c0 -3 -1 -7 -3 -9c-3 -3 -7 -1 -10 2l-11 12c-13 -4 -26 -8 -40 -11c-32 -6 -64 -11 -99 -9zM251 28l95 65c-21 7 -44 11 -66 14c-26 -3 -50 -6 -73 -13c15 -22 30 -44 44 -66z M242 -112c21 8 41 18 60 29l-53 78l-75 -50c-10 -7 -21 -11 -32 -12h-7c-3 0 -6 1 -8 5v1c0 5 4 8 8 10l99 68l-47 69c-16 -7 -30 -16 -44 -29c-27 -23 -38 -46 -38 -68c0 -24 14 -47 36 -68c21 -22 47 -39 75 -39c9 1 17 2 26 6zM266 7l54 -78c34 23 63 52 86 88 c5 8 7 15 7 22c0 10 -6 21 -18 30c-6 4 -12 8 -19 11c-36 -24 -73 -49 -110 -73z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0B7-noteheadVoidWithX.xml b/data/Petaluma/E0B7-noteheadVoidWithX.xml
deleted file mode 100644
index 1dc18f25c4b..00000000000
--- a/data/Petaluma/E0B7-noteheadVoidWithX.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M176 -142c-75 1 -125 30 -161 83c-10 14 -15 31 -15 49c0 32 16 65 44 87c9 6 18 12 28 17c-1 2 -1 4 1 7c4 5 9 3 13 1c36 18 76 27 116 34l17 3c10 2 21 3 31 3c32 -1 61 -11 82 -42c17 -24 27 -51 27 -77c0 -21 -6 -41 -18 -62c-39 -66 -98 -99 -165 -103zM186 14 l80 -72c16 13 30 28 41 45c12 19 17 38 17 58c0 7 0 15 -2 22c-4 20 -17 33 -34 33l-10 -1c-4 -1 -8 -2 -12 -2zM169 28l66 68c-39 -3 -76 -12 -111 -27l5 -5c14 -12 27 -24 40 -36zM61 -82c5 6 13 11 18 16l78 81l-51 46c-10 -6 -21 -12 -31 -19c-26 -17 -40 -43 -40 -72 c0 -6 1 -13 2 -20c4 -15 13 -25 24 -32zM101 -97c14 -4 28 -5 42 -5c37 0 75 12 107 33c-26 23 -51 46 -77 70l-78 -81l-12 -12c6 -2 12 -3 18 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0D9-noteheadDiamondHalf.xml b/data/Petaluma/E0D9-noteheadDiamondHalf.xml
deleted file mode 100644
index 92c616227ee..00000000000
--- a/data/Petaluma/E0D9-noteheadDiamondHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 -144c-30 16 -50 44 -76 65c-25 20 -46 44 -70 65c-8 7 -12 13 -12 19s3 11 10 18c37 37 72 76 108 113c5 5 8 12 17 12c7 0 12 -4 16 -9c46 -48 92 -97 138 -146c4 -4 6 -8 6 -12c0 -5 -3 -9 -7 -13c-35 -36 -70 -72 -105 -109c-4 -5 -8 -7 -13 -7c-3 0 -7 2 -12 4z M145 -109c13 -7 25 22 39 33c8 7 15 16 23 24c12 11 18 23 17 34c-1 56 -32 90 -64 124c-2 2 -3 2 -4 2c-3 0 -5 -3 -7 -5c-38 -34 -59 -74 -59 -121c0 -10 1 -20 3 -30c5 -32 30 -48 52 -61z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DA-noteheadDiamondHalfWide.xml b/data/Petaluma/E0DA-noteheadDiamondHalfWide.xml
deleted file mode 100644
index 689067642b0..00000000000
--- a/data/Petaluma/E0DA-noteheadDiamondHalfWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 -143c-78 43 -155 86 -233 128c-4 2 -7 4 -10 7c-9 6 -13 11 -13 16c0 4 5 9 15 14c62 36 125 71 188 106c11 6 22 12 33 19c8 -4 14 -6 20 -9c72 -38 143 -75 214 -113c6 -3 12 -8 17 -13c8 -7 12 -13 12 -18c0 -6 -5 -11 -16 -18c-66 -39 -131 -78 -196 -118 c-6 -4 -11 -5 -16 -5s-10 1 -15 4zM227 -108c7 -3 13 -5 18 -5c6 -1 12 1 18 6c21 15 44 30 67 42c28 15 34 40 38 65c0 21 -16 55 -30 69c-24 22 -46 33 -67 33c-22 0 -44 -12 -69 -36c-20 -20 -33 -52 -33 -84c0 -35 16 -71 58 -90z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DB-noteheadDiamondBlack.xml b/data/Petaluma/E0DB-noteheadDiamondBlack.xml
deleted file mode 100644
index 032217cb7b1..00000000000
--- a/data/Petaluma/E0DB-noteheadDiamondBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M185 -146c-7 4 -17 7 -24 13l-155 129c-4 4 -6 7 -6 10c0 4 3 7 7 11c45 40 91 81 135 123c5 5 10 6 14 6c7 0 13 -4 19 -10c36 -37 71 -74 106 -111c2 -2 3 -4 5 -5c16 -18 24 -27 24 -36s-9 -18 -28 -37c-27 -27 -53 -55 -81 -82c-4 -4 -8 -10 -16 -11z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DC-noteheadDiamondBlackWide.xml b/data/Petaluma/E0DC-noteheadDiamondBlackWide.xml
deleted file mode 100644
index 13acdfb1e54..00000000000
--- a/data/Petaluma/E0DC-noteheadDiamondBlackWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M339 -132c-20 3 -37 8 -53 14c-86 36 -172 71 -258 106c-6 3 -13 5 -19 9c-6 3 -9 6 -9 9s3 6 9 8c98 40 196 79 294 118c4 1 7 2 11 2c7 0 14 -2 21 -5l285 -114c6 -2 11 -5 17 -9c7 -4 10 -8 10 -12s-3 -7 -12 -10l-280 -111c-6 -2 -12 -7 -16 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DD-noteheadDiamondWhite.xml b/data/Petaluma/E0DD-noteheadDiamondWhite.xml
deleted file mode 100644
index 5e414f70825..00000000000
--- a/data/Petaluma/E0DD-noteheadDiamondWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 -123c-4 -4 -9 -6 -16 -6c-12 0 -28 7 -38 18c-22 26 -44 52 -67 78c-6 8 -12 15 -18 22c-10 11 -16 16 -16 21c0 6 6 11 17 22l91 85c6 5 11 12 16 11c19 -1 32 -7 42 -19c30 -35 59 -70 90 -105c4 -5 6 -9 6 -13c0 -5 -2 -9 -7 -14c-34 -33 -67 -66 -100 -100z M135 -84l75 78c3 3 5 7 8 11c-2 3 -3 5 -5 7l-63 72c-2 3 -5 4 -7 4c-3 0 -6 -1 -9 -4c-27 -27 -55 -53 -84 -79c-3 -3 -5 -6 -5 -8c0 -3 2 -6 5 -9c21 -23 43 -47 63 -71c5 -5 8 -8 11 -8c4 0 7 2 11 7z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DE-noteheadDiamondWhiteWide.xml b/data/Petaluma/E0DE-noteheadDiamondWhiteWide.xml
deleted file mode 100644
index f66b4bd4fc0..00000000000
--- a/data/Petaluma/E0DE-noteheadDiamondWhiteWide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0DE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 -142c-7 2 -20 3 -31 9l-248 135c-6 3 -9 7 -9 10s3 6 9 9l262 120c6 2 11 3 15 3c8 0 15 -2 22 -6c86 -41 172 -82 257 -124c8 -3 20 -7 20 -17c0 -11 -13 -12 -21 -16l-246 -116c-8 -4 -15 -9 -30 -7zM320 -95c67 38 138 69 210 104c-73 36 -144 70 -214 104 c-3 1 -5 2 -9 2c-6 0 -12 -3 -18 -6c-34 -15 -67 -31 -100 -46c-43 -20 -85 -40 -133 -63c59 -32 113 -58 165 -90c19 -11 36 -19 54 -19c14 1 29 5 45 14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0F5-noteheadParenthesisLeft.xml b/data/Petaluma/E0F5-noteheadParenthesisLeft.xml
deleted file mode 100644
index d51b5bfc5c5..00000000000
--- a/data/Petaluma/E0F5-noteheadParenthesisLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M93 -197c-5 0 -9 7 -11 11c-45 66 -76 138 -82 212c1 65 24 115 68 154c7 6 13 17 22 17c4 0 7 -2 11 -4c4 -3 5 -9 5 -16c0 -11 -4 -25 -11 -31c-29 -27 -52 -57 -61 -95c-4 -15 -5 -29 -5 -42c0 -48 20 -92 45 -134c10 -17 22 -31 26 -51l1 -10c0 -4 -1 -7 -5 -9 c-1 -2 -2 -2 -3 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0F6-noteheadParenthesisRight.xml b/data/Petaluma/E0F6-noteheadParenthesisRight.xml
deleted file mode 100644
index cbdeff19954..00000000000
--- a/data/Petaluma/E0F6-noteheadParenthesisRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-12 -196c-3 4 -5 11 -5 17c0 9 3 18 10 25c10 9 22 15 29 26c23 36 36 80 36 123c0 62 -25 123 -80 161c-4 3 -8 18 -8 29c0 7 1 13 4 16c4 3 7 5 10 5c7 0 13 -7 19 -12c44 -37 66 -87 73 -143c2 -13 6 -26 6 -40c0 -3 0 -7 -1 -10c-3 -53 -14 -105 -39 -153 c-6 -12 -14 -24 -25 -31c-9 -6 -21 -23 -29 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0FA-noteheadWholeFilled.xml b/data/Petaluma/E0FA-noteheadWholeFilled.xml
deleted file mode 100644
index 7f99079590f..00000000000
--- a/data/Petaluma/E0FA-noteheadWholeFilled.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E0FA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M201 -130c-79 5 -139 44 -186 105c-10 14 -15 28 -15 43c0 25 16 49 45 69c39 26 83 36 128 40c20 2 40 3 60 3c65 0 128 -11 189 -42c25 -12 46 -29 58 -54c6 -12 9 -25 9 -37c0 -26 -14 -50 -40 -66c-59 -35 -124 -47 -190 -56c-19 -2 -38 -3 -58 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E101-noteheadSlashHorizontalEnds.xml b/data/Petaluma/E101-noteheadSlashHorizontalEnds.xml
deleted file mode 100644
index bd443003b6b..00000000000
--- a/data/Petaluma/E101-noteheadSlashHorizontalEnds.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E101" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M55 -254c-10 0 -20 1 -31 2c-10 1 -18 4 -22 15c-1 3 -2 5 -2 7c0 6 5 10 9 15c97 120 195 240 292 361c23 28 47 55 68 84c13 16 28 24 46 24c4 0 7 -1 10 -1c18 -3 37 -5 52 -16c7 -5 11 -10 11 -16c0 -4 -2 -8 -6 -13c-68 -74 -128 -154 -191 -232 c-59 -73 -124 -141 -179 -216c-6 -8 -12 -13 -21 -13c-3 0 -6 1 -10 2c-8 -2 -17 -3 -26 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E102-noteheadSlashWhiteWhole.xml b/data/Petaluma/E102-noteheadSlashWhiteWhole.xml
deleted file mode 100644
index c2e7b3a4242..00000000000
--- a/data/Petaluma/E102-noteheadSlashWhiteWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E102" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M443 -254c-78 3 -155 11 -233 18c-43 4 -86 7 -130 10h-19c-4 0 -9 0 -13 -1h-3c-2 0 -4 0 -8 1c-2 1 -4 1 -7 1c-4 0 -7 -1 -11 -1c-6 1 -12 2 -16 12c-1 3 -3 7 -3 10c0 4 2 7 6 12c122 139 244 278 365 419c6 7 15 12 24 16v1c0 8 11 8 16 9c16 2 32 3 47 3 c24 0 47 -2 70 -3c74 -3 147 -5 220 -9c37 -2 75 -2 112 -4c3 2 7 2 11 1c12 -1 19 0 25 -3c1 0 2 0 3 -1c8 0 16 -1 24 -2c5 -1 11 -3 15 -5c8 -4 19 -10 16 -19c0 -2 -2 -4 -3 -5c3 -19 -21 -30 -33 -43c-75 -81 -151 -161 -227 -241c-49 -51 -96 -104 -147 -155 c-4 -4 -7 -7 -12 -9c0 -1 1 -2 0 -3c-2 -5 -8 -3 -13 -4c-25 -3 -50 -7 -76 -5zM434 -217c1 3 4 7 7 11l381 410c-111 5 -221 9 -332 14c0 -5 -4 -10 -9 -15l-115 -130l-156 -174c-27 -31 -53 -62 -81 -92h1c54 -4 108 -10 162 -13c48 -3 95 -6 142 -11z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E103-noteheadSlashWhiteHalf.xml b/data/Petaluma/E103-noteheadSlashWhiteHalf.xml
deleted file mode 100644
index 6ab22cadb44..00000000000
--- a/data/Petaluma/E103-noteheadSlashWhiteHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E103" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 -243c-57 6 -115 6 -172 8c-4 -2 -9 -3 -15 -3c-5 0 -10 1 -15 2c-5 -1 -9 -2 -14 -2c-13 0 -26 5 -39 7c-6 1 -11 3 -14 6c-1 1 -1 2 -2 2c-3 3 -5 6 -5 11v2c0 5 3 7 6 8c1 2 2 4 4 6c121 139 242 277 362 416c13 15 25 21 39 21c5 0 10 0 15 -2l22 3 c12 0 25 1 37 1c66 0 131 -6 197 -6c5 0 10 -1 14 -3c6 -2 14 -5 18 -9l3 -2c8 -4 13 -8 13 -14c0 -3 -2 -7 -7 -13c-46 -53 -90 -106 -136 -160c-44 -52 -89 -105 -133 -158c-31 -35 -60 -72 -91 -107c-10 -11 -24 -9 -37 -9c-17 -2 -34 -3 -50 -5zM272 -202 c112 134 225 268 337 403c-13 -1 -27 -1 -42 -1c-23 0 -53 -1 -83 -5c-1 -2 -3 -4 -5 -7c-50 -56 -99 -113 -149 -170c-44 -50 -88 -100 -133 -150c-19 -23 -39 -45 -59 -68h54c26 0 53 0 80 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E220-tremolo1.xml b/data/Petaluma/E220-tremolo1.xml
deleted file mode 100644
index 1d8029dc8e3..00000000000
--- a/data/Petaluma/E220-tremolo1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E220" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-143 -88c-8 0 -11 5 -11 13c0 18 -4 35 -4 53c0 6 1 11 1 16c3 16 9 25 24 29l260 63c4 2 6 2 8 2c7 0 11 -5 15 -14c4 -11 7 -21 6 -39c0 -4 -1 -14 -3 -24c-4 -19 -13 -31 -33 -36c-85 -20 -170 -40 -255 -62c-3 -1 -6 -1 -8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E221-tremolo2.xml b/data/Petaluma/E221-tremolo2.xml
deleted file mode 100644
index 2e0efe7dbc2..00000000000
--- a/data/Petaluma/E221-tremolo2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E221" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-135 3c-9 0 -13 5 -12 17v24v3c-1 56 0 57 55 72c70 18 140 36 210 55c5 2 9 3 12 3c12 -1 16 -8 18 -22l1 -13c0 -17 -4 -33 -9 -48c-3 -12 -12 -19 -25 -23c-80 -21 -160 -44 -241 -67c-3 0 -7 -1 -9 -1zM-133 -177c-7 0 -10 4 -10 15c0 20 -5 39 -5 59 c1 21 10 29 29 33l216 44c9 2 16 3 22 3c15 1 17 -8 17 -35l-1 -10c-1 -49 -8 -56 -56 -66c-68 -13 -135 -26 -203 -41c-4 -2 -7 -2 -9 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E222-tremolo3.xml b/data/Petaluma/E222-tremolo3.xml
deleted file mode 100644
index 47d1bcd7416..00000000000
--- a/data/Petaluma/E222-tremolo3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E222" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-132 113l-5 -1c-8 0 -11 7 -9 16c4 22 3 45 8 68c4 16 13 21 26 23l230 33c3 0 6 1 9 1c12 0 19 -6 19 -18c0 -3 0 -6 -1 -9c-2 -18 -8 -36 -15 -53c-5 -11 -15 -19 -28 -21c-75 -13 -150 -25 -226 -38c-2 -1 -5 -1 -8 -1zM-129 -75c-9 0 -12 6 -10 16c1 4 1 8 1 12 c0 6 0 11 -1 16c-2 45 7 54 50 63c66 14 132 29 199 44c5 1 10 2 14 2c14 0 17 -8 17 -32c-3 -13 -7 -31 -13 -48c-5 -13 -16 -20 -31 -24c-73 -15 -146 -31 -219 -48c-3 -1 -5 -1 -7 -1zM-131 -253c-6 0 -10 3 -9 11c0 25 2 50 4 75c1 13 12 17 22 19c77 19 154 37 231 55 c7 2 13 3 17 3c12 0 14 -8 13 -29c-8 -61 -17 -71 -64 -81c-69 -15 -138 -34 -206 -52c-3 -1 -6 -1 -8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E223-tremolo4.xml b/data/Petaluma/E223-tremolo4.xml
deleted file mode 100644
index f9a888d45fc..00000000000
--- a/data/Petaluma/E223-tremolo4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E223" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-140 179c-11 0 -15 6 -13 22c1 14 -2 29 -2 43c0 10 1 21 8 29c15 20 45 16 68 22l185 42c11 3 19 5 25 5c15 0 19 -7 19 -26c0 -5 -1 -10 -1 -15c-4 -52 -9 -57 -59 -68c-73 -17 -146 -35 -219 -53c-4 0 -8 -1 -11 -1zM-146 6c-4 0 -7 1 -8 9c-2 17 -4 35 -5 48 c0 44 3 47 41 55l229 49c7 2 13 3 17 3c14 0 18 -8 16 -30c0 -15 -3 -30 -6 -45c-4 -15 -14 -25 -29 -28l-248 -60c-3 0 -5 -1 -7 -1zM-135 -171l-5 -1c-11 0 -12 7 -12 13c0 12 -2 25 -2 37c0 10 0 19 1 28c0 18 10 25 26 28l258 42c3 0 5 1 7 1c12 0 18 -7 20 -21 c1 -6 1 -11 1 -16c0 -14 -2 -29 -7 -43c-5 -15 -17 -22 -31 -24zM-145 -342c-5 0 -8 2 -8 10c0 17 -5 34 -5 53c0 6 0 12 2 18c3 13 8 20 20 23c87 18 174 37 262 54h8c10 0 11 -7 11 -16v-6c0 -4 0 -7 3 -10c-6 -51 -8 -70 -60 -78c-76 -12 -150 -30 -225 -47 c-3 -1 -6 -1 -8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E224-tremolo5.xml b/data/Petaluma/E224-tremolo5.xml
deleted file mode 100644
index 984c32272da..00000000000
--- a/data/Petaluma/E224-tremolo5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E224" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-139 292c-13 0 -14 7 -19 31c-3 11 -3 21 -3 29c0 41 2 42 42 48c82 11 164 23 246 36c3 1 6 1 9 1c13 -1 20 -7 22 -22c1 -5 2 -11 2 -17c0 -16 -4 -31 -9 -46c-4 -12 -13 -18 -27 -20c-80 -12 -160 -25 -240 -38c-10 -1 -17 -2 -23 -2zM-138 90c-7 -1 -10 3 -9 13 c1 18 -9 34 -5 50c0 37 0 37 36 45l234 55c7 2 12 3 16 3c11 -1 14 -8 16 -26c2 -19 -3 -37 -7 -54c-3 -13 -13 -22 -27 -25l-246 -60c-3 -1 -6 -1 -8 -1zM-130 -85c-7 1 -11 3 -12 12c-2 18 -3 37 -5 51c1 43 4 46 42 54l235 46c5 2 9 2 13 2c14 0 17 -8 17 -31 c0 -16 -4 -32 -9 -47c-4 -12 -13 -21 -27 -25l-247 -60c-3 -2 -5 -2 -7 -2zM-146 -272c-8 0 -11 6 -11 18c1 15 -2 30 -2 46c0 7 1 14 2 20c2 14 7 21 19 24c86 20 172 40 259 58c2 1 5 1 6 1c12 0 12 -10 12 -20c0 -4 0 -8 1 -11c-1 -51 -15 -67 -63 -79 c-71 -17 -142 -35 -212 -55c-5 -1 -8 -2 -11 -2zM-124 -435l-7 -2c-9 1 -16 5 -14 16c2 18 -4 34 -2 52c2 37 6 42 42 47c74 12 148 23 222 34l10 2c7 0 13 1 18 1c12 0 16 -6 16 -24c0 -4 -1 -9 -1 -16c-1 -6 -2 -19 -6 -32c-4 -16 -13 -27 -30 -30z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E22A-buzzRoll.xml b/data/Petaluma/E22A-buzzRoll.xml
deleted file mode 100644
index 9fe80d46716..00000000000
--- a/data/Petaluma/E22A-buzzRoll.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E22A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-74 -123c-28 1 -55 5 -82 14c-9 3 -16 6 -18 18c0 2 -1 3 -1 4c0 9 8 12 13 16l156 120c2 2 6 3 4 8c-25 0 -50 -3 -76 -3c-18 -1 -37 1 -55 6c-10 3 -19 7 -29 9c-15 4 -12 17 -12 26v1c0 8 10 7 16 7l246 18c27 2 51 -9 74 -22c10 -6 15 -13 15 -19 c0 -8 -5 -15 -15 -23c-52 -39 -105 -78 -158 -116l1 -5c25 2 49 2 73 5c5 1 9 1 14 1c22 0 42 -7 62 -15c5 -2 10 -6 14 -10s8 -9 8 -14c0 -12 -11 -11 -18 -11c-70 -5 -140 -9 -210 -14c-8 -1 -15 -1 -22 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E240-flag8thUp.xml b/data/Petaluma/E240-flag8thUp.xml
deleted file mode 100644
index d115b0c9110..00000000000
--- a/data/Petaluma/E240-flag8thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M184 -813c-4 -4 -7 -6 -10 -6s-6 4 -7 12c-1 13 -6 26 -7 39c-1 9 -2 18 -2 26c0 16 4 31 20 44c18 15 28 38 38 60c3 6 4 13 4 20c0 13 -5 27 -6 41c-7 76 -43 140 -91 197c-19 23 -37 48 -56 71c-47 62 -67 132 -67 209v56c0 19 4 35 24 44h5c7 -17 14 -34 14 -52 c0 -11 2 -26 2 -35c1 -46 18 -79 46 -115c24 -30 47 -61 71 -91c54 -68 81 -146 93 -231c4 -26 6 -52 6 -78c0 -39 -5 -78 -17 -117c-11 -36 -35 -66 -60 -94z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E241-flag8thDown.xml b/data/Petaluma/E241-flag8thDown.xml
deleted file mode 100644
index 616cbfc5876..00000000000
--- a/data/Petaluma/E241-flag8thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M184 813c25 -28 49 -58 60 -94c12 -39 17 -78 17 -117c0 -26 -2 -52 -6 -78c-12 -85 -39 -163 -93 -231c-24 -30 -47 -61 -71 -91c-28 -36 -49 -75 -50 -121c0 -9 2 -18 2 -29c0 -18 -7 -35 -14 -52h-5c-20 9 -24 25 -24 44v56c0 77 20 147 67 209c19 23 37 48 56 71 c48 57 84 121 91 197c1 14 6 28 6 41c0 7 -1 14 -4 20c-10 22 -20 45 -38 60c-16 13 -20 28 -20 44c0 8 1 17 2 26c1 13 6 26 7 39c1 8 4 12 7 12s6 -2 10 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E242-flag16thUp.xml b/data/Petaluma/E242-flag16thUp.xml
deleted file mode 100644
index 9953fa570ca..00000000000
--- a/data/Petaluma/E242-flag16thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 -819c-7 3 -4 10 -4 15c1 100 -41 182 -105 253c-71 78 -126 164 -155 266c-16 54 -24 110 -24 167c0 15 0 28 1 42c0 7 3 14 6 21c2 5 7 7 13 8c0 9 -1 17 -1 25c0 15 9 18 18 21c2 0 3 1 4 1c9 0 9 -11 11 -17c7 -20 6 -42 15 -62c15 -38 44 -64 72 -91 c58 -57 118 -113 149 -191c18 -45 31 -91 35 -140c1 -24 5 -48 4 -69c1 -34 -3 -66 -7 -98c2 -15 2 -29 3 -40c1 -31 -1 -57 -10 -82c-3 -8 -6 -15 -11 -21c-4 -4 -8 -10 -14 -8zM287 -567c5 72 -21 136 -66 193c-34 42 -75 79 -113 117c-19 19 -35 40 -48 62 c11 -34 27 -65 41 -97c30 -70 84 -122 129 -181c23 -29 42 -61 57 -94z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E243-flag16thDown.xml b/data/Petaluma/E243-flag16thDown.xml
deleted file mode 100644
index da91af23c13..00000000000
--- a/data/Petaluma/E243-flag16thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 0c-1 0 -18 3 -21 5c-16 11 -20 44 -20 56v57c0 57 8 113 24 167c29 102 84 188 155 266c64 71 106 153 105 253c0 2 -1 5 -1 8s1 5 5 7h2c5 0 9 -5 12 -8c5 -6 8 -13 11 -21c9 -25 11 -51 10 -82c-1 -11 -1 -25 -3 -40c4 -32 8 -64 7 -98c1 -21 -3 -45 -4 -69 c-4 -49 -17 -95 -35 -140c-31 -78 -91 -134 -149 -191c-28 -27 -57 -53 -72 -91c-9 -20 -8 -42 -15 -62c-2 -6 -2 -17 -11 -17zM60 195c13 22 29 43 48 62c38 38 79 75 113 117c41 52 67 111 67 175c0 6 -1 12 -1 18c-15 -33 -34 -65 -57 -94c-45 -59 -99 -111 -129 -181 c-14 -32 -30 -63 -41 -97z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E244-flag32ndUp.xml b/data/Petaluma/E244-flag32ndUp.xml
deleted file mode 100644
index 86ab259a7b2..00000000000
--- a/data/Petaluma/E244-flag32ndUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M224 -849c-8 2 -2 14 -4 21c-2 9 -3 19 -3 28c0 25 6 50 6 75c0 8 0 16 -2 23c-16 78 -50 146 -111 199c-22 19 -45 37 -64 60c-31 37 -41 80 -41 126c0 41 -2 83 -2 125c1 42 -3 83 -3 124c1 13 0 26 0 38c0 39 3 75 0 113c-1 18 2 35 4 52c2 10 11 12 17 14h2 c5 1 5 -8 8 -12c2 -4 6 -10 6 -15c-2 -51 31 -81 68 -103c95 -58 137 -166 136 -276c1 -22 -3 -47 -11 -73c-2 -6 -2 -11 -2 -17c0 -18 7 -37 9 -55c1 -10 2 -20 2 -29c0 -20 -3 -40 -8 -61c-2 -6 -2 -13 -2 -19c0 -12 3 -23 8 -33c21 -50 31 -100 31 -150 c1 -42 -6 -85 -19 -128c-2 -3 -3 -7 -5 -10c-5 -8 -10 -20 -20 -17zM198 -261c1 4 2 9 2 15c0 59 -74 146 -137 173c1 -21 9 -37 21 -52c36 -45 89 -76 114 -136zM191 -456c-7 106 -77 166 -142 232c-2 -13 -4 -26 -4 -37c1 -29 9 -56 32 -81c36 -38 80 -67 114 -114z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E245-flag32ndDown.xml b/data/Petaluma/E245-flag32ndDown.xml
deleted file mode 100644
index 930af8a76ce..00000000000
--- a/data/Petaluma/E245-flag32ndDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M224 829c10 3 15 -9 20 -17c2 -3 3 -7 5 -10c13 -43 20 -86 19 -128c0 -50 -10 -100 -31 -150c-5 -10 -8 -21 -8 -33c0 -6 0 -13 2 -19c5 -21 8 -41 8 -61c0 -9 -1 -19 -2 -29c-2 -18 -9 -37 -9 -55c0 -6 0 -11 2 -17c8 -26 12 -51 11 -73c1 -110 -41 -218 -136 -276 c-37 -22 -70 -52 -68 -103c0 -5 -4 -11 -6 -15c-3 -4 -3 -13 -8 -12h-2c-6 2 -15 4 -17 14c-2 17 -4 34 -4 52v113c0 12 0 31 -1 44c-6 41 5 76 4 118c0 42 2 84 2 125c0 46 10 89 41 126c19 23 42 41 64 60c61 53 95 121 111 199c2 7 2 15 2 23c0 25 -6 50 -6 75 c0 9 1 19 3 28c2 7 -4 19 4 21zM191 436c-34 -47 -78 -76 -114 -114c-23 -25 -31 -52 -32 -81c0 -11 2 -24 4 -37c65 66 135 126 142 232zM198 241c-25 -60 -78 -91 -114 -136c-12 -15 -20 -31 -21 -52c63 27 137 114 137 173c0 6 -1 11 -2 15z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E246-flag64thUp.xml b/data/Petaluma/E246-flag64thUp.xml
deleted file mode 100644
index dd040543306..00000000000
--- a/data/Petaluma/E246-flag64thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 -823c-4 2 -5 6 -5 9c0 4 1 9 1 13c-2 99 -30 187 -102 259c-18 18 -38 34 -58 50c-38 31 -58 72 -62 121c-2 20 -3 40 -3 60c0 39 3 79 6 119c3 44 -7 88 -10 133c0 12 -1 23 -1 35v48c0 28 -1 57 -5 84c-4 26 -5 52 -5 77v52c0 21 0 43 -3 65v6c0 8 1 16 3 25 s11 12 18 13c1 1 1 1 2 1c6 0 7 -8 10 -13c9 -19 14 -40 14 -60c0 -17 7 -29 17 -41c28 -33 66 -54 97 -84c36 -35 67 -74 80 -123c5 -22 8 -44 8 -71c0 -9 -1 -18 -1 -27c-2 -5 -2 -11 -2 -16c0 -32 23 -64 27 -99c2 -17 4 -35 4 -53c0 -34 -5 -68 -14 -100 c-5 -16 -10 -32 -10 -49c0 -5 0 -9 1 -14c2 -9 2 -19 2 -28c0 -30 -5 -58 -9 -86c0 -3 -1 -6 -1 -8c0 -11 3 -20 7 -29c18 -51 33 -102 33 -156c0 -34 -5 -67 -18 -97c-4 -9 -11 -19 -21 -16zM199 -61c4 8 6 15 6 22c0 5 -1 10 -4 16c-11 21 -23 43 -42 59 c-38 32 -75 64 -116 98c12 -101 86 -146 156 -195zM207 -285c3 -3 6 -5 9 -5s5 3 8 11c3 10 5 20 5 29c0 31 -18 56 -43 75c-45 35 -91 69 -133 114c1 -41 4 -76 29 -102c40 -42 83 -81 125 -122zM208 -480c1 6 1 12 1 17c0 33 -10 58 -29 79c-37 42 -86 71 -122 121 c-1 -6 -1 -13 -1 -20c0 -28 8 -50 24 -70c36 -46 88 -75 127 -127z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E247-flag64thDown.xml b/data/Petaluma/E247-flag64thDown.xml
deleted file mode 100644
index 78352a0f80d..00000000000
--- a/data/Petaluma/E247-flag64thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M242 795c10 3 17 -7 21 -16c13 -30 18 -63 18 -97c0 -54 -15 -105 -33 -156c-4 -9 -7 -18 -7 -29c0 -2 1 -5 1 -8c4 -28 9 -56 9 -86c0 -9 0 -19 -2 -28c-1 -5 -1 -9 -1 -14c0 -17 5 -33 10 -49c9 -32 14 -66 14 -100c0 -18 -2 -36 -4 -53c-4 -35 -27 -67 -27 -99 c0 -5 0 -11 2 -16c0 -9 1 -18 1 -27c0 -27 -3 -49 -8 -71c-13 -49 -44 -88 -80 -123c-31 -30 -69 -51 -97 -84c-10 -12 -17 -24 -17 -41c0 -20 -5 -41 -14 -60c-3 -5 -4 -13 -10 -13c-1 0 -1 0 -2 1c-7 1 -16 4 -18 13s-3 17 -3 25v6c3 22 3 44 3 65v52c0 25 1 51 5 77 c4 27 5 56 5 84v48c0 12 1 23 1 35c3 45 13 89 10 133c-3 40 -6 80 -6 119c0 20 1 40 3 60c4 49 24 90 62 121c20 16 40 32 58 50c72 72 100 160 102 259c0 4 -1 9 -1 13c0 3 1 7 5 9zM207 452c-39 -52 -91 -81 -127 -127c-16 -20 -24 -42 -24 -70c0 -7 0 -14 1 -20 c36 50 85 79 122 121c19 21 29 46 29 79c0 5 0 11 -1 17zM206 257c-42 -41 -85 -80 -125 -122c-25 -26 -28 -61 -29 -102c42 45 88 79 133 114c25 19 43 44 43 75c0 9 -2 19 -5 29c-3 8 -5 11 -8 11s-6 -2 -9 -5zM198 33c-70 -49 -144 -94 -156 -195c41 34 78 66 116 98 c19 16 31 38 42 59c3 6 4 11 4 16c0 7 -2 14 -6 22z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E248-flag128thUp.xml b/data/Petaluma/E248-flag128thUp.xml
deleted file mode 100644
index a1c621babf6..00000000000
--- a/data/Petaluma/E248-flag128thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M207 -804c-7 0 -8 3 -8 9c0 5 2 11 1 16s0 10 0 15c-8 86 -16 173 -63 249c-26 42 -63 76 -98 111c-19 19 -31 39 -31 66c0 29 -2 59 -2 89c0 20 1 38 3 57c4 33 5 67 5 100c0 26 -1 53 -1 79c0 20 1 39 2 59c1 14 2 29 2 43c0 39 -2 76 -2 112c0 33 -11 64 -14 97 c-1 9 -1 19 -1 28c0 29 0 57 1 87c1 25 -1 47 -1 71c0 10 10 20 12 31c3 11 13 11 20 14c1 0 2 1 3 1c5 0 5 -8 8 -13c4 -8 9 -15 9 -25c0 -37 25 -57 50 -78c22 -19 46 -35 67 -55c57 -57 82 -125 82 -201c0 -12 -1 -24 -2 -37c-1 -8 -4 -17 -10 -21c-9 -8 -12 -14 -12 -21 s4 -15 7 -24c10 -32 18 -63 18 -93c0 -29 -7 -57 -22 -86c-2 -2 -2 -4 -2 -6c0 -4 1 -7 2 -10c12 -38 21 -76 21 -114c0 -25 -4 -49 -13 -73c-6 -15 -7 -29 -7 -44c0 -26 6 -52 6 -77c0 -5 -1 -10 -1 -14c-2 -16 -1 -34 -7 -47c-5 -11 -7 -21 -7 -31c0 -14 3 -27 6 -41 c7 -37 13 -74 13 -111c0 -28 -3 -55 -12 -83c0 -2 0 -5 -1 -7c-6 -9 -11 -22 -21 -22zM211 104c1 95 -49 144 -159 226c26 -98 107 -152 159 -226zM188 -51c-20 78 -85 122 -130 186c-1 -7 -2 -13 -2 -19c0 -28 11 -48 32 -66c36 -32 74 -60 100 -101zM194 -275 c-7 80 -78 188 -137 212c-1 -5 -1 -10 -1 -15c0 -30 16 -55 36 -77c33 -39 70 -74 102 -120zM173 -423c-14 77 -82 117 -125 175c13 -79 89 -113 125 -175z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E249-flag128thDown.xml b/data/Petaluma/E249-flag128thDown.xml
deleted file mode 100644
index 968356dceff..00000000000
--- a/data/Petaluma/E249-flag128thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M207 754c10 0 15 -13 21 -22c1 -2 1 -5 1 -7c9 -28 12 -55 12 -83c0 -37 -6 -74 -13 -111c-3 -14 -6 -27 -6 -41c0 -10 2 -20 7 -31c6 -13 5 -31 7 -47c0 -4 1 -9 1 -14c0 -25 -6 -51 -6 -77c0 -15 1 -29 7 -44c9 -24 13 -48 13 -73c0 -38 -9 -76 -21 -114 c-1 -3 -2 -6 -2 -10c0 -2 0 -4 2 -6c15 -29 22 -57 22 -86c0 -30 -8 -61 -18 -93c-3 -9 -7 -17 -7 -24s3 -13 12 -21c6 -4 9 -13 10 -21c1 -13 2 -25 2 -37c0 -76 -25 -144 -82 -201c-21 -20 -45 -36 -67 -55c-25 -21 -50 -41 -50 -78c0 -10 -5 -17 -9 -25 c-3 -5 -3 -13 -8 -13c-1 0 -2 1 -3 1c-7 3 -29 6 -32 17c-2 13 0 93 0 99c-2 30 0 58 0 87c0 9 0 19 1 28c3 33 14 64 14 97c0 36 2 73 2 112c0 14 -1 29 -2 43c-1 20 -2 39 -2 59c0 26 1 53 1 79c0 33 -1 67 -5 100c-2 19 -3 37 -3 57c0 30 2 60 2 89c0 27 12 47 31 66 c35 35 72 69 98 111c47 76 55 163 63 249c0 5 -1 10 0 15s-1 11 -1 16c0 6 1 9 8 9zM173 373c-36 -62 -112 -96 -125 -175c43 58 111 98 125 175zM194 225c-32 -46 -69 -81 -102 -120c-20 -22 -36 -47 -36 -77c0 -5 0 -10 1 -15c59 24 130 132 137 212zM188 1 c-26 -41 -64 -69 -100 -101c-21 -18 -32 -38 -32 -66c0 -6 1 -12 2 -19c45 64 110 108 130 186zM211 -154c-52 -74 -133 -128 -159 -226c110 82 160 131 159 226z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24A-flag256thUp.xml b/data/Petaluma/E24A-flag256thUp.xml
deleted file mode 100644
index a53a7cc6273..00000000000
--- a/data/Petaluma/E24A-flag256thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M218 -827c-12 2 -5 18 -7 27c-2 12 -6 23 -4 36s3 25 3 37c0 88 -48 158 -100 227c-21 27 -43 55 -65 81c-31 36 -35 80 -36 123c-1 60 -2 120 -2 179c0 49 1 98 2 147c1 23 1 45 1 68c0 74 -3 148 -3 222c0 23 0 45 1 67c2 32 -1 64 -6 95c-1 9 -2 18 -2 27v86v62 c0 8 3 15 4 23c3 14 11 17 20 20h3c10 0 9 -12 9 -16c3 -73 55 -110 103 -151c39 -33 78 -68 102 -115c20 -40 31 -82 31 -123c0 -34 -8 -69 -22 -104c-2 -4 -3 -8 -3 -11s1 -6 2 -10c6 -20 8 -40 8 -59c0 -27 -5 -53 -12 -80c-2 -5 -2 -9 -2 -14c0 -13 5 -24 8 -37 c3 -14 4 -28 4 -42c0 -26 -4 -52 -11 -78c-3 -13 -5 -25 -5 -37c0 -13 2 -26 6 -39c5 -15 7 -30 7 -46c0 -14 -2 -29 -7 -43c-4 -11 -5 -22 -5 -32c0 -15 3 -30 5 -45c2 -10 2 -21 2 -31c0 -34 -8 -68 -17 -101c-2 -8 -3 -16 -3 -23c0 -17 5 -33 9 -49 c11 -40 18 -79 18 -119c0 -26 -3 -51 -9 -77c-2 -6 -3 -13 -6 -19c-5 -10 -8 -27 -21 -26zM225 231c2 10 3 18 3 26c0 15 -4 29 -13 50c-33 78 -106 118 -165 177c-3 -46 14 -80 39 -111c40 -50 95 -86 136 -142zM209 71c0 25 -11 47 -23 68c-30 54 -90 79 -126 128 c-3 -31 10 -56 26 -78c34 -47 85 -76 123 -118zM203 -104c3 8 4 14 4 20c0 4 0 8 -2 13c-10 25 -28 43 -47 62c-32 32 -74 55 -103 93c0 -28 14 -50 33 -68c40 -38 85 -69 115 -120zM185 -231c-23 71 -87 106 -137 158c0 -27 9 -46 27 -59c40 -29 78 -61 110 -99zM194 -480 c3 21 8 38 8 55c0 9 -1 17 -5 26c-27 67 -73 117 -133 156c-4 2 -7 4 -10 4c-4 0 -6 -5 -6 -19c0 -23 8 -42 22 -59c42 -52 89 -100 124 -163z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24B-flag256thDown.xml b/data/Petaluma/E24B-flag256thDown.xml
deleted file mode 100644
index 801935e08d7..00000000000
--- a/data/Petaluma/E24B-flag256thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M218 777c13 1 16 -16 21 -26c3 -6 4 -13 6 -19c6 -26 9 -51 9 -77c0 -40 -7 -79 -18 -119c-4 -16 -9 -32 -9 -49c0 -7 1 -15 3 -23c9 -33 17 -67 17 -101c0 -10 0 -21 -2 -31c-2 -15 -5 -30 -5 -45c0 -10 1 -21 5 -32c5 -14 7 -29 7 -43c0 -16 -2 -31 -7 -46 c-4 -13 -6 -26 -6 -39c0 -12 2 -24 5 -37c7 -26 11 -52 11 -78c0 -14 -1 -28 -4 -42c-3 -13 -8 -24 -8 -37c0 -5 0 -9 2 -14c7 -27 12 -53 12 -80c0 -19 -2 -39 -8 -59c-1 -4 -2 -7 -2 -10s1 -7 3 -11c14 -35 22 -70 22 -104c0 -41 -11 -83 -31 -123 c-24 -47 -63 -82 -102 -115c-48 -41 -100 -78 -103 -151c0 -4 1 -16 -9 -16h-3c-9 3 -17 6 -20 20c-1 8 -2 16 -2 24c0 20 -1 42 -1 61c0 29 -1 57 -1 86c0 9 1 18 2 27c5 31 8 63 6 95c-1 22 -1 44 -1 67c0 74 3 148 3 222c0 23 0 45 -1 68c-1 49 -2 98 -2 147 c0 59 1 119 2 179c1 43 5 87 36 123c22 26 44 54 65 81c52 69 100 139 100 227c0 12 -1 24 -3 37s2 24 4 36c2 9 -5 25 7 27zM194 430c-35 -63 -82 -111 -124 -163c-14 -17 -22 -36 -22 -59c0 -14 2 -19 6 -19c3 0 6 2 10 4c60 39 106 89 133 156c4 9 5 17 5 26 c0 17 -5 34 -8 55zM185 181c-32 -38 -70 -70 -110 -99c-18 -13 -27 -32 -27 -59c50 52 114 87 137 158zM203 54c-30 -51 -75 -82 -115 -120c-19 -18 -33 -40 -33 -68c29 38 71 61 103 93c19 19 37 37 47 62c2 5 2 9 2 13c0 6 -1 12 -4 20zM209 -121 c-38 -42 -89 -71 -123 -118c-16 -22 -29 -47 -26 -78c36 49 96 74 126 128c12 21 23 43 23 68zM225 -281c-41 -56 -96 -92 -136 -142c-25 -31 -42 -65 -39 -111c59 59 132 99 165 177c9 21 13 35 13 50c0 8 -1 16 -3 26z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24C-flag512thUp.xml b/data/Petaluma/E24C-flag512thUp.xml
deleted file mode 100644
index 903d81175c7..00000000000
--- a/data/Petaluma/E24C-flag512thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M211 -842c-5 3 -4 8 -4 13c-1 12 -2 23 -2 35c0 22 3 44 10 66c4 11 6 22 6 33c0 29 -13 56 -27 83c-28 56 -71 100 -113 144s-67 94 -67 156c0 73 -12 144 -17 215c-1 26 -3 53 -3 79c0 27 2 53 6 79c1 9 1 18 1 26c-1 54 -4 108 -4 162c0 22 1 44 2 66c3 39 3 77 3 116 c0 61 -2 123 -2 185c0 38 2 75 2 114c0 27 -2 53 -2 80c0 9 1 18 1 27c0 13 2 27 6 40c2 9 11 14 19 14c5 0 10 -2 12 -7c35 -70 106 -100 159 -150c25 -23 49 -45 66 -75c14 -27 21 -53 21 -79c0 -35 -12 -68 -38 -99c-2 -3 -3 -5 -3 -7c0 -4 5 -7 7 -11 c12 -27 20 -54 20 -81c0 -16 -3 -33 -10 -50c-3 -6 -5 -12 -9 -17c-5 -9 -13 -17 -23 -16c-8 1 -9 6 -9 12c0 38 -22 66 -43 93c-30 38 -66 70 -96 116c4 -85 47 -144 95 -199c41 -47 79 -94 88 -158c4 -26 7 -51 7 -76c0 -23 -3 -46 -9 -68c-4 -15 -6 -30 -6 -45 c0 -6 0 -13 1 -19c2 -26 -4 -50 -13 -72c-3 -8 -5 -15 -5 -22c0 -5 1 -11 3 -17c8 -21 11 -42 11 -64c0 -25 -4 -50 -10 -75c-1 -5 -2 -10 -2 -14c0 -6 1 -11 3 -16c15 -38 23 -75 23 -113c0 -35 -7 -69 -22 -104c-2 -3 -2 -6 -2 -9c0 -4 1 -8 3 -12c8 -25 13 -51 16 -77 c2 -13 3 -26 3 -39c0 -48 -11 -94 -27 -140c-3 -7 -6 -13 -11 -18c-5 -4 -10 -8 -15 -5zM231 496c-4 97 -80 139 -145 189c31 -77 92 -129 145 -189zM217 94c-25 89 -106 138 -145 214c-1 -41 2 -80 33 -110c31 -31 62 -63 93 -93c4 -5 8 -12 19 -11zM202 -81 c-24 83 -100 124 -152 185c24 -83 103 -121 152 -185zM206 -260c-25 93 -110 136 -163 205c0 -33 6 -62 30 -86c42 -42 87 -80 133 -119zM218 -494c3 51 -13 95 -51 131c-36 34 -72 67 -110 103c-3 -42 23 -66 44 -93c38 -47 87 -86 117 -141z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24D-flag512thDown.xml b/data/Petaluma/E24D-flag512thDown.xml
deleted file mode 100644
index a7a911fb02c..00000000000
--- a/data/Petaluma/E24D-flag512thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M211 794c5 3 10 -1 15 -5c5 -5 8 -11 11 -18c16 -46 27 -92 27 -140c0 -13 -1 -26 -3 -39c-3 -26 -8 -52 -16 -77c-2 -4 -3 -8 -3 -12c0 -3 0 -6 2 -9c15 -35 22 -69 22 -104c0 -38 -8 -75 -23 -113c-2 -5 -3 -10 -3 -16c0 -4 1 -9 2 -14c6 -25 10 -50 10 -75 c0 -22 -3 -43 -11 -64c-2 -6 -3 -12 -3 -17c0 -7 2 -14 5 -22c9 -22 15 -46 13 -72c-1 -6 -1 -13 -1 -19c0 -15 2 -30 6 -45c6 -22 9 -45 9 -68c0 -25 -3 -50 -7 -76c-9 -64 -47 -111 -88 -158c-48 -55 -91 -114 -95 -199c30 46 66 78 96 116c21 27 43 55 43 93 c0 6 1 11 9 12c10 1 18 -7 23 -16c4 -5 6 -11 9 -17c7 -17 10 -34 10 -50c0 -27 -8 -54 -20 -81c-2 -4 -7 -7 -7 -11c0 -2 1 -4 3 -7c26 -31 38 -64 38 -99c0 -26 -7 -52 -21 -79c-17 -30 -41 -52 -66 -75c-53 -50 -124 -80 -159 -150c-2 -5 -7 -7 -12 -7c-8 0 -17 5 -19 14 c-4 13 -6 27 -6 40c0 9 -1 18 -1 27c0 27 2 53 2 80c0 39 -2 76 -2 114c0 62 2 124 2 185c0 39 0 77 -3 116c-1 22 -2 44 -2 66c0 54 3 108 4 162c0 8 0 17 -1 26c-4 26 -6 52 -6 79c0 26 2 53 3 79c5 71 17 142 17 215c0 62 25 112 67 156s85 88 113 144c14 27 27 54 27 83 c0 11 -2 22 -6 33c-7 22 -10 44 -10 66c0 12 1 23 2 35c0 5 -1 10 4 13zM218 446c-30 -55 -79 -94 -117 -141c-21 -27 -47 -51 -44 -93c38 36 74 69 110 103c38 36 54 80 51 131zM206 212c-46 -39 -91 -77 -133 -119c-24 -24 -30 -53 -30 -86c53 69 138 112 163 205zM202 33 c-49 -64 -128 -102 -152 -185c52 61 128 102 152 185zM217 -142c-11 1 -15 -6 -19 -11c-31 -30 -62 -62 -93 -93c-31 -30 -34 -69 -33 -110c39 76 120 125 145 214zM231 -544c-53 -60 -114 -112 -145 -189c65 50 141 92 145 189z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24E-flag1024thUp.xml b/data/Petaluma/E24E-flag1024thUp.xml
deleted file mode 100644
index 520f1bf6c56..00000000000
--- a/data/Petaluma/E24E-flag1024thUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 -822c-5 2 -6 7 -6 14c0 36 3 72 8 109c1 7 2 15 2 22c0 52 -29 92 -70 128c-58 50 -108 109 -122 185c-9 46 -16 93 -16 140c0 11 0 22 1 34c2 25 2 49 2 74v87c0 14 0 28 1 42c3 79 9 158 9 237c-1 72 -9 144 -12 217c-2 27 2 54 7 81c1 7 1 13 1 20v4 c0 4 0 7 -1 11c-6 34 -8 67 -8 100s2 66 3 99c2 46 3 92 3 137c0 31 0 61 -2 92c-1 19 4 38 10 56c4 10 13 11 21 13h2c6 0 7 -7 7 -11c6 -65 54 -97 100 -130c54 -39 95 -87 108 -155c4 -20 6 -40 9 -61c0 -23 -5 -45 -16 -64c-4 -8 -6 -16 -6 -23c0 -8 2 -16 7 -25 c14 -32 21 -65 21 -98c0 -28 -5 -56 -15 -83c-3 -5 -4 -10 -4 -15c1 -13 6 -24 8 -36c2 -8 2 -17 2 -25c0 -23 -4 -45 -9 -67c-2 -7 -3 -15 -3 -22c1 -11 3 -21 7 -32c15 -34 22 -70 22 -105c0 -33 -6 -67 -17 -100c-7 -20 -13 -39 -13 -61c0 -5 0 -10 1 -15 c1 -7 2 -13 2 -20c0 -15 -3 -30 -7 -44c-2 -7 -3 -13 -3 -20c0 -11 3 -21 8 -33c12 -25 22 -52 22 -80c0 -15 -2 -30 -9 -46c-1 -3 -1 -7 -3 -9c-10 -10 -14 -21 -14 -32c0 -14 6 -28 11 -43c6 -19 9 -39 9 -58c0 -30 -8 -59 -23 -86c-2 -3 -3 -5 -3 -7c0 -5 2 -9 3 -13 c11 -35 15 -69 15 -104c0 -36 -4 -71 -11 -107c-4 -22 -9 -42 -21 -60c-4 -7 -9 -16 -18 -12zM198 676c-7 99 -80 147 -154 200c11 -102 93 -142 154 -200zM205 478c-17 99 -107 138 -163 204c2 -32 14 -60 34 -84c37 -46 88 -77 129 -120zM204 304 c-21 89 -107 122 -158 185c17 -92 102 -126 158 -185zM213 46c8 118 -70 174 -147 236c25 -95 101 -152 147 -236zM187 -87c-24 83 -94 132 -132 202c0 -87 48 -148 132 -202zM215 -310c-11 45 -31 82 -66 112c-33 28 -68 53 -94 87c22 -91 88 -147 160 -199zM208 -483 c-7 22 -12 45 -30 62c-42 40 -90 72 -123 121c27 -81 98 -125 153 -183z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24F-flag1024thDown.xml b/data/Petaluma/E24F-flag1024thDown.xml
deleted file mode 100644
index 8a9020e87b9..00000000000
--- a/data/Petaluma/E24F-flag1024thDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M31 -1200h-2c-8 2 -17 3 -21 13c-6 18 -11 37 -10 56c2 31 2 61 2 92c0 45 -1 91 -3 137c-1 33 -3 66 -3 99s2 66 8 100c1 4 1 7 1 11v4c0 7 0 13 -1 20c-5 27 -9 54 -7 81c3 73 11 145 12 217c0 79 -6 158 -9 237c-1 14 -1 28 -1 42v87c0 25 0 49 -2 74 c-1 12 -1 23 -1 34c0 47 7 94 16 140c14 76 64 135 122 185c41 36 70 76 70 128c0 7 -1 15 -2 22c-5 37 -8 73 -8 109c0 7 1 12 6 14c2 1 3 1 4 1c7 0 11 -7 14 -13c12 -18 17 -38 21 -60c7 -36 11 -71 11 -107c0 -35 -4 -69 -15 -104c-1 -4 -3 -8 -3 -13c0 -2 1 -4 3 -7 c15 -27 23 -56 23 -86c0 -19 -3 -39 -9 -58c-5 -15 -11 -29 -11 -43c0 -11 4 -22 14 -32c2 -2 2 -6 3 -9c7 -16 9 -31 9 -46c0 -28 -10 -55 -22 -80c-5 -12 -8 -22 -8 -33c0 -7 1 -13 3 -20c4 -14 7 -29 7 -44c0 -7 -1 -13 -2 -20c-1 -5 -1 -10 -1 -15c0 -22 6 -41 13 -61 c11 -33 17 -67 17 -100c0 -35 -7 -71 -22 -105c-4 -11 -6 -21 -7 -32c0 -7 1 -15 3 -22c5 -22 9 -44 9 -67c0 -8 0 -17 -2 -25c-2 -12 -7 -23 -8 -36c0 -5 1 -10 4 -15c10 -27 15 -55 15 -83c0 -33 -7 -66 -21 -98c-5 -9 -7 -17 -7 -25c0 -7 2 -15 6 -23 c11 -19 16 -41 16 -64c-3 -21 -5 -41 -9 -61c-13 -68 -54 -116 -108 -155c-46 -33 -94 -65 -100 -130c0 -4 -1 -11 -7 -11zM55 180c33 49 81 81 123 121c18 17 23 40 30 62c-55 -58 -126 -102 -153 -183zM55 -9c26 34 61 59 94 87c35 30 55 67 66 112 c-72 -52 -138 -108 -160 -199zM55 -235c38 70 108 119 132 202c-84 -54 -132 -115 -132 -202zM66 -402c77 62 155 118 147 236c-46 -84 -122 -141 -147 -236zM46 -609c51 63 137 96 158 185c-56 -59 -141 -93 -158 -185zM42 -802c56 66 146 105 163 204 c-41 -43 -92 -74 -129 -120c-20 -24 -32 -52 -34 -84zM44 -996c74 53 147 101 154 200c-61 -58 -143 -98 -154 -200z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E260-accidentalFlat.xml b/data/Petaluma/E260-accidentalFlat.xml
deleted file mode 100644
index 20cbc3182ac..00000000000
--- a/data/Petaluma/E260-accidentalFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -208c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c0 85 14 168 17 253c2 59 5 118 5 177v31c-1 28 2 57 3 85c0 14 8 23 19 24h1c10 0 10 -13 12 -20c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -4 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5 c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM47 -73c45 32 87 66 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66c-3 -28 -4 -55 -6 -81z " /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E261-accidentalNatural.xml b/data/Petaluma/E261-accidentalNatural.xml
deleted file mode 100644
index ee6d09c3a45..00000000000
--- a/data/Petaluma/E261-accidentalNatural.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M177 -456c-13 0 -10 16 -13 26c-7 24 -9 48 -9 72c0 36 5 73 5 109v95l-5 -1l-121 -18c-4 -1 -7 -1 -10 -1c-12 0 -19 5 -19 22c0 19 -3 39 -3 59c-1 29 -2 58 -2 88c0 35 1 70 2 105c3 101 11 201 10 302c0 20 -6 50 27 60c7 -16 10 -32 10 -49c1 -19 1 -37 1 -56 c0 -57 -3 -115 -6 -172c49 4 98 9 145 22c21 5 17 -17 22 -27c4 -9 2 -21 2 -24l-1 -18v-6l-1 -12v-3c-1 -13 -3 -28 -3 -28c-2 -67 -5 -134 -7 -201c0 -32 2 -64 2 -96c-2 -70 -3 -139 -5 -208c0 -6 -2 -11 -3 -17c-4 -9 -7 -23 -18 -23zM40 -44v-12c40 5 81 12 121 23 c0 26 2 53 3 79l3 30l-6 -1c-34 -1 -68 -3 -102 -6c-7 -1 -14 0 -20 0l-1 -13c-1 -33 1 -66 2 -100z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E262-accidentalSharp.xml b/data/Petaluma/E262-accidentalSharp.xml
deleted file mode 100644
index 65f1c958ee5..00000000000
--- a/data/Petaluma/E262-accidentalSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M140 -384c-9 0 -7 12 -9 19c-12 34 -16 68 -16 103c0 14 0 27 1 40c-36 -8 -72 -15 -108 -23c-4 -1 -7 -2 -9 -2c-8 1 -11 6 -11 17c-1 23 -10 45 -10 69s12 32 33 37c37 9 74 16 111 23c2 16 4 32 5 49l3 90c-32 -6 -64 -11 -97 -16c-4 -1 -7 -2 -10 -2 c-13 1 -18 7 -16 26c1 12 -7 25 -4 36c0 45 6 51 47 58c28 5 56 9 84 15c1 31 2 62 4 94c0 16 -3 35 19 46c8 -15 8 -29 9 -44c2 -30 3 -60 3 -90l53 12c-1 58 -3 116 -3 175v19c1 11 11 14 19 16h3h1c6 0 5 -9 7 -14c9 -43 11 -87 13 -130l3 -54c32 9 63 19 94 32 c4 2 8 2 11 2h2c6 0 9 -5 13 -15s5 -21 5 -31c0 -18 -5 -35 -9 -53c-4 -16 -17 -24 -32 -29c-27 -9 -54 -17 -82 -24c0 -32 -1 -64 -2 -96c-1 -15 -1 -30 -2 -44l17 3c24 4 49 9 72 15c4 1 7 1 11 1h2c11 0 16 -9 17 -22c1 -10 0 -19 0 -32c-4 -53 -11 -61 -66 -72l-58 -12 c1 -24 3 -49 3 -73c0 -8 0 -16 -1 -25c0 -12 -1 -25 -8 -36c-3 -5 -5 -12 -11 -11c-6 0 -10 6 -11 11c-14 40 -22 81 -24 123l-44 -9c-1 -20 -3 -40 -5 -60c-1 -7 -1 -16 -1 -23c0 -11 1 -21 1 -32c0 -12 -1 -25 -5 -38c-2 -7 -4 -18 -12 -19zM167 -92l42 9 c3 46 5 92 10 138c-16 -4 -32 -7 -49 -10c0 -24 0 -47 -1 -71c-1 -22 -1 -44 -2 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E263-accidentalDoubleSharp.xml b/data/Petaluma/E263-accidentalDoubleSharp.xml
deleted file mode 100644
index d9a5350831f..00000000000
--- a/data/Petaluma/E263-accidentalDoubleSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M58 -159c-5 0 -10 3 -15 10c-10 15 -25 27 -35 42c-6 7 -8 14 -8 21s4 15 10 21c21 22 43 43 64 63c-6 5 -12 9 -18 13c-17 11 -28 53 -28 84c0 12 2 22 5 29c4 6 10 5 14 8c3 2 5 2 7 2c3 0 6 -1 10 -4c28 -18 56 -38 83 -58c14 17 28 33 43 49c8 9 18 17 28 25 c10 9 18 13 25 13s14 -6 22 -20c11 -17 19 -36 22 -51c0 -14 -2 -21 -8 -25c-19 -16 -36 -34 -53 -53l36 -29c16 -13 23 -29 24 -52c-4 -16 -1 -36 -11 -53c-5 -9 -11 -15 -18 -15c-5 0 -10 3 -16 8c-26 22 -53 44 -80 65c-7 -7 -14 -14 -22 -21c-23 -20 -43 -42 -65 -63 c-6 -6 -11 -9 -16 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E264-accidentalDoubleFlat.xml b/data/Petaluma/E264-accidentalDoubleFlat.xml
deleted file mode 100644
index defe663c9f4..00000000000
--- a/data/Petaluma/E264-accidentalDoubleFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 -220c-3 0 -6 0 -9 2c-11 4 -10 14 -13 24c-6 26 -8 51 -8 77c0 54 9 109 10 163c1 75 8 150 8 225c0 29 -1 57 -4 86c-1 5 -1 11 -1 16c0 10 1 20 3 30c2 12 12 14 21 16h2c8 0 7 -9 10 -15c5 -11 7 -24 7 -37c1 -49 4 -99 4 -148c0 -20 -1 -40 -2 -60 c0 -3 1 -6 1 -11c19 9 38 17 55 17c20 0 39 -9 58 -35v39c0 41 -1 81 -1 121c0 37 1 73 5 109c2 11 4 22 7 33c2 10 13 13 20 14h1c8 0 5 -10 8 -15c5 -12 3 -25 3 -38v-203h1c6 0 9 6 14 9c17 13 35 20 54 20c9 0 19 -2 29 -6c38 -16 46 -54 46 -93c0 -45 -12 -87 -36 -125 c-34 -54 -67 -108 -114 -153c-7 -7 -12 -17 -29 -13c-14 4 -13 9 -14 18c-3 21 -4 41 -4 62c0 16 1 32 2 49c-17 -29 -35 -59 -53 -87s-36 -57 -61 -80c-6 -6 -12 -11 -20 -11zM209 -50c37 40 67 84 97 129c2 3 3 6 3 9c0 4 -3 8 -7 11c-11 10 -23 16 -36 16 c-7 0 -15 -2 -22 -5c-21 -9 -33 -26 -34 -50v-55c0 -18 0 -36 -1 -55zM52 -102c35 36 57 81 81 125c1 1 1 3 1 5c0 3 -1 6 -2 8c-11 12 -24 22 -40 22c-3 0 -6 0 -10 -1c-18 -4 -31 -14 -31 -36c1 -41 1 -81 1 -123z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E265-accidentalTripleSharp.xml b/data/Petaluma/E265-accidentalTripleSharp.xml
deleted file mode 100644
index 59d12677468..00000000000
--- a/data/Petaluma/E265-accidentalTripleSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M122 -347h-1c-12 0 -7 18 -10 28c-7 31 -8 63 -7 95c-25 -7 -51 -13 -76 -20c-9 -2 -15 -4 -19 -4c-10 1 -10 8 -10 30c-2 5 -2 12 -2 19c0 12 1 25 2 38c1 14 8 22 21 25c30 6 59 13 88 21c1 38 3 75 6 113c-43 -9 -87 -17 -130 -26c-3 -1 -6 -1 -8 -1 c-11 0 -16 8 -15 22c1 6 0 13 0 19v2c-1 10 -1 18 -1 25c0 35 11 42 58 49c34 5 67 12 100 19c0 51 -2 101 -4 152c0 8 1 16 2 24c2 10 12 13 20 16c1 0 2 1 2 1c6 -1 6 -10 9 -14c9 -19 10 -40 10 -61c1 -18 1 -36 1 -54c0 -19 0 -37 -1 -55c25 6 49 11 73 17v54 c-1 34 -7 67 -5 100c0 15 3 29 4 43s11 16 19 17c1 1 2 1 2 1c8 0 8 -10 10 -16c4 -14 4 -29 4 -44c0 -16 0 -31 1 -46c2 -33 4 -66 4 -99c22 5 44 11 67 15c7 3 14 3 19 3c18 0 26 -9 26 -30c0 -4 -1 -8 -1 -12c-7 -54 -14 -64 -66 -78c-16 -4 -32 -7 -48 -11l-3 -102 c20 5 41 11 62 17c7 1 13 2 18 2c18 1 24 -12 22 -37c-8 -62 -20 -74 -69 -85c-13 -3 -26 -7 -38 -10c-2 -32 -3 -65 -5 -97c-1 -18 -5 -37 -27 -48c-6 25 -7 50 -7 75v32c0 10 1 19 1 29l-72 -18c-2 -32 -3 -64 -5 -96v-8c-4 -12 -7 -31 -21 -31zM408 -235 c-13 1 -12 14 -15 23c-2 5 -6 10 -8 15c-5 14 -10 27 -10 40c0 15 5 29 19 44c17 18 32 37 48 56c-11 9 -21 19 -30 29c-15 16 -11 39 -18 58c-5 12 -1 27 -2 40v2c0 14 14 14 22 19c1 1 3 1 4 1c5 0 8 -7 10 -12c11 -20 28 -35 46 -48c8 -6 16 -11 23 -17 c17 21 33 41 51 61c11 12 23 32 39 26c17 -6 19 -29 21 -47c1 -5 0 -10 0 -15c1 -3 1 -6 1 -9c0 -16 -8 -29 -19 -42c-7 -9 -14 -18 -21 -26c11 -8 22 -15 34 -21c21 -11 26 -30 26 -50c0 -4 -1 -9 -1 -14c0 -17 1 -34 -12 -47c-5 -5 -9 -8 -14 -8c-4 0 -7 1 -11 4 c-26 22 -54 42 -81 62c-26 -35 -52 -70 -78 -104c-7 -9 -11 -22 -24 -20zM154 -103c23 7 46 13 69 20c1 34 3 69 4 104c-23 -6 -46 -10 -70 -15c0 -36 -2 -73 -3 -109z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E266-accidentalTripleFlat.xml b/data/Petaluma/E266-accidentalTripleFlat.xml
deleted file mode 100644
index 6ca1aa4d33b..00000000000
--- a/data/Petaluma/E266-accidentalTripleFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M408 -205c-7 3 -6 10 -5 17c0 2 0 3 -1 4c-13 53 -13 108 -13 162v30c-3 -12 -8 -24 -13 -36c-29 -60 -78 -104 -125 -151c-3 -3 -8 -6 -12 -6c-1 0 -1 1 -1 1s0 -1 -1 -1c-2 -3 -7 -8 -11 -7c-4 0 -5 6 -7 11c-9 37 -12 74 -13 112c-3 118 -5 236 -5 354 c0 50 5 99 8 149c0 13 8 23 19 23c12 0 14 -14 15 -24c2 -16 1 -32 1 -48c-4 -50 -5 -99 -5 -148c0 -34 0 -69 1 -103v-5c3 2 7 4 11 6c18 7 36 14 55 17c4 1 8 1 11 1c23 0 40 -16 52 -35c9 -13 15 -27 19 -40v78c0 86 1 172 4 258c1 14 2 28 17 28c16 0 17 -17 17 -29 v-240h1v-24c4 3 10 5 16 7c18 5 36 10 54 10c20 0 39 -6 57 -22c27 -24 35 -55 35 -88c0 -7 0 -16 -1 -24c-12 -94 -68 -158 -140 -213l-7 -6c-11 -7 -21 -24 -33 -18zM44 -200c-4 0 -8 3 -9 11v2c-2 -2 -4 -3 -7 -3c-9 1 -7 11 -10 19c-22 59 -12 121 -17 182 c0 56 -1 112 -1 168c0 28 0 56 1 83c2 43 1 86 7 129c2 14 11 21 21 23c1 -1 1 -1 2 -1c9 0 8 -12 11 -19c4 -9 6 -19 6 -30c0 -7 -1 -16 -2 -24c-3 -55 -4 -110 -4 -165v-51c16 7 32 14 48 18c13 3 24 5 34 5c48 0 69 -33 69 -87c0 -94 -52 -164 -111 -228 c-8 -10 -17 -19 -27 -27c-4 -3 -8 -5 -11 -5zM429 -94c3 3 7 6 11 8c37 26 67 59 92 97c3 4 5 8 5 12c0 5 -3 9 -8 14c-16 16 -34 24 -53 24c-14 1 -28 -3 -43 -11l-7 -3c1 -24 1 -48 1 -73c0 -22 1 -45 2 -68zM243 28l3 -104c8 9 17 18 26 27c21 21 37 44 55 65 c5 5 7 10 7 13c0 7 -7 10 -15 14c-6 3 -13 4 -19 4c-17 1 -33 -10 -49 -16zM47 -91c32 32 63 66 86 106c3 6 5 10 5 14c0 7 -6 11 -19 11c-28 1 -52 -6 -74 -21c0 -1 -1 -1 -1 -1c1 -14 1 -29 2 -44c1 -22 1 -43 1 -65z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E267-accidentalNaturalFlat.xml b/data/Petaluma/E267-accidentalNaturalFlat.xml
deleted file mode 100644
index 83f6a1a04d2..00000000000
--- a/data/Petaluma/E267-accidentalNaturalFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M250 -198c-3 2 -4 4 -4 7c0 4 2 9 3 13c1 3 1 7 2 12c-4 14 -4 29 -4 43c0 96 1 190 8 284c5 84 2 168 4 252c0 6 0 11 1 17c0 12 11 16 19 18h3c8 0 6 -11 8 -15c9 -27 11 -56 11 -85c0 -11 -1 -22 -1 -34c-1 -64 -3 -128 -6 -192c26 29 65 46 99 57c6 2 14 3 21 3 c41 3 60 -17 60 -79c0 -8 0 -17 -1 -27c-9 -69 -57 -145 -126 -209c-24 -21 -49 -41 -76 -59c-6 -4 -13 -12 -21 -6zM157 -341c-5 2 -4 8 -5 13c-3 22 -4 44 -4 66c0 28 1 56 2 84v11c-5 -3 -11 -5 -18 -8c-28 -9 -56 -20 -84 -31c-4 -2 -8 -2 -11 -2c-10 0 -18 3 -22 1 c-8 39 -9 76 -10 113c-2 74 -5 146 -5 219c0 46 1 92 4 138c3 33 7 65 10 98c2 12 10 19 21 19c0 1 1 1 1 1c10 0 8 -12 11 -18c4 -9 5 -17 5 -26c0 -15 -4 -30 -6 -45c-4 -49 -7 -98 -8 -146c2 0 5 1 8 2c33 7 66 18 97 33c9 5 30 17 40 17c13 0 13 -15 13 -23v-113h2 c-4 -112 -7 -225 -12 -337c-1 -20 -2 -42 -16 -59c-3 -4 -7 -10 -13 -7zM44 -100h1c36 8 69 24 103 36l5 2c1 51 3 103 4 155c-7 -9 -17 -17 -29 -22c-29 -13 -59 -22 -89 -32c1 -16 1 -32 2 -48c2 -31 3 -61 3 -91zM288 -89c2 2 5 4 8 6c47 28 80 70 113 113 c5 7 12 14 12 23c0 4 -1 7 -3 11c-9 14 -23 17 -38 15c-34 -6 -62 -23 -85 -49l-5 -6c-1 -37 0 -75 -2 -113z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E268-accidentalNaturalSharp.xml b/data/Petaluma/E268-accidentalNaturalSharp.xml
deleted file mode 100644
index be2cb308a6e..00000000000
--- a/data/Petaluma/E268-accidentalNaturalSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M314 -370c-11 0 -11 12 -11 22c0 38 -2 77 -2 115v17c-16 -3 -32 -7 -48 -10c-13 -3 -21 -5 -27 -5c-12 0 -13 9 -15 35c0 7 -1 13 -2 16c2 54 7 59 56 70c12 2 24 5 36 7c0 42 -1 83 -1 125l-66 -12c-12 -3 -25 -4 -37 -8c-2 -1 -4 -1 -6 -1c-8 0 -11 7 -10 14 c1 5 1 9 1 14c0 12 -1 24 -1 35c0 6 0 12 1 18c3 20 12 30 31 34c27 6 54 11 82 15c1 0 2 1 3 1v100c0 16 3 31 5 47c1 12 9 17 19 19c1 -1 2 -1 4 -1h1c8 0 6 -10 8 -16c5 -13 6 -28 6 -42c0 -33 -2 -65 -2 -98c30 8 59 18 89 27v186c0 16 2 32 19 32c21 0 19 -25 19 -41 v-165c20 6 41 12 62 12c27 1 35 -13 35 -50c0 -50 -21 -75 -72 -85c-7 -1 -14 -2 -22 -4c1 -20 1 -40 1 -60s0 -40 -1 -60c28 7 57 13 86 19c5 1 10 2 15 2c16 0 24 -8 24 -24c1 -4 0 -9 0 -13c-11 -58 -11 -75 -77 -87l-48 -9c0 -39 0 -77 -4 -115c0 -4 0 -9 -1 -12 c-4 -11 -8 -27 -21 -27c-5 1 -7 5 -7 10s2 11 1 15c-6 40 -7 80 -7 121c-30 -7 -60 -13 -90 -20v-86c0 -20 -2 -41 -10 -60c-3 -7 -8 -17 -16 -17zM157 -358c-9 2 -8 13 -8 20l-3 96c-1 34 -3 69 -4 103c-7 -4 -14 -8 -24 -12c-33 -13 -66 -27 -95 -48l-2 -2 c-3 -4 -18 -4 -20 -3c-3 2 -4 6 -4 10s1 7 1 10c1 7 -4 88 -2 121c3 49 7 172 7 173c1 25 -3 94 -3 148c1 27 1 51 4 62c2 12 9 17 18 19c1 -1 2 -1 2 -1c9 0 8 -10 10 -16c3 -7 4 -16 4 -24c1 -52 1 -104 1 -157l66 27c14 5 26 6 35 6c10 1 17 -1 20 0c0 -1 1 -1 1 -1 c11 0 9 -12 10 -17c3 -35 5 -69 6 -103v-34c1 -11 1 -22 1 -33v-34c0 -63 9 -127 9 -191c0 -21 -1 -43 -4 -65c-1 -13 -2 -27 -9 -39c-4 -7 -9 -16 -17 -15zM35 -89c33 19 68 34 103 49c0 1 1 1 1 1l-3 123c-8 -11 -22 -19 -45 -27c-18 -7 -36 -16 -53 -24 c-1 -12 -1 -24 -1 -36c0 -29 -1 -57 -2 -86zM340 -94c30 6 60 13 89 19c0 40 -1 80 -1 120c-29 -5 -59 -11 -89 -16c1 -41 1 -82 1 -123z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E269-accidentalSharpSharp.xml b/data/Petaluma/E269-accidentalSharpSharp.xml
deleted file mode 100644
index da02c970029..00000000000
--- a/data/Petaluma/E269-accidentalSharpSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M403 -393c-9 0 -7 9 -7 14c-7 59 -8 118 -9 176l-46 -10c-4 -1 -8 -2 -11 -2c-11 0 -15 8 -16 22l2 65s-36 -9 -48 -13c-2 0 -4 -1 -6 -2v-129c0 -18 -2 -35 -11 -51c-3 -4 -5 -8 -10 -8c-6 0 -8 6 -8 12c-3 31 -10 62 -10 95c0 23 0 47 1 70l-70 -21v-35 c0 -23 1 -46 1 -69c0 -22 -1 -45 -3 -67c-1 -8 -1 -15 -4 -22c-3 -8 -8 -17 -16 -17c-10 0 -8 12 -10 20c-8 33 -11 68 -11 102c0 26 2 51 3 76c-34 -11 -68 -22 -101 -35c-7 -3 -13 -4 -17 -4c-9 0 -11 7 -12 24c-1 15 -4 30 -4 39c1 42 2 45 43 58c32 10 64 19 95 29v117 c-31 -8 -62 -17 -92 -27c-10 -4 -16 -6 -20 -6c-8 0 -9 7 -8 26c0 17 -1 34 -1 50c0 24 14 34 36 40l87 24l3 144v17c1 12 10 19 20 21h3c10 0 7 -13 9 -19c3 -11 5 -23 5 -35c0 -8 -1 -18 -2 -26c-1 -31 -2 -61 -2 -92l64 18c-1 55 -1 110 -2 165c0 14 2 28 4 43 c2 13 11 15 20 17c1 0 2 1 3 1c8 0 6 -9 9 -14c7 -13 8 -26 8 -40v-159l44 12c13 4 24 6 32 6c15 0 20 -8 20 -27c0 -5 0 -12 -1 -20c-1 -4 -2 -7 -3 -14l28 4v113c0 12 1 24 2 36c0 12 9 17 18 19c1 -1 2 -1 2 -1h1c9 0 7 -11 9 -17c5 -27 6 -55 6 -83v-61c27 4 55 9 82 14 c0 31 1 62 1 93c1 36 2 72 4 108c0 6 1 13 3 18c3 8 11 11 18 11h1c8 0 5 -9 8 -13c3 -5 3 -10 3 -15c0 -65 1 -131 1 -194c23 5 46 10 69 16c4 1 7 1 10 2c7 2 13 2 18 2c23 0 35 -13 35 -38c0 -4 0 -9 -1 -13c-7 -56 -17 -64 -72 -75l-60 -12c-3 -39 -4 -78 -4 -116 c5 2 10 3 15 4c29 8 58 18 87 25c6 1 12 2 17 2c18 0 23 -11 23 -41c0 -43 -12 -76 -67 -86c-25 -5 -50 -10 -76 -16c0 -39 -1 -78 -5 -116c-1 -15 -3 -30 -15 -42c-4 -3 -7 -6 -9 -5c-3 1 -5 3 -6 9c-2 17 -3 34 -3 51c0 31 0 63 1 94c-25 -5 -49 -11 -74 -17 c0 -46 0 -92 1 -138c0 -17 0 -35 -10 -51c-3 -4 -6 -10 -12 -10zM383 -88c0 0 2 -1 4 0c0 40 0 80 -1 120c-13 -2 -25 -4 -37 -7c-11 -2 -18 -3 -24 -3c-15 0 -17 8 -20 35c-2 18 -1 35 -1 35l-35 -9c-2 -1 -5 -2 -7 -2v-114l27 9c19 5 37 13 57 17c6 1 11 2 15 2 c15 0 19 -8 20 -31c0 -11 2 -52 2 -52zM155 -65l69 21c0 36 0 71 -2 107v7l-66 -18c-1 -39 -1 -78 -1 -117zM422 -82c26 5 51 11 77 17c1 39 1 79 2 118l-82 -15c0 -34 1 -68 2 -101c0 -7 0 -13 1 -19z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E26A-accidentalParensLeft.xml b/data/Petaluma/E26A-accidentalParensLeft.xml
deleted file mode 100644
index db3d5398acc..00000000000
--- a/data/Petaluma/E26A-accidentalParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M74 -270c-5 0 -10 4 -15 12c-40 59 -56 124 -59 194v40c0 99 23 191 86 270c4 5 9 9 13 13c7 7 16 10 24 8c9 -3 7 -14 7 -21c1 -34 -8 -64 -29 -91c-36 -49 -60 -101 -60 -162c0 -12 1 -25 3 -38c6 -36 21 -69 41 -99c13 -20 20 -40 20 -60c0 -12 -2 -25 -7 -37 c-3 -7 -6 -14 -10 -19c-5 -7 -9 -10 -14 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E26B-accidentalParensRight.xml b/data/Petaluma/E26B-accidentalParensRight.xml
deleted file mode 100644
index b2a55dc9845..00000000000
--- a/data/Petaluma/E26B-accidentalParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M40 -275c-14 0 -11 15 -11 28c0 3 0 6 -1 8c-2 9 -3 17 -3 26c0 20 6 39 19 57c31 42 50 92 54 142c1 7 1 13 1 20c0 62 -26 119 -80 159c-14 11 -21 20 -19 37v19c0 11 -1 22 0 33c0 15 7 23 18 23c5 0 10 -1 16 -5c36 -19 57 -50 72 -86c22 -54 33 -110 33 -177 c0 -86 -22 -174 -72 -255c-8 -11 -15 -29 -27 -29z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E26C-accidentalBracketLeft.xml b/data/Petaluma/E26C-accidentalBracketLeft.xml
deleted file mode 100644
index 437cee1f8d6..00000000000
--- a/data/Petaluma/E26C-accidentalBracketLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 -288c-6 0 -12 1 -17 3c-8 3 -8 11 -8 16c-2 47 -16 94 -16 124c0 5 0 8 1 12c8 126 7 226 8 325c0 23 3 45 4 67c0 16 10 23 24 25c13 2 27 2 40 3c2 0 3 1 5 1c5 0 7 -4 9 -10c4 -12 5 -23 5 -35c0 -14 -2 -28 -6 -42c-3 -9 -9 -19 -17 -19c-26 1 -21 -17 -21 -32 c-3 -104 -5 -209 -8 -313c0 -9 0 -14 10 -14h3c7 0 14 2 21 2c5 0 11 -1 14 -7c7 -11 9 -23 9 -35c0 -11 -2 -22 -4 -32c-5 -22 -32 -39 -56 -39z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E26D-accidentalBracketRight.xml b/data/Petaluma/E26D-accidentalBracketRight.xml
deleted file mode 100644
index dccbf489621..00000000000
--- a/data/Petaluma/E26D-accidentalBracketRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E26D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M13 -282c-7 0 -10 3 -10 10c1 9 1 19 1 29s0 20 1 31c3 19 9 33 31 35c12 1 11 10 10 18c-3 17 -4 36 -4 54c0 30 3 60 4 89c3 60 8 119 6 179c0 12 -4 17 -12 17h-8c-8 -2 -14 -3 -18 -3c-10 0 -10 6 -13 27c-1 6 -1 11 -1 17c0 13 1 25 2 37c1 14 8 20 20 24 c10 2 19 4 27 4c26 0 40 -17 41 -52c1 -26 0 -53 0 -79c1 -66 -7 -132 -7 -198c0 -11 0 -24 1 -36c2 -28 3 -56 5 -84c2 -22 -1 -44 -5 -66c-7 -41 -29 -57 -71 -53z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E270-accidentalQuarterToneFlatArrowUp.xml b/data/Petaluma/E270-accidentalQuarterToneFlatArrowUp.xml
deleted file mode 100644
index 0f8f7d023ef..00000000000
--- a/data/Petaluma/E270-accidentalQuarterToneFlatArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -239c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c1 85 14 168 17 253c2 59 5 118 5 177v31c-1 23 1 47 2 70v17c0 9 -2 12 -7 12c-2 0 -5 -1 -8 -2c-8 -3 -16 -6 -24 -10c-5 -3 -9 -4 -13 1c-5 4 -6 9 -2 15c26 45 42 94 50 146c1 6 2 8 4 8s5 -2 8 -5c4 -3 6 -9 8 -14 c16 -42 37 -81 62 -118c3 -3 8 -6 4 -11c-2 -3 -4 -3 -7 -3h-21c-16 0 -21 -1 -21 -15v-2c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -3 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257 c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM38 -104c45 32 89 65 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66c-3 -28 -4 -55 -6 -81z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E271-accidentalThreeQuarterTonesFlatArrowDown.xml b/data/Petaluma/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
deleted file mode 100644
index caf77b89cfb..00000000000
--- a/data/Petaluma/E271-accidentalThreeQuarterTonesFlatArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M34 -434c-2 0 -4 2 -7 4c-5 4 -7 9 -9 15c-15 42 -37 81 -62 118c-2 3 -8 6 -4 11c2 3 5 3 8 3c9 0 16 -1 22 -1c16 0 20 3 20 18c0 5 0 12 -1 20c-1 29 -1 58 -2 87c0 2 0 3 1 4c-1 10 -1 20 -1 30c1 85 14 168 17 253c2 59 5 118 5 177v31c-1 28 2 57 3 85 c0 14 8 23 19 24h1c10 0 10 -13 12 -20c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -3 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-13 -9 -26 -19 -38 -29v-39c0 -9 2 -13 6 -13 c3 0 6 1 9 3c8 3 16 6 24 10c2 1 4 2 7 2c2 0 4 -1 7 -3c5 -5 5 -9 2 -15c-27 -46 -43 -94 -51 -146c-1 -6 -2 -8 -4 -8zM45 -100c45 32 89 65 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66 c-3 -28 -4 -55 -6 -81z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E272-accidentalQuarterToneSharpNaturalArrowUp.xml b/data/Petaluma/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
deleted file mode 100644
index 1e69a073d44..00000000000
--- a/data/Petaluma/E272-accidentalQuarterToneSharpNaturalArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M213 165c4 -9 2 -21 2 -24l-1 -18v-6l-1 -12v-3c-1 -13 -3 -28 -3 -28c-2 -67 -5 -134 -7 -201c0 -32 2 -64 2 -96c-2 -70 -3 -139 -5 -208c0 -6 -2 -11 -3 -17c-4 -9 -7 -23 -18 -23c-13 0 -10 16 -13 26c-7 24 -9 48 -9 72c0 36 5 73 5 109v95l-5 -1l-121 -18 c-4 -1 -7 -1 -10 -1c-12 0 -19 5 -19 22c0 19 -3 39 -3 59c-1 29 -2 58 -2 88c0 35 1 70 2 105c3 101 11 201 10 302c0 10 -1 22 1 34c-1 3 -3 4 -6 4c-2 0 -5 -1 -9 -2c-8 -4 -16 -6 -23 -11c-6 -2 -10 -3 -14 1c-5 5 -6 9 -2 15c26 46 43 94 50 146c1 6 3 8 5 8s4 -2 7 -4 c4 -4 6 -9 8 -15c16 -42 38 -80 63 -117c2 -4 7 -7 3 -12c-2 -3 -7 -3 -12 -2c-25 1 -34 1 -36 -9c1 -8 2 -17 2 -25c1 -19 1 -37 1 -56c0 -57 -3 -115 -6 -172c49 4 98 9 145 22c21 5 17 -17 22 -27zM166 31l3 30l-6 -1c-34 -1 -68 -3 -102 -6c-7 -1 -14 0 -20 0l-1 -13 c-1 -33 1 -66 2 -100v-12c40 5 81 12 121 23c0 26 2 53 3 79z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E273-accidentalQuarterToneFlatNaturalArrowDown.xml b/data/Petaluma/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
deleted file mode 100644
index f90e627881d..00000000000
--- a/data/Petaluma/E273-accidentalQuarterToneFlatNaturalArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M199 -520c-2 0 -4 2 -7 4c-5 4 -7 9 -9 15c-15 42 -37 81 -62 118c-2 3 -8 6 -4 11c3 4 8 3 12 3c6 -1 11 -1 15 -1c5 0 8 0 11 1c0 35 5 72 5 107v95l-5 -1l-121 -18c-4 -1 -7 -1 -10 -1c-12 0 -19 5 -19 22c0 19 -3 39 -3 59c-1 29 -2 58 -2 88c0 35 1 70 2 105 c3 101 11 201 10 302c0 20 -6 50 27 60c7 -16 10 -32 10 -49c1 -19 1 -37 1 -56c0 -57 -3 -115 -6 -172c49 4 98 9 145 22c21 5 17 -17 22 -27c4 -9 2 -21 2 -24l-1 -18v-6l-1 -12v-3c-1 -13 -3 -28 -3 -28c-2 -67 -5 -134 -7 -201c0 -32 2 -64 2 -96l-3 -137 c1 -3 3 -5 5 -5c3 0 5 1 9 3c8 3 16 6 24 10c2 1 4 2 7 2c2 0 4 -1 7 -3c5 -5 5 -9 2 -15c-27 -46 -43 -94 -51 -146c-1 -6 -2 -8 -4 -8zM40 -57v-12c40 5 81 12 121 23c0 26 2 53 3 79l3 30l-6 -1c-34 -1 -68 -3 -102 -6c-7 -1 -14 0 -20 0l-1 -13c-1 -33 1 -66 2 -100z " /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E274-accidentalThreeQuarterTonesSharpArrowUp.xml b/data/Petaluma/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
deleted file mode 100644
index d38b2f22100..00000000000
--- a/data/Petaluma/E274-accidentalThreeQuarterTonesSharpArrowUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M136 -363c-9 0 -7 12 -9 19c-12 34 -16 68 -16 103c0 14 0 27 1 40c-36 -8 -72 -15 -108 -23c-4 -1 -7 -2 -9 -2c-8 1 -11 6 -11 17c-1 23 -10 45 -10 69s12 32 33 37c37 9 74 16 111 23c2 16 4 32 5 49l3 90c-32 -6 -64 -11 -97 -16c-4 -1 -7 -2 -10 -2 c-13 1 -18 7 -16 26c1 12 -7 25 -4 36c0 45 6 51 47 58c28 5 56 9 84 15c1 20 2 40 2 60v5c1 8 1 16 1 25c0 23 -2 46 -1 70c0 9 -2 12 -7 12c-2 0 -5 -1 -9 -2c-7 -4 -16 -6 -23 -11c-6 -3 -9 -3 -14 1c-5 5 -6 9 -2 15c26 46 43 94 50 146c1 6 3 8 5 8s4 -2 7 -4 c4 -4 7 -9 9 -15c15 -42 37 -81 62 -118c2 -3 7 -6 4 -11c-3 -3 -8 -3 -12 -3c-7 0 -13 1 -18 1c-22 0 -21 -6 -20 -38c1 -8 1 -17 1 -25c0 -17 -1 -34 -1 -51c1 -20 1 -39 1 -59l53 12c-1 58 -3 83 -3 142v19c1 11 11 14 19 16h4c6 0 5 -9 7 -14c9 -43 11 -54 13 -97l3 -54 c32 9 63 19 94 32c4 2 8 2 11 2h2c6 0 9 -5 13 -15s5 -21 5 -31c0 -18 -5 -35 -9 -53c-4 -16 -17 -24 -32 -29c-27 -9 -54 -17 -82 -24c0 -32 -1 -64 -2 -96c-1 -15 -1 -30 -2 -44l17 3c24 4 49 9 72 15c4 1 7 1 11 1h2c11 0 16 -9 17 -22c1 -10 0 -19 0 -32 c-4 -53 -11 -61 -66 -72l-58 -12c1 -24 3 -49 3 -73c0 -8 0 -16 -1 -25c0 -12 -1 -25 -8 -36c-3 -5 -5 -12 -11 -11c-6 0 -10 6 -11 11c-14 40 -22 81 -24 123l-44 -9c-1 -20 -3 -40 -5 -60c-1 -7 -1 -16 -1 -23c0 -11 1 -21 1 -32c0 -12 -1 -25 -5 -38 c-2 -7 -4 -18 -12 -19zM163 -71l42 9c3 46 5 92 10 138c-16 -4 -32 -7 -49 -10c0 -24 0 -47 -1 -71c-1 -22 -1 -44 -2 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E275-accidentalQuarterToneSharpArrowDown.xml b/data/Petaluma/E275-accidentalQuarterToneSharpArrowDown.xml
deleted file mode 100644
index 8619fc075f1..00000000000
--- a/data/Petaluma/E275-accidentalQuarterToneSharpArrowDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M253 -514c-5 4 -7 9 -9 15c-15 42 -37 81 -62 118c-2 3 -8 6 -4 11c3 4 8 3 12 3c7 0 13 -1 18 -1c16 0 20 3 20 18c0 5 0 12 -1 20c0 12 -18 108 -20 145l-44 -9c-1 -20 -3 -40 -5 -60c-1 -7 -1 -16 -1 -23c0 -11 1 -21 1 -32c0 -12 -1 -25 -5 -38c-2 -7 -4 -18 -12 -19 c-9 0 -7 12 -9 19c-12 34 -16 68 -16 103c0 14 0 27 1 40c-36 -8 -72 -15 -108 -23c-4 -1 -7 -2 -9 -2c-8 1 -11 6 -11 17c-1 23 -10 45 -10 69s12 32 33 37c37 9 74 16 111 23c2 16 4 32 5 49l3 90c-32 -6 -64 -11 -97 -16c-4 -1 -7 -2 -10 -2c-13 1 -18 7 -16 26 c1 12 -7 25 -4 36c0 45 6 51 47 58c28 5 56 9 84 15c1 31 2 62 4 94c0 16 -3 35 19 46c8 -15 8 -29 9 -44c2 -30 3 -60 3 -90l53 12c-1 58 -3 116 -3 175v19c1 11 11 14 19 16h4c6 0 5 -9 7 -14c9 -43 11 -87 13 -130l3 -54c32 9 63 19 94 32c4 2 8 2 11 2h2 c6 0 9 -5 13 -15s5 -21 5 -31c0 -18 -5 -35 -9 -53c-4 -16 -17 -24 -32 -29c-27 -9 -54 -17 -82 -24c0 -32 -1 -64 -2 -96c-1 -15 -1 -30 -2 -44l17 3c24 4 49 9 72 15c4 1 7 1 11 1h2c11 0 16 -9 17 -22c1 -10 0 -19 0 -32c-4 -53 -11 -61 -66 -72l-58 -12 c1 -24 3 -49 3 -73c0 -8 -2 -83 -2 -101c0 -9 2 -13 6 -13c3 0 6 1 9 3c8 3 16 6 24 10c2 1 4 2 7 2c2 0 4 -1 7 -3c5 -5 5 -9 2 -15c-27 -46 -43 -94 -51 -146c-1 -6 -2 -8 -4 -8s-4 2 -7 4zM168 -74l42 9c3 46 5 92 10 138c-16 -4 -32 -7 -49 -10c0 -24 0 -47 -1 -71 c-1 -22 -1 -44 -2 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E280-accidentalQuarterToneFlatStein.xml b/data/Petaluma/E280-accidentalQuarterToneFlatStein.xml
deleted file mode 100644
index fc091d7fe66..00000000000
--- a/data/Petaluma/E280-accidentalQuarterToneFlatStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M189 -240c-3 0 -7 2 -12 7c-13 11 -28 22 -42 32c-88 63 -135 148 -135 257c0 14 0 27 2 41c5 49 33 77 75 77c9 0 19 -2 30 -5c14 -4 28 -11 42 -17l1 -1v26c0 38 -2 76 -4 114c0 22 -2 43 -2 65c0 21 2 43 7 64c2 7 2 20 12 20h1c11 -1 19 -10 19 -24 c1 -28 4 -57 3 -85v-31c0 -59 3 -118 5 -177c3 -85 17 -168 17 -253c0 -33 -2 -68 -11 -101c-2 -6 -4 -9 -8 -9zM162 -105c-2 26 -3 53 -6 81c-2 22 -3 44 -3 66l-4 2c-19 8 -38 18 -59 18c-7 0 -15 -2 -23 -5c-16 -6 -24 -14 -23 -25c0 -6 1 -12 5 -20 c26 -51 68 -85 113 -117z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E281-accidentalThreeQuarterTonesFlatZimmermann.xml b/data/Petaluma/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
deleted file mode 100644
index 05d9b30c4e3..00000000000
--- a/data/Petaluma/E281-accidentalThreeQuarterTonesFlatZimmermann.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M189 -240c-3 0 -7 2 -12 7c-13 11 -28 22 -42 32c-88 63 -135 148 -135 257c0 14 0 27 2 41c5 49 33 77 75 77c9 0 19 -2 30 -5c14 -4 28 -11 42 -17l1 -1v26c0 38 -2 76 -4 114c0 22 -2 43 -2 65c0 21 2 43 7 64c2 7 2 20 12 20h1c11 -1 19 -10 19 -24 c1 -28 4 -57 3 -85v-31c0 -59 3 -118 5 -177c3 -85 17 -168 17 -253c0 -33 -2 -68 -11 -101c-2 -6 -4 -9 -8 -9zM233 -240c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c0 85 14 168 17 253c2 59 5 118 5 177v31c-1 28 2 57 3 85c0 14 8 23 19 24h1c10 0 10 -13 12 -20 c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -4 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM162 -105c-2 26 -3 53 -6 81c-2 22 -3 44 -3 66 l-4 2c-19 8 -38 18 -59 18c-7 0 -15 -2 -23 -5c-16 -6 -24 -14 -23 -25c0 -6 1 -12 5 -20c26 -51 68 -85 113 -117zM260 -105c45 32 87 66 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66 c-3 -28 -4 -55 -6 -81z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E282-accidentalQuarterToneSharpStein.xml b/data/Petaluma/E282-accidentalQuarterToneSharpStein.xml
deleted file mode 100644
index 335550e4fe9..00000000000
--- a/data/Petaluma/E282-accidentalQuarterToneSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M135 -338c-11 23 -10 47 -11 69c-1 31 1 61 5 91v8l-86 -21c-4 -1 -7 -1 -9 -1c-8 0 -11 5 -11 16c1 9 1 19 1 28c0 56 -5 56 54 69l54 12c0 22 -1 44 -2 66s-2 44 -2 66c-34 -7 -69 -19 -104 -19h-5c-10 0 -13 5 -14 14c-2 19 -4 38 -5 57c0 28 4 33 33 37 c32 4 64 10 95 17c0 37 -3 74 -3 111c0 15 1 30 2 45c1 13 4 21 19 24c15 -45 13 -91 14 -137c1 -12 1 -23 1 -35c26 6 52 13 78 16c8 1 14 2 20 2c20 0 25 -11 23 -40c-4 -56 -11 -64 -65 -73c-19 -3 -37 -7 -55 -11c0 -29 -1 -58 0 -87c0 -15 1 -30 1 -45l107 27 c7 2 12 3 16 3c11 0 14 -9 14 -32c0 -18 -3 -35 -10 -53c-5 -12 -14 -20 -28 -24c-32 -7 -64 -15 -97 -23c-1 -46 -6 -93 -9 -139c-1 -14 -7 -26 -21 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E283-accidentalThreeQuarterTonesSharpStein.xml b/data/Petaluma/E283-accidentalThreeQuarterTonesSharpStein.xml
deleted file mode 100644
index 969bd035455..00000000000
--- a/data/Petaluma/E283-accidentalThreeQuarterTonesSharpStein.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M79 -373c-14 37 -23 74 -23 112c0 16 1 32 1 48c-17 -3 -35 -7 -53 -11c-3 -1 -5 -1 -8 -1c-5 0 -9 2 -9 10c0 25 -9 48 -10 73c0 24 10 33 30 38l57 12l6 85c1 19 2 39 2 58c-15 -2 -30 -5 -45 -7c-3 0 -5 -1 -7 -1c-11 0 -15 5 -15 20c1 16 -3 33 -3 50 c0 27 9 41 32 44c14 3 28 5 42 8c0 27 0 54 2 81c1 14 4 27 4 41c0 10 7 16 14 17h1c7 0 4 -10 7 -15c2 -4 3 -9 3 -14c0 -35 0 -70 1 -105c19 4 38 7 56 11c1 25 0 50 -2 75c-1 28 -2 55 -2 83v34c0 6 1 12 7 15c5 3 9 7 13 7s8 -3 10 -13c7 -34 10 -68 12 -102 c2 -30 3 -60 4 -90c21 5 41 10 62 16c3 71 7 142 16 212c1 6 3 13 6 18c2 6 7 9 13 9c8 0 5 -8 7 -13c3 -8 4 -16 4 -24c0 -9 -1 -17 -2 -25c-5 -56 -9 -111 -12 -167c14 5 27 9 40 14c12 5 21 7 28 7c15 0 20 -12 20 -43c-4 -12 -1 -27 -5 -42c-4 -21 -18 -34 -39 -41 c-16 -5 -32 -10 -48 -14c-1 -21 -1 -41 -2 -61c-1 -28 -3 -56 -4 -83c18 3 36 8 55 11c7 2 13 2 17 2c13 0 17 -7 18 -28v-6c0 -70 -16 -81 -67 -91c-7 -2 -13 -3 -20 -4c1 -12 1 -24 1 -36c0 -25 -2 -51 -5 -76c-1 -15 -3 -28 -18 -42c-8 36 -8 69 -10 101 c-1 16 -1 31 -1 46l-60 -12c0 -20 1 -40 3 -59c-3 -26 0 -48 -8 -69c-3 -6 -6 -16 -14 -14c-7 1 -9 9 -12 16c-13 38 -20 77 -22 115c-15 -3 -30 -6 -45 -10c-2 -42 -6 -84 -6 -127c0 -14 -1 -30 -17 -43zM204 -64c18 4 37 7 56 11c0 47 1 94 3 141c-18 -5 -37 -9 -55 -13 v-41c0 -20 0 -40 -2 -60c-1 -13 -1 -25 -2 -38zM107 -83l44 9c2 25 4 50 5 74c1 22 3 44 4 66c-17 -4 -33 -6 -50 -9c0 -14 0 -29 -1 -43c-1 -32 -2 -65 -2 -97z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E440-accidentalBuyukMucennebFlat.xml b/data/Petaluma/E440-accidentalBuyukMucennebFlat.xml
deleted file mode 100644
index f7e980c7755..00000000000
--- a/data/Petaluma/E440-accidentalBuyukMucennebFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M285 89c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c1 85 14 168 17 253c0 14 1 28 2 42l-90 -39c-2 27 -7 52 -6 77c0 12 6 20 18 24l81 33v31c-31 -13 -62 -25 -93 -38 c-2 25 -7 48 -6 71c0 12 6 19 18 23c28 10 55 20 82 31c1 13 2 26 2 38c0 14 8 23 19 24h1c10 0 10 -13 12 -20c2 -8 4 -17 5 -26l101 42c20 8 25 6 28 -12c3 -19 -1 -37 -9 -57c-3 -8 -11 -15 -20 -19c-33 -14 -66 -27 -100 -41v-16c0 -4 0 -9 -1 -14c34 15 68 31 102 46 c20 8 25 6 28 -13c3 -21 -1 -41 -9 -61c-3 -9 -11 -16 -20 -21c-34 -15 -69 -31 -104 -46v-5v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77zM243 24c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66 c-3 -28 -4 -55 -6 -81c45 32 89 65 113 117c4 8 5 14 5 20z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E441-accidentalKucukMucennebFlat.xml b/data/Petaluma/E441-accidentalKucukMucennebFlat.xml
deleted file mode 100644
index 2ff47466126..00000000000
--- a/data/Petaluma/E441-accidentalKucukMucennebFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E441" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 -231c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c1 85 14 168 17 253c2 59 5 118 5 177v31c-1 28 2 57 3 85c0 14 8 23 19 24h1c10 0 10 -13 12 -20c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -3 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5 c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM36 -96c45 32 89 65 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66c-3 -28 -4 -55 -6 -81z " /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E442-accidentalBakiyeFlat.xml b/data/Petaluma/E442-accidentalBakiyeFlat.xml
deleted file mode 100644
index 108451d0c48..00000000000
--- a/data/Petaluma/E442-accidentalBakiyeFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 -236c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c0 85 14 168 17 253l3 86c-30 -15 -60 -29 -91 -44c-2 30 -7 57 -6 85c0 14 6 22 18 27c27 11 54 24 81 37v17c-1 28 2 57 3 85c0 14 8 23 19 24h1c10 0 10 -13 12 -20c5 -21 7 -43 7 -64c0 -8 0 -15 -1 -22 c34 16 66 35 100 49c7 3 13 5 16 5c7 0 9 -6 12 -19c1 -5 1 -10 1 -15c0 -18 -4 -35 -10 -53c-3 -10 -11 -18 -20 -23c-34 -17 -68 -34 -103 -50c0 -17 -1 -34 -1 -51v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77c2 -14 2 -27 2 -41 c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM125 -101c45 32 87 66 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66c-3 -28 -4 -55 -6 -81z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E443-accidentalKomaFlat.xml b/data/Petaluma/E443-accidentalKomaFlat.xml
deleted file mode 100644
index e6faef1e6ec..00000000000
--- a/data/Petaluma/E443-accidentalKomaFlat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E443" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 -231c-3 0 -7 2 -12 7c-13 11 -28 22 -42 32c-88 63 -135 148 -135 257c0 14 0 27 2 41c5 49 33 77 75 77c9 0 19 -2 30 -5c14 -4 28 -11 42 -17l1 -1v26c-1 38 -2 76 -4 114c0 22 -2 43 -2 65c0 21 2 43 7 64c2 7 2 20 12 20h1c11 -1 19 -10 19 -24 c1 -28 4 -57 3 -85v-31c0 -59 3 -118 5 -177c3 -85 16 -168 17 -253c0 -33 -2 -68 -11 -101c-2 -6 -4 -9 -8 -9zM152 -96c-2 26 -3 53 -6 81c-2 22 -3 44 -3 66l-4 2c-19 8 -38 18 -59 18c-7 0 -15 -2 -23 -5c-16 -6 -24 -14 -23 -25c0 -6 1 -12 5 -20 c24 -52 68 -85 113 -117z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E444-accidentalKomaSharp.xml b/data/Petaluma/E444-accidentalKomaSharp.xml
deleted file mode 100644
index d986f147f4e..00000000000
--- a/data/Petaluma/E444-accidentalKomaSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E444" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M135 -338c-11 23 -10 47 -11 69c-1 31 1 61 5 91v8l-86 -21c-4 -1 -7 -1 -9 -1c-8 0 -11 5 -11 16c1 9 1 19 1 28c0 56 -5 56 54 69l54 12c0 22 -1 44 -2 66s-2 44 -2 66c-34 -7 -69 -19 -104 -19h-5c-10 0 -13 5 -14 14c-2 19 -4 38 -5 57c0 28 4 33 33 37 c32 4 64 10 95 17c0 37 -3 74 -3 111c0 15 1 30 2 45c1 13 4 21 19 24c15 -45 13 -91 14 -137c1 -12 1 -23 1 -35c26 6 52 13 78 16c8 1 14 2 20 2c20 0 25 -11 23 -40c-4 -56 -11 -64 -65 -73c-19 -3 -37 -7 -55 -11c0 -29 -1 -58 0 -87c0 -15 1 -30 1 -45l107 27 c7 2 12 3 16 3c11 0 14 -9 14 -32c0 -18 -3 -35 -10 -53c-5 -12 -14 -20 -28 -24c-32 -7 -64 -15 -97 -23c-1 -46 -6 -93 -9 -139c-1 -14 -7 -26 -21 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E445-accidentalBakiyeSharp.xml b/data/Petaluma/E445-accidentalBakiyeSharp.xml
deleted file mode 100644
index dc828f4160d..00000000000
--- a/data/Petaluma/E445-accidentalBakiyeSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E445" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M137 -356c-9 0 -7 12 -9 19c-12 34 -16 68 -16 103c0 14 0 27 1 40c-36 -8 -72 -15 -108 -23c-4 -1 -7 -2 -9 -2c-8 1 -11 6 -11 17c-1 23 -10 45 -10 69s12 32 33 37c37 9 74 16 111 23c2 16 4 32 5 49l3 90c-32 -6 -64 -11 -97 -16c-4 -1 -7 -2 -10 -2 c-13 1 -18 7 -16 26c1 12 -7 25 -4 36c0 45 6 51 47 58c28 5 56 9 84 15c1 31 2 62 4 94c0 16 -3 35 19 46c8 -15 8 -29 9 -44c2 -30 3 -60 3 -90l53 12c-1 58 -3 116 -3 175v19c1 11 11 14 19 16h4c6 0 5 -9 7 -14c9 -43 11 -87 13 -130l3 -54c32 9 63 19 94 32 c4 2 8 2 11 2h2c6 0 9 -5 13 -15s5 -21 5 -31c0 -18 -5 -35 -9 -53c-4 -16 -17 -24 -32 -29c-27 -9 -54 -17 -82 -24c0 -32 -1 -64 -2 -96c-1 -15 -1 -30 -2 -44l17 3c24 4 49 9 72 15c4 1 7 1 11 1h2c11 0 16 -9 17 -22c1 -10 0 -19 0 -32c-4 -53 -11 -61 -66 -72l-58 -12 c1 -24 3 -49 3 -73c0 -8 0 -16 -1 -25c0 -12 -1 -25 -8 -36c-3 -5 -5 -12 -11 -11c-6 0 -10 6 -11 11c-14 40 -22 81 -24 123l-44 -9c-1 -20 -3 -40 -5 -60c-1 -7 -1 -16 -1 -23c0 -11 1 -21 1 -32c0 -12 -1 -25 -5 -38c-2 -7 -4 -18 -12 -19zM164 -64l42 9 c3 46 5 92 10 138c-16 -4 -32 -7 -49 -10c0 -24 0 -47 -1 -71c-1 -22 -1 -44 -2 -66z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E446-accidentalKucukMucennebSharp.xml b/data/Petaluma/E446-accidentalKucukMucennebSharp.xml
deleted file mode 100644
index 57b37c1bb22..00000000000
--- a/data/Petaluma/E446-accidentalKucukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 -420c-8 37 -9 70 -10 102c-1 25 -1 50 -1 74l-66 -15c-3 -1 -6 -1 -9 -1c-10 0 -14 6 -12 19c1 15 -7 29 -4 41c0 41 2 42 40 49c17 3 34 7 51 10c0 21 0 42 1 63c-45 -10 -90 -20 -135 -32c-3 -1 -6 -1 -9 -1c-7 0 -11 3 -10 15v55c2 42 4 46 46 55 c37 8 74 16 112 25c0 8 0 16 1 25c0 9 1 18 1 26l-100 -15h-5c-10 0 -13 6 -12 17v22c0 62 0 61 60 72c21 4 42 7 63 10c3 40 6 80 11 120c1 6 3 13 6 18c2 6 7 9 13 9c8 0 5 -8 7 -13c3 -8 4 -16 4 -24c0 -9 -1 -17 -2 -25l-6 -79c19 4 39 7 59 12c5 1 10 2 14 2 c10 0 14 -6 14 -19c0 -18 -3 -37 -7 -56s-17 -30 -36 -34c-17 -4 -34 -7 -51 -11c0 -17 -1 -33 -2 -50c46 10 92 20 137 31c4 1 8 1 11 1c18 0 21 -12 21 -35c0 -20 -4 -39 -11 -59c-5 -15 -17 -24 -33 -27c-43 -11 -85 -19 -128 -28c-1 -21 -3 -42 -4 -63c28 6 55 12 82 19 c4 1 7 1 9 1c10 0 12 -5 13 -17c2 -21 -1 -41 -6 -61c-4 -15 -14 -25 -30 -29l-66 -15c1 -19 2 -39 2 -58c0 -28 -1 -55 -5 -83c-1 -15 -4 -28 -18 -43z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E447-accidentalBuyukMucennebSharp.xml b/data/Petaluma/E447-accidentalBuyukMucennebSharp.xml
deleted file mode 100644
index 7c4e0386771..00000000000
--- a/data/Petaluma/E447-accidentalBuyukMucennebSharp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M160 -460c-8 36 -9 69 -10 102s-1 65 -1 97c-15 -4 -30 -8 -44 -13c-2 -1 -4 -1 -5 -1c-7 0 -6 7 -6 10c-2 16 -1 32 -1 46c0 12 -1 21 -1 28c0 18 6 20 49 32l8 3c1 18 1 36 2 55c-24 -5 -47 -9 -71 -13c-22 -4 -43 -10 -65 -15c-3 -1 -5 -1 -7 -1c-5 0 -8 2 -7 11 c1 18 -2 37 -2 55c0 31 10 44 32 49l124 27v9c1 13 2 25 2 38c-20 -3 -40 -7 -61 -10c-2 0 -4 -1 -5 -1c-6 0 -8 4 -8 10c-1 13 0 26 0 39c0 7 0 14 -1 21c-4 26 11 37 33 40c16 3 32 5 48 8c3 37 5 74 11 110c1 6 3 13 6 18c3 4 7 8 12 8c9 0 5 -8 7 -12c4 -8 5 -16 5 -25 c0 -8 -1 -16 -2 -25l-6 -69c35 6 70 13 105 20c3 44 6 88 12 131c1 5 1 10 3 14c2 8 8 14 15 14c10 0 7 -10 8 -15c3 -9 4 -17 4 -26c0 -8 -1 -16 -2 -24c-4 -29 -6 -58 -8 -87c13 2 26 5 40 8c4 1 8 2 11 2c10 0 17 -6 17 -20c0 -17 -1 -34 -3 -51c-2 -21 -16 -34 -36 -39 c-12 -2 -23 -4 -35 -7c0 -14 -1 -28 -1 -41c26 5 52 11 77 17l17 3c11 3 19 5 25 5c15 0 19 -10 22 -43v-19c-1 -7 -1 -19 -4 -30c-5 -20 -19 -32 -41 -36l-101 -18c-1 -14 -2 -29 -2 -43c19 5 39 9 58 14c4 1 7 1 9 1c8 0 12 -3 14 -15c1 -6 2 -13 2 -19 c0 -16 -3 -31 -6 -47c-3 -13 -11 -23 -27 -27s-33 -7 -50 -11c2 -24 3 -48 3 -72c0 -26 -1 -53 -4 -80c-1 -15 -3 -28 -19 -42c-8 36 -10 70 -10 103c0 28 -1 56 -1 84c-36 -8 -71 -17 -107 -26c1 -31 2 -62 2 -93c0 -27 -2 -55 -5 -83c-1 -11 -5 -22 -18 -33zM188 19 l105 24c1 9 1 18 2 27v15c-35 -7 -70 -14 -105 -20c0 -15 -1 -30 -2 -46zM182 -123v-25c35 10 71 19 106 27c1 15 1 30 2 45c-36 -7 -71 -13 -107 -19c0 -10 0 -19 -1 -28z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A0-articAccentAbove.xml b/data/Petaluma/E4A0-articAccentAbove.xml
deleted file mode 100644
index 0c21eb94c4c..00000000000
--- a/data/Petaluma/E4A0-articAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M19 1c0 -1 0 -1 -1 -1h-7c-4 0 -9 1 -11 6v3c0 6 6 11 9 16c28 48 74 67 124 82c40 12 77 34 117 49c-68 25 -135 51 -203 75c-11 3 -16 8 -16 14c0 3 2 7 6 12c17 20 30 43 50 60c8 6 14 9 21 9c4 0 9 -1 14 -3c69 -28 138 -56 209 -82c29 -11 57 -24 84 -38 c7 -4 10 -8 10 -13c0 -2 -1 -6 -3 -10c-13 -27 -35 -45 -60 -52c-43 -12 -78 -39 -121 -50c-65 -15 -124 -47 -187 -70c-11 -4 -22 -8 -35 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A1-articAccentBelow.xml b/data/Petaluma/E4A1-articAccentBelow.xml
deleted file mode 100644
index 0155af9f030..00000000000
--- a/data/Petaluma/E4A1-articAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -326h-7c-4 0 -9 1 -11 6v3c0 6 6 10 9 16c28 47 74 67 124 82c40 11 77 34 117 49c-68 25 -135 51 -203 75c-11 3 -16 8 -16 14c0 3 2 7 6 12c17 20 30 43 50 60c8 6 14 9 21 9c4 0 9 -1 14 -3c69 -28 138 -56 209 -82c29 -11 57 -24 84 -39c7 -3 10 -7 10 -12 c0 -3 -1 -6 -3 -10c-13 -27 -35 -46 -60 -52c-43 -12 -78 -39 -121 -50c-65 -16 -124 -48 -187 -70c-11 -4 -22 -8 -35 -8h-1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A2-articStaccatoAbove.xml b/data/Petaluma/E4A2-articStaccatoAbove.xml
deleted file mode 100644
index ce6d5a5a474..00000000000
--- a/data/Petaluma/E4A2-articStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 0c-7 0 -15 6 -23 19s-17 24 -32 27c-10 2 -13 9 -11 17c6 25 6 50 14 74c5 15 15 17 28 19c15 -6 37 -7 43 -27c4 -13 20 -13 23 -26c2 -8 2 -17 2 -25c0 -23 -8 -43 -20 -62c-7 -11 -16 -16 -24 -16z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A3-articStaccatoBelow.xml b/data/Petaluma/E4A3-articStaccatoBelow.xml
deleted file mode 100644
index ce5ae4f5c7f..00000000000
--- a/data/Petaluma/E4A3-articStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M92 -140c-7 -11 -16 -16 -24 -16c-7 0 -16 6 -23 19c-8 13 -17 23 -32 27c-10 2 -13 9 -11 17c5 25 6 50 14 74c5 15 15 17 28 19c15 -6 36 -7 43 -27c4 -13 19 -13 23 -26c2 -8 2 -17 2 -25c1 -23 -7 -43 -20 -62z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A4-articTenutoAbove.xml b/data/Petaluma/E4A4-articTenutoAbove.xml
deleted file mode 100644
index da616524a3f..00000000000
--- a/data/Petaluma/E4A4-articTenutoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M95 0c-20 0 -42 2 -64 11c-6 3 -13 6 -18 11c-7 8 -15 17 -12 27c4 10 16 5 24 6h86c23 0 43 1 66 1c60 0 119 -2 178 -4c34 -1 66 -1 99 -11c13 -4 18 -10 17 -22c0 -12 -11 -11 -19 -12c-21 -5 -44 -7 -66 -7c-15 0 -33 2 -51 3c-16 1 -35 1 -51 1 c-49 0 -98 -3 -147 -3c-13 0 -29 -1 -42 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A5-articTenutoBelow.xml b/data/Petaluma/E4A5-articTenutoBelow.xml
deleted file mode 100644
index 41975b37680..00000000000
--- a/data/Petaluma/E4A5-articTenutoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M95 -59c-20 0 -42 2 -64 11c-6 3 -13 6 -18 11c-7 8 -15 17 -12 27c4 10 16 5 24 6h86c23 0 43 1 66 1c60 0 119 -2 178 -4c34 -1 66 -1 99 -11c13 -4 18 -10 17 -22c0 -12 -11 -11 -19 -12c-21 -5 -44 -7 -66 -7c-15 0 -33 2 -51 3c-16 1 -35 1 -51 1 c-49 0 -98 -3 -147 -3c-13 0 -29 -1 -42 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A6-articStaccatissimoAbove.xml b/data/Petaluma/E4A6-articStaccatissimoAbove.xml
deleted file mode 100644
index b9c6bebca43..00000000000
--- a/data/Petaluma/E4A6-articStaccatissimoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M72 0h-5c-3 4 -7 9 -9 14c-22 58 -28 120 -39 180c-9 47 -9 95 -19 142v4c2 26 22 39 38 54c12 12 26 17 40 17c20 0 38 -13 48 -36c8 -19 13 -40 13 -60c0 -7 -1 -14 -2 -21c-12 -72 -27 -143 -37 -214c-4 -28 -1 -60 -28 -80z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A7-articStaccatissimoBelow.xml b/data/Petaluma/E4A7-articStaccatissimoBelow.xml
deleted file mode 100644
index 3f946cfea75..00000000000
--- a/data/Petaluma/E4A7-articStaccatissimoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M61 -411c-20 0 -38 13 -48 36c-8 19 -13 40 -13 60c0 7 1 14 2 21c12 72 27 143 37 214c4 28 1 60 28 80h5c3 -4 7 -9 9 -14c22 -58 28 -120 39 -180c9 -47 9 -95 19 -142v-4c-2 -26 -22 -39 -38 -54c-12 -12 -26 -17 -40 -17z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A8-articStaccatissimoWedgeAbove.xml b/data/Petaluma/E4A8-articStaccatissimoWedgeAbove.xml
deleted file mode 100644
index 6c0db5fa040..00000000000
--- a/data/Petaluma/E4A8-articStaccatissimoWedgeAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42 0c-13 11 -11 27 -12 41v10c0 69 -8 135 -26 202c-2 8 -4 15 -4 20c0 18 12 22 43 22c28 0 42 -9 42 -31c0 -7 -2 -16 -5 -27c-20 -65 -20 -131 -27 -197c-1 -14 -2 -28 -11 -40z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A9-articStaccatissimoWedgeBelow.xml b/data/Petaluma/E4A9-articStaccatissimoWedgeBelow.xml
deleted file mode 100644
index f227015f7fc..00000000000
--- a/data/Petaluma/E4A9-articStaccatissimoWedgeBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42 -295c-28 0 -42 9 -42 31c0 7 2 16 5 27c20 65 20 131 27 197c1 14 2 28 11 40c13 -11 11 -27 12 -41v-10c0 -69 8 -135 26 -202c2 -8 4 -15 4 -20c0 -18 -12 -22 -43 -22z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AA-articStaccatissimoStrokeAbove.xml b/data/Petaluma/E4AA-articStaccatissimoStrokeAbove.xml
deleted file mode 100644
index a68f27c5c9b..00000000000
--- a/data/Petaluma/E4AA-articStaccatissimoStrokeAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 0c-4 0 -8 5 -10 14c-10 38 -17 76 -16 115v34c1 23 0 44 0 61c1 18 1 36 1 53v49c0 28 1 56 5 83c1 7 3 14 4 21c3 16 16 21 28 22h1c11 0 12 -14 14 -23c10 -38 10 -78 10 -117c0 -36 1 -73 1 -109c0 -48 -1 -96 -5 -144c-1 -20 -5 -38 -20 -52c-5 -5 -9 -7 -13 -7z " /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AB-articStaccatissimoStrokeBelow.xml b/data/Petaluma/E4AB-articStaccatissimoStrokeBelow.xml
deleted file mode 100644
index 3e2d9bb422c..00000000000
--- a/data/Petaluma/E4AB-articStaccatissimoStrokeBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -452h-1c-11 0 -12 14 -14 23c-10 38 -10 78 -10 117c0 36 -1 73 -1 109c0 48 1 96 5 144c1 20 5 38 20 52c5 5 9 7 13 7s8 -5 10 -14c10 -38 17 -76 16 -115v-34c-1 -23 0 -44 0 -61c-1 -18 -1 -36 -1 -53v-49c0 -28 -1 -56 -5 -83c-1 -7 -3 -14 -4 -21 c-3 -16 -16 -21 -28 -22z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AC-articMarcatoAbove.xml b/data/Petaluma/E4AC-articMarcatoAbove.xml
deleted file mode 100644
index 49415c231b1..00000000000
--- a/data/Petaluma/E4AC-articMarcatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M331 0c-7 0 -14 3 -20 10c-40 50 -86 95 -120 149c-6 9 -9 18 -14 28c-43 -48 -79 -100 -119 -150c-8 -10 -17 -17 -29 -21c-3 -2 -7 -2 -10 -2c-13 0 -22 10 -18 25c8 34 17 68 38 97c39 54 84 102 129 151c8 8 14 17 22 25c7 8 14 21 27 14l4 -3c8 -1 15 -6 19 -15v-1 c3 -4 6 -9 7 -14c34 -64 91 -109 133 -166c9 -12 16 -25 16 -41c-5 -30 -17 -58 -42 -77c-7 -5 -15 -9 -23 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AD-articMarcatoBelow.xml b/data/Petaluma/E4AD-articMarcatoBelow.xml
deleted file mode 100644
index f145201d605..00000000000
--- a/data/Petaluma/E4AD-articMarcatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 -326l-4 3c-8 1 -15 6 -19 15v1c-3 4 -6 9 -7 14c-34 64 -91 109 -133 166c-9 12 -16 25 -16 41c5 30 17 58 42 77c7 5 15 9 23 9c7 0 14 -3 20 -10c40 -50 86 -95 120 -149c6 -9 9 -18 14 -28c43 48 79 100 119 150c8 10 17 17 29 21c3 2 7 2 10 2 c13 0 22 -10 18 -25c-8 -34 -17 -68 -38 -97c-39 -54 -84 -102 -129 -151c-8 -8 -14 -17 -22 -25c-7 -8 -14 -21 -27 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AE-articMarcatoStaccatoAbove.xml b/data/Petaluma/E4AE-articMarcatoStaccatoAbove.xml
deleted file mode 100644
index 541113d8260..00000000000
--- a/data/Petaluma/E4AE-articMarcatoStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 191c-1 2 -2 3 -2 5c0 5 4 11 6 15c47 87 106 166 161 248c11 16 23 24 38 24c8 0 17 -2 27 -6c35 -14 60 -41 86 -67c28 -30 55 -62 83 -92c8 -8 15 -16 15 -26c0 -3 -1 -6 -2 -9c-2 -48 -37 -85 -77 -85c-3 0 -7 0 -10 1c-12 2 -18 8 -25 17c-36 43 -65 93 -106 133 c-3 2 -6 5 -9 8c-6 7 -11 11 -16 11c-6 0 -12 -4 -18 -13c-27 -41 -54 -81 -83 -120c-13 -17 -26 -35 -47 -43c-7 -2 -15 -6 -21 -1zM206 0c-31 1 -42 5 -42 21c0 7 2 16 6 28c7 25 10 50 24 73c7 12 14 21 24 21c5 0 10 -2 17 -7c11 -8 31 -1 34 -20c2 -10 3 -19 5 -28 c5 -26 -32 -80 -57 -86c-5 -1 -9 -2 -11 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AF-articMarcatoStaccatoBelow.xml b/data/Petaluma/E4AF-articMarcatoStaccatoBelow.xml
deleted file mode 100644
index f29a47792c8..00000000000
--- a/data/Petaluma/E4AF-articMarcatoStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 -143c-5 0 -10 2 -17 7c-11 8 -31 1 -34 20c-2 10 -3 19 -5 28c-5 26 32 80 57 86c5 1 9 2 11 2c31 -1 42 -5 42 -21c0 -7 -2 -16 -6 -28c-7 -25 -10 -50 -24 -73c-7 -12 -14 -21 -24 -21zM211 -483c-8 0 -17 2 -27 6c-35 14 -60 41 -86 67c-28 30 -55 62 -83 92 c-8 8 -15 16 -15 26c0 3 1 6 2 9c2 48 37 85 77 85c3 0 7 0 10 -1c12 -2 18 -8 25 -17c36 -43 65 -93 106 -133c3 -2 6 -5 9 -8c6 -7 11 -11 16 -11c6 0 12 4 18 13c27 41 54 81 83 120c13 17 26 35 47 43c7 2 15 6 21 1c1 -2 2 -3 2 -5c0 -5 -4 -11 -6 -15 c-47 -87 -106 -166 -161 -248c-11 -16 -23 -24 -38 -24z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B0-articAccentStaccatoAbove.xml b/data/Petaluma/E4B0-articAccentStaccatoAbove.xml
deleted file mode 100644
index 2ec5147152b..00000000000
--- a/data/Petaluma/E4B0-articAccentStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 176c-10 3 -22 3 -24 14v1c0 8 12 11 19 15c67 35 141 53 209 86c7 3 15 5 28 10c-61 23 -116 43 -171 64l-9 3c-53 20 -68 24 -68 48c0 13 4 31 9 60c3 19 12 28 27 28c5 0 11 -2 18 -4c76 -26 152 -54 228 -80c23 -8 46 -14 68 -22c17 -5 27 -16 27 -34 c0 -44 -18 -69 -60 -82c-74 -22 -142 -59 -215 -84c-20 -6 -39 -14 -58 -20c-9 -2 -19 -5 -28 -3zM186 0c-8 3 -21 -1 -26 11c-2 6 -3 11 -3 15c0 7 2 13 7 20c12 17 20 36 34 52c8 9 20 14 31 14c12 0 23 -5 30 -13c4 -4 5 -8 5 -11c0 -7 -3 -13 -4 -19 c-4 -30 -46 -69 -74 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B1-articAccentStaccatoBelow.xml b/data/Petaluma/E4B1-articAccentStaccatoBelow.xml
deleted file mode 100644
index 7a57841b709..00000000000
--- a/data/Petaluma/E4B1-articAccentStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M229 -113c-11 0 -23 5 -31 14c-14 16 -22 35 -34 52c-5 7 -7 13 -7 20c0 4 1 9 3 15c5 12 18 8 26 11c28 0 70 -39 74 -69c1 -6 4 -12 4 -19c0 -3 -1 -7 -5 -11c-7 -8 -18 -13 -30 -13zM24 -505c-10 3 -22 3 -24 14v1c0 8 12 11 19 15c67 35 141 53 209 86 c7 3 15 5 28 10c-61 23 -116 43 -171 64l-9 3c-53 20 -68 24 -68 48c0 13 4 31 9 60c3 19 12 28 27 28c5 0 11 -2 18 -4c76 -26 152 -54 228 -80c23 -8 46 -14 68 -22c17 -5 27 -16 27 -34c0 -44 -18 -69 -60 -82c-74 -22 -142 -59 -215 -84c-20 -6 -39 -14 -58 -20 c-9 -2 -19 -5 -28 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B2-articTenutoStaccatoAbove.xml b/data/Petaluma/E4B2-articTenutoStaccatoAbove.xml
deleted file mode 100644
index 2cb809c3b62..00000000000
--- a/data/Petaluma/E4B2-articTenutoStaccatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M388 217h-46c-100 5 -200 5 -301 5c-4 0 -8 0 -12 1c-12 3 -29 7 -29 20v1c0 10 17 9 27 12c42 11 85 14 128 14c32 0 65 -2 98 -4c54 -3 109 -4 164 -6c13 0 26 -1 38 -4c13 -2 15 -12 17 -20v-2c0 -8 -10 -8 -16 -10c-22 -7 -45 -7 -68 -7zM217 0c-25 2 -41 16 -54 32 c-2 2 -2 5 -2 7c0 8 6 16 11 18c29 14 46 45 79 54c8 2 15 5 21 5c7 0 13 -4 17 -17c4 -12 24 -18 17 -34c-10 -20 -20 -42 -44 -50c-16 -5 -32 -11 -45 -15z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B3-articTenutoStaccatoBelow.xml b/data/Petaluma/E4B3-articTenutoStaccatoBelow.xml
deleted file mode 100644
index d861664dd15..00000000000
--- a/data/Petaluma/E4B3-articTenutoStaccatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M200 -116c-7 0 -13 4 -17 17c-4 12 -24 18 -17 34c10 20 20 42 44 50c16 5 32 11 45 15c25 -2 41 -16 54 -32c2 -2 2 -5 2 -7c0 -8 -6 -16 -11 -18c-29 -14 -46 -45 -79 -54c-8 -2 -15 -5 -21 -5zM317 -270c-32 0 -65 2 -98 4c-54 3 -109 4 -164 6c-13 0 -26 1 -38 4 c-13 2 -15 12 -17 20v2c0 8 10 8 16 10c22 7 45 7 68 7h46c100 -5 200 -5 301 -5c4 0 8 0 12 -1c12 -3 29 -7 29 -20v-1c0 -10 -17 -9 -27 -12c-42 -11 -85 -14 -128 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B4-articTenutoAccentAbove.xml b/data/Petaluma/E4B4-articTenutoAccentAbove.xml
deleted file mode 100644
index 66d385df451..00000000000
--- a/data/Petaluma/E4B4-articTenutoAccentAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M103 99c-14 0 -27 2 -39 18c76 36 160 45 236 88c-55 27 -103 56 -151 87c-33 22 -70 39 -97 69c-10 11 -16 18 -16 24c0 7 8 12 25 19c22 9 39 26 63 32c8 2 15 2 22 2c19 0 35 -5 52 -17c44 -29 90 -57 136 -83c24 -15 51 -28 63 -59c5 -12 16 -23 28 -31 c11 -8 17 -15 17 -21c0 -7 -6 -14 -18 -22c-56 -39 -120 -57 -184 -76c-45 -14 -89 -30 -137 -30zM86 0c-15 0 -30 1 -44 4c-4 0 -9 -1 -12 1c-13 5 -30 10 -30 24c1 13 19 8 29 11c46 12 93 7 140 10c58 3 116 7 174 7c16 0 31 0 47 -1c35 -1 71 -10 107 -10 c14 0 21 -11 24 -23v-3c0 -10 -14 -7 -19 -12c-13 -8 -28 -4 -44 -5c-51 7 -103 9 -156 9c-52 -1 -104 -7 -155 -9c-20 -1 -41 -3 -61 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B5-articTenutoAccentBelow.xml b/data/Petaluma/E4B5-articTenutoAccentBelow.xml
deleted file mode 100644
index f233214009d..00000000000
--- a/data/Petaluma/E4B5-articTenutoAccentBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 -57c-58 0 -116 4 -174 7c-47 3 -94 -2 -140 10c-10 3 -28 -2 -29 11c0 14 17 19 30 24c3 2 8 1 12 1c14 3 29 4 44 4c20 0 41 -2 61 -3c51 -2 103 -8 155 -9c53 0 105 2 156 9c16 -1 31 3 44 -5c5 -5 19 -2 19 -12v-3c-3 -12 -10 -23 -24 -23c-36 0 -72 -9 -107 -10 c-16 -1 -31 -1 -47 -1zM103 -438c-14 0 -27 2 -39 18c76 36 160 45 236 88c-55 27 -103 56 -151 87c-33 22 -70 39 -97 69c-10 11 -16 18 -16 24c0 7 8 12 25 19c22 9 39 26 63 32c8 2 15 2 22 2c19 0 35 -5 52 -17c44 -29 90 -57 136 -83c24 -15 51 -28 63 -59 c5 -12 16 -23 28 -31c11 -8 17 -15 17 -21c0 -7 -6 -14 -18 -22c-56 -39 -120 -57 -184 -76c-45 -14 -89 -30 -137 -30z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B6-articStressAbove.xml b/data/Petaluma/E4B6-articStressAbove.xml
deleted file mode 100644
index d6aff16e96e..00000000000
--- a/data/Petaluma/E4B6-articStressAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 0c-4 0 -9 0 -14 2c17 47 44 87 74 127c40 55 80 111 129 159c19 18 43 31 71 31c21 0 31 -14 31 -37c0 -47 -30 -78 -61 -103c-65 -54 -130 -108 -194 -163c-10 -9 -21 -16 -36 -16z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B7-articStressBelow.xml b/data/Petaluma/E4B7-articStressBelow.xml
deleted file mode 100644
index c32c826feb6..00000000000
--- a/data/Petaluma/E4B7-articStressBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M274 -319c-28 0 -52 13 -71 31c-49 48 -89 104 -129 159c-30 40 -57 80 -74 127c5 2 10 2 14 2c15 0 26 -7 36 -16c64 -55 129 -109 194 -163c31 -25 61 -56 61 -103c0 -23 -10 -37 -31 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B8-articUnstressAbove.xml b/data/Petaluma/E4B8-articUnstressAbove.xml
deleted file mode 100644
index e10edf0da90..00000000000
--- a/data/Petaluma/E4B8-articUnstressAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M227 0c-97 0 -171 71 -209 155c-13 28 -18 56 -18 86c0 9 0 18 1 27c1 14 4 28 19 28h1c11 0 13 -14 15 -23c21 -68 66 -114 127 -146c27 -14 56 -21 86 -21c57 0 115 26 152 73c21 27 41 54 53 87c2 8 7 13 13 17c5 3 9 5 12 5c5 0 9 -4 11 -14c1 -8 2 -16 2 -23 c0 -26 -8 -50 -20 -74c-31 -61 -73 -114 -134 -148c-39 -22 -67 -29 -111 -29z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B9-articUnstressBelow.xml b/data/Petaluma/E4B9-articUnstressBelow.xml
deleted file mode 100644
index 0df6737545f..00000000000
--- a/data/Petaluma/E4B9-articUnstressBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M21 -296h-1c-15 0 -18 14 -19 28c-1 9 -1 18 -1 27c0 30 5 58 18 86c38 84 112 155 209 155c44 0 72 -7 111 -29c61 -34 103 -87 134 -148c12 -24 20 -48 20 -74c0 -7 -1 -15 -2 -23c-2 -10 -6 -14 -11 -14c-3 0 -7 2 -12 5c-6 4 -11 9 -13 17c-12 33 -32 60 -53 87 c-37 47 -95 73 -152 73c-30 0 -59 -7 -86 -21c-61 -32 -106 -78 -127 -146c-2 -9 -4 -23 -15 -23z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4BA-articLaissezVibrerAbove.xml b/data/Petaluma/E4BA-articLaissezVibrerAbove.xml
deleted file mode 100644
index e1d60449254..00000000000
--- a/data/Petaluma/E4BA-articLaissezVibrerAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M404 0c-40 74 -112 95 -186 105c-10 1 -20 2 -29 2c-61 0 -116 -26 -164 -69c-4 -3 -8 -7 -12 -11c-3 -3 -6 -7 -10 -5c-5 2 -3 7 -3 11c-2 46 21 77 60 100c37 22 78 38 119 46c8 2 16 2 24 2c35 0 69 -14 100 -29c19 -8 38 -19 53 -33c27 -27 53 -55 56 -96v-7 c0 -4 -2 -7 -8 -16z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4BB-articLaissezVibrerBelow.xml b/data/Petaluma/E4BB-articLaissezVibrerBelow.xml
deleted file mode 100644
index 1337217bb54..00000000000
--- a/data/Petaluma/E4BB-articLaissezVibrerBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M404 0c6 -9 8 -12 8 -16v-7c-3 -41 -29 -69 -56 -96c-15 -14 -34 -25 -53 -33c-31 -15 -65 -29 -100 -29c-8 0 -16 0 -24 2c-41 8 -82 24 -119 46c-39 23 -62 54 -60 100c0 4 -2 9 3 11c4 2 7 -2 10 -5c4 -4 8 -8 12 -11c48 -43 103 -69 164 -69c9 0 19 1 29 2 c74 10 146 31 186 105z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4BC-articMarcatoTenutoAbove.xml b/data/Petaluma/E4BC-articMarcatoTenutoAbove.xml
deleted file mode 100644
index 6ad74e479ee..00000000000
--- a/data/Petaluma/E4BC-articMarcatoTenutoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 127c-6 2 -7 5 -7 9c0 5 4 13 3 19c-1 5 -1 11 -1 16c0 63 39 110 76 157c21 25 42 50 62 76c10 12 20 18 31 18c8 0 17 -4 25 -12c45 -43 87 -90 127 -139c10 -13 13 -29 12 -46c2 -19 -6 -37 -12 -55c-6 -15 -16 -23 -28 -23c-9 0 -19 5 -28 15 c-38 44 -72 90 -106 137c-5 6 -8 9 -11 9s-5 -4 -9 -9c-34 -47 -74 -89 -99 -141c-2 -4 -5 -8 -8 -12c-7 -9 -15 -23 -27 -19zM211 0c-50 0 -100 0 -150 1c-24 0 -44 7 -61 24v5c50 12 101 15 152 15c19 0 39 -1 59 -1h292c6 0 11 0 17 -1c11 0 13 -11 16 -18 c1 -2 1 -3 1 -4c0 -7 -10 -6 -14 -9c-11 -9 -26 -9 -39 -9c-91 -2 -182 -3 -273 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4BD-articMarcatoTenutoBelow.xml b/data/Petaluma/E4BD-articMarcatoTenutoBelow.xml
deleted file mode 100644
index 60e6d3cc482..00000000000
--- a/data/Petaluma/E4BD-articMarcatoTenutoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 -45c-51 0 -102 3 -152 15v5c17 17 37 24 61 24c50 1 100 1 150 1c91 0 182 -1 273 -3c13 0 28 0 39 -9c4 -3 14 -2 14 -9c0 -1 0 -2 -1 -4c-3 -7 -5 -18 -16 -18c-6 -1 -11 -1 -17 -1h-292c-20 0 -40 -1 -59 -1zM271 -422c-8 0 -17 4 -25 12c-45 43 -87 90 -127 139 c-10 13 -13 29 -12 46c-2 19 6 37 12 55c6 15 16 23 28 23c9 0 19 -5 28 -15c38 -44 72 -90 106 -137c5 -6 8 -9 11 -9s5 4 9 9c34 47 74 89 99 141c2 4 5 8 8 12c7 9 15 23 27 19c6 -2 7 -5 7 -9s-3 -11 -3 -17c0 -5 1 -12 1 -18c0 -63 -39 -110 -76 -157 c-21 -25 -42 -50 -62 -76c-10 -12 -20 -18 -31 -18z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C0-fermataAbove.xml b/data/Petaluma/E4C0-fermataAbove.xml
deleted file mode 100644
index 43e64ad729f..00000000000
--- a/data/Petaluma/E4C0-fermataAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 7c-4 -4 -3 -4 -7 -4c-9 -3 -12 1 -13 10c-4 35 -4 73 -4 108c-5 15 -3 33 0 52c15 75 56 137 109 192c27 28 51 61 90 74c24 8 51 15 73 15c39 -3 78 -20 114 -60c54 -60 83 -126 83 -201c-5 -21 -6 -39 -9 -58c-3 -22 -5 -43 -11 -64c-2 -7 -4 -14 -8 -20 c-6 -9 -14 -21 -26 -16c-9 3 -4 17 -5 26v23c0 7 6 16 6 22c-5 86 -51 145 -118 193c-16 11 -27 19 -42 19c-23 -3 -42 -10 -62 -24c-31 -22 -59 -49 -84 -78c-36 -41 -49 -90 -59 -141c-5 -24 -8 -49 -27 -68zM235 26c-18 2 -36 2 -54 7c-20 6 -27 23 -25 54 c2 22 19 20 31 20c21 1 41 -5 60 -15c13 -7 23 -15 23 -27c-5 -6 -5 -10 -6 -13c0 -22 5 -24 -7 -24c-9 -3 -14 -3 -22 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C1-fermataBelow.xml b/data/Petaluma/E4C1-fermataBelow.xml
deleted file mode 100644
index f843ed65c90..00000000000
--- a/data/Petaluma/E4C1-fermataBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M239 -427c-10 -2 -19 -3 -28 -3c-42 0 -78 20 -113 46c-79 59 -97 142 -98 229c-2 43 6 81 14 119c1 5 3 9 4 14c5 14 16 22 29 21c10 -2 8 -17 10 -26c1 -4 1 -9 1 -13c0 -15 -4 -30 -6 -44c-3 -14 -4 -27 -4 -40c0 -58 29 -105 77 -144c31 -26 65 -44 103 -44 c13 0 27 2 41 7c49 16 89 46 121 87c34 43 60 91 81 142c3 5 6 9 7 15c4 14 16 20 27 20c12 0 12 -16 13 -27c3 -38 -6 -74 -23 -108c-36 -77 -75 -151 -148 -201c-33 -23 -68 -41 -108 -50zM288 -132l-35 5c-43 9 -66 38 -66 79c0 5 0 10 1 16c1 8 11 13 26 13 c49 0 88 -41 88 -90c0 -19 -4 -24 -14 -23z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C2-fermataVeryShortAbove.xml b/data/Petaluma/E4C2-fermataVeryShortAbove.xml
deleted file mode 100644
index eae5f0f3519..00000000000
--- a/data/Petaluma/E4C2-fermataVeryShortAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M707 -31c-24 28 -46 51 -66 75c-86 103 -176 203 -264 304c-7 8 -12 12 -17 12s-10 -4 -17 -11c-76 -76 -151 -155 -227 -231c-24 -24 -46 -51 -69 -76c-11 -13 -24 -23 -47 -27c15 29 33 51 51 73c66 81 124 167 185 252c33 46 65 91 97 137c9 13 18 19 28 19 c8 0 17 -6 26 -18c100 -134 200 -268 298 -405c15 -21 26 -45 26 -74c0 -9 -2 -19 -4 -30zM581 -11l-75 62c-48 39 -95 78 -141 119c-4 4 -8 6 -11 6s-6 -2 -11 -6c-60 -48 -120 -96 -178 -146l-8 -6c-8 -5 -18 -19 -26 -12c-2 2 -3 4 -3 6c0 6 10 13 13 19 c25 50 65 87 100 128c34 39 68 78 100 119c8 10 14 15 19 15c6 0 10 -6 16 -18c3 -7 8 -13 13 -19c55 -66 112 -132 166 -199c13 -15 27 -31 27 -56c0 -4 0 -8 -1 -12zM344 0c-6 0 -10 5 -13 12c-8 20 -14 41 -22 61c-2 4 -2 8 -2 12c0 9 4 16 12 22c24 16 39 25 51 25 c14 0 23 -15 32 -52c2 -10 5 -20 5 -33c0 -12 -2 -23 -21 -25c-11 -1 -21 -11 -31 -18c-4 -3 -8 -4 -11 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C3-fermataVeryShortBelow.xml b/data/Petaluma/E4C3-fermataVeryShortBelow.xml
deleted file mode 100644
index 712ac324473..00000000000
--- a/data/Petaluma/E4C3-fermataVeryShortBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M352 -266c-5 0 -10 3 -16 9l-173 172c-20 20 -34 48 -43 76c-1 3 -1 5 -1 7c0 5 2 9 5 12c2 2 4 3 6 3c4 0 7 -6 10 -8c58 -50 117 -99 174 -150c10 -8 17 -12 25 -12c7 0 14 3 23 10c62 48 123 97 186 142c7 5 13 9 24 7c-1 -35 -9 -67 -34 -92 c-56 -56 -114 -110 -170 -166c-6 -6 -11 -10 -16 -10zM349 -475c-8 1 -11 8 -14 12c-85 113 -167 228 -254 339c-25 32 -50 64 -71 99c-4 6 -7 13 -9 19c-1 1 -1 3 -1 4c0 4 4 9 6 11s3 3 5 3c4 0 6 -6 8 -8c31 -31 60 -62 89 -93c82 -87 165 -171 243 -262 c6 -7 11 -11 16 -11s10 3 16 11c95 112 190 223 286 335l7 9c5 6 12 8 18 5c2 -1 3 -3 3 -5c0 -4 -2 -7 -3 -10c-11 -34 -36 -61 -57 -89c-86 -115 -175 -229 -263 -343c-7 -10 -15 -19 -25 -26zM338 -114c-14 0 -13 5 -16 13c-4 24 -9 48 -13 72c0 3 -1 7 1 9 c11 20 32 14 49 19h3c11 0 14 -12 16 -20c3 -17 4 -33 5 -47c0 -27 -20 -46 -45 -46z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C4-fermataShortAbove.xml b/data/Petaluma/E4C4-fermataShortAbove.xml
deleted file mode 100644
index 3508a735db8..00000000000
--- a/data/Petaluma/E4C4-fermataShortAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -18c-9 3 -4 13 -5 19c0 13 -6 24 -6 37c0 3 1 7 2 10c-1 4 -1 7 -1 10c0 15 7 26 18 37c79 79 153 162 229 244c5 5 10 9 15 9c4 0 9 -2 14 -7l256 -237c8 -8 12 -26 12 -46c0 -25 -6 -51 -16 -59c-2 -3 -4 -4 -6 -4s-4 3 -7 5c-49 47 -100 91 -148 138l-103 99 c-3 3 -6 5 -9 5s-6 -2 -10 -6c-73 -81 -147 -162 -221 -242c-4 -5 -7 -13 -14 -12zM248 17c-8 0 -10 4 -11 12c-3 25 -6 48 -6 73c0 20 18 32 47 32c20 0 19 -15 20 -29c1 -7 1 -15 1 -23c0 -48 -6 -53 -44 -63c-3 -2 -5 -2 -7 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C5-fermataShortBelow.xml b/data/Petaluma/E4C5-fermataShortBelow.xml
deleted file mode 100644
index ec2e20653db..00000000000
--- a/data/Petaluma/E4C5-fermataShortBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M268 -335c-6 0 -13 6 -24 19c-43 50 -85 101 -128 151c-36 42 -74 84 -102 132c-4 6 -6 12 -9 17c-3 4 -5 9 -5 14c0 3 1 7 5 10c2 2 4 2 6 2c5 0 9 -7 13 -10c85 -73 170 -147 254 -221c5 -5 9 -7 13 -7s7 2 12 6c72 70 145 139 219 207c11 10 20 25 43 23 c-10 -37 -34 -63 -57 -89c-70 -80 -143 -157 -215 -235c-12 -13 -19 -19 -25 -19zM265 -148c-13 0 -17 10 -18 30c-1 28 -5 55 -5 83c1 25 19 25 34 29c5 1 9 2 14 2c9 0 17 -4 21 -18c4 -12 9 -24 9 -37c-2 -16 -3 -33 -6 -49c-4 -17 -15 -30 -32 -36c-7 -2 -12 -4 -17 -4z " /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C6-fermataLongAbove.xml b/data/Petaluma/E4C6-fermataLongAbove.xml
deleted file mode 100644
index 7414d36c5fe..00000000000
--- a/data/Petaluma/E4C6-fermataLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -6c-10 0 -8 11 -8 18c-4 43 -6 86 -6 129c0 42 1 85 1 128v32c0 31 7 37 37 36l490 -12c36 -1 39 -6 44 -50c7 -58 13 -117 19 -175c3 -29 -8 -69 -26 -88c-8 35 -9 68 -12 100l-9 95c-1 12 -6 13 -16 13c-112 4 -223 9 -334 11c-49 1 -98 2 -147 5 c-1 -1 -2 -1 -3 -1c-12 0 -15 -5 -15 -18c2 -39 -1 -78 4 -118c1 -8 1 -15 1 -23c0 -22 -3 -45 -9 -66c-1 -8 -5 -16 -11 -16zM280 2c-21 0 -22 8 -30 43c0 1 0 3 -1 4c-2 9 -3 17 -3 24c0 35 22 51 66 47c7 0 8 -4 11 -9c9 -17 9 -35 9 -53v-15c0 -5 0 -9 -1 -14 c-2 -14 -9 -23 -26 -25c-10 -1 -18 -2 -25 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C7-fermataLongBelow.xml b/data/Petaluma/E4C7-fermataLongBelow.xml
deleted file mode 100644
index 8ff5adcbfd4..00000000000
--- a/data/Petaluma/E4C7-fermataLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M551 -335h-263v1h-259c-15 0 -23 2 -25 20c-2 22 -4 43 -4 65c0 55 7 110 10 165c1 22 2 46 5 69c2 14 11 21 21 22h1c11 0 9 -14 10 -21c2 -9 2 -19 2 -28c0 -29 -6 -58 -6 -88c-1 -26 -5 -51 -8 -76v-5c0 -11 6 -16 19 -16c65 0 130 3 196 2c95 -1 191 -2 286 -2 c20 0 24 6 23 24c-3 47 -5 94 -5 142c0 13 3 26 5 40c1 7 8 8 12 9h1c6 0 6 -6 6 -10c5 -36 10 -72 13 -109c3 -34 5 -68 10 -102c1 -5 1 -10 1 -15c0 -21 -5 -41 -11 -60s-20 -27 -40 -27zM284 -127c-22 0 -24 10 -31 48c-2 14 -1 30 -1 45v2c0 8 6 13 12 17 c15 7 31 9 47 9c9 0 17 0 26 -1c11 0 12 -13 14 -22c1 -4 1 -7 1 -11c0 -7 -1 -15 -1 -22c0 -8 1 -16 0 -24c-1 -24 -13 -36 -36 -38c-13 -2 -23 -3 -31 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C8-fermataVeryLongAbove.xml b/data/Petaluma/E4C8-fermataVeryLongAbove.xml
deleted file mode 100644
index 537d7462575..00000000000
--- a/data/Petaluma/E4C8-fermataVeryLongAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -14c-3 1 -6 7 -7 11c-2 25 -11 48 -11 73c0 113 5 227 5 340c0 19 8 27 27 27c107 0 213 -1 320 -2c108 -1 217 -2 326 -2c15 0 23 -4 25 -19c3 -20 6 -41 6 -62c3 -103 5 -206 6 -309c0 -19 -1 -39 -21 -56c-3 28 -6 55 -7 82c-3 79 -3 158 -8 238 c-1 17 -8 20 -24 20c-170 0 -341 4 -511 4h-44c-15 0 -29 0 -44 2c-2 -1 -4 -1 -6 -1h-2c-12 0 -14 -8 -14 -21v-274c0 -14 0 -27 -5 -40c-2 -5 -4 -12 -11 -11zM130 -6c-7 0 -8 15 -10 25c-16 80 -14 161 -14 243c0 16 7 22 25 22c138 -5 277 -4 415 -13 c16 -1 24 -5 28 -21c10 -41 10 -82 17 -123c5 -29 4 -58 4 -88c0 -15 -3 -30 -16 -42c-12 16 -9 35 -11 51c-6 32 -8 65 -10 97c-1 18 -8 20 -22 21l-219 9c-54 2 -108 4 -162 7h-3c-11 0 -13 -4 -13 -15c-2 -43 7 -86 5 -129c0 -6 1 -12 0 -17c-2 -11 -1 -26 -14 -27z M332 2c-27 1 -28 13 -35 59c-2 10 -3 21 -3 31c0 15 9 22 25 23c14 2 28 3 43 4c5 -1 9 0 13 0c22 0 26 -9 28 -38c1 -7 0 -13 0 -19h1v-20c-1 -20 -9 -32 -32 -35c-18 -3 -31 -5 -40 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C9-fermataVeryLongBelow.xml b/data/Petaluma/E4C9-fermataVeryLongBelow.xml
deleted file mode 100644
index 78e35da7014..00000000000
--- a/data/Petaluma/E4C9-fermataVeryLongBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M39 -427c-20 0 -24 8 -28 25c-6 24 -6 48 -6 73v37c0 91 -5 182 -5 273c0 12 -1 24 15 31c10 -16 14 -34 14 -53c0 -62 0 -123 1 -185c0 -17 2 -35 2 -52c0 -5 0 -11 -1 -17c-2 -28 0 -29 30 -29c27 -1 55 0 82 0c159 0 319 4 478 5c6 1 11 1 17 1c11 0 15 5 15 16v89 c0 43 0 86 -4 129c-1 10 -1 21 -1 31c0 22 2 45 5 67c2 10 9 12 18 16c6 -14 7 -27 7 -40s-1 -25 0 -38c3 -45 4 -89 4 -134s1 -89 4 -134c2 -27 -3 -54 -10 -80c-4 -16 -14 -25 -34 -25c-149 0 -297 -1 -446 -4c-52 -1 -104 0 -157 -2zM548 -271c-141 7 -282 9 -424 9 c-19 0 -21 9 -23 24c-5 34 -5 67 -5 101v64c-1 16 -3 31 -3 46c0 8 0 15 2 23c2 11 6 17 18 21c9 -17 11 -35 11 -52c0 -15 -1 -30 0 -45c1 -11 1 -21 1 -31v-34c0 -10 4 -14 16 -14l406 -9c12 0 15 3 15 14v135c0 14 0 29 19 35c8 -22 6 -44 6 -66v-44c0 -22 0 -44 2 -66 c1 -6 1 -12 1 -18c0 -24 -4 -47 -10 -70c-4 -16 -13 -24 -32 -23zM333 -114c-5 0 -11 1 -18 1c-10 1 -12 7 -12 14v38v12c0 43 -7 50 63 50c26 0 27 -8 27 -46c0 -52 -12 -69 -60 -69z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4CE-breathMarkComma.xml b/data/Petaluma/E4CE-breathMarkComma.xml
deleted file mode 100644
index 246cc74edc0..00000000000
--- a/data/Petaluma/E4CE-breathMarkComma.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M83 0c1 16 0 31 0 46c0 28 3 55 28 78c-4 1 -8 1 -12 1c-13 0 -23 -4 -34 -6c-8 -2 -14 -3 -19 -3c-14 0 -19 8 -25 30c-6 23 -18 45 -20 70c0 4 -1 8 -1 12c0 20 8 28 32 35c5 2 10 2 15 2c12 2 26 10 38 10c4 0 8 -1 12 -4c22 -16 42 -37 46 -67c3 -20 5 -39 5 -59 c0 -31 -5 -61 -18 -91c-9 -21 -22 -40 -47 -54z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E0-restMaxima.xml b/data/Petaluma/E4E0-restMaxima.xml
deleted file mode 100644
index 75ed6f83792..00000000000
--- a/data/Petaluma/E4E0-restMaxima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 -255c-33 0 -42 9 -40 42c4 78 12 156 11 234v42c0 56 1 112 1 168c0 10 3 15 12 18c13 4 25 6 37 6c17 0 34 -4 51 -12c13 -6 17 -19 17 -34v-186c1 -14 1 -28 1 -44c0 -60 -6 -130 -6 -200c0 -8 -2 -16 -10 -17c-25 -3 -47 -17 -74 -17zM32 -248 c-21 0 -31 18 -31 38c-1 71 -1 142 -1 213h2v208c-1 31 11 41 45 42c15 0 31 -1 45 -6c17 -5 28 -18 28 -37v-422c0 -10 -3 -17 -13 -19c-23 -4 -44 -13 -67 -16c-3 -1 -6 -1 -8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E1-restLonga.xml b/data/Petaluma/E4E1-restLonga.xml
deleted file mode 100644
index 261c63b649a..00000000000
--- a/data/Petaluma/E4E1-restLonga.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M40 -249c-27 2 -34 8 -36 35v64c-3 39 -4 79 -4 118c0 77 4 155 9 233v2c0 6 -3 13 -3 18c0 4 2 8 6 11c14 9 30 18 49 15c16 -2 34 -3 49 -9c19 -8 30 -24 29 -48c-4 -94 -7 -188 -10 -282c-1 -42 1 -84 -4 -127c-1 -9 -1 -19 -12 -20c-25 -1 -48 -12 -73 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E2-restDoubleWhole.xml b/data/Petaluma/E4E2-restDoubleWhole.xml
deleted file mode 100644
index eb3696dd596..00000000000
--- a/data/Petaluma/E4E2-restDoubleWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 0c-18 0 -27 11 -27 33v88h-2v48c0 17 -1 33 -1 50c0 15 14 17 22 21c14 6 29 9 44 9c11 0 21 -2 31 -4c16 -5 25 -15 25 -34s-2 -39 -2 -58c0 -29 1 -57 2 -86c0 -27 -2 -48 -36 -53c-15 -2 -30 -10 -46 -13c-4 -1 -7 -1 -10 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E3-restWhole.xml b/data/Petaluma/E4E3-restWhole.xml
deleted file mode 100644
index 16efcdcd49f..00000000000
--- a/data/Petaluma/E4E3-restWhole.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -120h-194c-48 0 -53 18 -52 62c1 8 6 18 6 28c0 6 -1 12 -1 18c0 8 2 15 14 17c14 3 28 9 44 8c118 -1 237 -1 356 -1c11 0 20 2 31 2c5 0 10 0 16 -2c15 -5 22 -12 27 -26s6 -28 6 -43c0 -7 -1 -15 -1 -23c-1 -21 -27 -39 -53 -39h-199v-1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E4-restHalf.xml b/data/Petaluma/E4E4-restHalf.xml
deleted file mode 100644
index 5ad64010a78..00000000000
--- a/data/Petaluma/E4E4-restHalf.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 0c-48 0 -66 19 -64 66c0 14 -1 28 -3 41c-1 7 -1 12 -1 17c0 29 13 38 51 38h196c49 0 99 -3 149 -3c23 0 46 2 69 2c27 0 41 -12 46 -40c3 -21 9 -42 7 -64c-2 -37 -18 -55 -56 -56c-25 -1 -51 -1 -76 -1h-318z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E5-restQuarter.xml b/data/Petaluma/E4E5-restQuarter.xml
deleted file mode 100644
index 2624562e24d..00000000000
--- a/data/Petaluma/E4E5-restQuarter.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M105 -414c-1 -1 -3 -1 -4 -1c-5 0 -9 7 -15 9c-10 3 -15 11 -19 19c-33 65 -60 133 -67 206c-5 61 40 112 108 121c6 1 12 -1 19 5c-16 35 -36 69 -58 100c-14 21 -27 42 -37 65c-2 5 -4 10 -4 15c0 8 5 16 15 23c20 15 42 27 63 39c16 10 24 17 24 26c0 7 -4 15 -13 26 c-30 40 -49 87 -80 127c-6 8 -10 16 -10 24c0 7 4 15 14 21c5 3 9 4 13 4c10 0 19 -9 26 -16c30 -27 51 -61 68 -97c25 -53 56 -102 86 -152c9 -14 12 -27 12 -40c0 -19 -7 -38 -18 -56c-12 -23 -31 -40 -49 -59c-7 -7 -11 -13 -11 -20c0 -4 2 -9 5 -15 c20 -41 36 -85 66 -121c15 -18 19 -42 23 -65l1 -7c0 -9 -4 -18 -13 -22c-2 -1 -3 -1 -5 -1c-8 0 -15 9 -20 16c-18 25 -35 52 -67 62c-7 2 -13 5 -20 1c-28 -12 -53 -53 -53 -87c0 -3 0 -7 1 -11c8 -35 17 -69 25 -104c1 -4 3 -8 3 -12c-2 -8 -1 -18 -9 -23z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E6-rest8th.xml b/data/Petaluma/E4E6-rest8th.xml
deleted file mode 100644
index d38144b65c2..00000000000
--- a/data/Petaluma/E4E6-rest8th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 -260c20 112 64 217 87 330c-29 -18 -53 -34 -82 -45c-16 -6 -31 -8 -43 -8c-52 0 -76 41 -76 87c0 7 1 14 2 22c6 37 12 74 31 107c11 19 19 28 32 28c6 0 14 -2 23 -6c19 -9 14 -31 14 -48c0 -9 -4 -18 -8 -25c-2 -4 -3 -7 -3 -11s2 -9 6 -13s8 -6 12 -6s8 2 12 4 c29 18 57 36 82 60c16 15 38 25 62 29c3 1 5 1 8 1c12 0 15 -9 16 -23v-5c0 -7 -2 -14 -4 -20c-36 -109 -54 -223 -93 -330c-13 -36 -27 -71 -45 -104c-6 -12 -15 -23 -33 -24z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E7-rest16th.xml b/data/Petaluma/E4E7-rest16th.xml
deleted file mode 100644
index 167b37700f5..00000000000
--- a/data/Petaluma/E4E7-rest16th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M145 -327c-4 2 -5 6 -5 10c0 43 13 85 23 126c3 10 9 20 6 30c-2 1 -3 1 -5 1c-5 0 -9 -4 -12 -8c-11 -12 -26 -18 -41 -24c-22 -9 -40 -12 -54 -12c-31 0 -45 22 -53 75c-3 13 -4 27 -4 41c0 19 3 37 12 55c8 14 18 31 36 27c22 -5 50 1 61 -31c5 -13 14 -24 13 -40v-2 c0 -9 8 -9 14 -6c27 11 56 16 65 51c9 34 16 68 34 104c-28 -13 -47 -29 -71 -38c-22 -8 -40 -13 -56 -13c-44 0 -67 34 -67 106c0 26 5 52 19 76c12 19 48 36 74 36c4 0 9 -1 13 -2c10 -3 18 -25 18 -43c0 -4 0 -8 -1 -12c-1 -9 -5 -18 -9 -31c49 21 84 55 124 82 c1 1 2 2 4 3c8 7 17 10 26 10c6 0 11 -1 15 -3c7 -4 9 -11 9 -20c0 -41 -24 -72 -36 -109c-29 -88 -54 -177 -72 -269c-5 -25 -8 -52 -12 -78c-5 -32 -19 -60 -42 -83c-7 -7 -17 -13 -26 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E8-rest32nd.xml b/data/Petaluma/E4E8-rest32nd.xml
deleted file mode 100644
index a9f26644146..00000000000
--- a/data/Petaluma/E4E8-rest32nd.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M123 -497c-12 2 -13 16 -15 27c-4 20 -15 37 -15 57c-2 60 17 115 33 171c1 1 2 2 2 4c3 12 10 27 10 39c0 3 -1 6 -2 8c-2 3 -4 4 -8 4c-9 0 -23 -8 -33 -9c-8 -3 -16 -3 -23 -3c-36 0 -58 21 -65 63c-3 18 -7 36 -7 54c0 12 2 24 6 36c8 24 35 44 64 44 c24 0 41 -14 55 -33c2 -3 1 -9 4 -11c9 -6 0 -28 15 -24c16 3 36 7 41 30c10 43 21 84 34 132c-39 -24 -71 -48 -115 -48c-35 0 -57 20 -64 57c-4 23 -10 45 -10 68c2 33 13 49 44 58c8 2 16 4 25 4c30 0 60 -15 76 -39c3 -5 6 -7 9 -7c2 0 5 1 8 3c30 19 61 36 61 80 c0 20 10 40 16 64c-40 -24 -71 -53 -112 -66c-12 -4 -24 -6 -36 -7c-3 -1 -6 -1 -9 -1c-19 0 -33 12 -38 31c-8 27 -15 55 -15 84c0 5 1 10 1 15c6 48 38 77 82 77c8 0 16 -1 24 -2c18 -4 37 -11 48 -26c6 -9 12 -13 17 -13c7 1 14 5 20 11l39 33c9 8 21 15 32 15 c4 0 8 -1 11 -3c9 -5 14 -18 14 -31c0 -4 -1 -8 -2 -12c-10 -53 -21 -106 -31 -159c-21 -103 -41 -207 -63 -311c-18 -79 -34 -158 -48 -238c-12 -62 -27 -123 -41 -184c-2 -9 -6 -17 -11 -24c-6 -10 -16 -21 -28 -18z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E9-rest64th.xml b/data/Petaluma/E4E9-rest64th.xml
deleted file mode 100644
index 6ede68a6b7a..00000000000
--- a/data/Petaluma/E4E9-rest64th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 -720c-12 0 -13 12 -16 20c-5 12 -11 25 -15 37c-4 10 -5 20 -5 30c0 21 6 41 12 61c16 53 26 106 40 162c-23 -9 -42 -22 -64 -27c-10 -3 -19 -4 -28 -4c-32 0 -55 17 -59 49c-2 15 -4 31 -4 46c0 21 3 42 10 63c9 26 41 43 74 43c13 0 26 -2 38 -9 c17 -9 34 -21 40 -39c3 -8 6 -10 9 -10s6 3 9 6c5 3 9 9 12 14c2 2 2 5 3 7c8 32 24 62 26 99c-17 -5 -32 -11 -48 -15c-10 -3 -19 -4 -28 -4c-19 0 -36 6 -50 23c-8 9 -13 19 -13 32v48c0 10 1 21 3 32c9 35 34 56 70 56c33 0 57 -20 66 -55c1 -3 1 -7 1 -11 c34 6 42 30 47 56c7 29 13 58 20 90c-26 -16 -50 -30 -78 -35c-6 -1 -11 -1 -17 -1c-32 0 -61 16 -64 62c-1 18 -4 36 -4 54c0 9 1 18 3 27c6 29 34 50 63 50c10 0 20 -3 30 -9c22 -13 40 -28 44 -56c36 15 63 34 63 78c0 20 8 39 14 64l-40 -30c-23 -18 -49 -25 -77 -25 c-17 0 -36 3 -41 19c-11 29 -21 58 -21 89c0 10 2 20 4 30c8 33 30 52 62 60c8 2 16 3 24 3c22 0 41 -8 57 -28c4 -5 7 -8 11 -8c3 0 7 2 11 5c15 12 33 22 49 33c11 8 25 15 35 10c10 -6 11 -22 11 -35c0 -21 -4 -41 -11 -61c-35 -99 -50 -203 -76 -304 c-28 -109 -48 -219 -73 -328c-22 -96 -48 -191 -72 -286c-12 -47 -24 -93 -31 -141c-1 -7 -3 -14 -6 -20c-5 -9 -10 -17 -20 -17z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4EA-rest128th.xml b/data/Petaluma/E4EA-rest128th.xml
deleted file mode 100644
index 960682704a0..00000000000
--- a/data/Petaluma/E4EA-rest128th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 -705c-7 -4 -12 -6 -16 -6c-8 0 -11 7 -12 22c-1 8 -1 15 -1 23c0 64 20 125 32 188c3 16 7 31 11 50c-28 -15 -51 -29 -79 -35c-7 -1 -15 -2 -21 -2c-46 0 -79 31 -75 79c3 37 -4 75 19 109c11 16 31 25 51 25c8 0 16 -1 23 -4c24 -10 34 -24 34 -47v-4 c0 -4 0 -8 -1 -12c-2 -7 -2 -14 -2 -22c60 14 99 75 100 163c-22 -13 -42 -27 -65 -35c-11 -4 -22 -6 -31 -6c-36 0 -59 27 -56 67c2 25 -1 51 5 76c6 27 22 44 49 50c9 2 17 4 25 4c18 0 35 -7 49 -23c9 -10 5 -21 8 -33c37 13 54 40 60 77c4 20 9 40 14 62 c-29 -23 -54 -46 -90 -54c-9 -2 -17 -3 -25 -3c-38 0 -61 25 -61 70c0 38 -1 76 19 109c15 24 43 38 70 38c19 0 38 -6 53 -19c13 -10 10 -27 18 -40c58 29 59 86 72 141c-27 -12 -50 -23 -75 -28c-4 -1 -8 -1 -12 -1c-32 0 -57 23 -58 57c-1 31 2 63 10 94 c7 27 34 46 64 46c29 0 60 -26 64 -55c0 -3 1 -6 1 -10c26 9 40 24 46 52c7 35 20 68 32 107c-30 -19 -57 -35 -89 -35c-20 -1 -40 1 -58 11s-28 25 -27 47c0 12 -1 24 -1 37c0 12 1 25 3 37c6 29 24 45 52 53c8 3 17 4 26 4c22 0 41 -8 59 -22c12 -9 8 -25 12 -41 c19 16 38 25 49 43c7 11 18 14 28 14c5 0 9 -1 13 -1c11 -1 11 -18 12 -27c1 -7 1 -13 1 -20c0 -27 -6 -54 -14 -81c-36 -122 -72 -244 -100 -367c-35 -154 -70 -306 -104 -460c-19 -86 -39 -172 -55 -259l-30 -162c-3 -17 -10 -32 -26 -41z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4EB-rest256th.xml b/data/Petaluma/E4EB-rest256th.xml
deleted file mode 100644
index d4f699994f7..00000000000
--- a/data/Petaluma/E4EB-rest256th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 -940c-11 3 -10 15 -12 24c-6 20 -9 40 -9 59c0 21 4 42 11 63c15 39 21 80 33 119c2 8 3 16 5 26c-24 -12 -47 -22 -71 -27h-13c-28 -1 -49 16 -55 45c-5 24 -9 48 -9 73c0 43 28 71 64 71c9 -1 19 -3 28 -6c19 -8 38 -14 47 -35c1 -3 4 -7 7 -5c15 13 36 18 47 36 c1 1 1 3 1 4l24 99c-20 -11 -39 -21 -57 -30c-14 -6 -28 -9 -42 -9h-6c-6 0 -13 1 -19 3c-26 7 -42 24 -43 51c-1 10 -2 20 -2 30c1 13 1 28 2 42c3 36 19 54 55 62c9 2 19 3 28 3c41 -2 53 -14 56 -53c51 13 62 32 79 131c-26 -11 -48 -28 -75 -35c-10 -3 -19 -4 -28 -4 c-35 0 -56 23 -59 67c-1 16 -2 32 -2 47c1 13 1 25 2 39c3 26 19 39 42 47c10 4 22 7 33 7c14 -1 26 -5 37 -14c8 -7 11 -16 11 -26c0 -12 -4 -26 -5 -38c74 26 110 75 112 152c-25 -11 -48 -24 -74 -31c-13 -2 -22 -3 -32 -3c-35 0 -55 24 -62 67c-2 12 -3 24 -3 35 c1 14 2 28 4 41c4 25 20 38 42 45c10 4 21 6 32 6c13 0 25 -4 36 -13c10 -10 14 -23 14 -37c0 -7 -1 -14 -2 -20c29 9 52 25 73 43c2 2 6 5 6 7c0 33 18 63 20 97c-27 -11 -52 -20 -79 -25h-13c-29 0 -52 18 -59 49c-5 22 -9 44 -9 66c0 38 32 70 70 70c17 0 28 -5 34 -23 c3 -8 4 -16 4 -24v-18c43 0 81 29 89 68c4 19 7 38 11 56l17 58c-27 -17 -49 -32 -74 -40c-13 -3 -24 -6 -37 -6c-5 0 -11 0 -17 1c-19 4 -32 16 -36 33c-6 25 -13 50 -13 76c1 4 1 9 2 13c2 27 32 52 66 56c5 1 9 1 13 1c26 -1 39 -12 47 -38c1 -4 3 -7 5 -12 c24 10 40 32 62 44l14 9c8 4 15 6 20 6c11 0 16 -9 18 -28c-1 -6 0 -12 0 -17c0 -47 -13 -91 -26 -135c-34 -114 -55 -231 -76 -349c-18 -100 -39 -199 -69 -296c-27 -86 -47 -173 -67 -261c-19 -85 -39 -170 -62 -254c-20 -74 -37 -148 -58 -222c-7 -25 -11 -51 -16 -77 c-2 -8 -4 -15 -9 -22c-6 -7 -13 -16 -23 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4EC-rest512th.xml b/data/Petaluma/E4EC-rest512th.xml
deleted file mode 100644
index 93d95165482..00000000000
--- a/data/Petaluma/E4EC-rest512th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 -1031c-5 0 -9 4 -11 11c-6 18 -17 33 -25 51c-5 12 -7 24 -7 36c0 22 7 44 13 66c17 61 32 123 48 185c1 3 0 7 0 12c-19 -8 -36 -17 -54 -23c-9 -3 -18 -4 -27 -4c-31 0 -58 16 -60 42c-1 12 -2 24 -2 36c0 25 3 50 13 74c8 22 43 40 71 40c4 0 7 0 10 -1 c25 -4 35 -20 41 -61c29 11 51 27 59 60c7 29 17 58 21 93c-14 -10 -26 -18 -37 -25c-21 -13 -43 -22 -68 -19c-33 6 -54 25 -52 58c2 28 1 57 10 85c8 26 22 44 50 48c5 1 10 1 15 1c24 0 45 -8 62 -26c1 0 1 -1 2 -1c7 -7 0 -26 11 -23c17 4 36 16 42 33 c11 31 16 66 24 102c-23 -9 -39 -21 -59 -28c-12 -4 -25 -6 -36 -6c-16 0 -32 4 -46 15c-16 11 -26 27 -23 47c2 24 4 49 10 73c9 37 28 55 59 55c4 0 8 0 12 -1c35 -3 51 -26 52 -74c30 19 65 27 75 68c8 34 23 66 28 103c-24 -12 -45 -24 -66 -34c-13 -6 -26 -9 -39 -9 c-15 0 -31 4 -46 13c-19 12 -28 29 -27 50c1 30 4 60 16 89c10 25 39 43 67 43c7 0 14 -2 20 -4c21 -8 34 -23 35 -47v-29c36 23 74 37 80 88c3 27 15 54 16 84c-34 -13 -65 -31 -100 -39c-9 -2 -18 -3 -27 -3c-5 0 -11 0 -16 1c-27 4 -44 24 -44 51c0 22 0 43 4 65 c7 39 25 58 60 64c3 1 7 1 11 1c28 0 59 -17 71 -43c4 -9 7 -11 11 -11s8 2 13 4c31 12 52 31 52 68c0 14 10 27 7 43c-22 -7 -44 -14 -67 -14c-21 -1 -40 5 -58 13c-21 9 -30 26 -28 50c2 27 4 54 10 81c8 34 38 59 72 59c5 0 9 0 14 -1c29 -7 45 -29 58 -55 c3 -6 -1 -20 8 -19c11 0 19 10 25 20c0 2 0 3 1 5c10 41 21 83 33 129c-28 -16 -54 -26 -81 -26c-9 0 -19 1 -29 4c-31 9 -43 24 -43 55v32c0 11 0 22 2 32c6 32 18 45 50 49c8 1 15 1 21 1c38 0 46 -14 46 -57c28 7 49 25 69 43c11 9 22 22 35 22c3 0 7 -1 10 -3 c10 -5 12 -16 12 -28c0 -7 -1 -15 -2 -23c-4 -35 -21 -67 -32 -102c-31 -100 -53 -202 -76 -305c-25 -112 -46 -225 -73 -337c-23 -95 -45 -190 -70 -284c-27 -101 -48 -203 -69 -305c-22 -105 -43 -211 -67 -316c-16 -71 -35 -142 -53 -213c-5 -17 -12 -33 -24 -46 c-5 -5 -9 -8 -13 -8z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4ED-rest1024th.xml b/data/Petaluma/E4ED-rest1024th.xml
deleted file mode 100644
index cab64eb12bf..00000000000
--- a/data/Petaluma/E4ED-rest1024th.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M157 -952c-7 0 -9 7 -12 12c-12 28 -19 55 -19 83c0 17 3 34 8 52c13 41 20 85 26 130c-27 -15 -52 -30 -83 -30c-49 0 -77 26 -77 75c0 20 1 39 4 59c5 44 35 73 78 73c47 0 72 -31 69 -83c33 13 45 40 52 73c7 35 18 69 28 108l-24 -18c-22 -14 -44 -23 -67 -23 c-14 0 -29 4 -44 11c-29 14 -36 38 -36 63c0 11 2 23 3 34c2 24 1 52 22 71c15 13 32 19 50 19h5c8 0 16 -2 24 -5c29 -11 47 -31 47 -64c71 22 61 87 78 143c-23 -13 -42 -24 -61 -33c-15 -8 -29 -12 -44 -12c-14 0 -28 4 -42 14c-18 13 -29 30 -26 51c3 24 3 47 7 71 c7 40 29 51 62 54s68 -18 76 -47c3 -9 5 -13 9 -13c3 0 7 1 13 4c39 16 50 48 57 84c4 20 10 39 16 62c-34 -15 -60 -35 -93 -42c-8 -1 -15 -2 -21 -2c-42 0 -67 27 -65 75c0 22 4 43 7 64c6 41 56 58 97 58c17 0 32 -5 42 -13c15 -13 22 -28 23 -50c22 13 41 24 46 50 c7 37 18 73 28 115c-31 -21 -55 -42 -85 -54c-13 -5 -26 -8 -39 -8c-19 0 -37 6 -55 16c-15 8 -26 22 -27 40c0 30 -1 61 4 91c7 40 45 59 78 59c11 0 22 -2 31 -7c23 -13 45 -28 47 -59c0 -7 2 -9 5 -9s7 1 11 3c48 24 71 62 75 115c1 15 5 29 8 48 c-38 -26 -78 -40 -122 -40c-47 0 -69 18 -69 60c1 22 1 43 4 65c5 33 27 47 55 55c9 2 18 4 27 4c20 0 37 -7 53 -23c8 -8 11 -18 10 -29v-5c0 -6 2 -9 6 -9c3 0 6 1 10 3c29 18 59 33 62 74c1 27 11 53 18 82c-31 -18 -60 -34 -95 -34c-40 0 -61 23 -61 64c0 20 0 40 3 60 c6 38 32 63 69 64c24 2 42 -11 50 -37c3 -10 4 -21 7 -33c31 15 56 30 60 70c4 37 14 73 23 113l-24 -20c-23 -21 -50 -34 -80 -42c-8 -2 -14 -3 -21 -3c-24 0 -38 17 -38 46c0 37 4 73 18 109c11 29 34 42 67 42c20 0 38 -5 47 -29c2 -4 4 -5 6 -5c3 0 6 5 9 7 c18 16 37 33 54 50c9 10 21 16 31 12c11 -3 10 -17 10 -27c1 -34 -8 -65 -18 -96c-27 -84 -40 -171 -59 -257c-22 -101 -46 -201 -65 -302c-31 -167 -77 -332 -114 -497c-28 -124 -62 -247 -91 -371c-22 -95 -51 -189 -74 -283c-24 -99 -45 -197 -60 -297 c-2 -13 -5 -27 -13 -39c-3 -4 -5 -10 -11 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4F2-restQuarterOld.xml b/data/Petaluma/E4F2-restQuarterOld.xml
deleted file mode 100644
index b31419f931f..00000000000
--- a/data/Petaluma/E4F2-restQuarterOld.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 -258h-3c-8 0 -11 13 -16 20c-35 42 -41 94 -54 144c-28 106 -49 213 -84 318c-2 6 -6 14 -6 21c0 6 3 13 12 19c5 4 8 5 11 5c4 0 8 -3 12 -7c26 -26 44 -57 72 -81c8 -7 16 -16 32 -22c-5 11 -7 21 -7 29c0 20 11 35 32 48c13 8 27 12 39 12c22 0 41 -12 55 -35 c17 -29 26 -60 26 -93c0 -6 0 -13 -1 -20c-6 -41 -39 -70 -80 -70c-19 0 -40 6 -61 21c-14 10 -26 22 -43 36c18 -53 31 -101 43 -150c11 -44 23 -88 33 -132c3 -11 3 -22 3 -33c0 -12 -2 -27 -15 -30z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4F6-restQuarterZ.xml b/data/Petaluma/E4F6-restQuarterZ.xml
deleted file mode 100644
index e42d9d455fd..00000000000
--- a/data/Petaluma/E4F6-restQuarterZ.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 -226c-11 1 -22 5 -32 15c-21 18 -41 37 -57 60c-6 8 -9 16 -9 24c0 6 2 13 5 19c17 42 47 63 91 63c12 1 25 -1 40 -4c-25 53 -44 108 -73 158c-16 28 -35 55 -44 87c-1 3 -1 5 -1 8c0 8 5 14 10 19c2 2 4 3 6 3c6 0 11 -7 15 -10c23 -16 38 -40 58 -60 c11 -10 20 -22 36 -26c1 2 2 4 2 5c0 3 -3 6 -4 8c-5 12 -7 21 -7 29c0 12 6 22 20 36c13 12 27 18 42 18c9 0 18 -2 27 -6c28 -12 70 -86 70 -131c0 -7 -1 -13 -3 -19c-12 -32 -32 -50 -62 -50c-6 0 -12 0 -18 2c-22 4 -43 11 -66 27c21 -46 41 -87 59 -129 c15 -33 32 -64 51 -94c4 -6 7 -12 9 -19c2 -6 3 -11 3 -16c0 -6 -2 -12 -8 -15c-2 -2 -3 -2 -5 -2c-6 0 -10 11 -16 16c-17 16 -32 33 -46 52c-9 13 -24 17 -41 20c1 -6 1 -12 1 -19c0 -16 -3 -33 -15 -47c-11 -15 -24 -22 -38 -22z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E500-repeat1Bar.xml b/data/Petaluma/E500-repeat1Bar.xml
deleted file mode 100644
index 345a788f8a8..00000000000
--- a/data/Petaluma/E500-repeat1Bar.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 68c-11 8 -19 20 -29 28c-9 8 -12 15 -12 22c0 9 4 17 11 25c3 4 7 7 10 11c14 14 24 21 35 21s22 -9 36 -26c17 -21 23 -32 23 -47c3 -15 -13 -21 -22 -30c-12 -13 -18 -20 -25 -20c-6 0 -13 6 -27 16zM53 -232c-3 -1 -5 -2 -7 -2c-5 0 -8 4 -10 8 c-10 22 -26 42 -34 65c-2 5 -2 9 -2 13c0 12 7 19 18 24c96 38 184 91 275 137l258 132c4 2 7 3 10 3c5 0 9 -3 14 -8c19 -18 19 -43 24 -61c1 -22 -5 -35 -22 -43c-151 -76 -302 -153 -451 -234c-23 -12 -49 -21 -73 -34zM534 -250c-4 0 -9 2 -12 5c-14 18 -34 31 -48 50 c-5 7 -7 13 -7 19s2 12 7 18c7 10 18 18 23 30c5 11 12 15 18 15s13 -3 19 -9c21 -17 37 -39 42 -61c0 -14 -35 -67 -42 -67z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E501-repeat2Bars.xml b/data/Petaluma/E501-repeat2Bars.xml
deleted file mode 100644
index baf2e34d436..00000000000
--- a/data/Petaluma/E501-repeat2Bars.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M631 286c-6 19 -7 40 -19 58c-14 23 -20 24 -43 8c-136 -96 -274 -191 -416 -280c-43 -27 -86 -55 -128 -83c-29 -19 -30 -26 -17 -56c9 -20 25 -35 35 -54c4 -6 10 -10 20 -3l240 159c103 67 203 138 303 209c14 11 23 23 25 42zM231 235c0 29 -34 71 -60 80 c-10 3 -13 -1 -15 -9c-5 -15 -9 -30 -15 -45c-14 -40 -12 -48 21 -74l30 -24c7 -5 14 -7 18 4c10 23 19 46 21 68zM775 158c-5 17 -6 37 -16 55c-12 23 -23 25 -44 10c-117 -83 -242 -155 -356 -243c-56 -43 -117 -80 -178 -116c-18 -10 -23 -22 -15 -43s23 -39 32 -60 c3 -8 9 -11 18 -4c38 25 78 49 116 76c100 70 197 144 300 208c37 23 73 46 109 69c17 11 33 23 34 48zM743 -73c-8 29 -26 51 -50 68c-15 11 -26 9 -34 -10c-7 -16 -16 -31 -25 -46c-11 -17 -10 -33 8 -45l51 -40c4 -3 11 -6 15 0c13 24 26 47 35 73z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E502-repeat4Bars.xml b/data/Petaluma/E502-repeat4Bars.xml
deleted file mode 100644
index 356eaf45fcd..00000000000
--- a/data/Petaluma/E502-repeat4Bars.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M54 -185c-4 0 -7 3 -10 8c-13 22 -32 41 -41 66c-2 4 -3 8 -3 11c0 6 3 11 8 16c25 26 56 42 86 61c160 100 317 205 471 315c11 8 20 12 27 12c10 0 17 -8 24 -26c7 -15 10 -32 14 -44c-1 -22 -9 -36 -24 -46c-55 -38 -109 -76 -163 -114c-119 -84 -242 -161 -364 -241 c-5 -4 -11 -7 -15 -12c-3 -4 -7 -6 -10 -6zM202 103c-8 0 -19 15 -48 36c-14 10 -22 22 -22 36c0 7 2 16 8 25c8 12 10 27 13 41c3 12 8 18 15 18c4 0 9 -3 15 -7c24 -19 46 -40 48 -74c-2 -7 -3 -15 -5 -23c-12 -37 -16 -52 -24 -52zM566 -255c-4 0 -7 3 -9 7 c-14 22 -33 42 -42 67c-2 4 -3 8 -3 11c0 5 3 10 8 16c25 26 56 42 86 60c160 101 317 206 471 316c11 7 20 12 27 12c10 0 17 -8 25 -26c6 -16 9 -32 13 -45c-1 -22 -9 -35 -24 -45l-163 -114c-118 -85 -242 -162 -364 -242c-5 -3 -11 -7 -15 -11s-7 -6 -10 -6zM275 -250 c-4 0 -7 4 -8 7c-9 22 -24 39 -32 61c-3 6 -4 12 -4 17c0 10 6 18 17 25c167 95 314 221 480 319c23 14 45 31 67 46c4 3 7 4 10 4c4 0 7 -2 12 -6c20 -20 19 -47 26 -68c-2 -25 -17 -37 -35 -48c-62 -40 -124 -81 -186 -120c-70 -43 -132 -95 -199 -142 c-46 -32 -96 -58 -140 -92c-3 -2 -5 -3 -8 -3zM807 -304c-4 0 -8 4 -9 8c-8 21 -24 39 -32 61c-2 6 -3 12 -3 16c0 11 5 18 17 25c167 96 314 222 480 320c23 14 44 30 67 46c3 3 6 4 9 4c4 0 8 -2 13 -7c20 -19 18 -46 25 -67c-1 -26 -17 -38 -34 -49 c-62 -40 -124 -80 -187 -120c-69 -43 -132 -95 -199 -141c-45 -32 -95 -59 -139 -93c-3 -2 -5 -3 -8 -3zM1302 -205c-3 0 -7 2 -9 4c-17 14 -37 25 -53 41c-8 7 -11 14 -11 22c0 6 2 12 5 18l24 44c8 15 13 22 20 22c5 0 12 -4 22 -13c20 -16 37 -35 43 -64 c-9 -24 -21 -48 -36 -71c-2 -2 -3 -3 -5 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E503-repeatBarUpperDot.xml b/data/Petaluma/E503-repeatBarUpperDot.xml
deleted file mode 100644
index bc548a190e7..00000000000
--- a/data/Petaluma/E503-repeatBarUpperDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M73 62c-3 0 -7 2 -9 4c-17 14 -37 25 -53 41c-8 7 -11 14 -11 22c0 6 2 12 5 18l24 44c8 15 13 22 20 22c5 0 12 -4 22 -13c20 -16 37 -35 43 -64c-9 -24 -21 -48 -36 -71c-2 -2 -3 -3 -5 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E504-repeatBarSlash.xml b/data/Petaluma/E504-repeatBarSlash.xml
deleted file mode 100644
index 581e8097fcb..00000000000
--- a/data/Petaluma/E504-repeatBarSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M54 -225c-4 1 -7 4 -10 8c-15 20 -32 41 -41 66c-2 4 -3 8 -3 11c0 7 3 11 8 17c23 28 56 41 86 60c159 101 325 196 471 315c11 9 20 14 27 13c10 -1 17 -9 24 -26c7 -16 10 -32 14 -45c-1 -22 -9 -35 -24 -45c-56 -37 -109 -77 -163 -115c-119 -84 -242 -161 -364 -241 c-5 -3 -12 -6 -15 -11s-7 -8 -10 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E505-repeatBarLowerDot.xml b/data/Petaluma/E505-repeatBarLowerDot.xml
deleted file mode 100644
index 0834b61f674..00000000000
--- a/data/Petaluma/E505-repeatBarLowerDot.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M73 -206c-3 0 -7 2 -9 4c-17 14 -37 25 -53 41c-8 7 -11 14 -11 22c0 6 2 12 5 18l24 44c8 15 13 22 20 22c5 0 12 -4 22 -13c20 -16 37 -35 43 -64c-9 -24 -21 -48 -36 -71c-2 -2 -3 -3 -5 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E510-ottava.xml b/data/Petaluma/E510-ottava.xml
deleted file mode 100644
index d41386beb7e..00000000000
--- a/data/Petaluma/E510-ottava.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 0c-13 0 -25 3 -38 8c-36 14 -52 46 -52 84c0 45 22 114 70 152c-19 13 -31 38 -31 66c0 25 9 52 30 77c22 25 46 35 66 35c34 0 60 -26 62 -51c2 -36 -12 -74 -28 -99c16 -16 42 -64 43 -93c1 -62 -18 -115 -67 -157c-17 -15 -36 -22 -55 -22zM115 286 c30 1 42 21 45 50c3 19 -10 31 -28 31c-2 0 -5 0 -8 -1c-31 -6 -36 -26 -36 -44c0 -19 12 -36 27 -36zM108 57c46 0 69 47 69 90c0 27 -10 52 -30 57c-6 1 -12 2 -18 2c-36 0 -59 -28 -67 -51c-4 -12 -6 -24 -6 -35c0 -36 19 -63 52 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E511-ottavaAlta.xml b/data/Petaluma/E511-ottavaAlta.xml
deleted file mode 100644
index e85f9903932..00000000000
--- a/data/Petaluma/E511-ottavaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M596 128c-7 3 -6 11 -6 17v112c-18 -28 -32 -51 -47 -74c-10 -15 -21 -31 -39 -31c-25 0 -37 22 -47 42c-4 8 -5 17 -5 25c0 13 3 25 4 38c7 62 31 115 81 155c12 9 27 14 41 14c9 0 17 -2 23 -6c18 -11 29 -38 29 -60c0 -13 -2 -27 -2 -41c0 -20 2 -41 3 -62 c1 -18 4 -37 4 -56c0 -17 -2 -33 -10 -50c-3 -6 -5 -12 -10 -16c-6 -4 -11 -10 -19 -7zM100 0c-13 0 -25 3 -38 8c-36 14 -52 46 -52 84c0 45 22 114 70 152c-19 13 -31 38 -31 66c0 25 9 52 30 77c22 25 46 35 66 35c34 0 60 -26 62 -51c2 -36 -12 -74 -28 -99 c16 -16 42 -64 43 -93c1 -62 -18 -115 -67 -157c-17 -15 -36 -22 -55 -22zM337 183c-11 0 -10 13 -13 21c-21 44 -37 91 -63 133c-7 12 13 68 25 73c2 1 4 1 5 1c7 0 12 -5 16 -12c18 -32 33 -65 47 -99c3 -8 5 -17 14 -25c20 35 39 69 59 103c8 14 17 38 34 29 c5 -3 6 -7 6 -12c0 -10 -7 -24 -12 -33c-30 -54 -61 -107 -92 -161c-6 -10 -15 -19 -26 -18zM115 286c30 1 42 21 45 50c3 19 -10 31 -28 31c-2 0 -5 0 -8 -1c-31 -6 -36 -26 -36 -44c0 -19 12 -36 27 -36zM519 234c4 0 9 3 15 11c15 23 29 47 40 72c1 3 2 7 2 9 c0 10 -7 16 -12 23c-3 4 -7 5 -11 5s-9 -1 -13 -4c-28 -18 -42 -45 -48 -76c0 -11 5 -20 11 -28c6 -7 10 -12 16 -12zM108 57c46 0 69 47 69 90c0 27 -10 52 -30 57c-6 1 -12 2 -18 2c-36 0 -59 -28 -67 -51c-4 -12 -6 -24 -6 -35c0 -36 19 -63 52 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E512-ottavaBassa.xml b/data/Petaluma/E512-ottavaBassa.xml
deleted file mode 100644
index 197d5a63dbd..00000000000
--- a/data/Petaluma/E512-ottavaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 0c-13 0 -25 3 -38 8c-36 14 -52 46 -52 84c0 45 22 114 70 152c-19 13 -31 38 -31 66c0 25 9 52 30 77c22 25 46 35 66 35c34 0 60 -26 62 -51c2 -36 -12 -74 -28 -99c16 -16 42 -64 43 -93c1 -62 -18 -115 -67 -157c-17 -15 -36 -22 -55 -22zM115 286 c30 1 42 21 45 50c3 19 -10 31 -28 31c-2 0 -5 0 -8 -1c-31 -6 -36 -26 -36 -44c0 -19 12 -36 27 -36zM587 -37c-7 3 -6 11 -6 17v112c-18 -28 -32 -51 -47 -74c-10 -15 -21 -31 -39 -31c-25 0 -37 22 -47 42c-4 8 -5 17 -5 25c0 13 3 25 4 38c7 62 30 117 81 155 c12 9 27 14 41 14c9 0 17 -2 23 -6c18 -11 29 -38 29 -60c0 -13 -2 -27 -2 -41c0 -20 2 -41 3 -62c1 -18 4 -37 4 -56c0 -17 -2 -33 -10 -50c-3 -6 -5 -12 -10 -16c-6 -4 -11 -10 -19 -7zM328 18c-11 0 -10 13 -13 21c-21 44 -38 90 -63 133c-7 12 13 68 25 73c2 1 4 1 5 1 c7 0 12 -5 16 -12c18 -32 34 -65 47 -99c3 -8 5 -17 14 -25c20 35 39 69 59 103c8 14 17 38 34 29c5 -3 6 -7 6 -12c0 -10 -7 -24 -12 -33c-30 -54 -60 -108 -92 -161c-6 -10 -15 -19 -26 -18zM108 57c46 0 69 47 69 90c0 27 -10 52 -30 57c-6 1 -12 2 -18 2 c-36 0 -59 -28 -67 -51c-4 -12 -6 -24 -6 -35c0 -36 19 -63 52 -63zM510 69c4 0 9 3 15 11c15 23 29 47 40 72c1 3 2 7 2 9c0 10 -7 16 -12 23c-3 4 -7 5 -11 5s-9 -1 -13 -4c-28 -18 -42 -45 -48 -76c0 -11 5 -20 11 -28c6 -7 10 -12 16 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E513-ottavaBassaBa.xml b/data/Petaluma/E513-ottavaBassaBa.xml
deleted file mode 100644
index 029cb29eed9..00000000000
--- a/data/Petaluma/E513-ottavaBassaBa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 -10c-11 0 -24 3 -36 8c-36 15 -50 45 -52 82c-1 6 0 13 0 22c0 4 -1 7 -1 11c0 27 14 51 35 72c6 6 10 12 7 23c-6 17 -9 35 -9 52c0 49 22 92 58 131c4 5 10 10 13 17c11 25 31 27 53 26c22 -2 30 -20 35 -38c4 -13 5 -26 5 -38c1 -27 -7 -54 -17 -81 c-3 -8 -5 -14 -5 -20c1 -8 4 -15 12 -23c20 -20 26 -46 26 -72v-8c0 -7 -1 -14 -2 -21c-7 -47 -26 -88 -63 -119c-19 -16 -39 -24 -59 -24zM279 0c-16 0 -27 9 -33 25c-2 4 -2 9 -2 14c0 13 5 26 10 38c3 6 7 11 7 19c-3 81 9 161 9 242c0 20 17 32 31 43c2 1 3 2 5 2 c5 0 5 -7 6 -13c-1 -21 0 -41 0 -63c1 -24 0 -49 -4 -76c14 13 22 22 31 29c11 10 24 15 36 15c18 0 33 -10 45 -29c6 -10 10 -22 12 -34c2 -11 3 -22 3 -33c0 -83 -56 -147 -130 -173c-10 -4 -19 -6 -26 -6zM120 257c14 0 27 6 35 22c9 17 13 34 16 52v3v2 c0 10 -8 18 -17 18c-34 2 -69 -17 -72 -61c0 -13 7 -30 25 -34c4 -1 9 -2 13 -2zM586 -9c-9 2 -7 11 -7 18v110c-17 -27 -31 -48 -45 -70c-5 -7 -10 -15 -16 -21c-9 -9 -18 -14 -26 -14c-9 1 -17 5 -27 14c-19 17 -25 37 -25 57c1 13 3 26 5 39c8 55 29 105 73 142 c16 15 32 21 46 21c23 1 41 -16 55 -47c1 -4 1 -8 1 -12c1 -11 -5 -23 -4 -34c4 -46 4 -91 6 -137c1 -21 -5 -39 -16 -56c-4 -7 -12 -13 -20 -10zM318 59c4 1 7 2 12 4c38 15 63 55 63 96c0 16 -3 32 -12 46c-9 16 -23 31 -41 26c-19 -5 -32 -20 -32 -42c0 -17 1 -43 1 -55 c1 -7 1 -16 1 -27c0 -10 0 -21 -1 -31v-3c0 -10 3 -14 9 -14zM510 93l6 5c20 25 37 53 48 84v7v2c0 9 -7 16 -14 21c-3 3 -7 4 -10 4c-6 0 -13 -3 -18 -8c-22 -18 -35 -42 -42 -69c-3 -15 16 -46 30 -46zM120 50c32 5 56 27 69 58c2 7 3 13 3 20c1 19 -10 37 -22 53 c-6 7 -13 11 -21 11c-3 0 -8 -1 -12 -3c-29 -11 -53 -29 -76 -49c-18 -15 -26 -28 -26 -39c1 -17 17 -30 42 -42c12 -6 25 -8 43 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E514-quindicesima.xml b/data/Petaluma/E514-quindicesima.xml
deleted file mode 100644
index bf6ff17e303..00000000000
--- a/data/Petaluma/E514-quindicesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M77 18c-8 0 -8 8 -9 13c-3 19 -6 37 -6 57c0 5 1 11 1 16c6 93 2 186 13 278v3c0 2 0 5 -1 9c-17 -15 -30 -30 -49 -36c-4 -1 -8 -3 -11 -3c-6 0 -10 4 -12 15s-3 19 -3 25c0 13 6 16 30 27c20 8 32 26 45 42c7 7 13 17 23 14c9 -4 12 -15 12 -25c-1 -23 -3 -46 -6 -69 c-7 -69 -8 -138 -9 -207c0 -45 -3 -90 -4 -134c0 -5 -1 -10 -3 -14c-2 -5 -5 -11 -11 -11zM201 0c-8 0 -17 1 -26 4c-30 9 -34 39 -40 65c-1 6 -1 12 -1 18c0 11 1 22 0 33c0 8 4 15 12 15h1c8 0 9 -8 11 -15c1 -4 0 -8 0 -12c1 -30 15 -46 36 -46c9 0 20 3 31 9 c33 18 47 50 57 83c4 14 10 28 10 43c0 6 -1 13 -3 19c-11 32 -34 49 -60 49c-14 0 -29 -5 -44 -15c-8 -6 -13 -8 -17 -8c-6 0 -8 6 -10 21c-1 9 -2 18 -2 27c0 39 11 77 19 115c1 3 1 8 3 11c6 11 0 27 11 36c3 3 6 4 9 4c9 0 17 -8 26 -8c26 -2 46 10 67 21c7 4 12 6 15 6 c6 0 8 -7 10 -20c1 -4 1 -8 1 -11c0 -33 -30 -49 -75 -57c-41 -7 -42 -4 -52 -45c-1 -5 -3 -10 -3 -15c0 -2 1 -5 2 -8c14 4 27 6 38 6c48 0 79 -33 86 -92c1 -11 2 -23 2 -34c0 -36 -6 -72 -18 -107c-9 -28 -26 -50 -47 -71c-14 -15 -31 -21 -49 -21z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E515-quindicesimaAlta.xml b/data/Petaluma/E515-quindicesimaAlta.xml
deleted file mode 100644
index cd8c759fccc..00000000000
--- a/data/Petaluma/E515-quindicesimaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M528 178c7 37 17 71 20 106c1 10 2 21 2 31c0 23 -3 45 -13 66c-3 10 -8 20 -20 20c-17 0 -25 -11 -25 -26v-87c1 -21 -9 -38 -21 -54c-3 -5 -7 -10 -13 -8c-7 3 -4 10 -4 15v118c0 10 -2 20 -5 30c-3 11 -9 21 -22 21c-15 0 -27 -11 -26 -28c2 -39 4 -78 8 -117 c3 -26 -12 -42 -27 -58c-3 -4 -6 -6 -9 -6s-5 4 -6 13l-15 200c-2 27 11 46 24 66c3 5 7 7 12 5c5 -1 5 -5 5 -9c1 -13 3 -27 4 -41c21 24 38 35 52 35s26 -12 38 -37c9 6 18 12 28 18c9 6 18 8 26 8c14 0 24 -9 32 -29c10 -26 14 -53 14 -81c0 -19 -2 -38 -6 -58 c-6 -32 -9 -68 -30 -96c-6 -8 -11 -13 -23 -17zM747 184c-9 2 -7 11 -7 18v110l-45 -70c-4 -7 -9 -15 -15 -21c-9 -9 -18 -14 -26 -14c-9 0 -18 5 -28 14c-19 17 -24 38 -24 58c0 13 2 26 4 39c8 54 29 104 73 141c18 15 33 22 47 22c22 0 39 -17 54 -47c2 -4 2 -8 2 -12 c0 -11 -6 -23 -5 -35c4 -46 5 -91 7 -137c1 -21 -6 -39 -17 -56c-4 -7 -11 -13 -20 -10zM77 17c-8 0 -8 8 -9 13c-3 19 -6 37 -6 57c0 5 1 11 1 16c6 93 2 186 13 278v3c0 2 0 5 -1 9c-17 -15 -30 -30 -49 -36c-4 -1 -8 -3 -11 -3c-6 0 -10 4 -12 15s-3 19 -3 25 c0 13 6 16 30 27c20 8 32 26 45 42c7 7 13 17 23 14c9 -4 12 -15 12 -25c-1 -23 -4 -46 -6 -69c-6 -69 -9 -138 -9 -207c0 -45 -4 -90 -4 -134c0 -5 -1 -10 -3 -14c-2 -5 -5 -11 -11 -11zM201 -1c-8 0 -17 1 -26 4c-30 10 -34 39 -40 65c-1 6 -1 12 -1 18c0 11 1 22 0 33 c0 8 4 15 12 15h1c8 0 9 -8 11 -15c1 -4 0 -8 0 -12c1 -30 15 -46 36 -46c9 0 20 3 31 9c33 18 48 50 57 83c4 14 10 28 10 43c0 6 -1 13 -3 19c-11 32 -34 49 -60 49c-14 0 -29 -5 -44 -15c-8 -6 -13 -8 -17 -8c-6 0 -8 6 -10 21c-1 9 -2 18 -2 27c0 39 11 77 19 115 c1 3 1 8 3 11c6 11 0 27 11 36c3 3 6 4 9 4c9 0 17 -8 26 -8c26 -2 46 10 67 21c7 4 12 6 15 6c6 0 8 -7 10 -20c1 -4 1 -8 1 -11c0 -33 -30 -49 -75 -57c-41 -7 -42 -4 -52 -45c-1 -5 -3 -10 -3 -15c0 -2 1 -5 2 -8c14 4 27 6 38 6c48 0 81 -33 86 -92c1 -11 2 -23 2 -34 c0 -36 -7 -72 -18 -107c-9 -28 -27 -49 -47 -71c-14 -15 -31 -21 -49 -21zM671 286l6 5c21 25 38 53 48 84c1 3 1 5 1 8c0 9 -7 16 -14 22c-4 3 -7 4 -11 4c-6 0 -12 -4 -18 -8c-22 -18 -35 -42 -41 -69c-4 -15 16 -46 29 -46z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E516-quindicesimaBassa.xml b/data/Petaluma/E516-quindicesimaBassa.xml
deleted file mode 100644
index 1a938a1de15..00000000000
--- a/data/Petaluma/E516-quindicesimaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M77 19c-8 0 -8 8 -9 13c-3 19 -6 37 -6 57c0 5 1 11 1 16c6 93 2 186 13 278v3c0 2 0 5 -1 9c-17 -15 -30 -30 -49 -36c-4 -1 -8 -3 -11 -3c-6 0 -10 4 -12 15s-3 19 -3 25c0 13 6 16 30 27c20 8 32 26 45 42c7 7 13 17 23 14c9 -4 12 -15 12 -25c-1 -23 -4 -46 -6 -69 c-6 -69 -9 -138 -9 -207c0 -45 -4 -90 -4 -134c0 -5 -1 -10 -3 -14c-2 -5 -5 -11 -11 -11zM201 1c-8 0 -17 1 -26 4c-30 10 -34 39 -40 65c-1 6 -1 12 -1 18c0 11 1 22 0 33c0 8 4 15 12 15h1c8 0 9 -8 11 -15c1 -4 0 -8 0 -12c1 -30 15 -46 36 -46c9 0 20 3 31 9 c33 18 48 50 57 83c4 14 10 28 10 43c0 6 -1 13 -3 19c-11 32 -34 49 -60 49c-14 0 -29 -5 -44 -15c-8 -6 -13 -8 -17 -8c-6 0 -8 6 -10 21c-1 9 -2 18 -2 27c0 39 11 77 19 115c1 3 1 8 3 11c6 11 0 27 11 36c3 3 6 4 9 4c9 0 17 -8 26 -8c26 -2 46 10 67 21c7 4 12 6 15 6 c6 0 8 -7 10 -20c1 -4 1 -8 1 -11c0 -33 -30 -49 -75 -57c-41 -7 -42 -4 -52 -45c-1 -5 -3 -10 -3 -15c0 -2 1 -5 2 -8c14 4 27 6 38 6c48 0 81 -33 86 -92c1 -11 2 -23 2 -34c0 -36 -7 -72 -18 -107c-9 -28 -27 -49 -47 -71c-14 -15 -31 -21 -49 -21zM528 -20 c7 37 17 71 20 106c1 10 2 21 2 31c0 23 -3 45 -13 66c-3 10 -8 20 -20 20c-17 0 -25 -11 -25 -26v-87c1 -21 -9 -38 -21 -54c-3 -5 -7 -10 -13 -8c-7 3 -4 10 -4 15v118c0 10 -2 20 -5 30c-3 11 -9 21 -22 21c-15 0 -27 -11 -26 -28c2 -39 4 -78 8 -117 c3 -26 -12 -42 -27 -58c-3 -4 -6 -6 -9 -6s-5 4 -6 13l-15 200c-2 27 11 46 24 66c3 5 7 7 12 5c5 -1 5 -5 5 -9c1 -13 3 -27 4 -41c21 24 38 35 52 35s26 -12 38 -37c9 6 18 12 28 18c9 6 18 8 26 8c14 0 24 -9 32 -29c10 -26 14 -53 14 -81c0 -19 -2 -38 -6 -58 c-6 -32 -9 -68 -30 -96c-6 -8 -11 -13 -23 -17zM747 -14c-9 2 -7 11 -7 18v110l-45 -70c-4 -7 -9 -15 -15 -21c-9 -9 -18 -14 -26 -14c-9 0 -18 5 -28 14c-19 17 -24 38 -24 58c0 13 2 26 4 39c8 54 29 104 73 141c18 15 33 22 47 22c22 0 39 -17 54 -47c2 -4 2 -8 2 -12 c0 -11 -6 -23 -5 -35c4 -46 5 -91 7 -137c1 -21 -6 -39 -17 -56c-4 -7 -11 -13 -20 -10zM671 88l6 5c21 25 38 53 48 84c1 3 1 5 1 8c0 9 -7 16 -14 22c-4 3 -7 4 -11 4c-6 0 -12 -4 -18 -8c-22 -18 -35 -42 -41 -69c-4 -15 16 -46 29 -46z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E517-ventiduesima.xml b/data/Petaluma/E517-ventiduesima.xml
deleted file mode 100644
index 92f21d7ced6..00000000000
--- a/data/Petaluma/E517-ventiduesima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 -5c-5 16 -8 30 -8 44c0 36 17 66 32 96c33 66 73 130 100 201l15 40c3 8 4 15 4 22c0 22 -14 41 -42 54c-10 4 -19 7 -28 7c-19 0 -36 -10 -49 -30c-10 -16 -16 -34 -18 -54c-1 -11 -3 -21 -12 -33c-4 16 -7 32 -7 47c0 35 13 67 32 97c16 25 36 36 60 36 c8 0 17 -1 27 -4c34 -10 57 -43 58 -79c2 -75 -19 -143 -51 -208c-20 -41 -42 -81 -65 -127c10 3 19 4 28 4c42 0 73 -31 110 -46c5 -2 7 -13 7 -25c0 -10 -2 -22 -6 -29c-4 -6 -7 -8 -11 -8c-6 0 -12 5 -18 7c-9 4 -18 10 -26 16c-20 15 -39 23 -58 23 c-23 0 -45 -12 -66 -35c-3 -3 -4 -7 -8 -16zM199 0c-15 -6 -29 8 -40 18c-9 8 -18 17 -29 23c-13 7 -25 11 -37 11c-19 0 -36 -8 -55 -27c-4 -4 -8 -9 -13 -13c-4 -3 -7 -5 -9 -5c-3 0 -4 4 -5 11c-1 5 -1 10 -1 15c0 25 8 47 24 68c46 61 86 124 112 196c8 22 15 44 21 66 c2 7 3 14 3 21c0 12 -3 24 -10 36c-11 19 -24 28 -41 28c-6 0 -12 -1 -19 -3c-41 -12 -60 -37 -65 -80c-1 -9 -3 -16 -10 -21c-4 17 -6 34 -6 49c0 55 25 95 87 116c6 2 13 3 19 3c32 0 60 -28 63 -69c1 -12 2 -24 2 -35c0 -52 -12 -101 -29 -149c-18 -50 -42 -96 -72 -144 c35 -1 60 -15 83 -36c9 -7 18 -16 30 -19c11 -3 15 -11 12 -22c-3 -14 0 -33 -15 -38z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E518-ventiduesimaAlta.xml b/data/Petaluma/E518-ventiduesimaAlta.xml
deleted file mode 100644
index 37e0ab5246a..00000000000
--- a/data/Petaluma/E518-ventiduesimaAlta.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 -5c-5 16 -8 30 -8 44c0 36 17 66 32 96c33 66 74 130 100 200l15 41c3 8 4 15 4 22c0 22 -14 41 -42 54c-10 4 -19 7 -28 7c-19 0 -36 -11 -49 -30c-10 -17 -16 -34 -18 -54c-1 -11 -3 -21 -12 -33c-4 16 -7 32 -7 47c0 35 13 67 32 97c16 25 36 36 60 36 c8 0 17 -1 27 -4c34 -10 57 -43 58 -80c2 -74 -19 -142 -51 -207c-20 -41 -42 -82 -65 -127c10 3 19 4 28 4c42 0 73 -31 110 -46c5 -2 7 -13 7 -25c0 -11 -2 -22 -6 -29c-4 -6 -7 -8 -11 -8c-6 0 -12 4 -18 7c-9 4 -18 9 -26 16c-20 16 -39 23 -58 23 c-23 0 -45 -12 -66 -36c-3 -2 -4 -7 -8 -15zM199 0c-15 -6 -29 8 -40 17c-9 9 -18 18 -29 24c-13 7 -25 11 -37 11c-19 -1 -36 -8 -55 -27c-4 -4 -8 -9 -13 -13c-4 -3 -7 -5 -9 -5c-3 0 -4 3 -5 11c-1 5 -1 10 -1 15c0 25 8 47 24 68c46 60 86 123 112 196c8 22 14 43 21 66 c2 7 3 14 3 21c0 12 -3 24 -10 36c-11 19 -24 28 -41 28c-6 0 -12 -1 -19 -3c-41 -12 -60 -37 -65 -81c-1 -8 -3 -15 -10 -20c-4 17 -6 34 -6 49c0 55 25 95 87 116c6 2 13 3 19 3c32 0 59 -28 63 -70c1 -11 2 -23 2 -34c0 -52 -12 -101 -29 -149c-18 -50 -42 -96 -72 -144 c35 -2 60 -16 83 -36c9 -8 18 -16 30 -19c11 -3 15 -12 12 -22c-3 -14 0 -33 -15 -38zM874 200c-9 3 -7 12 -7 19v110c-17 -27 -31 -49 -45 -70c-4 -8 -9 -15 -15 -21c-9 -9 -18 -14 -26 -14c-9 0 -18 5 -28 14c-12 11 -18 23 -21 36c-17 -26 -45 -37 -72 -49 c-2 -1 -4 -1 -6 -1c-5 0 -6 5 -6 10c0 57 1 115 1 172c0 7 1 13 0 19c-1 10 -2 21 -14 21c-17 0 -29 -9 -25 -27c3 -15 5 -30 5 -45c0 -30 -6 -60 -13 -89c-6 -21 -22 -31 -36 -43c-3 -2 -9 -4 -11 -1s-2 5 -2 7c0 3 1 6 2 9c9 26 11 52 11 78c0 14 -1 29 -3 43 c-2 19 -5 37 -17 52c-6 8 -12 16 -23 11c-10 -4 -19 -9 -18 -24c3 -45 3 -91 4 -136c0 -21 -18 -45 -37 -50c-2 0 -4 -1 -6 -1c-6 0 -9 3 -9 12c0 48 -2 96 -2 144c0 24 0 48 2 72c2 23 23 33 39 45c2 2 4 2 5 2c5 0 8 -4 7 -12c-1 -6 -3 -14 -3 -22c0 -5 1 -9 2 -13 c10 8 18 13 26 19c12 9 22 13 31 13c12 0 22 -8 32 -24c4 -7 7 -10 10 -10s6 3 10 8c10 13 24 22 39 27c6 2 12 4 17 4c15 -1 25 -12 25 -32c0 -53 1 -107 1 -160l-1 -10c0 -4 1 -8 5 -10c2 -1 3 -2 5 -2c5 0 9 6 14 9c3 2 5 3 8 4c0 13 2 27 4 40c8 55 29 105 73 142 c18 15 33 22 47 22c22 0 40 -17 54 -48c2 -3 2 -7 2 -11c0 -12 -6 -23 -5 -36c3 -45 5 -90 7 -136c1 -21 -6 -39 -17 -56c-4 -7 -11 -13 -20 -11zM798 293c1 1 4 2 6 5c21 25 38 53 48 84c1 3 1 5 1 8c0 9 -7 16 -14 22c-4 3 -7 4 -11 4c-6 -1 -12 -4 -18 -8 c-22 -18 -35 -42 -41 -70c-4 -14 16 -45 29 -45z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E519-ventiduesimaBassa.xml b/data/Petaluma/E519-ventiduesimaBassa.xml
deleted file mode 100644
index 7607caa0ebe..00000000000
--- a/data/Petaluma/E519-ventiduesimaBassa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 -5c-5 16 -8 30 -8 44c0 36 17 66 32 96c33 66 74 130 100 200l15 41c3 8 4 15 4 22c0 22 -14 41 -42 54c-10 4 -19 7 -28 7c-19 0 -36 -11 -49 -30c-10 -17 -16 -34 -18 -54c-1 -11 -3 -21 -12 -33c-4 16 -7 32 -7 47c0 35 13 67 32 97c16 25 36 36 60 36 c8 0 17 -1 27 -4c34 -10 57 -43 58 -80c2 -74 -19 -142 -51 -207c-20 -41 -42 -82 -65 -127c10 3 19 4 28 4c42 0 73 -31 110 -46c5 -2 7 -13 7 -25c0 -11 -2 -22 -6 -29c-4 -6 -7 -8 -11 -8c-6 0 -12 4 -18 7c-9 4 -18 9 -26 16c-20 16 -39 23 -58 23 c-23 0 -45 -12 -66 -36c-3 -2 -4 -7 -8 -15zM199 0c-15 -6 -29 8 -40 17c-9 9 -18 18 -29 24c-13 7 -25 11 -37 11c-19 -1 -36 -8 -55 -27c-4 -4 -8 -9 -13 -13c-4 -3 -7 -5 -9 -5c-3 0 -4 3 -5 11c-1 5 -1 10 -1 15c0 25 8 47 24 68c46 60 86 123 112 196c8 22 14 43 21 66 c2 7 3 14 3 21c0 12 -3 24 -10 36c-11 19 -24 28 -41 28c-6 0 -12 -1 -19 -3c-41 -12 -60 -37 -65 -81c-1 -8 -3 -15 -10 -20c-4 17 -6 34 -6 49c0 55 25 95 87 116c6 2 13 3 19 3c32 0 59 -28 63 -70c1 -11 2 -23 2 -34c0 -52 -12 -101 -29 -149c-18 -50 -42 -96 -72 -144 c35 -2 60 -16 83 -36c9 -8 18 -16 30 -19c11 -3 15 -12 12 -22c-3 -14 0 -33 -15 -38zM874 -30c-9 3 -7 12 -7 19v110c-17 -27 -31 -49 -45 -70c-4 -8 -9 -15 -15 -21c-9 -9 -18 -14 -26 -14c-9 0 -18 5 -28 14c-12 11 -18 23 -21 36c-17 -26 -45 -37 -72 -49 c-2 -1 -4 -1 -6 -1c-5 0 -6 5 -6 10c0 57 1 115 1 172c0 7 1 13 0 19c-1 10 -2 21 -14 21c-17 0 -29 -9 -25 -27c3 -15 5 -30 5 -45c0 -30 -6 -60 -13 -89c-6 -21 -22 -31 -36 -43c-3 -2 -9 -4 -11 -1s-2 5 -2 7c0 3 1 6 2 9c9 26 11 52 11 78c0 14 -1 29 -3 43 c-2 19 -5 37 -17 52c-6 8 -12 16 -23 11c-10 -4 -19 -9 -18 -24c3 -45 3 -91 4 -136c0 -21 -18 -45 -37 -50c-2 0 -4 -1 -6 -1c-6 0 -9 3 -9 12c0 48 -2 96 -2 144c0 24 0 48 2 72c2 23 23 33 39 45c2 2 4 2 5 2c5 0 8 -4 7 -12c-1 -6 -3 -14 -3 -22c0 -5 1 -9 2 -13 c10 8 18 13 26 19c12 9 22 13 31 13c12 0 22 -8 32 -24c4 -7 7 -10 10 -10s6 3 10 8c10 13 24 22 39 27c6 2 12 4 17 4c15 -1 25 -12 25 -32c0 -53 1 -107 1 -160l-1 -10c0 -4 1 -8 5 -10c2 -1 3 -2 5 -2c5 0 9 6 14 9c3 2 5 3 8 4c0 13 2 27 4 40c8 55 29 105 73 142 c18 15 33 22 47 22c22 0 40 -17 54 -48c2 -3 2 -7 2 -11c0 -12 -6 -23 -5 -36c3 -45 5 -90 7 -136c1 -21 -6 -39 -17 -56c-4 -7 -11 -13 -20 -11zM798 73c1 1 4 2 6 5c21 25 38 53 48 84c1 3 1 5 1 8c0 9 -7 16 -14 22c-4 3 -7 4 -11 4c-6 -1 -12 -4 -18 -8 c-22 -18 -35 -42 -41 -70c-4 -14 16 -45 29 -45z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51A-octaveParensLeft.xml b/data/Petaluma/E51A-octaveParensLeft.xml
deleted file mode 100644
index 04623ff6c4e..00000000000
--- a/data/Petaluma/E51A-octaveParensLeft.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M138 -20c-2 0 -5 2 -8 5c-74 60 -120 136 -125 232c-1 18 -6 36 -5 55c7 78 25 150 89 203c6 5 12 9 18 12c8 4 17 13 26 13c3 0 7 -1 10 -4c3 -2 4 -7 4 -13c0 -15 -9 -38 -19 -43c-69 -35 -108 -111 -108 -189c0 -50 15 -101 49 -138c19 -21 36 -43 58 -60 c15 -12 18 -27 18 -42c0 -7 -1 -15 -1 -22c-1 -5 -2 -9 -6 -9z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51B-octaveParensRight.xml b/data/Petaluma/E51B-octaveParensRight.xml
deleted file mode 100644
index 09bd81839ef..00000000000
--- a/data/Petaluma/E51B-octaveParensRight.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -20c-1 9 -2 17 -2 25c0 19 4 36 22 52c49 44 69 105 78 168c2 11 2 22 2 32c0 81 -47 141 -114 190c-15 10 -22 28 -22 45c0 8 1 15 4 22c2 6 4 9 7 9c2 0 5 -1 9 -4c66 -49 120 -106 131 -192c3 -24 5 -47 5 -70c0 -99 -27 -191 -103 -267c-3 -3 -7 -6 -11 -9 c-1 -1 -3 -1 -6 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51C-ottavaBassaVb.xml b/data/Petaluma/E51C-ottavaBassaVb.xml
deleted file mode 100644
index 264f16c99f1..00000000000
--- a/data/Petaluma/E51C-ottavaBassaVb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 0c-13 0 -25 3 -38 8c-36 14 -52 46 -52 84c0 45 22 114 70 152c-19 13 -31 38 -31 66c0 25 9 52 30 77c22 25 46 35 66 35c34 0 60 -26 62 -51c2 -36 -12 -74 -28 -99c16 -16 42 -64 43 -93c1 -62 -18 -115 -67 -157c-17 -15 -36 -22 -55 -22zM105 286 c30 1 42 21 45 50c3 19 -10 31 -28 31c-2 0 -5 0 -8 -1c-31 -6 -36 -26 -36 -44c0 -19 12 -36 27 -36zM499 15c-9 -3 -17 -4 -24 -4c-14 0 -23 6 -29 21c-1 3 -1 7 -1 10c0 12 5 24 10 36c2 5 7 9 4 15c-2 73 9 143 9 212c0 18 16 29 26 38c2 1 4 2 5 2c5 0 6 -6 6 -11 c0 -18 1 -36 1 -54c0 -22 -1 -44 -5 -69c13 14 20 20 28 27c10 9 20 13 30 13c15 0 30 -9 40 -26c5 -9 9 -20 11 -29c2 -10 3 -20 3 -30c0 -72 -50 -128 -114 -151zM318 18c-11 0 -10 13 -13 21c-21 44 -38 90 -63 133c-7 12 13 68 25 73c2 1 4 1 5 1c7 0 12 -5 16 -12 c18 -32 34 -65 47 -99c3 -8 5 -17 14 -25c20 35 39 69 59 103c8 14 17 38 34 29c5 -3 6 -7 6 -12c0 -10 -7 -24 -12 -33c-30 -54 -60 -108 -92 -161c-6 -10 -15 -19 -26 -18zM521 65c35 13 56 49 56 85c0 14 -3 28 -10 40c-9 13 -22 26 -38 21c-17 -4 -28 -17 -28 -39 c1 -7 1 -16 1 -24c0 -9 0 -16 1 -22v-50v-4c0 -7 3 -9 8 -9c3 0 6 0 10 2zM98 57c46 0 69 47 69 90c0 27 -10 52 -30 57c-6 1 -12 2 -18 2c-36 0 -59 -28 -67 -51c-4 -12 -6 -24 -6 -35c0 -36 19 -63 52 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51D-quindicesimaBassaMb.xml b/data/Petaluma/E51D-quindicesimaBassaMb.xml
deleted file mode 100644
index f62839cfb91..00000000000
--- a/data/Petaluma/E51D-quindicesimaBassaMb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M77 9c-8 0 -8 8 -9 13c-3 19 -6 37 -6 57c0 5 1 11 1 16c6 93 2 186 13 278v3c0 2 0 5 -1 9c-17 -15 -30 -30 -49 -36c-4 -1 -8 -3 -11 -3c-6 0 -10 4 -12 15s-3 19 -3 25c0 13 6 16 30 27c20 8 32 26 45 42c7 7 13 17 23 14c9 -4 12 -15 12 -25c-1 -23 -4 -46 -6 -69 c-6 -69 -9 -138 -9 -207c0 -45 -4 -90 -4 -134c0 -5 -1 -10 -3 -14c-2 -5 -5 -11 -11 -11zM201 -9c-8 0 -17 1 -26 4c-30 10 -34 39 -40 65c-1 6 -1 12 -1 18c0 11 1 22 0 33c0 8 4 15 12 15h1c8 0 9 -8 11 -15c1 -4 0 -8 0 -12c1 -30 15 -46 36 -46c9 0 20 3 31 9 c33 18 48 50 57 83c4 14 10 28 10 43c0 6 -1 13 -3 19c-11 32 -34 49 -60 49c-14 0 -29 -5 -44 -15c-8 -6 -13 -8 -17 -8c-6 0 -8 6 -10 21c-1 9 -2 18 -2 27c0 39 11 77 19 115c1 3 1 8 3 11c6 11 0 27 11 36c3 3 6 4 9 4c9 0 17 -8 26 -8c26 -2 46 10 67 21c7 4 12 6 15 6 c6 0 8 -7 10 -20c1 -4 1 -8 1 -11c0 -33 -30 -49 -75 -57c-41 -7 -42 -4 -52 -45c-1 -5 -3 -10 -3 -15c0 -2 1 -5 2 -8c14 4 27 6 38 6c48 0 81 -33 86 -92c1 -11 2 -23 2 -34c0 -36 -7 -72 -18 -107c-9 -28 -27 -49 -47 -71c-14 -15 -31 -21 -49 -21zM634 -7 c-16 0 -27 8 -32 24c-2 5 -2 9 -2 14c0 13 5 26 10 38c3 6 7 11 7 19c-3 81 9 161 9 242c0 20 17 32 31 43c2 2 4 2 6 2c4 1 5 -6 5 -13c0 -18 1 -37 1 -56c0 -26 -1 -53 -6 -83c14 13 23 22 32 29c13 10 25 15 37 15c17 0 32 -10 43 -29c6 -10 11 -22 13 -33 c2 -13 3 -24 3 -35c0 -83 -57 -146 -130 -172c-10 -4 -19 -5 -27 -5zM528 -30c7 37 17 71 20 106c1 10 2 21 2 31c0 23 -3 45 -13 66c-3 10 -8 20 -20 20c-17 0 -25 -11 -25 -26v-87c1 -21 -9 -38 -21 -54c-3 -5 -7 -10 -13 -8c-7 3 -4 10 -4 15v118c0 10 -2 20 -5 30 c-3 11 -9 21 -22 21c-15 0 -27 -11 -26 -28c2 -39 4 -78 8 -117c3 -26 -12 -42 -27 -58c-3 -4 -6 -6 -9 -6s-5 4 -6 13l-15 200c-2 27 11 46 24 66c3 5 7 7 12 5c5 -1 5 -5 5 -9c1 -13 3 -27 4 -41c21 24 38 35 52 35s26 -12 38 -37c9 6 18 12 28 18c9 6 18 8 26 8 c14 0 24 -9 32 -29c10 -26 14 -53 14 -81c0 -19 -2 -38 -6 -58c-6 -32 -9 -68 -30 -96c-6 -8 -11 -13 -23 -17zM674 52c3 0 7 1 11 3c39 14 64 55 64 96c0 16 -4 32 -12 46c-9 16 -23 31 -41 26c-19 -5 -32 -20 -32 -42c0 -17 0 -43 1 -55c1 -6 1 -16 1 -26 c0 -11 0 -22 -1 -32v-3c0 -9 3 -13 9 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51E-ventiduesimaBassaMb.xml b/data/Petaluma/E51E-ventiduesimaBassaMb.xml
deleted file mode 100644
index 2d3c4fbe560..00000000000
--- a/data/Petaluma/E51E-ventiduesimaBassaMb.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 -7c-5 16 -8 30 -8 44c0 36 17 66 32 96c33 66 73 130 100 201l15 40c3 8 4 15 4 22c0 22 -14 41 -42 54c-10 4 -19 7 -28 7c-19 0 -36 -10 -49 -30c-10 -16 -16 -34 -18 -54c-1 -11 -3 -21 -12 -33c-4 16 -7 32 -7 47c0 35 13 67 32 97c16 25 36 36 60 36 c8 0 17 -1 27 -4c34 -10 57 -43 58 -79c2 -75 -19 -143 -51 -208c-20 -41 -42 -81 -65 -127c10 3 19 4 28 4c42 0 73 -31 110 -46c5 -2 7 -13 7 -25c0 -10 -2 -22 -6 -29c-4 -6 -7 -8 -11 -8c-6 0 -12 5 -18 7c-9 4 -18 10 -26 16c-20 15 -39 23 -58 23 c-23 0 -45 -12 -66 -35c-3 -3 -4 -7 -8 -16zM189 -2c-15 -6 -29 8 -40 18c-9 8 -18 17 -29 23c-13 7 -25 11 -37 11c-19 0 -36 -8 -55 -27c-4 -4 -8 -9 -13 -13c-4 -3 -7 -5 -9 -5c-3 0 -4 4 -5 11c-1 5 -1 10 -1 15c0 25 8 47 24 68c46 61 86 124 112 196c8 22 15 44 21 66 c2 7 3 14 3 21c0 12 -3 24 -10 36c-11 19 -24 28 -41 28c-6 0 -12 -1 -19 -3c-41 -12 -60 -37 -65 -80c-1 -9 -3 -16 -10 -21c-4 17 -6 34 -6 49c0 55 25 95 87 116c6 2 13 3 19 3c32 0 60 -28 63 -69c1 -12 2 -24 2 -35c0 -52 -12 -101 -29 -149c-18 -50 -42 -96 -72 -144 c35 -1 60 -15 83 -36c9 -7 18 -16 30 -19c11 -3 15 -11 12 -22c-3 -14 0 -33 -15 -38zM699 6c-16 0 -27 8 -32 24c-2 5 -2 9 -2 14c0 13 5 26 10 38c3 6 7 11 7 19c-3 81 9 161 9 242c0 20 17 32 31 43c2 2 4 2 6 2c4 1 5 -6 5 -13c0 -18 1 -37 1 -56c0 -26 -1 -53 -6 -83 c14 13 23 22 32 29c13 10 25 15 37 15c17 0 32 -10 43 -29c6 -10 11 -22 13 -33c2 -13 3 -24 3 -35c0 -83 -57 -146 -130 -172c-10 -4 -19 -5 -27 -5zM605 -17c7 37 17 71 20 106c1 10 2 21 2 31c0 23 -3 45 -13 66c-3 10 -8 20 -20 20c-17 0 -25 -11 -25 -26v-87 c1 -21 -9 -38 -21 -54c-3 -5 -7 -10 -13 -8c-7 3 -4 10 -4 15v118c0 10 -2 20 -5 30c-3 11 -9 21 -22 21c-15 0 -27 -11 -26 -28c2 -39 4 -78 8 -117c3 -26 -12 -42 -27 -58c-3 -4 -6 -6 -9 -6s-5 4 -6 13l-15 200c-2 27 11 46 24 66c3 5 7 7 12 5c5 -1 5 -5 5 -9 c1 -13 3 -27 4 -41c21 24 38 35 52 35s26 -12 38 -37c9 6 18 12 28 18c9 6 18 8 26 8c14 0 24 -9 32 -29c10 -26 14 -53 14 -81c0 -19 -2 -38 -6 -58c-6 -32 -9 -68 -30 -96c-6 -8 -11 -13 -23 -17zM739 65c3 0 7 1 11 3c39 14 64 55 64 96c0 16 -4 32 -12 46 c-9 16 -23 31 -41 26c-19 -5 -32 -20 -32 -42c0 -17 0 -43 1 -55c1 -6 1 -16 1 -26c0 -11 0 -22 -1 -32v-3c0 -9 3 -13 9 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E520-dynamicPiano.xml b/data/Petaluma/E520-dynamicPiano.xml
deleted file mode 100644
index 8586554f3a1..00000000000
--- a/data/Petaluma/E520-dynamicPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-39 -142c-3 0 -6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74c20 21 22 51 27 78c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-7c-3 0 -7 0 -9 4c-1 1 -1 2 -1 3c0 4 4 8 6 12c24 49 74 76 113 111c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8 s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6c44 0 80 -42 78 -117c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20 c-18 -26 -38 -48 -71 -56c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5c-3 -1 -7 -2 -10 -2zM136 179c17 2 34 5 50 10c19 6 33 19 37 35c8 32 16 63 16 96c0 9 -1 19 -3 29c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169 c0 -2 0 -4 -1 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E521-dynamicMezzo.xml b/data/Petaluma/E521-dynamicMezzo.xml
deleted file mode 100644
index ab03bd2aff6..00000000000
--- a/data/Petaluma/E521-dynamicMezzo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 -49c-17 0 -26 4 -24 25c6 83 10 165 15 248v5c3 8 4 14 4 20c0 8 -3 12 -12 12c-5 0 -10 -1 -17 -3c-2 0 -4 -1 -6 -1c-4 0 -7 1 -8 6v3c0 4 4 8 7 11c27 28 57 54 87 79c6 5 12 9 19 9c4 0 8 -1 13 -3c12 -6 13 -14 13 -23c0 -35 -10 -70 -10 -105v-21 c33 52 67 95 111 128c9 7 19 11 29 11c17 0 32 -12 36 -34c3 -18 3 -36 5 -59c19 18 35 35 52 51c18 17 36 35 61 40c6 1 11 2 16 2c22 0 36 -15 36 -41c1 -71 -12 -140 -9 -211c0 -22 4 -43 9 -64c3 -9 7 -13 12 -13c3 0 7 2 12 5l43 31c6 4 11 6 16 6s10 -2 14 -6 c3 -3 5 -6 5 -9c0 -6 -7 -11 -11 -15c-31 -37 -69 -65 -114 -79c-12 -4 -22 -6 -31 -6c-26 0 -41 17 -49 52c-4 18 -6 36 -6 54c0 12 0 23 2 34c6 50 12 100 13 150v29c-23 -27 -33 -54 -42 -81c-18 -51 -39 -102 -47 -157c-4 -29 -51 -61 -83 -61c-21 0 -19 10 -18 22 l24 202c1 9 2 18 2 28c0 9 -1 19 -3 30c-16 -25 -27 -46 -36 -69c-21 -55 -29 -114 -49 -170c-12 -31 -51 -62 -81 -62z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E522-dynamicForte.xml b/data/Petaluma/E522-dynamicForte.xml
deleted file mode 100644
index 058c4273ef1..00000000000
--- a/data/Petaluma/E522-dynamicForte.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-70 -115c-22 -2 -44 4 -65 12c-6 2 -9 5 -9 8s3 6 6 9c21 17 39 36 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 37 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -15 31 -30 42c-8 5 -14 8 -20 8c-8 0 -15 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-22 -23 -47 -43 -81 -39c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -74 -115 -159 -190 -168z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E523-dynamicRinforzando.xml b/data/Petaluma/E523-dynamicRinforzando.xml
deleted file mode 100644
index 5f547de476d..00000000000
--- a/data/Petaluma/E523-dynamicRinforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -90c-8 0 -10 7 -9 20c7 91 12 182 19 273v8c0 6 0 11 -4 18c-31 -23 -57 -51 -97 -62c7 21 21 34 31 48c33 40 76 69 114 103c5 5 10 7 14 7c9 0 18 -8 19 -21c2 -27 4 -52 3 -78c4 5 7 9 10 14c24 33 59 47 96 58c20 6 39 11 59 11c13 0 26 -3 39 -8 c6 -3 13 -3 12 -13c0 -18 -37 -68 -55 -72c-2 -1 -3 -1 -5 -1c-3 0 -6 2 -10 3c-13 3 -26 5 -38 5c-44 0 -86 -21 -111 -58c0 -9 -1 -18 -2 -26c-3 -49 -9 -96 -12 -145c-2 -31 -33 -73 -61 -81c-5 -2 -9 -3 -12 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E524-dynamicSforzando.xml b/data/Petaluma/E524-dynamicSforzando.xml
deleted file mode 100644
index d80d5d5ec6a..00000000000
--- a/data/Petaluma/E524-dynamicSforzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M105 0c-35 0 -68 16 -96 42c-6 5 -9 12 -9 18c0 5 2 10 5 16c13 20 24 41 39 59c6 7 13 14 23 10c3 -1 4 -3 4 -5c0 -4 -4 -8 -4 -12v-2c0 -8 5 -13 12 -17c29 -22 60 -35 101 -34h2c3 0 6 -1 11 -1c5 1 11 2 14 9c0 2 1 5 1 8c0 9 -6 18 -11 26c-12 20 -32 26 -52 32 c-23 8 -47 12 -67 29c-19 16 -29 39 -29 63c0 14 3 28 11 40c15 24 32 47 52 68c20 20 49 30 78 30c41 0 84 -19 103 -53c2 -3 3 -5 3 -8s-1 -6 -3 -9c-10 -17 -25 -30 -41 -41c-7 -5 -14 -11 -20 -11s-12 4 -17 16c-10 20 -50 33 -77 33c-6 0 -11 0 -16 -2 c-6 -1 -7 -4 -7 -8c0 -2 1 -6 2 -9c9 -33 33 -51 64 -61c23 -7 47 -12 68 -27s32 -35 32 -55c0 -12 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-6 -1 -10 -1 -16 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E525-dynamicZ.xml b/data/Petaluma/E525-dynamicZ.xml
deleted file mode 100644
index 0609ed7e81c..00000000000
--- a/data/Petaluma/E525-dynamicZ.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-31 0c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14 c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12 c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E526-dynamicNiente.xml b/data/Petaluma/E526-dynamicNiente.xml
deleted file mode 100644
index 327db4e21ec..00000000000
--- a/data/Petaluma/E526-dynamicNiente.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 0c-15 0 -22 12 -21 35c5 79 10 158 14 236v8c2 8 4 15 4 21c0 7 -3 12 -11 12c-4 0 -10 -1 -17 -4c-1 0 -3 -1 -5 -1c-4 0 -8 1 -9 6v3c0 5 3 8 6 11c27 28 56 53 85 78c7 6 13 9 21 9c4 0 9 -1 14 -4c13 -7 11 -19 11 -29c-3 -36 -7 -71 -11 -107c0 -3 -2 -7 4 -9 c29 46 61 89 104 123c10 8 19 12 30 12c5 0 10 -1 16 -3c20 -7 24 -23 25 -40c1 -28 2 -56 2 -84c0 -41 -2 -81 -7 -122c-2 -15 -6 -30 -6 -45c0 -43 -27 -65 -62 -82c-7 -3 -14 -5 -21 -5c-5 0 -11 1 -16 4c-4 3 -6 6 -6 11s2 11 3 16l24 216c0 4 1 8 1 13c0 7 -1 14 -5 23 c-35 -52 -51 -109 -64 -166c-5 -19 -12 -37 -16 -56c-7 -37 -32 -59 -65 -74c-9 -4 -16 -6 -22 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E527-dynamicPPPPPP.xml b/data/Petaluma/E527-dynamicPPPPPP.xml
deleted file mode 100644
index 84370eb41fc..00000000000
--- a/data/Petaluma/E527-dynamicPPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1797 262c4 -39 -4 -77 -18 -114c-21 -57 -38 -117 -82 -163c-16 -17 -35 -26 -54 -26c-8 0 -15 2 -23 4l-4 -22c-10 -39 -24 -74 -45 -106c27 7 54 10 79 19c5 2 11 3 17 3h2c4 0 8 -2 10 -5c1 -1 1 -3 1 -4c0 -7 -6 -15 -10 -21c-23 -29 -48 -54 -86 -61 s-76 -18 -114 -28l3 9h-1c10 22 18 43 34 59c35 38 44 84 46 132c2 47 4 95 4 142c0 53 -2 105 -5 156c-1 17 0 33 0 55c-13 -11 -24 -23 -37 -33c2 -9 2 -19 2 -30c-9 -104 -45 -193 -131 -259c-17 -13 -34 -18 -51 -18c-14 0 -29 4 -44 8c-3 -15 -7 -30 -10 -46 c-5 -28 -17 -55 -30 -79c31 7 61 20 91 28c4 1 9 2 13 2s6 0 8 -2c1 -3 2 -4 2 -6c0 -5 -4 -11 -7 -16c-18 -30 -40 -57 -78 -69c-37 -10 -72 -24 -115 -26v1c-1 1 -2 1 -2 2c-2 1 -2 3 -2 5c0 3 2 7 4 10c54 75 63 165 81 252c14 67 28 134 41 201c4 16 6 34 6 53 c0 7 0 13 -1 20c-23 -17 -42 -33 -63 -48c-5 -3 -12 -11 -19 -4c-1 1 -2 2 -2 4c0 4 5 9 7 13c20 57 69 87 113 122c5 4 10 5 15 5c3 1 6 0 10 -1c9 -4 9 -13 9 -21s-1 -16 -1 -24c13 9 31 11 47 10c46 -3 79 -19 96 -50c5 8 11 15 19 21c25 22 47 44 71 68c6 6 12 10 19 10 c3 0 5 -1 8 -2c5 -2 6 -6 6 -10s-1 -9 -2 -14c-1 -13 -2 -25 -2 -37c0 -15 1 -30 2 -45c20 27 61 43 99 43c17 1 33 -3 46 -10c24 -13 26 -35 28 -57zM989 -37l-3 -23c-5 -39 -24 -72 -46 -103c32 3 62 14 94 22c4 1 8 2 12 2s8 -1 10 -3c2 -3 3 -5 3 -7c0 -5 -4 -11 -7 -15 c-20 -33 -42 -61 -84 -69c-46 -9 -91 -22 -141 -35c17 34 32 67 60 86c17 25 24 54 27 83c10 92 17 183 25 274l9 105c-27 -18 -46 -46 -79 -57c-8 -80 -36 -154 -81 -221c-22 -33 -52 -63 -98 -58c-5 1 -8 1 -11 2c-11 -34 -25 -66 -42 -97h1c29 0 58 9 87 13c3 0 5 1 7 1 c8 0 13 -3 13 -10c0 -3 -1 -7 -4 -12c-20 -33 -39 -66 -85 -69c-29 -2 -57 -8 -86 -14c-10 -10 -22 -18 -40 -20c6 22 16 40 29 55l2 3c5 9 11 18 18 26c17 30 27 63 37 96c24 80 30 161 30 244c0 41 -2 81 -4 122c-24 -18 -41 -39 -65 -50c-1 0 -3 -1 -4 -2 c-1 -38 -9 -75 -23 -110c-23 -57 -48 -113 -98 -153c-16 -13 -33 -19 -49 -19c-7 0 -15 1 -22 4c-4 -40 -11 -78 -28 -113c22 5 43 11 65 16c6 1 13 3 18 3c4 1 7 0 9 -3s3 -5 3 -8c0 -7 -5 -14 -9 -20c-18 -34 -43 -59 -83 -65c-44 -7 -88 -15 -135 -36c18 42 33 79 68 97 l3 11c8 50 11 101 13 152c3 89 9 177 23 265c1 4 1 9 1 19c-24 -17 -41 -40 -74 -41c-5 -82 -31 -157 -96 -216c-24 -22 -53 -33 -85 -38c-11 -46 -26 -92 -44 -137c22 4 45 7 67 10h5c8 0 12 -3 12 -8c0 -3 -1 -7 -4 -12c-22 -36 -47 -65 -94 -71c-17 -2 -33 -4 -49 -8 c-2 -2 -4 -4 -6 -5c-7 -5 -17 -11 -24 -5c-7 -4 -14 -7 -21 -12c-3 -2 -6 -3 -11 -3c-2 0 -5 0 -8 1c16 28 31 55 51 79c4 5 8 7 12 10c22 61 40 124 49 190c6 43 9 87 9 132c0 41 -2 81 -7 123c-26 -8 -45 -31 -78 -30c21 33 41 62 71 80c18 12 37 23 54 35c7 5 13 7 20 7 h4c2 0 5 0 8 -1c7 -4 9 -9 9 -15c0 -3 -1 -6 -1 -10c1 -10 1 -19 2 -29c23 20 50 34 78 37c4 0 7 1 11 1c37 0 66 -24 67 -62c1 -14 0 -28 0 -42c18 32 34 61 61 83c19 16 42 28 59 48c5 5 11 7 18 7h3c2 0 5 0 8 -1c6 -3 7 -7 7 -11s-1 -9 -2 -12c-6 -27 -9 -55 -12 -82 c16 31 40 55 74 67c13 3 24 5 36 5c38 0 63 -29 66 -76c29 44 68 78 105 115c6 6 13 10 21 10c3 0 6 0 9 -2c6 -2 8 -7 8 -12l-1 -10c0 -21 1 -41 1 -62c11 14 26 27 45 35c17 7 34 10 51 10c35 0 56 -22 58 -57c1 -6 1 -12 1 -18s0 -12 -1 -18c16 23 31 44 54 60 c22 16 39 37 57 57c6 7 12 14 19 18c5 3 9 4 13 4c8 0 13 -7 12 -19l-6 -72c24 20 54 33 91 33c65 0 90 -39 90 -87c0 -5 0 -11 -1 -18c-11 -103 -59 -190 -150 -246c-18 -11 -38 -21 -61 -18zM799 90c10 31 16 62 16 94c0 31 -10 53 -29 60c-7 2 -14 4 -22 4 c-16 0 -33 -6 -46 -16c0 -62 -2 -124 -14 -185c2 -1 4 0 6 0c3 0 5 0 9 -1c6 -3 12 -3 18 -3c28 0 53 18 62 47zM1452 122c1 6 1 14 1 22s0 16 -1 23c-6 45 -37 75 -83 77c-3 0 -6 1 -9 1c-4 0 -7 -1 -11 -2c-3 -11 -5 -22 -7 -33l-30 -147c3 0 6 0 10 -1c11 -2 23 -5 35 -9 c7 -2 14 -3 21 -3c42 0 71 36 74 72zM185 104c9 12 13 34 13 56c0 24 -5 48 -14 60c-11 13 -27 19 -45 19c-12 1 -24 -2 -36 -8c1 -53 -1 -106 -9 -159v-2c7 3 16 5 27 5c19 -1 36 11 53 20c4 2 8 5 11 9zM468 57c32 22 50 52 53 91c0 14 0 28 -4 43c-6 21 -16 41 -39 45 c-4 1 -8 1 -12 1c-20 0 -38 -8 -53 -24c-8 -9 -13 -20 -21 -29c-2 -38 -3 -77 -5 -115c3 0 7 -1 11 -3c15 -7 30 -18 47 -18c7 1 15 3 23 9zM1015 220c-4 -51 -8 -103 -13 -155c3 1 7 2 11 2c3 0 6 0 9 -1c5 -1 10 -2 15 -2c51 0 103 52 103 103c0 6 -1 12 -2 17 c-8 32 -31 50 -62 50c-22 0 -42 -5 -61 -14zM1741 141c3 12 5 23 5 35c0 15 -4 28 -16 39c-12 10 -25 13 -38 13c-15 0 -30 -4 -45 -7c-7 -1 -13 -5 -18 -9v-18c0 -38 1 -76 1 -114c1 -1 2 -1 2 -1c22 -12 37 -17 50 -17c26 0 38 24 58 69c1 3 0 7 1 10zM1472 -254v1v-1z " /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E528-dynamicPPPPP.xml b/data/Petaluma/E528-dynamicPPPPP.xml
deleted file mode 100644
index 227247984fc..00000000000
--- a/data/Petaluma/E528-dynamicPPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1116 -285c24 31 40 63 69 81c23 41 29 87 33 134c9 109 16 218 21 327c1 4 0 9 0 15c-13 -7 -23 -18 -34 -27c-10 -98 -53 -179 -123 -249c-20 -20 -43 -35 -70 -40c-8 -45 -24 -86 -48 -124l64 12c4 1 8 2 12 2c3 0 6 -1 8 -3s3 -4 3 -7c0 -5 -4 -11 -7 -15 c-21 -32 -41 -64 -86 -68c-44 -4 -89 -14 -136 -22c13 33 30 59 49 85c3 4 10 5 15 6c7 0 13 1 19 2c18 39 25 82 30 125c8 72 13 145 13 218c0 24 -1 47 -2 71c-1 11 -2 22 -4 37c-27 -18 -48 -41 -74 -57c-10 -60 -24 -120 -55 -173c-31 -54 -77 -82 -133 -93 c-2 -14 -4 -28 -7 -42c-7 -32 -14 -56 -26 -77c21 6 42 13 63 19c6 2 13 4 19 4c5 0 9 -1 12 -5c1 -2 1 -3 1 -5c0 -8 -6 -18 -12 -24c-21 -24 -42 -46 -77 -54c-46 -10 -90 -29 -137 -39c-4 -1 -7 -2 -12 -2c-3 0 -6 0 -10 1c28 32 45 71 88 85c11 28 12 59 17 98 c13 104 23 209 33 313c0 6 1 12 1 19c0 10 -1 21 -7 31c-28 -20 -49 -48 -78 -69c-11 -61 -29 -120 -72 -171c-31 -37 -68 -58 -109 -72c-4 -20 -7 -40 -12 -60c-5 -27 -12 -51 -21 -73c21 6 41 12 62 17c3 1 5 1 8 1c5 0 10 -2 12 -8c-13 -33 -34 -60 -64 -72 c-49 -20 -101 -30 -149 -49c-5 -2 -10 -4 -14 0c-1 1 -2 3 -2 5c0 3 2 6 4 9c4 5 7 9 9 14c14 31 33 53 63 65c12 40 18 82 23 123c10 82 17 163 17 245c0 29 0 58 -2 87c-5 -2 -9 -5 -14 -8c2 -8 4 -16 4 -24c0 -12 -3 -24 -8 -37c-35 -92 -85 -177 -180 -218 c-7 -3 -14 -5 -21 -7c-2 -10 -3 -20 -5 -30c-7 -46 -18 -82 -36 -113c21 4 42 10 63 13l7 1c6 0 10 -3 10 -8c0 -3 -1 -7 -4 -12c-17 -31 -38 -59 -74 -67c-41 -9 -81 -22 -121 -35c-7 -2 -13 -6 -21 -2c15 38 38 67 69 85c9 21 15 42 18 65c15 111 37 220 32 332 c-1 24 -1 47 -1 74c-36 -19 -57 -52 -100 -50c17 28 35 52 58 69c31 23 59 49 89 72c6 5 11 7 17 7c3 0 7 -1 10 -2c9 -4 8 -13 8 -20v-54c20 21 54 33 86 33c18 0 35 -4 49 -11c14 -8 26 -18 35 -29c15 15 32 30 49 44c13 11 25 22 39 31c4 3 8 4 12 4c7 0 12 -6 13 -17 c2 -24 3 -48 4 -72c27 26 58 43 99 43c43 0 71 -19 71 -57c0 -3 -1 -6 -1 -10c34 36 70 69 107 101c7 6 14 11 23 11c3 0 6 0 10 -2c13 -6 13 -19 14 -30c0 -16 1 -32 0 -48c16 14 34 25 56 34c15 6 31 9 48 9c9 0 18 -1 27 -3c22 -5 37 -20 37 -41c0 -3 0 -6 -1 -9 c1 0 2 1 2 1c33 18 59 44 86 69c5 6 11 11 18 15c8 5 15 8 20 8c10 0 17 -9 18 -26c2 -21 3 -43 4 -65c13 12 27 24 43 33c21 12 42 18 56 18c45 0 70 -15 78 -43c24 26 49 49 76 71c8 6 16 11 25 11c3 0 6 0 10 -2c15 -6 16 -20 15 -32c0 -10 -1 -19 -1 -29 c20 15 44 26 72 31c9 2 17 3 24 3c41 0 64 -26 70 -73c2 -12 2 -24 2 -36c0 -82 -39 -149 -92 -212c-22 -26 -46 -53 -80 -66c-8 -3 -15 -5 -22 -6c-1 -3 -1 -6 -1 -9c-7 -47 -23 -88 -49 -122c28 6 55 13 83 20c3 1 6 1 9 1c5 0 9 -1 11 -4c2 -2 2 -4 2 -5 c0 -5 -4 -10 -6 -14c-19 -24 -38 -47 -71 -56c-46 -13 -91 -29 -138 -39c-6 -2 -12 -3 -26 -5zM1357 33c14 0 26 8 35 23c20 33 26 70 26 107c0 12 -1 25 -2 37c-5 35 -27 56 -55 56c-11 0 -23 -4 -36 -10c-2 -42 -5 -84 -7 -126c-1 -23 -3 -46 -5 -69l2 -2 c7 -4 13 -8 21 -11s15 -5 21 -5zM691 28c10 3 20 5 31 6c40 2 42 5 51 44c9 41 18 83 26 124c1 5 1 9 1 12c0 18 -10 27 -32 30c-4 0 -7 1 -10 1c-19 0 -35 -7 -49 -17c-1 -19 -2 -38 -4 -57c-5 -48 -8 -95 -14 -143zM1050 46c8 0 16 1 24 5c17 7 32 18 39 37 c12 33 22 67 22 102c0 30 -26 51 -57 51c-6 0 -13 -1 -20 -3c-11 -4 -21 -10 -30 -17c0 -56 -3 -113 -7 -169c1 0 1 -1 2 -1c9 -3 18 -5 27 -5zM377 39h1c84 22 72 -1 93 91l9 40c1 6 2 11 2 17c0 16 -6 32 -20 43c-8 6 -19 9 -31 9c-15 0 -31 -4 -42 -12 c0 -63 -4 -126 -12 -188zM92 61c5 1 10 2 16 2c38 3 71 15 94 49c9 13 14 28 14 43c0 20 -8 41 -24 59c-15 16 -37 24 -58 24c-12 0 -23 -2 -33 -7c-1 -57 -3 -114 -9 -170z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E529-dynamicPPPP.xml b/data/Petaluma/E529-dynamicPPPP.xml
deleted file mode 100644
index ccd01547e91..00000000000
--- a/data/Petaluma/E529-dynamicPPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M807 -276c22 52 49 97 106 112c11 30 14 61 16 93c6 89 6 178 10 267c1 21 5 42 5 63c0 6 0 12 -1 18c-21 -14 -41 -28 -61 -41c1 -64 -16 -124 -49 -182c-28 -50 -63 -93 -119 -113c-5 -2 -11 -3 -17 -3c-8 -36 -23 -68 -43 -96c24 4 49 7 73 10h6c9 0 14 -3 14 -10 c0 -3 -1 -6 -2 -9c-16 -38 -33 -72 -81 -78c-41 -5 -83 -8 -122 -29c2 51 22 85 58 102c18 28 23 61 27 94c11 92 16 184 16 277c0 18 1 36 1 54c-1 5 -1 12 -7 15c-1 1 -3 1 -4 1c-4 0 -6 -6 -9 -8c-18 -13 -35 -28 -56 -40c-17 -93 -55 -176 -131 -240 c-16 -12 -32 -22 -51 -28c-5 -38 -14 -74 -35 -107c19 4 39 10 58 14c3 1 7 2 11 2s8 -2 10 -7c-2 -18 -39 -71 -68 -78c-46 -11 -93 -20 -138 -35c-4 -2 -10 -5 -13 0c-1 1 -2 3 -2 4c0 4 4 7 6 10l17 29c14 22 30 40 57 48c10 30 13 63 16 96c9 96 15 192 21 289 c0 6 1 14 1 22c0 15 -3 30 -14 30c-12 0 -26 -19 -38 -29c2 -12 2 -24 2 -37c-5 -58 -44 -117 -87 -173c-26 -34 -57 -56 -98 -63l-2 -17c-8 -41 -23 -78 -44 -112l82 16c4 0 8 1 11 1c4 1 7 0 9 -4c0 -1 1 -2 1 -3c0 -5 -4 -11 -7 -16c-17 -31 -37 -59 -76 -67 c-34 -7 -67 -14 -102 -22c-6 -4 -11 -5 -20 -5c-19 -4 -38 -8 -58 -13c14 31 26 57 44 81c9 10 21 14 34 17l22 4c18 42 26 87 26 134c0 102 -6 202 -6 303c0 7 0 15 -5 23c-29 -15 -47 -48 -90 -52c16 22 27 41 42 58c28 31 59 59 94 84c7 5 14 8 19 8c10 0 16 -8 19 -24 c4 -24 6 -47 7 -70c10 11 22 20 37 27c17 8 33 12 49 12c37 0 69 -20 86 -55c11 13 23 25 36 35c19 14 36 30 54 44c9 7 17 11 24 11c11 0 20 -10 24 -28c2 -10 3 -20 4 -31c19 16 42 28 72 33c6 1 12 2 18 2c44 0 76 -31 77 -75c8 10 16 19 26 27c23 20 48 38 73 58 c9 7 17 10 24 10c13 0 21 -9 22 -28c1 -15 1 -30 1 -46c26 26 60 42 105 45c33 1 46 -10 52 -43c1 -3 1 -6 2 -9c31 33 75 52 109 82c5 4 10 6 14 6c11 0 20 -11 19 -27c0 -7 -1 -15 -1 -23c19 15 41 26 66 31c7 1 13 2 19 2c46 0 87 -34 91 -88c1 -13 2 -26 2 -38 c0 -91 -34 -170 -101 -237c-19 -19 -42 -28 -66 -28c-9 0 -17 1 -26 3c-3 -20 -6 -40 -13 -60c-6 -20 -15 -39 -25 -56c13 3 27 6 40 8c6 2 14 4 20 4c5 0 9 -1 12 -5c2 -3 3 -5 3 -8c0 -8 -7 -17 -11 -25c-18 -31 -42 -55 -81 -59c-41 -4 -81 -17 -118 -35 c-7 -3 -15 -7 -24 -4zM1059 62c15 0 29 4 44 14c28 19 44 42 41 75c-3 38 -11 76 -53 94c-7 3 -16 4 -24 4c-17 1 -35 -5 -52 -15l-6 -160c3 0 5 -1 8 -2c14 -6 28 -10 42 -10zM393 40c6 3 14 5 24 5c44 2 77 44 85 96c1 9 2 18 2 27c0 6 -1 13 -1 19c-3 39 -26 62 -57 62 c-13 0 -27 -4 -42 -13c-6 -65 -8 -131 -11 -196zM98 55c4 1 9 2 14 2c3 0 7 -1 11 -1c49 -4 84 34 84 88c0 10 -2 21 -4 32c-8 33 -31 51 -60 62c-7 3 -13 4 -19 4c-11 0 -21 -4 -31 -11c0 -13 0 -26 1 -39c0 -46 4 -91 4 -137zM748 63c18 0 32 10 41 32c13 26 19 54 25 82 c1 3 1 6 1 10c0 15 -7 29 -12 43c-3 7 -12 8 -21 8c-23 -1 -44 -6 -63 -17c-1 -10 -1 -20 -2 -30c-4 -41 -4 -81 -5 -121c1 -1 2 -1 3 -1c3 0 7 0 11 -2c8 -3 15 -4 22 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52A-dynamicPPP.xml b/data/Petaluma/E52A-dynamicPPP.xml
deleted file mode 100644
index 435093d4ce0..00000000000
--- a/data/Petaluma/E52A-dynamicPPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 -321c-1 2 -3 3 -5 4c22 40 33 86 87 100c5 1 10 2 15 4c20 25 28 57 32 92c1 10 1 19 1 29c0 35 -5 70 -7 105c-2 19 -2 39 -2 58c0 52 5 104 10 156c0 9 1 17 2 29c-24 -12 -40 -33 -65 -44c4 -20 6 -41 6 -62c0 -30 -4 -61 -15 -90c-23 -61 -74 -117 -146 -117 c-8 0 -16 1 -23 2c-2 -12 -4 -24 -7 -36c-8 -34 -21 -64 -38 -92l77 15c7 1 16 6 17 -3c-1 -27 -46 -77 -72 -85c-51 -16 -104 -22 -155 -40c-2 -1 -5 -1 -6 -1c-5 0 -7 3 -3 11c1 3 2 6 4 9c37 67 34 74 78 82c16 41 22 84 23 129c2 96 13 193 13 291c0 13 0 27 -5 43 c-25 -22 -44 -47 -82 -50c25 37 45 72 78 96c16 12 31 23 46 35c6 6 13 9 20 9c4 0 7 -1 11 -2c8 -2 9 -7 9 -13c0 -27 3 -52 4 -79l42 36c16 14 34 20 51 20c26 0 48 -16 59 -48c4 -12 7 -24 10 -37c7 9 15 17 22 25c29 33 64 60 98 89c5 5 11 7 17 7c4 0 7 0 11 -2 c6 -3 8 -7 8 -11s-1 -8 -1 -12l-3 -41c20 15 43 27 72 33c4 1 10 2 15 2c38 0 71 -31 71 -71v-41c5 4 10 7 13 11c36 35 73 68 109 101c7 7 15 13 24 13c3 0 7 -1 10 -3c11 -7 11 -21 10 -33l-1 -4c22 15 46 24 76 29c6 1 12 1 17 1c31 0 48 -15 54 -50c5 -31 9 -62 9 -92 c0 -23 -2 -45 -8 -67c-21 -77 -97 -144 -179 -164c-1 -9 -1 -18 -2 -28c-2 -46 -19 -83 -45 -115c15 5 31 12 46 17c10 3 20 6 25 7h6c9 0 13 -3 13 -7c0 -3 -1 -6 -3 -9c-14 -25 -28 -50 -54 -62c-49 -23 -100 -41 -152 -55c-5 -1 -12 -5 -16 0c-1 2 -1 3 -1 4 c0 4 3 7 5 11c5 9 10 18 16 27c11 18 23 35 43 44c15 22 23 47 25 75l6 83l1 19c5 87 15 173 29 259v15c-27 -14 -45 -42 -76 -47v-53c0 -29 -9 -55 -26 -78c-35 -47 -77 -83 -130 -102c-1 -58 -19 -107 -52 -150c10 4 21 8 32 11c7 2 15 5 22 5c6 0 11 -2 14 -6 c0 -2 1 -4 1 -7c0 -8 -8 -18 -14 -26c-20 -31 -48 -47 -82 -58c-47 -15 -93 -33 -139 -50zM710 22h4c12 -1 24 3 36 4c41 6 47 13 52 54c2 16 3 31 3 47c0 31 -5 62 -10 94c-4 25 -12 34 -30 34c-5 0 -10 -1 -15 -2c-7 -1 -13 -3 -18 -5c-4 -26 -7 -53 -10 -79 c-6 -49 -9 -98 -12 -147zM412 31c3 0 6 1 9 1c14 0 27 9 41 11c27 4 33 20 33 43c-1 21 0 43 0 65v10c0 8 0 17 -1 25c-4 33 -23 52 -51 52c-8 0 -18 -2 -28 -6l-7 -3c0 -3 0 -6 -1 -10c-3 -20 -4 -41 -4 -61c0 -43 5 -85 9 -127zM171 26c11 0 17 6 17 23 c0 51 1 102 -17 151c-8 22 -20 34 -35 34c-10 0 -21 -6 -33 -16l-3 -3c-1 -51 -4 -101 -7 -151c-1 -6 -1 -13 -1 -19c2 0 5 -1 8 -2c20 -7 41 -11 62 -16c3 -1 7 -1 9 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52B-dynamicPP.xml b/data/Petaluma/E52B-dynamicPP.xml
deleted file mode 100644
index 03a6b8061aa..00000000000
--- a/data/Petaluma/E52B-dynamicPP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-93 -280c-2 1 -3 3 -3 5c0 5 6 10 10 14l15 24c14 23 32 38 54 49c15 41 22 84 25 127c5 74 8 148 10 222c1 37 14 73 12 115c-31 -24 -55 -52 -98 -58c19 32 36 60 61 82c26 23 52 46 77 71c6 5 13 9 21 9c3 1 6 0 10 -1c7 -4 9 -10 9 -16c0 -3 -1 -7 -1 -9 c-4 -29 -6 -58 -7 -87c17 19 37 34 64 45c15 6 31 9 47 9h6c5 0 10 -1 15 -2c24 -4 39 -18 43 -41c11 11 24 21 41 26c35 10 60 39 88 62c5 4 9 11 17 11h3c7 0 14 -1 10 -14c-7 -26 -14 -53 -19 -79c23 22 51 40 86 51c8 2 15 4 22 4c24 0 41 -15 52 -44 c7 -22 10 -43 10 -64c0 -26 -4 -52 -11 -78c-19 -70 -52 -131 -112 -176c-21 -16 -45 -23 -71 -27c1 -52 -9 -91 -33 -125c24 7 48 17 72 24l18 6c2 0 4 1 5 1c6 0 12 -3 15 -6c2 -2 2 -3 2 -5c0 -4 -4 -8 -6 -12c-15 -26 -35 -46 -63 -56c-45 -16 -91 -28 -137 -42 c-14 -5 -28 -8 -44 -8c-5 0 -11 1 -16 1c27 36 49 72 93 84c6 20 9 41 9 63c0 19 -1 38 -1 57c0 108 12 214 40 319c2 6 4 12 2 19c-23 -13 -45 -29 -70 -40c-3 -97 -39 -180 -121 -241c-23 -17 -48 -27 -75 -32c-1 -8 -3 -16 -5 -25c-9 -39 -21 -71 -38 -100 c28 8 56 15 85 19c3 0 6 1 9 1c5 0 9 -1 11 -8c-2 -6 -3 -11 -6 -14c-23 -29 -45 -57 -87 -65c-43 -8 -86 -20 -126 -42c-6 -3 -14 -9 -19 -3zM436 38c31 0 61 20 70 50c7 23 12 46 12 69c0 22 -4 43 -13 64c-8 19 -18 29 -33 29c-8 0 -16 -3 -26 -8c-15 -8 -28 -17 -41 -28 c-8 -54 -12 -108 -12 -163c2 0 5 -1 8 -3c11 -7 23 -10 35 -10zM121 37c14 0 28 6 41 9c8 3 15 8 17 18c11 40 23 80 21 122c-1 18 1 41 -20 47c-10 3 -20 5 -30 5c-13 1 -27 -3 -39 -13c-4 -4 -8 -8 -11 -12c-2 -42 -3 -84 -6 -127c-2 -14 -2 -29 -3 -44c5 0 11 -1 17 -3 c4 -2 9 -2 13 -2z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52C-dynamicMP.xml b/data/Petaluma/E52C-dynamicMP.xml
deleted file mode 100644
index d15b49ef313..00000000000
--- a/data/Petaluma/E52C-dynamicMP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M446 -243c-3 0 -6 1 -8 3s-2 4 -2 6c0 6 5 11 8 15c16 26 32 52 55 72c4 3 6 8 7 12c16 51 27 102 30 155c0 3 1 6 -3 10c-21 -18 -42 -36 -66 -50c-19 -10 -37 -19 -58 -22c-4 -1 -9 -1 -12 -1c-21 0 -35 11 -44 33c-9 23 -13 47 -13 71c0 22 3 44 6 66 c6 43 8 86 11 129v5c0 3 0 8 -4 12c-20 -25 -32 -53 -42 -82c-17 -50 -38 -100 -45 -153c0 -8 -5 -14 -9 -20c-14 -22 -36 -33 -60 -41c-6 -2 -10 -3 -14 -3c-14 0 -18 10 -16 30c6 64 15 127 22 191c2 11 3 22 3 34c0 10 -1 20 -3 31c-28 -42 -44 -83 -55 -127 c-10 -39 -21 -77 -33 -115c-11 -35 -40 -49 -70 -59c-6 -2 -11 -3 -15 -3c-13 0 -19 9 -17 31c7 80 11 161 14 241c1 10 6 20 6 31c0 3 -1 6 -2 10c-11 0 -20 -7 -31 -5c-3 1 -8 0 -10 4c-1 1 -1 3 -1 4c0 3 2 6 4 8c10 11 20 22 31 31c19 17 38 34 58 50c6 6 12 9 19 9 c4 0 8 -1 13 -3c14 -7 13 -19 12 -29c-2 -35 -10 -71 -10 -107c0 -3 0 -6 1 -9c19 23 35 47 54 70c18 21 37 40 59 56c8 6 16 9 25 9c16 0 32 -11 37 -30c5 -20 2 -40 6 -63c19 19 35 37 54 54c18 16 36 34 62 38c4 1 7 1 11 1c22 0 37 -14 38 -38c1 -34 -3 -68 -6 -103 c-4 -41 -6 -83 -4 -124c1 -19 5 -36 11 -54c2 -7 6 -10 10 -10c3 0 5 1 8 3c23 14 41 33 67 42c5 3 4 12 5 18c0 25 1 51 1 76c0 13 0 26 -1 39c0 6 -1 12 -1 17c0 19 2 38 3 56c0 3 1 7 1 11c0 3 0 6 -3 9c-15 -8 -28 -22 -47 -21c-4 1 -10 -1 -13 4c0 1 -1 2 -1 3 c0 4 3 7 5 10c22 29 41 61 75 79c13 8 23 19 34 30c5 5 10 7 16 7c4 0 8 -1 13 -3c10 -3 12 -8 9 -17c-6 -22 -3 -44 -5 -71c24 18 44 34 68 44c13 6 26 9 38 9c43 0 78 -33 78 -83c1 -97 -36 -176 -110 -241c-24 -21 -45 -46 -80 -49c-8 -1 -10 -8 -12 -16 c-8 -38 -20 -75 -37 -113c18 1 32 10 48 14c6 1 11 3 16 5c3 1 6 2 9 2c6 0 13 -3 18 -7c3 -2 3 -4 3 -7c0 -5 -4 -11 -6 -15c-15 -27 -35 -52 -68 -60c-40 -10 -80 -23 -119 -39c-4 -2 -8 -4 -12 -5s-9 -2 -14 -2zM623 235v-157c42 0 69 13 83 41c8 16 9 34 11 51 c3 19 6 37 6 55c0 10 -1 21 -4 31c-5 13 -12 23 -26 28c-5 1 -9 2 -14 2c-28 0 -56 -23 -56 -51z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52D-dynamicMF.xml b/data/Petaluma/E52D-dynamicMF.xml
deleted file mode 100644
index 5e3de403f5d..00000000000
--- a/data/Petaluma/E52D-dynamicMF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 -186c-18 0 -36 5 -54 12c-7 2 -10 5 -10 9c0 2 2 5 5 8c20 16 38 36 62 48c7 4 13 5 20 3c3 -1 6 -3 9 -4c9 -3 17 -5 23 -5c16 0 25 10 36 34c13 29 17 60 21 90s5 60 8 90c2 19 5 38 5 57c-1 10 -4 12 -13 12h-82c-9 0 -19 1 -29 7c1 4 2 7 4 9c18 14 30 36 49 49 c13 9 25 13 40 12h12c16 1 17 1 17 18c1 28 13 50 30 71c21 26 43 52 71 71c10 7 20 13 31 18c13 6 27 9 41 9c22 0 44 -8 61 -23c14 -13 27 -27 32 -47c2 -5 2 -9 -1 -13c-18 -23 -40 -39 -69 -48c-2 -1 -5 -1 -8 -1c-2 0 -5 1 -8 1c-5 2 -7 4 -9 10c-6 22 -20 40 -41 49 c-4 2 -8 3 -11 3c-8 0 -13 -5 -17 -15c-6 -16 -8 -32 -7 -49c0 -14 2 -28 2 -43c0 -8 4 -11 11 -11l93 -9c3 0 6 0 9 -1c13 -3 19 -8 19 -15c0 -5 -2 -10 -6 -16c-4 -5 -8 -10 -13 -13c-13 -7 -25 -15 -37 -22c-7 -4 -15 -6 -23 -6c-6 0 -13 1 -19 2c-9 1 -16 2 -21 2 c-12 0 -13 -6 -16 -30c-3 -22 -3 -44 -5 -66c-2 -27 -8 -53 -12 -80c-1 -9 -4 -18 -8 -27c-21 -41 -47 -78 -84 -106c-24 -18 -52 -30 -81 -40c-9 -3 -18 -4 -27 -4zM32 -50c-20 1 -24 5 -23 25c1 27 4 55 5 82c4 55 7 109 9 164c1 10 6 20 6 31c0 3 -1 6 -2 10 c-11 -2 -21 -7 -32 -5c-4 1 -8 0 -10 5v2c0 3 2 7 4 9c14 14 28 31 44 43c17 14 32 29 50 42c4 3 9 5 14 5c16 0 25 -8 25 -23c0 -19 -1 -38 -4 -56c-2 -12 -4 -24 -4 -36l-3 -36c6 1 7 5 9 9c28 46 62 87 105 120c7 6 16 8 24 8c17 0 33 -10 39 -28c2 -9 4 -18 4 -28v-36 c10 5 15 13 20 18c22 22 41 44 66 60c8 6 16 10 25 13c5 2 10 3 15 3c10 0 19 -4 28 -9c6 -4 10 -8 10 -15c1 -9 3 -17 3 -26c0 -31 -5 -63 -6 -95c-2 -29 -4 -58 -4 -87c0 -22 1 -45 6 -67c1 -7 3 -14 5 -21c3 -7 6 -10 10 -10c3 0 6 1 9 3c5 3 10 7 16 11c9 7 19 15 29 21 c8 5 12 7 16 7c5 0 9 -4 20 -12c-14 -29 -39 -49 -66 -67c-21 -14 -43 -28 -69 -32c-6 -1 -12 -2 -18 -2c-5 0 -10 1 -15 2c-13 4 -22 12 -27 25c-10 25 -15 50 -15 76c0 7 0 14 1 21c8 56 13 112 16 169v6c0 6 0 11 -4 17c-18 -21 -28 -45 -37 -69 c-17 -45 -34 -90 -45 -138c-1 -6 -3 -12 -3 -18c-1 -18 -9 -33 -23 -43c-19 -15 -37 -31 -63 -29c-3 0 -7 0 -10 1c-4 2 -7 4 -7 10c4 42 9 84 14 126c5 45 15 89 12 135c0 3 0 6 -1 14c-27 -43 -46 -85 -57 -130c-8 -39 -19 -77 -32 -115c-5 -15 -13 -27 -26 -35 c-11 -7 -22 -14 -33 -20c-6 -4 -13 -5 -20 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52E-dynamicPF.xml b/data/Petaluma/E52E-dynamicPF.xml
deleted file mode 100644
index 15e3f921c17..00000000000
--- a/data/Petaluma/E52E-dynamicPF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-32 -274c-4 0 -7 1 -10 4c-2 2 -2 4 -2 6c0 6 9 13 12 20c13 25 29 47 51 66c5 4 7 11 8 17c17 54 27 108 29 164c2 47 7 94 5 141c0 10 -1 20 -1 31c0 31 2 62 2 95c-16 -9 -30 -22 -48 -22c-5 0 -10 1 -16 3c8 20 22 36 34 52c12 15 27 29 44 39c14 9 27 21 39 33 c5 5 9 6 14 6c6 0 13 -3 19 -5c6 -3 5 -9 3 -15c-4 -12 -4 -25 -4 -38c0 -10 0 -20 -1 -31c23 13 41 29 62 40c14 6 27 9 40 9c14 0 27 -3 41 -8c28 -10 38 -33 41 -60c1 -9 0 -19 0 -32c17 14 35 12 53 12c9 0 18 1 18 14c0 35 17 62 40 87c28 31 57 62 97 80 c10 5 20 7 31 7c43 0 90 -31 99 -72v-3c0 -5 -2 -9 -5 -12c-17 -22 -39 -37 -66 -44c-5 -1 -8 -2 -11 -2c-8 0 -11 5 -15 17c-7 17 -19 31 -35 41c-6 3 -11 5 -15 5c-8 0 -14 -6 -19 -18c-5 -14 -7 -28 -7 -42c0 -17 2 -33 4 -50c1 -10 11 -8 17 -9c28 -3 56 -6 83 -8 c13 0 28 -3 31 -14c4 -11 -7 -21 -17 -29c-21 -16 -43 -30 -70 -30c-6 0 -13 1 -20 3s-12 3 -15 3c-9 0 -10 -7 -12 -25c-5 -50 -5 -100 -18 -149c-2 -9 -2 -18 -6 -26c-36 -78 -92 -133 -178 -153c-6 -1 -11 -2 -17 -2c-19 0 -37 6 -55 13c-6 2 -8 5 -8 8s2 6 5 8 c21 16 39 36 62 49c4 2 8 3 12 3s8 -1 13 -3c10 -3 19 -5 27 -5c19 0 30 12 39 39c9 28 15 57 18 87c4 36 8 73 11 110c1 11 1 22 2 33c0 8 -3 12 -11 12h-63c-7 0 -8 -5 -10 -10c-20 -80 -78 -132 -139 -181c-10 -8 -22 -12 -35 -14c-10 -2 -15 -6 -17 -17 c-7 -38 -20 -75 -39 -116c22 7 39 13 56 19c6 1 11 4 16 4h3c12 0 19 -5 19 -14c0 -3 -1 -7 -3 -11c-14 -30 -35 -53 -68 -62c-42 -12 -83 -25 -122 -41c-6 -3 -15 -7 -22 -7zM143 205v-159c14 1 28 5 43 9c25 6 39 23 44 47c4 15 6 30 8 45c2 16 5 33 5 49 c0 10 -1 19 -4 29c-5 14 -12 24 -27 29c-5 1 -9 2 -14 2c-27 0 -55 -23 -55 -51z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52F-dynamicFF.xml b/data/Petaluma/E52F-dynamicFF.xml
deleted file mode 100644
index 5ea3b4e5dc5..00000000000
--- a/data/Petaluma/E52F-dynamicFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M190 -197c-17 0 -34 6 -50 12c-7 2 -9 5 -9 8s2 7 6 11c11 10 24 21 36 31c13 10 26 17 41 17c7 0 14 -1 22 -5c5 -2 10 -3 14 -3c14 0 25 10 34 30c9 21 14 42 17 65c8 62 17 125 17 188h-4c-50 0 -100 2 -150 4c-1 -25 -3 -49 -5 -74c-5 -37 -6 -75 -17 -111 c-25 -82 -99 -152 -191 -167c-4 -1 -8 -1 -13 -1c-16 0 -32 5 -48 11c-6 2 -9 6 -9 9c0 4 3 8 6 11c11 10 23 20 35 29c13 11 27 20 42 20c7 0 14 -2 22 -6c4 -2 9 -3 13 -3c10 0 19 6 27 16c13 17 17 37 21 58c13 69 20 139 21 210c-32 0 -65 -1 -97 -1c-9 0 -20 0 -23 8 c0 1 -1 2 -1 3c0 7 9 12 15 17c5 4 8 10 12 14c20 20 40 37 72 35h22c9 78 74 162 147 186c6 2 12 3 19 3c44 0 99 -38 99 -78c0 -18 -17 -27 -31 -36s-27 -21 -45 -21c-4 0 -9 1 -14 3s-3 7 -4 10c-2 5 -2 10 -5 13c-13 17 -25 41 -50 36c-18 -5 -22 -20 -22 -37 c0 -26 3 -54 3 -82l84 -3c11 -1 22 -1 33 -1s22 1 33 1c3 75 54 125 115 169c18 14 37 20 56 20c17 0 34 -5 52 -15c4 -2 9 -4 12 -8c14 -15 33 -29 33 -51c0 -3 0 -6 -1 -9c-5 -19 -58 -52 -77 -50c-9 0 -16 2 -18 14c-2 17 -16 29 -29 40c-7 6 -14 9 -20 9 c-10 0 -18 -8 -22 -24c-4 -12 -5 -25 -5 -38c0 -19 3 -38 4 -57c37 -1 74 -4 111 -9c14 -2 21 -7 21 -15c0 -5 -3 -11 -9 -17c-23 -23 -48 -43 -83 -39c-13 2 -27 3 -40 4c-1 -65 -6 -130 -26 -192c-28 -87 -94 -142 -186 -161c-4 -1 -8 -1 -13 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E530-dynamicFFF.xml b/data/Petaluma/E530-dynamicFFF.xml
deleted file mode 100644
index 21a167b128e..00000000000
--- a/data/Petaluma/E530-dynamicFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M522 -197c-11 0 -21 1 -31 3c-10 1 -20 8 -23 16v2c0 6 9 10 14 15c8 6 14 14 21 20c13 12 26 23 42 23c8 0 16 -2 25 -7c6 -3 12 -5 17 -5c13 0 23 10 30 26c20 46 20 95 20 143c0 39 2 78 6 117c-33 -1 -65 -2 -98 -2c-23 0 -46 1 -69 1c0 -12 -1 -23 -1 -34 s1 -22 1 -34c0 -48 -4 -96 -17 -142c-6 -21 -15 -41 -32 -55c-47 -42 -95 -82 -162 -82c-17 0 -53 2 -62 19c-6 10 18 21 28 31c15 15 31 27 51 27c9 0 19 -2 29 -7c11 -5 19 -8 26 -8c14 0 22 12 29 37c13 47 14 95 15 143c1 37 3 73 7 109l-44 3c-20 1 -40 2 -60 2 c-17 0 -33 0 -50 -1h-4c-1 -5 -1 -9 -1 -13c-1 -14 -1 -29 -1 -43c0 -23 1 -47 1 -70c0 -18 -1 -35 -2 -53c-3 -51 -24 -90 -67 -118c-45 -29 -92 -48 -143 -48c-17 0 -34 2 -51 6c-4 1 -7 3 -11 4c-1 1 -2 2 -4 5c23 18 48 35 76 47c3 1 5 1 8 1c8 0 16 -4 24 -6 c10 -3 18 -5 25 -5c15 0 22 9 32 30c11 26 14 52 14 79c0 11 -1 21 -1 32c0 51 1 101 5 152c-41 2 -82 6 -125 8c15 29 28 54 46 77c7 10 17 11 27 10c21 -3 41 -4 62 -6c7 54 40 93 82 124c19 14 41 24 61 37c11 7 23 10 34 10c42 0 84 -37 99 -67c1 -2 1 -3 1 -4 c0 -5 -4 -7 -7 -9c-21 -18 -47 -27 -74 -33c-2 0 -4 -1 -5 -1c-8 0 -14 4 -19 14c-8 17 -24 37 -42 34c-17 -2 -23 -26 -28 -44c-6 -21 -10 -42 -12 -64c55 0 110 0 165 -2l9 47c12 52 51 83 90 114c21 17 42 26 66 26c11 0 23 -2 36 -7c32 -12 48 -38 60 -67 c1 -3 1 -5 1 -7c0 -3 -1 -5 -4 -8c-21 -21 -44 -36 -72 -42l-7 -1c-6 0 -11 3 -14 14c-6 21 -20 37 -41 46c-4 2 -7 3 -10 3c-5 0 -7 -3 -10 -12c-10 -37 -14 -74 -18 -111c57 -4 114 -6 172 -5l9 37c20 68 65 115 121 152c9 6 18 9 29 9c19 0 39 -10 55 -27 c17 -18 25 -30 25 -40c0 -13 -11 -23 -34 -38c-9 -6 -18 -12 -27 -16c-6 -3 -11 -5 -15 -5c-7 0 -13 5 -18 16c-6 14 -18 31 -32 31c-17 0 -17 -23 -20 -38c-5 -27 -10 -53 -14 -80c2 1 4 1 6 1c34 0 68 5 103 7h9c7 0 14 -1 17 -7l1 -4c0 -8 -7 -16 -12 -23 c-25 -35 -59 -50 -102 -52c-11 0 -21 -1 -32 -1l-3 -53c0 -18 1 -37 1 -55c0 -10 0 -19 -1 -28c-8 -106 -69 -170 -161 -212c-13 -6 -27 -8 -40 -8z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E531-dynamicFFFF.xml b/data/Petaluma/E531-dynamicFFFF.xml
deleted file mode 100644
index b55bc1556ff..00000000000
--- a/data/Petaluma/E531-dynamicFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M244 -197c-5 0 -10 0 -15 1c-11 2 -16 5 -16 10c0 3 3 7 7 13c13 16 26 31 40 45c6 7 12 10 19 10c3 0 6 0 10 -2c9 -4 18 -6 28 -6c20 0 34 8 43 27c32 62 37 129 37 197v41c0 14 0 28 1 42c-55 1 -109 5 -164 8h-5c-1 -35 1 -71 1 -107c2 -103 -44 -177 -132 -227 c-35 -19 -71 -28 -109 -32h-10c-10 0 -19 1 -28 7c18 22 37 42 59 59c7 5 15 4 23 4c10 1 20 2 31 1c40 -4 56 19 66 54c9 32 10 65 9 99c0 19 -1 38 -1 57c0 28 1 56 4 83c-19 -2 -39 -4 -59 -7c-9 -2 -19 -2 -29 -2c-8 0 -15 0 -23 1c-7 1 -10 3 -10 6s2 5 4 8 c17 20 31 42 51 60c5 5 10 8 17 6c13 -3 25 -4 38 -4c8 0 16 0 24 1c20 78 68 132 139 168c10 5 19 7 28 7c18 0 35 -9 51 -23c3 -3 7 -6 10 -10c17 -22 26 -34 26 -43c0 -11 -12 -19 -35 -34c-9 -6 -19 -10 -28 -15c-6 -3 -11 -4 -16 -4c-8 0 -14 4 -19 17 c-6 16 -18 29 -34 38c-5 2 -8 4 -11 4c-5 0 -9 -4 -11 -11c-7 -29 -15 -58 -20 -87c12 1 25 1 37 1c46 0 92 -4 138 -8c22 71 73 121 131 164c9 6 18 9 29 9c13 0 27 -4 40 -9c27 -9 51 -25 63 -54c2 -6 6 -10 0 -17c-19 -21 -41 -38 -67 -48c-3 -1 -6 -2 -8 -2 c-5 0 -8 3 -11 10c-11 27 -35 38 -60 45c-2 1 -5 1 -7 1c-6 0 -11 -3 -15 -10c-16 -29 -21 -60 -23 -92c23 1 47 2 70 2c10 0 21 0 31 -1c25 0 49 -2 74 -3c2 12 4 24 7 36c15 69 59 117 118 151c11 6 21 10 32 10c16 0 32 -7 46 -19c16 -13 31 -27 42 -45c3 -3 4 -6 4 -9 c0 -4 -2 -7 -5 -11c-16 -17 -36 -30 -56 -40c-5 -3 -10 -5 -15 -5c-8 0 -16 5 -22 14c-9 16 -24 25 -38 36c-5 3 -8 4 -11 4c-5 0 -8 -5 -10 -13c-10 -38 -15 -75 -17 -113c45 -2 89 -4 134 -3h45c2 25 7 51 19 73c29 54 64 107 130 122c7 2 14 2 21 2c36 0 68 -21 88 -60 c2 -5 4 -10 4 -15c0 -7 -3 -13 -9 -19c-18 -17 -38 -34 -62 -42c-4 -1 -6 -2 -9 -2c-4 0 -7 3 -8 12c-5 27 -36 50 -64 52h-3c-11 0 -14 -6 -17 -15c-9 -26 -11 -53 -11 -79c0 -10 1 -20 1 -30c39 -1 79 0 118 5c7 1 15 2 23 2c9 0 18 -2 28 -8c-23 -30 -49 -55 -86 -60 c-28 -3 -55 -6 -82 -7c0 -72 -5 -143 -37 -209c-35 -76 -85 -137 -170 -160c-6 -2 -11 -2 -17 -2c-4 0 -9 0 -13 1c-15 4 -23 11 -23 20c0 6 3 13 9 20c12 16 23 32 36 45c5 5 10 7 15 7c4 0 9 -2 14 -6c11 -8 21 -12 31 -12c17 0 31 11 40 31c27 63 34 129 38 196 c-2 23 -3 45 -4 68h-19c-20 1 -40 -1 -60 -1l-101 3v-23c0 -15 1 -30 1 -45c0 -52 -5 -103 -35 -149c-39 -62 -89 -113 -162 -134c-4 -1 -8 -2 -11 -2c-7 0 -14 -1 -22 -1c-9 0 -18 2 -23 11c-7 14 13 21 18 32c3 7 9 12 13 17c11 12 20 20 35 20c5 0 10 0 16 -2 c8 -2 16 -3 23 -3c25 0 40 15 50 47c12 38 13 78 14 118v42l3 75c-56 1 -113 2 -169 2v-17c1 -60 -2 -119 -24 -177c-30 -78 -80 -138 -159 -172c-18 -7 -36 -12 -55 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E532-dynamicFFFFF.xml b/data/Petaluma/E532-dynamicFFFFF.xml
deleted file mode 100644
index 09d01131803..00000000000
--- a/data/Petaluma/E532-dynamicFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M989 -195c-18 -2 -30 11 -39 29c-3 7 -6 14 -6 22s3 16 10 24c12 15 20 34 34 48c6 6 12 10 17 10c6 0 11 -5 16 -15c6 -14 11 -35 28 -35c20 0 17 25 19 40c12 87 29 175 40 262c-52 -3 -104 -6 -156 -6c-1 -14 -3 -29 -3 -44c-8 -132 -85 -214 -196 -273 c-17 -9 -37 -10 -56 -13h-6c-4 0 -9 1 -11 5c-1 1 -1 2 -1 3c0 5 5 8 7 12c4 7 9 13 14 19c17 24 35 40 69 44c69 8 89 37 94 117c3 44 6 88 10 133c-33 0 -67 1 -100 1c-24 0 -48 0 -72 -1c1 -25 3 -49 3 -73c0 -10 0 -21 -1 -30c-5 -106 -53 -185 -142 -241 c-19 -11 -39 -18 -60 -22c-17 -2 -30 5 -41 16c-4 5 -7 10 -7 15c0 4 2 9 7 14c14 13 25 29 40 44c6 6 12 9 18 9c5 0 11 -3 18 -10c9 -10 19 -15 28 -15c13 0 24 11 31 30c18 44 23 89 23 135c0 22 -1 44 -2 65s-2 41 -2 62c-63 -1 -127 -2 -190 -2c0 -10 1 -21 1 -31 c0 -67 -9 -135 -31 -199c-21 -60 -59 -109 -121 -130c-6 -2 -12 -3 -18 -3c-24 0 -48 16 -60 36c-2 3 -3 6 -3 8c0 4 2 6 4 9c15 15 24 35 40 51c7 7 13 10 20 10h2c5 0 10 -3 16 -8c19 -15 27 -24 34 -24c8 0 12 13 19 40c11 43 16 87 16 135c0 15 0 31 -1 48 c-2 19 -2 40 -2 61c-44 1 -88 1 -132 1c-2 -43 -4 -86 -8 -128c-8 -82 -51 -143 -114 -193c-25 -20 -52 -36 -85 -40h-7c-10 0 -19 2 -27 8c-9 6 -16 13 -16 21c0 5 3 11 9 17c13 14 23 30 36 45c5 5 10 8 15 8h2c4 0 9 -3 13 -6c12 -11 24 -16 35 -16c17 0 31 13 39 38 c17 52 18 107 21 161c1 16 2 33 2 50c0 12 -1 24 -1 36c-45 0 -90 1 -135 4c-3 0 -6 1 -11 2c12 29 26 55 45 79c4 5 9 6 14 6h10c27 -1 53 -2 80 -2c0 12 2 24 4 36c12 73 56 122 118 153c10 5 20 7 30 7c40 0 81 -31 93 -72v-3c0 -5 -3 -7 -5 -11c-16 -22 -40 -34 -64 -44 c-4 -2 -8 -3 -12 -3c-7 0 -12 4 -13 16c0 1 -2 2 -3 4c-11 16 -24 39 -43 39c-22 0 -19 -32 -20 -51c-1 -24 -1 -49 -1 -73c48 -1 95 -3 142 -4c5 18 12 37 21 55c27 54 71 96 120 130c13 9 27 13 40 13c24 0 49 -14 65 -41c11 -18 17 -29 17 -38c0 -12 -10 -22 -32 -38 c-7 -6 -14 -12 -23 -17c-8 -5 -14 -7 -19 -7c-7 0 -12 6 -18 19c-4 8 -9 16 -14 22c-13 17 -24 25 -34 25c-11 0 -21 -11 -31 -33c-14 -30 -18 -61 -20 -92c66 -3 132 -3 198 -3l1 10c6 35 20 65 42 92c20 24 42 46 65 68c21 20 41 28 61 28c33 0 62 -24 82 -54 c4 -7 7 -13 7 -18c0 -8 -5 -15 -14 -21c-13 -9 -26 -19 -40 -26c-8 -5 -15 -8 -22 -8c-8 0 -16 5 -21 19c-7 19 -26 27 -43 35c-3 1 -6 2 -8 2c-9 0 -11 -10 -13 -18c-11 -35 -16 -72 -18 -109h4c59 0 119 -2 178 -3c1 10 2 20 4 30c10 73 54 122 111 160c18 12 37 18 55 18 c37 0 71 -25 81 -67c0 -3 2 -6 2 -9v-3c0 -5 -4 -10 -7 -14c-15 -22 -37 -37 -61 -48c-3 -2 -7 -3 -10 -3c-5 0 -8 3 -8 13c0 14 -9 25 -18 35c-11 11 -23 20 -39 20c-2 0 -5 0 -8 -1c-18 -4 -17 -22 -18 -35c-3 -33 -6 -65 -8 -97c25 -1 51 -1 76 -1h39c14 0 29 1 44 1v1 c7 83 54 142 118 188c18 12 36 18 54 18c36 0 69 -23 83 -62c2 -4 2 -8 2 -12c0 -5 -2 -10 -6 -16c-15 -18 -33 -32 -54 -43c-5 -3 -11 -5 -15 -5c-8 0 -14 5 -16 18c-3 17 -15 28 -29 36c-8 5 -16 7 -23 7c-14 1 -24 -9 -27 -29c-5 -32 -9 -65 -13 -97c42 3 84 6 125 8 c5 0 12 2 17 2c7 0 12 -2 15 -6c4 -11 -7 -21 -15 -31c-25 -28 -54 -40 -94 -42l-58 -3c0 -5 -1 -10 -2 -15c-9 -72 -16 -143 -32 -213s-63 -117 -122 -152c-10 -6 -21 -9 -36 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E533-dynamicFFFFFF.xml b/data/Petaluma/E533-dynamicFFFFFF.xml
deleted file mode 100644
index 0e544ed1440..00000000000
--- a/data/Petaluma/E533-dynamicFFFFFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M465 -197c-11 0 -21 3 -30 10c-8 6 -12 11 -12 17c0 5 3 10 9 16c14 16 28 33 45 47c6 5 12 7 17 7h2c5 0 10 -3 15 -7c3 -2 5 -5 8 -7c6 -4 11 -6 15 -6c8 0 13 5 17 16c13 30 16 63 23 95c15 68 15 138 20 207v5c-21 1 -41 1 -62 2c-20 1 -39 2 -59 2 c-14 0 -28 -1 -42 -1l-15 -199c-4 -52 -27 -96 -69 -129c-23 -18 -44 -39 -75 -44c-6 -1 -11 -2 -17 -2c-19 0 -37 7 -54 16c-6 3 -9 7 -9 12c0 3 1 7 4 10c16 16 26 37 43 52c6 5 11 12 21 9c11 1 20 -8 30 -12c9 -3 15 -5 20 -5c9 0 12 7 15 24c10 56 5 113 14 169 c5 32 8 64 10 96c-35 -1 -70 4 -104 6c-7 0 -13 1 -19 1c0 -11 1 -22 1 -33c0 -71 -10 -141 -38 -208c-30 -72 -81 -127 -156 -157c-9 -4 -17 -5 -25 -5c-22 0 -40 12 -51 34c-4 7 -6 14 -6 21c0 8 3 15 10 23c14 15 24 34 39 48c7 6 12 10 17 10c6 0 10 -5 14 -16 c4 -10 10 -19 17 -26c10 -10 19 -14 28 -14c10 0 20 8 27 24c25 56 30 116 34 175c1 16 0 32 0 48c1 27 -2 55 -4 82h-3c-22 0 -42 -9 -63 -12c-20 -3 -40 -8 -61 -8c-6 0 -13 1 -20 2v2c0 5 3 8 6 11c12 9 22 21 33 31c15 14 30 25 52 25c15 0 30 5 45 9c2 0 5 0 7 1 c0 31 3 62 20 89c23 37 51 68 88 91c11 7 25 11 40 11c24 0 51 -10 69 -27c3 -4 7 -7 10 -11c12 -13 18 -23 18 -31c0 -11 -8 -20 -20 -30c-14 -11 -27 -22 -43 -29c-5 -3 -10 -4 -14 -4c-7 0 -13 4 -18 13c-8 15 -20 27 -36 34c-8 3 -13 5 -17 5c-8 0 -10 -9 -10 -33 s2 -48 5 -71c12 -1 24 -1 36 -2c32 -3 64 -4 96 -5v4c3 42 21 78 49 107c30 32 58 65 103 80c9 3 18 4 27 4c45 0 87 -32 103 -71c1 -3 1 -5 1 -8c0 -4 -1 -8 -4 -12c-18 -23 -40 -40 -67 -52c-3 -1 -6 -2 -8 -2c-5 0 -8 3 -12 11c-15 30 -36 55 -73 57 c-15 0 -24 -5 -27 -21c-4 -19 -7 -37 -8 -56c0 -15 -1 -30 -2 -44c39 0 77 2 116 2c15 0 29 0 44 -1h9c1 9 4 18 6 27c18 66 63 112 118 148c15 10 32 14 48 14c40 0 79 -26 100 -57c3 -4 4 -8 4 -12c0 -3 -1 -7 -5 -11c-16 -22 -37 -35 -59 -48c-5 -2 -10 -4 -14 -4 c-7 0 -14 5 -19 15c-11 21 -44 39 -65 39h-3c-8 0 -11 -6 -14 -13c-8 -23 -12 -46 -14 -70c-1 -10 -1 -21 -2 -31c18 0 35 -1 53 -1c26 -1 51 2 77 3c22 1 44 1 67 1c3 15 8 31 14 46c20 51 54 94 102 123c15 9 33 14 51 14c31 0 63 -14 81 -37c7 -9 10 -16 10 -22 s-3 -12 -11 -20c-16 -16 -33 -30 -53 -39c-5 -2 -10 -5 -14 -5c-6 0 -11 4 -16 14c-10 19 -32 27 -55 30h-3c-13 0 -15 -12 -17 -22c-5 -26 -9 -53 -13 -79c15 1 31 1 46 1c30 0 60 -1 91 -1h37c2 11 5 23 8 35c16 55 48 100 93 136c16 13 34 19 53 19c23 0 45 -9 62 -26 c21 -21 32 -33 32 -45c0 -13 -11 -25 -34 -43l-15 -12c-10 -7 -18 -11 -24 -11c-8 0 -15 6 -24 19c-11 15 -24 27 -42 33c-4 1 -7 2 -9 2c-7 0 -12 -5 -14 -14c-7 -31 -11 -62 -14 -93v-3h20c23 -1 46 -1 69 -1c11 1 22 1 34 1c11 0 23 0 34 -1c18 70 61 128 118 179 c10 9 21 11 33 11c8 0 17 -1 26 -3c30 -4 55 -18 75 -41c9 -10 14 -17 14 -26c0 -7 -4 -14 -10 -24c-13 -18 -30 -34 -49 -45c-5 -3 -10 -5 -15 -5s-10 4 -15 14c-11 22 -32 35 -56 42c-8 3 -14 4 -19 4c-10 0 -13 -7 -18 -25c-6 -27 -11 -55 -13 -84c15 0 30 -1 45 -1 c19 -1 37 -2 56 -2c11 0 23 1 35 2h5c9 0 19 -2 27 -9c-5 -14 -15 -23 -27 -31c-26 -19 -56 -27 -88 -27h-55v-2c-2 -54 -4 -107 -10 -160c-5 -42 -23 -79 -50 -110c-33 -38 -66 -79 -120 -91c-9 -2 -18 -4 -27 -4c-12 0 -24 4 -36 14c-6 5 -6 9 -3 13c14 19 25 39 41 57 c6 7 13 10 20 10c4 0 7 0 11 -2c1 0 2 -1 2 -1c12 -4 23 -6 32 -6c27 0 42 18 46 55c8 74 16 149 16 224v5c-42 3 -84 3 -126 3h-28c-3 -42 -7 -83 -13 -125c-4 -27 -11 -55 -20 -81c-29 -83 -88 -138 -172 -166c-6 -2 -12 -4 -19 -4c-6 0 -13 2 -20 5c-8 4 -11 10 -6 18 c15 21 28 43 46 61c4 5 9 6 15 6c6 -1 11 -2 17 -4c7 -2 14 -2 19 -2c19 0 30 9 38 32c21 61 25 124 30 188c1 25 4 49 7 73c-31 1 -61 1 -92 1c-26 0 -52 0 -77 -1c-6 -66 -12 -132 -34 -196c-22 -65 -58 -119 -114 -159c-27 -19 -57 -27 -90 -27c-6 0 -14 0 -17 7v3 c0 5 4 9 7 12c13 17 25 35 40 50c7 6 13 12 22 11c8 0 15 -1 21 -1c28 0 30 7 44 45c21 56 25 115 32 174l9 79c-21 -1 -41 -1 -61 -2c-43 -2 -87 -3 -130 -3c-1 -18 -3 -36 -4 -54c-7 -72 -16 -144 -44 -211c-21 -50 -60 -85 -105 -115c-15 -10 -33 -14 -51 -18 c-4 -1 -7 -1 -11 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E534-dynamicFortePiano.xml b/data/Petaluma/E534-dynamicFortePiano.xml
deleted file mode 100644
index 894909be119..00000000000
--- a/data/Petaluma/E534-dynamicFortePiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M287 -243c-1 1 -2 3 -2 4c0 5 8 8 10 13c17 29 39 49 63 63c24 71 44 142 54 216c6 46 10 92 10 138c0 40 -3 81 -8 121c-17 -7 -30 -19 -44 -30c5 -1 9 -3 11 -7c1 -1 2 -3 2 -5c0 -8 -8 -15 -13 -21c-25 -30 -54 -49 -98 -49c-16 0 -32 -1 -48 -1c0 -25 1 -50 1 -75 c0 -42 -3 -84 -15 -126c-19 -67 -105 -151 -203 -151c-19 0 -37 2 -56 8l57 56c8 7 17 9 27 7l19 -3c9 -1 16 -2 23 -2c30 0 41 13 51 52c7 28 9 56 9 85c0 30 -2 60 -2 90v58l-153 -3c-4 0 -8 1 -15 1c17 29 31 55 53 75c11 10 25 12 38 12c11 0 22 -2 33 -2 c16 -1 32 -1 47 -2c2 14 4 28 8 42c19 65 64 108 117 143c9 6 20 8 31 8c43 0 98 -34 107 -71l1 -4c0 -4 -3 -7 -6 -11c-18 -21 -42 -34 -67 -44c-4 -1 -7 -2 -11 -2h-2c-6 0 -11 4 -15 15c-6 21 -26 33 -48 40c-2 1 -4 1 -6 1c-7 0 -8 -9 -10 -15c-8 -34 -11 -69 -12 -103 c37 0 74 1 110 3c16 22 33 41 53 58c21 18 44 34 67 50c7 5 15 7 21 7c13 0 23 -9 25 -27c2 -17 3 -35 5 -52c25 26 56 45 97 50c5 1 9 1 13 1c34 0 54 -19 61 -57c2 -9 2 -18 2 -27c0 -27 -6 -54 -14 -79c-26 -80 -77 -142 -143 -192c-12 -9 -25 -15 -38 -17 c-5 -21 -11 -42 -18 -63c-7 -22 -14 -44 -22 -66c11 3 23 6 35 8c16 4 32 12 51 11h7c4 0 9 -1 11 -5c1 -1 1 -3 1 -4c0 -6 -5 -11 -8 -15c-24 -27 -49 -50 -86 -58c-31 -7 -62 -14 -92 -24c-1 0 -2 -1 -3 -1c-18 -6 -36 -12 -53 -20c-6 -3 -14 -8 -20 -2zM532 78 c12 -1 24 8 30 20c19 38 32 77 32 119c0 8 0 16 -1 23c-4 30 -20 45 -42 45c-8 0 -17 -2 -27 -6c-5 -2 -11 -5 -16 -9c1 -17 1 -36 1 -54c0 -46 -3 -91 -9 -137c3 2 7 3 11 3c4 -1 8 -1 13 -3c3 -1 6 -1 8 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E535-dynamicForzando.xml b/data/Petaluma/E535-dynamicForzando.xml
deleted file mode 100644
index a1b7cf90e89..00000000000
--- a/data/Petaluma/E535-dynamicForzando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 -195c-22 -2 -44 4 -65 12c-6 2 -9 5 -9 8s3 6 6 9c21 17 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 37 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -15 31 -30 42c-8 5 -14 8 -20 8c-8 0 -15 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-22 -23 -47 -44 -81 -39c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -74 -115 -161 -190 -168zM342 0c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5 c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58 c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E536-dynamicSforzando1.xml b/data/Petaluma/E536-dynamicSforzando1.xml
deleted file mode 100644
index 133ac5f82fd..00000000000
--- a/data/Petaluma/E536-dynamicSforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M265 -155c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40l-10 1c-15 0 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM105 0c-35 0 -68 16 -96 42c-6 5 -9 12 -9 18c0 5 2 11 5 15c12 21 24 42 40 60 c6 8 12 14 21 10c4 -1 5 -3 5 -5c0 -4 -4 -8 -4 -12v-2c0 -8 6 -12 12 -17c28 -22 60 -35 101 -34h2c3 0 6 -1 11 -1s11 2 13 9c1 2 2 5 2 8c0 10 -6 18 -11 26c-12 19 -32 26 -52 32c-23 7 -47 12 -67 29c-19 16 -29 39 -29 63c0 13 4 28 11 41c15 23 32 46 52 67 c20 20 49 30 78 30c41 0 84 -19 104 -53c1 -3 2 -5 2 -8c0 -4 -1 -6 -3 -9c-10 -17 -26 -30 -41 -42c-7 -4 -14 -10 -20 -10c-7 0 -12 4 -17 16c-10 20 -50 33 -77 33c-6 0 -11 -1 -15 -2c-7 -1 -8 -4 -8 -8c0 -2 1 -6 2 -9c8 -33 33 -51 64 -61c24 -7 47 -12 68 -27 s32 -35 32 -55c0 -11 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-6 -1 -10 -1 -16 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E537-dynamicSforzandoPiano.xml b/data/Petaluma/E537-dynamicSforzandoPiano.xml
deleted file mode 100644
index 80c516051b2..00000000000
--- a/data/Petaluma/E537-dynamicSforzandoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M265 -155c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40l-10 1c-15 0 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM581 -232c-3 0 -6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74 c20 21 22 51 27 78c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-7c-3 0 -7 0 -9 4c-1 1 -1 2 -1 3c0 4 4 8 6 12c24 49 74 76 113 111c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6 c44 0 80 -42 78 -117c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20c-18 -26 -38 -48 -71 -56c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5 c-3 -1 -7 -2 -10 -2zM105 0c-35 0 -68 16 -96 42c-6 5 -9 12 -9 18c0 5 2 11 5 15c12 21 24 42 40 60c6 8 12 14 21 10c4 -1 5 -3 5 -5c0 -4 -4 -8 -4 -12v-2c0 -8 6 -12 12 -17c28 -22 60 -35 101 -34h2c3 0 6 -1 11 -1s11 2 13 9c1 2 2 5 2 8c0 10 -6 18 -11 26 c-12 19 -32 26 -52 32c-23 7 -47 12 -67 29c-19 16 -29 39 -29 63c0 13 4 28 11 41c15 23 32 46 52 67c20 20 49 30 78 30c41 0 84 -19 104 -53c1 -3 2 -5 2 -8c0 -4 -1 -6 -3 -9c-10 -17 -26 -30 -41 -42c-7 -4 -14 -10 -20 -10c-7 0 -12 4 -17 16c-10 20 -50 33 -77 33 c-6 0 -11 -1 -15 -2c-7 -1 -8 -4 -8 -8c0 -2 1 -6 2 -9c8 -33 33 -51 64 -61c24 -7 47 -12 68 -27s32 -35 32 -55c0 -11 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-6 -1 -10 -1 -16 -1zM756 89c17 2 34 5 50 10c19 6 33 19 37 35c8 32 16 63 16 96c0 9 -1 19 -3 29 c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169c0 -2 0 -4 -1 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E538-dynamicSforzandoPianissimo.xml b/data/Petaluma/E538-dynamicSforzandoPianissimo.xml
deleted file mode 100644
index 38744eda43a..00000000000
--- a/data/Petaluma/E538-dynamicSforzandoPianissimo.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M265 -145c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40c-3 0 -7 0 -10 1c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM591 -242c-3 0 -6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74 c20 21 22 51 27 78c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-7c-3 0 -7 0 -9 4c-1 1 -1 2 -1 3c0 4 4 8 6 12c24 49 74 76 113 111c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6 c32 0 60 -22 72 -64c27 43 71 70 108 103c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6c44 0 80 -42 78 -117c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125 c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20c-18 -26 -38 -48 -71 -56c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5c-3 -1 -7 -2 -10 -2s-6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74c20 21 22 51 27 78 c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-1c1 -8 1 -17 1 -26c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20c-18 -26 -38 -48 -71 -56 c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5c-3 -1 -7 -2 -10 -2zM106 0c-36 0 -69 16 -97 42c-6 5 -9 12 -9 18s2 11 5 16c12 20 24 41 40 60c6 7 12 13 21 10c4 -2 5 -4 5 -6c0 -4 -4 -8 -4 -12v-2c0 -8 6 -12 12 -17c28 -22 60 -34 101 -33h2c3 0 6 -1 11 -1s11 1 14 8 c0 3 1 5 1 8c0 10 -6 18 -11 26c-12 19 -32 26 -52 32c-23 7 -47 12 -67 29c-19 16 -29 39 -29 63c0 14 4 28 11 41c16 24 32 46 52 67c20 20 49 30 78 30c41 0 84 -19 104 -52c2 -4 3 -6 3 -9s-2 -6 -4 -9c-10 -17 -26 -30 -41 -42c-6 -4 -14 -10 -20 -10s-12 4 -17 16 c-10 20 -49 34 -77 34c-6 0 -11 -1 -15 -2c-7 -2 -8 -5 -8 -8s1 -7 2 -9c9 -34 33 -51 64 -61c24 -8 47 -12 68 -28c21 -15 32 -34 32 -55c0 -11 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-5 -1 -10 -1 -15 -1zM1100 115c17 2 34 5 50 10c19 6 33 19 37 35 c7 32 16 63 16 96c0 9 -1 19 -3 29c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169c0 -2 0 -4 -1 -6zM786 109c17 2 34 5 50 10c19 6 33 19 37 35c8 32 16 63 16 96c0 9 -1 19 -3 29c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12 c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169c0 -2 0 -4 -1 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E539-dynamicSforzato.xml b/data/Petaluma/E539-dynamicSforzato.xml
deleted file mode 100644
index ab7b8b07a0a..00000000000
--- a/data/Petaluma/E539-dynamicSforzato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M245 -166c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40c-3 0 -7 0 -10 1c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM96 0c-32 0 -62 15 -88 39c-6 5 -8 10 -8 16c0 5 1 10 5 14 c10 20 21 39 35 55c6 7 12 13 20 10c4 -2 5 -4 5 -5c0 -4 -4 -8 -4 -11v-2c0 -7 5 -12 11 -16c26 -20 55 -31 93 -31h1h10c5 0 10 1 13 7c1 3 2 5 2 8c0 9 -6 16 -10 24c-12 17 -30 23 -49 29c-21 7 -42 11 -61 27c-17 14 -26 36 -26 57c0 13 3 26 10 38c14 21 29 42 47 62 c19 18 45 27 72 27c38 0 77 -17 95 -48c2 -4 3 -5 3 -8s-2 -6 -4 -8c-9 -16 -23 -28 -37 -39c-6 -4 -13 -9 -19 -9c-5 0 -10 4 -16 14c-9 19 -45 31 -70 31c-5 0 -10 -1 -14 -1c-6 -2 -7 -5 -7 -8c0 -2 1 -6 2 -8c8 -31 30 -47 59 -56c21 -7 43 -11 62 -25s29 -32 29 -51 c0 -10 -2 -21 -8 -31c-29 -56 -76 -92 -138 -100c-5 -1 -10 -1 -15 -1zM574 12c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8 c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9 c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E53A-dynamicSforzatoPiano.xml b/data/Petaluma/E53A-dynamicSforzatoPiano.xml
deleted file mode 100644
index ea95244e219..00000000000
--- a/data/Petaluma/E53A-dynamicSforzatoPiano.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M245 -165c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40c-3 0 -7 0 -10 1c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM894 -280c-3 0 -6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74 c20 21 22 51 27 78c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-7c-3 0 -7 0 -9 4c-1 1 -1 2 -1 3c0 4 4 8 6 12c24 49 74 76 113 111c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6 c44 0 80 -42 78 -117c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20c-18 -26 -38 -48 -71 -56c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5 c-3 -1 -7 -2 -10 -2zM97 0c-33 0 -63 15 -89 39c-6 5 -8 11 -8 16s1 10 5 15c11 19 21 38 36 55c6 6 11 12 20 9c3 -2 4 -3 4 -5c0 -3 -3 -8 -3 -11v-2c0 -7 5 -11 10 -15c26 -21 55 -32 93 -31h2c2 0 5 -1 10 -1s10 1 12 7c1 3 2 5 2 8c0 9 -6 17 -10 24 c-12 18 -30 23 -49 29c-20 7 -42 11 -60 27c-18 14 -27 36 -27 57c0 13 3 26 10 38c14 22 29 43 47 62c19 18 45 27 72 27c38 0 77 -17 95 -48c2 -3 3 -5 3 -8s-2 -5 -4 -8c-9 -16 -23 -27 -37 -38c-6 -4 -13 -9 -18 -9c-6 0 -11 3 -16 14c-9 18 -45 31 -70 31 c-6 0 -10 -1 -15 -2c-5 -2 -7 -4 -7 -8c0 -2 2 -5 2 -8c8 -31 30 -47 59 -56c22 -7 43 -11 62 -25c20 -14 30 -32 30 -51c0 -10 -3 -21 -9 -31c-29 -56 -76 -91 -138 -100c-5 -1 -9 -1 -14 -1zM584 13c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30 c-26 -2 -50 -5 -75 -5c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21 c-19 -22 -40 -42 -64 -58c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3 c-8 -4 -18 -11 -27 -11zM1069 41c17 2 34 5 50 10c19 6 33 19 37 35c8 32 16 63 16 96c0 9 -1 19 -3 29c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169c0 -2 0 -4 -1 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E53B-dynamicSforzatoFF.xml b/data/Petaluma/E53B-dynamicSforzatoFF.xml
deleted file mode 100644
index 0327c94b3bb..00000000000
--- a/data/Petaluma/E53B-dynamicSforzatoFF.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M503 -169c-17 0 -34 6 -50 12c-7 2 -9 5 -9 8s2 7 6 11c11 10 24 21 36 31c13 10 26 17 41 17c7 0 14 -1 22 -5c5 -2 10 -3 14 -3c14 0 25 10 34 30c9 21 14 42 17 65c8 62 17 125 17 188h-4c-50 0 -100 2 -150 4c-1 -25 -3 -49 -5 -74c-5 -37 -6 -75 -17 -111 c-25 -82 -99 -152 -191 -167c-4 -1 -8 -1 -13 -1c-16 0 -32 5 -48 11c-6 2 -9 6 -9 9c0 4 3 8 6 11c11 10 23 20 35 29c13 11 27 20 42 20c7 0 14 -2 22 -6c4 -2 9 -3 13 -3c10 0 19 6 27 16c13 17 17 37 21 58c13 69 20 139 21 210c-32 0 -65 -1 -97 -1c-9 0 -20 0 -23 8 c0 1 -1 2 -1 3c0 7 9 12 15 17c5 4 8 10 12 14c20 20 40 37 72 35h22c9 78 74 162 147 186c6 2 12 3 19 3c44 0 99 -38 99 -78c0 -18 -17 -27 -31 -36s-27 -21 -45 -21c-4 0 -9 1 -14 3s-3 7 -4 10c-2 5 -2 10 -5 13c-13 17 -25 41 -50 36c-18 -5 -22 -20 -22 -37 c0 -26 3 -54 3 -82l84 -3c11 -1 22 -1 33 -1s22 1 33 1c3 75 54 125 115 169c18 14 37 20 56 20c17 0 34 -5 52 -15c4 -2 9 -4 12 -8c14 -15 33 -29 33 -51c0 -3 0 -6 -1 -9c-5 -19 -58 -52 -77 -50c-9 0 -16 2 -18 14c-2 17 -16 29 -29 40c-7 6 -14 9 -20 9 c-10 0 -18 -8 -22 -24c-4 -12 -5 -25 -5 -38c0 -19 3 -38 4 -57c37 -1 74 -4 111 -9c14 -2 21 -7 21 -15c0 -5 -3 -11 -9 -17c-23 -23 -48 -43 -83 -39c-13 2 -27 3 -40 4c-1 -65 -6 -130 -26 -192c-28 -87 -94 -142 -186 -161c-4 -1 -8 -1 -13 -1zM105 0 c-35 0 -68 16 -96 42c-6 5 -9 12 -9 18c0 5 2 10 5 16c13 20 24 41 39 59c6 7 13 14 23 10c3 -1 4 -3 4 -5c0 -4 -4 -8 -4 -12v-2c0 -8 5 -13 12 -17c29 -22 60 -35 101 -34h2c3 0 6 -1 11 -1c5 1 11 2 14 9c0 2 1 5 1 8c0 9 -6 18 -11 26c-12 20 -32 26 -52 32 c-23 8 -47 12 -67 29c-19 16 -29 39 -29 63c0 14 3 28 11 40c15 24 32 47 52 68c20 20 49 30 78 30c41 0 84 -19 103 -53c2 -3 3 -5 3 -8s-1 -6 -3 -9c-10 -17 -25 -30 -41 -41c-7 -5 -14 -11 -20 -11s-12 4 -17 16c-10 20 -50 33 -77 33c-6 0 -11 0 -16 -2 c-6 -1 -7 -4 -7 -8c0 -2 1 -6 2 -9c9 -33 33 -51 64 -61c23 -7 47 -12 68 -27s32 -35 32 -55c0 -12 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-6 -1 -10 -1 -16 -1zM819 29c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5 c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58 c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E53C-dynamicRinforzando1.xml b/data/Petaluma/E53C-dynamicRinforzando1.xml
deleted file mode 100644
index e621f444a35..00000000000
--- a/data/Petaluma/E53C-dynamicRinforzando1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 -115c-22 -2 -44 4 -65 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-22 -23 -47 -44 -81 -39c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -74 -115 -161 -190 -168zM16 0c-8 0 -10 7 -9 20c7 91 12 182 19 273v8c0 6 0 11 -4 18c-31 -23 -57 -51 -97 -62 c7 21 21 34 31 48c33 40 76 69 114 103c5 5 10 7 14 7c9 0 17 -8 19 -21c3 -27 4 -52 3 -78c4 5 7 9 10 14c24 33 59 48 96 58c20 6 39 11 59 11c13 0 26 -3 39 -8c6 -3 13 -3 12 -13c0 -18 -37 -68 -55 -72c-2 -1 -3 -1 -5 -1c-3 0 -6 2 -10 3c-13 3 -26 5 -38 5 c-44 0 -86 -21 -111 -58c0 -9 -1 -18 -2 -26c-3 -49 -9 -96 -12 -145c-2 -31 -33 -73 -61 -81c-5 -2 -9 -3 -12 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E53D-dynamicRinforzando2.xml b/data/Petaluma/E53D-dynamicRinforzando2.xml
deleted file mode 100644
index 87cf34f63bf..00000000000
--- a/data/Petaluma/E53D-dynamicRinforzando2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 -155c-22 -2 -44 4 -65 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-22 -23 -47 -44 -81 -39c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -74 -115 -161 -190 -168zM16 -40c-8 0 -10 7 -9 20c7 91 12 182 19 273v8c0 6 0 11 -4 18c-31 -23 -57 -51 -97 -62 c7 21 21 34 31 48c33 40 76 69 114 103c5 5 10 7 14 7c9 0 18 -8 19 -21c2 -27 4 -52 3 -78c4 5 7 9 10 14c24 33 59 47 96 58c20 6 39 11 59 11c13 0 26 -3 39 -8c6 -3 13 -3 12 -13c0 -18 -37 -68 -55 -72c-2 -1 -3 -1 -5 -1c-3 0 -6 2 -10 3c-13 3 -26 5 -38 5 c-44 0 -86 -21 -111 -58c0 -9 -1 -18 -2 -26c-3 -49 -9 -96 -12 -145c-2 -31 -33 -73 -61 -81c-5 -2 -9 -3 -12 -3zM609 10c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22 c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1 c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E566-ornamentTrill.xml b/data/Petaluma/E566-ornamentTrill.xml
deleted file mode 100644
index 71970e93112..00000000000
--- a/data/Petaluma/E566-ornamentTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M223 425c24 4 31 -10 31 -36c0 -20 -6 -40 -14 -58c-4 -9 -14 -10 -23 -10h-5c-7 0 -13 -1 -15 -7c-3 -8 -5 -8 -8 -7l-54 -3c3 -62 6 -124 12 -186c1 -11 -2 -27 12 -27c6 0 22 10 24 12l19 19c6 6 14 13 22 11c10 -3 13 -14 14 -23c1 -8 0 -8 0 -16 c2 -48 -12 -81 -51 -106c-11 -7 -25 1 -33 -3c-3 -2 -6 -3 -9 -3c-11 0 -21 11 -27 27c-9 23 -12 48 -13 72c-3 74 -9 147 -12 221c-22 -1 -41 -2 -56 -2c-21 0 -33 3 -35 14v-3s-1 9 -1 20c0 16 1 37 2 43c2 22 13 32 33 34l54 6v40c1 22 4 43 5 65c0 13 9 20 17 20 c22 0 16 -41 18 -58c2 -18 2 -28 2 -38v-25c31 2 61 2 91 7zM527 408c18 -8 24 -20 24 -48c0 -58 -6 -76 -64 -88c-25 -5 -48 -19 -70 -31c-13 -7 -14 -20 -14 -31v-119c0 -7 0 -15 -2 -22c-4 -11 -10 -23 -20 -23c-13 0 -11 15 -13 25c-4 14 -15 123 -15 134 c0 10 3 19 8 29c1 2 2 6 2 12c0 4 -1 8 -1 13c-23 -28 -43 -52 -63 -77c-4 -5 -8 -13 -15 -13c-11 0 -11 13 -12 22c0 7 -2 14 -3 21c-1 9 -5 25 -4 33c2 12 7 31 24 49c25 27 46 59 70 88c8 10 17 22 30 18c12 -3 12 -19 16 -30c2 -6 2 -13 3 -23c30 15 58 29 86 42 c15 7 26 22 33 19z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E567-ornamentTurn.xml b/data/Petaluma/E567-ornamentTurn.xml
deleted file mode 100644
index be0f88adfb6..00000000000
--- a/data/Petaluma/E567-ornamentTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M452 0c-18 0 -37 4 -55 11c-67 26 -118 75 -171 121c-29 27 -57 55 -99 62c-5 1 -10 1 -15 1c-29 0 -56 -14 -70 -37c-4 -7 -5 -13 -5 -18c0 -9 6 -16 18 -22c15 -7 30 -11 45 -11s29 3 43 11c6 3 10 5 14 5c9 0 12 -9 14 -21c1 -8 1 -16 1 -17c0 -58 -10 -71 -55 -81 c-6 -1 -11 -2 -17 -2c-33 0 -70 18 -79 47c-11 36 -21 73 -21 110c0 23 4 46 14 69c20 44 54 72 97 72c21 0 45 -7 70 -22c49 -32 88 -76 135 -110c28 -20 54 -39 86 -51c20 -7 39 -10 59 -10c8 0 15 0 23 1c26 3 53 20 53 37c0 16 -23 46 -43 52c-13 4 -26 8 -39 8 c-8 0 -16 -1 -24 -5c-3 -1 -5 -2 -7 -2c-4 0 -5 4 -6 10l-9 59c-2 26 8 39 33 43c7 1 13 2 20 2c44 0 83 -29 99 -76c9 -27 13 -54 13 -81c0 -21 -3 -42 -7 -63c-14 -60 -62 -92 -115 -92z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E568-ornamentTurnInverted.xml b/data/Petaluma/E568-ornamentTurnInverted.xml
deleted file mode 100644
index be6a69a5f59..00000000000
--- a/data/Petaluma/E568-ornamentTurnInverted.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M462 0c-7 0 -13 1 -20 2c-25 4 -35 17 -33 43l9 59c1 6 2 10 6 10c2 0 4 -1 7 -2c8 -4 16 -5 24 -5c13 0 26 4 39 8c20 6 43 36 43 52c0 17 -27 34 -53 37c-8 1 -15 1 -23 1c-20 0 -39 -3 -59 -10c-32 -12 -58 -31 -86 -51c-47 -34 -86 -78 -135 -110 c-25 -15 -49 -22 -70 -22c-43 0 -77 28 -97 72c-10 23 -14 46 -14 69c0 37 10 74 21 110c9 29 46 47 79 47c6 0 11 -1 17 -2c45 -10 55 -23 55 -81c0 -1 0 -9 -1 -17c-2 -12 -5 -21 -14 -21c-4 0 -8 2 -14 5c-14 8 -28 11 -43 11s-30 -4 -45 -11c-12 -6 -18 -13 -18 -22 c0 -5 1 -11 5 -18c14 -23 41 -37 70 -37c5 0 10 0 15 1c42 7 70 35 99 62c53 46 104 95 171 121c18 7 37 11 55 11c53 0 101 -32 115 -92c4 -21 7 -42 7 -63c0 -27 -4 -54 -13 -81c-16 -47 -55 -76 -99 -76z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E569-ornamentTurnSlash.xml b/data/Petaluma/E569-ornamentTurnSlash.xml
deleted file mode 100644
index 878a5448d97..00000000000
--- a/data/Petaluma/E569-ornamentTurnSlash.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M306 -106c-27 52 -35 102 -33 155c0 13 0 27 1 41c-16 13 -32 27 -48 41c-30 26 -57 54 -99 62c-5 1 -10 1 -15 1c-29 0 -57 -14 -70 -37c-4 -7 -5 -13 -5 -18c0 -9 6 -16 18 -22c15 -7 30 -11 45 -11s29 3 43 11c6 3 10 5 14 5c9 0 12 -9 14 -21c1 -8 1 -16 1 -17 c0 -58 -10 -71 -55 -81c-6 -1 -11 -2 -17 -2c-33 0 -70 18 -79 47c-11 36 -21 73 -21 110c0 23 4 46 14 69c19 44 54 72 97 72c21 0 45 -7 70 -22c34 -23 64 -51 95 -78l3 180c0 5 -1 10 1 14c3 5 8 11 13 12h2c4 0 4 -6 6 -9c12 -17 13 -37 13 -57c0 -34 1 -71 1 -105v-66 c1 0 1 -1 1 -1c28 -20 54 -40 86 -51c20 -7 39 -10 59 -10c8 0 15 0 23 1c26 3 53 20 53 37c0 16 -23 46 -43 52c-13 4 -26 8 -39 8c-8 0 -16 -1 -24 -5c-3 -1 -5 -2 -7 -2c-4 0 -5 4 -6 10l-9 59c-2 26 8 39 33 43c7 1 13 2 20 2c44 0 83 -29 99 -76c9 -27 13 -54 13 -81 c0 -21 -3 -42 -7 -63c-14 -60 -62 -92 -115 -92c-18 0 -37 4 -55 11c-29 11 -56 28 -81 46c0 -33 0 -66 1 -98c0 -20 -1 -40 -11 -64z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56A-ornamentTurnUp.xml b/data/Petaluma/E56A-ornamentTurnUp.xml
deleted file mode 100644
index dc3749f34eb..00000000000
--- a/data/Petaluma/E56A-ornamentTurnUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 0c-21 0 -42 3 -63 7c-60 14 -92 62 -92 115c0 18 4 37 11 55c26 67 75 118 121 171c27 29 55 57 62 99c1 5 1 10 1 15c0 29 -14 56 -37 70c-7 4 -13 5 -18 5c-9 0 -16 -6 -22 -18c-7 -15 -11 -30 -11 -45s3 -29 11 -43c3 -6 5 -10 5 -14c0 -9 -9 -12 -21 -14 c-8 -1 -16 -1 -17 -1c-58 0 -71 10 -81 55c-1 6 -2 11 -2 17c0 33 18 70 47 79c36 11 73 21 110 21c23 0 46 -4 69 -14c44 -20 72 -54 72 -97c0 -21 -7 -45 -22 -70c-32 -49 -76 -88 -110 -135c-20 -28 -39 -54 -51 -86c-7 -20 -10 -39 -10 -59c0 -8 0 -15 1 -23 c3 -26 20 -53 37 -53c16 0 46 23 52 43c4 13 8 26 8 39c0 8 -1 16 -5 24c-1 3 -2 5 -2 7c0 4 4 5 10 6l59 9c26 2 39 -8 43 -33c1 -7 2 -13 2 -20c0 -44 -29 -83 -76 -99c-27 -9 -54 -13 -81 -13z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56B-ornamentTurnUpS.xml b/data/Petaluma/E56B-ornamentTurnUpS.xml
deleted file mode 100644
index 88cb964d6b3..00000000000
--- a/data/Petaluma/E56B-ornamentTurnUpS.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M157 0c-27 0 -54 4 -81 13c-47 16 -76 55 -76 99c0 7 1 13 2 20c4 25 17 35 43 33l59 -9c6 -1 10 -2 10 -6c0 -2 -1 -4 -2 -7c-4 -8 -5 -16 -5 -24c0 -13 4 -26 8 -39c6 -20 36 -43 52 -43c17 0 34 27 37 53c1 8 1 15 1 23c0 20 -3 39 -10 59c-12 32 -31 58 -51 86 c-34 47 -78 86 -110 135c-15 25 -22 49 -22 70c0 43 28 77 72 97c23 10 46 14 69 14c37 0 74 -10 110 -21c29 -9 47 -46 47 -79c0 -6 -1 -11 -2 -17c-10 -45 -23 -55 -81 -55c-1 0 -9 0 -17 1c-12 2 -21 5 -21 14c0 4 2 8 5 14c8 14 11 28 11 43s-4 30 -11 45 c-6 12 -13 18 -22 18c-5 0 -11 -1 -18 -5c-23 -14 -37 -41 -37 -70c0 -5 0 -10 1 -15c7 -42 35 -70 62 -99c46 -53 95 -104 121 -171c7 -18 11 -37 11 -55c0 -53 -32 -101 -92 -115c-21 -4 -42 -7 -63 -7z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56C-ornamentShortTrill.xml b/data/Petaluma/E56C-ornamentShortTrill.xml
deleted file mode 100644
index b30e35b3d40..00000000000
--- a/data/Petaluma/E56C-ornamentShortTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M263 0c-17 0 -33 8 -46 25c-21 27 -42 54 -59 85c-9 16 -15 23 -22 23s-15 -5 -28 -16c-29 -25 -50 -58 -79 -84c-7 -7 -14 -14 -29 -16c16 45 32 86 64 119c25 26 48 54 74 79c19 17 37 24 55 24c24 0 47 -14 65 -34c23 -26 45 -52 63 -81c5 -7 8 -10 12 -10s7 4 12 10 c21 25 40 54 65 76c12 11 24 15 35 15c10 0 20 -3 31 -8c19 -10 37 -21 50 -39c16 -23 40 -39 54 -64c2 -4 4 -5 6 -5c3 0 6 7 9 10l100 106c10 10 21 18 32 26c2 2 4 2 7 2c4 0 8 -1 11 -3c2 -2 2 -3 2 -4c0 -4 -5 -7 -6 -11c-9 -20 -27 -36 -42 -52 c-46 -50 -94 -100 -142 -149c-15 -15 -31 -23 -48 -23c-16 0 -33 8 -48 24c-25 25 -50 49 -62 84c-2 6 -4 8 -6 8c-4 0 -7 -4 -10 -8c-18 -24 -36 -47 -54 -70c-9 -12 -20 -21 -32 -29c-12 -7 -23 -10 -34 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56D-ornamentMordent.xml b/data/Petaluma/E56D-ornamentMordent.xml
deleted file mode 100644
index da8917ba41c..00000000000
--- a/data/Petaluma/E56D-ornamentMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M356 0c-18 38 -33 75 -35 115c-1 25 -1 50 -1 75c-12 -15 -23 -31 -35 -46c-17 -23 -34 -35 -51 -35c-16 0 -32 9 -49 28c-24 27 -49 55 -66 87c-5 9 -11 14 -17 14c-5 0 -10 -4 -16 -11c-24 -26 -48 -52 -71 -78c-4 -4 -7 -8 -14 -9c-1 7 -1 13 -1 19 c0 81 52 133 109 182c7 6 14 10 22 10c9 0 17 -4 26 -11c27 -23 45 -53 69 -79c1 -2 2 -5 3 -6c17 -22 27 -33 38 -33c10 0 21 11 38 32c6 7 12 15 18 23c2 64 6 129 5 193c0 12 5 19 14 27c21 -31 23 -67 24 -101v-69c8 7 16 13 25 19c14 9 24 13 33 13c13 0 23 -9 35 -29 c20 -30 41 -58 67 -84c5 -6 10 -9 14 -9s9 4 14 10c35 38 71 75 113 106c2 1 3 3 5 5c7 6 18 10 24 6c3 -2 4 -5 4 -8c0 -5 -3 -12 -5 -16c-10 -24 -23 -47 -42 -66c-44 -40 -87 -80 -126 -125c-10 -12 -19 -17 -28 -17c-10 0 -20 7 -31 19c-24 26 -45 55 -66 84 c-7 10 -13 14 -19 14c-5 0 -10 -3 -16 -8v-145c0 -15 2 -31 2 -46c0 -8 0 -15 -2 -23c-1 -8 -2 -17 -11 -27z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56E-ornamentTremblement.xml b/data/Petaluma/E56E-ornamentTremblement.xml
deleted file mode 100644
index 08a5e3315d1..00000000000
--- a/data/Petaluma/E56E-ornamentTremblement.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c18 39 23 76 56 100c27 21 52 45 75 70c15 15 28 22 41 22c13 1 26 -7 40 -22c17 -16 33 -33 47 -51c5 -7 10 -10 14 -10c5 0 10 3 15 8l80 76c15 14 30 21 46 21c13 0 26 -4 39 -12c28 -17 53 -41 72 -68c6 -9 12 -13 18 -13c5 0 10 3 17 8c24 17 45 37 67 57 c24 23 46 35 68 35c21 0 42 -11 66 -33c18 -16 34 -34 48 -54c7 -10 13 -14 20 -14c6 0 13 4 21 9c31 21 56 50 83 75c10 9 22 14 33 18c3 1 6 2 9 2c6 0 9 -5 6 -15c-7 -28 -17 -54 -37 -74c-38 -39 -77 -77 -122 -108c-18 -12 -34 -18 -50 -18c-22 0 -41 11 -61 33 c-19 22 -41 42 -61 64c-4 5 -8 7 -11 7s-7 -2 -11 -6c-23 -21 -47 -41 -70 -62c-16 -13 -33 -23 -52 -29c-7 -2 -14 -4 -21 -4c-15 0 -28 7 -40 19c-23 23 -45 47 -68 70c-5 6 -10 9 -14 9c-5 0 -10 -3 -15 -9c-20 -22 -41 -43 -62 -64c-9 -9 -19 -17 -30 -23 c-13 -7 -23 -10 -32 -10c-13 0 -24 7 -38 24c-16 19 -35 37 -50 57c-5 6 -9 9 -13 9c-5 0 -9 -3 -14 -8c-22 -21 -44 -40 -65 -61c-11 -9 -23 -17 -44 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56F-ornamentHaydn.xml b/data/Petaluma/E56F-ornamentHaydn.xml
deleted file mode 100644
index 0b7201ec408..00000000000
--- a/data/Petaluma/E56F-ornamentHaydn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M165 -101c-9 2 -4 13 -5 19l-3 43c-2 22 7 41 20 59c11 15 21 30 31 45c-31 15 -62 29 -97 33c-5 1 -10 1 -15 1c-31 0 -48 -13 -62 -47c-3 -10 -5 -20 -17 -32c-6 30 -17 58 -17 86c0 10 1 20 5 31c17 46 46 68 93 68c9 0 19 0 29 -2c52 -7 97 -30 142 -54 c18 24 36 47 55 69c11 13 25 24 38 36c5 4 11 8 17 5c3 -2 4 -4 4 -6c0 -3 -2 -7 -3 -9c-1 -24 -11 -45 -24 -64c-12 -19 -25 -37 -37 -56c25 -10 51 -18 79 -18c42 0 56 11 65 51c3 14 9 28 14 42c3 8 9 10 14 10c8 0 9 -3 9 -7c0 -3 -1 -7 -1 -9c-5 -50 -16 -98 -41 -143 c-17 -31 -55 -50 -95 -50c-10 0 -21 1 -31 4c-26 8 -49 20 -72 34c-28 -41 -55 -82 -80 -125c-3 -6 -7 -15 -15 -14z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E583-ornamentVerticalLine.xml b/data/Petaluma/E583-ornamentVerticalLine.xml
deleted file mode 100644
index cdca1ce51d5..00000000000
--- a/data/Petaluma/E583-ornamentVerticalLine.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E583" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M32 94c-2 -1 -3 -1 -4 -1c-5 0 -8 6 -12 9c-11 8 -16 18 -16 32v261c0 4 1 9 6 11c1 1 3 1 4 1c6 0 10 -8 15 -12c8 -9 10 -20 10 -31c-1 -43 -1 -85 -1 -127h1v-135c0 -3 0 -6 -3 -8z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E587-ornamentSchleifer.xml b/data/Petaluma/E587-ornamentSchleifer.xml
deleted file mode 100644
index 96d724e9741..00000000000
--- a/data/Petaluma/E587-ornamentSchleifer.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M541 -34c-14 -11 -25 -16 -35 -16c-13 0 -24 8 -39 23c-24 24 -38 52 -55 80c-5 7 -9 15 -15 22c-15 19 -27 28 -39 28c-11 0 -25 -8 -40 -26c-21 -26 -44 -49 -69 -70c-16 -14 -32 -21 -46 -21c-19 0 -36 11 -50 35c-10 17 -23 33 -35 48c-9 12 -19 18 -29 18 c-7 0 -15 -3 -24 -9c-12 -7 -21 -17 -32 -25c-10 -8 -20 -16 -33 -19c-4 66 45 135 107 152c5 1 10 2 15 2c12 0 24 -5 33 -16c16 -17 29 -37 43 -57c13 -18 25 -27 39 -27c12 0 25 7 39 22c22 23 43 47 65 69c17 17 33 26 48 26c18 0 35 -12 51 -35c21 -30 38 -61 58 -91 c11 -16 21 -24 32 -24c9 0 19 8 30 22c59 75 118 149 172 226c61 86 121 172 190 251c33 38 71 69 114 95c5 3 9 5 13 5s7 -3 7 -12c0 -33 -8 -67 -34 -89c-79 -66 -146 -143 -204 -228c-67 -98 -138 -193 -213 -286c-20 -25 -38 -53 -64 -73z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B0-ornamentPrecompSlide.xml b/data/Petaluma/E5B0-ornamentPrecompSlide.xml
deleted file mode 100644
index 07c73b866ea..00000000000
--- a/data/Petaluma/E5B0-ornamentPrecompSlide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M542 5c-13 -11 -24 -17 -33 -17c-12 0 -22 10 -31 31c-17 40 -33 80 -49 119l-6 13c-11 22 -20 33 -30 33c-9 0 -18 -8 -31 -25c-27 -36 -55 -72 -85 -106c-16 -19 -34 -36 -58 -45c-8 -3 -14 -4 -20 -4c-12 0 -20 6 -29 22c-18 32 -31 66 -52 96c-8 12 -14 18 -21 18 c-5 0 -11 -5 -19 -16l-41 -57c-8 -10 -18 -20 -37 -25c10 34 22 64 38 91c20 34 46 63 72 92c9 10 20 15 30 15c11 0 22 -6 32 -18c9 -11 16 -22 23 -34c10 -18 19 -36 30 -54c11 -19 18 -28 27 -28c7 0 16 7 30 21c38 38 66 85 100 126c9 12 18 24 33 30c7 3 14 4 20 4 c12 0 22 -4 32 -14c21 -21 32 -48 43 -74c13 -30 26 -61 38 -91c3 -5 4 -12 10 -13h1c7 0 8 8 10 13c28 62 62 119 116 162c68 55 143 81 224 81c27 0 55 -3 84 -9c7 -2 14 -3 21 -5c20 -4 28 -7 28 -15c0 -6 -4 -14 -12 -27c-6 -10 -13 -20 -21 -29 c-11 -13 -24 -17 -42 -15c-29 3 -58 6 -86 6c-38 0 -76 -4 -113 -17c-72 -25 -131 -67 -163 -141c-15 -35 -33 -69 -63 -94z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B1-ornamentPrecompDescendingSlide.xml b/data/Petaluma/E5B1-ornamentPrecompDescendingSlide.xml
deleted file mode 100644
index 8b5fa0edb72..00000000000
--- a/data/Petaluma/E5B1-ornamentPrecompDescendingSlide.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M929 -70c-42 0 -84 6 -123 26c-65 34 -111 86 -137 154l-16 36c-19 -51 -41 -96 -73 -136c-10 -12 -21 -24 -35 -32c-10 -6 -19 -9 -27 -9c-14 0 -25 10 -33 29c-15 39 -29 78 -44 117c-8 19 -13 49 -32 52c-13 3 -21 -28 -31 -45c-21 -35 -42 -69 -72 -98 c-19 -18 -36 -27 -52 -27c-18 0 -36 11 -55 34c-28 33 -51 70 -84 99c-6 5 -10 7 -14 7c-5 0 -9 -4 -15 -10c-16 -19 -33 -36 -51 -54c-8 -9 -18 -17 -35 -20c18 48 45 86 75 121l30 35c14 15 27 23 41 23c12 0 24 -6 38 -18c27 -23 49 -52 71 -80c20 -26 34 -39 48 -39 c15 0 28 15 45 46c20 37 40 74 66 107c13 16 26 24 38 24c13 0 25 -9 36 -27c23 -40 39 -84 55 -127c5 -13 11 -25 17 -37c3 -6 5 -13 12 -14c9 0 12 8 14 14c17 39 33 78 49 116c8 19 16 37 28 53c8 12 16 18 23 18c8 0 16 -7 23 -20c16 -30 24 -64 42 -93 c53 -84 128 -129 228 -132c25 -1 49 -1 74 -1c12 0 15 -4 12 -16c-10 -37 -42 -69 -81 -73c-18 -2 -37 -3 -55 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B2-ornamentPrecompAppoggTrill.xml b/data/Petaluma/E5B2-ornamentPrecompAppoggTrill.xml
deleted file mode 100644
index f38478b871a..00000000000
--- a/data/Petaluma/E5B2-ornamentPrecompAppoggTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M130 -32c-12 -12 -25 -18 -37 -18c-15 0 -29 9 -41 25c-24 32 -28 71 -34 110c-14 90 -16 181 -18 272c-1 50 5 100 9 150c1 12 4 28 19 26c8 -1 10 -16 9 -26c-4 -43 -6 -86 -6 -129c0 -28 1 -56 2 -84c2 -63 8 -126 23 -187c2 -8 4 -16 8 -22c9 -14 17 -30 35 -30 c21 0 35 16 43 32c19 38 30 79 43 119c7 21 18 32 32 32c8 0 18 -3 28 -10c36 -25 63 -61 90 -95c9 -10 14 -16 18 -16s8 7 13 21c11 30 19 59 28 89c9 29 24 44 44 44c11 0 24 -5 39 -15c44 -30 78 -71 113 -110c14 -17 27 -34 42 -51c7 -8 12 -11 16 -11c5 0 9 5 13 16 c13 37 23 75 43 109c11 19 26 30 42 30c10 0 22 -5 33 -14c32 -24 54 -56 78 -87c12 -15 18 -22 24 -22c7 0 14 6 28 17l130 105c7 6 13 12 24 11c2 -11 3 -23 3 -34c0 -26 -6 -51 -27 -72c-48 -48 -100 -89 -155 -128c-7 -5 -14 -8 -20 -8c-9 0 -16 5 -25 15 c-26 32 -55 63 -83 94c-10 11 -18 16 -24 16c-9 0 -15 -8 -22 -24c-10 -23 -17 -48 -27 -71c-9 -24 -16 -56 -45 -60c-26 -4 -41 22 -56 41c-33 42 -70 79 -108 117c-19 19 -32 28 -42 28c-13 0 -21 -15 -29 -46s-16 -62 -34 -89c-9 -13 -16 -20 -25 -20c-8 0 -16 5 -26 15 c-30 30 -50 68 -84 94c-12 9 -18 14 -23 14s-7 -8 -13 -26c-13 -40 -24 -80 -50 -115c-6 -8 -11 -16 -18 -22z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B3-ornamentPrecompAppoggTrillSuffix.xml b/data/Petaluma/E5B3-ornamentPrecompAppoggTrillSuffix.xml
deleted file mode 100644
index ee45ce19636..00000000000
--- a/data/Petaluma/E5B3-ornamentPrecompAppoggTrillSuffix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M135 5c-15 -13 -29 -19 -42 -19c-16 0 -31 9 -45 27c-22 28 -28 62 -32 96c-10 83 -16 167 -16 250c0 22 0 43 1 65s3 43 5 65c1 10 6 18 17 21c9 -17 10 -35 9 -53c-2 -35 -3 -70 -3 -106c0 -59 3 -119 10 -179c3 -24 10 -47 29 -66c9 -9 19 -14 28 -14c11 0 21 6 31 17 c21 23 30 52 47 77c14 21 25 31 38 31c10 0 21 -5 36 -15c37 -24 71 -52 102 -83c7 -7 13 -11 17 -11c6 0 11 6 15 18l27 81c6 17 14 26 24 26c7 0 14 -4 23 -13c35 -35 75 -65 107 -103c17 -20 33 -29 53 -29c12 0 26 4 41 11c45 21 74 60 95 104c26 55 47 113 47 175 c0 41 -6 81 -21 117c-7 17 -9 35 -9 52c0 16 1 32 1 48v1c0 7 6 10 12 12h2c5 0 7 -5 10 -9c18 -28 28 -60 32 -92c4 -35 7 -70 7 -105c0 -80 -13 -158 -45 -235c-26 -62 -59 -120 -115 -162c-23 -17 -44 -25 -65 -25c-22 0 -43 9 -66 28c-36 29 -66 64 -99 97 c-5 5 -9 15 -16 11c-5 -1 -7 -11 -8 -18c-6 -24 -11 -48 -23 -70c-11 -21 -23 -31 -36 -31c-10 0 -21 6 -34 17c-26 22 -50 46 -75 69l-5 5c-16 13 -26 19 -34 19c-10 0 -18 -10 -31 -30c-15 -24 -25 -51 -46 -72z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B4-ornamentPrecompTurnTrillDAnglebert.xml b/data/Petaluma/E5B4-ornamentPrecompTurnTrillDAnglebert.xml
deleted file mode 100644
index e5839e0bfda..00000000000
--- a/data/Petaluma/E5B4-ornamentPrecompTurnTrillDAnglebert.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M996 -52c-13 -5 -22 -8 -31 -8c-14 0 -24 8 -37 27c-30 44 -57 92 -80 141c-6 13 -13 25 -24 37c-7 -18 -14 -33 -20 -50c-12 -34 -31 -65 -55 -91c-14 -15 -29 -24 -43 -24s-27 7 -41 24c-38 46 -75 92 -102 150l-29 -68c-13 -31 -32 -58 -51 -86c-6 -7 -13 -14 -20 -20 c-14 -12 -27 -18 -38 -18c-14 0 -27 9 -41 26c-28 34 -53 70 -78 106c-9 12 -13 18 -18 18c-4 0 -9 -7 -17 -22c-32 -54 -76 -87 -140 -92c-52 -4 -102 27 -119 77c-8 24 -12 47 -12 71c0 22 4 45 12 67c19 52 37 105 80 144c26 24 65 38 101 38c26 0 50 -7 66 -22 c7 -6 10 -10 10 -16c0 -3 -1 -6 -3 -10c-10 -23 -25 -43 -43 -59c-5 -4 -9 -7 -15 -7c-4 0 -10 2 -16 7c-14 12 -28 16 -44 16s-32 -5 -48 -12c-26 -11 -40 -30 -40 -58c0 -45 10 -89 46 -119c19 -16 42 -24 65 -24c33 0 64 15 85 44c13 18 25 37 37 56c10 16 23 24 36 24 c11 0 22 -5 33 -16c32 -32 53 -72 82 -105c3 -3 5 -7 8 -10c7 -6 11 -22 21 -22c17 0 21 18 25 32c15 52 33 104 60 150c10 17 21 25 34 25c11 0 22 -7 33 -22c38 -51 74 -103 111 -154c4 -6 8 -15 17 -15c10 0 9 12 12 18c16 42 33 83 57 120c13 20 26 30 40 30 c13 0 26 -8 39 -25c36 -47 61 -99 93 -148c4 -5 7 -11 10 -16c5 -10 11 -15 17 -15s12 4 19 10c30 26 53 57 80 86c62 66 125 130 190 195c43 43 87 85 134 123c32 26 70 40 106 60c4 3 9 4 13 1c5 -3 1 -7 0 -11c-9 -29 -21 -55 -45 -74c-102 -81 -198 -168 -290 -261 c-62 -63 -121 -128 -183 -190c-14 -14 -30 -26 -49 -33z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B5-ornamentPrecompSlideTrillDAnglebert.xml b/data/Petaluma/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
deleted file mode 100644
index bf305e04bbb..00000000000
--- a/data/Petaluma/E5B5-ornamentPrecompSlideTrillDAnglebert.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M389 -374c-13 -4 -25 -6 -38 -6c-26 0 -51 8 -75 15c-149 43 -237 145 -270 293c-4 18 -6 35 -6 52c0 79 45 145 124 179c21 9 42 13 64 13c31 0 62 -8 92 -19c34 -13 69 -27 101 -44c15 -8 30 -12 44 -12c19 0 38 7 56 19c38 26 77 48 111 79c7 7 15 12 24 15 c6 2 12 3 18 3c12 0 21 -5 29 -19c13 -22 21 -46 31 -70c4 -8 7 -12 11 -12s7 3 11 10c19 30 37 62 55 92c12 20 25 30 37 30c13 0 25 -10 38 -28c20 -27 32 -59 47 -89c5 -10 11 -14 17 -14c5 0 10 2 17 6c27 19 46 45 68 67c23 23 48 43 74 61c5 3 8 5 11 5 c5 0 7 -4 8 -14c0 -39 -6 -73 -36 -102c-35 -33 -67 -69 -101 -103c-10 -10 -21 -20 -34 -26c-8 -4 -14 -6 -20 -6c-10 0 -17 6 -25 19c-17 27 -26 60 -45 86c-8 11 -15 27 -32 26c-17 0 -17 -18 -24 -29c-10 -19 -18 -39 -28 -58c-4 -9 -9 -17 -15 -24 c-8 -10 -16 -22 -29 -22c-20 0 -23 18 -29 31c-6 17 -12 35 -20 51c-7 15 -16 23 -26 23c-8 0 -17 -4 -26 -13c-30 -30 -64 -55 -99 -79c-34 -23 -53 -33 -69 -33c-20 0 -36 15 -73 36c-26 15 -51 31 -80 41c-22 8 -43 13 -63 13c-28 0 -54 -9 -78 -31 c-33 -31 -50 -66 -50 -106c0 -13 2 -26 5 -39c21 -91 73 -163 155 -213c18 -11 38 -12 59 -14c31 -3 61 -11 84 -40z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B6-ornamentPrecompSlideTrillMarpurg.xml b/data/Petaluma/E5B6-ornamentPrecompSlideTrillMarpurg.xml
deleted file mode 100644
index cfc842abf45..00000000000
--- a/data/Petaluma/E5B6-ornamentPrecompSlideTrillMarpurg.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M314 -364c-85 0 -153 37 -207 108c-50 66 -86 138 -103 221c-3 15 -4 30 -4 45c0 29 6 58 18 86c44 103 117 172 234 181c6 0 12 1 17 1c61 0 111 -25 149 -73c22 -28 39 -59 61 -86c4 -5 8 -14 15 -14c12 0 5 12 7 19c8 37 11 75 33 108c13 19 28 28 42 28 c13 0 27 -8 40 -25c32 -42 67 -83 101 -125c4 -5 8 -10 13 -14c8 -7 14 -11 19 -11c6 0 11 7 15 21c8 28 17 54 33 79c17 27 35 40 56 40c15 0 31 -6 50 -19c31 -21 61 -45 93 -66c12 -8 22 -12 31 -12c13 0 23 10 31 31c4 10 5 21 5 31c0 51 -42 98 -99 99 c-41 1 -40 1 -53 39c-1 3 -1 6 -2 9c-3 16 -6 27 -6 36c0 15 7 20 29 20c8 0 18 -1 30 -2c73 -6 104 -62 124 -123c11 -34 15 -71 15 -110c1 -37 -9 -74 -28 -108c-11 -20 -24 -31 -40 -31c-9 0 -19 4 -30 11c-37 24 -71 52 -106 76c-13 9 -25 14 -35 14 c-15 0 -27 -10 -40 -30c-13 -21 -19 -45 -28 -69c-1 -3 -1 -6 -2 -9c-8 -23 -19 -35 -32 -35c-10 0 -21 6 -33 20c-38 45 -73 93 -111 137c-11 13 -20 20 -29 20c-11 0 -20 -9 -29 -26c-17 -33 -14 -70 -23 -105c-3 -12 -6 -25 -18 -28c-2 -1 -3 -1 -5 -1 c-10 0 -17 9 -23 18c-23 35 -49 67 -74 100c-34 44 -78 62 -126 62c-17 0 -36 -3 -54 -7c-108 -24 -181 -144 -181 -228c0 -72 53 -152 129 -181c47 -18 97 -23 147 -21c18 0 28 -6 33 -22c6 -19 12 -36 13 -56v-3c0 -12 -6 -16 -19 -17c-15 -2 -29 -3 -43 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B7-ornamentPrecompTurnTrillBach.xml b/data/Petaluma/E5B7-ornamentPrecompTurnTrillBach.xml
deleted file mode 100644
index ef403350cd6..00000000000
--- a/data/Petaluma/E5B7-ornamentPrecompTurnTrillBach.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1072 -169c-4 23 -10 47 -12 71c-5 60 -7 121 -11 181c-1 15 -2 29 -2 44c-13 -22 -24 -42 -36 -63c-14 -25 -33 -45 -56 -61c-9 -6 -16 -9 -23 -9c-9 0 -17 6 -26 19c-33 47 -64 96 -97 144c-3 6 -8 11 -15 19c-17 -37 -30 -74 -51 -106c-13 -20 -26 -40 -45 -56 c-12 -11 -23 -16 -33 -16c-15 0 -27 11 -39 33c-23 43 -46 86 -56 137c-12 -5 -12 -15 -15 -22c-14 -33 -29 -65 -49 -94c-5 -7 -10 -13 -15 -19c-14 -14 -23 -21 -32 -21s-17 8 -29 24c-26 35 -50 72 -76 106c-6 8 -11 12 -16 12s-9 -4 -15 -13c-26 -39 -50 -80 -89 -108 c-30 -22 -59 -33 -88 -33c-42 0 -81 24 -112 71c-24 36 -34 74 -34 111c0 71 37 138 79 183c19 20 51 29 83 29c36 0 72 -12 96 -32c7 -6 8 -9 5 -17c-9 -25 -26 -44 -45 -63c-5 -5 -9 -8 -14 -8c-4 0 -9 3 -15 8c-15 14 -42 21 -68 21c-19 0 -37 -3 -50 -11 c-8 -5 -15 -11 -15 -22c1 -55 45 -151 105 -173c12 -5 25 -7 37 -7c22 0 43 8 61 26c30 30 51 66 76 99c5 8 11 16 18 22c10 10 18 15 26 15s17 -5 26 -15c35 -36 61 -78 90 -118c2 -3 5 -6 9 -12c18 40 35 77 51 115l21 42c6 12 16 19 29 19s18 -12 21 -22 c17 -50 37 -100 63 -145c8 -14 15 -21 22 -21s13 7 20 21c17 34 30 70 45 105c8 16 16 33 25 48c7 11 16 17 24 17s17 -5 25 -14c30 -34 54 -71 78 -108c15 -21 29 -42 43 -63c4 -6 7 -8 10 -8c4 0 7 4 11 9c23 28 37 61 53 93c0 27 -1 53 -3 80c-1 18 -2 35 -2 53 c0 31 2 62 5 92c1 11 5 21 15 22h1c11 0 7 -13 11 -19c2 -4 2 -10 2 -14c-1 -21 -1 -41 -1 -61c0 -33 1 -66 2 -99c3 5 6 10 9 14c8 12 16 17 24 17c9 0 17 -5 25 -16c32 -43 54 -92 89 -134c9 -11 16 -17 22 -17s11 5 20 15c26 28 42 64 64 95c10 14 20 27 32 39 c6 6 14 11 21 8c4 -2 6 -5 6 -8c0 -5 -3 -9 -5 -13c-9 -26 -23 -49 -39 -71c-30 -42 -56 -87 -91 -125c-5 -5 -11 -10 -16 -14c-17 -13 -31 -20 -43 -20c-16 0 -30 11 -46 34c-25 32 -46 67 -69 104c1 -8 1 -16 1 -24c3 -73 10 -146 10 -218c0 -12 -1 -24 -1 -36 c0 -17 -1 -33 -16 -48z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B8-ornamentPrecompSlideTrillBach.xml b/data/Petaluma/E5B8-ornamentPrecompSlideTrillBach.xml
deleted file mode 100644
index 8957e1fdf3b..00000000000
--- a/data/Petaluma/E5B8-ornamentPrecompSlideTrillBach.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M433 -378c-7 -1 -14 -2 -21 -2c-20 0 -39 5 -58 11c-78 25 -142 78 -209 123c-12 8 -22 19 -34 26c-77 45 -111 112 -111 183c0 46 15 92 38 133c21 37 45 73 69 109c25 37 59 54 101 54c6 0 12 0 19 -1c27 -4 44 -20 61 -38c36 -39 73 -77 109 -117c5 -5 8 -7 12 -7 c3 0 7 2 11 6c25 21 41 50 60 77s33 41 48 41c14 0 28 -11 48 -34c26 -30 49 -62 74 -94c7 -9 13 -15 20 -15c5 0 11 4 19 11c12 11 24 24 35 37c0 5 -1 11 -1 16c-3 72 -11 145 -16 217c-2 31 4 62 12 92c2 9 8 15 16 15c9 0 9 -9 9 -16c5 -50 11 -101 14 -152 c2 -21 5 -42 5 -65c0 -7 0 -15 -1 -23c2 -11 3 -21 4 -32c11 14 21 29 31 44c15 22 32 33 50 33c14 0 29 -7 44 -21c35 -33 61 -75 91 -113c8 -10 13 -16 18 -16s9 4 17 14c35 40 69 81 104 122c16 19 34 38 64 40c-8 -48 -36 -84 -67 -117c-32 -34 -62 -69 -91 -105 c-14 -17 -29 -32 -47 -44c-11 -6 -19 -9 -26 -9c-11 0 -20 6 -31 20c-26 33 -47 71 -76 102c-3 2 -4 5 -7 7c-13 14 -21 21 -29 21c-9 0 -17 -8 -28 -25c-5 -7 -10 -14 -15 -20c0 -61 -5 -123 -5 -186c0 -31 -2 -62 -10 -92c-2 -10 -6 -20 -11 -29c-3 -6 -9 -14 -16 -13 c-5 1 -6 5 -6 9l1 10c1 58 0 116 6 174c1 15 2 29 2 43c0 10 -1 20 -1 30c-9 -11 -19 -23 -28 -33c-8 -9 -15 -18 -24 -24c-25 -18 -38 -28 -49 -28c-12 0 -21 13 -41 39c-25 32 -52 63 -77 96c-6 7 -10 10 -15 10s-10 -5 -15 -13c-15 -21 -29 -42 -45 -62 c-25 -32 -41 -48 -59 -48c-15 0 -32 14 -58 40c-37 37 -68 80 -109 112c-13 10 -26 15 -37 15c-17 0 -32 -10 -41 -31c-28 -66 -67 -127 -79 -199c-1 -4 -1 -7 -1 -11c0 -10 4 -19 12 -28c60 -68 133 -120 215 -161c22 -11 45 -18 69 -18c6 0 11 0 17 1c21 2 35 -6 47 -21 c13 -16 27 -30 34 -49c2 -4 2 -7 2 -10c0 -6 -3 -10 -13 -11z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B9-ornamentPrecompSlideTrillMuffat.xml b/data/Petaluma/E5B9-ornamentPrecompSlideTrillMuffat.xml
deleted file mode 100644
index 4ffa5d8cadc..00000000000
--- a/data/Petaluma/E5B9-ornamentPrecompSlideTrillMuffat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -200c-3 0 -5 1 -10 1c13 29 30 53 48 77c7 9 18 9 29 8c57 0 113 8 166 30c104 43 191 106 252 204c33 53 65 105 101 156c14 20 26 28 36 28c14 0 26 -14 36 -32c21 -37 37 -76 56 -114l8 -16c11 40 19 77 40 109c9 14 16 29 26 43c8 12 19 18 30 18 c9 0 19 -5 27 -14c9 -9 16 -21 21 -32c24 -53 55 -105 81 -157c4 -8 10 -14 17 -23c22 51 46 97 74 142c62 100 154 166 258 218c32 16 62 34 98 43c4 1 8 3 12 3c3 0 6 -1 8 -4c0 -1 1 -2 1 -3c0 -5 -3 -11 -5 -15c-18 -36 -41 -62 -79 -78c-80 -34 -152 -78 -217 -134 c-47 -40 -78 -89 -93 -149c-11 -43 -26 -85 -55 -121c-13 -15 -25 -23 -36 -23s-22 7 -33 22c-38 51 -65 109 -92 166c-5 9 -9 19 -15 35c-9 -36 -15 -66 -23 -94c-9 -32 -29 -57 -54 -78c-11 -9 -20 -14 -27 -14c-10 0 -18 10 -26 28c-23 52 -48 104 -71 156 c-4 9 -7 13 -11 13s-8 -4 -13 -12c-32 -52 -64 -105 -102 -153c-118 -149 -271 -234 -463 -234z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml b/data/Petaluma/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml
deleted file mode 100644
index dfbf4648741..00000000000
--- a/data/Petaluma/E5BA-ornamentPrecompSlideTrillSuffixMuffat.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -202c18 30 35 56 58 77c10 9 23 9 36 10c73 6 130 46 181 95c81 77 136 174 203 262c13 17 24 26 35 26s22 -8 36 -23s24 -33 34 -51c17 -30 36 -59 55 -87c2 -4 6 -9 10 -10h1c7 0 5 8 7 12c24 57 45 115 83 164c14 18 27 27 41 27c12 0 25 -8 39 -24 c43 -49 83 -100 125 -151c10 -12 18 -18 26 -18s17 6 27 18c27 32 37 70 37 109c0 11 -1 22 -2 33c-9 69 -44 119 -110 144c-7 2 -9 6 -9 10c0 3 1 5 2 8c9 20 19 39 28 58c5 11 12 15 21 15c3 0 7 0 10 -1c68 -12 120 -71 131 -147c2 -14 4 -29 4 -43 c0 -42 -11 -83 -30 -122c-27 -56 -61 -108 -112 -147c-13 -10 -28 -17 -44 -23c-6 -2 -12 -3 -17 -3c-24 0 -38 20 -52 38c-36 46 -74 92 -112 139c-19 -33 -28 -69 -39 -104c-12 -38 -34 -67 -62 -95c-11 -11 -21 -16 -30 -16c-12 0 -23 8 -35 24c-36 48 -63 102 -94 152 c-5 8 -9 12 -13 12c-5 0 -9 -4 -14 -12c-55 -80 -111 -158 -181 -225c-66 -64 -139 -113 -231 -127c-13 -2 -26 -2 -43 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BB-ornamentPrecompTrillSuffixDandrieu.xml b/data/Petaluma/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
deleted file mode 100644
index 94e9f55c772..00000000000
--- a/data/Petaluma/E5BB-ornamentPrecompTrillSuffixDandrieu.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M549 -11c-10 -6 -18 -9 -25 -9c-12 0 -20 9 -26 29c-15 49 -28 98 -42 146c-4 14 -6 30 -20 42c-25 -47 -46 -93 -76 -136c-16 -23 -31 -49 -56 -64c-10 -6 -18 -10 -25 -10c-10 0 -17 8 -24 24c-15 34 -25 70 -39 104c-13 28 -23 57 -46 79c-9 10 -15 15 -20 15 c-6 0 -10 -6 -18 -17c-33 -49 -55 -104 -91 -152c-9 -13 -23 -35 -36 -28c-4 2 -5 4 -5 8c0 8 12 21 16 30c40 78 87 151 133 226c11 18 27 27 43 27c14 0 28 -6 42 -20c30 -30 43 -69 58 -106c8 -19 15 -39 22 -58c5 -13 5 -34 19 -34c13 0 16 19 23 31c23 39 43 80 65 119 c9 16 18 31 28 45c9 13 19 19 29 19s21 -7 29 -21c25 -44 34 -95 50 -144c5 -15 9 -30 15 -45c1 -5 3 -13 10 -11c3 0 6 6 8 10c25 45 49 91 73 137c11 21 24 42 39 62c8 12 19 17 29 17c11 0 22 -5 30 -17c17 -22 23 -49 34 -73c10 -22 19 -44 30 -65c10 -19 22 -28 35 -28 c10 0 22 5 35 16c25 21 39 48 41 80c1 8 1 15 1 23c0 61 -19 115 -73 155c-24 18 -51 25 -79 25c-10 0 -20 -1 -31 -3c-4 0 -7 -1 -10 -1c-8 0 -11 2 -11 7c0 4 2 9 5 16c6 11 9 23 11 36c7 30 28 40 55 44c7 1 14 2 21 2c77 0 148 -59 169 -141c6 -23 9 -45 9 -67 c0 -65 -26 -125 -67 -182c-23 -32 -47 -63 -81 -83c-19 -10 -36 -18 -51 -18c-20 0 -38 13 -56 48s-30 73 -47 109c-2 6 -4 13 -11 13c-6 0 -7 -7 -9 -12c-30 -56 -56 -114 -95 -165c-10 -13 -22 -25 -37 -34z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BC-ornamentPrecompPortDeVoixMordent.xml b/data/Petaluma/E5BC-ornamentPrecompPortDeVoixMordent.xml
deleted file mode 100644
index dd98bd54a51..00000000000
--- a/data/Petaluma/E5BC-ornamentPrecompPortDeVoixMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M911 -290c-15 43 -20 84 -21 124c-1 45 -2 89 -2 133c-8 5 -14 15 -19 29c-20 55 -29 114 -50 170c-1 1 -1 3 -2 4c-7 13 -10 34 -27 34c-14 0 -15 -19 -21 -30c-23 -46 -45 -92 -67 -139c-9 -17 -19 -33 -33 -46c-14 -14 -28 -22 -40 -22c-16 0 -29 14 -39 40 c-15 44 -29 89 -45 133c-5 14 -4 37 -19 38c-14 2 -16 -21 -24 -34c-20 -32 -32 -69 -56 -99l-12 -18c-11 -11 -21 -17 -30 -17c-11 0 -20 9 -29 27c-16 33 -28 69 -48 100c-17 26 -37 51 -61 70c-23 18 -48 26 -74 26c-30 0 -62 -11 -88 -35c-37 -35 -55 -76 -55 -125 c0 -31 -11 -59 -22 -87c-4 -10 -11 -19 -27 -25c-2 76 18 145 41 213c16 48 42 87 81 118c35 28 71 41 106 41c43 0 86 -20 122 -63c32 -38 50 -81 70 -125c3 -5 5 -12 8 -17c4 -5 6 -15 15 -13c7 1 10 8 13 13c20 39 40 77 60 117c5 10 11 19 19 27c7 8 16 12 24 12 c10 0 20 -7 27 -19c23 -39 30 -84 47 -125c7 -17 13 -34 20 -52c3 -9 8 -19 18 -20h1c10 0 15 10 19 18c23 47 45 95 68 142c8 18 18 36 29 52c13 17 28 25 42 25c16 0 32 -10 42 -32c8 -17 14 -35 20 -53l6 139c2 36 9 71 9 107c0 10 5 16 13 18h2c9 0 7 -10 9 -15 c4 -14 5 -27 5 -41c0 -9 0 -19 -1 -28c-6 -94 -10 -187 -12 -281c4 -12 7 -25 11 -37c3 -9 6 -19 16 -20h1c10 0 11 10 15 17c25 44 46 91 71 135c10 18 22 35 35 51c12 14 25 21 37 21c15 0 29 -11 39 -31c18 -36 25 -75 36 -113c7 -25 15 -37 26 -37c9 0 19 7 33 20 c35 32 58 74 87 110c19 23 36 47 55 70c5 6 11 12 17 17c5 4 12 6 18 2c2 -1 2 -3 2 -5c0 -4 -1 -8 -2 -11c-8 -23 -21 -43 -35 -62c-47 -63 -93 -126 -143 -188c-17 -21 -38 -35 -64 -45c-8 -3 -14 -4 -20 -4c-14 0 -23 8 -31 26c-18 40 -22 83 -37 123c-2 6 -4 11 -7 16 c-4 9 -9 13 -13 13c-5 0 -9 -4 -15 -13c-28 -42 -47 -88 -71 -132c-13 -24 -26 -48 -48 -65c-5 -4 -9 -7 -14 -9c2 -65 6 -130 9 -195c1 -22 -6 -41 -20 -63z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BD-ornamentPrecompTrillWithMordent.xml b/data/Petaluma/E5BD-ornamentPrecompTrillWithMordent.xml
deleted file mode 100644
index 825fcd333a4..00000000000
--- a/data/Petaluma/E5BD-ornamentPrecompTrillWithMordent.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M591 -160c-10 31 -16 60 -17 89c-1 31 -1 63 -1 95c-8 -9 -16 -16 -27 -22c-6 -3 -11 -4 -17 -4c-8 0 -15 4 -22 14c-32 51 -59 105 -85 159c-2 5 -4 11 -8 15c-3 4 -7 8 -10 8s-6 -3 -10 -9c-20 -36 -35 -74 -51 -110c-11 -25 -24 -48 -42 -67c-10 -12 -20 -18 -28 -18 c-10 0 -19 9 -27 26c-20 43 -40 86 -61 129c-1 3 -2 5 -4 8c-11 16 -19 24 -27 24s-15 -9 -25 -26c-27 -46 -51 -93 -84 -135c-11 -14 -23 -25 -45 -31c11 32 21 61 39 86c41 56 71 117 109 174c12 18 29 28 47 28c14 0 27 -6 38 -19c25 -33 39 -71 57 -107 c8 -16 15 -33 25 -54c23 53 45 100 72 145c6 11 12 22 19 33c11 17 24 25 37 25c12 0 25 -8 35 -24c19 -30 34 -63 51 -95c14 -26 29 -52 43 -77c0 87 -2 175 -2 262c0 18 -1 37 -1 55c0 14 0 27 3 41c2 10 6 18 15 19c9 0 8 -13 9 -19c2 -7 2 -15 2 -23c0 -7 0 -15 -1 -23 c0 -17 -1 -35 -1 -52c0 -76 4 -151 6 -227c24 42 49 84 74 126c10 17 20 40 45 40c30 0 33 -27 41 -47l45 -108c3 -6 3 -17 11 -17h1c8 0 11 9 15 15l78 117c6 8 12 16 21 20c3 1 6 2 8 2c4 0 6 -3 4 -12c-6 -25 -18 -46 -31 -67c-30 -49 -63 -96 -94 -143 c-3 -4 -5 -8 -9 -12c-14 -14 -25 -22 -35 -22c-12 0 -22 11 -33 34c-18 38 -32 77 -49 116c-3 7 -4 19 -14 20c-9 0 -10 -11 -15 -18c-22 -35 -40 -72 -61 -107c1 -61 -1 -122 3 -182c1 -16 1 -32 -16 -48z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BE-ornamentPrecompCadence.xml b/data/Petaluma/E5BE-ornamentPrecompCadence.xml
deleted file mode 100644
index 06481d825af..00000000000
--- a/data/Petaluma/E5BE-ornamentPrecompCadence.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M602 5c-8 -5 -15 -8 -21 -8c-11 0 -18 8 -24 24c-14 37 -32 73 -43 111c-1 6 -4 16 -12 16h-1c-8 0 -10 -8 -13 -14c-16 -29 -31 -59 -51 -86c-5 -7 -10 -14 -16 -20c-11 -11 -20 -16 -28 -16c-9 0 -17 9 -24 27c-23 60 -37 124 -75 178c-21 30 -45 56 -80 68 c-17 6 -33 9 -49 9c-45 0 -87 -22 -118 -63c-13 -16 -22 -37 -47 -45c22 110 90 191 198 204c6 1 12 1 17 1c55 0 97 -30 131 -73c42 -53 55 -119 80 -178c3 -7 6 -14 10 -26l50 81c8 13 15 26 25 37c10 12 21 18 32 18c12 0 24 -9 33 -25c20 -35 29 -76 45 -113l9 -17 c14 8 19 21 27 33l72 116c1 2 2 4 4 6c20 29 40 44 59 44c20 0 39 -16 56 -49c23 -44 43 -89 63 -134c3 -8 6 -12 9 -12s6 3 10 10c21 33 46 62 73 91c13 14 29 24 46 34c5 3 12 5 16 1c2 -1 2 -3 2 -4c0 -4 -2 -8 -3 -11c-16 -35 -40 -64 -69 -88c-30 -24 -46 -59 -69 -88 c-11 -14 -22 -29 -39 -38c-8 -4 -14 -6 -20 -6c-11 0 -19 7 -25 20c-20 44 -42 86 -57 132c-3 9 -8 17 -13 25c-9 13 -17 20 -24 20s-14 -7 -23 -21c-34 -53 -63 -107 -103 -154c-6 -7 -13 -13 -20 -17z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BF-ornamentPrecompCadenceWithTurn.xml b/data/Petaluma/E5BF-ornamentPrecompCadenceWithTurn.xml
deleted file mode 100644
index 6a7c4a46473..00000000000
--- a/data/Petaluma/E5BF-ornamentPrecompCadenceWithTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5BF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M739 -174c-5 30 -12 56 -13 82l-3 130c-12 -17 -25 -33 -44 -44c-11 -7 -19 -10 -27 -10c-12 0 -21 8 -29 26c-18 41 -35 82 -53 123c-3 7 -5 20 -14 20s-11 -12 -15 -20c-16 -25 -30 -52 -46 -78c-6 -10 -14 -19 -22 -27c-14 -14 -23 -21 -31 -21c-9 0 -14 10 -24 34 c-24 57 -50 107 -103 145c-42 30 -85 45 -129 45c-31 0 -63 -8 -95 -22s-61 -33 -91 -57c8 78 53 116 116 145c41 19 80 27 116 27c92 0 166 -53 215 -127c18 -27 26 -59 41 -93l55 97c7 12 14 25 23 36s19 16 29 16c13 0 24 -7 33 -21c27 -42 38 -90 58 -134 c6 -13 11 -20 17 -20c4 0 9 5 16 16l3 4l-6 267v16c0 8 7 11 13 13c1 0 2 1 3 1c5 0 5 -8 7 -11c4 -9 6 -18 6 -28c1 -72 2 -144 4 -216c18 26 35 51 53 76s34 39 50 39c15 0 30 -14 45 -45c18 -38 37 -77 56 -115c7 -14 13 -22 20 -22s14 6 23 17c47 57 94 113 142 168 c7 8 15 15 24 10c4 -2 5 -5 5 -8c0 -5 -4 -11 -6 -15c-14 -32 -34 -59 -56 -86c-44 -54 -85 -110 -138 -155c-7 -6 -15 -12 -23 -17s-16 -7 -22 -7c-11 0 -20 6 -28 20c-29 44 -46 96 -73 142c-6 9 -10 14 -14 14s-9 -5 -14 -13l-41 -63c3 -71 -1 -142 4 -212 c1 -14 0 -29 -17 -42z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml b/data/Petaluma/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
deleted file mode 100644
index f6add93d24d..00000000000
--- a/data/Petaluma/E5C0-ornamentPrecompDoubleCadenceLowerPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M412 -1c-8 -6 -14 -9 -20 -9c-8 0 -13 7 -18 22l-30 100c-23 76 -108 144 -199 144c-25 0 -50 -5 -75 -16c-24 -10 -47 -20 -70 -33c7 31 16 60 33 85s47 29 73 39c30 13 60 18 87 18c78 0 142 -44 185 -100c30 -39 35 -89 50 -134c1 -2 1 -5 2 -7c2 -5 1 -14 8 -16h1 c7 0 8 8 11 13c28 46 48 95 80 138c14 19 27 29 40 29s25 -11 37 -32c24 -42 53 -80 79 -120c6 -9 10 -12 13 -12c5 0 7 8 11 16c15 41 33 80 54 117c4 7 8 14 13 20c10 11 21 17 32 17c10 0 20 -5 30 -15c33 -33 58 -72 83 -110c10 -15 21 -28 32 -43c6 -8 11 -11 17 -11 s12 4 18 13c14 21 30 42 43 64c15 23 32 46 49 67c13 16 28 25 42 25s28 -8 40 -24c21 -28 34 -61 49 -93l20 -42c13 30 25 56 37 82c8 15 17 30 26 46c3 5 8 7 13 7c11 0 14 -4 14 -8c0 -3 -1 -6 -2 -8c-23 -61 -34 -127 -77 -179c-2 -1 -3 -3 -5 -5 c-17 -21 -33 -32 -48 -32c-16 0 -31 15 -44 44c-15 33 -27 69 -49 98c-9 12 -14 18 -20 18s-11 -6 -19 -17c-22 -34 -45 -67 -67 -101c-3 -4 -6 -9 -10 -13c-25 -25 -42 -38 -60 -38c-17 0 -34 14 -54 44c-27 41 -53 82 -85 120c-5 6 -9 9 -12 9c-4 0 -7 -5 -9 -13 c-15 -39 -27 -79 -50 -113c-4 -6 -7 -11 -11 -16c-14 -20 -26 -29 -39 -29s-25 10 -39 31c-28 41 -60 80 -80 127c-3 8 -7 12 -11 12s-9 -4 -13 -12c-18 -35 -37 -69 -56 -103c-13 -23 -28 -44 -50 -61z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C1-ornamentPrecompCadenceUpperPrefix.xml b/data/Petaluma/E5C1-ornamentPrecompCadenceUpperPrefix.xml
deleted file mode 100644
index 3fe9676025e..00000000000
--- a/data/Petaluma/E5C1-ornamentPrecompCadenceUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M161 -20c-64 0 -102 33 -129 83c-15 28 -27 58 -32 89c-4 35 12 66 25 98c3 5 9 6 15 6c8 0 7 -8 8 -12c8 -31 18 -61 33 -90c29 -51 67 -76 115 -76c19 0 39 3 61 12c50 20 78 61 106 103c14 23 28 46 44 68c7 11 16 16 25 16s18 -4 27 -12c41 -37 73 -80 102 -127 c5 -8 11 -16 18 -26c22 45 42 88 63 130c4 8 9 17 14 24c9 12 20 18 31 18s21 -6 31 -18c37 -44 53 -99 81 -147c4 -7 4 -20 14 -19c9 0 11 12 14 20c22 43 47 84 82 119c7 7 7 7 22 11c0 -27 -12 -51 -25 -73c-32 -54 -64 -107 -102 -158c-2 -4 -6 -7 -9 -10 c-11 -9 -19 -14 -26 -14c-9 0 -16 7 -24 22c-22 42 -42 85 -62 127c-8 14 -15 35 -31 35c-13 0 -14 -22 -21 -35c-16 -30 -29 -61 -43 -92c-3 -5 -6 -11 -10 -16c-14 -20 -24 -30 -34 -30c-9 0 -19 10 -32 30c-27 41 -54 83 -88 120c-11 11 -16 17 -21 17 c-4 0 -9 -6 -17 -17c-24 -34 -42 -72 -70 -102c-43 -46 -93 -74 -155 -74z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml b/data/Petaluma/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml
deleted file mode 100644
index 2309f193f3c..00000000000
--- a/data/Petaluma/E5C2-ornamentPrecompCadenceUpperPrefixTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M671 -190c-11 19 -10 38 -11 56c-4 44 -6 89 -6 134v2c-5 3 -11 8 -17 16c-40 44 -80 87 -127 123c-6 5 -11 7 -15 7c-6 0 -10 -4 -16 -12c-26 -41 -55 -78 -94 -108c-33 -25 -69 -36 -106 -36c-21 0 -42 3 -63 10c-124 41 -192 130 -215 255c-1 4 -1 9 -1 13 c0 27 12 53 21 79c3 7 9 9 16 9h1c9 0 5 -9 7 -14c29 -114 92 -200 206 -241c25 -9 48 -13 69 -13c50 0 89 24 128 75c16 21 32 43 48 65c10 14 20 20 32 20c9 0 19 -4 29 -11c35 -24 64 -53 93 -83c-1 16 -2 33 -2 50c0 74 -6 149 -8 224c-1 12 3 24 4 36c1 9 7 13 14 14h2 c7 0 5 -9 7 -14c3 -12 6 -26 6 -39c3 -91 4 -182 7 -273c0 -11 0 -22 1 -32v-1c10 -11 17 -16 23 -16c7 0 13 6 20 20l53 102c11 18 21 28 32 28c10 0 20 -9 31 -27c25 -42 50 -85 75 -128c4 -7 8 -16 17 -16c11 0 12 11 15 18c23 53 51 104 86 150c9 12 20 19 30 28 c4 5 10 8 15 5c3 -2 4 -4 4 -7s-2 -7 -3 -10c-9 -28 -24 -53 -40 -78c-31 -48 -58 -99 -83 -150c-9 -18 -22 -33 -39 -45c-10 -7 -20 -11 -29 -11c-14 0 -25 8 -34 25c-19 36 -43 70 -59 107l-19 32c-12 -24 -21 -44 -31 -63c-14 -27 -31 -53 -55 -72c-2 -2 -4 -3 -5 -5 l3 -110v-53c-1 -13 -4 -25 -17 -35z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml b/data/Petaluma/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
deleted file mode 100644
index ee35c233eb4..00000000000
--- a/data/Petaluma/E5C3-ornamentPrecompDoubleCadenceUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M250 -30c-49 0 -90 24 -129 55c-58 46 -87 110 -118 174c-2 5 -3 9 -3 14c0 14 9 27 13 41c5 16 5 42 27 42c17 1 19 -23 26 -37c34 -68 76 -129 145 -169c26 -15 51 -22 75 -22c32 0 62 13 92 39c42 37 75 82 107 128c1 1 1 2 2 4c16 23 28 35 40 35c13 0 25 -12 41 -36 c24 -36 48 -73 71 -110c5 -8 9 -12 13 -12s8 4 14 10c23 29 40 62 63 90c5 6 9 13 14 19c10 11 19 17 28 17c8 0 17 -6 24 -18c24 -38 45 -77 69 -115c7 -12 8 -31 25 -31c16 0 18 19 25 30c20 34 36 70 56 104c10 17 24 26 38 26c13 0 27 -9 35 -29c16 -40 42 -75 70 -107 c7 -8 12 -12 18 -12s12 5 19 14c23 29 38 65 67 90c8 7 16 16 29 11c-2 -19 -9 -35 -19 -50c-33 -49 -62 -101 -104 -143c-14 -14 -26 -20 -37 -20c-12 0 -24 8 -39 26c-28 31 -50 65 -66 104c-2 5 -5 14 -12 14s-8 -9 -11 -14c-20 -38 -39 -78 -66 -113 c-7 -8 -14 -17 -24 -23c-9 -6 -17 -9 -24 -9c-10 0 -19 7 -27 21l-70 124c-5 9 -9 14 -13 14s-9 -4 -14 -13c-19 -31 -45 -58 -63 -90c-5 -8 -13 -14 -20 -21c-10 -9 -18 -14 -24 -14c-9 0 -16 7 -24 21l-84 134c-4 6 -6 9 -9 9s-7 -3 -11 -8c-32 -40 -58 -87 -97 -123 s-79 -71 -138 -71z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml b/data/Petaluma/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml
deleted file mode 100644
index 11e838c91de..00000000000
--- a/data/Petaluma/E5C4-ornamentPrecompDoubleCadenceUpperPrefixTurn.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M888 -237c-19 44 -33 82 -35 124c-2 51 -4 101 -5 152c-2 -1 -3 -3 -4 -4c-14 -14 -24 -21 -34 -21s-20 8 -33 25c-22 29 -45 59 -65 89c-6 9 -11 18 -21 24c-19 -28 -35 -57 -50 -87c-3 -6 -5 -13 -9 -19c-11 -19 -23 -42 -46 -41c-18 0 -22 24 -30 39 c-18 33 -34 67 -56 97c-9 11 -14 17 -19 17c-4 0 -9 -6 -17 -18c-19 -29 -36 -60 -58 -87c-38 -46 -96 -71 -157 -71c-46 0 -93 14 -132 45c-53 42 -95 90 -114 155c-2 7 -3 14 -3 21c0 29 16 56 29 82c2 4 6 7 9 7c5 0 10 -4 13 -14c30 -81 79 -145 159 -182 c26 -12 52 -17 78 -17c56 0 108 28 143 82l54 84c9 12 18 18 27 18s18 -5 28 -16c29 -31 47 -69 66 -107c5 -10 10 -21 22 -33c18 46 45 84 69 123c10 16 21 24 31 24c11 0 21 -7 32 -22c25 -35 51 -70 75 -106c4 -5 7 -9 10 -11c-1 42 -2 85 -4 127c-3 55 -5 110 -8 165v10 c0 3 0 6 1 9c1 4 6 9 10 10h2c3 0 4 -5 7 -8c13 -20 17 -43 18 -66c3 -72 7 -144 10 -217c21 27 42 53 62 79c10 13 21 20 31 20s21 -7 31 -21c28 -39 48 -83 76 -121c6 -8 10 -12 15 -12c4 0 8 4 14 11c27 34 52 69 83 98c5 4 8 8 13 11c5 4 12 6 18 3c2 -1 2 -3 2 -5 c0 -3 -2 -8 -3 -11c-7 -26 -23 -47 -39 -68c-25 -30 -53 -59 -75 -92c-6 -8 -13 -15 -20 -21c-17 -16 -29 -24 -40 -24c-12 0 -24 10 -38 32c-19 30 -38 61 -54 93c-8 16 -13 24 -20 24c-5 0 -12 -7 -22 -19c-10 -13 -20 -27 -31 -40l3 -57c3 -66 7 -133 11 -200 c1 -18 0 -38 -10 -62z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C5-ornamentPrecompMordentRelease.xml b/data/Petaluma/E5C5-ornamentPrecompMordentRelease.xml
deleted file mode 100644
index ddee489bc40..00000000000
--- a/data/Petaluma/E5C5-ornamentPrecompMordentRelease.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M566 11c-10 -4 -19 -6 -27 -6c-18 0 -32 11 -42 33c-20 44 -38 89 -57 134c-5 11 -11 22 -18 38l-32 -72c-15 -39 -36 -74 -62 -106c-5 -7 -11 -12 -17 -17c-12 -10 -22 -15 -31 -15c-13 0 -24 10 -33 29c-21 43 -41 87 -61 132c-4 9 -8 14 -13 14c-4 0 -9 -3 -15 -8 c-34 -31 -69 -61 -104 -92c-15 -12 -30 -22 -54 -29c18 40 32 76 61 102c42 37 85 73 127 110c14 13 26 19 36 19c14 0 25 -11 36 -33c17 -35 32 -70 48 -104c6 -13 11 -27 24 -39l43 98c16 36 32 72 54 104c8 12 18 18 28 18c9 0 19 -6 28 -17c32 -39 43 -88 64 -132 c8 -17 15 -34 23 -51c6 -12 14 -18 24 -18c6 0 13 2 19 7c29 20 47 47 51 84c1 12 2 24 2 36c0 49 -10 95 -31 141c-30 63 -80 90 -148 85h-4c-10 0 -14 3 -14 8c0 3 1 7 3 11c4 13 9 26 11 39c8 38 39 45 76 45c64 0 116 -37 145 -106c21 -49 30 -97 30 -143 c0 -83 -31 -161 -88 -235c-21 -29 -48 -51 -82 -64z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C6-ornamentPrecompMordentUpperPrefix.xml b/data/Petaluma/E5C6-ornamentPrecompMordentUpperPrefix.xml
deleted file mode 100644
index 7e7b2b5ec46..00000000000
--- a/data/Petaluma/E5C6-ornamentPrecompMordentUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M112 -8c-43 12 -67 41 -84 77c-22 47 -29 97 -28 144c-1 66 11 124 29 182c5 16 10 43 28 38c6 -2 8 -7 8 -14c0 -10 -4 -23 -8 -32c-12 -31 -17 -62 -17 -93s4 -61 13 -92c8 -29 19 -58 40 -81c20 -22 41 -32 66 -32c15 0 31 4 49 12c45 22 79 58 111 96l36 42 c11 12 22 18 33 18c10 0 19 -3 30 -11c40 -27 68 -66 100 -100c15 -16 22 -25 28 -25s11 10 22 30c14 28 30 55 45 81c9 16 21 24 33 24c9 0 19 -5 28 -16c33 -40 61 -84 91 -127c7 -10 11 -16 14 -16c4 0 7 6 14 17c25 40 49 79 74 118c9 13 19 20 29 20s20 -7 28 -21 c28 -49 58 -97 86 -147c5 -9 9 -13 13 -13c5 0 9 4 15 12c26 34 51 71 77 106l8 12c6 7 14 17 24 11c3 -1 4 -4 4 -7c0 -5 -4 -11 -5 -16c-12 -34 -33 -64 -52 -94c-19 -29 -41 -57 -62 -85c-1 -2 -3 -5 -5 -7c-19 -22 -34 -33 -47 -33c-14 0 -28 13 -42 38 c-23 41 -45 82 -67 123c-4 9 -8 14 -11 14c-4 0 -7 -4 -12 -13c-18 -33 -41 -64 -61 -98c-6 -10 -14 -21 -23 -29c-10 -10 -17 -14 -24 -14s-15 6 -25 19c-32 41 -55 89 -89 129c-5 6 -9 9 -12 9s-6 -4 -10 -12c-14 -27 -29 -53 -43 -79c-6 -11 -12 -21 -20 -30 c-10 -11 -18 -17 -26 -17c-10 0 -19 7 -30 20c-34 41 -66 83 -107 117c-7 5 -12 8 -18 8c-7 0 -13 -5 -20 -13c-38 -44 -70 -93 -121 -124c-26 -16 -51 -30 -81 -30c-8 0 -17 2 -26 4z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml b/data/Petaluma/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
deleted file mode 100644
index 6fba4d0842a..00000000000
--- a/data/Petaluma/E5C7-ornamentPrecompInvertedMordentUpperPrefix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M774 -146c-2 -3 -4 -4 -6 -4s-4 2 -6 6c-1 3 -2 8 -2 12c2 37 -5 74 -5 112v46c-2 -3 -3 -5 -5 -7c-17 -23 -31 -35 -44 -35s-26 11 -44 32c-33 38 -65 77 -97 117c-5 7 -9 10 -13 10c-5 0 -9 -5 -14 -14c-18 -32 -29 -67 -52 -97c-12 -14 -20 -21 -27 -21 c-8 0 -15 8 -23 24c-22 43 -43 87 -65 131c-7 14 -11 21 -15 21s-9 -7 -18 -20c-31 -44 -54 -95 -92 -134c-33 -34 -70 -52 -107 -52c-16 0 -31 3 -46 9c-47 19 -68 61 -81 106c-9 30 -12 59 -12 89c0 38 5 77 13 115c11 50 22 100 37 150c4 11 8 23 24 22c1 -6 1 -13 1 -19 c0 -27 -7 -52 -14 -77c-11 -38 -17 -76 -17 -115c0 -29 4 -58 15 -87c19 -49 47 -91 111 -91c37 0 65 21 89 51c32 41 58 85 85 130c12 20 24 31 36 31c11 0 23 -10 34 -29l61 -109c4 -8 9 -16 14 -26c21 26 29 55 44 81c15 24 30 37 46 37c14 0 28 -10 44 -28l99 -117 c6 -8 11 -12 16 -12s10 4 14 12c-3 80 -6 160 -6 240v46c0 16 2 28 21 31c7 -15 8 -30 8 -45c0 -71 2 -143 5 -214c10 25 20 49 32 73c15 27 31 41 48 41c15 0 31 -11 47 -34c30 -43 55 -88 83 -132c11 -19 20 -28 28 -28s16 10 27 30c28 51 46 106 76 156c6 11 10 31 26 24 c3 -1 4 -4 4 -8c0 -7 -4 -19 -7 -27c-29 -78 -60 -156 -104 -226c-12 -19 -27 -35 -46 -46c-6 -4 -12 -5 -18 -5c-10 0 -18 5 -26 17c-31 43 -60 88 -86 134c-10 16 -21 36 -38 37c-13 0 -15 -25 -21 -38c-7 -16 -15 -32 -22 -48l3 -130c0 -24 0 -48 -2 -71 c-1 -10 -4 -19 -10 -27z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C8-ornamentPrecompTrillLowerSuffix.xml b/data/Petaluma/E5C8-ornamentPrecompTrillLowerSuffix.xml
deleted file mode 100644
index 43affb3ce57..00000000000
--- a/data/Petaluma/E5C8-ornamentPrecompTrillLowerSuffix.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M540 -308l-23 3c-43 10 -61 25 -61 57c0 9 1 19 4 31l6 20c5 18 9 25 17 25c5 0 13 -3 24 -9c28 -15 55 -21 82 -21c37 0 75 13 112 33c56 30 74 72 74 122c0 14 -2 29 -4 44c-8 59 -27 115 -56 166c-4 7 -9 13 -14 19c-11 13 -17 19 -22 19c-6 0 -10 -7 -18 -23 c-22 -43 -45 -85 -66 -127c-12 -24 -26 -46 -49 -62c-8 -6 -15 -8 -22 -8c-9 0 -16 6 -23 20c-25 49 -45 100 -68 150c-9 20 -20 38 -35 54c-4 5 -8 8 -12 8c-3 0 -6 -3 -10 -11c-21 -42 -42 -85 -62 -128c-8 -17 -16 -35 -28 -50c-6 -9 -14 -17 -25 -17 c-15 0 -17 15 -21 25c-14 46 -29 92 -50 136c-3 4 -4 9 -7 13c-9 15 -16 22 -23 22c-8 0 -15 -7 -25 -20c-29 -38 -57 -79 -88 -115c-12 -14 -25 -25 -47 -37c11 47 12 89 49 121c40 34 69 79 98 123c13 20 29 30 44 30c16 0 31 -11 44 -32c28 -45 37 -99 58 -149 c9 0 9 8 12 13c24 50 47 99 71 148c11 23 25 34 40 34c14 0 28 -10 42 -29c39 -53 59 -116 88 -174c5 -10 7 -26 18 -27c10 0 14 15 20 24c31 51 57 105 83 158c12 25 27 37 44 37c13 0 28 -9 42 -26c61 -74 80 -163 80 -256c0 -102 -35 -193 -113 -261 c-47 -41 -99 -74 -164 -74c-5 0 -11 1 -16 1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5E5-brassMuteClosed.xml b/data/Petaluma/E5E5-brassMuteClosed.xml
deleted file mode 100644
index 1c3700121c0..00000000000
--- a/data/Petaluma/E5E5-brassMuteClosed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M141 0c-5 0 -8 8 -13 11c-9 7 -12 17 -12 29l3 72c-15 0 -29 0 -44 -1c-14 0 -28 -1 -43 -2c-11 0 -19 0 -25 12c-5 10 -7 17 -7 22c0 9 8 11 27 11h93l3 88v7c0 5 1 9 5 10c1 0 2 1 3 1c6 0 10 -7 14 -12c7 -9 11 -20 10 -33l-3 -57c32 0 64 1 96 1c20 0 24 -14 26 -28 v-3c0 -13 -8 -14 -16 -14c-37 0 -72 -1 -108 -2c0 -2 0 -4 -1 -6v-87l1 -10c0 -3 -1 -6 -5 -8c-1 -1 -2 -1 -4 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5E6-brassMuteHalfClosed.xml b/data/Petaluma/E5E6-brassMuteHalfClosed.xml
deleted file mode 100644
index d3e576bb86b..00000000000
--- a/data/Petaluma/E5E6-brassMuteHalfClosed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M185 0h-24c-92 0 -157 59 -159 143c-2 7 -2 11 0 14v1c2 38 23 68 47 95l11 10c34 29 59 46 87 46c26 0 54 -13 96 -43c39 -28 64 -68 71 -117c1 -6 1 -12 1 -18c0 -70 -62 -126 -130 -131zM150 121v-78c53 2 97 21 125 70c7 13 12 27 12 42c-1 21 -9 42 -26 59 c-15 16 -32 29 -52 37c-15 6 -32 13 -49 13c-6 0 -12 0 -18 -3l3 -4c8 -10 11 -21 10 -33l-3 -57h63h34c20 0 23 -13 25 -28c1 -1 1 -2 1 -3c0 -13 -10 -14 -19 -14c-35 0 -70 -1 -106 -1zM40 163h81c0 29 1 58 2 87v2c-37 -20 -66 -50 -83 -89zM90 51l27 -6v4 c1 24 1 47 2 71h-43c-15 0 -29 -1 -43 -2h-3c1 -32 21 -55 60 -67z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5E7-brassMuteOpen.xml b/data/Petaluma/E5E7-brassMuteOpen.xml
deleted file mode 100644
index 6977c8ceaf0..00000000000
--- a/data/Petaluma/E5E7-brassMuteOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M184 0h-24c-95 0 -159 61 -159 148c0 43 20 76 47 105c3 3 7 6 10 10c34 29 59 46 87 46c27 0 55 -13 97 -43c39 -28 64 -68 71 -117v-18c1 -70 -61 -126 -129 -131zM146 43c54 1 100 20 127 70c8 13 12 27 12 42c0 21 -9 42 -25 59c-15 16 -32 29 -52 37 c-16 6 -33 14 -50 14c-7 0 -14 -1 -21 -5c-47 -21 -82 -55 -101 -103c-5 -14 -8 -27 -8 -38c1 -32 21 -56 61 -68c18 -5 37 -8 57 -8z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E610-stringsDownBow.xml b/data/Petaluma/E610-stringsDownBow.xml
deleted file mode 100644
index 83686c6f59a..00000000000
--- a/data/Petaluma/E610-stringsDownBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M281 0c-8 1 -4 10 -5 16c-4 27 -5 54 -5 80s1 51 0 74v43l-13 5c-37 17 -76 23 -115 23c-18 0 -35 -1 -53 -3c-21 -2 -40 -8 -56 -21v-42c-1 -8 -1 -17 -1 -26c0 -16 1 -33 1 -51c0 -20 -1 -40 -5 -61c-1 -3 0 -7 -1 -10c-4 -10 -8 -25 -19 -25c-11 1 -8 17 -8 27 c-1 22 -1 45 -1 68c0 46 0 92 3 137c2 21 2 41 2 62v8c2 21 17 33 37 42c33 14 66 20 100 20c32 0 65 -5 97 -13c20 -5 43 -5 55 -27c5 -9 8 -23 8 -39l1 -1c2 -35 3 -68 3 -100c0 -46 -1 -91 -1 -140c0 -13 -3 -24 -10 -34c-3 -6 -8 -13 -14 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E611-stringsDownBowTurned.xml b/data/Petaluma/E611-stringsDownBowTurned.xml
deleted file mode 100644
index ba47f07ca3e..00000000000
--- a/data/Petaluma/E611-stringsDownBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 0c-38 0 -76 10 -115 25c-16 7 -31 20 -33 37v41s1 13 1 19v1c0 2 0 3 -1 3c0 2 1 2 1 3v6c6 53 3 107 5 160c0 13 2 26 3 38c0 9 7 14 13 15h1c3 0 5 -8 7 -13c3 -10 4 -20 4 -30c0 -11 1 -23 1 -34c0 -38 -2 -75 -4 -113l11 -3c27 -12 55 -22 84 -27 c10 -2 19 -2 29 -2c34 0 67 9 98 25c6 3 11 5 16 6c0 24 1 49 2 73c2 30 3 59 3 89c0 9 2 19 12 20c12 0 12 -12 11 -19c-1 -46 1 -92 1 -138c0 -34 -1 -69 -5 -103l-3 -8c-4 -18 -15 -32 -33 -42c-36 -20 -73 -29 -109 -29z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E612-stringsUpBow.xml b/data/Petaluma/E612-stringsUpBow.xml
deleted file mode 100644
index 359e4abb463..00000000000
--- a/data/Petaluma/E612-stringsUpBow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M105 0h-1c-15 40 -23 81 -31 121c-23 99 -44 199 -66 298c-3 16 -5 32 -7 47v2c0 12 6 14 9 14c6 0 9 -7 12 -12c15 -27 21 -70 30 -105c21 -90 42 -173 58 -265v-9c27 125 55 249 83 374c4 19 8 24 19 24c5 0 8 -5 8 -10c2 -31 -7 -64 -13 -94 c-25 -120 -51 -238 -78 -356c-3 -11 -10 -21 -23 -29z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E613-stringsUpBowTurned.xml b/data/Petaluma/E613-stringsUpBowTurned.xml
deleted file mode 100644
index 654a4152e83..00000000000
--- a/data/Petaluma/E613-stringsUpBowTurned.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M201 0c-13 54 -26 102 -38 150c-20 82 -41 165 -62 248c-5 -24 -8 -49 -13 -74c-17 -79 -33 -159 -51 -238c-5 -21 -11 -56 -34 -67c-2 6 -3 15 -3 25c0 29 8 71 15 100c25 110 48 219 72 329c1 4 4 9 4 13c1 10 6 17 15 16c1 0 3 0 4 -1c6 -1 10 -11 11 -17 c27 -110 53 -220 79 -330c7 -28 14 -56 17 -84c1 -8 1 -20 1 -28c0 -15 -1 -30 -17 -42z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E614-stringsHarmonic.xml b/data/Petaluma/E614-stringsHarmonic.xml
deleted file mode 100644
index b7ac3306da6..00000000000
--- a/data/Petaluma/E614-stringsHarmonic.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 0c-50 0 -99 53 -99 107c0 47 44 95 88 95c52 0 103 -59 103 -117c0 -48 -40 -85 -92 -85zM85 47c19 0 41 6 56 17c15 10 22 25 22 40c0 16 -8 32 -25 42c-13 7 -25 11 -37 11c-16 0 -31 -7 -46 -19c-16 -13 -28 -35 -28 -52c0 -5 1 -9 3 -13c11 -21 32 -27 55 -26z " /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E630-pluckedSnapPizzicatoBelow.xml b/data/Petaluma/E630-pluckedSnapPizzicatoBelow.xml
deleted file mode 100644
index 4a6f3e0150d..00000000000
--- a/data/Petaluma/E630-pluckedSnapPizzicatoBelow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M101 5c-14 8 -22 18 -21 34v83c-42 18 -80 63 -80 103c0 32 48 82 82 82c47 -2 85 -21 113 -61c11 -15 16 -32 16 -47c0 -37 -28 -70 -68 -81c-9 -3 -19 -4 -24 -5h-1v-16h2v-81c0 -11 -2 -16 -7 -16c-3 0 -7 2 -12 5zM80 153v56c0 5 1 9 6 10h3c5 0 10 -4 14 -7 c10 -9 16 -19 15 -33v-22c23 7 42 21 53 45c3 7 5 14 5 21c0 17 -10 31 -28 38c-10 4 -21 6 -31 6c-23 0 -44 -9 -63 -28c-12 -11 -17 -23 -17 -36c0 -8 2 -16 6 -25c8 -18 21 -23 37 -25z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E631-pluckedSnapPizzicatoAbove.xml b/data/Petaluma/E631-pluckedSnapPizzicatoAbove.xml
deleted file mode 100644
index ffb7f0f8784..00000000000
--- a/data/Petaluma/E631-pluckedSnapPizzicatoAbove.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M119 0c-57 0 -119 59 -119 115c0 40 41 90 80 98c0 28 1 57 2 85c0 4 -1 10 -1 15c0 7 2 12 10 12c15 0 26 -12 30 -27c1 -5 0 -10 0 -15v-96c20 -20 43 -36 58 -60c11 -19 22 -37 22 -58c0 -38 -34 -69 -82 -69zM93 38c16 0 30 4 44 12c18 9 27 23 27 40c0 4 -1 9 -2 13 c-7 24 -23 41 -41 55v-75c-42 12 -42 12 -42 50c0 10 0 20 1 29c-24 -17 -44 -38 -44 -71c0 -32 22 -53 57 -53z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E632-pluckedBuzzPizzicato.xml b/data/Petaluma/E632-pluckedBuzzPizzicato.xml
deleted file mode 100644
index 2655abbaba6..00000000000
--- a/data/Petaluma/E632-pluckedBuzzPizzicato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M109 0c-35 5 -75 24 -99 68c-7 12 -10 25 -10 37c0 21 10 41 29 57c20 17 43 25 66 25c27 0 54 -11 80 -33c6 -6 12 -12 20 -16c11 -6 19 -14 24 -24c24 1 47 2 71 2c20 0 20 -18 21 -32v-3c0 -12 -13 -9 -20 -9c-22 1 -43 0 -65 -1c-2 -12 -8 -23 -17 -33 c-23 -24 -51 -39 -100 -38zM96 34c28 2 53 13 74 33c-17 -1 -34 -2 -51 -4c-20 -6 -25 11 -32 25c-2 4 -3 7 -3 9c0 5 4 8 12 9c29 3 58 5 87 7l-2 3c-15 24 -39 36 -63 36c-22 0 -45 -10 -63 -30c-10 -11 -15 -24 -15 -37c0 -7 1 -15 4 -22c9 -24 29 -27 52 -29z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E633-pluckedLeftHandPizzicato.xml b/data/Petaluma/E633-pluckedLeftHandPizzicato.xml
deleted file mode 100644
index 7f278fbf1f0..00000000000
--- a/data/Petaluma/E633-pluckedLeftHandPizzicato.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E633" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 0c-13 1 -33 -1 -36 20c-2 8 -2 16 -2 24v79c-25 1 -50 1 -75 1c-15 0 -34 17 -35 31v2c0 8 5 9 11 9c35 0 69 1 99 1v90c0 4 -2 10 -2 16s3 11 11 11c15 0 33 -10 33 -31v-88c33 -2 61 -3 89 -4c24 0 27 -17 30 -33v-3c0 -6 -6 -7 -12 -7c-35 0 -70 3 -105 4v-98 c0 -4 1 -9 1 -14s-1 -10 -7 -10z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E638-pluckedDamp.xml b/data/Petaluma/E638-pluckedDamp.xml
deleted file mode 100644
index 0d1672da495..00000000000
--- a/data/Petaluma/E638-pluckedDamp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E638" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 0c-13 0 -36 0 -36 24v43c-34 14 -61 44 -73 79c-14 0 -28 1 -41 1c-21 0 -38 6 -52 21c-3 4 -8 8 -5 14s8 4 12 4h79c1 8 2 16 4 24c9 32 44 61 77 63h4v5c0 5 0 10 1 14c1 2 1 5 1 8v4c0 6 1 12 8 12c15 0 30 -10 30 -28c0 -12 -2 -25 -2 -37c27 -15 56 -26 72 -57 c4 -8 8 -15 11 -23c5 0 11 -1 16 -1c18 -1 35 -2 45 -21c3 -5 5 -9 5 -13c0 -5 -6 -8 -16 -7l-45 3c-1 -9 -4 -18 -9 -27c-18 -31 -45 -44 -79 -45v-38c0 -3 1 -8 1 -12c0 -5 -2 -10 -8 -10zM173 179v36c-5 2 -9 3 -13 3c-16 0 -21 -17 -28 -30l-3 -7c15 -1 29 -2 44 -2z M215 176l54 -3c-1 2 -1 5 -2 8c-8 23 -28 30 -49 32h-3v-37zM172 101v40l-43 3c5 -25 19 -40 43 -43zM215 137v-33c11 4 22 9 32 17c5 4 9 9 12 13z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E645-vocalSprechgesang.xml b/data/Petaluma/E645-vocalSprechgesang.xml
deleted file mode 100644
index 4f0c9ce30f1..00000000000
--- a/data/Petaluma/E645-vocalSprechgesang.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E645" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-132 0l-16 20c-6 7 -9 12 -9 19c0 5 3 12 11 19l114 108l-104 102c-8 8 -11 16 -11 24c0 9 3 17 6 26c1 5 5 6 8 6c7 -1 11 -5 15 -9c39 -40 79 -79 118 -119c40 38 80 77 120 114c4 5 9 15 16 15c3 0 6 -2 10 -6c6 -7 11 -14 11 -22c0 -6 -3 -12 -10 -19 c-39 -37 -78 -74 -117 -112c39 -39 78 -78 118 -117c5 -6 7 -11 7 -17c0 -4 -1 -8 -3 -13c-5 -10 -9 -16 -14 -16c-4 0 -9 3 -15 9c-42 41 -83 83 -124 124c-18 -18 -36 -35 -54 -52c-26 -26 -50 -54 -77 -84z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E650-keyboardPedalPed.xml b/data/Petaluma/E650-keyboardPedalPed.xml
deleted file mode 100644
index 09000408e46..00000000000
--- a/data/Petaluma/E650-keyboardPedalPed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 0c-12 0 -15 6 -15 13c0 2 0 5 1 8c4 31 9 62 13 93c7 51 11 103 16 154c7 67 7 133 7 200v7c0 10 -1 18 -12 18c-2 0 -5 0 -9 -1c-2 0 -5 4 -11 7c28 13 36 49 71 49c6 0 13 2 19 2c5 -1 11 -2 16 -8c5 -4 15 -2 23 -2c13 1 25 1 38 1c17 0 33 -1 50 -6 c53 -16 85 -53 92 -106c1 -4 1 -9 1 -13c0 -41 -26 -71 -62 -93c-44 -27 -88 -52 -140 -62c-16 -3 -11 -20 -13 -30l-24 -177c-3 -22 -39 -54 -61 -54zM119 295c40 -2 109 24 121 79c1 6 2 11 2 17c0 54 -49 108 -108 115h-6c-12 0 -16 -6 -16 -21c1 -22 2 -44 2 -67 c0 -29 -2 -59 -5 -88c0 -8 0 -16 -1 -23c0 -9 3 -12 11 -12zM680 4c-9 0 -11 8 -10 27c2 22 4 44 7 71c-36 -32 -71 -57 -111 -74c-16 -5 -29 -8 -43 -8c-34 0 -57 25 -61 70c0 6 -1 11 -1 16c0 67 35 118 91 155c30 20 62 35 97 35c10 -1 21 -2 31 -5c2 1 4 0 5 0 c9 0 10 6 12 14c7 54 15 108 23 161c1 10 -1 22 13 24c12 3 25 7 36 7c8 0 16 -2 23 -8c4 -3 5 -8 5 -13c0 -7 -2 -15 -3 -22c-7 -47 -14 -94 -19 -142c-8 -81 -20 -161 -24 -242c-2 -38 -24 -50 -51 -61c-9 -3 -15 -5 -20 -5zM273 -12c-3 -1 -7 -1 -10 -1 c-42 0 -76 44 -76 96c0 55 23 103 55 145c42 55 105 92 167 92c2 0 9 0 16 -1c19 -3 34 -12 42 -31c2 -5 3 -9 3 -14c0 -13 -7 -24 -16 -35c-33 -41 -80 -62 -129 -78c-6 -2 -12 -3 -18 -5c-33 -8 -51 -27 -51 -55c0 -10 3 -22 8 -34c12 -29 25 -44 38 -44c12 0 25 11 42 32 c7 9 15 17 20 27c14 29 40 32 67 34c1 1 2 1 3 1c6 0 9 -2 9 -6c0 -3 -1 -6 -3 -10c-38 -65 -97 -90 -167 -113zM274 167c47 9 81 31 109 63c7 9 13 20 13 33v3c0 9 -4 16 -11 22c-3 2 -5 3 -7 3c-6 -1 -11 -7 -16 -10l-19 -15c-29 -27 -53 -58 -69 -99zM574 62 c7 0 14 3 22 10c35 30 58 69 82 108c3 4 3 9 1 14c-10 28 -25 51 -56 60c-6 2 -12 4 -18 4s-12 -2 -18 -8c-32 -32 -51 -72 -55 -108c0 -32 6 -51 18 -65c8 -10 16 -15 24 -15zM890 8c-20 5 -41 8 -60 18c-9 5 -12 12 -12 19c0 5 3 11 6 16c11 15 25 29 47 29 c21 0 40 -8 58 -19c10 -5 15 -14 15 -22c0 -9 -6 -18 -16 -25c-11 -8 -23 -14 -38 -16z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E651-keyboardPedalP.xml b/data/Petaluma/E651-keyboardPedalP.xml
deleted file mode 100644
index 6fbfc9f5a6d..00000000000
--- a/data/Petaluma/E651-keyboardPedalP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 0h-4c-10 0 -12 5 -12 12c0 3 0 7 1 10c9 64 19 128 26 192c6 67 11 134 11 202c0 19 0 38 -1 57c0 13 -1 22 -17 18h-2c-5 0 -7 4 -12 8c26 13 36 48 71 48c6 0 12 2 18 2c5 0 10 -2 15 -7c3 -3 7 -3 10 -3c5 0 11 1 16 1h36c16 0 33 -1 49 -6c53 -15 85 -52 92 -105 c1 -5 1 -10 1 -14c0 -41 -26 -71 -62 -93c-43 -26 -87 -54 -138 -61c-16 -3 -12 -18 -13 -27c-9 -57 -16 -114 -23 -170c-5 -35 -28 -59 -62 -64zM119 294c41 -1 112 25 122 84c1 4 1 8 1 13c0 52 -50 108 -108 114h-6c-12 0 -16 -5 -16 -20c1 -23 2 -45 2 -67 c0 -29 -2 -59 -5 -88c0 -8 0 -16 -1 -24c0 -8 3 -11 11 -12z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E655-keyboardPedalUp.xml b/data/Petaluma/E655-keyboardPedalUp.xml
deleted file mode 100644
index dc52d20bb69..00000000000
--- a/data/Petaluma/E655-keyboardPedalUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M229 0c-5 0 -9 7 -13 9c-28 17 -38 41 -38 72c0 16 2 32 2 48c-29 -28 -60 -55 -90 -83c-4 -3 -7 -6 -11 -6c-2 0 -5 2 -7 7c-1 2 -2 3 -3 4c-18 22 -27 33 -27 43c0 11 11 20 33 40c21 18 41 37 61 55h-36c-19 0 -38 -2 -56 -4c-43 -1 -44 -1 -44 40c0 24 6 35 31 35 c38 1 76 2 114 4c-19 16 -39 32 -59 46c-29 21 -27 50 -27 79c0 9 3 13 8 13c4 0 9 -3 14 -7c36 -27 71 -56 105 -86c1 17 1 34 2 51c1 33 2 65 11 101c24 -22 37 -44 37 -72v-102c35 35 71 70 107 105c10 9 19 25 31 22c15 -4 14 -23 18 -37c2 -5 2 -11 2 -13 c0 -10 0 -17 -6 -23l-66 -67c28 1 57 3 85 5c24 2 32 -6 29 -30c-1 -9 -2 -19 -4 -28c-3 -11 -9 -17 -22 -18c-34 -1 -67 -3 -101 -5l19 -18c16 -15 32 -28 49 -39c21 -13 29 -31 26 -53v-4c0 -13 0 -29 -11 -34c-1 -1 -3 -1 -4 -1c-8 0 -16 12 -23 17 c-45 37 -87 77 -129 117c-1 -55 -1 -110 -1 -165l1 -10c0 -3 -1 -5 -4 -7c-1 -1 -2 -1 -3 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E659-keyboardPedalSost.xml b/data/Petaluma/E659-keyboardPedalSost.xml
deleted file mode 100644
index e0a7ccd42ac..00000000000
--- a/data/Petaluma/E659-keyboardPedalSost.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E659" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M157 0c-6 0 -13 0 -19 1c-54 7 -100 28 -128 78c-7 12 -10 26 -10 40c0 36 21 74 51 83c-1 -5 -1 -11 -1 -16c0 -67 54 -121 130 -126c6 0 12 -1 17 -1c39 0 54 14 54 46c0 10 -1 22 -4 35c-12 68 -56 105 -111 136c-38 22 -71 49 -85 93c-3 9 -5 18 -5 27c0 5 1 11 2 16 c12 44 36 81 71 111c12 11 28 16 43 16c9 0 19 -2 27 -5c56 -19 104 -48 135 -101c2 -5 3 -9 3 -13c0 -5 -2 -10 -7 -15c-11 -12 -21 -25 -38 -28c-7 0 -5 7 -6 11c-9 18 -20 34 -39 44c-12 7 -23 15 -33 23c-14 12 -30 20 -47 23c-9 2 -19 5 -29 5c-9 0 -17 -3 -24 -13 c-6 -9 -9 -18 -9 -27c0 -11 3 -22 8 -32c15 -30 38 -53 66 -72c16 -11 34 -21 50 -32c62 -40 89 -98 87 -171c-3 -61 -69 -136 -149 -136zM899 10c-19 0 -33 17 -36 48c-4 35 -5 71 -5 107c0 21 1 43 1 65c0 15 -2 22 -12 22c-3 0 -7 -1 -12 -2c-14 -4 -29 -6 -43 -12 c5 55 7 58 55 69c13 3 17 8 17 21v6c0 7 1 15 1 22c0 3 0 7 -1 10s-1 6 -1 9c0 19 11 32 24 44c7 6 12 16 22 11c5 -2 6 -7 6 -12c0 -29 0 -57 -1 -86v-4c0 -9 3 -13 11 -13c2 0 5 0 8 1c21 3 43 5 64 7h3c13 0 17 -7 14 -20c-7 -31 -17 -39 -50 -41c-46 -3 -51 -3 -51 -39 c0 -38 1 -74 3 -112c0 -11 2 -21 5 -31c2 -7 5 -16 13 -19c1 0 2 -1 4 -1c8 0 10 10 14 14c24 29 43 62 73 85c6 4 10 10 19 10c3 0 6 0 9 -1c-37 -53 -68 -107 -120 -144c-12 -9 -24 -14 -34 -14zM428 22c-47 -6 -98 42 -98 108c0 5 0 11 1 17c8 55 37 98 77 134 c5 4 11 7 16 10c12 5 24 7 36 7c58 0 118 -49 118 -108c0 -66 -55 -141 -118 -163c-11 -4 -21 -7 -32 -5zM654 15c-17 0 -33 2 -48 10c-12 6 -30 13 -25 28c5 18 19 33 35 44c1 1 2 1 3 1c4 0 7 -3 10 -6c19 -21 42 -25 67 -25c14 0 28 2 43 2c-9 14 -19 21 -30 28 c-33 21 -65 43 -94 69c-14 13 -21 24 -21 35c0 10 6 20 17 33c11 12 23 24 36 35c24 20 39 28 53 28c17 0 31 -11 56 -27c8 -5 12 -11 12 -17s-4 -12 -11 -18c-8 -6 -16 -12 -24 -17c-4 -2 -7 -4 -11 -4s-7 2 -11 8c-9 15 -27 18 -41 27c-3 1 -6 2 -9 2c-3 1 -6 0 -9 -3 c-3 -4 -4 -7 -4 -10c0 -4 1 -7 3 -10c10 -16 25 -27 40 -38c28 -19 57 -38 85 -58c18 -14 27 -26 27 -40c0 -12 -8 -25 -22 -39c-23 -22 -50 -36 -81 -36c-15 0 -31 -2 -46 -2zM463 67c20 0 39 8 51 22c15 17 18 39 17 61c1 5 1 10 1 15c0 25 -11 46 -34 57 c-25 12 -51 25 -80 28h-4c-8 0 -14 -1 -19 -9c-11 -20 -18 -44 -18 -69c0 -30 11 -61 36 -85c14 -13 32 -20 50 -20zM1089 12h-3c-10 0 -16 3 -16 12c0 3 0 7 2 11c1 3 1 7 1 11c0 5 0 9 1 12c4 34 9 37 43 37c17 0 23 -7 23 -19c0 -2 0 -5 -1 -8c-5 -39 -17 -56 -50 -56z " /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E65A-keyboardPedalS.xml b/data/Petaluma/E65A-keyboardPedalS.xml
deleted file mode 100644
index d8215e364d6..00000000000
--- a/data/Petaluma/E65A-keyboardPedalS.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E65A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M149 0c-57 0 -105 24 -138 77c-7 12 -11 26 -11 41c0 31 15 65 39 81c3 2 8 6 13 3c-1 -8 -2 -16 -2 -23c0 -53 37 -96 100 -114c11 -3 22 -5 33 -5c49 -3 68 9 68 46c0 8 -1 18 -3 30c-11 69 -56 109 -112 141c-38 21 -71 48 -85 93c-3 8 -5 17 -5 25c0 5 1 10 2 15 c11 45 36 83 71 113c13 11 28 15 43 15c10 0 19 -1 28 -4c54 -18 101 -47 131 -98c2 -3 3 -7 3 -11c0 -20 -22 -48 -40 -48c-7 0 -6 5 -8 9c-8 21 -22 37 -42 47c-22 12 -39 34 -64 41c-13 4 -26 9 -38 9c-9 0 -19 -3 -27 -11c-6 -6 -9 -15 -9 -27c0 -13 4 -29 12 -43 c15 -27 38 -47 63 -64c22 -15 45 -28 66 -44c43 -33 70 -90 70 -142c0 -15 -2 -30 -7 -44c-20 -55 -57 -96 -117 -105c-12 -2 -23 -3 -34 -3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E880-tuplet0.xml b/data/Petaluma/E880-tuplet0.xml
deleted file mode 100644
index e8271f87a65..00000000000
--- a/data/Petaluma/E880-tuplet0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 3c-13 0 -26 3 -38 8c-14 6 -28 10 -41 17c-47 25 -68 72 -73 134c0 8 -1 16 -1 29c0 91 30 174 82 240c12 15 27 21 42 21c13 0 26 -4 39 -11c67 -36 100 -108 107 -198c1 -13 2 -26 2 -38c0 -54 -13 -102 -37 -148c-19 -37 -50 -54 -82 -54zM124 67c5 0 11 4 19 11 c48 42 57 110 63 178c0 35 -6 69 -14 101c-4 15 -10 22 -17 22c-4 0 -10 -4 -15 -11c-23 -35 -44 -73 -54 -118c-6 -26 -10 -53 -10 -80c0 -26 4 -51 11 -77c5 -18 10 -26 17 -26z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E881-tuplet1.xml b/data/Petaluma/E881-tuplet1.xml
deleted file mode 100644
index 4ff4effd11f..00000000000
--- a/data/Petaluma/E881-tuplet1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E881" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -40c-1 8 -1 15 -1 23c0 20 1 41 5 61c3 17 15 20 29 22c47 5 48 5 56 49c13 74 37 145 53 218c1 3 2 6 2 10c0 2 -1 5 -3 8c-16 -12 -31 -25 -47 -37c-10 -8 -23 -16 -35 -16c-4 0 -7 0 -11 2c-5 2 -7 7 -7 12c0 8 4 18 2 25c-1 3 -1 7 -1 10c0 14 6 28 6 43v1 c0 9 9 13 15 14c35 3 54 29 79 47c14 11 26 23 40 34c7 5 12 8 16 8c7 0 10 -6 11 -19c2 -31 -2 -63 -9 -93c-14 -59 -32 -118 -45 -177c-9 -40 -14 -80 -21 -120c-1 -2 -1 -4 -1 -5c0 -7 4 -9 11 -9c11 0 24 1 35 1c19 0 26 -5 26 -20c0 -2 -1 -6 -1 -9 c-3 -14 -5 -28 -9 -42c-6 -22 -19 -34 -45 -35c-49 0 -99 -4 -150 -6z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E882-tuplet2.xml b/data/Petaluma/E882-tuplet2.xml
deleted file mode 100644
index 2958619fa36..00000000000
--- a/data/Petaluma/E882-tuplet2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E882" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M348 -20c-6 0 -11 8 -16 12c-34 30 -69 61 -114 71c-14 4 -28 6 -42 6c-25 0 -51 -7 -72 -27c-13 -12 -28 -22 -41 -33c-4 -4 -8 -6 -11 -6c-5 0 -8 4 -10 11c-7 20 -20 38 -27 58c-2 7 -4 13 -4 19c0 11 6 20 17 29c47 33 92 68 138 102c35 26 70 54 95 90 c6 8 9 14 9 19c0 7 -7 12 -21 17c-12 4 -24 6 -36 6c-57 0 -109 -44 -116 -104c0 -6 -2 -11 -9 -20c-16 38 -35 71 -35 110c0 13 3 25 11 36c22 34 49 62 88 78c17 7 34 10 49 10c54 0 94 -40 112 -108c5 -19 7 -38 7 -56c0 -51 -20 -96 -62 -135c-4 -3 -9 -6 -10 -13 c23 -15 45 -31 68 -48c34 -25 41 -61 45 -99v-6c0 -7 -2 -15 -8 -18c-2 -1 -3 -1 -5 -1z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E883-tuplet3.xml b/data/Petaluma/E883-tuplet3.xml
deleted file mode 100644
index e48dfb0e5be..00000000000
--- a/data/Petaluma/E883-tuplet3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M171 -20c-32 0 -65 14 -94 33c-5 3 -9 8 -14 12c-36 28 -53 58 -53 94c0 15 3 31 9 49c3 8 6 12 10 12s8 -3 14 -8c40 -38 81 -76 140 -84c45 -6 88 37 102 69c6 14 -10 37 -30 48c-10 5 -20 7 -31 7c-12 0 -24 -3 -36 -8c-18 -8 -35 -19 -51 -30c-6 -4 -13 -11 -19 -6 c-3 2 -4 6 -4 9c0 4 1 8 2 12c0 61 33 106 70 149l18 25c-37 2 -73 4 -107 4c-14 0 -27 0 -40 -1h-5c-9 0 -13 2 -13 8c0 3 1 7 3 13c6 19 10 39 17 59c6 14 14 20 29 20c73 0 146 3 220 3c14 0 20 -4 18 -19c-3 -31 -13 -59 -33 -82c-13 -15 -27 -30 -42 -47 c17 -5 34 -4 48 -13c21 -13 34 -31 36 -56c1 -8 1 -16 1 -24c0 -81 -33 -150 -87 -211c-23 -26 -51 -37 -78 -37z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E884-tuplet4.xml b/data/Petaluma/E884-tuplet4.xml
deleted file mode 100644
index bbb531d7645..00000000000
--- a/data/Petaluma/E884-tuplet4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E884" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M188 -50c-12 35 -25 69 -25 104c0 11 1 22 4 34c2 10 4 17 4 22c0 11 -8 12 -29 14c-11 1 -22 1 -32 1c-18 0 -36 -1 -53 -7c-5 -1 -9 -2 -12 -2c-9 0 -14 5 -20 18c-10 21 -15 40 -15 59c0 29 13 55 38 83c56 62 102 133 140 208c5 10 11 24 22 22c9 -2 8 -17 10 -27 c3 -11 4 -22 4 -33c0 -19 -4 -37 -14 -55c-26 -47 -43 -99 -76 -143c-3 -4 -4 -7 -4 -9c0 -4 4 -6 11 -5c1 0 2 0 2 -1c9 -1 17 -1 23 -1c22 0 24 7 34 38l23 71c2 6 7 12 13 12c4 -1 8 -8 9 -13c6 -19 11 -37 11 -56c0 -12 -2 -23 -7 -35c-3 -6 -4 -12 -4 -17 c0 -10 7 -17 25 -18c16 -2 32 -7 48 -13c11 -5 17 -11 19 -22c2 -10 2 -20 2 -31c0 -10 0 -20 -2 -31c-2 -14 -10 -21 -25 -21c-26 0 -50 9 -75 14c-4 1 -7 2 -9 2c-6 0 -9 -4 -10 -15c-3 -37 -9 -74 -13 -111c-2 -13 -5 -25 -17 -36z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E885-tuplet5.xml b/data/Petaluma/E885-tuplet5.xml
deleted file mode 100644
index 99c45178f7f..00000000000
--- a/data/Petaluma/E885-tuplet5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E885" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M133 -10c-37 0 -74 12 -99 37c-13 13 -21 29 -22 47c-1 16 -2 32 -2 48c0 11 0 21 1 31c0 11 5 17 17 23c7 -41 34 -63 73 -71c14 -3 28 -5 42 -5c29 0 57 8 83 26c19 13 28 21 28 31c0 8 -7 18 -21 33c-26 27 -61 43 -93 43c-15 0 -30 -3 -43 -10 c-11 -6 -20 -14 -29 -21c-6 -4 -12 -12 -19 -8c-6 4 -5 12 -6 20c-1 7 -1 15 -1 22c0 56 25 106 41 159c15 51 42 76 97 74c32 -1 65 6 97 10c25 3 49 6 65 28c3 4 9 6 13 6c8 -2 6 -9 5 -14c-2 -62 -23 -113 -90 -124c-44 -7 -88 -12 -132 -20c-11 -2 -24 -1 -25 -21 c18 5 34 9 51 9c8 0 15 -1 23 -3c71 -18 113 -69 113 -140c0 -9 0 -19 -2 -29c-6 -46 -16 -92 -46 -129c-27 -34 -73 -52 -119 -52z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E886-tuplet6.xml b/data/Petaluma/E886-tuplet6.xml
deleted file mode 100644
index b200c5e9fdd..00000000000
--- a/data/Petaluma/E886-tuplet6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M145 -10c-33 0 -67 17 -91 49c-30 40 -38 86 -42 135c-1 14 -2 29 -2 43c0 70 17 135 62 193c44 56 98 94 171 94c32 0 48 -9 48 -28c0 -6 -2 -14 -5 -23c-2 -8 -5 -15 -7 -23c-6 -25 -16 -32 -41 -30c-66 5 -138 -37 -173 -109c25 18 44 37 71 42c5 1 10 1 16 1 c39 0 81 -26 99 -69c13 -32 20 -64 20 -96c0 -46 -15 -90 -42 -132c-21 -32 -52 -47 -84 -47zM160 98c11 0 22 2 33 7c20 9 36 30 36 47c0 27 -41 67 -80 73c-16 4 -36 -8 -54 -22c-19 -15 -28 -25 -28 -36s8 -22 24 -38c20 -20 45 -31 69 -31z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E887-tuplet7.xml b/data/Petaluma/E887-tuplet7.xml
deleted file mode 100644
index 17a609c889d..00000000000
--- a/data/Petaluma/E887-tuplet7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M21 -24c-10 0 -8 12 -9 21c-1 14 -2 27 -2 41c0 23 3 46 10 68c9 27 27 47 42 69c48 70 102 136 158 201c1 1 1 3 2 8c-35 -4 -70 -7 -104 -7c-14 0 -28 1 -42 2c-46 5 -59 6 -59 30c0 9 2 23 5 41c5 29 9 39 27 39h4c5 0 12 -1 21 -3c24 -4 49 -6 73 -6 c42 0 83 5 125 10c8 1 14 1 20 1c20 0 28 -6 28 -23c0 -7 -2 -17 -4 -29c-11 -64 -53 -110 -91 -158c-60 -76 -121 -152 -171 -236c-10 -17 -11 -35 -18 -52c-4 -6 -7 -17 -15 -17z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E888-tuplet8.xml b/data/Petaluma/E888-tuplet8.xml
deleted file mode 100644
index 0608d2b1558..00000000000
--- a/data/Petaluma/E888-tuplet8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M129 -40c-34 0 -67 12 -87 33c-24 23 -22 59 -29 90c-2 9 -3 19 -3 28c0 49 23 89 57 126c12 13 19 25 19 39c0 7 -2 15 -5 24c-12 31 -19 64 -19 97c0 13 1 25 3 38c8 51 47 95 98 107c7 1 14 3 20 5c13 5 23 7 33 7c21 0 34 -12 47 -39c11 -23 16 -48 14 -73 c2 -66 -20 -121 -66 -167c-5 -5 -8 -9 -8 -14c0 -4 2 -8 6 -13c29 -40 42 -82 42 -125c0 -35 -8 -71 -25 -106c-19 -40 -58 -57 -97 -57zM143 323c3 0 7 2 11 6c22 22 46 41 66 65c8 10 16 20 19 33c-2 13 -10 22 -22 19c-13 -4 -25 -2 -37 -4c-20 -2 -39 -9 -55 -21 c-18 -14 -26 -22 -26 -33c0 -8 6 -18 16 -33c6 -8 13 -16 18 -25c4 -5 7 -7 10 -7zM118 65h8c31 0 58 14 80 40c5 6 7 11 7 16c0 4 -2 9 -6 13l-57 65c-3 3 -6 5 -8 5c-4 0 -8 -3 -11 -7c-16 -18 -33 -35 -48 -54c-13 -16 -35 -36 -28 -52c10 -20 39 -25 63 -26z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E889-tuplet9.xml b/data/Petaluma/E889-tuplet9.xml
deleted file mode 100644
index ae22879c335..00000000000
--- a/data/Petaluma/E889-tuplet9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M190 0c-2 31 -10 59 -10 88c0 11 2 23 5 35c17 61 30 124 45 185c1 4 2 8 2 10c0 6 -3 7 -10 7c-12 0 -22 -1 -33 -1c-55 0 -105 15 -145 59c-3 4 -7 8 -10 13c-12 24 -24 67 -24 111c0 35 8 70 28 97c27 34 86 60 139 60c12 0 23 -1 34 -4c48 -11 87 -60 96 -117 c3 -19 5 -37 5 -56c0 -53 -12 -104 -28 -155c-28 -97 -49 -195 -69 -294c-3 -13 -9 -25 -25 -38zM217 433c13 0 26 1 40 2c2 0 4 1 6 3c6 7 10 21 10 35c0 10 -2 20 -6 26c-22 37 -60 52 -99 52c-37 0 -75 -13 -99 -33c-11 -9 -16 -15 -16 -22s7 -13 20 -23 c43 -33 92 -40 144 -40z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E88A-tupletColon.xml b/data/Petaluma/E88A-tupletColon.xml
deleted file mode 100644
index 2409d784f92..00000000000
--- a/data/Petaluma/E88A-tupletColon.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E88A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M103 245c-6 0 -10 8 -11 12c-12 36 -35 69 -35 108c0 21 20 16 28 26c1 2 3 3 4 3c5 0 11 -7 15 -11c29 -23 24 -58 31 -87c0 -21 -10 -35 -24 -47c-3 -3 -6 -4 -8 -4zM63 80c-8 0 -14 8 -16 15c-9 31 -28 57 -36 89c-1 4 -1 7 -1 10c0 19 16 24 27 33c3 2 6 3 9 3 c8 0 12 -9 18 -14c29 -22 23 -58 33 -85c-2 -20 -9 -36 -24 -47c-4 -3 -7 -4 -10 -4z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E938-mensuralNoteheadSemibrevisBlack.xml b/data/Petaluma/E938-mensuralNoteheadSemibrevisBlack.xml
deleted file mode 100644
index cf07560106d..00000000000
--- a/data/Petaluma/E938-mensuralNoteheadSemibrevisBlack.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E938" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E939-mensuralNoteheadSemibrevisVoid.xml b/data/Petaluma/E939-mensuralNoteheadSemibrevisVoid.xml
deleted file mode 100644
index b45f0675fd2..00000000000
--- a/data/Petaluma/E939-mensuralNoteheadSemibrevisVoid.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E939" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E93C-mensuralNoteheadMinimaWhite.xml b/data/Petaluma/E93C-mensuralNoteheadMinimaWhite.xml
deleted file mode 100644
index ac943dc3621..00000000000
--- a/data/Petaluma/E93C-mensuralNoteheadMinimaWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M255 -249c-8 0 -16 2 -19 4c-4 5 -9 11 -14 16c-10 6 -20 13 -29 21c-7 6 -10 13 -10 19c-52 54 -104 110 -154 168c-6 7 -31 35 -29 44c0 7 3 12 8 17c61 59 122 119 183 179c7 7 13 9 22 7c0 8 3 13 9 19c3 3 5 4 7 4c6 0 10 -8 14 -12c67 -66 134 -132 200 -200 c7 -7 41 -54 41 -64v-6c0 -5 -4 -8 -8 -12l-206 -200c-3 -3 -9 -4 -15 -4zM208 -156l183 175c-36 35 -72 71 -108 105c-7 6 -12 12 -18 19c-56 -55 -112 -110 -167 -165l-3 -3c38 -44 76 -87 113 -131z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E93D-mensuralNoteheadSemiminimaWhite.xml b/data/Petaluma/E93D-mensuralNoteheadSemiminimaWhite.xml
deleted file mode 100644
index 9bbc8dab90d..00000000000
--- a/data/Petaluma/E93D-mensuralNoteheadSemiminimaWhite.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E93E-mensuralCombStemUp.xml b/data/Petaluma/E93E-mensuralCombStemUp.xml
deleted file mode 100644
index b3f2e5f6aa8..00000000000
--- a/data/Petaluma/E93E-mensuralCombStemUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E93F-mensuralCombStemDown.xml b/data/Petaluma/E93F-mensuralCombStemDown.xml
deleted file mode 100644
index 7f158813bca..00000000000
--- a/data/Petaluma/E93F-mensuralCombStemDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E93F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E949-mensuralCombStemUpFlagSemiminima.xml b/data/Petaluma/E949-mensuralCombStemUpFlagSemiminima.xml
deleted file mode 100644
index efb43cf565e..00000000000
--- a/data/Petaluma/E949-mensuralCombStemUpFlagSemiminima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E949" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E94A-mensuralCombStemDownFlagSemiminima.xml b/data/Petaluma/E94A-mensuralCombStemDownFlagSemiminima.xml
deleted file mode 100644
index ed7b25dd8c4..00000000000
--- a/data/Petaluma/E94A-mensuralCombStemDownFlagSemiminima.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E94A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E94B-mensuralCombStemUpFlagFusa.xml b/data/Petaluma/E94B-mensuralCombStemUpFlagFusa.xml
deleted file mode 100644
index b18018df0cd..00000000000
--- a/data/Petaluma/E94B-mensuralCombStemUpFlagFusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E94B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E94C-mensuralCombStemDownFlagFusa.xml b/data/Petaluma/E94C-mensuralCombStemDownFlagFusa.xml
deleted file mode 100644
index 6a1ddaaa664..00000000000
--- a/data/Petaluma/E94C-mensuralCombStemDownFlagFusa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="E94C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAA4-wiggleTrill.xml b/data/Petaluma/EAA4-wiggleTrill.xml
deleted file mode 100644
index 641b12e58c2..00000000000
--- a/data/Petaluma/EAA4-wiggleTrill.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M229 110c39 0 86 25 111 51c39 39 36 85 0 61c-22 -16 -22 -19 -45 -36c-24 -18 -45 -10 -64 11l-56 55c-24 29 -58 41 -84 30c-36 -15 -63 -36 -91 -60c-20 -16 -69 -46 -53 -69c9 -12 32 -10 53 8c40 34 85 60 136 9l23 -24c19 -20 40 -38 70 -36z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAA9-wiggleArpeggiatoUp.xml b/data/Petaluma/EAA9-wiggleArpeggiatoUp.xml
deleted file mode 100644
index 1a7353aa075..00000000000
--- a/data/Petaluma/EAA9-wiggleArpeggiatoUp.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 3c-29 9 -27 8 -55 22c-14 7 -50 24 -65 35c-22 16 -22 26 -22 46c0 11 8 29 22 20c24 -15 38 -32 54 -49c4 -4 8 -6 11 -6c4 0 8 2 12 7c20 20 28 47 40 71c9 18 19 27 36 27c3 0 6 0 10 -1c35 -5 61 -25 96 -49c28 -19 41 -45 41 -61c0 -10 -5 -17 -14 -17 c-7 0 -16 4 -27 12c-14 10 -22 18 -32 26c-4 3 -8 5 -10 5c-4 0 -5 -4 -8 -10c-11 -22 -21 -44 -38 -63c-11 -12 -22 -18 -35 -18c-5 0 -11 1 -16 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAAA-wiggleArpeggiatoDown.xml b/data/Petaluma/EAAA-wiggleArpeggiatoDown.xml
deleted file mode 100644
index 81f41a743d3..00000000000
--- a/data/Petaluma/EAAA-wiggleArpeggiatoDown.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 3c-5 -2 -11 -3 -16 -3c-13 0 -24 6 -35 18c-17 19 -27 41 -38 63c-3 6 -4 10 -8 10c-2 0 -6 -2 -10 -5c-10 -8 -18 -16 -32 -26c-11 -8 -21 -12 -27 -12c-9 0 -14 7 -14 17c0 16 13 42 41 61c35 24 61 44 96 49c4 1 7 1 10 1c17 0 27 -9 36 -27 c12 -24 20 -51 40 -71c5 -5 8 -7 12 -7s7 2 11 6c16 17 30 34 54 49c3 2 5 2 7 2c10 0 15 -13 15 -22c0 -20 0 -30 -22 -46c-15 -11 -51 -28 -65 -35c-28 -14 -26 -13 -55 -22z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAAD-wiggleArpeggiatoUpArrow.xml b/data/Petaluma/EAAD-wiggleArpeggiatoUpArrow.xml
deleted file mode 100644
index be06ab229b7..00000000000
--- a/data/Petaluma/EAAD-wiggleArpeggiatoUpArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M282 -13c-4 3 -4 7 -4 12c0 31 13 64 6 63c-17 -2 -27 8 -50 19c-8 3 -13 6 -17 6s-6 -2 -8 -6c-11 -22 -21 -44 -38 -63c-11 -12 -22 -18 -35 -18c-5 0 -11 1 -16 3c-29 9 -27 8 -55 22c-14 7 -50 24 -65 35c-22 16 -22 26 -22 46c0 11 8 29 22 20c24 -15 38 -32 54 -49 c4 -4 8 -6 11 -6c4 0 8 2 12 7c20 20 28 47 40 71c9 18 19 27 36 27c3 0 6 0 10 -1c32 -5 82 -65 123 -72c2 11 -7 16 -14 31c-5 12 -16 23 -23 34c-2 4 -3 7 -3 10c0 4 1 7 5 11s8 6 12 6c3 0 6 -1 10 -3c68 -40 141 -65 219 -76c9 -1 12 -3 12 -7c0 -2 -2 -6 -6 -10 c-6 -7 -14 -10 -22 -13c-63 -24 -121 -56 -177 -94c-5 -3 -9 -11 -17 -5z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAAE-wiggleArpeggiatoDownArrow.xml b/data/Petaluma/EAAE-wiggleArpeggiatoDownArrow.xml
deleted file mode 100644
index 10006b42d52..00000000000
--- a/data/Petaluma/EAAE-wiggleArpeggiatoDownArrow.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 201c4 0 8 -2 12 -6s5 -7 5 -11c0 -3 -1 -6 -3 -10c-7 -11 -18 -22 -23 -34c-7 -15 -16 -20 -14 -31c41 7 91 67 123 72c4 1 7 1 10 1c17 0 27 -9 36 -27c12 -24 20 -51 40 -71c4 -5 8 -7 12 -7c3 0 7 2 11 6c16 17 30 34 54 49c3 2 5 2 7 2c10 0 15 -13 15 -22 c0 -20 0 -30 -22 -46c-15 -11 -51 -28 -65 -35c-28 -14 -26 -13 -55 -22c-5 -2 -11 -3 -16 -3c-13 0 -24 6 -35 18c-17 19 -27 41 -38 63c-2 4 -4 6 -8 6s-9 -3 -17 -6c-23 -11 -33 -21 -50 -19c-7 1 5 -28 6 -57v-6c0 -5 0 -9 -4 -12c-2 -2 -4 -2 -6 -2c-4 0 -7 5 -11 7 c-56 38 -114 70 -177 94c-8 3 -16 6 -22 13c-4 4 -6 8 -6 10c0 4 3 6 12 7c78 11 151 36 219 76c4 2 7 3 10 3z" /></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAAF-wiggleGlissando.xml b/data/Petaluma/EAAF-wiggleGlissando.xml
deleted file mode 100644
index fd2a327bec0..00000000000
--- a/data/Petaluma/EAAF-wiggleGlissando.xml
+++ /dev/null
@@ -1 +0,0 @@
-<symbol id="EAAF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 0c-6 0 -13 1 -19 3c-35 9 -33 8 -67 22c-16 7 -60 24 -78 35c-27 16 -27 26 -27 46c0 11 10 29 27 20c29 -15 46 -32 65 -49c5 -4 10 -6 13 -6c5 0 10 2 15 7c24 20 34 47 48 71c11 18 23 27 44 27c4 0 7 0 12 -1c42 -5 74 -25 116 -49c34 -19 50 -45 50 -61 c0 -10 -6 -17 -17 -17c-9 0 -19 4 -33 12c-17 10 -26 18 -39 26c-4 3 -9 5 -12 5c-4 0 -6 -4 -9 -10c-14 -22 -26 -44 -46 -63c-14 -12 -27 -18 -43 -18z" /></symbol>
\ No newline at end of file

From 8d23093476959d7fba622ebf4dae901488d36e37 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Wed, 26 Jan 2022 09:57:00 +0100
Subject: [PATCH 143/403] regenerate SMuFL glyphs

---
 data/Bravura.xml        | 696 ++++++++++++++++++++++++++++++++++++++++
 data/Bravura/E000.xml   |   1 +
 data/Bravura/E003.xml   |   1 +
 data/Bravura/E004.xml   |   1 +
 data/Bravura/E043.xml   |   1 +
 data/Bravura/E044.xml   |   1 +
 data/Bravura/E045.xml   |   1 +
 data/Bravura/E046.xml   |   1 +
 data/Bravura/E047.xml   |   1 +
 data/Bravura/E048.xml   |   1 +
 data/Bravura/E049.xml   |   1 +
 data/Bravura/E04B.xml   |   1 +
 data/Bravura/E050.xml   |   1 +
 data/Bravura/E051.xml   |   1 +
 data/Bravura/E052.xml   |   1 +
 data/Bravura/E053.xml   |   1 +
 data/Bravura/E054.xml   |   1 +
 data/Bravura/E055.xml   |   1 +
 data/Bravura/E056.xml   |   1 +
 data/Bravura/E05C.xml   |   1 +
 data/Bravura/E05D.xml   |   1 +
 data/Bravura/E062.xml   |   1 +
 data/Bravura/E063.xml   |   1 +
 data/Bravura/E064.xml   |   1 +
 data/Bravura/E065.xml   |   1 +
 data/Bravura/E066.xml   |   1 +
 data/Bravura/E069.xml   |   1 +
 data/Bravura/E06A.xml   |   1 +
 data/Bravura/E073.xml   |   1 +
 data/Bravura/E074.xml   |   1 +
 data/Bravura/E075.xml   |   1 +
 data/Bravura/E076.xml   |   1 +
 data/Bravura/E077.xml   |   1 +
 data/Bravura/E080.xml   |   1 +
 data/Bravura/E081.xml   |   1 +
 data/Bravura/E082.xml   |   1 +
 data/Bravura/E083.xml   |   1 +
 data/Bravura/E084.xml   |   1 +
 data/Bravura/E085.xml   |   1 +
 data/Bravura/E086.xml   |   1 +
 data/Bravura/E087.xml   |   1 +
 data/Bravura/E088.xml   |   1 +
 data/Bravura/E089.xml   |   1 +
 data/Bravura/E08A.xml   |   1 +
 data/Bravura/E08B.xml   |   1 +
 data/Bravura/E08C.xml   |   1 +
 data/Bravura/E08D.xml   |   1 +
 data/Bravura/E08E.xml   |   1 +
 data/Bravura/E08F.xml   |   1 +
 data/Bravura/E090.xml   |   1 +
 data/Bravura/E091.xml   |   1 +
 data/Bravura/E092.xml   |   1 +
 data/Bravura/E093.xml   |   1 +
 data/Bravura/E094.xml   |   1 +
 data/Bravura/E095.xml   |   1 +
 data/Bravura/E0A0.xml   |   1 +
 data/Bravura/E0A1.xml   |   1 +
 data/Bravura/E0A2.xml   |   1 +
 data/Bravura/E0A3.xml   |   1 +
 data/Bravura/E0A4.xml   |   1 +
 data/Bravura/E0A5.xml   |   1 +
 data/Bravura/E0A9.xml   |   1 +
 data/Bravura/E0AF.xml   |   1 +
 data/Bravura/E0B5.xml   |   1 +
 data/Bravura/E0B6.xml   |   1 +
 data/Bravura/E0B7.xml   |   1 +
 data/Bravura/E0D9.xml   |   1 +
 data/Bravura/E0DA.xml   |   1 +
 data/Bravura/E0DB.xml   |   1 +
 data/Bravura/E0DC.xml   |   1 +
 data/Bravura/E0DD.xml   |   1 +
 data/Bravura/E0DE.xml   |   1 +
 data/Bravura/E0F5.xml   |   1 +
 data/Bravura/E0F6.xml   |   1 +
 data/Bravura/E0FA.xml   |   1 +
 data/Bravura/E101.xml   |   1 +
 data/Bravura/E102.xml   |   1 +
 data/Bravura/E103.xml   |   1 +
 data/Bravura/E220.xml   |   1 +
 data/Bravura/E221.xml   |   1 +
 data/Bravura/E222.xml   |   1 +
 data/Bravura/E223.xml   |   1 +
 data/Bravura/E224.xml   |   1 +
 data/Bravura/E22A.xml   |   1 +
 data/Bravura/E240.xml   |   1 +
 data/Bravura/E241.xml   |   1 +
 data/Bravura/E242.xml   |   1 +
 data/Bravura/E243.xml   |   1 +
 data/Bravura/E244.xml   |   1 +
 data/Bravura/E245.xml   |   1 +
 data/Bravura/E246.xml   |   1 +
 data/Bravura/E247.xml   |   1 +
 data/Bravura/E248.xml   |   1 +
 data/Bravura/E249.xml   |   1 +
 data/Bravura/E24A.xml   |   1 +
 data/Bravura/E24B.xml   |   1 +
 data/Bravura/E24C.xml   |   1 +
 data/Bravura/E24D.xml   |   1 +
 data/Bravura/E24E.xml   |   1 +
 data/Bravura/E24F.xml   |   1 +
 data/Bravura/E260.xml   |   1 +
 data/Bravura/E261.xml   |   1 +
 data/Bravura/E262.xml   |   1 +
 data/Bravura/E263.xml   |   1 +
 data/Bravura/E264.xml   |   1 +
 data/Bravura/E265.xml   |   1 +
 data/Bravura/E266.xml   |   1 +
 data/Bravura/E267.xml   |   1 +
 data/Bravura/E268.xml   |   1 +
 data/Bravura/E269.xml   |   1 +
 data/Bravura/E26A.xml   |   1 +
 data/Bravura/E26B.xml   |   1 +
 data/Bravura/E26C.xml   |   1 +
 data/Bravura/E26D.xml   |   1 +
 data/Bravura/E270.xml   |   1 +
 data/Bravura/E271.xml   |   1 +
 data/Bravura/E272.xml   |   1 +
 data/Bravura/E273.xml   |   1 +
 data/Bravura/E274.xml   |   1 +
 data/Bravura/E275.xml   |   1 +
 data/Bravura/E280.xml   |   1 +
 data/Bravura/E281.xml   |   1 +
 data/Bravura/E282.xml   |   1 +
 data/Bravura/E283.xml   |   1 +
 data/Bravura/E440.xml   |   1 +
 data/Bravura/E441.xml   |   1 +
 data/Bravura/E442.xml   |   1 +
 data/Bravura/E443.xml   |   1 +
 data/Bravura/E444.xml   |   1 +
 data/Bravura/E445.xml   |   1 +
 data/Bravura/E446.xml   |   1 +
 data/Bravura/E447.xml   |   1 +
 data/Bravura/E4A0.xml   |   1 +
 data/Bravura/E4A1.xml   |   1 +
 data/Bravura/E4A2.xml   |   1 +
 data/Bravura/E4A3.xml   |   1 +
 data/Bravura/E4A4.xml   |   1 +
 data/Bravura/E4A5.xml   |   1 +
 data/Bravura/E4A6.xml   |   1 +
 data/Bravura/E4A7.xml   |   1 +
 data/Bravura/E4A8.xml   |   1 +
 data/Bravura/E4A9.xml   |   1 +
 data/Bravura/E4AA.xml   |   1 +
 data/Bravura/E4AB.xml   |   1 +
 data/Bravura/E4AC.xml   |   1 +
 data/Bravura/E4AD.xml   |   1 +
 data/Bravura/E4AE.xml   |   1 +
 data/Bravura/E4AF.xml   |   1 +
 data/Bravura/E4B0.xml   |   1 +
 data/Bravura/E4B1.xml   |   1 +
 data/Bravura/E4B2.xml   |   1 +
 data/Bravura/E4B3.xml   |   1 +
 data/Bravura/E4B4.xml   |   1 +
 data/Bravura/E4B5.xml   |   1 +
 data/Bravura/E4B6.xml   |   1 +
 data/Bravura/E4B7.xml   |   1 +
 data/Bravura/E4B8.xml   |   1 +
 data/Bravura/E4B9.xml   |   1 +
 data/Bravura/E4BA.xml   |   1 +
 data/Bravura/E4BB.xml   |   1 +
 data/Bravura/E4BC.xml   |   1 +
 data/Bravura/E4BD.xml   |   1 +
 data/Bravura/E4C0.xml   |   1 +
 data/Bravura/E4C1.xml   |   1 +
 data/Bravura/E4C2.xml   |   1 +
 data/Bravura/E4C3.xml   |   1 +
 data/Bravura/E4C4.xml   |   1 +
 data/Bravura/E4C5.xml   |   1 +
 data/Bravura/E4C6.xml   |   1 +
 data/Bravura/E4C7.xml   |   1 +
 data/Bravura/E4C8.xml   |   1 +
 data/Bravura/E4C9.xml   |   1 +
 data/Bravura/E4CE.xml   |   1 +
 data/Bravura/E4E0.xml   |   1 +
 data/Bravura/E4E1.xml   |   1 +
 data/Bravura/E4E2.xml   |   1 +
 data/Bravura/E4E3.xml   |   1 +
 data/Bravura/E4E4.xml   |   1 +
 data/Bravura/E4E5.xml   |   1 +
 data/Bravura/E4E6.xml   |   1 +
 data/Bravura/E4E7.xml   |   1 +
 data/Bravura/E4E8.xml   |   1 +
 data/Bravura/E4E9.xml   |   1 +
 data/Bravura/E4EA.xml   |   1 +
 data/Bravura/E4EB.xml   |   1 +
 data/Bravura/E4EC.xml   |   1 +
 data/Bravura/E4ED.xml   |   1 +
 data/Bravura/E4F2.xml   |   1 +
 data/Bravura/E4F6.xml   |   1 +
 data/Bravura/E500.xml   |   1 +
 data/Bravura/E501.xml   |   1 +
 data/Bravura/E502.xml   |   1 +
 data/Bravura/E503.xml   |   1 +
 data/Bravura/E504.xml   |   1 +
 data/Bravura/E505.xml   |   1 +
 data/Bravura/E510.xml   |   1 +
 data/Bravura/E511.xml   |   1 +
 data/Bravura/E512.xml   |   1 +
 data/Bravura/E513.xml   |   1 +
 data/Bravura/E514.xml   |   1 +
 data/Bravura/E515.xml   |   1 +
 data/Bravura/E516.xml   |   1 +
 data/Bravura/E517.xml   |   1 +
 data/Bravura/E518.xml   |   1 +
 data/Bravura/E519.xml   |   1 +
 data/Bravura/E51A.xml   |   1 +
 data/Bravura/E51B.xml   |   1 +
 data/Bravura/E51C.xml   |   1 +
 data/Bravura/E51D.xml   |   1 +
 data/Bravura/E51E.xml   |   1 +
 data/Bravura/E520.xml   |   1 +
 data/Bravura/E521.xml   |   1 +
 data/Bravura/E522.xml   |   1 +
 data/Bravura/E523.xml   |   1 +
 data/Bravura/E524.xml   |   1 +
 data/Bravura/E525.xml   |   1 +
 data/Bravura/E526.xml   |   1 +
 data/Bravura/E527.xml   |   1 +
 data/Bravura/E528.xml   |   1 +
 data/Bravura/E529.xml   |   1 +
 data/Bravura/E52A.xml   |   1 +
 data/Bravura/E52B.xml   |   1 +
 data/Bravura/E52C.xml   |   1 +
 data/Bravura/E52D.xml   |   1 +
 data/Bravura/E52E.xml   |   1 +
 data/Bravura/E52F.xml   |   1 +
 data/Bravura/E530.xml   |   1 +
 data/Bravura/E531.xml   |   1 +
 data/Bravura/E532.xml   |   1 +
 data/Bravura/E533.xml   |   1 +
 data/Bravura/E534.xml   |   1 +
 data/Bravura/E535.xml   |   1 +
 data/Bravura/E536.xml   |   1 +
 data/Bravura/E537.xml   |   1 +
 data/Bravura/E538.xml   |   1 +
 data/Bravura/E539.xml   |   1 +
 data/Bravura/E53A.xml   |   1 +
 data/Bravura/E53B.xml   |   1 +
 data/Bravura/E53C.xml   |   1 +
 data/Bravura/E53D.xml   |   1 +
 data/Bravura/E566.xml   |   1 +
 data/Bravura/E567.xml   |   1 +
 data/Bravura/E568.xml   |   1 +
 data/Bravura/E569.xml   |   1 +
 data/Bravura/E56A.xml   |   1 +
 data/Bravura/E56B.xml   |   1 +
 data/Bravura/E56C.xml   |   1 +
 data/Bravura/E56D.xml   |   1 +
 data/Bravura/E56E.xml   |   1 +
 data/Bravura/E56F.xml   |   1 +
 data/Bravura/E583.xml   |   1 +
 data/Bravura/E587.xml   |   1 +
 data/Bravura/E59D.xml   |   1 +
 data/Bravura/E59E.xml   |   1 +
 data/Bravura/E5B0.xml   |   1 +
 data/Bravura/E5B1.xml   |   1 +
 data/Bravura/E5B2.xml   |   1 +
 data/Bravura/E5B3.xml   |   1 +
 data/Bravura/E5B4.xml   |   1 +
 data/Bravura/E5B5.xml   |   1 +
 data/Bravura/E5B6.xml   |   1 +
 data/Bravura/E5B7.xml   |   1 +
 data/Bravura/E5B8.xml   |   1 +
 data/Bravura/E5B9.xml   |   1 +
 data/Bravura/E5BA.xml   |   1 +
 data/Bravura/E5BB.xml   |   1 +
 data/Bravura/E5BC.xml   |   1 +
 data/Bravura/E5BD.xml   |   1 +
 data/Bravura/E5BE.xml   |   1 +
 data/Bravura/E5BF.xml   |   1 +
 data/Bravura/E5C0.xml   |   1 +
 data/Bravura/E5C1.xml   |   1 +
 data/Bravura/E5C2.xml   |   1 +
 data/Bravura/E5C3.xml   |   1 +
 data/Bravura/E5C4.xml   |   1 +
 data/Bravura/E5C5.xml   |   1 +
 data/Bravura/E5C6.xml   |   1 +
 data/Bravura/E5C7.xml   |   1 +
 data/Bravura/E5C8.xml   |   1 +
 data/Bravura/E5E5.xml   |   1 +
 data/Bravura/E5E6.xml   |   1 +
 data/Bravura/E5E7.xml   |   1 +
 data/Bravura/E610.xml   |   1 +
 data/Bravura/E611.xml   |   1 +
 data/Bravura/E612.xml   |   1 +
 data/Bravura/E613.xml   |   1 +
 data/Bravura/E614.xml   |   1 +
 data/Bravura/E630.xml   |   1 +
 data/Bravura/E631.xml   |   1 +
 data/Bravura/E632.xml   |   1 +
 data/Bravura/E633.xml   |   1 +
 data/Bravura/E638.xml   |   1 +
 data/Bravura/E645.xml   |   1 +
 data/Bravura/E650.xml   |   1 +
 data/Bravura/E651.xml   |   1 +
 data/Bravura/E655.xml   |   1 +
 data/Bravura/E659.xml   |   1 +
 data/Bravura/E65A.xml   |   1 +
 data/Bravura/E880.xml   |   1 +
 data/Bravura/E881.xml   |   1 +
 data/Bravura/E882.xml   |   1 +
 data/Bravura/E883.xml   |   1 +
 data/Bravura/E884.xml   |   1 +
 data/Bravura/E885.xml   |   1 +
 data/Bravura/E886.xml   |   1 +
 data/Bravura/E887.xml   |   1 +
 data/Bravura/E888.xml   |   1 +
 data/Bravura/E889.xml   |   1 +
 data/Bravura/E88A.xml   |   1 +
 data/Bravura/E901.xml   |   1 +
 data/Bravura/E902.xml   |   1 +
 data/Bravura/E904.xml   |   1 +
 data/Bravura/E906.xml   |   1 +
 data/Bravura/E907.xml   |   1 +
 data/Bravura/E908.xml   |   1 +
 data/Bravura/E909.xml   |   1 +
 data/Bravura/E90A.xml   |   1 +
 data/Bravura/E90B.xml   |   1 +
 data/Bravura/E910.xml   |   1 +
 data/Bravura/E911.xml   |   1 +
 data/Bravura/E912.xml   |   1 +
 data/Bravura/E913.xml   |   1 +
 data/Bravura/E914.xml   |   1 +
 data/Bravura/E915.xml   |   1 +
 data/Bravura/E916.xml   |   1 +
 data/Bravura/E917.xml   |   1 +
 data/Bravura/E918.xml   |   1 +
 data/Bravura/E919.xml   |   1 +
 data/Bravura/E91A.xml   |   1 +
 data/Bravura/E91B.xml   |   1 +
 data/Bravura/E91C.xml   |   1 +
 data/Bravura/E91D.xml   |   1 +
 data/Bravura/E91E.xml   |   1 +
 data/Bravura/E91F.xml   |   1 +
 data/Bravura/E920.xml   |   1 +
 data/Bravura/E921.xml   |   1 +
 data/Bravura/E922.xml   |   1 +
 data/Bravura/E923.xml   |   1 +
 data/Bravura/E924.xml   |   1 +
 data/Bravura/E925.xml   |   1 +
 data/Bravura/E938.xml   |   1 +
 data/Bravura/E939.xml   |   1 +
 data/Bravura/E93C.xml   |   1 +
 data/Bravura/E93D.xml   |   1 +
 data/Bravura/E93E.xml   |   1 +
 data/Bravura/E93F.xml   |   1 +
 data/Bravura/E949.xml   |   1 +
 data/Bravura/E94A.xml   |   1 +
 data/Bravura/E94B.xml   |   1 +
 data/Bravura/E94C.xml   |   1 +
 data/Bravura/E990.xml   |   1 +
 data/Bravura/E991.xml   |   1 +
 data/Bravura/E996.xml   |   1 +
 data/Bravura/E99B.xml   |   1 +
 data/Bravura/E99E.xml   |   1 +
 data/Bravura/E99F.xml   |   1 +
 data/Bravura/E9B4.xml   |   1 +
 data/Bravura/E9B5.xml   |   1 +
 data/Bravura/E9B6.xml   |   1 +
 data/Bravura/E9B7.xml   |   1 +
 data/Bravura/E9B9.xml   |   1 +
 data/Bravura/E9BA.xml   |   1 +
 data/Bravura/E9BB.xml   |   1 +
 data/Bravura/E9BC.xml   |   1 +
 data/Bravura/E9E0.xml   |   1 +
 data/Bravura/E9E1.xml   |   1 +
 data/Bravura/E9E2.xml   |   1 +
 data/Bravura/E9E3.xml   |   1 +
 data/Bravura/E9F0.xml   |   1 +
 data/Bravura/E9F1.xml   |   1 +
 data/Bravura/E9F2.xml   |   1 +
 data/Bravura/E9F3.xml   |   1 +
 data/Bravura/E9F4.xml   |   1 +
 data/Bravura/E9F5.xml   |   1 +
 data/Bravura/E9F6.xml   |   1 +
 data/Bravura/E9F7.xml   |   1 +
 data/Bravura/E9F8.xml   |   1 +
 data/Bravura/EA02.xml   |   1 +
 data/Bravura/EA06.xml   |   1 +
 data/Bravura/EAA4.xml   |   1 +
 data/Bravura/EAA9.xml   |   1 +
 data/Bravura/EAAA.xml   |   1 +
 data/Bravura/EAAD.xml   |   1 +
 data/Bravura/EAAE.xml   |   1 +
 data/Bravura/EAAF.xml   |   1 +
 data/Bravura/EBA7.xml   |   1 +
 data/Bravura/EBA8.xml   |   1 +
 data/Bravura/EBA9.xml   |   1 +
 data/Bravura/EBAA.xml   |   1 +
 data/Bravura/EBAB.xml   |   1 +
 data/Bravura/EBAC.xml   |   1 +
 data/Bravura/EBC0.xml   |   1 +
 data/Bravura/EBC1.xml   |   1 +
 data/Bravura/EBC2.xml   |   1 +
 data/Bravura/EBC3.xml   |   1 +
 data/Bravura/EBC4.xml   |   1 +
 data/Bravura/EBC5.xml   |   1 +
 data/Bravura/EBC6.xml   |   1 +
 data/Bravura/EBC7.xml   |   1 +
 data/Bravura/EBC8.xml   |   1 +
 data/Bravura/EBC9.xml   |   1 +
 data/Bravura/EBCA.xml   |   1 +
 data/Bravura/EBCB.xml   |   1 +
 data/Bravura/EBCC.xml   |   1 +
 data/Bravura/EBE0.xml   |   1 +
 data/Bravura/EBE1.xml   |   1 +
 data/Bravura/EBE2.xml   |   1 +
 data/Bravura/EBE3.xml   |   1 +
 data/Bravura/EBE4.xml   |   1 +
 data/Bravura/EBE5.xml   |   1 +
 data/Bravura/EBE6.xml   |   1 +
 data/Bravura/EBE7.xml   |   1 +
 data/Bravura/EBE8.xml   |   1 +
 data/Bravura/EBE9.xml   |   1 +
 data/Bravura/ED40.xml   |   1 +
 data/Bravura/ED41.xml   |   1 +
 data/Gootville.xml      | 416 ++++++++++++++++++++++++
 data/Gootville/E003.xml |   1 +
 data/Gootville/E004.xml |   1 +
 data/Gootville/E043.xml |   1 +
 data/Gootville/E044.xml |   1 +
 data/Gootville/E047.xml |   1 +
 data/Gootville/E048.xml |   1 +
 data/Gootville/E049.xml |   1 +
 data/Gootville/E050.xml |   1 +
 data/Gootville/E051.xml |   1 +
 data/Gootville/E052.xml |   1 +
 data/Gootville/E053.xml |   1 +
 data/Gootville/E054.xml |   1 +
 data/Gootville/E05C.xml |   1 +
 data/Gootville/E05D.xml |   1 +
 data/Gootville/E062.xml |   1 +
 data/Gootville/E063.xml |   1 +
 data/Gootville/E064.xml |   1 +
 data/Gootville/E065.xml |   1 +
 data/Gootville/E066.xml |   1 +
 data/Gootville/E069.xml |   1 +
 data/Gootville/E06A.xml |   1 +
 data/Gootville/E080.xml |   1 +
 data/Gootville/E081.xml |   1 +
 data/Gootville/E082.xml |   1 +
 data/Gootville/E083.xml |   1 +
 data/Gootville/E084.xml |   1 +
 data/Gootville/E085.xml |   1 +
 data/Gootville/E086.xml |   1 +
 data/Gootville/E087.xml |   1 +
 data/Gootville/E088.xml |   1 +
 data/Gootville/E089.xml |   1 +
 data/Gootville/E08A.xml |   1 +
 data/Gootville/E08B.xml |   1 +
 data/Gootville/E092.xml |   1 +
 data/Gootville/E093.xml |   1 +
 data/Gootville/E094.xml |   1 +
 data/Gootville/E095.xml |   1 +
 data/Gootville/E0A0.xml |   1 +
 data/Gootville/E0A1.xml |   1 +
 data/Gootville/E0A2.xml |   1 +
 data/Gootville/E0A3.xml |   1 +
 data/Gootville/E0A4.xml |   1 +
 data/Gootville/E0A9.xml |   1 +
 data/Gootville/E0D9.xml |   1 +
 data/Gootville/E0DA.xml |   1 +
 data/Gootville/E0DB.xml |   1 +
 data/Gootville/E0DC.xml |   1 +
 data/Gootville/E0DD.xml |   1 +
 data/Gootville/E0DE.xml |   1 +
 data/Gootville/E0F5.xml |   1 +
 data/Gootville/E0F6.xml |   1 +
 data/Gootville/E101.xml |   1 +
 data/Gootville/E102.xml |   1 +
 data/Gootville/E103.xml |   1 +
 data/Gootville/E240.xml |   1 +
 data/Gootville/E241.xml |   1 +
 data/Gootville/E242.xml |   1 +
 data/Gootville/E243.xml |   1 +
 data/Gootville/E244.xml |   1 +
 data/Gootville/E245.xml |   1 +
 data/Gootville/E246.xml |   1 +
 data/Gootville/E247.xml |   1 +
 data/Gootville/E248.xml |   1 +
 data/Gootville/E249.xml |   1 +
 data/Gootville/E260.xml |   1 +
 data/Gootville/E261.xml |   1 +
 data/Gootville/E262.xml |   1 +
 data/Gootville/E263.xml |   1 +
 data/Gootville/E264.xml |   1 +
 data/Gootville/E26A.xml |   1 +
 data/Gootville/E26B.xml |   1 +
 data/Gootville/E270.xml |   1 +
 data/Gootville/E271.xml |   1 +
 data/Gootville/E272.xml |   1 +
 data/Gootville/E273.xml |   1 +
 data/Gootville/E274.xml |   1 +
 data/Gootville/E275.xml |   1 +
 data/Gootville/E280.xml |   1 +
 data/Gootville/E281.xml |   1 +
 data/Gootville/E282.xml |   1 +
 data/Gootville/E283.xml |   1 +
 data/Gootville/E440.xml |   1 +
 data/Gootville/E441.xml |   1 +
 data/Gootville/E442.xml |   1 +
 data/Gootville/E443.xml |   1 +
 data/Gootville/E444.xml |   1 +
 data/Gootville/E445.xml |   1 +
 data/Gootville/E446.xml |   1 +
 data/Gootville/E447.xml |   1 +
 data/Gootville/E4A0.xml |   1 +
 data/Gootville/E4A1.xml |   1 +
 data/Gootville/E4A2.xml |   1 +
 data/Gootville/E4A3.xml |   1 +
 data/Gootville/E4A4.xml |   1 +
 data/Gootville/E4A5.xml |   1 +
 data/Gootville/E4A6.xml |   1 +
 data/Gootville/E4A7.xml |   1 +
 data/Gootville/E4A8.xml |   1 +
 data/Gootville/E4A9.xml |   1 +
 data/Gootville/E4AC.xml |   1 +
 data/Gootville/E4AD.xml |   1 +
 data/Gootville/E4B2.xml |   1 +
 data/Gootville/E4B3.xml |   1 +
 data/Gootville/E4B6.xml |   1 +
 data/Gootville/E4B7.xml |   1 +
 data/Gootville/E4C0.xml |   1 +
 data/Gootville/E4C1.xml |   1 +
 data/Gootville/E4C4.xml |   1 +
 data/Gootville/E4C5.xml |   1 +
 data/Gootville/E4C6.xml |   1 +
 data/Gootville/E4C7.xml |   1 +
 data/Gootville/E4C8.xml |   1 +
 data/Gootville/E4C9.xml |   1 +
 data/Gootville/E4CE.xml |   1 +
 data/Gootville/E4E1.xml |   1 +
 data/Gootville/E4E2.xml |   1 +
 data/Gootville/E4E3.xml |   1 +
 data/Gootville/E4E4.xml |   1 +
 data/Gootville/E4E5.xml |   1 +
 data/Gootville/E4E6.xml |   1 +
 data/Gootville/E4E7.xml |   1 +
 data/Gootville/E4E8.xml |   1 +
 data/Gootville/E4E9.xml |   1 +
 data/Gootville/E4EA.xml |   1 +
 data/Gootville/E4F2.xml |   1 +
 data/Gootville/E510.xml |   1 +
 data/Gootville/E514.xml |   1 +
 data/Gootville/E517.xml |   1 +
 data/Gootville/E51A.xml |   1 +
 data/Gootville/E51B.xml |   1 +
 data/Gootville/E520.xml |   1 +
 data/Gootville/E521.xml |   1 +
 data/Gootville/E522.xml |   1 +
 data/Gootville/E523.xml |   1 +
 data/Gootville/E524.xml |   1 +
 data/Gootville/E525.xml |   1 +
 data/Gootville/E526.xml |   1 +
 data/Gootville/E527.xml |   1 +
 data/Gootville/E528.xml |   1 +
 data/Gootville/E529.xml |   1 +
 data/Gootville/E52A.xml |   1 +
 data/Gootville/E52B.xml |   1 +
 data/Gootville/E52C.xml |   1 +
 data/Gootville/E52D.xml |   1 +
 data/Gootville/E52E.xml |   1 +
 data/Gootville/E52F.xml |   1 +
 data/Gootville/E530.xml |   1 +
 data/Gootville/E531.xml |   1 +
 data/Gootville/E532.xml |   1 +
 data/Gootville/E533.xml |   1 +
 data/Gootville/E534.xml |   1 +
 data/Gootville/E535.xml |   1 +
 data/Gootville/E536.xml |   1 +
 data/Gootville/E537.xml |   1 +
 data/Gootville/E538.xml |   1 +
 data/Gootville/E539.xml |   1 +
 data/Gootville/E53A.xml |   1 +
 data/Gootville/E53B.xml |   1 +
 data/Gootville/E53C.xml |   1 +
 data/Gootville/E53D.xml |   1 +
 data/Gootville/E566.xml |   1 +
 data/Gootville/E567.xml |   1 +
 data/Gootville/E568.xml |   1 +
 data/Gootville/E569.xml |   1 +
 data/Gootville/E56C.xml |   1 +
 data/Gootville/E56D.xml |   1 +
 data/Gootville/E56E.xml |   1 +
 data/Gootville/E59D.xml |   1 +
 data/Gootville/E59E.xml |   1 +
 data/Gootville/E5B0.xml |   1 +
 data/Gootville/E5E5.xml |   1 +
 data/Gootville/E5E7.xml |   1 +
 data/Gootville/E610.xml |   1 +
 data/Gootville/E611.xml |   1 +
 data/Gootville/E612.xml |   1 +
 data/Gootville/E613.xml |   1 +
 data/Gootville/E630.xml |   1 +
 data/Gootville/E631.xml |   1 +
 data/Gootville/E650.xml |   1 +
 data/Gootville/E651.xml |   1 +
 data/Gootville/E655.xml |   1 +
 data/Gootville/EAA4.xml |   1 +
 data/Gootville/EAA9.xml |   1 +
 data/Gootville/EAAA.xml |   1 +
 data/Gootville/EAAD.xml |   1 +
 data/Gootville/EAAE.xml |   1 +
 data/Gootville/EAAF.xml |   1 +
 data/Leipzig.xml        | 520 ++++++++++++++++++++++++++++++
 data/Leipzig/E000.xml   |   1 +
 data/Leipzig/E003.xml   |   1 +
 data/Leipzig/E004.xml   |   1 +
 data/Leipzig/E043.xml   |   1 +
 data/Leipzig/E044.xml   |   1 +
 data/Leipzig/E045.xml   |   1 +
 data/Leipzig/E046.xml   |   1 +
 data/Leipzig/E047.xml   |   1 +
 data/Leipzig/E048.xml   |   1 +
 data/Leipzig/E049.xml   |   1 +
 data/Leipzig/E04B.xml   |   1 +
 data/Leipzig/E050.xml   |   1 +
 data/Leipzig/E051.xml   |   1 +
 data/Leipzig/E052.xml   |   1 +
 data/Leipzig/E053.xml   |   1 +
 data/Leipzig/E054.xml   |   1 +
 data/Leipzig/E055.xml   |   1 +
 data/Leipzig/E056.xml   |   1 +
 data/Leipzig/E05C.xml   |   1 +
 data/Leipzig/E05D.xml   |   1 +
 data/Leipzig/E062.xml   |   1 +
 data/Leipzig/E063.xml   |   1 +
 data/Leipzig/E064.xml   |   1 +
 data/Leipzig/E065.xml   |   1 +
 data/Leipzig/E066.xml   |   1 +
 data/Leipzig/E069.xml   |   1 +
 data/Leipzig/E06A.xml   |   1 +
 data/Leipzig/E073.xml   |   1 +
 data/Leipzig/E074.xml   |   1 +
 data/Leipzig/E075.xml   |   1 +
 data/Leipzig/E076.xml   |   1 +
 data/Leipzig/E077.xml   |   1 +
 data/Leipzig/E080.xml   |   1 +
 data/Leipzig/E081.xml   |   1 +
 data/Leipzig/E082.xml   |   1 +
 data/Leipzig/E083.xml   |   1 +
 data/Leipzig/E084.xml   |   1 +
 data/Leipzig/E085.xml   |   1 +
 data/Leipzig/E086.xml   |   1 +
 data/Leipzig/E087.xml   |   1 +
 data/Leipzig/E088.xml   |   1 +
 data/Leipzig/E089.xml   |   1 +
 data/Leipzig/E08A.xml   |   1 +
 data/Leipzig/E08B.xml   |   1 +
 data/Leipzig/E08C.xml   |   1 +
 data/Leipzig/E08D.xml   |   1 +
 data/Leipzig/E08E.xml   |   1 +
 data/Leipzig/E08F.xml   |   1 +
 data/Leipzig/E090.xml   |   1 +
 data/Leipzig/E091.xml   |   1 +
 data/Leipzig/E092.xml   |   1 +
 data/Leipzig/E093.xml   |   1 +
 data/Leipzig/E094.xml   |   1 +
 data/Leipzig/E095.xml   |   1 +
 data/Leipzig/E0A0.xml   |   1 +
 data/Leipzig/E0A1.xml   |   1 +
 data/Leipzig/E0A2.xml   |   1 +
 data/Leipzig/E0A3.xml   |   1 +
 data/Leipzig/E0A4.xml   |   1 +
 data/Leipzig/E0A5.xml   |   1 +
 data/Leipzig/E0A9.xml   |   1 +
 data/Leipzig/E0AF.xml   |   1 +
 data/Leipzig/E0B5.xml   |   1 +
 data/Leipzig/E0B6.xml   |   1 +
 data/Leipzig/E0B7.xml   |   1 +
 data/Leipzig/E0D9.xml   |   1 +
 data/Leipzig/E0DA.xml   |   1 +
 data/Leipzig/E0DB.xml   |   1 +
 data/Leipzig/E0DC.xml   |   1 +
 data/Leipzig/E0DD.xml   |   1 +
 data/Leipzig/E0DE.xml   |   1 +
 data/Leipzig/E0F5.xml   |   1 +
 data/Leipzig/E0F6.xml   |   1 +
 data/Leipzig/E0FA.xml   |   1 +
 data/Leipzig/E101.xml   |   1 +
 data/Leipzig/E102.xml   |   1 +
 data/Leipzig/E103.xml   |   1 +
 data/Leipzig/E220.xml   |   1 +
 data/Leipzig/E221.xml   |   1 +
 data/Leipzig/E222.xml   |   1 +
 data/Leipzig/E223.xml   |   1 +
 data/Leipzig/E224.xml   |   1 +
 data/Leipzig/E22A.xml   |   1 +
 data/Leipzig/E240.xml   |   1 +
 data/Leipzig/E241.xml   |   1 +
 data/Leipzig/E242.xml   |   1 +
 data/Leipzig/E243.xml   |   1 +
 data/Leipzig/E244.xml   |   1 +
 data/Leipzig/E245.xml   |   1 +
 data/Leipzig/E246.xml   |   1 +
 data/Leipzig/E247.xml   |   1 +
 data/Leipzig/E248.xml   |   1 +
 data/Leipzig/E249.xml   |   1 +
 data/Leipzig/E24A.xml   |   1 +
 data/Leipzig/E24B.xml   |   1 +
 data/Leipzig/E24C.xml   |   1 +
 data/Leipzig/E24D.xml   |   1 +
 data/Leipzig/E24E.xml   |   1 +
 data/Leipzig/E24F.xml   |   1 +
 data/Leipzig/E260.xml   |   1 +
 data/Leipzig/E261.xml   |   1 +
 data/Leipzig/E262.xml   |   1 +
 data/Leipzig/E263.xml   |   1 +
 data/Leipzig/E264.xml   |   1 +
 data/Leipzig/E265.xml   |   1 +
 data/Leipzig/E266.xml   |   1 +
 data/Leipzig/E267.xml   |   1 +
 data/Leipzig/E268.xml   |   1 +
 data/Leipzig/E269.xml   |   1 +
 data/Leipzig/E26A.xml   |   1 +
 data/Leipzig/E26B.xml   |   1 +
 data/Leipzig/E26C.xml   |   1 +
 data/Leipzig/E26D.xml   |   1 +
 data/Leipzig/E270.xml   |   1 +
 data/Leipzig/E271.xml   |   1 +
 data/Leipzig/E272.xml   |   1 +
 data/Leipzig/E273.xml   |   1 +
 data/Leipzig/E274.xml   |   1 +
 data/Leipzig/E275.xml   |   1 +
 data/Leipzig/E280.xml   |   1 +
 data/Leipzig/E281.xml   |   1 +
 data/Leipzig/E282.xml   |   1 +
 data/Leipzig/E283.xml   |   1 +
 data/Leipzig/E440.xml   |   1 +
 data/Leipzig/E441.xml   |   1 +
 data/Leipzig/E442.xml   |   1 +
 data/Leipzig/E443.xml   |   1 +
 data/Leipzig/E444.xml   |   1 +
 data/Leipzig/E445.xml   |   1 +
 data/Leipzig/E446.xml   |   1 +
 data/Leipzig/E447.xml   |   1 +
 data/Leipzig/E4A0.xml   |   1 +
 data/Leipzig/E4A1.xml   |   1 +
 data/Leipzig/E4A2.xml   |   1 +
 data/Leipzig/E4A3.xml   |   1 +
 data/Leipzig/E4A4.xml   |   1 +
 data/Leipzig/E4A5.xml   |   1 +
 data/Leipzig/E4A6.xml   |   1 +
 data/Leipzig/E4A7.xml   |   1 +
 data/Leipzig/E4A8.xml   |   1 +
 data/Leipzig/E4A9.xml   |   1 +
 data/Leipzig/E4AA.xml   |   1 +
 data/Leipzig/E4AB.xml   |   1 +
 data/Leipzig/E4AC.xml   |   1 +
 data/Leipzig/E4AD.xml   |   1 +
 data/Leipzig/E4AE.xml   |   1 +
 data/Leipzig/E4AF.xml   |   1 +
 data/Leipzig/E4B0.xml   |   1 +
 data/Leipzig/E4B1.xml   |   1 +
 data/Leipzig/E4B2.xml   |   1 +
 data/Leipzig/E4B3.xml   |   1 +
 data/Leipzig/E4B4.xml   |   1 +
 data/Leipzig/E4B5.xml   |   1 +
 data/Leipzig/E4B6.xml   |   1 +
 data/Leipzig/E4B7.xml   |   1 +
 data/Leipzig/E4B8.xml   |   1 +
 data/Leipzig/E4B9.xml   |   1 +
 data/Leipzig/E4BA.xml   |   1 +
 data/Leipzig/E4BB.xml   |   1 +
 data/Leipzig/E4BC.xml   |   1 +
 data/Leipzig/E4BD.xml   |   1 +
 data/Leipzig/E4C0.xml   |   1 +
 data/Leipzig/E4C1.xml   |   1 +
 data/Leipzig/E4C2.xml   |   1 +
 data/Leipzig/E4C3.xml   |   1 +
 data/Leipzig/E4C4.xml   |   1 +
 data/Leipzig/E4C5.xml   |   1 +
 data/Leipzig/E4C6.xml   |   1 +
 data/Leipzig/E4C7.xml   |   1 +
 data/Leipzig/E4C8.xml   |   1 +
 data/Leipzig/E4C9.xml   |   1 +
 data/Leipzig/E4CE.xml   |   1 +
 data/Leipzig/E4E0.xml   |   1 +
 data/Leipzig/E4E1.xml   |   1 +
 data/Leipzig/E4E2.xml   |   1 +
 data/Leipzig/E4E3.xml   |   1 +
 data/Leipzig/E4E4.xml   |   1 +
 data/Leipzig/E4E5.xml   |   1 +
 data/Leipzig/E4E6.xml   |   1 +
 data/Leipzig/E4E7.xml   |   1 +
 data/Leipzig/E4E8.xml   |   1 +
 data/Leipzig/E4E9.xml   |   1 +
 data/Leipzig/E4EA.xml   |   1 +
 data/Leipzig/E4EB.xml   |   1 +
 data/Leipzig/E4EC.xml   |   1 +
 data/Leipzig/E4ED.xml   |   1 +
 data/Leipzig/E4F2.xml   |   1 +
 data/Leipzig/E4F6.xml   |   1 +
 data/Leipzig/E500.xml   |   1 +
 data/Leipzig/E501.xml   |   1 +
 data/Leipzig/E502.xml   |   1 +
 data/Leipzig/E503.xml   |   1 +
 data/Leipzig/E504.xml   |   1 +
 data/Leipzig/E505.xml   |   1 +
 data/Leipzig/E510.xml   |   1 +
 data/Leipzig/E511.xml   |   1 +
 data/Leipzig/E512.xml   |   1 +
 data/Leipzig/E513.xml   |   1 +
 data/Leipzig/E514.xml   |   1 +
 data/Leipzig/E515.xml   |   1 +
 data/Leipzig/E516.xml   |   1 +
 data/Leipzig/E517.xml   |   1 +
 data/Leipzig/E518.xml   |   1 +
 data/Leipzig/E519.xml   |   1 +
 data/Leipzig/E51A.xml   |   1 +
 data/Leipzig/E51B.xml   |   1 +
 data/Leipzig/E51C.xml   |   1 +
 data/Leipzig/E51D.xml   |   1 +
 data/Leipzig/E51E.xml   |   1 +
 data/Leipzig/E520.xml   |   1 +
 data/Leipzig/E521.xml   |   1 +
 data/Leipzig/E522.xml   |   1 +
 data/Leipzig/E523.xml   |   1 +
 data/Leipzig/E524.xml   |   1 +
 data/Leipzig/E525.xml   |   1 +
 data/Leipzig/E526.xml   |   1 +
 data/Leipzig/E527.xml   |   1 +
 data/Leipzig/E528.xml   |   1 +
 data/Leipzig/E529.xml   |   1 +
 data/Leipzig/E52A.xml   |   1 +
 data/Leipzig/E52B.xml   |   1 +
 data/Leipzig/E52C.xml   |   1 +
 data/Leipzig/E52D.xml   |   1 +
 data/Leipzig/E52E.xml   |   1 +
 data/Leipzig/E52F.xml   |   1 +
 data/Leipzig/E530.xml   |   1 +
 data/Leipzig/E531.xml   |   1 +
 data/Leipzig/E532.xml   |   1 +
 data/Leipzig/E533.xml   |   1 +
 data/Leipzig/E534.xml   |   1 +
 data/Leipzig/E535.xml   |   1 +
 data/Leipzig/E536.xml   |   1 +
 data/Leipzig/E537.xml   |   1 +
 data/Leipzig/E538.xml   |   1 +
 data/Leipzig/E539.xml   |   1 +
 data/Leipzig/E53A.xml   |   1 +
 data/Leipzig/E53B.xml   |   1 +
 data/Leipzig/E53C.xml   |   1 +
 data/Leipzig/E53D.xml   |   1 +
 data/Leipzig/E566.xml   |   1 +
 data/Leipzig/E567.xml   |   1 +
 data/Leipzig/E568.xml   |   1 +
 data/Leipzig/E569.xml   |   1 +
 data/Leipzig/E56A.xml   |   1 +
 data/Leipzig/E56B.xml   |   1 +
 data/Leipzig/E56C.xml   |   1 +
 data/Leipzig/E56D.xml   |   1 +
 data/Leipzig/E56E.xml   |   1 +
 data/Leipzig/E56F.xml   |   1 +
 data/Leipzig/E583.xml   |   1 +
 data/Leipzig/E587.xml   |   1 +
 data/Leipzig/E59D.xml   |   1 +
 data/Leipzig/E59E.xml   |   1 +
 data/Leipzig/E5B0.xml   |   1 +
 data/Leipzig/E5B1.xml   |   1 +
 data/Leipzig/E5B2.xml   |   1 +
 data/Leipzig/E5B3.xml   |   1 +
 data/Leipzig/E5B4.xml   |   1 +
 data/Leipzig/E5B5.xml   |   1 +
 data/Leipzig/E5B6.xml   |   1 +
 data/Leipzig/E5B7.xml   |   1 +
 data/Leipzig/E5B8.xml   |   1 +
 data/Leipzig/E5B9.xml   |   1 +
 data/Leipzig/E5BA.xml   |   1 +
 data/Leipzig/E5BB.xml   |   1 +
 data/Leipzig/E5BC.xml   |   1 +
 data/Leipzig/E5BD.xml   |   1 +
 data/Leipzig/E5BE.xml   |   1 +
 data/Leipzig/E5BF.xml   |   1 +
 data/Leipzig/E5C0.xml   |   1 +
 data/Leipzig/E5C1.xml   |   1 +
 data/Leipzig/E5C2.xml   |   1 +
 data/Leipzig/E5C3.xml   |   1 +
 data/Leipzig/E5C4.xml   |   1 +
 data/Leipzig/E5C5.xml   |   1 +
 data/Leipzig/E5C6.xml   |   1 +
 data/Leipzig/E5C7.xml   |   1 +
 data/Leipzig/E5C8.xml   |   1 +
 data/Leipzig/E5E5.xml   |   1 +
 data/Leipzig/E5E6.xml   |   1 +
 data/Leipzig/E5E7.xml   |   1 +
 data/Leipzig/E610.xml   |   1 +
 data/Leipzig/E611.xml   |   1 +
 data/Leipzig/E612.xml   |   1 +
 data/Leipzig/E613.xml   |   1 +
 data/Leipzig/E614.xml   |   1 +
 data/Leipzig/E630.xml   |   1 +
 data/Leipzig/E631.xml   |   1 +
 data/Leipzig/E632.xml   |   1 +
 data/Leipzig/E633.xml   |   1 +
 data/Leipzig/E638.xml   |   1 +
 data/Leipzig/E645.xml   |   1 +
 data/Leipzig/E650.xml   |   1 +
 data/Leipzig/E651.xml   |   1 +
 data/Leipzig/E655.xml   |   1 +
 data/Leipzig/E659.xml   |   1 +
 data/Leipzig/E65A.xml   |   1 +
 data/Leipzig/E880.xml   |   1 +
 data/Leipzig/E881.xml   |   1 +
 data/Leipzig/E882.xml   |   1 +
 data/Leipzig/E883.xml   |   1 +
 data/Leipzig/E884.xml   |   1 +
 data/Leipzig/E885.xml   |   1 +
 data/Leipzig/E886.xml   |   1 +
 data/Leipzig/E887.xml   |   1 +
 data/Leipzig/E888.xml   |   1 +
 data/Leipzig/E889.xml   |   1 +
 data/Leipzig/E88A.xml   |   1 +
 data/Leipzig/E901.xml   |   1 +
 data/Leipzig/E902.xml   |   1 +
 data/Leipzig/E904.xml   |   1 +
 data/Leipzig/E906.xml   |   1 +
 data/Leipzig/E907.xml   |   1 +
 data/Leipzig/E908.xml   |   1 +
 data/Leipzig/E909.xml   |   1 +
 data/Leipzig/E90A.xml   |   1 +
 data/Leipzig/E90B.xml   |   1 +
 data/Leipzig/E910.xml   |   1 +
 data/Leipzig/E911.xml   |   1 +
 data/Leipzig/E912.xml   |   1 +
 data/Leipzig/E913.xml   |   1 +
 data/Leipzig/E914.xml   |   1 +
 data/Leipzig/E915.xml   |   1 +
 data/Leipzig/E916.xml   |   1 +
 data/Leipzig/E917.xml   |   1 +
 data/Leipzig/E918.xml   |   1 +
 data/Leipzig/E919.xml   |   1 +
 data/Leipzig/E91A.xml   |   1 +
 data/Leipzig/E91B.xml   |   1 +
 data/Leipzig/E91C.xml   |   1 +
 data/Leipzig/E91D.xml   |   1 +
 data/Leipzig/E91E.xml   |   1 +
 data/Leipzig/E91F.xml   |   1 +
 data/Leipzig/E920.xml   |   1 +
 data/Leipzig/E921.xml   |   1 +
 data/Leipzig/E922.xml   |   1 +
 data/Leipzig/E923.xml   |   1 +
 data/Leipzig/E924.xml   |   1 +
 data/Leipzig/E925.xml   |   1 +
 data/Leipzig/E938.xml   |   1 +
 data/Leipzig/E939.xml   |   1 +
 data/Leipzig/E93C.xml   |   1 +
 data/Leipzig/E93D.xml   |   1 +
 data/Leipzig/E93E.xml   |   1 +
 data/Leipzig/E93F.xml   |   1 +
 data/Leipzig/E949.xml   |   1 +
 data/Leipzig/E94A.xml   |   1 +
 data/Leipzig/E94B.xml   |   1 +
 data/Leipzig/E94C.xml   |   1 +
 data/Leipzig/E9E0.xml   |   1 +
 data/Leipzig/E9E1.xml   |   1 +
 data/Leipzig/E9E2.xml   |   1 +
 data/Leipzig/E9E3.xml   |   1 +
 data/Leipzig/E9F0.xml   |   1 +
 data/Leipzig/E9F1.xml   |   1 +
 data/Leipzig/E9F2.xml   |   1 +
 data/Leipzig/E9F3.xml   |   1 +
 data/Leipzig/E9F4.xml   |   1 +
 data/Leipzig/E9F5.xml   |   1 +
 data/Leipzig/E9F6.xml   |   1 +
 data/Leipzig/E9F7.xml   |   1 +
 data/Leipzig/E9F8.xml   |   1 +
 data/Leipzig/EA02.xml   |   1 +
 data/Leipzig/EA06.xml   |   1 +
 data/Leipzig/EAA4.xml   |   1 +
 data/Leipzig/EAA9.xml   |   1 +
 data/Leipzig/EAAA.xml   |   1 +
 data/Leipzig/EAAD.xml   |   1 +
 data/Leipzig/EAAE.xml   |   1 +
 data/Leipzig/EAAF.xml   |   1 +
 data/Leipzig/EBA7.xml   |   1 +
 data/Leipzig/EBA8.xml   |   1 +
 data/Leipzig/EBA9.xml   |   1 +
 data/Leipzig/EBAA.xml   |   1 +
 data/Leipzig/EBAB.xml   |   1 +
 data/Leipzig/EBAC.xml   |   1 +
 data/Leipzig/EBC0.xml   |   1 +
 data/Leipzig/EBC1.xml   |   1 +
 data/Leipzig/EBC2.xml   |   1 +
 data/Leipzig/EBC3.xml   |   1 +
 data/Leipzig/EBC4.xml   |   1 +
 data/Leipzig/EBC5.xml   |   1 +
 data/Leipzig/EBC6.xml   |   1 +
 data/Leipzig/EBC7.xml   |   1 +
 data/Leipzig/EBC8.xml   |   1 +
 data/Leipzig/EBC9.xml   |   1 +
 data/Leipzig/EBCA.xml   |   1 +
 data/Leipzig/EBCB.xml   |   1 +
 data/Leipzig/EBCC.xml   |   1 +
 data/Leipzig/EBE0.xml   |   1 +
 data/Leipzig/EBE1.xml   |   1 +
 data/Leipzig/EBE2.xml   |   1 +
 data/Leipzig/EBE3.xml   |   1 +
 data/Leipzig/EBE4.xml   |   1 +
 data/Leipzig/EBE5.xml   |   1 +
 data/Leipzig/EBE6.xml   |   1 +
 data/Leipzig/EBE7.xml   |   1 +
 data/Leipzig/EBE8.xml   |   1 +
 data/Leipzig/EBE9.xml   |   1 +
 data/Leipzig/ED40.xml   |   1 +
 data/Leipzig/ED41.xml   |   1 +
 data/Leland.xml         | 500 +++++++++++++++++++++++++++++
 data/Leland/E000.xml    |   1 +
 data/Leland/E003.xml    |   1 +
 data/Leland/E004.xml    |   1 +
 data/Leland/E043.xml    |   1 +
 data/Leland/E044.xml    |   1 +
 data/Leland/E047.xml    |   1 +
 data/Leland/E048.xml    |   1 +
 data/Leland/E049.xml    |   1 +
 data/Leland/E04B.xml    |   1 +
 data/Leland/E050.xml    |   1 +
 data/Leland/E051.xml    |   1 +
 data/Leland/E052.xml    |   1 +
 data/Leland/E053.xml    |   1 +
 data/Leland/E054.xml    |   1 +
 data/Leland/E055.xml    |   1 +
 data/Leland/E05C.xml    |   1 +
 data/Leland/E05D.xml    |   1 +
 data/Leland/E062.xml    |   1 +
 data/Leland/E063.xml    |   1 +
 data/Leland/E064.xml    |   1 +
 data/Leland/E065.xml    |   1 +
 data/Leland/E066.xml    |   1 +
 data/Leland/E069.xml    |   1 +
 data/Leland/E06A.xml    |   1 +
 data/Leland/E080.xml    |   1 +
 data/Leland/E081.xml    |   1 +
 data/Leland/E082.xml    |   1 +
 data/Leland/E083.xml    |   1 +
 data/Leland/E084.xml    |   1 +
 data/Leland/E085.xml    |   1 +
 data/Leland/E086.xml    |   1 +
 data/Leland/E087.xml    |   1 +
 data/Leland/E088.xml    |   1 +
 data/Leland/E089.xml    |   1 +
 data/Leland/E08A.xml    |   1 +
 data/Leland/E08B.xml    |   1 +
 data/Leland/E08C.xml    |   1 +
 data/Leland/E0A0.xml    |   1 +
 data/Leland/E0A1.xml    |   1 +
 data/Leland/E0A2.xml    |   1 +
 data/Leland/E0A3.xml    |   1 +
 data/Leland/E0A4.xml    |   1 +
 data/Leland/E0A5.xml    |   1 +
 data/Leland/E0A9.xml    |   1 +
 data/Leland/E0AF.xml    |   1 +
 data/Leland/E0D9.xml    |   1 +
 data/Leland/E0DB.xml    |   1 +
 data/Leland/E0F5.xml    |   1 +
 data/Leland/E0F6.xml    |   1 +
 data/Leland/E220.xml    |   1 +
 data/Leland/E221.xml    |   1 +
 data/Leland/E222.xml    |   1 +
 data/Leland/E223.xml    |   1 +
 data/Leland/E224.xml    |   1 +
 data/Leland/E22A.xml    |   1 +
 data/Leland/E240.xml    |   1 +
 data/Leland/E241.xml    |   1 +
 data/Leland/E242.xml    |   1 +
 data/Leland/E243.xml    |   1 +
 data/Leland/E244.xml    |   1 +
 data/Leland/E245.xml    |   1 +
 data/Leland/E246.xml    |   1 +
 data/Leland/E247.xml    |   1 +
 data/Leland/E248.xml    |   1 +
 data/Leland/E249.xml    |   1 +
 data/Leland/E24A.xml    |   1 +
 data/Leland/E24B.xml    |   1 +
 data/Leland/E24C.xml    |   1 +
 data/Leland/E24D.xml    |   1 +
 data/Leland/E24E.xml    |   1 +
 data/Leland/E24F.xml    |   1 +
 data/Leland/E260.xml    |   1 +
 data/Leland/E261.xml    |   1 +
 data/Leland/E262.xml    |   1 +
 data/Leland/E263.xml    |   1 +
 data/Leland/E264.xml    |   1 +
 data/Leland/E265.xml    |   1 +
 data/Leland/E266.xml    |   1 +
 data/Leland/E267.xml    |   1 +
 data/Leland/E268.xml    |   1 +
 data/Leland/E269.xml    |   1 +
 data/Leland/E26A.xml    |   1 +
 data/Leland/E26B.xml    |   1 +
 data/Leland/E26C.xml    |   1 +
 data/Leland/E26D.xml    |   1 +
 data/Leland/E270.xml    |   1 +
 data/Leland/E271.xml    |   1 +
 data/Leland/E272.xml    |   1 +
 data/Leland/E273.xml    |   1 +
 data/Leland/E274.xml    |   1 +
 data/Leland/E275.xml    |   1 +
 data/Leland/E280.xml    |   1 +
 data/Leland/E281.xml    |   1 +
 data/Leland/E282.xml    |   1 +
 data/Leland/E283.xml    |   1 +
 data/Leland/E440.xml    |   1 +
 data/Leland/E442.xml    |   1 +
 data/Leland/E446.xml    |   1 +
 data/Leland/E447.xml    |   1 +
 data/Leland/E4A0.xml    |   1 +
 data/Leland/E4A1.xml    |   1 +
 data/Leland/E4A2.xml    |   1 +
 data/Leland/E4A3.xml    |   1 +
 data/Leland/E4A4.xml    |   1 +
 data/Leland/E4A5.xml    |   1 +
 data/Leland/E4A6.xml    |   1 +
 data/Leland/E4A7.xml    |   1 +
 data/Leland/E4A8.xml    |   1 +
 data/Leland/E4A9.xml    |   1 +
 data/Leland/E4AC.xml    |   1 +
 data/Leland/E4AD.xml    |   1 +
 data/Leland/E4AE.xml    |   1 +
 data/Leland/E4AF.xml    |   1 +
 data/Leland/E4B0.xml    |   1 +
 data/Leland/E4B1.xml    |   1 +
 data/Leland/E4B2.xml    |   1 +
 data/Leland/E4B3.xml    |   1 +
 data/Leland/E4B4.xml    |   1 +
 data/Leland/E4B5.xml    |   1 +
 data/Leland/E4B6.xml    |   1 +
 data/Leland/E4B7.xml    |   1 +
 data/Leland/E4B8.xml    |   1 +
 data/Leland/E4B9.xml    |   1 +
 data/Leland/E4BA.xml    |   1 +
 data/Leland/E4BB.xml    |   1 +
 data/Leland/E4BC.xml    |   1 +
 data/Leland/E4BD.xml    |   1 +
 data/Leland/E4C0.xml    |   1 +
 data/Leland/E4C1.xml    |   1 +
 data/Leland/E4C4.xml    |   1 +
 data/Leland/E4C5.xml    |   1 +
 data/Leland/E4C6.xml    |   1 +
 data/Leland/E4C7.xml    |   1 +
 data/Leland/E4C8.xml    |   1 +
 data/Leland/E4C9.xml    |   1 +
 data/Leland/E4CE.xml    |   1 +
 data/Leland/E4E0.xml    |   1 +
 data/Leland/E4E1.xml    |   1 +
 data/Leland/E4E2.xml    |   1 +
 data/Leland/E4E3.xml    |   1 +
 data/Leland/E4E4.xml    |   1 +
 data/Leland/E4E5.xml    |   1 +
 data/Leland/E4E6.xml    |   1 +
 data/Leland/E4E7.xml    |   1 +
 data/Leland/E4E8.xml    |   1 +
 data/Leland/E4E9.xml    |   1 +
 data/Leland/E4EA.xml    |   1 +
 data/Leland/E4EB.xml    |   1 +
 data/Leland/E4EC.xml    |   1 +
 data/Leland/E4ED.xml    |   1 +
 data/Leland/E4F2.xml    |   1 +
 data/Leland/E4F6.xml    |   1 +
 data/Leland/E500.xml    |   1 +
 data/Leland/E501.xml    |   1 +
 data/Leland/E502.xml    |   1 +
 data/Leland/E503.xml    |   1 +
 data/Leland/E504.xml    |   1 +
 data/Leland/E505.xml    |   1 +
 data/Leland/E510.xml    |   1 +
 data/Leland/E511.xml    |   1 +
 data/Leland/E512.xml    |   1 +
 data/Leland/E513.xml    |   1 +
 data/Leland/E514.xml    |   1 +
 data/Leland/E515.xml    |   1 +
 data/Leland/E516.xml    |   1 +
 data/Leland/E517.xml    |   1 +
 data/Leland/E518.xml    |   1 +
 data/Leland/E519.xml    |   1 +
 data/Leland/E51A.xml    |   1 +
 data/Leland/E51B.xml    |   1 +
 data/Leland/E51C.xml    |   1 +
 data/Leland/E51D.xml    |   1 +
 data/Leland/E51E.xml    |   1 +
 data/Leland/E520.xml    |   1 +
 data/Leland/E521.xml    |   1 +
 data/Leland/E522.xml    |   1 +
 data/Leland/E523.xml    |   1 +
 data/Leland/E524.xml    |   1 +
 data/Leland/E525.xml    |   1 +
 data/Leland/E526.xml    |   1 +
 data/Leland/E527.xml    |   1 +
 data/Leland/E528.xml    |   1 +
 data/Leland/E529.xml    |   1 +
 data/Leland/E52A.xml    |   1 +
 data/Leland/E52B.xml    |   1 +
 data/Leland/E52C.xml    |   1 +
 data/Leland/E52D.xml    |   1 +
 data/Leland/E52E.xml    |   1 +
 data/Leland/E52F.xml    |   1 +
 data/Leland/E530.xml    |   1 +
 data/Leland/E531.xml    |   1 +
 data/Leland/E532.xml    |   1 +
 data/Leland/E533.xml    |   1 +
 data/Leland/E534.xml    |   1 +
 data/Leland/E535.xml    |   1 +
 data/Leland/E536.xml    |   1 +
 data/Leland/E537.xml    |   1 +
 data/Leland/E538.xml    |   1 +
 data/Leland/E539.xml    |   1 +
 data/Leland/E53A.xml    |   1 +
 data/Leland/E53B.xml    |   1 +
 data/Leland/E53C.xml    |   1 +
 data/Leland/E53D.xml    |   1 +
 data/Leland/E566.xml    |   1 +
 data/Leland/E567.xml    |   1 +
 data/Leland/E568.xml    |   1 +
 data/Leland/E569.xml    |   1 +
 data/Leland/E56A.xml    |   1 +
 data/Leland/E56B.xml    |   1 +
 data/Leland/E56C.xml    |   1 +
 data/Leland/E56D.xml    |   1 +
 data/Leland/E56E.xml    |   1 +
 data/Leland/E56F.xml    |   1 +
 data/Leland/E583.xml    |   1 +
 data/Leland/E587.xml    |   1 +
 data/Leland/E59D.xml    |   1 +
 data/Leland/E59E.xml    |   1 +
 data/Leland/E5B2.xml    |   1 +
 data/Leland/E5B5.xml    |   1 +
 data/Leland/E5B8.xml    |   1 +
 data/Leland/E5BB.xml    |   1 +
 data/Leland/E5BC.xml    |   1 +
 data/Leland/E5BD.xml    |   1 +
 data/Leland/E5BE.xml    |   1 +
 data/Leland/E5C0.xml    |   1 +
 data/Leland/E5C3.xml    |   1 +
 data/Leland/E5C6.xml    |   1 +
 data/Leland/E5C7.xml    |   1 +
 data/Leland/E5C8.xml    |   1 +
 data/Leland/E5E5.xml    |   1 +
 data/Leland/E5E6.xml    |   1 +
 data/Leland/E5E7.xml    |   1 +
 data/Leland/E610.xml    |   1 +
 data/Leland/E611.xml    |   1 +
 data/Leland/E612.xml    |   1 +
 data/Leland/E613.xml    |   1 +
 data/Leland/E614.xml    |   1 +
 data/Leland/E630.xml    |   1 +
 data/Leland/E631.xml    |   1 +
 data/Leland/E632.xml    |   1 +
 data/Leland/E650.xml    |   1 +
 data/Leland/E651.xml    |   1 +
 data/Leland/E655.xml    |   1 +
 data/Leland/E880.xml    |   1 +
 data/Leland/E881.xml    |   1 +
 data/Leland/E882.xml    |   1 +
 data/Leland/E883.xml    |   1 +
 data/Leland/E884.xml    |   1 +
 data/Leland/E885.xml    |   1 +
 data/Leland/E886.xml    |   1 +
 data/Leland/E887.xml    |   1 +
 data/Leland/E888.xml    |   1 +
 data/Leland/E889.xml    |   1 +
 data/Leland/E88A.xml    |   1 +
 data/Leland/E93C.xml    |   1 +
 data/Leland/E93D.xml    |   1 +
 data/Leland/EAA4.xml    |   1 +
 data/Leland/EAA9.xml    |   1 +
 data/Leland/EAAA.xml    |   1 +
 data/Leland/EAAD.xml    |   1 +
 data/Leland/EAAE.xml    |   1 +
 data/Petaluma.xml       | 599 ++++++++++++++++++++++++++++++++++
 data/Petaluma/E000.xml  |   1 +
 data/Petaluma/E003.xml  |   1 +
 data/Petaluma/E004.xml  |   1 +
 data/Petaluma/E043.xml  |   1 +
 data/Petaluma/E044.xml  |   1 +
 data/Petaluma/E045.xml  |   1 +
 data/Petaluma/E046.xml  |   1 +
 data/Petaluma/E047.xml  |   1 +
 data/Petaluma/E048.xml  |   1 +
 data/Petaluma/E049.xml  |   1 +
 data/Petaluma/E04B.xml  |   1 +
 data/Petaluma/E050.xml  |   1 +
 data/Petaluma/E051.xml  |   1 +
 data/Petaluma/E052.xml  |   1 +
 data/Petaluma/E053.xml  |   1 +
 data/Petaluma/E054.xml  |   1 +
 data/Petaluma/E055.xml  |   1 +
 data/Petaluma/E056.xml  |   1 +
 data/Petaluma/E05C.xml  |   1 +
 data/Petaluma/E05D.xml  |   1 +
 data/Petaluma/E062.xml  |   1 +
 data/Petaluma/E063.xml  |   1 +
 data/Petaluma/E064.xml  |   1 +
 data/Petaluma/E065.xml  |   1 +
 data/Petaluma/E066.xml  |   1 +
 data/Petaluma/E069.xml  |   1 +
 data/Petaluma/E06A.xml  |   1 +
 data/Petaluma/E073.xml  |   1 +
 data/Petaluma/E074.xml  |   1 +
 data/Petaluma/E075.xml  |   1 +
 data/Petaluma/E076.xml  |   1 +
 data/Petaluma/E077.xml  |   1 +
 data/Petaluma/E080.xml  |   1 +
 data/Petaluma/E081.xml  |   1 +
 data/Petaluma/E082.xml  |   1 +
 data/Petaluma/E083.xml  |   1 +
 data/Petaluma/E084.xml  |   1 +
 data/Petaluma/E085.xml  |   1 +
 data/Petaluma/E086.xml  |   1 +
 data/Petaluma/E087.xml  |   1 +
 data/Petaluma/E088.xml  |   1 +
 data/Petaluma/E089.xml  |   1 +
 data/Petaluma/E08A.xml  |   1 +
 data/Petaluma/E08B.xml  |   1 +
 data/Petaluma/E08C.xml  |   1 +
 data/Petaluma/E08D.xml  |   1 +
 data/Petaluma/E08E.xml  |   1 +
 data/Petaluma/E08F.xml  |   1 +
 data/Petaluma/E090.xml  |   1 +
 data/Petaluma/E091.xml  |   1 +
 data/Petaluma/E092.xml  |   1 +
 data/Petaluma/E093.xml  |   1 +
 data/Petaluma/E094.xml  |   1 +
 data/Petaluma/E095.xml  |   1 +
 data/Petaluma/E0A0.xml  |   1 +
 data/Petaluma/E0A1.xml  |   1 +
 data/Petaluma/E0A2.xml  |   1 +
 data/Petaluma/E0A3.xml  |   1 +
 data/Petaluma/E0A4.xml  |   1 +
 data/Petaluma/E0A5.xml  |   1 +
 data/Petaluma/E0A9.xml  |   1 +
 data/Petaluma/E0AF.xml  |   1 +
 data/Petaluma/E0B5.xml  |   1 +
 data/Petaluma/E0B6.xml  |   1 +
 data/Petaluma/E0B7.xml  |   1 +
 data/Petaluma/E0D9.xml  |   1 +
 data/Petaluma/E0DA.xml  |   1 +
 data/Petaluma/E0DB.xml  |   1 +
 data/Petaluma/E0DC.xml  |   1 +
 data/Petaluma/E0DD.xml  |   1 +
 data/Petaluma/E0DE.xml  |   1 +
 data/Petaluma/E0F5.xml  |   1 +
 data/Petaluma/E0F6.xml  |   1 +
 data/Petaluma/E0FA.xml  |   1 +
 data/Petaluma/E101.xml  |   1 +
 data/Petaluma/E102.xml  |   1 +
 data/Petaluma/E103.xml  |   1 +
 data/Petaluma/E220.xml  |   1 +
 data/Petaluma/E221.xml  |   1 +
 data/Petaluma/E222.xml  |   1 +
 data/Petaluma/E223.xml  |   1 +
 data/Petaluma/E224.xml  |   1 +
 data/Petaluma/E22A.xml  |   1 +
 data/Petaluma/E240.xml  |   1 +
 data/Petaluma/E241.xml  |   1 +
 data/Petaluma/E242.xml  |   1 +
 data/Petaluma/E243.xml  |   1 +
 data/Petaluma/E244.xml  |   1 +
 data/Petaluma/E245.xml  |   1 +
 data/Petaluma/E246.xml  |   1 +
 data/Petaluma/E247.xml  |   1 +
 data/Petaluma/E248.xml  |   1 +
 data/Petaluma/E249.xml  |   1 +
 data/Petaluma/E24A.xml  |   1 +
 data/Petaluma/E24B.xml  |   1 +
 data/Petaluma/E24C.xml  |   1 +
 data/Petaluma/E24D.xml  |   1 +
 data/Petaluma/E24E.xml  |   1 +
 data/Petaluma/E24F.xml  |   1 +
 data/Petaluma/E260.xml  |   1 +
 data/Petaluma/E261.xml  |   1 +
 data/Petaluma/E262.xml  |   1 +
 data/Petaluma/E263.xml  |   1 +
 data/Petaluma/E264.xml  |   1 +
 data/Petaluma/E265.xml  |   1 +
 data/Petaluma/E266.xml  |   1 +
 data/Petaluma/E267.xml  |   1 +
 data/Petaluma/E268.xml  |   1 +
 data/Petaluma/E269.xml  |   1 +
 data/Petaluma/E26A.xml  |   1 +
 data/Petaluma/E26B.xml  |   1 +
 data/Petaluma/E26C.xml  |   1 +
 data/Petaluma/E26D.xml  |   1 +
 data/Petaluma/E270.xml  |   1 +
 data/Petaluma/E271.xml  |   1 +
 data/Petaluma/E272.xml  |   1 +
 data/Petaluma/E273.xml  |   1 +
 data/Petaluma/E274.xml  |   1 +
 data/Petaluma/E275.xml  |   1 +
 data/Petaluma/E280.xml  |   1 +
 data/Petaluma/E281.xml  |   1 +
 data/Petaluma/E282.xml  |   1 +
 data/Petaluma/E283.xml  |   1 +
 data/Petaluma/E440.xml  |   1 +
 data/Petaluma/E441.xml  |   1 +
 data/Petaluma/E442.xml  |   1 +
 data/Petaluma/E443.xml  |   1 +
 data/Petaluma/E444.xml  |   1 +
 data/Petaluma/E445.xml  |   1 +
 data/Petaluma/E446.xml  |   1 +
 data/Petaluma/E447.xml  |   1 +
 data/Petaluma/E4A0.xml  |   1 +
 data/Petaluma/E4A1.xml  |   1 +
 data/Petaluma/E4A2.xml  |   1 +
 data/Petaluma/E4A3.xml  |   1 +
 data/Petaluma/E4A4.xml  |   1 +
 data/Petaluma/E4A5.xml  |   1 +
 data/Petaluma/E4A6.xml  |   1 +
 data/Petaluma/E4A7.xml  |   1 +
 data/Petaluma/E4A8.xml  |   1 +
 data/Petaluma/E4A9.xml  |   1 +
 data/Petaluma/E4AA.xml  |   1 +
 data/Petaluma/E4AB.xml  |   1 +
 data/Petaluma/E4AC.xml  |   1 +
 data/Petaluma/E4AD.xml  |   1 +
 data/Petaluma/E4AE.xml  |   1 +
 data/Petaluma/E4AF.xml  |   1 +
 data/Petaluma/E4B0.xml  |   1 +
 data/Petaluma/E4B1.xml  |   1 +
 data/Petaluma/E4B2.xml  |   1 +
 data/Petaluma/E4B3.xml  |   1 +
 data/Petaluma/E4B4.xml  |   1 +
 data/Petaluma/E4B5.xml  |   1 +
 data/Petaluma/E4B6.xml  |   1 +
 data/Petaluma/E4B7.xml  |   1 +
 data/Petaluma/E4B8.xml  |   1 +
 data/Petaluma/E4B9.xml  |   1 +
 data/Petaluma/E4BA.xml  |   1 +
 data/Petaluma/E4BB.xml  |   1 +
 data/Petaluma/E4BC.xml  |   1 +
 data/Petaluma/E4BD.xml  |   1 +
 data/Petaluma/E4C0.xml  |   1 +
 data/Petaluma/E4C1.xml  |   1 +
 data/Petaluma/E4C2.xml  |   1 +
 data/Petaluma/E4C3.xml  |   1 +
 data/Petaluma/E4C4.xml  |   1 +
 data/Petaluma/E4C5.xml  |   1 +
 data/Petaluma/E4C6.xml  |   1 +
 data/Petaluma/E4C7.xml  |   1 +
 data/Petaluma/E4C8.xml  |   1 +
 data/Petaluma/E4C9.xml  |   1 +
 data/Petaluma/E4CE.xml  |   1 +
 data/Petaluma/E4E0.xml  |   1 +
 data/Petaluma/E4E1.xml  |   1 +
 data/Petaluma/E4E2.xml  |   1 +
 data/Petaluma/E4E3.xml  |   1 +
 data/Petaluma/E4E4.xml  |   1 +
 data/Petaluma/E4E5.xml  |   1 +
 data/Petaluma/E4E6.xml  |   1 +
 data/Petaluma/E4E7.xml  |   1 +
 data/Petaluma/E4E8.xml  |   1 +
 data/Petaluma/E4E9.xml  |   1 +
 data/Petaluma/E4EA.xml  |   1 +
 data/Petaluma/E4EB.xml  |   1 +
 data/Petaluma/E4EC.xml  |   1 +
 data/Petaluma/E4ED.xml  |   1 +
 data/Petaluma/E4F2.xml  |   1 +
 data/Petaluma/E4F6.xml  |   1 +
 data/Petaluma/E500.xml  |   1 +
 data/Petaluma/E501.xml  |   1 +
 data/Petaluma/E502.xml  |   1 +
 data/Petaluma/E503.xml  |   1 +
 data/Petaluma/E504.xml  |   1 +
 data/Petaluma/E505.xml  |   1 +
 data/Petaluma/E510.xml  |   1 +
 data/Petaluma/E511.xml  |   1 +
 data/Petaluma/E512.xml  |   1 +
 data/Petaluma/E513.xml  |   1 +
 data/Petaluma/E514.xml  |   1 +
 data/Petaluma/E515.xml  |   1 +
 data/Petaluma/E516.xml  |   1 +
 data/Petaluma/E517.xml  |   1 +
 data/Petaluma/E518.xml  |   1 +
 data/Petaluma/E519.xml  |   1 +
 data/Petaluma/E51A.xml  |   1 +
 data/Petaluma/E51B.xml  |   1 +
 data/Petaluma/E51C.xml  |   1 +
 data/Petaluma/E51D.xml  |   1 +
 data/Petaluma/E51E.xml  |   1 +
 data/Petaluma/E520.xml  |   1 +
 data/Petaluma/E521.xml  |   1 +
 data/Petaluma/E522.xml  |   1 +
 data/Petaluma/E523.xml  |   1 +
 data/Petaluma/E524.xml  |   1 +
 data/Petaluma/E525.xml  |   1 +
 data/Petaluma/E526.xml  |   1 +
 data/Petaluma/E527.xml  |   1 +
 data/Petaluma/E528.xml  |   1 +
 data/Petaluma/E529.xml  |   1 +
 data/Petaluma/E52A.xml  |   1 +
 data/Petaluma/E52B.xml  |   1 +
 data/Petaluma/E52C.xml  |   1 +
 data/Petaluma/E52D.xml  |   1 +
 data/Petaluma/E52E.xml  |   1 +
 data/Petaluma/E52F.xml  |   1 +
 data/Petaluma/E530.xml  |   1 +
 data/Petaluma/E531.xml  |   1 +
 data/Petaluma/E532.xml  |   1 +
 data/Petaluma/E533.xml  |   1 +
 data/Petaluma/E534.xml  |   1 +
 data/Petaluma/E535.xml  |   1 +
 data/Petaluma/E536.xml  |   1 +
 data/Petaluma/E537.xml  |   1 +
 data/Petaluma/E538.xml  |   1 +
 data/Petaluma/E539.xml  |   1 +
 data/Petaluma/E53A.xml  |   1 +
 data/Petaluma/E53B.xml  |   1 +
 data/Petaluma/E53C.xml  |   1 +
 data/Petaluma/E53D.xml  |   1 +
 data/Petaluma/E566.xml  |   1 +
 data/Petaluma/E567.xml  |   1 +
 data/Petaluma/E568.xml  |   1 +
 data/Petaluma/E569.xml  |   1 +
 data/Petaluma/E56A.xml  |   1 +
 data/Petaluma/E56B.xml  |   1 +
 data/Petaluma/E56C.xml  |   1 +
 data/Petaluma/E56D.xml  |   1 +
 data/Petaluma/E56E.xml  |   1 +
 data/Petaluma/E56F.xml  |   1 +
 data/Petaluma/E583.xml  |   1 +
 data/Petaluma/E587.xml  |   1 +
 data/Petaluma/E5B0.xml  |   1 +
 data/Petaluma/E5B1.xml  |   1 +
 data/Petaluma/E5B2.xml  |   1 +
 data/Petaluma/E5B3.xml  |   1 +
 data/Petaluma/E5B4.xml  |   1 +
 data/Petaluma/E5B5.xml  |   1 +
 data/Petaluma/E5B6.xml  |   1 +
 data/Petaluma/E5B7.xml  |   1 +
 data/Petaluma/E5B8.xml  |   1 +
 data/Petaluma/E5B9.xml  |   1 +
 data/Petaluma/E5BA.xml  |   1 +
 data/Petaluma/E5BB.xml  |   1 +
 data/Petaluma/E5BC.xml  |   1 +
 data/Petaluma/E5BD.xml  |   1 +
 data/Petaluma/E5BE.xml  |   1 +
 data/Petaluma/E5BF.xml  |   1 +
 data/Petaluma/E5C0.xml  |   1 +
 data/Petaluma/E5C1.xml  |   1 +
 data/Petaluma/E5C2.xml  |   1 +
 data/Petaluma/E5C3.xml  |   1 +
 data/Petaluma/E5C4.xml  |   1 +
 data/Petaluma/E5C5.xml  |   1 +
 data/Petaluma/E5C6.xml  |   1 +
 data/Petaluma/E5C7.xml  |   1 +
 data/Petaluma/E5C8.xml  |   1 +
 data/Petaluma/E5E5.xml  |   1 +
 data/Petaluma/E5E6.xml  |   1 +
 data/Petaluma/E5E7.xml  |   1 +
 data/Petaluma/E610.xml  |   1 +
 data/Petaluma/E611.xml  |   1 +
 data/Petaluma/E612.xml  |   1 +
 data/Petaluma/E613.xml  |   1 +
 data/Petaluma/E614.xml  |   1 +
 data/Petaluma/E630.xml  |   1 +
 data/Petaluma/E631.xml  |   1 +
 data/Petaluma/E632.xml  |   1 +
 data/Petaluma/E633.xml  |   1 +
 data/Petaluma/E638.xml  |   1 +
 data/Petaluma/E645.xml  |   1 +
 data/Petaluma/E650.xml  |   1 +
 data/Petaluma/E651.xml  |   1 +
 data/Petaluma/E655.xml  |   1 +
 data/Petaluma/E659.xml  |   1 +
 data/Petaluma/E65A.xml  |   1 +
 data/Petaluma/E880.xml  |   1 +
 data/Petaluma/E881.xml  |   1 +
 data/Petaluma/E882.xml  |   1 +
 data/Petaluma/E883.xml  |   1 +
 data/Petaluma/E884.xml  |   1 +
 data/Petaluma/E885.xml  |   1 +
 data/Petaluma/E886.xml  |   1 +
 data/Petaluma/E887.xml  |   1 +
 data/Petaluma/E888.xml  |   1 +
 data/Petaluma/E889.xml  |   1 +
 data/Petaluma/E88A.xml  |   1 +
 data/Petaluma/E938.xml  |   1 +
 data/Petaluma/E939.xml  |   1 +
 data/Petaluma/E93C.xml  |   1 +
 data/Petaluma/E93D.xml  |   1 +
 data/Petaluma/E93E.xml  |   1 +
 data/Petaluma/E93F.xml  |   1 +
 data/Petaluma/E949.xml  |   1 +
 data/Petaluma/E94A.xml  |   1 +
 data/Petaluma/E94B.xml  |   1 +
 data/Petaluma/E94C.xml  |   1 +
 data/Petaluma/EAA4.xml  |   1 +
 data/Petaluma/EAA9.xml  |   1 +
 data/Petaluma/EAAA.xml  |   1 +
 data/Petaluma/EAAD.xml  |   1 +
 data/Petaluma/EAAE.xml  |   1 +
 data/Petaluma/EAAF.xml  |   1 +
 1591 files changed, 4317 insertions(+)
 create mode 100644 data/Bravura.xml
 create mode 100644 data/Bravura/E000.xml
 create mode 100644 data/Bravura/E003.xml
 create mode 100644 data/Bravura/E004.xml
 create mode 100644 data/Bravura/E043.xml
 create mode 100644 data/Bravura/E044.xml
 create mode 100644 data/Bravura/E045.xml
 create mode 100644 data/Bravura/E046.xml
 create mode 100644 data/Bravura/E047.xml
 create mode 100644 data/Bravura/E048.xml
 create mode 100644 data/Bravura/E049.xml
 create mode 100644 data/Bravura/E04B.xml
 create mode 100644 data/Bravura/E050.xml
 create mode 100644 data/Bravura/E051.xml
 create mode 100644 data/Bravura/E052.xml
 create mode 100644 data/Bravura/E053.xml
 create mode 100644 data/Bravura/E054.xml
 create mode 100644 data/Bravura/E055.xml
 create mode 100644 data/Bravura/E056.xml
 create mode 100644 data/Bravura/E05C.xml
 create mode 100644 data/Bravura/E05D.xml
 create mode 100644 data/Bravura/E062.xml
 create mode 100644 data/Bravura/E063.xml
 create mode 100644 data/Bravura/E064.xml
 create mode 100644 data/Bravura/E065.xml
 create mode 100644 data/Bravura/E066.xml
 create mode 100644 data/Bravura/E069.xml
 create mode 100644 data/Bravura/E06A.xml
 create mode 100644 data/Bravura/E073.xml
 create mode 100644 data/Bravura/E074.xml
 create mode 100644 data/Bravura/E075.xml
 create mode 100644 data/Bravura/E076.xml
 create mode 100644 data/Bravura/E077.xml
 create mode 100644 data/Bravura/E080.xml
 create mode 100644 data/Bravura/E081.xml
 create mode 100644 data/Bravura/E082.xml
 create mode 100644 data/Bravura/E083.xml
 create mode 100644 data/Bravura/E084.xml
 create mode 100644 data/Bravura/E085.xml
 create mode 100644 data/Bravura/E086.xml
 create mode 100644 data/Bravura/E087.xml
 create mode 100644 data/Bravura/E088.xml
 create mode 100644 data/Bravura/E089.xml
 create mode 100644 data/Bravura/E08A.xml
 create mode 100644 data/Bravura/E08B.xml
 create mode 100644 data/Bravura/E08C.xml
 create mode 100644 data/Bravura/E08D.xml
 create mode 100644 data/Bravura/E08E.xml
 create mode 100644 data/Bravura/E08F.xml
 create mode 100644 data/Bravura/E090.xml
 create mode 100644 data/Bravura/E091.xml
 create mode 100644 data/Bravura/E092.xml
 create mode 100644 data/Bravura/E093.xml
 create mode 100644 data/Bravura/E094.xml
 create mode 100644 data/Bravura/E095.xml
 create mode 100644 data/Bravura/E0A0.xml
 create mode 100644 data/Bravura/E0A1.xml
 create mode 100644 data/Bravura/E0A2.xml
 create mode 100644 data/Bravura/E0A3.xml
 create mode 100644 data/Bravura/E0A4.xml
 create mode 100644 data/Bravura/E0A5.xml
 create mode 100644 data/Bravura/E0A9.xml
 create mode 100644 data/Bravura/E0AF.xml
 create mode 100644 data/Bravura/E0B5.xml
 create mode 100644 data/Bravura/E0B6.xml
 create mode 100644 data/Bravura/E0B7.xml
 create mode 100644 data/Bravura/E0D9.xml
 create mode 100644 data/Bravura/E0DA.xml
 create mode 100644 data/Bravura/E0DB.xml
 create mode 100644 data/Bravura/E0DC.xml
 create mode 100644 data/Bravura/E0DD.xml
 create mode 100644 data/Bravura/E0DE.xml
 create mode 100644 data/Bravura/E0F5.xml
 create mode 100644 data/Bravura/E0F6.xml
 create mode 100644 data/Bravura/E0FA.xml
 create mode 100644 data/Bravura/E101.xml
 create mode 100644 data/Bravura/E102.xml
 create mode 100644 data/Bravura/E103.xml
 create mode 100644 data/Bravura/E220.xml
 create mode 100644 data/Bravura/E221.xml
 create mode 100644 data/Bravura/E222.xml
 create mode 100644 data/Bravura/E223.xml
 create mode 100644 data/Bravura/E224.xml
 create mode 100644 data/Bravura/E22A.xml
 create mode 100644 data/Bravura/E240.xml
 create mode 100644 data/Bravura/E241.xml
 create mode 100644 data/Bravura/E242.xml
 create mode 100644 data/Bravura/E243.xml
 create mode 100644 data/Bravura/E244.xml
 create mode 100644 data/Bravura/E245.xml
 create mode 100644 data/Bravura/E246.xml
 create mode 100644 data/Bravura/E247.xml
 create mode 100644 data/Bravura/E248.xml
 create mode 100644 data/Bravura/E249.xml
 create mode 100644 data/Bravura/E24A.xml
 create mode 100644 data/Bravura/E24B.xml
 create mode 100644 data/Bravura/E24C.xml
 create mode 100644 data/Bravura/E24D.xml
 create mode 100644 data/Bravura/E24E.xml
 create mode 100644 data/Bravura/E24F.xml
 create mode 100644 data/Bravura/E260.xml
 create mode 100644 data/Bravura/E261.xml
 create mode 100644 data/Bravura/E262.xml
 create mode 100644 data/Bravura/E263.xml
 create mode 100644 data/Bravura/E264.xml
 create mode 100644 data/Bravura/E265.xml
 create mode 100644 data/Bravura/E266.xml
 create mode 100644 data/Bravura/E267.xml
 create mode 100644 data/Bravura/E268.xml
 create mode 100644 data/Bravura/E269.xml
 create mode 100644 data/Bravura/E26A.xml
 create mode 100644 data/Bravura/E26B.xml
 create mode 100644 data/Bravura/E26C.xml
 create mode 100644 data/Bravura/E26D.xml
 create mode 100644 data/Bravura/E270.xml
 create mode 100644 data/Bravura/E271.xml
 create mode 100644 data/Bravura/E272.xml
 create mode 100644 data/Bravura/E273.xml
 create mode 100644 data/Bravura/E274.xml
 create mode 100644 data/Bravura/E275.xml
 create mode 100644 data/Bravura/E280.xml
 create mode 100644 data/Bravura/E281.xml
 create mode 100644 data/Bravura/E282.xml
 create mode 100644 data/Bravura/E283.xml
 create mode 100644 data/Bravura/E440.xml
 create mode 100644 data/Bravura/E441.xml
 create mode 100644 data/Bravura/E442.xml
 create mode 100644 data/Bravura/E443.xml
 create mode 100644 data/Bravura/E444.xml
 create mode 100644 data/Bravura/E445.xml
 create mode 100644 data/Bravura/E446.xml
 create mode 100644 data/Bravura/E447.xml
 create mode 100644 data/Bravura/E4A0.xml
 create mode 100644 data/Bravura/E4A1.xml
 create mode 100644 data/Bravura/E4A2.xml
 create mode 100644 data/Bravura/E4A3.xml
 create mode 100644 data/Bravura/E4A4.xml
 create mode 100644 data/Bravura/E4A5.xml
 create mode 100644 data/Bravura/E4A6.xml
 create mode 100644 data/Bravura/E4A7.xml
 create mode 100644 data/Bravura/E4A8.xml
 create mode 100644 data/Bravura/E4A9.xml
 create mode 100644 data/Bravura/E4AA.xml
 create mode 100644 data/Bravura/E4AB.xml
 create mode 100644 data/Bravura/E4AC.xml
 create mode 100644 data/Bravura/E4AD.xml
 create mode 100644 data/Bravura/E4AE.xml
 create mode 100644 data/Bravura/E4AF.xml
 create mode 100644 data/Bravura/E4B0.xml
 create mode 100644 data/Bravura/E4B1.xml
 create mode 100644 data/Bravura/E4B2.xml
 create mode 100644 data/Bravura/E4B3.xml
 create mode 100644 data/Bravura/E4B4.xml
 create mode 100644 data/Bravura/E4B5.xml
 create mode 100644 data/Bravura/E4B6.xml
 create mode 100644 data/Bravura/E4B7.xml
 create mode 100644 data/Bravura/E4B8.xml
 create mode 100644 data/Bravura/E4B9.xml
 create mode 100644 data/Bravura/E4BA.xml
 create mode 100644 data/Bravura/E4BB.xml
 create mode 100644 data/Bravura/E4BC.xml
 create mode 100644 data/Bravura/E4BD.xml
 create mode 100644 data/Bravura/E4C0.xml
 create mode 100644 data/Bravura/E4C1.xml
 create mode 100644 data/Bravura/E4C2.xml
 create mode 100644 data/Bravura/E4C3.xml
 create mode 100644 data/Bravura/E4C4.xml
 create mode 100644 data/Bravura/E4C5.xml
 create mode 100644 data/Bravura/E4C6.xml
 create mode 100644 data/Bravura/E4C7.xml
 create mode 100644 data/Bravura/E4C8.xml
 create mode 100644 data/Bravura/E4C9.xml
 create mode 100644 data/Bravura/E4CE.xml
 create mode 100644 data/Bravura/E4E0.xml
 create mode 100644 data/Bravura/E4E1.xml
 create mode 100644 data/Bravura/E4E2.xml
 create mode 100644 data/Bravura/E4E3.xml
 create mode 100644 data/Bravura/E4E4.xml
 create mode 100644 data/Bravura/E4E5.xml
 create mode 100644 data/Bravura/E4E6.xml
 create mode 100644 data/Bravura/E4E7.xml
 create mode 100644 data/Bravura/E4E8.xml
 create mode 100644 data/Bravura/E4E9.xml
 create mode 100644 data/Bravura/E4EA.xml
 create mode 100644 data/Bravura/E4EB.xml
 create mode 100644 data/Bravura/E4EC.xml
 create mode 100644 data/Bravura/E4ED.xml
 create mode 100644 data/Bravura/E4F2.xml
 create mode 100644 data/Bravura/E4F6.xml
 create mode 100644 data/Bravura/E500.xml
 create mode 100644 data/Bravura/E501.xml
 create mode 100644 data/Bravura/E502.xml
 create mode 100644 data/Bravura/E503.xml
 create mode 100644 data/Bravura/E504.xml
 create mode 100644 data/Bravura/E505.xml
 create mode 100644 data/Bravura/E510.xml
 create mode 100644 data/Bravura/E511.xml
 create mode 100644 data/Bravura/E512.xml
 create mode 100644 data/Bravura/E513.xml
 create mode 100644 data/Bravura/E514.xml
 create mode 100644 data/Bravura/E515.xml
 create mode 100644 data/Bravura/E516.xml
 create mode 100644 data/Bravura/E517.xml
 create mode 100644 data/Bravura/E518.xml
 create mode 100644 data/Bravura/E519.xml
 create mode 100644 data/Bravura/E51A.xml
 create mode 100644 data/Bravura/E51B.xml
 create mode 100644 data/Bravura/E51C.xml
 create mode 100644 data/Bravura/E51D.xml
 create mode 100644 data/Bravura/E51E.xml
 create mode 100644 data/Bravura/E520.xml
 create mode 100644 data/Bravura/E521.xml
 create mode 100644 data/Bravura/E522.xml
 create mode 100644 data/Bravura/E523.xml
 create mode 100644 data/Bravura/E524.xml
 create mode 100644 data/Bravura/E525.xml
 create mode 100644 data/Bravura/E526.xml
 create mode 100644 data/Bravura/E527.xml
 create mode 100644 data/Bravura/E528.xml
 create mode 100644 data/Bravura/E529.xml
 create mode 100644 data/Bravura/E52A.xml
 create mode 100644 data/Bravura/E52B.xml
 create mode 100644 data/Bravura/E52C.xml
 create mode 100644 data/Bravura/E52D.xml
 create mode 100644 data/Bravura/E52E.xml
 create mode 100644 data/Bravura/E52F.xml
 create mode 100644 data/Bravura/E530.xml
 create mode 100644 data/Bravura/E531.xml
 create mode 100644 data/Bravura/E532.xml
 create mode 100644 data/Bravura/E533.xml
 create mode 100644 data/Bravura/E534.xml
 create mode 100644 data/Bravura/E535.xml
 create mode 100644 data/Bravura/E536.xml
 create mode 100644 data/Bravura/E537.xml
 create mode 100644 data/Bravura/E538.xml
 create mode 100644 data/Bravura/E539.xml
 create mode 100644 data/Bravura/E53A.xml
 create mode 100644 data/Bravura/E53B.xml
 create mode 100644 data/Bravura/E53C.xml
 create mode 100644 data/Bravura/E53D.xml
 create mode 100644 data/Bravura/E566.xml
 create mode 100644 data/Bravura/E567.xml
 create mode 100644 data/Bravura/E568.xml
 create mode 100644 data/Bravura/E569.xml
 create mode 100644 data/Bravura/E56A.xml
 create mode 100644 data/Bravura/E56B.xml
 create mode 100644 data/Bravura/E56C.xml
 create mode 100644 data/Bravura/E56D.xml
 create mode 100644 data/Bravura/E56E.xml
 create mode 100644 data/Bravura/E56F.xml
 create mode 100644 data/Bravura/E583.xml
 create mode 100644 data/Bravura/E587.xml
 create mode 100644 data/Bravura/E59D.xml
 create mode 100644 data/Bravura/E59E.xml
 create mode 100644 data/Bravura/E5B0.xml
 create mode 100644 data/Bravura/E5B1.xml
 create mode 100644 data/Bravura/E5B2.xml
 create mode 100644 data/Bravura/E5B3.xml
 create mode 100644 data/Bravura/E5B4.xml
 create mode 100644 data/Bravura/E5B5.xml
 create mode 100644 data/Bravura/E5B6.xml
 create mode 100644 data/Bravura/E5B7.xml
 create mode 100644 data/Bravura/E5B8.xml
 create mode 100644 data/Bravura/E5B9.xml
 create mode 100644 data/Bravura/E5BA.xml
 create mode 100644 data/Bravura/E5BB.xml
 create mode 100644 data/Bravura/E5BC.xml
 create mode 100644 data/Bravura/E5BD.xml
 create mode 100644 data/Bravura/E5BE.xml
 create mode 100644 data/Bravura/E5BF.xml
 create mode 100644 data/Bravura/E5C0.xml
 create mode 100644 data/Bravura/E5C1.xml
 create mode 100644 data/Bravura/E5C2.xml
 create mode 100644 data/Bravura/E5C3.xml
 create mode 100644 data/Bravura/E5C4.xml
 create mode 100644 data/Bravura/E5C5.xml
 create mode 100644 data/Bravura/E5C6.xml
 create mode 100644 data/Bravura/E5C7.xml
 create mode 100644 data/Bravura/E5C8.xml
 create mode 100644 data/Bravura/E5E5.xml
 create mode 100644 data/Bravura/E5E6.xml
 create mode 100644 data/Bravura/E5E7.xml
 create mode 100644 data/Bravura/E610.xml
 create mode 100644 data/Bravura/E611.xml
 create mode 100644 data/Bravura/E612.xml
 create mode 100644 data/Bravura/E613.xml
 create mode 100644 data/Bravura/E614.xml
 create mode 100644 data/Bravura/E630.xml
 create mode 100644 data/Bravura/E631.xml
 create mode 100644 data/Bravura/E632.xml
 create mode 100644 data/Bravura/E633.xml
 create mode 100644 data/Bravura/E638.xml
 create mode 100644 data/Bravura/E645.xml
 create mode 100644 data/Bravura/E650.xml
 create mode 100644 data/Bravura/E651.xml
 create mode 100644 data/Bravura/E655.xml
 create mode 100644 data/Bravura/E659.xml
 create mode 100644 data/Bravura/E65A.xml
 create mode 100644 data/Bravura/E880.xml
 create mode 100644 data/Bravura/E881.xml
 create mode 100644 data/Bravura/E882.xml
 create mode 100644 data/Bravura/E883.xml
 create mode 100644 data/Bravura/E884.xml
 create mode 100644 data/Bravura/E885.xml
 create mode 100644 data/Bravura/E886.xml
 create mode 100644 data/Bravura/E887.xml
 create mode 100644 data/Bravura/E888.xml
 create mode 100644 data/Bravura/E889.xml
 create mode 100644 data/Bravura/E88A.xml
 create mode 100644 data/Bravura/E901.xml
 create mode 100644 data/Bravura/E902.xml
 create mode 100644 data/Bravura/E904.xml
 create mode 100644 data/Bravura/E906.xml
 create mode 100644 data/Bravura/E907.xml
 create mode 100644 data/Bravura/E908.xml
 create mode 100644 data/Bravura/E909.xml
 create mode 100644 data/Bravura/E90A.xml
 create mode 100644 data/Bravura/E90B.xml
 create mode 100644 data/Bravura/E910.xml
 create mode 100644 data/Bravura/E911.xml
 create mode 100644 data/Bravura/E912.xml
 create mode 100644 data/Bravura/E913.xml
 create mode 100644 data/Bravura/E914.xml
 create mode 100644 data/Bravura/E915.xml
 create mode 100644 data/Bravura/E916.xml
 create mode 100644 data/Bravura/E917.xml
 create mode 100644 data/Bravura/E918.xml
 create mode 100644 data/Bravura/E919.xml
 create mode 100644 data/Bravura/E91A.xml
 create mode 100644 data/Bravura/E91B.xml
 create mode 100644 data/Bravura/E91C.xml
 create mode 100644 data/Bravura/E91D.xml
 create mode 100644 data/Bravura/E91E.xml
 create mode 100644 data/Bravura/E91F.xml
 create mode 100644 data/Bravura/E920.xml
 create mode 100644 data/Bravura/E921.xml
 create mode 100644 data/Bravura/E922.xml
 create mode 100644 data/Bravura/E923.xml
 create mode 100644 data/Bravura/E924.xml
 create mode 100644 data/Bravura/E925.xml
 create mode 100644 data/Bravura/E938.xml
 create mode 100644 data/Bravura/E939.xml
 create mode 100644 data/Bravura/E93C.xml
 create mode 100644 data/Bravura/E93D.xml
 create mode 100644 data/Bravura/E93E.xml
 create mode 100644 data/Bravura/E93F.xml
 create mode 100644 data/Bravura/E949.xml
 create mode 100644 data/Bravura/E94A.xml
 create mode 100644 data/Bravura/E94B.xml
 create mode 100644 data/Bravura/E94C.xml
 create mode 100644 data/Bravura/E990.xml
 create mode 100644 data/Bravura/E991.xml
 create mode 100644 data/Bravura/E996.xml
 create mode 100644 data/Bravura/E99B.xml
 create mode 100644 data/Bravura/E99E.xml
 create mode 100644 data/Bravura/E99F.xml
 create mode 100644 data/Bravura/E9B4.xml
 create mode 100644 data/Bravura/E9B5.xml
 create mode 100644 data/Bravura/E9B6.xml
 create mode 100644 data/Bravura/E9B7.xml
 create mode 100644 data/Bravura/E9B9.xml
 create mode 100644 data/Bravura/E9BA.xml
 create mode 100644 data/Bravura/E9BB.xml
 create mode 100644 data/Bravura/E9BC.xml
 create mode 100644 data/Bravura/E9E0.xml
 create mode 100644 data/Bravura/E9E1.xml
 create mode 100644 data/Bravura/E9E2.xml
 create mode 100644 data/Bravura/E9E3.xml
 create mode 100644 data/Bravura/E9F0.xml
 create mode 100644 data/Bravura/E9F1.xml
 create mode 100644 data/Bravura/E9F2.xml
 create mode 100644 data/Bravura/E9F3.xml
 create mode 100644 data/Bravura/E9F4.xml
 create mode 100644 data/Bravura/E9F5.xml
 create mode 100644 data/Bravura/E9F6.xml
 create mode 100644 data/Bravura/E9F7.xml
 create mode 100644 data/Bravura/E9F8.xml
 create mode 100644 data/Bravura/EA02.xml
 create mode 100644 data/Bravura/EA06.xml
 create mode 100644 data/Bravura/EAA4.xml
 create mode 100644 data/Bravura/EAA9.xml
 create mode 100644 data/Bravura/EAAA.xml
 create mode 100644 data/Bravura/EAAD.xml
 create mode 100644 data/Bravura/EAAE.xml
 create mode 100644 data/Bravura/EAAF.xml
 create mode 100644 data/Bravura/EBA7.xml
 create mode 100644 data/Bravura/EBA8.xml
 create mode 100644 data/Bravura/EBA9.xml
 create mode 100644 data/Bravura/EBAA.xml
 create mode 100644 data/Bravura/EBAB.xml
 create mode 100644 data/Bravura/EBAC.xml
 create mode 100644 data/Bravura/EBC0.xml
 create mode 100644 data/Bravura/EBC1.xml
 create mode 100644 data/Bravura/EBC2.xml
 create mode 100644 data/Bravura/EBC3.xml
 create mode 100644 data/Bravura/EBC4.xml
 create mode 100644 data/Bravura/EBC5.xml
 create mode 100644 data/Bravura/EBC6.xml
 create mode 100644 data/Bravura/EBC7.xml
 create mode 100644 data/Bravura/EBC8.xml
 create mode 100644 data/Bravura/EBC9.xml
 create mode 100644 data/Bravura/EBCA.xml
 create mode 100644 data/Bravura/EBCB.xml
 create mode 100644 data/Bravura/EBCC.xml
 create mode 100644 data/Bravura/EBE0.xml
 create mode 100644 data/Bravura/EBE1.xml
 create mode 100644 data/Bravura/EBE2.xml
 create mode 100644 data/Bravura/EBE3.xml
 create mode 100644 data/Bravura/EBE4.xml
 create mode 100644 data/Bravura/EBE5.xml
 create mode 100644 data/Bravura/EBE6.xml
 create mode 100644 data/Bravura/EBE7.xml
 create mode 100644 data/Bravura/EBE8.xml
 create mode 100644 data/Bravura/EBE9.xml
 create mode 100644 data/Bravura/ED40.xml
 create mode 100644 data/Bravura/ED41.xml
 create mode 100644 data/Gootville.xml
 create mode 100644 data/Gootville/E003.xml
 create mode 100644 data/Gootville/E004.xml
 create mode 100644 data/Gootville/E043.xml
 create mode 100644 data/Gootville/E044.xml
 create mode 100644 data/Gootville/E047.xml
 create mode 100644 data/Gootville/E048.xml
 create mode 100644 data/Gootville/E049.xml
 create mode 100644 data/Gootville/E050.xml
 create mode 100644 data/Gootville/E051.xml
 create mode 100644 data/Gootville/E052.xml
 create mode 100644 data/Gootville/E053.xml
 create mode 100644 data/Gootville/E054.xml
 create mode 100644 data/Gootville/E05C.xml
 create mode 100644 data/Gootville/E05D.xml
 create mode 100644 data/Gootville/E062.xml
 create mode 100644 data/Gootville/E063.xml
 create mode 100644 data/Gootville/E064.xml
 create mode 100644 data/Gootville/E065.xml
 create mode 100644 data/Gootville/E066.xml
 create mode 100644 data/Gootville/E069.xml
 create mode 100644 data/Gootville/E06A.xml
 create mode 100644 data/Gootville/E080.xml
 create mode 100644 data/Gootville/E081.xml
 create mode 100644 data/Gootville/E082.xml
 create mode 100644 data/Gootville/E083.xml
 create mode 100644 data/Gootville/E084.xml
 create mode 100644 data/Gootville/E085.xml
 create mode 100644 data/Gootville/E086.xml
 create mode 100644 data/Gootville/E087.xml
 create mode 100644 data/Gootville/E088.xml
 create mode 100644 data/Gootville/E089.xml
 create mode 100644 data/Gootville/E08A.xml
 create mode 100644 data/Gootville/E08B.xml
 create mode 100644 data/Gootville/E092.xml
 create mode 100644 data/Gootville/E093.xml
 create mode 100644 data/Gootville/E094.xml
 create mode 100644 data/Gootville/E095.xml
 create mode 100644 data/Gootville/E0A0.xml
 create mode 100644 data/Gootville/E0A1.xml
 create mode 100644 data/Gootville/E0A2.xml
 create mode 100644 data/Gootville/E0A3.xml
 create mode 100644 data/Gootville/E0A4.xml
 create mode 100644 data/Gootville/E0A9.xml
 create mode 100644 data/Gootville/E0D9.xml
 create mode 100644 data/Gootville/E0DA.xml
 create mode 100644 data/Gootville/E0DB.xml
 create mode 100644 data/Gootville/E0DC.xml
 create mode 100644 data/Gootville/E0DD.xml
 create mode 100644 data/Gootville/E0DE.xml
 create mode 100644 data/Gootville/E0F5.xml
 create mode 100644 data/Gootville/E0F6.xml
 create mode 100644 data/Gootville/E101.xml
 create mode 100644 data/Gootville/E102.xml
 create mode 100644 data/Gootville/E103.xml
 create mode 100644 data/Gootville/E240.xml
 create mode 100644 data/Gootville/E241.xml
 create mode 100644 data/Gootville/E242.xml
 create mode 100644 data/Gootville/E243.xml
 create mode 100644 data/Gootville/E244.xml
 create mode 100644 data/Gootville/E245.xml
 create mode 100644 data/Gootville/E246.xml
 create mode 100644 data/Gootville/E247.xml
 create mode 100644 data/Gootville/E248.xml
 create mode 100644 data/Gootville/E249.xml
 create mode 100644 data/Gootville/E260.xml
 create mode 100644 data/Gootville/E261.xml
 create mode 100644 data/Gootville/E262.xml
 create mode 100644 data/Gootville/E263.xml
 create mode 100644 data/Gootville/E264.xml
 create mode 100644 data/Gootville/E26A.xml
 create mode 100644 data/Gootville/E26B.xml
 create mode 100644 data/Gootville/E270.xml
 create mode 100644 data/Gootville/E271.xml
 create mode 100644 data/Gootville/E272.xml
 create mode 100644 data/Gootville/E273.xml
 create mode 100644 data/Gootville/E274.xml
 create mode 100644 data/Gootville/E275.xml
 create mode 100644 data/Gootville/E280.xml
 create mode 100644 data/Gootville/E281.xml
 create mode 100644 data/Gootville/E282.xml
 create mode 100644 data/Gootville/E283.xml
 create mode 100644 data/Gootville/E440.xml
 create mode 100644 data/Gootville/E441.xml
 create mode 100644 data/Gootville/E442.xml
 create mode 100644 data/Gootville/E443.xml
 create mode 100644 data/Gootville/E444.xml
 create mode 100644 data/Gootville/E445.xml
 create mode 100644 data/Gootville/E446.xml
 create mode 100644 data/Gootville/E447.xml
 create mode 100644 data/Gootville/E4A0.xml
 create mode 100644 data/Gootville/E4A1.xml
 create mode 100644 data/Gootville/E4A2.xml
 create mode 100644 data/Gootville/E4A3.xml
 create mode 100644 data/Gootville/E4A4.xml
 create mode 100644 data/Gootville/E4A5.xml
 create mode 100644 data/Gootville/E4A6.xml
 create mode 100644 data/Gootville/E4A7.xml
 create mode 100644 data/Gootville/E4A8.xml
 create mode 100644 data/Gootville/E4A9.xml
 create mode 100644 data/Gootville/E4AC.xml
 create mode 100644 data/Gootville/E4AD.xml
 create mode 100644 data/Gootville/E4B2.xml
 create mode 100644 data/Gootville/E4B3.xml
 create mode 100644 data/Gootville/E4B6.xml
 create mode 100644 data/Gootville/E4B7.xml
 create mode 100644 data/Gootville/E4C0.xml
 create mode 100644 data/Gootville/E4C1.xml
 create mode 100644 data/Gootville/E4C4.xml
 create mode 100644 data/Gootville/E4C5.xml
 create mode 100644 data/Gootville/E4C6.xml
 create mode 100644 data/Gootville/E4C7.xml
 create mode 100644 data/Gootville/E4C8.xml
 create mode 100644 data/Gootville/E4C9.xml
 create mode 100644 data/Gootville/E4CE.xml
 create mode 100644 data/Gootville/E4E1.xml
 create mode 100644 data/Gootville/E4E2.xml
 create mode 100644 data/Gootville/E4E3.xml
 create mode 100644 data/Gootville/E4E4.xml
 create mode 100644 data/Gootville/E4E5.xml
 create mode 100644 data/Gootville/E4E6.xml
 create mode 100644 data/Gootville/E4E7.xml
 create mode 100644 data/Gootville/E4E8.xml
 create mode 100644 data/Gootville/E4E9.xml
 create mode 100644 data/Gootville/E4EA.xml
 create mode 100644 data/Gootville/E4F2.xml
 create mode 100644 data/Gootville/E510.xml
 create mode 100644 data/Gootville/E514.xml
 create mode 100644 data/Gootville/E517.xml
 create mode 100644 data/Gootville/E51A.xml
 create mode 100644 data/Gootville/E51B.xml
 create mode 100644 data/Gootville/E520.xml
 create mode 100644 data/Gootville/E521.xml
 create mode 100644 data/Gootville/E522.xml
 create mode 100644 data/Gootville/E523.xml
 create mode 100644 data/Gootville/E524.xml
 create mode 100644 data/Gootville/E525.xml
 create mode 100644 data/Gootville/E526.xml
 create mode 100644 data/Gootville/E527.xml
 create mode 100644 data/Gootville/E528.xml
 create mode 100644 data/Gootville/E529.xml
 create mode 100644 data/Gootville/E52A.xml
 create mode 100644 data/Gootville/E52B.xml
 create mode 100644 data/Gootville/E52C.xml
 create mode 100644 data/Gootville/E52D.xml
 create mode 100644 data/Gootville/E52E.xml
 create mode 100644 data/Gootville/E52F.xml
 create mode 100644 data/Gootville/E530.xml
 create mode 100644 data/Gootville/E531.xml
 create mode 100644 data/Gootville/E532.xml
 create mode 100644 data/Gootville/E533.xml
 create mode 100644 data/Gootville/E534.xml
 create mode 100644 data/Gootville/E535.xml
 create mode 100644 data/Gootville/E536.xml
 create mode 100644 data/Gootville/E537.xml
 create mode 100644 data/Gootville/E538.xml
 create mode 100644 data/Gootville/E539.xml
 create mode 100644 data/Gootville/E53A.xml
 create mode 100644 data/Gootville/E53B.xml
 create mode 100644 data/Gootville/E53C.xml
 create mode 100644 data/Gootville/E53D.xml
 create mode 100644 data/Gootville/E566.xml
 create mode 100644 data/Gootville/E567.xml
 create mode 100644 data/Gootville/E568.xml
 create mode 100644 data/Gootville/E569.xml
 create mode 100644 data/Gootville/E56C.xml
 create mode 100644 data/Gootville/E56D.xml
 create mode 100644 data/Gootville/E56E.xml
 create mode 100644 data/Gootville/E59D.xml
 create mode 100644 data/Gootville/E59E.xml
 create mode 100644 data/Gootville/E5B0.xml
 create mode 100644 data/Gootville/E5E5.xml
 create mode 100644 data/Gootville/E5E7.xml
 create mode 100644 data/Gootville/E610.xml
 create mode 100644 data/Gootville/E611.xml
 create mode 100644 data/Gootville/E612.xml
 create mode 100644 data/Gootville/E613.xml
 create mode 100644 data/Gootville/E630.xml
 create mode 100644 data/Gootville/E631.xml
 create mode 100644 data/Gootville/E650.xml
 create mode 100644 data/Gootville/E651.xml
 create mode 100644 data/Gootville/E655.xml
 create mode 100644 data/Gootville/EAA4.xml
 create mode 100644 data/Gootville/EAA9.xml
 create mode 100644 data/Gootville/EAAA.xml
 create mode 100644 data/Gootville/EAAD.xml
 create mode 100644 data/Gootville/EAAE.xml
 create mode 100644 data/Gootville/EAAF.xml
 create mode 100644 data/Leipzig.xml
 create mode 100644 data/Leipzig/E000.xml
 create mode 100644 data/Leipzig/E003.xml
 create mode 100644 data/Leipzig/E004.xml
 create mode 100644 data/Leipzig/E043.xml
 create mode 100644 data/Leipzig/E044.xml
 create mode 100644 data/Leipzig/E045.xml
 create mode 100644 data/Leipzig/E046.xml
 create mode 100644 data/Leipzig/E047.xml
 create mode 100644 data/Leipzig/E048.xml
 create mode 100644 data/Leipzig/E049.xml
 create mode 100644 data/Leipzig/E04B.xml
 create mode 100644 data/Leipzig/E050.xml
 create mode 100644 data/Leipzig/E051.xml
 create mode 100644 data/Leipzig/E052.xml
 create mode 100644 data/Leipzig/E053.xml
 create mode 100644 data/Leipzig/E054.xml
 create mode 100644 data/Leipzig/E055.xml
 create mode 100644 data/Leipzig/E056.xml
 create mode 100644 data/Leipzig/E05C.xml
 create mode 100644 data/Leipzig/E05D.xml
 create mode 100644 data/Leipzig/E062.xml
 create mode 100644 data/Leipzig/E063.xml
 create mode 100644 data/Leipzig/E064.xml
 create mode 100644 data/Leipzig/E065.xml
 create mode 100644 data/Leipzig/E066.xml
 create mode 100644 data/Leipzig/E069.xml
 create mode 100644 data/Leipzig/E06A.xml
 create mode 100644 data/Leipzig/E073.xml
 create mode 100644 data/Leipzig/E074.xml
 create mode 100644 data/Leipzig/E075.xml
 create mode 100644 data/Leipzig/E076.xml
 create mode 100644 data/Leipzig/E077.xml
 create mode 100644 data/Leipzig/E080.xml
 create mode 100644 data/Leipzig/E081.xml
 create mode 100644 data/Leipzig/E082.xml
 create mode 100644 data/Leipzig/E083.xml
 create mode 100644 data/Leipzig/E084.xml
 create mode 100644 data/Leipzig/E085.xml
 create mode 100644 data/Leipzig/E086.xml
 create mode 100644 data/Leipzig/E087.xml
 create mode 100644 data/Leipzig/E088.xml
 create mode 100644 data/Leipzig/E089.xml
 create mode 100644 data/Leipzig/E08A.xml
 create mode 100644 data/Leipzig/E08B.xml
 create mode 100644 data/Leipzig/E08C.xml
 create mode 100644 data/Leipzig/E08D.xml
 create mode 100644 data/Leipzig/E08E.xml
 create mode 100644 data/Leipzig/E08F.xml
 create mode 100644 data/Leipzig/E090.xml
 create mode 100644 data/Leipzig/E091.xml
 create mode 100644 data/Leipzig/E092.xml
 create mode 100644 data/Leipzig/E093.xml
 create mode 100644 data/Leipzig/E094.xml
 create mode 100644 data/Leipzig/E095.xml
 create mode 100644 data/Leipzig/E0A0.xml
 create mode 100644 data/Leipzig/E0A1.xml
 create mode 100644 data/Leipzig/E0A2.xml
 create mode 100644 data/Leipzig/E0A3.xml
 create mode 100644 data/Leipzig/E0A4.xml
 create mode 100644 data/Leipzig/E0A5.xml
 create mode 100644 data/Leipzig/E0A9.xml
 create mode 100644 data/Leipzig/E0AF.xml
 create mode 100644 data/Leipzig/E0B5.xml
 create mode 100644 data/Leipzig/E0B6.xml
 create mode 100644 data/Leipzig/E0B7.xml
 create mode 100644 data/Leipzig/E0D9.xml
 create mode 100644 data/Leipzig/E0DA.xml
 create mode 100644 data/Leipzig/E0DB.xml
 create mode 100644 data/Leipzig/E0DC.xml
 create mode 100644 data/Leipzig/E0DD.xml
 create mode 100644 data/Leipzig/E0DE.xml
 create mode 100644 data/Leipzig/E0F5.xml
 create mode 100644 data/Leipzig/E0F6.xml
 create mode 100644 data/Leipzig/E0FA.xml
 create mode 100644 data/Leipzig/E101.xml
 create mode 100644 data/Leipzig/E102.xml
 create mode 100644 data/Leipzig/E103.xml
 create mode 100644 data/Leipzig/E220.xml
 create mode 100644 data/Leipzig/E221.xml
 create mode 100644 data/Leipzig/E222.xml
 create mode 100644 data/Leipzig/E223.xml
 create mode 100644 data/Leipzig/E224.xml
 create mode 100644 data/Leipzig/E22A.xml
 create mode 100644 data/Leipzig/E240.xml
 create mode 100644 data/Leipzig/E241.xml
 create mode 100644 data/Leipzig/E242.xml
 create mode 100644 data/Leipzig/E243.xml
 create mode 100644 data/Leipzig/E244.xml
 create mode 100644 data/Leipzig/E245.xml
 create mode 100644 data/Leipzig/E246.xml
 create mode 100644 data/Leipzig/E247.xml
 create mode 100644 data/Leipzig/E248.xml
 create mode 100644 data/Leipzig/E249.xml
 create mode 100644 data/Leipzig/E24A.xml
 create mode 100644 data/Leipzig/E24B.xml
 create mode 100644 data/Leipzig/E24C.xml
 create mode 100644 data/Leipzig/E24D.xml
 create mode 100644 data/Leipzig/E24E.xml
 create mode 100644 data/Leipzig/E24F.xml
 create mode 100644 data/Leipzig/E260.xml
 create mode 100644 data/Leipzig/E261.xml
 create mode 100644 data/Leipzig/E262.xml
 create mode 100644 data/Leipzig/E263.xml
 create mode 100644 data/Leipzig/E264.xml
 create mode 100644 data/Leipzig/E265.xml
 create mode 100644 data/Leipzig/E266.xml
 create mode 100644 data/Leipzig/E267.xml
 create mode 100644 data/Leipzig/E268.xml
 create mode 100644 data/Leipzig/E269.xml
 create mode 100644 data/Leipzig/E26A.xml
 create mode 100644 data/Leipzig/E26B.xml
 create mode 100644 data/Leipzig/E26C.xml
 create mode 100644 data/Leipzig/E26D.xml
 create mode 100644 data/Leipzig/E270.xml
 create mode 100644 data/Leipzig/E271.xml
 create mode 100644 data/Leipzig/E272.xml
 create mode 100644 data/Leipzig/E273.xml
 create mode 100644 data/Leipzig/E274.xml
 create mode 100644 data/Leipzig/E275.xml
 create mode 100644 data/Leipzig/E280.xml
 create mode 100644 data/Leipzig/E281.xml
 create mode 100644 data/Leipzig/E282.xml
 create mode 100644 data/Leipzig/E283.xml
 create mode 100644 data/Leipzig/E440.xml
 create mode 100644 data/Leipzig/E441.xml
 create mode 100644 data/Leipzig/E442.xml
 create mode 100644 data/Leipzig/E443.xml
 create mode 100644 data/Leipzig/E444.xml
 create mode 100644 data/Leipzig/E445.xml
 create mode 100644 data/Leipzig/E446.xml
 create mode 100644 data/Leipzig/E447.xml
 create mode 100644 data/Leipzig/E4A0.xml
 create mode 100644 data/Leipzig/E4A1.xml
 create mode 100644 data/Leipzig/E4A2.xml
 create mode 100644 data/Leipzig/E4A3.xml
 create mode 100644 data/Leipzig/E4A4.xml
 create mode 100644 data/Leipzig/E4A5.xml
 create mode 100644 data/Leipzig/E4A6.xml
 create mode 100644 data/Leipzig/E4A7.xml
 create mode 100644 data/Leipzig/E4A8.xml
 create mode 100644 data/Leipzig/E4A9.xml
 create mode 100644 data/Leipzig/E4AA.xml
 create mode 100644 data/Leipzig/E4AB.xml
 create mode 100644 data/Leipzig/E4AC.xml
 create mode 100644 data/Leipzig/E4AD.xml
 create mode 100644 data/Leipzig/E4AE.xml
 create mode 100644 data/Leipzig/E4AF.xml
 create mode 100644 data/Leipzig/E4B0.xml
 create mode 100644 data/Leipzig/E4B1.xml
 create mode 100644 data/Leipzig/E4B2.xml
 create mode 100644 data/Leipzig/E4B3.xml
 create mode 100644 data/Leipzig/E4B4.xml
 create mode 100644 data/Leipzig/E4B5.xml
 create mode 100644 data/Leipzig/E4B6.xml
 create mode 100644 data/Leipzig/E4B7.xml
 create mode 100644 data/Leipzig/E4B8.xml
 create mode 100644 data/Leipzig/E4B9.xml
 create mode 100644 data/Leipzig/E4BA.xml
 create mode 100644 data/Leipzig/E4BB.xml
 create mode 100644 data/Leipzig/E4BC.xml
 create mode 100644 data/Leipzig/E4BD.xml
 create mode 100644 data/Leipzig/E4C0.xml
 create mode 100644 data/Leipzig/E4C1.xml
 create mode 100644 data/Leipzig/E4C2.xml
 create mode 100644 data/Leipzig/E4C3.xml
 create mode 100644 data/Leipzig/E4C4.xml
 create mode 100644 data/Leipzig/E4C5.xml
 create mode 100644 data/Leipzig/E4C6.xml
 create mode 100644 data/Leipzig/E4C7.xml
 create mode 100644 data/Leipzig/E4C8.xml
 create mode 100644 data/Leipzig/E4C9.xml
 create mode 100644 data/Leipzig/E4CE.xml
 create mode 100644 data/Leipzig/E4E0.xml
 create mode 100644 data/Leipzig/E4E1.xml
 create mode 100644 data/Leipzig/E4E2.xml
 create mode 100644 data/Leipzig/E4E3.xml
 create mode 100644 data/Leipzig/E4E4.xml
 create mode 100644 data/Leipzig/E4E5.xml
 create mode 100644 data/Leipzig/E4E6.xml
 create mode 100644 data/Leipzig/E4E7.xml
 create mode 100644 data/Leipzig/E4E8.xml
 create mode 100644 data/Leipzig/E4E9.xml
 create mode 100644 data/Leipzig/E4EA.xml
 create mode 100644 data/Leipzig/E4EB.xml
 create mode 100644 data/Leipzig/E4EC.xml
 create mode 100644 data/Leipzig/E4ED.xml
 create mode 100644 data/Leipzig/E4F2.xml
 create mode 100644 data/Leipzig/E4F6.xml
 create mode 100644 data/Leipzig/E500.xml
 create mode 100644 data/Leipzig/E501.xml
 create mode 100644 data/Leipzig/E502.xml
 create mode 100644 data/Leipzig/E503.xml
 create mode 100644 data/Leipzig/E504.xml
 create mode 100644 data/Leipzig/E505.xml
 create mode 100644 data/Leipzig/E510.xml
 create mode 100644 data/Leipzig/E511.xml
 create mode 100644 data/Leipzig/E512.xml
 create mode 100644 data/Leipzig/E513.xml
 create mode 100644 data/Leipzig/E514.xml
 create mode 100644 data/Leipzig/E515.xml
 create mode 100644 data/Leipzig/E516.xml
 create mode 100644 data/Leipzig/E517.xml
 create mode 100644 data/Leipzig/E518.xml
 create mode 100644 data/Leipzig/E519.xml
 create mode 100644 data/Leipzig/E51A.xml
 create mode 100644 data/Leipzig/E51B.xml
 create mode 100644 data/Leipzig/E51C.xml
 create mode 100644 data/Leipzig/E51D.xml
 create mode 100644 data/Leipzig/E51E.xml
 create mode 100644 data/Leipzig/E520.xml
 create mode 100644 data/Leipzig/E521.xml
 create mode 100644 data/Leipzig/E522.xml
 create mode 100644 data/Leipzig/E523.xml
 create mode 100644 data/Leipzig/E524.xml
 create mode 100644 data/Leipzig/E525.xml
 create mode 100644 data/Leipzig/E526.xml
 create mode 100644 data/Leipzig/E527.xml
 create mode 100644 data/Leipzig/E528.xml
 create mode 100644 data/Leipzig/E529.xml
 create mode 100644 data/Leipzig/E52A.xml
 create mode 100644 data/Leipzig/E52B.xml
 create mode 100644 data/Leipzig/E52C.xml
 create mode 100644 data/Leipzig/E52D.xml
 create mode 100644 data/Leipzig/E52E.xml
 create mode 100644 data/Leipzig/E52F.xml
 create mode 100644 data/Leipzig/E530.xml
 create mode 100644 data/Leipzig/E531.xml
 create mode 100644 data/Leipzig/E532.xml
 create mode 100644 data/Leipzig/E533.xml
 create mode 100644 data/Leipzig/E534.xml
 create mode 100644 data/Leipzig/E535.xml
 create mode 100644 data/Leipzig/E536.xml
 create mode 100644 data/Leipzig/E537.xml
 create mode 100644 data/Leipzig/E538.xml
 create mode 100644 data/Leipzig/E539.xml
 create mode 100644 data/Leipzig/E53A.xml
 create mode 100644 data/Leipzig/E53B.xml
 create mode 100644 data/Leipzig/E53C.xml
 create mode 100644 data/Leipzig/E53D.xml
 create mode 100644 data/Leipzig/E566.xml
 create mode 100644 data/Leipzig/E567.xml
 create mode 100644 data/Leipzig/E568.xml
 create mode 100644 data/Leipzig/E569.xml
 create mode 100644 data/Leipzig/E56A.xml
 create mode 100644 data/Leipzig/E56B.xml
 create mode 100644 data/Leipzig/E56C.xml
 create mode 100644 data/Leipzig/E56D.xml
 create mode 100644 data/Leipzig/E56E.xml
 create mode 100644 data/Leipzig/E56F.xml
 create mode 100644 data/Leipzig/E583.xml
 create mode 100644 data/Leipzig/E587.xml
 create mode 100644 data/Leipzig/E59D.xml
 create mode 100644 data/Leipzig/E59E.xml
 create mode 100644 data/Leipzig/E5B0.xml
 create mode 100644 data/Leipzig/E5B1.xml
 create mode 100644 data/Leipzig/E5B2.xml
 create mode 100644 data/Leipzig/E5B3.xml
 create mode 100644 data/Leipzig/E5B4.xml
 create mode 100644 data/Leipzig/E5B5.xml
 create mode 100644 data/Leipzig/E5B6.xml
 create mode 100644 data/Leipzig/E5B7.xml
 create mode 100644 data/Leipzig/E5B8.xml
 create mode 100644 data/Leipzig/E5B9.xml
 create mode 100644 data/Leipzig/E5BA.xml
 create mode 100644 data/Leipzig/E5BB.xml
 create mode 100644 data/Leipzig/E5BC.xml
 create mode 100644 data/Leipzig/E5BD.xml
 create mode 100644 data/Leipzig/E5BE.xml
 create mode 100644 data/Leipzig/E5BF.xml
 create mode 100644 data/Leipzig/E5C0.xml
 create mode 100644 data/Leipzig/E5C1.xml
 create mode 100644 data/Leipzig/E5C2.xml
 create mode 100644 data/Leipzig/E5C3.xml
 create mode 100644 data/Leipzig/E5C4.xml
 create mode 100644 data/Leipzig/E5C5.xml
 create mode 100644 data/Leipzig/E5C6.xml
 create mode 100644 data/Leipzig/E5C7.xml
 create mode 100644 data/Leipzig/E5C8.xml
 create mode 100644 data/Leipzig/E5E5.xml
 create mode 100644 data/Leipzig/E5E6.xml
 create mode 100644 data/Leipzig/E5E7.xml
 create mode 100644 data/Leipzig/E610.xml
 create mode 100644 data/Leipzig/E611.xml
 create mode 100644 data/Leipzig/E612.xml
 create mode 100644 data/Leipzig/E613.xml
 create mode 100644 data/Leipzig/E614.xml
 create mode 100644 data/Leipzig/E630.xml
 create mode 100644 data/Leipzig/E631.xml
 create mode 100644 data/Leipzig/E632.xml
 create mode 100644 data/Leipzig/E633.xml
 create mode 100644 data/Leipzig/E638.xml
 create mode 100644 data/Leipzig/E645.xml
 create mode 100644 data/Leipzig/E650.xml
 create mode 100644 data/Leipzig/E651.xml
 create mode 100644 data/Leipzig/E655.xml
 create mode 100644 data/Leipzig/E659.xml
 create mode 100644 data/Leipzig/E65A.xml
 create mode 100644 data/Leipzig/E880.xml
 create mode 100644 data/Leipzig/E881.xml
 create mode 100644 data/Leipzig/E882.xml
 create mode 100644 data/Leipzig/E883.xml
 create mode 100644 data/Leipzig/E884.xml
 create mode 100644 data/Leipzig/E885.xml
 create mode 100644 data/Leipzig/E886.xml
 create mode 100644 data/Leipzig/E887.xml
 create mode 100644 data/Leipzig/E888.xml
 create mode 100644 data/Leipzig/E889.xml
 create mode 100644 data/Leipzig/E88A.xml
 create mode 100644 data/Leipzig/E901.xml
 create mode 100644 data/Leipzig/E902.xml
 create mode 100644 data/Leipzig/E904.xml
 create mode 100644 data/Leipzig/E906.xml
 create mode 100644 data/Leipzig/E907.xml
 create mode 100644 data/Leipzig/E908.xml
 create mode 100644 data/Leipzig/E909.xml
 create mode 100644 data/Leipzig/E90A.xml
 create mode 100644 data/Leipzig/E90B.xml
 create mode 100644 data/Leipzig/E910.xml
 create mode 100644 data/Leipzig/E911.xml
 create mode 100644 data/Leipzig/E912.xml
 create mode 100644 data/Leipzig/E913.xml
 create mode 100644 data/Leipzig/E914.xml
 create mode 100644 data/Leipzig/E915.xml
 create mode 100644 data/Leipzig/E916.xml
 create mode 100644 data/Leipzig/E917.xml
 create mode 100644 data/Leipzig/E918.xml
 create mode 100644 data/Leipzig/E919.xml
 create mode 100644 data/Leipzig/E91A.xml
 create mode 100644 data/Leipzig/E91B.xml
 create mode 100644 data/Leipzig/E91C.xml
 create mode 100644 data/Leipzig/E91D.xml
 create mode 100644 data/Leipzig/E91E.xml
 create mode 100644 data/Leipzig/E91F.xml
 create mode 100644 data/Leipzig/E920.xml
 create mode 100644 data/Leipzig/E921.xml
 create mode 100644 data/Leipzig/E922.xml
 create mode 100644 data/Leipzig/E923.xml
 create mode 100644 data/Leipzig/E924.xml
 create mode 100644 data/Leipzig/E925.xml
 create mode 100644 data/Leipzig/E938.xml
 create mode 100644 data/Leipzig/E939.xml
 create mode 100644 data/Leipzig/E93C.xml
 create mode 100644 data/Leipzig/E93D.xml
 create mode 100644 data/Leipzig/E93E.xml
 create mode 100644 data/Leipzig/E93F.xml
 create mode 100644 data/Leipzig/E949.xml
 create mode 100644 data/Leipzig/E94A.xml
 create mode 100644 data/Leipzig/E94B.xml
 create mode 100644 data/Leipzig/E94C.xml
 create mode 100644 data/Leipzig/E9E0.xml
 create mode 100644 data/Leipzig/E9E1.xml
 create mode 100644 data/Leipzig/E9E2.xml
 create mode 100644 data/Leipzig/E9E3.xml
 create mode 100644 data/Leipzig/E9F0.xml
 create mode 100644 data/Leipzig/E9F1.xml
 create mode 100644 data/Leipzig/E9F2.xml
 create mode 100644 data/Leipzig/E9F3.xml
 create mode 100644 data/Leipzig/E9F4.xml
 create mode 100644 data/Leipzig/E9F5.xml
 create mode 100644 data/Leipzig/E9F6.xml
 create mode 100644 data/Leipzig/E9F7.xml
 create mode 100644 data/Leipzig/E9F8.xml
 create mode 100644 data/Leipzig/EA02.xml
 create mode 100644 data/Leipzig/EA06.xml
 create mode 100644 data/Leipzig/EAA4.xml
 create mode 100644 data/Leipzig/EAA9.xml
 create mode 100644 data/Leipzig/EAAA.xml
 create mode 100644 data/Leipzig/EAAD.xml
 create mode 100644 data/Leipzig/EAAE.xml
 create mode 100644 data/Leipzig/EAAF.xml
 create mode 100644 data/Leipzig/EBA7.xml
 create mode 100644 data/Leipzig/EBA8.xml
 create mode 100644 data/Leipzig/EBA9.xml
 create mode 100644 data/Leipzig/EBAA.xml
 create mode 100644 data/Leipzig/EBAB.xml
 create mode 100644 data/Leipzig/EBAC.xml
 create mode 100644 data/Leipzig/EBC0.xml
 create mode 100644 data/Leipzig/EBC1.xml
 create mode 100644 data/Leipzig/EBC2.xml
 create mode 100644 data/Leipzig/EBC3.xml
 create mode 100644 data/Leipzig/EBC4.xml
 create mode 100644 data/Leipzig/EBC5.xml
 create mode 100644 data/Leipzig/EBC6.xml
 create mode 100644 data/Leipzig/EBC7.xml
 create mode 100644 data/Leipzig/EBC8.xml
 create mode 100644 data/Leipzig/EBC9.xml
 create mode 100644 data/Leipzig/EBCA.xml
 create mode 100644 data/Leipzig/EBCB.xml
 create mode 100644 data/Leipzig/EBCC.xml
 create mode 100644 data/Leipzig/EBE0.xml
 create mode 100644 data/Leipzig/EBE1.xml
 create mode 100644 data/Leipzig/EBE2.xml
 create mode 100644 data/Leipzig/EBE3.xml
 create mode 100644 data/Leipzig/EBE4.xml
 create mode 100644 data/Leipzig/EBE5.xml
 create mode 100644 data/Leipzig/EBE6.xml
 create mode 100644 data/Leipzig/EBE7.xml
 create mode 100644 data/Leipzig/EBE8.xml
 create mode 100644 data/Leipzig/EBE9.xml
 create mode 100644 data/Leipzig/ED40.xml
 create mode 100644 data/Leipzig/ED41.xml
 create mode 100644 data/Leland.xml
 create mode 100644 data/Leland/E000.xml
 create mode 100644 data/Leland/E003.xml
 create mode 100644 data/Leland/E004.xml
 create mode 100644 data/Leland/E043.xml
 create mode 100644 data/Leland/E044.xml
 create mode 100644 data/Leland/E047.xml
 create mode 100644 data/Leland/E048.xml
 create mode 100644 data/Leland/E049.xml
 create mode 100644 data/Leland/E04B.xml
 create mode 100644 data/Leland/E050.xml
 create mode 100644 data/Leland/E051.xml
 create mode 100644 data/Leland/E052.xml
 create mode 100644 data/Leland/E053.xml
 create mode 100644 data/Leland/E054.xml
 create mode 100644 data/Leland/E055.xml
 create mode 100644 data/Leland/E05C.xml
 create mode 100644 data/Leland/E05D.xml
 create mode 100644 data/Leland/E062.xml
 create mode 100644 data/Leland/E063.xml
 create mode 100644 data/Leland/E064.xml
 create mode 100644 data/Leland/E065.xml
 create mode 100644 data/Leland/E066.xml
 create mode 100644 data/Leland/E069.xml
 create mode 100644 data/Leland/E06A.xml
 create mode 100644 data/Leland/E080.xml
 create mode 100644 data/Leland/E081.xml
 create mode 100644 data/Leland/E082.xml
 create mode 100644 data/Leland/E083.xml
 create mode 100644 data/Leland/E084.xml
 create mode 100644 data/Leland/E085.xml
 create mode 100644 data/Leland/E086.xml
 create mode 100644 data/Leland/E087.xml
 create mode 100644 data/Leland/E088.xml
 create mode 100644 data/Leland/E089.xml
 create mode 100644 data/Leland/E08A.xml
 create mode 100644 data/Leland/E08B.xml
 create mode 100644 data/Leland/E08C.xml
 create mode 100644 data/Leland/E0A0.xml
 create mode 100644 data/Leland/E0A1.xml
 create mode 100644 data/Leland/E0A2.xml
 create mode 100644 data/Leland/E0A3.xml
 create mode 100644 data/Leland/E0A4.xml
 create mode 100644 data/Leland/E0A5.xml
 create mode 100644 data/Leland/E0A9.xml
 create mode 100644 data/Leland/E0AF.xml
 create mode 100644 data/Leland/E0D9.xml
 create mode 100644 data/Leland/E0DB.xml
 create mode 100644 data/Leland/E0F5.xml
 create mode 100644 data/Leland/E0F6.xml
 create mode 100644 data/Leland/E220.xml
 create mode 100644 data/Leland/E221.xml
 create mode 100644 data/Leland/E222.xml
 create mode 100644 data/Leland/E223.xml
 create mode 100644 data/Leland/E224.xml
 create mode 100644 data/Leland/E22A.xml
 create mode 100644 data/Leland/E240.xml
 create mode 100644 data/Leland/E241.xml
 create mode 100644 data/Leland/E242.xml
 create mode 100644 data/Leland/E243.xml
 create mode 100644 data/Leland/E244.xml
 create mode 100644 data/Leland/E245.xml
 create mode 100644 data/Leland/E246.xml
 create mode 100644 data/Leland/E247.xml
 create mode 100644 data/Leland/E248.xml
 create mode 100644 data/Leland/E249.xml
 create mode 100644 data/Leland/E24A.xml
 create mode 100644 data/Leland/E24B.xml
 create mode 100644 data/Leland/E24C.xml
 create mode 100644 data/Leland/E24D.xml
 create mode 100644 data/Leland/E24E.xml
 create mode 100644 data/Leland/E24F.xml
 create mode 100644 data/Leland/E260.xml
 create mode 100644 data/Leland/E261.xml
 create mode 100644 data/Leland/E262.xml
 create mode 100644 data/Leland/E263.xml
 create mode 100644 data/Leland/E264.xml
 create mode 100644 data/Leland/E265.xml
 create mode 100644 data/Leland/E266.xml
 create mode 100644 data/Leland/E267.xml
 create mode 100644 data/Leland/E268.xml
 create mode 100644 data/Leland/E269.xml
 create mode 100644 data/Leland/E26A.xml
 create mode 100644 data/Leland/E26B.xml
 create mode 100644 data/Leland/E26C.xml
 create mode 100644 data/Leland/E26D.xml
 create mode 100644 data/Leland/E270.xml
 create mode 100644 data/Leland/E271.xml
 create mode 100644 data/Leland/E272.xml
 create mode 100644 data/Leland/E273.xml
 create mode 100644 data/Leland/E274.xml
 create mode 100644 data/Leland/E275.xml
 create mode 100644 data/Leland/E280.xml
 create mode 100644 data/Leland/E281.xml
 create mode 100644 data/Leland/E282.xml
 create mode 100644 data/Leland/E283.xml
 create mode 100644 data/Leland/E440.xml
 create mode 100644 data/Leland/E442.xml
 create mode 100644 data/Leland/E446.xml
 create mode 100644 data/Leland/E447.xml
 create mode 100644 data/Leland/E4A0.xml
 create mode 100644 data/Leland/E4A1.xml
 create mode 100644 data/Leland/E4A2.xml
 create mode 100644 data/Leland/E4A3.xml
 create mode 100644 data/Leland/E4A4.xml
 create mode 100644 data/Leland/E4A5.xml
 create mode 100644 data/Leland/E4A6.xml
 create mode 100644 data/Leland/E4A7.xml
 create mode 100644 data/Leland/E4A8.xml
 create mode 100644 data/Leland/E4A9.xml
 create mode 100644 data/Leland/E4AC.xml
 create mode 100644 data/Leland/E4AD.xml
 create mode 100644 data/Leland/E4AE.xml
 create mode 100644 data/Leland/E4AF.xml
 create mode 100644 data/Leland/E4B0.xml
 create mode 100644 data/Leland/E4B1.xml
 create mode 100644 data/Leland/E4B2.xml
 create mode 100644 data/Leland/E4B3.xml
 create mode 100644 data/Leland/E4B4.xml
 create mode 100644 data/Leland/E4B5.xml
 create mode 100644 data/Leland/E4B6.xml
 create mode 100644 data/Leland/E4B7.xml
 create mode 100644 data/Leland/E4B8.xml
 create mode 100644 data/Leland/E4B9.xml
 create mode 100644 data/Leland/E4BA.xml
 create mode 100644 data/Leland/E4BB.xml
 create mode 100644 data/Leland/E4BC.xml
 create mode 100644 data/Leland/E4BD.xml
 create mode 100644 data/Leland/E4C0.xml
 create mode 100644 data/Leland/E4C1.xml
 create mode 100644 data/Leland/E4C4.xml
 create mode 100644 data/Leland/E4C5.xml
 create mode 100644 data/Leland/E4C6.xml
 create mode 100644 data/Leland/E4C7.xml
 create mode 100644 data/Leland/E4C8.xml
 create mode 100644 data/Leland/E4C9.xml
 create mode 100644 data/Leland/E4CE.xml
 create mode 100644 data/Leland/E4E0.xml
 create mode 100644 data/Leland/E4E1.xml
 create mode 100644 data/Leland/E4E2.xml
 create mode 100644 data/Leland/E4E3.xml
 create mode 100644 data/Leland/E4E4.xml
 create mode 100644 data/Leland/E4E5.xml
 create mode 100644 data/Leland/E4E6.xml
 create mode 100644 data/Leland/E4E7.xml
 create mode 100644 data/Leland/E4E8.xml
 create mode 100644 data/Leland/E4E9.xml
 create mode 100644 data/Leland/E4EA.xml
 create mode 100644 data/Leland/E4EB.xml
 create mode 100644 data/Leland/E4EC.xml
 create mode 100644 data/Leland/E4ED.xml
 create mode 100644 data/Leland/E4F2.xml
 create mode 100644 data/Leland/E4F6.xml
 create mode 100644 data/Leland/E500.xml
 create mode 100644 data/Leland/E501.xml
 create mode 100644 data/Leland/E502.xml
 create mode 100644 data/Leland/E503.xml
 create mode 100644 data/Leland/E504.xml
 create mode 100644 data/Leland/E505.xml
 create mode 100644 data/Leland/E510.xml
 create mode 100644 data/Leland/E511.xml
 create mode 100644 data/Leland/E512.xml
 create mode 100644 data/Leland/E513.xml
 create mode 100644 data/Leland/E514.xml
 create mode 100644 data/Leland/E515.xml
 create mode 100644 data/Leland/E516.xml
 create mode 100644 data/Leland/E517.xml
 create mode 100644 data/Leland/E518.xml
 create mode 100644 data/Leland/E519.xml
 create mode 100644 data/Leland/E51A.xml
 create mode 100644 data/Leland/E51B.xml
 create mode 100644 data/Leland/E51C.xml
 create mode 100644 data/Leland/E51D.xml
 create mode 100644 data/Leland/E51E.xml
 create mode 100644 data/Leland/E520.xml
 create mode 100644 data/Leland/E521.xml
 create mode 100644 data/Leland/E522.xml
 create mode 100644 data/Leland/E523.xml
 create mode 100644 data/Leland/E524.xml
 create mode 100644 data/Leland/E525.xml
 create mode 100644 data/Leland/E526.xml
 create mode 100644 data/Leland/E527.xml
 create mode 100644 data/Leland/E528.xml
 create mode 100644 data/Leland/E529.xml
 create mode 100644 data/Leland/E52A.xml
 create mode 100644 data/Leland/E52B.xml
 create mode 100644 data/Leland/E52C.xml
 create mode 100644 data/Leland/E52D.xml
 create mode 100644 data/Leland/E52E.xml
 create mode 100644 data/Leland/E52F.xml
 create mode 100644 data/Leland/E530.xml
 create mode 100644 data/Leland/E531.xml
 create mode 100644 data/Leland/E532.xml
 create mode 100644 data/Leland/E533.xml
 create mode 100644 data/Leland/E534.xml
 create mode 100644 data/Leland/E535.xml
 create mode 100644 data/Leland/E536.xml
 create mode 100644 data/Leland/E537.xml
 create mode 100644 data/Leland/E538.xml
 create mode 100644 data/Leland/E539.xml
 create mode 100644 data/Leland/E53A.xml
 create mode 100644 data/Leland/E53B.xml
 create mode 100644 data/Leland/E53C.xml
 create mode 100644 data/Leland/E53D.xml
 create mode 100644 data/Leland/E566.xml
 create mode 100644 data/Leland/E567.xml
 create mode 100644 data/Leland/E568.xml
 create mode 100644 data/Leland/E569.xml
 create mode 100644 data/Leland/E56A.xml
 create mode 100644 data/Leland/E56B.xml
 create mode 100644 data/Leland/E56C.xml
 create mode 100644 data/Leland/E56D.xml
 create mode 100644 data/Leland/E56E.xml
 create mode 100644 data/Leland/E56F.xml
 create mode 100644 data/Leland/E583.xml
 create mode 100644 data/Leland/E587.xml
 create mode 100644 data/Leland/E59D.xml
 create mode 100644 data/Leland/E59E.xml
 create mode 100644 data/Leland/E5B2.xml
 create mode 100644 data/Leland/E5B5.xml
 create mode 100644 data/Leland/E5B8.xml
 create mode 100644 data/Leland/E5BB.xml
 create mode 100644 data/Leland/E5BC.xml
 create mode 100644 data/Leland/E5BD.xml
 create mode 100644 data/Leland/E5BE.xml
 create mode 100644 data/Leland/E5C0.xml
 create mode 100644 data/Leland/E5C3.xml
 create mode 100644 data/Leland/E5C6.xml
 create mode 100644 data/Leland/E5C7.xml
 create mode 100644 data/Leland/E5C8.xml
 create mode 100644 data/Leland/E5E5.xml
 create mode 100644 data/Leland/E5E6.xml
 create mode 100644 data/Leland/E5E7.xml
 create mode 100644 data/Leland/E610.xml
 create mode 100644 data/Leland/E611.xml
 create mode 100644 data/Leland/E612.xml
 create mode 100644 data/Leland/E613.xml
 create mode 100644 data/Leland/E614.xml
 create mode 100644 data/Leland/E630.xml
 create mode 100644 data/Leland/E631.xml
 create mode 100644 data/Leland/E632.xml
 create mode 100644 data/Leland/E650.xml
 create mode 100644 data/Leland/E651.xml
 create mode 100644 data/Leland/E655.xml
 create mode 100644 data/Leland/E880.xml
 create mode 100644 data/Leland/E881.xml
 create mode 100644 data/Leland/E882.xml
 create mode 100644 data/Leland/E883.xml
 create mode 100644 data/Leland/E884.xml
 create mode 100644 data/Leland/E885.xml
 create mode 100644 data/Leland/E886.xml
 create mode 100644 data/Leland/E887.xml
 create mode 100644 data/Leland/E888.xml
 create mode 100644 data/Leland/E889.xml
 create mode 100644 data/Leland/E88A.xml
 create mode 100644 data/Leland/E93C.xml
 create mode 100644 data/Leland/E93D.xml
 create mode 100644 data/Leland/EAA4.xml
 create mode 100644 data/Leland/EAA9.xml
 create mode 100644 data/Leland/EAAA.xml
 create mode 100644 data/Leland/EAAD.xml
 create mode 100644 data/Leland/EAAE.xml
 create mode 100644 data/Petaluma.xml
 create mode 100644 data/Petaluma/E000.xml
 create mode 100644 data/Petaluma/E003.xml
 create mode 100644 data/Petaluma/E004.xml
 create mode 100644 data/Petaluma/E043.xml
 create mode 100644 data/Petaluma/E044.xml
 create mode 100644 data/Petaluma/E045.xml
 create mode 100644 data/Petaluma/E046.xml
 create mode 100644 data/Petaluma/E047.xml
 create mode 100644 data/Petaluma/E048.xml
 create mode 100644 data/Petaluma/E049.xml
 create mode 100644 data/Petaluma/E04B.xml
 create mode 100644 data/Petaluma/E050.xml
 create mode 100644 data/Petaluma/E051.xml
 create mode 100644 data/Petaluma/E052.xml
 create mode 100644 data/Petaluma/E053.xml
 create mode 100644 data/Petaluma/E054.xml
 create mode 100644 data/Petaluma/E055.xml
 create mode 100644 data/Petaluma/E056.xml
 create mode 100644 data/Petaluma/E05C.xml
 create mode 100644 data/Petaluma/E05D.xml
 create mode 100644 data/Petaluma/E062.xml
 create mode 100644 data/Petaluma/E063.xml
 create mode 100644 data/Petaluma/E064.xml
 create mode 100644 data/Petaluma/E065.xml
 create mode 100644 data/Petaluma/E066.xml
 create mode 100644 data/Petaluma/E069.xml
 create mode 100644 data/Petaluma/E06A.xml
 create mode 100644 data/Petaluma/E073.xml
 create mode 100644 data/Petaluma/E074.xml
 create mode 100644 data/Petaluma/E075.xml
 create mode 100644 data/Petaluma/E076.xml
 create mode 100644 data/Petaluma/E077.xml
 create mode 100644 data/Petaluma/E080.xml
 create mode 100644 data/Petaluma/E081.xml
 create mode 100644 data/Petaluma/E082.xml
 create mode 100644 data/Petaluma/E083.xml
 create mode 100644 data/Petaluma/E084.xml
 create mode 100644 data/Petaluma/E085.xml
 create mode 100644 data/Petaluma/E086.xml
 create mode 100644 data/Petaluma/E087.xml
 create mode 100644 data/Petaluma/E088.xml
 create mode 100644 data/Petaluma/E089.xml
 create mode 100644 data/Petaluma/E08A.xml
 create mode 100644 data/Petaluma/E08B.xml
 create mode 100644 data/Petaluma/E08C.xml
 create mode 100644 data/Petaluma/E08D.xml
 create mode 100644 data/Petaluma/E08E.xml
 create mode 100644 data/Petaluma/E08F.xml
 create mode 100644 data/Petaluma/E090.xml
 create mode 100644 data/Petaluma/E091.xml
 create mode 100644 data/Petaluma/E092.xml
 create mode 100644 data/Petaluma/E093.xml
 create mode 100644 data/Petaluma/E094.xml
 create mode 100644 data/Petaluma/E095.xml
 create mode 100644 data/Petaluma/E0A0.xml
 create mode 100644 data/Petaluma/E0A1.xml
 create mode 100644 data/Petaluma/E0A2.xml
 create mode 100644 data/Petaluma/E0A3.xml
 create mode 100644 data/Petaluma/E0A4.xml
 create mode 100644 data/Petaluma/E0A5.xml
 create mode 100644 data/Petaluma/E0A9.xml
 create mode 100644 data/Petaluma/E0AF.xml
 create mode 100644 data/Petaluma/E0B5.xml
 create mode 100644 data/Petaluma/E0B6.xml
 create mode 100644 data/Petaluma/E0B7.xml
 create mode 100644 data/Petaluma/E0D9.xml
 create mode 100644 data/Petaluma/E0DA.xml
 create mode 100644 data/Petaluma/E0DB.xml
 create mode 100644 data/Petaluma/E0DC.xml
 create mode 100644 data/Petaluma/E0DD.xml
 create mode 100644 data/Petaluma/E0DE.xml
 create mode 100644 data/Petaluma/E0F5.xml
 create mode 100644 data/Petaluma/E0F6.xml
 create mode 100644 data/Petaluma/E0FA.xml
 create mode 100644 data/Petaluma/E101.xml
 create mode 100644 data/Petaluma/E102.xml
 create mode 100644 data/Petaluma/E103.xml
 create mode 100644 data/Petaluma/E220.xml
 create mode 100644 data/Petaluma/E221.xml
 create mode 100644 data/Petaluma/E222.xml
 create mode 100644 data/Petaluma/E223.xml
 create mode 100644 data/Petaluma/E224.xml
 create mode 100644 data/Petaluma/E22A.xml
 create mode 100644 data/Petaluma/E240.xml
 create mode 100644 data/Petaluma/E241.xml
 create mode 100644 data/Petaluma/E242.xml
 create mode 100644 data/Petaluma/E243.xml
 create mode 100644 data/Petaluma/E244.xml
 create mode 100644 data/Petaluma/E245.xml
 create mode 100644 data/Petaluma/E246.xml
 create mode 100644 data/Petaluma/E247.xml
 create mode 100644 data/Petaluma/E248.xml
 create mode 100644 data/Petaluma/E249.xml
 create mode 100644 data/Petaluma/E24A.xml
 create mode 100644 data/Petaluma/E24B.xml
 create mode 100644 data/Petaluma/E24C.xml
 create mode 100644 data/Petaluma/E24D.xml
 create mode 100644 data/Petaluma/E24E.xml
 create mode 100644 data/Petaluma/E24F.xml
 create mode 100644 data/Petaluma/E260.xml
 create mode 100644 data/Petaluma/E261.xml
 create mode 100644 data/Petaluma/E262.xml
 create mode 100644 data/Petaluma/E263.xml
 create mode 100644 data/Petaluma/E264.xml
 create mode 100644 data/Petaluma/E265.xml
 create mode 100644 data/Petaluma/E266.xml
 create mode 100644 data/Petaluma/E267.xml
 create mode 100644 data/Petaluma/E268.xml
 create mode 100644 data/Petaluma/E269.xml
 create mode 100644 data/Petaluma/E26A.xml
 create mode 100644 data/Petaluma/E26B.xml
 create mode 100644 data/Petaluma/E26C.xml
 create mode 100644 data/Petaluma/E26D.xml
 create mode 100644 data/Petaluma/E270.xml
 create mode 100644 data/Petaluma/E271.xml
 create mode 100644 data/Petaluma/E272.xml
 create mode 100644 data/Petaluma/E273.xml
 create mode 100644 data/Petaluma/E274.xml
 create mode 100644 data/Petaluma/E275.xml
 create mode 100644 data/Petaluma/E280.xml
 create mode 100644 data/Petaluma/E281.xml
 create mode 100644 data/Petaluma/E282.xml
 create mode 100644 data/Petaluma/E283.xml
 create mode 100644 data/Petaluma/E440.xml
 create mode 100644 data/Petaluma/E441.xml
 create mode 100644 data/Petaluma/E442.xml
 create mode 100644 data/Petaluma/E443.xml
 create mode 100644 data/Petaluma/E444.xml
 create mode 100644 data/Petaluma/E445.xml
 create mode 100644 data/Petaluma/E446.xml
 create mode 100644 data/Petaluma/E447.xml
 create mode 100644 data/Petaluma/E4A0.xml
 create mode 100644 data/Petaluma/E4A1.xml
 create mode 100644 data/Petaluma/E4A2.xml
 create mode 100644 data/Petaluma/E4A3.xml
 create mode 100644 data/Petaluma/E4A4.xml
 create mode 100644 data/Petaluma/E4A5.xml
 create mode 100644 data/Petaluma/E4A6.xml
 create mode 100644 data/Petaluma/E4A7.xml
 create mode 100644 data/Petaluma/E4A8.xml
 create mode 100644 data/Petaluma/E4A9.xml
 create mode 100644 data/Petaluma/E4AA.xml
 create mode 100644 data/Petaluma/E4AB.xml
 create mode 100644 data/Petaluma/E4AC.xml
 create mode 100644 data/Petaluma/E4AD.xml
 create mode 100644 data/Petaluma/E4AE.xml
 create mode 100644 data/Petaluma/E4AF.xml
 create mode 100644 data/Petaluma/E4B0.xml
 create mode 100644 data/Petaluma/E4B1.xml
 create mode 100644 data/Petaluma/E4B2.xml
 create mode 100644 data/Petaluma/E4B3.xml
 create mode 100644 data/Petaluma/E4B4.xml
 create mode 100644 data/Petaluma/E4B5.xml
 create mode 100644 data/Petaluma/E4B6.xml
 create mode 100644 data/Petaluma/E4B7.xml
 create mode 100644 data/Petaluma/E4B8.xml
 create mode 100644 data/Petaluma/E4B9.xml
 create mode 100644 data/Petaluma/E4BA.xml
 create mode 100644 data/Petaluma/E4BB.xml
 create mode 100644 data/Petaluma/E4BC.xml
 create mode 100644 data/Petaluma/E4BD.xml
 create mode 100644 data/Petaluma/E4C0.xml
 create mode 100644 data/Petaluma/E4C1.xml
 create mode 100644 data/Petaluma/E4C2.xml
 create mode 100644 data/Petaluma/E4C3.xml
 create mode 100644 data/Petaluma/E4C4.xml
 create mode 100644 data/Petaluma/E4C5.xml
 create mode 100644 data/Petaluma/E4C6.xml
 create mode 100644 data/Petaluma/E4C7.xml
 create mode 100644 data/Petaluma/E4C8.xml
 create mode 100644 data/Petaluma/E4C9.xml
 create mode 100644 data/Petaluma/E4CE.xml
 create mode 100644 data/Petaluma/E4E0.xml
 create mode 100644 data/Petaluma/E4E1.xml
 create mode 100644 data/Petaluma/E4E2.xml
 create mode 100644 data/Petaluma/E4E3.xml
 create mode 100644 data/Petaluma/E4E4.xml
 create mode 100644 data/Petaluma/E4E5.xml
 create mode 100644 data/Petaluma/E4E6.xml
 create mode 100644 data/Petaluma/E4E7.xml
 create mode 100644 data/Petaluma/E4E8.xml
 create mode 100644 data/Petaluma/E4E9.xml
 create mode 100644 data/Petaluma/E4EA.xml
 create mode 100644 data/Petaluma/E4EB.xml
 create mode 100644 data/Petaluma/E4EC.xml
 create mode 100644 data/Petaluma/E4ED.xml
 create mode 100644 data/Petaluma/E4F2.xml
 create mode 100644 data/Petaluma/E4F6.xml
 create mode 100644 data/Petaluma/E500.xml
 create mode 100644 data/Petaluma/E501.xml
 create mode 100644 data/Petaluma/E502.xml
 create mode 100644 data/Petaluma/E503.xml
 create mode 100644 data/Petaluma/E504.xml
 create mode 100644 data/Petaluma/E505.xml
 create mode 100644 data/Petaluma/E510.xml
 create mode 100644 data/Petaluma/E511.xml
 create mode 100644 data/Petaluma/E512.xml
 create mode 100644 data/Petaluma/E513.xml
 create mode 100644 data/Petaluma/E514.xml
 create mode 100644 data/Petaluma/E515.xml
 create mode 100644 data/Petaluma/E516.xml
 create mode 100644 data/Petaluma/E517.xml
 create mode 100644 data/Petaluma/E518.xml
 create mode 100644 data/Petaluma/E519.xml
 create mode 100644 data/Petaluma/E51A.xml
 create mode 100644 data/Petaluma/E51B.xml
 create mode 100644 data/Petaluma/E51C.xml
 create mode 100644 data/Petaluma/E51D.xml
 create mode 100644 data/Petaluma/E51E.xml
 create mode 100644 data/Petaluma/E520.xml
 create mode 100644 data/Petaluma/E521.xml
 create mode 100644 data/Petaluma/E522.xml
 create mode 100644 data/Petaluma/E523.xml
 create mode 100644 data/Petaluma/E524.xml
 create mode 100644 data/Petaluma/E525.xml
 create mode 100644 data/Petaluma/E526.xml
 create mode 100644 data/Petaluma/E527.xml
 create mode 100644 data/Petaluma/E528.xml
 create mode 100644 data/Petaluma/E529.xml
 create mode 100644 data/Petaluma/E52A.xml
 create mode 100644 data/Petaluma/E52B.xml
 create mode 100644 data/Petaluma/E52C.xml
 create mode 100644 data/Petaluma/E52D.xml
 create mode 100644 data/Petaluma/E52E.xml
 create mode 100644 data/Petaluma/E52F.xml
 create mode 100644 data/Petaluma/E530.xml
 create mode 100644 data/Petaluma/E531.xml
 create mode 100644 data/Petaluma/E532.xml
 create mode 100644 data/Petaluma/E533.xml
 create mode 100644 data/Petaluma/E534.xml
 create mode 100644 data/Petaluma/E535.xml
 create mode 100644 data/Petaluma/E536.xml
 create mode 100644 data/Petaluma/E537.xml
 create mode 100644 data/Petaluma/E538.xml
 create mode 100644 data/Petaluma/E539.xml
 create mode 100644 data/Petaluma/E53A.xml
 create mode 100644 data/Petaluma/E53B.xml
 create mode 100644 data/Petaluma/E53C.xml
 create mode 100644 data/Petaluma/E53D.xml
 create mode 100644 data/Petaluma/E566.xml
 create mode 100644 data/Petaluma/E567.xml
 create mode 100644 data/Petaluma/E568.xml
 create mode 100644 data/Petaluma/E569.xml
 create mode 100644 data/Petaluma/E56A.xml
 create mode 100644 data/Petaluma/E56B.xml
 create mode 100644 data/Petaluma/E56C.xml
 create mode 100644 data/Petaluma/E56D.xml
 create mode 100644 data/Petaluma/E56E.xml
 create mode 100644 data/Petaluma/E56F.xml
 create mode 100644 data/Petaluma/E583.xml
 create mode 100644 data/Petaluma/E587.xml
 create mode 100644 data/Petaluma/E5B0.xml
 create mode 100644 data/Petaluma/E5B1.xml
 create mode 100644 data/Petaluma/E5B2.xml
 create mode 100644 data/Petaluma/E5B3.xml
 create mode 100644 data/Petaluma/E5B4.xml
 create mode 100644 data/Petaluma/E5B5.xml
 create mode 100644 data/Petaluma/E5B6.xml
 create mode 100644 data/Petaluma/E5B7.xml
 create mode 100644 data/Petaluma/E5B8.xml
 create mode 100644 data/Petaluma/E5B9.xml
 create mode 100644 data/Petaluma/E5BA.xml
 create mode 100644 data/Petaluma/E5BB.xml
 create mode 100644 data/Petaluma/E5BC.xml
 create mode 100644 data/Petaluma/E5BD.xml
 create mode 100644 data/Petaluma/E5BE.xml
 create mode 100644 data/Petaluma/E5BF.xml
 create mode 100644 data/Petaluma/E5C0.xml
 create mode 100644 data/Petaluma/E5C1.xml
 create mode 100644 data/Petaluma/E5C2.xml
 create mode 100644 data/Petaluma/E5C3.xml
 create mode 100644 data/Petaluma/E5C4.xml
 create mode 100644 data/Petaluma/E5C5.xml
 create mode 100644 data/Petaluma/E5C6.xml
 create mode 100644 data/Petaluma/E5C7.xml
 create mode 100644 data/Petaluma/E5C8.xml
 create mode 100644 data/Petaluma/E5E5.xml
 create mode 100644 data/Petaluma/E5E6.xml
 create mode 100644 data/Petaluma/E5E7.xml
 create mode 100644 data/Petaluma/E610.xml
 create mode 100644 data/Petaluma/E611.xml
 create mode 100644 data/Petaluma/E612.xml
 create mode 100644 data/Petaluma/E613.xml
 create mode 100644 data/Petaluma/E614.xml
 create mode 100644 data/Petaluma/E630.xml
 create mode 100644 data/Petaluma/E631.xml
 create mode 100644 data/Petaluma/E632.xml
 create mode 100644 data/Petaluma/E633.xml
 create mode 100644 data/Petaluma/E638.xml
 create mode 100644 data/Petaluma/E645.xml
 create mode 100644 data/Petaluma/E650.xml
 create mode 100644 data/Petaluma/E651.xml
 create mode 100644 data/Petaluma/E655.xml
 create mode 100644 data/Petaluma/E659.xml
 create mode 100644 data/Petaluma/E65A.xml
 create mode 100644 data/Petaluma/E880.xml
 create mode 100644 data/Petaluma/E881.xml
 create mode 100644 data/Petaluma/E882.xml
 create mode 100644 data/Petaluma/E883.xml
 create mode 100644 data/Petaluma/E884.xml
 create mode 100644 data/Petaluma/E885.xml
 create mode 100644 data/Petaluma/E886.xml
 create mode 100644 data/Petaluma/E887.xml
 create mode 100644 data/Petaluma/E888.xml
 create mode 100644 data/Petaluma/E889.xml
 create mode 100644 data/Petaluma/E88A.xml
 create mode 100644 data/Petaluma/E938.xml
 create mode 100644 data/Petaluma/E939.xml
 create mode 100644 data/Petaluma/E93C.xml
 create mode 100644 data/Petaluma/E93D.xml
 create mode 100644 data/Petaluma/E93E.xml
 create mode 100644 data/Petaluma/E93F.xml
 create mode 100644 data/Petaluma/E949.xml
 create mode 100644 data/Petaluma/E94A.xml
 create mode 100644 data/Petaluma/E94B.xml
 create mode 100644 data/Petaluma/E94C.xml
 create mode 100644 data/Petaluma/EAA4.xml
 create mode 100644 data/Petaluma/EAA9.xml
 create mode 100644 data/Petaluma/EAAA.xml
 create mode 100644 data/Petaluma/EAAD.xml
 create mode 100644 data/Petaluma/EAAE.xml
 create mode 100644 data/Petaluma/EAAF.xml

diff --git a/data/Bravura.xml b/data/Bravura.xml
new file mode 100644
index 00000000000..3eda0822bcc
--- /dev/null
+++ b/data/Bravura.xml
@@ -0,0 +1,696 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bounding-boxes font-family="Bravura" units-per-em="1000">
+  <g c="E000" x="2.0" y="0.0" w="80.0" h="997.0" h-a-x="84" n="brace"/>
+  <g c="E003" x="0.0" y="0.0" w="469.0" h="295.0" h-a-x="469" n="bracketTop"/>
+  <g c="E004" x="0.0" y="-295.0" w="469.0" h="295.0" h-a-x="469" n="bracketBottom"/>
+  <g c="E043" x="0.0" y="318.0" w="100.0" h="352.0" h-a-x="100" n="repeatDots"/>
+  <g c="E044" x="0.0" y="-50.0" w="100.0" h="100.0" h-a-x="100" n="repeatDot"/>
+  <g c="E045" x="11.0" y="-9.0" w="1071.0" h="451.0" h-a-x="1082" n="dalSegno"/>
+  <g c="E046" x="11.0" y="-9.0" w="1071.0" h="451.0" h-a-x="1083" n="daCapo"/>
+  <g c="E047" x="4.0" y="-27.0" w="546.0" h="786.0" h-a-x="557" n="segno"/>
+  <g c="E048" x="-4.0" y="-158.0" w="959.0" h="1056.0" h-a-x="954" n="coda"/>
+  <g c="E049" x="0.0" y="-154.0" w="822.0" h="1057.0" h-a-x="819" n="codaSquare"/>
+  <g c="E04B" x="1.0" y="-33.0" w="401.0" h="1064.0" h-a-x="402" n="segnoSerpent2"/>
+  <g c="E050" x="0.0" y="-658.0" w="671.0" h="1756.0" h-a-x="671" n="gClef"/>
+  <g c="E051" x="0.0" y="-881.0" w="671.0" h="1979.0" h-a-x="671" n="gClef15mb"/>
+  <g c="E052" x="0.0" y="-878.0" w="671.0" h="1976.0" h-a-x="664" n="gClef8vb"/>
+  <g c="E053" x="0.0" y="-658.0" w="671.0" h="1978.0" h-a-x="671" n="gClef8va"/>
+  <g c="E054" x="0.0" y="-658.0" w="671.0" h="1977.0" h-a-x="671" n="gClef15ma"/>
+  <g c="E055" x="0.0" y="-658.0" w="1044.0" h="1756.0" h-a-x="1044" n="gClef8vbOld"/>
+  <g c="E056" x="0.0" y="-658.0" w="842.0" h="1756.0" h-a-x="842" n="gClef8vbCClef"/>
+  <g c="E05C" x="0.0" y="-506.0" w="699.0" h="1012.0" h-a-x="699" n="cClef"/>
+  <g c="E05D" x="0.0" y="-741.0" w="699.0" h="1247.0" h-a-x="699" n="cClef8vb"/>
+  <g c="E062" x="-5.0" y="-635.0" w="689.0" h="897.0" h-a-x="684" n="fClef"/>
+  <g c="E063" x="-5.0" y="-742.0" w="689.0" h="1004.0" h-a-x="684" n="fClef15mb"/>
+  <g c="E064" x="-5.0" y="-744.0" w="689.0" h="1006.0" h-a-x="684" n="fClef8vb"/>
+  <g c="E065" x="-5.0" y="-635.0" w="689.0" h="1130.0" h-a-x="684" n="fClef8va"/>
+  <g c="E066" x="-5.0" y="-635.0" w="689.0" h="1131.0" h-a-x="684" n="fClef15ma"/>
+  <g c="E069" x="0.0" y="-250.0" w="382.0" h="500.0" h-a-x="382" n="unpitchedPercussionClef1"/>
+  <g c="E06A" x="0.0" y="-465.0" w="312.0" h="926.0" h-a-x="312" n="unpitchedPercussionClef2"/>
+  <g c="E073" x="6.0" y="-658.0" w="671.0" h="1756.0" h-a-x="674" n="gClefReversed"/>
+  <g c="E074" x="6.0" y="-602.0" w="671.0" h="1756.0" h-a-x="674" n="gClefTurned"/>
+  <g c="E075" x="0.0" y="-506.0" w="699.0" h="1012.0" h-a-x="699" n="cClefReversed"/>
+  <g c="E076" x="0.0" y="-635.0" w="689.0" h="897.0" h-a-x="689" n="fClefReversed"/>
+  <g c="E077" x="0.0" y="-264.0" w="689.0" h="897.0" h-a-x="684" n="fClefTurned"/>
+  <g c="E080" x="20.0" y="-250.0" w="430.0" h="501.0" h-a-x="470" n="timeSig0"/>
+  <g c="E081" x="20.0" y="-250.0" w="294.0" h="501.0" h-a-x="334" n="timeSig1"/>
+  <g c="E082" x="20.0" y="-257.0" w="406.0" h="511.0" h-a-x="446" n="timeSig2"/>
+  <g c="E083" x="20.0" y="-251.0" w="381.0" h="500.0" h-a-x="421" n="timeSig3"/>
+  <g c="E084" x="20.0" y="-250.0" w="430.0" h="501.0" h-a-x="470" n="timeSig4"/>
+  <g c="E085" x="20.0" y="-251.0" w="363.0" h="497.0" h-a-x="403" n="timeSig5"/>
+  <g c="E086" x="20.0" y="-249.0" w="394.0" h="500.0" h-a-x="434" n="timeSig6"/>
+  <g c="E087" x="20.0" y="-250.0" w="401.0" h="499.0" h-a-x="441" n="timeSig7"/>
+  <g c="E088" x="20.0" y="-259.0" w="396.0" h="518.0" h-a-x="436" n="timeSig8"/>
+  <g c="E089" x="20.0" y="-249.0" w="394.0" h="500.0" h-a-x="434" n="timeSig9"/>
+  <g c="E08A" x="5.0" y="-249.0" w="419.0" h="500.0" h-a-x="424" n="timeSigCommon"/>
+  <g c="E08B" x="0.0" y="-359.0" w="418.0" h="720.0" h-a-x="417" n="timeSigCutCommon"/>
+  <g c="E08C" x="-1.0" y="-250.0" w="500.0" h="500.0" n="timeSigPlus"/>
+  <g c="E08D" x="-1.0" y="-133.0" w="256.0" h="256.0" h-a-x="254" n="timeSigPlusSmall"/>
+  <g c="E08E" x="0.0" y="-190.0" w="378.0" h="379.0" h-a-x="378" n="timeSigFractionalSlash"/>
+  <g c="E08F" x="0.0" y="-125.0" w="448.0" h="249.0" h-a-x="448" n="timeSigEquals"/>
+  <g c="E090" x="0.0" y="-35.0" w="448.0" h="75.0" h-a-x="448" n="timeSigMinus"/>
+  <g c="E091" x="0.0" y="-198.0" w="395.0" h="396.0" h-a-x="396" n="timeSigMultiply"/>
+  <g c="E092" x="0.0" y="-251.0" w="110.0" h="500.0" h-a-x="110" n="timeSigParensLeftSmall"/>
+  <g c="E093" x="0.0" y="-251.0" w="110.0" h="500.0" h-a-x="110" n="timeSigParensRightSmall"/>
+  <g c="E094" x="0.0" y="-489.0" w="184.0" h="980.0" h-a-x="184" n="timeSigParensLeft"/>
+  <g c="E095" x="0.0" y="-489.0" w="184.0" h="980.0" h-a-x="184" n="timeSigParensRight"/>
+  <g c="E0A0" x="0.0" y="-155.0" w="599.0" h="310.0" h-a-x="599" n="noteheadDoubleWhole">
+    <a n="noteheadOrigin" x="0.36" y="0.0"/>
+  </g>
+  <g c="E0A1" x="0.0" y="-190.0" w="416.0" h="388.0" h-a-x="416" n="noteheadDoubleWholeSquare"/>
+  <g c="E0A2" x="0.0" y="-125.0" w="422.0" h="250.0" h-a-x="422" n="noteheadWhole">
+    <a n="cutOutNW" x="0.17" y="0.33"/>
+    <a n="cutOutSE" x="1.53" y="-0.36"/>
+  </g>
+  <g c="E0A3" x="0.0" y="-125.0" w="295.0" h="250.0" h-a-x="295" n="noteheadHalf">
+    <a n="cutOutNW" x="0.2" y="0.3"/>
+    <a n="cutOutSE" x="0.98" y="-0.3"/>
+    <a n="splitStemDownNE" x="0.96" y="-0.3"/>
+    <a n="splitStemDownNW" x="0.13" y="-0.43"/>
+    <a n="splitStemUpSE" x="1.11" y="0.37"/>
+    <a n="splitStemUpSW" x="0.33" y="0.38"/>
+    <a n="stemDownNW" x="0.0" y="-0.17"/>
+    <a n="stemUpSE" x="1.18" y="0.17"/>
+  </g>
+  <g c="E0A4" x="0.0" y="-125.0" w="295.0" h="250.0" h-a-x="295" n="noteheadBlack">
+    <a n="cutOutNW" x="0.21" y="0.3"/>
+    <a n="cutOutSE" x="0.94" y="-0.3"/>
+    <a n="splitStemDownNE" x="0.97" y="-0.25"/>
+    <a n="splitStemDownNW" x="0.12" y="-0.42"/>
+    <a n="splitStemUpSE" x="1.09" y="0.39"/>
+    <a n="splitStemUpSW" x="0.31" y="0.36"/>
+    <a n="stemDownNW" x="0.0" y="-0.17"/>
+    <a n="stemUpSE" x="1.18" y="0.17"/>
+  </g>
+  <g c="E0A5" x="0.0" y="0.0" w="295" h="0.0" h-a-x="295" n="noteheadNull"/>
+  <g c="E0A9" x="0.0" y="-125.0" w="290.0" h="250.0" h-a-x="290" n="noteheadXBlack">
+    <a n="stemDownNW" x="0.0" y="-0.44"/>
+    <a n="stemUpSE" x="1.16" y="0.44"/>
+  </g>
+  <g c="E0AF" x="-1.0" y="-125.0" w="250.0" h="250.0" h-a-x="249" n="noteheadPlusBlack">
+    <a n="stemDownNW" x="-0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.0" y="0.0"/>
+  </g>
+  <g c="E0B5" x="0.0" y="-125.0" w="420.0" h="250.0" h-a-x="420" n="noteheadWholeWithX"/>
+  <g c="E0B6" x="0.0" y="-125.0" w="294.0" h="250.0" h-a-x="294" n="noteheadHalfWithX">
+    <a n="stemDownNW" x="0.0" y="-0.17"/>
+    <a n="stemUpSE" x="1.18" y="0.16"/>
+  </g>
+  <g c="E0B7" x="0.0" y="-125.0" w="289.0" h="250.0" h-a-x="289" n="noteheadVoidWithX">
+    <a n="stemDownNW" x="0.0" y="-0.15"/>
+    <a n="stemUpSE" x="1.16" y="0.15"/>
+  </g>
+  <g c="E0D9" x="0.0" y="-125.0" w="251.0" h="250.0" h-a-x="251" n="noteheadDiamondHalf">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.0" y="0.0"/>
+  </g>
+  <g c="E0DA" x="0.0" y="-125.0" w="351.0" h="250.0" h-a-x="351" n="noteheadDiamondHalfWide">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.4" y="0.0"/>
+  </g>
+  <g c="E0DB" x="0.0" y="-125.0" w="250.0" h="250.0" h-a-x="250" n="noteheadDiamondBlack">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.0" y="0.0"/>
+  </g>
+  <g c="E0DC" x="0.0" y="-125.0" w="350.0" h="250.0" h-a-x="350" n="noteheadDiamondBlackWide">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.4" y="0.0"/>
+  </g>
+  <g c="E0DD" x="0.0" y="-125.0" w="250.0" h="250.0" h-a-x="250" n="noteheadDiamondWhite">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.0" y="0.0"/>
+  </g>
+  <g c="E0DE" x="0.0" y="-125.0" w="350.0" h="250.0" h-a-x="350" n="noteheadDiamondWhiteWide">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.4" y="0.0"/>
+  </g>
+  <g c="E0F5" x="0.0" y="-181.0" w="109.0" h="362.0" h-a-x="73" n="noteheadParenthesisLeft"/>
+  <g c="E0F6" x="-36.0" y="-181.0" w="109.0" h="362.0" h-a-x="73" n="noteheadParenthesisRight"/>
+  <g c="E0FA" x="0.0" y="-125.0" w="422.0" h="250.0" h-a-x="422" n="noteheadWholeFilled"/>
+  <g c="E101" x="0.0" y="-250.0" w="530.0" h="500.0" h-a-x="531" n="noteheadSlashHorizontalEnds">
+    <a n="stemDownNW" x="0.0" y="-1.0"/>
+    <a n="stemUpSE" x="2.12" y="1.0"/>
+  </g>
+  <g c="E102" x="0.0" y="-250.0" w="980.0" h="500.0" h-a-x="980" n="noteheadSlashWhiteWhole"/>
+  <g c="E103" x="0.0" y="-250.0" w="780.0" h="500.0" h-a-x="780" n="noteheadSlashWhiteHalf">
+    <a n="stemDownNW" x="0.0" y="-1.0"/>
+    <a n="stemUpSE" x="3.12" y="1.0"/>
+  </g>
+  <g c="E220" x="-150.0" y="-93.0" w="300.0" h="187.0" h-a-x="150" n="tremolo1"/>
+  <g c="E221" x="-151.0" y="-187.0" w="300.0" h="374.0" h-a-x="149" n="tremolo2"/>
+  <g c="E222" x="-150.0" y="-280.0" w="300.0" h="558.0" h-a-x="150" n="tremolo3"/>
+  <g c="E223" x="-150.0" y="-370.0" w="300.0" h="744.0" h-a-x="149" n="tremolo4"/>
+  <g c="E224" x="-151.0" y="-460.0" w="301.0" h="930.0" h-a-x="149" n="tremolo5"/>
+  <g c="E22A" x="-155.0" y="-116.0" w="311.0" h="232.0" h-a-x="156" n="buzzRoll"/>
+  <g c="E240" x="0.0" y="-810.19" w="264.0" h="819.19" h-a-x="264" n="flag8thUp">
+    <a n="graceNoteSlashNE" x="1.28" y="-0.8"/>
+    <a n="graceNoteSlashSW" x="-0.64" y="-2.46"/>
+    <a n="stemUpNW" x="0.0" y="-0.04"/>
+  </g>
+  <g c="E241" x="0.0" y="-14.0" w="306.0" h="822.0" h-a-x="306" n="flag8thDown">
+    <a n="graceNoteSlashNW" x="-0.6" y="2.17"/>
+    <a n="graceNoteSlashSE" x="1.33" y="0.63"/>
+    <a n="stemDownSW" x="0.0" y="0.13"/>
+  </g>
+  <g c="E242" x="0.0" y="-813.0" w="279.0" h="815.0" h-a-x="279" n="flag16thUp">
+    <a n="stemUpNW" x="0.0" y="-0.09"/>
+  </g>
+  <g c="E243" x="0.0" y="-9.0" w="290.9" h="821.01" h-a-x="292" n="flag16thDown">
+    <a n="stemDownSW" x="0.0" y="0.13"/>
+  </g>
+  <g c="E244" x="0.0" y="-812.0" w="261.0" h="961.0" h-a-x="262" n="flag32ndUp">
+    <a n="stemUpNW" x="0.0" y="0.38"/>
+  </g>
+  <g c="E245" x="0.0" y="-172.0" w="273.0" h="984.0" h-a-x="274" n="flag32ndDown">
+    <a n="stemDownSW" x="0.0" y="-0.45"/>
+  </g>
+  <g c="E246" x="0.0" y="-812.0" w="261.0" h="1159.0" h-a-x="262" n="flag64thUp">
+    <a n="stemUpNW" x="0.0" y="1.17"/>
+  </g>
+  <g c="E247" x="0.0" y="-376.0" w="273.0" h="1188.0" h-a-x="275" n="flag64thDown">
+    <a n="stemDownSW" x="0.0" y="-1.24"/>
+  </g>
+  <g c="E248" x="0.0" y="-812.0" w="261.0" h="1345.0" h-a-x="259" n="flag128thUp">
+    <a n="stemUpNW" x="0.0" y="1.9"/>
+  </g>
+  <g c="E249" x="0.0" y="-580.0" w="273.0" h="1392.0" h-a-x="275" n="flag128thDown">
+    <a n="stemDownSW" x="0.0" y="-2.08"/>
+  </g>
+  <g c="E24A" x="0.0" y="-812.0" w="264.0" h="1516.0" h-a-x="268" n="flag256thUp">
+    <a n="stemUpNW" x="0.0" y="2.59"/>
+  </g>
+  <g c="E24B" x="0.0" y="-751.0" w="299.0" h="1563.0" h-a-x="301" n="flag256thDown">
+    <a n="stemDownSW" x="0.0" y="-2.81"/>
+  </g>
+  <g c="E24C" x="0.0" y="-812.0" w="265.0" h="1703.0" h-a-x="268" n="flag512thUp">
+    <a n="stemUpNW" x="0.0" y="3.32"/>
+  </g>
+  <g c="E24D" x="0.0" y="-939.0" w="300.0" h="1750.0" h-a-x="301" n="flag512thDown">
+    <a n="stemDownSW" x="0.0" y="-3.61"/>
+  </g>
+  <g c="E24E" x="0.0" y="-812.0" w="265.0" h="1891.0" h-a-x="272" n="flag1024thUp">
+    <a n="stemUpNW" x="0.0" y="4.06"/>
+  </g>
+  <g c="E24F" x="0.0" y="-1202.0" w="301.0" h="1944.0" h-a-x="310" n="flag1024thDown">
+    <a n="stemDownSW" x="0.0" y="-4.68"/>
+  </g>
+  <g c="E260" x="0.0" y="-175.0" w="226.0" h="614.0" h-a-x="226" n="accidentalFlat">
+    <a n="cutOutNE" x="0.25" y="0.66"/>
+    <a n="cutOutSE" x="0.5" y="-0.48"/>
+  </g>
+  <g c="E261" x="0.0" y="-335.0" w="168.0" h="676.0" h-a-x="168" n="accidentalNatural">
+    <a n="cutOutNE" x="0.19" y="0.78"/>
+    <a n="cutOutSW" x="0.48" y="-0.83"/>
+  </g>
+  <g c="E262" x="0.0" y="-348.0" w="249.0" h="698.0" h-a-x="249" n="accidentalSharp">
+    <a n="cutOutNE" x="0.84" y="0.9"/>
+    <a n="cutOutNW" x="0.14" y="0.57"/>
+    <a n="cutOutSE" x="0.84" y="-0.6"/>
+    <a n="cutOutSW" x="0.14" y="-0.9"/>
+  </g>
+  <g c="E263" x="0.0" y="-125.0" w="247.0" h="252.0" h-a-x="250" n="accidentalDoubleSharp"/>
+  <g c="E264" x="0.0" y="-175.0" w="411.0" h="612.0" h-a-x="413" n="accidentalDoubleFlat">
+    <a n="cutOutNE" x="0.99" y="0.64"/>
+    <a n="cutOutSE" x="1.34" y="-0.4"/>
+  </g>
+  <g c="E265" x="0.0" y="-348.0" w="513.0" h="698.0" h-a-x="513" n="accidentalTripleSharp">
+    <a n="cutOutNE" x="0.86" y="0.92"/>
+    <a n="cutOutNW" x="0.12" y="0.6"/>
+    <a n="cutOutSE" x="0.86" y="-0.59"/>
+    <a n="cutOutSW" x="0.12" y="-0.9"/>
+  </g>
+  <g c="E266" x="0.0" y="-175.0" w="596.0" h="614.0" h-a-x="600" n="accidentalTripleFlat">
+    <a n="cutOutNE" x="1.75" y="0.66"/>
+    <a n="cutOutSE" x="2.05" y="-0.44"/>
+  </g>
+  <g c="E267" x="0.0" y="-335.0" w="459.0" h="774.0" h-a-x="459" n="accidentalNaturalFlat">
+    <a n="cutOutNE" x="1.18" y="0.65"/>
+    <a n="cutOutSE" x="0.75" y="-0.83"/>
+    <a n="cutOutSW" x="0.44" y="-0.83"/>
+  </g>
+  <g c="E268" x="0.0" y="-348.0" w="481.0" h="698.0" h-a-x="480" n="accidentalNaturalSharp">
+    <a n="cutOutNE" x="1.78" y="0.9"/>
+    <a n="cutOutSE" x="1.78" y="-0.61"/>
+    <a n="cutOutSW" x="0.45" y="-0.84"/>
+  </g>
+  <g c="E269" x="0.0" y="-348.0" w="519.0" h="698.0" h-a-x="519" n="accidentalSharpSharp">
+    <a n="cutOutNE" x="1.93" y="0.9"/>
+    <a n="cutOutNW" x="0.14" y="0.6"/>
+    <a n="cutOutSE" x="1.94" y="-0.6"/>
+    <a n="cutOutSW" x="0.14" y="-0.9"/>
+  </g>
+  <g c="E26A" x="0.0" y="-248.0" w="141.0" h="495.0" h-a-x="141" n="accidentalParensLeft"/>
+  <g c="E26B" x="0.0" y="-248.0" w="141.0" h="495.0" h-a-x="141" n="accidentalParensRight"/>
+  <g c="E26C" x="0.0" y="-187.0" w="77.0" h="375.0" h-a-x="77" n="accidentalBracketLeft"/>
+  <g c="E26D" x="0.0" y="-187.0" w="77.0" h="375.0" h-a-x="77" n="accidentalBracketRight"/>
+  <g c="E270" x="-42.0" y="-177.0" w="290.0" h="756.0" h-a-x="248" n="accidentalQuarterToneFlatArrowUp">
+    <a n="cutOutNE" x="0.6" y="0.66"/>
+    <a n="cutOutSE" x="0.62" y="-0.45"/>
+  </g>
+  <g c="E271" x="-39.0" y="-418.0" w="290.0" h="860.0" h-a-x="251" n="accidentalThreeQuarterTonesFlatArrowDown">
+    <a n="cutOutNE" x="0.36" y="0.65"/>
+    <a n="cutOutNW" x="0.03" y="-0.8"/>
+    <a n="cutOutSE" x="0.65" y="-0.5"/>
+  </g>
+  <g c="E272" x="-26.0" y="-340.0" w="238.0" h="887.0" h-a-x="212" n="accidentalQuarterToneSharpNaturalArrowUp">
+    <a n="cutOutSW" x="0.62" y="-0.87"/>
+  </g>
+  <g c="E273" x="3.0" y="-543.0" w="247.0" h="879.0" h-a-x="171" n="accidentalQuarterToneFlatNaturalArrowDown">
+    <a n="cutOutNE" x="0.23" y="0.79"/>
+  </g>
+  <g c="E274" x="0.0" y="-347.0" w="275.0" h="877.0" h-a-x="249" n="accidentalThreeQuarterTonesSharpArrowUp">
+    <a n="cutOutNW" x="0.27" y="1.3"/>
+    <a n="cutOutSE" x="0.86" y="-0.58"/>
+    <a n="cutOutSW" x="0.13" y="-0.89"/>
+  </g>
+  <g c="E275" x="-28.0" y="-534.0" w="277.0" h="883.0" h-a-x="249" n="accidentalQuarterToneSharpArrowDown">
+    <a n="cutOutNE" x="0.86" y="0.91"/>
+    <a n="cutOutNW" x="0.13" y="0.61"/>
+    <a n="cutOutSE" x="0.86" y="-0.59"/>
+  </g>
+  <g c="E280" x="1.0" y="-175.0" w="226.0" h="614.0" h-a-x="227" n="accidentalQuarterToneFlatStein">
+    <a n="cutOutNW" x="0.63" y="0.68"/>
+    <a n="cutOutSW" x="0.34" y="-0.43"/>
+  </g>
+  <g c="E281" x="1.0" y="-175.0" w="465.0" h="614.0" h-a-x="466" n="accidentalThreeQuarterTonesFlatZimmermann">
+    <a n="cutOutNE" x="1.22" y="0.67"/>
+    <a n="cutOutNW" x="0.64" y="0.67"/>
+  </g>
+  <g c="E282" x="0.0" y="-353.0" w="179.0" h="660.0" h-a-x="179" n="accidentalQuarterToneSharpStein">
+    <a n="cutOutNE" x="0.48" y="0.75"/>
+    <a n="cutOutNW" x="0.22" y="0.6"/>
+    <a n="cutOutSE" x="0.49" y="-0.8"/>
+    <a n="cutOutSW" x="0.22" y="-0.92"/>
+  </g>
+  <g c="E283" x="3.0" y="-347.0" w="314.0" h="716.0" h-a-x="317" n="accidentalThreeQuarterTonesSharpStein">
+    <a n="cutOutNE" x="1.13" y="1.0"/>
+    <a n="cutOutNW" x="0.14" y="0.6"/>
+    <a n="cutOutSE" x="1.13" y="-0.5"/>
+    <a n="cutOutSW" x="0.14" y="-0.9"/>
+  </g>
+  <g c="E440" x="1.0" y="-174.0" w="286.0" h="612.0" h-a-x="287" n="accidentalBuyukMucennebFlat">
+    <a n="cutOutSE" x="0.81" y="-0.42"/>
+    <a n="cutOutSW" x="0.18" y="0.54"/>
+  </g>
+  <g c="E441" x="0.0" y="-175.0" w="226.0" h="614.0" h-a-x="227" n="accidentalKucukMucennebFlat">
+    <a n="cutOutNE" x="0.28" y="0.7"/>
+    <a n="cutOutSE" x="0.58" y="-0.42"/>
+  </g>
+  <g c="E442" x="-1.0" y="-175.0" w="287.0" h="614.0" h-a-x="287" n="accidentalBakiyeFlat">
+    <a n="cutOutNE" x="0.54" y="1.39"/>
+    <a n="cutOutNW" x="0.15" y="1.11"/>
+    <a n="cutOutSE" x="0.82" y="-0.44"/>
+    <a n="cutOutSW" x="0.15" y="0.5"/>
+  </g>
+  <g c="E443" x="1.0" y="-175.0" w="226.0" h="614.0" h-a-x="229" n="accidentalKomaFlat">
+    <a n="cutOutNW" x="0.61" y="0.72"/>
+    <a n="cutOutSW" x="0.36" y="-0.45"/>
+  </g>
+  <g c="E444" x="0.0" y="-337.0" w="229.0" h="659.0" h-a-x="231" n="accidentalKomaSharp">
+    <a n="cutOutNE" x="0.6" y="0.88"/>
+    <a n="cutOutNW" x="0.28" y="0.71"/>
+    <a n="cutOutSE" x="0.6" y="-0.78"/>
+    <a n="cutOutSW" x="0.28" y="-0.92"/>
+  </g>
+  <g c="E445" x="0.0" y="-348.0" w="249.0" h="698.0" h-a-x="250" n="accidentalBakiyeSharp">
+    <a n="cutOutNE" x="0.86" y="0.94"/>
+    <a n="cutOutNW" x="0.12" y="0.62"/>
+    <a n="cutOutSE" x="0.86" y="-0.62"/>
+    <a n="cutOutSW" x="0.12" y="-0.92"/>
+  </g>
+  <g c="E446" x="-1.0" y="-338.0" w="340.0" h="659.0" h-a-x="339" n="accidentalKucukMucennebSharp">
+    <a n="cutOutNE" x="0.82" y="0.88"/>
+    <a n="cutOutNW" x="0.49" y="0.71"/>
+    <a n="cutOutSE" x="0.84" y="-0.77"/>
+    <a n="cutOutSW" x="0.5" y="-0.95"/>
+  </g>
+  <g c="E447" x="0.0" y="-350.0" w="341.0" h="698.0" h-a-x="343" n="accidentalBuyukMucennebSharp">
+    <a n="cutOutNE" x="1.05" y="0.94"/>
+    <a n="cutOutNW" x="0.26" y="0.63"/>
+    <a n="cutOutSE" x="1.05" y="-0.62"/>
+    <a n="cutOutSW" x="0.26" y="-0.96"/>
+  </g>
+  <g c="E4A0" x="0.0" y="1.0" w="339.0" h="244.0" h-a-x="339" n="articAccentAbove"/>
+  <g c="E4A1" x="0.0" y="-244.0" w="339.0" h="244.0" h-a-x="339" n="articAccentBelow"/>
+  <g c="E4A2" x="0.0" y="0.0" w="84.0" h="84.0" h-a-x="84" n="articStaccatoAbove"/>
+  <g c="E4A3" x="0.0" y="-84.0" w="84.0" h="84.0" h-a-x="84" n="articStaccatoBelow"/>
+  <g c="E4A4" x="-1.0" y="0.0" w="339.0" h="48.0" h-a-x="338" n="articTenutoAbove"/>
+  <g c="E4A5" x="-1.0" y="-48.0" w="339.0" h="48.0" h-a-x="338" n="articTenutoBelow"/>
+  <g c="E4A6" x="1.0" y="-2.0" w="99.0" h="295.0" h-a-x="102" n="articStaccatissimoAbove"/>
+  <g c="E4A7" x="1.0" y="-295.0" w="99.0" h="295.0" h-a-x="102" n="articStaccatissimoBelow"/>
+  <g c="E4A8" x="1.0" y="0.0" w="88.0" h="290.0" h-a-x="89" n="articStaccatissimoWedgeAbove"/>
+  <g c="E4A9" x="1.0" y="-290.0" w="88.0" h="290.0" h-a-x="89" n="articStaccatissimoWedgeBelow"/>
+  <g c="E4AA" x="0.0" y="0.0" w="48.0" h="290.0" h-a-x="48" n="articStaccatissimoStrokeAbove"/>
+  <g c="E4AB" x="0.0" y="-290.0" w="48.0" h="290.0" h-a-x="48" n="articStaccatissimoStrokeBelow"/>
+  <g c="E4AC" x="-1.0" y="-1.0" w="236.0" h="254.0" h-a-x="236" n="articMarcatoAbove"/>
+  <g c="E4AD" x="-1.0" y="-254.0" w="236.0" h="254.0" h-a-x="236" n="articMarcatoBelow"/>
+  <g c="E4AE" x="-1.0" y="0.0" w="236.0" h="443.0" h-a-x="236" n="articMarcatoStaccatoAbove"/>
+  <g c="E4AF" x="-1.0" y="-453.0" w="236.0" h="453.0" h-a-x="236" n="articMarcatoStaccatoBelow"/>
+  <g c="E4B0" x="0.0" y="0.0" w="339.0" h="420.0" h-a-x="340" n="articAccentStaccatoAbove"/>
+  <g c="E4B1" x="-1.0" y="-411.0" w="339.0" h="411.0" h-a-x="339" n="articAccentStaccatoBelow"/>
+  <g c="E4B2" x="-1.0" y="0.0" w="339.0" h="240.0" h-a-x="339" n="articTenutoStaccatoAbove"/>
+  <g c="E4B3" x="-1.0" y="-242.0" w="339.0" h="242.0" h-a-x="338" n="articTenutoStaccatoBelow"/>
+  <g c="E4B4" x="-1.0" y="0.0" w="340.0" h="345.0" h-a-x="339" n="articTenutoAccentAbove"/>
+  <g c="E4B5" x="-1.0" y="-345.0" w="340.0" h="345.0" h-a-x="339" n="articTenutoAccentBelow"/>
+  <g c="E4B6" x="0.0" y="5.0" w="233.0" h="232.0" h-a-x="235" n="articStressAbove"/>
+  <g c="E4B7" x="4.0" y="-234.0" w="232.0" h="234.0" h-a-x="238" n="articStressBelow"/>
+  <g c="E4B8" x="0.0" y="0.0" w="382.0" h="207.0" h-a-x="382" n="articUnstressAbove"/>
+  <g c="E4B9" x="1.0" y="-207.0" w="382.0" h="207.0" h-a-x="383" n="articUnstressBelow"/>
+  <g c="E4BA" x="1.0" y="1.0" w="366.0" h="143.0" h-a-x="367" n="articLaissezVibrerAbove"/>
+  <g c="E4BB" x="0.0" y="-143.0" w="365.0" h="143.0" h-a-x="365" n="articLaissezVibrerBelow"/>
+  <g c="E4BC" x="-1.0" y="0.0" w="339.0" h="427.0" h-a-x="338" n="articMarcatoTenutoAbove"/>
+  <g c="E4BD" x="-1.0" y="-429.0" w="339.0" h="429.0" h-a-x="338" n="articMarcatoTenutoBelow"/>
+  <g c="E4C0" x="3.0" y="-3.0" w="602.0" h="332.0" h-a-x="605" n="fermataAbove"/>
+  <g c="E4C1" x="3.0" y="-332.0" w="602.0" h="332.0" h-a-x="605" n="fermataBelow"/>
+  <g c="E4C2" x="0.0" y="0.0" w="726.0" h="449.0" h-a-x="735" n="fermataVeryShortAbove"/>
+  <g c="E4C3" x="0.0" y="-449.0" w="726.0" h="449.0" h-a-x="735" n="fermataVeryShortBelow"/>
+  <g c="E4C4" x="0.0" y="0.0" w="604.0" h="341.0" h-a-x="603" n="fermataShortAbove"/>
+  <g c="E4C5" x="0.0" y="-341.0" w="604.0" h="341.0" h-a-x="603" n="fermataShortBelow"/>
+  <g c="E4C6" x="0.0" y="-1.0" w="603.0" h="334.0" h-a-x="605" n="fermataLongAbove"/>
+  <g c="E4C7" x="0.0" y="-333.0" w="603.0" h="334.0" h-a-x="605" n="fermataLongBelow"/>
+  <g c="E4C8" x="0.0" y="0.0" w="715.0" h="408.0" h-a-x="716" n="fermataVeryLongAbove"/>
+  <g c="E4C9" x="0.0" y="-408.0" w="715.0" h="408.0" h-a-x="716" n="fermataVeryLongBelow"/>
+  <g c="E4CE" x="1.0" y="2.0" w="151.0" h="249.0" h-a-x="153" n="breathMarkComma"/>
+  <g c="E4E0" x="0.0" y="-249.0" w="381.0" h="499.0" h-a-x="381" n="restMaxima"/>
+  <g c="E4E1" x="0.0" y="-249.0" w="125.0" h="499.0" h-a-x="125" n="restLonga"/>
+  <g c="E4E2" x="0.0" y="0.0" w="125.0" h="250.0" h-a-x="126" n="restDoubleWhole"/>
+  <g c="E4E3" x="0.0" y="-135.0" w="282.0" h="144.0" h-a-x="283" n="restWhole"/>
+  <g c="E4E4" x="0.0" y="-2.0" w="282.0" h="144.0" h-a-x="283" n="restHalf"/>
+  <g c="E4E5" x="1.0" y="-375.0" w="269.0" h="748.0" h-a-x="270" n="restQuarter"/>
+  <g c="E4E6" x="0.0" y="-251.0" w="247.0" h="425.0" h-a-x="250" n="rest8th"/>
+  <g c="E4E7" x="0.0" y="-500.0" w="320.0" h="679.0" h-a-x="320" n="rest16th"/>
+  <g c="E4E8" x="0.0" y="-500.0" w="363.0" h="926.0" h-a-x="363" n="rest32nd"/>
+  <g c="E4E9" x="0.0" y="-753.0" w="423.0" h="1183.0" h-a-x="424" n="rest64th"/>
+  <g c="E4EA" x="0.0" y="-750.0" w="485.0" h="1439.0" h-a-x="485" n="rest128th"/>
+  <g c="E4EB" x="0.0" y="-1000.0" w="541.0" h="1696.0" h-a-x="541" n="rest256th"/>
+  <g c="E4EC" x="0.0" y="-1000.0" w="604.0" h="1944.0" h-a-x="604" n="rest512th"/>
+  <g c="E4ED" x="0.0" y="-993.0" w="668.0" h="2190.0" h-a-x="668" n="rest1024th"/>
+  <g c="E4F2" x="0.0" y="-251.0" w="247.0" h="425.0" h-a-x="250" n="restQuarterOld"/>
+  <g c="E4F6" x="0.0" y="-214.0" w="250.0" h="428.0" h-a-x="250" n="restQuarterZ"/>
+  <g c="E500" x="0.0" y="-250.0" w="532.0" h="529.0" h-a-x="533" n="repeat1Bar"/>
+  <g c="E501" x="0.0" y="-250.0" w="762.0" h="529.0" h-a-x="761" n="repeat2Bars"/>
+  <g c="E502" x="0.0" y="-250.0" w="1232.0" h="529.0" h-a-x="1233" n="repeat4Bars"/>
+  <g c="E503" x="0.0" y="75.0" w="125.0" h="125.0" h-a-x="125" n="repeatBarUpperDot"/>
+  <g c="E504" x="0.0" y="-250.0" w="532.0" h="529.0" h-a-x="532" n="repeatBarSlash"/>
+  <g c="E505" x="0.0" y="-174.0" w="125.0" h="125.0" h-a-x="124" n="repeatBarLowerDot"/>
+  <g c="E510" x="0.0" y="-10.0" w="386.0" h="473.0" h-a-x="386" n="ottava"/>
+  <g c="E511" x="0.0" y="-10.0" w="885.0" h="473.0" h-a-x="885" n="ottavaAlta"/>
+  <g c="E512" x="0.0" y="-10.0" w="839.0" h="473.0" h-a-x="839" n="ottavaBassa"/>
+  <g c="E513" x="0.0" y="-10.0" w="875.0" h="473.0" h-a-x="875" n="ottavaBassaBa"/>
+  <g c="E514" x="0.0" y="-10.0" w="667.0" h="471.0" h-a-x="667" n="quindicesima"/>
+  <g c="E515" x="0.0" y="-10.0" w="1315.0" h="471.0" h-a-x="1315" n="quindicesimaAlta"/>
+  <g c="E516" x="0.0" y="-10.0" w="1285.0" h="471.0" h-a-x="1285" n="quindicesimaBassa"/>
+  <g c="E517" x="4.0" y="-7.0" w="746.0" h="470.0" h-a-x="750" n="ventiduesima"/>
+  <g c="E518" x="4.0" y="-7.0" w="1424.0" h="470.0" h-a-x="1428" n="ventiduesimaAlta"/>
+  <g c="E519" x="4.0" y="-7.0" w="1374.0" h="470.0" h-a-x="1378" n="ventiduesimaBassa"/>
+  <g c="E51A" x="0.0" y="-17.0" w="163.0" h="501.0" h-a-x="137" n="octaveParensLeft"/>
+  <g c="E51B" x="-26.0" y="-17.0" w="163.0" h="501.0" h-a-x="137" n="octaveParensRight"/>
+  <g c="E51C" x="0.0" y="-10.0" w="796.0" h="473.0" h-a-x="796" n="ottavaBassaVb"/>
+  <g c="E51D" x="0.0" y="-10.0" w="1232.0" h="471.0" h-a-x="1231" n="quindicesimaBassaMb"/>
+  <g c="E51E" x="4.0" y="-7.0" w="1331.0" h="470.0" h-a-x="1335" n="ventiduesimaBassaMb"/>
+  <g c="E520" x="-89.0" y="-142.0" w="455.0" h="416.0" h-a-x="365" n="dynamicPiano">
+    <a n="opticalCenter" x="1.22" y="0.0"/>
+  </g>
+  <g c="E521" x="-20.0" y="-10.0" w="466.0" h="284.0" h-a-x="437" n="dynamicMezzo">
+    <a n="opticalCenter" x="0.87" y="0.0"/>
+  </g>
+  <g c="E522" x="-141.0" y="-152.0" w="505.0" h="596.0" h-a-x="364" n="dynamicForte">
+    <a n="opticalCenter" x="1.26" y="0.0"/>
+  </g>
+  <g c="E523" x="-20.0" y="0.0" w="297.0" h="274.0" h-a-x="277" n="dynamicRinforzando">
+    <a n="opticalCenter" x="0.61" y="0.0"/>
+  </g>
+  <g c="E524" x="0.0" y="-10.0" w="229.0" h="283.0" h-a-x="229" n="dynamicSforzando">
+    <a n="opticalCenter" x="0.44" y="0.0"/>
+  </g>
+  <g c="E525" x="-30.0" y="-10.0" w="274.0" h="278.0" h-a-x="244" n="dynamicZ">
+    <a n="opticalCenter" x="0.5" y="0.0"/>
+  </g>
+  <g c="E526" x="-23.0" y="-10.0" w="331.0" h="284.0" h-a-x="308" n="dynamicNiente">
+    <a n="opticalCenter" x="0.62" y="0.0"/>
+  </g>
+  <g c="E527" x="-102.0" y="-142.0" w="2230.0" h="416.0" h-a-x="2124" n="dynamicPPPPPP">
+    <a n="opticalCenter" x="4.25" y="0.0"/>
+  </g>
+  <g c="E528" x="-102.0" y="-142.0" w="1875.0" h="416.0" h-a-x="1776" n="dynamicPPPPP">
+    <a n="opticalCenter" x="3.55" y="0.0"/>
+  </g>
+  <g c="E529" x="-102.0" y="-142.0" w="1520.0" h="416.0" h-a-x="1417" n="dynamicPPPP">
+    <a n="opticalCenter" x="3.0" y="0.0"/>
+  </g>
+  <g c="E52A" x="-92.0" y="-142.0" w="1165.0" h="416.0" h-a-x="1072" n="dynamicPPP">
+    <a n="opticalCenter" x="2.37" y="0.0"/>
+  </g>
+  <g c="E52B" x="-82.0" y="-142.0" w="810.0" h="416.0" h-a-x="727" n="dynamicPP">
+    <a n="opticalCenter" x="1.71" y="0.0"/>
+  </g>
+  <g c="E52C" x="-20.0" y="-142.0" w="845.0" h="416.0" h-a-x="826" n="dynamicMP">
+    <a n="opticalCenter" x="1.85" y="0.0"/>
+  </g>
+  <g c="E52D" x="-20.0" y="-165.0" w="838.0" h="596.0" h-a-x="797" n="dynamicMF">
+    <a n="opticalCenter" x="1.8" y="0.0"/>
+  </g>
+  <g c="E52E" x="-72.0" y="-152.0" w="842.0" h="596.0" h-a-x="770" n="dynamicPF">
+    <a n="opticalCenter" x="1.68" y="0.0"/>
+  </g>
+  <g c="E52F" x="-135.0" y="-152.0" w="745.0" h="596.0" h-a-x="609" n="dynamicFF">
+    <a n="opticalCenter" x="1.85" y="0.0"/>
+  </g>
+  <g c="E530" x="-155.0" y="-152.0" w="985.0" h="596.0" h-a-x="831" n="dynamicFFF">
+    <a n="opticalCenter" x="2.47" y="0.0"/>
+  </g>
+  <g c="E531" x="-155.0" y="-152.0" w="1225.0" h="596.0" h-a-x="1070" n="dynamicFFFF">
+    <a n="opticalCenter" x="2.82" y="0.0"/>
+  </g>
+  <g c="E532" x="-155.0" y="-152.0" w="1465.0" h="596.0" h-a-x="1310" n="dynamicFFFFF">
+    <a n="opticalCenter" x="2.98" y="0.0"/>
+  </g>
+  <g c="E533" x="-155.0" y="-152.0" w="1705.0" h="596.0" h-a-x="1550" n="dynamicFFFFFF">
+    <a n="opticalCenter" x="3.5" y="0.0"/>
+  </g>
+  <g c="E534" x="-141.0" y="-152.0" w="760.0" h="596.0" h-a-x="619" n="dynamicFortePiano">
+    <a n="opticalCenter" x="1.5" y="0.0"/>
+  </g>
+  <g c="E535" x="-141.0" y="-152.0" w="638.0" h="596.0" h-a-x="497" n="dynamicForzando">
+    <a n="opticalCenter" x="1.35" y="0.0"/>
+  </g>
+  <g c="E536" x="0.0" y="-152.0" w="604.0" h="596.0" h-a-x="604" n="dynamicSforzando1">
+    <a n="opticalCenter" x="1.3" y="0.0"/>
+  </g>
+  <g c="E537" x="0.0" y="-152.0" w="845.0" h="596.0" h-a-x="846" n="dynamicSforzandoPiano">
+    <a n="opticalCenter" x="1.9" y="0.0"/>
+  </g>
+  <g c="E538" x="0.0" y="-152.0" w="1199.0" h="596.0" h-a-x="1198" n="dynamicSforzandoPianissimo">
+    <a n="opticalCenter" x="1.97" y="0.0"/>
+  </g>
+  <g c="E539" x="0.0" y="-152.0" w="733.0" h="596.0" h-a-x="732" n="dynamicSforzato">
+    <a n="opticalCenter" x="1.76" y="0.0"/>
+  </g>
+  <g c="E53A" x="0.0" y="-152.0" w="1076.0" h="596.0" h-a-x="1075" n="dynamicSforzatoPiano">
+    <a n="opticalCenter" x="1.85" y="0.0"/>
+  </g>
+  <g c="E53B" x="0.0" y="-152.0" w="964.0" h="596.0" h-a-x="964" n="dynamicSforzatoFF">
+    <a n="opticalCenter" x="2.28" y="0.0"/>
+  </g>
+  <g c="E53C" x="-20.0" y="-152.0" w="645.0" h="596.0" h-a-x="625" n="dynamicRinforzando1">
+    <a n="opticalCenter" x="1.56" y="0.0"/>
+  </g>
+  <g c="E53D" x="-20.0" y="-152.0" w="764.0" h="596.0" h-a-x="744" n="dynamicRinforzando2">
+    <a n="opticalCenter" x="2.08" y="0.0"/>
+  </g>
+  <g c="E566" x="0.0" y="-10.0" w="521.0" h="400.0" h-a-x="521" n="ornamentTrill"/>
+  <g c="E567" x="0.0" y="0.0" w="460.0" h="218.0" h-a-x="460" n="ornamentTurn"/>
+  <g c="E568" x="-3.0" y="0.0" w="460.0" h="218.0" h-a-x="457" n="ornamentTurnInverted"/>
+  <g c="E569" x="0.0" y="-90.0" w="460.0" h="396.0" h-a-x="460" n="ornamentTurnSlash"/>
+  <g c="E56A" x="0.0" y="0.0" w="218.0" h="460.0" h-a-x="218" n="ornamentTurnUp"/>
+  <g c="E56B" x="-3.0" y="0.0" w="218.0" h="460.0" h-a-x="217" n="ornamentTurnUpS"/>
+  <g c="E56C" x="0.0" y="0.0" w="725.0" h="245.0" h-a-x="730" n="ornamentShortTrill"/>
+  <g c="E56D" x="1.0" y="-73.0" w="728.0" h="392.0" h-a-x="729" n="ornamentMordent"/>
+  <g c="E56E" x="1.0" y="0.0" w="984.0" h="244.0" h-a-x="985" n="ornamentTremblement"/>
+  <g c="E56F" x="0.0" y="-40.0" w="499.0" h="253.0" n="ornamentHaydn"/>
+  <g c="E583" x="1.0" y="109.0" w="24.0" h="280.0" h-a-x="27" n="ornamentVerticalLine"/>
+  <g c="E587" x="0.0" y="0.0" w="1143.0" h="660.0" h-a-x="1143" n="ornamentSchleifer"/>
+  <g c="E59D" x="-52.0" y="0.0" w="337.0" h="245.0" h-a-x="262" n="ornamentZigZagLineNoRightEnd">
+    <a n="repeatOffset" x="1.05" y="0.0"/>
+  </g>
+  <g c="E59E" x="-54.0" y="0.0" w="460.0" h="245.0" h-a-x="357" n="ornamentZigZagLineWithRightEnd">
+    <a n="repeatOffset" x="1.43" y="0.0"/>
+  </g>
+  <g c="E5B0" x="0.0" y="0.0" w="1108.0" h="308.0" h-a-x="1108" n="ornamentPrecompSlide"/>
+  <g c="E5B1" x="0.0" y="-185.0" w="1129.0" h="429.0" h-a-x="1128" n="ornamentPrecompDescendingSlide"/>
+  <g c="E5B2" x="0.0" y="0.0" w="1119.0" h="481.0" h-a-x="1119" n="ornamentPrecompAppoggTrill"/>
+  <g c="E5B3" x="0.0" y="0.0" w="876.0" h="619.0" h-a-x="876" n="ornamentPrecompAppoggTrillSuffix"/>
+  <g c="E5B4" x="0.0" y="0.0" w="1494.0" h="510.0" h-a-x="1495" n="ornamentPrecompTurnTrillDAnglebert"/>
+  <g c="E5B5" x="2.0" y="-367.0" w="1148.0" h="612.0" h-a-x="1150" n="ornamentPrecompSlideTrillDAnglebert"/>
+  <g c="E5B6" x="0.0" y="-367.0" w="1112.0" h="748.0" h-a-x="1112" n="ornamentPrecompSlideTrillMarpurg"/>
+  <g c="E5B7" x="0.0" y="-62.0" w="1474.0" h="407.0" h-a-x="1473" n="ornamentPrecompTurnTrillBach"/>
+  <g c="E5B8" x="0.0" y="-367.0" w="1048.0" h="698.0" h-a-x="1048" n="ornamentPrecompSlideTrillBach"/>
+  <g c="E5B9" x="4.0" y="-197.0" w="1407.0" h="701.0" h-a-x="1410" n="ornamentPrecompSlideTrillMuffat"/>
+  <g c="E5BA" x="0.0" y="-196.0" w="1082.0" h="577.0" h-a-x="1082" n="ornamentPrecompSlideTrillSuffixMuffat"/>
+  <g c="E5BB" x="0.0" y="0.0" w="949.0" h="381.0" h-a-x="949" n="ornamentPrecompTrillSuffixDandrieu"/>
+  <g c="E5BC" x="0.0" y="-62.0" w="1305.0" h="392.0" h-a-x="1306" n="ornamentPrecompPortDeVoixMordent"/>
+  <g c="E5BD" x="0.0" y="-62.0" w="990.0" h="395.0" h-a-x="990" n="ornamentPrecompTrillWithMordent"/>
+  <g c="E5BE" x="0.0" y="0.0" w="1106.0" h="291.0" h-a-x="1106" n="ornamentPrecompCadence"/>
+  <g c="E5BF" x="0.0" y="-62.0" w="1106.0" h="395.0" h-a-x="1106" n="ornamentPrecompCadenceWithTurn"/>
+  <g c="E5C0" x="0.0" y="0.0" w="1369.0" h="291.0" h-a-x="1369" n="ornamentPrecompDoubleCadenceLowerPrefix"/>
+  <g c="E5C1" x="0.0" y="0.0" w="1013.0" h="247.0" h-a-x="1013" n="ornamentPrecompCadenceUpperPrefix"/>
+  <g c="E5C2" x="0.0" y="-62.0" w="1013.0" h="395.0" h-a-x="1013" n="ornamentPrecompCadenceUpperPrefixTurn"/>
+  <g c="E5C3" x="0.0" y="0.0" w="1278.0" h="247.0" h-a-x="1278" n="ornamentPrecompDoubleCadenceUpperPrefix"/>
+  <g c="E5C4" x="0.0" y="-62.0" w="1277.0" h="395.0" h-a-x="1277" n="ornamentPrecompDoubleCadenceUpperPrefixTurn"/>
+  <g c="E5C5" x="0.0" y="0.0" w="693.0" h="384.0" h-a-x="693" n="ornamentPrecompMordentRelease"/>
+  <g c="E5C6" x="0.0" y="0.0" w="1223.0" h="391.0" h-a-x="1223" n="ornamentPrecompMordentUpperPrefix"/>
+  <g c="E5C7" x="0.0" y="-62.0" w="1222.0" h="452.0" h-a-x="1222" n="ornamentPrecompInvertedMordentUpperPrefix"/>
+  <g c="E5C8" x="0.0" y="-222.0" w="859.0" h="468.0" h-a-x="859" n="ornamentPrecompTrillLowerSuffix"/>
+  <g c="E5E5" x="0.0" y="0.0" w="272.0" h="272.0" h-a-x="272" n="brassMuteClosed"/>
+  <g c="E5E6" x="1.0" y="0.0" w="304.0" h="304.0" h-a-x="305" n="brassMuteHalfClosed"/>
+  <g c="E5E7" x="0.0" y="0.0" w="304.0" h="304.0" h-a-x="305" n="brassMuteOpen"/>
+  <g c="E610" x="0.0" y="0.0" w="312.0" h="318.0" h-a-x="312" n="stringsDownBow"/>
+  <g c="E611" x="0.0" y="0.0" w="312.0" h="318.0" h-a-x="312" n="stringsDownBowTurned"/>
+  <g c="E612" x="1.0" y="1.0" w="248.0" h="494.0" h-a-x="250" n="stringsUpBow"/>
+  <g c="E613" x="1.0" y="1.0" w="248.0" h="494.0" h-a-x="250" n="stringsUpBowTurned"/>
+  <g c="E614" x="0.0" y="0.0" w="200.0" h="200.0" h-a-x="200" n="stringsHarmonic"/>
+  <g c="E630" x="0.0" y="0.0" w="200.0" h="300.0" h-a-x="200" n="pluckedSnapPizzicatoBelow"/>
+  <g c="E631" x="0.0" y="0.0" w="200.0" h="300.0" h-a-x="200" n="pluckedSnapPizzicatoAbove"/>
+  <g c="E632" x="0.0" y="0.0" w="300.0" h="200.0" h-a-x="300" n="pluckedBuzzPizzicato"/>
+  <g c="E633" x="0.0" y="0.0" w="272.0" h="272.0" h-a-x="272" n="pluckedLeftHandPizzicato"/>
+  <g c="E638" x="0.0" y="0.0" w="324.0" h="324.0" h-a-x="325" n="pluckedDamp"/>
+  <g c="E645" x="-161.0" y="-1.0" w="322.0" h="322.0" h-a-x="161" n="vocalSprechgesang"/>
+  <g c="E650" x="0.0" y="-8.0" w="1019.0" h="563.0" h-a-x="1019" n="keyboardPedalPed"/>
+  <g c="E651" x="0.0" y="-8.0" w="500.0" h="563.0" h-a-x="493" n="keyboardPedalP"/>
+  <g c="E655" x="0.0" y="0.0" w="450.0" h="450.0" h-a-x="450" n="keyboardPedalUp"/>
+  <g c="E659" x="0.0" y="-15.0" w="1107.0" h="606.0" h-a-x="1107" n="keyboardPedalSost"/>
+  <g c="E65A" x="0.0" y="-15.0" w="419.0" h="606.0" h-a-x="419" n="keyboardPedalS"/>
+  <g c="E880" x="-0.3" y="-8.0" w="318.58" h="383.0" h-a-x="319" n="tuplet0"/>
+  <g c="E881" x="10.0" y="0.0" w="246.0" h="372.0" h-a-x="246" n="tuplet1"/>
+  <g c="E882" x="10.0" y="-6.0" w="319.0" h="381.0" h-a-x="319" n="tuplet2"/>
+  <g c="E883" x="10.0" y="-8.0" w="296.0" h="383.0" h-a-x="296" n="tuplet3"/>
+  <g c="E884" x="10.0" y="0.0" w="303.0" h="372.0" h-a-x="303" n="tuplet4"/>
+  <g c="E885" x="10.0" y="-8.0" w="317.0" h="381.0" h-a-x="317" n="tuplet5"/>
+  <g c="E886" x="10.26" y="-8.0" w="303.74" h="383.0" h-a-x="304" n="tuplet6"/>
+  <g c="E887" x="30.0" y="-4.0" w="303.0" h="376.0" h-a-x="303" n="tuplet7"/>
+  <g c="E888" x="10.0" y="-8.0" w="313.0" h="383.0" h-a-x="313" n="tuplet8"/>
+  <g c="E889" x="10.0" y="-8.0" w="303.74" h="383.0" h-a-x="304" n="tuplet9"/>
+  <g c="E88A" x="10.0" y="58.0" w="111.0" h="210.0" h-a-x="111" n="tupletColon"/>
+  <g c="E901" x="0.0" y="-169.0" w="339.0" h="1091.0" h-a-x="339" n="mensuralGclefPetrucci"/>
+  <g c="E902" x="0.0" y="-231.0" w="264.0" h="452.0" h-a-x="264" n="chantFclef"/>
+  <g c="E904" x="0.0" y="-1069.0" w="488.0" h="1660.0" h-a-x="488" n="mensuralFclefPetrucci"/>
+  <g c="E906" x="0.0" y="-221.0" w="134.0" h="442.0" h-a-x="134" n="chantCclef"/>
+  <g c="E907" x="0.0" y="-349.0" w="244.0" h="1149.0" h-a-x="244" n="mensuralCclefPetrucciPosLowest"/>
+  <g c="E908" x="0.0" y="-600.0" w="244.0" h="1400.0" h-a-x="244" n="mensuralCclefPetrucciPosLow"/>
+  <g c="E909" x="0.0" y="-800.0" w="244.0" h="1600.0" h-a-x="244" n="mensuralCclefPetrucciPosMiddle"/>
+  <g c="E90A" x="0.0" y="-800.0" w="244.0" h="1400.0" h-a-x="244" n="mensuralCclefPetrucciPosHigh"/>
+  <g c="E90B" x="0.0" y="-795.0" w="244.0" h="1149.0" h-a-x="244" n="mensuralCclefPetrucciPosHighest"/>
+  <g c="E910" x="1.0" y="-266.0" w="531.0" h="531.0" h-a-x="532" n="mensuralProlation1"/>
+  <g c="E911" x="1.0" y="-266.0" w="531.0" h="531.0" h-a-x="532" n="mensuralProlation2"/>
+  <g c="E912" x="1.0" y="-380.0" w="531.0" h="743.0" h-a-x="532" n="mensuralProlation3"/>
+  <g c="E913" x="0.0" y="-380.0" w="531.0" h="743.0" h-a-x="531" n="mensuralProlation4"/>
+  <g c="E914" x="0.0" y="-266.0" w="494.0" h="531.0" h-a-x="495" n="mensuralProlation5"/>
+  <g c="E915" x="0.0" y="-266.0" w="494.0" h="531.0" h-a-x="495" n="mensuralProlation6"/>
+  <g c="E916" x="-3.0" y="-250.0" w="495.0" h="531.0" h-a-x="492" n="mensuralProlation7"/>
+  <g c="E917" x="1.0" y="-380.0" w="494.0" h="743.0" h-a-x="493" n="mensuralProlation8"/>
+  <g c="E918" x="1.0" y="-380.0" w="494.0" h="743.0" h-a-x="495" n="mensuralProlation9"/>
+  <g c="E919" x="0.0" y="-380.0" w="495.0" h="743.0" n="mensuralProlation10"/>
+  <g c="E91A" x="0.0" y="-267.0" w="495.0" h="531.0" h-a-x="494" n="mensuralProlation11"/>
+  <g c="E91B" x="0.0" y="-276.0" w="547.0" h="551.0" h-a-x="547" n="mensuralProportionTempusPerfectum"/>
+  <g c="E91C" x="0.0" y="-266.0" w="743.0" h="531.0" h-a-x="743" n="mensuralProportionProportioDupla1"/>
+  <g c="E91D" x="0.0" y="-269.0" w="540.0" h="539.0" h-a-x="540" n="mensuralProportionProportioDupla2"/>
+  <g c="E91E" x="0.0" y="-269.0" w="540.0" h="539.0" h-a-x="540" n="mensuralProportionProportioTripla"/>
+  <g c="E91F" x="0.0" y="-270.0" w="539.0" h="539.0" h-a-x="539" n="mensuralProportionProportioQuadrupla"/>
+  <g c="E920" x="0.0" y="-63.0" w="125.0" h="125.0" h-a-x="125" n="mensuralProlationCombiningDot"/>
+  <g c="E921" x="0.0" y="-52.0" w="266.0" h="104.0" h-a-x="266" n="mensuralProlationCombiningTwoDots"/>
+  <g c="E922" x="0.0" y="-49.0" w="362.0" h="98.0" h-a-x="362" n="mensuralProlationCombiningThreeDots"/>
+  <g c="E923" x="0.0" y="-125.0" w="266.0" h="251.0" h-a-x="266" n="mensuralProlationCombiningThreeDotsTri"/>
+  <g c="E924" x="0.0" y="-162.0" w="324.0" h="324.0" h-a-x="324" n="mensuralProlationCombiningDotVoid"/>
+  <g c="E925" x="0.0" y="-371.0" w="48.0" h="743.0" h-a-x="48" n="mensuralProlationCombiningStroke"/>
+  <g c="E938" x="0.0" y="-141.0" w="282.0" h="282.0" h-a-x="282" n="mensuralNoteheadSemibrevisBlack"/>
+  <g c="E939" x="1.0" y="-141.0" w="282.0" h="282.0" h-a-x="283" n="mensuralNoteheadSemibrevisVoid"/>
+  <g c="E93C" x="0.0" y="-184.0" w="320.0" h="369.0" h-a-x="320" n="mensuralNoteheadMinimaWhite">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.28" y="0.0"/>
+  </g>
+  <g c="E93D" x="0.0" y="-184.0" w="320.0" h="369.0" h-a-x="320" n="mensuralNoteheadSemiminimaWhite"/>
+  <g c="E93E" x="0.0" y="0.0" w="32.0" h="782.0" h-a-x="32" n="mensuralCombStemUp"/>
+  <g c="E93F" x="0.0" y="-782.0" w="32.0" h="782.0" h-a-x="32" n="mensuralCombStemDown"/>
+  <g c="E949" x="0.0" y="0.0" w="219.0" h="782.0" h-a-x="219" n="mensuralCombStemUpFlagSemiminima"/>
+  <g c="E94A" x="0.0" y="-782.0" w="219.0" h="782.0" h-a-x="219" n="mensuralCombStemDownFlagSemiminima"/>
+  <g c="E94B" x="0.0" y="0.0" w="219.0" h="782.0" h-a-x="219" n="mensuralCombStemUpFlagFusa"/>
+  <g c="E94C" x="0.0" y="-782.0" w="219.0" h="782.0" h-a-x="219" n="mensuralCombStemDownFlagFusa"/>
+  <g c="E990" x="0.0" y="-101.0" w="160.0" h="203.0" h-a-x="160" n="chantPunctum"/>
+  <g c="E991" x="0.0" y="-113.0" w="150.0" h="226.0" h-a-x="150" n="chantPunctumInclinatum"/>
+  <g c="E996" x="0.0" y="-401.0" w="160.0" h="503.0" h-a-x="160" n="chantPunctumVirga"/>
+  <g c="E99B" x="0.0" y="-115.0" w="154.0" h="230.0" h-a-x="154" n="chantQuilisma"/>
+  <g c="E99E" x="0.0" y="-246.0" w="153.0" h="360.0" h-a-x="153" n="chantOriscusLiquescens"/>
+  <g c="E99F" x="0.0" y="-92.0" w="124.0" h="185.0" h-a-x="124" n="chantStrophicus"/>
+  <g c="E9B4" x="0.0" y="-150.0" w="14.0" h="300.0" h-a-x="14" n="chantEntryLineAsc2nd"/>
+  <g c="E9B5" x="0.0" y="-150.0" w="14.0" h="450.0" h-a-x="14" n="chantEntryLineAsc3rd"/>
+  <g c="E9B6" x="0.0" y="-150.0" w="14.0" h="600.0" h-a-x="14" n="chantEntryLineAsc4th"/>
+  <g c="E9B7" x="0.0" y="-150.0" w="14.0" h="750.0" h-a-x="14" n="chantEntryLineAsc5th"/>
+  <g c="E9B9" x="0.0" y="-228.0" w="465.0" h="332.0" h-a-x="465" n="chantLigaturaDesc2nd"/>
+  <g c="E9BA" x="0.0" y="-400.0" w="579.0" h="504.0" h-a-x="579" n="chantLigaturaDesc3rd"/>
+  <g c="E9BB" x="0.0" y="-553.0" w="579.0" h="657.0" h-a-x="579" n="chantLigaturaDesc4th"/>
+  <g c="E9BC" x="0.0" y="-703.0" w="579.0" h="807.0" h-a-x="579" n="chantLigaturaDesc5th"/>
+  <g c="E9E0" x="0.0" y="-151.0" w="205.0" h="564.0" h-a-x="205" n="medRenFlatSoftB"/>
+  <g c="E9E1" x="0.0" y="-141.0" w="186.0" h="561.0" h-a-x="186" n="medRenFlatHardB"/>
+  <g c="E9E2" x="0.0" y="-254.0" w="102.0" h="507.0" h-a-x="102" n="medRenNatural"/>
+  <g c="E9E3" x="0.0" y="-142.0" w="430.0" h="284.0" h-a-x="430" n="medRenSharpCroix"/>
+  <g c="E9F0" x="0.0" y="-500.0" w="147.0" h="1000.0" h-a-x="147" n="mensuralRestMaxima"/>
+  <g c="E9F1" x="0.0" y="-500.0" w="48.0" h="1000.0" h-a-x="48" n="mensuralRestLongaPerfecta"/>
+  <g c="E9F2" x="0.0" y="-250.0" w="48.0" h="500.0" h-a-x="48" n="mensuralRestLongaImperfecta"/>
+  <g c="E9F3" x="0.0" y="0.0" w="48.0" h="250.0" h-a-x="48" n="mensuralRestBrevis"/>
+  <g c="E9F4" x="0.0" y="125.0" w="48.0" h="125.0" h-a-x="48" n="mensuralRestSemibrevis"/>
+  <g c="E9F5" x="0.0" y="0.0" w="48.0" h="125.0" h-a-x="48" n="mensuralRestMinima"/>
+  <g c="E9F6" x="0.0" y="0.0" w="139.0" h="165.0" h-a-x="139" n="mensuralRestSemiminima"/>
+  <g c="E9F7" x="0.0" y="0.0" w="139.0" h="165.0" h-a-x="139" n="mensuralRestFusa"/>
+  <g c="E9F8" x="0.0" y="0.0" w="138.0" h="165.0" h-a-x="138" n="mensuralRestSemifusa"/>
+  <g c="EA02" x="1.0" y="0.0" w="613.0" h="411.0" h-a-x="615" n="mensuralCustosUp"/>
+  <g c="EA06" x="0.0" y="-101.0" w="60.0" h="416.0" h-a-x="60" n="chantCustosStemUpPosMiddle"/>
+  <g c="EAA4" x="-36.0" y="98.0" w="306.0" h="111.0" h-a-x="237" n="wiggleTrill">
+    <a n="repeatOffset" x="0.95" y="0.0"/>
+  </g>
+  <g c="EAA9" x="-33.0" y="0.0" w="325.0" h="119.0" h-a-x="255" n="wiggleArpeggiatoUp">
+    <a n="repeatOffset" x="1.02" y="0.0"/>
+  </g>
+  <g c="EAAA" x="-33.0" y="0.0" w="325.0" h="119.0" h-a-x="255" n="wiggleArpeggiatoDown">
+    <a n="repeatOffset" x="1.02" y="0.0"/>
+  </g>
+  <g c="EAAD" x="-47.0" y="-80.0" w="563.0" h="235.0" h-a-x="516" n="wiggleArpeggiatoUpArrow">
+    <a n="repeatOffset" x="2.06" y="0.0"/>
+  </g>
+  <g c="EAAE" x="1.0" y="-65.0" w="563.0" h="235.0" h-a-x="516" n="wiggleArpeggiatoDownArrow">
+    <a n="repeatOffset" x="2.06" y="0.0"/>
+  </g>
+  <g c="EAAF" x="-25.0" y="0.0" w="306.0" h="111.0" h-a-x="240" n="wiggleGlissando">
+    <a n="repeatOffset" x="0.96" y="0.0"/>
+  </g>
+  <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"/>
+  <g c="EBAA" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" n="luteDuration8th"/>
+  <g c="EBAB" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" n="luteDuration16th"/>
+  <g c="EBAC" x="0.0" y="-9.0" w="228.0" h="795.0" h-a-x="228" n="luteDuration32nd"/>
+  <g c="EBC0" x="0.0" y="0.0" w="276.0" h="242.0" h-a-x="276" n="luteFrenchFretA"/>
+  <g c="EBC1" x="0.0" y="0.0" w="219.0" h="300.0" h-a-x="219" n="luteFrenchFretB"/>
+  <g c="EBC2" x="1.0" y="1.0" w="291.0" h="265.0" h-a-x="292" n="luteFrenchFretC"/>
+  <g c="EBC3" x="0.0" y="0.0" w="429.0" h="245.0" h-a-x="429" n="luteFrenchFretD"/>
+  <g c="EBC4" x="0.0" y="0.0" w="313.0" h="238.0" h-a-x="313" n="luteFrenchFretE"/>
+  <g c="EBC5" x="0.0" y="0.0" w="251.0" h="264.0" h-a-x="251" n="luteFrenchFretF"/>
+  <g c="EBC6" x="0.0" y="0.0" w="404.0" h="283.0" h-a-x="404" n="luteFrenchFretG"/>
+  <g c="EBC7" x="0.0" y="0.0" w="234.0" h="290.0" h-a-x="234" n="luteFrenchFretH"/>
+  <g c="EBC8" x="0.0" y="1.0" w="124.0" h="305.0" h-a-x="124" n="luteFrenchFretI"/>
+  <g c="EBC9" x="1.0" y="1.0" w="213.0" h="299.0" h-a-x="214" n="luteFrenchFretK"/>
+  <g c="EBCA" x="0.0" y="0.0" w="131.0" h="296.0" h-a-x="131" n="luteFrenchFretL"/>
+  <g c="EBCB" x="0.0" y="0.0" w="411.0" h="275.0" h-a-x="411" n="luteFrenchFretM"/>
+  <g c="EBCC" x="0.0" y="0.0" w="321.0" h="302.0" h-a-x="321" n="luteFrenchFretN"/>
+  <g c="EBE0" x="24.0" y="-1.0" w="257.0" h="301.0" h-a-x="256" n="luteItalianFret0"/>
+  <g c="EBE1" x="24.0" y="0.0" w="138.0" h="300.0" h-a-x="138" n="luteItalianFret1"/>
+  <g c="EBE2" x="24.0" y="-3.0" w="239.0" h="304.0" h-a-x="239" n="luteItalianFret2"/>
+  <g c="EBE3" x="24.0" y="0.0" w="220.0" h="300.0" h-a-x="220" n="luteItalianFret3"/>
+  <g c="EBE4" x="24.0" y="1.0" w="233.0" h="300.0" h-a-x="234" n="luteItalianFret4"/>
+  <g c="EBE5" x="23.0" y="0.0" w="215.0" h="300.0" h-a-x="216" n="luteItalianFret5"/>
+  <g c="EBE6" x="24.0" y="0.0" w="235.0" h="300.0" h-a-x="236" n="luteItalianFret6"/>
+  <g c="EBE7" x="25.0" y="0.0" w="242.0" h="301.0" h-a-x="242" n="luteItalianFret7"/>
+  <g c="EBE8" x="24.0" y="0.0" w="230.0" h="301.0" h-a-x="230" n="luteItalianFret8"/>
+  <g c="EBE9" x="24.0" y="0.0" w="235.0" h="300.0" h-a-x="235" n="luteItalianFret9"/>
+  <g c="ED40" x="0.0" y="1.0" w="708.0" h="244.0" h-a-x="708" n="articSoftAccentAbove"/>
+  <g c="ED41" x="0.0" y="-245.0" w="708.0" h="244.0" h-a-x="708" n="articSoftAccentBelow"/>
+</bounding-boxes>
diff --git a/data/Bravura/E000.xml b/data/Bravura/E000.xml
new file mode 100644
index 00000000000..af9ef14233a
--- /dev/null
+++ b/data/Bravura/E000.xml
@@ -0,0 +1 @@
+<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M49 397c0 65 -29 81 -47 101c28 32 47 58 47 105c0 63 -35 103 -35 202c0 100 27 158 49 185c4 5 6 7 8 7s3 -2 4 -3c1 0 2 -2 2 -4c0 -3 -1 -6 -5 -10c-5 -9 -28 -59 -28 -111c0 -54 30 -147 37 -207c1 -5 1 -11 1 -16c0 -59 -33 -130 -62 -148c29 -18 62 -89 62 -148 c0 -6 0 -11 -1 -16c-7 -59 -37 -153 -37 -206s23 -103 28 -111c4 -5 5 -8 5 -11s-3 -6 -6 -6c-2 0 -4 1 -8 6c-22 28 -49 86 -49 186c0 73 35 135 35 205z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E003.xml b/data/Bravura/E003.xml
new file mode 100644
index 00000000000..56652afb5b0
--- /dev/null
+++ b/data/Bravura/E003.xml
@@ -0,0 +1 @@
+<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 117c0 6 2 7 8 7h101c191 14 317 146 327 157c5 7 16 14 25 14c5 -2 8 -6 8 -14c0 -3 0 -6 -1 -10c-40 -167 -183 -241 -343 -271h-125v117z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E004.xml b/data/Bravura/E004.xml
new file mode 100644
index 00000000000..73212515614
--- /dev/null
+++ b/data/Bravura/E004.xml
@@ -0,0 +1 @@
+<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0h125c160 -30 303 -104 343 -271c1 -4 1 -7 1 -10c0 -8 -3 -12 -8 -14c-9 0 -20 7 -25 14c-10 11 -136 143 -327 157h-101c-6 0 -8 1 -8 7v117z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E043.xml b/data/Bravura/E043.xml
new file mode 100644
index 00000000000..0d2a0ddc1c3
--- /dev/null
+++ b/data/Bravura/E043.xml
@@ -0,0 +1 @@
+<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M50 318c-28 0 -50 22 -50 50s22 50 50 50c27 0 50 -22 50 -50s-23 -50 -50 -50zM0 620c0 28 22 50 50 50c27 0 50 -22 50 -50c0 -27 -23 -50 -50 -50c-28 0 -50 23 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E044.xml b/data/Bravura/E044.xml
new file mode 100644
index 00000000000..07155874aa2
--- /dev/null
+++ b/data/Bravura/E044.xml
@@ -0,0 +1 @@
+<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 28 22 50 50 50c27 0 50 -22 50 -50s-23 -50 -50 -50c-28 0 -50 22 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E045.xml b/data/Bravura/E045.xml
new file mode 100644
index 00000000000..040673e2f9a
--- /dev/null
+++ b/data/Bravura/E045.xml
@@ -0,0 +1 @@
+<symbol id="E045" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 433h214c85 0 129 -8 165 -32c56 -37 86 -99 86 -180c0 -82 -30 -147 -83 -184c-37 -26 -85 -37 -161 -37h-221v32h9c32 0 44 3 50 9c4 5 4 8 4 45v261c0 38 0 40 -4 45c-6 6 -18 9 -50 9h-9v32zM630 -4h-31v170h31c33 -90 92 -144 160 -144c52 0 87 28 87 70 c0 21 -10 39 -27 48c-11 5 -21 8 -42 13c-4 0 -10 2 -14 3c-3 1 -6 1 -9 2l-37 8c-94 17 -148 69 -148 142c0 80 63 134 155 134c42 0 75 -9 108 -32l32 27h27l7 -155h-31c-36 85 -86 129 -148 129c-47 0 -81 -26 -81 -63c0 -25 14 -42 41 -52c15 -5 15 -3 61 -14l29 -7 c104 -22 149 -65 149 -141c0 -84 -65 -143 -159 -143c-48 0 -86 13 -123 40zM218 401c-29 0 -36 -7 -36 -36v-294c0 -31 6 -39 36 -39h12c90 0 126 59 126 191c0 120 -40 178 -123 178h-15zM1025 -9c-31 0 -56 26 -56 56c0 32 25 57 56 57c32 0 57 -25 57 -57 c0 -31 -25 -56 -57 -56zM459 47c0 32 25 57 56 57c32 0 57 -25 57 -57c0 -31 -25 -56 -57 -56c-31 0 -56 26 -56 56z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E046.xml b/data/Bravura/E046.xml
new file mode 100644
index 00000000000..9579df12be5
--- /dev/null
+++ b/data/Bravura/E046.xml
@@ -0,0 +1 @@
+<symbol id="E046" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 0h-221v32h9c32 0 44 3 50 9c4 5 4 8 4 45v261c0 38 0 40 -4 45c-6 6 -18 9 -50 9h-9v32h214c85 0 129 -8 165 -32c56 -37 86 -99 86 -180c0 -82 -30 -147 -83 -184c-37 -26 -85 -37 -161 -37zM564 211c0 135 95 231 227 231c42 0 70 -8 110 -32l32 30h26l6 -172 l-32 -3c-27 100 -71 146 -137 146c-74 0 -113 -65 -113 -189c0 -132 39 -194 120 -194c69 0 117 48 134 131l37 -9c-23 -107 -84 -159 -190 -159c-71 0 -122 20 -163 66c-38 43 -57 92 -57 154zM182 365v-294c0 -31 6 -39 36 -39h12c90 0 126 59 126 191 c0 120 -40 178 -123 178h-15c-29 0 -36 -7 -36 -36zM1025 -9c-31 0 -56 26 -56 56c0 32 25 57 56 57c32 0 57 -25 57 -57c0 -31 -25 -56 -57 -56zM515 -9c-31 0 -56 26 -56 56c0 32 25 57 56 57c32 0 57 -25 57 -57c0 -31 -25 -56 -57 -56z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E047.xml b/data/Bravura/E047.xml
new file mode 100644
index 00000000000..b868edbb77b
--- /dev/null
+++ b/data/Bravura/E047.xml
@@ -0,0 +1 @@
+<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 477c-11 25 -16 50 -16 74c0 99 79 185 149 185c51 0 118 -17 134 -63c5 -16 8 -32 8 -47c0 -43 -28 -67 -69 -67c-51 0 -66 59 -73 86l-2 7c-3 11 -10 13 -16 13h-6c-42 -7 -54 -35 -54 -62c0 -21 8 -42 14 -53c26 -45 177 -103 186 -106c4 -2 7 -3 10 -3 c4 0 6 3 9 8c6 9 165 296 165 296c5 9 15 14 25 14c15 0 28 -12 28 -28c0 -5 -1 -9 -4 -14c0 0 -155 -279 -160 -287c-1 -2 -2 -4 -2 -6c0 -5 5 -9 17 -16c12 -6 170 -95 185 -205c1 -10 2 -20 2 -29c0 -83 -53 -148 -133 -175c-15 -5 -29 -7 -42 -7c-59 0 -121 53 -121 114 c0 40 34 56 71 65c4 1 8 2 12 2c28 0 53 -28 53 -66v-11c0 -31 17 -45 36 -45c2 0 5 1 7 1c32 5 56 31 56 70c0 95 -200 154 -215 157c-4 0 -12 -6 -12 -5c-3 -6 -158 -286 -158 -286c-5 -9 -15 -15 -25 -15c-16 0 -28 13 -28 29c0 4 1 9 3 13c0 0 144 259 151 273 c4 7 6 12 6 16s-2 6 -6 8c-8 3 -153 92 -185 165zM472 409c-31 0 -57 26 -57 57c0 32 26 57 57 57c32 0 57 -25 57 -57c0 -31 -25 -57 -57 -57zM83 207c-31 0 -57 25 -57 57c0 31 26 57 57 57c32 0 57 -26 57 -57c0 -32 -25 -57 -57 -57z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E048.xml b/data/Bravura/E048.xml
new file mode 100644
index 00000000000..67280bb3ef7
--- /dev/null
+++ b/data/Bravura/E048.xml
@@ -0,0 +1 @@
+<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-4 376c0 13 4 24 18 24h132c11 189 150 339 312 352v129c0 13 11 17 24 17s24 -4 24 -17v-129c162 -13 302 -164 312 -352h119c14 0 18 -11 18 -24s-4 -24 -18 -24h-119c-10 -187 -150 -339 -312 -352v-140c0 -14 -11 -18 -24 -18s-24 4 -24 18v140 c-162 13 -301 165 -312 352h-132c-14 0 -18 11 -18 24zM653 400c0 162 -7 284 -147 296v-296h147zM506 352v-304c125 15 144 151 147 304h-147zM316 400h142v296c-142 -12 -142 -134 -142 -296zM458 352h-142c1 -154 13 -289 142 -304v304z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E049.xml b/data/Bravura/E049.xml
new file mode 100644
index 00000000000..420d9613289
--- /dev/null
+++ b/data/Bravura/E049.xml
@@ -0,0 +1 @@
+<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 350c-9 0 -16 8 -16 21v8c0 12 7 21 16 21h123v323c0 8 6 15 14 15h234v144c0 12 9 21 21 21h6c13 0 21 -9 21 -21v-144h234c7 0 14 -7 14 -15v-323h124c8 0 15 -9 15 -21v-8c0 -13 -7 -21 -15 -21h-124v-340c0 -10 -7 -17 -14 -17h-234v-126c0 -11 -8 -21 -21 -21h-6 c-12 0 -21 10 -21 21v126h-234c-8 0 -14 7 -14 17v340h-123zM435 43h107c7 0 10 5 10 15v292h-117v-307zM270 58c0 -10 5 -15 12 -15h105v307h-117v-292zM270 400h117v288h-108c-5 0 -9 -2 -9 -9v-279zM541 688h-106v-288h117v275c0 8 -3 13 -11 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E04B.xml b/data/Bravura/E04B.xml
new file mode 100644
index 00000000000..ead6658bec9
--- /dev/null
+++ b/data/Bravura/E04B.xml
@@ -0,0 +1 @@
+<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M143 227c-63 36 -142 91 -142 177c0 44 38 97 44 108c3 5 5 9 5 13s-2 9 -8 16c-12 13 -38 49 -38 95s40 94 56 104c5 3 8 8 8 14c0 4 -2 9 -8 17c-12 13 -43 46 -43 112c0 69 62 148 184 148h5c45 -1 162 -28 162 -95c0 -54 -29 -63 -55 -63c-28 0 -49 7 -69 54 c-15 36 -66 53 -81 53c-21 0 -76 -9 -76 -59c0 -26 29 -53 63 -78c1 -1 3 -2 5 -2s4 1 5 3v6c0 8 6 15 14 15c7 0 15 -7 15 -15v-24c0 -6 3 -10 5 -11c6 -4 24 -16 28 -16c3 0 4 6 4 10v41c0 8 7 15 14 15c9 0 15 -7 15 -15v-58c0 -8 4 -14 8 -16c47 -27 139 -80 139 -145 c0 -74 -34 -100 -49 -119c-6 -8 -8 -13 -8 -18s4 -12 8 -16c6 -7 42 -50 42 -107c0 -55 -48 -96 -58 -110c-4 -6 -6 -11 -6 -16c0 -6 3 -11 7 -16c6 -9 44 -44 44 -103v-7c-3 -63 -43 -152 -176 -152c-132 0 -172 82 -172 113c0 32 17 54 49 54c31 0 46 -18 60 -39 c15 -23 38 -92 92 -92c55 0 76 40 77 72c0 0 -24 74 -52 74c-3 0 -5 -2 -5 -4c0 -7 -6 -14 -15 -14c-7 0 -14 7 -14 14v24c0 4 -6 11 -9 14l-16 11c-1 0 -4 2 -4 2c-3 0 -8 -4 -8 -8v-43c0 -7 -8 -14 -15 -14c-8 0 -14 7 -14 14v61c0 6 -12 17 -17 21zM101 479 c-22 0 -48 -23 -48 -46c0 -24 32 -52 52 -59l40 -22c2 -1 5 -2 8 -2c4 0 7 2 7 5v86c0 9 -8 15 -11 17c-18 10 -31 16 -33 17c-3 2 -8 4 -15 4zM255 634v-76c0 -6 3 -13 8 -15c9 -4 17 -6 21 -8c7 -1 13 -2 18 -2c21 0 38 22 38 42c0 15 -10 30 -19 37c0 1 -39 31 -59 31 c-3 0 -7 -3 -7 -9zM72 670c0 -23 28 -42 47 -54l6 -4s9 -5 23 -12h4c4 0 8 1 8 6v81c0 5 -6 10 -8 11l-19 9c-3 2 -8 3 -15 3c-21 0 -46 -18 -46 -40zM255 391v-80c0 -9 2 -15 7 -17c5 -3 9 -4 11 -5c7 -2 13 -3 18 -3c16 0 25 9 35 26c3 7 5 13 5 20c0 17 -10 33 -20 40 c-4 4 -21 12 -43 24c-1 1 -3 2 -5 2c-4 0 -8 -2 -8 -7zM189 425c-1 -4 -1 -56 -1 -82c0 -8 1 -13 6 -17l22 -11c1 -1 2 -1 3 -1c3 0 7 3 7 8v83c0 12 -6 17 -9 19c-5 2 -16 10 -21 10c-3 0 -7 -3 -7 -9zM188 638c0 -17 0 -37 1 -49c0 -6 4 -12 6 -13c6 -4 20 -13 27 -13 c2 0 4 1 4 5v82c0 10 -4 13 -6 14c-9 4 -25 13 -26 13c-2 0 -5 -2 -5 -5c-1 -2 -1 -17 -1 -34z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E050.xml b/data/Bravura/E050.xml
new file mode 100644
index 00000000000..ccfddd927b6
--- /dev/null
+++ b/data/Bravura/E050.xml
@@ -0,0 +1 @@
+<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M364 -252c-245 0 -364 165 -364 339c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18 c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -170 -130 -200 -197 -200c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29 c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13 c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM470 943c-61 0 -133 -96 -133 -252c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8 c79 69 174 159 174 270c0 55 -27 82 -60 82zM441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E051.xml b/data/Bravura/E051.xml
new file mode 100644
index 00000000000..c6655959414
--- /dev/null
+++ b/data/Bravura/E051.xml
@@ -0,0 +1 @@
+<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M364 -252c-245 0 -364 165 -364 339c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18 c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -132 -79 -180 -146 -194c8 -2 19 -4 33 -4c18 0 33 2 46 6c8 2 11 4 15 4c3 0 6 -3 6 -6c0 -4 -3 -8 -9 -13c-19 -18 -47 -35 -83 -35c-8 0 -17 1 -24 2 c-6 1 -9 1 -11 -5l-9 -28c-2 -6 -1 -10 8 -7c8 3 17 4 29 4c40 0 65 -14 65 -50c0 -58 -42 -97 -99 -97c-43 0 -63 23 -63 47c0 21 13 36 30 36c13 0 24 -7 24 -22c0 -16 -9 -24 -16 -27c-5 -2 -8 -3 -8 -7c0 -6 10 -11 22 -11c41 0 60 50 60 80c0 17 -7 31 -28 31 c-19 0 -32 -13 -37 -18s-8 -7 -12 -7c-6 0 -10 4 -10 10c0 3 1 5 3 11l34 100v1c-6 -1 -12 -1 -17 -1c-11 0 -21 1 -31 2c0 -1 -1 -2 -1 -4l-60 -189c-1 -5 -2 -8 2 -8l21 -2c6 -1 9 -4 9 -9s-3 -8 -10 -8h-103c-7 0 -10 3 -10 8s3 8 9 9l21 2c6 0 6 2 8 6l42 132 c1 3 1 5 1 7c0 3 -1 4 -3 4c-3 0 -5 -2 -8 -6l-23 -25c-3 -4 -6 -6 -11 -6s-10 4 -10 9c0 3 2 6 5 10l66 74c2 3 4 5 7 5c-86 28 -111 101 -111 152c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29 c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13 c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM337 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270 c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252zM441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E052.xml b/data/Bravura/E052.xml
new file mode 100644
index 00000000000..7658cd92b0a
--- /dev/null
+++ b/data/Bravura/E052.xml
@@ -0,0 +1 @@
+<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 87c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18c147 0 241 -113 241 -241 c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -121 -67 -171 -129 -190c21 -9 31 -26 31 -46c0 -18 -10 -39 -37 -53c-12 -6 -10 -8 -3 -16c12 -13 16 -26 16 -44c0 -46 -42 -71 -91 -71c-54 0 -78 26 -78 59c0 24 13 46 45 59 c12 5 10 7 5 14c-8 10 -12 22 -12 37c0 23 10 41 28 52c-128 12 -162 101 -162 162c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9 c-20 -4 -46 -6 -69 -6c-245 0 -364 165 -364 339zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6 c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM337 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252z M441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163zM267 -825c0 -18 10 -38 40 -38c24 0 43 14 43 40c0 15 -8 22 -40 47c-7 5 -10 6 -15 3c-21 -13 -28 -36 -28 -52zM351 -657c-22 0 -38 -13 -38 -35c0 -14 8 -23 31 -41 c8 -5 11 -5 15 -2c17 12 24 29 24 46c0 16 -8 32 -32 32z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E053.xml b/data/Bravura/E053.xml
new file mode 100644
index 00000000000..6e297969e0d
--- /dev/null
+++ b/data/Bravura/E053.xml
@@ -0,0 +1 @@
+<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 87c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 118 33 274 137 346c-35 8 -50 30 -50 57c0 24 13 46 45 59c12 5 10 8 5 15c-8 9 -12 22 -12 36c0 43 35 68 86 68c49 0 69 -24 69 -52c0 -19 -10 -39 -37 -53c-12 -6 -10 -9 -3 -17 c12 -12 16 -25 16 -44c0 -39 -32 -64 -72 -70c68 -62 96 -181 96 -269c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214 c0 -170 -130 -200 -197 -200c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6 c-245 0 -364 165 -364 339zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177 c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM470 943c-61 0 -133 -96 -133 -252c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270c0 55 -27 82 -60 82zM441 117 c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163zM418 1137c0 -17 9 -37 35 -39h5c24 0 43 15 43 40c0 15 -8 22 -40 47c-7 6 -10 6 -15 3c-21 -13 -28 -36 -28 -51zM502 1305c-22 0 -38 -13 -38 -35c0 -15 8 -24 31 -41 c8 -6 11 -5 15 -2c17 11 24 29 24 45c0 17 -8 33 -32 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E054.xml b/data/Bravura/E054.xml
new file mode 100644
index 00000000000..5f30eff5670
--- /dev/null
+++ b/data/Bravura/E054.xml
@@ -0,0 +1 @@
+<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M364 -252c-245 0 -364 165 -364 339c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18 c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -170 -130 -200 -197 -200c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29 c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6zM173 252c-83 -94 -93 -173 -93 -232c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107 c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142zM470 943c-61 0 -133 -96 -133 -252c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8 c79 69 174 159 174 270c0 55 -27 82 -60 82zM441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163zM514 1083c-43 0 -63 23 -63 48c0 20 13 36 30 36c13 0 24 -8 24 -23c0 -16 -9 -23 -16 -26c-5 -3 -8 -4 -8 -8 c0 -6 10 -11 22 -11c41 0 60 50 60 80c0 18 -7 32 -28 32c-19 0 -32 -13 -37 -19c-5 -4 -8 -6 -12 -6c-6 0 -10 3 -10 9c0 4 1 6 3 12l34 99c2 7 6 11 13 11c5 0 8 -1 17 -4c7 -2 20 -4 37 -4c18 0 33 2 46 5c8 3 13 5 15 5c3 0 6 -3 6 -6c0 -4 -3 -8 -9 -14 c-19 -17 -47 -34 -83 -34c-8 0 -17 1 -24 2c-6 1 -9 1 -11 -5l-9 -28c-2 -6 -1 -10 8 -7c8 2 17 4 29 4c40 0 65 -15 65 -51c0 -58 -42 -97 -99 -97zM323 1088c-7 0 -10 4 -10 9s3 8 9 8l21 2c6 1 6 2 8 7l42 131c1 3 1 5 1 7c0 3 -1 4 -3 4c-3 0 -5 -1 -8 -5l-23 -25 c-3 -4 -6 -7 -11 -7s-10 5 -10 9s2 7 5 11l66 74c3 3 5 5 9 5c8 0 12 -6 19 -6s15 6 21 6c4 0 6 -3 6 -6c0 -2 0 -4 -1 -7l-60 -189c-1 -5 -2 -8 2 -9l21 -2c6 0 9 -3 9 -8s-3 -9 -10 -9h-103z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E055.xml b/data/Bravura/E055.xml
new file mode 100644
index 00000000000..c6d4fd4bee7
--- /dev/null
+++ b/data/Bravura/E055.xml
@@ -0,0 +1 @@
+<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 87c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c2 -14 2 -18 8 -19c54 122 161 217 261 300 c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18c147 0 241 -113 241 -241c0 -113 -67 -198 -168 -238 c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -170 -130 -200 -197 -200c-125 0 -173 67 -186 127c-32 -106 -131 -127 -187 -127c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29 c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6c-245 0 -364 165 -364 339zM173 252c-83 -94 -93 -173 -93 -232c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-18 106c-32 54 -47 115 -47 178v23c-1 0 -3 -1 -5 -1 c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142zM503 -227c-14 -6 -15 -5 -13 -17 c9 -54 25 -135 28 -192c17 33 50 56 94 56c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29c59 0 159 18 159 166c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6c-77 0 -142 17 -194 45c-13 -8 -26 -14 -40 -20z M337 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252zM710 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252zM642 -108 c-15 -28 -36 -53 -61 -74c44 -21 98 -34 160 -34c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-32 -9 -58 -25 -75 -46c3 -17 5 -35 5 -52c0 -28 -4 -55 -12 -79c13 -21 31 -37 54 -47c7 -3 15 -6 15 -13c0 -6 -4 -11 -12 -11c-22 0 -58 18 -74 31zM814 117 c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163zM453 20c0 -73 31 -135 87 -177c30 29 49 67 49 111v9c-7 17 -12 37 -14 57c-20 47 -61 81 -110 93c-10 -35 -12 -66 -12 -93zM529 232c36 -15 65 -38 88 -66c25 32 60 57 102 72 c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-6 -7 -12 -13 -17 -20zM475 -159l4 -23c2 -12 4 -12 16 -6l8 5c-10 7 -19 15 -28 24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E056.xml b/data/Bravura/E056.xml
new file mode 100644
index 00000000000..4b60286cd65
--- /dev/null
+++ b/data/Bravura/E056.xml
@@ -0,0 +1 @@
+<symbol id="E056" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 87c0 202 153 345 297 464c12 10 11 12 9 24c-7 41 -14 106 -14 164c0 104 24 229 98 311c20 22 51 48 65 48c11 0 37 -28 52 -50c41 -60 65 -146 65 -233c0 -153 -82 -280 -190 -381c-6 -6 -8 -7 -6 -19l25 -145c3 -18 3 -18 29 -18c147 0 241 -113 241 -241 c0 -113 -67 -198 -168 -238c-14 -6 -15 -5 -13 -17c11 -62 29 -157 29 -214c0 -170 -130 -200 -197 -200c-151 0 -190 98 -190 163c0 62 40 115 107 115c61 0 96 -47 96 -102c0 -58 -36 -85 -67 -94c-23 -7 -32 -10 -32 -17c0 -13 26 -29 80 -29c59 0 159 18 159 166 c0 47 -15 134 -27 201c-2 12 -4 11 -15 9c-20 -4 -46 -6 -69 -6c-245 0 -364 165 -364 339zM80 20c0 -139 113 -236 288 -236c20 0 40 2 56 5c15 3 16 3 14 14l-50 298c-2 11 -4 12 -20 8c-61 -17 -100 -60 -100 -117c0 -46 30 -89 72 -107c7 -3 15 -6 15 -13 c0 -6 -4 -11 -12 -11c-7 0 -19 3 -27 6c-68 23 -115 87 -115 177c0 85 57 164 145 194c18 6 18 5 15 24l-21 128c-2 11 -4 12 -14 4c-47 -38 -93 -75 -153 -142c-83 -94 -93 -173 -93 -232zM337 691c0 -32 2 -66 6 -92c2 -13 6 -14 13 -8c79 69 174 159 174 270 c0 55 -27 82 -60 82c-61 0 -133 -96 -133 -252zM615 419v66c0 9 4 13 13 13h166c7 0 10 3 10 10v383c0 13 6 21 19 21s19 -8 19 -21v-472c0 -9 -4 -13 -13 -13h-201c-9 0 -13 4 -13 13zM615 331c0 9 4 13 13 13h201c9 0 13 -4 13 -13v-472c0 -13 -6 -21 -19 -21 s-19 8 -19 21v383c0 7 -3 10 -10 10h-166c-9 0 -13 4 -13 13v66zM441 117c-12 1 -13 -2 -11 -14l49 -285c2 -12 4 -12 16 -6c56 28 94 79 94 142c0 88 -67 156 -148 163z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E05C.xml b/data/Bravura/E05C.xml
new file mode 100644
index 00000000000..f3f804ce95c
--- /dev/null
+++ b/data/Bravura/E05C.xml
@@ -0,0 +1 @@
+<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 -482v964c0 14 7 21 21 21h1c14 0 21 -7 21 -21v-438c0 -8 5 -7 9 -6c26 7 68 33 89 146c3 16 9 25 19 25c11 0 16 -10 21 -27c13 -44 36 -93 107 -93c65 0 83 64 83 195s-23 190 -106 190c-14 0 -85 -6 -85 -27c0 -5 16 -11 27 -15c20 -7 40 -27 40 -65 c0 -44 -29 -69 -68 -69c-43 0 -77 29 -77 82c0 63 55 126 174 126c164 0 236 -115 236 -219c0 -138 -76 -234 -209 -234c-29 0 -48 5 -61 9c-10 3 -20 5 -29 -1c-14 -9 -36 -41 -36 -61s22 -52 36 -61c9 -6 19 -4 29 -1c13 4 32 9 61 9c133 0 209 -96 209 -234 c0 -104 -72 -219 -236 -219c-119 0 -174 63 -174 126c0 53 34 82 77 82c39 0 68 -25 68 -69c0 -38 -20 -58 -40 -65c-11 -4 -27 -10 -27 -15c0 -21 71 -27 85 -27c83 0 106 59 106 190s-18 195 -83 195c-71 0 -94 -49 -107 -93c-5 -17 -10 -27 -21 -27c-10 0 -16 9 -19 25 c-21 113 -63 139 -89 146c-4 1 -9 2 -9 -6v-438c0 -14 -7 -21 -21 -21h-1c-14 0 -21 7 -21 21zM21 -503c-14 0 -21 7 -21 21v964c0 14 7 21 21 21h86c14 0 21 -7 21 -21v-964c0 -14 -7 -21 -21 -21h-86z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E05D.xml b/data/Bravura/E05D.xml
new file mode 100644
index 00000000000..41ff54bbbaf
--- /dev/null
+++ b/data/Bravura/E05D.xml
@@ -0,0 +1 @@
+<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 -503c-14 0 -21 7 -21 21v964c0 14 7 21 21 21h1c14 0 21 -7 21 -21v-438c0 -8 5 -7 9 -6c26 7 68 33 89 146c3 16 9 25 19 25c11 0 16 -10 21 -27c13 -44 36 -93 107 -93c65 0 83 64 83 195s-23 190 -106 190c-14 0 -85 -6 -85 -27c0 -5 16 -11 27 -15 c20 -7 40 -27 40 -65c0 -44 -29 -69 -68 -69c-43 0 -77 29 -77 82c0 63 55 126 174 126c164 0 236 -115 236 -219c0 -138 -76 -234 -209 -234c-29 0 -48 5 -61 9c-10 3 -20 5 -29 -1c-14 -9 -36 -41 -36 -61s22 -52 36 -61c9 -6 19 -4 29 -1c13 4 32 9 61 9 c133 0 209 -96 209 -234c0 -104 -72 -219 -236 -219c-119 0 -174 63 -174 126c0 53 34 82 77 82c39 0 68 -25 68 -69c0 -38 -20 -58 -40 -65c-11 -4 -27 -10 -27 -15c0 -21 71 -27 85 -27c83 0 106 59 106 190s-18 195 -83 195c-71 0 -94 -49 -107 -93 c-5 -17 -10 -27 -21 -27c-10 0 -16 9 -19 25c-21 113 -63 139 -89 146c-4 1 -9 2 -9 -6v-438c0 -14 -7 -21 -21 -21h-1zM0 -482v964c0 14 7 21 21 21h86c14 0 21 -7 21 -21v-964c0 -14 -7 -21 -21 -21h-86c-14 0 -21 7 -21 21zM224 -682c0 24 13 46 45 59c12 5 10 7 5 14 c-8 10 -12 22 -12 37c0 42 35 67 86 67c49 0 69 -23 69 -52c0 -18 -10 -39 -37 -53c-12 -6 -10 -8 -3 -16c12 -13 16 -26 16 -44c0 -46 -42 -71 -91 -71c-54 0 -78 26 -78 59zM263 -688c0 -18 10 -38 40 -38c24 0 43 14 43 40c0 15 -8 22 -40 47c-7 5 -10 6 -15 3 c-21 -13 -28 -36 -28 -52zM309 -555c0 -14 8 -23 31 -41c8 -5 11 -5 15 -2c17 12 24 29 24 46c0 16 -8 32 -32 32c-22 0 -38 -13 -38 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E062.xml b/data/Bravura/E062.xml
new file mode 100644
index 00000000000..67df9d697cb
--- /dev/null
+++ b/data/Bravura/E062.xml
@@ -0,0 +1 @@
+<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -635c-9 0 -13 6 -13 12c0 8 6 13 15 18c233 133 371 289 371 568c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 96 78 223 252 223 c173 0 279 -116 279 -290c0 -304 -260 -482 -506 -602c-6 -3 -12 -5 -17 -5zM629 70c-31 0 -55 24 -55 55s24 55 55 55s55 -24 55 -55s-24 -55 -55 -55zM630 -179c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E063.xml b/data/Bravura/E063.xml
new file mode 100644
index 00000000000..32f3833e003
--- /dev/null
+++ b/data/Bravura/E063.xml
@@ -0,0 +1 @@
+<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-5 -623c0 8 6 13 15 18c233 133 371 289 371 568c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 96 78 223 252 223c173 0 279 -116 279 -290 c0 -217 -129 -363 -295 -481c3 -1 7 -4 11 -4c7 0 15 6 21 6c4 0 6 -3 6 -6c0 -2 0 -4 -1 -7l-60 -189c-1 -5 -2 -8 2 -9l21 -2c6 0 9 -3 9 -8s-3 -9 -10 -9h-103c-7 0 -10 4 -10 9s3 8 9 8l21 2c6 1 6 2 8 7l42 131c1 3 1 5 1 7c0 3 -1 4 -3 4c-3 0 -5 -1 -8 -5l-23 -25 c-3 -4 -6 -7 -11 -7s-10 5 -10 9s2 7 5 11l47 54c-25 -17 -169 -103 -192 -103c-9 0 -13 6 -13 12zM260 -694c0 20 13 36 30 36c13 0 24 -8 24 -23c0 -16 -9 -23 -16 -26c-5 -3 -8 -4 -8 -8c0 -6 10 -11 22 -11c41 0 60 50 60 80c0 18 -7 32 -28 32c-19 0 -32 -13 -37 -19 c-5 -4 -8 -6 -12 -6c-6 0 -10 3 -10 9c0 4 1 6 3 12l34 99c2 7 6 11 13 11c5 0 8 -1 17 -4c7 -2 20 -4 37 -4c18 0 33 2 46 5c8 3 13 5 15 5c3 0 6 -3 6 -6c0 -4 -3 -8 -9 -14c-19 -17 -47 -34 -83 -34c-8 0 -17 1 -24 2c-6 1 -9 1 -11 -5l-9 -28c-2 -6 -1 -10 8 -7 c8 2 17 4 29 4c40 0 65 -15 65 -51c0 -58 -42 -97 -99 -97c-43 0 -63 23 -63 48zM629 70c-31 0 -55 24 -55 55s24 55 55 55s55 -24 55 -55s-24 -55 -55 -55zM576 -125c0 31 23 54 54 54s54 -23 54 -54s-23 -54 -54 -54s-54 23 -54 54z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E064.xml b/data/Bravura/E064.xml
new file mode 100644
index 00000000000..c951c3a9a6f
--- /dev/null
+++ b/data/Bravura/E064.xml
@@ -0,0 +1 @@
+<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -635c-9 0 -13 6 -13 12c0 8 6 13 15 18c233 133 371 289 371 568c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 96 78 223 252 223 c173 0 279 -116 279 -290c0 -219 -133 -369 -302 -486c12 5 26 7 42 7c49 0 69 -24 69 -52c0 -19 -10 -39 -37 -53c-12 -6 -10 -9 -3 -17c12 -12 16 -25 16 -44c0 -45 -42 -71 -91 -71c-54 0 -78 26 -78 59c0 24 13 46 45 59c12 5 10 8 5 15c-8 9 -12 22 -12 36 c0 17 5 31 15 42c-57 -36 -115 -68 -175 -97c-6 -3 -12 -5 -17 -5zM629 70c-31 0 -55 24 -55 55s24 55 55 55s55 -24 55 -55s-24 -55 -55 -55zM576 -125c0 31 23 54 54 54s54 -23 54 -54s-23 -54 -54 -54s-54 23 -54 54zM186 -690c0 -18 10 -39 40 -39c24 0 43 15 43 40 c0 15 -8 22 -40 47c-7 6 -10 6 -15 3c-21 -13 -28 -36 -28 -51zM232 -557c0 -15 8 -24 31 -41c8 -6 11 -5 15 -2c17 11 24 29 24 45c0 17 -8 33 -32 33c-22 0 -38 -13 -38 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E065.xml b/data/Bravura/E065.xml
new file mode 100644
index 00000000000..c3bb2a8b42b
--- /dev/null
+++ b/data/Bravura/E065.xml
@@ -0,0 +1 @@
+<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-5 -623c0 8 6 13 15 18c124 71 227 156 287 249c62 96 84 216 84 319c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 93 73 216 238 223 c-31 8 -45 29 -45 55c0 24 13 46 45 59c12 5 10 8 5 15c-8 9 -12 22 -12 36c0 43 35 68 86 68c49 0 69 -24 69 -52c0 -19 -10 -39 -37 -53c-12 -6 -10 -9 -3 -17c12 -12 16 -25 16 -44c0 -38 -30 -63 -69 -70c148 -17 238 -127 238 -287c0 -304 -260 -482 -506 -602 c-6 -3 -12 -5 -17 -5c-9 0 -13 6 -13 12zM574 125c0 31 24 55 55 55s55 -24 55 -55s-24 -55 -55 -55s-55 24 -55 55zM630 -179c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54zM232 312c0 -18 10 -39 40 -39c24 0 43 15 43 40c0 15 -8 22 -40 47 c-7 6 -10 6 -15 3c-21 -13 -28 -36 -28 -51zM278 445c0 -15 8 -24 31 -41c8 -6 11 -5 15 -2c17 11 24 29 24 45c0 17 -8 33 -32 33c-22 0 -38 -13 -38 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E066.xml b/data/Bravura/E066.xml
new file mode 100644
index 00000000000..7bb811271c9
--- /dev/null
+++ b/data/Bravura/E066.xml
@@ -0,0 +1 @@
+<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-5 -623c0 8 6 13 15 18c233 133 371 289 371 568c0 157 -46 261 -152 261c-102 0 -162 -73 -162 -113c0 -10 3 -18 16 -18s23 7 50 7c49 0 96 -40 96 -104c0 -62 -43 -106 -106 -106c-81 0 -123 69 -123 149c0 96 78 223 252 223c173 0 279 -116 279 -290 c0 -304 -260 -482 -506 -602c-6 -3 -12 -5 -17 -5c-9 0 -13 6 -13 12zM263 308c0 20 13 36 30 36c13 0 24 -8 24 -23c0 -16 -9 -23 -16 -26c-5 -3 -8 -4 -8 -8c0 -6 10 -11 22 -11c41 0 60 50 60 80c0 18 -7 32 -28 32c-19 0 -32 -13 -37 -19c-5 -4 -8 -6 -12 -6 c-6 0 -10 3 -10 9c0 4 1 6 3 12l34 99c2 7 6 11 13 11c5 0 8 -1 17 -4c7 -2 20 -4 37 -4c18 0 33 2 46 5c8 3 13 5 15 5c3 0 6 -3 6 -6c0 -4 -3 -8 -9 -14c-19 -17 -47 -34 -83 -34c-8 0 -17 1 -24 2c-6 1 -9 1 -11 -5l-9 -28c-2 -6 -1 -10 8 -7c8 2 17 4 29 4 c40 0 65 -15 65 -51c0 -58 -42 -97 -99 -97c-43 0 -63 23 -63 48zM135 265c-7 0 -10 4 -10 9s3 8 9 8l21 2c6 1 6 2 8 7l42 131c1 3 1 5 1 7c0 3 -1 4 -3 4c-3 0 -5 -1 -8 -5l-23 -25c-3 -4 -6 -7 -11 -7s-10 5 -10 9s2 7 5 11l66 74c3 3 5 5 9 5c8 0 12 -6 19 -6s15 6 21 6 c4 0 6 -3 6 -6c0 -2 0 -4 -1 -7l-60 -189c-1 -5 -2 -8 2 -9l21 -2c6 0 9 -3 9 -8s-3 -9 -10 -9h-103zM629 70c-31 0 -55 24 -55 55s24 55 55 55s55 -24 55 -55s-24 -55 -55 -55zM630 -179c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E069.xml b/data/Bravura/E069.xml
new file mode 100644
index 00000000000..890982c0959
--- /dev/null
+++ b/data/Bravura/E069.xml
@@ -0,0 +1 @@
+<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 235c0 8 6 15 14 15h132c8 0 14 -7 14 -15v-470c0 -8 -6 -15 -14 -15h-132c-8 0 -14 7 -14 15v470zM14 -250c-8 0 -14 7 -14 15v470c0 8 6 15 14 15h132c8 0 14 -7 14 -15v-470c0 -8 -6 -15 -14 -15h-132z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E06A.xml b/data/Bravura/E06A.xml
new file mode 100644
index 00000000000..f29c0e2d7a4
--- /dev/null
+++ b/data/Bravura/E06A.xml
@@ -0,0 +1 @@
+<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -450v896c0 8 7 15 16 15h280c9 0 16 -7 16 -15v-896c0 -8 -7 -15 -16 -15h-280c-9 0 -16 7 -16 15zM40 344v-692c0 -8 7 -15 15 -15h202c8 0 15 7 15 15v692c0 8 -7 15 -15 15h-202c-8 0 -15 -7 -15 -15z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E073.xml b/data/Bravura/E073.xml
new file mode 100644
index 00000000000..1e1ce3533ee
--- /dev/null
+++ b/data/Bravura/E073.xml
@@ -0,0 +1 @@
+<symbol id="E073" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M6 11c0 128 94 241 241 241c26 0 26 0 29 18l25 145c2 12 0 13 -6 19c-108 101 -190 228 -190 381c0 87 24 173 65 233c15 22 41 50 52 50c14 0 45 -26 65 -48c74 -82 98 -207 98 -311c0 -58 -7 -123 -14 -164c-2 -12 -3 -14 9 -24c144 -119 297 -262 297 -464 c0 -174 -119 -339 -364 -339c-23 0 -49 2 -69 6c-11 2 -13 3 -15 -9c-12 -67 -27 -154 -27 -201c0 -148 100 -166 159 -166c54 0 80 16 80 29c0 7 -9 10 -32 17c-31 9 -67 36 -67 94c0 55 35 102 96 102c67 0 107 -53 107 -115c0 -65 -39 -163 -190 -163 c-67 0 -197 30 -197 200c0 57 18 152 29 214c2 12 1 11 -13 17c-101 40 -168 125 -168 238zM239 -197c-2 -11 -1 -11 14 -14c16 -3 36 -5 56 -5c175 0 288 97 288 236c0 59 -10 138 -93 232c-60 67 -106 104 -153 142c-10 8 -12 7 -14 -4l-21 -128c-3 -19 -3 -18 15 -24 c88 -30 145 -109 145 -194c0 -90 -47 -154 -115 -177c-8 -3 -20 -6 -27 -6c-8 0 -12 5 -12 11c0 7 8 10 15 13c42 18 72 61 72 107c0 57 -39 100 -100 117c-16 4 -18 3 -20 -8zM147 861c0 -111 95 -201 174 -270c7 -6 11 -5 13 8c4 26 6 60 6 92c0 156 -72 252 -133 252 c-33 0 -60 -27 -60 -82zM88 -46c0 -63 38 -114 94 -142c12 -6 14 -6 16 6l49 285c2 12 1 15 -11 14c-81 -7 -148 -75 -148 -163z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E074.xml b/data/Bravura/E074.xml
new file mode 100644
index 00000000000..ad2f016d62e
--- /dev/null
+++ b/data/Bravura/E074.xml
@@ -0,0 +1 @@
+<symbol id="E074" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M6 485c0 113 67 198 168 238c14 6 15 5 13 17c-11 62 -29 157 -29 214c0 170 130 200 197 200c151 0 190 -98 190 -163c0 -62 -40 -115 -107 -115c-61 0 -96 47 -96 102c0 58 36 85 67 94c23 7 32 10 32 17c0 13 -26 29 -80 29c-59 0 -159 -18 -159 -166 c0 -47 15 -134 27 -201c2 -12 4 -11 15 -9c20 4 46 6 69 6c245 0 364 -165 364 -339c0 -202 -153 -345 -297 -464c-12 -10 -11 -12 -9 -24c7 -41 14 -106 14 -164c0 -104 -24 -229 -98 -311c-20 -22 -51 -48 -65 -48c-11 0 -37 28 -52 50c-41 60 -65 146 -65 233 c0 153 82 280 190 381c6 6 8 7 6 19l-25 145c-3 18 -3 18 -29 18c-147 0 -241 113 -241 241zM253 707c-15 -3 -16 -3 -14 -14l50 -298c2 -11 4 -12 20 -8c61 17 100 60 100 117c0 46 -30 89 -72 107c-7 3 -15 6 -15 13c0 6 4 11 12 11c7 0 19 -3 27 -6 c68 -23 115 -87 115 -177c0 -85 -57 -164 -145 -194c-18 -6 -18 -5 -15 -24l21 -128c2 -11 4 -12 14 -4c47 38 93 75 153 142c83 94 93 173 93 232c0 139 -113 236 -288 236c-20 0 -40 -2 -56 -5zM147 -365c0 -55 27 -82 60 -82c61 0 133 96 133 252c0 32 -2 66 -6 92 c-2 13 -6 14 -13 8c-79 -69 -174 -159 -174 -270zM88 542c0 -88 67 -156 148 -163c12 -1 13 2 11 14l-49 285c-2 12 -4 12 -16 6c-56 -28 -94 -79 -94 -142z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E075.xml b/data/Bravura/E075.xml
new file mode 100644
index 00000000000..a2b77361468
--- /dev/null
+++ b/data/Bravura/E075.xml
@@ -0,0 +1 @@
+<symbol id="E075" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M209 53c-133 0 -209 96 -209 234c0 104 72 219 236 219c119 0 174 -63 174 -126c0 -53 -34 -82 -77 -82c-39 0 -68 25 -68 69c0 38 20 58 40 65c11 4 27 10 27 15c0 21 -71 27 -85 27c-83 0 -106 -59 -106 -190s18 -195 83 -195c71 0 94 49 107 93c5 17 10 27 21 27 c10 0 16 -9 19 -25c21 -113 63 -139 89 -146c4 -1 9 -2 9 6v438c0 14 7 21 21 21h1c14 0 21 -7 21 -21v-964c0 -14 -7 -21 -21 -21h-1c-14 0 -21 7 -21 21v438c0 8 -5 7 -9 6c-26 -7 -68 -33 -89 -146c-3 -16 -9 -25 -19 -25c-11 0 -16 10 -21 27c-13 44 -36 93 -107 93 c-65 0 -83 -64 -83 -195s23 -190 106 -190c14 0 85 6 85 27c0 5 -16 11 -27 15c-20 7 -40 27 -40 65c0 44 29 69 68 69c43 0 77 -29 77 -82c0 -63 -55 -126 -174 -126c-164 0 -236 115 -236 219c0 138 76 234 209 234c29 0 48 -5 61 -9c10 -3 20 -5 29 1c14 9 36 41 36 61 s-22 52 -36 61c-9 6 -19 4 -29 1c-13 -4 -32 -9 -61 -9zM592 -503c-14 0 -21 7 -21 21v964c0 14 7 21 21 21h86c14 0 21 -7 21 -21v-964c0 -14 -7 -21 -21 -21h-86z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E076.xml b/data/Bravura/E076.xml
new file mode 100644
index 00000000000..65624d81761
--- /dev/null
+++ b/data/Bravura/E076.xml
@@ -0,0 +1 @@
+<symbol id="E076" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M153 -28c0 174 106 290 279 290c174 0 252 -127 252 -223c0 -80 -42 -149 -123 -149c-63 0 -106 44 -106 106c0 64 47 104 96 104c27 0 37 -7 50 -7s16 8 16 18c0 40 -60 113 -162 113c-106 0 -152 -104 -152 -261c0 -279 138 -435 371 -568c9 -5 15 -10 15 -18 c0 -6 -4 -12 -13 -12c-5 0 -11 2 -17 5c-246 120 -506 298 -506 602zM0 125c0 31 24 55 55 55s55 -24 55 -55s-24 -55 -55 -55s-55 24 -55 55zM54 -179c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E077.xml b/data/Bravura/E077.xml
new file mode 100644
index 00000000000..7a9ebeba111
--- /dev/null
+++ b/data/Bravura/E077.xml
@@ -0,0 +1 @@
+<symbol id="E077" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M432 -264c-173 0 -279 116 -279 290c0 304 260 482 506 602c6 3 12 5 17 5c9 0 13 -6 13 -12c0 -8 -6 -13 -15 -18c-233 -133 -371 -289 -371 -568c0 -157 46 -261 152 -261c102 0 162 73 162 113c0 10 -3 18 -16 18s-23 -7 -50 -7c-49 0 -96 40 -96 104 c0 62 43 106 106 106c81 0 123 -69 123 -149c0 -96 -78 -223 -252 -223zM0 -127c0 31 24 55 55 55s55 -24 55 -55s-24 -55 -55 -55s-55 24 -55 55zM54 69c-31 0 -54 23 -54 54s23 54 54 54s54 -23 54 -54s-23 -54 -54 -54z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E080.xml b/data/Bravura/E080.xml
new file mode 100644
index 00000000000..6a1a20e08ec
--- /dev/null
+++ b/data/Bravura/E080.xml
@@ -0,0 +1 @@
+<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M235 -250c-119 0 -215 112 -215 250c0 139 96 251 215 251s215 -112 215 -251c0 -138 -96 -250 -215 -250zM160 7c0 -117 33 -212 75 -212c41 0 75 95 75 212c0 118 -34 213 -75 213c-42 0 -75 -95 -75 -213z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E081.xml b/data/Bravura/E081.xml
new file mode 100644
index 00000000000..0479059b91a
--- /dev/null
+++ b/data/Bravura/E081.xml
@@ -0,0 +1 @@
+<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 0c0 7 4 13 4 13l96 219c4 9 8 19 18 19c1 0 3 -1 5 -1c15 -2 33 -3 52 -3c13 0 38 4 52 4c14 -1 20 -7 20 -23v-412c0 -17 18 -35 32 -35c15 0 15 -15 15 -15s0 -16 -16 -16h-213c-13 0 -22 5 -22 16c0 12 10 15 17 15c21 0 44 15 44 38v258c0 6 -2 14 -6 14 c-2 0 -6 -3 -10 -10c-11 -19 -54 -88 -54 -88s-4 -9 -14 -9c-1 0 -5 1 -9 2c-8 3 -11 9 -11 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E082.xml b/data/Bravura/E082.xml
new file mode 100644
index 00000000000..f98fce76cf7
--- /dev/null
+++ b/data/Bravura/E082.xml
@@ -0,0 +1 @@
+<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 118c0 27 11 52 28 73c49 57 111 63 181 63c93 0 197 -46 197 -152c0 -83 -63 -112 -133 -131c-22 -6 -107 -36 -129 -72c11 4 24 6 37 6c41 0 88 -16 108 -24c10 -5 17 -6 30 -11c7 -2 12 -3 17 -3c21 0 29 19 39 43c0 1 1 2 1 3c2 6 5 10 13 10c7 0 12 -2 12 -14 c-16 -155 -93 -159 -136 -159c-89 0 -104 54 -144 54c-59 0 -71 -61 -93 -61c-20 0 -25 24 -25 39c17 63 56 112 111 147c72 44 147 113 147 204c0 29 -1 96 -90 96c-59 0 -77 -24 -79 -38c0 -20 69 -23 69 -83c0 -25 -9 -88 -70 -88c-36 0 -67 24 -82 55c-6 15 -9 29 -9 43 z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E083.xml b/data/Bravura/E083.xml
new file mode 100644
index 00000000000..8c1a05cab4a
--- /dev/null
+++ b/data/Bravura/E083.xml
@@ -0,0 +1 @@
+<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -141c0 22 5 46 22 61c12 13 31 23 48 26c4 1 7 1 11 1c43 0 72 -30 72 -72c-1 -29 -23 -44 -23 -66v-5c1 -15 20 -15 28 -16c1 0 5 -1 9 -1c22 0 76 12 76 118c0 13 -9 91 -124 91c-8 0 -25 0 -25 12c0 11 14 16 24 17c63 3 122 32 122 106v7c0 24 -8 77 -93 77 c-9 0 -40 -8 -42 -25v-4c0 -14 15 -12 20 -14s30 -4 33 -41v-8c0 -33 -22 -65 -66 -65h-5c-62 4 -81 48 -81 81c0 53 86 110 172 110c5 0 10 -1 15 -1c42 -3 167 -30 167 -122c0 -46 -21 -72 -61 -91c-9 -5 -20 -6 -31 -9c-3 -1 -4 -5 -4 -9c0 -2 0 -3 1 -5c2 -4 5 -4 10 -5 l33 -9l21 -12c10 -6 18 -13 24 -21c19 -22 26 -41 28 -70v-7c0 -88 -102 -139 -201 -139h-9c-98 2 -169 32 -171 110z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E084.xml b/data/Bravura/E084.xml
new file mode 100644
index 00000000000..20aa2db5523
--- /dev/null
+++ b/data/Bravura/E084.xml
@@ -0,0 +1 @@
+<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M40 -112c-12 0 -20 7 -20 17c0 3 1 7 3 11c0 1 1 2 1 3l6 8c30 42 128 181 128 305c0 16 14 19 23 19c8 0 53 -2 71 -2s59 2 68 2c8 0 15 -6 15 -14c0 -2 -1 -3 -1 -5c-3 -11 -163 -238 -243 -306h135v84c0 12 5 18 9 23l95 115c6 7 11 9 20 9c11 0 12 -9 12 -17v-214h73 c11 0 15 -7 15 -19s-5 -19 -15 -19h-73v-59c0 -32 21 -38 31 -38s22 -6 22 -20s-10 -21 -20 -21h-213c-15 0 -19 11 -19 21s7 19 23 19c18 0 40 8 40 35v63h-186z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E085.xml b/data/Bravura/E085.xml
new file mode 100644
index 00000000000..b8f1995417e
--- /dev/null
+++ b/data/Bravura/E085.xml
@@ -0,0 +1 @@
+<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -127c0 6 0 12 1 18c3 35 25 74 79 74c43 0 78 -34 78 -78c0 -28 -15 -53 -38 -67c-5 -3 -12 -7 -12 -14c1 -7 7 -11 12 -14c7 -3 15 -3 23 -3c26 0 85 14 85 124c0 111 -69 130 -103 130s-58 -23 -68 -33c-11 -11 -12 -20 -22 -20s-20 2 -20 15v2l11 222 c1 8 6 17 24 17c17 -2 103 -10 135 -10s110 9 123 9c11 0 14 -8 14 -21c0 -16 -5 -96 -144 -96c-41 0 -88 7 -98 9h-4c-9 0 -14 -5 -15 -13c-1 -9 -5 -65 -5 -65v-4c0 -3 0 -7 4 -7c1 0 3 0 5 1c32 19 75 29 133 29c91 0 165 -74 165 -165c0 -90 -66 -164 -186 -164 c-123 0 -177 41 -177 124z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E086.xml b/data/Bravura/E086.xml
new file mode 100644
index 00000000000..f915e89514d
--- /dev/null
+++ b/data/Bravura/E086.xml
@@ -0,0 +1 @@
+<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 3c0 47 17 100 39 142c36 68 107 105 183 106c54 0 132 -17 142 -81c1 -4 1 -7 1 -11c0 -43 -38 -76 -80 -76c-13 0 -42 8 -49 21c-10 11 -15 26 -15 41c0 10 2 20 7 29c6 12 25 24 25 38c0 10 -13 15 -33 15c-21 0 -80 -5 -83 -190c0 -16 3 -24 9 -24c2 0 4 0 6 2 c26 23 59 35 91 35c77 0 151 -67 151 -145c0 -45 -23 -90 -58 -118c-36 -29 -86 -36 -131 -36c-84 0 -133 36 -174 110c-22 40 -30 92 -31 138v4zM222 2c-32 0 -58 -50 -58 -112s26 -112 58 -112s59 50 59 112s-27 112 -59 112z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E087.xml b/data/Bravura/E087.xml
new file mode 100644
index 00000000000..15af3653bcb
--- /dev/null
+++ b/data/Bravura/E087.xml
@@ -0,0 +1 @@
+<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 49v165c0 9 5 12 10 12s10 -3 12 -7c5 -10 18 -24 26 -24c7 1 13 5 27 18s29 36 87 36c83 0 130 -85 155 -85s39 57 46 69c4 7 20 11 21 11c17 0 17 -13 17 -40v-4c0 -103 -119 -246 -119 -413c0 -29 -6 -37 -16 -37s-57 9 -82 9s-47 -9 -65 -9c-19 0 -19 10 -19 31 c0 39 31 97 69 141c60 71 137 127 137 155c-1 6 -3 9 -7 9c-2 0 -6 -2 -9 -4c-8 -6 -22 -21 -50 -21c-58 0 -106 75 -146 75c-45 0 -58 -58 -68 -83c-4 -11 -7 -20 -15 -20c-10 0 -11 16 -11 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E088.xml b/data/Bravura/E088.xml
new file mode 100644
index 00000000000..cb63489f735
--- /dev/null
+++ b/data/Bravura/E088.xml
@@ -0,0 +1 @@
+<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -132c0 63 40 96 92 121c-48 27 -87 64 -87 133c0 84 79 137 195 137c27 0 174 -15 174 -117c0 -50 -24 -83 -60 -106c47 -24 82 -57 82 -117c0 -135 -107 -178 -207 -178c-99 0 -189 40 -189 127zM77 -127c0 -65 61 -99 128 -99s98 34 98 74c0 66 -74 87 -147 119 c-44 -17 -79 -54 -79 -94zM218 230c-44 0 -101 -21 -101 -63c0 -63 85 -80 165 -108c33 19 53 45 53 85c0 70 -85 86 -117 86z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E089.xml b/data/Bravura/E089.xml
new file mode 100644
index 00000000000..a7cac3baba5
--- /dev/null
+++ b/data/Bravura/E089.xml
@@ -0,0 +1 @@
+<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M171 -48c-77 0 -151 67 -151 145c0 45 23 90 58 118c36 29 86 36 131 36c84 0 133 -36 174 -110c22 -40 30 -92 31 -138v-4c0 -47 -17 -100 -39 -142c-36 -68 -107 -105 -183 -106c-54 0 -132 17 -142 81c-1 4 -1 7 -1 11c0 43 38 76 80 76c13 0 42 -8 49 -21 c10 -11 15 -26 15 -41c0 -10 -2 -20 -7 -29c-6 -12 -25 -24 -25 -38c0 -10 13 -15 33 -15c21 0 80 5 83 190c0 16 -3 24 -9 24c-2 0 -4 0 -6 -2c-26 -23 -59 -35 -91 -35zM153 112c0 -62 27 -112 59 -112s58 50 58 112s-26 112 -58 112s-59 -50 -59 -112z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08A.xml b/data/Bravura/E08A.xml
new file mode 100644
index 00000000000..e1d54494648
--- /dev/null
+++ b/data/Bravura/E08A.xml
@@ -0,0 +1 @@
+<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M70 -182c-41 50 -65 107 -65 172c0 135 86 261 228 261c19 0 170 -12 170 -143c0 -83 -76 -86 -76 -86c-28 0 -77 18 -77 75c0 31 23 74 63 74c15 0 18 13 18 22c0 10 -21 34 -73 34c-54 0 -130 -34 -130 -199s43 -244 124 -244c32 0 142 30 142 159c0 17 7 18 15 18 c4 0 15 0 15 -22c0 -29 -26 -188 -201 -188c-60 0 -115 21 -153 67z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08B.xml b/data/Bravura/E08B.xml
new file mode 100644
index 00000000000..a7b1d28b1a8
--- /dev/null
+++ b/data/Bravura/E08B.xml
@@ -0,0 +1 @@
+<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M156 -240c-96 25 -156 136 -156 230c0 95 46 201 136 240l27 10c2 0 12 9 12 16v88c0 8 9 17 17 17c11 0 18 -9 18 -17v-73c0 -5 5 -22 11 -23c85 0 176 -43 176 -141c0 -83 -76 -86 -76 -86c-28 0 -77 18 -77 74c0 31 23 74 63 74c15 0 18 14 18 22c0 10 -22 34 -73 34 c-5 0 -11 0 -17 -1c-7 -1 -25 -18 -25 -25v-396c0 -8 6 -14 10 -15c8 -2 16 -3 26 -3c32 0 142 30 142 158c0 15 6 17 10 17h4c5 0 15 0 16 -19c0 -31 -27 -187 -197 -190c-7 -3 -11 -8 -11 -14v-79c0 -9 -7 -17 -18 -17c-8 0 -17 8 -17 17v77c0 9 -12 22 -19 25zM161 180 c-22 -31 -38 -78 -38 -154c0 -93 14 -160 41 -198c1 -2 3 -3 5 -3c3 0 6 3 6 12v329c0 8 -6 16 -11 16c-1 0 -2 0 -3 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08C.xml b/data/Bravura/E08C.xml
new file mode 100644
index 00000000000..30ec2bc3e0c
--- /dev/null
+++ b/data/Bravura/E08C.xml
@@ -0,0 +1 @@
+<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 23c0 9 7 14 14 14h184c6 0 15 9 15 18v181c0 7 5 14 14 14h46c9 0 15 -7 15 -14v-181c0 -10 5 -18 13 -18h185c7 0 14 -5 14 -14v-46c0 -9 -7 -15 -14 -15h-184c-7 0 -14 -6 -14 -16v-182c0 -7 -6 -14 -15 -14h-46c-9 0 -14 7 -14 14v184c0 5 -5 14 -15 14h-184 c-7 0 -14 6 -14 15v46z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08D.xml b/data/Bravura/E08D.xml
new file mode 100644
index 00000000000..acbd6889d29
--- /dev/null
+++ b/data/Bravura/E08D.xml
@@ -0,0 +1 @@
+<symbol id="E08D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 7c0 4 4 7 8 7h94c3 0 7 5 7 9v92c0 4 3 8 7 8h24c4 0 7 -4 7 -8v-92c0 -5 3 -9 7 -9h94c4 0 8 -3 8 -7v-24c0 -4 -4 -7 -8 -7h-93c-4 0 -8 -3 -8 -9v-92c0 -4 -3 -8 -7 -8h-24c-4 0 -7 4 -7 8v93c0 3 -2 8 -7 8h-94c-4 0 -8 3 -8 7v24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08E.xml b/data/Bravura/E08E.xml
new file mode 100644
index 00000000000..0ae7339fa45
--- /dev/null
+++ b/data/Bravura/E08E.xml
@@ -0,0 +1 @@
+<symbol id="E08E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -162c0 4 2 8 5 12l333 333c4 4 8 6 12 6c2 0 4 -1 5 -2l21 -21c1 -1 2 -3 2 -5c0 -4 -2 -9 -6 -12l-333 -333c-3 -4 -7 -6 -11 -6c-2 0 -4 1 -5 2l-22 21c-1 1 -1 3 -1 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E08F.xml b/data/Bravura/E08F.xml
new file mode 100644
index 00000000000..109161b45e1
--- /dev/null
+++ b/data/Bravura/E08F.xml
@@ -0,0 +1 @@
+<symbol id="E08F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 62v49c0 7 8 13 19 13h411c10 0 18 -6 18 -13v-49c0 -7 -8 -13 -18 -13h-411c-11 0 -19 6 -19 13zM19 -125c-11 0 -19 6 -19 13v49c0 7 8 13 19 13h411c10 0 18 -6 18 -13v-49c0 -7 -8 -13 -18 -13h-411z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E090.xml b/data/Bravura/E090.xml
new file mode 100644
index 00000000000..3c1734cd81b
--- /dev/null
+++ b/data/Bravura/E090.xml
@@ -0,0 +1 @@
+<symbol id="E090" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 27c0 7 8 13 19 13h411c10 0 18 -6 18 -13v-49c0 -7 -8 -13 -18 -13h-411c-11 0 -19 6 -19 13v49z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E091.xml b/data/Bravura/E091.xml
new file mode 100644
index 00000000000..66e1d6d7a5d
--- /dev/null
+++ b/data/Bravura/E091.xml
@@ -0,0 +1 @@
+<symbol id="E091" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 141c-3 3 -4 6 -4 10c0 3 1 7 4 10l32 32c4 3 8 5 12 5s7 -2 9 -4l128 -128c4 -4 9 -7 14 -7c3 0 6 1 8 3l131 131c3 3 6 4 10 4c3 0 7 -1 10 -4l32 -32c3 -4 5 -8 5 -12s-2 -7 -4 -9l-130 -130c-3 -3 -4 -6 -4 -10s1 -8 5 -11l129 -129c2 -2 4 -5 4 -9s-2 -8 -5 -12 l-32 -32c-3 -3 -7 -4 -10 -4c-4 0 -7 1 -10 4c0 0 -128 127 -130 130c-2 2 -6 4 -10 4s-8 -2 -11 -5l-130 -130c-2 -2 -5 -4 -9 -4s-8 2 -12 5l-32 32c-3 3 -4 7 -4 10c0 4 1 7 4 10l130 130c2 2 3 6 3 10c0 5 -2 10 -5 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E092.xml b/data/Bravura/E092.xml
new file mode 100644
index 00000000000..1537e653942
--- /dev/null
+++ b/data/Bravura/E092.xml
@@ -0,0 +1 @@
+<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M108 -251c-76 62 -108 150 -108 251c0 102 34 189 107 249c1 0 3 -1 3 -4v-10s0 -6 -2 -8c-40 -56 -61 -116 -61 -227s20 -173 60 -228c1 -1 3 -3 3 -6v-13c0 -1 -1 -4 -2 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E093.xml b/data/Bravura/E093.xml
new file mode 100644
index 00000000000..45df32a3218
--- /dev/null
+++ b/data/Bravura/E093.xml
@@ -0,0 +1 @@
+<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 245c0 3 2 4 3 4c73 -60 107 -147 107 -249c0 -101 -32 -189 -108 -251c-1 0 -2 3 -2 4v13c0 3 2 5 3 6c40 55 60 117 60 228s-21 171 -61 227c-2 2 -2 8 -2 8v10z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E094.xml b/data/Bravura/E094.xml
new file mode 100644
index 00000000000..524148c0549
--- /dev/null
+++ b/data/Bravura/E094.xml
@@ -0,0 +1 @@
+<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 -488c-125 120 -179 292 -179 489c0 200 54 368 176 486c0 0 4 4 5 4c2 0 3 -3 3 -8v-21s0 -10 -3 -15c-75 -98 -113 -228 -113 -446c0 -217 40 -346 112 -446c2 -2 4 -7 4 -12v-26c0 -2 -1 -6 -2 -6s-2 0 -3 1z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E095.xml b/data/Bravura/E095.xml
new file mode 100644
index 00000000000..14d13173838
--- /dev/null
+++ b/data/Bravura/E095.xml
@@ -0,0 +1 @@
+<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 483c0 5 1 8 3 8c1 0 5 -4 5 -4c122 -118 176 -286 176 -486c0 -197 -54 -369 -179 -489c-1 -1 -2 -1 -3 -1s-2 4 -2 6v26c0 5 2 10 4 12c72 100 112 229 112 446c0 218 -38 348 -113 446c-3 5 -3 15 -3 15v21z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A0.xml b/data/Bravura/E0A0.xml
new file mode 100644
index 00000000000..9ce35f126e2
--- /dev/null
+++ b/data/Bravura/E0A0.xml
@@ -0,0 +1 @@
+<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M294 -125c-148 0 -204 61 -204 126c0 69 82 124 214 124c93 0 205 -53 205 -124v146c0 4 5 8 10 8h13c5 0 10 -4 10 -8v-295c0 -4 -5 -7 -10 -7h-13c-5 0 -10 3 -10 7v149c0 -69 -53 -126 -215 -126zM197 40c0 -32 15 -66 33 -89c26 -29 54 -52 96 -52c44 0 75 21 75 70 c0 60 -55 133 -123 133c-47 0 -81 -11 -81 -62zM566 -148v295c0 4 6 8 10 8h13c6 0 10 -4 10 -8v-295c0 -4 -4 -7 -10 -7h-13c-4 0 -10 3 -10 7zM57 147c0 4 4 8 10 8h12c5 0 10 -4 10 -8v-295c0 -4 -5 -7 -10 -7h-12c-6 0 -10 3 -10 7v295zM9 -155c-6 0 -9 3 -9 7v295 c0 4 3 8 9 8h13c5 0 9 -4 9 -8v-295c0 -4 -4 -7 -9 -7h-13z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A1.xml b/data/Bravura/E0A1.xml
new file mode 100644
index 00000000000..a9b054526f4
--- /dev/null
+++ b/data/Bravura/E0A1.xml
@@ -0,0 +1 @@
+<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 186c0 7 5 12 12 12s13 -5 13 -12v-37c0 -16 11 -24 18 -24h324c11 0 24 8 24 26v35c0 7 5 12 12 12s13 -5 13 -12v-363c0 -6 -6 -13 -13 -13s-12 7 -12 13v32c0 9 -10 20 -24 20h-321c-9 0 -21 -12 -21 -23v-29c0 -6 -6 -13 -13 -13s-12 7 -12 13v363zM25 16v-31 c0 -19 21 -32 56 -32h257c32 0 53 10 53 32v36c0 16 -21 28 -53 28h-261c-37 0 -52 -11 -52 -33z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A2.xml b/data/Bravura/E0A2.xml
new file mode 100644
index 00000000000..5c4da6fce28
--- /dev/null
+++ b/data/Bravura/E0A2.xml
@@ -0,0 +1 @@
+<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 2c0 68 83 123 216 123c93 0 206 -52 206 -123c0 -70 -52 -127 -216 -127c-149 0 -206 60 -206 127zM108 39c0 -32 15 -66 35 -89c21 -28 58 -52 94 -52c10 0 21 1 31 4c33 8 46 36 46 67c0 60 -55 134 -124 134c-31 0 -68 -5 -79 -40c-2 -8 -3 -16 -3 -24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A3.xml b/data/Bravura/E0A3.xml
new file mode 100644
index 00000000000..a667856bd8b
--- /dev/null
+++ b/data/Bravura/E0A3.xml
@@ -0,0 +1 @@
+<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M97 -125c-55 0 -97 30 -97 83c0 52 47 167 196 167c58 0 99 -32 99 -83c0 -33 -33 -167 -198 -167zM29 -44c0 -7 3 -14 6 -20c7 -12 19 -23 40 -23c48 0 189 88 189 131c0 7 -3 13 -6 19c-7 12 -18 21 -37 21c-47 0 -192 -79 -192 -128z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A4.xml b/data/Bravura/E0A4.xml
new file mode 100644
index 00000000000..6cffcc920af
--- /dev/null
+++ b/data/Bravura/E0A4.xml
@@ -0,0 +1 @@
+<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -42c0 86 88 167 198 167c57 0 97 -32 97 -83c0 -85 -109 -167 -198 -167c-54 0 -97 31 -97 83z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0A5.xml b/data/Bravura/E0A5.xml
new file mode 100644
index 00000000000..d4eec1c1f60
--- /dev/null
+++ b/data/Bravura/E0A5.xml
@@ -0,0 +1 @@
+<symbol id="E0A5" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Bravura/E0A9.xml b/data/Bravura/E0A9.xml
new file mode 100644
index 00000000000..6ec70417a2f
--- /dev/null
+++ b/data/Bravura/E0A9.xml
@@ -0,0 +1 @@
+<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -110c0 4 1 8 5 11l119 99l-119 100c-3 3 -5 8 -5 12c0 6 5 13 12 13c3 0 6 -1 8 -2l124 -105l126 105c2 1 5 2 7 2c6 0 13 -6 13 -14c0 -4 -2 -9 -5 -11l-119 -100l119 -99c3 -3 5 -7 5 -12c0 -6 -5 -14 -13 -14c-2 0 -5 1 -7 3l-126 105l-124 -105c-2 -2 -4 -3 -7 -3 c-8 0 -13 7 -13 15z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0AF.xml b/data/Bravura/E0AF.xml
new file mode 100644
index 00000000000..c353b2855d2
--- /dev/null
+++ b/data/Bravura/E0AF.xml
@@ -0,0 +1 @@
+<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 0c0 8 6 14 14 14h97v97c0 8 6 14 14 14c7 0 14 -6 14 -14v-97h97c7 0 14 -6 14 -14s-7 -14 -14 -14h-97v-97c0 -8 -7 -14 -14 -14c-8 0 -14 6 -14 14v97h-97c-8 0 -14 6 -14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0B5.xml b/data/Bravura/E0B5.xml
new file mode 100644
index 00000000000..b183401e5e2
--- /dev/null
+++ b/data/Bravura/E0B5.xml
@@ -0,0 +1 @@
+<symbol id="E0B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 1c0 68 82 124 215 124c93 0 205 -53 205 -124c0 -69 -51 -126 -215 -126c-149 0 -205 60 -205 126zM106 37c0 -28 14 -58 30 -80l61 48l-71 82c-7 -6 -12 -14 -15 -24c-3 -8 -5 -17 -5 -26zM155 -65l8 -7c21 -18 46 -30 74 -30c10 0 20 1 30 4c5 1 10 3 14 5l-64 76z M155 99l66 -76l52 39c-22 24 -51 40 -84 40c-11 0 -22 -1 -34 -3zM240 0l62 -72c5 7 7 14 8 22c1 5 2 12 2 18c0 24 -8 48 -22 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0B6.xml b/data/Bravura/E0B6.xml
new file mode 100644
index 00000000000..9d6121de6fa
--- /dev/null
+++ b/data/Bravura/E0B6.xml
@@ -0,0 +1 @@
+<symbol id="E0B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M97 -125c-55 0 -97 30 -97 83c0 52 47 167 196 167c57 0 98 -33 98 -84c0 -32 -32 -166 -197 -166zM256 63l-94 -65l23 -46c54 32 73 58 73 92c0 6 -1 12 -2 19zM29 -42c0 -6 2 -12 4 -17l93 66l-19 38c-59 -35 -78 -65 -78 -87zM48 -79c8 -6 20 -11 36 -11 c19 0 43 7 77 27l-22 45zM131 58l18 -36l88 61c-6 3 -13 4 -22 4c-18 0 -45 -7 -84 -29z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0B7.xml b/data/Bravura/E0B7.xml
new file mode 100644
index 00000000000..ba9c7f9b058
--- /dev/null
+++ b/data/Bravura/E0B7.xml
@@ -0,0 +1 @@
+<symbol id="E0B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37c0 24 10 65 41 100c24 28 69 62 148 62c53 0 100 -31 100 -88c0 -16 -7 -56 -36 -93c-38 -50 -92 -69 -154 -69c-53 0 -99 32 -99 88zM237 87l-80 -81l63 -63l13 16c14 17 21 35 25 46c4 14 6 27 6 32c0 19 -7 34 -20 45zM25 -37c0 -16 5 -30 14 -40l83 83l-52 52 l-11 -12c-24 -27 -34 -62 -34 -83zM139 -12l-80 -79c12 -6 25 -9 40 -9c32 0 61 6 85 18c5 3 11 6 16 10zM109 84l-20 -10l50 -51l74 75c-7 1 -16 2 -24 2c-30 0 -57 -5 -80 -16z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0D9.xml b/data/Bravura/E0D9.xml
new file mode 100644
index 00000000000..d48554a59d7
--- /dev/null
+++ b/data/Bravura/E0D9.xml
@@ -0,0 +1 @@
+<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -5c-2 1 -3 3 -3 5s1 3 3 5l118 118c1 1 3 2 4 2c2 0 4 -1 6 -2l118 -118c1 -2 2 -3 2 -5s-1 -4 -2 -5l-118 -118c-2 -2 -4 -2 -6 -2c-1 0 -3 0 -4 2zM149 51c-26 0 -88 -42 -88 -68c0 -5 1 -13 6 -18c8 -9 17 -14 29 -14c26 0 89 41 89 67c0 17 -20 33 -36 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DA.xml b/data/Bravura/E0DA.xml
new file mode 100644
index 00000000000..5f3c6440114
--- /dev/null
+++ b/data/Bravura/E0DA.xml
@@ -0,0 +1 @@
+<symbol id="E0DA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -6c-3 2 -4 3 -4 5s1 3 4 5l165 119c1 1 4 2 6 2c3 0 6 -1 7 -2l167 -119c1 -2 2 -3 2 -5s-1 -4 -2 -5l-166 -117c-2 -1 -5 -2 -8 -2c-2 0 -5 1 -7 2zM207 50c-28 0 -122 -39 -122 -68c0 -5 3 -11 9 -16c10 -12 24 -16 40 -16c28 0 125 37 125 67c0 20 -36 33 -52 33z "/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DB.xml b/data/Bravura/E0DB.xml
new file mode 100644
index 00000000000..3ff2fe40a4f
--- /dev/null
+++ b/data/Bravura/E0DB.xml
@@ -0,0 +1 @@
+<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -5c-2 2 -3 4 -3 6s0 3 2 5l117 117c1 1 4 2 6 2c3 0 5 -1 6 -2l117 -117c1 -1 2 -3 2 -5s-1 -4 -2 -5l-118 -119c-2 -2 -4 -2 -5 -2c-2 0 -3 0 -5 2z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DC.xml b/data/Bravura/E0DC.xml
new file mode 100644
index 00000000000..dc917248c73
--- /dev/null
+++ b/data/Bravura/E0DC.xml
@@ -0,0 +1 @@
+<symbol id="E0DC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -4c-3 0 -3 3 -3 5s0 3 3 5l162 116c3 2 7 3 9 3c3 0 7 -1 10 -3l163 -116c2 -2 3 -3 3 -5s-1 -4 -3 -5l-164 -118c-3 -2 -6 -3 -9 -3c-2 0 -5 1 -7 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DD.xml b/data/Bravura/E0DD.xml
new file mode 100644
index 00000000000..20bc604d1e6
--- /dev/null
+++ b/data/Bravura/E0DD.xml
@@ -0,0 +1 @@
+<symbol id="E0DD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -4c-1 1 -2 3 -2 5s1 4 2 5l116 116c1 1 4 3 7 3s6 -2 7 -3l116 -116c1 -1 2 -3 2 -5s-1 -4 -2 -5l-118 -119c-1 -1 -3 -2 -5 -2s-4 1 -5 2zM125 90l-89 -89l89 -88l89 88z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0DE.xml b/data/Bravura/E0DE.xml
new file mode 100644
index 00000000000..f733e4f4ba3
--- /dev/null
+++ b/data/Bravura/E0DE.xml
@@ -0,0 +1 @@
+<symbol id="E0DE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -6c-3 2 -5 4 -5 6s1 4 4 6l159 114c4 3 8 5 12 5c5 0 8 -2 11 -4l161 -116c2 -2 3 -3 3 -5s-1 -4 -3 -5l-164 -117c-3 -2 -6 -3 -9 -3c-2 0 -4 1 -7 3zM174 93l-130 -93l130 -94l131 94z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0F5.xml b/data/Bravura/E0F5.xml
new file mode 100644
index 00000000000..92449cd6086
--- /dev/null
+++ b/data/Bravura/E0F5.xml
@@ -0,0 +1 @@
+<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 1c0 84 39 135 105 180l4 -7c-61 -51 -72 -93 -72 -172c0 -42 5 -74 15 -103c11 -32 23 -47 57 -73l-5 -7c-64 41 -104 104 -104 182z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0F6.xml b/data/Bravura/E0F6.xml
new file mode 100644
index 00000000000..31823b6b69a
--- /dev/null
+++ b/data/Bravura/E0F6.xml
@@ -0,0 +1 @@
+<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M37 2c0 79 -11 122 -73 172l4 7c66 -43 105 -97 105 -180c0 -77 -39 -142 -103 -182l-6 7c34 26 46 41 58 73c10 29 15 61 15 103z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E0FA.xml b/data/Bravura/E0FA.xml
new file mode 100644
index 00000000000..dab725f66ab
--- /dev/null
+++ b/data/Bravura/E0FA.xml
@@ -0,0 +1 @@
+<symbol id="E0FA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 2c0 68 83 123 216 123c93 0 206 -52 206 -123c0 -70 -52 -127 -216 -127c-149 0 -206 60 -206 127z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E101.xml b/data/Bravura/E101.xml
new file mode 100644
index 00000000000..41fc2858ea9
--- /dev/null
+++ b/data/Bravura/E101.xml
@@ -0,0 +1 @@
+<symbol id="E101" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M430 250h100l-430 -500h-100z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E102.xml b/data/Bravura/E102.xml
new file mode 100644
index 00000000000..774c30eb6bb
--- /dev/null
+++ b/data/Bravura/E102.xml
@@ -0,0 +1 @@
+<symbol id="E102" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M845 220h-350l-370 -440h350zM430 250h550l-430 -500h-550z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E103.xml b/data/Bravura/E103.xml
new file mode 100644
index 00000000000..9e5d42ebe2b
--- /dev/null
+++ b/data/Bravura/E103.xml
@@ -0,0 +1 @@
+<symbol id="E103" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M645 220h-150l-370 -440h150zM430 250h350l-430 -500h-350z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E220.xml b/data/Bravura/E220.xml
new file mode 100644
index 00000000000..a90d1e3e120
--- /dev/null
+++ b/data/Bravura/E220.xml
@@ -0,0 +1 @@
+<symbol id="E220" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 -31l-300 -62v125l300 62v-125z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E221.xml b/data/Bravura/E221.xml
new file mode 100644
index 00000000000..66c83c4ad49
--- /dev/null
+++ b/data/Bravura/E221.xml
@@ -0,0 +1 @@
+<symbol id="E221" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M149 62l-300 -62v125l300 62v-125zM-151 -62l300 63v-125l-300 -63v125z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E222.xml b/data/Bravura/E222.xml
new file mode 100644
index 00000000000..d0b591a6071
--- /dev/null
+++ b/data/Bravura/E222.xml
@@ -0,0 +1 @@
+<symbol id="E222" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-150 -155l300 62v-125l-300 -62v125zM-150 -96v125l300 62v-125zM150 153l-300 -63v125l300 63v-125z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E223.xml b/data/Bravura/E223.xml
new file mode 100644
index 00000000000..aab4cd5f418
--- /dev/null
+++ b/data/Bravura/E223.xml
@@ -0,0 +1 @@
+<symbol id="E223" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 63l-300 -63v125l300 63v-125zM150 -308l-300 -62v125l300 62v-125zM-150 -61l300 62v-125l-300 -62v125zM-150 312l300 62v-125l-300 -62v125z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E224.xml b/data/Bravura/E224.xml
new file mode 100644
index 00000000000..6e0edd0953b
--- /dev/null
+++ b/data/Bravura/E224.xml
@@ -0,0 +1 @@
+<symbol id="E224" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 -214l-300 -62v125l300 62v-125zM-151 408l300 62v-125l-300 -62v125zM-150 35l300 63v-125l-300 -63v125zM-151 96v125l300 63v-125zM150 -398l-300 -62v125l300 62v-125z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E22A.xml b/data/Bravura/E22A.xml
new file mode 100644
index 00000000000..5be7d962bb0
--- /dev/null
+++ b/data/Bravura/E22A.xml
@@ -0,0 +1 @@
+<symbol id="E22A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-155 116h311v-49l-220 -134h220v-49h-311v49l216 134h-216v49z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E240.xml b/data/Bravura/E240.xml
new file mode 100644
index 00000000000..cf817688d65
--- /dev/null
+++ b/data/Bravura/E240.xml
@@ -0,0 +1 @@
+<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M197 -478c-36 85 -131 221 -197 233v239c0 12 8 15 19 15c10 0 18 -6 21 -22c16 -96 58 -182 109 -261c63 -100 115 -218 115 -343c0 -78 -26 -173 -26 -173c-5 -17 -22 -23 -28 -19s-16 13 -16 29c0 4 1 9 3 15c17 45 24 92 24 137c0 59 -9 116 -24 150z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E241.xml b/data/Bravura/E241.xml
new file mode 100644
index 00000000000..2aa4967dbec
--- /dev/null
+++ b/data/Bravura/E241.xml
@@ -0,0 +1 @@
+<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -14c-8 0 -16 5 -16 15v235c134 45 184 126 221 210c15 34 40 118 40 177c0 45 -7 95 -21 137c-10 29 7 48 22 48c7 0 13 -4 16 -15c8 -32 28 -103 28 -181c0 -125 -61 -244 -124 -343c-51 -79 -125 -166 -142 -261c-2 -16 -15 -22 -24 -22z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E242.xml b/data/Bravura/E242.xml
new file mode 100644
index 00000000000..fbc6f3a5ce8
--- /dev/null
+++ b/data/Bravura/E242.xml
@@ -0,0 +1 @@
+<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -396h-5v388c0 7 11 10 17 10s18 -2 20 -13c17 -106 73 -122 127 -180c72 -78 98 -106 108 -174c2 -12 3 -23 3 -36c0 -61 -22 -121 -25 -127c-1 -3 -1 -5 -1 -7c0 -4 1 -6 1 -9c18 -37 29 -78 29 -120v-22c0 -48 -3 -105 -7 -110c-6 -13 -13 -17 -20 -17 c-14 0 -22 13 -22 26c0 3 0 5 1 9c5 30 8 60 8 89c0 52 -9 101 -32 149c-69 140 -140 142 -202 144zM54 -217c-8 0 -14 -6 -14 -10c0 -1 0 -2 1 -3c21 -82 67 -106 114 -160c21 -24 38 -44 54 -69c2 -3 4 -4 7 -4c5 0 12 3 13 6c5 8 5 18 7 26c1 7 1 13 1 20 c0 32 -9 63 -27 89c-33 49 -87 105 -148 105h-8z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E243.xml b/data/Bravura/E243.xml
new file mode 100644
index 00000000000..7bf7f3bf3c3
--- /dev/null
+++ b/data/Bravura/E243.xml
@@ -0,0 +1 @@
+<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M17 -9c-10 0 -17 5 -17 10v387h5c62 2 143 5 212 145c38 78 38 169 23 253c-3 17 5 25 17 26c12 0 19 1 24 -22c16 -80 15 -178 -21 -253c0 -3 -1 -5 -1 -9c0 -3 0 -5 1 -7c3 -6 25 -66 25 -127c0 -13 -1 -25 -3 -36c-24 -157 -221 -200 -245 -354 c-2 -11 -13 -13 -20 -13zM40 220c0 -5 6 -10 14 -10h8c61 0 125 56 158 105c18 26 27 56 27 89c0 6 0 13 -1 20c-2 8 -2 18 -7 25c-1 4 -8 7 -13 7c-3 0 -5 -1 -7 -4c-16 -26 -33 -46 -54 -69c-47 -55 -103 -78 -124 -160c-1 -1 -1 -2 -1 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E244.xml b/data/Bravura/E244.xml
new file mode 100644
index 00000000000..2637f5b77ce
--- /dev/null
+++ b/data/Bravura/E244.xml
@@ -0,0 +1 @@
+<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -423h-5v560c0 7 8 12 14 12c10 0 17 -10 18 -19c17 -100 71 -116 121 -170c67 -73 90 -100 101 -161c2 -9 2 -18 2 -28c0 -39 -11 -80 -20 -106c14 -29 21 -61 21 -93c0 -57 -21 -112 -23 -119c-1 -2 -1 -4 -1 -6c0 -3 0 -5 1 -7c15 -36 24 -74 26 -113 c0 -9 1 -18 1 -28c0 -43 -4 -89 -7 -95c-7 -11 -14 -16 -20 -16c-2 0 -4 1 -6 2c-7 3 -13 12 -13 24c0 2 1 4 1 7c5 29 8 57 8 85c0 48 -9 93 -31 137c-64 130 -130 132 -188 134zM208 -181c-55 93 -114 117 -169 117c16 -97 65 -114 114 -168c23 -25 41 -44 55 -62 c5 17 10 34 12 44c1 7 3 13 3 21c0 13 -4 28 -15 48zM51 -255c-9 0 -14 -9 -12 -16c22 -73 63 -95 106 -146l5 -5c17 -20 31 -37 46 -59c1 -3 4 -4 7 -4c5 0 10 3 11 6c3 7 3 15 5 23c1 8 2 16 2 24c0 81 -90 177 -170 177z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E245.xml b/data/Bravura/E245.xml
new file mode 100644
index 00000000000..7cc156153a4
--- /dev/null
+++ b/data/Bravura/E245.xml
@@ -0,0 +1 @@
+<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -172c-8 0 -14 4 -14 13v589c61 2 125 4 201 140c23 41 31 70 31 98c0 34 -12 65 -20 110c0 3 -1 5 -1 7c0 13 7 23 14 26c2 1 4 1 6 1c35 0 42 -116 42 -136v-11c-4 -64 -9 -75 -22 -100l-4 -7c-2 -3 -3 -5 -3 -7c0 -3 3 -6 3 -9c4 -10 20 -53 20 -105 c0 -34 -7 -72 -23 -101c9 -27 22 -71 22 -114c0 -10 0 -20 -2 -29c-11 -64 -35 -92 -105 -168c-52 -57 -109 -73 -126 -177c-1 -9 -9 -20 -19 -20zM39 53c0 -1 0 -2 2 -3c57 0 118 26 175 122c12 21 16 37 16 50c0 8 -2 14 -3 21c-3 11 -8 32 -14 51 c-14 -18 -32 -38 -56 -64c-52 -57 -103 -73 -120 -177zM39 268c0 -5 4 -13 13 -13h5c81 0 173 103 173 185c0 8 -1 17 -2 25c-2 8 -2 16 -5 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-16 -25 -32 -44 -52 -67c-45 -53 -91 -75 -112 -155z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E246.xml b/data/Bravura/E246.xml
new file mode 100644
index 00000000000..8d090ee8a4b
--- /dev/null
+++ b/data/Bravura/E246.xml
@@ -0,0 +1 @@
+<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -423v758c0 7 7 12 14 12c8 0 17 -10 18 -19c17 -100 71 -116 121 -170c67 -73 90 -100 101 -161c1 -9 2 -18 2 -27c0 -42 -13 -86 -22 -111c15 -27 22 -58 22 -88c0 -39 -11 -80 -20 -106c14 -29 21 -61 21 -93c0 -57 -21 -112 -23 -119c-1 -2 -1 -4 -1 -6 c0 -3 0 -5 1 -7c15 -36 24 -74 26 -113c0 -9 1 -18 1 -28c0 -43 -4 -89 -7 -95c-7 -11 -14 -16 -20 -16c-2 0 -4 1 -6 2c-7 3 -13 12 -13 24c0 2 1 4 1 7c5 29 8 57 8 85c0 48 -9 93 -31 137c-64 130 -130 132 -188 134h-5zM39 134c1 -1 1 -3 1 -4c17 -100 63 -116 113 -170 c23 -25 40 -44 54 -61l13 49c1 7 3 13 3 21c0 13 -4 28 -15 48c-55 92 -112 117 -169 117zM208 -181c-55 93 -114 117 -169 117c16 -97 65 -114 114 -168c23 -25 41 -44 55 -62c5 17 10 34 12 44c1 7 3 13 3 21c0 13 -4 28 -15 48zM51 -255c-7 0 -15 -6 -13 -13 c20 -77 64 -98 107 -149l5 -5c17 -20 31 -37 46 -59c1 -3 4 -4 7 -4c5 0 10 3 11 6c3 7 3 15 5 23c1 8 2 16 2 24c0 81 -90 177 -170 177z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E247.xml b/data/Bravura/E247.xml
new file mode 100644
index 00000000000..e098a251b7d
--- /dev/null
+++ b/data/Bravura/E247.xml
@@ -0,0 +1 @@
+<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -376c-8 0 -14 5 -14 13v793c61 2 125 4 201 140c23 41 31 70 31 98c0 34 -12 65 -20 110c0 3 -1 5 -1 7c0 13 7 23 14 26c2 1 4 1 6 1c35 0 42 -116 42 -136v-11c-4 -64 -9 -75 -22 -100l-4 -7c-2 -3 -3 -5 -3 -7c0 -3 3 -6 3 -9c4 -10 20 -53 20 -105 c0 -34 -7 -72 -23 -101c9 -27 22 -71 22 -114c0 -10 0 -20 -2 -29c-4 -24 -10 -43 -20 -62c10 -26 23 -70 23 -112c0 -10 -1 -20 -3 -30c-11 -64 -35 -92 -105 -168c-52 -57 -109 -73 -126 -177c-1 -9 -9 -20 -19 -20zM39 53c0 -1 0 -2 2 -3c57 0 118 26 175 122 c12 21 16 37 16 50c0 8 -2 14 -3 21c-3 11 -8 32 -14 51c-14 -18 -32 -38 -56 -64c-52 -57 -103 -73 -120 -177zM159 25c-58 -63 -107 -85 -120 -179c56 0 120 26 177 122c12 21 16 37 16 50c0 8 -2 14 -3 21l-13 50c-15 -18 -33 -38 -57 -64zM151 423 c-45 -53 -91 -75 -112 -155c0 -5 4 -13 13 -13h5c81 0 173 103 173 185c0 8 -1 17 -2 25c-2 8 -2 16 -5 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-16 -25 -32 -44 -52 -67z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E248.xml b/data/Bravura/E248.xml
new file mode 100644
index 00000000000..7ef7aa4b738
--- /dev/null
+++ b/data/Bravura/E248.xml
@@ -0,0 +1 @@
+<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -423h-5v944c0 7 7 12 15 12c9 0 16 -10 17 -19c17 -100 71 -116 121 -170c67 -73 90 -100 101 -161c2 -9 2 -19 2 -29c0 -38 -10 -77 -19 -102c8 -17 13 -34 17 -55c1 -9 2 -18 2 -27c0 -42 -13 -86 -22 -111c15 -27 22 -58 22 -88c0 -39 -11 -80 -20 -106 c14 -29 21 -61 21 -93c0 -57 -21 -112 -23 -119c-1 -2 -1 -4 -1 -6c0 -3 0 -5 1 -7c15 -36 24 -74 26 -113c0 -9 1 -18 1 -28c0 -43 -4 -89 -7 -95c-7 -11 -14 -16 -20 -16c-2 0 -4 1 -6 2c-7 3 -13 12 -13 24c0 2 1 4 1 7c5 29 8 57 8 85c0 48 -9 93 -31 137 c-64 130 -130 132 -188 134zM208 17c-55 92 -113 117 -170 117c1 -1 1 -3 1 -4c17 -100 64 -116 114 -170c23 -25 40 -44 54 -61l13 49c1 7 3 13 3 21c0 13 -4 28 -15 48zM208 -181c-55 93 -114 117 -169 117c16 -97 65 -114 114 -168c23 -25 41 -44 55 -62 c5 17 10 34 12 44c1 7 3 13 3 21c0 13 -4 28 -15 48zM51 -255c-8 0 -14 -6 -13 -13c20 -77 64 -98 107 -149l5 -5c17 -20 31 -37 46 -59c1 -3 4 -4 7 -4c5 0 10 3 11 6c3 7 3 15 5 23c1 8 2 16 2 24c0 81 -90 177 -170 177zM208 203c-55 93 -115 117 -170 117 c17 -93 67 -109 115 -162c24 -26 42 -46 56 -64c5 16 9 31 11 40c1 7 3 13 3 21c0 13 -4 28 -15 48z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E249.xml b/data/Bravura/E249.xml
new file mode 100644
index 00000000000..ff47fbefabf
--- /dev/null
+++ b/data/Bravura/E249.xml
@@ -0,0 +1 @@
+<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -580c-9 0 -14 5 -14 13v997c61 2 125 4 201 140c23 41 31 70 31 98c0 34 -12 65 -20 110c0 3 -1 5 -1 7c0 13 7 23 14 26c2 1 4 1 6 1c35 0 42 -116 42 -136v-11c-4 -64 -9 -75 -22 -100l-4 -7c-2 -3 -3 -5 -3 -7c0 -3 3 -6 3 -9c4 -10 20 -53 20 -105 c0 -34 -7 -72 -23 -101c9 -27 22 -71 22 -114c0 -10 0 -20 -2 -29c-4 -24 -10 -43 -20 -62c10 -26 23 -70 23 -112c0 -30 -9 -65 -23 -92c10 -26 23 -70 23 -112c0 -10 -1 -20 -3 -30c-11 -64 -35 -92 -105 -168c-52 -57 -109 -73 -126 -177c-1 -9 -10 -20 -19 -20zM159 230 c-52 -57 -103 -73 -120 -177c0 -1 0 -2 2 -3c57 0 118 26 175 122c12 21 16 37 16 50c0 8 -2 14 -3 21c-3 11 -8 32 -14 51c-14 -18 -32 -38 -56 -64zM39 -358c56 0 120 26 177 122c12 21 16 37 16 50c0 8 -2 14 -3 21l-13 50c-15 -18 -33 -38 -57 -64 c-58 -63 -107 -85 -120 -179zM39 -154c56 0 120 26 177 122c12 21 16 37 16 50c0 8 -2 14 -3 21l-13 50c-15 -18 -33 -38 -57 -64c-58 -63 -107 -85 -120 -179zM151 423c-45 -53 -91 -75 -112 -155c0 -5 4 -13 13 -13h5c81 0 173 103 173 185c0 8 -1 17 -2 25 c-2 8 -2 16 -5 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-16 -25 -32 -44 -52 -67z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24A.xml b/data/Bravura/E24A.xml
new file mode 100644
index 00000000000..116123fc385
--- /dev/null
+++ b/data/Bravura/E24A.xml
@@ -0,0 +1 @@
+<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 691c0 6 6 13 14 13s15 -5 17 -18c17 -97 72 -124 124 -179l18 -19c54 -59 79 -88 88 -141c2 -10 2 -20 2 -31c0 -39 -9 -80 -18 -107c13 -25 18 -52 18 -80c0 -38 -9 -80 -18 -107c13 -25 18 -52 18 -80c0 -38 -9 -80 -18 -107c13 -24 19 -54 19 -81 c0 -37 -9 -75 -17 -102c8 -24 12 -51 12 -76c0 -58 -21 -113 -23 -120c-1 -1 -1 -3 -1 -5c0 -3 1 -7 1 -8c16 -37 25 -75 27 -113c0 -9 1 -18 1 -28c0 -44 -4 -92 -8 -97c-6 -12 -12 -17 -19 -17c-3 0 -6 1 -8 2c-7 2 -13 11 -13 23c0 3 0 5 1 8c5 30 8 58 8 86 c0 48 -9 94 -30 138c-65 134 -134 136 -191 138h-4v1108zM51 -249c-8 0 -14 -6 -12 -13c18 -76 62 -99 108 -151c19 -21 34 -40 49 -65c2 -3 5 -4 8 -4c5 0 10 4 11 7c4 8 4 16 6 25c1 7 2 14 2 21c0 78 -89 180 -166 180h-6zM209 -7c-55 93 -115 117 -170 117 c20 -85 68 -110 116 -164l55 -61c4 14 9 29 11 38c2 7 3 14 3 22c0 13 -3 28 -15 48zM39 297c20 -85 68 -110 116 -164l55 -61c4 14 9 29 11 38c2 7 3 14 3 22c0 13 -4 27 -15 46c-55 95 -115 119 -170 119zM39 484c20 -85 68 -110 116 -164l55 -61c4 14 9 29 11 38 c2 7 3 14 3 22c0 13 -4 27 -16 46c-54 95 -114 119 -169 119zM39 -77c20 -80 68 -96 116 -147c25 -27 44 -48 58 -67c6 15 11 33 11 49c0 13 -3 27 -15 47c-54 91 -116 117 -170 118z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24B.xml b/data/Bravura/E24B.xml
new file mode 100644
index 00000000000..6042622cffd
--- /dev/null
+++ b/data/Bravura/E24B.xml
@@ -0,0 +1 @@
+<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -751c-9 0 -14 6 -14 16v1160c62 3 124 5 202 143c23 41 31 72 31 100c0 34 -12 65 -20 110c-1 3 -1 6 -1 9c0 13 7 22 14 25c13 0 20 0 27 -15c5 -8 21 -73 21 -122v-11c-4 -65 -9 -76 -24 -103l-3 -6c-1 -3 -2 -5 -2 -7s0 -4 2 -8c15 -46 22 -97 22 -145 c0 -1 1 -3 1 -4c8 -21 29 -80 29 -138c0 -29 -6 -58 -17 -85c8 -28 17 -66 17 -103c0 -29 -6 -57 -17 -84c8 -28 17 -66 17 -103c0 -29 -6 -57 -17 -84c8 -28 17 -66 17 -103c0 -12 -1 -23 -3 -34c-12 -72 -40 -103 -118 -188c-59 -63 -122 -81 -140 -199 c-2 -11 -14 -21 -24 -21zM160 224c-50 -54 -105 -72 -122 -166c64 0 140 28 203 137c13 23 16 40 16 54c0 27 -4 51 -11 77c0 1 -1 3 -1 4c-16 -30 -42 -59 -85 -106zM151 419c-47 -52 -92 -76 -114 -156c0 -5 5 -13 15 -13h8c77 0 171 105 171 184c0 9 -1 19 -3 28 c0 6 -2 15 -4 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-17 -25 -34 -45 -53 -68zM178 30c-51 -55 -114 -76 -139 -159c62 2 141 32 202 137c13 23 16 40 16 54c0 18 -2 35 -5 53c-18 -24 -41 -50 -74 -85zM178 -157c-51 -55 -114 -76 -139 -159c62 2 141 32 202 137 c13 23 16 40 16 54c0 18 -2 35 -5 53c-18 -24 -41 -50 -74 -85zM39 -503c62 2 141 33 202 137c13 23 16 41 16 55c0 9 -1 17 -1 25c0 6 -2 16 -4 27c-18 -24 -41 -49 -74 -85c-51 -55 -114 -76 -139 -159z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24C.xml b/data/Bravura/E24C.xml
new file mode 100644
index 00000000000..20fa639cccb
--- /dev/null
+++ b/data/Bravura/E24C.xml
@@ -0,0 +1 @@
+<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -417h-4v1296c0 9 7 12 15 12s15 -4 16 -18c17 -97 74 -122 124 -179l16 -17c56 -60 82 -89 91 -144c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109c7 -15 12 -31 16 -50c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109c7 -15 12 -31 16 -50c1 -9 2 -18 2 -28 c0 -39 -10 -81 -18 -109c7 -15 12 -31 16 -49c1 -9 2 -18 2 -28c0 -39 -10 -82 -18 -110c7 -15 12 -31 16 -49c1 -9 2 -19 2 -29c0 -37 -9 -77 -17 -105c8 -24 13 -50 13 -76c0 -58 -21 -113 -23 -120c-1 -1 -1 -3 -1 -5c0 -3 1 -7 1 -8c16 -37 25 -75 27 -113 c0 -9 1 -18 1 -28c0 -44 -4 -92 -8 -97c-6 -12 -12 -17 -19 -17c-3 0 -6 1 -8 2c-7 2 -13 11 -13 23c0 3 0 5 1 8c5 29 8 58 8 86c0 48 -9 94 -31 138c-65 134 -134 136 -191 138zM51 -249c-8 0 -13 -6 -12 -13c18 -77 62 -100 108 -151c19 -21 35 -40 50 -65 c2 -3 5 -4 8 -4c5 0 10 4 11 7c4 8 4 16 6 25c1 7 2 14 2 21c0 78 -90 180 -167 180h-6zM210 -8c-56 94 -117 118 -171 118c20 -85 69 -110 116 -164c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 13 -3 27 -15 47zM39 484c20 -85 69 -110 116 -164 c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 12 -3 26 -15 46c-56 94 -117 119 -171 119zM210 178c-56 94 -117 119 -171 119c20 -85 69 -110 116 -164c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 12 -3 26 -15 46zM209 552 c-55 94 -116 119 -170 119c20 -85 69 -110 116 -164c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 13 3 21c0 12 -4 27 -16 47zM209 -195c-54 91 -117 117 -170 118c19 -80 68 -96 116 -147c25 -27 44 -48 59 -67l8 27c2 7 3 14 3 22c0 13 -4 27 -16 47z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24D.xml b/data/Bravura/E24D.xml
new file mode 100644
index 00000000000..88574c4f406
--- /dev/null
+++ b/data/Bravura/E24D.xml
@@ -0,0 +1 @@
+<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -925v1349c62 3 126 5 204 143c23 41 31 72 31 100c0 34 -12 65 -20 110c-1 3 -1 6 -1 9c0 13 7 22 14 25c13 0 20 0 27 -15c4 -8 20 -73 20 -122v-11c-4 -62 -9 -74 -21 -99l-5 -10c-1 -3 -2 -5 -2 -7s0 -4 2 -8c1 -5 21 -51 21 -107c0 -11 0 -22 -2 -33 c1 0 32 -75 32 -147c0 -27 -6 -60 -16 -85c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36c-12 -72 -39 -103 -118 -187 c-58 -63 -122 -82 -140 -200c-2 -11 -14 -21 -24 -21s-15 9 -15 14zM40 57c64 0 139 28 202 137c14 24 17 40 17 55c0 28 -5 53 -13 80c-16 -30 -41 -59 -84 -106c-51 -54 -106 -72 -122 -166zM38 262c0 -5 5 -13 15 -13h8c78 0 172 105 172 184c0 9 -1 19 -3 28 c0 6 -2 15 -4 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-17 -25 -34 -45 -53 -68c-47 -52 -93 -76 -115 -156zM40 -317c62 2 142 32 203 137c13 24 16 41 16 56c0 17 -1 34 -6 51c-16 -22 -37 -46 -67 -77l-7 -7c-51 -56 -114 -77 -139 -160zM39 -691c62 2 143 33 203 137 c14 24 17 41 17 56c0 8 -1 16 -1 24c0 6 -2 16 -5 27c-17 -23 -41 -49 -74 -84c-51 -56 -115 -77 -140 -160zM40 -130c62 2 142 32 203 137c13 24 16 42 16 56c0 17 -1 34 -6 51c-15 -22 -37 -45 -65 -76l-8 -9c-52 -55 -115 -76 -140 -159zM40 -504c62 2 142 33 202 137 c14 24 17 41 17 56c0 17 -1 34 -6 51c-17 -23 -41 -49 -74 -84c-51 -56 -114 -77 -139 -160z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24E.xml b/data/Bravura/E24E.xml
new file mode 100644
index 00000000000..f36bae7a638
--- /dev/null
+++ b/data/Bravura/E24E.xml
@@ -0,0 +1 @@
+<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -417h-5v1483c0 9 8 13 15 13c8 0 15 -4 17 -18c17 -98 73 -123 123 -180l15 -16c57 -61 83 -89 92 -144c1 -9 2 -18 2 -28c0 -39 -10 -82 -18 -110c13 -24 18 -51 18 -78c0 -39 -10 -81 -18 -109c13 -24 18 -51 18 -78c0 -39 -10 -81 -18 -109c13 -24 18 -51 18 -78 c0 -39 -10 -81 -18 -109c8 -15 13 -31 16 -49c1 -9 2 -18 2 -28c0 -39 -10 -82 -18 -110c8 -15 13 -31 16 -49c1 -9 2 -19 2 -29c0 -37 -9 -77 -17 -105c8 -25 13 -50 13 -76c0 -58 -21 -113 -23 -120c-1 -1 -1 -3 -1 -5c0 -3 1 -7 1 -8c16 -37 25 -75 27 -113 c0 -9 1 -18 1 -28c0 -44 -4 -92 -8 -97c-6 -12 -12 -17 -19 -17c-3 0 -6 1 -8 2c-7 2 -13 11 -13 23c0 3 0 5 1 8c5 29 8 58 8 86c0 48 -9 94 -31 138c-65 134 -134 136 -190 138zM51 -249c-6 0 -13 -5 -11 -13c17 -77 61 -99 107 -151c19 -21 35 -40 50 -65c2 -3 5 -4 8 -4 c5 0 10 4 11 7c4 8 4 16 6 25c1 7 2 14 2 21c0 78 -90 180 -167 180h-6zM39 297c20 -85 69 -110 116 -164c23 -24 41 -44 56 -61l11 38c2 7 3 14 3 22c0 13 -3 27 -15 47c-56 94 -117 118 -171 118zM39 110c20 -85 69 -110 116 -164c23 -24 41 -44 55 -61c5 14 9 29 12 38 c2 7 3 14 3 22c0 13 -3 27 -15 47c-56 94 -117 118 -171 118zM209 740c-55 94 -116 118 -170 118c20 -85 69 -110 116 -164c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 13 -4 27 -16 47zM210 552c-56 94 -117 119 -171 119c20 -85 69 -110 116 -164 c23 -24 41 -44 56 -61l11 38c2 7 3 14 3 22c0 12 -3 26 -15 46zM39 484c20 -85 69 -110 116 -164c23 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 12 -3 26 -15 46c-56 94 -117 119 -171 119zM210 -195c-54 91 -117 117 -171 118c19 -80 69 -96 116 -147 c25 -27 44 -48 59 -67l8 27c2 7 3 14 3 22c0 13 -3 27 -15 47z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E24F.xml b/data/Bravura/E24F.xml
new file mode 100644
index 00000000000..3b075461e04
--- /dev/null
+++ b/data/Bravura/E24F.xml
@@ -0,0 +1 @@
+<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 -1202c-9 0 -15 6 -15 14v1543c62 3 126 5 204 143c23 42 30 72 30 100c0 34 -11 65 -19 110c-1 3 -1 6 -1 9c0 13 7 22 14 25c13 0 19 0 26 -15c5 -8 21 -72 21 -122v-11c-4 -65 -9 -76 -24 -103l-3 -6c-1 -4 -2 -5 -2 -8c0 -2 1 -3 2 -7c0 -1 0 -2 1 -3 c5 -12 21 -54 21 -104c0 -11 0 -22 -2 -33c1 0 32 -75 32 -147c0 -27 -6 -60 -16 -85c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -28 -6 -61 -16 -86c8 -28 16 -65 16 -101c0 -30 -6 -61 -17 -89 c9 -29 18 -68 18 -107c0 -11 -1 -23 -3 -34c-13 -72 -41 -103 -119 -187c-58 -63 -122 -82 -140 -200c-2 -12 -15 -21 -24 -21zM40 -12c64 0 139 28 203 137c13 23 15 39 15 53c0 28 -4 55 -12 82c-16 -30 -41 -59 -84 -106c-51 -54 -106 -72 -122 -166zM38 193 c0 -5 5 -13 15 -13h8c78 0 172 105 172 184c0 9 -1 19 -3 28c0 6 -2 15 -4 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-17 -25 -34 -45 -53 -68c-47 -52 -93 -76 -115 -156zM39 -954c63 2 142 32 204 137c13 23 15 40 15 54c0 9 -1 18 -1 26c0 7 -2 20 -5 32 c-16 -21 -37 -43 -65 -73l-8 -9c-52 -57 -116 -78 -140 -167zM39 -573c62 2 143 33 204 137c13 23 15 40 15 54c0 17 0 36 -5 53c-17 -23 -41 -49 -74 -84c-51 -56 -115 -77 -140 -160zM39 -760c62 2 143 33 204 137c13 23 15 40 15 54c0 17 0 36 -5 53 c-17 -23 -41 -49 -74 -84c-51 -56 -115 -77 -140 -160zM179 -226c-51 -56 -115 -77 -140 -160c62 2 143 33 204 137c13 23 15 40 15 54c0 17 0 36 -5 53c-16 -22 -37 -46 -67 -77zM39 -199c62 2 143 32 204 137c13 23 15 39 15 53c0 18 0 37 -5 54c-15 -22 -37 -45 -65 -76 l-8 -9c-52 -55 -116 -76 -141 -159z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E260.xml b/data/Bravura/E260.xml
new file mode 100644
index 00000000000..fb0200ab823
--- /dev/null
+++ b/data/Bravura/E260.xml
@@ -0,0 +1 @@
+<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -170c-8 10 -12 581 -12 581c1 18 17 28 31 28c10 0 19 -6 19 -17c0 -20 -6 -260 -7 -282c0 -7 4 -14 11 -17c2 -1 3 -1 5 -1c5 0 16 9 22 14c14 9 38 17 55 17c46 -3 90 -39 90 -96c0 -46 -31 -107 -120 -169c-25 -17 -49 -44 -79 -61c0 0 -3 -2 -6 -2s-6 1 -9 5z M46 51c-1 -4 -2 -16 -2 -32c0 -40 3 -100 3 -100c0 -5 2 -15 11 -15c3 0 6 1 10 3c43 27 89 81 89 135c0 25 -12 58 -41 58c-23 0 -63 -29 -70 -49z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E261.xml b/data/Bravura/E261.xml
new file mode 100644
index 00000000000..1995a83789a
--- /dev/null
+++ b/data/Bravura/E261.xml
@@ -0,0 +1 @@
+<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -186v515c0 7 5 12 12 12h13c6 0 12 -5 12 -12v-167c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-502c0 -7 -6 -12 -12 -12h-13c-7 0 -12 5 -12 12v149c0 8 -7 11 -17 11c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2c-5 0 -8 3 -8 9z M122 79c-24 0 -85 -26 -85 -40v-103c0 -4 5 -6 12 -6c25 0 82 23 82 41v103c0 4 -3 5 -9 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E262.xml b/data/Bravura/E262.xml
new file mode 100644
index 00000000000..95bb9f1b2d0
--- /dev/null
+++ b/data/Bravura/E262.xml
@@ -0,0 +1 @@
+<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 26c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1 c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18 c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18 c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11zM77 -30c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38c-2 -8 -3 -43 -3 -74z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E263.xml b/data/Bravura/E263.xml
new file mode 100644
index 00000000000..a065aa25d25
--- /dev/null
+++ b/data/Bravura/E263.xml
@@ -0,0 +1 @@
+<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -77c0 18 2 35 5 38c6 5 25 7 43 7h10c14 5 46 21 46 34c0 7 -36 27 -47 33c-3 0 -6 -1 -10 -1c-17 0 -35 4 -42 10c-3 3 -5 21 -5 39s2 35 5 37c6 5 24 7 41 7c16 0 32 -2 36 -7c5 -4 8 -22 8 -39c4 -14 20 -47 34 -47c12 0 28 36 33 47c0 18 1 36 5 39c5 5 23 7 41 7 c41 0 44 -6 44 -47c0 -16 -2 -31 -7 -36c-7 -6 -22 -10 -38 -10c-4 0 -8 1 -12 1c-14 -5 -47 -20 -47 -34c0 -7 36 -27 47 -33h10c17 0 35 -2 40 -7c4 -5 7 -23 7 -40c0 -36 -7 -46 -45 -46c-17 0 -33 4 -40 10c-4 3 -5 20 -5 38c-4 14 -21 46 -34 46s-25 -28 -31 -42 c-1 -1 -2 -3 -2 -4c0 -16 -2 -33 -8 -38c-6 -7 -22 -10 -37 -10c-17 0 -33 4 -40 10c-3 2 -5 20 -5 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E264.xml b/data/Bravura/E264.xml
new file mode 100644
index 00000000000..6e8b6512bc4
--- /dev/null
+++ b/data/Bravura/E264.xml
@@ -0,0 +1 @@
+<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -170c-7 9 -12 581 -12 581c1 17 17 26 31 26c10 0 19 -5 19 -16c0 -19 -7 -260 -7 -281c0 -8 4 -15 11 -17c2 -1 3 -1 5 -1c9 0 16 9 24 13c16 9 28 16 47 16h6c19 0 36 -6 51 -16c-2 139 -3 276 -3 276c2 17 18 26 31 26c10 0 19 -5 19 -16c0 -19 -6 -260 -6 -281 c0 -8 3 -15 10 -17c1 -1 3 -1 5 -1c9 0 17 9 24 13c16 9 29 16 47 16h6c47 -1 91 -38 91 -94c0 -46 -32 -107 -122 -170c-23 -16 -47 -44 -78 -60c0 0 -3 -2 -6 -2c-2 0 -5 1 -8 5c-3 3 -5 60 -7 135c-19 -24 -47 -51 -84 -77c-23 -17 -48 -45 -79 -61c0 0 -3 -2 -6 -2 s-6 1 -9 5zM46 50c-1 -4 -2 -16 -2 -32c0 -39 3 -98 3 -98c0 -6 3 -16 11 -16c2 0 6 1 9 3c45 28 90 78 90 134c0 25 -10 59 -40 59c-24 0 -65 -30 -71 -50zM228 27c0 -38 3 -107 3 -107c0 -6 3 -16 11 -16c2 0 5 1 9 3c45 28 89 78 89 134c0 20 -6 37 -15 49 c-6 7 -14 10 -24 10c-24 0 -66 -30 -72 -50c-1 -3 -1 -12 -1 -23z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E265.xml b/data/Bravura/E265.xml
new file mode 100644
index 00000000000..cfca0e3a0ce
--- /dev/null
+++ b/data/Bravura/E265.xml
@@ -0,0 +1 @@
+<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 35v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71 c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25 c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1 c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9zM271 -115c-3 2 -5 20 -5 38s2 35 5 38c6 5 25 7 43 7h10c14 5 46 21 46 34c0 7 -36 27 -47 33c-3 0 -6 -1 -10 -1c-17 0 -35 4 -42 10c-3 3 -5 21 -5 39s2 35 5 37c6 5 24 7 41 7c16 0 32 -2 36 -7c5 -4 8 -22 8 -39 c4 -14 20 -47 34 -47c12 0 28 36 33 47c0 18 1 36 5 39c5 5 23 7 41 7c41 0 44 -6 44 -47c0 -16 -2 -31 -7 -36c-7 -6 -22 -10 -38 -10c-4 0 -8 1 -12 1c-14 -5 -47 -20 -47 -34c0 -7 36 -27 47 -33h10c17 0 35 -2 40 -7c4 -5 7 -23 7 -40c0 -36 -7 -46 -45 -46 c-17 0 -33 4 -40 10c-4 3 -5 20 -5 38c-4 14 -21 46 -34 46s-25 -28 -31 -42c-1 -1 -2 -3 -2 -4c0 -16 -2 -33 -8 -38c-6 -7 -22 -10 -37 -10c-17 0 -33 4 -40 10zM80 44c-2 -8 -3 -43 -3 -74c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64 s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E266.xml b/data/Bravura/E266.xml
new file mode 100644
index 00000000000..105d5a48bed
--- /dev/null
+++ b/data/Bravura/E266.xml
@@ -0,0 +1 @@
+<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 411c1 17 17 26 31 26c10 0 19 -5 19 -16c0 -19 -7 -260 -7 -281c0 -8 4 -15 11 -17c2 -1 3 -1 5 -1c9 0 16 9 24 13c16 9 28 16 47 16h6c19 0 36 -6 51 -16c-2 139 -3 276 -3 276c2 17 18 26 31 26c10 0 19 -5 19 -16c0 -19 -6 -260 -6 -281c0 -8 3 -15 10 -17 c1 -1 3 -1 5 -1c9 0 17 9 24 13c16 9 29 16 47 16h6c19 0 38 -7 53 -18c-2 141 -3 278 -3 278c1 18 17 28 31 28c10 0 19 -6 19 -17c0 -20 -6 -260 -7 -282c0 -7 4 -14 11 -17c2 -1 3 -1 5 -1c5 0 16 9 22 14c14 9 38 17 55 17c46 -3 90 -39 90 -96 c0 -46 -31 -107 -120 -169c-25 -17 -49 -44 -79 -61c0 0 -3 -2 -6 -2s-6 1 -9 5c-2 3 -5 60 -6 137c-20 -26 -48 -53 -87 -80c-23 -16 -47 -44 -78 -60c0 0 -3 -2 -6 -2c-2 0 -5 1 -8 5c-3 3 -5 60 -7 135c-19 -24 -47 -51 -84 -77c-23 -17 -48 -45 -79 -61c0 0 -3 -2 -6 -2 s-6 1 -9 5c-7 9 -12 581 -12 581zM44 18c0 -39 3 -98 3 -98c0 -6 3 -16 11 -16c2 0 6 1 9 3c45 28 90 78 90 134c0 25 -10 59 -40 59c-24 0 -65 -30 -71 -50c-1 -4 -2 -16 -2 -32zM416 51c-1 -4 -2 -16 -2 -32c0 -40 3 -100 3 -100c0 -5 2 -15 11 -15c3 0 6 1 10 3 c43 27 89 81 89 135c0 25 -12 58 -41 58c-23 0 -63 -29 -70 -49zM229 50c-1 -3 -1 -12 -1 -23c0 -38 3 -107 3 -107c0 -6 3 -16 11 -16c2 0 5 1 9 3c45 28 89 78 89 134c0 20 -6 37 -15 49c-6 7 -14 10 -24 10c-24 0 -66 -30 -72 -50z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E267.xml b/data/Bravura/E267.xml
new file mode 100644
index 00000000000..4cd0049c5a6
--- /dev/null
+++ b/data/Bravura/E267.xml
@@ -0,0 +1 @@
+<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -195c-5 0 -8 3 -8 9v515c0 7 5 12 12 12h13c6 0 12 -5 12 -12v-167c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-502c0 -7 -6 -12 -12 -12h-13c-7 0 -12 5 -12 12v149c0 8 -7 11 -17 11c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2z M245 -170c-8 10 -12 581 -12 581c1 18 17 28 31 28c10 0 19 -6 19 -17c0 -20 -6 -260 -7 -282c0 -7 4 -14 11 -17c2 -1 3 -1 5 -1c5 0 16 9 22 14c14 9 38 17 55 17c46 -3 90 -39 90 -96c0 -46 -31 -107 -120 -169c-25 -17 -49 -44 -79 -61c0 0 -3 -2 -6 -2s-6 1 -9 5z M277 19c0 -40 3 -100 3 -100c0 -5 2 -15 11 -15c3 0 6 1 10 3c43 27 89 81 89 135c0 25 -12 58 -41 58c-23 0 -63 -29 -70 -49c-1 -4 -2 -16 -2 -32zM37 39v-103c0 -4 5 -6 12 -6c25 0 82 23 82 41v103c0 4 -3 5 -9 5c-24 0 -85 -26 -85 -40z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E268.xml b/data/Bravura/E268.xml
new file mode 100644
index 00000000000..dcfd8ec246c
--- /dev/null
+++ b/data/Bravura/E268.xml
@@ -0,0 +1 @@
+<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 106c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71 c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25 c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1 c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71zM0 -186v515c0 7 5 12 12 12h13c6 0 12 -5 12 -12v-167c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-502c0 -7 -6 -12 -12 -12h-13c-7 0 -12 5 -12 12v149c0 8 -7 11 -17 11 c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2c-5 0 -8 3 -8 9zM312 44c-2 -8 -3 -43 -3 -74c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38zM37 39v-103c0 -4 5 -6 12 -6c25 0 82 23 82 41v103 c0 4 -3 5 -9 5c-24 0 -85 -26 -85 -40z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E269.xml b/data/Bravura/E269.xml
new file mode 100644
index 00000000000..93489e36c81
--- /dev/null
+++ b/data/Bravura/E269.xml
@@ -0,0 +1 @@
+<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 26c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1 c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18 c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18 c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11zM270 106c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13 c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11 v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99 c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71zM350 44c-2 -8 -3 -43 -3 -74c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38zM77 -30c0 -24 1 -46 3 -50 c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38c-2 -8 -3 -43 -3 -74z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E26A.xml b/data/Bravura/E26A.xml
new file mode 100644
index 00000000000..5fdc48f968e
--- /dev/null
+++ b/data/Bravura/E26A.xml
@@ -0,0 +1 @@
+<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M138 -248c-96 61 -138 148 -138 248c0 97 42 195 140 247c1 0 1 -1 1 -3v-14c0 -3 -1 -4 -2 -5c-56 -51 -79 -115 -79 -225c0 -111 22 -176 79 -227c1 -1 2 -2 2 -4v-15c0 -1 -2 -2 -3 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E26B.xml b/data/Bravura/E26B.xml
new file mode 100644
index 00000000000..ba21df9adc7
--- /dev/null
+++ b/data/Bravura/E26B.xml
@@ -0,0 +1 @@
+<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 230v14c0 2 0 3 1 3c98 -52 140 -150 140 -247c0 -100 -42 -187 -138 -248c-1 0 -3 1 -3 2v15c0 2 1 3 2 4c57 51 79 116 79 227c0 110 -23 174 -79 225c-1 1 -2 2 -2 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E26C.xml b/data/Bravura/E26C.xml
new file mode 100644
index 00000000000..11c3255d0f9
--- /dev/null
+++ b/data/Bravura/E26C.xml
@@ -0,0 +1 @@
+<symbol id="E26C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 186c0 1 1 2 2 2h73c1 0 2 -2 2 -3v-16c0 -1 -1 -3 -2 -3h-43v-332h43c1 0 2 -1 2 -3v-15c0 -1 -1 -3 -2 -3h-73c-1 0 -2 1 -2 2v371z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E26D.xml b/data/Bravura/E26D.xml
new file mode 100644
index 00000000000..b17eec2af98
--- /dev/null
+++ b/data/Bravura/E26D.xml
@@ -0,0 +1 @@
+<symbol id="E26D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -184v15c0 2 1 3 2 3h43v332h-43c-1 0 -2 2 -2 3v16c0 1 1 3 2 3h73c1 0 2 -1 2 -2v-371c0 -1 -1 -2 -2 -2h-73c-1 0 -2 2 -2 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E270.xml b/data/Bravura/E270.xml
new file mode 100644
index 00000000000..84960e562d7
--- /dev/null
+++ b/data/Bravura/E270.xml
@@ -0,0 +1 @@
+<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-42 381l90 198l89 -198h-65c-2 -73 -5 -227 -6 -244c0 -8 4 -15 10 -17c2 -1 3 -1 5 -1c8 0 15 9 23 14c17 11 35 16 54 16c47 -2 90 -39 90 -94c0 -47 -32 -107 -121 -169c-23 -17 -48 -44 -78 -61c0 0 -3 -2 -6 -2c-2 0 -5 1 -8 5c-7 8 -11 441 -12 553h-65zM68 48 c-1 -4 -1 -14 -1 -27c0 -39 3 -104 3 -104c0 -6 1 -15 9 -15c3 0 6 1 10 3c46 29 89 78 89 135c0 25 -11 57 -40 57c-24 0 -64 -28 -70 -49z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E271.xml b/data/Bravura/E271.xml
new file mode 100644
index 00000000000..187d02bf2e6
--- /dev/null
+++ b/data/Bravura/E271.xml
@@ -0,0 +1 @@
+<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-39 -215h71c-5 128 -11 629 -11 629c1 18 17 28 31 28c11 0 20 -6 20 -17c0 -20 -6 -266 -7 -288c0 -8 4 -14 11 -16c2 -1 4 -1 6 -1c5 0 16 8 23 13c10 6 21 10 31 14c1 0 2 1 3 1c7 1 13 2 20 2c47 -2 92 -38 92 -96c0 -48 -32 -110 -123 -173c-10 -7 -17 -15 -30 -25 c-26 -21 -28 -49 -29 -71h76l-92 -203zM66 13c0 -40 3 -101 3 -101c0 -5 2 -14 11 -14c3 0 6 1 10 3c32 19 60 51 74 75c11 22 16 43 16 62c0 20 -6 37 -15 48c-7 7 -16 11 -26 11c-24 0 -65 -30 -71 -51c-1 -4 -2 -17 -2 -33z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E272.xml b/data/Bravura/E272.xml
new file mode 100644
index 00000000000..d4c99d6f066
--- /dev/null
+++ b/data/Bravura/E272.xml
@@ -0,0 +1 @@
+<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M44 348h-70l91 199l90 -199h-74v-191c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-502c0 -7 -6 -12 -12 -12h-13c-7 0 -12 5 -12 12v149c0 8 -7 11 -17 11c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2c-5 0 -8 3 -8 9v539zM81 -69 c0 -4 5 -6 12 -6c25 0 82 23 82 41v103c0 4 -3 5 -9 5c-24 0 -85 -26 -85 -40v-103z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E273.xml b/data/Bravura/E273.xml
new file mode 100644
index 00000000000..1524e27d141
--- /dev/null
+++ b/data/Bravura/E273.xml
@@ -0,0 +1 @@
+<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 324c0 7 5 12 12 12h13c6 0 12 -5 12 -12v-167c0 -4 4 -5 10 -5c26 0 90 23 90 23c1 0 2 1 4 1l15 5c1 1 3 1 4 1c4 0 8 -3 8 -8v-503h79l-97 -214l-97 214h78v150c0 8 -7 11 -17 11c-29 0 -85 -24 -99 -30c-1 -1 -6 -2 -7 -2c-5 0 -8 3 -8 9v515zM40 34v-103 c0 -4 5 -6 12 -6c25 0 82 23 82 41v103c0 4 -3 5 -9 5c-24 0 -85 -26 -85 -40z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E274.xml b/data/Bravura/E274.xml
new file mode 100644
index 00000000000..d95265d905b
--- /dev/null
+++ b/data/Bravura/E274.xml
@@ -0,0 +1 @@
+<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 107c0 6 5 14 12 17c0 0 20 7 26 10s12 13 12 27v135c0 7 6 11 16 11c7 0 14 -4 14 -11v-119c0 -9 3 -21 12 -21c17 4 51 18 63 25c9 6 12 19 13 29v116h-78l92 204l93 -204h-77v-108c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71 c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25 c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 12c6 2 11 11 11 22v99c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1 c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71zM80 45c-2 -8 -3 -43 -3 -74c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 53 -4 58c-2 4 -7 5 -14 5c-25 0 -72 -21 -74 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E275.xml b/data/Bravura/E275.xml
new file mode 100644
index 00000000000..04ad6ae645a
--- /dev/null
+++ b/data/Bravura/E275.xml
@@ -0,0 +1 @@
+<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-28 -330h78v115c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 12c6 2 11 11 11 22v99c0 8 -6 18 -13 18c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71c0 6 5 14 12 17 c0 0 20 7 26 10s12 13 12 27v135c0 7 6 11 16 11c7 0 14 -4 14 -11v-119c0 -9 3 -21 12 -21c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10 c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-130h77 l-91 -205zM77 -31c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 53 -4 58c-2 4 -7 5 -14 5c-25 0 -72 -21 -74 -38c-2 -8 -3 -43 -3 -74z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E280.xml b/data/Bravura/E280.xml
new file mode 100644
index 00000000000..71e35bba405
--- /dev/null
+++ b/data/Bravura/E280.xml
@@ -0,0 +1 @@
+<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M121 -112c-89 62 -120 123 -120 171c0 55 44 91 90 94c17 0 41 -8 55 -17c6 -5 17 -14 22 -14c2 0 3 0 5 1c7 3 11 10 11 17c-1 22 -7 262 -7 282c0 11 9 17 19 17c14 0 30 -10 31 -28c0 0 -4 -571 -12 -581c-3 -4 -6 -5 -9 -5s-6 2 -6 2c-30 17 -54 44 -79 61zM70 42 c0 -54 46 -108 89 -135c4 -2 7 -3 10 -3c9 0 11 10 11 15c0 0 3 60 3 100c0 16 -1 28 -2 32c-7 20 -47 49 -70 49c-29 0 -41 -33 -41 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E281.xml b/data/Bravura/E281.xml
new file mode 100644
index 00000000000..feb9dddb400
--- /dev/null
+++ b/data/Bravura/E281.xml
@@ -0,0 +1 @@
+<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M252 -170c-8 10 -12 581 -12 581c1 18 18 28 32 28c10 0 19 -5 19 -17l-8 -282c0 -8 4 -15 11 -17c2 -1 3 -1 5 -1c8 0 15 9 23 14c11 7 22 11 34 15c7 1 13 2 20 2c45 -2 90 -39 90 -95c0 -47 -32 -108 -121 -170c-23 -17 -48 -45 -78 -61c0 0 -3 -2 -6 -2s-6 1 -9 5z M123 -113c-90 63 -122 124 -122 171c0 55 44 93 91 95c7 0 13 -1 20 -2c1 0 2 -1 3 -1c10 -4 21 -8 31 -14c8 -5 15 -14 23 -14c2 0 3 0 5 1c7 2 11 9 11 17l-8 282c0 11 9 16 19 16c14 0 31 -9 32 -27c0 0 -5 -571 -13 -581c-3 -4 -7 -5 -9 -5c-3 0 -5 2 -5 2 c-31 16 -55 44 -78 60zM71 42c0 -56 44 -106 89 -135c4 -2 7 -3 10 -3c9 0 11 10 11 16c0 0 3 59 3 98c0 16 -1 28 -2 32c-4 14 -30 35 -44 43c-10 5 -18 7 -26 7c-10 0 -19 -4 -26 -11c-9 -11 -15 -28 -15 -47zM284 18c0 -39 3 -98 3 -98c0 -6 3 -16 11 -16c3 0 5 1 9 3 c46 30 89 77 89 135c0 25 -9 58 -39 58c-24 0 -65 -29 -71 -50c-1 -4 -2 -16 -2 -32z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E282.xml b/data/Bravura/E282.xml
new file mode 100644
index 00000000000..bf1ae8a82cf
--- /dev/null
+++ b/data/Bravura/E282.xml
@@ -0,0 +1 @@
+<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -219c-5 0 -8 3 -8 9v71c0 6 6 14 12 16l52 22c6 2 10 11 10 22v100c0 8 -6 17 -12 17c-1 0 -2 -1 -3 -1c-8 -3 -47 -20 -47 -20c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 6 14 12 16c17 7 33 15 51 22c7 6 10 18 10 26v130c0 8 2 17 17 17c8 0 14 -5 14 -11v-120 c0 -9 4 -20 13 -20c2 0 50 18 50 18c1 1 3 1 4 1c4 0 8 -3 8 -8v-71c0 -7 -6 -14 -12 -17c0 0 -42 -16 -51 -20c-8 -3 -13 -21 -13 -29v-93c0 -11 7 -17 14 -17c4 1 50 20 50 20v-1c1 0 3 1 4 1c5 0 8 -3 8 -9v-71c0 -6 -6 -14 -12 -16c0 0 -45 -18 -53 -20 c-4 -2 -8 -8 -9 -14c-1 -3 -1 -5 -1 -8v-138c0 -10 -2 -17 -17 -17c-8 0 -14 5 -14 11v125c0 8 -9 21 -14 19c-6 -3 -47 -21 -51 -21z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E283.xml b/data/Bravura/E283.xml
new file mode 100644
index 00000000000..d47a066decf
--- /dev/null
+++ b/data/Bravura/E283.xml
@@ -0,0 +1 @@
+<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -209c-4 0 -7 4 -7 8v78c0 4 3 6 8 8l29 11c5 2 10 9 10 17v116c0 6 -1 10 -6 10c-1 0 -2 0 -4 -1c-8 -4 -29 -11 -31 -11c-3 0 -6 4 -6 8v77c0 4 3 6 8 8l31 12c5 2 8 5 8 15v145c0 13 3 16 16 16s16 -3 16 -16v-133c0 -6 3 -9 7 -9c1 0 2 1 3 1l43 16c7 3 9 9 9 16 v139c0 13 3 16 16 16s16 -2 16 -16v-127c0 -5 2 -9 10 -9c13 6 36 14 40 16c6 2 8 6 8 19v132c0 13 3 16 16 16s16 -2 16 -16v-127c0 -5 2 -7 4 -7c1 0 2 0 3 1c5 2 36 13 38 13c4 0 6 -4 6 -8v-77c0 -4 -3 -7 -8 -8c0 0 -33 -13 -37 -14c-5 -2 -6 -6 -6 -13v-117 c0 -11 3 -11 11 -11c6 3 32 13 34 13c4 0 6 -5 6 -8v-78c0 -4 -3 -6 -8 -8l-35 -13c-3 -1 -8 -6 -8 -12v-148c0 -13 -3 -16 -16 -16s-16 2 -16 16v134c0 5 -2 8 -6 8c-2 0 -4 -1 -6 -2l-36 -13c-6 -2 -10 -8 -10 -16v-142c0 -13 -3 -16 -16 -16s-16 2 -16 16v131 c0 6 -2 8 -8 8l-48 -19c-4 -1 -6 -7 -6 -13v-138c0 -13 -3 -16 -16 -16s-16 3 -16 16v124c0 6 -2 9 -7 9c-2 0 -4 0 -6 -1c-9 -3 -26 -10 -27 -10zM79 -33c0 -27 0 -51 3 -55c1 -1 3 -2 6 -2c15 0 53 15 56 25c2 6 3 45 3 80c0 31 -1 59 -3 62c-1 1 -2 2 -5 2 c-14 0 -54 -16 -57 -25c-2 -7 -3 -50 -3 -87zM176 13c0 -32 1 -62 3 -65c1 -1 3 -2 6 -2c14 0 46 15 49 23c2 5 3 48 3 85c0 29 -1 55 -3 58c0 0 -2 1 -3 1c-12 0 -48 -15 -52 -23c-2 -5 -3 -42 -3 -77z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E440.xml b/data/Bravura/E440.xml
new file mode 100644
index 00000000000..9cb9245a91c
--- /dev/null
+++ b/data/Bravura/E440.xml
@@ -0,0 +1 @@
+<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 333c0 4 3 7 10 8c0 0 42 16 45 18c5 1 6 6 6 8v43c1 18 17 28 31 28c10 0 19 -5 19 -16c0 -4 -1 -16 -1 -35c0 -2 2 -5 7 -5c3 1 136 50 139 50c5 0 6 -4 6 -8v-49c0 -4 -3 -8 -9 -10c0 0 -134 -49 -138 -51s-7 -5 -7 -11s0 -19 -1 -28c0 -2 5 -5 6 -5 c4 2 140 52 143 52c5 0 6 -4 6 -8v-48c0 -5 -3 -9 -9 -11c0 0 -134 -49 -141 -52c-7 -2 -7 -12 -7 -16c-1 -23 -1 -41 -1 -46c0 -8 4 -15 11 -18c1 0 2 -1 3 -1c9 0 17 10 25 14c15 9 36 17 53 17c46 -3 90 -38 90 -95c0 -47 -32 -107 -120 -169c-23 -17 -48 -45 -78 -61 c0 0 -3 -2 -6 -2s-6 1 -9 6c-4 4 -8 184 -10 342c0 4 -2 8 -9 8c-6 -3 -44 -18 -46 -18c-6 0 -8 4 -8 8v51c0 5 3 7 10 7c0 0 42 17 46 19c5 2 6 4 6 12c-1 7 -1 16 -1 25c0 2 -2 5 -7 5c-2 -1 -45 -17 -47 -17c-5 0 -7 4 -7 8v51zM107 51c-1 -4 -1 -14 -1 -27 c0 -39 3 -103 3 -103c0 -6 3 -16 11 -16c2 0 5 1 9 3c45 27 89 80 89 135c0 20 -6 36 -15 47c-7 7 -16 10 -26 10c-8 0 -16 -2 -25 -6c-15 -8 -41 -30 -45 -43z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E441.xml b/data/Bravura/E441.xml
new file mode 100644
index 00000000000..0e103eb2a0a
--- /dev/null
+++ b/data/Bravura/E441.xml
@@ -0,0 +1 @@
+<symbol id="E441" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -170c-8 10 -12 581 -12 581c1 18 17 28 31 28c10 0 19 -6 19 -17c0 -20 -6 -260 -7 -282c0 -7 4 -14 11 -17c2 -1 3 -1 5 -1c5 0 16 9 22 14c14 9 38 17 55 17c46 -3 90 -39 90 -96c0 -46 -31 -107 -120 -169c-25 -17 -49 -44 -79 -61c0 0 -3 -2 -6 -2s-6 1 -9 5z M46 51c-1 -4 -2 -16 -2 -32c0 -40 3 -100 3 -100c0 -5 2 -15 11 -15c3 0 6 1 10 3c43 27 89 81 89 135c0 25 -12 58 -41 58c-23 0 -63 -29 -70 -49z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E442.xml b/data/Bravura/E442.xml
new file mode 100644
index 00000000000..e65ebc48951
--- /dev/null
+++ b/data/Bravura/E442.xml
@@ -0,0 +1 @@
+<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 172v50c0 5 3 7 9 8l45 17c8 3 8 12 8 15c-1 86 -1 149 -1 149c1 18 17 28 30 28c10 0 19 -6 19 -17c0 -10 -2 -79 -3 -145c0 -3 1 -6 6 -6c4 2 140 52 140 52c1 1 3 1 4 1c5 0 6 -6 6 -9v-48c0 -4 -3 -8 -10 -10c0 0 -139 -54 -142 -55s-6 -3 -6 -10 c0 -6 -2 -46 -2 -52c0 -7 4 -14 11 -16c2 -1 4 -1 6 -1c4 0 15 8 22 13c13 7 24 11 36 14c6 2 13 3 19 3c46 -3 90 -38 90 -95c0 -46 -31 -108 -120 -170c-25 -17 -50 -45 -80 -61c0 0 -3 -2 -6 -2c-2 0 -5 1 -8 5c-5 6 -8 191 -10 349c0 2 -2 4 -6 4c-2 -2 -48 -19 -50 -19 c-5 0 -7 4 -7 8zM103 19c0 -40 3 -100 3 -100c0 -6 2 -15 10 -15c3 0 6 1 10 3c47 26 91 80 91 136c0 26 -10 57 -40 57c-25 0 -65 -27 -72 -49c-1 -4 -2 -16 -2 -32z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E443.xml b/data/Bravura/E443.xml
new file mode 100644
index 00000000000..0ba9d08c755
--- /dev/null
+++ b/data/Bravura/E443.xml
@@ -0,0 +1 @@
+<symbol id="E443" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M121 -112c-89 62 -120 123 -120 171c0 55 44 91 90 94c17 0 41 -8 55 -17c6 -5 17 -14 22 -14c2 0 3 0 5 1c7 3 11 10 11 17c-1 22 -7 262 -7 282c0 11 9 17 19 17c14 0 30 -10 31 -28c0 0 -4 -571 -12 -581c-3 -4 -6 -5 -9 -5s-6 2 -6 2c-30 17 -54 44 -79 61zM70 42 c0 -54 46 -108 89 -135c4 -2 7 -3 10 -3c9 0 11 10 11 15c0 0 3 60 3 100c0 16 -1 28 -2 32c-7 20 -47 49 -70 49c-29 0 -41 -33 -41 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E444.xml b/data/Bravura/E444.xml
new file mode 100644
index 00000000000..9c240b5d028
--- /dev/null
+++ b/data/Bravura/E444.xml
@@ -0,0 +1 @@
+<symbol id="E444" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 27c-4 0 -7 3 -7 8v71c0 7 5 14 12 17c19 0 52 18 73 26c7 7 10 18 11 27v130c0 8 1 16 17 16c7 0 13 -5 13 -11v-120c0 -8 4 -20 13 -20c2 1 78 29 78 29c2 1 4 1 5 1c5 0 7 -3 7 -8v-71c0 -7 -5 -14 -12 -17l-78 -30c-8 -3 -13 -11 -13 -29v-93c0 -12 1 -19 8 -19 c1 0 3 0 5 1l78 30c2 1 4 1 5 1c5 0 7 -3 7 -8v-71c0 -7 -5 -14 -12 -17c0 0 -73 -28 -80 -31c-5 -2 -8 -8 -10 -14c-1 -2 -1 -4 -1 -7v-139c0 -9 -2 -16 -17 -16c-7 0 -13 5 -13 11v134c0 10 0 11 -8 11c-7 -2 -76 -30 -76 -30c-2 -1 -3 -1 -5 -1c-4 0 -7 3 -7 8v71 c0 7 5 14 12 17c0 0 68 28 74 30c6 3 10 12 10 23v99c0 8 0 20 -7 20l-77 -28c-2 -1 -3 -1 -5 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E445.xml b/data/Bravura/E445.xml
new file mode 100644
index 00000000000..28cc00babd1
--- /dev/null
+++ b/data/Bravura/E445.xml
@@ -0,0 +1 @@
+<symbol id="E445" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 26c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1 c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-8 -3 -13 -22 -13 -29v-93c0 -12 7 -18 13 -18l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18 c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 21 9 27 11c6 3 11 12 11 23v99c0 8 -6 18 -13 18 c-1 0 -2 -1 -3 -1c-3 -2 -22 -11 -26 -11zM77 -30c0 -24 1 -46 3 -50c1 -3 6 -5 12 -5c23 0 70 20 76 40c2 9 4 37 4 64s-2 52 -4 57c-2 4 -8 6 -15 6c-25 0 -71 -21 -73 -38c-2 -8 -3 -43 -3 -74z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E446.xml b/data/Bravura/E446.xml
new file mode 100644
index 00000000000..3ff4c9c37b0
--- /dev/null
+++ b/data/Bravura/E446.xml
@@ -0,0 +1 @@
+<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 -31c0 6 4 9 12 11c0 0 135 51 139 52c3 1 3 4 3 7v15c0 1 -1 2 -3 2c-1 0 -3 0 -4 -1l-77 -28c-2 -1 -3 -1 -5 -1c-4 0 -7 3 -7 8v71c0 7 5 14 12 17c19 0 52 18 73 26c7 7 10 18 11 27v130c0 8 1 16 17 16c7 0 13 -5 13 -11v-120c0 -8 4 -20 13 -20c2 1 78 29 78 29 c2 1 4 1 5 1c5 0 7 -3 7 -8v-71c0 -7 -5 -14 -12 -17l-86 -33c-4 -2 -5 -3 -5 -7v-15c0 -1 0 -3 3 -3c1 0 3 1 4 1c6 2 137 52 137 52v-1c1 0 3 2 4 2c7 0 8 -7 8 -12v-63c0 -6 -3 -10 -12 -13c0 0 -137 -52 -140 -53s-4 -2 -4 -6v-13c0 -5 3 -7 10 -7l81 31c2 1 4 1 5 1 c5 0 7 -3 7 -8v-71c0 -7 -5 -14 -12 -17c0 0 -73 -28 -80 -31c-5 -2 -8 -8 -10 -14c-1 -2 -1 -4 -1 -7v-139c0 -9 -2 -16 -17 -16c-7 0 -13 5 -13 11v134c0 10 0 11 -8 11c-7 -2 -76 -30 -76 -30c-2 -1 -3 -1 -5 -1c-4 0 -7 3 -7 8v71c0 7 5 14 12 17c0 0 71 29 77 32 c6 2 7 5 7 12v15c0 2 -1 3 -4 3l-141 -52c-6 0 -9 6 -9 11v65z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E447.xml b/data/Bravura/E447.xml
new file mode 100644
index 00000000000..8e1c521d568
--- /dev/null
+++ b/data/Bravura/E447.xml
@@ -0,0 +1 @@
+<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 -100c-6 0 -9 5 -9 10v66c0 6 5 8 12 10c0 0 75 28 77 29c3 1 3 3 3 5v15c0 2 -2 3 -4 3c-3 0 -7 -2 -11 -3c-3 -2 -22 -11 -26 -11c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 20 8 26 11s12 13 12 27v135c0 6 6 11 16 11c7 0 14 -5 14 -11v-120c0 -8 3 -20 12 -20 c17 4 51 18 63 25c9 6 12 19 13 29v130c0 6 6 11 16 11c8 0 14 -5 14 -11v-122c0 -8 7 -13 14 -13c5 1 25 9 25 9c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17l-26 -10c-12 -5 -14 -7 -14 -17c0 -1 1 -8 1 -13c0 -2 1 -3 3 -3c2 1 85 32 85 32v-1c1 0 3 2 4 2 c6 0 8 -7 8 -11v-63c0 -6 -4 -11 -12 -13l-85 -32c-3 -1 -3 -3 -3 -5v-10c0 -6 1 -9 4 -9c2 0 5 1 9 3l26 10c2 1 3 1 5 1c4 0 7 -3 7 -8v-71c0 -6 -5 -14 -12 -17c0 0 -21 -8 -28 -11s-11 -15 -11 -23v-142c0 -6 -6 -11 -17 -11c-7 0 -13 5 -13 11v125c0 6 -5 18 -13 18 c-1 0 -3 -1 -4 -1l-61 -25c-5 -2 -10 -9 -10 -22v-139c0 -6 -7 -11 -17 -11c-7 0 -13 5 -13 11v123c0 5 -5 16 -12 16c-1 0 -2 0 -3 -1c-9 -3 -23 -9 -23 -9c-1 0 -3 -1 -4 -1c-5 0 -8 3 -8 9v71c0 6 5 14 12 16c0 0 24 10 30 13c7 3 8 6 8 14v12c0 2 0 5 -3 5 c-1 0 -2 -1 -3 -1c-4 -2 -75 -28 -78 -28zM124 -58c-3 -1 -4 -2 -4 -6c1 -9 1 -16 3 -18c1 -1 2 -2 5 -2c18 0 81 25 84 39c1 4 1 9 1 16c0 1 -2 3 -3 3c-16 -6 -85 -32 -86 -32zM121 30c0 -1 2 -2 3 -2c1 1 73 28 87 33c2 1 2 3 2 4c-1 2 -1 8 -1 12s0 8 -3 8 c-27 0 -73 -23 -86 -35c-2 -2 -1 -15 -2 -20z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A0.xml b/data/Bravura/E4A0.xml
new file mode 100644
index 00000000000..fbddfea45f6
--- /dev/null
+++ b/data/Bravura/E4A0.xml
@@ -0,0 +1 @@
+<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 221c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z "/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A1.xml b/data/Bravura/E4A1.xml
new file mode 100644
index 00000000000..5c92d74c9fb
--- /dev/null
+++ b/data/Bravura/E4A1.xml
@@ -0,0 +1 @@
+<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -24c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z "/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A2.xml b/data/Bravura/E4A2.xml
new file mode 100644
index 00000000000..93a243e4ce5
--- /dev/null
+++ b/data/Bravura/E4A2.xml
@@ -0,0 +1 @@
+<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42 0c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A3.xml b/data/Bravura/E4A3.xml
new file mode 100644
index 00000000000..631b916659d
--- /dev/null
+++ b/data/Bravura/E4A3.xml
@@ -0,0 +1 @@
+<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42 -84c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A4.xml b/data/Bravura/E4A4.xml
new file mode 100644
index 00000000000..ef41b08d1f6
--- /dev/null
+++ b/data/Bravura/E4A4.xml
@@ -0,0 +1 @@
+<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 0c-24 0 -24 11 -24 24s0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A5.xml b/data/Bravura/E4A5.xml
new file mode 100644
index 00000000000..d2d48d212d6
--- /dev/null
+++ b/data/Bravura/E4A5.xml
@@ -0,0 +1 @@
+<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 -48c-24 0 -24 11 -24 24s0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A6.xml b/data/Bravura/E4A6.xml
new file mode 100644
index 00000000000..3c4b5698129
--- /dev/null
+++ b/data/Bravura/E4A6.xml
@@ -0,0 +1 @@
+<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 271c1 13 23 22 49 22c27 0 50 -8 50 -23c0 -23 -25 -272 -50 -272c-23 0 -49 258 -49 273z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A7.xml b/data/Bravura/E4A7.xml
new file mode 100644
index 00000000000..d6949e92740
--- /dev/null
+++ b/data/Bravura/E4A7.xml
@@ -0,0 +1 @@
+<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 -273c0 15 26 273 49 273c25 0 50 -249 50 -272c0 -15 -23 -23 -50 -23c-26 0 -48 9 -49 22z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A8.xml b/data/Bravura/E4A8.xml
new file mode 100644
index 00000000000..a7cd9748811
--- /dev/null
+++ b/data/Bravura/E4A8.xml
@@ -0,0 +1 @@
+<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 287c0 2 0 3 2 3c1 0 21 -4 42 -4c20 0 41 4 42 4c2 0 2 -2 2 -3c-17 -43 -35 -186 -37 -284c0 -3 -6 -3 -7 -3s-7 0 -7 3c-2 99 -20 242 -37 284z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4A9.xml b/data/Bravura/E4A9.xml
new file mode 100644
index 00000000000..c705104974e
--- /dev/null
+++ b/data/Bravura/E4A9.xml
@@ -0,0 +1 @@
+<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 -287c17 42 35 185 37 284c0 3 6 3 7 3s7 0 7 -3c2 -98 20 -241 37 -284c0 -1 0 -3 -2 -3c-1 0 -22 4 -42 4c-21 0 -41 -4 -42 -4c-2 0 -2 1 -2 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AA.xml b/data/Bravura/E4AA.xml
new file mode 100644
index 00000000000..7f8a0241ac7
--- /dev/null
+++ b/data/Bravura/E4AA.xml
@@ -0,0 +1 @@
+<symbol id="E4AA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 281c0 5 4 9 9 9h30c5 0 9 -4 9 -9v-272c0 -5 -4 -9 -9 -9h-30c-5 0 -9 4 -9 9v272z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AB.xml b/data/Bravura/E4AB.xml
new file mode 100644
index 00000000000..f4173bef9bf
--- /dev/null
+++ b/data/Bravura/E4AB.xml
@@ -0,0 +1 @@
+<symbol id="E4AB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -9c0 5 4 9 9 9h30c5 0 9 -4 9 -9v-272c0 -5 -4 -9 -9 -9h-30c-5 0 -9 4 -9 9v272z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AC.xml b/data/Bravura/E4AC.xml
new file mode 100644
index 00000000000..752cb5864df
--- /dev/null
+++ b/data/Bravura/E4AC.xml
@@ -0,0 +1 @@
+<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 11c0 2 0 3 1 5l106 231s3 6 10 6c4 0 7 -2 10 -6l108 -231c1 -1 1 -3 1 -5c0 -6 -4 -10 -11 -11h-68c-4 0 -8 2 -11 6c0 0 -56 119 -57 123c-2 2 -4 3 -6 3s-3 -1 -4 -3c-2 -4 -56 -123 -56 -123c-2 -5 -7 -7 -11 -7c-1 0 -4 0 -5 1c-5 1 -7 6 -7 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AD.xml b/data/Bravura/E4AD.xml
new file mode 100644
index 00000000000..76b90995038
--- /dev/null
+++ b/data/Bravura/E4AD.xml
@@ -0,0 +1 @@
+<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 -12c0 6 4 10 11 11h68c4 0 8 -2 11 -6c0 0 56 -119 57 -123c2 -2 4 -3 6 -3s3 1 4 3c2 4 56 123 56 123c2 5 7 7 11 7c1 0 4 0 5 -1c5 -1 7 -6 7 -11c0 -2 0 -3 -1 -5l-106 -231s-3 -6 -10 -6c-4 0 -7 2 -10 6l-108 231c-1 1 -1 3 -1 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AE.xml b/data/Bravura/E4AE.xml
new file mode 100644
index 00000000000..087921517b9
--- /dev/null
+++ b/data/Bravura/E4AE.xml
@@ -0,0 +1 @@
+<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 201c0 2 0 3 1 5l106 231s3 6 10 6c4 0 7 -2 10 -6l108 -231c1 -1 1 -3 1 -5c0 -6 -4 -10 -11 -11h-68c-4 0 -8 2 -11 6c0 0 -56 119 -57 123c-2 2 -4 3 -6 3s-3 -1 -4 -3c-2 -4 -56 -123 -56 -123c-2 -5 -7 -7 -11 -7c-1 0 -4 0 -5 1c-5 1 -7 6 -7 11zM76 42 c0 23 19 42 42 42s42 -19 42 -42s-19 -42 -42 -42s-42 19 -42 42z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4AF.xml b/data/Bravura/E4AF.xml
new file mode 100644
index 00000000000..4bc3c2582c1
--- /dev/null
+++ b/data/Bravura/E4AF.xml
@@ -0,0 +1 @@
+<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 -211c0 6 4 10 11 11h68c4 0 8 -2 11 -6c0 0 56 -119 57 -123c2 -2 4 -3 6 -3s3 1 4 3c2 4 56 123 56 123c2 5 7 7 11 7c1 0 4 0 5 -1c5 -1 7 -6 7 -11c0 -2 0 -3 -1 -5l-106 -231s-3 -6 -10 -6c-4 0 -7 2 -10 6l-108 231c-1 1 -1 3 -1 5zM116 -84 c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B0.xml b/data/Bravura/E4B0.xml
new file mode 100644
index 00000000000..af3973bc5de
--- /dev/null
+++ b/data/Bravura/E4B0.xml
@@ -0,0 +1 @@
+<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 191c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15z M171 0c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B1.xml b/data/Bravura/E4B1.xml
new file mode 100644
index 00000000000..c5f59135f9d
--- /dev/null
+++ b/data/Bravura/E4B1.xml
@@ -0,0 +1 @@
+<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 -396c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15z M170 -84c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B2.xml b/data/Bravura/E4B2.xml
new file mode 100644
index 00000000000..9af0c199517
--- /dev/null
+++ b/data/Bravura/E4B2.xml
@@ -0,0 +1 @@
+<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 216c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24zM172 0c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B3.xml b/data/Bravura/E4B3.xml
new file mode 100644
index 00000000000..54136f73eb6
--- /dev/null
+++ b/data/Bravura/E4B3.xml
@@ -0,0 +1 @@
+<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 -218c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24zM167 -84c-23 0 -42 19 -42 42s19 42 42 42s42 -19 42 -42s-19 -42 -42 -42z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B4.xml b/data/Bravura/E4B4.xml
new file mode 100644
index 00000000000..8a62f3bfe7a
--- /dev/null
+++ b/data/Bravura/E4B4.xml
@@ -0,0 +1 @@
+<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 321c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M-1 24c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B5.xml b/data/Bravura/E4B5.xml
new file mode 100644
index 00000000000..a61a2a9b0cc
--- /dev/null
+++ b/data/Bravura/E4B5.xml
@@ -0,0 +1 @@
+<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -125c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M-1 -24c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B6.xml b/data/Bravura/E4B6.xml
new file mode 100644
index 00000000000..908cda16b69
--- /dev/null
+++ b/data/Bravura/E4B6.xml
@@ -0,0 +1 @@
+<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 9c0 31 149 214 159 224c3 2 6 4 10 4c24 0 64 -40 64 -64c0 -4 -1 -7 -4 -10c-9 -10 -190 -158 -224 -158c-2 0 -3 0 -4 1c0 0 -1 2 -1 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B7.xml b/data/Bravura/E4B7.xml
new file mode 100644
index 00000000000..0068e03b19c
--- /dev/null
+++ b/data/Bravura/E4B7.xml
@@ -0,0 +1 @@
+<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 -230c-10 10 -159 192 -159 225c0 4 1 5 5 5c32 0 214 -150 224 -160c2 -3 3 -6 3 -10c0 -23 -40 -64 -63 -64c-4 0 -8 1 -10 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B8.xml b/data/Bravura/E4B8.xml
new file mode 100644
index 00000000000..0dd524674df
--- /dev/null
+++ b/data/Bravura/E4B8.xml
@@ -0,0 +1 @@
+<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M191 0c-105 0 -191 86 -191 191v16h32v-16c0 -88 72 -159 159 -159c88 0 159 71 159 159v16h32v-16c0 -105 -85 -191 -191 -191z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4B9.xml b/data/Bravura/E4B9.xml
new file mode 100644
index 00000000000..66858cb299d
--- /dev/null
+++ b/data/Bravura/E4B9.xml
@@ -0,0 +1 @@
+<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 -191c0 105 86 191 191 191s191 -86 191 -191v-16h-32v16c0 88 -71 159 -159 159s-159 -71 -159 -159v-16h-32v16z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4BA.xml b/data/Bravura/E4BA.xml
new file mode 100644
index 00000000000..b16370ab9fc
--- /dev/null
+++ b/data/Bravura/E4BA.xml
@@ -0,0 +1 @@
+<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 1c33 95 111 143 187 143c75 0 150 -47 179 -143h-5c-30 61 -102 92 -175 92s-147 -31 -182 -92h-4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4BB.xml b/data/Bravura/E4BB.xml
new file mode 100644
index 00000000000..57f20c1d050
--- /dev/null
+++ b/data/Bravura/E4BB.xml
@@ -0,0 +1 @@
+<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0h4c30 -61 102 -92 175 -92s147 31 182 92h4c-32 -95 -110 -143 -187 -143c-75 0 -149 47 -178 143z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4BC.xml b/data/Bravura/E4BC.xml
new file mode 100644
index 00000000000..4d3e3debd1f
--- /dev/null
+++ b/data/Bravura/E4BC.xml
@@ -0,0 +1 @@
+<symbol id="E4BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M60 174c-5 1 -7 6 -7 11c0 2 0 3 1 5l106 231s3 6 10 6c4 0 7 -2 10 -6l108 -231c1 -1 1 -3 1 -5c0 -6 -4 -10 -11 -11h-68c-4 0 -8 2 -11 6c0 0 -56 119 -57 123c-2 2 -4 3 -6 3s-3 -1 -4 -3c-2 -4 -56 -123 -56 -123c-2 -5 -7 -7 -11 -7c-1 0 -4 0 -5 1zM-1 24 c0 13 0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291c-24 0 -24 11 -24 24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4BD.xml b/data/Bravura/E4BD.xml
new file mode 100644
index 00000000000..e65edf006ab
--- /dev/null
+++ b/data/Bravura/E4BD.xml
@@ -0,0 +1 @@
+<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M52 -192c-1 1 -1 3 -1 5c0 6 4 10 11 11h68c4 0 8 -2 11 -6c0 0 56 -119 57 -123c2 -2 4 -3 6 -3s3 1 4 3c2 4 56 123 56 123c2 5 7 7 11 7c1 0 4 0 5 -1c5 -1 7 -6 7 -11c0 -2 0 -3 -1 -5l-106 -231s-3 -6 -10 -6c-4 0 -7 2 -10 6zM23 -48c-24 0 -24 11 -24 24 s0 24 24 24h291c24 0 24 -11 24 -24s-1 -24 -24 -24h-291z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C0.xml b/data/Bravura/E4C0.xml
new file mode 100644
index 00000000000..aae6f3184cc
--- /dev/null
+++ b/data/Bravura/E4C0.xml
@@ -0,0 +1 @@
+<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 10c0 3 0 7 1 11c61 306 268 308 300 308c29 0 238 -2 300 -308c1 -4 1 -7 1 -10c0 -10 -5 -14 -14 -14c-10 0 -14 7 -21 21c-1 1 -1 4 -2 7c-10 38 -53 196 -266 196c-206 0 -251 -153 -263 -194c-1 -4 -2 -8 -3 -9c-6 -14 -11 -21 -20 -21c-8 0 -13 3 -13 13zM249 52 c0 29 25 54 54 54c30 0 55 -25 55 -54c0 -30 -25 -55 -55 -55c-29 0 -54 25 -54 55z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C1.xml b/data/Bravura/E4C1.xml
new file mode 100644
index 00000000000..a78d255c783
--- /dev/null
+++ b/data/Bravura/E4C1.xml
@@ -0,0 +1 @@
+<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -24c-1 4 -1 8 -1 11c0 10 5 13 13 13c9 0 14 -7 20 -21c1 -1 2 -5 3 -9c12 -41 57 -194 263 -194c213 0 256 158 266 196c1 3 1 6 2 7c7 14 11 21 21 21c9 0 14 -4 14 -14c0 -3 0 -6 -1 -10c-62 -306 -271 -308 -300 -308c-32 0 -239 2 -300 308zM303 -109 c-29 0 -54 25 -54 54c0 30 25 55 54 55c30 0 55 -25 55 -55c0 -29 -25 -54 -55 -54z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C2.xml b/data/Bravura/E4C2.xml
new file mode 100644
index 00000000000..39c80df7850
--- /dev/null
+++ b/data/Bravura/E4C2.xml
@@ -0,0 +1 @@
+<symbol id="E4C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 0c0 0 -4 2 -4 5c0 1 0 2 2 4c61 59 348 440 356 440c14 0 310 -386 366 -440c2 -2 2 -4 2 -5c0 -3 -3 -4 -3 -4h-37s-6 1 -9 3c-38 33 -311 356 -319 356c-6 0 -275 -318 -317 -354c-5 -2 -6 -5 -9 -5h-28zM116 0c0 0 -3 1 -3 3c0 1 1 3 2 4c44 44 230 277 243 277 c11 0 202 -237 244 -277c1 -1 2 -3 2 -4c0 -2 -3 -3 -3 -3h-48s-5 1 -7 2c-28 24 -172 162 -188 162c-15 0 -155 -134 -186 -160c-4 -2 -5 -4 -7 -4h-49zM304 63c0 29 24 53 54 53c29 0 53 -24 53 -53c0 -30 -24 -54 -53 -54c-30 0 -54 24 -54 54z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C3.xml b/data/Bravura/E4C3.xml
new file mode 100644
index 00000000000..b81913fb196
--- /dev/null
+++ b/data/Bravura/E4C3.xml
@@ -0,0 +1 @@
+<symbol id="E4C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -5c0 3 4 5 4 5h28c3 0 4 -3 9 -5c42 -36 311 -354 317 -354c8 0 281 323 319 356c3 2 9 3 9 3h37s3 -1 3 -4c0 -1 0 -3 -2 -5c-56 -54 -352 -440 -366 -440c-8 0 -295 381 -356 440c-2 2 -2 3 -2 4zM115 -7c-1 1 -2 3 -2 4c0 2 3 3 3 3h49c2 0 3 -2 7 -4 c31 -26 171 -160 186 -160c16 0 160 138 188 162c2 1 7 2 7 2h48s3 -1 3 -3c0 -1 -1 -3 -2 -4c-42 -40 -233 -277 -244 -277c-13 0 -199 233 -243 277zM304 -63c0 30 24 54 54 54c29 0 53 -24 53 -54c0 -29 -24 -53 -53 -53c-30 0 -54 24 -54 53z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C4.xml b/data/Bravura/E4C4.xml
new file mode 100644
index 00000000000..1954b290a3d
--- /dev/null
+++ b/data/Bravura/E4C4.xml
@@ -0,0 +1 @@
+<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 0c0 0 -3 1 -3 3c0 1 1 3 2 4c46 45 274 334 300 334c27 0 257 -293 300 -334c1 -1 2 -3 2 -4c0 -2 -3 -3 -3 -3h-50s-5 1 -7 2c-29 25 -226 226 -242 226s-209 -197 -241 -224c-4 -2 -5 -4 -7 -4h-51zM246 65c0 29 25 54 55 54s55 -25 55 -54c0 -31 -25 -56 -55 -56 s-55 25 -55 56z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C5.xml b/data/Bravura/E4C5.xml
new file mode 100644
index 00000000000..a7a20e43e39
--- /dev/null
+++ b/data/Bravura/E4C5.xml
@@ -0,0 +1 @@
+<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -3c0 2 3 3 3 3h51c2 0 3 -2 7 -4c32 -27 225 -224 241 -224s213 201 242 226c2 1 7 2 7 2h50s3 -1 3 -3c0 -1 -1 -3 -2 -4c-43 -41 -273 -334 -300 -334c-26 0 -254 289 -300 334c-1 1 -2 3 -2 4zM246 -65c0 31 25 56 55 56s55 -25 55 -56c0 -29 -25 -54 -55 -54 s-55 25 -55 54z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C6.xml b/data/Bravura/E4C6.xml
new file mode 100644
index 00000000000..7ec4c8ed085
--- /dev/null
+++ b/data/Bravura/E4C6.xml
@@ -0,0 +1 @@
+<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 0c-13 0 -24 6 -24 13v293c0 15 22 27 50 27h503c28 0 50 -12 50 -27v-293c0 -7 -11 -13 -25 -13c-13 0 -24 6 -24 13v188c0 12 -127 18 -253 18s-252 -6 -252 -18v-188c0 -7 -11 -13 -25 -13zM301 -1c-30 0 -54 25 -54 55s24 54 54 54c31 0 55 -24 55 -54 s-24 -55 -55 -55z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C7.xml b/data/Bravura/E4C7.xml
new file mode 100644
index 00000000000..35ea9f08464
--- /dev/null
+++ b/data/Bravura/E4C7.xml
@@ -0,0 +1 @@
+<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -306v293c0 7 11 13 24 13c14 0 25 -6 25 -13v-188c0 -12 126 -18 252 -18s253 6 253 18v188c0 7 11 13 24 13c14 0 25 -6 25 -13v-293c0 -15 -22 -27 -50 -27h-503c-28 0 -50 12 -50 27zM247 -54c0 30 24 55 54 55c31 0 55 -25 55 -55s-24 -54 -55 -54 c-30 0 -54 24 -54 54z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C8.xml b/data/Bravura/E4C8.xml
new file mode 100644
index 00000000000..24dc8c894f9
--- /dev/null
+++ b/data/Bravura/E4C8.xml
@@ -0,0 +1 @@
+<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 379c0 16 24 29 53 29h609c29 0 53 -13 53 -29v-364c0 -8 -12 -14 -27 -14c-14 0 -25 6 -25 14v284c0 13 -153 19 -306 19s-305 -6 -305 -19v-284c0 -8 -11 -14 -26 -14c-14 0 -26 6 -26 14v364zM121 1c-14 0 -25 6 -25 14v226c0 16 23 29 53 29h417 c30 0 53 -13 53 -29v-226c0 -8 -11 -14 -26 -14c-14 0 -26 6 -26 14v136c0 12 -105 19 -210 19s-209 -7 -209 -19v-136c0 -8 -12 -14 -27 -14zM305 58c0 32 25 58 57 58c33 0 59 -26 59 -58c0 -31 -26 -58 -59 -58c-32 0 -57 27 -57 58z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4C9.xml b/data/Bravura/E4C9.xml
new file mode 100644
index 00000000000..cddd389c759
--- /dev/null
+++ b/data/Bravura/E4C9.xml
@@ -0,0 +1 @@
+<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M53 -408c-29 0 -53 13 -53 29v364c0 8 12 14 26 14c15 0 26 -6 26 -14v-284c0 -13 152 -19 305 -19s306 6 306 19v284c0 8 11 14 25 14c15 0 27 -6 27 -14v-364c0 -16 -24 -29 -53 -29h-609zM96 -241v226c0 8 11 14 25 14c15 0 27 -6 27 -14v-136c0 -12 104 -19 209 -19 s210 7 210 19v136c0 8 12 14 26 14c15 0 26 -6 26 -14v-226c0 -16 -23 -29 -53 -29h-417c-30 0 -53 13 -53 29zM305 -58c0 31 25 58 57 58c33 0 59 -27 59 -58c0 -32 -26 -58 -59 -58c-32 0 -57 26 -57 58z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4CE.xml b/data/Bravura/E4CE.xml
new file mode 100644
index 00000000000..2e8b2199538
--- /dev/null
+++ b/data/Bravura/E4CE.xml
@@ -0,0 +1 @@
+<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 188c0 35 28 63 71 63c46 0 80 -31 80 -78v-7c0 -29 -6 -64 -26 -95c-16 -25 -67 -69 -100 -69c-3 0 -6 2 -7 8c0 1 -1 2 -1 3c0 5 4 7 8 9c2 2 28 17 45 39c9 12 16 25 16 39c0 4 -1 7 -2 11c0 0 -3 21 -28 21c-33 0 -56 22 -56 56z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E0.xml b/data/Bravura/E4E0.xml
new file mode 100644
index 00000000000..d9c828db189
--- /dev/null
+++ b/data/Bravura/E4E0.xml
@@ -0,0 +1 @@
+<symbol id="E4E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 230c0 17 7 20 16 20h92c10 0 17 -3 17 -20v-459c0 -17 -7 -20 -17 -20h-92c-9 0 -16 3 -16 20v459zM16 -249c-9 0 -16 3 -16 20v459c0 17 7 20 16 20h92c10 0 17 -3 17 -20v-459c0 -17 -7 -20 -17 -20h-92z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E1.xml b/data/Bravura/E4E1.xml
new file mode 100644
index 00000000000..f709217ee67
--- /dev/null
+++ b/data/Bravura/E4E1.xml
@@ -0,0 +1 @@
+<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -249c-9 0 -16 3 -16 20v459c0 17 7 20 16 20h92c10 0 17 -3 17 -20v-459c0 -17 -7 -20 -17 -20h-92z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E2.xml b/data/Bravura/E4E2.xml
new file mode 100644
index 00000000000..e4c4376fa2a
--- /dev/null
+++ b/data/Bravura/E4E2.xml
@@ -0,0 +1 @@
+<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 0c-9 0 -16 7 -16 15v220c0 8 7 15 16 15h92c10 0 17 -7 17 -15v-220c0 -8 -7 -15 -17 -15h-92z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E3.xml b/data/Bravura/E4E3.xml
new file mode 100644
index 00000000000..26a83b682af
--- /dev/null
+++ b/data/Bravura/E4E3.xml
@@ -0,0 +1 @@
+<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -135c-15 0 -26 12 -26 26v92c0 15 11 26 26 26h230c14 0 26 -11 26 -26v-92c0 -14 -12 -26 -26 -26h-230z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E4.xml b/data/Bravura/E4E4.xml
new file mode 100644
index 00000000000..4dcc53d8d16
--- /dev/null
+++ b/data/Bravura/E4E4.xml
@@ -0,0 +1 @@
+<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -2c-15 0 -26 12 -26 26v92c0 15 11 26 26 26h230c14 0 26 -11 26 -26v-92c0 -14 -12 -26 -26 -26h-230z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E5.xml b/data/Bravura/E4E5.xml
new file mode 100644
index 00000000000..d75a9195eec
--- /dev/null
+++ b/data/Bravura/E4E5.xml
@@ -0,0 +1 @@
+<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M117 -366c-73 56 -116 105 -116 155c0 53 39 96 82 96c5 0 11 -3 16 -3c4 -1 12 -3 16 -3c5 0 9 1 11 5c1 1 1 3 1 4c0 2 -4 10 -6 14c-13 21 -27 40 -43 60l-49 60s-10 10 -10 24c0 8 4 19 14 29c45 47 60 90 60 127c0 72 -57 123 -61 134c-3 6 -4 11 -4 16 c0 14 10 21 20 21c6 0 13 -3 18 -8c17 -17 165 -193 165 -193s4 -9 4 -19c0 -5 -1 -10 -4 -15c-26 -41 -62 -89 -66 -147c0 -4 -1 -9 -1 -13c0 -56 31 -93 69 -139c11 -12 37 -45 37 -57c0 -3 -2 -4 -5 -4c-2 0 -4 0 -7 1c-1 0 -2 1 -3 1c-16 6 -49 17 -78 17 c-42 0 -63 -32 -63 -73c0 -9 1 -18 4 -26c2 -9 13 -36 26 -36c8 -7 16 -15 16 -24c0 -2 -1 -4 -2 -7c-1 -4 -8 -6 -15 -6c-8 0 -18 3 -26 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E6.xml b/data/Bravura/E4E6.xml
new file mode 100644
index 00000000000..6067d79e519
--- /dev/null
+++ b/data/Bravura/E4E6.xml
@@ -0,0 +1 @@
+<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 56c-15 12 -27 30 -27 51c0 37 30 67 67 67s67 -30 67 -67v-10c33 0 83 60 90 66c6 4 9 4 11 4c2 -1 12 -6 12 -16c-1 -5 -6 -21 -10 -39c0 0 -98 -351 -101 -353c-10 -8 -24 -10 -35 -10c-6 0 -29 1 -29 13c18 66 90 265 93 280c1 4 1 8 1 11c0 5 -1 9 -5 9 c-1 0 -3 0 -5 -1c-13 -7 -22 -11 -36 -15c-11 -4 -25 -7 -39 -7c-19 0 -38 6 -54 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E7.xml b/data/Bravura/E4E7.xml
new file mode 100644
index 00000000000..68258f52078
--- /dev/null
+++ b/data/Bravura/E4E7.xml
@@ -0,0 +1 @@
+<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 -209c-38 0 -80 27 -80 68c0 38 30 68 68 68c37 0 68 -30 68 -68c0 -3 0 -6 -1 -10c14 0 41 12 49 31c7 15 58 164 58 180c0 5 -2 7 -5 7c-2 0 -4 -1 -7 -2c-23 -13 -51 -22 -78 -22c-38 0 -80 27 -80 68c0 38 31 68 68 68c38 0 68 -30 68 -68v-10c34 1 84 61 91 67 c3 2 6 4 11 4c2 -1 10 -5 10 -11c0 -1 -1 -2 -1 -4c-2 -13 -27 -101 -27 -101s-19 -67 -45 -152l-116 -381c-4 -11 -9 -23 -38 -23c-22 0 -31 10 -31 18c0 1 1 2 1 3l95 283c0 1 1 2 1 3c0 3 -2 5 -4 5c-23 -12 -49 -21 -75 -21z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E8.xml b/data/Bravura/E4E8.xml
new file mode 100644
index 00000000000..fd15d73a540
--- /dev/null
+++ b/data/Bravura/E4E8.xml
@@ -0,0 +1 @@
+<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -141c0 38 31 68 68 68c38 0 68 -30 68 -68c0 -3 0 -6 -1 -10c15 1 46 14 51 35l40 164c0 5 -2 13 -7 13c-1 0 -2 0 -3 -1c-23 -12 -49 -22 -75 -22c-10 0 -19 2 -27 4c-10 3 -19 7 -27 14c-16 12 -28 30 -28 50c0 38 30 68 68 68c37 0 68 -30 68 -68c0 -3 0 -6 -1 -9 c16 0 49 20 54 36l39 160c0 1 1 3 1 4c0 6 -4 16 -11 16c-1 0 -3 0 -4 -1c-23 -12 -50 -22 -76 -22c-10 0 -18 2 -26 4c-10 3 -20 7 -28 14c-16 12 -28 30 -28 50c0 38 31 68 68 68c38 0 68 -30 68 -68v-9c34 0 84 61 91 66c3 2 6 4 11 4c2 0 10 -2 10 -11c0 -1 -1 -2 -1 -4 c-2 -12 -26 -101 -26 -101s-172 -770 -175 -782c-4 -11 -7 -21 -39 -21c-21 0 -27 8 -27 16c0 2 0 4 1 6c2 7 71 282 71 286c0 3 -3 6 -6 6c-1 0 -2 0 -3 -1c-23 -13 -51 -22 -78 -22c-38 0 -80 27 -80 68z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4E9.xml b/data/Bravura/E4E9.xml
new file mode 100644
index 00000000000..8c72c5a9f17
--- /dev/null
+++ b/data/Bravura/E4E9.xml
@@ -0,0 +1 @@
+<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -385c0 38 31 68 68 68c38 0 68 -30 68 -68c0 -3 0 -6 -1 -9c13 0 39 9 45 30c4 11 39 154 40 159c0 1 1 5 1 8c0 6 -1 14 -6 14c-1 0 -2 0 -3 -1c-13 -6 -16 -10 -30 -15c-12 -4 -26 -7 -40 -7c-9 0 -19 2 -27 4c-10 3 -19 8 -28 14c-16 12 -28 30 -28 51 c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c14 0 41 9 49 35c3 8 39 153 41 162c1 2 1 3 1 5c0 5 -2 9 -6 9c-1 0 -2 0 -4 -1c-26 -12 -54 -21 -82 -21c-9 0 -17 1 -25 3c-29 9 -56 33 -56 65c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c17 0 53 21 60 40c4 11 38 153 39 156 c1 4 2 7 2 10c0 7 -4 11 -9 11c-2 0 -5 -1 -7 -2c-24 -11 -49 -22 -76 -22c-38 0 -82 27 -82 69c0 37 30 68 68 68c37 0 68 -31 68 -68c0 -4 0 -7 -1 -10c34 0 84 61 92 67c3 2 6 4 11 4c4 -1 9 -4 9 -15c-3 -13 -27 -102 -27 -102l-93 -400c-4 -18 -23 -99 -24 -99 c-120 -516 -128 -534 -130 -543c-4 -11 -9 -17 -33 -17c-23 0 -32 5 -32 14c0 2 0 4 1 7l72 279c0 2 1 4 1 6c0 6 -3 11 -8 11c-1 0 -2 0 -4 -1c-17 -9 -45 -16 -64 -16c-18 0 -40 6 -54 18c-16 12 -28 30 -28 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4EA.xml b/data/Bravura/E4EA.xml
new file mode 100644
index 00000000000..eae0c26784d
--- /dev/null
+++ b/data/Bravura/E4EA.xml
@@ -0,0 +1 @@
+<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M82 -453c-38 0 -82 26 -82 68c0 38 31 68 68 68c38 0 68 -30 68 -68l3 -10c14 1 33 2 46 36c8 19 40 160 42 168c0 4 -2 8 -6 8c-1 0 -3 0 -4 -1c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7c-38 0 -82 27 -82 69c0 37 30 68 68 68c37 0 68 -31 68 -68 c0 -4 -1 -7 -1 -10c15 0 45 11 53 38c5 16 35 138 38 153c1 4 2 8 2 11c0 6 -2 10 -6 10c-2 0 -4 -1 -6 -2c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7c-38 0 -83 27 -83 69c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c16 0 51 20 56 40l39 156c1 4 2 9 2 14 c0 7 -1 13 -5 13c-1 0 -2 0 -3 -1c-13 -6 -31 -15 -45 -20c-12 -4 -28 -6 -42 -6c-22 0 -35 5 -53 17c-16 12 -28 30 -28 51c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c19 0 60 30 64 45c4 14 35 138 39 157c1 3 1 6 1 8c0 9 -6 13 -12 13c-2 0 -6 -1 -8 -2 c-12 -6 -21 -10 -33 -14c-1 0 -2 -1 -3 -1c-11 -4 -26 -7 -40 -7c-18 0 -40 6 -54 18c-16 12 -28 30 -28 50c0 38 31 68 68 68c38 0 68 -30 68 -68v-10c34 1 84 62 91 67c3 2 6 4 11 4c2 -1 10 -5 10 -11c0 -1 -1 -2 -1 -4c-2 -13 -27 -101 -27 -101l-297 -1300 c-4 -12 -8 -16 -40 -16c-23 0 -29 6 -29 16c2 5 72 288 74 295c1 1 1 3 1 4c0 3 -2 5 -5 5c-1 0 -2 -1 -3 -1c-12 -6 -21 -10 -33 -14c-1 0 -2 -1 -3 -1c-11 -4 -26 -7 -40 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4EB.xml b/data/Bravura/E4EB.xml
new file mode 100644
index 00000000000..8b792a2a771
--- /dev/null
+++ b/data/Bravura/E4EB.xml
@@ -0,0 +1 @@
+<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M82 -703c-38 0 -82 27 -82 69c0 37 30 68 68 68s68 -31 68 -68c0 -4 0 -7 -1 -10c12 0 35 1 45 38c7 24 24 95 40 158c0 1 1 2 1 4c1 4 1 8 1 11c0 5 -1 9 -5 9c-2 0 -4 -1 -6 -2c-23 -11 -47 -20 -72 -20c-38 0 -82 26 -82 68c0 38 30 68 68 68s68 -30 68 -68 c0 -3 0 -6 -1 -10c15 1 44 10 53 42c5 15 21 85 34 139c2 2 5 20 5 23c0 5 -2 9 -5 9c-1 0 -3 -1 -5 -2c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7c-38 0 -83 27 -83 69c0 37 31 68 68 68c38 0 68 -31 68 -68v-10c15 0 44 10 55 42c5 14 34 137 37 149c0 3 1 6 1 8 c0 7 -3 13 -7 13c-1 0 -3 -1 -5 -2c-24 -11 -49 -22 -76 -22c-10 0 -19 2 -27 4c-28 9 -55 33 -55 65c0 37 31 68 68 68c38 0 68 -31 68 -68c0 -4 0 -7 -1 -10c17 0 52 14 59 43l38 157c1 4 1 7 1 10c0 6 -2 10 -7 10c-2 0 -4 0 -6 -1c-25 -13 -53 -23 -82 -23 c-38 0 -81 26 -81 68c0 37 31 68 68 68c38 0 68 -31 68 -68c0 -3 0 -7 -1 -10c20 0 58 20 65 47c4 11 34 136 39 155c0 2 1 4 1 6c0 10 -6 15 -13 15c-2 0 -5 -1 -7 -2c-12 -6 -21 -10 -33 -14c-1 0 -2 -1 -3 -1c-11 -4 -26 -7 -40 -7c-19 0 -40 5 -54 18 c-16 12 -28 30 -28 50c0 38 30 68 68 68s68 -30 68 -68c0 -3 0 -6 -1 -10c34 1 85 62 92 67c3 2 6 4 11 4c2 -1 9 -4 9 -11v-4c-3 -13 -27 -101 -27 -101l-359 -1549c-3 -11 -7 -24 -40 -24c-21 0 -26 8 -26 15c0 3 0 5 1 7c2 5 63 261 67 278c1 5 2 10 2 13c0 4 -1 6 -4 6 c-2 0 -3 -1 -6 -2c-13 -6 -13 -8 -27 -13c-11 -4 -26 -7 -40 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4EC.xml b/data/Bravura/E4EC.xml
new file mode 100644
index 00000000000..d24a6200c87
--- /dev/null
+++ b/data/Bravura/E4EC.xml
@@ -0,0 +1 @@
+<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -639c0 38 31 68 68 68c38 0 68 -30 68 -68v-9c13 0 40 5 46 29l43 180c0 6 -3 12 -7 12c-1 0 -2 0 -3 -1c-13 -7 -21 -11 -36 -15c-12 -4 -28 -7 -42 -7c-38 0 -80 27 -80 68c0 38 31 68 68 68c38 0 68 -30 68 -68v-10c15 0 48 15 55 44l36 152c1 3 1 5 1 7 c0 5 -2 9 -6 9c-1 0 -3 0 -5 -1c-23 -12 -49 -22 -75 -22c-18 0 -40 6 -54 18c-16 12 -28 30 -28 50c0 38 30 68 68 68c37 0 68 -30 68 -68c0 -3 0 -6 -1 -9c16 0 45 10 54 37c4 14 33 136 37 154c1 5 2 9 2 12c0 6 -2 9 -6 9c-2 0 -3 -1 -6 -2c-13 -6 -21 -10 -35 -15 c-12 -4 -26 -7 -40 -7c-21 0 -38 7 -55 18c-16 12 -27 30 -27 51c0 37 30 68 68 68c37 0 68 -31 68 -68c0 -4 -1 -7 -1 -10c16 0 47 10 55 40c6 21 25 101 38 155c1 1 2 8 2 9c0 9 -4 15 -10 15c-2 0 -4 -1 -6 -2c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7 c-21 0 -38 7 -55 18c-15 12 -27 30 -27 51c0 37 30 68 68 68c37 0 68 -31 68 -68c0 -4 -1 -7 -1 -10c18 0 53 14 61 44c4 16 36 147 38 159c1 2 1 3 1 5c0 7 -5 14 -11 14c-2 0 -3 0 -5 -1c-13 -7 -21 -11 -36 -15c-12 -4 -28 -7 -42 -7c-38 0 -80 27 -80 68 c0 38 31 68 68 68c38 0 68 -30 68 -68v-10c18 0 54 21 62 46c4 14 35 147 36 150s1 6 1 9c0 9 -4 13 -9 13c-2 0 -4 -1 -6 -2c-23 -13 -51 -22 -78 -22c-38 0 -80 27 -80 68c0 38 31 68 68 68c38 0 68 -30 68 -68c0 -3 0 -6 -1 -10c35 1 85 61 92 67c3 2 6 4 11 4 c2 -1 10 -5 10 -11c0 -1 -1 -2 -1 -4c-2 -13 -27 -101 -27 -101s-413 -1786 -416 -1797c-4 -12 -7 -24 -40 -24c-23 0 -27 10 -27 19c0 3 0 6 1 8c2 4 64 261 68 275c1 2 1 4 1 6c0 5 -3 6 -5 6s-3 0 -4 -1c-21 -11 -49 -20 -72 -20c-17 0 -41 7 -54 18 c-16 12 -28 30 -28 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4ED.xml b/data/Bravura/E4ED.xml
new file mode 100644
index 00000000000..49f0bcb406b
--- /dev/null
+++ b/data/Bravura/E4ED.xml
@@ -0,0 +1 @@
+<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -634c0 32 29 67 67 67c33 0 65 -29 65 -81c15 0 38 9 49 33c4 13 37 170 43 175c0 5 -6 15 -11 15c-14 -10 -23 -10 -38 -15c-8 -5 -23 -9 -37 -9c-9 0 -20 4 -28 4l-29 15c-14 9 -24 27 -24 52c0 32 29 67 67 67c33 0 66 -29 66 -81c14 4 47 18 57 46 c4 15 33 139 33 153c0 4 -5 14 -10 14c-9 -10 -19 -10 -33 -14c-9 -5 -24 -11 -38 -11c-9 0 -18 6 -29 6l-27 14c-14 9 -29 28 -29 51c0 34 33 66 67 66c32 0 70 -28 70 -80c15 5 43 14 52 38c20 52 39 157 39 161c0 5 -5 14 -11 14c-14 -9 -22 -9 -37 -14 c-9 -4 -24 -9 -38 -9c-9 0 -19 5 -28 5l-29 14c-14 10 -29 28 -29 52c0 33 34 66 72 66s61 -80 71 -80c15 4 43 14 53 42l36 157c0 4 0 18 -13 18l-38 -14c-14 -4 -34 -4 -48 -4h-18l-29 14c-14 15 -28 33 -28 52c0 37 33 66 71 66s67 -29 67 -76c18 0 50 15 60 42l38 161 c0 5 0 14 -15 14l-38 -14c-9 -4 -22 -4 -37 -4c-8 0 -18 0 -28 4c-7 0 -18 5 -29 10c-14 14 -28 33 -28 51c0 39 34 67 71 67s66 -28 66 -75c19 0 52 19 62 47c4 14 38 147 38 147s3 13 3 19c0 2 -2 5 -3 5c-5 0 -11 -5 -15 -5l-38 -14c-9 -5 -24 -5 -37 -5 c-10 0 -20 0 -28 5c-11 0 -18 6 -28 8c-14 14 -29 34 -29 53c0 39 33 66 71 66c37 0 66 -27 66 -76c19 0 56 24 62 43c14 47 42 118 42 165c0 4 -5 10 -14 10l-38 -14c-11 -6 -25 -10 -38 -10c-10 0 -19 4 -29 4l-28 14c-15 15 -29 35 -29 53c0 38 33 71 72 71 c38 0 66 -33 66 -81c47 0 67 57 104 72c0 0 10 -5 10 -15c0 -9 -104 -387 -104 -387c-53 -246 -407 -1750 -407 -1760c-5 -14 -10 -19 -39 -19c-8 0 -28 19 -28 23c5 6 67 261 71 275c0 4 0 9 -9 9l-34 -9c-8 -6 -23 -10 -37 -10c-10 0 -19 4 -29 4l-27 15 c-14 9 -25 28 -25 52z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4F2.xml b/data/Bravura/E4F2.xml
new file mode 100644
index 00000000000..3736b6557ae
--- /dev/null
+++ b/data/Bravura/E4F2.xml
@@ -0,0 +1 @@
+<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 151c0 10 10 15 12 16c2 0 5 0 11 -4c7 -6 57 -66 90 -66v10c0 37 30 67 67 67s67 -30 67 -67c0 -21 -12 -39 -27 -51c-16 -11 -35 -17 -54 -17c-14 0 -28 3 -39 7c-14 4 -23 8 -36 15c-2 1 -4 1 -5 1c-4 0 -5 -4 -5 -9c0 -3 0 -7 1 -11c3 -15 75 -214 93 -280 c0 -12 -23 -13 -29 -13c-11 0 -25 2 -35 10c-3 2 -101 353 -101 353c-4 18 -9 34 -10 39z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E4F6.xml b/data/Bravura/E4F6.xml
new file mode 100644
index 00000000000..ffe8bcfb731
--- /dev/null
+++ b/data/Bravura/E4F6.xml
@@ -0,0 +1 @@
+<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M67 -214c-37 0 -67 30 -67 67c0 21 12 39 27 51c16 11 35 17 54 17c14 0 28 -3 39 -7c6 -2 19 -10 27 -10c5 0 8 5 8 10c0 16 -24 45 -30 54c-17 30 -36 59 -54 89c-12 18 -21 37 -34 55c-13 19 -30 45 -33 68v6c0 10 4 21 12 21c3 0 6 -2 10 -4c7 -6 57 -66 90 -66v10 c0 37 30 67 67 67s67 -30 67 -67c0 -21 -12 -39 -27 -51c-16 -11 -35 -17 -54 -17c-14 0 -28 3 -39 7c-7 2 -23 14 -33 14c-4 0 -6 -2 -7 -6c0 -3 1 -8 2 -12c3 -9 9 -18 12 -23l102 -161c7 -11 41 -66 41 -92c0 -8 -3 -13 -12 -13c-2 0 -5 0 -11 4c-7 6 -57 66 -90 66v-10 c0 -37 -30 -67 -67 -67z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E500.xml b/data/Bravura/E500.xml
new file mode 100644
index 00000000000..69b2770b2e0
--- /dev/null
+++ b/data/Bravura/E500.xml
@@ -0,0 +1 @@
+<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99c-5 0 -8 3 -8 7zM407 -112c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62zM0 137c0 35 28 63 62 63 c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E501.xml b/data/Bravura/E501.xml
new file mode 100644
index 00000000000..1d4216055e4
--- /dev/null
+++ b/data/Bravura/E501.xml
@@ -0,0 +1 @@
+<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99c-5 0 -8 3 -8 7zM238 -250c-5 0 -8 3 -8 7c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14 h-99zM637 -112c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62zM62 75c-34 0 -62 28 -62 62c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E502.xml b/data/Bravura/E502.xml
new file mode 100644
index 00000000000..8011473b1d0
--- /dev/null
+++ b/data/Bravura/E502.xml
@@ -0,0 +1 @@
+<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M230 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99c-5 0 -8 3 -8 7zM700 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99 c-5 0 -8 3 -8 7zM478 -250c-5 0 -8 3 -8 7c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99zM0 -243c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99 c-5 0 -8 3 -8 7zM1169 -174c-34 0 -62 28 -62 62c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62zM0 137c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E503.xml b/data/Bravura/E503.xml
new file mode 100644
index 00000000000..306b9f0d6f1
--- /dev/null
+++ b/data/Bravura/E503.xml
@@ -0,0 +1 @@
+<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 137c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E504.xml b/data/Bravura/E504.xml
new file mode 100644
index 00000000000..f6be7400a66
--- /dev/null
+++ b/data/Bravura/E504.xml
@@ -0,0 +1 @@
+<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -250c-5 0 -8 3 -8 7c0 2 1 5 3 7l399 500c7 9 12 15 18 15h106c4 0 6 -2 6 -5s-2 -6 -5 -10l-399 -500c-5 -6 -12 -14 -21 -14h-99z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E505.xml b/data/Bravura/E505.xml
new file mode 100644
index 00000000000..ae3321916d6
--- /dev/null
+++ b/data/Bravura/E505.xml
@@ -0,0 +1 @@
+<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -112c0 35 28 63 62 63c35 0 63 -28 63 -63c0 -34 -28 -62 -63 -62c-34 0 -62 28 -62 62z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E510.xml b/data/Bravura/E510.xml
new file mode 100644
index 00000000000..851de58a05e
--- /dev/null
+++ b/data/Bravura/E510.xml
@@ -0,0 +1 @@
+<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 108c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142c-108 0 -156 52 -156 118z M78 97c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4c-42 -26 -56 -72 -56 -103zM170 363c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65c-45 0 -76 -26 -76 -70z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E511.xml b/data/Bravura/E511.xml
new file mode 100644
index 00000000000..d7e2825b011
--- /dev/null
+++ b/data/Bravura/E511.xml
@@ -0,0 +1 @@
+<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 108c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142c-108 0 -156 52 -156 118z M703 216c-28 0 -60 23 -60 81c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33zM422 347c-5 0 -11 3 -11 10c0 4 1 9 4 17c14 39 34 77 71 77c26 0 42 -23 42 -52c0 -48 -38 -89 -38 -127c0 -14 8 -27 28 -27 c34 0 74 59 74 104c0 17 -7 25 -18 33c-10 7 -21 17 -21 32c0 18 14 35 33 35c25 0 39 -28 39 -60c0 -97 -56 -173 -119 -173c-36 0 -67 21 -67 60c0 49 43 98 43 133c0 6 -3 10 -9 10c-17 0 -32 -37 -40 -63c-2 -6 -6 -9 -11 -9zM134 200c-42 -26 -56 -72 -56 -103 c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4zM170 363c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65c-45 0 -76 -26 -76 -70zM768 423c-43 0 -76 -91 -76 -139 c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E512.xml b/data/Bravura/E512.xml
new file mode 100644
index 00000000000..c6bf33fe976
--- /dev/null
+++ b/data/Bravura/E512.xml
@@ -0,0 +1 @@
+<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 108c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142c-108 0 -156 52 -156 118z M657 -10c-28 0 -60 23 -60 81c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33zM376 121c-5 0 -11 3 -11 10c0 4 1 9 4 17c14 39 34 77 71 77c26 0 42 -23 42 -52c0 -48 -38 -89 -38 -127c0 -14 8 -27 28 -27 c34 0 74 59 74 104c0 17 -7 25 -18 33c-10 7 -21 17 -21 32c0 18 14 35 33 35c25 0 39 -28 39 -60c0 -97 -56 -173 -119 -173c-36 0 -67 21 -67 60c0 49 43 98 43 133c0 6 -3 10 -9 10c-17 0 -32 -37 -40 -63c-2 -6 -6 -9 -11 -9zM134 200c-42 -26 -56 -72 -56 -103 c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4zM170 363c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65c-45 0 -76 -26 -76 -70zM722 197c-43 0 -76 -91 -76 -139 c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E513.xml b/data/Bravura/E513.xml
new file mode 100644
index 00000000000..beea934b4d0
--- /dev/null
+++ b/data/Bravura/E513.xml
@@ -0,0 +1 @@
+<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 108c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142c-108 0 -156 52 -156 118z M485 -10c-41 0 -69 28 -69 71c0 19 3 35 7 49l50 183c1 4 2 8 2 10c0 5 -4 6 -13 6h-19c-14 0 -15 7 -15 11s1 12 16 13l77 5c8 0 12 -4 12 -10c0 -3 -1 -6 -2 -9l-25 -83c-6 -21 -9 -26 -9 -31c0 -2 1 -3 3 -3c5 0 13 10 28 17c9 4 18 6 28 6c39 0 59 -32 59 -67 c0 -90 -59 -168 -130 -168zM633 71c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM78 97c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4 c-42 -26 -56 -72 -56 -103zM246 433c-45 0 -76 -26 -76 -70c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65zM542 199c-45 0 -81 -96 -81 -153c0 -19 8 -31 23 -31c47 0 81 110 81 150c0 19 -5 34 -23 34zM682 58c0 -24 8 -38 22 -38 c33 0 76 102 76 146c0 16 -6 31 -22 31c-43 0 -76 -91 -76 -139z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E514.xml b/data/Bravura/E514.xml
new file mode 100644
index 00000000000..de357e69262
--- /dev/null
+++ b/data/Bravura/E514.xml
@@ -0,0 +1 @@
+<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M275 85c0 41 26 72 60 72c26 0 48 -15 48 -45c0 -32 -18 -47 -31 -53c-10 -5 -16 -7 -16 -15c0 -12 19 -22 44 -22c81 0 120 100 120 160c0 35 -15 63 -57 63c-38 0 -63 -26 -74 -37c-9 -9 -15 -13 -24 -13c-11 0 -19 7 -19 19c0 7 1 11 5 23l68 199c5 14 13 21 27 21 c9 0 16 -2 33 -7c15 -4 40 -9 74 -9c36 0 67 4 92 11c17 5 23 9 30 9s12 -6 12 -12c0 -8 -5 -16 -17 -27c-38 -35 -94 -69 -166 -69c-16 0 -35 2 -48 4c-4 1 -6 1 -9 1c-6 0 -10 -2 -13 -11l-19 -56c-1 -3 -2 -6 -2 -8c0 -5 3 -8 9 -8c3 0 6 1 10 2c16 5 34 8 58 8 c80 0 130 -29 130 -101c0 -116 -84 -194 -198 -194c-87 0 -127 46 -127 95zM19 0c-13 0 -19 7 -19 17s6 16 17 17l43 4c11 1 12 4 15 13l84 263c2 6 3 10 3 14c0 6 -3 8 -7 8c-5 0 -9 -3 -16 -11l-45 -50c-7 -8 -13 -13 -23 -13s-19 9 -19 18c0 7 3 13 10 21l131 148 c6 7 11 10 19 10c15 0 23 -11 38 -11c13 0 29 11 42 11c8 0 12 -5 12 -12c0 -4 -1 -8 -3 -14l-119 -378c-1 -5 -3 -8 -3 -11s2 -5 7 -6l42 -4c11 -1 17 -7 17 -17s-6 -17 -19 -17h-207z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E515.xml b/data/Bravura/E515.xml
new file mode 100644
index 00000000000..32000e465cc
--- /dev/null
+++ b/data/Bravura/E515.xml
@@ -0,0 +1 @@
+<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M402 -10c-87 0 -127 46 -127 95c0 41 26 72 60 72c26 0 48 -15 48 -45c0 -32 -18 -47 -31 -53c-10 -5 -16 -7 -16 -15c0 -12 19 -22 44 -22c81 0 120 100 120 160c0 35 -15 63 -57 63c-38 0 -63 -26 -74 -37c-9 -9 -15 -13 -24 -13c-11 0 -19 7 -19 19c0 7 1 11 5 23 l68 199c5 14 13 21 27 21c9 0 16 -2 33 -7c15 -4 40 -9 74 -9c36 0 67 4 92 11c17 5 23 9 30 9s12 -6 12 -12c0 -8 -5 -16 -17 -27c-38 -35 -94 -69 -166 -69c-16 0 -35 2 -48 4c-4 1 -6 1 -9 1c-6 0 -10 -2 -13 -11l-19 -56c-1 -3 -2 -6 -2 -8c0 -5 3 -8 9 -8c3 0 6 1 10 2 c16 5 34 8 58 8c80 0 130 -29 130 -101c0 -116 -84 -194 -198 -194zM19 0c-13 0 -19 7 -19 17s6 16 17 17l43 4c11 1 12 4 15 13l84 263c2 6 3 10 3 14c0 6 -3 8 -7 8c-5 0 -9 -3 -16 -11l-45 -50c-7 -8 -13 -13 -23 -13s-19 9 -19 18c0 7 3 13 10 21l131 148 c6 7 11 10 19 10c15 0 23 -11 38 -11c13 0 29 11 42 11c8 0 12 -5 12 -12c0 -4 -1 -8 -3 -14l-119 -378c-1 -5 -3 -8 -3 -11s2 -5 7 -6l42 -4c11 -1 17 -7 17 -17s-6 -17 -19 -17h-207zM667 355c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21 c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57 c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5 c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9c-5 0 -11 3 -11 10zM1073 297c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162 c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM1198 423 c-43 0 -76 -91 -76 -139c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E516.xml b/data/Bravura/E516.xml
new file mode 100644
index 00000000000..d4346fb3bae
--- /dev/null
+++ b/data/Bravura/E516.xml
@@ -0,0 +1 @@
+<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M402 -10c-87 0 -127 46 -127 95c0 41 26 72 60 72c26 0 48 -15 48 -45c0 -32 -18 -47 -31 -53c-10 -5 -16 -7 -16 -15c0 -12 19 -22 44 -22c81 0 120 100 120 160c0 35 -15 63 -57 63c-38 0 -63 -26 -74 -37c-9 -9 -15 -13 -24 -13c-11 0 -19 7 -19 19c0 7 1 11 5 23 l68 199c5 14 13 21 27 21c9 0 16 -2 33 -7c15 -4 40 -9 74 -9c36 0 67 4 92 11c17 5 23 9 30 9s12 -6 12 -12c0 -8 -5 -16 -17 -27c-38 -35 -94 -69 -166 -69c-16 0 -35 2 -48 4c-4 1 -6 1 -9 1c-6 0 -10 -2 -13 -11l-19 -56c-1 -3 -2 -6 -2 -8c0 -5 3 -8 9 -8c3 0 6 1 10 2 c16 5 34 8 58 8c80 0 130 -29 130 -101c0 -116 -84 -194 -198 -194zM19 0c-13 0 -19 7 -19 17s6 16 17 17l43 4c11 1 12 4 15 13l84 263c2 6 3 10 3 14c0 6 -3 8 -7 8c-5 0 -9 -3 -16 -11l-45 -50c-7 -8 -13 -13 -23 -13s-19 9 -19 18c0 7 3 13 10 21l131 148 c6 7 11 10 19 10c15 0 23 -11 38 -11c13 0 29 11 42 11c8 0 12 -5 12 -12c0 -4 -1 -8 -3 -14l-119 -378c-1 -5 -3 -8 -3 -11s2 -5 7 -6l42 -4c11 -1 17 -7 17 -17s-6 -17 -19 -17h-207zM637 134c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21 c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57 c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5 c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9c-5 0 -11 3 -11 10zM1043 76c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162 c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM1168 202 c-43 0 -76 -91 -76 -139c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E517.xml b/data/Bravura/E517.xml
new file mode 100644
index 00000000000..3d4afb407a3
--- /dev/null
+++ b/data/Bravura/E517.xml
@@ -0,0 +1 @@
+<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M375 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138c93 0 148 -41 148 -106 c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53 c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM4 15c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138 c93 0 148 -41 148 -106c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108 c-82 0 -114 53 -157 53c-18 0 -26 -11 -32 -27s-12 -23 -25 -23c-12 0 -19 8 -19 19z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E518.xml b/data/Bravura/E518.xml
new file mode 100644
index 00000000000..cf2cb685b56
--- /dev/null
+++ b/data/Bravura/E518.xml
@@ -0,0 +1 @@
+<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138c93 0 148 -41 148 -106 c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53 c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM375 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54 c0 70 64 138 163 138c93 0 148 -41 148 -106c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18 c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM780 355c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17 c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76 l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9 c-5 0 -11 3 -11 10zM1186 297c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM1311 423c-43 0 -76 -91 -76 -139c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E519.xml b/data/Bravura/E519.xml
new file mode 100644
index 00000000000..dd5875c7cda
--- /dev/null
+++ b/data/Bravura/E519.xml
@@ -0,0 +1 @@
+<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138c93 0 148 -41 148 -106 c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53 c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM375 -4c-12 0 -19 8 -19 19c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54 c0 70 64 138 163 138c93 0 148 -41 148 -106c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18 c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53c-18 0 -26 -11 -32 -27s-12 -23 -25 -23zM730 133c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17 c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76 l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9 c-5 0 -11 3 -11 10zM1136 75c0 76 57 156 120 156c18 0 29 -6 37 -19c4 -6 7 -11 9 -11c3 0 4 4 7 16c2 8 5 12 14 12h24c8 0 11 -2 11 -7c0 -2 -1 -5 -2 -9l-51 -162c-2 -5 -3 -11 -3 -15c0 -8 3 -13 11 -13c18 0 33 37 43 62c2 5 5 9 11 9c5 0 11 -3 11 -10 c0 -6 -5 -13 -5 -18c-8 -19 -29 -71 -68 -71c-22 0 -33 11 -37 28c-2 9 -3 15 -6 15c-5 0 -10 -10 -11 -11c-14 -20 -33 -33 -55 -33c-28 0 -60 23 -60 81zM1261 201c-43 0 -76 -91 -76 -139c0 -24 8 -38 22 -38c33 0 76 102 76 146c0 16 -6 31 -22 31z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51A.xml b/data/Bravura/E51A.xml
new file mode 100644
index 00000000000..fa0c771758f
--- /dev/null
+++ b/data/Bravura/E51A.xml
@@ -0,0 +1 @@
+<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 102 50 189 159 249v1c3 0 4 -2 4 -4v-11s0 -5 -3 -8c-67 -49 -91 -116 -91 -227s27 -177 90 -228c3 -1 4 -3 4 -6v-13c0 -1 -1 -4 -1 -4c-2 0 -3 0 -3 1c-111 61 -159 149 -159 250z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51B.xml b/data/Bravura/E51B.xml
new file mode 100644
index 00000000000..5b7950fcec9
--- /dev/null
+++ b/data/Bravura/E51B.xml
@@ -0,0 +1 @@
+<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-26 480c0 2 1 4 4 4v-1c109 -60 159 -147 159 -249c0 -101 -48 -189 -159 -250c0 -1 -1 -1 -3 -1c0 0 -1 3 -1 4v13c0 3 1 5 4 6c63 51 90 117 90 228s-24 178 -91 227c-3 3 -3 8 -3 8v11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51C.xml b/data/Bravura/E51C.xml
new file mode 100644
index 00000000000..01f4040a715
--- /dev/null
+++ b/data/Bravura/E51C.xml
@@ -0,0 +1 @@
+<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M156 -10c-108 0 -156 52 -156 118c0 48 25 92 89 118c13 6 18 9 18 14c0 4 -3 9 -8 15c-16 19 -24 44 -24 73c0 85 71 135 173 135c98 0 138 -47 138 -104c0 -37 -21 -78 -75 -106c-12 -6 -17 -10 -17 -15s5 -10 12 -18c23 -25 32 -51 32 -88c0 -91 -85 -142 -182 -142z M666 -10c-41 0 -69 28 -69 71c0 19 3 35 7 49l50 183c1 4 2 8 2 10c0 5 -4 6 -13 6h-19c-14 0 -15 7 -15 11s1 12 16 13l77 5c8 0 12 -4 12 -10c0 -3 -1 -6 -2 -9l-25 -83c-6 -21 -9 -26 -9 -31c0 -2 1 -3 3 -3c5 0 13 10 28 17c9 4 18 6 28 6c39 0 59 -32 59 -67 c0 -90 -59 -168 -130 -168zM361 131c0 4 1 9 4 17c14 39 34 77 71 77c26 0 42 -23 42 -52c0 -48 -38 -89 -38 -127c0 -14 8 -27 28 -27c34 0 74 59 74 104c0 17 -7 25 -18 33c-10 7 -21 17 -21 32c0 18 14 35 33 35c25 0 39 -28 39 -60c0 -97 -56 -173 -119 -173 c-36 0 -67 21 -67 60c0 49 43 98 43 133c0 6 -3 10 -9 10c-17 0 -32 -37 -40 -63c-2 -6 -6 -9 -11 -9s-11 3 -11 10zM134 200c-42 -26 -56 -72 -56 -103c0 -36 19 -77 80 -77c47 0 85 29 85 80c0 30 -16 44 -80 94c-8 7 -14 10 -19 10c-3 0 -6 -2 -10 -4zM246 433 c-45 0 -76 -26 -76 -70c0 -29 15 -47 62 -82c8 -6 13 -8 18 -8c4 0 8 1 12 4c33 23 48 58 48 91s-16 65 -64 65zM723 199c-45 0 -81 -96 -81 -153c0 -19 8 -31 23 -31c47 0 81 110 81 150c0 19 -5 34 -23 34z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51D.xml b/data/Bravura/E51D.xml
new file mode 100644
index 00000000000..9e8b64290cd
--- /dev/null
+++ b/data/Bravura/E51D.xml
@@ -0,0 +1 @@
+<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M402 -10c-87 0 -127 46 -127 95c0 41 26 72 60 72c26 0 48 -15 48 -45c0 -32 -18 -47 -31 -53c-10 -5 -16 -7 -16 -15c0 -12 19 -22 44 -22c81 0 120 100 120 160c0 35 -15 63 -57 63c-38 0 -63 -26 -74 -37c-9 -9 -15 -13 -24 -13c-11 0 -19 7 -19 19c0 7 1 11 5 23 l68 199c5 14 13 21 27 21c9 0 16 -2 33 -7c15 -4 40 -9 74 -9c36 0 67 4 92 11c17 5 23 9 30 9s12 -6 12 -12c0 -8 -5 -16 -17 -27c-38 -35 -94 -69 -166 -69c-16 0 -35 2 -48 4c-4 1 -6 1 -9 1c-6 0 -10 -2 -13 -11l-19 -56c-1 -3 -2 -6 -2 -8c0 -5 3 -8 9 -8c3 0 6 1 10 2 c16 5 34 8 58 8c80 0 130 -29 130 -101c0 -116 -84 -194 -198 -194zM0 17c0 10 6 16 17 17l43 4c11 1 12 4 15 13l84 263c2 6 3 10 3 14c0 6 -3 8 -7 8c-5 0 -9 -3 -16 -11l-45 -50c-7 -8 -13 -13 -23 -13s-19 9 -19 18c0 7 3 13 10 21l131 148c6 7 11 10 19 10 c15 0 23 -11 38 -11c13 0 29 11 42 11c8 0 12 -5 12 -12c0 -4 -1 -8 -3 -14l-119 -378c-1 -5 -3 -8 -3 -11s2 -5 7 -6l42 -4c11 -1 17 -7 17 -17s-6 -17 -19 -17h-207c-13 0 -19 7 -19 17zM1033 66c0 19 3 35 7 49l50 183c1 4 2 8 2 10c0 5 -4 6 -13 6h-19 c-14 0 -15 7 -15 11s1 12 16 13l77 5c8 0 12 -4 12 -10c0 -3 -1 -6 -2 -9l-25 -83c-6 -21 -9 -26 -9 -31c0 -2 1 -3 3 -3c5 0 13 10 28 17c9 4 18 6 28 6c39 0 59 -32 59 -67c0 -90 -59 -168 -130 -168c-41 0 -69 28 -69 71zM627 134c0 6 2 11 5 18c16 36 40 79 83 79 c18 0 30 -9 35 -22s2 -21 7 -21c1 0 8 8 16 17c13 15 29 27 53 27c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9 c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57c-28 0 -48 12 -48 39c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102 c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l47 143c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9c-5 0 -11 3 -11 10zM1078 51c0 -19 8 -31 23 -31c47 0 81 110 81 150c0 19 -5 34 -23 34c-45 0 -81 -96 -81 -153z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E51E.xml b/data/Bravura/E51E.xml
new file mode 100644
index 00000000000..cd396189a7e
--- /dev/null
+++ b/data/Bravura/E51E.xml
@@ -0,0 +1 @@
+<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M356 15c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54c0 70 64 138 163 138c93 0 148 -41 148 -106 c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53 c-18 0 -26 -11 -32 -27s-12 -23 -25 -23c-12 0 -19 8 -19 19zM4 15c0 5 1 10 3 19c21 80 65 141 168 183c96 39 124 100 124 158c0 43 -31 53 -65 53c-42 0 -65 -19 -65 -34c0 -9 5 -14 14 -23c7 -7 14 -19 14 -37c0 -33 -24 -63 -58 -63c-38 0 -52 26 -52 54 c0 70 64 138 163 138c93 0 148 -41 148 -106c0 -109 -87 -155 -185 -177c-47 -11 -90 -30 -117 -60c-6 -7 -10 -13 -10 -17c0 -3 2 -4 5 -4s10 3 20 7c15 6 31 9 50 9c39 0 69 -23 105 -23c22 0 38 8 52 28c7 10 12 13 19 13c9 0 18 -5 18 -14c0 -5 -1 -9 -4 -18 c-23 -69 -51 -108 -114 -108c-82 0 -114 53 -157 53c-18 0 -26 -11 -32 -27s-12 -23 -25 -23c-12 0 -19 8 -19 19zM1136 65c0 19 3 35 7 49l50 183c1 4 2 8 2 10c0 5 -4 6 -13 6h-19c-14 0 -15 7 -15 11s1 12 16 13l77 5c8 0 12 -4 12 -10c0 -3 -1 -6 -2 -9l-25 -83 c-6 -21 -9 -26 -9 -31c0 -2 1 -3 3 -3c5 0 13 10 28 17c9 4 18 6 28 6c39 0 59 -32 59 -67c0 -90 -59 -168 -130 -168c-41 0 -69 28 -69 71zM741 123c-5 0 -11 3 -11 10c0 6 2 11 5 18c16 36 40 79 83 79c18 0 30 -9 35 -22s2 -21 7 -21c1 0 8 8 16 17c13 15 29 27 53 27 c19 0 32 -8 38 -23c5 -13 2 -21 7 -21c1 0 8 8 16 17c13 14 29 27 53 27c31 0 44 -24 44 -49c0 -49 -41 -118 -41 -148c0 -8 4 -13 11 -13c15 0 25 22 33 42c3 8 7 10 11 10c6 0 10 -4 10 -9c0 -4 -1 -8 -3 -13c-11 -29 -28 -57 -65 -57c-28 0 -48 12 -48 39 c0 40 39 105 39 138c0 9 -5 16 -14 16c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l45 137c3 9 4 15 4 21c0 11 -6 17 -16 17c-26 0 -50 -37 -63 -76l-34 -102c-2 -6 -3 -9 -12 -9h-30c-7 0 -9 1 -9 5c0 2 0 4 1 7l47 143 c2 7 6 21 6 28s-3 12 -10 12c-20 0 -40 -39 -50 -63c-2 -5 -5 -9 -11 -9zM1181 50c0 -19 8 -31 23 -31c47 0 81 110 81 150c0 19 -5 34 -23 34c-45 0 -81 -96 -81 -153z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E520.xml b/data/Bravura/E520.xml
new file mode 100644
index 00000000000..673fab55680
--- /dev/null
+++ b/data/Bravura/E520.xml
@@ -0,0 +1 @@
+<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-89 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM144 56c0 -21 8 -32 25 -32c48 0 101 127 101 176 c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E521.xml b/data/Bravura/E521.xml
new file mode 100644
index 00000000000..204b975adc2
--- /dev/null
+++ b/data/Bravura/E521.xml
@@ -0,0 +1 @@
+<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-20 155c0 5 2 10 7 19c31 56 62 99 115 99c19 0 33 -10 39 -23c6 -14 3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c25 0 38 -11 44 -24s3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c41 0 54 -29 54 -54c0 -55 -58 -142 -58 -177c0 -6 2 -9 8 -9c13 0 32 24 51 54 c5 8 8 13 15 13c5 0 9 -3 9 -9c0 -5 -3 -11 -9 -21c-32 -53 -67 -81 -105 -81c-29 0 -45 14 -45 40c0 42 62 145 62 180c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11c62 155 63 155 63 156c6 14 10 25 10 37 c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -27 -68 -78c-5 -8 -8 -13 -15 -13c-6 0 -11 4 -11 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E522.xml b/data/Bravura/E522.xml
new file mode 100644
index 00000000000..08d7af7304f
--- /dev/null
+++ b/data/Bravura/E522.xml
@@ -0,0 +1 @@
+<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-141 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E523.xml b/data/Bravura/E523.xml
new file mode 100644
index 00000000000..266d653d823
--- /dev/null
+++ b/data/Bravura/E523.xml
@@ -0,0 +1 @@
+<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-9 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c32 60 65 99 114 99c20 0 34 -10 40 -23c7 -16 3 -21 8 -21c4 0 5 4 14 14c15 17 36 31 62 31c37 0 52 -24 52 -53c0 -35 -18 -55 -42 -55c-21 0 -36 12 -36 32c0 28 22 31 22 40c0 4 -4 6 -10 6c-22 0 -54 -37 -67 -70l-65 -162 c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -68 -78c-4 -8 -8 -13 -15 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E524.xml b/data/Bravura/E524.xml
new file mode 100644
index 00000000000..c003a424a16
--- /dev/null
+++ b/data/Bravura/E524.xml
@@ -0,0 +1 @@
+<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M87 -10c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38 c-20 0 -35 12 -35 32c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E525.xml b/data/Bravura/E525.xml
new file mode 100644
index 00000000000..643d0623b3e
--- /dev/null
+++ b/data/Bravura/E525.xml
@@ -0,0 +1 @@
+<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-17 -1c-8 0 -13 5 -13 12c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6 c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31 c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E526.xml b/data/Bravura/E526.xml
new file mode 100644
index 00000000000..0edfb85a4c7
--- /dev/null
+++ b/data/Bravura/E526.xml
@@ -0,0 +1 @@
+<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-12 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 56 62 99 115 99c19 0 33 -10 39 -23c6 -14 3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c41 0 54 -29 54 -54c0 -55 -58 -142 -58 -177c0 -6 2 -9 8 -9c13 0 32 24 51 54c5 8 8 13 15 13c5 0 9 -3 9 -9c0 -5 -3 -11 -9 -21 c-32 -53 -67 -81 -105 -81c-29 0 -45 14 -45 40c0 42 62 145 62 180c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -27 -68 -78c-5 -8 -8 -13 -15 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E527.xml b/data/Bravura/E527.xml
new file mode 100644
index 00000000000..22d362032a9
--- /dev/null
+++ b/data/Bravura/E527.xml
@@ -0,0 +1 @@
+<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-102 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM1685 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31 c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM975 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM1318 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30 c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12 l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM265 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6 c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112 c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM608 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19 c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12 c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM1570 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM1925 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37 c-24 0 -50 -29 -64 -63zM841 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM486 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49 c-11 -28 -19 -48 -19 -69zM150 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM1215 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E528.xml b/data/Bravura/E528.xml
new file mode 100644
index 00000000000..ec28c2441c9
--- /dev/null
+++ b/data/Bravura/E528.xml
@@ -0,0 +1 @@
+<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-102 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM1318 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305 c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM963 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM620 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM253 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30 c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12 l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM1196 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM1570 125 c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM505 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM131 56c0 -21 8 -32 25 -32c48 0 101 127 101 176 c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM860 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E529.xml b/data/Bravura/E529.xml
new file mode 100644
index 00000000000..ee7d85bec84
--- /dev/null
+++ b/data/Bravura/E529.xml
@@ -0,0 +1 @@
+<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-102 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM963 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305 c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM253 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM608 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12 c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9 c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM860 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63zM486 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM131 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM1196 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52A.xml b/data/Bravura/E52A.xml
new file mode 100644
index 00000000000..7a7d4ad08f8
--- /dev/null
+++ b/data/Bravura/E52A.xml
@@ -0,0 +1 @@
+<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-92 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM618 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305 c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM263 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25 c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195 c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM515 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37 c-24 0 -50 -29 -64 -63zM851 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM160 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52B.xml b/data/Bravura/E52B.xml
new file mode 100644
index 00000000000..25a77992a6b
--- /dev/null
+++ b/data/Bravura/E52B.xml
@@ -0,0 +1 @@
+<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-70 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20 c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM285 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31 c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-2 -2 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM506 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63 l-20 -49c-11 -28 -19 -48 -19 -69zM151 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52C.xml b/data/Bravura/E52C.xml
new file mode 100644
index 00000000000..ece74a74de4
--- /dev/null
+++ b/data/Bravura/E52C.xml
@@ -0,0 +1 @@
+<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-9 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 56 62 99 115 99c19 0 33 -10 39 -23c6 -14 3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c25 0 38 -11 44 -24s3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c41 0 54 -29 54 -54c0 -55 -58 -142 -58 -177c0 -6 2 -9 8 -9 c20 0 45 37 73 98l7 16c24 54 56 125 131 125c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40 c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -2 12 -10 12c-26 0 -52 -51 -82 -119c-31 -71 -71 -126 -134 -126c-29 0 -45 14 -45 40c0 42 62 145 62 180c0 8 -3 14 -15 14 c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11c62 155 63 155 63 156c6 14 10 25 10 37c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25 c0 7 -3 12 -11 12c-18 0 -38 -27 -68 -78c-5 -8 -8 -13 -15 -13zM603 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52D.xml b/data/Bravura/E52D.xml
new file mode 100644
index 00000000000..cd548201e0f
--- /dev/null
+++ b/data/Bravura/E52D.xml
@@ -0,0 +1 @@
+<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M388 -165c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14 c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164zM-20 155c0 5 2 10 7 19c31 56 62 99 115 99c19 0 33 -10 39 -23c6 -14 3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c25 0 38 -11 44 -24s3 -21 8 -21c4 0 5 4 15 14c16 17 39 31 68 31c41 0 54 -29 54 -54 c0 -55 -58 -142 -58 -177c0 -6 2 -9 8 -9c13 0 32 24 51 54c5 8 8 13 15 13c5 0 9 -3 9 -9c0 -5 -3 -11 -9 -21c-32 -53 -67 -81 -105 -81c-29 0 -45 14 -45 40c0 42 62 145 62 180c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49 c-8 0 -11 2 -11 6c0 3 1 6 3 11c62 155 63 155 63 156c6 14 10 25 10 37c0 8 -3 14 -15 14c-22 0 -43 -21 -55 -50l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -27 -68 -78c-5 -8 -8 -13 -15 -13 c-6 0 -11 4 -11 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52E.xml b/data/Bravura/E52E.xml
new file mode 100644
index 00000000000..1f0b0e4b57a
--- /dev/null
+++ b/data/Bravura/E52E.xml
@@ -0,0 +1 @@
+<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM265 -85c0 31 22 55 52 55c27 0 45 -15 45 -41 c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM161 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E52F.xml b/data/Bravura/E52F.xml
new file mode 100644
index 00000000000..f712e725f16
--- /dev/null
+++ b/data/Bravura/E52F.xml
@@ -0,0 +1 @@
+<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-135 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 97 80 165 178 165 c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62 c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E530.xml b/data/Bravura/E530.xml
new file mode 100644
index 00000000000..10b7f4035ee
--- /dev/null
+++ b/data/Bravura/E530.xml
@@ -0,0 +1 @@
+<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-80 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51 c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8 c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39 c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39 c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E531.xml b/data/Bravura/E531.xml
new file mode 100644
index 00000000000..1ad5e9908a3
--- /dev/null
+++ b/data/Bravura/E531.xml
@@ -0,0 +1 @@
+<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-80 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51 c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4 c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12 c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5 c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5 c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5 c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E532.xml b/data/Bravura/E532.xml
new file mode 100644
index 00000000000..7d570f2f3dc
--- /dev/null
+++ b/data/Bravura/E532.xml
@@ -0,0 +1 @@
+<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-80 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51 c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4 c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107 c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112 c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E533.xml b/data/Bravura/E533.xml
new file mode 100644
index 00000000000..d9d13d014c7
--- /dev/null
+++ b/data/Bravura/E533.xml
@@ -0,0 +1 @@
+<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-80 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51 c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4 c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107 c14 0 15 0 20 15c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67 s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E534.xml b/data/Bravura/E534.xml
new file mode 100644
index 00000000000..aa702cf12ee
--- /dev/null
+++ b/data/Bravura/E534.xml
@@ -0,0 +1 @@
+<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM-141 -85c0 31 22 55 52 55c27 0 45 -15 45 -41 c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM397 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E535.xml b/data/Bravura/E535.xml
new file mode 100644
index 00000000000..d7c509e138e
--- /dev/null
+++ b/data/Bravura/E535.xml
@@ -0,0 +1 @@
+<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-141 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM236 -1c-8 0 -13 5 -13 12c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13 c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44 c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E536.xml b/data/Bravura/E536.xml
new file mode 100644
index 00000000000..9b726460ad3
--- /dev/null
+++ b/data/Bravura/E536.xml
@@ -0,0 +1 @@
+<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM87 -10c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83 c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E537.xml b/data/Bravura/E537.xml
new file mode 100644
index 00000000000..f9ddf704e78
--- /dev/null
+++ b/data/Bravura/E537.xml
@@ -0,0 +1 @@
+<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M390 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26 c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM89 -85c0 31 22 55 52 55c27 0 45 -15 45 -41 c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM0 54 c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32c0 11 4 19 10 24 c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93c-53 0 -87 31 -87 64zM623 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49 c-11 -28 -19 -48 -19 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E538.xml b/data/Bravura/E538.xml
new file mode 100644
index 00000000000..87016694f24
--- /dev/null
+++ b/data/Bravura/E538.xml
@@ -0,0 +1 @@
+<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M401 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20 c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM744 -130c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305 c3 7 6 17 6 25c0 7 -3 12 -11 12c-15 0 -28 -17 -38 -30c-3 -5 -4 -6 -4 -6c-5 -7 -9 -12 -16 -12c-6 0 -11 3 -11 10c0 5 2 10 8 19c22 31 48 57 96 57c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20c18 16 40 26 71 26c56 0 92 -31 92 -89 c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193c-8 0 -12 4 -12 12zM100 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37 c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 186 165c61 0 84 -30 84 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38 c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h44c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-49c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM87 -10c-53 0 -87 31 -87 64 c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32c0 11 4 19 10 24 c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93zM977 56c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69zM622 56 c0 -21 8 -32 25 -32c48 0 101 127 101 176c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63l-20 -49c-11 -28 -19 -48 -19 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E539.xml b/data/Bravura/E539.xml
new file mode 100644
index 00000000000..79893f39367
--- /dev/null
+++ b/data/Bravura/E539.xml
@@ -0,0 +1 @@
+<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M94 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM87 -10c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83 c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93zM472 -1c-8 0 -13 5 -13 12c0 8 4 12 12 20l154 156 c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158 c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E53A.xml b/data/Bravura/E53A.xml
new file mode 100644
index 00000000000..0b0005d0387
--- /dev/null
+++ b/data/Bravura/E53A.xml
@@ -0,0 +1 @@
+<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M633 -142c-8 0 -12 4 -12 12c0 9 4 13 13 13h31c10 0 12 2 15 10l123 305c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -67 -76c-5 -9 -9 -15 -16 -15c-6 0 -11 4 -11 11c0 5 2 10 7 19c31 57 63 99 122 99c26 0 41 -9 48 -21c9 -17 6 -24 11 -24c4 0 7 8 21 20 c18 16 40 26 71 26c56 0 92 -31 92 -89c0 -95 -78 -195 -174 -195c-17 0 -30 2 -44 9c-16 8 -19 18 -24 18s-7 -7 -9 -12l-45 -112c-1 -3 -2 -6 -2 -7c0 -3 3 -3 9 -3h40c8 0 12 -4 12 -12c0 -9 -4 -13 -13 -13h-193zM99 -85c0 31 22 55 52 55c27 0 45 -15 45 -41 c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15c33 96 87 165 184 165c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42 c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM87 -10 c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38c-20 0 -35 12 -35 32 c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93zM465 11c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21 c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10 s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12c-8 0 -13 5 -13 12zM873 125c-11 -28 -19 -48 -19 -69s8 -32 25 -32c48 0 101 127 101 176 c0 22 -6 37 -23 37c-24 0 -50 -29 -64 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E53B.xml b/data/Bravura/E53B.xml
new file mode 100644
index 00000000000..78639ea8bef
--- /dev/null
+++ b/data/Bravura/E53B.xml
@@ -0,0 +1 @@
+<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M175 -152c-42 0 -75 23 -75 67c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-58c-10 0 -15 5 -15 15c0 11 5 16 16 16h58c14 0 15 0 20 15 c33 97 80 165 178 165c57 0 77 -29 77 -55c0 -33 -17 -51 -44 -51c-24 0 -42 12 -42 41c0 27 18 31 18 38c0 3 -3 4 -8 4c-39 0 -54 -53 -74 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h107c14 0 15 0 20 15c33 96 87 165 186 165c61 0 84 -30 84 -67s-23 -54 -49 -54 c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h44c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-49c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164 c-42 0 -72 23 -72 62c0 31 18 52 49 52c24 0 41 -15 41 -39c0 -16 -5 -27 -17 -35c-11 -7 -15 -9 -15 -13c0 -3 2 -5 10 -5c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-112c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207c-55 -113 -102 -164 -178 -164z M87 -10c-53 0 -87 31 -87 64c0 27 17 47 41 47c19 0 36 -13 36 -33c0 -13 -5 -23 -14 -29c-11 -7 -17 -5 -17 -10c0 -7 17 -15 42 -15c32 0 51 23 51 45c0 20 -9 33 -38 53c-35 24 -54 43 -54 78c0 53 41 83 100 83c51 0 82 -23 82 -60c0 -19 -13 -38 -37 -38 c-20 0 -35 12 -35 32c0 11 4 19 10 24c7 5 12 5 12 9c0 7 -14 11 -31 11c-31 0 -43 -17 -43 -33c0 -19 12 -30 48 -57c39 -29 49 -50 49 -78c0 -58 -50 -93 -115 -93zM690 11c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3 c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35 c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12c-8 0 -13 5 -13 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E53C.xml b/data/Bravura/E53C.xml
new file mode 100644
index 00000000000..92da373345f
--- /dev/null
+++ b/data/Bravura/E53C.xml
@@ -0,0 +1 @@
+<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-32c-10 0 -15 5 -15 15c0 11 5 16 16 16h32c14 0 15 0 20 15c33 96 87 165 184 165 c63 0 86 -30 86 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h60c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-65c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM-9 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c32 60 65 99 114 99c20 0 34 -10 40 -23c7 -16 3 -21 8 -21c4 0 5 4 14 14c15 17 36 31 62 31c37 0 52 -24 52 -53c0 -35 -18 -55 -42 -55c-21 0 -36 12 -36 32 c0 28 22 31 22 40c0 4 -4 6 -10 6c-22 0 -54 -37 -67 -70l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -68 -78c-4 -8 -8 -13 -15 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E53D.xml b/data/Bravura/E53D.xml
new file mode 100644
index 00000000000..09ca8f9cc40
--- /dev/null
+++ b/data/Bravura/E53D.xml
@@ -0,0 +1 @@
+<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 -85c0 31 22 55 52 55c27 0 45 -15 45 -41c0 -16 -8 -29 -20 -37c-15 -10 -24 -5 -24 -13c0 -5 5 -9 18 -9c40 0 58 32 86 130l63 219c1 5 2 8 2 10c0 4 -2 4 -8 4h-32c-10 0 -15 5 -15 15c0 11 5 16 16 16h32c14 0 15 0 20 15c33 96 87 165 186 165 c61 0 84 -30 84 -67s-23 -54 -49 -54c-25 0 -45 14 -45 42c0 18 8 32 21 38c11 5 16 4 16 10s-8 8 -16 8c-50 0 -72 -53 -92 -140c-1 -6 -2 -9 -2 -12c0 -5 3 -5 10 -5h44c10 0 15 -5 15 -15c0 -11 -5 -16 -16 -16h-49c-4 0 -14 -9 -14 -14c-24 -84 -46 -146 -75 -207 c-55 -113 -102 -164 -178 -164c-42 0 -75 23 -75 67zM483 -1c-8 0 -13 5 -13 12c0 8 4 12 12 20l154 156c1 1 23 23 19 23c-6 0 -20 -7 -38 -7c-29 0 -46 3 -50 3c-6 0 -8 -6 -11 -12l-10 -21c-4 -9 -8 -15 -15 -15c-6 0 -11 3 -11 10c0 4 1 9 3 15l24 70c3 9 8 13 18 13 c12 0 41 -9 101 -9c14 0 30 2 41 5s16 6 24 6c7 0 13 -4 13 -11c0 -8 -5 -14 -13 -22l-160 -158c-5 -5 -12 -17 -12 -17c3 0 9 6 22 6c39 0 48 -35 78 -35c9 0 16 4 20 11c2 4 4 8 4 10s-1 3 -3 3c-3 0 -6 -5 -16 -5c-14 0 -27 11 -27 30c0 21 15 35 33 35s36 -13 36 -44 c0 -41 -26 -81 -82 -81c-49 0 -69 31 -97 31c-8 0 -16 -4 -24 -10c-5 -4 -11 -12 -20 -12zM-9 144c-6 0 -11 4 -11 11c0 5 2 10 7 19c32 60 65 99 114 99c20 0 34 -10 40 -23c7 -16 3 -21 8 -21c4 0 5 4 14 14c15 17 36 31 62 31c37 0 52 -24 52 -53c0 -35 -18 -55 -42 -55 c-21 0 -36 12 -36 32c0 28 22 31 22 40c0 4 -4 6 -10 6c-22 0 -54 -37 -67 -70l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11l73 181c3 7 6 17 6 25c0 7 -3 12 -11 12c-18 0 -38 -26 -68 -78c-4 -8 -8 -13 -15 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E566.xml b/data/Bravura/E566.xml
new file mode 100644
index 00000000000..0bd5013fb76
--- /dev/null
+++ b/data/Bravura/E566.xml
@@ -0,0 +1 @@
+<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M66 146c-45 0 -66 26 -66 57c0 42 35 70 82 70c15 0 28 -3 42 -9c9 -4 15 -9 19 -9c3 0 4 2 8 12l36 88c4 10 8 13 17 16l49 16c3 1 9 3 13 3s6 -2 6 -6c0 -3 -1 -6 -3 -11l-50 -124c-2 -5 -5 -11 -5 -15c0 -2 1 -3 3 -3c5 0 11 4 24 11c21 11 59 31 99 31 c22 0 37 -9 44 -22c8 -15 4 -22 9 -22c4 0 5 4 14 14c15 17 36 31 62 31c37 0 52 -24 52 -53c0 -35 -18 -55 -42 -55c-21 0 -36 12 -36 32c0 28 22 31 22 40c0 4 -4 6 -10 6c-22 0 -54 -37 -67 -70l-65 -162c-4 -10 -7 -12 -16 -12h-49c-8 0 -11 2 -11 6c0 3 1 6 3 11 l73 181c3 7 6 19 6 29c0 12 -4 15 -13 15c-19 0 -43 -14 -78 -35l-6 -3c-16 -9 -22 -14 -22 -20c0 -3 1 -5 3 -10c9 -22 13 -44 13 -68c0 -74 -50 -116 -102 -116c-38 0 -57 22 -57 50c0 21 8 41 19 68l11 27c2 5 3 8 3 10s-1 3 -3 3c-6 0 -19 -2 -31 -2zM82 250 c-40 0 -55 -23 -55 -41c0 -14 8 -30 41 -30c10 0 22 2 35 5s17 6 22 19l4 10c2 5 4 10 4 13c0 15 -40 24 -51 24zM136 33c0 -7 3 -12 11 -12c29 0 56 40 56 84c0 9 -5 62 -14 62c-3 0 -4 -2 -6 -7c-38 -95 -39 -95 -39 -96c-4 -10 -8 -23 -8 -31z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E567.xml b/data/Bravura/E567.xml
new file mode 100644
index 00000000000..3ab7c50ed58
--- /dev/null
+++ b/data/Bravura/E567.xml
@@ -0,0 +1 @@
+<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 103c0 64 38 114 104 114c65 0 109 -38 158 -92c43 -48 76 -75 108 -75c35 0 65 21 65 64c0 26 -16 47 -33 47c-21 0 -22 -23 -51 -23c-21 0 -36 14 -36 36c0 30 25 44 56 44c43 0 89 -31 89 -103c0 -64 -38 -114 -104 -114c-65 0 -109 38 -158 92 c-43 48 -76 75 -108 75c-35 0 -65 -21 -65 -64c0 -26 16 -47 33 -47c21 0 22 23 51 23c21 0 36 -14 36 -36c0 -30 -25 -44 -56 -44c-43 0 -89 31 -89 103z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E568.xml b/data/Bravura/E568.xml
new file mode 100644
index 00000000000..8fe035f9ed4
--- /dev/null
+++ b/data/Bravura/E568.xml
@@ -0,0 +1 @@
+<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-3 115c0 72 46 103 89 103c31 0 56 -14 56 -44c0 -22 -15 -36 -36 -36c-29 0 -30 23 -51 23c-17 0 -33 -21 -33 -47c0 -43 30 -64 65 -64c32 0 65 27 108 75c49 54 93 92 158 92c66 0 104 -50 104 -114c0 -72 -46 -103 -89 -103c-31 0 -56 14 -56 44c0 22 15 36 36 36 c29 0 30 -23 51 -23c17 0 33 21 33 47c0 43 -30 64 -65 64c-32 0 -65 -27 -108 -75c-49 -54 -93 -92 -158 -92c-66 0 -104 50 -104 114z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E569.xml b/data/Bravura/E569.xml
new file mode 100644
index 00000000000..a023c122b91
--- /dev/null
+++ b/data/Bravura/E569.xml
@@ -0,0 +1 @@
+<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 64 38 114 104 114c29 0 54 -9 77 -23c18 -11 23 -18 29 -18c4 0 5 4 5 15v100c0 11 4 16 16 16s16 -5 16 -16v-129c0 -18 2 -20 15 -34c44 -48 76 -78 108 -78c35 0 65 21 65 64c0 26 -16 47 -33 47c-21 0 -22 -23 -51 -23c-21 0 -36 14 -36 36 c0 30 25 44 56 44c43 0 89 -31 89 -103c0 -64 -38 -114 -104 -114c-29 0 -54 9 -77 23c-18 11 -23 18 -29 18c-5 0 -5 -4 -5 -15v-100c0 -11 -4 -16 -16 -16s-16 5 -16 16v129c0 18 -2 20 -15 34c-44 48 -76 78 -108 78c-35 0 -65 -21 -65 -64c0 -26 16 -47 33 -47 c21 0 22 23 51 23c21 0 36 -14 36 -36c0 -30 -25 -44 -56 -44c-43 0 -89 31 -89 103z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56A.xml b/data/Bravura/E56A.xml
new file mode 100644
index 00000000000..48a46318a1d
--- /dev/null
+++ b/data/Bravura/E56A.xml
@@ -0,0 +1 @@
+<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 371c0 43 31 89 103 89c64 0 114 -38 114 -104c0 -65 -38 -109 -92 -158c-48 -43 -75 -76 -75 -108c0 -35 21 -65 64 -65c26 0 47 16 47 33c0 21 -23 22 -23 51c0 21 14 36 36 36c30 0 44 -25 44 -56c0 -43 -31 -89 -103 -89c-64 0 -114 38 -114 104 c0 65 38 109 92 158c48 43 75 76 75 108c0 35 -21 65 -64 65c-26 0 -47 -16 -47 -33c0 -21 23 -22 23 -51c0 -21 -14 -36 -36 -36c-30 0 -44 25 -44 56z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56B.xml b/data/Bravura/E56B.xml
new file mode 100644
index 00000000000..e24ac5cc643
--- /dev/null
+++ b/data/Bravura/E56B.xml
@@ -0,0 +1 @@
+<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-3 89c0 31 14 56 44 56c22 0 36 -15 36 -36c0 -29 -23 -30 -23 -51c0 -17 21 -33 47 -33c43 0 64 30 64 65c0 32 -27 65 -75 108c-54 49 -92 93 -92 158c0 66 50 104 114 104c72 0 103 -46 103 -89c0 -31 -14 -56 -44 -56c-22 0 -36 15 -36 36c0 29 23 30 23 51 c0 17 -21 33 -47 33c-43 0 -64 -30 -64 -65c0 -32 27 -65 75 -108c54 -49 92 -93 92 -158c0 -66 -50 -104 -114 -104c-72 0 -103 46 -103 89z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56C.xml b/data/Bravura/E56C.xml
new file mode 100644
index 00000000000..fefc88f0b7a
--- /dev/null
+++ b/data/Bravura/E56C.xml
@@ -0,0 +1 @@
+<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 40c-15 0 -20 4 -20 10c0 10 6 17 11 23c50 56 99 113 145 163c9 7 15 9 22 9c18 -2 24 -10 31 -19l89 -110c3 -4 7 -4 10 0c33 32 62 64 90 95c7 8 14 17 23 25c9 7 15 8 24 8c7 0 15 -6 23 -14c10 -9 76 -90 85 -99c5 -5 10 -10 17 -10c5 0 11 3 19 10 c11 11 80 98 91 107c6 4 12 7 18 7c9 0 27 -8 27 -18c0 -4 -8 -15 -14 -23c-13 -15 -177 -193 -184 -199c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-9 10 -82 87 -87 92c-8 9 -11 12 -16 12c-3 0 -8 -1 -15 -8l-108 -98c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 92 c-7 8 -11 12 -16 12c-4 0 -8 -1 -11 -4l-61 -54c-11 -10 -20 -13 -29 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56D.xml b/data/Bravura/E56D.xml
new file mode 100644
index 00000000000..57b7f580d0e
--- /dev/null
+++ b/data/Bravura/E56D.xml
@@ -0,0 +1 @@
+<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M21 41c-15 0 -20 4 -20 10c0 7 7 17 13 23l143 162c8 6 13 9 22 9c17 -1 23 -10 31 -18c5 -7 59 -69 95 -111c4 -5 10 -5 14 0l29 34v169h31v-135l24 27c7 8 14 18 23 25s14 9 22 9s16 -6 25 -14c10 -9 76 -91 84 -99c5 -5 11 -10 18 -10c5 0 10 3 18 10 c12 11 81 97 92 106c5 4 11 7 18 7c8 0 26 -7 26 -17c0 -7 -6 -14 -12 -20l-2 -3c-13 -15 -176 -193 -184 -199c-4 -4 -11 -6 -19 -6c-7 0 -15 2 -19 7c-9 10 -83 87 -87 93c-6 8 -11 11 -16 11c-4 0 -8 -2 -12 -5v-179h-32v152c-16 -14 -74 -67 -84 -73 c-4 -4 -11 -6 -18 -6c-8 0 -16 2 -20 7l-87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -34c-10 -10 -24 -24 -40 -24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56E.xml b/data/Bravura/E56E.xml
new file mode 100644
index 00000000000..c74d7b3d287
--- /dev/null
+++ b/data/Bravura/E56E.xml
@@ -0,0 +1 @@
+<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 50c0 3 8 17 12 24l121 137c8 8 15 17 24 24c7 7 12 9 21 9c16 -1 23 -9 31 -18l95 -110c1 -2 5 -2 6 0l107 119c8 7 13 9 22 9c16 -1 23 -9 31 -18c37 -43 57 -69 95 -111c2 -2 6 -2 8 0c27 32 56 64 84 96c7 8 14 17 23 24c9 8 15 9 22 9c8 0 16 -6 25 -14 c10 -9 76 -91 85 -99c5 -5 10 -10 17 -10c5 0 11 3 19 10c11 11 80 97 91 106c6 5 12 7 19 7c9 0 26 -6 26 -17c0 -4 -8 -15 -14 -23c-13 -15 -177 -193 -184 -199c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -21 7l-87 92c-6 8 -10 12 -15 12s-6 -1 -16 -9l-106 -97 c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 9 -82 86 -86 92c-7 8 -11 12 -16 12c-4 0 -11 -4 -15 -8l-105 -98c-4 -3 -11 -5 -19 -5s-15 2 -19 7c-9 9 -83 86 -87 92c-7 8 -11 12 -16 12c-4 0 -11 -5 -19 -11c-1 0 -1 -1 -3 -2l-38 -34c-11 -10 -26 -24 -41 -24s-20 4 -20 10z "/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E56F.xml b/data/Bravura/E56F.xml
new file mode 100644
index 00000000000..95c89045b1e
--- /dev/null
+++ b/data/Bravura/E56F.xml
@@ -0,0 +1 @@
+<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 55c0 18 19 128 112 128c62 0 123 -39 157 -64l66 88c3 4 7 6 12 6c3 0 6 -1 9 -3c4 -3 6 -7 6 -12c0 -3 -1 -7 -3 -9l-66 -88c28 -21 74 -51 104 -51c35 0 67 52 67 82c0 29 10 45 22 45c10 0 13 -13 13 -32c0 -18 -13 -144 -109 -144h-3c-11 0 -59 4 -131 52l-66 -87 c-3 -4 -8 -6 -12 -6c-3 0 -6 1 -9 3c-4 3 -6 8 -6 12c0 3 1 6 3 9l66 87c-15 11 -86 63 -120 63c-35 0 -72 -26 -75 -87v-7c0 -12 -2 -36 -15 -36c-19 0 -22 32 -22 51z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E583.xml b/data/Bravura/E583.xml
new file mode 100644
index 00000000000..bc50a2ebcfc
--- /dev/null
+++ b/data/Bravura/E583.xml
@@ -0,0 +1 @@
+<symbol id="E583" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 109h-24v280h24v-280z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E587.xml b/data/Bravura/E587.xml
new file mode 100644
index 00000000000..1bcb325b4b6
--- /dev/null
+++ b/data/Bravura/E587.xml
@@ -0,0 +1 @@
+<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M19 40c-15 0 -19 4 -19 10c0 5 7 17 11 24l122 137c7 8 14 17 23 25c7 6 12 8 18 8h4c17 -1 24 -9 31 -18c5 -6 63 -74 100 -116l4 6l84 95c8 8 15 17 23 24c9 8 15 9 24 9c7 0 15 -6 24 -14c10 -10 76 -91 85 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10 c11 11 405 522 524 528l17 1c12 0 13 -7 14 -15c0 -10 -16 -26 -29 -27c-119 -7 -521 -591 -588 -613c-5 -2 -14 -4 -22 -4c-7 0 -13 2 -17 6c-8 10 -82 87 -86 92c-7 8 -11 12 -16 12c-4 0 -11 -5 -19 -11c-1 0 -1 -1 -3 -2l-38 -34c-7 -6 -13 -14 -22 -19 c-20 -20 -39 -37 -42 -40c-4 -3 -11 -5 -19 -5s-15 2 -19 7c-9 10 -83 87 -87 92c-6 8 -11 12 -16 12c-3 0 -9 -4 -15 -8c-1 0 -1 -1 -3 -2l-3 -3c-14 -11 -26 -22 -39 -34c-11 -10 -26 -24 -41 -24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E59D.xml b/data/Bravura/E59D.xml
new file mode 100644
index 00000000000..b9dd9a953cb
--- /dev/null
+++ b/data/Bravura/E59D.xml
@@ -0,0 +1 @@
+<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-32 40c-15 0 -20 5 -20 11c0 7 7 17 12 22c13 15 24 29 37 43c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c7 -10 128 -149 128 -149c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12 s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E59E.xml b/data/Bravura/E59E.xml
new file mode 100644
index 00000000000..26d5719cba1
--- /dev/null
+++ b/data/Bravura/E59E.xml
@@ -0,0 +1 @@
+<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-54 50c0 3 8 17 12 24l121 137c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5 s-16 2 -20 7c-8 10 -82 87 -86 93c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-13 -11 -26 -23 -38 -35c-11 -10 -26 -24 -41 -24s-20 4 -20 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B0.xml b/data/Bravura/E5B0.xml
new file mode 100644
index 00000000000..de61443d28a
--- /dev/null
+++ b/data/Bravura/E5B0.xml
@@ -0,0 +1 @@
+<symbol id="E5B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 40c-15 0 -20 5 -20 11c0 7 7 17 12 22c13 15 24 29 37 43c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c4 -7 62 -73 98 -115l4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c4 -7 63 -75 99 -117l3 4 c46 57 178 170 274 188c22 4 44 6 64 6c84 0 151 -30 189 -57c5 -4 8 -11 8 -16c0 -3 -1 -5 -3 -7c-2 -1 -4 -2 -6 -2c-9 0 -20 9 -30 14c-42 21 -88 29 -135 29c-91 0 -166 -28 -227 -80c-60 -51 -115 -125 -136 -148c-12 -14 -35 -40 -57 -40c-3 -1 -6 -1 -9 -1 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13l-24 -21c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B1.xml b/data/Bravura/E5B1.xml
new file mode 100644
index 00000000000..ad0b557bb47
--- /dev/null
+++ b/data/Bravura/E5B1.xml
@@ -0,0 +1 @@
+<symbol id="E5B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 39c-15 0 -20 5 -20 11c0 7 7 17 12 22c13 15 24 29 37 43c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 98 -115c2 1 3 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 98 -115c2 1 3 3 4 4 c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c21 -1 32 -37 52 -72c56 -99 196 -327 356 -327c15 0 19 -5 19 -10c0 -9 -11 -20 -18 -20h-12c-199 0 -388 221 -435 294c-4 6 -8 8 -12 8s-16 -9 -29 -19c-8 -7 -16 -13 -24 -21c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B2.xml b/data/Bravura/E5B2.xml
new file mode 100644
index 00000000000..30f287b8bb5
--- /dev/null
+++ b/data/Bravura/E5B2.xml
@@ -0,0 +1 @@
+<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M84 0c-37 0 -84 28 -84 144v284c0 6 2 39 36 52c2 1 4 1 6 1c7 0 13 -7 13 -31v-313c0 -6 1 -76 45 -76c19 0 61 25 68 39l15 17c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -73 99 -115c2 1 3 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25 s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -73 99 -115l87 99c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200 c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 93c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-13 -11 -26 -23 -38 -35c-5 -5 -10 -11 -17 -16l-45 -43c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13 c-14 -11 -26 -23 -39 -35l-15 -14c-22 -21 -42 -41 -47 -45c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-6 -5 -12 -13 -21 -18c-12 -10 -56 -47 -89 -47z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B3.xml b/data/Bravura/E5B3.xml
new file mode 100644
index 00000000000..17c2a847652
--- /dev/null
+++ b/data/Bravura/E5B3.xml
@@ -0,0 +1 @@
+<symbol id="E5B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 428c0 6 2 39 36 52c2 1 4 1 6 1c7 0 13 -7 13 -31v-313c0 -6 1 -76 45 -76c23 0 47 19 63 33l19 23c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116l4 5c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 60 -71 96 -113c26 31 78 99 104 165c19 46 24 113 24 172c0 53 -4 101 -5 121v8c0 23 4 38 8 38c3 0 7 -7 11 -23c5 -19 33 -93 33 -183c0 -121 -55 -251 -143 -334c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93 c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-5 -5 -9 -10 -15 -15c-22 -21 -43 -41 -47 -44s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35l-13 -12s-59 -53 -96 -53s-84 28 -84 144 v284z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B4.xml b/data/Bravura/E5B4.xml
new file mode 100644
index 00000000000..b52dfb495e4
--- /dev/null
+++ b/data/Bravura/E5B4.xml
@@ -0,0 +1 @@
+<symbol id="E5B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 11c-64 33 -99 93 -99 186c0 71 64 154 165 154c18 0 82 -9 82 -25c0 -3 -1 -8 -4 -8c-11 0 -31 8 -51 8c-89 0 -158 -60 -158 -130c0 -65 55 -147 125 -147c42 0 77 42 112 68l4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 62 -73 99 -115l3 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -72 98 -114l3 3c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c29 -40 65 -77 98 -113l24 29c106 132 285 355 383 361l19 1c10 0 11 -7 12 -15 c0 -10 -16 -26 -29 -27c-75 -5 -250 -224 -351 -350c-10 -13 -20 -25 -28 -35c-1 -1 -3 -2 -4 -4l-28 -33c-14 -16 -38 -41 -62 -41c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-10 0 -38 -26 -45 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-7 -6 -15 -16 -26 -21 c-32 -25 -71 -48 -113 -48c-16 0 -32 3 -48 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B5.xml b/data/Bravura/E5B5.xml
new file mode 100644
index 00000000000..9f4c9983fa7
--- /dev/null
+++ b/data/Bravura/E5B5.xml
@@ -0,0 +1 @@
+<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -100c0 118 177 339 289 339c72 0 113 -48 136 -76l45 -52l4 5c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116l88 100c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10 c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 93c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-13 -11 -26 -23 -38 -35c-6 -6 -13 -13 -21 -18 c-20 -20 -38 -38 -42 -41s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-3 -3 -11 -5 -18 -5c-8 0 -15 2 -20 7c-5 6 -34 36 -57 60c-16 15 -44 60 -103 60c-49 0 -88 -45 -100 -60 c-39 -48 -80 -109 -80 -172c0 -89 87 -166 87 -166c72 -68 165 -72 214 -74h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2c-33 0 -82 5 -147 32c-102 42 -154 116 -168 218c-1 6 -1 11 -1 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B6.xml b/data/Bravura/E5B6.xml
new file mode 100644
index 00000000000..6f82867babc
--- /dev/null
+++ b/data/Bravura/E5B6.xml
@@ -0,0 +1 @@
+<symbol id="E5B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -100c0 118 177 339 289 339c72 0 113 -48 136 -76l3 -3c14 -17 29 -34 42 -48l4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 98 -115l4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -6 59 -70 96 -112 c2 2 4 4 5 4c41 33 85 68 85 125c0 94 -95 115 -170 117c-6 0 -9 3 -9 6c0 4 4 8 12 12c3 2 9 2 17 2c26 0 72 -8 99 -19c47 -27 81 -71 81 -144c0 -55 -48 -107 -91 -143c-29 -27 -67 -65 -73 -70c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93 c-6 8 -10 12 -15 12s-12 -5 -22 -13c-8 -6 -16 -14 -24 -21c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-8 -6 -16 -14 -24 -21c-29 -27 -70 -68 -76 -73c-3 -3 -11 -5 -18 -5c-8 0 -15 2 -20 7 c-5 6 -34 36 -57 60c-16 15 -44 60 -103 60c-49 0 -88 -45 -100 -60c-39 -48 -80 -109 -80 -172c0 -89 87 -166 87 -166c72 -68 165 -72 214 -74h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2c-33 0 -82 5 -147 32c-102 42 -154 116 -168 218 c-1 6 -1 11 -1 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B7.xml b/data/Bravura/E5B7.xml
new file mode 100644
index 00000000000..f0220acde6b
--- /dev/null
+++ b/data/Bravura/E5B7.xml
@@ -0,0 +1 @@
+<symbol id="E5B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 191c0 71 64 154 165 154c18 0 82 -9 82 -25c0 -3 -1 -8 -4 -8c-11 0 -31 8 -51 8c-89 0 -158 -60 -158 -130c0 -65 55 -147 125 -147c43 0 77 43 112 68c2 1 3 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l99 -114l3 3c27 32 55 64 84 95 c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l99 -115c2 1 3 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l99 -115l57 64v155h21v-131l10 11c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9 c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 11 -82 90 -87 95c-5 6 -8 9 -13 9v-172h-21v163l-3 -3c-13 -11 -26 -23 -38 -35c-6 -5 -12 -13 -20 -18 c-21 -19 -39 -37 -43 -41c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35l-15 -14c-22 -21 -42 -41 -47 -45c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12 s-12 -5 -22 -13l-24 -21c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-7 -6 -15 -15 -26 -20c-31 -26 -71 -49 -113 -49c-16 0 -32 3 -48 11c-64 33 -99 93 -99 186z "/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B8.xml b/data/Bravura/E5B8.xml
new file mode 100644
index 00000000000..7f7e51b7db3
--- /dev/null
+++ b/data/Bravura/E5B8.xml
@@ -0,0 +1 @@
+<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -100c0 67 47 143 81 185c36 44 72 84 110 126c7 8 14 18 23 25s15 9 22 9h4c13 -1 22 -7 31 -18c4 -7 62 -74 99 -115c1 1 2 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c4 -7 62 -74 99 -116l47 54v166h41v-120c8 8 14 17 23 25 c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 93l-5 5v-166h-40v154 c-11 -9 -21 -19 -31 -29c-7 -6 -13 -13 -21 -18c-20 -20 -38 -38 -42 -41s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-5 -4 -10 -10 -16 -14l-46 -45c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7 c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-11 -8 -20 -17 -30 -26c-43 -49 -85 -113 -85 -178c0 -60 42 -128 87 -166c72 -68 165 -72 214 -74h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2c-33 0 -82 5 -147 32c-102 42 -154 116 -168 218 c-1 6 -1 11 -1 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5B9.xml b/data/Bravura/E5B9.xml
new file mode 100644
index 00000000000..9f9c480f9b3
--- /dev/null
+++ b/data/Bravura/E5B9.xml
@@ -0,0 +1 @@
+<symbol id="E5B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -195c0 0 -6 2 -6 4c0 1 2 2 7 2h7c50 0 181 56 253 123c42 39 119 114 167 172l42 50l49 54c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -74 99 -115c1 1 2 3 4 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 65 -76 101 -118 l28 34c106 132 285 355 383 361l19 1c10 0 11 -7 12 -15c0 -10 -16 -26 -29 -27c-122 -7 -344 -347 -411 -422c-19 -23 -38 -41 -69 -41c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-5 -4 -10 -10 -16 -14 c-22 -21 -42 -42 -46 -45s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-6 0 -21 -9 -23 -14c-53 -57 -138 -145 -202 -188c-78 -51 -189 -106 -260 -106c-8 0 -15 1 -22 2z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BA.xml b/data/Bravura/E5BA.xml
new file mode 100644
index 00000000000..b548f590eeb
--- /dev/null
+++ b/data/Bravura/E5BA.xml
@@ -0,0 +1 @@
+<symbol id="E5BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -190c0 1 2 2 7 2h7c50 0 181 56 253 123c42 39 113 119 166 173c8 8 23 24 35 38c5 5 10 12 17 19l41 46c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116l4 5c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 60 -71 97 -113c2 3 5 5 5 5c41 33 85 68 85 125c0 94 -95 115 -170 117c-6 0 -9 3 -9 6c0 4 4 8 12 12c3 2 9 2 17 2c26 0 72 -8 99 -19c47 -27 81 -71 81 -144c0 -59 -54 -113 -98 -149c-28 -27 -61 -60 -67 -64c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7 c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-4 -4 -9 -10 -15 -14c-22 -21 -42 -42 -47 -45c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13l-4 -4c-54 -58 -137 -143 -200 -185 c-78 -51 -189 -106 -260 -106c-8 0 -15 1 -22 2c0 0 -6 2 -6 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BB.xml b/data/Bravura/E5BB.xml
new file mode 100644
index 00000000000..391fabb5404
--- /dev/null
+++ b/data/Bravura/E5BB.xml
@@ -0,0 +1 @@
+<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 51c0 7 7 17 12 22c13 15 24 29 37 43c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 99 -115l3 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 99 -115l3 4c27 32 55 64 84 95c7 8 14 18 23 25 s14 9 22 9c13 -1 22 -7 31 -18c5 -7 60 -70 96 -112c3 2 5 4 5 4c41 33 85 68 85 125c0 94 -95 115 -170 117c-6 0 -9 3 -9 6c0 4 4 8 12 12c3 2 9 2 17 2c26 0 72 -8 99 -19c47 -27 81 -71 81 -144c0 -56 -48 -107 -91 -143c-28 -27 -67 -65 -73 -70c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24c-15 0 -20 5 -20 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BC.xml b/data/Bravura/E5BC.xml
new file mode 100644
index 00000000000..d631645c86f
--- /dev/null
+++ b/data/Bravura/E5BC.xml
@@ -0,0 +1 @@
+<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 83c0 102 71 182 177 186h6c87 0 152 -91 185 -147l3 -5c27 32 54 63 82 93c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 99 -115l3 4c27 32 55 64 84 95c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -115l48 54v165h30v-131l10 11 c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 76 -90 85 -99c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 81 97 92 106c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -177 -193 -184 -200c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -82 87 -86 93 c-6 7 -10 10 -14 11v-172h-30v155l-32 -30c-6 -6 -12 -13 -20 -18c-21 -20 -39 -38 -43 -41s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12c-9 0 -39 -27 -46 -34c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7 c-9 10 -83 87 -87 93c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -23 -40 -24h-7c-10 0 -16 2 -19 5c0 1 -1 2 -1 3c-4 10 -7 20 -11 29c-43 109 -59 148 -137 148c-126 0 -140 -124 -140 -187c0 -12 1 -22 1 -28v-7c0 -13 -3 -19 -7 -19 c-17 0 -19 81 -19 94v6z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BD.xml b/data/Bravura/E5BD.xml
new file mode 100644
index 00000000000..18032fe7e5c
--- /dev/null
+++ b/data/Bravura/E5BD.xml
@@ -0,0 +1 @@
+<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 51c0 7 7 17 12 22c13 15 24 29 38 43c27 32 55 65 84 96c7 8 14 18 23 25s15 9 23 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116c1 1 2 3 4 4c27 32 55 65 84 96c7 8 14 18 23 25c10 7 15 9 23 9c13 -1 22 -7 31 -18c4 -6 55 -65 92 -107v212h30v-193l63 72 c8 8 15 17 24 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -179 -195 -186 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -83 88 -87 94 c-7 8 -11 11 -16 11c-12 0 -36 -24 -44 -33c-2 -2 -5 -4 -7 -7v-133h-30v104c-19 -18 -36 -35 -40 -38s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-9 -7 -16 -14 -24 -21c-29 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5 c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -22 -23 -41 -24c-15 0 -20 5 -20 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BE.xml b/data/Bravura/E5BE.xml
new file mode 100644
index 00000000000..4957c67fa5f
--- /dev/null
+++ b/data/Bravura/E5BE.xml
@@ -0,0 +1 @@
+<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 206c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 48 61 176 61c59 0 202 -57 236 -175c0 -2 1 -3 2 -5c1 2 3 4 5 6c27 32 55 65 84 96c7 8 15 18 24 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -73 98 -115l87 99c9 8 15 17 24 25c9 7 15 9 22 9c8 0 16 -6 26 -15 c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -178 -195 -185 -202c-4 -3 -12 -5 -20 -5s-16 2 -20 7c-8 10 -82 88 -86 94c-8 8 -12 11 -17 11c-6 0 -12 -4 -22 -12 c-7 -7 -15 -13 -22 -21c-29 -27 -70 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-10 -9 -21 -24 -40 -25h-7c-13 0 -19 2 -21 9c-6 22 -52 193 -186 208c0 0 -9 1 -22 1 c-32 0 -92 -6 -142 -45c0 0 -13 -7 -19 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5BF.xml b/data/Bravura/E5BF.xml
new file mode 100644
index 00000000000..f9819d3815d
--- /dev/null
+++ b/data/Bravura/E5BF.xml
@@ -0,0 +1 @@
+<symbol id="E5BF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 208c0 3 3 10 11 21c0 0 48 61 176 61c59 0 202 -57 235 -175c1 -2 2 -3 2 -5c2 2 4 4 5 6c28 32 56 65 85 96c7 8 14 18 23 25s14 9 22 9c14 -1 23 -7 32 -18c4 -6 55 -65 91 -107v212h31v-193l63 72c8 8 14 17 23 25c9 7 16 9 23 9c8 0 16 -6 26 -15 c9 -8 76 -91 85 -100c4 -4 11 -9 17 -9c5 0 11 3 19 10c11 10 81 98 92 107c6 4 13 7 19 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -179 -195 -186 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -83 88 -87 94c-7 8 -11 11 -16 11c-8 0 -22 -12 -23 -13 c-7 -6 -14 -12 -21 -20c-3 -2 -5 -5 -7 -7v-133h-31v104c-19 -18 -35 -35 -39 -38s-11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-11 -9 -22 -24 -41 -25c-1 0 -3 -1 -4 -1c-7 0 -20 1 -23 9 c-6 23 -52 194 -186 209c0 0 -10 1 -23 1c-31 0 -91 -6 -142 -45c0 0 -12 -7 -18 -7c-2 0 -4 1 -4 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C0.xml b/data/Bravura/E5C0.xml
new file mode 100644
index 00000000000..bf0facc55e3
--- /dev/null
+++ b/data/Bravura/E5C0.xml
@@ -0,0 +1 @@
+<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 206c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 47 61 175 61c60 0 203 -57 236 -175l2 -5c1 2 3 4 5 6c27 32 55 64 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116c2 1 3 3 4 4c27 32 55 64 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 62 -73 99 -115l87 99c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -16 -178 -195 -185 -202c-4 -3 -11 -5 -19 -5 s-16 2 -20 7c-9 10 -83 88 -87 94c-7 8 -11 11 -16 11c-6 0 -12 -4 -23 -12l-22 -21c-29 -28 -70 -69 -76 -74c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-12 -5 -23 -13c-8 -7 -16 -13 -24 -21c-29 -28 -70 -69 -76 -74 c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12c-6 0 -13 -5 -23 -13c-14 -11 -26 -23 -39 -36c-10 -9 -21 -23 -40 -24h-7c-12 0 -18 2 -20 8c0 1 -1 2 -1 4c-10 34 -58 191 -186 205c0 0 -9 1 -22 1c-31 0 -92 -6 -142 -45c0 0 -12 -7 -18 -7z "/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C1.xml b/data/Bravura/E5C1.xml
new file mode 100644
index 00000000000..40c50019a36
--- /dev/null
+++ b/data/Bravura/E5C1.xml
@@ -0,0 +1 @@
+<symbol id="E5C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 198c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 93 -166 186 -166c47 0 87 29 119 61l21 24c28 32 56 65 85 96c7 8 14 18 23 25s14 9 22 9c14 -1 23 -7 32 -18c4 -7 61 -72 98 -115l87 99c8 8 14 17 23 25c9 7 15 9 22 9c9 0 17 -6 27 -15c9 -8 76 -91 85 -100 c4 -4 10 -9 17 -9c5 0 11 3 19 10c11 10 81 98 92 107c5 4 13 7 19 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -179 -195 -186 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -83 88 -87 94c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-3 -2 -24 -20 -22 -21 c-30 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-7 -5 -14 -11 -20 -17c-33 -39 -80 -82 -154 -83c-104 0 -185 132 -212 198z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C2.xml b/data/Bravura/E5C2.xml
new file mode 100644
index 00000000000..e761e012ef0
--- /dev/null
+++ b/data/Bravura/E5C2.xml
@@ -0,0 +1 @@
+<symbol id="E5C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 197c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 93 -166 187 -166c46 0 87 30 118 61c7 8 14 17 22 25c27 32 55 64 85 95c7 9 14 19 23 26s14 9 22 9c13 -1 22 -7 31 -18c5 -7 55 -66 92 -108v212h30v-192l64 71c8 9 14 18 23 26c9 7 15 9 22 9c8 0 16 -6 26 -15 c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -9 -13 -22 -14 -23c-13 -15 -178 -194 -185 -201c-4 -3 -11 -5 -19 -5c-9 0 -17 2 -21 7c-8 10 -82 87 -86 94c-7 8 -11 11 -16 11c-7 0 -13 -4 -23 -12 c-7 -7 -15 -14 -22 -22l-7 -6v-134h-30v105l-39 -38c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-9 10 -83 87 -87 94c-6 8 -10 12 -16 12c-5 0 -12 -5 -22 -13l-19 -17c-34 -40 -80 -83 -154 -83c-105 0 -186 132 -213 197z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C3.xml b/data/Bravura/E5C3.xml
new file mode 100644
index 00000000000..8e1441c4d87
--- /dev/null
+++ b/data/Bravura/E5C3.xml
@@ -0,0 +1 @@
+<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 198c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 9 -7c11 -14 92 -166 186 -166c47 0 87 29 119 61l21 24c27 33 56 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 33 56 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18 c5 -7 62 -72 99 -115l87 99c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 27 -15c9 -8 76 -91 85 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c12 10 82 98 93 107c5 4 12 7 18 7s13 -3 21 -8c4 -3 6 -7 6 -10c0 -7 -8 -15 -15 -22c-13 -15 -178 -195 -185 -202c-4 -3 -11 -5 -19 -5 s-16 2 -20 7c-8 10 -83 88 -87 94c-7 8 -11 11 -16 11c-6 0 -12 -4 -22 -12c-3 -2 -24 -20 -22 -21c-30 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13l-25 -21c-29 -27 -70 -69 -76 -74 c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-10 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-7 -5 -14 -11 -20 -17c-33 -39 -80 -82 -154 -83c-105 0 -185 132 -213 198z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C4.xml b/data/Bravura/E5C4.xml
new file mode 100644
index 00000000000..a6978a02131
--- /dev/null
+++ b/data/Bravura/E5C4.xml
@@ -0,0 +1 @@
+<symbol id="E5C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 201c0 1 1 3 2 3s4 -2 8 -7c11 -14 93 -166 187 -166c46 0 88 30 119 61c7 8 13 16 21 24c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l92 -107v212 h30v-193l64 72c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -90 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 11 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22c-13 -15 -178 -195 -185 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7 c-9 11 -83 88 -87 94c-7 8 -11 11 -16 11c-11 0 -37 -24 -45 -33l-7 -7v-133h-30v104l-39 -38c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 11 -83 88 -87 94c-6 8 -10 12 -15 12s-12 -5 -23 -13l-24 -21c-29 -27 -70 -69 -76 -74c-4 -3 -11 -5 -18 -5c-9 0 -17 2 -21 7 c-9 11 -83 88 -87 94c-6 8 -10 12 -15 12c-6 0 -13 -5 -23 -13c-7 -5 -13 -11 -19 -17c-34 -39 -80 -82 -154 -83c-105 0 -185 132 -213 198c0 0 -1 2 -1 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C5.xml b/data/Bravura/E5C5.xml
new file mode 100644
index 00000000000..e8002f9528a
--- /dev/null
+++ b/data/Bravura/E5C5.xml
@@ -0,0 +1 @@
+<symbol id="E5C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 51c0 7 7 17 12 22c13 15 24 30 37 44c27 32 55 64 85 95c7 9 14 19 23 26s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 32 56 64 85 95c7 9 14 19 23 26s14 9 22 9c13 -1 22 -7 31 -18c5 -7 61 -71 97 -114c3 3 6 4 6 5c42 33 86 68 86 126 c0 44 -24 76 -60 94c-33 19 -76 23 -111 24c-7 0 -10 3 -10 6c0 4 4 8 13 12c3 2 9 2 17 2c26 0 72 -8 99 -19c48 -28 82 -72 82 -145c0 -60 -54 -114 -99 -151c-28 -26 -62 -60 -67 -64c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-10 10 -84 88 -88 94c-6 8 -10 12 -15 12 c-10 0 -39 -27 -47 -35c-29 -27 -70 -68 -76 -73c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-13 -5 -23 -13c-14 -12 -26 -24 -39 -36c-10 -9 -21 -23 -40 -24c-15 0 -20 5 -20 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C6.xml b/data/Bravura/E5C6.xml
new file mode 100644
index 00000000000..ae305f6ff6a
--- /dev/null
+++ b/data/Bravura/E5C6.xml
@@ -0,0 +1 @@
+<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 104c-15 21 -22 45 -23 72v10c0 77 44 162 73 203c0 0 5 2 6 2c0 -1 0 -4 -2 -8c-4 -14 -54 -105 -54 -185c0 -120 129 -125 220 -127c1 1 2 2 2 3c13 15 24 29 38 43c27 32 55 65 84 96c7 8 14 18 23 25c10 7 15 9 23 9c13 -1 22 -7 31 -18c5 -7 63 -74 99 -116 c1 2 2 3 4 4c27 32 55 65 84 96c7 8 14 18 24 25c9 7 14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -72 98 -115l87 99c8 8 15 17 24 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18 c0 -6 -8 -15 -14 -22c-13 -15 -178 -195 -186 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-8 10 -83 88 -87 94c-7 8 -11 11 -16 11c-12 0 -36 -24 -44 -33c-29 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12 s-12 -5 -22 -13c-9 -7 -16 -14 -24 -21c-29 -27 -71 -69 -77 -74c-4 -3 -11 -5 -18 -5c-8 0 -16 2 -20 7c-9 10 -84 88 -88 94c-6 8 -10 12 -15 12s-12 -5 -22 -13c-14 -11 -26 -23 -39 -35c-2 -1 -3 -2 -4 -4l-33 -40h-9c-47 0 -173 1 -225 83z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C7.xml b/data/Bravura/E5C7.xml
new file mode 100644
index 00000000000..22dcad0d3c6
--- /dev/null
+++ b/data/Bravura/E5C7.xml
@@ -0,0 +1 @@
+<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 175v10c0 77 43 162 72 203c0 0 5 2 6 2c0 -1 0 -4 -2 -8c-4 -14 -54 -105 -54 -185c0 -120 130 -125 221 -127c0 1 1 2 2 3c13 15 24 29 37 43c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 33 55 65 85 96 c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18l92 -107v212h30v-193l64 72c8 8 14 17 23 25c9 7 15 9 22 9c8 0 16 -6 26 -15c9 -8 77 -91 86 -100c4 -4 10 -9 16 -9c5 0 11 3 19 10c11 10 82 98 93 107c5 4 12 7 18 7c8 0 26 -8 26 -18c0 -6 -8 -15 -14 -22 c-13 -15 -178 -195 -185 -202c-4 -3 -11 -5 -19 -5s-16 2 -20 7c-9 10 -83 88 -87 94c-7 8 -11 11 -16 11c-11 0 -37 -24 -45 -33l-7 -7v-133h-30v104l-39 -38c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-12 -5 -23 -13l-24 -21 c-29 -27 -70 -69 -76 -74c-4 -3 -11 -5 -18 -5c-9 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12c-6 0 -13 -5 -23 -13c-14 -11 -26 -23 -39 -35l-36 -43h-9c-106 0 -243 24 -248 154z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5C8.xml b/data/Bravura/E5C8.xml
new file mode 100644
index 00000000000..bc653dff181
--- /dev/null
+++ b/data/Bravura/E5C8.xml
@@ -0,0 +1 @@
+<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 51c0 7 7 17 12 22c13 15 24 29 37 43c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 63 -74 100 -116l3 4c27 33 55 65 85 96c7 8 14 18 23 25s14 9 22 9c13 -1 22 -7 31 -18c5 -7 62 -72 98 -114l3 2c40 35 86 86 127 118c9 7 6 10 14 10 c22 0 74 -64 92 -93c38 -66 51 -99 51 -186c0 -103 -101 -187 -201 -187c-47 0 -96 16 -102 22c-4 4 -6 14 -6 15l10 -3c30 -8 68 -18 98 -18c70 0 145 64 145 135v9c0 66 -20 106 -52 136c-35 32 -81 53 -88 53c-8 0 -53 -42 -60 -49c-29 -27 -70 -69 -76 -74 c-4 -3 -11 -5 -18 -5c-8 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-12 -5 -23 -13l-24 -21c-29 -27 -70 -69 -76 -74c-4 -3 -11 -5 -18 -5c-9 0 -17 2 -21 7c-9 10 -83 88 -87 94c-6 8 -10 12 -15 12s-13 -5 -23 -13c-14 -11 -26 -23 -39 -35 c-10 -9 -21 -23 -40 -24c-15 0 -20 5 -20 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5E5.xml b/data/Bravura/E5E5.xml
new file mode 100644
index 00000000000..bcb77d5973f
--- /dev/null
+++ b/data/Bravura/E5E5.xml
@@ -0,0 +1 @@
+<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 152h120v120h32v-120h120v-32h-120v-120h-32v120h-120v32z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5E6.xml b/data/Bravura/E5E6.xml
new file mode 100644
index 00000000000..6b2c3eab355
--- /dev/null
+++ b/data/Bravura/E5E6.xml
@@ -0,0 +1 @@
+<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 152c0 84 69 152 152 152c84 0 152 -68 152 -152s-68 -152 -152 -152c-83 0 -152 68 -152 152zM169 136v-103c54 7 96 49 103 103h-103zM169 271v-103h103c-7 53 -49 96 -103 103zM34 136c8 -54 50 -96 103 -103v103h-103zM34 168h103v103c-53 -7 -95 -50 -103 -103z "/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E5E7.xml b/data/Bravura/E5E7.xml
new file mode 100644
index 00000000000..a95e92256ec
--- /dev/null
+++ b/data/Bravura/E5E7.xml
@@ -0,0 +1 @@
+<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 152c0 84 68 152 152 152s152 -68 152 -152s-68 -152 -152 -152s-152 68 -152 152zM152 272c-66 0 -120 -54 -120 -120s54 -120 120 -120s120 54 120 120s-54 120 -120 120z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E610.xml b/data/Bravura/E610.xml
new file mode 100644
index 00000000000..85c0170bcd9
--- /dev/null
+++ b/data/Bravura/E610.xml
@@ -0,0 +1 @@
+<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 0c-6 0 -12 5 -12 12v280c0 14 12 26 26 26h260c14 0 26 -12 26 -26v-280c0 -7 -6 -12 -12 -12h-13c-7 0 -13 5 -13 12v164c0 11 -59 17 -118 17s-118 -6 -118 -17v-164c0 -7 -6 -12 -12 -12h-14z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E611.xml b/data/Bravura/E611.xml
new file mode 100644
index 00000000000..a6c833a8789
--- /dev/null
+++ b/data/Bravura/E611.xml
@@ -0,0 +1 @@
+<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 0c-14 0 -26 12 -26 26v280c0 7 6 12 12 12h14c6 0 12 -5 12 -12v-164c0 -11 59 -17 118 -17s118 6 118 17v164c0 7 6 12 13 12h13c6 0 12 -5 12 -12v-280c0 -14 -12 -26 -26 -26h-260z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E612.xml b/data/Bravura/E612.xml
new file mode 100644
index 00000000000..6acdc8883ad
--- /dev/null
+++ b/data/Bravura/E612.xml
@@ -0,0 +1 @@
+<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 479c0 7 6 14 14 16h4c8 0 15 -5 18 -13l88 -385l89 385c2 8 9 13 17 13h4c9 -2 14 -9 14 -17v-4l-106 -459c-2 -8 -9 -14 -17 -14c-10 0 -17 6 -19 14l-105 459c-1 2 -1 3 -1 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E613.xml b/data/Bravura/E613.xml
new file mode 100644
index 00000000000..40a9cd9ab7e
--- /dev/null
+++ b/data/Bravura/E613.xml
@@ -0,0 +1 @@
+<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 1c-8 2 -14 9 -14 16c0 2 0 3 1 5l105 459c2 8 9 14 19 14c8 0 15 -6 17 -14l106 -459v-4c0 -8 -5 -15 -14 -17h-4c-8 0 -15 5 -17 13l-89 385l-88 -385c-3 -8 -10 -13 -18 -13h-4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E614.xml b/data/Bravura/E614.xml
new file mode 100644
index 00000000000..ac139eea9e3
--- /dev/null
+++ b/data/Bravura/E614.xml
@@ -0,0 +1 @@
+<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 0c-55 0 -100 45 -100 100c0 56 45 100 100 100s100 -44 100 -100c0 -55 -45 -100 -100 -100zM27 100c0 -40 33 -73 73 -73c41 0 73 33 73 73c0 41 -32 73 -73 73c-40 0 -73 -32 -73 -73z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E630.xml b/data/Bravura/E630.xml
new file mode 100644
index 00000000000..c3d23a1778b
--- /dev/null
+++ b/data/Bravura/E630.xml
@@ -0,0 +1 @@
+<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M84 101c-48 8 -84 49 -84 99c0 56 45 100 100 100s100 -44 100 -100c0 -50 -37 -91 -84 -99v-101h-32v101zM27 200c0 -35 25 -64 57 -71v71h32v-71c33 7 57 36 57 71c0 41 -32 73 -73 73c-40 0 -73 -32 -73 -73z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E631.xml b/data/Bravura/E631.xml
new file mode 100644
index 00000000000..99cd58f5589
--- /dev/null
+++ b/data/Bravura/E631.xml
@@ -0,0 +1 @@
+<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 0c-55 0 -100 44 -100 100c0 49 36 91 84 98v102h32v-102c47 -7 84 -49 84 -98c0 -56 -45 -100 -100 -100zM27 100c0 -41 32 -73 73 -73c40 0 73 32 73 73c0 34 -25 64 -57 71v-71h-32v71c-33 -7 -57 -37 -57 -71z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E632.xml b/data/Bravura/E632.xml
new file mode 100644
index 00000000000..3114b6ab2cd
--- /dev/null
+++ b/data/Bravura/E632.xml
@@ -0,0 +1 @@
+<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 100c0 55 44 100 100 100c50 0 91 -37 99 -84h101v-32h-101c-8 -48 -49 -84 -99 -84c-56 0 -100 45 -100 100zM27 100c0 -40 32 -73 73 -73c34 0 64 24 71 57h-71v32h71c-7 33 -36 57 -71 57c-41 0 -73 -32 -73 -73z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E633.xml b/data/Bravura/E633.xml
new file mode 100644
index 00000000000..3cf7e649409
--- /dev/null
+++ b/data/Bravura/E633.xml
@@ -0,0 +1 @@
+<symbol id="E633" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 152h120v120h32v-120h120v-32h-120v-120h-32v120h-120v32z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E638.xml b/data/Bravura/E638.xml
new file mode 100644
index 00000000000..268e0dd85d7
--- /dev/null
+++ b/data/Bravura/E638.xml
@@ -0,0 +1 @@
+<symbol id="E638" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M60 148h-60v28h60c6 46 42 83 88 89v59h28v-59c46 -6 82 -43 88 -89h60v-28h-60c-7 -45 -43 -81 -88 -87v-61h-28v61c-45 6 -81 42 -88 87zM88 176h60v60c-30 -5 -54 -30 -60 -60zM176 236v-60h60c-6 30 -30 55 -60 60zM148 148h-60c6 -30 30 -53 60 -59v59zM235 148h-59 v-59c30 6 54 29 59 59z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E645.xml b/data/Bravura/E645.xml
new file mode 100644
index 00000000000..8ddc5970815
--- /dev/null
+++ b/data/Bravura/E645.xml
@@ -0,0 +1 @@
+<symbol id="E645" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-28 160l-133 133l28 28l133 -133l133 133l28 -28l-132 -133l132 -133l-28 -28l-133 133l-133 -133l-28 28z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E650.xml b/data/Bravura/E650.xml
new file mode 100644
index 00000000000..1152383327b
--- /dev/null
+++ b/data/Bravura/E650.xml
@@ -0,0 +1 @@
+<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M85 261c-59 0 -85 54 -85 98c0 80 74 136 124 161c57 28 103 34 163 35h6c92 0 201 -40 201 -147c0 -44 -29 -81 -75 -81c-65 0 -100 69 -100 92c0 8 4 13 10 13c9 0 13 -8 19 -14c13 -14 27 -19 44 -19c18 0 32 12 32 34c0 56 -49 97 -103 97c-11 0 -26 -3 -42 -30 c-12 -20 -23 -50 -23 -63c0 -21 13 -41 42 -75c35 -41 56 -60 56 -92c0 -34 -32 -83 -51 -110c-5 -7 -7 -10 -7 -13c0 -4 6 -3 17 -6c16 -4 32 -13 49 -30s35 -34 58 -34c14 0 24 5 40 16c5 4 6 6 6 9v4c-3 16 -4 31 -4 45c0 79 32 164 124 164c39 0 65 -22 65 -61 c0 -57 -49 -91 -95 -124l-10 -7c-7 -5 -9 -7 -9 -10s1 -6 2 -10c7 -22 28 -55 53 -55c17 0 32 5 63 36c20 20 22 27 22 48v18c0 84 33 133 82 160c11 6 18 8 23 8c7 0 11 -5 11 -11c0 -4 -1 -7 -7 -13c-32 -32 -41 -76 -41 -135c0 -67 22 -132 55 -132c37 0 49 58 49 127 c0 196 -135 277 -307 318c-17 4 -23 9 -23 16c0 6 3 12 13 12c6 0 13 -1 18 -2c177 -36 373 -112 373 -326c0 -115 -63 -175 -123 -175c-52 0 -85 28 -104 65c-4 7 -6 12 -10 12c-5 0 -12 -10 -29 -28c-36 -37 -64 -52 -95 -52c-39 0 -64 26 -79 58c-4 8 -5 10 -7 10 c-4 0 -8 -4 -12 -8l-26 -25c-31 -29 -44 -32 -61 -32c-53 0 -68 107 -108 107c-8 0 -12 -6 -17 -12l-14 -17c-44 -52 -72 -83 -102 -83c-17 0 -34 11 -34 28c0 41 86 96 130 112c19 7 20 8 33 26c15 20 21 33 21 53c0 33 -28 60 -41 78c-14 19 -55 64 -55 90 c0 27 39 90 54 113c6 10 15 22 15 30c0 6 -6 7 -14 7c-85 0 -183 -50 -186 -144v-4c0 -22 8 -48 37 -48c30 0 42 33 46 48c5 17 6 26 14 26c6 0 11 -5 11 -32c0 -61 -36 -114 -82 -114zM976 0c-25 0 -43 18 -43 43s18 43 43 43s43 -18 43 -43s-18 -43 -43 -43zM525 196 c0 -14 1 -26 2 -38c0 -5 2 -7 4 -7s6 2 11 6c30 24 47 48 47 81c0 28 -7 42 -23 42c-30 0 -41 -40 -41 -84z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E651.xml b/data/Bravura/E651.xml
new file mode 100644
index 00000000000..85ea515ac1f
--- /dev/null
+++ b/data/Bravura/E651.xml
@@ -0,0 +1 @@
+<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M85 261c-59 0 -85 54 -85 98c0 80 74 136 124 161c57 28 103 34 163 35h6c92 0 201 -40 201 -147c0 -44 -29 -81 -75 -81c-65 0 -100 69 -100 92c0 8 4 13 10 13c9 0 13 -8 19 -14c13 -14 27 -19 44 -19c18 0 32 12 32 34c0 56 -49 97 -103 97c-11 0 -26 -3 -42 -30 c-12 -20 -23 -50 -23 -63c0 -21 13 -41 42 -75c35 -41 56 -60 56 -92c0 -34 -32 -83 -51 -110c-5 -7 -7 -10 -7 -13c0 -4 6 -3 17 -6c16 -4 32 -13 49 -30s35 -34 58 -34c17 0 29 8 51 24c5 4 10 7 16 7c8 0 13 -7 13 -12c0 -4 -1 -7 -9 -15l-53 -52 c-31 -29 -44 -32 -61 -32c-53 0 -68 107 -108 107c-8 0 -12 -6 -17 -12l-14 -17c-44 -52 -72 -83 -102 -83c-17 0 -34 11 -34 28c0 41 86 96 130 112c19 7 20 8 33 26c15 20 21 33 21 53c0 33 -28 60 -41 78c-14 19 -55 64 -55 90c0 27 39 90 54 113c6 10 15 22 15 30 c0 6 -6 7 -14 7c-85 0 -183 -50 -186 -144v-4c0 -22 8 -48 37 -48c30 0 42 33 46 48c5 17 6 26 14 26c6 0 11 -5 11 -32c0 -61 -36 -114 -82 -114z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E655.xml b/data/Bravura/E655.xml
new file mode 100644
index 00000000000..f016f3c8660
--- /dev/null
+++ b/data/Bravura/E655.xml
@@ -0,0 +1 @@
+<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M46 175c-30 0 -46 23 -46 50s16 50 46 50c19 0 34 -8 46 -20c14 -14 20 -19 35 -19h5c18 0 32 6 32 26c0 7 -5 13 -14 22l-4 4c-9 9 -18 10 -36 10c-31 0 -59 16 -59 50c0 28 23 51 51 51c34 0 50 -28 50 -59c0 -18 1 -27 10 -36l4 -4c9 -9 15 -14 22 -14 c20 0 26 14 26 32v5c0 15 -5 21 -19 35c-12 12 -20 27 -20 46c0 30 23 46 50 46s50 -16 50 -46c0 -19 -8 -34 -20 -46c-14 -14 -19 -20 -19 -35v-5c0 -18 6 -32 26 -32c7 0 13 5 22 14l4 4c9 9 10 18 10 36c0 31 16 59 50 59c28 0 51 -23 51 -51c0 -34 -28 -50 -59 -50 c-18 0 -27 -1 -36 -10l-4 -4c-9 -9 -14 -15 -14 -22c0 -20 14 -26 32 -26h5c15 0 21 5 35 19c12 12 27 20 46 20c30 0 46 -23 46 -50s-16 -50 -46 -50c-19 0 -34 8 -46 20c-14 14 -20 19 -35 19h-5c-18 0 -32 -6 -32 -26c0 -7 5 -13 14 -22l4 -4c9 -9 18 -10 36 -10 c31 0 59 -16 59 -50c0 -28 -23 -51 -51 -51c-34 0 -50 28 -50 59c0 18 -1 27 -10 36l-4 4c-9 9 -15 14 -22 14c-20 0 -26 -14 -26 -32v-5c0 -15 5 -21 19 -35c12 -12 20 -27 20 -46c0 -30 -23 -46 -50 -46s-50 16 -50 46c0 19 8 34 20 46c14 14 19 20 19 35v5 c0 18 -6 32 -26 32c-7 0 -13 -5 -22 -14l-4 -4c-9 -9 -10 -18 -10 -36c0 -31 -16 -59 -50 -59c-28 0 -51 23 -51 51c0 34 28 50 59 50c18 0 27 1 36 10l4 4c9 9 14 15 14 22c0 20 -14 26 -32 26h-5c-15 0 -21 -5 -35 -19c-12 -12 -27 -20 -46 -20zM188 225 c0 -23 14 -37 37 -37s37 14 37 37s-14 37 -37 37s-37 -14 -37 -37z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E659.xml b/data/Bravura/E659.xml
new file mode 100644
index 00000000000..5d3b0898ada
--- /dev/null
+++ b/data/Bravura/E659.xml
@@ -0,0 +1 @@
+<symbol id="E659" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M474 39c-13 21 -30 50 -30 89c0 40 11 88 50 138c23 29 41 39 59 39c28 0 61 -42 75 -66c10 -17 11 -28 15 -28s6 8 13 21c16 30 41 69 80 69c4 0 13 1 13 2c0 4 -13 9 -13 32c0 45 39 79 104 79c73 0 105 -26 105 -81c0 -16 -1 -26 -1 -32s1 -7 6 -7h47 c11 0 17 -6 17 -17s-6 -17 -17 -17h-46c-8 0 -9 0 -10 -17c-3 -60 -6 -104 -6 -139c0 -39 3 -51 13 -51c13 0 21 27 27 70c1 8 4 16 14 16c7 0 13 -3 13 -15c0 -47 -19 -132 -78 -132c-48 0 -56 50 -56 100c0 55 2 92 7 155v6c0 7 -2 7 -8 7h-22c-11 0 -17 6 -17 17 s6 17 17 17h24c8 0 11 0 11 39c0 34 -14 50 -52 50c-36 0 -66 -17 -66 -48c0 -15 5 -25 15 -31c15 -9 28 -5 28 -23c0 -12 -5 -18 -14 -18c-7 0 -15 2 -26 6c-8 3 -17 7 -27 7c-9 0 -18 -12 -18 -25c0 -10 20 -29 45 -51l4 -3c31 -27 51 -54 51 -88c0 -60 -53 -119 -93 -119 c-29 0 -65 33 -65 71c0 13 4 26 40 78c4 6 5 7 5 9s-1 3 -5 8c-6 7 -15 18 -20 27c-8 14 -7 22 -10 22c-4 0 -29 -65 -33 -78c-12 -38 -62 -137 -105 -137c-23 0 -48 30 -60 49zM12 -15c-10 0 -12 7 -12 14c0 4 1 13 3 23c11 56 48 145 116 145c35 0 57 -24 107 -52 c39 -22 72 -28 102 -28c36 0 53 44 53 90c0 53 -33 94 -63 94c-39 0 -94 -45 -184 -45c-60 0 -110 54 -110 141c0 122 87 183 171 183c57 0 90 -42 146 -42c17 0 22 7 22 22c0 19 -12 35 -40 35c-19 0 -30 -4 -38 -4c-5 0 -10 4 -10 11c0 18 37 19 49 19c42 0 67 -24 67 -67 c0 -58 -36 -101 -89 -101c-85 0 -103 56 -161 56c-40 0 -80 -32 -80 -84c0 -49 26 -75 51 -75c51 0 107 41 190 41c60 0 117 -39 117 -151c0 -151 -98 -220 -157 -220c-45 0 -99 40 -132 65l-9 7c-15 11 -26 19 -37 19c-25 0 -44 -44 -56 -81c-3 -9 -5 -15 -16 -15zM536 241 c-25 0 -42 -41 -42 -65c0 -27 27 -113 59 -113c22 0 40 38 40 67c0 35 -13 60 -21 75c-7 13 -23 36 -36 36zM1021 35c0 25 18 43 43 43s43 -18 43 -43s-18 -43 -43 -43s-43 18 -43 43zM726 129c-7 0 -23 -37 -23 -45c0 -15 28 -40 55 -40c11 0 18 12 18 21 c0 12 -12 25 -34 49l-6 6c-6 7 -8 9 -10 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E65A.xml b/data/Bravura/E65A.xml
new file mode 100644
index 00000000000..4794aea3bb4
--- /dev/null
+++ b/data/Bravura/E65A.xml
@@ -0,0 +1 @@
+<symbol id="E65A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -15c-10 0 -12 7 -12 14c0 4 1 13 3 23c11 56 48 145 116 145c35 0 57 -24 107 -52c39 -22 72 -28 102 -28c36 0 53 44 53 90c0 53 -33 94 -63 94c-39 0 -94 -45 -184 -45c-60 0 -110 54 -110 141c0 122 87 183 171 183c57 0 90 -42 146 -42c17 0 22 7 22 22 c0 19 -12 35 -40 35c-19 0 -30 -4 -38 -4c-5 0 -10 4 -10 11c0 18 37 19 49 19c42 0 67 -24 67 -67c0 -58 -36 -101 -89 -101c-85 0 -103 56 -161 56c-40 0 -80 -32 -80 -84c0 -49 26 -75 51 -75c51 0 107 41 190 41c60 0 117 -39 117 -151c0 -151 -98 -220 -157 -220 c-45 0 -99 40 -132 65l-9 7c-15 11 -26 19 -37 19c-25 0 -44 -44 -56 -81c-3 -9 -5 -15 -16 -15z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E880.xml b/data/Bravura/E880.xml
new file mode 100644
index 00000000000..46bef43a9b2
--- /dev/null
+++ b/data/Bravura/E880.xml
@@ -0,0 +1 @@
+<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -8c-113 0 -127 107 -96 204c35 113 108 179 193 179c114 0 128 -107 97 -204c-36 -113 -109 -179 -194 -179zM99 183c-22 -68 -38 -165 10 -165c45 0 85 86 110 166c22 68 38 165 -11 165c-44 0 -84 -87 -109 -166z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E881.xml b/data/Bravura/E881.xml
new file mode 100644
index 00000000000..d3e304c3c73
--- /dev/null
+++ b/data/Bravura/E881.xml
@@ -0,0 +1 @@
+<symbol id="E881" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 0c-10 0 -15 6 -15 14s5 13 14 14l35 3c9 1 9 3 12 10l68 213c1 5 2 10 2 12c0 5 -2 6 -5 6c-4 0 -8 -2 -13 -9l-37 -40c-6 -7 -10 -11 -18 -11c-9 0 -16 8 -16 15c0 5 3 10 8 17l106 120c5 5 9 8 16 8c12 0 18 -9 31 -9c10 0 23 9 34 9c6 0 9 -4 9 -10 c0 -1 -1 -6 -2 -11l-97 -306c-2 -9 -4 -13 4 -14l34 -3c9 -1 13 -6 13 -14s-4 -14 -15 -14h-168z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E882.xml b/data/Bravura/E882.xml
new file mode 100644
index 00000000000..12aecc7c96b
--- /dev/null
+++ b/data/Bravura/E882.xml
@@ -0,0 +1 @@
+<symbol id="E882" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -3c-10 0 -16 6 -16 15c0 4 1 8 3 16c17 64 52 114 136 148c78 31 100 81 100 128c0 35 -25 43 -52 43c-34 0 -53 -16 -53 -28c0 -8 5 -12 11 -18s12 -16 12 -30c0 -27 -20 -51 -47 -51c-31 0 -43 21 -43 43c0 57 52 112 133 112c75 0 119 -33 119 -86 c0 -88 -70 -125 -149 -143c-39 -9 -73 -24 -95 -49c-8 -9 -11 -17 -4 -17c4 0 8 3 16 6c12 5 25 7 40 7c32 0 56 -18 85 -18c18 0 31 6 43 22c5 8 9 11 15 11c7 0 15 -4 15 -12c0 -4 -1 -7 -4 -14c-18 -56 -41 -88 -92 -88c-66 0 -92 43 -127 43c-15 0 -21 -9 -26 -22 s-10 -18 -20 -18z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E883.xml b/data/Bravura/E883.xml
new file mode 100644
index 00000000000..28ce2e5b0ba
--- /dev/null
+++ b/data/Bravura/E883.xml
@@ -0,0 +1 @@
+<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 -8c-71 0 -103 37 -103 77c0 33 21 58 49 58c21 0 38 -12 38 -36c0 -26 -14 -38 -25 -43c-8 -4 -13 -6 -13 -12c0 -10 16 -18 36 -18c61 0 92 61 92 105c0 32 -18 54 -55 54h-10c-13 0 -20 6 -20 15s7 15 20 15h11c58 0 92 38 92 91c0 22 -13 46 -52 46 c-21 0 -33 -7 -33 -14c0 -3 5 -7 12 -13c5 -6 9 -14 9 -25c0 -27 -20 -47 -45 -47c-23 0 -39 17 -38 43c2 54 54 87 117 87c61 0 111 -32 111 -84c0 -40 -34 -72 -76 -89c-8 -4 -12 -6 -12 -9c0 -5 4 -6 11 -9c26 -13 39 -37 39 -62c0 -79 -70 -130 -155 -130z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E884.xml b/data/Bravura/E884.xml
new file mode 100644
index 00000000000..4701201deed
--- /dev/null
+++ b/data/Bravura/E884.xml
@@ -0,0 +1 @@
+<symbol id="E884" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 116c0 7 4 11 10 17c65 65 129 138 155 228c2 6 5 11 13 11c13 0 29 -9 48 -9c18 0 32 9 47 9c8 0 11 -3 11 -8c0 -3 0 -6 -5 -12c-48 -63 -134 -147 -212 -209c-4 -3 -5 -5 -5 -7s1 -5 8 -5h90c7 0 8 3 10 8l18 57c2 7 4 11 11 19l64 69c8 9 13 13 23 13 c8 0 14 -2 14 -9c0 -3 -2 -11 -4 -19l-41 -130c-1 -6 1 -8 5 -8h29c8 0 14 -5 14 -14c0 -8 -6 -14 -15 -14h-34c-7 0 -9 -3 -10 -8l-16 -50c-2 -9 -4 -13 4 -14l34 -3c9 -1 13 -6 13 -14s-4 -14 -15 -14h-168c-10 0 -15 6 -15 14s5 13 14 14l35 3c9 1 9 3 12 10l17 55 c1 5 -1 7 -5 7h-136c-12 0 -18 5 -18 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E885.xml b/data/Bravura/E885.xml
new file mode 100644
index 00000000000..38e6c973ebe
--- /dev/null
+++ b/data/Bravura/E885.xml
@@ -0,0 +1 @@
+<symbol id="E885" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 -8c-71 0 -103 37 -103 77c0 33 21 58 48 58c21 0 39 -12 39 -36c0 -26 -14 -38 -25 -43c-8 -4 -13 -6 -13 -12c0 -10 16 -18 36 -18c65 0 97 81 97 129c0 29 -12 51 -46 51c-31 0 -51 -21 -60 -30c-7 -7 -12 -10 -19 -10c-9 0 -16 6 -16 15c0 6 1 9 4 19l55 161 c4 12 11 17 22 17c7 0 13 -1 27 -5c12 -4 32 -8 60 -8c29 0 54 3 74 9c14 4 25 7 25 7c5 0 9 -4 9 -9c0 -7 -4 -13 -13 -22c-31 -29 -77 -56 -135 -56c-13 0 -28 2 -39 3c-10 2 -14 2 -18 -8l-15 -45c-3 -10 -1 -16 14 -12c13 4 27 7 47 7c65 0 105 -24 105 -82 c0 -94 -68 -157 -160 -157z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E886.xml b/data/Bravura/E886.xml
new file mode 100644
index 00000000000..ea7a6ee8e2c
--- /dev/null
+++ b/data/Bravura/E886.xml
@@ -0,0 +1 @@
+<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M128 -8c-124 0 -136 108 -100 217c36 111 105 166 191 166c59 0 95 -30 95 -71c0 -34 -20 -56 -49 -56c-22 0 -42 14 -42 38c0 21 12 36 27 43c5 2 14 6 14 10c0 6 -16 12 -35 11c-59 -3 -97 -68 -118 -127c-6 -19 3 -20 12 -14c20 15 44 21 71 21c58 0 89 -38 89 -86 c0 -102 -82 -152 -155 -152zM88 102c-7 -34 -10 -84 37 -84c39 0 77 57 77 127c0 29 -8 49 -37 49c-35 0 -67 -40 -77 -92z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E887.xml b/data/Bravura/E887.xml
new file mode 100644
index 00000000000..d18b2e95896
--- /dev/null
+++ b/data/Bravura/E887.xml
@@ -0,0 +1 @@
+<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 241c0 2 1 5 2 8l34 108c4 10 9 12 18 12c8 0 13 -3 13 -9c0 -8 -4 -14 -4 -20c0 -3 2 -4 3 -4c2 0 6 4 13 11c16 14 35 25 57 25c49 0 68 -41 101 -41c15 0 25 8 31 25c4 10 8 13 20 13c8 0 15 -2 15 -11c0 -5 -1 -10 -2 -15c-21 -69 -56 -114 -90 -153 c-55 -63 -70 -120 -85 -183c-1 -7 -4 -11 -13 -11c-15 0 -28 9 -43 9c-16 0 -31 -9 -46 -9c-6 0 -9 3 -9 8c0 3 1 7 2 9c20 64 58 124 119 172c42 34 78 57 107 100c5 7 0 13 -8 8c-20 -13 -42 -20 -62 -20c-37 0 -70 19 -98 19c-24 0 -36 -21 -45 -48 c-3 -11 -9 -13 -18 -13c-8 0 -12 3 -12 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E888.xml b/data/Bravura/E888.xml
new file mode 100644
index 00000000000..54c5019cdce
--- /dev/null
+++ b/data/Bravura/E888.xml
@@ -0,0 +1 @@
+<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 87c0 39 20 75 72 96c20 8 17 12 8 24c-13 15 -19 35 -19 59c0 69 57 109 140 109c79 0 112 -38 112 -84c0 -30 -17 -63 -61 -86c-19 -10 -16 -14 -4 -27c18 -20 26 -41 26 -71c0 -74 -69 -115 -148 -115c-87 0 -126 42 -126 95zM119 162c-34 -21 -46 -58 -46 -83 c0 -30 16 -63 65 -63c38 0 69 24 69 65c0 24 -13 36 -65 76c-11 9 -15 10 -23 5zM148 294c0 -23 12 -38 50 -66c12 -9 17 -8 24 -4c27 19 39 47 39 74s-13 53 -52 53c-36 0 -61 -21 -61 -57z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E889.xml b/data/Bravura/E889.xml
new file mode 100644
index 00000000000..85a31758fa3
--- /dev/null
+++ b/data/Bravura/E889.xml
@@ -0,0 +1 @@
+<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M105 -8c-59 0 -95 30 -95 71c0 34 20 56 49 56c22 0 42 -14 42 -38c0 -21 -12 -36 -27 -43c-5 -2 -14 -6 -14 -10c0 -6 16 -12 35 -11c59 3 97 68 118 127c6 19 -3 20 -12 14c-20 -15 -44 -21 -71 -21c-58 0 -89 38 -89 86c0 102 82 152 155 152c124 0 136 -108 100 -217 c-36 -111 -105 -166 -191 -166zM199 349c-39 0 -77 -57 -77 -127c0 -29 8 -49 37 -49c35 0 67 40 77 92c7 34 10 84 -37 84z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E88A.xml b/data/Bravura/E88A.xml
new file mode 100644
index 00000000000..e00e6608b70
--- /dev/null
+++ b/data/Bravura/E88A.xml
@@ -0,0 +1 @@
+<symbol id="E88A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 186c-23 0 -37 18 -37 39c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44zM10 97c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44c-23 0 -37 18 -37 39z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E901.xml b/data/Bravura/E901.xml
new file mode 100644
index 00000000000..a9173e9ce8a
--- /dev/null
+++ b/data/Bravura/E901.xml
@@ -0,0 +1 @@
+<symbol id="E901" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 229v5c0 25 8 50 19 73c38 73 106 123 157 185l-29 49c-31 58 -58 122 -58 189c0 85 51 192 147 192c51 0 66 -45 66 -100c0 -84 -41 -229 -86 -303c35 -62 75 -141 80 -194c1 -5 1 -11 1 -16c0 -50 -24 -101 -43 -142l-5 -10c29 0 46 0 72 -19c1 -1 2 -2 2 -7 c0 -7 -22 -44 -38 -54c-2 -1 -5 -2 -7 -2c-1 0 -2 1 -3 1c-12 7 -28 12 -46 13v-5c0 -23 7 -44 15 -64c3 3 5 6 7 6c3 2 14 3 26 3c24 0 56 -3 56 -3c4 -16 6 -32 6 -47c0 -87 -62 -144 -113 -148h-6c-41 0 -89 30 -103 67c-10 27 -17 55 -17 82c0 72 62 151 130 173l9 21 c16 36 23 69 23 102c0 75 -39 139 -77 201c-55 -64 -140 -115 -153 -205c-1 -4 -1 -8 -1 -12c0 -53 46 -92 62 -92c4 -3 6 -6 6 -8c0 -1 -2 -5 -3 -7c-2 -3 -6 -15 -17 -26c-4 -4 -8 -6 -11 -6c-4 0 -7 3 -7 3s-59 17 -61 105zM192 880c-57 0 -69 -50 -69 -98 c0 -70 28 -155 43 -179c7 -12 23 -36 40 -67l12 21c28 60 53 149 53 217c0 51 -19 106 -79 106zM149 65v-19c0 -131 71 -150 113 -150c10 0 19 1 24 2c4 0 5 11 5 24c0 15 -2 32 -5 39c-1 3 -9 4 -19 4c-11 0 -26 -1 -36 -1c-5 0 -10 0 -12 1c-13 12 -18 32 -18 56 c0 21 3 45 9 69c-22 -1 -45 -9 -61 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E902.xml b/data/Bravura/E902.xml
new file mode 100644
index 00000000000..346c65e29ba
--- /dev/null
+++ b/data/Bravura/E902.xml
@@ -0,0 +1 @@
+<symbol id="E902" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M130 -108v217c1 34 5 112 70 112h6c50 -3 58 -40 58 -56v-128s0 -3 -2 -3c-1 0 -3 1 -5 3c0 0 -24 24 -57 24s-61 -23 -61 -61c0 -37 28 -60 61 -60s57 23 57 23c2 2 4 3 5 3c2 0 2 -3 2 -3v-127c0 -16 -8 -54 -58 -57h-5c-66 0 -71 79 -71 113zM0 45c0 0 0 40 57 40 c29 0 58 -3 58 -43v-257c0 -11 -3 -16 -6 -16s-6 5 -6 16v140s0 7 -9 12c0 0 -12 10 -37 10c-20 0 -50 -15 -56 -15c-1 0 -1 1 -1 5v108z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E904.xml b/data/Bravura/E904.xml
new file mode 100644
index 00000000000..041f727ffea
--- /dev/null
+++ b/data/Bravura/E904.xml
@@ -0,0 +1 @@
+<symbol id="E904" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M327 -11c-7 11 -59 100 -59 110c0 6 5 10 6 16l80 140c8 16 16 25 24 29v297c0 5 4 10 10 10h13c5 0 10 -5 10 -10v-308l6 -8c11 -16 71 -114 71 -133c0 -4 -1 -7 -3 -11l-56 -95c-2 -4 -3 -7 -3 -10c0 -4 2 -7 4 -11c0 0 36 -65 49 -86c6 -9 7 -18 7 -24 c0 -22 -69 -133 -82 -153c-9 -14 -17 -22 -24 -27v-774c0 -6 -5 -10 -10 -10h-13c-6 0 -10 4 -10 10v779l-5 8c-8 12 -62 106 -70 116c-3 4 -4 9 -4 14c0 6 2 11 4 16c55 97 55 98 55 98c3 4 4 6 4 8s-1 5 -4 9zM0 -176v346c0 6 5 10 12 10h9c6 0 12 -4 12 -10v-10 c3 -26 15 -33 24 -33h117c24 0 28 20 30 39c1 13 6 14 12 14h8c7 0 12 -2 12 -19v-1105c0 -18 -5 -18 -12 -18h-8c-7 0 -12 0 -12 18v786c-7 20 -17 23 -27 23h-121c-7 0 -18 0 -23 -23v-18c0 -5 -6 -10 -12 -10h-9c-7 0 -12 5 -12 10zM33 22v-42c3 -26 15 -33 24 -33h117 c24 0 28 19 30 37v38c-7 20 -17 23 -27 23h-121c-7 0 -18 0 -23 -23zM367 -34l-39 -66l61 -106l40 68zM328 135l61 -106l40 68l-62 104z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E906.xml b/data/Bravura/E906.xml
new file mode 100644
index 00000000000..4bae5c9c6e5
--- /dev/null
+++ b/data/Bravura/E906.xml
@@ -0,0 +1 @@
+<symbol id="E906" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -108v216c0 34 5 113 70 113h6c49 -3 58 -41 58 -56v-128s0 -3 -2 -3c-1 0 -3 1 -6 3c0 0 -24 24 -57 24s-61 -24 -61 -61s28 -61 61 -61s57 24 57 24c3 2 5 3 6 3c2 0 2 -3 2 -3v-128c0 -15 -9 -53 -58 -56h-5c-66 0 -71 79 -71 113z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E907.xml b/data/Bravura/E907.xml
new file mode 100644
index 00000000000..bf913196491
--- /dev/null
+++ b/data/Bravura/E907.xml
@@ -0,0 +1 @@
+<symbol id="E907" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 783c0 17 6 17 13 17h8c7 0 13 0 13 -17v-474c3 -26 15 -33 25 -33h121c25 0 28 19 30 37v227c0 17 6 17 13 17h9c6 0 12 0 12 -17v-837c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17c-2 18 -5 28 -30 28h-116c-24 0 -28 -20 -30 -38v-25c0 -17 -6 -17 -13 -17h-8 c-7 0 -13 0 -13 17v1115zM58 174c-7 0 -18 0 -24 -23v-36c2 -18 6 -37 30 -37h121c17 0 25 20 25 35v38c-6 20 -17 23 -27 23h-125zM34 -132c2 -18 6 -37 30 -37h121c10 0 22 7 25 33v26c-1 18 -6 37 -27 37h-127c-17 -4 -21 -21 -22 -37v-22z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E908.xml b/data/Bravura/E908.xml
new file mode 100644
index 00000000000..0f0ae313fb9
--- /dev/null
+++ b/data/Bravura/E908.xml
@@ -0,0 +1 @@
+<symbol id="E908" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -583v1366c0 17 6 17 13 17h8c7 0 13 0 13 -17v-476c2 -18 6 -38 30 -38h116c25 0 28 20 30 38v237c0 17 6 17 13 17h9c6 0 12 0 12 -17v-1074c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v227c-2 18 -5 37 -30 37h-121c-10 0 -22 -7 -25 -33v-284 c0 -17 -6 -17 -13 -17h-8c-7 0 -13 0 -13 17zM34 -115v-36c6 -23 17 -23 24 -23h125c10 0 21 3 27 23v38c0 15 -8 35 -25 35h-121c-24 0 -28 -19 -30 -37zM34 132v-22c1 -16 5 -33 22 -37h127c21 0 26 19 27 37v26c-3 26 -15 33 -25 33h-121c-24 0 -28 -19 -30 -37z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E909.xml b/data/Bravura/E909.xml
new file mode 100644
index 00000000000..7f26a939c0b
--- /dev/null
+++ b/data/Bravura/E909.xml
@@ -0,0 +1 @@
+<symbol id="E909" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -783v1566c0 17 6 17 13 17h8c7 0 13 0 13 -17v-474c3 -26 15 -33 25 -33h121c25 0 28 19 30 37v227c0 17 6 17 13 17h9c6 0 12 0 12 -17v-1084c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v237c-2 18 -5 38 -30 38h-116c-24 0 -28 -20 -30 -38v-476 c0 -17 -6 -17 -13 -17h-8c-7 0 -13 0 -13 17zM34 151v-36c2 -18 6 -37 30 -37h121c17 0 25 20 25 35v38c-6 20 -17 23 -27 23h-125c-7 0 -18 0 -24 -23zM34 -110v-22c2 -18 6 -37 30 -37h121c10 0 22 7 25 33v26c-1 18 -6 37 -27 37h-127c-17 -4 -21 -21 -22 -37z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E90A.xml b/data/Bravura/E90A.xml
new file mode 100644
index 00000000000..c77610a587d
--- /dev/null
+++ b/data/Bravura/E90A.xml
@@ -0,0 +1 @@
+<symbol id="E90A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -783v1366c0 17 6 17 13 17h8c7 0 13 0 13 -17v-284c3 -26 15 -33 25 -33h121c25 0 28 19 30 37v227c0 17 6 17 13 17h9c6 0 12 0 12 -17v-1074c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v237c-2 18 -5 38 -30 38h-116c-24 0 -28 -20 -30 -38v-476 c0 -17 -6 -17 -13 -17h-8c-7 0 -13 0 -13 17zM34 151v-36c2 -18 6 -37 30 -37h121c17 0 25 20 25 35v38c-6 20 -17 23 -27 23h-125c-7 0 -18 0 -24 -23zM34 -110v-22c2 -18 6 -37 30 -37h121c10 0 22 7 25 33v26c-1 18 -6 37 -27 37h-127c-17 -4 -21 -21 -22 -37z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E90B.xml b/data/Bravura/E90B.xml
new file mode 100644
index 00000000000..c983703ed72
--- /dev/null
+++ b/data/Bravura/E90B.xml
@@ -0,0 +1 @@
+<symbol id="E90B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 337c0 17 6 17 13 17h8c7 0 13 0 13 -17v-25c2 -18 6 -38 30 -38h116c25 0 28 10 30 28c0 17 6 17 13 17h9c6 0 12 0 12 -17v-837c0 -17 -6 -17 -12 -17h-9c-7 0 -13 0 -13 17v227c-2 18 -5 37 -30 37h-121c-10 0 -22 -7 -25 -33v-474c0 -17 -6 -17 -13 -17h-8 c-7 0 -13 0 -13 17v1115zM34 -110v-36c6 -23 17 -23 24 -23h125c10 0 21 3 27 23v38c0 15 -8 35 -25 35h-121c-24 0 -28 -19 -30 -37zM34 137v-22c1 -16 5 -33 22 -37h127c21 0 26 19 27 37v26c-3 26 -15 33 -25 33h-121c-24 0 -28 -19 -30 -37z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E910.xml b/data/Bravura/E910.xml
new file mode 100644
index 00000000000..36a91b7b525
--- /dev/null
+++ b/data/Bravura/E910.xml
@@ -0,0 +1 @@
+<symbol id="E910" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M266 -266c-146 0 -265 120 -265 266c0 145 120 265 265 265c146 0 266 -119 266 -265c0 -147 -119 -266 -266 -266zM49 0c0 -119 97 -218 217 -218s218 98 218 218s-99 217 -218 217s-217 -98 -217 -217zM266 -63c-34 0 -62 28 -62 63c0 34 28 62 62 62 c35 0 63 -28 63 -62c0 -35 -28 -63 -63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E911.xml b/data/Bravura/E911.xml
new file mode 100644
index 00000000000..7905daaeb2b
--- /dev/null
+++ b/data/Bravura/E911.xml
@@ -0,0 +1 @@
+<symbol id="E911" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M266 -266c-146 0 -265 120 -265 266c0 145 120 265 265 265c146 0 266 -119 266 -265c0 -147 -119 -266 -266 -266zM49 0c0 -119 97 -218 217 -218s218 98 218 218s-99 217 -218 217s-217 -98 -217 -217z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E912.xml b/data/Bravura/E912.xml
new file mode 100644
index 00000000000..afbf8e178f3
--- /dev/null
+++ b/data/Bravura/E912.xml
@@ -0,0 +1 @@
+<symbol id="E912" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 0c0 137 105 251 241 264v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75c136 -13 242 -126 242 -264s-105 -252 -242 -265v-91c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v91c-136 13 -241 128 -241 265zM290 216v-432c110 11 194 105 194 216s-84 203 -194 216zM49 0 c0 -110 83 -205 193 -216v432c-109 -13 -193 -105 -193 -216z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E913.xml b/data/Bravura/E913.xml
new file mode 100644
index 00000000000..0ca55fac83a
--- /dev/null
+++ b/data/Bravura/E913.xml
@@ -0,0 +1 @@
+<symbol id="E913" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 -265c-136 13 -241 128 -241 265s105 251 241 264v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75c136 -13 242 -126 242 -264s-105 -252 -242 -265v-91c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v91zM289 -58v-158c110 11 194 105 194 216s-84 203 -194 216v-158 c23 -10 39 -32 39 -58s-16 -48 -39 -58zM241 216c-109 -13 -193 -105 -193 -216c0 -110 83 -205 193 -216v158c-22 10 -38 32 -38 58s16 48 38 58v158z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E914.xml b/data/Bravura/E914.xml
new file mode 100644
index 00000000000..8ac5ce71715
--- /dev/null
+++ b/data/Bravura/E914.xml
@@ -0,0 +1 @@
+<symbol id="E914" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M266 -266c-147 0 -266 119 -266 266c0 146 120 265 266 265c89 0 172 -45 221 -120c3 -4 5 -9 5 -14c0 -8 -4 -15 -11 -19c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11c-40 61 -108 98 -181 98c-119 0 -218 -97 -218 -217s98 -218 218 -218c75 0 145 39 184 103 c4 7 12 11 20 11c13 0 24 -12 24 -25c0 -4 -1 -8 -3 -12c-50 -78 -132 -125 -225 -125zM268 -63c-34 0 -62 28 -62 63c0 34 28 62 62 62c35 0 63 -28 63 -62c0 -35 -28 -63 -63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E915.xml b/data/Bravura/E915.xml
new file mode 100644
index 00000000000..3eb9af22a8d
--- /dev/null
+++ b/data/Bravura/E915.xml
@@ -0,0 +1 @@
+<symbol id="E915" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 146 120 265 266 265c89 0 172 -45 221 -120c3 -4 5 -9 5 -14c0 -8 -4 -15 -11 -19c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11c-40 61 -108 98 -181 98c-119 0 -218 -97 -218 -217s98 -218 218 -218c75 0 145 39 184 103c4 7 12 11 20 11c13 0 24 -12 24 -25 c0 -4 -1 -8 -3 -12c-50 -78 -132 -125 -225 -125c-147 0 -266 119 -266 266z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E916.xml b/data/Bravura/E916.xml
new file mode 100644
index 00000000000..d8d64b0d65a
--- /dev/null
+++ b/data/Bravura/E916.xml
@@ -0,0 +1 @@
+<symbol id="E916" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-3 -112c0 8 4 15 12 20c4 3 9 4 13 4c8 0 16 -4 20 -11c39 -64 109 -103 184 -103c120 0 218 98 218 218s-99 217 -218 217c-73 0 -141 -37 -182 -98c-4 -7 -12 -11 -20 -11c-4 0 -9 1 -13 4c-7 4 -11 12 -11 20c0 4 1 9 4 13c50 75 133 120 222 120 c146 0 266 -119 266 -265c0 -147 -119 -266 -266 -266c-91 0 -177 47 -225 125c-2 4 -4 9 -4 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E917.xml b/data/Bravura/E917.xml
new file mode 100644
index 00000000000..8ec9831f303
--- /dev/null
+++ b/data/Bravura/E917.xml
@@ -0,0 +1 @@
+<symbol id="E917" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 0c0 137 107 253 244 264v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75c80 -8 151 -51 195 -119c3 -4 5 -9 5 -14c0 -8 -4 -15 -11 -19c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11c-35 54 -92 89 -155 96v-157c23 -10 39 -32 39 -58s-16 -48 -39 -58v-158 c66 7 124 45 158 101c4 7 12 11 20 11c13 0 24 -12 24 -25c0 -4 -1 -8 -3 -12c-44 -68 -118 -116 -199 -123v-92c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v91c-138 11 -244 127 -244 265zM49 0c0 -111 85 -206 196 -217v159c-22 10 -38 32 -38 58s16 48 38 58v158 c-110 -11 -196 -105 -196 -216z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E918.xml b/data/Bravura/E918.xml
new file mode 100644
index 00000000000..92b068d7fa5
--- /dev/null
+++ b/data/Bravura/E918.xml
@@ -0,0 +1 @@
+<symbol id="E918" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M245 -265c-138 11 -244 127 -244 265c0 137 107 253 244 264v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75c80 -8 151 -51 195 -119c3 -4 5 -9 5 -14c0 -8 -4 -15 -11 -19c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11c-35 54 -92 89 -155 96v-431c66 7 124 45 158 101 c4 7 12 11 20 11c13 0 24 -12 24 -25c0 -4 -1 -8 -3 -12c-44 -68 -118 -116 -199 -123v-92c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v91zM245 216c-110 -11 -196 -105 -196 -216s85 -206 196 -217v433z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E919.xml b/data/Bravura/E919.xml
new file mode 100644
index 00000000000..63f1d3e6ea1
--- /dev/null
+++ b/data/Bravura/E919.xml
@@ -0,0 +1 @@
+<symbol id="E919" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -128c0 8 4 15 12 20c4 3 9 4 13 4c8 0 16 -4 20 -11c34 -55 92 -94 157 -101v431c-63 -7 -119 -42 -155 -96c-4 -7 -12 -11 -20 -11c-4 0 -9 1 -13 4c-7 4 -11 12 -11 20c0 4 1 9 4 13c45 68 116 111 195 119v75c0 13 11 24 24 24c14 0 24 -11 24 -24v-75 c137 -11 245 -126 245 -264c0 -139 -107 -254 -245 -265v-91c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v92c-80 7 -156 56 -198 123c-2 4 -4 9 -4 13zM250 216v-433c111 11 197 105 197 217s-86 205 -197 216z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91A.xml b/data/Bravura/E91A.xml
new file mode 100644
index 00000000000..3e889ce142c
--- /dev/null
+++ b/data/Bravura/E91A.xml
@@ -0,0 +1 @@
+<symbol id="E91A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -129c0 8 4 15 12 20c4 3 9 4 13 4c8 0 16 -4 20 -11c39 -64 109 -103 184 -103c120 0 218 98 218 218s-99 217 -218 217c-73 0 -141 -37 -182 -98c-4 -7 -12 -11 -20 -11c-4 0 -9 1 -13 4c-7 4 -11 12 -11 20c0 4 1 9 4 13c50 75 133 120 222 120 c146 0 266 -119 266 -265c0 -147 -119 -266 -266 -266c-91 0 -177 47 -225 125c-2 4 -4 9 -4 13zM164 -1c0 34 28 62 62 62c35 0 63 -28 63 -62c0 -35 -28 -63 -63 -63c-34 0 -62 28 -62 63z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91B.xml b/data/Bravura/E91B.xml
new file mode 100644
index 00000000000..acdb022e16f
--- /dev/null
+++ b/data/Bravura/E91B.xml
@@ -0,0 +1 @@
+<symbol id="E91B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 -257c-5 5 -7 11 -7 17s2 12 7 17l58 59c-32 44 -49 98 -49 154c0 146 119 265 265 265c56 0 110 -17 155 -49l62 62c4 5 11 7 17 7s12 -2 17 -7c4 -5 7 -11 7 -17s-3 -12 -7 -17l-60 -60c48 -49 75 -115 75 -184c0 -147 -119 -266 -266 -266c-69 0 -134 27 -184 75 l-56 -56c-5 -4 -11 -7 -17 -7s-12 3 -17 7zM131 -167c40 -39 94 -61 150 -61c120 0 218 98 218 218c0 56 -22 110 -61 150zM281 207c-119 0 -217 -98 -217 -217c0 -43 13 -85 36 -120l301 301c-35 24 -76 36 -120 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91C.xml b/data/Bravura/E91C.xml
new file mode 100644
index 00000000000..a3684029e0f
--- /dev/null
+++ b/data/Bravura/E91C.xml
@@ -0,0 +1 @@
+<symbol id="E91C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 13 11 24 24 24h83c13 137 126 241 264 241s252 -104 265 -241h83c13 0 24 -11 24 -24s-11 -24 -24 -24h-83c-13 -137 -127 -242 -265 -242s-251 106 -264 242h-83c-13 0 -24 11 -24 24zM587 -24h-432c13 -110 105 -194 216 -194s205 84 216 194zM155 24h432 c-11 110 -106 193 -216 193c-111 0 -203 -84 -216 -193z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91D.xml b/data/Bravura/E91D.xml
new file mode 100644
index 00000000000..e1974252169
--- /dev/null
+++ b/data/Bravura/E91D.xml
@@ -0,0 +1 @@
+<symbol id="E91D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -245c0 6 3 12 8 17l69 69c-35 46 -54 101 -54 160c0 146 120 265 266 265c58 0 114 -19 159 -53l51 50c4 5 11 7 17 7s12 -2 17 -7c4 -5 7 -11 7 -17s-3 -12 -7 -17l-49 -49c9 -9 31 -34 31 -47c0 -8 -4 -16 -11 -20c-4 -3 -8 -4 -13 -4c-8 0 -16 4 -21 11 c-6 9 -13 18 -20 26l-307 -307c40 -36 91 -56 146 -56c75 0 145 39 184 103c4 7 12 11 20 11c13 0 24 -11 24 -24c0 -4 -1 -9 -3 -13c-50 -78 -132 -125 -225 -125c-68 0 -131 25 -180 70l-67 -67c-5 -4 -11 -7 -17 -7s-12 3 -17 7c-5 5 -8 11 -8 17zM71 1 c0 -46 14 -89 40 -126l303 303c-36 26 -80 40 -125 40c-119 0 -218 -97 -218 -217z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91E.xml b/data/Bravura/E91E.xml
new file mode 100644
index 00000000000..b7eaaf5de4d
--- /dev/null
+++ b/data/Bravura/E91E.xml
@@ -0,0 +1 @@
+<symbol id="E91E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 -262c-5 4 -8 11 -8 17s3 12 8 17l69 69c-35 45 -54 101 -54 159c0 146 119 266 265 266c59 0 115 -19 160 -54l51 51c4 4 11 7 17 7s12 -3 17 -7c4 -5 7 -11 7 -17s-3 -13 -7 -17l-49 -49c9 -10 18 -22 26 -34c3 -4 4 -8 4 -13c0 -8 -4 -16 -11 -20 c-4 -3 -8 -4 -13 -4c-7 0 -15 4 -20 11c-6 9 -13 18 -20 26l-122 -122c3 -7 5 -15 5 -24c0 -34 -28 -62 -63 -62c-8 0 -16 2 -24 5l-103 -104c40 -36 91 -56 145 -56c75 0 145 39 185 102c5 8 12 12 20 12c4 0 9 -2 13 -4c7 -5 11 -13 11 -21c0 -4 -1 -8 -3 -12 c-51 -78 -132 -125 -226 -125c-67 0 -130 25 -179 70l-67 -67c-5 -5 -11 -7 -17 -7s-13 2 -17 7zM71 0c0 -45 14 -89 40 -125l101 102c-3 7 -4 15 -4 23c0 35 28 63 62 63c9 0 17 -2 24 -5l120 120c-36 26 -80 40 -126 40c-120 0 -217 -99 -217 -218z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E91F.xml b/data/Bravura/E91F.xml
new file mode 100644
index 00000000000..8742de89c50
--- /dev/null
+++ b/data/Bravura/E91F.xml
@@ -0,0 +1 @@
+<symbol id="E91F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -246c0 6 2 12 7 17l49 49c-11 12 -21 25 -30 39c-2 4 -3 9 -3 13c0 13 11 24 24 24c8 0 16 -4 20 -11c7 -11 15 -21 23 -31l307 307c-40 36 -91 56 -145 56c-74 0 -142 -37 -182 -98c-4 -7 -12 -11 -20 -11c-4 0 -9 1 -13 4c-7 4 -11 12 -11 20c0 4 1 9 4 13 c49 75 132 120 222 120c67 0 130 -25 179 -70l67 67c5 5 11 7 17 7c13 0 24 -11 24 -24c0 -6 -2 -12 -7 -17l-68 -69c34 -45 53 -101 53 -159c0 -146 -119 -266 -265 -266c-46 0 -91 12 -131 35c-10 5 -20 12 -29 19l-51 -51c-4 -5 -10 -7 -17 -7c-13 0 -24 11 -24 24z M429 125l-303 -303l19 -12c32 -18 69 -28 107 -28c120 0 217 99 217 218c0 45 -14 89 -40 125z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E920.xml b/data/Bravura/E920.xml
new file mode 100644
index 00000000000..cf66abdf0c4
--- /dev/null
+++ b/data/Bravura/E920.xml
@@ -0,0 +1 @@
+<symbol id="E920" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M62 -63c-34 0 -62 28 -62 63c0 34 28 62 62 62c35 0 63 -28 63 -62c0 -35 -28 -63 -63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E921.xml b/data/Bravura/E921.xml
new file mode 100644
index 00000000000..4c3768e2cf8
--- /dev/null
+++ b/data/Bravura/E921.xml
@@ -0,0 +1 @@
+<symbol id="E921" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M214 -52c-29 0 -52 24 -52 52c0 29 23 52 52 52s52 -23 52 -52c0 -28 -23 -52 -52 -52zM52 -52c-29 0 -52 24 -52 52c0 29 23 52 52 52s52 -23 52 -52c0 -28 -23 -52 -52 -52z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E922.xml b/data/Bravura/E922.xml
new file mode 100644
index 00000000000..cf6e00b779a
--- /dev/null
+++ b/data/Bravura/E922.xml
@@ -0,0 +1 @@
+<symbol id="E922" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M313 -49c-27 0 -49 22 -49 49s22 49 49 49s49 -22 49 -49s-22 -49 -49 -49zM132 0c0 27 22 49 49 49s49 -22 49 -49s-22 -49 -49 -49s-49 22 -49 49zM49 -49c-27 0 -49 22 -49 49s22 49 49 49s49 -22 49 -49s-22 -49 -49 -49z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E923.xml b/data/Bravura/E923.xml
new file mode 100644
index 00000000000..735024811c4
--- /dev/null
+++ b/data/Bravura/E923.xml
@@ -0,0 +1 @@
+<symbol id="E923" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M214 22c-29 0 -52 24 -52 52c0 29 23 52 52 52s52 -23 52 -52c0 -28 -23 -52 -52 -52zM133 -125c-29 0 -52 23 -52 52c0 28 23 52 52 52s52 -24 52 -52c0 -29 -23 -52 -52 -52zM0 74c0 29 23 52 52 52s52 -23 52 -52c0 -28 -23 -52 -52 -52s-52 24 -52 52z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E924.xml b/data/Bravura/E924.xml
new file mode 100644
index 00000000000..17547882372
--- /dev/null
+++ b/data/Bravura/E924.xml
@@ -0,0 +1 @@
+<symbol id="E924" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 89 73 162 162 162s162 -73 162 -162s-73 -162 -162 -162s-162 73 -162 162zM162 114c-63 0 -114 -51 -114 -114s51 -114 114 -114s114 51 114 114s-51 114 -114 114z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E925.xml b/data/Bravura/E925.xml
new file mode 100644
index 00000000000..1e7fcf2812e
--- /dev/null
+++ b/data/Bravura/E925.xml
@@ -0,0 +1 @@
+<symbol id="E925" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 348c0 13 11 24 24 24c14 0 24 -11 24 -24v-695c0 -13 -10 -24 -24 -24c-13 0 -24 11 -24 24v695z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E938.xml b/data/Bravura/E938.xml
new file mode 100644
index 00000000000..fccceb49e53
--- /dev/null
+++ b/data/Bravura/E938.xml
@@ -0,0 +1 @@
+<symbol id="E938" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -1c0 4 2 9 5 12l125 125c3 3 7 5 12 5c4 0 8 -2 11 -5l125 -125c3 -3 4 -8 4 -12s-1 -8 -4 -11l-125 -125c-3 -3 -7 -4 -11 -4c-5 0 -9 1 -12 4l-125 125c-3 3 -5 7 -5 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E939.xml b/data/Bravura/E939.xml
new file mode 100644
index 00000000000..e670878eba0
--- /dev/null
+++ b/data/Bravura/E939.xml
@@ -0,0 +1 @@
+<symbol id="E939" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M6 -12c-4 3 -5 8 -5 12s1 8 5 11l125 125c3 3 7 5 11 5s8 -2 11 -5l125 -125c3 -3 5 -7 5 -11s-2 -9 -5 -12l-125 -125c-3 -3 -7 -4 -11 -4s-8 1 -11 4zM40 0l102 -103l102 103l-102 102z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E93C.xml b/data/Bravura/E93C.xml
new file mode 100644
index 00000000000..bc6e116735d
--- /dev/null
+++ b/data/Bravura/E93C.xml
@@ -0,0 +1 @@
+<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 2 1 4 2 7l152 174c2 2 4 3 8 4c3 0 6 -1 8 -4l148 -174c1 -2 2 -5 2 -7c0 -3 -1 -5 -2 -7l-148 -174c-2 -2 -5 -3 -8 -3s-6 1 -8 3l-152 174c-1 2 -2 3 -2 7zM140 118l-80 -91l125 -144l75 90z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E93D.xml b/data/Bravura/E93D.xml
new file mode 100644
index 00000000000..c339969d544
--- /dev/null
+++ b/data/Bravura/E93D.xml
@@ -0,0 +1 @@
+<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 2 0 4 2 7l152 174c2 2 4 3 8 4c3 0 6 -1 8 -4l148 -174c1 -2 2 -5 2 -7c0 -3 -1 -5 -2 -7l-148 -174c-2 -2 -5 -3 -8 -3s-6 1 -8 3l-152 174c-1 2 -2 3 -2 7z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E93E.xml b/data/Bravura/E93E.xml
new file mode 100644
index 00000000000..69c1755e1f9
--- /dev/null
+++ b/data/Bravura/E93E.xml
@@ -0,0 +1 @@
+<symbol id="E93E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 766c0 8 8 16 16 16c9 0 16 -8 16 -16v-750c0 -9 -7 -16 -16 -16c-8 0 -16 7 -16 16v750z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E93F.xml b/data/Bravura/E93F.xml
new file mode 100644
index 00000000000..991692bac21
--- /dev/null
+++ b/data/Bravura/E93F.xml
@@ -0,0 +1 @@
+<symbol id="E93F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -16c0 8 8 16 16 16c9 0 16 -8 16 -16v-750c0 -9 -7 -16 -16 -16c-8 0 -16 7 -16 16v750z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E949.xml b/data/Bravura/E949.xml
new file mode 100644
index 00000000000..95ef6b06e04
--- /dev/null
+++ b/data/Bravura/E949.xml
@@ -0,0 +1 @@
+<symbol id="E949" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 766c0 7 5 13 12 15c1 0 3 1 4 1c5 0 11 -3 14 -8l186 -302c2 -3 3 -6 3 -9c0 -5 -3 -10 -8 -13c-2 -2 -5 -2 -8 -2c-5 0 -11 2 -14 7l-157 254v-693c0 -9 -7 -16 -16 -16c-8 0 -16 7 -16 16v750z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E94A.xml b/data/Bravura/E94A.xml
new file mode 100644
index 00000000000..b01ec86ab27
--- /dev/null
+++ b/data/Bravura/E94A.xml
@@ -0,0 +1 @@
+<symbol id="E94A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -766v750c0 9 8 16 16 16c9 0 16 -7 16 -16v-693l157 254c3 5 9 7 14 7c3 0 6 0 8 -2c5 -3 8 -8 8 -13c0 -3 -1 -6 -3 -9l-186 -302c-3 -5 -9 -8 -14 -8c-1 0 -3 1 -4 1c-7 2 -12 8 -12 15z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E94B.xml b/data/Bravura/E94B.xml
new file mode 100644
index 00000000000..8e191de6f03
--- /dev/null
+++ b/data/Bravura/E94B.xml
@@ -0,0 +1 @@
+<symbol id="E94B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 16v750c0 7 5 13 12 15c2 0 3 1 5 1c5 0 10 -3 13 -8l186 -302c2 -3 3 -6 3 -9c0 -5 -3 -10 -8 -13c-2 -1 -5 -2 -8 -2c-5 0 -11 2 -14 7l-157 255v-117l184 -295c2 -3 3 -6 3 -9c0 -5 -3 -10 -8 -13c-2 -2 -5 -3 -8 -3c-6 0 -11 3 -14 8l-157 251v-516 c0 -9 -7 -16 -16 -16c-8 0 -16 7 -16 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E94C.xml b/data/Bravura/E94C.xml
new file mode 100644
index 00000000000..5161b44f697
--- /dev/null
+++ b/data/Bravura/E94C.xml
@@ -0,0 +1 @@
+<symbol id="E94C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -766v750c0 9 8 16 16 16c9 0 16 -7 16 -16v-516l157 251c3 5 8 8 14 8c3 0 6 -1 8 -3c5 -3 8 -8 8 -13c0 -3 -1 -6 -3 -9l-184 -295v-117l157 255c3 5 9 7 14 7c3 0 6 -1 8 -2c5 -3 8 -8 8 -13c0 -3 -1 -6 -3 -9l-186 -302c-3 -5 -8 -8 -13 -8c-2 0 -3 1 -5 1 c-7 2 -12 8 -12 15z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E990.xml b/data/Bravura/E990.xml
new file mode 100644
index 00000000000..09bd051d6b2
--- /dev/null
+++ b/data/Bravura/E990.xml
@@ -0,0 +1 @@
+<symbol id="E990" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -97v147c0 35 37 52 76 52c41 0 84 -19 84 -54v-145s0 -4 -2 -4c-1 0 -2 1 -5 4c-8 8 -32 20 -68 20h-5c-32 -1 -60 -13 -72 -20c-1 -2 -4 -4 -6 -4c-1 0 -2 0 -2 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E991.xml b/data/Bravura/E991.xml
new file mode 100644
index 00000000000..72d5b7a96ae
--- /dev/null
+++ b/data/Bravura/E991.xml
@@ -0,0 +1 @@
+<symbol id="E991" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 2 0 4 3 6c2 4 67 103 67 103c1 3 2 4 5 4c1 0 3 -1 6 -4c0 0 63 -97 67 -102c1 -2 2 -5 2 -7c0 -1 0 -2 -1 -5l-67 -101c-4 -4 -5 -7 -7 -7c-1 0 -4 3 -6 7l-67 100c-2 2 -2 5 -2 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E996.xml b/data/Bravura/E996.xml
new file mode 100644
index 00000000000..650ed1628db
--- /dev/null
+++ b/data/Bravura/E996.xml
@@ -0,0 +1 @@
+<symbol id="E996" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -93c0 0 -4 6 -4 10v140c0 42 50 45 80 45h10c21 0 70 -4 70 -47v-448c0 -3 -2 -8 -7 -8h-5c-3 0 -7 5 -7 8v311c-12 7 -31 12 -56 12h-5c-38 -1 -70 -17 -76 -23z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E99B.xml b/data/Bravura/E99B.xml
new file mode 100644
index 00000000000..f1c98f73de7
--- /dev/null
+++ b/data/Bravura/E99B.xml
@@ -0,0 +1 @@
+<symbol id="E99B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 56c9 -32 21 -48 34 -48c12 0 19 24 21 72c6 -19 11 -32 15 -39c5 -9 11 -12 19 -12s14 21 19 66c9 -35 17 -53 23 -53c8 0 17 24 23 73v-153c0 -28 -5 -41 -15 -41c-7 0 -14 9 -20 27c-4 -33 -12 -50 -28 -50c-12 0 -25 11 -38 34c-7 -32 -17 -47 -28 -47 c-15 0 -25 19 -25 39v132z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E99E.xml b/data/Bravura/E99E.xml
new file mode 100644
index 00000000000..12aa9397af2
--- /dev/null
+++ b/data/Bravura/E99E.xml
@@ -0,0 +1 @@
+<symbol id="E99E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50v163c0 1 1 1 3 1c1 0 3 0 3 -1c1 -27 8 -47 29 -47c7 0 21 4 41 15c20 9 33 14 41 14c24 0 36 -15 36 -46v-123c0 -45 0 -81 -12 -111c-11 -28 -39 -50 -85 -61c-4 0 -8 3 -10 10c0 6 3 10 8 13c29 9 61 23 69 56c6 21 5 46 6 68c0 12 0 33 -18 33 c-5 0 -15 -5 -35 -15c-20 -11 -34 -16 -41 -16c-23 0 -35 16 -35 47z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E99F.xml b/data/Bravura/E99F.xml
new file mode 100644
index 00000000000..1338616622f
--- /dev/null
+++ b/data/Bravura/E99F.xml
@@ -0,0 +1 @@
+<symbol id="E99F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -1c0 2 0 3 2 5l56 86c1 2 2 3 4 3c1 0 3 -1 5 -3c8 -29 25 -54 46 -75c5 -5 11 -10 11 -17c0 -8 -23 -48 -29 -55c-7 -10 -21 -27 -32 -32c-1 -1 -7 -3 -10 -3c-1 0 -3 0 -3 1s1 2 2 3c4 4 5 8 5 12c0 9 -7 18 -13 25l-32 34c-4 4 -8 7 -11 11c-1 2 -1 4 -1 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B4.xml b/data/Bravura/E9B4.xml
new file mode 100644
index 00000000000..3cf09b7087f
--- /dev/null
+++ b/data/Bravura/E9B4.xml
@@ -0,0 +1 @@
+<symbol id="E9B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 150h14v-300h-14v300z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B5.xml b/data/Bravura/E9B5.xml
new file mode 100644
index 00000000000..5b66c5a9014
--- /dev/null
+++ b/data/Bravura/E9B5.xml
@@ -0,0 +1 @@
+<symbol id="E9B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 300h14v-450h-14v450z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B6.xml b/data/Bravura/E9B6.xml
new file mode 100644
index 00000000000..8b93bc6bcf6
--- /dev/null
+++ b/data/Bravura/E9B6.xml
@@ -0,0 +1 @@
+<symbol id="E9B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 450h14v-600h-14v600z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B7.xml b/data/Bravura/E9B7.xml
new file mode 100644
index 00000000000..03a98dc8afe
--- /dev/null
+++ b/data/Bravura/E9B7.xml
@@ -0,0 +1 @@
+<symbol id="E9B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 600h14v-750h-14v750z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9B9.xml b/data/Bravura/E9B9.xml
new file mode 100644
index 00000000000..4ed5cf8e535
--- /dev/null
+++ b/data/Bravura/E9B9.xml
@@ -0,0 +1 @@
+<symbol id="E9B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M436 -228c-178 0 -323 50 -436 149v183c45 -44 118 -92 220 -146c47 -25 108 -37 183 -37c33 0 53 16 62 46v-178c0 -11 -10 -17 -29 -17z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9BA.xml b/data/Bravura/E9BA.xml
new file mode 100644
index 00000000000..c8e3df134e0
--- /dev/null
+++ b/data/Bravura/E9BA.xml
@@ -0,0 +1 @@
+<symbol id="E9BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 104c111 -149 330 -328 519 -355h11c25 0 41 15 49 45v-176c0 -12 -9 -18 -27 -18c-78 0 -171 35 -279 103c-122 78 -213 151 -273 219v182z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9BB.xml b/data/Bravura/E9BB.xml
new file mode 100644
index 00000000000..bd2b09cf1b7
--- /dev/null
+++ b/data/Bravura/E9BB.xml
@@ -0,0 +1 @@
+<symbol id="E9BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M274 -372c-75 64 -168 161 -274 293v183c105 -130 222 -254 342 -370c31 -29 154 -136 198 -136c18 0 31 12 39 46v-175c0 -15 -5 -22 -15 -22c-4 0 -8 1 -12 3c-76 25 -168 85 -278 178z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9BC.xml b/data/Bravura/E9BC.xml
new file mode 100644
index 00000000000..59a5bf84988
--- /dev/null
+++ b/data/Bravura/E9BC.xml
@@ -0,0 +1 @@
+<symbol id="E9BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -78v182c46 -87 129 -188 234 -327c105 -141 196 -258 285 -328c9 -6 16 -8 22 -8c17 0 30 18 38 54v-177c0 -14 -5 -21 -13 -21c-4 0 -8 1 -14 3c-128 60 -311 268 -552 622z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9E0.xml b/data/Bravura/E9E0.xml
new file mode 100644
index 00000000000..33da12ff288
--- /dev/null
+++ b/data/Bravura/E9E0.xml
@@ -0,0 +1 @@
+<symbol id="E9E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -54v431c0 13 2 36 18 36c12 -1 12 -18 12 -39c0 -20 -3 -362 -3 -362c0 -3 2 -9 11 -18c28 -33 74 -65 120 -65c6 0 28 2 28 35c0 37 -44 69 -76 86l-42 24s-9 1 -9 27v42c0 3 1 9 14 9c14 -1 50 -6 83 -26c32 -22 49 -38 49 -71v-200c0 -1 -2 -6 -14 -6 c-16 0 -110 5 -173 66c0 0 -11 8 -18 31z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9E1.xml b/data/Bravura/E9E1.xml
new file mode 100644
index 00000000000..32c3bfd11e3
--- /dev/null
+++ b/data/Bravura/E9E1.xml
@@ -0,0 +1 @@
+<symbol id="E9E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -141c-7 0 -12 6 -12 14v535c0 7 4 12 9 12h18c5 0 9 -5 9 -12v-270h141c5 0 9 -5 9 -12v-255c0 -6 -5 -12 -12 -12h-162zM36 -66h114v130h-114v-130z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9E2.xml b/data/Bravura/E9E2.xml
new file mode 100644
index 00000000000..dcd8b9f082e
--- /dev/null
+++ b/data/Bravura/E9E2.xml
@@ -0,0 +1 @@
+<symbol id="E9E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -118c-6 2 -8 4 -10 10v359c4 1 8 2 10 2c4 0 8 -1 13 -2v-148c46 9 60 11 72 11c4 0 6 -4 7 -7v-355c0 -4 -3 -6 -7 -6c-1 0 -6 1 -14 4c1 2 1 34 1 99v45zM22 49c-1 0 -1 -37 -1 -111l63 10v111z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9E3.xml b/data/Bravura/E9E3.xml
new file mode 100644
index 00000000000..fcdfa65ab66
--- /dev/null
+++ b/data/Bravura/E9E3.xml
@@ -0,0 +1 @@
+<symbol id="E9E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -136c-2 3 -3 6 -3 9c0 5 2 10 6 14l135 113l-135 113c-4 4 -6 9 -6 14c0 3 1 6 3 9c3 4 7 6 11 6c3 0 6 -1 9 -3l141 -119l27 23l-85 70c-4 4 -6 9 -6 14c0 3 1 6 3 9c3 4 7 6 11 6c3 0 6 -1 9 -3l92 -77l92 77c2 2 5 3 8 3c4 0 9 -2 11 -6c3 -3 4 -7 4 -10 c0 -5 -3 -10 -6 -13l-85 -71l25 -22l143 119c2 2 5 3 8 3c4 0 9 -2 11 -6c3 -3 4 -7 4 -10c0 -5 -3 -10 -6 -13l-135 -113l135 -113c3 -3 6 -8 6 -13c0 -3 -1 -7 -4 -10c-2 -4 -7 -6 -11 -6c-3 0 -6 1 -8 3l-143 119l-25 -21l85 -72c3 -3 6 -8 6 -13c0 -3 -1 -7 -4 -10 c-2 -4 -7 -6 -11 -6c-3 0 -6 1 -8 3l-92 78l-92 -78c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -12 6c-2 3 -3 6 -3 9c0 5 2 10 6 14l85 71l-27 22l-141 -119c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -12 6zM215 22l-26 -22l26 -21l26 21z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F0.xml b/data/Bravura/E9F0.xml
new file mode 100644
index 00000000000..8d1a26decc3
--- /dev/null
+++ b/data/Bravura/E9F0.xml
@@ -0,0 +1 @@
+<symbol id="E9F0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 484c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-968c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v968zM16 -500c-9 0 -16 7 -16 16v968c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-968c0 -9 -7 -16 -16 -16h-16z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F1.xml b/data/Bravura/E9F1.xml
new file mode 100644
index 00000000000..ae7affbf859
--- /dev/null
+++ b/data/Bravura/E9F1.xml
@@ -0,0 +1 @@
+<symbol id="E9F1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 484c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-968c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v968z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F2.xml b/data/Bravura/E9F2.xml
new file mode 100644
index 00000000000..343ee4b19bd
--- /dev/null
+++ b/data/Bravura/E9F2.xml
@@ -0,0 +1 @@
+<symbol id="E9F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-468c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v468z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F3.xml b/data/Bravura/E9F3.xml
new file mode 100644
index 00000000000..59b49479eca
--- /dev/null
+++ b/data/Bravura/E9F3.xml
@@ -0,0 +1 @@
+<symbol id="E9F3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-218c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v218z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F4.xml b/data/Bravura/E9F4.xml
new file mode 100644
index 00000000000..49a50029193
--- /dev/null
+++ b/data/Bravura/E9F4.xml
@@ -0,0 +1 @@
+<symbol id="E9F4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-93c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v93z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F5.xml b/data/Bravura/E9F5.xml
new file mode 100644
index 00000000000..aea8de7a1ce
--- /dev/null
+++ b/data/Bravura/E9F5.xml
@@ -0,0 +1 @@
+<symbol id="E9F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 109c0 9 7 16 16 16h16c9 0 16 -7 16 -16v-93c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v93z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F6.xml b/data/Bravura/E9F6.xml
new file mode 100644
index 00000000000..fe8eb6d0d8a
--- /dev/null
+++ b/data/Bravura/E9F6.xml
@@ -0,0 +1 @@
+<symbol id="E9F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 16v133c0 9 7 16 16 16h19c1 0 3 0 4 -1l89 -29c7 -2 11 -9 11 -16c0 -1 -1 -3 -1 -4l-5 -16c-2 -6 -9 -11 -16 -11c-2 0 -3 0 -5 1l-64 22v-95c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F7.xml b/data/Bravura/E9F7.xml
new file mode 100644
index 00000000000..1c224feca8e
--- /dev/null
+++ b/data/Bravura/E9F7.xml
@@ -0,0 +1 @@
+<symbol id="E9F7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 119c0 7 4 14 11 16l89 29c1 1 3 1 4 1h19c9 0 16 -7 16 -16v-133c0 -9 -7 -16 -16 -16h-16c-9 0 -16 7 -16 16v95l-64 -22c-2 -1 -3 -1 -5 -1c-7 0 -14 5 -16 11l-5 16c0 1 -1 3 -1 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E9F8.xml b/data/Bravura/E9F8.xml
new file mode 100644
index 00000000000..97dfec82444
--- /dev/null
+++ b/data/Bravura/E9F8.xml
@@ -0,0 +1 @@
+<symbol id="E9F8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 39c-1 2 -1 3 -1 5c0 6 4 13 11 15l79 26v26l-64 -22c-2 -1 -3 -1 -5 -1c-7 0 -13 5 -15 11l-5 16c-1 2 -1 3 -1 5c0 6 4 13 11 15l88 29c1 1 2 1 7 1h16c9 0 16 -7 16 -16v-133c0 -9 -7 -16 -16 -16h-16c-8 0 -16 7 -16 16v19l-64 -22c-2 -1 -3 -1 -5 -1 c-7 0 -13 5 -15 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EA02.xml b/data/Bravura/EA02.xml
new file mode 100644
index 00000000000..2e532245717
--- /dev/null
+++ b/data/Bravura/EA02.xml
@@ -0,0 +1 @@
+<symbol id="EA02" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 52c0 7 5 17 9 23l27 43c20 32 40 64 61 96c5 8 10 18 17 25c5 7 8 9 13 9c7 -1 21 -4 21 -14c5 -9 56 -92 62 -100c3 -5 7 -10 12 -10c4 0 9 3 14 10c9 11 59 98 67 107c4 5 9 7 14 7s9 -2 14 -7c10 -11 52 -100 58 -109l6 -9c1 -2 2 -4 3 -4c2 0 5 3 10 10 c0 1 1 1 4 4c12 15 155 257 163 267c5 5 17 11 18 11c9 0 20 -10 20 -19c0 -3 -1 -7 -3 -10c-10 -15 -223 -368 -230 -376c-3 -4 -9 -6 -16 -6c-6 0 -11 1 -16 6c-10 10 -61 90 -66 96c-3 5 -5 8 -8 8c-2 0 -5 -2 -9 -6c-7 -8 -69 -91 -74 -98c-3 -3 -9 -5 -14 -5 c-6 0 -11 2 -14 7l-64 94c-4 8 -7 12 -11 12s-9 -5 -16 -13c-10 -11 -19 -23 -28 -35c-8 -10 -19 -24 -30 -24s-14 4 -14 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EA06.xml b/data/Bravura/EA06.xml
new file mode 100644
index 00000000000..7c1c93ad2a0
--- /dev/null
+++ b/data/Bravura/EA06.xml
@@ -0,0 +1 @@
+<symbol id="EA06" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -59v150c0 5 0 9 2 9s3 -1 5 -4c6 -7 22 -11 39 -12v225c0 3 2 6 9 6c3 0 5 -3 5 -6v-405c0 -2 -2 -5 -5 -5h-5c-25 2 -50 15 -50 42z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAA4.xml b/data/Bravura/EAA4.xml
new file mode 100644
index 00000000000..401d133833c
--- /dev/null
+++ b/data/Bravura/EAA4.xml
@@ -0,0 +1 @@
+<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-36 127c0 6 4 14 13 24l20 18c31 25 65 40 87 40c70 0 71 -53 123 -53c8 0 17 4 21 6c14 11 27 17 35 17c2 0 3 0 4 -1c2 -1 3 -3 3 -5c0 -7 -8 -19 -20 -31c-38 -34 -74 -44 -95 -44c-71 0 -72 53 -124 53c-6 0 -14 -3 -18 -6c-10 -10 -27 -24 -43 -24c-4 0 -6 2 -6 6z "/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAA9.xml b/data/Bravura/EAA9.xml
new file mode 100644
index 00000000000..dde86a858a6
--- /dev/null
+++ b/data/Bravura/EAA9.xml
@@ -0,0 +1 @@
+<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-20 29c-7 0 -13 3 -13 8c0 3 2 6 6 10c17 16 38 72 117 72c27 0 55 -13 77 -23c17 -7 34 -18 54 -21c4 -1 8 -1 11 -1c13 0 23 7 36 16c4 3 12 7 18 7c3 0 6 -2 6 -5c0 -1 0 -2 -1 -4c-6 -16 -40 -88 -119 -88c-78 0 -88 44 -133 44c-19 0 -31 -5 -46 -12 c-4 -2 -9 -3 -13 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAAA.xml b/data/Bravura/EAAA.xml
new file mode 100644
index 00000000000..806a315e2c2
--- /dev/null
+++ b/data/Bravura/EAAA.xml
@@ -0,0 +1 @@
+<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-33 92c0 3 3 5 6 5c6 0 14 -4 18 -7c13 -9 23 -16 36 -16c3 0 7 0 11 1c20 3 37 14 54 21c22 10 50 23 77 23c79 0 100 -56 117 -72c4 -4 6 -7 6 -10c0 -5 -6 -8 -13 -8c-4 0 -9 1 -13 3c-15 7 -27 12 -46 12c-45 0 -55 -44 -133 -44c-79 0 -113 72 -119 88 c-1 2 -1 3 -1 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAAD.xml b/data/Bravura/EAAD.xml
new file mode 100644
index 00000000000..2395bde9d0e
--- /dev/null
+++ b/data/Bravura/EAAD.xml
@@ -0,0 +1 @@
+<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 2c-3 0 -6 2 -6 5c0 1 0 2 1 4c6 16 41 79 120 79c77 0 139 -44 185 -44h18c-3 48 -18 92 -36 109l275 -113l-275 -122c23 22 33 54 36 89c-31 -6 -62 -9 -95 -9c-58 0 -96 22 -145 29c-3 0 -5 1 -8 1c-20 0 -40 -12 -52 -21c-4 -3 -12 -7 -18 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAAE.xml b/data/Bravura/EAAE.xml
new file mode 100644
index 00000000000..e47f620467f
--- /dev/null
+++ b/data/Bravura/EAAE.xml
@@ -0,0 +1 @@
+<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 -65l-275 122l275 113c-18 -17 -33 -61 -36 -109h18c46 0 108 44 185 44c79 0 114 -63 120 -79c1 -2 1 -3 1 -4c0 -3 -3 -5 -6 -5c-6 0 -14 4 -18 7c-12 9 -32 21 -52 21c-3 0 -5 -1 -8 -1c-49 -7 -87 -29 -145 -29c-33 0 -64 3 -95 9c3 -35 13 -67 36 -89z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EAAF.xml b/data/Bravura/EAAF.xml
new file mode 100644
index 00000000000..6c2c4dbb6c8
--- /dev/null
+++ b/data/Bravura/EAAF.xml
@@ -0,0 +1 @@
+<symbol id="EAAF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-25 29c0 6 4 14 13 24l20 18c31 25 65 40 87 40c70 0 71 -53 123 -53c8 0 17 4 21 6c14 11 27 17 35 17c2 0 3 0 4 -1c2 -1 3 -3 3 -5c0 -7 -8 -19 -20 -31c-38 -34 -74 -44 -95 -44c-71 0 -72 53 -124 53c-6 0 -14 -3 -18 -6c-10 -10 -27 -24 -43 -24c-4 0 -6 2 -6 6z "/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBA7.xml b/data/Bravura/EBA7.xml
new file mode 100644
index 00000000000..f56459f2ea3
--- /dev/null
+++ b/data/Bravura/EBA7.xml
@@ -0,0 +1 @@
+<symbol id="EBA7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 772c0 10 8 18 18 18s18 -8 18 -18v-754c0 -10 -8 -18 -18 -18s-18 8 -18 18v754z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBA8.xml b/data/Bravura/EBA8.xml
new file mode 100644
index 00000000000..c914956ae07
--- /dev/null
+++ b/data/Bravura/EBA8.xml
@@ -0,0 +1 @@
+<symbol id="EBA8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18v750c0 10 8 18 18 18c4 0 9 -2 12 -5l191 -160c4 -3 7 -9 7 -14c0 -4 -2 -8 -5 -11c-3 -5 -8 -7 -13 -7s-9 2 -12 4l-162 136v-711c0 -10 -8 -18 -18 -18s-18 8 -18 18z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBA9.xml b/data/Bravura/EBA9.xml
new file mode 100644
index 00000000000..4d47c33917d
--- /dev/null
+++ b/data/Bravura/EBA9.xml
@@ -0,0 +1 @@
+<symbol id="EBA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18v750c0 10 8 18 18 18c4 0 9 -2 12 -5l191 -160c4 -3 7 -9 7 -14c0 -4 -2 -8 -5 -11c-3 -5 -8 -7 -13 -7s-9 2 -12 4l-162 136v-102l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-562c0 -10 -8 -18 -18 -18s-18 8 -18 18z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBAA.xml b/data/Bravura/EBAA.xml
new file mode 100644
index 00000000000..10976ccbc62
--- /dev/null
+++ b/data/Bravura/EBAA.xml
@@ -0,0 +1 @@
+<symbol id="EBAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18v750c0 10 8 18 18 18c5 0 9 -2 12 -5l192 -160c4 -3 6 -9 6 -14c0 -4 -1 -8 -4 -11c-4 -5 -9 -7 -14 -7c-4 0 -8 2 -12 4l-162 136v-102l186 -156c4 -3 6 -8 6 -13c0 -4 -1 -8 -4 -12c-4 -4 -9 -6 -14 -6c-4 0 -8 1 -12 4l-162 136v-103l186 -156c4 -3 6 -8 6 -13 c0 -4 -1 -8 -4 -12c-4 -4 -9 -6 -14 -6c-4 0 -8 1 -12 4l-162 136v-412c0 -10 -8 -18 -18 -18s-18 8 -18 18z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBAB.xml b/data/Bravura/EBAB.xml
new file mode 100644
index 00000000000..1683003263c
--- /dev/null
+++ b/data/Bravura/EBAB.xml
@@ -0,0 +1 @@
+<symbol id="EBAB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18v750c0 10 8 18 18 18c4 0 9 -2 12 -5l191 -160c4 -3 7 -9 7 -14c0 -4 -2 -8 -5 -11c-3 -5 -8 -7 -13 -7s-9 2 -12 4l-162 136v-102l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-103l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18 c-5 0 -9 1 -12 4l-162 136v-103l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-262c0 -10 -8 -18 -18 -18s-18 8 -18 18z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBAC.xml b/data/Bravura/EBAC.xml
new file mode 100644
index 00000000000..b0cb42a8dec
--- /dev/null
+++ b/data/Bravura/EBAC.xml
@@ -0,0 +1 @@
+<symbol id="EBAC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 768c0 10 8 18 18 18c4 0 9 -2 12 -5l191 -160c4 -3 7 -9 7 -14c0 -4 -2 -8 -5 -11c-3 -5 -8 -7 -13 -7s-9 2 -12 4l-162 136v-102l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-103l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18 c-5 0 -9 1 -12 4l-162 136v-103l185 -155c4 -4 7 -9 7 -14c0 -4 -2 -9 -5 -12c-3 -4 -8 -6 -13 -6s-9 1 -12 4l-162 136v-102l185 -156c4 -3 7 -8 7 -13c0 -9 -9 -18 -18 -18c-5 0 -9 1 -12 4l-162 136v-113c0 -10 -8 -18 -18 -18s-18 8 -18 18v750z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC0.xml b/data/Bravura/EBC0.xml
new file mode 100644
index 00000000000..8a73edac364
--- /dev/null
+++ b/data/Bravura/EBC0.xml
@@ -0,0 +1 @@
+<symbol id="EBC0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 25c-8 11 -11 24 -11 38c0 40 27 91 58 128c35 41 63 51 115 51c15 0 29 -1 32 -1c17 -1 30 -4 30 -13c-1 -7 -22 -113 -22 -149c0 -7 1 -12 3 -12c13 0 38 22 43 25c3 1 6 2 9 2c4 0 8 -1 8 -8c0 -3 -1 -8 -3 -13c-9 -25 -31 -73 -84 -73c-35 0 -50 20 -50 52 c0 2 0 5 -1 5s-2 0 -3 -2c-32 -42 -59 -54 -79 -54c-29 0 -45 24 -45 24zM54 101c0 -24 8 -43 27 -43c28 0 54 13 62 43c7 27 14 67 17 78c0 2 -1 3 -3 3h-42c-27 0 -35 -5 -44 -18c-11 -17 -17 -42 -17 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC1.xml b/data/Bravura/EBC1.xml
new file mode 100644
index 00000000000..c8e62bb4ce5
--- /dev/null
+++ b/data/Bravura/EBC1.xml
@@ -0,0 +1 @@
+<symbol id="EBC1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 262v5c0 2 1 3 3 5c11 6 40 24 43 26c4 2 7 2 9 2l23 -6c4 -2 6 -5 6 -8c-3 -22 -13 -118 -13 -122c0 -1 -1 -2 -1 -3c0 -3 3 -3 6 -3c20 8 55 22 71 27c7 2 16 4 25 4c21 0 45 -9 47 -37v-9c0 -39 -19 -87 -87 -126c-23 -13 -42 -17 -57 -17c-28 0 -44 16 -52 26 c-2 3 -5 9 -5 15v207c-1 5 -2 8 -8 10l-6 2c-2 0 -4 1 -4 2zM67 121c-1 -7 -3 -22 -4 -41c0 -19 22 -39 48 -39c36 0 59 29 59 64c0 4 -1 9 -1 14c-2 23 -20 31 -33 31c-3 0 -6 0 -8 -1c-12 -4 -42 -15 -56 -21c-2 0 -5 -3 -5 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC2.xml b/data/Bravura/EBC2.xml
new file mode 100644
index 00000000000..28b65ba07a6
--- /dev/null
+++ b/data/Bravura/EBC2.xml
@@ -0,0 +1 @@
+<symbol id="EBC2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 100c0 40 18 90 65 144c3 4 6 6 11 7c6 0 170 13 208 15c1 0 7 -5 7 -9c0 -13 -28 -55 -28 -55c-2 -3 -8 -7 -13 -7c-35 -1 -168 -2 -172 -2c-5 0 -8 -3 -9 -5c-13 -15 -21 -37 -21 -59c0 -32 18 -62 67 -62c0 0 52 0 86 40c1 2 3 3 6 3l10 -5c1 -1 2 -4 2 -8 c-6 -21 -30 -96 -111 -96h-8c-57 4 -97 39 -100 93v6z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC3.xml b/data/Bravura/EBC3.xml
new file mode 100644
index 00000000000..bdbb65612f0
--- /dev/null
+++ b/data/Bravura/EBC3.xml
@@ -0,0 +1 @@
+<symbol id="EBC3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 206c0 12 8 25 27 38c1 1 2 1 3 1c9 0 15 -27 50 -27h5c27 2 75 3 123 3c56 0 112 -1 141 -3c24 -1 80 -18 80 -54s-34 -164 -170 -164c-29 0 -57 32 -57 58c2 29 40 80 56 93c4 3 5 6 5 7c0 2 -3 2 -7 2h-191c-29 0 -65 20 -65 46zM295 158c-10 -2 -40 -41 -40 -70 c0 -19 13 -34 51 -34h7c51 3 75 32 75 59c0 25 -21 49 -62 49c-9 0 -20 -1 -31 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC4.xml b/data/Bravura/EBC4.xml
new file mode 100644
index 00000000000..11a63851ee2
--- /dev/null
+++ b/data/Bravura/EBC4.xml
@@ -0,0 +1 @@
+<symbol id="EBC4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 103c0 31 23 67 42 88c26 30 62 47 102 47c25 0 47 -17 47 -39c0 -9 -4 -20 -14 -30c0 0 -53 -50 -70 -64c-6 -5 -8 -13 -8 -21s2 -17 7 -22c16 -18 37 -26 82 -26c63 0 79 49 81 60c1 10 19 18 29 18c10 -1 15 -6 15 -15c0 -3 0 -7 -2 -11c-24 -60 -89 -88 -152 -88 c-39 0 -94 14 -123 38c-14 12 -33 39 -36 58v7zM59 144c0 -5 2 -10 4 -15c3 -5 5 -12 8 -19c1 -1 2 -2 4 -2c1 0 3 0 5 2c5 3 47 43 47 43c4 2 6 7 6 12c0 11 -9 26 -23 26c-3 0 -5 -1 -8 -2c-22 -9 -43 -24 -43 -45z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC5.xml b/data/Bravura/EBC5.xml
new file mode 100644
index 00000000000..7c2ff76d5e4
--- /dev/null
+++ b/data/Bravura/EBC5.xml
@@ -0,0 +1 @@
+<symbol id="EBC5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 12c0 1 -1 2 -1 3c0 10 21 31 31 31c1 0 2 0 3 -1c7 -5 22 -24 38 -24c4 0 7 1 11 3c19 11 23 51 23 91c-32 0 -54 1 -57 1s-7 5 -7 6c0 13 32 32 41 32c3 1 8 3 22 4c-1 22 -4 37 -4 46c0 50 53 60 92 60c19 0 33 -2 37 -3c11 -3 21 -11 21 -22c-3 -9 -10 -12 -18 -12 c-16 0 -37 11 -49 15c-6 2 -11 2 -15 2c-13 0 -16 -8 -16 -25c0 -11 2 -34 4 -57c12 1 23 1 29 1h5c7 -2 13 -8 13 -14c0 -1 0 -3 -1 -4c-4 -7 -18 -22 -18 -22c-6 -6 -7 -7 -16 -8h-11c-6 -92 -67 -115 -111 -115c-23 0 -42 6 -46 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC6.xml b/data/Bravura/EBC6.xml
new file mode 100644
index 00000000000..00c4813233d
--- /dev/null
+++ b/data/Bravura/EBC6.xml
@@ -0,0 +1 @@
+<symbol id="EBC6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 148c0 26 24 73 33 77c3 1 8 2 12 2c9 0 18 -3 18 -14v-9c0 -57 4 -179 136 -179c49 0 102 30 108 100c-30 -24 -64 -44 -90 -44c-7 0 -14 1 -20 5c-21 12 -28 30 -28 49c0 35 24 73 28 78c5 8 14 14 24 14l67 6c-1 5 -3 9 -5 14c-2 6 -3 11 -3 15c0 14 9 21 17 21 s41 -3 58 -43l36 3c7 -1 13 -3 13 -10c0 -3 -1 -8 -5 -14c-3 -5 -16 -20 -33 -38c-4 -102 -110 -181 -208 -181c-78 0 -128 58 -157 139c-1 3 -1 6 -1 9zM204 164c0 -15 37 -26 53 -28h5c16 0 36 14 38 32c0 18 -38 20 -57 21h-8c-15 0 -25 0 -31 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC7.xml b/data/Bravura/EBC7.xml
new file mode 100644
index 00000000000..a6da9dddbcd
--- /dev/null
+++ b/data/Bravura/EBC7.xml
@@ -0,0 +1 @@
+<symbol id="EBC7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 260c0 4 2 7 8 9c14 4 58 21 68 21c9 0 16 -12 19 -21c2 -5 3 -16 3 -37c0 -15 0 -37 -3 -65c22 21 56 36 85 36c30 0 54 -16 54 -60c0 -51 -29 -143 -89 -143c-12 0 -22 4 -27 6c-3 1 -3 3 -3 5c0 6 14 44 22 44c1 0 2 -1 3 -1c10 -8 19 -12 27 -12c22 0 29 27 29 45 c0 35 -26 85 -54 85c-30 0 -48 -52 -54 -75l-9 -61c0 -3 -2 -4 -3 -4c-5 0 -15 15 -15 15c-1 21 -5 159 -5 168s-4 24 -46 33c-6 1 -10 7 -10 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC8.xml b/data/Bravura/EBC8.xml
new file mode 100644
index 00000000000..3aae3c56a2b
--- /dev/null
+++ b/data/Bravura/EBC8.xml
@@ -0,0 +1 @@
+<symbol id="EBC8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 161c-4 1 -6 6 -7 9c0 3 1 6 2 10c4 9 79 41 87 43c5 0 9 -4 10 -11l-4 -148c0 -5 6 -15 7 -15c3 0 7 5 16 5c3 -1 6 -4 6 -7v-4c-1 -4 -3 -7 -6 -9c-2 -1 -33 -23 -56 -33c-4 0 -7 5 -8 10c0 5 -5 99 -7 135c-1 10 -15 18 -25 18c-7 0 -11 -3 -15 -3zM37 280 c0 1 1 2 2 3c7 6 23 20 25 21s4 2 6 2h24c3 -1 5 -1 6 -4c2 -4 3 -8 3 -12c0 -19 -17 -39 -28 -45c0 -1 -2 -1 -6 -1s-10 3 -10 7c0 1 0 2 1 3c2 2 3 5 3 7c0 10 -26 17 -26 19z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBC9.xml b/data/Bravura/EBC9.xml
new file mode 100644
index 00000000000..57c5c686406
--- /dev/null
+++ b/data/Bravura/EBC9.xml
@@ -0,0 +1 @@
+<symbol id="EBC9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 258c-6 1 -10 7 -10 12c0 4 2 7 8 9c14 4 58 21 68 21c9 0 16 -12 19 -21c2 -5 3 -16 3 -37c0 -15 0 -37 -3 -65c30 28 71 60 95 60c12 0 19 -7 19 -26c0 -55 -38 -90 -92 -95c13 -6 24 -13 29 -18c20 -20 35 -57 47 -57c1 0 2 0 3 1c7 5 11 7 14 7c2 0 3 -1 3 -3 s0 -4 -1 -6c-3 -8 -30 -39 -48 -39c-4 0 -7 1 -10 5c-10 14 -41 60 -68 90l-7 -50c0 -3 -2 -4 -3 -4c-5 0 -15 15 -15 15c0 22 -4 65 -4 65c-7 3 -10 6 -10 8c0 5 6 7 11 8l-2 87c0 9 -4 24 -46 33zM160 193c-25 0 -51 -36 -60 -55c7 -4 16 -7 24 -7c19 0 37 13 43 36 c2 6 2 10 2 14c0 8 -3 12 -9 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBCA.xml b/data/Bravura/EBCA.xml
new file mode 100644
index 00000000000..241921fa8dc
--- /dev/null
+++ b/data/Bravura/EBCA.xml
@@ -0,0 +1 @@
+<symbol id="EBCA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 0c-40 0 -41 73 -41 94v152c0 25 55 50 76 50c22 0 37 -15 37 -52c0 -64 -45 -115 -64 -142v-40c0 -11 6 -15 14 -15c17 0 45 17 50 21c2 3 6 4 10 4s8 -2 8 -5c0 -1 -1 -3 -3 -5c-40 -46 -68 -62 -87 -62zM49 244v-115c22 26 29 68 29 93c0 10 -1 18 -3 20 c-4 5 -8 8 -13 8c-4 0 -9 -2 -13 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBCB.xml b/data/Bravura/EBCB.xml
new file mode 100644
index 00000000000..b922ca2486b
--- /dev/null
+++ b/data/Bravura/EBCB.xml
@@ -0,0 +1 @@
+<symbol id="EBCB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 234c0 5 3 10 11 12c19 6 79 29 93 29c15 0 29 -28 29 -42c0 -4 -1 -10 -2 -21c17 30 41 46 62 46c24 0 45 -19 50 -59c19 45 49 64 78 64c46 0 90 -48 90 -125c0 -64 -25 -138 -101 -138c-16 0 -30 3 -38 7c-3 1 -4 7 -4 8c0 13 20 53 24 56c2 2 4 3 6 3s3 -1 4 -1 c13 -11 24 -17 33 -17c28 0 36 56 36 78c0 43 -16 90 -47 90c-5 0 -10 -1 -16 -4c-38 -17 -49 -120 -52 -147c0 -2 -1 -4 -1 -5c-1 -8 -8 -11 -15 -11c-9 0 -19 5 -19 13v17c0 39 -2 128 -43 128c-33 0 -47 -54 -56 -89l-2 -9c-3 -26 -7 -53 -12 -84c-1 -4 -2 -5 -4 -5 c-7 0 -21 20 -21 20c-1 29 -6 114 -6 126s-6 32 -63 43c-8 2 -14 10 -14 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBCC.xml b/data/Bravura/EBCC.xml
new file mode 100644
index 00000000000..bf7202ab6a3
--- /dev/null
+++ b/data/Bravura/EBCC.xml
@@ -0,0 +1 @@
+<symbol id="EBCC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 261c0 5 3 10 11 12c19 6 79 29 93 29c18 0 29 -31 29 -47c0 -4 -1 -15 -2 -26c29 29 75 50 115 50c41 0 75 -23 75 -83c0 -69 -40 -196 -121 -196c-17 0 -31 6 -38 9c-3 1 -4 7 -4 8c0 13 20 53 24 56c2 2 4 3 6 3s3 -1 4 -1c13 -11 25 -17 36 -17c28 0 41 38 41 62 c0 48 -35 116 -74 116c-42 0 -66 -70 -75 -102c-3 -26 -7 -53 -12 -84c-1 -4 -2 -5 -4 -5c-7 0 -20 20 -20 20c-2 29 -7 136 -7 148s-6 20 -63 31c-8 2 -14 10 -14 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE0.xml b/data/Bravura/EBE0.xml
new file mode 100644
index 00000000000..4fa12a87b88
--- /dev/null
+++ b/data/Bravura/EBE0.xml
@@ -0,0 +1 @@
+<symbol id="EBE0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 -1c-71 0 -128 68 -128 150c0 83 57 151 128 151c72 0 129 -68 129 -151c0 -82 -57 -150 -129 -150zM96 154c0 -70 31 -128 56 -128s57 58 57 128c0 71 -32 127 -57 127s-56 -56 -56 -127z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE1.xml b/data/Bravura/EBE1.xml
new file mode 100644
index 00000000000..f03c7cf7636
--- /dev/null
+++ b/data/Bravura/EBE1.xml
@@ -0,0 +1 @@
+<symbol id="EBE1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 154c0 3 1 8 1 8l36 126c4 5 10 12 15 12c9 -2 11 -2 23 -2c7 0 14 2 23 2c8 0 11 -5 11 -14v-246c0 -10 11 -21 19 -21c10 0 10 -10 10 -10s0 -9 -10 -9h-99c-9 0 -15 2 -15 9c0 8 6 10 10 10c12 0 24 8 24 22v169c0 4 -1 9 -4 9c-1 0 -3 -2 -5 -6 c-8 -12 -22 -61 -23 -64c-1 -1 -3 -5 -7 -5c-1 0 -3 1 -6 3c-2 1 -3 3 -3 7z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE2.xml b/data/Bravura/EBE2.xml
new file mode 100644
index 00000000000..1d63fe16ba5
--- /dev/null
+++ b/data/Bravura/EBE2.xml
@@ -0,0 +1 @@
+<symbol id="EBE2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 20c10 38 33 72 66 92c30 19 69 29 90 56c12 17 19 37 19 58c0 14 -19 60 -75 60c-35 0 -47 -14 -47 -22c0 -12 30 -14 30 -42c0 -13 -4 -41 -34 -41c-16 0 -32 11 -39 25c-3 10 -7 20 -7 28c0 10 4 19 12 29c30 34 66 38 108 38c13 0 58 -4 89 -29 c15 -14 27 -33 27 -61c0 -45 -36 -72 -78 -77c-13 -4 -75 -34 -88 -56c7 2 14 4 23 4c23 0 52 -10 63 -15l18 -6c3 -1 5 -1 7 -1c18 0 31 22 37 38c1 4 4 7 8 7s7 -1 7 -9c-9 -91 -55 -94 -80 -94c-53 0 -62 32 -85 32c-36 0 -43 -37 -56 -37c-1 0 -3 0 -5 2 c-7 3 -10 13 -10 21z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE3.xml b/data/Bravura/EBE3.xml
new file mode 100644
index 00000000000..ab0279dd575
--- /dev/null
+++ b/data/Bravura/EBE3.xml
@@ -0,0 +1 @@
+<symbol id="EBE3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 71c0 11 2 22 11 29c5 6 14 11 22 13h5c14 0 28 -7 33 -20c1 -4 3 -10 3 -14c-2 -12 -5 -27 -5 -40v-7c1 -6 13 -9 20 -9c14 0 70 2 70 71c0 18 -9 54 -78 54c-5 0 -16 0 -16 7s9 11 17 11c18 1 75 5 75 61c0 21 -18 53 -79 53c-4 0 -22 -5 -25 -18c0 -8 5 -13 7 -14 c3 -2 15 -3 16 -21v-4c0 -16 -11 -30 -33 -30c-30 1 -40 21 -40 38c0 25 29 69 94 69h10c26 -2 100 -18 100 -74c0 -13 -4 -28 -13 -38c-6 -8 -15 -12 -23 -17l-19 -5c-2 0 -4 -3 -4 -5c0 -1 0 -3 2 -4c1 -2 2 -1 6 -2l7 -3c2 0 3 -1 6 -1l7 -2l13 -7c5 -4 9 -7 13 -12 c5 -5 10 -11 12 -18c3 -7 6 -17 6 -29c0 -52 -61 -83 -119 -83h-7c-60 1 -93 33 -94 71z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE4.xml b/data/Bravura/EBE4.xml
new file mode 100644
index 00000000000..e539b28de1e
--- /dev/null
+++ b/data/Bravura/EBE4.xml
@@ -0,0 +1 @@
+<symbol id="EBE4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 95c0 4 2 7 5 10c15 21 77 108 77 184c0 10 8 12 14 12c5 0 12 -2 23 -2c10 0 35 2 41 2c4 0 9 -3 9 -8c0 -1 -2 -2 -2 -4c-1 -7 -77 -141 -126 -182h78v49c0 8 3 12 6 14l35 69c4 5 7 6 12 6c6 0 7 -4 7 -10v-128h44c7 0 10 -5 10 -12s-4 -12 -10 -12h-44v-34 c0 -19 13 -23 19 -23s13 -3 13 -12c0 -8 -6 -13 -11 -13h-103c-10 0 -13 7 -13 13s5 11 16 11c9 0 19 5 19 21v37h-107c-7 0 -12 6 -12 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE5.xml b/data/Bravura/EBE5.xml
new file mode 100644
index 00000000000..4f4f694ef45
--- /dev/null
+++ b/data/Bravura/EBE5.xml
@@ -0,0 +1 @@
+<symbol id="EBE5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 78v8c1 16 18 36 44 36c20 0 38 -17 38 -38c0 -15 -13 -33 -33 -33c-5 0 -7 -2 -7 -6c0 -17 20 -22 33 -22h7c16 0 75 10 75 76c0 67 -51 79 -72 79s-49 -14 -56 -20c-5 -7 -10 -13 -12 -13c-6 0 -12 3 -12 11l7 135c0 4 3 9 14 9c10 0 63 -6 81 -6c20 0 68 6 76 6 c6 0 8 -6 8 -12c0 -8 -4 -45 -87 -45c-22 0 -49 5 -62 6c-6 0 -9 -4 -9 -8c-1 -6 -4 -54 -4 -54c0 -6 2 -6 6 -6c20 12 45 18 80 18c56 0 100 -44 100 -100c0 -55 -39 -99 -112 -99c-75 0 -103 35 -103 78z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE6.xml b/data/Bravura/EBE6.xml
new file mode 100644
index 00000000000..45de29fbf09
--- /dev/null
+++ b/data/Bravura/EBE6.xml
@@ -0,0 +1 @@
+<symbol id="EBE6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 149v5c0 27 11 58 23 82c21 41 63 63 109 64c29 0 72 -5 77 -41v-5c0 -18 -12 -33 -30 -37c-3 0 -4 -1 -6 -1c-10 0 -17 5 -23 10c-7 4 -10 12 -10 19c0 5 2 11 4 15c2 5 7 16 7 17c0 6 -8 9 -20 9c-49 0 -63 -56 -63 -96c0 -12 3 -26 14 -26c1 0 3 2 4 2l10 2 c2 0 4 1 6 1c18 5 37 10 55 10c23 0 52 -10 62 -33c9 -14 15 -28 16 -45v-7c0 -65 -55 -94 -113 -94c-15 0 -33 2 -48 8c-52 24 -74 88 -74 141zM145 151c-33 0 -54 -23 -54 -60s18 -74 54 -74c34 0 53 37 53 74s-22 60 -53 60z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE7.xml b/data/Bravura/EBE7.xml
new file mode 100644
index 00000000000..c568897a8e0
--- /dev/null
+++ b/data/Bravura/EBE7.xml
@@ -0,0 +1 @@
+<symbol id="EBE7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 205v75c0 5 3 8 6 8c2 0 6 -3 7 -5c3 -5 11 -15 15 -15c5 1 8 4 17 11c9 9 22 22 52 22c50 0 82 -52 98 -52c15 0 23 35 27 42c2 4 11 6 12 6c6 0 8 -2 8 -8v-17c0 -63 -72 -149 -72 -250c0 -18 -3 -22 -9 -22c-7 0 -16 5 -32 5c-15 0 -19 -5 -30 -5s-11 5 -11 18 c0 24 18 58 42 85c35 42 58 95 58 118c-2 4 -3 6 -5 6s-4 -1 -5 -2c-4 -4 -16 -14 -33 -14c-36 0 -64 46 -89 46c-27 0 -37 -47 -42 -52c-2 -5 -5 -10 -8 -10c-6 0 -6 10 -6 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE8.xml b/data/Bravura/EBE8.xml
new file mode 100644
index 00000000000..aac2b0f6f44
--- /dev/null
+++ b/data/Bravura/EBE8.xml
@@ -0,0 +1 @@
+<symbol id="EBE8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 73c0 37 24 69 54 83c-29 16 -52 37 -52 77c0 49 47 68 114 68c16 0 101 -10 101 -68c0 -29 -15 -60 -35 -73c28 -15 48 -34 48 -69c0 -78 -62 -91 -120 -91c-57 0 -110 23 -110 73zM58 77c0 -39 34 -58 74 -58c38 0 68 19 68 43c0 39 -55 63 -97 81 c-26 -10 -45 -43 -45 -66zM139 284c-25 0 -71 -12 -71 -37c0 -36 61 -57 108 -74c19 11 30 38 30 61c0 41 -49 50 -67 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/EBE9.xml b/data/Bravura/EBE9.xml
new file mode 100644
index 00000000000..4abb2079b7a
--- /dev/null
+++ b/data/Bravura/EBE9.xml
@@ -0,0 +1 @@
+<symbol id="EBE9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 209c0 64 55 91 112 91c15 0 33 -2 47 -8c52 -24 76 -88 76 -141c0 -29 -10 -62 -23 -87c-21 -41 -64 -63 -110 -64c-16 0 -32 2 -48 7c-17 7 -26 18 -29 34v5c0 18 13 33 31 37c3 0 4 1 6 1c14 0 33 -14 33 -29c0 -5 -1 -11 -4 -15c-2 -5 -7 -16 -7 -17 c0 -6 8 -9 19 -9c12 0 31 6 40 16c19 19 22 56 22 83c0 12 -2 23 -11 23c-2 0 -4 -2 -5 -2c-22 -4 -48 -13 -72 -13c-26 0 -49 10 -63 33c-7 14 -13 28 -14 45v10zM138 283c-34 0 -53 -37 -53 -74s22 -60 53 -60c34 0 53 23 53 60s-17 74 -53 74z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/ED40.xml b/data/Bravura/ED40.xml
new file mode 100644
index 00000000000..c52ad74ab08
--- /dev/null
+++ b/data/Bravura/ED40.xml
@@ -0,0 +1 @@
+<symbol id="ED40" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M369 221c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M0 123c0 8 0 14 13 18l300 102c4 1 8 2 9 2c9 0 12 -6 15 -14c1 -4 2 -7 2 -10c0 -5 -3 -10 -14 -14c0 0 -216 -73 -226 -77c-5 -1 -7 -4 -7 -7s2 -5 8 -7c11 -3 225 -76 225 -76c11 -5 14 -10 14 -15c0 -3 -1 -6 -2 -9c-3 -7 -7 -15 -14 -15c-1 0 -3 0 -4 1l-306 103 c-13 3 -13 10 -13 18z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/ED41.xml b/data/Bravura/ED41.xml
new file mode 100644
index 00000000000..7d2ef6c2580
--- /dev/null
+++ b/data/Bravura/ED41.xml
@@ -0,0 +1 @@
+<symbol id="ED41" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M369 -25c0 3 1 6 2 10c3 8 6 14 15 14c1 0 5 -1 9 -2l300 -102c13 -4 13 -10 13 -18s0 -15 -13 -18l-306 -103c-1 -1 -3 -1 -4 -1c-7 0 -11 8 -14 15c-1 3 -2 6 -2 9c0 5 3 10 14 15c0 0 214 73 225 76c6 2 8 4 8 7s-2 6 -7 7c-10 4 -226 77 -226 77c-11 4 -14 9 -14 14z M0 -123c0 8 0 14 13 18l300 102c4 1 8 2 9 2c9 0 12 -6 15 -14c1 -4 2 -7 2 -10c0 -5 -3 -10 -14 -14c0 0 -216 -73 -226 -77c-5 -1 -7 -4 -7 -7s2 -5 8 -7c11 -3 225 -76 225 -76c11 -5 14 -10 14 -15c0 -3 -1 -6 -2 -9c-3 -7 -7 -15 -14 -15c-1 0 -3 0 -4 1l-306 103 c-13 3 -13 10 -13 18z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville.xml b/data/Gootville.xml
new file mode 100644
index 00000000000..e3c4bce50ea
--- /dev/null
+++ b/data/Gootville.xml
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bounding-boxes font-family="Gootville" units-per-em="1000">
+  <g c="E527" x="-72.0" y="-180.0" w="2148.0" h="452.0" h-a-x="2076" n="dynamicPPPPPP">
+    <a n="opticalCenter" x="4.25" y="0.0"/>
+  </g>
+  <g c="E528" x="-72.0" y="-180.0" w="1802.0" h="452.0" h-a-x="1730" n="dynamicPPPPP">
+    <a n="opticalCenter" x="3.55" y="0.0"/>
+  </g>
+  <g c="E529" x="-72.0" y="-180.0" w="1456.0" h="452.0" h-a-x="1384" n="dynamicPPPP">
+    <a n="opticalCenter" x="3.0" y="0.0"/>
+  </g>
+  <g c="E52A" x="-72.0" y="-180.0" w="1110.0" h="452.0" h-a-x="1038" n="dynamicPPP">
+    <a n="opticalCenter" x="2.37" y="0.0"/>
+  </g>
+  <g c="E52B" x="-72.0" y="-180.0" w="764.0" h="452.0" h-a-x="692" n="dynamicPP">
+    <a n="opticalCenter" x="1.71" y="0.0"/>
+  </g>
+  <g c="E52C" x="-41.0" y="-180.0" w="781.0" h="452.0" h-a-x="740" n="dynamicMP">
+    <a n="opticalCenter" x="1.85" y="0.0"/>
+  </g>
+  <g c="E52D" x="-41.0" y="-147.0" w="821.0" h="597.0" h-a-x="671" n="dynamicMF">
+    <a n="opticalCenter" x="1.8" y="0.0"/>
+  </g>
+  <g c="E52E" x="-72.0" y="-180.0" w="804.0" h="630.0" h-a-x="623" n="dynamicPF">
+    <a n="opticalCenter" x="1.68" y="0.0"/>
+  </g>
+  <g c="E52F" x="-144.0" y="-147.0" w="807.0" h="597.0" h-a-x="554" n="dynamicFF">
+    <a n="opticalCenter" x="1.85" y="0.0"/>
+  </g>
+  <g c="E530" x="-144.0" y="-147.0" w="1084.0" h="597.0" h-a-x="831" n="dynamicFFF">
+    <a n="opticalCenter" x="2.47" y="0.0"/>
+  </g>
+  <g c="E531" x="-144.0" y="-147.0" w="1361.0" h="597.0" h-a-x="1108" n="dynamicFFFF">
+    <a n="opticalCenter" x="2.82" y="0.0"/>
+  </g>
+  <g c="E532" x="-144.0" y="-147.0" w="1638.0" h="597.0" h-a-x="1385" n="dynamicFFFFF">
+    <a n="opticalCenter" x="2.98" y="0.0"/>
+  </g>
+  <g c="E533" x="-144.0" y="-147.0" w="1915.0" h="597.0" h-a-x="1662" n="dynamicFFFFFF">
+    <a n="opticalCenter" x="3.5" y="0.0"/>
+  </g>
+  <g c="E534" x="-144.0" y="-180.0" w="767.0" h="630.0" h-a-x="623" n="dynamicFortePiano">
+    <a n="opticalCenter" x="1.5" y="0.0"/>
+  </g>
+  <g c="E535" x="-144.0" y="-147.0" w="711.0" h="597.0" h-a-x="567" n="dynamicForzando">
+    <a n="opticalCenter" x="1.35" y="0.0"/>
+  </g>
+  <g c="E536" x="0.0" y="-147.0" w="612.0" h="597.0" h-a-x="503" n="dynamicSforzando1">
+    <a n="opticalCenter" x="1.3" y="0.0"/>
+  </g>
+  <g c="E537" x="0.0" y="-180.0" w="849.0" h="630.0" h-a-x="849" n="dynamicSforzandoPiano">
+    <a n="opticalCenter" x="1.9" y="0.0"/>
+  </g>
+  <g c="E538" x="0.0" y="-180.0" w="1195.0" h="630.0" h-a-x="1195" n="dynamicSforzandoPianissimo">
+    <a n="opticalCenter" x="1.97" y="0.0"/>
+  </g>
+  <g c="E539" x="0.0" y="-147.0" w="793.0" h="597.0" h-a-x="793" n="dynamicSforzato">
+    <a n="opticalCenter" x="1.76" y="0.0"/>
+  </g>
+  <g c="E53A" x="0.0" y="-180.0" w="1139.0" h="630.0" h-a-x="1139" n="dynamicSforzatoPiano">
+    <a n="opticalCenter" x="1.85" y="0.0"/>
+  </g>
+  <g c="E53B" x="0.0" y="-147.0" w="1070.0" h="597.0" h-a-x="1070" n="dynamicSforzatoFF">
+    <a n="opticalCenter" x="2.28" y="0.0"/>
+  </g>
+  <g c="E53C" x="-17.0" y="-147.0" w="696.0" h="597.0" h-a-x="570" n="dynamicRinforzando1">
+    <a n="opticalCenter" x="1.56" y="0.0"/>
+  </g>
+  <g c="E53D" x="-17.0" y="-147.0" w="877.0" h="597.0" h-a-x="860" n="dynamicRinforzando2">
+    <a n="opticalCenter" x="2.08" y="0.0"/>
+  </g>
+  <g c="E003" x="0.0" y="-77.0" w="414.0" h="240.0" h-a-x="414" n="bracketTop"/>
+  <g c="E004" x="0.0" y="-163.0" w="414.0" h="240.0" h-a-x="414" n="bracketBottom"/>
+  <g c="E043" x="0.0" y="320.0" w="100.0" h="350.0" h-a-x="100" n="repeatDots"/>
+  <g c="E044" x="0.0" y="75.0" w="100.0" h="100.0" h-a-x="100" n="repeatDot"/>
+  <g c="E047" x="0.0" y="-348.0" w="486.0" h="696.0" h-a-x="486" n="segno"/>
+  <g c="E048" x="0.0" y="-316.0" w="464.0" h="632.0" h-a-x="464" n="coda"/>
+  <g c="E049" x="0.0" y="-316.0" w="464.0" h="632.0" h-a-x="464" n="codaSquare"/>
+  <g c="E050" x="0.0" y="-633.0" w="626.0" h="1713.0" h-a-x="626" n="gClef"/>
+  <g c="E051" x="0.0" y="-877.0" w="626.0" h="1957.0" h-a-x="626" n="gClef15mb"/>
+  <g c="E052" x="0.0" y="-877.0" w="626.0" h="1957.0" h-a-x="626" n="gClef8vb"/>
+  <g c="E053" x="0.0" y="-633.0" w="626.0" h="1957.0" h-a-x="626" n="gClef8va"/>
+  <g c="E054" x="0.0" y="-633.0" w="626.0" h="1957.0" h-a-x="626" n="gClef15ma"/>
+  <g c="E05C" x="0.0" y="-500.0" w="642.0" h="1000.0" h-a-x="642" n="cClef"/>
+  <g c="E05D" x="0.0" y="-744.0" w="642.0" h="1244.0" h-a-x="642" n="cClef8vb"/>
+  <g c="E062" x="0.0" y="-546.0" w="664.0" h="800.0" h-a-x="664" n="fClef"/>
+  <g c="E063" x="0.0" y="-790.0" w="664.0" h="1044.0" h-a-x="664" n="fClef15mb"/>
+  <g c="E064" x="0.0" y="-790.0" w="664.0" h="1044.0" h-a-x="664" n="fClef8vb"/>
+  <g c="E065" x="0.0" y="-546.0" w="664.0" h="1044.0" h-a-x="664" n="fClef8va"/>
+  <g c="E066" x="0.0" y="-546.0" w="664.0" h="1044.0" h-a-x="664" n="fClef15ma"/>
+  <g c="E069" x="0.0" y="-250.0" w="340.0" h="500.0" h-a-x="340" n="unpitchedPercussionClef1"/>
+  <g c="E06A" x="0.0" y="-420.0" w="270.0" h="840.0" h-a-x="270" n="unpitchedPercussionClef2"/>
+  <g c="E080" x="0.0" y="-243.0" w="424.0" h="486.0" h-a-x="424" n="timeSig0"/>
+  <g c="E081" x="0.0" y="-243.0" w="284.0" h="486.0" h-a-x="284" n="timeSig1"/>
+  <g c="E082" x="0.0" y="-243.0" w="376.0" h="486.0" h-a-x="376" n="timeSig2"/>
+  <g c="E083" x="0.0" y="-243.0" w="337.0" h="486.0" h-a-x="337" n="timeSig3"/>
+  <g c="E084" x="0.0" y="-243.0" w="384.0" h="486.0" h-a-x="384" n="timeSig4"/>
+  <g c="E085" x="0.0" y="-243.0" w="337.0" h="486.0" h-a-x="337" n="timeSig5"/>
+  <g c="E086" x="0.0" y="-243.0" w="390.0" h="486.0" h-a-x="390" n="timeSig6"/>
+  <g c="E087" x="0.0" y="-243.0" w="363.0" h="486.0" h-a-x="363" n="timeSig7"/>
+  <g c="E088" x="0.0" y="-243.0" w="400.0" h="486.0" h-a-x="400" n="timeSig8"/>
+  <g c="E089" x="0.0" y="-243.0" w="390.0" h="486.0" h-a-x="390" n="timeSig9"/>
+  <g c="E08A" x="0.0" y="-243.0" w="426.0" h="486.0" h-a-x="426" n="timeSigCommon"/>
+  <g c="E08B" x="0.0" y="-412.0" w="426.0" h="824.0" h-a-x="426" n="timeSigCutCommon"/>
+  <g c="E092" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="120" n="timeSigParensLeftSmall"/>
+  <g c="E093" x="16.0" y="-267.0" w="104.0" h="534.0" h-a-x="120" n="timeSigParensRightSmall"/>
+  <g c="E094" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" n="timeSigParensLeft"/>
+  <g c="E095" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" n="timeSigParensRight"/>
+  <g c="E0A0" x="0.0" y="-177.0" w="666.0" h="354.0" h-a-x="666" n="noteheadDoubleWhole">
+    <a n="noteheadOrigin" x="0.36" y="0.0"/>
+  </g>
+  <g c="E0A1" x="0.0" y="-230.0" w="524.0" h="460.0" h-a-x="524" n="noteheadDoubleWholeSquare"/>
+  <g c="E0A2" x="0.0" y="-135.0" w="454.0" h="270.0" h-a-x="454" n="noteheadWhole"/>
+  <g c="E0A3" x="0.0" y="-135.0" w="316.0" h="270.0" h-a-x="316" n="noteheadHalf">
+    <a n="splitStemDownNE" x="0.96" y="-0.3"/>
+    <a n="splitStemDownNW" x="0.13" y="-0.43"/>
+    <a n="splitStemUpSE" x="1.11" y="0.37"/>
+    <a n="splitStemUpSW" x="0.33" y="0.38"/>
+    <a n="stemDownNW" x="0.0" y="-0.17"/>
+    <a n="stemUpSE" x="1.18" y="0.17"/>
+  </g>
+  <g c="E0A4" x="0.0" y="-135.0" w="316.0" h="270.0" h-a-x="316" n="noteheadBlack">
+    <a n="splitStemDownNE" x="0.97" y="-0.25"/>
+    <a n="splitStemDownNW" x="0.12" y="-0.42"/>
+    <a n="splitStemUpSE" x="1.09" y="0.39"/>
+    <a n="splitStemUpSW" x="0.31" y="0.36"/>
+    <a n="stemDownNW" x="0.0" y="-0.17"/>
+    <a n="stemUpSE" x="1.18" y="0.17"/>
+  </g>
+  <g c="E0A9" x="0.0" y="-138.0" w="300.0" h="276.0" h-a-x="300" n="noteheadXBlack">
+    <a n="stemDownNW" x="0.0" y="-0.44"/>
+    <a n="stemUpSE" x="1.16" y="0.44"/>
+  </g>
+  <g c="E0D9" x="0.0" y="-139.0" w="322.0" h="278.0" h-a-x="322" n="noteheadDiamondHalf">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.0" y="0.0"/>
+  </g>
+  <g c="E0DA" x="0.0" y="-139.0" w="462.0" h="278.0" h-a-x="462" n="noteheadDiamondHalfWide">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.4" y="0.0"/>
+  </g>
+  <g c="E0DB" x="0.0" y="-139.0" w="322.0" h="278.0" h-a-x="322" n="noteheadDiamondBlack">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.0" y="0.0"/>
+  </g>
+  <g c="E0DC" x="0.0" y="-139.0" w="462.0" h="278.0" h-a-x="462" n="noteheadDiamondBlackWide">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.4" y="0.0"/>
+  </g>
+  <g c="E0DD" x="0.0" y="-139.0" w="322.0" h="278.0" h-a-x="322" n="noteheadDiamondWhite">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.0" y="0.0"/>
+  </g>
+  <g c="E0DE" x="0.0" y="-139.0" w="462.0" h="278.0" h-a-x="462" n="noteheadDiamondWhiteWide">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.4" y="0.0"/>
+  </g>
+  <g c="E0F5" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" n="noteheadParenthesisLeft"/>
+  <g c="E0F6" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" n="noteheadParenthesisRight"/>
+  <g c="E101" x="0.0" y="-246.0" w="212.0" h="492.0" h-a-x="212" n="noteheadSlashHorizontalEnds">
+    <a n="stemDownNW" x="0.0" y="-1.0"/>
+    <a n="stemUpSE" x="2.12" y="1.0"/>
+  </g>
+  <g c="E102" x="0.0" y="-246.0" w="400.0" h="492.0" h-a-x="400" n="noteheadSlashWhiteWhole"/>
+  <g c="E103" x="0.0" y="-246.0" w="286.0" h="492.0" h-a-x="286" n="noteheadSlashWhiteHalf">
+    <a n="stemDownNW" x="0.0" y="-1.0"/>
+    <a n="stemUpSE" x="3.12" y="1.0"/>
+  </g>
+  <g c="E240" x="0.0" y="-756.0" w="284.0" h="770.0" h-a-x="284" n="flag8thUp">
+    <a n="graceNoteSlashNE" x="1.28" y="-0.8"/>
+    <a n="graceNoteSlashSW" x="-0.64" y="-2.46"/>
+    <a n="stemUpNW" x="0.0" y="-0.04"/>
+  </g>
+  <g c="E241" x="0.0" y="-14.0" w="314.0" h="770.0" h-a-x="314" n="flag8thDown">
+    <a n="graceNoteSlashNW" x="-0.6" y="2.17"/>
+    <a n="graceNoteSlashSE" x="1.33" y="0.63"/>
+    <a n="stemDownSW" x="0.0" y="0.13"/>
+  </g>
+  <g c="E242" x="0.0" y="-880.0" w="284.0" h="894.0" h-a-x="284" n="flag16thUp">
+    <a n="stemUpNW" x="0.0" y="-0.09"/>
+  </g>
+  <g c="E243" x="0.0" y="-14.0" w="314.0" h="916.0" h-a-x="314" n="flag16thDown">
+    <a n="stemDownSW" x="0.0" y="0.13"/>
+  </g>
+  <g c="E244" x="0.0" y="-864.0" w="284.0" h="1098.0" h-a-x="284" n="flag32ndUp">
+    <a n="stemUpNW" x="0.0" y="0.38"/>
+  </g>
+  <g c="E245" x="0.0" y="-204.0" w="314.0" h="1120.0" h-a-x="314" n="flag32ndDown">
+    <a n="stemDownSW" x="0.0" y="-0.45"/>
+  </g>
+  <g c="E246" x="0.0" y="-878.0" w="284.0" h="1302.0" h-a-x="284" n="flag64thUp">
+    <a n="stemUpNW" x="0.0" y="1.17"/>
+  </g>
+  <g c="E247" x="0.0" y="-424.0" w="314.0" h="1324.0" h-a-x="314" n="flag64thDown">
+    <a n="stemDownSW" x="0.0" y="-1.24"/>
+  </g>
+  <g c="E248" x="0.0" y="-862.0" w="284.0" h="1506.0" h-a-x="284" n="flag128thUp">
+    <a n="stemUpNW" x="0.0" y="1.9"/>
+  </g>
+  <g c="E249" x="0.0" y="-614.0" w="314.0" h="1528.0" h-a-x="314" n="flag128thDown">
+    <a n="stemDownSW" x="0.0" y="-2.08"/>
+  </g>
+  <g c="E260" x="-15.0" y="-165.0" w="200.0" h="625.0" h-a-x="185" n="accidentalFlat">
+    <a n="cutOutNE" x="0.25" y="0.66"/>
+    <a n="cutOutSE" x="0.5" y="-0.48"/>
+  </g>
+  <g c="E261" x="0.0" y="-337.0" w="176.0" h="674.0" h-a-x="176" n="accidentalNatural">
+    <a n="cutOutNE" x="0.19" y="0.78"/>
+    <a n="cutOutSW" x="0.48" y="-0.83"/>
+  </g>
+  <g c="E262" x="0.0" y="-376.0" w="236.0" h="752.0" h-a-x="236" n="accidentalSharp">
+    <a n="cutOutNE" x="0.84" y="0.9"/>
+    <a n="cutOutNW" x="0.14" y="0.57"/>
+    <a n="cutOutSE" x="0.84" y="-0.6"/>
+    <a n="cutOutSW" x="0.14" y="-0.9"/>
+  </g>
+  <g c="E263" x="0.0" y="-135.0" w="270.0" h="270.0" h-a-x="270" n="accidentalDoubleSharp"/>
+  <g c="E264" x="-15.0" y="-165.0" w="370.0" h="625.0" h-a-x="355" n="accidentalDoubleFlat">
+    <a n="cutOutNE" x="0.99" y="0.64"/>
+    <a n="cutOutSE" x="1.34" y="-0.4"/>
+  </g>
+  <g c="E26A" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" n="accidentalParensLeft"/>
+  <g c="E26B" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" n="accidentalParensRight"/>
+  <g c="E270" x="-79.0" y="-165.0" w="264.0" h="788.0" h-a-x="185" n="accidentalQuarterToneFlatArrowUp">
+    <a n="cutOutNE" x="0.6" y="0.66"/>
+    <a n="cutOutSE" x="0.62" y="-0.45"/>
+  </g>
+  <g c="E271" x="-79.0" y="-372.0" w="264.0" h="832.0" h-a-x="185" n="accidentalThreeQuarterTonesFlatArrowDown">
+    <a n="cutOutNE" x="0.36" y="0.65"/>
+    <a n="cutOutNW" x="0.03" y="-0.8"/>
+    <a n="cutOutSE" x="0.65" y="-0.5"/>
+  </g>
+  <g c="E272" x="0.0" y="-337.0" w="240.0" h="837.0" h-a-x="240" n="accidentalQuarterToneSharpNaturalArrowUp">
+    <a n="cutOutSW" x="0.62" y="-0.87"/>
+  </g>
+  <g c="E273" x="0.0" y="-500.0" w="240.0" h="837.0" h-a-x="240" n="accidentalQuarterToneFlatNaturalArrowDown">
+    <a n="cutOutNE" x="0.23" y="0.79"/>
+  </g>
+  <g c="E274" x="0.0" y="-376.0" w="246.0" h="968.0" h-a-x="246" n="accidentalThreeQuarterTonesSharpArrowUp">
+    <a n="cutOutNW" x="0.27" y="1.3"/>
+    <a n="cutOutSE" x="0.86" y="-0.58"/>
+    <a n="cutOutSW" x="0.13" y="-0.89"/>
+  </g>
+  <g c="E275" x="-10.0" y="-592.0" w="246.0" h="968.0" h-a-x="236" n="accidentalQuarterToneSharpArrowDown">
+    <a n="cutOutNE" x="0.86" y="0.91"/>
+    <a n="cutOutNW" x="0.13" y="0.61"/>
+    <a n="cutOutSE" x="0.86" y="-0.59"/>
+  </g>
+  <g c="E280" x="0.0" y="-165.0" w="200.0" h="625.0" h-a-x="200" n="accidentalQuarterToneFlatStein">
+    <a n="cutOutNW" x="0.63" y="0.68"/>
+    <a n="cutOutSW" x="0.34" y="-0.43"/>
+  </g>
+  <g c="E281" x="0.0" y="-165.0" w="446.0" h="625.0" h-a-x="446" n="accidentalThreeQuarterTonesFlatZimmermann">
+    <a n="cutOutNE" x="1.22" y="0.67"/>
+    <a n="cutOutNW" x="0.64" y="0.67"/>
+  </g>
+  <g c="E282" x="0.0" y="-364.0" w="138.0" h="728.0" h-a-x="138" n="accidentalQuarterToneSharpStein">
+    <a n="cutOutNE" x="0.48" y="0.75"/>
+    <a n="cutOutNW" x="0.22" y="0.6"/>
+    <a n="cutOutSE" x="0.49" y="-0.8"/>
+    <a n="cutOutSW" x="0.22" y="-0.92"/>
+  </g>
+  <g c="E283" x="0.0" y="-388.0" w="334.0" h="776.0" h-a-x="334" n="accidentalThreeQuarterTonesSharpStein">
+    <a n="cutOutNE" x="1.13" y="1.0"/>
+    <a n="cutOutNW" x="0.14" y="0.6"/>
+    <a n="cutOutSE" x="1.13" y="-0.5"/>
+    <a n="cutOutSW" x="0.14" y="-0.9"/>
+  </g>
+  <g c="E440" x="-129.0" y="-165.0" w="314.0" h="625.0" h-a-x="185" n="accidentalBuyukMucennebFlat">
+    <a n="cutOutSE" x="0.81" y="-0.42"/>
+    <a n="cutOutSW" x="0.18" y="0.54"/>
+  </g>
+  <g c="E441" x="-15.0" y="-165.0" w="200.0" h="625.0" h-a-x="185" n="accidentalKucukMucennebFlat">
+    <a n="cutOutNE" x="0.28" y="0.7"/>
+    <a n="cutOutSE" x="0.58" y="-0.42"/>
+  </g>
+  <g c="E442" x="-129.0" y="-165.0" w="314.0" h="625.0" h-a-x="185" n="accidentalBakiyeFlat">
+    <a n="cutOutNE" x="0.54" y="1.39"/>
+    <a n="cutOutNW" x="0.15" y="1.11"/>
+    <a n="cutOutSE" x="0.82" y="-0.44"/>
+    <a n="cutOutSW" x="0.15" y="0.5"/>
+  </g>
+  <g c="E443" x="0.0" y="-165.0" w="200.0" h="625.0" h-a-x="200" n="accidentalKomaFlat">
+    <a n="cutOutNW" x="0.61" y="0.72"/>
+    <a n="cutOutSW" x="0.36" y="-0.45"/>
+  </g>
+  <g c="E444" x="0.0" y="-364.0" w="138.0" h="728.0" h-a-x="138" n="accidentalKomaSharp">
+    <a n="cutOutNE" x="0.6" y="0.88"/>
+    <a n="cutOutNW" x="0.28" y="0.71"/>
+    <a n="cutOutSE" x="0.6" y="-0.78"/>
+    <a n="cutOutSW" x="0.28" y="-0.92"/>
+  </g>
+  <g c="E445" x="0.0" y="-376.0" w="236.0" h="752.0" h-a-x="236" n="accidentalBakiyeSharp">
+    <a n="cutOutNE" x="0.86" y="0.94"/>
+    <a n="cutOutNW" x="0.12" y="0.62"/>
+    <a n="cutOutSE" x="0.86" y="-0.62"/>
+    <a n="cutOutSW" x="0.12" y="-0.92"/>
+  </g>
+  <g c="E446" x="0.0" y="-364.0" w="188.0" h="728.0" h-a-x="188" n="accidentalKucukMucennebSharp">
+    <a n="cutOutNE" x="0.82" y="0.88"/>
+    <a n="cutOutNW" x="0.49" y="0.71"/>
+    <a n="cutOutSE" x="0.84" y="-0.77"/>
+    <a n="cutOutSW" x="0.5" y="-0.95"/>
+  </g>
+  <g c="E447" x="0.0" y="-376.0" w="286.0" h="752.0" h-a-x="286" n="accidentalBuyukMucennebSharp">
+    <a n="cutOutNE" x="1.05" y="0.94"/>
+    <a n="cutOutNW" x="0.26" y="0.63"/>
+    <a n="cutOutSE" x="1.05" y="-0.62"/>
+    <a n="cutOutSW" x="0.26" y="-0.96"/>
+  </g>
+  <g c="E4A0" x="0.0" y="0.0" w="442.0" h="254.0" h-a-x="442" n="articAccentAbove"/>
+  <g c="E4A1" x="0.0" y="-254.0" w="442.0" h="254.0" h-a-x="442" n="articAccentBelow"/>
+  <g c="E4A2" x="0.0" y="0.0" w="100.0" h="100.0" h-a-x="100" n="articStaccatoAbove"/>
+  <g c="E4A3" x="0.0" y="-100.0" w="100.0" h="100.0" h-a-x="100" n="articStaccatoBelow"/>
+  <g c="E4A4" x="0.0" y="0.0" w="304.0" h="30.0" h-a-x="304" n="articTenutoAbove"/>
+  <g c="E4A5" x="0.0" y="-30.0" w="304.0" h="30.0" h-a-x="304" n="articTenutoBelow"/>
+  <g c="E4A6" x="0.0" y="0.0" w="164.0" h="198.0" h-a-x="164" n="articStaccatissimoAbove"/>
+  <g c="E4A7" x="0.0" y="-198.0" w="164.0" h="198.0" h-a-x="164" n="articStaccatissimoBelow"/>
+  <g c="E4A8" x="0.0" y="0.0" w="164.0" h="198.0" h-a-x="164" n="articStaccatissimoWedgeAbove"/>
+  <g c="E4A9" x="0.0" y="-198.0" w="164.0" h="198.0" h-a-x="164" n="articStaccatissimoWedgeBelow"/>
+  <g c="E4AC" x="0.0" y="0.0" w="252.0" h="412.0" h-a-x="252" n="articMarcatoAbove"/>
+  <g c="E4AD" x="0.0" y="-412.0" w="252.0" h="412.0" h-a-x="252" n="articMarcatoBelow"/>
+  <g c="E4B2" x="0.0" y="0.0" w="304.0" h="195.0" h-a-x="304" n="articTenutoStaccatoAbove"/>
+  <g c="E4B3" x="0.0" y="-195.0" w="304.0" h="195.0" h-a-x="304" n="articTenutoStaccatoBelow"/>
+  <g c="E4B6" x="0.0" y="0.0" w="118.0" h="279.0" h-a-x="118" n="articStressAbove"/>
+  <g c="E4B7" x="0.0" y="-279.0" w="118.0" h="279.0" h-a-x="118" n="articStressBelow"/>
+  <g c="E4C0" x="0.0" y="0.0" w="650.0" h="354.0" h-a-x="650" n="fermataAbove"/>
+  <g c="E4C1" x="0.0" y="-354.0" w="650.0" h="354.0" h-a-x="650" n="fermataBelow"/>
+  <g c="E4C4" x="0.0" y="0.0" w="581.0" h="470.0" h-a-x="581" n="fermataShortAbove"/>
+  <g c="E4C5" x="0.0" y="-470.0" w="581.0" h="470.0" h-a-x="581" n="fermataShortBelow"/>
+  <g c="E4C6" x="0.0" y="0.0" w="572.0" h="364.0" h-a-x="572" n="fermataLongAbove"/>
+  <g c="E4C7" x="0.0" y="-364.0" w="572.0" h="364.0" h-a-x="572" n="fermataLongBelow"/>
+  <g c="E4C8" x="0.0" y="0.0" w="572.0" h="416.0" h-a-x="572" n="fermataVeryLongAbove"/>
+  <g c="E4C9" x="0.0" y="-416.0" w="572.0" h="416.0" h-a-x="572" n="fermataVeryLongBelow"/>
+  <g c="E4CE" x="0.0" y="0.0" w="142.0" h="262.0" h-a-x="142" n="breathMarkComma"/>
+  <g c="E4E1" x="0.0" y="-250.0" w="284.0" h="500.0" h-a-x="284" n="restLonga"/>
+  <g c="E4E2" x="0.0" y="0.0" w="284.0" h="250.0" h-a-x="284" n="restDoubleWhole"/>
+  <g c="E4E3" x="0.0" y="-125.0" w="330.0" h="125.0" n="restWhole"/>
+  <g c="E4E4" x="0.0" y="0.0" w="330.0" h="125.0" n="restHalf"/>
+  <g c="E4E5" x="0.0" y="-363.0" w="222.0" h="728.0" h-a-x="222" n="restQuarter"/>
+  <g c="E4E6" x="0.0" y="-224.0" w="256.0" h="424.0" h-a-x="256" n="rest8th"/>
+  <g c="E4E7" x="0.0" y="-468.0" w="328.0" h="668.0" h-a-x="328" n="rest16th"/>
+  <g c="E4E8" x="0.0" y="-468.0" w="400.0" h="912.0" h-a-x="400" n="rest32nd"/>
+  <g c="E4E9" x="0.0" y="-712.0" w="472.0" h="1156.0" h-a-x="472" n="rest64th"/>
+  <g c="E4EA" x="0.0" y="-712.0" w="544.0" h="1400.0" h-a-x="544" n="rest128th"/>
+  <g c="E4F2" x="0.0" y="-224.0" w="256.0" h="424.0" h-a-x="256" n="restQuarterOld"/>
+  <g c="E510" x="0.0" y="0.0" w="414.0" h="486.0" h-a-x="414" n="ottava"/>
+  <g c="E514" x="0.0" y="0.0" w="661.0" h="486.0" h-a-x="661" n="quindicesima"/>
+  <g c="E517" x="0.0" y="0.0" w="792.0" h="486.0" h-a-x="792" n="ventiduesima"/>
+  <g c="E51A" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" n="octaveParensLeft"/>
+  <g c="E51B" x="0.0" y="-267.0" w="104.0" h="534.0" h-a-x="104" n="octaveParensRight"/>
+  <g c="E520" x="-72.0" y="-180.0" w="418.0" h="452.0" h-a-x="346" n="dynamicPiano">
+    <a n="opticalCenter" x="1.22" y="0.0"/>
+  </g>
+  <g c="E521" x="-41.0" y="-20.0" w="460.0" h="292.0" h-a-x="394" n="dynamicMezzo">
+    <a n="opticalCenter" x="0.87" y="0.0"/>
+  </g>
+  <g c="E522" x="-144.0" y="-147.0" w="530.0" h="597.0" h-a-x="277" n="dynamicForte">
+    <a n="opticalCenter" x="1.26" y="0.0"/>
+  </g>
+  <g c="E523" x="-17.0" y="-1.0" w="310.0" h="273.0" h-a-x="293" n="dynamicRinforzando">
+    <a n="opticalCenter" x="0.61" y="0.0"/>
+  </g>
+  <g c="E524" x="0.0" y="-22.0" w="226.0" h="294.0" h-a-x="226" n="dynamicSforzando">
+    <a n="opticalCenter" x="0.44" y="0.0"/>
+  </g>
+  <g c="E525" x="-24.0" y="0.0" w="314.0" h="272.0" h-a-x="290" n="dynamicZ">
+    <a n="opticalCenter" x="0.5" y="0.0"/>
+  </g>
+  <g c="E526" x="-41.0" y="-20.0" w="340.0" h="292.0" h-a-x="274" n="dynamicNiente">
+    <a n="opticalCenter" x="0.62" y="0.0"/>
+  </g>
+  <g c="E566" x="0.0" y="-9.0" w="531.0" h="376.0" h-a-x="600" n="ornamentTrill"/>
+  <g c="E567" x="0.0" y="-141.0" w="620.0" h="282.0" h-a-x="620" n="ornamentTurn"/>
+  <g c="E568" x="0.0" y="-141.0" w="620.0" h="282.0" h-a-x="620" n="ornamentTurnInverted"/>
+  <g c="E569" x="0.0" y="-200.0" w="620.0" h="400.0" h-a-x="620" n="ornamentTurnSlash"/>
+  <g c="E56C" x="0.0" y="-128.0" w="606.0" h="256.0" h-a-x="606" n="ornamentShortTrill"/>
+  <g c="E56D" x="0.0" y="-200.0" w="606.0" h="400.0" h-a-x="606" n="ornamentMordent"/>
+  <g c="E56E" x="0.0" y="-128.0" w="852.0" h="256.0" h-a-x="852" n="ornamentTremblement"/>
+  <g c="E59D" x="-77.0" y="-128.0" w="360.0" h="256.0" h-a-x="246" n="ornamentZigZagLineNoRightEnd">
+    <a n="repeatOffset" x="1.05" y="0.0"/>
+  </g>
+  <g c="E59E" x="-77.0" y="-128.0" w="360.0" h="256.0" h-a-x="246" n="ornamentZigZagLineWithRightEnd">
+    <a n="repeatOffset" x="1.43" y="0.0"/>
+  </g>
+  <g c="E5B0" x="0.0" y="-128.0" w="814.0" h="370.0" h-a-x="814" n="ornamentPrecompSlide"/>
+  <g c="E5E5" x="0.0" y="-125.0" w="250.0" h="250.0" h-a-x="250" n="brassMuteClosed"/>
+  <g c="E5E7" x="0.0" y="-125.0" w="250.0" h="250.0" h-a-x="250" n="brassMuteOpen"/>
+  <g c="E610" x="0.0" y="0.0" w="336.0" h="352.0" h-a-x="336" n="stringsDownBow"/>
+  <g c="E611" x="0.0" y="0.0" w="336.0" h="352.0" h-a-x="336" n="stringsDownBowTurned"/>
+  <g c="E612" x="0.0" y="0.0" w="252.0" h="412.0" h-a-x="252" n="stringsUpBow"/>
+  <g c="E613" x="0.0" y="0.0" w="252.0" h="412.0" h-a-x="252" n="stringsUpBowTurned"/>
+  <g c="E630" x="0.0" y="0.0" w="220.0" h="313.0" h-a-x="220" n="pluckedSnapPizzicatoBelow"/>
+  <g c="E631" x="0.0" y="0.0" w="220.0" h="313.0" h-a-x="220" n="pluckedSnapPizzicatoAbove"/>
+  <g c="E650" x="0.0" y="0.0" w="782.0" h="500.0" h-a-x="782" n="keyboardPedalPed"/>
+  <g c="E651" x="0.0" y="0.0" w="404.0" h="500.0" h-a-x="404" n="keyboardPedalP"/>
+  <g c="E655" x="0.0" y="66.0" w="430.0" h="434.0" h-a-x="430" n="keyboardPedalUp"/>
+  <g c="EAA4" x="-12.0" y="152.0" w="270.0" h="120.0" h-a-x="246" n="wiggleTrill">
+    <a n="repeatOffset" x="0.95" y="0.0"/>
+  </g>
+  <g c="EAA9" x="0.0" y="54.0" w="270.0" h="120.0" h-a-x="270" n="wiggleArpeggiatoUp">
+    <a n="repeatOffset" x="1.02" y="0.0"/>
+  </g>
+  <g c="EAAA" x="0.0" y="54.0" w="270.0" h="120.0" h-a-x="270" n="wiggleArpeggiatoDown">
+    <a n="repeatOffset" x="1.02" y="0.0"/>
+  </g>
+  <g c="EAAD" x="-26.0" y="0.0" w="276.0" h="228.0" h-a-x="250" n="wiggleArpeggiatoUpArrow">
+    <a n="repeatOffset" x="2.06" y="0.0"/>
+  </g>
+  <g c="EAAE" x="-26.0" y="0.0" w="276.0" h="228.0" h-a-x="250" n="wiggleArpeggiatoDownArrow">
+    <a n="repeatOffset" x="2.06" y="0.0"/>
+  </g>
+  <g c="EAAF" x="-12.0" y="0.0" w="270.0" h="120.0" h-a-x="246" n="wiggleGlissando">
+    <a n="repeatOffset" x="1.03" y="0.0"/>
+  </g>
+</bounding-boxes>
diff --git a/data/Gootville/E003.xml b/data/Gootville/E003.xml
new file mode 100644
index 00000000000..311ee5a5f30
--- /dev/null
+++ b/data/Gootville/E003.xml
@@ -0,0 +1 @@
+<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 11 12 21 24 21c158 0 289 71 379 139c0 0 4 3 6 3c3 0 5 -2 5 -7c0 -31 -171 -233 -414 -233v77z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E004.xml b/data/Gootville/E004.xml
new file mode 100644
index 00000000000..04f6dc2f289
--- /dev/null
+++ b/data/Gootville/E004.xml
@@ -0,0 +1 @@
+<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v77c243 0 414 -202 414 -233c0 -5 -2 -7 -5 -7c-2 0 -6 3 -6 3c-90 68 -221 139 -379 139c-12 0 -24 10 -24 21z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E043.xml b/data/Gootville/E043.xml
new file mode 100644
index 00000000000..adccaf80c41
--- /dev/null
+++ b/data/Gootville/E043.xml
@@ -0,0 +1 @@
+<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 370c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50zM0 620c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E044.xml b/data/Gootville/E044.xml
new file mode 100644
index 00000000000..fbdb151970f
--- /dev/null
+++ b/data/Gootville/E044.xml
@@ -0,0 +1 @@
+<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 125c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E047.xml b/data/Gootville/E047.xml
new file mode 100644
index 00000000000..0b40386adf8
--- /dev/null
+++ b/data/Gootville/E047.xml
@@ -0,0 +1 @@
+<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -84c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46zM25 -330c0 7 4 14 8 20l168 279c-80 46 -165 131 -165 236c0 75 42 143 121 143c47 0 112 -36 112 -96c0 -26 -18 -45 -45 -45c-22 0 -37 11 -46 38s-34 46 -58 46c-26 0 -44 -19 -44 -45 c0 -79 91 -153 174 -196l169 280c8 13 13 18 22 18c12 0 20 -7 20 -18c0 -7 -4 -14 -8 -20l-168 -279c80 -46 165 -131 165 -236c0 -75 -42 -143 -121 -143c-47 0 -112 36 -112 96c0 26 18 45 45 45c22 0 37 -11 46 -38s34 -46 58 -46c26 0 44 19 44 45 c0 79 -91 153 -174 196l-169 -280c-8 -13 -13 -18 -22 -18c-12 0 -20 7 -20 18zM394 84c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E048.xml b/data/Gootville/E048.xml
new file mode 100644
index 00000000000..4e0e6d23283
--- /dev/null
+++ b/data/Gootville/E048.xml
@@ -0,0 +1 @@
+<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 20 20 20 20 20h35c6 109 57 218 157 231v45s0 20 20 20s20 -20 20 -20v-45c100 -13 151 -122 157 -231h35s20 0 20 -20s-20 -20 -20 -20h-35c-6 -109 -57 -218 -157 -231v-45s0 -20 -20 -20s-20 20 -20 20v45c-100 13 -151 122 -157 231h-35s-20 0 -20 20zM144 20 h68v194c-47 -20 -66 -110 -68 -194zM144 -20c2 -84 21 -174 68 -194v194h-68zM252 20h68c-2 84 -21 174 -68 194v-194zM252 -20v-194c47 20 66 110 68 194h-68z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E049.xml b/data/Gootville/E049.xml
new file mode 100644
index 00000000000..d9d39ef07a9
--- /dev/null
+++ b/data/Gootville/E049.xml
@@ -0,0 +1 @@
+<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 20 20 20 20 20h34c1 56 7 171 10 190c3 22 7 25 32 30c21 4 76 10 116 12v44s0 20 20 20s20 -20 20 -20v-44c40 -2 95 -8 116 -12c25 -5 29 -8 32 -30c3 -19 9 -134 10 -190h34s20 0 20 -20s-20 -20 -20 -20h-34c-1 -56 -7 -171 -10 -190c-3 -22 -7 -25 -32 -30 c-21 -4 -76 -10 -116 -12v-44s0 -20 -20 -20s-20 20 -20 20v44c-40 2 -95 8 -116 12c-25 5 -29 8 -32 30c-3 19 -9 134 -10 190h-34s-20 0 -20 20zM144 20h68v198c-28 -1 -58 -6 -62 -26c-5 -23 -6 -107 -6 -172zM144 -20c0 -65 1 -149 6 -172c4 -20 34 -25 62 -26v198h-68z M252 20h68c0 65 -1 149 -6 172c-4 20 -34 25 -62 26v-198zM252 -20v-198c28 1 58 6 62 26c5 23 6 107 6 172h-68z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E050.xml b/data/Gootville/E050.xml
new file mode 100644
index 00000000000..3922d5545a1
--- /dev/null
+++ b/data/Gootville/E050.xml
@@ -0,0 +1 @@
+<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM262 723c0 -44 27 -160 27 -160 c80 78 159 190 159 296c0 43 -8 77 -49 77c-81 0 -137 -123 -137 -213zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E051.xml b/data/Gootville/E051.xml
new file mode 100644
index 00000000000..4b10bb5d214
--- /dev/null
+++ b/data/Gootville/E051.xml
@@ -0,0 +1 @@
+<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM153 -737c0 2 1 3 1 3l49 96s3 5 5 5h51 c2 0 3 -2 3 -4v-192c0 -18 11 -30 21 -30c4 0 12 0 12 -8c0 -7 -6 -10 -12 -10h-101c-6 0 -12 3 -12 10c0 8 8 8 12 8c10 0 20 12 20 30v142l-34 -54c-2 -4 -3 -4 -6 -4c-4 0 -9 4 -9 8zM262 723c0 -44 27 -160 27 -160c80 78 159 190 159 296c0 43 -8 77 -49 77 c-81 0 -137 -123 -137 -213zM304 -825c0 18 14 32 32 32s31 -14 31 -32c0 -12 -7 -23 -18 -28c2 -2 10 -8 22 -8c26 0 43 29 43 65s-23 59 -49 59c-20 0 -27 -3 -35 -9c-6 -4 -8 -5 -10 -5c-7 0 -7 2 -7 8c0 1 1 25 3 46s3 51 3 52c0 7 2 12 6 12c5 0 12 -2 22 -5 s26 -6 44 -6s39 3 49 6s18 5 24 5c3 0 5 -3 5 -7s0 -12 -9 -23s-35 -28 -69 -28c-21 0 -43 4 -61 10l-3 -50c20 13 37 14 53 14c48 0 93 -31 93 -79s-42 -81 -86 -81c-42 0 -83 17 -83 52zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z "/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E052.xml b/data/Gootville/E052.xml
new file mode 100644
index 00000000000..3adb14b2361
--- /dev/null
+++ b/data/Gootville/E052.xml
@@ -0,0 +1 @@
+<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM213 -801c0 20 10 44 32 55c-14 9 -20 25 -20 43 c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM248 -801c0 -30 27 -58 65 -58c24 0 42 12 42 28c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM262 723c0 -44 27 -160 27 -160 c80 78 159 190 159 296c0 43 -8 77 -49 77c-81 0 -137 -123 -137 -213zM278 -672c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E053.xml b/data/Gootville/E053.xml
new file mode 100644
index 00000000000..bb14955334e
--- /dev/null
+++ b/data/Gootville/E053.xml
@@ -0,0 +1 @@
+<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM213 1156c0 20 10 44 32 55c-14 9 -20 25 -20 43 c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM248 1156c0 -30 27 -58 65 -58c24 0 42 12 42 28c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM262 723c0 -44 27 -160 27 -160 c80 78 159 190 159 296c0 43 -8 77 -49 77c-81 0 -137 -123 -137 -213zM278 1285c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E054.xml b/data/Gootville/E054.xml
new file mode 100644
index 00000000000..5460a59b2ca
--- /dev/null
+++ b/data/Gootville/E054.xml
@@ -0,0 +1 @@
+<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 102c0 177 136 324 260 434c0 0 -43 178 -43 246c0 88 33 172 69 220s66 78 78 78c9 0 22 -8 37 -26c65 -78 98 -183 98 -279c0 -150 -83 -254 -181 -348l37 -174c11 2 22 2 33 2c138 0 238 -114 238 -240c0 -105 -68 -199 -170 -240c0 0 32 -146 32 -191 c0 -121 -82 -217 -204 -217c-73 0 -182 41 -182 151c0 56 45 101 101 101s101 -45 101 -101c0 -53 -40 -97 -92 -101c14 -12 49 -17 72 -17c97 0 171 74 171 184c0 49 -31 180 -31 180c-25 -7 -52 -10 -80 -10c-187 0 -344 162 -344 348zM94 49c0 -157 121 -269 250 -269 c26 0 51 3 74 10l-74 351c-58 -20 -96 -72 -96 -124c0 -41 19 -87 57 -110c5 -3 9 -8 9 -14c0 -8 -7 -15 -15 -15c-3 0 -8 2 -8 2c-66 29 -113 87 -113 173c0 81 55 164 144 192l-33 155c-153 -148 -195 -273 -195 -351zM153 1220c0 2 1 3 1 3l49 96s3 5 5 5h51 c2 0 3 -2 3 -4v-192c0 -18 11 -30 21 -30c4 0 12 0 12 -8c0 -7 -6 -10 -12 -10h-101c-6 0 -12 3 -12 10c0 8 8 8 12 8c10 0 20 12 20 30v142l-34 -54c-2 -4 -3 -4 -6 -4c-4 0 -9 4 -9 8zM262 723c0 -44 27 -160 27 -160c80 78 159 190 159 296c0 43 -8 77 -49 77 c-81 0 -137 -123 -137 -213zM304 1132c0 18 14 32 32 32s31 -14 31 -32c0 -12 -7 -23 -18 -28c2 -2 10 -8 22 -8c26 0 43 29 43 65s-23 59 -49 59c-20 0 -27 -3 -35 -9c-6 -4 -8 -5 -10 -5c-7 0 -7 2 -7 8c0 1 1 25 3 46s3 51 3 52c0 7 2 12 6 12c5 0 12 -2 22 -5 s26 -6 44 -6s39 3 49 6s18 5 24 5c3 0 5 -3 5 -7s0 -12 -9 -23s-35 -28 -69 -28c-21 0 -43 4 -61 10l-3 -50c20 13 37 14 53 14c48 0 93 -31 93 -79s-42 -81 -86 -81c-42 0 -83 17 -83 52zM377 149l73 -346c63 30 112 105 112 182c0 90 -62 165 -165 165c-7 0 -13 0 -20 -1z "/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E05C.xml b/data/Gootville/E05C.xml
new file mode 100644
index 00000000000..658d7fa2e7d
--- /dev/null
+++ b/data/Gootville/E05C.xml
@@ -0,0 +1 @@
+<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -490v980c0 6 4 10 10 10h101c6 0 10 -4 10 -10v-980c0 -6 -4 -10 -10 -10h-101c-6 0 -10 4 -10 10zM167 -490v980c0 6 4 10 10 10h10c6 0 10 -4 10 -10v-468c54 43 108 116 108 198c0 11 5 17 13 17s13 -6 13 -17c0 -82 59 -136 119 -136c83 0 86 84 86 198 c0 134 -11 195 -108 195c-24 0 -53 -6 -73 -15c26 -7 45 -30 45 -58c0 -33 -27 -60 -60 -60s-60 27 -60 60c0 60 81 96 148 96c111 0 214 -87 214 -218c0 -122 -84 -222 -192 -222c-31 0 -53 13 -78 28l-53 -88l53 -88c25 15 47 28 78 28c108 0 192 -100 192 -222 c0 -131 -103 -218 -214 -218c-67 0 -148 36 -148 96c0 33 27 60 60 60s60 -27 60 -60c0 -28 -19 -51 -45 -58c20 -9 49 -15 73 -15c97 0 108 61 108 195c0 114 -3 198 -86 198c-60 0 -119 -54 -119 -136c0 -11 -5 -17 -13 -17s-13 6 -13 17c0 82 -54 155 -108 198v-468 c0 -6 -4 -10 -10 -10h-10c-6 0 -10 4 -10 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E05D.xml b/data/Gootville/E05D.xml
new file mode 100644
index 00000000000..272d53bb793
--- /dev/null
+++ b/data/Gootville/E05D.xml
@@ -0,0 +1 @@
+<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -490v980c0 6 4 10 10 10h101c6 0 10 -4 10 -10v-980c0 -6 -4 -10 -10 -10h-101c-6 0 -10 4 -10 10zM167 -490v980c0 6 4 10 10 10h10c6 0 10 -4 10 -10v-468c54 43 108 116 108 198c0 11 5 17 13 17s13 -6 13 -17c0 -82 59 -136 119 -136c83 0 86 84 86 198 c0 134 -11 195 -108 195c-24 0 -53 -6 -73 -15c26 -7 45 -30 45 -58c0 -33 -27 -60 -60 -60s-60 27 -60 60c0 60 81 96 148 96c111 0 214 -87 214 -218c0 -122 -84 -222 -192 -222c-31 0 -53 13 -78 28l-53 -88l53 -88c25 15 47 28 78 28c108 0 192 -100 192 -222 c0 -131 -103 -218 -214 -218c-67 0 -148 36 -148 96c0 33 27 60 60 60s60 -27 60 -60c0 -28 -19 -51 -45 -58c20 -9 49 -15 73 -15c97 0 108 61 108 195c0 114 -3 198 -86 198c-60 0 -119 -54 -119 -136c0 -11 -5 -17 -13 -17s-13 6 -13 17c0 82 -54 155 -108 198v-468 c0 -6 -4 -10 -10 -10h-10c-6 0 -10 4 -10 10zM221 -668c0 20 10 44 32 55c-14 9 -20 25 -20 43c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM256 -668c0 -30 27 -58 65 -58c24 0 42 12 42 28 c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM286 -539c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E062.xml b/data/Gootville/E062.xml
new file mode 100644
index 00000000000..494ab6d0577
--- /dev/null
+++ b/data/Gootville/E062.xml
@@ -0,0 +1 @@
+<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543 c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E063.xml b/data/Gootville/E063.xml
new file mode 100644
index 00000000000..d676b332e5b
--- /dev/null
+++ b/data/Gootville/E063.xml
@@ -0,0 +1 @@
+<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543 c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM172 -650c0 2 1 3 1 3l49 96s3 5 5 5h51c2 0 3 -2 3 -4v-192c0 -18 11 -30 21 -30c4 0 12 0 12 -8c0 -7 -6 -10 -12 -10h-101c-6 0 -12 3 -12 10c0 8 8 8 12 8c10 0 20 12 20 30v142l-34 -54c-2 -4 -3 -4 -6 -4c-4 0 -9 4 -9 8z M323 -738c0 18 14 32 32 32s31 -14 31 -32c0 -12 -7 -23 -18 -28c2 -2 10 -8 22 -8c26 0 43 29 43 65s-23 59 -49 59c-20 0 -27 -3 -35 -9c-6 -4 -8 -5 -10 -5c-7 0 -7 2 -7 8c0 1 1 25 3 46s3 51 3 52c0 7 2 12 6 12c5 0 12 -2 22 -5s26 -6 44 -6s39 3 49 6s18 5 24 5 c3 0 5 -3 5 -7s0 -12 -9 -23s-35 -28 -69 -28c-21 0 -43 4 -61 10l-3 -50c20 13 37 14 53 14c48 0 93 -31 93 -79s-42 -81 -86 -81c-42 0 -83 17 -83 52zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38 s-17 -38 -38 -38s-38 17 -38 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E064.xml b/data/Gootville/E064.xml
new file mode 100644
index 00000000000..1fb1078a257
--- /dev/null
+++ b/data/Gootville/E064.xml
@@ -0,0 +1 @@
+<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543 c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM232 -714c0 20 10 44 32 55c-14 9 -20 25 -20 43c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM267 -714c0 -30 27 -58 65 -58c24 0 42 12 42 28 c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM297 -585c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38 s-38 17 -38 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E065.xml b/data/Gootville/E065.xml
new file mode 100644
index 00000000000..505034974e7
--- /dev/null
+++ b/data/Gootville/E065.xml
@@ -0,0 +1 @@
+<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543 c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM232 330c0 20 10 44 32 55c-14 9 -20 25 -20 43c0 43 36 70 88 70s88 -27 88 -70c0 -18 -10 -31 -20 -43c22 -16 32 -31 32 -55c0 -50 -54 -76 -100 -76s-100 31 -100 76zM267 330c0 -30 27 -58 65 -58c24 0 42 12 42 28 c0 26 -44 48 -88 70c-8 -10 -19 -24 -19 -40zM297 459c0 -25 42 -45 73 -59c6 6 8 20 8 28c0 26 -16 52 -46 52c-23 0 -35 -10 -35 -21zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38 s-38 17 -38 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E066.xml b/data/Gootville/E066.xml
new file mode 100644
index 00000000000..13eb4e5c139
--- /dev/null
+++ b/data/Gootville/E066.xml
@@ -0,0 +1 @@
+<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -531c0 6 3 10 9 13c236 101 410 282 410 516c0 128 -53 224 -177 224c-67 0 -130 -22 -169 -73c11 4 22 6 34 6c56 0 101 -45 101 -101s-45 -101 -101 -101s-101 45 -101 101c0 110 103 200 236 200h-41c-6 0 -12 3 -12 10c0 8 8 8 12 8c10 0 20 12 20 30v142l-34 -54 c-2 -4 -3 -4 -6 -4c-4 0 -9 4 -9 8c0 2 1 3 1 3l49 96s3 5 5 5h51c2 0 3 -2 3 -4v-192c0 -18 11 -30 21 -30c4 0 12 0 12 -8c0 -7 -6 -10 -12 -10h-60c173 0 306 -101 306 -256c0 -297 -274 -491 -525 -543c0 0 -5 -1 -8 -1c-8 0 -15 7 -15 15zM323 306c0 18 14 32 32 32 s31 -14 31 -32c0 -12 -7 -23 -18 -28c2 -2 10 -8 22 -8c26 0 43 29 43 65s-23 59 -49 59c-20 0 -27 -3 -35 -9c-6 -4 -8 -5 -10 -5c-7 0 -7 2 -7 8c0 1 1 25 3 46s3 51 3 52c0 7 2 12 6 12c5 0 12 -2 22 -5s26 -6 44 -6s39 3 49 6s18 5 24 5c3 0 5 -3 5 -7s0 -12 -9 -23 s-35 -28 -69 -28c-21 0 -43 4 -61 10l-3 -50c20 13 37 14 53 14c48 0 93 -31 93 -79s-42 -81 -86 -81c-42 0 -83 17 -83 52zM588 119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38s-38 17 -38 38zM588 -119c0 21 17 38 38 38s38 -17 38 -38s-17 -38 -38 -38 s-38 17 -38 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E069.xml b/data/Gootville/E069.xml
new file mode 100644
index 00000000000..de8d135d37d
--- /dev/null
+++ b/data/Gootville/E069.xml
@@ -0,0 +1 @@
+<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 240c0 6 4 10 10 10h94c6 0 10 -4 10 -10v-480c0 -6 -4 -10 -10 -10h-94c-6 0 -10 4 -10 10v480zM226 240c0 6 4 10 10 10h94c6 0 10 -4 10 -10v-480c0 -6 -4 -10 -10 -10h-94c-6 0 -10 4 -10 10v480z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E06A.xml b/data/Gootville/E06A.xml
new file mode 100644
index 00000000000..9b21faaff1d
--- /dev/null
+++ b/data/Gootville/E06A.xml
@@ -0,0 +1 @@
+<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 410c0 6 4 10 10 10h250c6 0 10 -4 10 -10v-820c0 -6 -4 -10 -10 -10h-250c-6 0 -10 4 -10 10v820zM45 330v-660h180v660h-180z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E080.xml b/data/Gootville/E080.xml
new file mode 100644
index 00000000000..ecc048771cc
--- /dev/null
+++ b/data/Gootville/E080.xml
@@ -0,0 +1 @@
+<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 132 100 243 212 243s212 -111 212 -243s-100 -243 -212 -243s-212 111 -212 243zM132 0c0 -96 0 -217 80 -217s80 121 80 217s0 217 -80 217s-80 -121 -80 -217z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E081.xml b/data/Gootville/E081.xml
new file mode 100644
index 00000000000..e8ed283c7b1
--- /dev/null
+++ b/data/Gootville/E081.xml
@@ -0,0 +1 @@
+<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 35c0 4 2 7 2 7l98 192s5 9 9 9h103c4 0 7 -4 7 -8v-384c0 -35 22 -58 41 -58c8 0 24 -1 24 -18c0 -14 -11 -18 -24 -18h-202c-13 0 -24 4 -24 18c0 17 16 18 24 18c19 0 41 23 41 58v285l-68 -107c-4 -7 -7 -10 -13 -10c-9 0 -18 7 -18 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E082.xml b/data/Gootville/E082.xml
new file mode 100644
index 00000000000..844931eb6c9
--- /dev/null
+++ b/data/Gootville/E082.xml
@@ -0,0 +1 @@
+<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -214c0 83 70 142 126 181s110 81 110 147c0 61 -22 98 -78 98c-33 0 -48 -9 -55 -14c21 -10 36 -32 36 -57c0 -35 -28 -63 -63 -63s-63 28 -63 63c0 70 80 102 165 102c91 0 177 -40 177 -129c0 -93 -95 -150 -159 -171s-111 -50 -142 -88c33 26 78 45 120 45 c30 0 52 -6 76 -18s40 -20 56 -20c20 0 32 12 38 18s16 12 22 12s10 -4 10 -12c0 -50 -64 -123 -116 -123c-32 0 -56 7 -80 23s-48 26 -72 26s-36 -4 -54 -18s-26 -20 -34 -20s-20 5 -20 18z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E083.xml b/data/Gootville/E083.xml
new file mode 100644
index 00000000000..bfe7c3dde34
--- /dev/null
+++ b/data/Gootville/E083.xml
@@ -0,0 +1 @@
+<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -140c0 35 28 63 63 63s63 -28 63 -63c0 -25 -15 -47 -37 -57c6 -5 21 -15 45 -15c54 0 83 47 83 98c0 67 -47 121 -97 121c-12 0 -16 7 -16 13s4 13 16 13c50 0 101 38 101 92c0 56 -31 87 -76 87c-33 0 -48 -9 -55 -14c21 -10 36 -32 36 -57c0 -35 -28 -63 -63 -63 s-63 28 -63 63c0 70 80 102 165 102c91 0 167 -30 167 -118c0 -59 -60 -83 -120 -105c85 -18 125 -51 125 -134c0 -70 -85 -129 -172 -129c-85 0 -165 33 -165 103z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E084.xml b/data/Gootville/E084.xml
new file mode 100644
index 00000000000..b5f98ddc370
--- /dev/null
+++ b/data/Gootville/E084.xml
@@ -0,0 +1 @@
+<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -106c0 3 0 9 9 19c72 78 126 214 126 308c0 14 1 22 9 22h174c7 0 9 -6 9 -12c0 -3 -2 -8 -5 -11l-272 -307h149v104c0 12 12 25 36 51l59 66s8 10 16 10c3 0 9 -1 9 -10v-221h39s13 -1 13 -17s-13 -17 -13 -17h-39v-28c0 -35 22 -58 41 -58c8 0 24 -1 24 -18 c0 -14 -11 -18 -24 -18h-202c-13 0 -24 4 -24 18c0 17 16 18 24 18c19 0 41 23 41 58v28h-180c-9 0 -19 6 -19 15z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E085.xml b/data/Gootville/E085.xml
new file mode 100644
index 00000000000..701c14a06b3
--- /dev/null
+++ b/data/Gootville/E085.xml
@@ -0,0 +1 @@
+<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -140c0 35 28 63 63 63s63 -28 63 -63c0 -25 -15 -47 -37 -57c6 -5 21 -15 45 -15c51 0 85 58 85 130s-45 118 -97 118c-40 0 -54 -7 -70 -18s-18 -11 -25 -11c-10 0 -10 10 -10 18c0 2 3 50 6 92s7 102 7 104c0 14 3 22 11 22c12 0 25 -3 45 -9s52 -12 88 -12 s77 6 97 12s37 9 49 9c6 0 10 -6 10 -13s0 -25 -18 -47s-70 -55 -138 -55c-42 0 -88 9 -123 20l-6 -99c39 26 75 27 107 27c95 0 185 -63 185 -158s-84 -161 -172 -161c-85 0 -165 33 -165 103z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E086.xml b/data/Gootville/E086.xml
new file mode 100644
index 00000000000..e1e38130d62
--- /dev/null
+++ b/data/Gootville/E086.xml
@@ -0,0 +1 @@
+<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 2c0 136 103 241 226 241c74 0 147 -38 147 -98c0 -35 -28 -63 -63 -63s-63 28 -63 63c0 28 17 51 42 60c-7 5 -22 12 -51 12c-81 0 -105 -99 -105 -199c31 18 54 22 80 22c89 0 177 -27 177 -141c0 -75 -87 -142 -177 -142c-127 0 -213 127 -213 245zM154 -101 c0 -60 10 -116 59 -116s59 56 59 116s-10 116 -59 116s-59 -56 -59 -116z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E087.xml b/data/Gootville/E087.xml
new file mode 100644
index 00000000000..96cd3ffdfb6
--- /dev/null
+++ b/data/Gootville/E087.xml
@@ -0,0 +1 @@
+<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 109v115c0 8 7 10 13 10s11 -2 15 -5s7 -5 13 -5c12 0 29 5 45 10s33 9 51 9c42 0 87 -15 108 -32s31 -18 42 -18c21 0 34 11 51 33c4 6 7 8 13 8s12 -4 12 -11c0 -61 -54 -173 -83 -221s-56 -128 -56 -220c0 -20 0 -25 -10 -25h-132c-9 0 -10 5 -10 25 c0 98 82 206 134 254s81 83 107 126c-35 -26 -76 -42 -116 -42c-33 0 -65 11 -90 32c-17 14 -28 20 -38 20c-21 0 -29 -22 -39 -58c-3 -12 -10 -15 -17 -15s-13 3 -13 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E088.xml b/data/Gootville/E088.xml
new file mode 100644
index 00000000000..05085caabef
--- /dev/null
+++ b/data/Gootville/E088.xml
@@ -0,0 +1 @@
+<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -91c0 39 22 87 65 109c-28 18 -40 51 -40 87c0 86 70 138 175 138s175 -52 175 -138c0 -36 -20 -64 -40 -87c45 -31 65 -61 65 -109c0 -101 -109 -152 -200 -152s-200 62 -200 152zM70 -91c0 -61 54 -118 130 -118c47 0 83 26 83 57c0 51 -87 98 -176 141 c-17 -20 -37 -47 -37 -80zM130 166c0 -50 84 -90 146 -119c13 13 17 41 17 58c0 52 -34 104 -93 104c-46 0 -70 -21 -70 -43z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E089.xml b/data/Gootville/E089.xml
new file mode 100644
index 00000000000..2eb45c8ed0a
--- /dev/null
+++ b/data/Gootville/E089.xml
@@ -0,0 +1 @@
+<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 101c0 75 87 142 177 142c127 0 213 -127 213 -245c0 -136 -103 -241 -226 -241c-74 0 -147 38 -147 98c0 35 28 63 63 63s63 -28 63 -63c0 -28 -17 -51 -42 -60c7 -5 22 -12 51 -12c81 0 105 99 105 199c-31 -18 -54 -22 -80 -22c-89 0 -177 27 -177 141zM118 101 c0 -60 10 -116 59 -116s59 56 59 116s-10 116 -59 116s-59 -56 -59 -116z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E08A.xml b/data/Gootville/E08A.xml
new file mode 100644
index 00000000000..10a8342ad73
--- /dev/null
+++ b/data/Gootville/E08A.xml
@@ -0,0 +1 @@
+<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 124 97 243 244 243c75 0 173 -41 173 -120c0 -39 -32 -71 -71 -71s-71 32 -71 71c0 37 28 68 64 71c-17 10 -47 25 -95 25c-108 0 -132 -59 -132 -219s35 -219 132 -219c108 0 158 83 158 142c0 12 8 14 12 14s12 -2 12 -14c0 -98 -89 -166 -182 -166 c-147 0 -244 119 -244 243z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E08B.xml b/data/Gootville/E08B.xml
new file mode 100644
index 00000000000..518f109b63e
--- /dev/null
+++ b/data/Gootville/E08B.xml
@@ -0,0 +1 @@
+<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 115 84 226 214 241v157s0 14 15 14s15 -14 15 -14v-155c75 0 173 -41 173 -120c0 -39 -32 -71 -71 -71s-71 32 -71 71c0 37 28 68 64 71c-17 10 -47 25 -95 25v-438c108 0 158 83 158 142c0 12 8 14 12 14s12 -2 12 -14c0 -98 -89 -166 -182 -166v-155 s0 -14 -15 -14s-15 14 -15 14v157c-130 15 -214 126 -214 241zM112 0c0 -142 28 -205 102 -217v434c-83 -11 -102 -73 -102 -217z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E092.xml b/data/Gootville/E092.xml
new file mode 100644
index 00000000000..5551521052b
--- /dev/null
+++ b/data/Gootville/E092.xml
@@ -0,0 +1 @@
+<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E093.xml b/data/Gootville/E093.xml
new file mode 100644
index 00000000000..1486c1f6ab3
--- /dev/null
+++ b/data/Gootville/E093.xml
@@ -0,0 +1 @@
+<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E094.xml b/data/Gootville/E094.xml
new file mode 100644
index 00000000000..b1af2c0c149
--- /dev/null
+++ b/data/Gootville/E094.xml
@@ -0,0 +1 @@
+<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E095.xml b/data/Gootville/E095.xml
new file mode 100644
index 00000000000..185c89feb44
--- /dev/null
+++ b/data/Gootville/E095.xml
@@ -0,0 +1 @@
+<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A0.xml b/data/Gootville/E0A0.xml
new file mode 100644
index 00000000000..68379dacbad
--- /dev/null
+++ b/data/Gootville/E0A0.xml
@@ -0,0 +1 @@
+<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -157v314s0 20 20 20s20 -20 20 -20v-314s0 -20 -20 -20s-20 20 -20 20zM68 -157v314s0 20 20 20s20 -20 20 -20v-139c15 66 110 117 224 117s211 -51 226 -117v139s0 20 20 20s20 -20 20 -20v-314s0 -20 -20 -20s-20 20 -20 20v139c-15 -66 -112 -117 -226 -117 s-209 51 -224 117v-139s0 -20 -20 -20s-20 20 -20 20zM231 30c0 -73 69 -148 128 -148c41 0 76 39 76 88c0 73 -69 148 -128 148c-41 0 -76 -39 -76 -88zM626 -157v314s0 20 20 20s20 -20 20 -20v-314s0 -20 -20 -20s-20 20 -20 20z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A1.xml b/data/Gootville/E0A1.xml
new file mode 100644
index 00000000000..03953dcece7
--- /dev/null
+++ b/data/Gootville/E0A1.xml
@@ -0,0 +1 @@
+<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -210v420s0 20 20 20s20 -20 20 -20v-30s0 -40 30 -40h384c30 0 30 40 30 40v30s0 20 20 20s20 -20 20 -20v-420s0 -20 -20 -20s-20 20 -20 20v30s0 40 -30 40h-384c-30 0 -30 -40 -30 -40v-30s0 -20 -20 -20s-20 20 -20 20zM40 10v-20c0 -25 0 -50 60 -50h324 c60 0 60 25 60 50v20c0 25 0 50 -60 50h-324c-60 0 -60 -25 -60 -50z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A2.xml b/data/Gootville/E0A2.xml
new file mode 100644
index 00000000000..b4ef88c177a
--- /dev/null
+++ b/data/Gootville/E0A2.xml
@@ -0,0 +1 @@
+<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 75 102 135 226 135s228 -60 228 -135s-104 -135 -228 -135s-226 60 -226 135zM125 30c0 -73 69 -148 128 -148c41 0 76 39 76 88c0 73 -69 148 -128 148c-41 0 -76 -39 -76 -88z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A3.xml b/data/Gootville/E0A3.xml
new file mode 100644
index 00000000000..3e23d354b04
--- /dev/null
+++ b/data/Gootville/E0A3.xml
@@ -0,0 +1 @@
+<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37c0 92 97 172 201 172c67 0 115 -40 115 -98c0 -92 -97 -172 -201 -172c-67 0 -115 40 -115 98zM35 -80c0 -11 8 -18 22 -18c62 0 224 129 224 178c0 11 -8 18 -22 18c-62 0 -224 -129 -224 -178z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A4.xml b/data/Gootville/E0A4.xml
new file mode 100644
index 00000000000..345bf7db88a
--- /dev/null
+++ b/data/Gootville/E0A4.xml
@@ -0,0 +1 @@
+<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37c0 92 97 172 201 172c67 0 115 -40 115 -98c0 -92 -97 -172 -201 -172c-67 0 -115 40 -115 98z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0A9.xml b/data/Gootville/E0A9.xml
new file mode 100644
index 00000000000..589903d0b4d
--- /dev/null
+++ b/data/Gootville/E0A9.xml
@@ -0,0 +1 @@
+<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -116c0 6 4 13 9 17l109 99l-109 99c-5 4 -9 11 -9 17c0 12 10 22 22 22c5 0 11 -2 15 -6l113 -103l113 103c4 4 10 6 15 6c12 0 22 -10 22 -22c0 -6 -4 -13 -9 -17l-109 -99l109 -99c5 -4 9 -11 9 -17c0 -12 -10 -22 -22 -22c-5 0 -11 2 -15 6l-113 103l-113 -103 c-4 -4 -10 -6 -15 -6c-12 0 -22 10 -22 22z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0D9.xml b/data/Gootville/E0D9.xml
new file mode 100644
index 00000000000..e67567e8828
--- /dev/null
+++ b/data/Gootville/E0D9.xml
@@ -0,0 +1 @@
+<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 4 11 39 25s77 51 108 103c5 9 8 11 14 11s9 -2 14 -11c31 -52 73 -89 108 -103s39 -18 39 -25s-4 -11 -39 -25s-77 -51 -108 -103c-5 -9 -8 -11 -14 -11s-9 2 -14 11c-31 52 -73 89 -108 103s-39 18 -39 25zM66 -12c30 -20 64 -43 84 -73c10 23 83 87 106 97 c-30 20 -64 43 -84 73c-10 -23 -83 -87 -106 -97z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DA.xml b/data/Gootville/E0DA.xml
new file mode 100644
index 00000000000..956c5c18122
--- /dev/null
+++ b/data/Gootville/E0DA.xml
@@ -0,0 +1 @@
+<symbol id="E0DA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 6 11 56 25s111 51 155 103c7 9 11 11 20 11s13 -2 20 -11c44 -52 105 -89 155 -103s56 -18 56 -25s-6 -11 -56 -25s-111 -51 -155 -103c-7 -9 -11 -11 -20 -11s-13 2 -20 11c-44 52 -105 89 -155 103s-56 18 -56 25zM114 0c47 -28 85 -61 117 -104 c32 43 70 76 117 104c-47 28 -85 61 -117 104c-32 -43 -70 -76 -117 -104z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DB.xml b/data/Gootville/E0DB.xml
new file mode 100644
index 00000000000..87036294c87
--- /dev/null
+++ b/data/Gootville/E0DB.xml
@@ -0,0 +1 @@
+<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 4 11 39 25s77 51 108 103c5 9 8 11 14 11s9 -2 14 -11c31 -52 73 -89 108 -103s39 -18 39 -25s-4 -11 -39 -25s-77 -51 -108 -103c-5 -9 -8 -11 -14 -11s-9 2 -14 11c-31 52 -73 89 -108 103s-39 18 -39 25z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DC.xml b/data/Gootville/E0DC.xml
new file mode 100644
index 00000000000..2288d22afb0
--- /dev/null
+++ b/data/Gootville/E0DC.xml
@@ -0,0 +1 @@
+<symbol id="E0DC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 6 11 56 25s111 51 155 103c7 9 11 11 20 11s13 -2 20 -11c44 -52 105 -89 155 -103s56 -18 56 -25s-6 -11 -56 -25s-111 -51 -155 -103c-7 -9 -11 -11 -20 -11s-13 2 -20 11c-44 52 -105 89 -155 103s-56 18 -56 25z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DD.xml b/data/Gootville/E0DD.xml
new file mode 100644
index 00000000000..54d3ff2444c
--- /dev/null
+++ b/data/Gootville/E0DD.xml
@@ -0,0 +1 @@
+<symbol id="E0DD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 4 11 39 25s77 51 108 103c5 9 8 11 14 11s9 -2 14 -11c31 -52 73 -89 108 -103s39 -18 39 -25s-4 -11 -39 -25s-77 -51 -108 -103c-5 -9 -8 -11 -14 -11s-9 2 -14 11c-31 52 -73 89 -108 103s-39 18 -39 25zM66 -12c30 -20 64 -43 84 -73c10 23 83 87 106 97 c-30 20 -64 43 -84 73c-10 -23 -83 -87 -106 -97z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0DE.xml b/data/Gootville/E0DE.xml
new file mode 100644
index 00000000000..43e4e006a3f
--- /dev/null
+++ b/data/Gootville/E0DE.xml
@@ -0,0 +1 @@
+<symbol id="E0DE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 7 6 11 56 25s111 51 155 103c7 9 11 11 20 11s13 -2 20 -11c44 -52 105 -89 155 -103s56 -18 56 -25s-6 -11 -56 -25s-111 -51 -155 -103c-7 -9 -11 -11 -20 -11s-13 2 -20 11c-44 52 -105 89 -155 103s-56 18 -56 25zM114 0c47 -28 85 -61 117 -104 c32 43 70 76 117 104c-47 28 -85 61 -117 104c-32 -43 -70 -76 -117 -104z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0F5.xml b/data/Gootville/E0F5.xml
new file mode 100644
index 00000000000..1c52272e169
--- /dev/null
+++ b/data/Gootville/E0F5.xml
@@ -0,0 +1 @@
+<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E0F6.xml b/data/Gootville/E0F6.xml
new file mode 100644
index 00000000000..ed78af01e1c
--- /dev/null
+++ b/data/Gootville/E0F6.xml
@@ -0,0 +1 @@
+<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E101.xml b/data/Gootville/E101.xml
new file mode 100644
index 00000000000..5f6bd53051e
--- /dev/null
+++ b/data/Gootville/E101.xml
@@ -0,0 +1 @@
+<symbol id="E101" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -224c0 6 79 394 90 448c3 13 9 22 19 22h87c10 0 16 -11 16 -22c0 -6 -79 -394 -90 -448c-3 -13 -9 -22 -19 -22h-87c-10 0 -16 11 -16 22z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E102.xml b/data/Gootville/E102.xml
new file mode 100644
index 00000000000..31e6f9cf685
--- /dev/null
+++ b/data/Gootville/E102.xml
@@ -0,0 +1 @@
+<symbol id="E102" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -224c0 6 79 394 90 448c3 13 9 22 19 22h275c10 0 16 -11 16 -22c0 -6 -79 -394 -90 -448c-3 -13 -9 -22 -19 -22h-275c-10 0 -16 11 -16 22zM51 -200h217l81 400h-217z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E103.xml b/data/Gootville/E103.xml
new file mode 100644
index 00000000000..981e593c620
--- /dev/null
+++ b/data/Gootville/E103.xml
@@ -0,0 +1 @@
+<symbol id="E103" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -224c0 6 79 394 90 448c3 13 9 22 19 22h161c10 0 16 -11 16 -22c0 -6 -79 -394 -90 -448c-3 -13 -9 -22 -19 -22h-161c-10 0 -16 11 -16 22zM51 -200h103l81 400h-103z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E240.xml b/data/Gootville/E240.xml
new file mode 100644
index 00000000000..41aeefc4cd3
--- /dev/null
+++ b/data/Gootville/E240.xml
@@ -0,0 +1 @@
+<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 0 0 14 15 14s15 -14 15 -14c24 -66 58 -116 119 -191s135 -166 135 -282c0 -88 -33 -184 -101 -264c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210c0 159 -91 230 -215 273h-30v224z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E241.xml b/data/Gootville/E241.xml
new file mode 100644
index 00000000000..96af6f7e69e
--- /dev/null
+++ b/data/Gootville/E241.xml
@@ -0,0 +1 @@
+<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v224h30c156 0 245 121 245 273c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -143 -77 -226 -143 -291s-117 -116 -141 -182c0 0 0 -14 -15 -14s-15 14 -15 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E242.xml b/data/Gootville/E242.xml
new file mode 100644
index 00000000000..2b1eb758aef
--- /dev/null
+++ b/data/Gootville/E242.xml
@@ -0,0 +1 @@
+<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 0 0 14 15 14s15 -14 15 -14c24 -66 123 -161 171 -206s83 -109 83 -187c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -88 -33 -184 -101 -264c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210c0 140 -89 215 -215 215h-30v406zM30 -202v-2 c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E243.xml b/data/Gootville/E243.xml
new file mode 100644
index 00000000000..57f645c17bd
--- /dev/null
+++ b/data/Gootville/E243.xml
@@ -0,0 +1 @@
+<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v406h30c129 21 245 83 245 237c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -90 -50 -168 -108 -216s-152 -133 -176 -199c0 0 0 -14 -15 -14s-15 14 -15 14zM30 202 c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E244.xml b/data/Gootville/E244.xml
new file mode 100644
index 00000000000..00fdfadc84d
--- /dev/null
+++ b/data/Gootville/E244.xml
@@ -0,0 +1 @@
+<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 220c0 0 0 14 15 14s15 -14 15 -14c24 -66 123 -161 171 -206s83 -109 83 -187c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -88 -33 -184 -101 -264c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210 c0 140 -89 215 -215 215h-30v610zM30 16c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2zM30 -186v-2c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E245.xml b/data/Gootville/E245.xml
new file mode 100644
index 00000000000..ee8880c1dcb
--- /dev/null
+++ b/data/Gootville/E245.xml
@@ -0,0 +1 @@
+<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -190v610h30c129 21 245 83 245 237c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -90 -50 -168 -108 -216s-152 -133 -176 -199 c0 0 0 -14 -15 -14s-15 14 -15 14zM30 12c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2zM30 216c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E246.xml b/data/Gootville/E246.xml
new file mode 100644
index 00000000000..62798c24087
--- /dev/null
+++ b/data/Gootville/E246.xml
@@ -0,0 +1 @@
+<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -404v814s0 14 15 14s15 -14 15 -14c24 -66 123 -161 171 -206s83 -109 83 -187c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -88 -33 -184 -101 -264 c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210c0 140 -89 215 -215 215h-30zM30 2c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2zM30 -200v-2c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41 c0 140 -89 215 -215 215zM30 206c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E247.xml b/data/Gootville/E247.xml
new file mode 100644
index 00000000000..957eed90270
--- /dev/null
+++ b/data/Gootville/E247.xml
@@ -0,0 +1 @@
+<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 404h30c129 21 245 83 245 237c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113 c0 -90 -50 -168 -108 -216s-152 -133 -176 -199c0 0 0 -14 -15 -14s-15 14 -15 14v814zM30 -2v-2c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185zM30 200c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89 s-135 -119 -159 -185v-2zM30 -206v-2c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E248.xml b/data/Gootville/E248.xml
new file mode 100644
index 00000000000..716a64b652d
--- /dev/null
+++ b/data/Gootville/E248.xml
@@ -0,0 +1 @@
+<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -388v1018s0 14 15 14s15 -14 15 -14c24 -66 123 -161 171 -206s83 -109 83 -187c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92c0 -37 -5 -74 -17 -112c11 -28 17 -59 17 -92 c0 -88 -33 -184 -101 -264c-11 -13 -18 -19 -24 -19s-12 5 -12 12s4 13 22 37s76 112 76 210c0 140 -89 215 -215 215h-30zM30 18c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2zM30 -184v-2c24 -66 123 -161 155 -190s45 -46 57 -64 c2 13 3 27 3 41c0 140 -89 215 -215 215zM30 222c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2zM30 426c24 -66 123 -161 155 -190s45 -46 57 -64c2 13 3 27 3 41c0 140 -89 215 -215 215v-2z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E249.xml b/data/Gootville/E249.xml
new file mode 100644
index 00000000000..7a593634b18
--- /dev/null
+++ b/data/Gootville/E249.xml
@@ -0,0 +1 @@
+<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 418h30c129 21 245 83 245 237c0 98 -58 186 -76 210s-22 30 -22 37s6 12 12 12s13 -6 24 -19c68 -80 101 -176 101 -264c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113 c0 -32 -6 -63 -17 -91c12 -38 17 -76 17 -113c0 -90 -50 -168 -108 -216s-152 -133 -176 -199c0 0 0 -14 -15 -14s-15 14 -15 14v1018zM30 10c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2zM30 -192v-2c129 21 245 83 245 237 c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185zM30 214c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185v-2zM30 -396v-2c129 21 245 83 245 237c0 13 -1 26 -3 39c-18 -30 -42 -55 -83 -89s-135 -119 -159 -185z "/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E260.xml b/data/Gootville/E260.xml
new file mode 100644
index 00000000000..21e38821a38
--- /dev/null
+++ b/data/Gootville/E260.xml
@@ -0,0 +1 @@
+<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-15 -153v599s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E261.xml b/data/Gootville/E261.xml
new file mode 100644
index 00000000000..348b8ef92df
--- /dev/null
+++ b/data/Gootville/E261.xml
@@ -0,0 +1 @@
+<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -169v492s0 14 15 14s15 -14 15 -14v-175l131 32c12 0 15 -11 15 -11v-492s0 -14 -15 -14s-15 14 -15 14v175l-131 -32c-12 0 -15 11 -15 11zM30 56v-140l116 28v140z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E262.xml b/data/Gootville/E262.xml
new file mode 100644
index 00000000000..d38f2492b73
--- /dev/null
+++ b/data/Gootville/E262.xml
@@ -0,0 +1 @@
+<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 64v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181 s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10zM84 71v-159l68 17v159z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E263.xml b/data/Gootville/E263.xml
new file mode 100644
index 00000000000..9efc6c05a46
--- /dev/null
+++ b/data/Gootville/E263.xml
@@ -0,0 +1 @@
+<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -55c0 6 4 10 10 10h58s45 20 45 45s-45 45 -45 45h-58c-6 0 -10 4 -10 10v70c0 6 4 10 10 10h70c6 0 10 -4 10 -10v-58s20 -45 45 -45s45 45 45 45v58c0 6 4 10 10 10h70c6 0 10 -4 10 -10v-70c0 -6 -4 -10 -10 -10h-58s-45 -20 -45 -45s45 -45 45 -45h58 c6 0 10 -4 10 -10v-70c0 -6 -4 -10 -10 -10h-70c-6 0 -10 4 -10 10v58s-20 45 -45 45s-45 -45 -45 -45v-58c0 -6 -4 -10 -10 -10h-70c-6 0 -10 4 -10 10v70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E264.xml b/data/Gootville/E264.xml
new file mode 100644
index 00000000000..39141d956b3
--- /dev/null
+++ b/data/Gootville/E264.xml
@@ -0,0 +1 @@
+<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-15 -153v599s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c22 0 39 -6 53 -16v318s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12v123c-29 -44 -76 -81 -105 -103 s-44 -32 -50 -32c-8 0 -15 5 -15 12zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39zM185 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E26A.xml b/data/Gootville/E26A.xml
new file mode 100644
index 00000000000..791582da0d8
--- /dev/null
+++ b/data/Gootville/E26A.xml
@@ -0,0 +1 @@
+<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E26B.xml b/data/Gootville/E26B.xml
new file mode 100644
index 00000000000..734ca0eb66c
--- /dev/null
+++ b/data/Gootville/E26B.xml
@@ -0,0 +1 @@
+<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E270.xml b/data/Gootville/E270.xml
new file mode 100644
index 00000000000..092ccb9a9ed
--- /dev/null
+++ b/data/Gootville/E270.xml
@@ -0,0 +1 @@
+<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-79 444c0 6 3 11 3 11c18 31 48 93 56 128s10 40 20 40s12 -5 20 -40s38 -97 56 -128c0 0 3 -5 3 -11c0 -8 -6 -13 -13 -13c-8 0 -18 4 -26 8s-25 7 -25 7v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19 c-8 0 -15 5 -15 12v599s-17 -3 -25 -7s-18 -8 -26 -8c-7 0 -13 5 -13 13zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E271.xml b/data/Gootville/E271.xml
new file mode 100644
index 00000000000..5da33ce0ed0
--- /dev/null
+++ b/data/Gootville/E271.xml
@@ -0,0 +1 @@
+<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-79 -193c0 8 6 13 13 13c8 0 18 -4 26 -8s25 -7 25 -7v641s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208l-17 -13v-36s17 3 25 7s18 8 26 8c7 0 13 -5 13 -13c0 -6 -3 -11 -3 -11c-18 -31 -48 -93 -56 -128 s-10 -40 -20 -40s-12 5 -20 40s-38 97 -56 128c0 0 -3 5 -3 11zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E272.xml b/data/Gootville/E272.xml
new file mode 100644
index 00000000000..d02f6831798
--- /dev/null
+++ b/data/Gootville/E272.xml
@@ -0,0 +1 @@
+<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 321c0 6 3 11 3 11c18 31 48 93 56 128s10 40 20 40s12 -5 20 -40s38 -97 56 -128c0 0 3 -5 3 -11c0 -8 -6 -13 -13 -13c-8 0 -18 4 -26 8s-25 7 -25 7v-175l131 32c12 0 15 -11 15 -11v-492s0 -14 -15 -14s-15 14 -15 14v175l-131 -32c-12 0 -15 11 -15 11v492 s-17 -3 -25 -7s-18 -8 -26 -8c-7 0 -13 5 -13 13zM94 56v-140l116 28v140z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E273.xml b/data/Gootville/E273.xml
new file mode 100644
index 00000000000..7866e5d84ac
--- /dev/null
+++ b/data/Gootville/E273.xml
@@ -0,0 +1 @@
+<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -169v492s0 14 15 14s15 -14 15 -14v-175l131 32c12 0 15 -11 15 -11v-492s17 3 25 7s18 8 26 8c7 0 13 -5 13 -13c0 -6 -3 -11 -3 -11c-18 -31 -48 -93 -56 -128s-10 -40 -20 -40s-12 5 -20 40s-38 97 -56 128c0 0 -3 5 -3 11c0 8 6 13 13 13c8 0 18 -4 26 -8 s25 -7 25 -7v175l-131 -32c-12 0 -15 11 -15 11zM30 56v-140l116 28v140z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E274.xml b/data/Gootville/E274.xml
new file mode 100644
index 00000000000..16489408cbb
--- /dev/null
+++ b/data/Gootville/E274.xml
@@ -0,0 +1 @@
+<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 64v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v234s-17 -3 -25 -7s-18 -8 -26 -8c-7 0 -13 5 -13 13c0 6 3 11 3 11c18 31 48 93 56 128s10 40 20 40s12 -5 20 -40s38 -97 56 -128c0 0 3 -5 3 -11c0 -8 -6 -13 -13 -13c-8 0 -18 4 -26 8 s-25 7 -25 7v-227s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10 c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10zM84 71v-159l68 17v159z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E275.xml b/data/Gootville/E275.xml
new file mode 100644
index 00000000000..5b117055f15
--- /dev/null
+++ b/data/Gootville/E275.xml
@@ -0,0 +1 @@
+<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-10 -413c0 8 6 13 13 13c8 0 18 -4 26 -8s25 -7 25 -7v227s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14 v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-234s17 3 25 7s18 8 26 8c7 0 13 -5 13 -13c0 -6 -3 -11 -3 -11 c-18 -31 -48 -93 -56 -128s-10 -40 -20 -40s-12 5 -20 40s-38 97 -56 128c0 0 -3 5 -3 11zM84 71v-159l68 17v159z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E280.xml b/data/Gootville/E280.xml
new file mode 100644
index 00000000000..0a6767593b8
--- /dev/null
+++ b/data/Gootville/E280.xml
@@ -0,0 +1 @@
+<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 62c0 46 30 82 83 82c35 0 56 -11 87 -36v338s0 14 15 14s15 -14 15 -14v-599c0 -7 -7 -12 -15 -12c-6 0 -20 10 -32 19c-77 58 -153 121 -153 208zM77 62c0 -90 59 -144 93 -174v170c-13 19 -32 39 -56 39c-26 0 -37 -14 -37 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E281.xml b/data/Gootville/E281.xml
new file mode 100644
index 00000000000..50785a5956c
--- /dev/null
+++ b/data/Gootville/E281.xml
@@ -0,0 +1 @@
+<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 62c0 46 30 82 83 82c35 0 56 -11 87 -36v338s0 14 15 14s15 -14 15 -14v-599c0 -7 -7 -12 -15 -12c-6 0 -20 10 -32 19c-77 58 -153 121 -153 208zM77 62c0 -90 59 -144 93 -174v170c-13 19 -32 39 -56 39c-26 0 -37 -14 -37 -35zM246 -153v599s0 14 15 14 s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12zM276 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E282.xml b/data/Gootville/E282.xml
new file mode 100644
index 00000000000..4c236db1eba
--- /dev/null
+++ b/data/Gootville/E282.xml
@@ -0,0 +1 @@
+<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 76v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10 c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E283.xml b/data/Gootville/E283.xml
new file mode 100644
index 00000000000..0bb5e90466a
--- /dev/null
+++ b/data/Gootville/E283.xml
@@ -0,0 +1 @@
+<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 52v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65 c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10 c-6 0 -12 1 -15 10zM84 59v-159l68 17v159zM182 -76l68 17v159l-68 -17v-159z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E440.xml b/data/Gootville/E440.xml
new file mode 100644
index 00000000000..131a0e241f6
--- /dev/null
+++ b/data/Gootville/E440.xml
@@ -0,0 +1 @@
+<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-129 155c0 6 3 10 8 13l106 53v82l-92 -46c-2 -1 -5 -2 -7 -2c-8 0 -15 6 -15 15c0 6 3 10 8 13l106 53v110s0 14 15 14s15 -14 15 -14v-95l92 46c2 1 5 2 7 2c8 0 15 -6 15 -15c0 -6 -3 -10 -8 -13l-106 -53v-82l92 46c2 1 5 2 7 2c8 0 15 -6 15 -15 c0 -6 -3 -10 -8 -13l-106 -53v-95c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12v341l-92 -46c-2 -1 -5 -2 -7 -2c-8 0 -15 6 -15 15zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35 c-24 0 -43 -20 -56 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E441.xml b/data/Gootville/E441.xml
new file mode 100644
index 00000000000..097fbf67cb8
--- /dev/null
+++ b/data/Gootville/E441.xml
@@ -0,0 +1 @@
+<symbol id="E441" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-15 -153v599s0 14 15 14s15 -14 15 -14v-338c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E442.xml b/data/Gootville/E442.xml
new file mode 100644
index 00000000000..d30f136785e
--- /dev/null
+++ b/data/Gootville/E442.xml
@@ -0,0 +1 @@
+<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-129 200c0 6 3 10 8 13l106 53v180s0 14 15 14s15 -14 15 -14v-165l92 46c2 1 5 2 7 2c8 0 15 -6 15 -15c0 -6 -3 -10 -8 -13l-106 -53v-140c31 25 52 36 87 36c53 0 83 -36 83 -82c0 -87 -76 -150 -153 -208c-12 -9 -26 -19 -32 -19c-8 0 -15 5 -15 12v386l-92 -46 c-2 -1 -5 -2 -7 -2c-8 0 -15 6 -15 15zM15 58v-170c34 30 93 84 93 174c0 21 -11 35 -37 35c-24 0 -43 -20 -56 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E443.xml b/data/Gootville/E443.xml
new file mode 100644
index 00000000000..19054ff8c86
--- /dev/null
+++ b/data/Gootville/E443.xml
@@ -0,0 +1 @@
+<symbol id="E443" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 62c0 46 30 82 83 82c35 0 56 -11 87 -36v338s0 14 15 14s15 -14 15 -14v-599c0 -7 -7 -12 -15 -12c-6 0 -20 10 -32 19c-77 58 -153 121 -153 208zM77 62c0 -90 59 -144 93 -174v170c-13 19 -32 39 -56 39c-26 0 -37 -14 -37 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E444.xml b/data/Gootville/E444.xml
new file mode 100644
index 00000000000..71e0ff096e5
--- /dev/null
+++ b/data/Gootville/E444.xml
@@ -0,0 +1 @@
+<symbol id="E444" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 76v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10 c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E445.xml b/data/Gootville/E445.xml
new file mode 100644
index 00000000000..1610c948738
--- /dev/null
+++ b/data/Gootville/E445.xml
@@ -0,0 +1 @@
+<symbol id="E445" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 64v65c0 13 15 18 15 18l39 10v181s0 14 15 14s15 -14 15 -14v-174l68 17v181s0 14 15 14s15 -14 15 -14v-174s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-159s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-181 s0 -14 -15 -14s-15 14 -15 14v174l-68 -17v-181s0 -14 -15 -14s-15 14 -15 14v174s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v159s-36 -10 -39 -10c-6 0 -12 1 -15 10zM84 71v-159l68 17v159z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E446.xml b/data/Gootville/E446.xml
new file mode 100644
index 00000000000..8b6b0bf103b
--- /dev/null
+++ b/data/Gootville/E446.xml
@@ -0,0 +1 @@
+<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 9c0 13 15 18 15 18l64 16v73s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v141s0 14 15 14s15 -14 15 -14v-134s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-73s61 16 64 16c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18 l-64 -16v-73s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-141s0 -14 -15 -14s-15 14 -15 14v134s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v73s-61 -16 -64 -16c-6 0 -12 1 -15 10v65z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E447.xml b/data/Gootville/E447.xml
new file mode 100644
index 00000000000..5bc793bd0a0
--- /dev/null
+++ b/data/Gootville/E447.xml
@@ -0,0 +1 @@
+<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -3c0 13 15 18 15 18l64 16v73s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18l39 10v141s0 14 15 14s15 -14 15 -14v-134l68 17v141s0 14 15 14s15 -14 15 -14v-134s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-73s61 16 64 16 c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-64 -16v-73s36 10 39 10c6 0 12 -1 15 -10v-65c0 -13 -15 -18 -15 -18l-39 -10v-141s0 -14 -15 -14s-15 14 -15 14v134l-68 -17v-141s0 -14 -15 -14s-15 14 -15 14v134s-36 -10 -39 -10c-6 0 -12 1 -15 10v65c0 13 15 18 15 18 l39 10v73s-61 -16 -64 -16c-6 0 -12 1 -15 10v65zM109 38l68 17v73l-68 -17v-73zM109 -55v-73l68 17v73z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A0.xml b/data/Gootville/E4A0.xml
new file mode 100644
index 00000000000..e640fd8ff40
--- /dev/null
+++ b/data/Gootville/E4A0.xml
@@ -0,0 +1 @@
+<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 19c0 9 7 17 16 19l330 89l-330 89c-9 2 -16 10 -16 19c0 10 9 19 19 19c6 0 11 -2 11 -2l401 -109s11 -3 11 -16s-11 -16 -11 -16l-401 -109s-5 -2 -11 -2c-10 0 -19 9 -19 19z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A1.xml b/data/Gootville/E4A1.xml
new file mode 100644
index 00000000000..b567e7b9a54
--- /dev/null
+++ b/data/Gootville/E4A1.xml
@@ -0,0 +1 @@
+<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -19c0 10 9 19 19 19c6 0 11 -2 11 -2l401 -109s11 -3 11 -16s-11 -16 -11 -16l-401 -109s-5 -2 -11 -2c-10 0 -19 9 -19 19c0 9 7 17 16 19l330 89l-330 89c-9 2 -16 10 -16 19z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A2.xml b/data/Gootville/E4A2.xml
new file mode 100644
index 00000000000..d05b67a9897
--- /dev/null
+++ b/data/Gootville/E4A2.xml
@@ -0,0 +1 @@
+<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 50c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A3.xml b/data/Gootville/E4A3.xml
new file mode 100644
index 00000000000..c40875ab855
--- /dev/null
+++ b/data/Gootville/E4A3.xml
@@ -0,0 +1 @@
+<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A4.xml b/data/Gootville/E4A4.xml
new file mode 100644
index 00000000000..bef5ad6ccde
--- /dev/null
+++ b/data/Gootville/E4A4.xml
@@ -0,0 +1 @@
+<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 0c0 0 -14 0 -14 15s14 15 14 15h276s14 0 14 -15s-14 -15 -14 -15h-276z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A5.xml b/data/Gootville/E4A5.xml
new file mode 100644
index 00000000000..a0691486086
--- /dev/null
+++ b/data/Gootville/E4A5.xml
@@ -0,0 +1 @@
+<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -30c0 0 -14 0 -14 15s14 15 14 15h276s14 0 14 -15s-14 -15 -14 -15h-276z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A6.xml b/data/Gootville/E4A6.xml
new file mode 100644
index 00000000000..26f31c21437
--- /dev/null
+++ b/data/Gootville/E4A6.xml
@@ -0,0 +1 @@
+<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 185c0 9 7 13 14 13c9 0 18 -4 27 -8s28 -10 41 -10s32 6 41 10s18 8 27 8c7 0 14 -4 14 -13c0 -6 -4 -11 -4 -11c-19 -32 -48 -97 -57 -133s-11 -41 -21 -41s-12 5 -21 41s-38 101 -57 133c0 0 -4 5 -4 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A7.xml b/data/Gootville/E4A7.xml
new file mode 100644
index 00000000000..5ef4d73d89f
--- /dev/null
+++ b/data/Gootville/E4A7.xml
@@ -0,0 +1 @@
+<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -185c0 6 4 11 4 11c19 32 48 97 57 133s11 41 21 41s12 -5 21 -41s38 -101 57 -133c0 0 4 -5 4 -11c0 -9 -7 -13 -14 -13c-9 0 -18 4 -27 8s-28 10 -41 10s-32 -6 -41 -10s-18 -8 -27 -8c-7 0 -14 4 -14 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A8.xml b/data/Gootville/E4A8.xml
new file mode 100644
index 00000000000..20e63ca763e
--- /dev/null
+++ b/data/Gootville/E4A8.xml
@@ -0,0 +1 @@
+<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 185c0 9 7 13 14 13c9 0 18 -4 27 -8s28 -10 41 -10s32 6 41 10s18 8 27 8c7 0 14 -4 14 -13c0 -6 -4 -11 -4 -11c-19 -32 -48 -97 -57 -133s-11 -41 -21 -41s-12 5 -21 41s-38 101 -57 133c0 0 -4 5 -4 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4A9.xml b/data/Gootville/E4A9.xml
new file mode 100644
index 00000000000..cfb318f14fe
--- /dev/null
+++ b/data/Gootville/E4A9.xml
@@ -0,0 +1 @@
+<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -185c0 6 4 11 4 11c19 32 48 97 57 133s11 41 21 41s12 -5 21 -41s38 -101 57 -133c0 0 4 -5 4 -11c0 -9 -7 -13 -14 -13c-9 0 -18 4 -27 8s-28 10 -41 10s-32 -6 -41 -10s-18 -8 -27 -8c-7 0 -14 4 -14 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4AC.xml b/data/Gootville/E4AC.xml
new file mode 100644
index 00000000000..8acf3deeb28
--- /dev/null
+++ b/data/Gootville/E4AC.xml
@@ -0,0 +1 @@
+<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 3c0 2 2 8 2 8l115 391s1 10 9 10s9 -10 9 -10l116 -391s1 -3 1 -5c0 -3 -2 -6 -10 -6h-51c-7 0 -10 11 -10 11l-79 266l-78 -266s-3 -11 -10 -11h-8c-4 0 -6 1 -6 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4AD.xml b/data/Gootville/E4AD.xml
new file mode 100644
index 00000000000..7915a3f8749
--- /dev/null
+++ b/data/Gootville/E4AD.xml
@@ -0,0 +1 @@
+<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -6c0 3 2 6 10 6h51c7 0 10 -11 10 -11l79 -266l78 266s3 11 10 11h8c4 0 6 -1 6 -3s-2 -8 -2 -8l-115 -391s-1 -10 -9 -10s-9 10 -9 10l-116 391s-1 3 -1 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4B2.xml b/data/Gootville/E4B2.xml
new file mode 100644
index 00000000000..6dd74043ff2
--- /dev/null
+++ b/data/Gootville/E4B2.xml
@@ -0,0 +1 @@
+<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 165c0 0 -14 0 -14 15s14 15 14 15h276s14 0 14 -15s-14 -15 -14 -15h-276zM102 50c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4B3.xml b/data/Gootville/E4B3.xml
new file mode 100644
index 00000000000..aa8ce03ed85
--- /dev/null
+++ b/data/Gootville/E4B3.xml
@@ -0,0 +1 @@
+<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -195c0 0 -14 0 -14 15s14 15 14 15h276s14 0 14 -15s-14 -15 -14 -15h-276zM102 -50c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4B6.xml b/data/Gootville/E4B6.xml
new file mode 100644
index 00000000000..434833a38e4
--- /dev/null
+++ b/data/Gootville/E4B6.xml
@@ -0,0 +1 @@
+<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 8c0 3 3 17 3 17s45 222 49 233s15 21 33 21s33 -15 33 -38c0 -13 -95 -216 -95 -216s-10 -25 -17 -25c-2 0 -6 0 -6 8z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4B7.xml b/data/Gootville/E4B7.xml
new file mode 100644
index 00000000000..a03365b75d8
--- /dev/null
+++ b/data/Gootville/E4B7.xml
@@ -0,0 +1 @@
+<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -8c0 8 4 8 6 8c7 0 17 -25 17 -25s95 -203 95 -216c0 -23 -15 -38 -33 -38s-29 10 -33 21s-49 233 -49 233s-3 14 -3 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C0.xml b/data/Gootville/E4C0.xml
new file mode 100644
index 00000000000..17459e92c9a
--- /dev/null
+++ b/data/Gootville/E4C0.xml
@@ -0,0 +1 @@
+<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 22c0 192 148 332 325 332s325 -140 325 -332c0 -14 -3 -22 -15 -22s-15 8 -15 22c0 127 -131 232 -295 232s-295 -105 -295 -232c0 -14 -3 -22 -15 -22s-15 8 -15 22zM279 46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C1.xml b/data/Gootville/E4C1.xml
new file mode 100644
index 00000000000..abe34f78544
--- /dev/null
+++ b/data/Gootville/E4C1.xml
@@ -0,0 +1 @@
+<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -22c0 14 3 22 15 22s15 -8 15 -22c0 -127 131 -232 295 -232s295 105 295 232c0 14 3 22 15 22s15 -8 15 -22c0 -192 -148 -332 -325 -332s-325 140 -325 332zM279 -46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C4.xml b/data/Gootville/E4C4.xml
new file mode 100644
index 00000000000..0aa91735f94
--- /dev/null
+++ b/data/Gootville/E4C4.xml
@@ -0,0 +1 @@
+<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 8c0 5 3 10 3 10l274 444s4 8 14 8s14 -8 14 -8l269 -436s7 -10 7 -18c0 -4 -3 -8 -9 -8h-49c-14 0 -21 11 -21 11l-234 379l-229 -372s-10 -18 -17 -18h-13c-6 0 -9 4 -9 8zM245 46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C5.xml b/data/Gootville/E4C5.xml
new file mode 100644
index 00000000000..956aef6cf47
--- /dev/null
+++ b/data/Gootville/E4C5.xml
@@ -0,0 +1 @@
+<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -8c0 4 3 8 9 8h13c7 0 17 -18 17 -18l229 -372l234 379s7 11 21 11h49c6 0 9 -4 9 -8c0 -8 -7 -18 -7 -18l-269 -436s-4 -8 -14 -8s-14 8 -14 8l-274 444s-3 5 -3 10zM245 -46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C6.xml b/data/Gootville/E4C6.xml
new file mode 100644
index 00000000000..84638699206
--- /dev/null
+++ b/data/Gootville/E4C6.xml
@@ -0,0 +1 @@
+<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 14v339c0 6 6 11 12 11h548c6 0 12 -5 12 -11v-339s0 -14 -15 -14s-15 14 -15 14v230h-512v-230s0 -14 -15 -14s-15 14 -15 14zM240 46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C7.xml b/data/Gootville/E4C7.xml
new file mode 100644
index 00000000000..51b61b9db3e
--- /dev/null
+++ b/data/Gootville/E4C7.xml
@@ -0,0 +1 @@
+<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -14c0 0 0 14 15 14s15 -14 15 -14v-230h512v230s0 14 15 14s15 -14 15 -14v-339c0 -6 -6 -11 -12 -11h-548c-6 0 -12 5 -12 11v339zM240 -46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C8.xml b/data/Gootville/E4C8.xml
new file mode 100644
index 00000000000..d287a438221
--- /dev/null
+++ b/data/Gootville/E4C8.xml
@@ -0,0 +1 @@
+<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 14v391c0 6 6 11 12 11h548c6 0 12 -5 12 -11v-391s0 -14 -15 -14s-15 14 -15 14v280h-512v-280s0 -14 -15 -14s-15 14 -15 14zM76 14v221c0 6 6 11 12 11h396c6 0 12 -5 12 -11v-221s0 -14 -15 -14s-15 14 -15 14v132h-360v-132s0 -14 -15 -14s-15 14 -15 14zM240 46 c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4C9.xml b/data/Gootville/E4C9.xml
new file mode 100644
index 00000000000..60775a8bdae
--- /dev/null
+++ b/data/Gootville/E4C9.xml
@@ -0,0 +1 @@
+<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -14c0 0 0 14 15 14s15 -14 15 -14v-280h512v280s0 14 15 14s15 -14 15 -14v-391c0 -6 -6 -11 -12 -11h-548c-6 0 -12 5 -12 11v391zM76 -14c0 0 0 14 15 14s15 -14 15 -14v-132h360v132s0 14 15 14s15 -14 15 -14v-221c0 -6 -6 -11 -12 -11h-396c-6 0 -12 5 -12 11 v221zM240 -46c0 25 21 46 46 46s46 -21 46 -46s-21 -46 -46 -46s-46 21 -46 46z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4CE.xml b/data/Gootville/E4CE.xml
new file mode 100644
index 00000000000..8553904ee7f
--- /dev/null
+++ b/data/Gootville/E4CE.xml
@@ -0,0 +1 @@
+<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 199c0 35 28 63 63 63c49 0 79 -49 79 -99c0 -57 -39 -117 -103 -155c-10 -6 -17 -8 -20 -8s-5 2 -5 5s2 5 7 8c34 23 52 56 52 87c0 14 -3 24 -10 37c-35 0 -63 27 -63 62z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E1.xml b/data/Gootville/E4E1.xml
new file mode 100644
index 00000000000..c95cf900b13
--- /dev/null
+++ b/data/Gootville/E4E1.xml
@@ -0,0 +1 @@
+<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 240c0 6 4 10 10 10h264c6 0 10 -4 10 -10v-480c0 -6 -4 -10 -10 -10h-264c-6 0 -10 4 -10 10v480z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E2.xml b/data/Gootville/E4E2.xml
new file mode 100644
index 00000000000..aa4d0b4a86d
--- /dev/null
+++ b/data/Gootville/E4E2.xml
@@ -0,0 +1 @@
+<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v230c0 6 4 10 10 10h264c6 0 10 -4 10 -10v-230c0 -6 -4 -10 -10 -10h-264c-6 0 -10 4 -10 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E3.xml b/data/Gootville/E4E3.xml
new file mode 100644
index 00000000000..b5852fe3d0c
--- /dev/null
+++ b/data/Gootville/E4E3.xml
@@ -0,0 +1 @@
+<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -10c0 6 4 10 10 10h310c6 0 10 -4 10 -10v-105c0 -6 -4 -10 -10 -10h-310c-6 0 -10 4 -10 10v105z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E4.xml b/data/Gootville/E4E4.xml
new file mode 100644
index 00000000000..1b9d00645d2
--- /dev/null
+++ b/data/Gootville/E4E4.xml
@@ -0,0 +1 @@
+<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v105c0 6 4 10 10 10h310c6 0 10 -4 10 -10v-105c0 -6 -4 -10 -10 -10h-310c-6 0 -10 4 -10 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E5.xml b/data/Gootville/E4E5.xml
new file mode 100644
index 00000000000..a2c165a0201
--- /dev/null
+++ b/data/Gootville/E4E5.xml
@@ -0,0 +1 @@
+<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -188c0 58 52 87 110 87c14 0 48 -6 48 -6s-145 124 -145 135c0 4 0 6 7 13c46 50 61 117 61 175c0 50 -15 95 -47 127c-4 4 -6 8 -6 12c0 5 4 10 12 10c12 0 176 -110 176 -155c0 -19 -12 -52 -29 -85s-32 -71 -32 -98c0 -58 20 -115 43 -135s24 -24 24 -29 c0 -7 -5 -13 -13 -13c-5 0 -13 2 -16 3s-11 2 -17 2c-18 0 -32 -5 -46 -14c-31 -21 -45 -52 -45 -85s14 -67 43 -96c6 -6 8 -9 8 -14s-5 -9 -10 -9s-8 1 -14 5c-69 46 -112 106 -112 170z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E6.xml b/data/Gootville/E4E6.xml
new file mode 100644
index 00000000000..cd17a97a4f8
--- /dev/null
+++ b/data/Gootville/E4E6.xml
@@ -0,0 +1 @@
+<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 124c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15c0 0 0 -3 -1 -6l-107 -363c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E7.xml b/data/Gootville/E4E7.xml
new file mode 100644
index 00000000000..f8c70d4173f
--- /dev/null
+++ b/data/Gootville/E4E7.xml
@@ -0,0 +1 @@
+<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -120c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15c0 0 0 -3 -1 -6 l-179 -607c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E8.xml b/data/Gootville/E4E8.xml
new file mode 100644
index 00000000000..236e4f2b2d9
--- /dev/null
+++ b/data/Gootville/E4E8.xml
@@ -0,0 +1 @@
+<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -120c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36 c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15c0 0 0 -3 -1 -6l-251 -851c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4E9.xml b/data/Gootville/E4E9.xml
new file mode 100644
index 00000000000..731239cf08e
--- /dev/null
+++ b/data/Gootville/E4E9.xml
@@ -0,0 +1 @@
+<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -364c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36 c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15 c0 0 0 -3 -1 -6l-323 -1095c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4EA.xml b/data/Gootville/E4EA.xml
new file mode 100644
index 00000000000..f3a00c79394
--- /dev/null
+++ b/data/Gootville/E4EA.xml
@@ -0,0 +1 @@
+<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -364c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36 c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86l47 159c-31 -20 -62 -36 -97 -36 c-56 0 -104 34 -104 85c0 42 34 76 76 76s76 -34 76 -76c0 -19 -7 -37 -19 -50c43 12 75 42 93 86c3 8 9 11 16 11s14 -6 14 -15c0 0 0 -3 -1 -6l-395 -1339c-3 -8 -9 -11 -16 -11s-14 6 -14 15c0 0 0 3 1 6l82 278c-31 -20 -62 -36 -97 -36c-56 0 -104 34 -104 85z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E4F2.xml b/data/Gootville/E4F2.xml
new file mode 100644
index 00000000000..01b834dbad3
--- /dev/null
+++ b/data/Gootville/E4F2.xml
@@ -0,0 +1 @@
+<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 156c0 9 7 15 14 15s13 -3 16 -11c18 -44 50 -74 93 -86c-12 13 -19 31 -19 50c0 42 34 76 76 76s76 -34 76 -76c0 -51 -48 -85 -104 -85c-35 0 -66 16 -97 36l82 -278c1 -3 1 -6 1 -6c0 -9 -7 -15 -14 -15s-13 3 -16 11l-107 363c-1 3 -1 6 -1 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E510.xml b/data/Gootville/E510.xml
new file mode 100644
index 00000000000..c43e156cb30
--- /dev/null
+++ b/data/Gootville/E510.xml
@@ -0,0 +1 @@
+<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 133c0 53 35 104 86 128c-19 14 -27 36 -27 62c0 105 92 163 202 163c94 0 153 -42 153 -113c0 -53 -28 -84 -58 -112c32 -25 48 -51 48 -85c0 -120 -134 -176 -229 -176c-84 0 -175 53 -175 133zM70 134c0 -54 43 -100 111 -100c49 0 94 27 94 65 c0 48 -75 92 -152 133c-24 -23 -53 -53 -53 -98zM176 401c0 -46 72 -84 126 -111c20 17 29 50 29 79c0 44 -25 83 -76 83c-49 0 -79 -22 -79 -51z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E514.xml b/data/Gootville/E514.xml
new file mode 100644
index 00000000000..6ef354c91f2
--- /dev/null
+++ b/data/Gootville/E514.xml
@@ -0,0 +1 @@
+<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 18c0 18 21 18 28 18c19 0 45 23 51 58l50 285l-87 -107c-5 -7 -9 -10 -15 -10c-8 0 -15 6 -15 14c0 4 3 9 3 9l132 192s7 9 11 9h103c5 0 5 -4 5 -8l-67 -384c-1 -5 -2 -10 -2 -14c0 -27 10 -44 26 -44c7 0 28 0 28 -18s-21 -18 -28 -18h-195c-7 0 -28 0 -28 18z M264 88c0 45 36 78 75 78c31 0 53 -22 53 -52c0 -32 -22 -57 -48 -68c5 -5 18 -15 42 -15c55 0 111 74 111 158c0 56 -34 90 -79 90c-40 0 -55 -7 -73 -18s-20 -11 -27 -11c-6 0 -8 4 -8 9c0 3 0 6 1 9c0 2 11 50 21 92s24 102 24 104c2 14 10 22 18 22c12 0 24 -3 43 -9 s50 -12 86 -12s78 6 99 12s39 9 51 9c5 0 8 -4 8 -10c0 -10 -4 -27 -27 -50c-22 -22 -80 -55 -148 -55c-42 0 -86 9 -119 20l-24 -99c44 26 80 27 112 27c86 0 160 -52 160 -133c0 -112 -112 -186 -203 -186c-79 0 -148 28 -148 88z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E517.xml b/data/Gootville/E517.xml
new file mode 100644
index 00000000000..aa652a8066f
--- /dev/null
+++ b/data/Gootville/E517.xml
@@ -0,0 +1 @@
+<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 26c0 82 103 150 158 184c72 45 139 87 139 180c0 41 -19 65 -64 65c-33 0 -49 -9 -57 -14c16 -9 27 -26 27 -46c0 -42 -38 -74 -75 -74c-31 0 -53 22 -53 52c0 80 100 113 184 113c83 0 156 -33 156 -107c0 -109 -122 -171 -191 -193c-68 -21 -120 -50 -158 -88 c38 26 84 46 127 46c31 0 52 -6 73 -18s38 -20 54 -20c20 0 35 10 42 16s16 13 22 13c5 0 10 -3 10 -9c0 -52 -94 -126 -140 -126c-32 0 -53 6 -75 22s-38 26 -68 26s-41 -4 -60 -18s-26 -18 -34 -18c-7 0 -17 4 -17 14zM377 26c0 82 103 150 158 184c72 45 139 87 139 180 c0 41 -19 65 -64 65c-33 0 -49 -9 -57 -14c16 -9 27 -26 27 -46c0 -42 -38 -74 -75 -74c-31 0 -53 22 -53 52c0 80 100 113 184 113c83 0 156 -33 156 -107c0 -109 -122 -171 -191 -193c-68 -21 -120 -50 -158 -88c38 26 84 46 127 46c31 0 52 -6 73 -18s38 -20 54 -20 c20 0 35 10 42 16s16 13 22 13c5 0 10 -3 10 -9c0 -52 -94 -126 -140 -126c-32 0 -53 6 -75 22s-38 26 -68 26s-41 -4 -60 -18s-26 -18 -34 -18c-7 0 -17 4 -17 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E51A.xml b/data/Gootville/E51A.xml
new file mode 100644
index 00000000000..d46fcf70960
--- /dev/null
+++ b/data/Gootville/E51A.xml
@@ -0,0 +1 @@
+<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 102 27 175 77 255c7 11 12 12 15 12c7 0 12 -4 12 -9c0 -3 -1 -6 -5 -15c-30 -73 -45 -145 -45 -243s15 -170 45 -243c4 -9 5 -12 5 -15c0 -5 -5 -9 -12 -9c-3 0 -8 1 -15 12c-50 80 -77 153 -77 255z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E51B.xml b/data/Gootville/E51B.xml
new file mode 100644
index 00000000000..adc2b0a8aee
--- /dev/null
+++ b/data/Gootville/E51B.xml
@@ -0,0 +1 @@
+<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -258c0 3 1 6 5 15c30 73 45 145 45 243s-15 170 -45 243c-4 9 -5 12 -5 15c0 5 5 9 12 9c3 0 8 -1 15 -12c50 -80 77 -153 77 -255s-27 -175 -77 -255c-7 -11 -12 -12 -15 -12c-7 0 -12 4 -12 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E520.xml b/data/Gootville/E520.xml
new file mode 100644
index 00000000000..83a741659e4
--- /dev/null
+++ b/data/Gootville/E520.xml
@@ -0,0 +1 @@
+<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E521.xml b/data/Gootville/E521.xml
new file mode 100644
index 00000000000..c78c01609e8
--- /dev/null
+++ b/data/Gootville/E521.xml
@@ -0,0 +1 @@
+<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 161c0 5 2 15 13 38s48 73 94 73s60 -42 60 -42s29 42 60 42c46 0 60 -42 60 -42s29 42 60 42c38 0 64 -30 64 -66c0 -15 -23 -80 -23 -80s-25 -74 -25 -93c0 -8 2 -15 10 -15c25 0 54 35 62 58s12 26 17 26s8 -3 8 -8c0 -45 -56 -114 -110 -114c-30 0 -58 26 -58 63 c0 19 25 93 25 93s23 65 23 80c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20 c-30 0 -54 -41 -61 -62s-10 -21 -15 -21s-8 3 -8 8z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E522.xml b/data/Gootville/E522.xml
new file mode 100644
index 00000000000..79aa9a9b860
--- /dev/null
+++ b/data/Gootville/E522.xml
@@ -0,0 +1 @@
+<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E523.xml b/data/Gootville/E523.xml
new file mode 100644
index 00000000000..fd7c826a0e7
--- /dev/null
+++ b/data/Gootville/E523.xml
@@ -0,0 +1 @@
+<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-17 218c0 5 3 12 16 25s33 27 71 27s51 -30 51 -30s33 32 81 32c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7c-38 0 -59 -19 -72 -42s-59 -191 -59 -191c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 60 170 60 212 c0 13 -7 21 -19 21c-15 0 -25 -5 -33 -15s-12 -14 -17 -14s-8 3 -8 8z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E524.xml b/data/Gootville/E524.xml
new file mode 100644
index 00000000000..97459bd450c
--- /dev/null
+++ b/data/Gootville/E524.xml
@@ -0,0 +1 @@
+<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E525.xml b/data/Gootville/E525.xml
new file mode 100644
index 00000000000..172267d2a95
--- /dev/null
+++ b/data/Gootville/E525.xml
@@ -0,0 +1 @@
+<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-24 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35 s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E526.xml b/data/Gootville/E526.xml
new file mode 100644
index 00000000000..732e3d0f3cc
--- /dev/null
+++ b/data/Gootville/E526.xml
@@ -0,0 +1 @@
+<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 161c0 5 2 15 13 38s48 73 94 73s60 -42 60 -42s29 42 60 42c38 0 64 -30 64 -66c0 -15 -23 -80 -23 -80s-25 -74 -25 -93c0 -8 2 -15 10 -15c25 0 54 35 62 58s12 26 17 26s8 -3 8 -8c0 -45 -56 -114 -110 -114c-30 0 -58 26 -58 63c0 19 25 93 25 93s23 65 23 80 c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20c-30 0 -54 -41 -61 -62s-10 -21 -15 -21s-8 3 -8 8z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E527.xml b/data/Gootville/E527.xml
new file mode 100644
index 00000000000..70e61b7b609
--- /dev/null
+++ b/data/Gootville/E527.xml
@@ -0,0 +1 @@
+<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM620 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59 s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13z M831 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM966 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47 s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1177 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44 c-15 0 -36 -1 -61 -35zM1312 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192 c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1523 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM1658 -167c0 8 7 13 31 13 c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5 c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1869 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E528.xml b/data/Gootville/E528.xml
new file mode 100644
index 00000000000..486ff01ab59
--- /dev/null
+++ b/data/Gootville/E528.xml
@@ -0,0 +1 @@
+<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM620 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59 s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13z M831 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM966 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47 s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1177 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44 c-15 0 -36 -1 -61 -35zM1312 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192 c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1523 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E529.xml b/data/Gootville/E529.xml
new file mode 100644
index 00000000000..f7c27724cfe
--- /dev/null
+++ b/data/Gootville/E529.xml
@@ -0,0 +1 @@
+<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM620 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59 s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13z M831 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM966 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47 s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM1177 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44 c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52A.xml b/data/Gootville/E52A.xml
new file mode 100644
index 00000000000..90047093b41
--- /dev/null
+++ b/data/Gootville/E52A.xml
@@ -0,0 +1 @@
+<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM620 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59 s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13z M831 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52B.xml b/data/Gootville/E52B.xml
new file mode 100644
index 00000000000..83cfe851825
--- /dev/null
+++ b/data/Gootville/E52B.xml
@@ -0,0 +1 @@
+<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM274 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338 s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10 c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM485 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52C.xml b/data/Gootville/E52C.xml
new file mode 100644
index 00000000000..7c7e1df8a41
--- /dev/null
+++ b/data/Gootville/E52C.xml
@@ -0,0 +1 @@
+<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 161c0 5 2 15 13 38s48 73 94 73s60 -42 60 -42s29 42 60 42c46 0 60 -42 60 -42s29 42 60 42c38 0 64 -30 64 -66c0 -15 -23 -80 -23 -80s-25 -74 -25 -93c0 -8 2 -15 10 -15c25 0 54 35 62 58s12 26 17 26s8 -3 8 -8c0 -45 -56 -114 -110 -114c-30 0 -58 26 -58 63 c0 19 25 93 25 93s23 65 23 80c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20 c-30 0 -54 -41 -61 -62s-10 -21 -15 -21s-8 3 -8 8zM322 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96 c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM533 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52D.xml b/data/Gootville/E52D.xml
new file mode 100644
index 00000000000..212fc84895d
--- /dev/null
+++ b/data/Gootville/E52D.xml
@@ -0,0 +1 @@
+<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-41 161c0 5 2 15 13 38s48 73 94 73s60 -42 60 -42s29 42 60 42c46 0 60 -42 60 -42s29 42 60 42c38 0 64 -30 64 -66c0 -15 -23 -80 -23 -80s-25 -74 -25 -93c0 -8 2 -15 10 -15c25 0 54 35 62 58s12 26 17 26s8 -3 8 -8c0 -45 -56 -114 -110 -114c-30 0 -58 26 -58 63 c0 19 25 93 25 93s23 65 23 80c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20c-21 0 -34 -48 -34 -48l-58 -184c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 59 183 59 210c0 9 -7 20 -16 20 c-30 0 -54 -41 -61 -62s-10 -21 -15 -21s-8 3 -8 8zM250 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50 c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52E.xml b/data/Gootville/E52E.xml
new file mode 100644
index 00000000000..8c524b9e5aa
--- /dev/null
+++ b/data/Gootville/E52E.xml
@@ -0,0 +1 @@
+<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-72 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47 c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM139 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM202 -77c0 28 22 50 50 50s50 -22 50 -50 c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69 c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E52F.xml b/data/Gootville/E52F.xml
new file mode 100644
index 00000000000..5ed701ab470
--- /dev/null
+++ b/data/Gootville/E52F.xml
@@ -0,0 +1 @@
+<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E530.xml b/data/Gootville/E530.xml
new file mode 100644
index 00000000000..b9e6179c8b8
--- /dev/null
+++ b/data/Gootville/E530.xml
@@ -0,0 +1 @@
+<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM410 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E531.xml b/data/Gootville/E531.xml
new file mode 100644
index 00000000000..4416b6a4a31
--- /dev/null
+++ b/data/Gootville/E531.xml
@@ -0,0 +1 @@
+<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM410 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM687 -77c0 28 22 50 50 50s50 -22 50 -50 c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69 c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E532.xml b/data/Gootville/E532.xml
new file mode 100644
index 00000000000..e1ca7e2450c
--- /dev/null
+++ b/data/Gootville/E532.xml
@@ -0,0 +1 @@
+<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM410 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM687 -77c0 28 22 50 50 50s50 -22 50 -50 c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69 c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM964 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50 c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E533.xml b/data/Gootville/E533.xml
new file mode 100644
index 00000000000..1567edef9f5
--- /dev/null
+++ b/data/Gootville/E533.xml
@@ -0,0 +1 @@
+<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM133 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM410 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM687 -77c0 28 22 50 50 50s50 -22 50 -50 c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69 c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM964 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50 c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM1241 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69 c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E534.xml b/data/Gootville/E534.xml
new file mode 100644
index 00000000000..831d35f024f
--- /dev/null
+++ b/data/Gootville/E534.xml
@@ -0,0 +1 @@
+<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM205 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43 c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM416 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44 c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E535.xml b/data/Gootville/E535.xml
new file mode 100644
index 00000000000..17b6dc9a95c
--- /dev/null
+++ b/data/Gootville/E535.xml
@@ -0,0 +1 @@
+<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-144 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19 s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM253 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2 c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E536.xml b/data/Gootville/E536.xml
new file mode 100644
index 00000000000..3c23cf076e2
--- /dev/null
+++ b/data/Gootville/E536.xml
@@ -0,0 +1 @@
+<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E537.xml b/data/Gootville/E537.xml
new file mode 100644
index 00000000000..1f6901fce9b
--- /dev/null
+++ b/data/Gootville/E537.xml
@@ -0,0 +1 @@
+<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM431 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23 c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13 s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM642 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E538.xml b/data/Gootville/E538.xml
new file mode 100644
index 00000000000..fe7d7af14ac
--- /dev/null
+++ b/data/Gootville/E538.xml
@@ -0,0 +1 @@
+<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM431 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23 c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13 s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM642 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35zM777 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8 s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM988 61c0 -21 15 -34 33 -34 c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E539.xml b/data/Gootville/E539.xml
new file mode 100644
index 00000000000..eefbaddfe0d
--- /dev/null
+++ b/data/Gootville/E539.xml
@@ -0,0 +1 @@
+<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM479 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19 c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14 c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E53A.xml b/data/Gootville/E53A.xml
new file mode 100644
index 00000000000..d481aa5eabc
--- /dev/null
+++ b/data/Gootville/E53A.xml
@@ -0,0 +1 @@
+<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM479 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19 c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14 c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13zM721 -167c0 8 7 13 31 13c22 0 28 19 28 19l102 338s5 17 5 23c0 7 -3 11 -11 11c-22 0 -47 -37 -57 -59s-13 -24 -18 -24s-8 3 -8 8s1 10 13 35s41 75 99 75s66 -47 66 -47s33 43 88 43c43 0 80 -40 80 -96 c0 -104 -63 -192 -146 -192c-37 0 -60 17 -71 47c0 -1 -50 -166 -50 -166s-1 -3 -1 -5c0 -4 5 -10 23 -10c24 0 31 -5 31 -13s-7 -13 -31 -13h-142c-24 0 -31 5 -31 13zM932 61c0 -21 15 -34 33 -34c71 0 98 90 98 151c0 23 -12 44 -32 44c-15 0 -36 -1 -61 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E53B.xml b/data/Gootville/E53B.xml
new file mode 100644
index 00000000000..ff8addeb9cb
--- /dev/null
+++ b/data/Gootville/E53B.xml
@@ -0,0 +1 @@
+<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 40c0 19 16 35 35 35s35 -16 35 -35c0 -7 -2 -14 -6 -20c2 -2 12 -9 33 -9c25 0 41 19 41 36c0 19 -20 33 -40 44c-42 24 -66 61 -66 95c0 52 54 86 103 86c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7 c-26 0 -36 -19 -36 -32c0 -24 17 -34 38 -46c38 -21 69 -56 69 -93c0 -56 -61 -88 -109 -88c-38 0 -97 24 -97 62zM82 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178 c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM359 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38 c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381 c-38 0 -72 28 -72 70zM756 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34 c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14c-13 0 -26 -2 -33 -9s-11 -10 -18 -10s-13 6 -13 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E53C.xml b/data/Gootville/E53C.xml
new file mode 100644
index 00000000000..98dc6fd66fd
--- /dev/null
+++ b/data/Gootville/E53C.xml
@@ -0,0 +1 @@
+<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-17 218c0 5 3 12 16 25s33 27 71 27s51 -30 51 -30s33 32 81 32c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7c-38 0 -59 -19 -72 -42s-59 -191 -59 -191c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 60 170 60 212 c0 13 -7 21 -19 21c-15 0 -25 -5 -33 -15s-12 -14 -17 -14s-8 3 -8 8zM149 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E53D.xml b/data/Gootville/E53D.xml
new file mode 100644
index 00000000000..ded5e610873
--- /dev/null
+++ b/data/Gootville/E53D.xml
@@ -0,0 +1 @@
+<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-17 218c0 5 3 12 16 25s33 27 71 27s51 -30 51 -30s33 32 81 32c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7c-38 0 -59 -19 -72 -42s-59 -191 -59 -191c0 -3 -14 -5 -32 -5s-39 2 -39 7c0 0 60 170 60 212 c0 13 -7 21 -19 21c-15 0 -25 -5 -33 -15s-12 -14 -17 -14s-8 3 -8 8zM149 -77c0 28 22 50 50 50s50 -22 50 -50c0 -15 -7 -29 -17 -38c77 11 112 197 140 349h-59s-20 0 -20 19s20 19 20 19h69c36 97 108 178 196 178c47 0 101 -22 101 -67c0 -28 -22 -50 -50 -50 s-50 22 -50 50c0 13 5 25 13 34c-48 0 -86 -65 -101 -145h59s20 0 20 -19s-20 -19 -20 -19h-69c-27 -137 -88 -381 -260 -381c-38 0 -72 28 -72 70zM546 21c0 7 8 14 30 30c5 4 173 146 173 146h-117c-15 0 -22 -6 -35 -19c-4 -4 -8 -5 -12 -5s-15 0 -15 8l36 82s5 9 9 9 h237c7 0 8 -3 8 -8c0 -3 -1 -8 -4 -11l-192 -161s7 2 12 2c18 0 33 -8 45 -17c15 -13 27 -18 49 -18c-16 3 -28 17 -28 34c0 19 16 35 35 35s35 -16 35 -35c0 -49 -58 -93 -109 -93c-20 0 -33 6 -45 13c-15 9 -32 14 -48 14c-13 0 -26 -2 -33 -9s-11 -10 -18 -10 s-13 6 -13 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E566.xml b/data/Gootville/E566.xml
new file mode 100644
index 00000000000..603f200704a
--- /dev/null
+++ b/data/Gootville/E566.xml
@@ -0,0 +1 @@
+<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 222c0 16 24 19 36 19c20 0 85 2 85 2l21 68c14 45 87 56 90 56s6 -2 6 -5c0 -7 -34 -111 -34 -111s99 19 131 19c24 0 24 -30 24 -30s33 32 81 32c44 0 91 -25 91 -60c0 -19 -16 -35 -35 -35s-35 16 -35 35c0 7 2 13 5 18c-1 1 -11 7 -26 7c-38 0 -59 -19 -72 -42 s-59 -191 -59 -191c0 -3 -14 -5 -32 -5s-39 2 -39 7l9 33s-70 -48 -125 -48c-37 0 -49 27 -49 62c0 54 39 163 39 163s-43 -6 -82 -6c-15 0 -30 0 -30 12zM149 54c0 -15 5 -26 16 -26c51 0 95 55 95 55s42 118 42 140c0 6 -7 10 -15 10c-31 0 -91 -9 -91 -9 s-47 -133 -47 -170z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E567.xml b/data/Gootville/E567.xml
new file mode 100644
index 00000000000..78e5c88d4c2
--- /dev/null
+++ b/data/Gootville/E567.xml
@@ -0,0 +1 @@
+<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 74 56 141 125 141c88 0 165 -56 217 -108s117 -99 186 -99c44 0 61 33 61 66s-28 59 -61 59c-12 0 -24 -4 -38 -11c-8 -4 -17 -6 -25 -6c-24 0 -44 21 -44 45c0 37 36 54 74 54c70 0 125 -67 125 -141s-56 -141 -125 -141c-88 0 -165 56 -217 108s-117 99 -186 99 c-44 0 -61 -33 -61 -66s28 -59 61 -59c12 0 24 4 38 11c8 4 17 6 25 6c24 0 44 -21 44 -45c0 -37 -36 -54 -74 -54c-70 0 -125 67 -125 141z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E568.xml b/data/Gootville/E568.xml
new file mode 100644
index 00000000000..d01be9c0e09
--- /dev/null
+++ b/data/Gootville/E568.xml
@@ -0,0 +1 @@
+<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 74 55 141 125 141c38 0 74 -17 74 -54c0 -24 -20 -45 -44 -45c-8 0 -17 2 -25 6c-14 7 -26 11 -38 11c-33 0 -61 -26 -61 -59s17 -66 61 -66c69 0 134 47 186 99s129 108 217 108c69 0 125 -67 125 -141s-55 -141 -125 -141c-38 0 -74 17 -74 54c0 24 20 45 44 45 c8 0 17 -2 25 -6c14 -7 26 -11 38 -11c33 0 61 26 61 59s-17 66 -61 66c-69 0 -134 -47 -186 -99s-129 -108 -217 -108c-69 0 -125 67 -125 141z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E569.xml b/data/Gootville/E569.xml
new file mode 100644
index 00000000000..184917285a4
--- /dev/null
+++ b/data/Gootville/E569.xml
@@ -0,0 +1 @@
+<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 74 56 141 125 141c64 0 123 -30 170 -66v111s0 14 15 14s15 -14 15 -14v-137c6 -5 12 -11 17 -16c52 -52 117 -99 186 -99c44 0 61 33 61 66s-28 59 -61 59c-12 0 -24 -4 -38 -11c-8 -4 -17 -6 -25 -6c-24 0 -44 21 -44 45c0 37 36 54 74 54 c70 0 125 -67 125 -141s-56 -141 -125 -141c-64 0 -123 30 -170 66v-111s0 -14 -15 -14s-15 14 -15 14v137c-6 5 -12 11 -17 16c-52 52 -117 99 -186 99c-44 0 -61 -33 -61 -66s28 -59 61 -59c12 0 24 4 38 11c8 4 17 6 25 6c24 0 44 -21 44 -45c0 -37 -36 -54 -74 -54 c-70 0 -125 67 -125 141z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E56C.xml b/data/Gootville/E56C.xml
new file mode 100644
index 00000000000..e7ca005c45f
--- /dev/null
+++ b/data/Gootville/E56C.xml
@@ -0,0 +1 @@
+<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l105 124s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-105 -124s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53 c-5 -6 -10 -11 -17 -11s-15 5 -15 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E56D.xml b/data/Gootville/E56D.xml
new file mode 100644
index 00000000000..b613b750868
--- /dev/null
+++ b/data/Gootville/E56D.xml
@@ -0,0 +1 @@
+<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l5 6v180s0 14 15 14s15 -14 15 -14v-145l70 83s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-5 -6v-180s0 -14 -15 -14 s-15 14 -15 14v145l-70 -83s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E56E.xml b/data/Gootville/E56E.xml
new file mode 100644
index 00000000000..d408a42a35d
--- /dev/null
+++ b/data/Gootville/E56E.xml
@@ -0,0 +1 @@
+<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l105 124s3 4 8 4s8 -4 8 -4l125 -124l105 124s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-105 -124s-3 -4 -8 -4s-8 4 -8 4 l-125 124l-105 -124s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E59D.xml b/data/Gootville/E59D.xml
new file mode 100644
index 00000000000..65e5ba150b7
--- /dev/null
+++ b/data/Gootville/E59D.xml
@@ -0,0 +1 @@
+<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-77 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E59E.xml b/data/Gootville/E59E.xml
new file mode 100644
index 00000000000..36df459c5d6
--- /dev/null
+++ b/data/Gootville/E59E.xml
@@ -0,0 +1 @@
+<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-77 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l45 53c5 6 10 11 17 11s15 -5 15 -14c0 -6 -2 -9 -7 -15l-135 -159s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E5B0.xml b/data/Gootville/E5B0.xml
new file mode 100644
index 00000000000..956ed913eaa
--- /dev/null
+++ b/data/Gootville/E5B0.xml
@@ -0,0 +1 @@
+<symbol id="E5B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -50c0 6 2 9 7 15l135 159s3 4 8 4s8 -4 8 -4l125 -124l105 124s3 4 8 4s8 -4 8 -4l125 -124c10 14 53 88 77 130s66 112 194 112c0 0 14 0 14 -15s-14 -15 -14 -15c-116 0 -148 -60 -188 -136s-91 -142 -148 -200c0 0 -3 -4 -8 -4s-8 4 -8 4l-125 124l-105 -124 s-3 -4 -8 -4s-8 4 -8 4l-125 124l-45 -53c-5 -6 -10 -11 -17 -11s-15 5 -15 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E5E5.xml b/data/Gootville/E5E5.xml
new file mode 100644
index 00000000000..7b21095c006
--- /dev/null
+++ b/data/Gootville/E5E5.xml
@@ -0,0 +1 @@
+<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -12c0 0 -11 0 -11 12s11 12 11 12h102v102s0 11 12 11s12 -11 12 -11v-102h102s11 0 11 -12s-11 -12 -11 -12h-102v-102s0 -11 -12 -11s-12 11 -12 11v102h-102z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E5E7.xml b/data/Gootville/E5E7.xml
new file mode 100644
index 00000000000..f71d555a08d
--- /dev/null
+++ b/data/Gootville/E5E7.xml
@@ -0,0 +1 @@
+<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 69 56 125 125 125s125 -56 125 -125s-56 -125 -125 -125s-125 56 -125 125zM24 0c0 -56 45 -101 101 -101s101 45 101 101s-45 101 -101 101s-101 -45 -101 -101z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E610.xml b/data/Gootville/E610.xml
new file mode 100644
index 00000000000..2196d0319dd
--- /dev/null
+++ b/data/Gootville/E610.xml
@@ -0,0 +1 @@
+<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 14v327c0 6 6 11 12 11h312c6 0 12 -5 12 -11v-327s0 -14 -15 -14s-15 14 -15 14v176h-276v-176s0 -14 -15 -14s-15 14 -15 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E611.xml b/data/Gootville/E611.xml
new file mode 100644
index 00000000000..467a379c20d
--- /dev/null
+++ b/data/Gootville/E611.xml
@@ -0,0 +1 @@
+<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 11v327s0 14 15 14s15 -14 15 -14v-176h276v176s0 14 15 14s15 -14 15 -14v-327c0 -6 -6 -11 -12 -11h-312c-6 0 -12 5 -12 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E612.xml b/data/Gootville/E612.xml
new file mode 100644
index 00000000000..44ffa3a7b1b
--- /dev/null
+++ b/data/Gootville/E612.xml
@@ -0,0 +1 @@
+<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 406c0 3 2 6 10 6h51c7 0 10 -11 10 -11l79 -266l78 266s3 11 10 11h8c4 0 6 -1 6 -3s-2 -8 -2 -8l-115 -391s-1 -10 -9 -10s-9 10 -9 10l-116 391s-1 3 -1 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E613.xml b/data/Gootville/E613.xml
new file mode 100644
index 00000000000..db4dc1a7be5
--- /dev/null
+++ b/data/Gootville/E613.xml
@@ -0,0 +1 @@
+<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 6c0 2 1 5 1 5l116 391s1 10 9 10s9 -10 9 -10l115 -391s2 -6 2 -8s-2 -3 -6 -3h-8c-7 0 -10 11 -10 11l-78 266l-79 -266s-3 -11 -10 -11h-51c-8 0 -10 3 -10 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E630.xml b/data/Gootville/E630.xml
new file mode 100644
index 00000000000..23a56972412
--- /dev/null
+++ b/data/Gootville/E630.xml
@@ -0,0 +1 @@
+<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 203c0 61 49 110 110 110s110 -49 110 -110c0 -56 -41 -102 -95 -109v-80s0 -14 -15 -14s-15 14 -15 14v80c-54 7 -95 53 -95 109zM30 203c0 -39 28 -72 65 -79v80s0 14 15 14s15 -14 15 -14v-80c37 7 65 40 65 79c0 44 -36 80 -80 80s-80 -36 -80 -80z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E631.xml b/data/Gootville/E631.xml
new file mode 100644
index 00000000000..515dde09c17
--- /dev/null
+++ b/data/Gootville/E631.xml
@@ -0,0 +1 @@
+<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 110c0 56 41 102 95 109v80s0 14 15 14s15 -14 15 -14v-80c54 -7 95 -53 95 -109c0 -61 -49 -110 -110 -110s-110 49 -110 110zM30 110c0 -44 36 -80 80 -80s80 36 80 80c0 39 -28 72 -65 79v-80s0 -14 -15 -14s-15 14 -15 14v80c-37 -7 -65 -40 -65 -79z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E650.xml b/data/Gootville/E650.xml
new file mode 100644
index 00000000000..1c05bdba0fe
--- /dev/null
+++ b/data/Gootville/E650.xml
@@ -0,0 +1 @@
+<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 307c0 108 113 193 231 193c98 0 173 -66 173 -141c0 -47 -33 -73 -68 -73c-33 0 -69 28 -69 73c0 8 3 13 10 13c6 0 10 -6 15 -16s15 -13 27 -13c23 0 42 15 42 39c0 55 -59 95 -122 95c-21 -38 -40 -74 -40 -98c0 -23 12 -41 34 -63s34 -38 34 -68 c0 -48 -31 -98 -60 -137c0 0 18 1 28 1c38 0 78 -13 107 -42l29 24s-3 18 -3 36c0 61 44 145 108 145c34 0 56 -27 56 -57c0 -16 -2 -31 -18 -44l-83 -68s10 -53 56 -53c25 0 52 9 70 35c-3 11 -4 22 -4 34c0 64 40 127 108 161c-48 61 -119 103 -202 123c0 0 -17 3 -17 14 c0 8 4 12 13 12c4 0 40 -4 109 -29s218 -119 218 -264c0 -75 -46 -139 -118 -139c-43 0 -77 22 -96 58c-26 -33 -71 -58 -107 -58c-40 0 -69 25 -83 63l-45 -37c-22 -18 -39 -26 -47 -26c-7 0 -8 0 -17 21s-37 55 -71 55c-8 0 -19 -2 -19 -2c-22 -29 -57 -74 -70 -74 c-7 0 -12 5 -12 12c0 36 44 73 74 88c36 46 51 77 51 101c0 15 -4 22 -28 43s-39 49 -39 85s23 89 56 148c-85 0 -170 -72 -170 -146c0 -26 8 -39 29 -39s43 19 43 46c0 10 4 14 11 14s12 -4 12 -19c0 -52 -27 -101 -78 -101c-39 0 -58 34 -58 75zM420 160 c0 -10 2 -24 2 -24l50 41c14 11 16 14 16 24c0 17 -12 35 -32 35c-27 0 -36 -43 -36 -76zM606 122c0 -43 23 -98 53 -98s55 69 55 115s-12 83 -35 118c-46 -23 -73 -86 -73 -135z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E651.xml b/data/Gootville/E651.xml
new file mode 100644
index 00000000000..1ed81aae9ff
--- /dev/null
+++ b/data/Gootville/E651.xml
@@ -0,0 +1 @@
+<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 307c0 108 113 193 231 193c98 0 173 -66 173 -141c0 -47 -33 -73 -68 -73c-33 0 -69 28 -69 73c0 8 3 13 10 13c6 0 10 -6 15 -16s15 -13 27 -13c23 0 42 15 42 39c0 55 -59 95 -122 95c-21 -38 -40 -74 -40 -98c0 -23 12 -41 34 -63s34 -38 34 -68 c0 -48 -31 -98 -60 -137c0 0 18 1 28 1c38 0 78 -13 107 -42l29 24s10 9 20 9c7 0 10 -4 10 -10c0 -13 -23 -30 -23 -30l-45 -37c-22 -18 -39 -26 -47 -26c-7 0 -8 0 -17 21s-37 55 -71 55c-8 0 -19 -2 -19 -2c-22 -29 -57 -74 -70 -74c-7 0 -12 5 -12 12c0 36 44 73 74 88 c36 46 51 77 51 101c0 15 -4 22 -28 43s-39 49 -39 85s23 89 56 148c-85 0 -170 -72 -170 -146c0 -26 8 -39 29 -39s43 19 43 46c0 10 4 14 11 14s12 -4 12 -19c0 -52 -27 -101 -78 -101c-39 0 -58 34 -58 75z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/E655.xml b/data/Gootville/E655.xml
new file mode 100644
index 00000000000..39b0948ab2d
--- /dev/null
+++ b/data/Gootville/E655.xml
@@ -0,0 +1 @@
+<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 283c0 30 23 46 46 46c12 0 25 -6 35 -16c10 -12 22 -19 31 -19c18 0 33 15 33 31c0 24 -17 33 -44 33c-34 0 -53 18 -53 46c0 26 21 46 47 46c30 0 45 -24 45 -51s9 -44 33 -44c16 0 31 15 31 33c0 9 -7 21 -19 31c-10 10 -16 23 -16 35c0 23 16 46 46 46 s46 -23 46 -46c0 -12 -6 -25 -16 -35c-12 -10 -19 -22 -19 -31c0 -18 15 -33 31 -33c24 0 33 17 33 44s15 51 45 51c26 0 47 -20 47 -46c0 -28 -19 -46 -53 -46c-27 0 -44 -9 -44 -33c0 -16 15 -31 33 -31c9 0 21 7 31 19c10 10 23 16 35 16c23 0 46 -16 46 -46 s-23 -46 -46 -46c-12 0 -25 6 -35 16c-10 12 -22 19 -31 19c-18 0 -33 -15 -33 -31c0 -24 17 -33 44 -33c34 0 53 -18 53 -46c0 -26 -21 -46 -47 -46c-30 0 -45 24 -45 51s-9 44 -33 44c-16 0 -31 -15 -31 -33c0 -9 7 -21 19 -31c10 -10 16 -23 16 -35 c0 -23 -16 -46 -46 -46s-46 23 -46 46c0 12 6 25 16 35c12 10 19 22 19 31c0 18 -15 33 -31 33c-24 0 -33 -17 -33 -44s-15 -51 -45 -51c-26 0 -47 20 -47 46c0 28 19 46 53 46c27 0 44 9 44 33c0 16 -15 31 -33 31c-9 0 -21 -7 -31 -19c-10 -10 -23 -16 -35 -16 c-23 0 -46 16 -46 46zM167 283c0 -26 22 -48 48 -48s48 22 48 48s-22 48 -48 48s-48 -22 -48 -48z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAA4.xml b/data/Gootville/EAA4.xml
new file mode 100644
index 00000000000..587642a89f9
--- /dev/null
+++ b/data/Gootville/EAA4.xml
@@ -0,0 +1 @@
+<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-12 212c0 4 2 7 20 25s39 35 68 35c36 0 67 -38 67 -38s31 -38 59 -38c17 0 25 3 34 11s13 11 16 11s6 -2 6 -6s-2 -7 -20 -25s-39 -35 -68 -35c-36 0 -67 38 -67 38s-31 38 -59 38c-17 0 -25 -3 -34 -11s-13 -11 -16 -11s-6 2 -6 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAA9.xml b/data/Gootville/EAA9.xml
new file mode 100644
index 00000000000..3065aac02a0
--- /dev/null
+++ b/data/Gootville/EAA9.xml
@@ -0,0 +1 @@
+<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 114c0 4 2 7 20 25s39 35 68 35c36 0 67 -38 67 -38s31 -38 59 -38c17 0 25 3 34 11s13 11 16 11s6 -2 6 -6s-2 -7 -20 -25s-39 -35 -68 -35c-36 0 -67 38 -67 38s-31 38 -59 38c-17 0 -25 -3 -34 -11s-13 -11 -16 -11s-6 2 -6 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAAA.xml b/data/Gootville/EAAA.xml
new file mode 100644
index 00000000000..90e2e61bbc0
--- /dev/null
+++ b/data/Gootville/EAAA.xml
@@ -0,0 +1 @@
+<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 114c0 4 3 6 6 6s7 -3 16 -11s17 -11 34 -11c28 0 59 38 59 38s31 38 67 38c29 0 50 -17 68 -35s20 -21 20 -25s-3 -6 -6 -6s-7 3 -16 11s-17 11 -34 11c-28 0 -59 -38 -59 -38s-31 -38 -67 -38c-29 0 -50 17 -68 35s-20 21 -20 25z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAAD.xml b/data/Gootville/EAAD.xml
new file mode 100644
index 00000000000..6f4e8397b32
--- /dev/null
+++ b/data/Gootville/EAAD.xml
@@ -0,0 +1 @@
+<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-26 19c0 5 1 9 4 13c16 21 22 51 22 82s-6 61 -22 82c-3 4 -4 8 -4 13c0 10 6 19 18 19c9 0 16 -4 16 -4c45 -26 135 -69 185 -81s57 -15 57 -29s-7 -17 -57 -29s-140 -55 -185 -81c0 0 -7 -4 -16 -4c-12 0 -18 9 -18 19z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAAE.xml b/data/Gootville/EAAE.xml
new file mode 100644
index 00000000000..7960934c408
--- /dev/null
+++ b/data/Gootville/EAAE.xml
@@ -0,0 +1 @@
+<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-26 19c0 5 1 9 4 13c16 21 22 51 22 82s-6 61 -22 82c-3 4 -4 8 -4 13c0 10 6 19 18 19c9 0 16 -4 16 -4c45 -26 135 -69 185 -81s57 -15 57 -29s-7 -17 -57 -29s-140 -55 -185 -81c0 0 -7 -4 -16 -4c-12 0 -18 9 -18 19z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville/EAAF.xml b/data/Gootville/EAAF.xml
new file mode 100644
index 00000000000..68b65585961
--- /dev/null
+++ b/data/Gootville/EAAF.xml
@@ -0,0 +1 @@
+<symbol id="EAAF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-12 60c0 4 2 7 20 25s39 35 68 35c36 0 67 -38 67 -38s31 -38 59 -38c17 0 25 3 34 11s13 11 16 11s6 -2 6 -6s-2 -7 -20 -25s-39 -35 -68 -35c-36 0 -67 38 -67 38s-31 38 -59 38c-17 0 -25 -3 -34 -11s-13 -11 -16 -11s-6 2 -6 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig.xml b/data/Leipzig.xml
new file mode 100644
index 00000000000..1e5728b9500
--- /dev/null
+++ b/data/Leipzig.xml
@@ -0,0 +1,520 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bounding-boxes font-family="Leipzig" units-per-em="1000">
+  <g c="E0A3" x="0.0" y="-132.0" w="314.0" h="270.0" h-a-x="314" n="noteheadHalf"/>
+  <g c="E080" x="20.0" y="-250.0" w="414.0" h="501.0" h-a-x="454" n="timeSig0"/>
+  <g c="E081" x="20.0" y="-250.0" w="296.0" h="500.0" h-a-x="336" n="timeSig1"/>
+  <g c="E082" x="20.0" y="-251.0" w="402.0" h="502.0" h-a-x="442" n="timeSig2"/>
+  <g c="E083" x="20.0" y="-252.0" w="372.0" h="502.0" h-a-x="412" n="timeSig3"/>
+  <g c="E084" x="20.0" y="-250.0" w="387.0" h="501.0" h-a-x="427" n="timeSig4"/>
+  <g c="E085" x="20.0" y="-250.0" w="357.0" h="500.0" h-a-x="397" n="timeSig5"/>
+  <g c="E086" x="20.0" y="-250.0" w="382.0" h="500.0" h-a-x="422" n="timeSig6"/>
+  <g c="E087" x="20.0" y="-250.0" w="404.0" h="501.0" h-a-x="444" n="timeSig7"/>
+  <g c="E088" x="10.0" y="-250.0" w="374.0" h="499.25" h-a-x="404" n="timeSig8"/>
+  <g c="E089" x="20.0" y="-250.0" w="385.0" h="500.0" h-a-x="425" n="timeSig9"/>
+  <g c="E0A2" x="0.0" y="-133.0" w="405.0" h="266.0" h-a-x="405" n="noteheadWhole">
+    <a n="cutOutNW" x="0.06" y="0.24"/>
+    <a n="cutOutSE" x="1.57" y="-0.23"/>
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.62" y="0.0"/>
+  </g>
+  <g c="E0A4" x="0.0" y="-133.0" w="314.0" h="266.0" h-a-x="314" n="noteheadBlack"/>
+  <g c="E05C" x="0.0" y="-502.0" w="606.0" h="1004.0" h-a-x="656" n="cClef"/>
+  <g c="E05D" x="0.0" y="-735.0" w="606.0" h="1237.0" h-a-x="616" n="cClef8vb"/>
+  <g c="E051" x="-1.0" y="-893.0" w="647.0" h="1976.0" h-a-x="650" n="gClef15mb"/>
+  <g c="E050" x="-1.0" y="-655.0" w="647.0" h="1738.0" h-a-x="646" n="gClef"/>
+  <g c="E052" x="-1.0" y="-890.0" w="647.0" h="1973.0" h-a-x="646" n="gClef8vb"/>
+  <g c="E053" x="-1.0" y="-655.0" w="647.0" h="1972.0" h-a-x="646" n="gClef8va"/>
+  <g c="E054" x="-1.0" y="-655.0" w="651.0" h="1968.0" h-a-x="646" n="gClef15ma"/>
+  <g c="E062" x="4.0" y="-581.0" w="694.0" h="832.0" h-a-x="698" n="fClef"/>
+  <g c="E063" x="4.0" y="-755.0" w="694.0" h="1006.0" h-a-x="698" n="fClef15mb"/>
+  <g c="E064" x="4.0" y="-750.0" w="694.0" h="1001.0" h-a-x="698" n="fClef8vb"/>
+  <g c="E065" x="4.0" y="-581.0" w="694.0" h="1048.0" h-a-x="698" n="fClef8va"/>
+  <g c="E066" x="4.0" y="-581.0" w="694.0" h="1066.0" h-a-x="698" n="fClef15ma"/>
+  <g c="E262" x="0.0" y="-339.0" w="197.0" h="694.0" h-a-x="197" n="accidentalSharp"/>
+  <g c="E261" x="0.0" y="-351.0" w="157.0" h="702.0" h-a-x="157" n="accidentalNatural"/>
+  <g c="E260" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="200" n="accidentalFlat"/>
+  <g c="E264" x="0.0" y="-175.0" w="388.0" h="644.0" h-a-x="388" n="accidentalDoubleFlat"/>
+  <g c="E266" x="0.0" y="-175.0" w="578.0" h="644.0" h-a-x="578" n="accidentalTripleFlat">
+    <a n="cutOutNE" x="1.62" y="0.57"/>
+    <a n="cutOutSE" x="1.97" y="-0.31"/>
+  </g>
+  <g c="E267" x="0.0" y="-351.0" w="378.0" h="820.0" h-a-x="378" n="accidentalNaturalFlat">
+    <a n="cutOutNE" x="0.82" y="0.56"/>
+    <a n="cutOutSE" x="1.17" y="-0.32"/>
+    <a n="cutOutSW" x="0.54" y="-0.78"/>
+  </g>
+  <g c="E263" x="0.0" y="-120.0" w="257.0" h="240.0" h-a-x="258" n="accidentalDoubleSharp"/>
+  <g c="E265" x="0.0" y="-339.0" w="475.0" h="694.0" h-a-x="475" n="accidentalTripleSharp">
+    <a n="cutOutNE" x="1.74" y="0.84"/>
+    <a n="cutOutNW" x="1.1" y="0.5"/>
+    <a n="cutOutSE" x="1.74" y="-0.64"/>
+    <a n="cutOutSW" x="1.1" y="-0.5"/>
+  </g>
+  <g c="E268" x="0.0" y="-351.0" w="377.0" h="706.0" h-a-x="377" n="accidentalNaturalSharp">
+    <a n="cutOutNE" x="1.35" y="0.84"/>
+    <a n="cutOutSE" x="1.35" y="-0.65"/>
+    <a n="cutOutSW" x="0.54" y="-0.77"/>
+  </g>
+  <g c="E269" x="0.0" y="-339.0" w="412.0" h="694.0" h-a-x="412" n="accidentalSharpSharp">
+    <a n="cutOutNE" x="1.48" y="0.83"/>
+    <a n="cutOutNW" x="0.16" y="0.66"/>
+    <a n="cutOutSE" x="1.48" y="-0.64"/>
+    <a n="cutOutSW" x="0.16" y="-0.82"/>
+  </g>
+  <g c="E26A" x="0.0" y="-250.0" w="163.0" h="500.0" h-a-x="163" n="accidentalParensLeft"/>
+  <g c="E26B" x="0.0" y="-250.0" w="163.0" h="500.0" h-a-x="163" n="accidentalParensRight"/>
+  <g c="E4C0" x="0.0" y="-3.0" w="605.0" h="323.0" h-a-x="605" n="fermataAbove"/>
+  <g c="E4C1" x="0.0" y="-320.0" w="605.0" h="323.0" h-a-x="605" n="fermataBelow"/>
+  <g c="E0FA" x="0.0" y="-133.0" w="405.0" h="266.0" h-a-x="405" n="noteheadWholeFilled">
+    <a n="cutOutNW" x="0.2" y="0.4"/>
+    <a n="cutOutSE" x="1.42" y="-0.4"/>
+  </g>
+  <g c="E240" x="0.0" y="-694.0" w="276.0" h="694.0" h-a-x="277" n="flag8thUp"/>
+  <g c="E241" x="0.0" y="0.0" w="276.0" h="694.0" h-a-x="277" n="flag8thDown"/>
+  <g c="E08B" x="0.0" y="-319.0" w="417.0" h="637.0" h-a-x="417" n="timeSigCutCommon"/>
+  <g c="E08A" x="0.0" y="-249.0" w="414.0" h="500.0" h-a-x="422" n="timeSigCommon"/>
+  <g c="E4E5" x="0.0" y="-388.0" w="305.0" h="760.0" h-a-x="304" n="restQuarter"/>
+  <g c="E4E6" x="0.0" y="-250.0" w="276.0" h="433.0" h-a-x="277" n="rest8th"/>
+  <g c="E4E7" x="1.0" y="-492.0" w="324.0" h="666.0" h-a-x="324" n="rest16th"/>
+  <g c="E4E8" x="1.0" y="-485.0" w="398.0" h="898.0" h-a-x="404" n="rest32nd"/>
+  <g c="E4E9" x="2.0" y="-718.0" w="478.0" h="1131.0" h-a-x="480" n="rest64th"/>
+  <g c="E4EA" x="7.0" y="-734.0" w="572.0" h="1411.0" h-a-x="578" n="rest128th"/>
+  <g c="E880" x="0.0" y="0.0" w="243.0" h="326.0" h-a-x="243" n="tuplet0"/>
+  <g c="E881" x="0.0" y="0.0" w="207.0" h="311.0" h-a-x="207" n="tuplet1"/>
+  <g c="E882" x="0.0" y="-15.0" w="260.0" h="326.0" h-a-x="260" n="tuplet2"/>
+  <g c="E883" x="0.0" y="0.0" w="255.0" h="326.0" h-a-x="255" n="tuplet3"/>
+  <g c="E884" x="0.0" y="0.0" w="259.0" h="311.0" h-a-x="259" n="tuplet4"/>
+  <g c="E885" x="0.0" y="0.0" w="240.0" h="326.0" h-a-x="240" n="tuplet5"/>
+  <g c="E886" x="0.0" y="0.0" w="214.0" h="326.0" h-a-x="214" n="tuplet6"/>
+  <g c="E887" x="0.0" y="0.0" w="243.0" h="311.0" h-a-x="243" n="tuplet7"/>
+  <g c="E888" x="0.0" y="0.0" w="274.0" h="326.0" h-a-x="274" n="tuplet8"/>
+  <g c="E889" x="0.0" y="-1.0" w="225.0" h="327.0" h-a-x="225" n="tuplet9"/>
+  <g c="E566" x="0.0" y="0.0" w="432.0" h="364.0" h-a-x="432" n="ornamentTrill"/>
+  <g c="E56C" x="0.0" y="-2.0" w="605.0" h="242.0" h-a-x="605" n="ornamentShortTrill"/>
+  <g c="E56D" x="0.0" y="-90.0" w="586.0" h="399.0" h-a-x="587" n="ornamentMordent"/>
+  <g c="E004" x="0.0" y="-282.11" w="399.0" h="282.11" h-a-x="399" n="bracketBottom"/>
+  <g c="E003" x="0.0" y="0.0" w="399.0" h="282.11" h-a-x="399" n="bracketTop"/>
+  <g c="E88A" x="17.0" y="50.0" w="110.0" h="194.0" h-a-x="144" n="tupletColon"/>
+  <g c="E522" x="-143.0" y="-223.0" w="448.0" h="665.0" h-a-x="232" n="dynamicForte"/>
+  <g c="E521" x="-44.0" y="-18.0" w="472.0" h="280.0" h-a-x="405" n="dynamicMezzo"/>
+  <g c="E520" x="-49.0" y="-167.0" w="382.0" h="430.0" h-a-x="306" n="dynamicPiano"/>
+  <g c="E523" x="-20.0" y="0.0" w="245.0" h="259.0" h-a-x="225" n="dynamicRinforzando"/>
+  <g c="E524" x="0.0" y="0.0" w="194.0" h="270.0" h-a-x="194" n="dynamicSforzando"/>
+  <g c="E525" x="-36.0" y="-16.0" w="296.0" h="265.0" h-a-x="260" n="dynamicZ"/>
+  <g c="E650" x="0.0" y="0.0" w="695.0" h="514.0" h-a-x="695" n="keyboardPedalPed"/>
+  <g c="E655" x="0.0" y="0.0" w="431.0" h="418.0" h-a-x="431" n="keyboardPedalUp"/>
+  <g c="E046" x="0.0" y="-22.0" w="935.0" h="428.0" h-a-x="935" n="daCapo"/>
+  <g c="E045" x="0.0" y="-14.0" w="860.0" h="418.0" h-a-x="860" n="dalSegno"/>
+  <g c="E047" x="0.0" y="0.0" w="411.0" h="513.0" h-a-x="411" n="segno"/>
+  <g c="E048" x="0.0" y="-73.0" w="537.0" h="653.0" h-a-x="537" n="coda"/>
+  <g c="E04B" x="0.0" y="-34.0" w="450.0" h="1192.0" h-a-x="477" n="segnoSerpent2"/>
+  <g c="E500" x="0.0" y="-242.0" w="508.0" h="484.0" h-a-x="508" n="repeat1Bar"/>
+  <g c="E220" x="-163.0" y="-124.0" w="326.0" h="249.0" h-a-x="163" n="tremolo1"/>
+  <g c="E222" x="-162.0" y="-258.0" w="324.0" h="516.0" h-a-x="162" n="tremolo3"/>
+  <g c="E223" x="-162.0" y="-325.0" w="324.0" h="651.0" h-a-x="162" n="tremolo4"/>
+  <g c="E224" x="-162.0" y="-392.0" w="324.0" h="785.0" h-a-x="162" n="tremolo5"/>
+  <g c="E221" x="-163.0" y="-193.0" w="326.0" h="386.0" h-a-x="164" n="tremolo2"/>
+  <g c="E530" x="-144.0" y="-223.0" w="908.0" h="667.0" h-a-x="692" n="dynamicFFF"/>
+  <g c="E52F" x="-143.0" y="-223.0" w="698.0" h="665.0" h-a-x="479" n="dynamicFF"/>
+  <g c="E531" x="-144.0" y="-223.0" w="1140.0" h="667.0" h-a-x="925" n="dynamicFFFF"/>
+  <g c="E532" x="-144.0" y="-223.0" w="1374.0" h="667.0" h-a-x="1158" n="dynamicFFFFF"/>
+  <g c="E4A0" x="0.0" y="0.0" w="347.0" h="236.0" h-a-x="347" n="articAccentAbove"/>
+  <g c="E4A1" x="0.0" y="-236.0" w="347.0" h="236.0" h-a-x="347" n="articAccentBelow"/>
+  <g c="E4A8" x="0.0" y="0.0" w="153.0" h="224.0" h-a-x="153" n="articStaccatissimoWedgeAbove"/>
+  <g c="E4A9" x="0.0" y="-224.0" w="153.0" h="224.0" h-a-x="153" n="articStaccatissimoWedgeBelow"/>
+  <g c="E4AA" x="0.0" y="0.0" w="33.0" h="240.0" n="articStaccatissimoStrokeAbove"/>
+  <g c="E4AB" x="0.0" y="-240.0" w="33.0" h="240.0" h-a-x="34" n="articStaccatissimoStrokeBelow"/>
+  <g c="E568" x="0.0" y="0.0" w="468.0" h="244.0" h-a-x="468" n="ornamentTurnInverted"/>
+  <g c="E567" x="0.0" y="0.0" w="468.0" h="244.0" h-a-x="468" n="ornamentTurn"/>
+  <g c="E56E" x="0.0" y="-1.0" w="710.0" h="199.0" h-a-x="711" n="ornamentTremblement"/>
+  <g c="E56A" x="0.0" y="0.0" w="244.0" h="468.0" h-a-x="244" n="ornamentTurnUp"/>
+  <g c="E569" x="0.0" y="-81.0" w="468.0" h="400.0" h-a-x="468" n="ornamentTurnSlash"/>
+  <g c="E4AC" x="0.0" y="0.0" w="273.0" h="265.0" h-a-x="274" n="articMarcatoAbove"/>
+  <g c="E4AD" x="1.0" y="-265.0" w="273.0" h="265.0" h-a-x="274" n="articMarcatoBelow"/>
+  <g c="E56B" x="0.0" y="0.0" w="244.0" h="468.0" h-a-x="244" n="ornamentTurnUpS"/>
+  <g c="E938" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" n="mensuralNoteheadSemibrevisBlack"/>
+  <g c="E939" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" n="mensuralNoteheadSemibrevisVoid"/>
+  <g c="E93C" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" n="mensuralNoteheadMinimaWhite"/>
+  <g c="E93D" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" n="mensuralNoteheadSemiminimaWhite"/>
+  <g c="E101" x="0.0" y="-250.0" w="460.0" h="500.0" h-a-x="460" n="noteheadSlashHorizontalEnds"/>
+  <g c="E501" x="0.0" y="-242.0" w="750.0" h="484.0" h-a-x="751" n="repeat2Bars"/>
+  <g c="E502" x="0.0" y="-242.0" w="1234.0" h="484.0" h-a-x="1234" n="repeat4Bars"/>
+  <g c="E901" x="0.0" y="-147.0" w="268.0" h="991.0" h-a-x="268" n="mensuralGclefPetrucci"/>
+  <g c="E904" x="0.0" y="-883.0" w="597.0" h="1208.0" h-a-x="596" n="mensuralFclefPetrucci"/>
+  <g c="E909" x="1.0" y="-652.0" w="205.58" h="1306.0" h-a-x="204" n="mensuralCclefPetrucciPosMiddle"/>
+  <g c="E526" x="-39.0" y="-18.0" w="352.0" h="280.0" h-a-x="290" n="dynamicNiente"/>
+  <g c="E527" x="-49.0" y="-167.0" w="1882.0" h="430.0" h-a-x="1800" n="dynamicPPPPPP"/>
+  <g c="E52B" x="-49.0" y="-167.0" w="682.0" h="430.0" h-a-x="600" n="dynamicPP"/>
+  <g c="E52A" x="-49.0" y="-167.0" w="982.0" h="430.0" h-a-x="900" n="dynamicPPP"/>
+  <g c="E529" x="-49.0" y="-167.0" w="1282.0" h="430.0" h-a-x="1200" n="dynamicPPPP"/>
+  <g c="E528" x="-49.0" y="-167.0" w="1582.0" h="430.0" h-a-x="1500" n="dynamicPPPPP"/>
+  <g c="E533" x="-143.0" y="-223.0" w="1605.0" h="667.0" h-a-x="1390" n="dynamicFFFFFF"/>
+  <g c="E52C" x="-44.0" y="-167.0" w="782.0" h="430.0" h-a-x="711" n="dynamicMP"/>
+  <g c="E52D" x="-44.0" y="-223.0" w="754.0" h="665.0" h-a-x="637" n="dynamicMF"/>
+  <g c="E52E" x="-49.0" y="-223.0" w="687.0" h="665.0" h-a-x="306" n="dynamicPF"/>
+  <g c="E534" x="-143.0" y="-223.0" w="708.0" h="665.0" h-a-x="532" n="dynamicFortePiano"/>
+  <g c="E535" x="-143.0" y="-223.0" w="635.0" h="665.0" h-a-x="492" n="dynamicForzando"/>
+  <g c="E536" x="0.0" y="-223.0" w="499.0" h="665.0" h-a-x="428" n="dynamicSforzando1"/>
+  <g c="E537" x="0.0" y="-223.0" w="761.0" h="665.0" h-a-x="728" n="dynamicSforzandoPiano"/>
+  <g c="E538" x="0.0" y="-223.0" w="1061.0" h="665.0" h-a-x="1028" n="dynamicSforzandoPianissimo"/>
+  <g c="E53B" x="0.0" y="-223.0" w="920.0" h="665.0" h-a-x="920" n="dynamicSforzatoFF"/>
+  <g c="E539" x="0.0" y="-223.0" w="688.0" h="665.0" h-a-x="688" n="dynamicSforzato"/>
+  <g c="E53A" x="0.0" y="-223.0" w="1021.0" h="665.0" h-a-x="988" n="dynamicSforzatoPiano"/>
+  <g c="E53C" x="-20.0" y="-223.0" w="550.0" h="665.0" h-a-x="457" n="dynamicRinforzando1"/>
+  <g c="E53D" x="-20.0" y="-223.0" w="737.0" h="665.0" h-a-x="717" n="dynamicRinforzando2"/>
+  <g c="E510" x="0.0" y="1.0" w="266.0" h="331.0" h-a-x="266" n="ottava"/>
+  <g c="E514" x="3.0" y="-8.0" w="423.0" h="329.0" h-a-x="426" n="quindicesima"/>
+  <g c="E517" x="0.0" y="-15.0" w="504.0" h="326.0" h-a-x="504" n="ventiduesima"/>
+  <g c="E515" x="3.0" y="-8.0" w="923.0" h="335.0" h-a-x="926" n="quindicesimaAlta"/>
+  <g c="E516" x="3.0" y="-8.0" w="913.0" h="329.0" h-a-x="916" n="quindicesimaBassa"/>
+  <g c="E518" x="0.0" y="-15.0" w="1021.0" h="332.0" h-a-x="1021" n="ventiduesimaAlta"/>
+  <g c="E519" x="0.0" y="-15.0" w="991.0" h="326.0" h-a-x="991" n="ventiduesimaBassa"/>
+  <g c="E511" x="0.0" y="1.0" w="657.0" h="349.0" h-a-x="657" n="ottavaAlta"/>
+  <g c="E512" x="0.0" y="0.0" w="650.0" h="332.0" h-a-x="650" n="ottavaBassa"/>
+  <g c="E513" x="0.0" y="0.0" w="624.0" h="332.0" h-a-x="624" n="ottavaBassaBa"/>
+  <g c="E504" x="0.0" y="-242.0" w="508.0" h="484.0" h-a-x="508" n="repeatBarSlash"/>
+  <g c="E069" x="0.0" y="-250.0" w="325.0" h="500.0" h-a-x="325" n="unpitchedPercussionClef1"/>
+  <g c="E06A" x="0.0" y="-396.0" w="257.0" h="791.0" h-a-x="257" n="unpitchedPercussionClef2"/>
+  <g c="E902" x="-189.0" y="-268.0" w="370.0" h="470.0" h-a-x="181" n="chantFclef"/>
+  <g c="E906" x="-1.0" y="-202.0" w="182.0" h="404.0" h-a-x="181" n="chantCclef"/>
+  <g c="E4A2" x="0.0" y="0.0" w="95.0" h="94.0" h-a-x="96" n="articStaccatoAbove"/>
+  <g c="E4A3" x="0.0" y="-94.0" w="95.0" h="94.0" h-a-x="96" n="articStaccatoBelow"/>
+  <g c="E4A4" x="0.0" y="0.0" w="346.0" h="36.0" h-a-x="346" n="articTenutoAbove"/>
+  <g c="E4A5" x="0.0" y="-36.0" w="346.0" h="36.0" h-a-x="346" n="articTenutoBelow"/>
+  <g c="E4A6" x="0.0" y="0.0" w="110.54" h="244.0" h-a-x="110" n="articStaccatissimoAbove"/>
+  <g c="E4A7" x="0.0" y="-244.0" w="110.54" h="244.0" h-a-x="110" n="articStaccatissimoBelow"/>
+  <g c="E4AE" x="0.0" y="0.0" w="273.0" h="375.0" h-a-x="274" n="articMarcatoStaccatoAbove"/>
+  <g c="E4AF" x="1.0" y="-375.0" w="273.0" h="375.0" h-a-x="274" n="articMarcatoStaccatoBelow"/>
+  <g c="E4B0" x="0.0" y="0.0" w="347.0" h="346.0" h-a-x="347" n="articAccentStaccatoAbove"/>
+  <g c="E4B1" x="0.0" y="-346.0" w="347.0" h="346.0" h-a-x="347" n="articAccentStaccatoBelow"/>
+  <g c="E4B2" x="0.0" y="0.0" w="347.0" h="173.0" h-a-x="347" n="articTenutoStaccatoAbove"/>
+  <g c="E4B3" x="0.0" y="-173.0" w="347.0" h="173.0" h-a-x="347" n="articTenutoStaccatoBelow"/>
+  <g c="E4B4" x="0.0" y="0.0" w="347.0" h="308.0" h-a-x="347" n="articTenutoAccentAbove"/>
+  <g c="E4B5" x="0.0" y="-308.0" w="347.0" h="308.0" h-a-x="347" n="articTenutoAccentBelow"/>
+  <g c="E4B6" x="0.0" y="0.0" w="195.86" h="194.52" h-a-x="196" n="articStressAbove"/>
+  <g c="E4B7" x="0.0" y="-194.52" w="195.86" h="194.52" h-a-x="196" n="articStressBelow"/>
+  <g c="E4B8" x="0.0" y="0.0" w="270.0" h="167.0" h-a-x="270" n="articUnstressAbove"/>
+  <g c="E4B9" x="0.0" y="-167.0" w="270.0" h="167.0" h-a-x="270" n="articUnstressBelow"/>
+  <g c="E4BA" x="-0.24" y="0.0" w="234.24" h="96.0" h-a-x="234" n="articLaissezVibrerAbove"/>
+  <g c="E4BB" x="-0.24" y="-96.0" w="234.24" h="96.0" h-a-x="234" n="articLaissezVibrerBelow"/>
+  <g c="E4C6" x="1.0" y="0.0" w="788.0" h="439.0" h-a-x="790" n="fermataLongAbove"/>
+  <g c="E4C7" x="1.0" y="-439.0" w="788.0" h="439.0" h-a-x="790" n="fermataLongBelow"/>
+  <g c="E4BC" x="0.0" y="0.0" w="347.0" h="350.0" h-a-x="347" n="articMarcatoTenutoAbove"/>
+  <g c="E4BD" x="0.0" y="-350.0" w="347.0" h="350.0" h-a-x="347" n="articMarcatoTenutoBelow"/>
+  <g c="E610" x="0.0" y="0.0" w="310.0" h="240.0" h-a-x="310" n="stringsDownBow"/>
+  <g c="E612" x="0.0" y="0.0" w="283.0" h="338.0" h-a-x="284" n="stringsUpBow"/>
+  <g c="E613" x="0.0" y="0.0" w="283.0" h="338.0" h-a-x="284" n="stringsUpBowTurned"/>
+  <g c="E611" x="0.0" y="0.0" w="310.0" h="240.0" h-a-x="310" n="stringsDownBowTurned"/>
+  <g c="E614" x="0.0" y="0.0" w="206.0" h="206.0" h-a-x="206" n="stringsHarmonic"/>
+  <g c="E4C8" x="1.0" y="0.0" w="788.0" h="439.0" h-a-x="790" n="fermataVeryLongAbove"/>
+  <g c="E4C9" x="1.0" y="-439.0" w="788.0" h="439.0" h-a-x="790" n="fermataVeryLongBelow"/>
+  <g c="E4C4" x="0.0" y="-0.19" w="779.0" h="449.19" h-a-x="779" n="fermataShortAbove"/>
+  <g c="E4C2" x="0.0" y="-0.19" w="779.0" h="449.19" h-a-x="779" n="fermataVeryShortAbove"/>
+  <g c="E4C3" x="0.0" y="-449.0" w="779.0" h="449.19" h-a-x="779" n="fermataVeryShortBelow"/>
+  <g c="E4C5" x="0.0" y="-449.0" w="779.0" h="449.19" h-a-x="779" n="fermataShortBelow"/>
+  <g c="E4CE" x="0.0" y="0.0" w="180.0" h="300.0" h-a-x="180" n="breathMarkComma"/>
+  <g c="E93E" x="0.0" y="0.0" w="30.0" h="760.0" h-a-x="30" n="mensuralCombStemUp"/>
+  <g c="E93F" x="0.0" y="-760.0" w="30.0" h="760.0" h-a-x="30" n="mensuralCombStemDown"/>
+  <g c="E949" x="0.0" y="0.0" w="186.0" h="760.0" h-a-x="186" n="mensuralCombStemUpFlagSemiminima"/>
+  <g c="E94B" x="0.0" y="0.0" w="186.0" h="760.0" h-a-x="186" n="mensuralCombStemUpFlagFusa"/>
+  <g c="E94A" x="0.0" y="-760.0" w="186.0" h="760.0" h-a-x="186" n="mensuralCombStemDownFlagSemiminima"/>
+  <g c="E94C" x="0.0" y="-760.0" w="186.0" h="760.0" h-a-x="186" n="mensuralCombStemDownFlagFusa"/>
+  <g c="E9F3" x="0.0" y="0.0" w="40.0" h="250.0" n="mensuralRestBrevis"/>
+  <g c="E9F2" x="0.0" y="-250.0" w="40.0" h="500.0" n="mensuralRestLongaImperfecta"/>
+  <g c="E9F1" x="0.0" y="-500.0" w="40.0" h="1000.0" n="mensuralRestLongaPerfecta"/>
+  <g c="E9F0" x="0.0" y="-500.0" w="130.0" h="1000.0" n="mensuralRestMaxima"/>
+  <g c="E9F4" x="0.0" y="110.0" w="40.0" h="140.0" n="mensuralRestSemibrevis"/>
+  <g c="E9F5" x="0.0" y="0.0" w="40.0" h="140.0" n="mensuralRestMinima"/>
+  <g c="E9F6" x="0.0" y="0.0" w="118.0" h="140.0" n="mensuralRestSemiminima"/>
+  <g c="E9F7" x="0.0" y="0.0" w="118.0" h="140.0" n="mensuralRestFusa"/>
+  <g c="E9F8" x="0.0" y="0.0" w="118.0" h="140.0" n="mensuralRestSemifusa"/>
+  <g c="E26C" x="0.0" y="-260.0" w="90.0" h="520.0" h-a-x="90" n="accidentalBracketLeft"/>
+  <g c="E26D" x="0.0" y="-260.0" w="90.0" h="520.0" h-a-x="90" n="accidentalBracketRight"/>
+  <g c="E270" x="-43.0" y="-184.0" w="263.0" h="786.0" h-a-x="221" n="accidentalQuarterToneFlatArrowUp"/>
+  <g c="E271" x="-46.0" y="-354.0" w="266.0" h="848.0" h-a-x="220" n="accidentalThreeQuarterTonesFlatArrowDown"/>
+  <g c="E272" x="-46.0" y="-377.0" w="223.0" h="862.0" h-a-x="178" n="accidentalQuarterToneSharpNaturalArrowUp"/>
+  <g c="E273" x="0.0" y="-485.0" w="221.0" h="862.0" h-a-x="157" n="accidentalQuarterToneFlatNaturalArrowDown"/>
+  <g c="E274" x="-24.0" y="-364.0" w="221.0" h="825.0" h-a-x="197" n="accidentalThreeQuarterTonesSharpArrowUp"/>
+  <g c="E275" x="-25.0" y="-473.0" w="222.0" h="855.0" h-a-x="197" n="accidentalQuarterToneSharpArrowDown"/>
+  <g c="E280" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="198" n="accidentalQuarterToneFlatStein">
+    <a n="cutOutNW" x="0.7" y="0.58"/>
+    <a n="cutOutSW" x="0.37" y="-0.33"/>
+  </g>
+  <g c="E281" x="0.0" y="-175.0" w="416.0" h="644.0" h-a-x="416" n="accidentalThreeQuarterTonesFlatZimmermann">
+    <a n="cutOutNE" x="0.97" y="0.59"/>
+    <a n="cutOutNW" x="0.7" y="0.58"/>
+    <a n="cutOutSE" x="1.34" y="-0.31"/>
+    <a n="cutOutSW" x="0.34" y="-0.32"/>
+  </g>
+  <g c="E282" x="0.0" y="-339.0" w="106.0" h="667.0" h-a-x="106" n="accidentalQuarterToneSharpStein">
+    <a n="cutOutNE" x="0.25" y="0.72"/>
+    <a n="cutOutNW" x="0.16" y="0.65"/>
+    <a n="cutOutSE" x="0.26" y="-0.75"/>
+    <a n="cutOutSW" x="0.16" y="-0.81"/>
+  </g>
+  <g c="E283" x="0.0" y="-373.0" w="303.0" h="728.0" h-a-x="303" n="accidentalThreeQuarterTonesSharpStein">
+    <a n="cutOutNE" x="1.05" y="0.82"/>
+    <a n="cutOutNW" x="0.16" y="0.52"/>
+    <a n="cutOutSE" x="1.05" y="-0.64"/>
+    <a n="cutOutSW" x="0.16" y="-0.95"/>
+  </g>
+  <g c="E242" x="0.0" y="-779.0" w="276.0" h="779.0" h-a-x="274" n="flag16thUp"/>
+  <g c="E244" x="0.0" y="-779.0" w="276.0" h="969.0" h-a-x="274" n="flag32ndUp"/>
+  <g c="E246" x="0.0" y="-779.0" w="276.0" h="1159.0" h-a-x="274" n="flag64thUp"/>
+  <g c="E248" x="0.0" y="-779.0" w="276.0" h="1349.0" h-a-x="274" n="flag128thUp"/>
+  <g c="E24A" x="0.0" y="-779.0" w="276.0" h="1539.0" h-a-x="274" n="flag256thUp"/>
+  <g c="E243" x="0.0" y="0.0" w="276.0" h="761.0" h-a-x="274" n="flag16thDown"/>
+  <g c="E245" x="0.0" y="-190.0" w="276.0" h="950.0" h-a-x="274" n="flag32ndDown"/>
+  <g c="E247" x="0.0" y="-380.0" w="276.0" h="1140.0" h-a-x="274" n="flag64thDown"/>
+  <g c="E249" x="0.0" y="-570.0" w="276.0" h="1329.0" h-a-x="274" n="flag128thDown"/>
+  <g c="E24B" x="0.0" y="-760.0" w="276.0" h="1518.0" h-a-x="274" n="flag256thDown"/>
+  <g c="E4EB" x="-1.0" y="-955.0" w="642.0" h="1632.0" h-a-x="642" n="rest256th"/>
+  <g c="E4EC" x="-1.0" y="-955.0" w="721.0" h="1868.0" h-a-x="720" n="rest512th"/>
+  <g c="E4ED" x="-1.0" y="-955.0" w="795.0" h="2099.0" h-a-x="795" n="rest1024th"/>
+  <g c="E08D" x="0.0" y="-126.0" w="253.0" h="252.0" h-a-x="253" n="timeSigPlusSmall"/>
+  <g c="E08C" x="0.0" y="-171.0" w="342.0" h="342.0" h-a-x="342" n="timeSigPlus"/>
+  <g c="E59E" x="0.0" y="0.0" w="375.0" h="192.0" h-a-x="375" n="ornamentZigZagLineWithRightEnd"/>
+  <g c="E59D" x="0.0" y="0.0" w="306.0" h="192.0" h-a-x="244" n="ornamentZigZagLineNoRightEnd"/>
+  <g c="EAAA" x="-6.34" y="0.0" w="210.68" h="112.0" h-a-x="198" n="wiggleArpeggiatoDown"/>
+  <g c="EAA9" x="-6.34" y="0.0" w="210.68" h="112.0" h-a-x="198" n="wiggleArpeggiatoUp"/>
+  <g c="EAAD" x="0.0" y="-44.0" w="370.0" h="200.0" h-a-x="370" n="wiggleArpeggiatoUpArrow"/>
+  <g c="EAAE" x="0.0" y="-44.0" w="370.0" h="200.0" h-a-x="370" n="wiggleArpeggiatoDownArrow"/>
+  <g c="E659" x="0.0" y="-14.0" w="969.0" h="549.0" h-a-x="969" n="keyboardPedalSost"/>
+  <g c="E910" x="0.0" y="-240.0" w="480.0" h="480.0" n="mensuralProlation1"/>
+  <g c="E911" x="0.0" y="-240.0" w="480.0" h="480.0" n="mensuralProlation2"/>
+  <g c="E912" x="0.0" y="-408.0" w="480.0" h="816.0" n="mensuralProlation3"/>
+  <g c="E913" x="0.0" y="-408.0" w="480.0" h="816.0" n="mensuralProlation4"/>
+  <g c="E91B" x="-26.0" y="-266.0" w="532.0" h="532.0" n="mensuralProportionTempusPerfectum"/>
+  <g c="E91C" x="-75.0" y="-240.0" w="625.0" h="480.0" n="mensuralProportionProportioDupla1"/>
+  <g c="E914" x="0.0" y="-240.0" w="450.0" h="480.0" n="mensuralProlation5"/>
+  <g c="E917" x="0.0" y="-408.0" w="450.0" h="816.0" n="mensuralProlation8"/>
+  <g c="E91E" x="-26.0" y="-266.0" w="532.0" h="532.0" n="mensuralProportionProportioTripla"/>
+  <g c="E920" x="0.0" y="-63.0" w="126.0" h="126.0" n="mensuralProlationCombiningDot"/>
+  <g c="E921" x="0.0" y="-47.0" w="223.0" h="93.0" h-a-x="223" n="mensuralProlationCombiningTwoDots"/>
+  <g c="E922" x="0.0" y="-40.0" w="292.0" h="80.0" h-a-x="292" n="mensuralProlationCombiningThreeDots"/>
+  <g c="E923" x="0.0" y="-88.0" w="196.0" h="176.0" h-a-x="196" n="mensuralProlationCombiningThreeDotsTri"/>
+  <g c="E924" x="0.0" y="-131.0" w="264.0" h="262.0" h-a-x="264" n="mensuralProlationCombiningDotVoid"/>
+  <g c="E925" x="0.0" y="-408.0" w="36.0" h="816.0" h-a-x="36" n="mensuralProlationCombiningStroke"/>
+  <g c="E918" x="0.0" y="-408.0" w="450.0" h="816.0" n="mensuralProlation9"/>
+  <g c="E915" x="0.0" y="-240.0" w="450.0" h="480.0" n="mensuralProlation6"/>
+  <g c="E916" x="30.0" y="-240.0" w="450.0" h="480.0" n="mensuralProlation7"/>
+  <g c="E919" x="30.0" y="-408.0" w="450.0" h="816.0" n="mensuralProlation10"/>
+  <g c="E91A" x="30.0" y="-240.0" w="450.0" h="480.0" n="mensuralProlation11"/>
+  <g c="E91F" x="-26.0" y="-266.0" w="532.0" h="532.0" n="mensuralProportionProportioQuadrupla"/>
+  <g c="E91D" x="-26.0" y="-266.0" w="532.0" h="532.0" n="mensuralProportionProportioDupla2"/>
+  <g c="EBE0" x="-3.0" y="-3.0" w="226.0" h="252.0" h-a-x="220" n="luteItalianFret0"/>
+  <g c="EBE1" x="-2.09" y="-4.0" w="155.09" h="253.0" h-a-x="148" n="luteItalianFret1"/>
+  <g c="EBE2" x="-3.9" y="-3.0" w="172.9" h="252.0" h-a-x="166" n="luteItalianFret2"/>
+  <g c="EBE3" x="-3.0" y="-3.0" w="172.0" h="252.0" h-a-x="166" n="luteItalianFret3"/>
+  <g c="EBE4" x="-4.0" y="-3.03" w="205.0" h="252.03" h-a-x="198" n="luteItalianFret4"/>
+  <g c="EBE5" x="-3.0" y="-3.0" w="155.0" h="257.0" h-a-x="149" n="luteItalianFret5"/>
+  <g c="EBE6" x="-3.0" y="-3.0" w="182.0" h="252.0" h-a-x="176" n="luteItalianFret6"/>
+  <g c="EBE7" x="-3.02" y="-3.0" w="168.02" h="252.0" h-a-x="162" n="luteItalianFret7"/>
+  <g c="EBE8" x="-3.0" y="-3.0" w="194.0" h="252.0" h-a-x="188" n="luteItalianFret8"/>
+  <g c="EBE9" x="-3.0" y="-3.15" w="185.0" h="252.15" h-a-x="179" n="luteItalianFret9"/>
+  <g c="EBA7" x="-82.0" y="0.0" w="174.0" h="791.0" h-a-x="92" n="luteDurationWhole"/>
+  <g c="EBA8" x="-1.0" y="0.0" w="405.0" h="795.0" h-a-x="403" n="luteDurationHalf"/>
+  <g c="EBAA" x="0.0" y="0.0" w="392.0" h="781.0" h-a-x="393" n="luteDuration8th"/>
+  <g c="EBA9" x="0.0" y="0.0" w="390.0" h="785.0" h-a-x="389" n="luteDurationQuarter"/>
+  <g c="EBAB" x="0.0" y="-1.0" w="392.0" h="787.0" h-a-x="392" n="luteDuration16th"/>
+  <g c="EBAC" x="0.0" y="-1.0" w="386.0" h="854.0" h-a-x="381" n="luteDuration32nd"/>
+  <g c="E24C" x="0.0" y="-779.0" w="277.0" h="1729.0" h-a-x="274" n="flag512thUp"/>
+  <g c="E24D" x="0.0" y="-950.0" w="277.0" h="1729.0" h-a-x="274" n="flag512thDown"/>
+  <g c="E24E" x="0.0" y="-779.0" w="280.0" h="1919.0" h-a-x="274" n="flag1024thUp"/>
+  <g c="E24F" x="0.0" y="-1140.0" w="280.0" h="1919.0" h-a-x="274" n="flag1024thDown"/>
+  <g c="EBC0" x="-0.6" y="0.0" w="279.6" h="202.8" h-a-x="280" n="luteFrenchFretA"/>
+  <g c="EBC1" x="-1.0" y="-0.0" w="227.6" h="313.2" h-a-x="227" n="luteFrenchFretB"/>
+  <g c="EBC2" x="0.6" y="0.8" w="251.6" h="233.2" h-a-x="253" n="luteFrenchFretC"/>
+  <g c="EBC3" x="0.2" y="0.4" w="413.2" h="306.0" h-a-x="413" n="luteFrenchFretD"/>
+  <g c="EBC4" x="0.0" y="0.0" w="187.6" h="276.4" h-a-x="187" n="luteFrenchFretE"/>
+  <g c="EBC5" x="0.0" y="0.0" w="211.75" h="355.0" h-a-x="212" n="luteFrenchFretF"/>
+  <g c="EBC6" x="-0.2" y="-0.23" w="321.2" h="319.63" h-a-x="321" n="luteFrenchFretG"/>
+  <g c="EBC7" x="0.0" y="0.0" w="289.0" h="328.0" h-a-x="289" n="luteFrenchFretH"/>
+  <g c="EBC8" x="1.0" y="0.0" w="151.0" h="267.0" h-a-x="153" n="luteFrenchFretI"/>
+  <g c="EBC9" x="0.0" y="0.0" w="161.0" h="355.0" h-a-x="160" n="luteFrenchFretK"/>
+  <g c="EBCA" x="1.0" y="0.0" w="232.0" h="348.0" h-a-x="233" n="luteFrenchFretL"/>
+  <g c="EBCB" x="-1.0" y="-1.0" w="550.0" h="229.2" h-a-x="549" n="luteFrenchFretM"/>
+  <g c="EBCC" x="0.2" y="-0.2" w="341.2" h="210.8" h-a-x="341" n="luteFrenchFretN"/>
+  <g c="E000" x="0.11" y="1.15" w="92.63" h="997.71" n="brace"/>
+  <g c="E645" x="-150.0" y="0.0" w="300.0" h="300.0" h-a-x="150" n="vocalSprechgesang"/>
+  <g c="E0A5" x="0.0" y="0.0" w="314" h="0.0" h-a-x="314" n="noteheadNull"/>
+  <g c="E0A9" x="0.0" y="-125.0" w="290.0" h="250.0" h-a-x="290" n="noteheadXBlack"/>
+  <g c="E0AF" x="-1.0" y="-133.0" w="267.0" h="266.0" h-a-x="266" n="noteheadPlusBlack"/>
+  <g c="E0DB" x="0.0" y="-160.0" w="314.0" h="320.0" h-a-x="314" n="noteheadDiamondBlack">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.26" y="0.0"/>
+  </g>
+  <g c="E0DC" x="0.0" y="-125.0" w="350.0" h="250.0" h-a-x="350" n="noteheadDiamondBlackWide">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.4" y="0.0"/>
+  </g>
+  <g c="E0DD" x="0.0" y="-160.0" w="314.0" h="320.0" h-a-x="314" n="noteheadDiamondWhite">
+    <a n="stemDownNW" x="-0.0" y="-0.0"/>
+    <a n="stemUpSE" x="1.26" y="0.0"/>
+  </g>
+  <g c="E0DE" x="0.0" y="-125.0" w="350.0" h="250.0" h-a-x="350" n="noteheadDiamondWhiteWide">
+    <a n="stemDownNW" x="-0.0" y="-0.0"/>
+    <a n="stemUpSE" x="1.4" y="-0.0"/>
+  </g>
+  <g c="E0D9" x="0.0" y="-162.0" w="314.0" h="324.0" h-a-x="314" n="noteheadDiamondHalf">
+    <a n="stemDownNW" x="-0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.26" y="0.0"/>
+  </g>
+  <g c="E22A" x="-155.0" y="-116.0" w="311.0" h="232.0" h-a-x="156" n="buzzRoll"/>
+  <g c="E0B7" x="0.0" y="-125.0" w="289.0" h="250.0" h-a-x="289" n="noteheadVoidWithX">
+    <a n="stemDownNW" x="0.0" y="-0.15"/>
+    <a n="stemUpSE" x="1.16" y="0.15"/>
+  </g>
+  <g c="E0B5" x="0.0" y="-133.0" w="405.0" h="266.0" h-a-x="405" n="noteheadWholeWithX">
+    <a n="cutOutNW" x="0.06" y="0.24"/>
+    <a n="cutOutSE" x="1.57" y="-0.23"/>
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.62" y="0.0"/>
+  </g>
+  <g c="E0B6" x="0.0" y="-132.0" w="314.0" h="270.0" h-a-x="314" n="noteheadHalfWithX">
+    <a n="cutOutNW" x="0.14" y="0.24"/>
+    <a n="cutOutSE" x="1.08" y="-0.24"/>
+    <a n="stemDownNW" x="-0.0" y="-0.14"/>
+    <a n="stemUpSE" x="1.26" y="0.16"/>
+  </g>
+  <g c="E5B0" x="0.0" y="-2.0" w="980.0" h="274.0" h-a-x="980" n="ornamentPrecompSlide"/>
+  <g c="E5B1" x="0.0" y="-160.0" w="1040.0" h="400.0" h-a-x="1040" n="ornamentPrecompDescendingSlide"/>
+  <g c="E5B2" x="0.0" y="-2.0" w="849.0" h="402.0" h-a-x="849" n="ornamentPrecompAppoggTrill"/>
+  <g c="E5B3" x="0.0" y="-2.0" w="855.0" h="523.0" h-a-x="855" n="ornamentPrecompAppoggTrillSuffix"/>
+  <g c="E5B4" x="1.0" y="-2.0" w="1498.0" h="374.0" h-a-x="1105" n="ornamentPrecompTurnTrillDAnglebert"/>
+  <g c="E5B5" x="0.0" y="-317.0" w="1076.0" h="590.0" h-a-x="1076" n="ornamentPrecompSlideTrillDAnglebert"/>
+  <g c="E5B6" x="0.0" y="-317.0" w="1292.0" h="867.89" h-a-x="1048" n="ornamentPrecompSlideTrillMarpurg"/>
+  <g c="E5B7" x="1.0" y="-90.0" w="1329.0" h="444.0" h-a-x="1330" n="ornamentPrecompTurnTrillBach"/>
+  <g c="E5B8" x="0.0" y="-317.0" w="1076.0" h="636.0" h-a-x="1076" n="ornamentPrecompSlideTrillBach"/>
+  <g c="E5B9" x="0.0" y="-249.0" w="1369.0" h="621.0" h-a-x="1369" n="ornamentPrecompSlideTrillMuffat"/>
+  <g c="E5BA" x="-369.0" y="-249.0" w="1190.0" h="799.89" h-a-x="820" n="ornamentPrecompSlideTrillSuffixMuffat"/>
+  <g c="E5BB" x="0.0" y="-2.0" w="1064.0" h="552.89" h-a-x="820" n="ornamentPrecompTrillSuffixDandrieu"/>
+  <g c="E5BC" x="0.0" y="-91.0" w="1227.0" h="400.0" h-a-x="1227" n="ornamentPrecompPortDeVoixMordent"/>
+  <g c="E5BD" x="0.0" y="-90.0" w="830.0" h="399.0" h-a-x="830" n="ornamentPrecompTrillWithMordent"/>
+  <g c="E5BE" x="0.0" y="-2.0" w="983.0" h="271.0" h-a-x="983" n="ornamentPrecompCadence"/>
+  <g c="E5BF" x="0.0" y="-80.0" w="983.0" h="400.0" h-a-x="983" n="ornamentPrecompCadenceWithTurn"/>
+  <g c="E5C0" x="0.0" y="-2.0" w="1227.0" h="271.0" h-a-x="1227" n="ornamentPrecompDoubleCadenceLowerPrefix"/>
+  <g c="E5C1" x="0.0" y="-90.0" w="1005.0" h="330.0" h-a-x="1005" n="ornamentPrecompCadenceUpperPrefix"/>
+  <g c="E5C2" x="0.0" y="-90.0" w="1005.0" h="400.0" h-a-x="1005" n="ornamentPrecompCadenceUpperPrefixTurn"/>
+  <g c="E5C3" x="0.0" y="-90.0" w="1249.0" h="330.0" h-a-x="1249" n="ornamentPrecompDoubleCadenceUpperPrefix"/>
+  <g c="E5C4" x="0.0" y="-90.0" w="1249.0" h="400.0" h-a-x="1249" n="ornamentPrecompDoubleCadenceUpperPrefixTurn"/>
+  <g c="E5C5" x="0.0" y="-2.0" w="821.0" h="552.89" h-a-x="820" n="ornamentPrecompMordentRelease"/>
+  <g c="E5C6" x="1.0" y="-2.0" w="1104.0" h="370.0" h-a-x="1105" n="ornamentPrecompMordentUpperPrefix"/>
+  <g c="E5C7" x="1.0" y="-80.0" w="1104.0" h="448.0" h-a-x="1105" n="ornamentPrecompInvertedMordentUpperPrefix"/>
+  <g c="E5C8" x="0.0" y="-243.0" w="756.0" h="483.0" h-a-x="756" n="ornamentPrecompTrillLowerSuffix"/>
+  <g c="E56F" x="0.0" y="-107.0" w="500.0" h="397.0" h-a-x="500" n="ornamentHaydn"/>
+  <g c="E587" x="0.0" y="-2.0" w="999.0" h="374.0" n="ornamentSchleifer"/>
+  <g c="E651" x="0.0" y="0.0" w="320.0" h="514.0" h-a-x="320" n="keyboardPedalP"/>
+  <g c="E65A" x="0.0" y="-14.0" w="378.0" h="549.0" h-a-x="378" n="keyboardPedalS"/>
+  <g c="E4E4" x="0.0" y="0.0" w="300.0" h="125.0" h-a-x="300" n="restHalf"/>
+  <g c="E4E3" x="0.0" y="-125.0" w="300.0" h="125.0" h-a-x="300" n="restWhole"/>
+  <g c="E4E2" x="0.0" y="0.0" w="125.0" h="250.0" h-a-x="125" n="restDoubleWhole"/>
+  <g c="E4E1" x="0.0" y="-250.0" w="125.0" h="500.0" h-a-x="125" n="restLonga"/>
+  <g c="E4E0" x="0.0" y="-250.0" w="375.0" h="500.0" h-a-x="375" n="restMaxima"/>
+  <g c="E583" x="0.0" y="0.0" w="26.0" h="330.0" n="ornamentVerticalLine"/>
+  <g c="E440" x="0.0" y="-175.0" w="247.0" h="644.0" h-a-x="247" n="accidentalBuyukMucennebFlat">
+    <a n="cutOutNE" x="0.32" y="1.48"/>
+    <a n="cutOutSE" x="0.63" y="-0.34"/>
+  </g>
+  <g c="E441" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="200" n="accidentalKucukMucennebFlat">
+    <a n="cutOutNE" x="0.1" y="0.56"/>
+    <a n="cutOutSE" x="0.43" y="-0.34"/>
+  </g>
+  <g c="E442" x="0.0" y="-175.0" w="247.0" h="644.0" h-a-x="247" n="accidentalBakiyeFlat">
+    <a n="cutOutNE" x="0.31" y="1.32"/>
+    <a n="cutOutSE" x="0.63" y="-0.34"/>
+  </g>
+  <g c="E443" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="198" n="accidentalKomaFlat">
+    <a n="cutOutNW" x="0.7" y="0.58"/>
+    <a n="cutOutSW" x="0.37" y="-0.33"/>
+  </g>
+  <g c="E444" x="0.0" y="-339.0" w="106.0" h="667.0" h-a-x="106" n="accidentalKomaSharp">
+    <a n="cutOutNE" x="0.25" y="0.72"/>
+    <a n="cutOutNW" x="0.16" y="0.65"/>
+    <a n="cutOutSE" x="0.26" y="-0.75"/>
+    <a n="cutOutSW" x="0.16" y="-0.81"/>
+  </g>
+  <g c="E446" x="0.0" y="-339.0" w="210.0" h="667.0" h-a-x="210" n="accidentalKucukMucennebSharp">
+    <a n="cutOutNE" x="0.45" y="0.72"/>
+    <a n="cutOutNW" x="0.36" y="0.65"/>
+    <a n="cutOutSE" x="0.46" y="-0.75"/>
+    <a n="cutOutSW" x="0.36" y="-0.81"/>
+  </g>
+  <g c="E445" x="0.0" y="-339.0" w="197.0" h="694.0" h-a-x="197" n="accidentalBakiyeSharp">
+    <a n="cutOutNE" x="0.62" y="0.84"/>
+    <a n="cutOutNW" x="0.16" y="0.64"/>
+    <a n="cutOutSE" x="0.62" y="-0.64"/>
+    <a n="cutOutSW" x="0.16" y="-0.82"/>
+  </g>
+  <g c="E447" x="0.0" y="-339.0" w="239.0" h="694.0" h-a-x="239" n="accidentalBuyukMucennebSharp">
+    <a n="cutOutNE" x="0.71" y="0.84"/>
+    <a n="cutOutNW" x="0.25" y="0.64"/>
+    <a n="cutOutSE" x="0.71" y="-0.64"/>
+    <a n="cutOutSW" x="0.25" y="-0.82"/>
+  </g>
+  <g c="E073" x="-1.0" y="-655.0" w="647.0" h="1738.0" h-a-x="646" n="gClefReversed"/>
+  <g c="E074" x="-1.0" y="-655.0" w="647.0" h="1738.0" h-a-x="646" n="gClefTurned"/>
+  <g c="E076" x="4.0" y="-581.0" w="694.0" h="832.0" h-a-x="698" n="fClefReversed"/>
+  <g c="E077" x="4.0" y="-581.0" w="694.0" h="832.0" h-a-x="698" n="fClefTurned"/>
+  <g c="E075" x="0.0" y="-502.0" w="606.0" h="1004.0" h-a-x="656" n="cClefReversed"/>
+  <g c="E055" x="-1.0" y="-655.0" w="1039.0" h="1738.0" h-a-x="646" n="gClef8vbOld"/>
+  <g c="E056" x="-1.0" y="-655.0" w="764.0" h="1738.0" h-a-x="750" n="gClef8vbCClef"/>
+  <g c="E51A" x="0.0" y="-25.0" w="115.0" h="350.44" h-a-x="115" n="octaveParensLeft"/>
+  <g c="E51B" x="0.0" y="-25.0" w="115.0" h="350.0" h-a-x="115" n="octaveParensRight"/>
+  <g c="E0F5" x="0.0" y="-240.0" w="153.0" h="480.0" h-a-x="100" n="noteheadParenthesisLeft"/>
+  <g c="E0F6" x="-53.0" y="-240.0" w="153.0" h="480.0" h-a-x="100" n="noteheadParenthesisRight"/>
+  <g c="E102" x="0.0" y="-250.0" w="900.0" h="500.0" h-a-x="900" n="noteheadSlashWhiteWhole">
+    <a n="stemDownNW" x="0.0" y="-1.0"/>
+    <a n="stemUpSE" x="3.6" y="1.0"/>
+  </g>
+  <g c="E103" x="0.0" y="-250.0" w="735.0" h="500.0" h-a-x="735" n="noteheadSlashWhiteHalf">
+    <a n="stemDownNW" x="0.0" y="-1.0"/>
+    <a n="stemUpSE" x="2.94" y="1.0"/>
+  </g>
+  <g c="E0DA" x="0.0" y="-162.0" w="352.0" h="324.0" h-a-x="314" n="noteheadDiamondHalfWide">
+    <a n="stemDownNW" x="-0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.41" y="0.0"/>
+  </g>
+  <g c="E4F2" x="0.0" y="-250.0" w="276.0" h="433.0" h-a-x="277" n="restQuarterOld"/>
+  <g c="E4F6" x="0.0" y="-260.0" w="304.0" h="443.0" h-a-x="304" n="restQuarterZ"/>
+  <g c="E630" x="0.0" y="0.0" w="206.0" h="266.0" h-a-x="206" n="pluckedSnapPizzicatoBelow"/>
+  <g c="E631" x="0.0" y="0.0" w="206.0" h="266.0" h-a-x="206" n="pluckedSnapPizzicatoAbove"/>
+  <g c="E632" x="0.0" y="0.0" w="266.0" h="206.0" h-a-x="266" n="pluckedBuzzPizzicato"/>
+  <g c="E633" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" n="pluckedLeftHandPizzicato"/>
+  <g c="E638" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" n="pluckedDamp"/>
+  <g c="E9E3" x="0.0" y="-124.06" w="292.0" h="248.12" h-a-x="292" n="medRenSharpCroix"/>
+  <g c="E9E0" x="0.0" y="-140.0" w="217.0" h="553.0" h-a-x="217" n="medRenFlatSoftB"/>
+  <g c="E9E1" x="0.0" y="-140.0" w="186.0" h="560.0" h-a-x="186" n="medRenFlatHardB"/>
+  <g c="E9E2" x="0.0" y="-254.0" w="102.0" h="507.0" h-a-x="102" n="medRenNatural"/>
+  <g c="E51C" x="0.0" y="0.0" w="620.0" h="332.0" h-a-x="620" n="ottavaBassaVb"/>
+  <g c="E51D" x="3.0" y="-8.0" w="881.0" h="329.0" h-a-x="884" n="quindicesimaBassaMb"/>
+  <g c="E51E" x="0.0" y="-15.0" w="959.0" h="326.0" h-a-x="959" n="ventiduesimaBassaMb"/>
+  <g c="E908" x="1.0" y="-392.0" w="205.58" h="1046.0" h-a-x="204" n="mensuralCclefPetrucciPosLow"/>
+  <g c="E907" x="1.0" y="-302.0" w="205.58" h="956.0" h-a-x="204" n="mensuralCclefPetrucciPosLowest"/>
+  <g c="E90A" x="1.0" y="-654.0" w="205.58" h="1046.0" h-a-x="204" n="mensuralCclefPetrucciPosHigh"/>
+  <g c="E90B" x="1.0" y="-654.0" w="205.58" h="956.0" h-a-x="204" n="mensuralCclefPetrucciPosHighest"/>
+  <g c="E08E" x="0.0" y="-243.0" w="186.0" h="486.0" h-a-x="186" n="timeSigFractionalSlash"/>
+  <g c="E08F" x="0.0" y="-120.0" w="342.0" h="240.0" h-a-x="342" n="timeSigEquals"/>
+  <g c="E090" x="0.0" y="-37.0" w="342.0" h="74.0" h-a-x="342" n="timeSigMinus"/>
+  <g c="E091" x="0.0" y="-167.0" w="334.0" h="334.0" h-a-x="334" n="timeSigMultiply"/>
+  <g c="E092" x="0.0" y="-250.44" w="134.0" h="500.89" h-a-x="134" n="timeSigParensLeftSmall"/>
+  <g c="E093" x="0.0" y="-250.44" w="134.0" h="500.89" h-a-x="134" n="timeSigParensRightSmall"/>
+  <g c="E094" x="0.0" y="-501.0" w="220.0" h="1002.0" h-a-x="220" n="timeSigParensLeft"/>
+  <g c="E095" x="0.0" y="-501.0" w="220.0" h="1002.0" h-a-x="220" n="timeSigParensRight"/>
+  <g c="ED40" x="0.0" y="0.0" w="720.0" h="236.0" h-a-x="720" n="articSoftAccentAbove"/>
+  <g c="ED41" x="0.0" y="-236.0" w="720.0" h="236.0" h-a-x="720" n="articSoftAccentBelow"/>
+  <g c="EAAF" x="-9.07" y="0.0" w="215.87" h="112.0" h-a-x="198" n="wiggleGlissando"/>
+  <g c="EAA4" x="-12.18" y="0.0" w="222.36" h="112.0" h-a-x="198" n="wiggleTrill"/>
+  <g c="E5E5" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" n="brassMuteClosed"/>
+  <g c="E5E6" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" n="brassMuteHalfClosed"/>
+  <g c="E5E7" x="0.0" y="0.0" w="330.0" h="330.0" h-a-x="330" n="brassMuteOpen"/>
+  <g c="E0A0" x="0.0" y="-170.0" w="545.0" h="340.0" h-a-x="545" n="noteheadDoubleWhole"/>
+  <g c="E0A1" x="0.0" y="-170.0" w="348.0" h="340.0" h-a-x="348" n="noteheadDoubleWholeSquare"/>
+  <g c="EA02" x="0.0" y="-2.0" w="772.0" h="396.0" h-a-x="772" n="mensuralCustosUp"/>
+  <g c="EA06" x="0.0" y="-96.0" w="64.0" h="410.0" h-a-x="64" n="chantCustosStemUpPosMiddle"/>
+  <g c="E043" x="0.0" y="325.0" w="100.0" h="350.0" h-a-x="100" n="repeatDots"/>
+  <g c="E044" x="0.0" y="-50.0" w="100.0" h="100.0" h-a-x="100" n="repeatDot"/>
+  <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"/>
+</bounding-boxes>
diff --git a/data/Leipzig/E000.xml b/data/Leipzig/E000.xml
new file mode 100644
index 00000000000..ee40a4ae68d
--- /dev/null
+++ b/data/Leipzig/E000.xml
@@ -0,0 +1 @@
+<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M92 7c3 -5 -4 -8 -7 -4c-54 81 -70 151 -70 214c0 46 9 89 16 125c6 29 12 54 12 77c0 31 -10 56 -41 77c-2 2 -3 5 0 7c31 21 41 46 41 77c0 23 -6 49 -12 78c-7 36 -16 79 -16 125c0 63 16 133 70 214c3 4 10 1 7 -4c-38 -69 -50 -132 -50 -187c0 -46 9 -88 16 -126 c6 -30 11 -58 11 -83c0 -39 -13 -72 -56 -97c43 -25 56 -58 56 -97c0 -25 -5 -53 -11 -83c-7 -38 -16 -80 -16 -126c0 -55 12 -118 50 -187z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E003.xml b/data/Leipzig/E003.xml
new file mode 100644
index 00000000000..dc4dbf6884c
--- /dev/null
+++ b/data/Leipzig/E003.xml
@@ -0,0 +1 @@
+<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -0v111c0 0 62 1 63 1c70 0 233 16 321 170c1 1 15 -5 15 -6c-5 -7 -57 -176 -263 -271c-24 -4 -53 -5 -83 -5h-53z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E004.xml b/data/Leipzig/E004.xml
new file mode 100644
index 00000000000..71e60f26f7a
--- /dev/null
+++ b/data/Leipzig/E004.xml
@@ -0,0 +1 @@
+<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0h53c30 0 59 -1 83 -5c206 -95 258 -264 263 -271c0 -1 -14 -7 -15 -6c-88 154 -251 170 -321 170c-1 0 -63 1 -63 1v111z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E043.xml b/data/Leipzig/E043.xml
new file mode 100644
index 00000000000..79f1d041760
--- /dev/null
+++ b/data/Leipzig/E043.xml
@@ -0,0 +1 @@
+<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 375c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50zM0 625c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E044.xml b/data/Leipzig/E044.xml
new file mode 100644
index 00000000000..121d29419e2
--- /dev/null
+++ b/data/Leipzig/E044.xml
@@ -0,0 +1 @@
+<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E045.xml b/data/Leipzig/E045.xml
new file mode 100644
index 00000000000..a79e7c8a8f1
--- /dev/null
+++ b/data/Leipzig/E045.xml
@@ -0,0 +1 @@
+<symbol id="E045" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M133 363c0 24 -18 26 -48 32v9h152c134 0 201 -55 201 -166c0 -48 -13 -91 -39 -128c-47 -65 -138 -110 -244 -110h-155v10c32 0 51 23 51 54l79 285l2 9zM366 249c0 90 -39 136 -128 136c-17 0 -32 -1 -38 -11l-90 -323l-2 -11c2 -15 17 -23 45 -23 c139 0 213 92 213 232zM704 384c-35 0 -64 -26 -64 -61c0 -17 5 -33 15 -47c20 -24 26 -31 48 -50c13 -16 36 -43 48 -59c12 -19 18 -38 18 -59c0 -26 -9 -46 -19 -65c-13 -19 -29 -34 -46 -43c-15 -10 -34 -14 -59 -14c-11 0 -28 5 -51 14c-16 4 -32 5 -42 10 c-7 0 -12 -4 -16 -10c-4 -1 -7 -5 -8 -13h-12l21 135h15l-3 -17c0 -15 3 -26 5 -37c4 -11 11 -21 22 -32c15 -19 35 -28 62 -28c24 0 42 8 54 24c16 15 24 34 24 55c0 20 -5 36 -14 48c-12 13 -20 25 -33 38c-5 5 -11 11 -17 18c-22 21 -38 40 -49 58c-11 13 -16 31 -16 54 c0 38 8 53 31 72c19 19 44 29 75 29c24 0 42 -2 54 -7c11 -7 21 -10 31 -10c7 0 15 6 24 17h13l-24 -119h-10c0 66 -26 99 -77 99zM430 0c-20 0 -32 12 -32 33s17 34 32 34c8 0 15 -4 21 -12c7 -4 10 -11 10 -22c0 -16 -13 -33 -31 -33zM829 0c-20 0 -32 11 -35 28 c0 17 17 33 35 33c19 0 31 -12 31 -33c0 -18 -15 -28 -31 -28z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E046.xml b/data/Leipzig/E046.xml
new file mode 100644
index 00000000000..ebc8855f58d
--- /dev/null
+++ b/data/Leipzig/E046.xml
@@ -0,0 +1 @@
+<symbol id="E046" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10c33 0 48 23 51 54l79 285l2 9l1 5c0 8 -3 14 -8 19s-19 9 -40 13v9h152c134 0 201 -55 201 -166c0 -48 -13 -91 -39 -128c-49 -64 -136 -110 -244 -110h-155v10zM366 249c0 89 -39 136 -128 136c-17 0 -32 -1 -38 -11l-90 -323l-2 -11c2 -15 17 -23 45 -23 c40 0 77 11 110 34c34 20 58 46 76 82c18 30 27 69 27 116zM677 10c70 0 112 30 149 74l8 -10c-47 -64 -104 -96 -171 -96c-30 0 -58 7 -83 22c-22 15 -40 40 -55 64c-13 26 -19 54 -19 85c0 43 11 84 34 124c24 39 55 71 94 98c40 23 81 35 124 35h18c7 0 12 -1 15 -2 l36 -7l28 -8l25 15h10l-22 -125h-11c0 34 -8 60 -25 79c-19 17 -42 26 -71 26c-44 0 -73 -15 -97 -39c-29 -25 -50 -56 -64 -95c-9 -20 -15 -38 -18 -54s-6 -34 -6 -55c0 -43 6 -69 25 -94c17 -25 42 -37 76 -37zM430 0c-20 0 -32 12 -32 33s17 34 32 34c8 0 15 -4 21 -12 c7 -4 10 -11 10 -22c0 -16 -14 -33 -31 -33zM904 0c-18 0 -31 12 -33 28c0 11 3 19 10 23c6 7 14 10 23 10c8 0 16 -3 24 -9c5 -6 7 -14 7 -24c0 -17 -14 -28 -31 -28z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E047.xml b/data/Leipzig/E047.xml
new file mode 100644
index 00000000000..fc521039882
--- /dev/null
+++ b/data/Leipzig/E047.xml
@@ -0,0 +1 @@
+<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M108 474c-22 0 -38 -30 -38 -56c0 -54 73 -85 140 -116l138 205h41l-146 -221c41 -21 73 -44 96 -67c28 -29 42 -62 42 -97c0 -68 -54 -122 -124 -122c-40 0 -76 33 -76 73c0 22 21 38 43 38c23 0 34 -17 39 -38c6 -23 16 -34 31 -34c27 0 42 23 42 54c0 13 -3 23 -8 32 c-9 17 -33 36 -72 57l-60 30l-134 -208h-40l141 223c-49 23 -85 50 -109 80c-21 27 -32 55 -32 84c0 47 25 80 54 102c17 13 37 20 58 20c46 0 91 -32 91 -77c0 -22 -23 -36 -45 -36c-19 0 -30 8 -35 25l-7 23c-5 17 -15 26 -30 26zM75 192c0 -21 -16 -38 -36 -38 c-23 0 -39 13 -39 35c0 21 15 39 36 39c22 0 39 -15 39 -36zM337 322c0 24 16 38 37 38c23 0 37 -19 37 -37c0 -23 -17 -37 -37 -37c-23 0 -37 17 -37 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E048.xml b/data/Leipzig/E048.xml
new file mode 100644
index 00000000000..c61b6768fbe
--- /dev/null
+++ b/data/Leipzig/E048.xml
@@ -0,0 +1 @@
+<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M537 233h-64c0 -16 -4 -40 -13 -73l-14 -39l-16 -31c-13 -17 -30 -40 -47 -53c-22 -17 -57 -27 -97 -37v-73h-35v73l-39 6c-9 1 -16 3 -23 6c-57 31 -89 74 -111 148l-13 39v34h-65v40h65c0 34 2 43 12 73c6 24 18 52 30 70l23 30l24 25c21 16 30 23 61 28 c12 2 24 4 36 7v74h35v-74c21 -3 46 -4 61 -13c13 -5 25 -13 35 -22c16 -13 32 -32 48 -55c13 -23 43 -107 43 -143h64v-40zM369 273l-2 22v37c0 17 -3 37 -9 58c-6 35 -38 81 -72 81v-198h83zM251 273v198c-15 0 -30 -9 -46 -26c-15 -19 -24 -36 -27 -52 c-3 -18 -5 -36 -8 -54v-36c0 -13 -2 -23 -3 -30h84zM370 233h-84v-196c15 0 31 8 46 24c13 15 22 33 26 54l9 62zM251 37v196h-84v-21v-37c0 -42 15 -87 37 -114c15 -16 31 -24 47 -24z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E049.xml b/data/Leipzig/E049.xml
new file mode 100644
index 00000000000..903eb9ff943
--- /dev/null
+++ b/data/Leipzig/E049.xml
@@ -0,0 +1 @@
+<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M537 233h-64v-233h-187v-73h-35v73h-186v199v34h-65v40h65v233h186v74h35v-74h187v-233h64v-40zM369 273v198h-83v-198h83zM251 273v198h-84v-198h84zM370 233h-84v-196h83zM251 37v196h-84v-196h84z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E04B.xml b/data/Leipzig/E04B.xml
new file mode 100644
index 00000000000..75a91435d82
--- /dev/null
+++ b/data/Leipzig/E04B.xml
@@ -0,0 +1 @@
+<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 643l66 -38v146l-66 37v-145zM320 572c29 8 60 36 60 72c0 27 -16 54 -34 63l-64 38v-148zM159 381v149l-37 22c-19 0 -28 -7 -39 -19c-15 -13 -22 -26 -22 -37c0 -36 18 -63 39 -78zM187 375l66 -36v144l-66 37v-145zM320 305c32 5 60 32 60 68c0 29 -12 51 -36 67 l-62 36v-146zM159 924v38h28v-53l66 -35v88h29v-99c33 -14 59 -28 78 -41c41 -25 79 -63 82 -126c0 -10 -2 -20 -5 -29l-6 -16c-5 -13 -11 -25 -18 -34c-6 -11 -17 -22 -26 -32l-31 -32c22 -12 39 -25 51 -39c13 -13 21 -27 25 -42c7 -13 10 -32 10 -56 c0 -56 -29 -100 -86 -131c27 -19 50 -38 67 -59s26 -45 27 -74c0 -41 -11 -69 -30 -95c-19 -29 -45 -51 -77 -67c-29 -13 -62 -22 -99 -24c-43 0 -57 4 -95 16c-47 13 -103 45 -105 96l2 13c5 25 19 37 42 37h13c15 -2 33 -17 54 -44c23 -30 38 -50 61 -65 c7 -4 26 -9 34 -12c4 -1 9 -2 16 -1c42 0 73 21 91 45c8 13 12 27 12 40l-3 22c-1 8 -4 16 -9 23c-17 31 -43 48 -75 65v-37h-29v53l-66 32v-85h-28v98l-50 26c-14 8 -43 27 -55 38c-15 12 -28 27 -37 44l-12 29c-2 8 -3 13 -3 16s0 8 -1 15l2 20c9 38 30 65 53 90l32 32 c-32 19 -55 39 -68 58c-13 21 -19 47 -19 78c0 33 8 59 23 78s37 38 66 56c-27 17 -49 37 -65 60s-24 53 -25 90c0 34 10 63 29 86c36 47 95 79 172 80c69 0 132 -21 169 -55c20 -18 30 -36 30 -54l-2 -15c-7 -29 -22 -44 -46 -44c-15 0 -27 4 -34 11c-10 10 -39 53 -54 69 c-7 7 -15 15 -25 23c-17 11 -39 18 -65 21c-31 0 -56 -8 -73 -23c-15 -15 -29 -30 -30 -57l1 -5c0 -46 51 -89 87 -105zM161 649v148l-37 23c-13 -2 -23 -6 -30 -13c-7 -10 -10 -16 -15 -28l-11 -30v-10c0 -14 1 -18 9 -30c7 -11 15 -20 23 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E050.xml b/data/Leipzig/E050.xml
new file mode 100644
index 00000000000..bb907603b16
--- /dev/null
+++ b/data/Leipzig/E050.xml
@@ -0,0 +1 @@
+<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M441 -245c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 54 15 111 45 170c29 57 65 106 110 148s96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 82 89 82 c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c59 -43 92 -104 98 -184c1 -7 1 -15 1 -22c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162 c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 29 7 55 20 76c18 28 45 42 79 44h6c49 0 93 -42 97 -87v-9c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85 c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8c-4 53 -22 81 -55 81h-2zM406 119l54 -326c73 25 110 78 110 161c0 7 0 15 -1 23c-7 95 -57 142 -151 142h-12 zM382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13c5 -68 35 -127 93 -176 s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E051.xml b/data/Leipzig/E051.xml
new file mode 100644
index 00000000000..0840721dc59
--- /dev/null
+++ b/data/Leipzig/E051.xml
@@ -0,0 +1 @@
+<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M224 -392c52 0 98 -44 98 -96c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -2 42 -5 67c-9 53 -18 106 -26 159c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-28 47 -49 116 -49 197 c0 125 83 249 155 316c45 42 96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 81 89 82c21 0 43 -30 69 -92c29 -69 41 -117 41 -174c0 -110 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2 c58 0 102 -12 133 -35c63 -46 99 -113 99 -206c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162c4 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-24 -45 -58 -75 -99 -91h9h28c22 0 39 0 39 -4c0 -22 -34 -34 -55 -38l-29 -6c-11 -2 -22 -4 -34 -7l-14 -3c-5 -4 -7 -19 -7 -26 c0 -1 1 -3 4 -3c8 0 22 3 31 3c24 0 31 -12 43 -12l3 -3c15 -11 23 -33 23 -55c0 -60 -58 -97 -112 -97c-31 0 -62 20 -62 58c0 16 8 27 23 31h4c14 0 24 -12 24 -26c0 -15 -14 -18 -17 -36c0 -11 17 -14 29 -14c15 1 40 10 60 67c5 14 7 24 7 32c0 28 -22 32 -33 32 c-27 0 -47 -27 -57 -27c-11 0 -11 4 -11 9c0 13 23 83 38 112c-8 0 -17 0 -25 1c-10 -26 -86 -197 -87 -205c0 -21 27 -11 27 -22c0 -5 -5 -9 -12 -9c-5 1 -11 1 -17 1c-19 0 -43 -2 -64 -2c-22 0 -39 2 -39 10c8 18 29 -7 47 30c8 16 39 95 39 97c0 0 2 5 2 9s-1 7 -7 7 c-10 0 -14 -19 -34 -19c-6 0 -11 3 -11 8c0 2 0 3 2 6c6 7 80 93 87 99c1 1 3 2 4 3c-10 3 -19 8 -29 13c-54 26 -80 62 -80 117c0 66 40 119 104 119zM518 850c0 56 -22 89 -55 89h-2c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128 c40 53 60 100 60 140zM570 -46c0 109 -52 165 -152 165h-12l54 -326c73 25 110 78 110 161zM254 -3c0 -51 41 -105 75 -122c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73 c-50 -44 -86 -84 -109 -119c-45 -68 -68 -128 -68 -180c0 -78 33 -140 94 -191c58 -49 125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331c-72 -2 -128 -47 -128 -120z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E052.xml b/data/Leipzig/E052.xml
new file mode 100644
index 00000000000..2326ab611b1
--- /dev/null
+++ b/data/Leipzig/E052.xml
@@ -0,0 +1 @@
+<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13 c5 -68 35 -127 93 -176s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331zM406 119l54 -326c73 25 110 78 110 161c0 7 0 15 -1 23c-7 95 -57 142 -151 142h-12zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8 c-4 53 -22 81 -55 81h-2zM441 -245c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 54 15 111 45 170c29 57 65 106 110 148s96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257 c34 54 64 82 89 82c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c59 -43 92 -104 98 -184c1 -7 1 -15 1 -22c0 -123 -87 -209 -181 -248 c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-25 -46 -59 -77 -102 -92c21 -1 85 -13 85 -60c0 -35 -22 -43 -31 -50c-6 -5 -8 -10 -8 -16s0 -11 4 -16c6 -11 9 -22 9 -34c0 -27 -18 -53 -46 -65c-11 -4 -27 -6 -41 -6c-34 0 -82 21 -90 58 c-1 5 -2 8 -2 12c0 28 25 57 51 66c4 1 6 2 6 5c0 2 -1 3 -2 3c-11 13 -16 27 -16 41c0 21 11 40 30 51h-5c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 29 7 55 20 76c18 28 45 42 79 44h6c49 0 93 -42 97 -87v-9c0 -51 -34 -86 -105 -106 c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159zM315 -781c-3 -2 -6 -5 -7 -8c-6 -8 -10 -19 -10 -30c0 -2 0 -4 1 -7c7 -32 34 -52 53 -52c20 0 37 20 37 36c0 5 -2 9 -4 14c-5 13 -14 24 -25 34c-6 5 -11 10 -17 14 c-4 2 -9 6 -14 6c-6 0 -11 -3 -14 -7zM349 -685c0 -14 10 -25 18 -34c8 -8 16 -18 26 -25c5 -2 10 -4 13 -4c17 0 22 30 23 48c0 9 -3 20 -9 26c-8 9 -23 14 -40 14c-15 -1 -29 -8 -31 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E053.xml b/data/Leipzig/E053.xml
new file mode 100644
index 00000000000..476ff3fb759
--- /dev/null
+++ b/data/Leipzig/E053.xml
@@ -0,0 +1 @@
+<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13 c5 -68 35 -127 93 -176s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331zM406 119l54 -326c73 25 110 78 110 161c0 7 0 15 -1 23c-7 95 -57 142 -151 142h-12zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8 c-4 53 -22 81 -55 81h-2zM441 -245c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 54 15 111 45 170c29 57 65 106 110 148s96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257 c22 35 43 59 61 72c-29 7 -61 26 -67 55c-1 5 -2 8 -2 12c0 28 25 57 51 66c4 1 6 2 6 5c0 2 -1 3 -2 3c-11 13 -16 27 -16 41c0 24 14 46 40 56c10 5 22 6 34 6h4c16 0 88 -10 88 -60c0 -35 -22 -43 -31 -50c-6 -5 -8 -10 -8 -16s0 -11 4 -16c6 -11 9 -22 9 -34 c0 -27 -18 -53 -46 -65c-4 -1 -9 -3 -14 -4c15 -14 30 -40 47 -81c26 -62 39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c59 -43 92 -104 98 -184c1 -7 1 -15 1 -22 c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 29 7 55 20 76c18 28 45 42 79 44h6c49 0 93 -42 97 -87v-9 c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159zM405 1179c-3 -2 -6 -5 -7 -8c-6 -8 -10 -19 -10 -30c0 -2 0 -4 1 -7c7 -30 31 -50 50 -52c3 1 5 1 8 1h3c16 4 29 21 29 35c0 5 -2 9 -4 14 c-5 13 -14 24 -25 34c-6 5 -11 10 -17 14c-4 2 -9 6 -14 6c-6 0 -11 -3 -14 -7zM439 1275c0 -14 10 -25 18 -34c8 -8 16 -18 26 -25c5 -2 10 -4 13 -4c17 0 22 30 23 48c0 9 -3 20 -9 26c-8 9 -23 14 -40 14c-15 -1 -29 -8 -31 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E054.xml b/data/Leipzig/E054.xml
new file mode 100644
index 00000000000..a0c7623782e
--- /dev/null
+++ b/data/Leipzig/E054.xml
@@ -0,0 +1 @@
+<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 -3c0 -51 41 -105 75 -122c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182c0 -77 33 -138 93 -189c58 -49 125 -73 203 -73 c25 0 50 3 75 9c-19 111 -36 221 -54 331c-72 -2 -128 -47 -128 -120zM570 -46c0 109 -51 165 -152 165h-12l54 -326c73 25 110 78 110 161zM518 850c0 56 -22 89 -55 89h-2c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140z M225 -392c51 0 97 -45 97 -96s-34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-27 46 -49 115 -49 195c0 126 84 251 155 318 c45 42 96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c15 25 30 43 44 57h-6c-18 0 -42 -2 -63 -2c-23 0 -42 2 -42 11c8 18 29 -7 47 30c8 16 39 95 39 97c0 0 2 5 2 9s-1 7 -7 7c-10 0 -14 -19 -34 -19c-6 0 -11 3 -11 8c0 2 0 3 2 6 c6 7 80 93 87 99s11 9 16 9c10 0 17 -11 33 -11c6 0 11 4 14 4c4 0 5 -1 5 -5v-4c-1 -7 -87 -200 -88 -208c0 -15 14 -14 22 -17c10 7 20 11 29 11h1c-5 8 -7 18 -7 30c0 16 8 27 23 31h4c14 0 24 -12 24 -26c0 -15 -14 -18 -17 -36c0 -11 17 -14 29 -14c15 1 40 10 60 67 c5 14 7 24 7 32c0 28 -22 32 -33 32c-27 0 -47 -27 -57 -27c-11 0 -11 4 -11 9c0 16 36 123 48 125h65h28c22 0 39 0 39 -4c0 -22 -34 -34 -55 -38l-29 -6c-11 -2 -22 -4 -34 -7l-14 -3c-5 -4 -7 -19 -7 -26c0 -1 1 -3 4 -3c8 0 22 3 31 3c24 0 31 -12 43 -12l3 -3 c15 -11 23 -33 23 -55c0 -60 -58 -97 -112 -97c-7 0 -15 1 -22 3c11 -15 23 -38 35 -67c26 -62 39 -115 41 -159v-15c0 -110 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c63 -46 99 -113 99 -206 c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-37 -68 -93 -104 -174 -104c-36 0 -72 10 -108 27c-53 25 -80 61 -80 115c0 69 39 121 105 121z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E055.xml b/data/Leipzig/E055.xml
new file mode 100644
index 00000000000..79329dca733
--- /dev/null
+++ b/data/Leipzig/E055.xml
@@ -0,0 +1 @@
+<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13 c5 -68 35 -127 93 -176s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8c-4 53 -22 81 -55 81h-2zM120 -512c0 68 38 116 99 120h6c49 0 93 -42 97 -87v-9 c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 127 82 250 155 318 c45 42 96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 82 89 82c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2h5c28 74 73 136 127 186 c45 42 96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 82 89 82c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35 c63 -46 99 -113 99 -206c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 68 38 116 99 120h6c49 0 93 -42 97 -87v-9 c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159c-23 -4 -48 -6 -76 -6c-108 0 -148 25 -207 63c-26 -21 -55 -39 -85 -51c8 -57 17 -110 25 -162c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70 c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11zM774 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-32 15 -59 35 -80 60c-13 -36 -33 -66 -59 -92c53 -38 113 -56 181 -56c25 0 50 3 75 9 c-19 111 -36 221 -54 331zM962 -46c0 109 -50 165 -152 165h-12l54 -326c73 25 110 78 110 161zM853 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8c-4 53 -22 81 -55 81h-2zM544 -145c17 26 26 59 26 99 c0 88 -33 143 -100 159c-9 -26 -13 -51 -13 -74v-13c5 -66 33 -123 87 -171zM528 227c38 -22 67 -52 87 -88c16 28 39 51 61 68c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-47 -42 -82 -80 -105 -113zM438 -73l22 -134c26 9 48 22 65 38c-37 28 -69 59 -87 96z "/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E056.xml b/data/Leipzig/E056.xml
new file mode 100644
index 00000000000..153bb8ca5e9
--- /dev/null
+++ b/data/Leipzig/E056.xml
@@ -0,0 +1 @@
+<symbol id="E056" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M483 485h180c10 0 10 0 10 10v380h90c0 -50 -50 -25 -50 -50v-410c0 -10 0 -10 -10 -10h-220c-10 0 -10 0 -10 10v60c0 10 0 10 10 10zM483 265c-10 0 -10 0 -10 10v60c0 10 0 10 10 10h220c10 0 10 0 10 -10v-410c0 -25 50 0 50 -50h-90v380c0 10 0 10 -10 10h-180z M441 -245c-23 -4 -48 -6 -76 -6c-59 0 -102 7 -130 20c-88 42 -150 93 -187 154c-26 44 -43 103 -48 176c0 6 -1 13 -1 19c0 54 15 111 45 170c29 57 65 106 110 148s96 85 153 127c-3 16 -8 46 -13 92c-4 43 -5 73 -5 89c0 117 16 172 69 257c34 54 64 82 89 82 c21 0 43 -30 69 -92s39 -115 41 -159v-15c0 -109 -21 -162 -67 -241c-13 -20 -63 -90 -98 -118c-13 -9 -25 -19 -37 -29l31 -181c8 1 18 2 28 2c58 0 102 -12 133 -35c59 -43 92 -104 98 -184c1 -7 1 -15 1 -22c0 -123 -87 -209 -181 -248c8 -57 17 -110 25 -162 c5 -31 6 -58 6 -80c0 -30 -5 -53 -14 -70c-35 -64 -88 -99 -158 -103c-5 0 -11 -1 -16 -1c-37 0 -72 10 -108 27c-50 24 -77 59 -80 105v11c0 29 7 55 20 76c18 28 45 42 79 44h6c49 0 93 -42 97 -87v-9c0 -51 -34 -86 -105 -106c17 -24 51 -36 102 -36c62 0 116 43 140 85 c9 16 13 41 13 74c0 20 -1 42 -5 67c-8 53 -18 106 -26 159zM461 939c-95 0 -135 -175 -135 -286c0 -24 2 -48 5 -71c50 39 92 82 127 128c40 53 60 100 60 140v8c-4 53 -22 81 -55 81h-2zM406 119l54 -326c73 25 110 78 110 161c0 7 0 15 -1 23c-7 95 -57 142 -151 142h-12 zM382 117c-72 -2 -128 -47 -128 -120v-7c2 -46 43 -99 75 -115c-3 -2 -7 -5 -10 -10c-70 33 -116 88 -123 172v11c0 68 44 126 88 159c23 17 49 29 78 36l-29 170c-21 -13 -52 -37 -92 -73c-50 -44 -86 -84 -109 -119c-45 -69 -67 -130 -67 -182v-13c5 -68 35 -127 93 -176 s125 -73 203 -73c25 0 50 3 75 9c-19 111 -36 221 -54 331z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E05C.xml b/data/Leipzig/E05C.xml
new file mode 100644
index 00000000000..986961f4fd9
--- /dev/null
+++ b/data/Leipzig/E05C.xml
@@ -0,0 +1 @@
+<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M175 0v502h43v-456c13 7 25 18 37 29c10 12 20 24 27 38c6 14 10 31 14 49c3 20 5 41 5 62c7 -35 32 -54 73 -60c78 19 99 68 100 165c0 44 -9 77 -31 100c-18 23 -41 35 -69 35c-43 0 -65 -37 -66 -84c7 15 19 18 39 24c6 0 10 -2 16 -4l17 -10l10 -14l7 -18 c-4 -32 -23 -48 -56 -48c-56 0 -77 39 -77 98c8 28 13 44 30 61c7 7 14 13 23 17c3 3 22 9 27 11l34 3l35 2c120 0 190 -61 190 -178l3 -33c0 -52 -20 -97 -60 -134c-20 -17 -45 -29 -74 -39c-31 -9 -64 -13 -101 -13l-93 -88v-34l93 -88c37 0 70 -4 101 -13 c29 -10 54 -22 74 -39c40 -37 60 -82 60 -134l-3 -33c0 -117 -70 -178 -190 -178l-35 2l-34 3c-5 2 -24 8 -27 11c-31 13 -43 42 -53 78c0 59 21 98 77 98c33 0 52 -16 56 -48l-7 -18l-10 -14l-17 -10c-6 -2 -10 -4 -16 -4c-20 6 -32 9 -39 24c1 -47 23 -84 66 -84 c28 0 51 12 69 35c22 23 31 56 31 100c-1 97 -22 146 -100 165c-41 -6 -66 -25 -73 -60c0 21 -2 42 -5 62c-4 18 -8 35 -14 49c-7 14 -17 26 -27 38c-12 11 -24 22 -37 29v-456h-43v502zM0 502h118v-502v-502h-118v502v502z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E05D.xml b/data/Leipzig/E05D.xml
new file mode 100644
index 00000000000..b52dc253acc
--- /dev/null
+++ b/data/Leipzig/E05D.xml
@@ -0,0 +1 @@
+<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M380 -545c0 27 -21 40 -49 40c-15 0 -31 -8 -31 -25c0 -14 10 -25 18 -34c8 -8 16 -18 26 -25c5 -2 10 -4 13 -4c17 0 23 30 23 48zM266 -626c-3 -2 -6 -5 -7 -8c-6 -8 -10 -19 -10 -30c0 -2 0 -4 1 -7c7 -32 34 -52 53 -52c20 0 37 20 37 36c0 5 -2 9 -4 14 c-7 19 -25 37 -42 48c-4 2 -9 6 -14 6c-6 0 -11 -3 -14 -7zM0 502h118v-1004h-118v1004zM303 -735c-36 0 -92 24 -92 70c0 28 25 57 51 66c4 1 6 2 6 5c0 2 -1 3 -2 3c-11 13 -16 27 -16 41c0 34 29 61 71 62c-2 1 -3 1 -4 2c-31 13 -43 42 -53 78c0 59 21 98 77 98 c33 0 52 -16 56 -48l-7 -18l-10 -14l-17 -10c-6 -2 -10 -4 -16 -4c-20 6 -32 9 -39 24c1 -47 23 -84 66 -84c28 0 50 13 69 35c21 24 31 56 31 100c-1 97 -22 146 -100 165c-41 -6 -66 -25 -73 -60c0 89 -26 146 -83 178v-456h-43v1004h43v-456c57 32 83 89 83 178 c7 -35 32 -54 73 -60c78 19 99 68 100 165c0 44 -10 76 -31 100c-19 22 -41 35 -69 35c-43 0 -65 -37 -66 -84c7 15 19 18 39 24c6 0 10 -2 16 -4l17 -10l10 -14l7 -18c-4 -32 -23 -48 -56 -48c-56 0 -77 39 -77 98c10 36 22 65 53 78c3 3 22 9 27 11l34 3l35 2 c120 0 190 -61 190 -178l3 -33c0 -52 -19 -98 -60 -134c-40 -35 -101 -52 -175 -52l-93 -88v-34l93 -88c74 0 135 -17 175 -52c41 -36 60 -82 60 -134l-3 -33c0 -114 -66 -178 -180 -178h-10l-32 1c19 -9 35 -23 35 -47c0 -35 -22 -43 -31 -50c-6 -5 -8 -10 -8 -16 s1 -11 4 -16c7 -11 9 -22 9 -34c0 -27 -18 -53 -46 -65c-11 -4 -27 -6 -41 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E062.xml b/data/Leipzig/E062.xml
new file mode 100644
index 00000000000..e1c6fa6e59c
--- /dev/null
+++ b/data/Leipzig/E062.xml
@@ -0,0 +1 @@
+<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 96c51 0 73 -14 88 -49l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c30 52 71 79 137 93l36 6l26 2c154 0 235 -68 274 -182c11 -32 18 -68 18 -107 c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44 c-48 0 -84 -8 -113 -28c-28 -19 -42 -44 -42 -73v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM642 177c31 0 56 -27 56 -58 c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E063.xml b/data/Leipzig/E063.xml
new file mode 100644
index 00000000000..cfcd744ef03
--- /dev/null
+++ b/data/Leipzig/E063.xml
@@ -0,0 +1 @@
+<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 96c51 0 73 -14 88 -49l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c30 52 71 79 137 93l36 6l26 2c154 0 235 -68 274 -182c11 -32 18 -68 18 -107 c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44 c-48 0 -84 -8 -113 -28c-28 -19 -42 -44 -42 -73v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM642 177c31 0 56 -27 56 -58 c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35zM254 -752h-104c-5 0 -11 3 -11 9c2 5 3 8 11 8s18 3 18 3s9 2 17 18s36 93 36 93s2 5 2 9c0 3 -1 6 -6 6c-4 0 -8 -3 -12 -8s-11 -10 -20 -10c-7 0 -12 3 -12 8c0 2 0 3 2 5c6 7 78 90 83 95 c7 7 12 10 16 10s11 -4 16 -8c5 -3 9 -4 16 -4c5 0 10 4 13 4c4 0 5 -1 5 -4v-4c-2 -6 -83 -192 -84 -200c0 -6 4 -14 13 -14c6 0 12 -2 12 -7s-4 -9 -11 -9zM305 -669h4c13 0 23 -11 23 -25c0 -5 -2 -11 -5 -15c-5 -6 -10 -9 -12 -17v-2c0 -11 17 -14 26 -14h2 c15 0 38 10 58 65c4 13 6 22 6 31c0 26 -20 30 -32 30c-18 0 -38 -19 -46 -24c-2 -2 -5 -2 -8 -2c-4 0 -7 1 -7 1c-2 1 -3 4 -3 7c0 4 1 8 1 10c0 1 1 1 1 2c4 18 13 36 19 54c3 9 12 27 12 34c2 7 6 19 13 20h62s55 0 63 -1c1 0 1 -1 1 -2c0 -4 -5 -12 -6 -13 c-2 -4 -6 -7 -9 -9c-4 -3 -8 -6 -13 -8c-8 -3 -16 -5 -25 -7c-9 -1 -18 -3 -27 -5c-11 -3 -22 -3 -33 -7c-4 -1 -9 -2 -13 -4c-5 -3 -6 -11 -6 -17c-1 -2 -1 -4 -1 -6s0 -3 2 -4l1 -1c2 0 5 2 8 2c2 1 4 1 6 1c6 1 12 1 17 1c22 0 30 -5 41 -12l2 -2c11 -8 16 -19 20 -32 c2 -6 3 -14 3 -22s-1 -16 -2 -22c-5 -24 -25 -42 -46 -54c-17 -9 -39 -17 -59 -17c-15 0 -30 4 -41 13s-19 27 -19 43c0 12 5 23 16 28c2 1 4 1 6 2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E064.xml b/data/Leipzig/E064.xml
new file mode 100644
index 00000000000..7919efed85f
--- /dev/null
+++ b/data/Leipzig/E064.xml
@@ -0,0 +1 @@
+<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 96c51 0 73 -14 88 -49l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c30 52 71 79 137 93l36 6l26 2c154 0 235 -68 274 -182c11 -32 18 -68 18 -107 c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44 c-48 0 -84 -8 -113 -28c-28 -19 -42 -44 -42 -73v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM642 177c31 0 56 -27 56 -58 c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35zM232 -572c0 33 29 59 71 59h5c15 0 84 -10 84 -57c0 -34 -21 -41 -30 -49c-6 -5 -8 -10 -8 -15s1 -10 4 -15c6 -10 8 -21 8 -32c0 -27 -16 -52 -43 -63c-12 -4 -27 -6 -39 -6c-35 0 -89 23 -89 67 c0 27 24 55 49 63c5 2 6 3 6 5s-1 3 -2 4c-11 11 -16 25 -16 39zM358 -567c0 25 -22 38 -46 38h-2c-15 -1 -28 -8 -30 -24v-2c0 -12 10 -23 17 -31c9 -9 23 -28 38 -28c17 0 22 29 23 44v3zM261 -638c-18 0 -29 -25 -29 -43v-7c7 -32 33 -50 51 -50c20 0 35 18 35 34 c0 5 -1 9 -3 13c-5 13 -13 24 -24 33c-5 5 -11 9 -16 14c-4 2 -9 6 -14 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E065.xml b/data/Leipzig/E065.xml
new file mode 100644
index 00000000000..c2279647ac0
--- /dev/null
+++ b/data/Leipzig/E065.xml
@@ -0,0 +1 @@
+<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M642 177c31 0 56 -27 56 -58c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM158 96c51 0 73 -14 88 -49 l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c30 52 71 79 137 93l36 6l26 2c34 0 65 -4 92 -10c-13 9 -23 22 -26 37c-1 5 -2 8 -2 12c0 28 25 57 51 66c4 1 6 2 6 5 c0 2 -1 3 -2 3c-11 13 -16 27 -16 41c0 24 14 46 40 56c10 5 22 6 34 6h4c16 0 88 -10 88 -60c0 -35 -22 -43 -31 -50c-6 -5 -8 -10 -8 -16s0 -11 4 -16c6 -11 9 -22 9 -34c0 -27 -18 -53 -46 -65c-11 -4 -27 -6 -41 -6h-5c61 -30 99 -82 123 -151c11 -32 18 -68 18 -107 c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44 c-48 0 -84 -8 -113 -28c-28 -19 -42 -44 -42 -73v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39zM355 329c-3 -2 -6 -5 -7 -8c-6 -8 -10 -19 -10 -30c0 -2 0 -4 1 -7c7 -32 34 -52 53 -52c20 0 37 20 37 36c0 5 -2 9 -4 14c-5 13 -14 24 -25 34c-6 5 -11 10 -17 14 c-4 2 -9 6 -14 6c-6 0 -11 -3 -14 -7zM389 425c0 -14 10 -25 18 -34c8 -8 16 -18 26 -25c5 -2 10 -4 13 -4c17 0 22 30 23 48c0 9 -3 20 -9 26c-8 9 -23 14 -40 14c-15 -1 -29 -8 -31 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E066.xml b/data/Leipzig/E066.xml
new file mode 100644
index 00000000000..fcbc1a6820b
--- /dev/null
+++ b/data/Leipzig/E066.xml
@@ -0,0 +1 @@
+<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M642 177c31 0 56 -27 56 -58c0 -30 -25 -58 -56 -58l-23 3c-19 7 -34 32 -34 55l3 23c9 20 28 35 54 35zM585 -118c0 32 23 58 57 58c18 0 33 -6 40 -18c9 -15 16 -18 16 -40c0 -9 -2 -16 -5 -21c-6 -19 -27 -37 -51 -37c-34 0 -57 26 -57 58zM225 185 c-78 0 -155 -30 -155 -101v-16c2 -5 3 -9 4 -11c24 22 52 39 84 39c51 0 73 -14 88 -49l16 -39c0 -17 -2 -30 -7 -40c-3 -11 -10 -21 -19 -31c-17 -18 -49 -43 -84 -43c-55 0 -77 13 -112 44c-24 21 -35 55 -35 100c0 46 14 81 32 112c28 49 94 81 152 96c2 4 3 6 4 6 s1 -2 2 -2s4 3 12 19s39 95 39 97c0 0 2 5 2 9s-1 7 -7 7c-10 0 -14 -19 -34 -19c-6 0 -11 3 -11 8c0 2 0 3 2 6c6 7 80 93 87 99s11 9 16 9c10 0 17 -11 33 -11c6 0 11 4 14 4c4 0 5 -1 5 -5v-4c-1 -7 -87 -200 -88 -208c0 -6 2 -9 5 -11c22 -2 42 -4 61 -9 c-12 10 -21 24 -21 44c0 16 8 27 23 31h4c14 0 24 -12 24 -26c0 -15 -14 -18 -17 -36c0 -11 17 -14 29 -14c15 1 40 10 60 67c5 14 7 24 7 32c0 28 -22 32 -33 32c-27 0 -47 -27 -57 -27c-11 0 -11 4 -11 9c0 16 36 123 48 125h65h28c22 0 39 0 39 -4c0 -22 -34 -34 -55 -38 l-29 -6c-11 -2 -22 -4 -34 -7l-14 -3c-5 -4 -7 -19 -7 -26c0 -1 1 -3 4 -3c8 0 22 3 31 3c24 0 31 -12 43 -12l3 -3c15 -11 23 -33 23 -55c0 -60 -58 -97 -112 -97c69 -29 113 -84 138 -158c11 -32 18 -68 18 -107c0 -103 -26 -182 -68 -250c-89 -145 -234 -230 -412 -288 l-30 -5c-9 0 -14 3 -14 8c3 10 5 11 10 16c35 15 70 30 96 44l78 43c96 57 162 136 197 258c9 33 17 60 22 100c3 22 5 35 6 39c-7 69 -16 115 -23 140s-4 22 -16 40c-8 12 -19 23 -31 34c-24 21 -62 44 -118 44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E069.xml b/data/Leipzig/E069.xml
new file mode 100644
index 00000000000..28ee32250ef
--- /dev/null
+++ b/data/Leipzig/E069.xml
@@ -0,0 +1 @@
+<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M200 250h125v-500h-125v500zM0 250h125v-500h-125v500z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E06A.xml b/data/Leipzig/E06A.xml
new file mode 100644
index 00000000000..0ead9c5cf05
--- /dev/null
+++ b/data/Leipzig/E06A.xml
@@ -0,0 +1 @@
+<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 395h257v-791h-257v791zM41 311v-622h174v622h-174z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E073.xml b/data/Leipzig/E073.xml
new file mode 100644
index 00000000000..dfd821b83e4
--- /dev/null
+++ b/data/Leipzig/E073.xml
@@ -0,0 +1 @@
+<symbol id="E073" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M204 -245c-8 -53 -18 -106 -26 -159c-4 -25 -5 -47 -5 -67c0 -33 4 -58 13 -74c24 -42 78 -85 140 -85c51 0 85 12 102 36c-71 20 -105 55 -105 106v9c4 45 48 87 97 87h6c34 -2 61 -16 79 -44c13 -21 20 -47 20 -76v-11c-3 -46 -30 -81 -80 -105 c-36 -17 -71 -27 -108 -27c-5 0 -11 1 -16 1c-70 4 -123 39 -158 103c-9 17 -14 40 -14 70c0 22 1 49 6 80c8 52 17 105 25 162c-94 39 -181 125 -181 248c0 7 0 15 1 22c6 80 39 141 98 184c31 23 75 35 133 35c10 0 20 -1 28 -2l31 181c-12 10 -24 20 -37 29 c-35 28 -85 98 -98 118c-46 79 -67 132 -67 241v15c2 44 15 97 41 159s48 92 69 92c25 0 55 -28 89 -82c53 -85 69 -140 69 -257c0 -16 -1 -46 -5 -89c-5 -46 -10 -76 -13 -92c57 -42 108 -85 153 -127s81 -91 110 -148c30 -59 45 -116 45 -170c0 -6 -1 -13 -1 -19 c-5 -73 -22 -132 -48 -176c-37 -61 -99 -112 -187 -154c-28 -13 -71 -20 -130 -20c-28 0 -53 2 -76 6zM184 939h-2c-33 0 -51 -28 -55 -81v-8c0 -40 20 -87 60 -140c35 -46 77 -89 127 -128c3 23 5 47 5 71c0 111 -40 286 -135 286zM239 119h-12c-94 0 -144 -47 -151 -142 c-1 -8 -1 -16 -1 -23c0 -83 37 -136 110 -161zM263 117c-18 -110 -35 -220 -54 -331c25 -6 50 -9 75 -9c78 0 145 24 203 73s88 108 93 176v13c0 52 -22 113 -67 182c-23 35 -59 75 -109 119c-40 36 -71 60 -92 73l-29 -170c29 -7 55 -19 78 -36c44 -33 88 -91 88 -159v-11 c-7 -84 -53 -139 -123 -172c-3 5 -7 8 -10 10c32 16 73 69 75 115v7c0 73 -56 118 -128 120z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E074.xml b/data/Leipzig/E074.xml
new file mode 100644
index 00000000000..c839fc17c58
--- /dev/null
+++ b/data/Leipzig/E074.xml
@@ -0,0 +1 @@
+<symbol id="E074" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M204 673c23 4 48 6 76 6c59 0 102 -7 130 -20c88 -42 150 -93 187 -154c26 -44 43 -103 48 -176c0 -6 1 -13 1 -19c0 -54 -15 -111 -45 -170c-29 -57 -65 -106 -110 -148s-96 -85 -153 -127c3 -16 8 -46 13 -92c4 -43 5 -73 5 -89c0 -117 -16 -172 -69 -257 c-34 -54 -64 -82 -89 -82c-21 0 -43 30 -69 92s-39 115 -41 159v15c0 109 21 162 67 241c13 20 63 90 98 118c13 9 25 19 37 29l-31 181c-8 -1 -18 -2 -28 -2c-58 0 -102 12 -133 35c-59 43 -92 104 -98 184c-1 7 -1 15 -1 22c0 123 87 209 181 248c-8 57 -17 110 -25 162 c-5 31 -6 58 -6 80c0 30 5 53 14 70c35 64 88 99 158 103c5 0 11 1 16 1c37 0 72 -10 108 -27c50 -24 77 -59 80 -105v-11c0 -29 -7 -55 -20 -76c-18 -28 -45 -42 -79 -44h-6c-49 0 -93 42 -97 87v9c0 51 34 86 105 106c-17 24 -51 36 -102 36c-62 0 -116 -43 -140 -85 c-9 -16 -13 -41 -13 -74c0 -20 1 -42 5 -67c8 -53 18 -106 26 -159zM184 -511c95 0 135 175 135 286c0 24 -2 48 -5 71c-50 -39 -92 -82 -127 -128c-40 -53 -60 -100 -60 -140v-8c4 -53 22 -81 55 -81h2zM239 309l-54 326c-73 -25 -110 -78 -110 -161c0 -7 0 -15 1 -23 c7 -95 57 -142 151 -142h12zM263 311c72 2 128 47 128 120v7c-2 46 -43 99 -75 115c3 2 7 5 10 10c70 -33 116 -88 123 -172v-11c0 -68 -44 -126 -88 -159c-23 -17 -49 -29 -78 -36l29 -170c21 13 52 37 92 73c50 44 86 84 109 119c45 69 67 130 67 182v13 c-5 68 -35 127 -93 176s-125 73 -203 73c-25 0 -50 -3 -75 -9c19 -111 36 -221 54 -331z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E075.xml b/data/Leipzig/E075.xml
new file mode 100644
index 00000000000..6b6de9e38cb
--- /dev/null
+++ b/data/Leipzig/E075.xml
@@ -0,0 +1 @@
+<symbol id="E075" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M431 0v-502h-43v456c-13 -7 -25 -18 -37 -29c-10 -12 -20 -24 -27 -38c-6 -14 -10 -31 -14 -49c-3 -20 -5 -41 -5 -62c-7 35 -32 54 -73 60c-78 -19 -99 -68 -100 -165c0 -44 9 -77 31 -100c18 -23 41 -35 69 -35c43 0 65 37 66 84c-7 -15 -19 -18 -39 -24 c-6 0 -10 2 -16 4l-17 10l-10 14l-7 18c4 32 23 48 56 48c56 0 77 -39 77 -98c-10 -36 -22 -65 -53 -78c-3 -3 -22 -9 -27 -11l-34 -3l-35 -2c-120 0 -190 61 -190 178l-3 33c0 52 20 97 60 134c20 17 45 29 74 39c31 9 64 13 101 13l93 88v34l-93 88c-37 0 -70 4 -101 13 c-29 10 -54 22 -74 39c-40 37 -60 82 -60 134l3 33c0 117 70 178 190 178l35 -2l34 -3c5 -2 24 -8 27 -11c9 -4 16 -10 23 -17c17 -17 22 -33 30 -61c0 -59 -21 -98 -77 -98c-33 0 -52 16 -56 48l7 18l10 14l17 10c6 2 10 4 16 4c20 -6 32 -9 39 -24c-1 47 -23 84 -66 84 c-28 0 -51 -12 -69 -35c-22 -23 -31 -56 -31 -100c1 -97 22 -146 100 -165c41 6 66 25 73 60c0 -21 2 -42 5 -62c4 -18 8 -35 14 -49c7 -14 17 -26 27 -38c12 -11 24 -22 37 -29v456h43v-502zM606 502v-502v-502h-118v502v502h118z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E076.xml b/data/Leipzig/E076.xml
new file mode 100644
index 00000000000..febfd9bfb21
--- /dev/null
+++ b/data/Leipzig/E076.xml
@@ -0,0 +1 @@
+<symbol id="E076" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M544 96c32 0 60 -17 84 -39c1 2 2 6 4 11v16c0 29 -14 54 -42 73c-29 20 -65 28 -113 28c-56 0 -94 -23 -118 -44c-12 -11 -23 -22 -31 -34c-12 -18 -9 -15 -16 -40s-16 -71 -23 -140c1 -4 3 -17 6 -39c5 -40 13 -67 22 -100c35 -122 101 -201 197 -258l78 -43 c26 -14 61 -29 96 -44c5 -5 7 -6 10 -16c0 -5 -5 -8 -14 -8l-30 5c-178 58 -323 143 -412 288c-42 68 -68 147 -68 250c0 39 7 75 18 107c39 114 120 182 274 182l26 -2l36 -6c66 -14 107 -41 137 -93c18 -31 32 -66 32 -112c0 -45 -11 -79 -35 -100 c-35 -31 -57 -44 -112 -44c-35 0 -67 25 -84 43c-9 10 -16 20 -19 31c-5 10 -7 23 -7 40l16 39c15 35 37 49 88 49zM117 -118c0 -32 -23 -58 -57 -58c-24 0 -45 18 -51 37c-3 5 -5 12 -5 21c0 22 7 25 16 40c7 12 22 18 40 18c34 0 57 -26 57 -58zM60 177 c26 0 45 -15 54 -35l3 -23c0 -23 -15 -48 -34 -55l-23 -3c-31 0 -56 28 -56 58c0 31 25 58 56 58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E077.xml b/data/Leipzig/E077.xml
new file mode 100644
index 00000000000..39e2d82724f
--- /dev/null
+++ b/data/Leipzig/E077.xml
@@ -0,0 +1 @@
+<symbol id="E077" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M544 -426c-51 0 -73 14 -88 49l-16 39c0 17 2 30 7 40c3 11 10 21 19 31c17 18 49 43 84 43c55 0 77 -13 112 -44c24 -21 35 -55 35 -100c0 -46 -14 -81 -32 -112c-30 -52 -71 -79 -137 -93l-36 -6l-26 -2c-154 0 -235 68 -274 182c-11 32 -18 68 -18 107 c0 103 26 182 68 250c89 145 234 230 412 288l30 5c9 0 14 -3 14 -8c-3 -10 -5 -11 -10 -16c-35 -15 -70 -30 -96 -44l-78 -43c-96 -57 -162 -136 -197 -258c-9 -33 -17 -60 -22 -100c-3 -22 -5 -35 -6 -39c7 -69 16 -115 23 -140s4 -22 16 -40c8 -12 19 -23 31 -34 c24 -21 62 -44 118 -44c48 0 84 8 113 28c28 19 42 44 42 73v16c-2 5 -3 9 -4 11c-24 -22 -52 -39 -84 -39zM117 -212c0 -32 -23 -58 -57 -58c-18 0 -33 6 -40 18c-9 15 -16 18 -16 40c0 9 2 16 5 21c6 19 27 37 51 37c34 0 57 -26 57 -58zM60 -507c-31 0 -56 27 -56 58 c0 30 25 58 56 58l23 -3c19 -7 34 -32 34 -55l-3 -23c-9 -20 -28 -35 -54 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E080.xml b/data/Leipzig/E080.xml
new file mode 100644
index 00000000000..774c04eaa40
--- /dev/null
+++ b/data/Leipzig/E080.xml
@@ -0,0 +1 @@
+<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M229 251zM230 -250c-99 0 -210 94 -210 251c0 152 93 250 209 250s205 -119 205 -250c0 -139 -103 -251 -204 -251zM139 1c0 -79 13 -215 88 -215c68 0 84 112 84 215c0 76 -15 216 -84 216c-68 0 -88 -136 -88 -216z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E081.xml b/data/Leipzig/E081.xml
new file mode 100644
index 00000000000..e8ef10b512a
--- /dev/null
+++ b/data/Leipzig/E081.xml
@@ -0,0 +1 @@
+<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -250v36c23 0 40 6 49 18c8 14 12 33 12 57v250l-82 -129l-27 13l107 255h128v-394c0 -24 5 -42 14 -53s25 -17 47 -17v-36h-248z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E082.xml b/data/Leipzig/E082.xml
new file mode 100644
index 00000000000..c5831005195
--- /dev/null
+++ b/data/Leipzig/E082.xml
@@ -0,0 +1 @@
+<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M124 -185c-18 0 -55 -14 -65 -65h-36l-3 30c0 25 6 45 18 63c11 19 22 30 39 43l121 82l37 29c15 11 27 29 38 54c12 24 18 47 18 70c0 40 -19 88 -94 88c-25 0 -32 0 -50 -8c-14 -5 -23 -12 -26 -22c3 -9 7 -15 10 -18l24 -17c12 -7 17 -11 27 -21c5 -7 7 -16 7 -27 c0 -12 0 -57 -79 -74c-30 0 -76 26 -76 94c0 66 81 135 197 135c72 0 181 -32 181 -150c0 -53 -32 -95 -113 -133l-91 -41c-26 -11 -45 -23 -57 -37l49 7c84 0 115 -41 148 -41c20 0 33 20 39 61h35c0 -152 -68 -168 -114 -168c-17 0 -65 0 -79 7h10l-28 17 c-49 37 -69 40 -87 42z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E083.xml b/data/Leipzig/E083.xml
new file mode 100644
index 00000000000..851a0b47c86
--- /dev/null
+++ b/data/Leipzig/E083.xml
@@ -0,0 +1 @@
+<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 250c97 0 177 -52 177 -116c0 -69 -40 -111 -118 -125c56 -5 125 -44 125 -116c0 -31 -10 -57 -31 -78c-19 -21 -45 -38 -78 -49l-50 -11c-15 -3 -36 -7 -55 -7c-50 0 -86 16 -113 38c-16 10 -23 18 -34 34c-7 13 -11 25 -11 38c0 43 27 83 68 83l3 -2 c61 0 75 -42 75 -70c0 -19 -24 -42 -26 -57c7 -17 20 -25 37 -25c44 0 94 29 94 78c0 75 -34 125 -138 125v36c84 0 131 22 131 98c0 54 -37 88 -87 88c-26 0 -43 -7 -51 -22c15 -22 44 -16 44 -70c0 -37 -37 -62 -71 -62c-22 0 -69 15 -69 76c0 79 101 116 178 116z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E084.xml b/data/Leipzig/E084.xml
new file mode 100644
index 00000000000..87926416c61
--- /dev/null
+++ b/data/Leipzig/E084.xml
@@ -0,0 +1 @@
+<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -78c84 97 114 180 134 329h170c-13 -32 -82 -132 -99 -151l-84 -97c-33 -36 -59 -63 -80 -81h162v102l127 123v-225h57v-39h-57v-34c0 -43 19 -65 57 -65v-34h-244v36c48 0 60 26 60 70v27h-203v39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E085.xml b/data/Leipzig/E085.xml
new file mode 100644
index 00000000000..6d54d5adf44
--- /dev/null
+++ b/data/Leipzig/E085.xml
@@ -0,0 +1 @@
+<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M161 38c-14 0 -56 -5 -92 -51h-32l5 263c55 -11 108 -18 158 -18c40 0 85 6 134 17c-8 -52 -39 -114 -159 -114l-50 2c-19 2 -31 4 -49 10l-5 -111c38 26 81 39 129 39c94 0 177 -64 177 -159c0 -100 -98 -166 -211 -166c-88 0 -146 53 -146 115c0 53 39 83 75 83 c37 0 69 -32 69 -72c0 -4 -1 -10 -4 -18l-27 -37c-2 -3 -3 -8 -3 -14c0 -15 12 -23 36 -23c74 0 92 77 92 132s-35 122 -97 122z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E086.xml b/data/Leipzig/E086.xml
new file mode 100644
index 00000000000..b42ea710a86
--- /dev/null
+++ b/data/Leipzig/E086.xml
@@ -0,0 +1 @@
+<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M284 -91c0 37 -28 92 -67 92c-35 0 -65 -54 -65 -111c0 -52 22 -104 68 -104c47 0 64 68 64 123zM230 214c-36 0 -90 -33 -90 -184l2 -36c40 24 81 36 120 36c80 0 140 -48 140 -121c0 -99 -99 -159 -182 -159c-160 0 -200 173 -200 244c0 21 2 43 7 71l10 35 c26 85 73 115 98 126c41 19 74 24 103 24c93 0 142 -63 142 -105c0 -58 -52 -72 -73 -72c-33 0 -59 24 -65 35c-3 5 -6 14 -7 25l11 30c6 15 9 27 9 35c0 11 -9 16 -25 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E087.xml b/data/Leipzig/E087.xml
new file mode 100644
index 00000000000..d82df2b1842
--- /dev/null
+++ b/data/Leipzig/E087.xml
@@ -0,0 +1 @@
+<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M350 125c-11 -9 -53 -46 -95 -46c-18 2 -33 8 -44 17c-17 19 -33 34 -48 45c-13 11 -27 17 -42 17c-23 0 -45 -22 -64 -66h-37v155h37c4 -18 11 -28 21 -30c8 1 15 3 22 8l10 5l14 10c3 2 14 6 21 7l11 2c8 1 33 1 42 1c39 0 57 -7 90 -43c11 -15 26 -23 44 -26 c27 3 45 29 54 70l38 -1c-1 -9 -11 -88 -29 -124c-5 -13 -12 -28 -21 -46l-33 -60c-55 -92 -69 -162 -69 -270h-174c0 45 11 86 33 122c23 35 59 74 106 117c99 84 113 96 113 136z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E088.xml b/data/Leipzig/E088.xml
new file mode 100644
index 00000000000..1d39c75d726
--- /dev/null
+++ b/data/Leipzig/E088.xml
@@ -0,0 +1 @@
+<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M195 -214c76 0 88 58 90 68c0 34 -35 60 -57 73l-52 29c-21 10 -32 17 -34 20c-39 -33 -58 -54 -62 -92c5 -23 23 -98 115 -98zM301 135c0 61 -72 76 -113 76c-40 0 -77 -17 -77 -51c3 -21 15 -38 26 -50c17 -15 33 -26 48 -34l65 -28c34 27 51 56 51 87zM176 -250 c-57 0 -166 26 -166 132c0 47 30 86 89 116c-33 15 -79 60 -79 119c0 79 85 132 178 132h18c5 0 21 1 28 -1c25 0 126 -30 126 -110c0 -37 -23 -76 -69 -116c43 -25 83 -71 83 -119c0 -101 -118 -153 -208 -153z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E089.xml b/data/Leipzig/E089.xml
new file mode 100644
index 00000000000..28c912f02f6
--- /dev/null
+++ b/data/Leipzig/E089.xml
@@ -0,0 +1 @@
+<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 107c0 -51 22 -104 66 -104c38 0 64 48 64 110c0 50 -31 100 -64 100c-40 0 -66 -56 -66 -106zM114 -74c40 0 72 -27 72 -65c0 -8 -3 -19 -9 -34l-7 -16l-5 -15c2 -8 12 -12 31 -12c56 0 84 73 84 219c-32 -24 -71 -36 -119 -36c-29 0 -56 6 -79 20 c-51 26 -57 78 -62 108c0 64 56 155 188 155c158 0 197 -151 197 -237c0 -145 -92 -263 -207 -263c-109 0 -155 68 -155 101c0 46 33 75 71 75z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08A.xml b/data/Leipzig/E08A.xml
new file mode 100644
index 00000000000..e95bfbb8581
--- /dev/null
+++ b/data/Leipzig/E08A.xml
@@ -0,0 +1 @@
+<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M340 179c-9 24 -56 41 -89 41c-46 0 -81 -28 -100 -58c-17 -28 -25 -78 -25 -150c0 -65 2 -111 8 -135c8 -31 18 -49 40 -67c20 -17 43 -25 70 -25c54 0 92 36 115 75c14 25 23 54 28 88h27c0 -63 -24 -105 -58 -141c-35 -38 -82 -56 -140 -56c-45 0 -83 13 -115 39 c-57 45 -101 130 -101 226c0 59 33 127 68 163c36 37 97 72 160 72c36 0 93 -21 121 -40c11 -8 23 -17 33 -30c19 -23 27 -48 27 -76c0 -51 -35 -88 -86 -88c-43 0 -76 27 -76 68c0 26 7 35 21 51c15 17 32 27 58 32c7 2 14 7 14 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08B.xml b/data/Leipzig/E08B.xml
new file mode 100644
index 00000000000..c80af29e36d
--- /dev/null
+++ b/data/Leipzig/E08B.xml
@@ -0,0 +1 @@
+<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M188 200c-42 -22 -63 -69 -63 -141v-119c0 -39 7 -70 19 -94s26 -40 44 -48v402zM0 -0c0 127 80 220 186 246v72h32l-6 -72c33 0 71 0 101 -11c54 -20 102 -65 102 -135c0 -16 -4 -30 -13 -43s-20 -24 -32 -29l-20 -8l-23 -3c-22 2 -41 8 -55 21s-21 31 -26 51 c0 38 45 80 79 80c12 0 19 3 19 10c0 6 -6 12 -15 18c-19 13 -47 24 -79 24c-10 0 -20 -1 -32 -5v-431c15 -3 12 -4 30 -4c57 0 100 51 121 93l17 39c3 13 5 25 5 35h26c-6 -70 -28 -121 -66 -152s-82 -47 -133 -47v-68h-30v72c-57 10 -122 54 -153 109c-7 12 -13 26 -19 42 c-11 29 -16 61 -16 96z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08C.xml b/data/Leipzig/E08C.xml
new file mode 100644
index 00000000000..c2d064af7fd
--- /dev/null
+++ b/data/Leipzig/E08C.xml
@@ -0,0 +1 @@
+<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M342 -37h-134v-134h-74v134h-134v74h134v134h74v-134h134v-74z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08D.xml b/data/Leipzig/E08D.xml
new file mode 100644
index 00000000000..2dca98389ea
--- /dev/null
+++ b/data/Leipzig/E08D.xml
@@ -0,0 +1 @@
+<symbol id="E08D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M253 -28h-99v-98h-56v98h-98v57h98v97h56v-97h99v-57z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08E.xml b/data/Leipzig/E08E.xml
new file mode 100644
index 00000000000..d009f9f1d37
--- /dev/null
+++ b/data/Leipzig/E08E.xml
@@ -0,0 +1 @@
+<symbol id="E08E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M49 -243l-49 25l137 461l49 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E08F.xml b/data/Leipzig/E08F.xml
new file mode 100644
index 00000000000..95a1b7cad89
--- /dev/null
+++ b/data/Leipzig/E08F.xml
@@ -0,0 +1 @@
+<symbol id="E08F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -120v74h342v-74h-342zM0 46v74h342v-74h-342z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E090.xml b/data/Leipzig/E090.xml
new file mode 100644
index 00000000000..980d6781f2d
--- /dev/null
+++ b/data/Leipzig/E090.xml
@@ -0,0 +1 @@
+<symbol id="E090" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37v74h342v-74h-342z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E091.xml b/data/Leipzig/E091.xml
new file mode 100644
index 00000000000..b4dd0f04217
--- /dev/null
+++ b/data/Leipzig/E091.xml
@@ -0,0 +1 @@
+<symbol id="E091" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M334 115l-115 -115l115 -115l-52 -52l-115 115l-115 -115l-52 52l115 115l-115 115l52 52l115 -115l115 115z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E092.xml b/data/Leipzig/E092.xml
new file mode 100644
index 00000000000..850beb5c617
--- /dev/null
+++ b/data/Leipzig/E092.xml
@@ -0,0 +1 @@
+<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M134 -235v-11c0 -3 -1 -4 -1 -4s-1 -1 -2 0c-108 82 -131 150 -131 250s23 168 131 250c1 1 2 0 2 0s1 -1 1 -4v-11s-1 -8 -3 -10c-68 -55 -81 -110 -81 -225s13 -170 81 -225c2 -2 3 -7 3 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E093.xml b/data/Leipzig/E093.xml
new file mode 100644
index 00000000000..e96fb38e7d3
--- /dev/null
+++ b/data/Leipzig/E093.xml
@@ -0,0 +1 @@
+<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -235c0 3 1 8 3 10c68 55 81 110 81 225s-13 170 -81 225c-2 2 -3 10 -3 10v11c0 3 1 4 1 4s1 1 2 0c108 -82 131 -150 131 -250s-23 -168 -131 -250c-1 -1 -2 0 -2 0s-1 1 -1 4v11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E094.xml b/data/Leipzig/E094.xml
new file mode 100644
index 00000000000..c4f34ebfee5
--- /dev/null
+++ b/data/Leipzig/E094.xml
@@ -0,0 +1 @@
+<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M220 -470v-22c0 -6 -2 -8 -2 -8s-1 -1 -2 -1s-1 1 -2 1c-212 181 -214 315 -214 490v10v10c0 175 2 309 214 490c1 0 1 1 2 1s2 -1 2 -1s2 -2 2 -8v-22s-2 -15 -6 -20c-136 -140 -144 -230 -144 -450s8 -310 144 -450c4 -5 6 -14 6 -20z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E095.xml b/data/Leipzig/E095.xml
new file mode 100644
index 00000000000..181540122be
--- /dev/null
+++ b/data/Leipzig/E095.xml
@@ -0,0 +1 @@
+<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-0 -470c0 6 2 15 6 20c136 140 144 230 144 450s-8 310 -144 450c-4 5 -6 20 -6 20v22c0 6 2 8 2 8s1 1 2 1s1 -1 2 -1c212 -181 214 -315 214 -490v-10v-10c0 -175 -2 -309 -214 -490c-1 0 -1 -1 -2 -1s-2 1 -2 1s-2 2 -2 8v22z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A0.xml b/data/Leipzig/E0A0.xml
new file mode 100644
index 00000000000..46709993076
--- /dev/null
+++ b/data/Leipzig/E0A0.xml
@@ -0,0 +1 @@
+<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M60 -165v330c0 5 6 5 12 5s13 0 13 -5v-109c30 51 103 77 183 77c79 0 159 -27 192 -80v112c0 5 6 5 12 5s13 0 13 -5v-330c0 -5 -7 -5 -13 -5s-12 0 -12 5v109c-31 -53 -109 -77 -192 -77c-77 0 -152 27 -183 78v-110c0 -5 -7 -5 -13 -5s-12 0 -12 5zM292 -108 c49 0 71 39 71 87c0 41 -19 74 -41 98c-20 21 -43 31 -68 31l-20 -2c-15 -5 -27 -14 -36 -28c-8 -17 -11 -28 -11 -51c0 -15 3 -34 9 -57s18 -41 34 -55c15 -15 36 -23 62 -23zM0 -165v330c0 5 6 5 12 5s13 0 13 -5v-330c0 -5 -7 -5 -13 -5s-12 0 -12 5zM520 -165v330 c0 5 6 5 12 5s13 0 13 -5v-330c0 -5 -7 -5 -13 -5s-12 0 -12 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A1.xml b/data/Leipzig/E0A1.xml
new file mode 100644
index 00000000000..ed1202288a2
--- /dev/null
+++ b/data/Leipzig/E0A1.xml
@@ -0,0 +1 @@
+<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 165c0 5 6 5 12 5s13 0 13 -5v-40h298v40c0 5 7 5 13 5s12 0 12 -5v-330c0 -5 -6 -5 -12 -5s-13 0 -13 5v40h-298v-40c0 -5 -7 -5 -13 -5s-12 0 -12 5v330zM25 0c0 -29 1 -55 25 -55h248c24 0 25 26 25 55s-1 55 -25 55h-248c-24 0 -25 -26 -25 -55z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A2.xml b/data/Leipzig/E0A2.xml
new file mode 100644
index 00000000000..ee3a553f18f
--- /dev/null
+++ b/data/Leipzig/E0A2.xml
@@ -0,0 +1 @@
+<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 133c102 0 207 -45 207 -133c0 -92 -98 -133 -207 -133c-101 0 -198 46 -198 133c0 88 93 133 198 133zM293 -21c0 14 -3 29 -8 44c-7 20 -18 38 -33 54c-20 21 -43 31 -68 31l-20 -2c-15 -5 -27 -14 -36 -28c-4 -9 -6 -17 -8 -24s-3 -16 -3 -27c0 -15 3 -34 9 -57 s18 -41 34 -55c15 -15 36 -23 62 -23c4 0 10 1 18 2c19 5 32 15 40 30s13 34 13 55z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A3.xml b/data/Leipzig/E0A3.xml
new file mode 100644
index 00000000000..b35092c3d85
--- /dev/null
+++ b/data/Leipzig/E0A3.xml
@@ -0,0 +1 @@
+<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M278 64c0 22 -17 39 -43 39c-12 0 -26 -3 -41 -10c-85 -43 -165 -94 -165 -156c5 -25 15 -32 49 -32c67 11 200 95 200 159zM0 -36c0 68 73 174 200 174c66 0 114 -39 114 -97c0 -84 -106 -173 -218 -173c-64 0 -96 32 -96 96z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A4.xml b/data/Leipzig/E0A4.xml
new file mode 100644
index 00000000000..766e14b63ad
--- /dev/null
+++ b/data/Leipzig/E0A4.xml
@@ -0,0 +1 @@
+<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -39c0 68 73 172 200 172c66 0 114 -37 114 -95c0 -84 -106 -171 -218 -171c-64 0 -96 30 -96 94z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0A5.xml b/data/Leipzig/E0A5.xml
new file mode 100644
index 00000000000..d4eec1c1f60
--- /dev/null
+++ b/data/Leipzig/E0A5.xml
@@ -0,0 +1 @@
+<symbol id="E0A5" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Leipzig/E0A9.xml b/data/Leipzig/E0A9.xml
new file mode 100644
index 00000000000..6ec70417a2f
--- /dev/null
+++ b/data/Leipzig/E0A9.xml
@@ -0,0 +1 @@
+<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -110c0 4 1 8 5 11l119 99l-119 100c-3 3 -5 8 -5 12c0 6 5 13 12 13c3 0 6 -1 8 -2l124 -105l126 105c2 1 5 2 7 2c6 0 13 -6 13 -14c0 -4 -2 -9 -5 -11l-119 -100l119 -99c3 -3 5 -7 5 -12c0 -6 -5 -14 -13 -14c-2 0 -5 1 -7 3l-126 105l-124 -105c-2 -2 -4 -3 -7 -3 c-8 0 -13 7 -13 15z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0AF.xml b/data/Leipzig/E0AF.xml
new file mode 100644
index 00000000000..4451f39844a
--- /dev/null
+++ b/data/Leipzig/E0AF.xml
@@ -0,0 +1 @@
+<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 0c0 8 6 13 14 13h107v106c0 8 5 14 13 14c7 0 13 -6 13 -14v-106h106c7 0 14 -5 14 -13s-7 -13 -14 -13h-106v-106c0 -8 -6 -14 -13 -14c-8 0 -13 6 -13 14v106h-107c-8 0 -14 5 -14 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0B5.xml b/data/Leipzig/E0B5.xml
new file mode 100644
index 00000000000..67cb3abdd4f
--- /dev/null
+++ b/data/Leipzig/E0B5.xml
@@ -0,0 +1 @@
+<symbol id="E0B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M293 -21c0 14 -3 29 -8 44c-3 8 -6 15 -10 22l-55 -45l68 -55c3 11 5 22 5 34zM198 133c102 0 207 -45 207 -133c0 -92 -98 -133 -207 -133c-101 0 -198 46 -198 133c0 88 93 133 198 133zM141 -64c5 -8 12 -15 19 -21c15 -15 36 -23 62 -23c4 0 10 1 18 2 c17 4 29 13 37 25l-79 64zM260 68c-2 3 -5 6 -8 9c-20 21 -43 31 -68 31l-20 -2c-15 -5 -27 -14 -36 -28c0 -1 -1 -1 -1 -2l71 -58zM119 48c-1 -6 -2 -13 -2 -21c0 -15 3 -34 9 -57l3 -9l49 39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0B6.xml b/data/Leipzig/E0B6.xml
new file mode 100644
index 00000000000..dc399f97c5d
--- /dev/null
+++ b/data/Leipzig/E0B6.xml
@@ -0,0 +1 @@
+<symbol id="E0B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -36c0 68 73 174 200 174c66 0 114 -39 114 -97c0 -84 -106 -173 -218 -173c-64 0 -96 32 -96 96zM52 -92c6 -2 15 -3 26 -3c29 5 70 23 107 47l-41 31zM208 -31c40 29 70 64 70 95c0 9 -3 16 -7 23l-105 -87zM246 102c-3 1 -7 1 -11 1c-12 0 -26 -3 -41 -10 c-30 -15 -60 -32 -86 -49l36 -26zM85 27c-33 -27 -56 -57 -56 -90c1 -4 2 -7 3 -11l92 74z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0B7.xml b/data/Leipzig/E0B7.xml
new file mode 100644
index 00000000000..734dd9fa23e
--- /dev/null
+++ b/data/Leipzig/E0B7.xml
@@ -0,0 +1 @@
+<symbol id="E0B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -37c0 24 10 65 41 100c24 28 64 62 143 62c53 0 105 -31 105 -88c0 -16 -7 -56 -36 -93c-38 -50 -87 -69 -149 -69c-53 0 -104 32 -104 88zM237 87l-81 -82l64 -62l13 16c14 17 21 35 25 46c4 14 6 27 6 32c0 19 -7 34 -20 45zM25 -37c0 -16 6 -31 15 -41l83 83 l-53 53l-11 -12c-24 -27 -34 -62 -34 -83zM139 -11l-80 -80c12 -6 25 -9 40 -9c32 0 61 6 85 18c5 3 11 6 16 10zM109 84l-21 -11l51 -51l75 76c-7 1 -17 2 -25 2c-30 0 -57 -5 -80 -16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0D9.xml b/data/Leipzig/E0D9.xml
new file mode 100644
index 00000000000..bf567413bb2
--- /dev/null
+++ b/data/Leipzig/E0D9.xml
@@ -0,0 +1 @@
+<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 3 1 4 3 6c53 47 102 98 151 153c2 2 5 3 8 3s5 -1 7 -3c49 -55 89 -106 142 -153c2 -2 3 -3 3 -6s-1 -4 -3 -6c-53 -47 -93 -98 -142 -153c-2 -2 -4 -3 -7 -3s-6 1 -8 3c-49 55 -98 106 -151 153c-2 2 -3 3 -3 6zM83 36c-2 -2 -3 -4 -3 -6s1 -4 3 -6l96 -101 c2 -2 4 -3 7 -3s5 1 7 3l40 41c2 2 3 4 3 6s-1 4 -3 6l-96 101c-2 2 -4 3 -7 3s-5 -1 -7 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DA.xml b/data/Leipzig/E0DA.xml
new file mode 100644
index 00000000000..7ee9f876bbe
--- /dev/null
+++ b/data/Leipzig/E0DA.xml
@@ -0,0 +1 @@
+<symbol id="E0DA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 3 1 4 3 6c53 47 102 98 151 153c2 2 5 3 8 3s5 -1 7 -3c49 -55 127 -106 180 -153c2 -2 3 -3 3 -6s-1 -4 -3 -6c-53 -47 -90 -98 -139 -153c-2 -2 -4 -3 -7 -3s-6 1 -8 3c-49 55 -139 106 -192 153c-2 2 -3 3 -3 6zM83 36c-2 -2 -3 -4 -3 -6s1 -4 3 -6l134 -101 c2 -2 4 -3 7 -3s5 1 7 3l40 41c2 2 3 4 3 6s-1 4 -3 6l-134 101c-2 2 -4 3 -7 3s-5 -1 -7 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DB.xml b/data/Leipzig/E0DB.xml
new file mode 100644
index 00000000000..320385ccbe8
--- /dev/null
+++ b/data/Leipzig/E0DB.xml
@@ -0,0 +1 @@
+<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 3 1 4 3 6c53 47 102 96 151 151c2 2 5 3 8 3s5 -1 7 -3c49 -55 89 -104 142 -151c2 -2 3 -3 3 -6s-1 -4 -3 -6c-53 -47 -93 -96 -142 -151c-2 -2 -4 -3 -7 -3s-6 1 -8 3c-49 55 -98 104 -151 151c-2 2 -3 3 -3 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DC.xml b/data/Leipzig/E0DC.xml
new file mode 100644
index 00000000000..28cc353cca3
--- /dev/null
+++ b/data/Leipzig/E0DC.xml
@@ -0,0 +1 @@
+<symbol id="E0DC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M3 -4c-2 1 -3 3 -3 5s0 3 3 5l162 116c3 2 7 3 9 3c3 0 7 -1 10 -3l163 -116c2 -2 3 -3 3 -5s-1 -4 -3 -5l-164 -118c-3 -2 -6 -3 -9 -3c-2 0 -5 1 -7 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DD.xml b/data/Leipzig/E0DD.xml
new file mode 100644
index 00000000000..f6ac59f5dc8
--- /dev/null
+++ b/data/Leipzig/E0DD.xml
@@ -0,0 +1 @@
+<symbol id="E0DD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 3 1 4 3 6c53 47 102 96 151 151c2 2 5 3 8 3s5 -1 7 -3c49 -55 89 -104 142 -151c2 -2 3 -3 3 -6s-1 -4 -3 -6c-53 -47 -93 -96 -142 -151c-2 -2 -4 -3 -7 -3s-6 1 -8 3c-49 55 -98 104 -151 151c-2 2 -3 3 -3 6zM43 6c-2 -2 -3 -4 -3 -6s1 -4 3 -6l112 -111 c2 -2 4 -3 7 -3s5 1 7 3l102 111c2 2 3 4 3 6s-1 4 -3 6l-102 111c-2 2 -4 3 -7 3s-5 -1 -7 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0DE.xml b/data/Leipzig/E0DE.xml
new file mode 100644
index 00000000000..7d33356f96e
--- /dev/null
+++ b/data/Leipzig/E0DE.xml
@@ -0,0 +1 @@
+<symbol id="E0DE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -6c-3 2 -5 4 -5 6s1 4 4 6l159 114c4 3 8 5 12 5c5 0 8 -2 11 -4l161 -116c2 -2 3 -3 3 -5s-1 -4 -3 -5l-164 -117c-3 -2 -6 -3 -9 -3c-2 0 -4 1 -7 3zM174 97l-134 -97l134 -98l135 98z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0F5.xml b/data/Leipzig/E0F5.xml
new file mode 100644
index 00000000000..247186a31f9
--- /dev/null
+++ b/data/Leipzig/E0F5.xml
@@ -0,0 +1 @@
+<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M153 -225v-11c0 -3 -1 -4 -1 -4h-2c-108 62 -150 140 -150 240s42 178 150 240h2s1 -1 1 -4v-11s0 -9 -3 -10c-78 -45 -100 -100 -100 -215s22 -170 100 -215c3 -1 3 -7 3 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0F6.xml b/data/Leipzig/E0F6.xml
new file mode 100644
index 00000000000..b95b58e8cc5
--- /dev/null
+++ b/data/Leipzig/E0F6.xml
@@ -0,0 +1 @@
+<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-53 -225c0 3 0 9 3 10c78 45 100 100 100 215s-22 170 -100 215c-3 1 -3 10 -3 10v11c0 3 1 4 1 4h2c108 -62 150 -140 150 -240s-42 -178 -150 -240h-2s-1 1 -1 4v11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E0FA.xml b/data/Leipzig/E0FA.xml
new file mode 100644
index 00000000000..c0b9e3e365a
--- /dev/null
+++ b/data/Leipzig/E0FA.xml
@@ -0,0 +1 @@
+<symbol id="E0FA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 -133c-51 0 -96 11 -133 32c-43 24 -65 58 -65 101s21 77 64 102c37 21 82 31 134 31c53 0 99 -11 138 -32c46 -24 69 -58 69 -101c0 -46 -23 -81 -69 -104c-37 -19 -83 -29 -138 -29z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E101.xml b/data/Leipzig/E101.xml
new file mode 100644
index 00000000000..9f12de4e33c
--- /dev/null
+++ b/data/Leipzig/E101.xml
@@ -0,0 +1 @@
+<symbol id="E101" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M460 250l-350 -500h-110l350 500h110z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E102.xml b/data/Leipzig/E102.xml
new file mode 100644
index 00000000000..da640868416
--- /dev/null
+++ b/data/Leipzig/E102.xml
@@ -0,0 +1 @@
+<symbol id="E102" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M760 210h-330l-300 -420h330zM900 250l-350 -500h-550l350 500h550z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E103.xml b/data/Leipzig/E103.xml
new file mode 100644
index 00000000000..af6c48241b6
--- /dev/null
+++ b/data/Leipzig/E103.xml
@@ -0,0 +1 @@
+<symbol id="E103" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M595 210h-165l-300 -420h165zM735 250l-350 -500h-385l350 500h385z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E220.xml b/data/Leipzig/E220.xml
new file mode 100644
index 00000000000..7491a28653c
--- /dev/null
+++ b/data/Leipzig/E220.xml
@@ -0,0 +1 @@
+<symbol id="E220" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-163 -124v83l326 166v-86z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E221.xml b/data/Leipzig/E221.xml
new file mode 100644
index 00000000000..7ecf2e5c567
--- /dev/null
+++ b/data/Leipzig/E221.xml
@@ -0,0 +1 @@
+<symbol id="E221" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-163 -193v83l326 166v-86zM-163 -57v84l326 166v-83z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E222.xml b/data/Leipzig/E222.xml
new file mode 100644
index 00000000000..14740c04764
--- /dev/null
+++ b/data/Leipzig/E222.xml
@@ -0,0 +1 @@
+<symbol id="E222" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 175l-324 -164v84l324 163v-83zM162 40l-324 -164v84l324 164v-84zM162 -95l-324 -163v83l324 164v-84z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E223.xml b/data/Leipzig/E223.xml
new file mode 100644
index 00000000000..bce091c85ab
--- /dev/null
+++ b/data/Leipzig/E223.xml
@@ -0,0 +1 @@
+<symbol id="E223" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 108l-324 -164v84l324 163v-83zM162 -27l-324 -164v84l324 164v-84zM162 -162l-324 -163v83l324 164v-84zM162 242l-324 -164v84l324 164v-84z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E224.xml b/data/Leipzig/E224.xml
new file mode 100644
index 00000000000..25a059530bd
--- /dev/null
+++ b/data/Leipzig/E224.xml
@@ -0,0 +1 @@
+<symbol id="E224" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 41l-324 -164v84l324 163v-83zM162 -94l-324 -164v84l324 164v-84zM162 -229l-324 -163v83l324 164v-84zM162 310l-324 -164v84l324 163v-83zM162 175l-324 -164v84l324 164v-84z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E22A.xml b/data/Leipzig/E22A.xml
new file mode 100644
index 00000000000..d4f04974f73
--- /dev/null
+++ b/data/Leipzig/E22A.xml
@@ -0,0 +1 @@
+<symbol id="E22A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-155 -96c0 6 0 11 7 16l169 124c7 5 7 8 7 13c0 19 -8 19 -18 19h-145c-11 0 -20 0 -20 20s11 20 22 20h271c12 0 18 0 18 -20c0 -6 0 -11 -8 -16l-171 -124c-7 -5 -7 -8 -7 -13c0 -19 8 -19 18 -19h148c11 0 20 0 20 -20s-9 -20 -20 -20h-271c-12 0 -20 0 -20 20z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E240.xml b/data/Leipzig/E240.xml
new file mode 100644
index 00000000000..90308936b73
--- /dev/null
+++ b/data/Leipzig/E240.xml
@@ -0,0 +1 @@
+<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 -646c15 29 29 55 46 102c18 49 30 108 30 138c0 105 -80 173 -168 200c-18 5 -47 9 -87 16v190h22c8 0 33 -61 71 -95c4 -3 -2 3 61 -56c62 -58 122 -137 122 -241c0 -38 -13 -106 -35 -163c-20 -51 -43 -99 -66 -132c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10 c1 3 14 25 18 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E241.xml b/data/Leipzig/E241.xml
new file mode 100644
index 00000000000..3f6225da141
--- /dev/null
+++ b/data/Leipzig/E241.xml
@@ -0,0 +1 @@
+<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 646c-4 8 -17 30 -18 33l-4 10c0 3 2 5 5 5s7 -2 13 -7c23 -33 46 -81 66 -132c22 -57 35 -125 35 -163c0 -104 -60 -183 -122 -241c-63 -59 -57 -53 -61 -56c-38 -34 -63 -95 -71 -95h-22v190c40 7 69 11 87 16c88 27 168 95 168 200c0 30 -12 89 -30 138 c-17 47 -31 73 -46 102z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E242.xml b/data/Leipzig/E242.xml
new file mode 100644
index 00000000000..bb424434995
--- /dev/null
+++ b/data/Leipzig/E242.xml
@@ -0,0 +1 @@
+<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190h22c8 0 33 -61 71 -95c4 -3 -2 3 61 -56c62 -58 122 -137 122 -241c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10 c1 3 6 8 11 16zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E243.xml b/data/Leipzig/E243.xml
new file mode 100644
index 00000000000..ff96e16fe50
--- /dev/null
+++ b/data/Leipzig/E243.xml
@@ -0,0 +1 @@
+<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M216 730c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 57 -101 57 -172c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -104 -60 -183 -122 -241c-63 -59 -57 -53 -61 -56c-38 -34 -63 -95 -71 -95h-22v190v190c40 7 69 11 87 16c116 36 175 111 175 197 c0 44 -15 91 -46 137zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E244.xml b/data/Leipzig/E244.xml
new file mode 100644
index 00000000000..7c39d4e86df
--- /dev/null
+++ b/data/Leipzig/E244.xml
@@ -0,0 +1 @@
+<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122zM206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190h22c8 0 33 -61 71 -95c4 -3 -2 3 61 -56 c61 -57 122 -134 122 -235v-6c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9 c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E245.xml b/data/Leipzig/E245.xml
new file mode 100644
index 00000000000..ec32faece35
--- /dev/null
+++ b/data/Leipzig/E245.xml
@@ -0,0 +1 @@
+<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM215 729c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 58 -100 58 -171c0 -34 -6 -65 -17 -94 c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6c0 -101 -61 -178 -122 -235c-63 -59 -57 -53 -61 -56c-38 -34 -51 -95 -59 -95h-34v190v190v190c40 7 69 11 87 16c116 36 174 110 174 196c0 44 -15 91 -46 137zM247 270c-23 -47 -58 -86 -93 -119 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 26 -4 43 -8 54z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E246.xml b/data/Leipzig/E246.xml
new file mode 100644
index 00000000000..183374954ac
--- /dev/null
+++ b/data/Leipzig/E246.xml
@@ -0,0 +1 @@
+<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122z M206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190v190h34c8 0 21 -61 59 -95c4 -3 -2 3 61 -56c61 -57 122 -134 122 -235v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99 c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E247.xml b/data/Leipzig/E247.xml
new file mode 100644
index 00000000000..8cc61777dc1
--- /dev/null
+++ b/data/Leipzig/E247.xml
@@ -0,0 +1 @@
+<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 79c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200 c0 19 -3 39 -7 57zM216 729c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 57 -100 57 -171c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -101 -61 -178 -122 -235 c-63 -59 -57 -53 -61 -56c-38 -34 -51 -95 -59 -95h-34v190v190v190v190c40 7 69 11 87 16c116 36 175 111 175 197c0 44 -15 90 -46 136zM247 270c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200 c0 26 -4 43 -8 54z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E248.xml b/data/Leipzig/E248.xml
new file mode 100644
index 00000000000..e3c1b295eb9
--- /dev/null
+++ b/data/Leipzig/E248.xml
@@ -0,0 +1 @@
+<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 111c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122z M206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190v190v190h34c8 0 21 -61 59 -95c4 -3 -2 3 61 -56c61 -57 122 -134 122 -235v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6 c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88 c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM40 -7c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E249.xml b/data/Leipzig/E249.xml
new file mode 100644
index 00000000000..7b44cc50f2a
--- /dev/null
+++ b/data/Leipzig/E249.xml
@@ -0,0 +1 @@
+<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -111c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9 c88 27 168 95 168 200c0 19 -3 39 -7 57zM215 728c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 58 -99 58 -170c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6 c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -101 -61 -178 -122 -235c-63 -59 -57 -53 -61 -56c-38 -34 -51 -95 -59 -95h-34v190v190v190v190v190c40 7 69 11 87 16c116 36 174 110 174 195c0 44 -15 91 -46 137zM247 79c-24 -46 -58 -86 -93 -118 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM40 7c20 3 36 6 47 9c88 27 168 95 168 200c0 26 -4 43 -8 54c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24A.xml b/data/Leipzig/E24A.xml
new file mode 100644
index 00000000000..0a218ade402
--- /dev/null
+++ b/data/Leipzig/E24A.xml
@@ -0,0 +1 @@
+<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 111c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118z M247 301c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122z M206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190v190v190v190h34c8 0 21 -61 59 -95c4 -3 -2 3 61 -56c61 -57 122 -134 122 -235v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6 c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200 c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24B.xml b/data/Leipzig/E24B.xml
new file mode 100644
index 00000000000..a0f86824d2b
--- /dev/null
+++ b/data/Leipzig/E24B.xml
@@ -0,0 +1 @@
+<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -111c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 79c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9 c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 -301c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56 c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM216 727c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 57 -98 57 -169c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6 c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -101 -61 -178 -122 -235c-63 -59 -57 -53 -61 -56c-38 -34 -51 -95 -59 -95h-34v190v190v190v190v190v190c40 7 69 11 87 16 c116 36 175 110 175 195c0 44 -15 90 -46 136zM247 270c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 26 -4 43 -8 54z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24C.xml b/data/Leipzig/E24C.xml
new file mode 100644
index 00000000000..606ce879946
--- /dev/null
+++ b/data/Leipzig/E24C.xml
@@ -0,0 +1 @@
+<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M251 484c4 19 4 34 4 49v11c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c37 -34 74 -75 97 -125zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119 zM276 -196c0 -58 -10 -86 -19 -97c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v1330h22 c8 0 33 -61 71 -95c4 -3 -2 3 61 -56c62 -58 122 -137 122 -241c0 -24 -5 -61 -15 -99c0 -1 1 -3 1 -4c10 39 15 52 15 52c0 -2 -8 -36 -14 -53c8 -25 13 -51 13 -80c0 -56 -10 -85 -18 -96c12 -29 18 -60 18 -94c0 -56 -10 -85 -18 -96c12 -29 18 -60 18 -94 c0 -56 -10 -85 -18 -96c12 -29 18 -60 18 -94zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122zM247 301c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88 c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 111c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88 c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24D.xml b/data/Leipzig/E24D.xml
new file mode 100644
index 00000000000..313822e5ddd
--- /dev/null
+++ b/data/Leipzig/E24D.xml
@@ -0,0 +1 @@
+<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M251 -484c-23 -50 -60 -91 -97 -125c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200v11c0 15 0 30 -4 49zM247 270c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9 c88 27 168 95 168 200c0 26 -4 43 -8 54zM258 -278c8 -11 18 -40 18 -96c0 -29 -5 -55 -13 -80c6 -17 14 -51 14 -53c0 0 -5 13 -15 52c0 -1 -1 -3 -1 -4c10 -38 15 -75 15 -99c0 -104 -60 -183 -122 -241c-63 -59 -57 -53 -61 -56c-38 -34 -63 -95 -71 -95h-22v1330 c40 7 69 11 87 16c113 35 168 114 168 203c0 49 -17 101 -49 149c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 67 -119 67 -190c0 -34 -6 -65 -17 -94c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 19 -39 19 -97c0 -34 -6 -65 -18 -94 c8 -11 18 -40 18 -96c0 -34 -6 -65 -18 -94c8 -11 18 -40 18 -96c0 -34 -6 -65 -18 -94zM248 463c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM247 -301c-24 -46 -58 -86 -93 -118 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 79c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 -111 c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24E.xml b/data/Leipzig/E24E.xml
new file mode 100644
index 00000000000..ce531d8919a
--- /dev/null
+++ b/data/Leipzig/E24E.xml
@@ -0,0 +1 @@
+<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119zM206 -748c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v190v190v190v190v190v190v190v190h22c8 0 33 -61 71 -95 c4 -3 -2 3 61 -56c62 -58 122 -137 122 -241c0 -32 -7 -65 -17 -96c10 -27 21 -53 21 -85c0 -34 -7 -60 -19 -104c11 -27 15 -55 15 -87v-8c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -57 -9 -78 -18 -90c12 -29 18 -60 18 -94v-6c-1 -57 -9 -78 -18 -90 c12 -29 18 -60 18 -94v-6c-1 -59 -10 -80 -19 -91c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16zM248 -463c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9 c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122zM247 301c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 -79c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9 c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM247 111c4 11 8 28 8 53c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -32 69 -72 93 -118zM248 677c4 18 7 38 7 57c0 105 -80 173 -168 200c-11 3 -27 6 -47 9 c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c36 -33 71 -74 94 -122zM40 753c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c33 -31 71 -77 94 -121c5 29 8 55 8 79c0 87 -41 141 -169 177c-11 3 -27 6 -47 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E24F.xml b/data/Leipzig/E24F.xml
new file mode 100644
index 00000000000..f6aa8bf200a
--- /dev/null
+++ b/data/Leipzig/E24F.xml
@@ -0,0 +1 @@
+<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 270c-23 -47 -58 -86 -93 -119c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 26 -4 43 -8 54zM206 748c-5 8 -10 13 -11 16l-4 10c0 3 2 5 5 5s7 -2 13 -7c35 -42 67 -119 67 -190c0 -34 -6 -65 -17 -94 c10 -31 17 -64 17 -96c0 -36 -7 -69 -19 -99c9 -11 18 -32 19 -91v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-6c0 -34 -6 -65 -18 -94c9 -12 17 -33 18 -90v-8c0 -32 -4 -60 -15 -87c12 -44 19 -70 19 -104 c0 -32 -11 -58 -21 -85c10 -31 17 -64 17 -96c0 -104 -60 -183 -122 -241c-63 -59 -57 -53 -61 -56c-38 -34 -63 -95 -71 -95h-22v190v190v190v190v190v190v190v190c40 7 69 11 87 16c113 35 168 114 168 203c0 49 -17 101 -49 149zM248 463c-23 -48 -58 -89 -94 -122 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM247 -301c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 79 c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 25 -4 42 -8 53zM247 -111c-24 -46 -58 -86 -93 -118c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200 c0 25 -4 42 -8 53zM248 -677c-23 -48 -58 -89 -94 -122c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88c20 3 36 6 47 9c88 27 168 95 168 200c0 19 -3 39 -7 57zM40 -753c20 3 36 6 47 9c128 36 169 90 169 177c0 24 -3 50 -8 79c-23 -44 -61 -90 -94 -121 c-63 -59 -57 -53 -61 -56c-30 -27 -44 -71 -53 -88z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E260.xml b/data/Leipzig/E260.xml
new file mode 100644
index 00000000000..8f52352ffbd
--- /dev/null
+++ b/data/Leipzig/E260.xml
@@ -0,0 +1 @@
+<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v644h20v-359zM90 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E261.xml b/data/Leipzig/E261.xml
new file mode 100644
index 00000000000..0bc446d747e
--- /dev/null
+++ b/data/Leipzig/E261.xml
@@ -0,0 +1 @@
+<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -188v539h18v-191l139 22v-533h-17v186zM18 -100l122 17v176l-122 -19v-174z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E262.xml b/data/Leipzig/E262.xml
new file mode 100644
index 00000000000..9812736d4cb
--- /dev/null
+++ b/data/Leipzig/E262.xml
@@ -0,0 +1 @@
+<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M136 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM60 73v-167l76 22v168z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E263.xml b/data/Leipzig/E263.xml
new file mode 100644
index 00000000000..e74cac5669a
--- /dev/null
+++ b/data/Leipzig/E263.xml
@@ -0,0 +1 @@
+<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 120h74v-54l15 -17h79l15 16v55h74v-72h-59l-25 -28v-38l25 -32h59v-70h-75v55l-14 15h-80l-14 -15v-55h-74v72h60l26 30v38l-28 29h-58v71z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E264.xml b/data/Leipzig/E264.xml
new file mode 100644
index 00000000000..5d433974d33
--- /dev/null
+++ b/data/Leipzig/E264.xml
@@ -0,0 +1 @@
+<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M280 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM113 137c38 0 65 -13 77 -41v373h20v-359c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89 c-23 -25 -39 -44 -65 -68l-88 -79v199c-12 -28 -46 -63 -67 -87c-9 -11 -21 -22 -35 -33l-88 -79v644h20v-359c32 16 54 27 93 27zM90 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E265.xml b/data/Leipzig/E265.xml
new file mode 100644
index 00000000000..f93b387fe0a
--- /dev/null
+++ b/data/Leipzig/E265.xml
@@ -0,0 +1 @@
+<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M414 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM338 73v-167l76 22v168zM0 120h74v-54l15 -17h79l15 16v55h74v-72h-59l-25 -28v-38l25 -32h59v-70h-75v55 l-14 15h-80l-14 -15v-55h-74v72h60l26 30v38l-28 29h-58v71z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E266.xml b/data/Leipzig/E266.xml
new file mode 100644
index 00000000000..c2db7087464
--- /dev/null
+++ b/data/Leipzig/E266.xml
@@ -0,0 +1 @@
+<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M280 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM303 137c38 0 65 -13 77 -41v373h20v-359c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89 c-23 -25 -39 -44 -65 -68l-88 -79v199c-12 -28 -46 -63 -67 -87c-9 -11 -21 -22 -35 -33l-88 -79v199c-12 -28 -46 -63 -67 -87c-9 -11 -21 -22 -35 -33l-88 -79v644h20v-359c32 16 54 27 93 27c38 0 65 -13 77 -41v373h20v-359c32 16 54 27 93 27zM470 106 c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM90 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c1 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E267.xml b/data/Leipzig/E267.xml
new file mode 100644
index 00000000000..9fdab8681d7
--- /dev/null
+++ b/data/Leipzig/E267.xml
@@ -0,0 +1 @@
+<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -188v539h18v-191l139 22v-533h-17v186zM18 -100l122 17v176l-122 -19v-174zM200 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v644h20v-359zM270 106c-32 0 -48 -10 -70 -29v-194 c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E268.xml b/data/Leipzig/E268.xml
new file mode 100644
index 00000000000..7ba63f68c6f
--- /dev/null
+++ b/data/Leipzig/E268.xml
@@ -0,0 +1 @@
+<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -188v539h18v-191l139 22v-533h-17v186zM18 -100l122 17v176l-122 -19v-174zM316 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM240 73v-167l76 22v168z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E269.xml b/data/Leipzig/E269.xml
new file mode 100644
index 00000000000..63b696850c4
--- /dev/null
+++ b/data/Leipzig/E269.xml
@@ -0,0 +1 @@
+<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M136 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM60 73v-167l76 22v168zM351 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22 v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM275 73v-167l76 22v168z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E26A.xml b/data/Leipzig/E26A.xml
new file mode 100644
index 00000000000..d587185ff28
--- /dev/null
+++ b/data/Leipzig/E26A.xml
@@ -0,0 +1 @@
+<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 -235v-11c0 -3 -1 -4 -1 -4h-2c-108 62 -160 150 -160 250s52 188 160 250h2s1 -1 1 -4v-11s0 -9 -3 -10c-78 -45 -110 -110 -110 -225s32 -180 110 -225c3 -1 3 -7 3 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E26B.xml b/data/Leipzig/E26B.xml
new file mode 100644
index 00000000000..443706c84ee
--- /dev/null
+++ b/data/Leipzig/E26B.xml
@@ -0,0 +1 @@
+<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -235c0 3 0 9 3 10c78 45 110 110 110 225s-32 180 -110 225c-3 1 -3 10 -3 10v11c0 3 1 4 1 4h2c108 -62 160 -150 160 -250s-52 -188 -160 -250h-2s-1 1 -1 4v11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E26C.xml b/data/Leipzig/E26C.xml
new file mode 100644
index 00000000000..de7ab956f22
--- /dev/null
+++ b/data/Leipzig/E26C.xml
@@ -0,0 +1 @@
+<symbol id="E26C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 260h90v-38h-52v-444h52v-38h-90v520z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E26D.xml b/data/Leipzig/E26D.xml
new file mode 100644
index 00000000000..c8355fa5db2
--- /dev/null
+++ b/data/Leipzig/E26D.xml
@@ -0,0 +1 @@
+<symbol id="E26D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 260v-520h-90v38h52v444h-52v38h90z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E270.xml b/data/Leipzig/E270.xml
new file mode 100644
index 00000000000..4e34d40d09b
--- /dev/null
+++ b/data/Leipzig/E270.xml
@@ -0,0 +1 @@
+<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M135 106l-8 4l-15 2c-11 0 -22 -2 -33 -6s-23 -12 -37 -25v-204c31 33 54 62 71 88c21 33 32 63 32 89c1 9 1 16 1 21c0 6 -1 11 -2 16s-4 10 -9 15zM-43 441l75 161l73 -161h-26l-37 49v-374c20 11 37 18 51 22s28 6 42 6c11 0 21 -1 28 -3s16 -6 26 -11 c13 -8 22 -21 27 -40l4 -26c0 -30 -15 -61 -45 -94c-11 -13 -21 -25 -30 -36s-21 -23 -35 -35l-88 -83v673l-39 -48h-26z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E271.xml b/data/Leipzig/E271.xml
new file mode 100644
index 00000000000..a9241c71035
--- /dev/null
+++ b/data/Leipzig/E271.xml
@@ -0,0 +1 @@
+<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M47 -162zM41 -239l35 46h26l-73 -161l-75 161h26l37 -47s4 674 5 734h20v-378c20 11 37 18 51 22s28 6 42 6c11 0 21 -1 28 -3s16 -6 26 -11c13 -8 22 -21 27 -40l4 -26c0 -30 -15 -61 -45 -94c-11 -13 -21 -25 -30 -36s-21 -23 -35 -35l-63 -59z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E272.xml b/data/Leipzig/E272.xml
new file mode 100644
index 00000000000..54815648904
--- /dev/null
+++ b/data/Leipzig/E272.xml
@@ -0,0 +1 @@
+<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-46 324l75 161l73 -161h-26l-38 50v-202l139 24v-573h-17v200l-140 -25v575l-40 -49h-26zM38 -108l122 19v189l-122 -20v-188z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E273.xml b/data/Leipzig/E273.xml
new file mode 100644
index 00000000000..035cf744333
--- /dev/null
+++ b/data/Leipzig/E273.xml
@@ -0,0 +1 @@
+<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M221 -324l-73 -161l-75 161h26l42 -52l-1 199l-140 -25v579h18v-205l139 24v-570l38 50h26zM140 -89v189l-122 -20v-188z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E274.xml b/data/Leipzig/E274.xml
new file mode 100644
index 00000000000..ac361f468c5
--- /dev/null
+++ b/data/Leipzig/E274.xml
@@ -0,0 +1 @@
+<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-24 300l75 161l73 -161h-26l-38 50v-173l76 23v182h17v-177l44 15v-97l-44 -15v-178l44 13v-98l-44 -14v-167h-17v162l-76 -24v-166h-17v160l-43 -14v97l43 15v179l-43 -15v99l43 14v180l-41 -51h-26zM60 78v-179l76 24v180z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E275.xml b/data/Leipzig/E275.xml
new file mode 100644
index 00000000000..f6633db24c0
--- /dev/null
+++ b/data/Leipzig/E275.xml
@@ -0,0 +1 @@
+<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M60 78v-179l76 24v180zM136 200v182h17v-177l44 15v-97l-44 -15v-178l44 13v-98l-44 -14v-167h-17v162l-76 -24v-163l37 49h26l-73 -161l-75 161h28l39 -50l1 158l-43 -14v97l43 15v179l-43 -15v99l43 14v182h17v-176z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E280.xml b/data/Leipzig/E280.xml
new file mode 100644
index 00000000000..4c30b04f3c4
--- /dev/null
+++ b/data/Leipzig/E280.xml
@@ -0,0 +1 @@
+<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M178 110v359h20v-644l-88 79c-26 24 -42 43 -65 68c-29 32 -45 61 -45 89l4 25c3 18 14 31 27 38c19 10 28 13 54 13c39 0 61 -11 93 -27zM108 106l-15 -2l-8 -3c-8 -9 -11 -16 -11 -30c0 -4 1 -11 1 -20c0 -25 11 -52 32 -84c17 -25 40 -53 71 -84v194 c-22 19 -38 29 -70 29z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E281.xml b/data/Leipzig/E281.xml
new file mode 100644
index 00000000000..b5f51c424e2
--- /dev/null
+++ b/data/Leipzig/E281.xml
@@ -0,0 +1 @@
+<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v644h20v-359zM308 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z M178 110v359h20v-644l-88 79c-26 24 -42 43 -65 68c-29 32 -45 61 -45 89l4 25c3 18 14 31 27 38c19 10 28 13 54 13c39 0 61 -11 93 -27zM108 106l-15 -2l-8 -3c-8 -9 -11 -16 -11 -30c0 -4 1 -11 1 -20c0 -25 11 -52 32 -84c17 -25 40 -53 71 -84v194 c-22 19 -38 29 -70 29z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E282.xml b/data/Leipzig/E282.xml
new file mode 100644
index 00000000000..56c857a8440
--- /dev/null
+++ b/data/Leipzig/E282.xml
@@ -0,0 +1 @@
+<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M106 179v-91l-44 -14v-165l44 12v-91l-46 -14v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E283.xml b/data/Leipzig/E283.xml
new file mode 100644
index 00000000000..373b8fb811a
--- /dev/null
+++ b/data/Leipzig/E283.xml
@@ -0,0 +1 @@
+<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 73v-167l76 22v168zM242 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v-1l-46 -14v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163l46 14v1l43 13v169h17v-163zM106 54l-44 -14v-165 l44 12l43 14v167z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E440.xml b/data/Leipzig/E440.xml
new file mode 100644
index 00000000000..47b9017ab86
--- /dev/null
+++ b/data/Leipzig/E440.xml
@@ -0,0 +1 @@
+<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM69 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v344.533 l-49 -27.5333v36l49 27.5333v41.9999l-49 -27.5332v36l49 27.5332v185.467h20v-174.229l147 85.2285v-36l-147 -85.2285v-42.0001l147 85.2286v-36l-147 -85.2286v-70.7714z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E441.xml b/data/Leipzig/E441.xml
new file mode 100644
index 00000000000..7a82968d2fb
--- /dev/null
+++ b/data/Leipzig/E441.xml
@@ -0,0 +1 @@
+<symbol id="E441" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v644h20v-359zM90 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E442.xml b/data/Leipzig/E442.xml
new file mode 100644
index 00000000000..2431c33165f
--- /dev/null
+++ b/data/Leipzig/E442.xml
@@ -0,0 +1 @@
+<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 106c-32 0 -48 -10 -70 -29v-194c31 31 54 59 71 84c21 32 32 59 32 84c0 9 1 16 1 20c0 14 -3 21 -11 30l-8 3zM69 110c32 16 54 27 93 27c26 0 35 -3 54 -13c13 -7 24 -20 27 -38l4 -25c0 -28 -16 -57 -45 -89c-23 -25 -39 -44 -65 -68l-88 -79v363.467 l-49 -28.4667v36l49 28.4667v244.533h20v-232.914l147 87.9143v-36l-147 -87.9143v-90.0857z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E443.xml b/data/Leipzig/E443.xml
new file mode 100644
index 00000000000..f7470244b70
--- /dev/null
+++ b/data/Leipzig/E443.xml
@@ -0,0 +1 @@
+<symbol id="E443" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M178 110v359h20v-644l-88 79c-26 24 -42 43 -65 68c-29 32 -45 61 -45 89l4 25c3 18 14 31 27 38c19 10 28 13 54 13c39 0 61 -11 93 -27zM108 106l-15 -2l-8 -3c-8 -9 -11 -16 -11 -30c0 -4 1 -11 1 -20c0 -25 11 -52 32 -84c17 -25 40 -53 71 -84v194 c-22 19 -38 29 -70 29z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E444.xml b/data/Leipzig/E444.xml
new file mode 100644
index 00000000000..93a95ea433a
--- /dev/null
+++ b/data/Leipzig/E444.xml
@@ -0,0 +1 @@
+<symbol id="E444" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M106 179v-91l-44 -14v-165l44 12v-91l-46 -14v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E445.xml b/data/Leipzig/E445.xml
new file mode 100644
index 00000000000..475a0b72981
--- /dev/null
+++ b/data/Leipzig/E445.xml
@@ -0,0 +1 @@
+<symbol id="E445" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M136 186v169h17v-164l44 14v-91l-44 -14v-165l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v167l-43 -14v92l43 13v169h17v-163zM60 73v-167l76 22v168z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E446.xml b/data/Leipzig/E446.xml
new file mode 100644
index 00000000000..a8900b11682
--- /dev/null
+++ b/data/Leipzig/E446.xml
@@ -0,0 +1 @@
+<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M156 179v-91l-44 -14v-51.2667l98 31.2667v-56l-98 -31.2667v-57.7333l44 12v-91l-46 -14v-155h-17v149l-43 -13v90l43 14v59.6714l-93 -29.6714v56l93 29.6714v51.3286l-43 -14v92l43 13v169h17v-163z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E447.xml b/data/Leipzig/E447.xml
new file mode 100644
index 00000000000..805ed2f009e
--- /dev/null
+++ b/data/Leipzig/E447.xml
@@ -0,0 +1 @@
+<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 186v169h17v-164l44 14v-91l-44 -14v-52.5481l64 19.5481v-56l-64 -19.5481v-56.4519l44 12v-91l-44 -13v-155h-17v150l-76 -22v-155h-17v149l-43 -13v90l43 14v56.8536l-65 -19.8536v56l65 19.8536v54.1464l-43 -14v92l43 13v169h17v-163zM82 -36.954v-57.046l76 22 v58.2594zM82 19.046l76 23.2134v53.7406l-76 -23v-53.954z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A0.xml b/data/Leipzig/E4A0.xml
new file mode 100644
index 00000000000..2c643e6e319
--- /dev/null
+++ b/data/Leipzig/E4A0.xml
@@ -0,0 +1 @@
+<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 236l347 -119l-347 -117v33l252 84l-252 86v33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A1.xml b/data/Leipzig/E4A1.xml
new file mode 100644
index 00000000000..412d830abb0
--- /dev/null
+++ b/data/Leipzig/E4A1.xml
@@ -0,0 +1 @@
+<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -236v33l252 86l-252 84v33l347 -117z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A2.xml b/data/Leipzig/E4A2.xml
new file mode 100644
index 00000000000..7b7f04986fc
--- /dev/null
+++ b/data/Leipzig/E4A2.xml
@@ -0,0 +1 @@
+<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 45c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A3.xml b/data/Leipzig/E4A3.xml
new file mode 100644
index 00000000000..db930247893
--- /dev/null
+++ b/data/Leipzig/E4A3.xml
@@ -0,0 +1 @@
+<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -45c1 14 6 25 15 33s21 12 35 12c13 -1 23 -6 32 -15s13 -21 13 -34c-1 -14 -6 -25 -15 -33s-21 -12 -35 -12c-13 1 -23 6 -32 15s-13 21 -13 34z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A4.xml b/data/Leipzig/E4A4.xml
new file mode 100644
index 00000000000..c21ec03c2d2
--- /dev/null
+++ b/data/Leipzig/E4A4.xml
@@ -0,0 +1 @@
+<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 36h330c8 0 8 -4 8 -12v-12c0 -8 0 -12 -8 -12h-330c-8 0 -8 4 -8 12v12c0 8 0 12 8 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A5.xml b/data/Leipzig/E4A5.xml
new file mode 100644
index 00000000000..e223e7b7049
--- /dev/null
+++ b/data/Leipzig/E4A5.xml
@@ -0,0 +1 @@
+<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M8 0h330c8 0 8 -4 8 -12v-12c0 -8 0 -12 -8 -12h-330c-8 0 -8 4 -8 12v12c0 8 0 12 8 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A6.xml b/data/Leipzig/E4A6.xml
new file mode 100644
index 00000000000..b81e6d59bc6
--- /dev/null
+++ b/data/Leipzig/E4A6.xml
@@ -0,0 +1 @@
+<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 224l-55 -224l-55 224v5c3 5 4 5 14 8c14 4 28 5 42 7c11 -1 21 0 35 -5c12 -4 22 -6 19 -10v-5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A7.xml b/data/Leipzig/E4A7.xml
new file mode 100644
index 00000000000..e3329d6e5cf
--- /dev/null
+++ b/data/Leipzig/E4A7.xml
@@ -0,0 +1 @@
+<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -224v-5c3 -4 -7 -6 -19 -10c-14 -5 -24 -4 -35 -5c-14 2 -28 3 -42 7c-10 3 -11 3 -14 8v5l55 224z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A8.xml b/data/Leipzig/E4A8.xml
new file mode 100644
index 00000000000..f1ee882ca34
--- /dev/null
+++ b/data/Leipzig/E4A8.xml
@@ -0,0 +1 @@
+<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M153 224l-77 -224l-76 224h36c9 -3 15 -9 20 -18c9 -16 16 -25 20 -26c6 2 11 7 14 14c7 16 16 26 26 30h37z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4A9.xml b/data/Leipzig/E4A9.xml
new file mode 100644
index 00000000000..a2150dba050
--- /dev/null
+++ b/data/Leipzig/E4A9.xml
@@ -0,0 +1 @@
+<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M153 -224h-37c-10 4 -19 14 -26 30c-3 7 -8 12 -14 14c-4 -1 -11 -10 -20 -26c-5 -9 -11 -15 -20 -18h-36l76 224z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AA.xml b/data/Leipzig/E4AA.xml
new file mode 100644
index 00000000000..5666d6277dd
--- /dev/null
+++ b/data/Leipzig/E4AA.xml
@@ -0,0 +1 @@
+<symbol id="E4AA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v240h33v-240h-33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AB.xml b/data/Leipzig/E4AB.xml
new file mode 100644
index 00000000000..c6e575caf08
--- /dev/null
+++ b/data/Leipzig/E4AB.xml
@@ -0,0 +1 @@
+<symbol id="E4AB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0h33v-240h-33v240z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AC.xml b/data/Leipzig/E4AC.xml
new file mode 100644
index 00000000000..fd1782f4843
--- /dev/null
+++ b/data/Leipzig/E4AC.xml
@@ -0,0 +1 @@
+<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 0h-82l-84 154l-78 -154h-29l137 265z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AD.xml b/data/Leipzig/E4AD.xml
new file mode 100644
index 00000000000..692609527bf
--- /dev/null
+++ b/data/Leipzig/E4AD.xml
@@ -0,0 +1 @@
+<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 0h82l84 -154l78 154h29l-137 -265z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AE.xml b/data/Leipzig/E4AE.xml
new file mode 100644
index 00000000000..f73e2f1c53c
--- /dev/null
+++ b/data/Leipzig/E4AE.xml
@@ -0,0 +1 @@
+<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 110h-82l-84 154l-78 -154h-29l137 265zM87 45c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4AF.xml b/data/Leipzig/E4AF.xml
new file mode 100644
index 00000000000..2b594423aca
--- /dev/null
+++ b/data/Leipzig/E4AF.xml
@@ -0,0 +1 @@
+<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 -45c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33zM1 -110h82l84 -154l78 154h29l-137 -265z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B0.xml b/data/Leipzig/E4B0.xml
new file mode 100644
index 00000000000..53ce9d6d480
--- /dev/null
+++ b/data/Leipzig/E4B0.xml
@@ -0,0 +1 @@
+<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 45c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33zM0 346l347 -119l-347 -117v33l252 84l-252 86v33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B1.xml b/data/Leipzig/E4B1.xml
new file mode 100644
index 00000000000..ad1a4a840ee
--- /dev/null
+++ b/data/Leipzig/E4B1.xml
@@ -0,0 +1 @@
+<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 -45c1 14 6 25 15 33s21 12 35 12c13 -1 23 -6 32 -15s13 -21 13 -34c-1 -14 -6 -25 -15 -33s-21 -12 -35 -12c-13 1 -23 6 -32 15s-13 21 -13 34zM0 -346v33l252 86l-252 84v33l347 -117z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B2.xml b/data/Leipzig/E4B2.xml
new file mode 100644
index 00000000000..49b9a0dfc88
--- /dev/null
+++ b/data/Leipzig/E4B2.xml
@@ -0,0 +1 @@
+<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 45c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33zM0 140v33h347v-33h-347z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B3.xml b/data/Leipzig/E4B3.xml
new file mode 100644
index 00000000000..3ebb924a391
--- /dev/null
+++ b/data/Leipzig/E4B3.xml
@@ -0,0 +1 @@
+<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 -45c1 14 6 25 15 33s21 12 35 12c13 -1 23 -6 32 -15s13 -21 13 -34c-1 -14 -6 -25 -15 -33s-21 -12 -35 -12c-13 1 -23 6 -32 15s-13 21 -13 34zM0 -140h347v-33h-347v33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B4.xml b/data/Leipzig/E4B4.xml
new file mode 100644
index 00000000000..e77f801d82a
--- /dev/null
+++ b/data/Leipzig/E4B4.xml
@@ -0,0 +1 @@
+<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 308l347 -119l-347 -117v33l252 84l-252 86v33zM0 0v33h347v-33h-347z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B5.xml b/data/Leipzig/E4B5.xml
new file mode 100644
index 00000000000..5a887b70d83
--- /dev/null
+++ b/data/Leipzig/E4B5.xml
@@ -0,0 +1 @@
+<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -308v33l252 86l-252 84v33l347 -117zM0 0h347v-33h-347v33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B6.xml b/data/Leipzig/E4B6.xml
new file mode 100644
index 00000000000..53bcadeb16f
--- /dev/null
+++ b/data/Leipzig/E4B6.xml
@@ -0,0 +1 @@
+<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M190 112l-190 -112l112 190l4 4c6 1 7 1 16 -4c13 -7 23 -17 34 -25c7 -8 14 -16 21 -29c6 -11 12 -19 7 -20z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B7.xml b/data/Leipzig/E4B7.xml
new file mode 100644
index 00000000000..8c19a5c022f
--- /dev/null
+++ b/data/Leipzig/E4B7.xml
@@ -0,0 +1 @@
+<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M190 -112l4 -4c5 -1 -1 -9 -7 -20c-7 -13 -14 -21 -21 -29c-11 -8 -21 -18 -34 -25c-9 -5 -10 -5 -16 -4l-4 4l-112 190z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B8.xml b/data/Leipzig/E4B8.xml
new file mode 100644
index 00000000000..05e328b8da1
--- /dev/null
+++ b/data/Leipzig/E4B8.xml
@@ -0,0 +1 @@
+<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 166c11 -44 21 -74 32 -90c22 -34 55 -51 98 -51s75 17 97 51c12 18 23 48 32 90c1 0 1 0 2 1c3 -5 4 -12 4 -22c0 -34 -8 -64 -24 -89c-24 -37 -61 -56 -111 -56s-87 19 -110 56c-17 27 -25 57 -25 91c0 11 1 17 2 20c1 -1 2 -1 3 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4B9.xml b/data/Leipzig/E4B9.xml
new file mode 100644
index 00000000000..bf2c82f7e3a
--- /dev/null
+++ b/data/Leipzig/E4B9.xml
@@ -0,0 +1 @@
+<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M5 -166c-1 0 -2 0 -3 -1c-1 3 -2 9 -2 20c0 34 8 64 25 91c23 37 60 56 110 56s87 -19 111 -56c16 -25 24 -55 24 -89c0 -10 -1 -17 -4 -22c-1 1 -1 1 -2 1c-9 42 -20 72 -32 90c-22 34 -54 51 -97 51s-76 -17 -98 -51c-11 -16 -21 -46 -32 -90z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4BA.xml b/data/Leipzig/E4BA.xml
new file mode 100644
index 00000000000..9d4aaeb340e
--- /dev/null
+++ b/data/Leipzig/E4BA.xml
@@ -0,0 +1 @@
+<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 25h16c17 0 41 1 55 11c19 13 14 10 36 40c0 1 12 19 13 20c1 -1 1 -3 1 -6c0 -21 -9 -36 -18 -49c-24 -37 -43 -41 -93 -41s-79 2 -99 37c-12 21 -1 1 -16 30c-7 13 -9 26 -8 29c1 -1 15 -18 15 -19c23 -27 18 -23 36 -38c16 -13 24 -14 46 -14h16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4BB.xml b/data/Leipzig/E4BB.xml
new file mode 100644
index 00000000000..4cd7fd2a0e2
--- /dev/null
+++ b/data/Leipzig/E4BB.xml
@@ -0,0 +1 @@
+<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 -25h-16c-22 0 -30 -1 -46 -14c-18 -15 -13 -11 -36 -38c0 -1 -14 -18 -15 -19c-1 3 1 16 8 29c15 29 4 9 16 30c20 35 49 37 99 37s69 -4 93 -41c9 -13 18 -28 18 -49c0 -3 0 -5 -1 -6c-1 1 -13 19 -13 20c-22 30 -17 27 -36 40c-14 10 -38 11 -55 11h-16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4BC.xml b/data/Leipzig/E4BC.xml
new file mode 100644
index 00000000000..8fba4a617f9
--- /dev/null
+++ b/data/Leipzig/E4BC.xml
@@ -0,0 +1 @@
+<symbol id="E4BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v33h347v-33h-347zM310 85h-82l-84 154l-78 -154h-29l137 265z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4BD.xml b/data/Leipzig/E4BD.xml
new file mode 100644
index 00000000000..c01a75a681e
--- /dev/null
+++ b/data/Leipzig/E4BD.xml
@@ -0,0 +1 @@
+<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M347 0v-33h-347v33h347zM37 -85h82l84 -154l78 154h29l-137 -265z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C0.xml b/data/Leipzig/E4C0.xml
new file mode 100644
index 00000000000..e01d017c229
--- /dev/null
+++ b/data/Leipzig/E4C0.xml
@@ -0,0 +1 @@
+<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M605 21zM0 0c0 3 3 17 4 21c58 293 250 299 295 299h5h5c42 0 236 -6 295 -299c1 -4 1 -18 1 -21h-32c-1 1 -4 22 -5 25c-10 38 -52 202 -265 202c-208 0 -252 -159 -264 -200c-1 -4 -6 -26 -6 -27h-33zM358 52c0 -30 -25 -55 -55 -55c-29 0 -54 25 -54 55 c0 29 25 54 54 54c30 0 55 -25 55 -54z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C1.xml b/data/Leipzig/E4C1.xml
new file mode 100644
index 00000000000..2a3b1e92ae2
--- /dev/null
+++ b/data/Leipzig/E4C1.xml
@@ -0,0 +1 @@
+<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M605 -21zM0 0h33c0 -1 5 -23 6 -27c12 -41 56 -200 264 -200c213 0 255 164 265 202c1 3 4 24 5 25h32c0 -3 0 -17 -1 -21c-59 -293 -253 -299 -295 -299h-5h-5c-45 0 -237 6 -295 299c-1 4 -4 18 -4 21zM358 -52c0 -29 -25 -54 -55 -54c-29 0 -54 25 -54 54 c0 30 25 55 54 55c30 0 55 -25 55 -55z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C2.xml b/data/Leipzig/E4C2.xml
new file mode 100644
index 00000000000..ed782a3b7b2
--- /dev/null
+++ b/data/Leipzig/E4C2.xml
@@ -0,0 +1 @@
+<symbol id="E4C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 104c0 -16 -6 -30 -18 -41s-28 -17 -47 -17c-16 0 -30 6 -42 17s-18 25 -19 41c0 14 6 27 17 38s25 17 43 18c20 0 37 -6 48 -17s17 -24 18 -39zM390 449c0 0 347 -361 378 -390c8 -7 11 -18 11 -28c0 -9 -2 -16 -6 -21s-13 -10 -13 -10c-13 0 -7 -1 -19 4 c-11 5 -31 25 -42 35l-309 290l-298 -276s-32 -32 -41 -40c-12 -10 -12 -13 -25 -13c-10 0 -8 -2 -21 7c-4 3 -5 9 -5 16c0 11 4 24 10 30c127 126 380 396 380 396zM390 288c0 0 225 -230 245 -249c5 -5 7 -12 7 -18s-1 -11 -3 -14c-3 -3 -9 -6 -9 -6c-9 0 -4 -1 -12 2 c-7 3 -21 17 -28 24l-200 186v1l-194 -179s-21 -21 -27 -26c-8 -6 -8 -8 -16 -8c-6 0 -6 -2 -14 4c-2 2 -3 6 -3 10c0 7 3 16 7 20c83 82 247 253 247 253z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C3.xml b/data/Leipzig/E4C3.xml
new file mode 100644
index 00000000000..df42a8beda3
--- /dev/null
+++ b/data/Leipzig/E4C3.xml
@@ -0,0 +1 @@
+<symbol id="E4C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 -104c-1 -15 -7 -28 -18 -39s-28 -17 -48 -17c-18 1 -32 7 -43 18s-17 24 -17 38c1 16 7 30 19 41s26 17 42 17c19 0 35 -6 47 -17s18 -25 18 -41zM390 -449c0 0 -253 270 -380 396c-6 6 -10 19 -10 30c0 7 1 13 5 16c13 9 11 7 21 7c13 0 13 -3 25 -13 c9 -8 41 -40 41 -40l298 -276l309 290c11 10 31 30 42 35c12 5 6 4 19 4c0 0 9 -5 13 -10s6 -12 6 -21c0 -10 -3 -21 -11 -28c-31 -29 -378 -390 -378 -390zM390 -288c0 0 -164 171 -247 253c-4 4 -7 13 -7 20c0 4 1 8 3 10c8 6 8 4 14 4c8 0 8 -2 16 -8c6 -5 27 -26 27 -26 l194 -179v1l200 186c7 7 21 21 28 24c8 3 3 2 12 2c0 0 6 -3 9 -6c2 -3 3 -8 3 -14s-2 -13 -7 -18c-20 -19 -245 -249 -245 -249z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C4.xml b/data/Leipzig/E4C4.xml
new file mode 100644
index 00000000000..dea5d1d81cd
--- /dev/null
+++ b/data/Leipzig/E4C4.xml
@@ -0,0 +1 @@
+<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 104c0 -16 -6 -30 -18 -41s-28 -17 -47 -17c-16 0 -30 6 -42 17s-18 25 -19 41c0 14 6 27 17 38s25 17 43 18c20 0 37 -6 48 -17s17 -24 18 -39zM390 449c0 0 347 -361 378 -390c8 -7 11 -18 11 -28c0 -9 -2 -16 -6 -21s-13 -10 -13 -10c-13 0 -7 -1 -19 4 c-11 5 -31 25 -42 35l-309 290l-298 -276s-32 -32 -41 -40c-12 -10 -12 -13 -25 -13c-10 0 -8 -2 -21 7c-4 3 -5 9 -5 16c0 11 4 24 10 30c127 126 380 396 380 396z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C5.xml b/data/Leipzig/E4C5.xml
new file mode 100644
index 00000000000..49ad74a3142
--- /dev/null
+++ b/data/Leipzig/E4C5.xml
@@ -0,0 +1 @@
+<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 -104c-1 -15 -7 -28 -18 -39s-28 -17 -48 -17c-18 1 -32 7 -43 18s-17 24 -17 38c1 16 7 30 19 41s26 17 42 17c19 0 35 -6 47 -17s18 -25 18 -41zM390 -449c0 0 -253 270 -380 396c-6 6 -10 19 -10 30c0 7 1 13 5 16c13 9 11 7 21 7c13 0 13 -3 25 -13 c9 -8 41 -40 41 -40l298 -276l309 290c11 10 31 30 42 35c12 5 6 4 19 4c0 0 9 -5 13 -10s6 -12 6 -21c0 -10 -3 -21 -11 -28c-31 -29 -378 -390 -378 -390z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C6.xml b/data/Leipzig/E4C6.xml
new file mode 100644
index 00000000000..6fa8c15b87c
--- /dev/null
+++ b/data/Leipzig/E4C6.xml
@@ -0,0 +1 @@
+<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M391 204c36.8298 0 62.809 -23.1346 65 -56c0 -34.3531 -29.4543 -58 -65 -58c-32.6676 0 -59.0449 26.7191 -61 58c0 31.7398 28.9048 54.2169 61 56zM742 0c-28.0091 0 -48 18.0516 -48 47v297h-598v-297c0 -28.9412 -20.5747 -44.9673 -47 -47 c-28.0091 0 -48 18.0516 -48 47v345c0 28.7164 19.2113 45.1474 47 47h694c29.0826 0 45.1887 -19.8304 47 -47v-345c0 -28.9412 -20.5747 -44.9673 -47 -47z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C7.xml b/data/Leipzig/E4C7.xml
new file mode 100644
index 00000000000..85ac1c3af0a
--- /dev/null
+++ b/data/Leipzig/E4C7.xml
@@ -0,0 +1 @@
+<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M391 -90c35.5551 0 65 -23.6372 65 -58c-2.19013 -32.852 -28.1797 -56 -65 -56c-32.1124 1.78402 -61 24.2367 -61 56c1.95528 31.2845 28.3265 58 61 58zM49 0c26.4253 -2.03272 47 -18.0628 47 -47v-297h598v297c0 28.9498 19.98 47 48 47 c26.4253 -2.03272 47 -18.0628 47 -47v-345c-1 -15 -6 -27 -15 -35c-6.89933 -6.89933 -18.9516 -12 -32 -12h-694c-27.8043 1.85362 -47 18.2815 -47 47v345c0 28.9498 19.98 47 48 47z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C8.xml b/data/Leipzig/E4C8.xml
new file mode 100644
index 00000000000..51fb8953785
--- /dev/null
+++ b/data/Leipzig/E4C8.xml
@@ -0,0 +1 @@
+<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M391 204c36.8298 0 62.809 -23.1346 65 -56c0 -34.3531 -29.4543 -58 -65 -58c-32.6676 0 -59.0449 26.7191 -61 58c0 31.7398 28.9048 54.2169 61 56zM742 0c-28.0091 0 -48 18.0516 -48 47v297h-598v-297c0 -28.9412 -20.5747 -44.9673 -47 -47 c-28.0091 0 -48 18.0516 -48 47v345c0 28.7164 19.2113 45.1474 47 47h694c29.0826 0 45.1887 -19.8304 47 -47v-345c0 -28.9412 -20.5747 -44.9673 -47 -47zM139 271c0 17.9783 11.708 30 30 30h452s13 0 15 -1c13 -4 15 -19 15 -29v-239c0 -18.0353 -13.0788 -30 -30 -30 c-18.3958 0 -32 10.9571 -32 30v207h-388v-207c0 -18.5509 -13.5742 -30 -31 -30c-17.9071 0 -31 11.4604 -31 30v239z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4C9.xml b/data/Leipzig/E4C9.xml
new file mode 100644
index 00000000000..a9338aac251
--- /dev/null
+++ b/data/Leipzig/E4C9.xml
@@ -0,0 +1 @@
+<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M391 -90c35.5551 0 65 -23.6372 65 -58c-2.19013 -32.852 -28.1797 -56 -65 -56c-32.1124 1.78402 -61 24.2367 -61 56c1.95528 31.2845 28.3265 58 61 58zM49 0c26.4253 -2.03272 47 -18.0628 47 -47v-297h598v297c0 28.9498 19.98 47 48 47 c26.4253 -2.03272 47 -18.0628 47 -47v-345c-1 -15 -6 -27 -15 -35c-6.89933 -6.89933 -18.9516 -12 -32 -12h-694c-27.8043 1.85362 -47 18.2815 -47 47v345c0 28.9498 19.98 47 48 47zM621 -2c16.9169 0 30 -11.9786 30 -30v-239c0 -10 -2 -25 -15 -29 c-2 -1 -15 -1 -15 -1h-452c-18.3027 0 -30 12.0274 -30 30v239c0 18.5509 13.0956 30 31 30c17.4146 0 31 -11.4604 31 -30v-207h388v207c0 19.0521 13.5999 30 32 30z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4CE.xml b/data/Leipzig/E4CE.xml
new file mode 100644
index 00000000000..b87beec6aba
--- /dev/null
+++ b/data/Leipzig/E4CE.xml
@@ -0,0 +1 @@
+<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 166l-12 -2h-8c-21 0 -37 7 -50 20s-19 29 -20 46c0 19 8 36 23 49c14 14 35 21 63 21c29 0 52 -10 69 -31s25 -46 25 -76c0 -20 -3 -39 -9 -58s-16 -38 -29 -57c-24 -35 -60 -61 -107 -78l-4 17c24 9 43 24 56 44s20 41 20 62c0 20 -6 34 -17 43z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E0.xml b/data/Leipzig/E4E0.xml
new file mode 100644
index 00000000000..90edf6c8f91
--- /dev/null
+++ b/data/Leipzig/E4E0.xml
@@ -0,0 +1 @@
+<symbol id="E4E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M250 -240v480c0 8 2 10 10 10h105c8 0 10 -2 10 -10v-480c0 -8 -2 -10 -10 -10h-105c-8 0 -10 2 -10 10zM0 -240v480c0 8 2 10 10 10h105c8 0 10 -2 10 -10v-480c0 -8 -2 -10 -10 -10h-105c-8 0 -10 2 -10 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E1.xml b/data/Leipzig/E4E1.xml
new file mode 100644
index 00000000000..2d352616311
--- /dev/null
+++ b/data/Leipzig/E4E1.xml
@@ -0,0 +1 @@
+<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -240v480c0 8 2 10 10 10h105c8 0 10 -2 10 -10v-480c0 -8 -2 -10 -10 -10h-105c-8 0 -10 2 -10 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E2.xml b/data/Leipzig/E4E2.xml
new file mode 100644
index 00000000000..9459538de1c
--- /dev/null
+++ b/data/Leipzig/E4E2.xml
@@ -0,0 +1 @@
+<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v230c0 8 2 10 10 10h105c8 0 10 -2 10 -10v-230c0 -8 -2 -10 -10 -10h-105c-8 0 -10 2 -10 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E3.xml b/data/Leipzig/E4E3.xml
new file mode 100644
index 00000000000..983504741df
--- /dev/null
+++ b/data/Leipzig/E4E3.xml
@@ -0,0 +1 @@
+<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -115v105c0 9 1 10 10 10h280c9 0 10 -1 10 -10v-105c0 -9 -1 -10 -10 -10h-280c-9 0 -10 1 -10 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E4.xml b/data/Leipzig/E4E4.xml
new file mode 100644
index 00000000000..8f539fb963b
--- /dev/null
+++ b/data/Leipzig/E4E4.xml
@@ -0,0 +1 @@
+<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v105c0 9 1 10 10 10h280c9 0 10 -1 10 -10v-105c0 -9 -1 -10 -10 -10h-280c-9 0 -10 1 -10 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E5.xml b/data/Leipzig/E4E5.xml
new file mode 100644
index 00000000000..8a4ab2d1738
--- /dev/null
+++ b/data/Leipzig/E4E5.xml
@@ -0,0 +1 @@
+<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M107 292c-13 24 -30 49 -52 71c-1 1 0 2 0 3l-2 2c3 3 4 4 6 4c12 0 26 -7 40 -20s44 -40 89 -81c26 -24 28 -29 46 -47c4 -4 8 -9 10 -14c6 -8 8 -16 8 -27c0 -19 -12 -40 -36 -61c-28 -23 -49 -38 -61 -73c-4 -11 -7 -27 -10 -50c13 -43 34 -83 59 -121 c31 -47 59 -79 101 -129c-8 0 -26 7 -54 20l-62 29l-21 6l-23 1c-25 0 -45 -10 -60 -30l-4 -14l-1 -12c0 -33 20 -56 39 -78c8 -9 17 -18 26 -26c17 -15 27 -24 28 -30l-3 -3c-11 5 -19 10 -25 15c-9 3 -37 21 -45 26c-24 14 -45 32 -63 51c-19 21 -37 44 -37 71 c0 63 27 95 80 95c41 0 86 -18 136 -52c-19 26 -37 48 -55 66c-23 23 -48 44 -73 65c-28 23 -47 40 -58 53s-17 26 -18 39c75 64 113 125 113 183c0 27 -7 48 -18 68z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E6.xml b/data/Leipzig/E4E6.xml
new file mode 100644
index 00000000000..ae2914283e2
--- /dev/null
+++ b/data/Leipzig/E4E6.xml
@@ -0,0 +1 @@
+<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 123c7 34 33 56 69 60c29 -3 43 -9 53 -29c4 -8 7 -15 10 -22c0 -21 -1 -25 -11 -35c-5 -8 -18 -14 -40 -20l12 -3l15 -1c44 0 97 26 122 56c10 11 18 26 24 42c7 1 15 2 22 3l-140 -424h-36l111 330c-10 -6 -27 -12 -53 -16l-52 -8h-10l-20 1c-1 0 -8 3 -21 6 c-37 9 -55 28 -55 60z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E7.xml b/data/Leipzig/E4E7.xml
new file mode 100644
index 00000000000..b5402534b2d
--- /dev/null
+++ b/data/Leipzig/E4E7.xml
@@ -0,0 +1 @@
+<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M133 -111c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 69 24 90 47l66 197c-36 -18 -64 -25 -112 -25c-23 0 -38 3 -45 8c-37 7 -55 27 -55 59c8 35 30 54 68 58c45 -6 49 -13 64 -48c0 -3 1 -5 1 -7c0 -27 -25 -46 -52 -49c6 -4 15 -6 26 -6c32 2 62 14 88 29 c32 19 44 36 59 71l7 1l10 2h4c-72 -220 -143 -439 -215 -659h-37l108 324c-20 -13 -51 -20 -82 -20c-21 0 -35 4 -43 10c-37 6 -55 26 -55 58c8 35 31 56 68 60c43 -8 48 -13 64 -51z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E8.xml b/data/Leipzig/E4E8.xml
new file mode 100644
index 00000000000..2149ba88754
--- /dev/null
+++ b/data/Leipzig/E4E8.xml
@@ -0,0 +1 @@
+<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M69 -54c44 -9 49 -10 63 -50c0 -14 -1 -24 -4 -29c-7 -11 -23 -20 -47 -26c6 -3 15 -4 25 -4c18 0 39 7 61 22c18 12 30 26 30 26l61 187c-22 -12 -48 -21 -81 -21c-18 0 -34 3 -46 9c-36 9 -54 29 -54 61c8 34 31 58 68 58c34 0 63 -24 63 -57c0 -11 -4 -21 -10 -30 c-4 -5 -16 -12 -39 -18c8 -3 16 -5 24 -5c35 0 71 25 88 45l66 198c-12 -11 -33 -12 -55 -17c-18 -4 -29 -8 -35 -8h-15l-28 2c-10 1 -17 3 -23 6c-37 7 -56 26 -56 59c9 33 33 59 72 59c33 0 53 -21 61 -49c0 -37 -17 -47 -51 -55c5 -4 13 -6 24 -6c14 0 29 3 45 8 c47 15 89 43 101 92l18 2l4 -1l-288 -889h-37l106 318c-17 -10 -43 -15 -72 -15c-22 0 -40 3 -52 9c-35 8 -55 23 -55 61c8 35 31 54 68 58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4E9.xml b/data/Leipzig/E4E9.xml
new file mode 100644
index 00000000000..881e7f4e8f9
--- /dev/null
+++ b/data/Leipzig/E4E9.xml
@@ -0,0 +1 @@
+<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M270 413c40 0 56 -15 65 -47c-1 -39 -13 -49 -50 -57c3 -1 5 -2 7 -2s4 -1 6 -2l14 -1c28 1 57 10 85 26s49 41 63 73h6l7 4l7 -1c-78 -235 -154 -472 -231 -708c-10 -32 -21 -63 -32 -95c-36 -107 -71 -214 -107 -321h-34c36 108 70 218 108 324 c-27 -14 -47 -19 -84 -19c-20 0 -34 2 -43 7c-30 6 -55 24 -55 58c0 37 29 57 68 61c41 -8 51 -13 64 -49c0 -39 -16 -45 -51 -56c8 -3 16 -5 23 -5c30 0 60 15 90 46l63 189c-26 -14 -43 -19 -78 -19c-21 0 -34 5 -49 9c-34 9 -53 27 -53 58c0 35 29 55 68 60 c41 -8 51 -14 63 -51c0 -15 -1 -25 -5 -30c-6 -9 -22 -17 -45 -25c8 -3 16 -3 25 -3c39 2 65 22 89 46l61 187c-28 -12 -56 -18 -84 -18c-18 0 -32 3 -41 7c-37 7 -56 27 -56 61c10 35 33 54 69 58c45 -5 51 -12 64 -50c0 -37 -15 -44 -48 -55c8 -2 15 -3 23 -3 c41 0 67 25 91 50l62 191c-19 -10 -81 -24 -112 -24c-18 0 -34 1 -45 8c-36 8 -54 28 -54 60c0 33 33 58 66 58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4EA.xml b/data/Leipzig/E4EA.xml
new file mode 100644
index 00000000000..8f810ceb0d0
--- /dev/null
+++ b/data/Leipzig/E4EA.xml
@@ -0,0 +1 @@
+<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 567c13 -3 15 -5 27 -5c28 0 57 10 89 28c28 16 52 40 61 74h8l9 2h6l-82 -247c-125 -385 -252 -769 -378 -1153h-35c36 112 72 224 109 335c-22 -13 -59 -19 -93 -19c-10 0 -16 -1 -18 0l-17 6c-39 8 -58 29 -58 62c8 35 31 56 70 62c41 -6 57 -15 67 -53 c-2 -39 -17 -45 -53 -57c7 -3 15 -3 25 -3c40 2 67 22 91 48l65 196c-21 -14 -46 -22 -78 -22c-23 0 -39 2 -52 9c-36 8 -54 28 -54 60c8 35 30 58 68 63c46 -5 51 -14 66 -52c0 -39 -18 -48 -53 -57c7 -2 17 -6 26 -6c40 2 66 22 93 48l62 197c-23 -16 -42 -21 -79 -21 c-13 1 -40 4 -49 8c-38 9 -57 30 -57 62c11 36 29 56 71 61c43 -8 52 -13 65 -51c0 -38 -17 -51 -53 -58c8 -3 17 -5 25 -5c37 1 77 28 94 50l64 194c-22 -16 -40 -20 -79 -20c-16 0 -28 0 -33 1l-18 7c-38 9 -57 30 -57 62c8 34 32 55 71 62c40 -8 53 -17 66 -53 c0 -40 -16 -49 -54 -57c11 -4 20 -5 29 -5c41 0 68 25 92 52l65 198c-26 -11 -82 -24 -119 -24c-22 0 -30 0 -44 7c-37 9 -56 29 -56 61c8 36 32 57 71 63c35 -3 66 -20 66 -56c0 -32 -23 -49 -52 -54z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4EB.xml b/data/Leipzig/E4EB.xml
new file mode 100644
index 00000000000..f9ef1ffc7f2
--- /dev/null
+++ b/data/Leipzig/E4EB.xml
@@ -0,0 +1 @@
+<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 -574c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 69 23 90 46c20 63 40 126 61 188c-22 -13 -59 -19 -93 -19c-10 0 -16 -1 -18 0l-17 6c-39 8 -58 29 -58 62c8 35 31 56 70 62c41 -6 57 -15 67 -53c-2 -39 -17 -45 -53 -57c7 -3 15 -3 25 -3c40 2 67 22 91 48 l65 196c-21 -14 -46 -22 -78 -22c-23 0 -39 2 -52 9c-36 8 -54 28 -54 60c8 35 30 58 68 63c46 -5 51 -14 66 -52c0 -39 -18 -48 -53 -57c7 -2 17 -6 26 -6c40 2 66 22 93 48l62 197c-23 -16 -42 -21 -79 -21c-13 1 -40 4 -49 8c-38 9 -57 30 -57 62c11 36 29 56 71 61 c43 -8 52 -13 65 -51c0 -38 -17 -51 -53 -58c8 -3 17 -5 25 -5c37 1 77 28 94 50l64 194c-22 -16 -40 -20 -79 -20c-16 0 -28 0 -33 1l-18 7c-38 9 -57 30 -57 62c8 34 32 55 71 62c40 -8 53 -17 66 -53c0 -40 -16 -49 -54 -57c11 -4 20 -5 29 -5c41 0 68 25 92 52l65 198 c-26 -11 -67 -26 -104 -26h-17c-8 0 -13 1 -27 5c-36 12 -56 33 -56 65c8 36 32 57 71 63c35 -3 66 -20 66 -56c0 -32 -23 -49 -52 -54c13 -3 15 -5 27 -5c28 0 42 10 74 28c28 16 52 40 61 74h8l9 2h6l-82 -247c-90 -277 -181 -553 -272 -829c0 -1 1 -1 1 -2l-179 -542 l-38 -1l108 324c-20 -13 -51 -20 -82 -20h-22c-9 0 -15 0 -20 4c-37 6 -56 32 -56 64c8 35 31 56 68 60c43 -8 48 -13 64 -51z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4EC.xml b/data/Leipzig/E4EC.xml
new file mode 100644
index 00000000000..d32fe899157
--- /dev/null
+++ b/data/Leipzig/E4EC.xml
@@ -0,0 +1 @@
+<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 -574c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 69 23 90 46c20 63 40 126 61 188c-22 -13 -59 -19 -93 -19c-10 0 -16 -1 -18 0l-17 6c-39 8 -58 29 -58 62c8 35 31 56 70 62c41 -6 57 -15 67 -53c-2 -39 -17 -45 -53 -57c7 -3 15 -3 25 -3c40 2 67 22 91 48 l65 196c-21 -14 -46 -22 -78 -22c-23 0 -39 2 -52 9c-36 8 -54 28 -54 60c8 35 30 58 68 63c46 -5 51 -14 66 -52c0 -39 -18 -48 -53 -57c7 -2 17 -6 26 -6c40 2 66 22 93 48l62 197c-23 -16 -42 -21 -79 -21c-13 1 -40 4 -49 8c-38 9 -57 30 -57 62c11 36 29 56 71 61 c43 -8 52 -13 65 -51c0 -38 -17 -51 -53 -58c8 -3 17 -5 25 -5c37 1 77 28 94 50l64 194c-22 -16 -40 -20 -79 -20c-16 0 -28 0 -33 1l-18 7c-38 9 -57 30 -57 62c8 34 32 55 71 62c40 -8 53 -17 66 -53c0 -40 -16 -49 -54 -57c11 -4 20 -5 29 -5c41 0 68 25 92 52l34 108 c9 28 21 60 30 90c-26 -11 -64 -28 -101 -28h-12c-11 0 -16 1 -32 6c-36 12 -56 34 -56 66c8 36 32 57 71 63c35 -3 66 -20 66 -56c0 -32 -23 -49 -52 -54c13 -2 20 -6 30 -6c2 0 5 1 8 1c28 4 29 7 61 28c11 7 22 14 32 24l66 196c-10 -6 -27 -12 -53 -16l-52 -8h-10l-20 1 c-1 0 -8 3 -21 6c-37 9 -55 28 -55 60c7 34 33 56 69 60c29 -3 43 -9 53 -29c4 -8 7 -15 10 -22c0 -21 -1 -25 -11 -35c-5 -8 -18 -14 -40 -20l12 -3l15 -1c44 0 97 26 122 56c10 11 18 26 24 42c7 1 15 2 22 3l-140 -424h-1l-20 -61c-90 -277 -181 -553 -272 -829 c0 -1 1 -1 1 -2l-179 -542l-38 -1l108 324c-20 -13 -51 -20 -82 -20h-22c-9 0 -15 0 -20 4c-37 6 -56 32 -56 64c8 35 31 56 68 60c43 -8 48 -13 64 -51z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4ED.xml b/data/Leipzig/E4ED.xml
new file mode 100644
index 00000000000..c3bd245be22
--- /dev/null
+++ b/data/Leipzig/E4ED.xml
@@ -0,0 +1 @@
+<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 -574c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 69 23 90 46c20 63 40 126 61 188c-22 -13 -59 -19 -93 -19c-10 0 -16 -1 -18 0l-17 6c-39 8 -58 29 -58 62c8 35 31 56 70 62c41 -6 57 -15 67 -53c-2 -39 -17 -45 -53 -57c7 -3 15 -3 25 -3c40 2 67 22 91 48 l65 196c-21 -14 -46 -22 -78 -22c-23 0 -39 2 -52 9c-36 8 -54 28 -54 60c8 35 30 58 68 63c46 -5 51 -14 66 -52c0 -39 -18 -48 -53 -57c7 -2 17 -6 26 -6c40 2 66 22 93 48l62 197c-23 -16 -42 -21 -79 -21c-13 1 -40 4 -49 8c-38 9 -57 30 -57 62c11 36 29 56 71 61 c43 -8 52 -13 65 -51c0 -38 -17 -51 -53 -58c8 -3 17 -5 25 -5c37 1 77 28 94 50l64 194c-22 -16 -40 -20 -79 -20c-16 0 -28 0 -33 1l-18 7c-38 9 -57 30 -57 62c8 34 32 55 71 62c40 -8 53 -17 66 -53c0 -40 -16 -49 -54 -57c11 -4 20 -5 29 -5c41 0 68 25 92 52l35 106 h-1l31 92c-26 -11 -62 -26 -99 -26h-13c-13 0 -20 1 -31 6c-37 9 -56 32 -56 64c8 36 32 57 71 63c35 -3 57 -20 57 -56c0 -32 -14 -49 -43 -54c13 -3 16 -2 28 -2c28 0 36 7 68 25c12 7 23 15 33 25l62 187c-20 -13 -69 -25 -100 -25c-21 0 -35 1 -43 7 c-37 6 -55 34 -55 66c8 35 31 56 68 60c43 -8 48 -13 64 -51c0 -33 -21 -50 -52 -55c10 -3 18 -4 25 -4c40 0 87 24 108 47l66 197c-36 -18 -64 -25 -112 -25c-23 0 -38 3 -45 8c-37 7 -55 27 -55 59c8 35 30 54 68 58c45 -6 49 -13 64 -48c0 -3 1 -5 1 -7 c0 -27 -25 -46 -52 -49c6 -4 15 -6 26 -6c32 2 62 14 88 29c32 19 44 36 59 71l7 1l10 2h2c-74 -220 -148 -439 -216 -659c-5 -16 -13 -40 -20 -59c-90 -277 -180 -553 -271 -829c0 -1 1 -1 1 -2l-179 -542l-38 -1l108 324c-20 -13 -51 -20 -82 -20h-22c-9 0 -15 0 -20 4 c-37 6 -56 32 -56 64c8 35 31 56 68 60c43 -8 48 -13 64 -51z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4F2.xml b/data/Leipzig/E4F2.xml
new file mode 100644
index 00000000000..aa978df7616
--- /dev/null
+++ b/data/Leipzig/E4F2.xml
@@ -0,0 +1 @@
+<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 123c0 -32 -18 -51 -55 -60c-13 -3 -20 -6 -21 -6l-20 -1h-10l-52 8c-26 4 -43 10 -53 16l111 -330h-36l-140 424c7 -1 15 -2 22 -3c6 -16 14 -31 24 -42c25 -30 78 -56 122 -56l15 1l12 3c-22 6 -35 12 -40 20c-10 10 -11 14 -11 35c3 7 6 14 10 22 c10 20 24 26 53 29c36 -4 62 -26 69 -60z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E4F6.xml b/data/Leipzig/E4F6.xml
new file mode 100644
index 00000000000..a6d69cc636c
--- /dev/null
+++ b/data/Leipzig/E4F6.xml
@@ -0,0 +1 @@
+<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 123c0 -32 -18 -51 -55 -60c-13 -3 -20 -6 -21 -6l-20 -1h-10l-52 8c-26 4 -43 10 -53 16l211 -330h-28h-22l-2 7c-6 14 -13 27 -22 37c-25 30 -78 56 -122 56l-15 -1l-12 -3c22 -6 35 -12 40 -20c10 -10 11 -14 11 -35c-3 -7 -6 -14 -10 -22 c-10 -20 -24 -26 -53 -29c-36 4 -62 26 -69 60c0 32 18 51 55 60c13 3 20 6 21 6l20 1h10l52 -8c26 -4 43 -10 53 -16l-211 330h18h32l2 -7c6 -14 13 -27 22 -37c25 -30 78 -56 122 -56l15 1l12 3c-22 6 -35 12 -40 20c-10 10 -11 14 -11 35c3 7 6 14 10 22 c10 20 24 26 53 29c36 -4 62 -26 69 -60z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E500.xml b/data/Leipzig/E500.xml
new file mode 100644
index 00000000000..41ed8782814
--- /dev/null
+++ b/data/Leipzig/E500.xml
@@ -0,0 +1 @@
+<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M508 242l-362 -484h-146l362 484h146zM52 118c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33zM361 -121c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33 c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E501.xml b/data/Leipzig/E501.xml
new file mode 100644
index 00000000000..d73f01cae94
--- /dev/null
+++ b/data/Leipzig/E501.xml
@@ -0,0 +1 @@
+<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33zM603 -121c0 13 4 25 13 34s19 14 32 15 c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E502.xml b/data/Leipzig/E502.xml
new file mode 100644
index 00000000000..6c3707684b0
--- /dev/null
+++ b/data/Leipzig/E502.xml
@@ -0,0 +1 @@
+<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1234 242l-362 -484h-146l362 484h146zM992 242l-362 -484h-146l362 484h146zM750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15 c-14 0 -26 4 -35 12s-14 19 -15 33zM1087 -121c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E503.xml b/data/Leipzig/E503.xml
new file mode 100644
index 00000000000..ec92476a080
--- /dev/null
+++ b/data/Leipzig/E503.xml
@@ -0,0 +1 @@
+<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 118c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E504.xml b/data/Leipzig/E504.xml
new file mode 100644
index 00000000000..6d77f56c5cd
--- /dev/null
+++ b/data/Leipzig/E504.xml
@@ -0,0 +1 @@
+<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M508 242l-362 -484h-146l362 484h146z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E505.xml b/data/Leipzig/E505.xml
new file mode 100644
index 00000000000..82077c61fc3
--- /dev/null
+++ b/data/Leipzig/E505.xml
@@ -0,0 +1 @@
+<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -121c0 13 4 25 13 34s19 14 32 15c14 0 26 -4 35 -12s14 -19 15 -33c0 -13 -4 -25 -13 -34s-19 -14 -32 -15c-14 0 -26 4 -35 12s-14 19 -15 33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E510.xml b/data/Leipzig/E510.xml
new file mode 100644
index 00000000000..4b0541f7d05
--- /dev/null
+++ b/data/Leipzig/E510.xml
@@ -0,0 +1 @@
+<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M86 180c-15 17 -25 40 -28 67c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58c0 -17 -6 -32 -17 -45s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60 c0 18 7 36 22 55c13 16 34 29 64 39zM98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18c17 0 29 4 38 12s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12 c7 -22 29 -48 64 -79z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E511.xml b/data/Leipzig/E511.xml
new file mode 100644
index 00000000000..28829cd95c4
--- /dev/null
+++ b/data/Leipzig/E511.xml
@@ -0,0 +1 @@
+<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M584 213c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13 c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7c-15 0 -22 8 -22 25l1 12zM528 167c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8 c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM352 316c-11 -9 -21 -13 -32 -13l-6 1l-6 1l-17 4c-4 0 -6 -4 -6 -11c0 -3 -1 -5 -4 -6l-4 3l-2 2l-1 11l1 8l5 8c3 6 9 9 16 9h6h4l4 -1l6 -4l10 -5l13 -4 c5 0 9 1 13 4l1 3l4 11c3 7 6 12 11 13c3 -3 5 -6 5 -8l-2 -9c-5 -7 -9 -14 -12 -20s-7 -17 -14 -34l-9 -36l-3 -34l1 -15l4 -14c5 -10 13 -15 24 -15s23 6 34 17s22 32 32 61l4 24l2 24l-3 16l-1 20l2 16c2 4 6 6 11 7c5 0 9 -3 12 -9c1 -2 1 -5 2 -9s2 -9 3 -14l-2 -24 l-2 -11l-3 -11c-4 -18 -9 -33 -15 -46s-15 -26 -27 -40c-7 -10 -17 -18 -28 -24s-23 -9 -36 -9c-14 0 -25 4 -33 12s-12 19 -13 34c0 11 5 27 16 49zM86 180c-15 17 -25 40 -28 67c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58 c0 -17 -6 -32 -17 -45s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60c0 18 7 36 22 55c13 16 34 29 64 39zM98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18 c17 0 29 4 38 12s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12c7 -22 29 -48 64 -79z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E512.xml b/data/Leipzig/E512.xml
new file mode 100644
index 00000000000..5148f25089a
--- /dev/null
+++ b/data/Leipzig/E512.xml
@@ -0,0 +1 @@
+<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M577 55c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13 c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7c-15 0 -22 8 -22 25l1 12zM521 9c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18 l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM345 163c-11 -9 -21 -13 -32 -13l-6 1l-6 1l-17 4c-4 0 -6 -4 -6 -11c0 -3 -1 -5 -4 -6l-4 3l-2 2l-1 11l1 8l5 8c3 6 9 9 16 9h6h4l4 -1l6 -4l10 -5l13 -4c5 0 9 1 13 4l1 3l4 11 c3 7 6 12 11 13c3 -3 5 -6 5 -8l-2 -9c-5 -7 -9 -14 -12 -20s-7 -17 -14 -34l-9 -36l-3 -34l1 -15l4 -14c5 -10 13 -15 24 -15s23 6 34 17s22 32 32 61l4 24l2 24l-3 16l-1 20l2 16c2 4 6 6 11 7c5 0 9 -3 12 -9c1 -2 1 -5 2 -9s2 -9 3 -14l-2 -24l-2 -11l-3 -11 c-4 -18 -9 -33 -15 -46s-15 -26 -27 -40c-7 -10 -17 -18 -28 -24s-23 -9 -36 -9c-14 0 -25 4 -33 12s-12 19 -13 34c0 11 5 27 16 49zM86 180c-15 17 -25 40 -28 67c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58c0 -17 -6 -32 -17 -45 s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60c0 18 7 36 22 55c13 16 34 29 64 39zM98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18c17 0 29 4 38 12 s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12c7 -22 29 -48 64 -79z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E513.xml b/data/Leipzig/E513.xml
new file mode 100644
index 00000000000..8047d777ef3
--- /dev/null
+++ b/data/Leipzig/E513.xml
@@ -0,0 +1 @@
+<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M314 8l7 -1c18 0 36 19 53 57c14 32 21 60 21 83c0 19 -7 29 -20 29c-15 0 -32 -16 -50 -49c-8 -16 -15 -32 -20 -48c-5 -17 -7 -32 -7 -43c0 -15 5 -25 16 -28zM283 90l45 169l1 6l-2 9c-3 2 -8 3 -13 3h-11l3 9l61 8l-45 -156c11 17 21 30 31 37s20 11 29 12 c11 0 20 -5 28 -14s12 -24 12 -43c0 -5 0 -11 -1 -18s-3 -14 -6 -23c-5 -15 -13 -29 -23 -42c-22 -31 -48 -47 -78 -47l-13 2c-9 3 -16 7 -19 12c-5 5 -7 15 -7 28v11l2 10c1 6 1 10 2 11zM551 55c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37 c0 11 0 19 1 24s4 14 9 26s14 25 26 40c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14 s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7c-15 0 -22 8 -22 25l1 12zM495 9c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9z M86 180c-15 17 -25 40 -28 67c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58c0 -17 -6 -32 -17 -45s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60 c0 18 7 36 22 55c13 16 34 29 64 39zM98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18c17 0 29 4 38 12s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12 c7 -22 29 -48 64 -79z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E514.xml b/data/Leipzig/E514.xml
new file mode 100644
index 00000000000..e1ea7f3bb0b
--- /dev/null
+++ b/data/Leipzig/E514.xml
@@ -0,0 +1 @@
+<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M108 41c0 -18 15 -22 33 -24l12 1l14 2l-5 -20h-159l5 20h19c15 0 25 1 29 3c5 4 9 11 12 21l52 211l1 5c-4 4 -7 6 -9 6l-53 1l5 20c17 0 34 3 51 9c19 5 35 12 50 22h12l-67 -266l-2 -6v-5zM224 137c-9 2 -11 2 -13 13c0 7 5 15 16 24c9 28 17 57 25 85l16 61l47 -9 c5 -1 13 -2 25 -2c5 -1 9 -1 14 -1c26 0 48 4 66 13l6 -4c-18 -32 -41 -51 -89 -51c-11 0 -49 6 -58 7l-26 -86c20 11 32 14 59 16c51 0 81 -33 81 -84c0 -31 -12 -60 -37 -87s-56 -40 -93 -40c-44 0 -83 24 -83 70c0 24 11 41 34 41c14 0 26 -13 26 -28c0 -7 -1 -11 -3 -13 l-16 -13l-8 -5l-2 -4c0 -18 25 -29 47 -29c21 0 40 10 59 30s28 47 29 81c0 37 -21 57 -55 57c-26 0 -33 -5 -46 -17c-3 -13 -7 -25 -21 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E515.xml b/data/Leipzig/E515.xml
new file mode 100644
index 00000000000..2e093747da3
--- /dev/null
+++ b/data/Leipzig/E515.xml
@@ -0,0 +1 @@
+<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M445 145l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16 c11 11 23 21 41 21c22 0 30 -16 30 -35c0 -39 -35 -96 -35 -125c0 -9 6 -18 16 -18c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -21 -44 -48 -44c-22 0 -32 9 -32 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -53 -36 -64 -69l-29 -87 c-1 -2 0 -3 0 -3h-25s-1 1 -1 2l39 116c3 8 3 14 3 20c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22v2zM853 196c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40 c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7 c-15 0 -22 8 -22 25l1 12zM797 150c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM108 41c0 -18 15 -22 33 -24l12 1 l14 2l-5 -20h-159l5 20h19c15 0 25 1 29 3c5 4 9 11 12 21l52 211l1 5c-4 4 -7 6 -9 6l-53 1l5 20c17 0 34 3 51 9c19 5 35 12 50 22h12l-67 -266l-2 -6v-5zM224 137c-9 2 -11 2 -13 13c0 7 5 15 16 24c9 28 17 57 25 85l16 61l47 -9c5 -1 13 -2 25 -2c5 -1 9 -1 14 -1 c26 0 48 4 66 13l6 -4c-18 -32 -41 -51 -89 -51c-11 0 -49 6 -58 7l-26 -86c20 11 32 14 59 16c51 0 81 -33 81 -84c0 -31 -12 -60 -37 -87s-56 -40 -93 -40c-44 0 -83 24 -83 70c0 24 11 41 34 41c14 0 26 -13 26 -28c0 -7 -1 -11 -3 -13l-16 -13l-8 -5l-2 -4 c0 -18 25 -29 47 -29c21 0 40 10 59 30s28 47 29 81c0 37 -21 57 -55 57c-26 0 -33 -5 -46 -17c-3 -13 -7 -25 -21 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E516.xml b/data/Leipzig/E516.xml
new file mode 100644
index 00000000000..91f4bd9d5eb
--- /dev/null
+++ b/data/Leipzig/E516.xml
@@ -0,0 +1 @@
+<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M435 2l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16 c11 11 23 21 41 21c22 0 30 -16 30 -35c0 -39 -35 -97 -35 -126c0 -9 6 -17 16 -17c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -21 -44 -48 -44c-22 0 -32 9 -32 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87 c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c-1 -2 0 -3 0 -3h-26v2zM843 56c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40 c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7 c-15 0 -22 8 -22 25l1 12zM787 10c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM108 41c0 -18 15 -22 33 -24l12 1l14 2 l-5 -20h-159l5 20h19c15 0 25 1 29 3c5 4 9 11 12 21l52 211l1 5c-4 4 -7 6 -9 6l-53 1l5 20c17 0 34 3 51 9c19 5 35 12 50 22h12l-67 -266l-2 -6v-5zM224 137c-9 2 -11 2 -13 13c0 7 5 15 16 24c9 28 17 57 25 85l16 61l47 -9c5 -1 13 -2 25 -2c5 -1 9 -1 14 -1 c26 0 48 4 66 13l6 -4c-18 -32 -41 -51 -89 -51c-11 0 -49 6 -58 7l-26 -86c20 11 32 14 59 16c51 0 81 -33 81 -84c0 -31 -12 -60 -37 -87s-56 -40 -93 -40c-44 0 -83 24 -83 70c0 24 11 41 34 41c14 0 26 -13 26 -28c0 -7 -1 -11 -3 -13l-16 -13l-8 -5l-2 -4 c0 -18 25 -29 47 -29c21 0 40 10 59 30s28 47 29 81c0 37 -21 57 -55 57c-26 0 -33 -5 -46 -17c-3 -13 -7 -25 -21 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E517.xml b/data/Leipzig/E517.xml
new file mode 100644
index 00000000000..bd3819f299f
--- /dev/null
+++ b/data/Leipzig/E517.xml
@@ -0,0 +1 @@
+<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11 c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28 c0 48 52 92 100 92zM410 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10 c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16 c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E518.xml b/data/Leipzig/E518.xml
new file mode 100644
index 00000000000..f7a08516f27
--- /dev/null
+++ b/data/Leipzig/E518.xml
@@ -0,0 +1 @@
+<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M540 135l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16 c11 11 22 21 40 21c22 0 31 -16 31 -35c0 -39 -35 -96 -35 -125c0 -9 6 -18 16 -18c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -22 -44 -49 -44c-22 0 -31 9 -31 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87 c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22v2zM948 186c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40 c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7 c-15 0 -22 8 -22 25l1 12zM892 140c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM166 311c60 0 94 -21 94 -80 c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10 c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92z M410 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11 c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28 c0 48 52 92 100 92z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E519.xml b/data/Leipzig/E519.xml
new file mode 100644
index 00000000000..3782a885e32
--- /dev/null
+++ b/data/Leipzig/E519.xml
@@ -0,0 +1 @@
+<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M510 2l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16 c11 11 22 21 40 21c22 0 31 -16 31 -35c0 -39 -35 -97 -35 -126c0 -9 6 -17 16 -17c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -22 -44 -49 -44c-22 0 -31 9 -31 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87 c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22v2zM918 56c-9 -19 -18 -33 -28 -42s-22 -13 -37 -13c-14 0 -24 5 -31 14s-10 22 -11 37c0 11 0 19 1 24s4 14 9 26s14 25 26 40 c25 30 49 45 71 45c15 0 26 -9 32 -26l2 10l3 10c2 2 5 3 8 3h7c4 0 6 -2 6 -6l-1 -8l-33 -117l-3 -14l-2 -13c0 -9 3 -13 8 -13c4 0 10 4 18 13c5 7 8 13 11 19s6 15 11 26l6 -3c-3 -14 -6 -22 -7 -25s-4 -7 -7 -12s-7 -10 -10 -14s-7 -7 -10 -9c-5 -5 -12 -7 -21 -7 c-15 0 -22 8 -22 25l1 12zM862 10c10 0 20 5 29 15l18 28l21 45l9 30c3 8 4 16 4 23c0 10 -2 17 -7 21c-3 4 -8 7 -15 8c-19 0 -40 -23 -63 -70l-7 -18l-4 -9l-3 -9c-2 -7 -4 -14 -5 -19s-2 -11 -2 -16c0 -8 2 -15 5 -20s10 -8 20 -9zM166 311c60 0 94 -21 94 -80 c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10 c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92z M410 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11 c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28 c0 48 52 92 100 92z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51A.xml b/data/Leipzig/E51A.xml
new file mode 100644
index 00000000000..3f77661be12
--- /dev/null
+++ b/data/Leipzig/E51A.xml
@@ -0,0 +1 @@
+<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M115 -14v-9c0 -1 -1 -2 -1 -2h-2c-78 43 -112 104 -112 175s37 132 112 175c1 1 2 0 2 0s1 -2 1 -3v-8s-1 -3 -3 -5c-47 -34 -70 -81 -70 -159s26 -124 70 -160c3 -2 3 -2 3 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51B.xml b/data/Leipzig/E51B.xml
new file mode 100644
index 00000000000..9bd6efaad07
--- /dev/null
+++ b/data/Leipzig/E51B.xml
@@ -0,0 +1 @@
+<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -14c0 2 0 2 3 4c44 36 70 82 70 160s-23 125 -70 159c-2 2 -3 5 -3 5v8c0 1 1 3 1 3h2c75 -43 112 -104 112 -175s-34 -132 -112 -175h-2s-1 1 -1 2v9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51C.xml b/data/Leipzig/E51C.xml
new file mode 100644
index 00000000000..88df166fc4b
--- /dev/null
+++ b/data/Leipzig/E51C.xml
@@ -0,0 +1 @@
+<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M512 8l7 -1c18 0 36 19 53 57c14 32 21 60 21 83c0 19 -7 29 -20 29c-15 0 -32 -16 -50 -49c-8 -16 -15 -32 -20 -48c-5 -17 -7 -32 -7 -43c0 -15 5 -25 16 -28zM481 90l45 169l1 6l-2 9c-3 2 -8 3 -13 3h-11l3 9l61 8l-45 -156c11 17 21 30 31 37s20 11 29 12 c11 0 20 -5 28 -14s12 -24 12 -43c0 -5 0 -11 -1 -18s-3 -14 -6 -23c-5 -15 -13 -29 -23 -42c-22 -31 -48 -47 -78 -47l-13 2c-9 3 -16 7 -19 12c-5 5 -7 15 -7 28v11l2 10c1 6 1 10 2 11zM345 163c-11 -9 -21 -13 -32 -13l-6 1l-6 1l-17 4c-4 0 -6 -4 -6 -11 c0 -3 -1 -5 -4 -6l-4 3l-2 2l-1 11l1 8l5 8c3 6 9 9 16 9h6h4l4 -1l6 -4l10 -5l13 -4c5 0 9 1 13 4l1 3l4 11c3 7 6 12 11 13c3 -3 5 -6 5 -8l-2 -9c-5 -7 -9 -14 -12 -20s-7 -17 -14 -34l-9 -36l-3 -34l1 -15l4 -14c5 -10 13 -15 24 -15s23 6 34 17s22 32 32 61l4 24l2 24 l-3 16l-1 20l2 16c2 4 6 6 11 7c5 0 9 -3 12 -9c1 -2 1 -5 2 -9s2 -9 3 -14l-2 -24l-2 -11l-3 -11c-4 -18 -9 -33 -15 -46s-15 -26 -27 -40c-7 -10 -17 -18 -28 -24s-23 -9 -36 -9c-14 0 -25 4 -33 12s-12 19 -13 34c0 11 5 27 16 49zM86 180c-15 17 -25 40 -28 67 c0 11 3 22 8 33s13 21 23 29c21 15 47 23 78 23c29 0 53 -9 71 -27s27 -37 28 -58c0 -17 -6 -32 -17 -45s-28 -25 -51 -36c21 -25 32 -52 32 -80c0 -23 -10 -44 -30 -61c-21 -16 -51 -24 -90 -24c-34 0 -61 8 -80 25s-29 37 -30 60c0 18 7 36 22 55c13 16 34 29 64 39z M98 168c-19 -12 -34 -25 -43 -38s-14 -28 -15 -44c2 -23 9 -38 21 -47s30 -15 55 -18c17 0 29 4 38 12s13 21 14 38c-3 21 -26 54 -70 97zM187 180c26 20 39 44 39 71c0 17 -5 31 -16 44s-25 19 -42 20c-28 0 -44 -15 -47 -44l2 -12c7 -22 29 -48 64 -79z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51D.xml b/data/Leipzig/E51D.xml
new file mode 100644
index 00000000000..7f9af3643d2
--- /dev/null
+++ b/data/Leipzig/E51D.xml
@@ -0,0 +1 @@
+<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M776 8l7 -1c18 0 36 19 53 57c14 32 21 60 21 83c0 19 -7 29 -20 29c-15 0 -32 -16 -50 -49c-8 -16 -15 -32 -20 -48c-5 -17 -7 -32 -7 -43c0 -15 5 -25 16 -28zM745 90l45 169l1 6l-2 9c-3 2 -8 3 -13 3h-11l3 9l61 8l-45 -156c11 17 21 30 31 37s20 11 29 12 c11 0 20 -5 28 -14s12 -24 12 -43c0 -5 0 -11 -1 -18s-3 -14 -6 -23c-5 -15 -13 -29 -23 -42c-22 -31 -48 -47 -78 -47l-13 2c-9 3 -16 7 -19 12c-5 5 -7 15 -7 28v11l2 10c1 6 1 10 2 11zM435 2l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58 c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16c11 11 23 21 41 21c22 0 30 -16 30 -35c0 -39 -35 -97 -35 -126 c0 -9 6 -17 16 -17c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -21 -44 -48 -44c-22 0 -32 9 -32 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20 c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c-1 -2 0 -3 0 -3h-26v2zM108 41c0 -18 15 -22 33 -24l12 1l14 2l-5 -20h-159l5 20h19c15 0 25 1 29 3c5 4 9 11 12 21l52 211l1 5c-4 4 -7 6 -9 6l-53 1l5 20c17 0 34 3 51 9c19 5 35 12 50 22h12l-67 -266l-2 -6v-5z M224 137c-9 2 -11 2 -13 13c0 7 5 15 16 24c9 28 17 57 25 85l16 61l47 -9c5 -1 13 -2 25 -2c5 -1 9 -1 14 -1c26 0 48 4 66 13l6 -4c-18 -32 -41 -51 -89 -51c-11 0 -49 6 -58 7l-26 -86c20 11 32 14 59 16c51 0 81 -33 81 -84c0 -31 -12 -60 -37 -87s-56 -40 -93 -40 c-44 0 -83 24 -83 70c0 24 11 41 34 41c14 0 26 -13 26 -28c0 -7 -1 -11 -3 -13l-16 -13l-8 -5l-2 -4c0 -18 25 -29 47 -29c21 0 40 10 59 30s28 47 29 81c0 37 -21 57 -55 57c-26 0 -33 -5 -46 -17c-3 -13 -7 -25 -21 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E51E.xml b/data/Leipzig/E51E.xml
new file mode 100644
index 00000000000..39ec919559b
--- /dev/null
+++ b/data/Leipzig/E51E.xml
@@ -0,0 +1 @@
+<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M851 8l7 -1c18 0 36 19 53 57c14 32 21 60 21 83c0 19 -7 29 -20 29c-15 0 -32 -16 -50 -49c-8 -16 -15 -32 -20 -48c-5 -17 -7 -32 -7 -43c0 -15 5 -25 16 -28zM820 90l45 169l1 6l-2 9c-3 2 -8 3 -13 3h-11l3 9l61 8l-45 -156c11 17 21 30 31 37s20 11 29 12 c11 0 20 -5 28 -14s12 -24 12 -43c0 -5 0 -11 -1 -18s-3 -14 -6 -23c-5 -15 -13 -29 -23 -42c-22 -31 -48 -47 -78 -47l-13 2c-9 3 -16 7 -19 12c-5 5 -7 15 -7 28v11l2 10c1 6 1 10 2 11zM510 2l40 121c2 6 5 18 5 26s-4 17 -15 17c-24 0 -41 -39 -49 -58 c-1 -4 -2 -3 -3 -3c-2 0 -3 1 -3 2c0 3 1 6 4 12c14 31 33 63 64 63c13 0 21 -6 24 -14c2 -4 0 -22 12 -22c8 0 13 11 19 17c11 12 22 20 40 20c14 0 22 -5 26 -15c2 -4 0 -22 12 -22c8 0 12 10 18 16c11 11 22 21 40 21c22 0 31 -16 31 -35c0 -39 -35 -97 -35 -126 c0 -9 6 -17 16 -17c19 0 29 24 35 40c2 5 2 4 3 4c2 0 2 -1 2 -1c0 -2 -1 -5 -3 -9c-9 -24 -22 -44 -49 -44c-22 0 -31 9 -31 27c0 31 34 85 34 117c0 11 -10 20 -22 20c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22s-1 1 -1 2l39 116c3 8 3 14 3 20 c0 12 -8 21 -20 21c-28 0 -52 -36 -63 -69l-29 -87c0 -1 -1 -3 -1 -3h-3h-22v2zM166 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28 c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14 c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92zM410 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26 l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c27 12 58 42 58 75l1 12c0 13 -4 24 -12 31 c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29c-14 0 -26 13 -26 28c0 48 52 92 100 92z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E520.xml b/data/Leipzig/E520.xml
new file mode 100644
index 00000000000..2e112af05aa
--- /dev/null
+++ b/data/Leipzig/E520.xml
@@ -0,0 +1 @@
+<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 124h-23c22 43 43 76 62 101s45 37 76 38c6 0 12 -4 18 -13c7 -7 10 -16 10 -27l24 14l25 13c12 5 24 7 37 7c24 0 43 -9 58 -28s22 -44 23 -77c0 -14 -1 -27 -3 -38s-5 -21 -10 -29s-11 -17 -19 -27c-14 -18 -30 -32 -47 -42s-35 -15 -54 -15c-9 0 -20 3 -33 10 c-5 3 -10 7 -15 10s-9 8 -13 14l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-9 0 -17 -4 -25 -12s-16 -18 -23 -31l-11 -17l-10 -20zM197 201c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62 c0 -24 7 -36 22 -36c13 0 23 2 31 7s15 11 21 20c10 17 15 26 16 28c5 11 8 26 10 44s3 31 4 39c0 7 -1 13 -2 18s-3 9 -6 14c-5 9 -15 14 -28 14c-14 0 -24 -5 -29 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E521.xml b/data/Leipzig/E521.xml
new file mode 100644
index 00000000000..04d9ce80d1d
--- /dev/null
+++ b/data/Leipzig/E521.xml
@@ -0,0 +1 @@
+<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M337 262c21 0 43 -14 43 -35v-7l-63 -183c0 -13 4 -20 12 -21c8 0 17 5 26 15s15 16 16 17c4 7 19 32 20 35l14 41h23l-24 -63c-8 -22 -31 -45 -44 -58s-29 -20 -46 -21c-18 0 -34 5 -49 14l-16 15c-3 7 -5 12 -5 17c20 63 44 124 65 186c0 7 -5 12 -15 13 c-16 0 -31 -15 -44 -45l-64 -182h-71l77 214c0 9 -6 13 -17 13c-9 0 -17 -4 -22 -11s-12 -19 -20 -34l-64 -182h-69l77 210v4c0 10 -5 12 -12 16c-25 0 -52 -47 -66 -73c-5 -9 -12 -23 -21 -42h-22c19 39 40 76 64 107c21 27 47 40 79 40c21 0 31 -19 34 -41 c19 17 34 27 45 32c11 6 24 9 39 9c21 0 32 -19 35 -41c22 17 49 41 85 41z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E522.xml b/data/Leipzig/E522.xml
new file mode 100644
index 00000000000..b007485b28f
--- /dev/null
+++ b/data/Leipzig/E522.xml
@@ -0,0 +1 @@
+<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-91 -179c-2 -3 -3 -5 -2 -7s4 -3 11 -4c19 0 34 14 47 41c7 14 13 30 20 48s12 35 15 52l14 61l44 208h-58v38h70c7 21 13 36 18 47c7 18 15 33 22 44c21 30 42 53 65 69s48 24 75 24c9 0 17 -1 23 -3s12 -7 19 -16c5 -7 8 -13 9 -19l4 -16c0 -15 -1 -25 -2 -32 s-5 -16 -11 -28c-3 -6 -9 -13 -18 -21c-4 -3 -8 -5 -13 -6s-10 -1 -17 0c-6 1 -10 5 -13 11s-5 13 -6 20c0 12 2 23 7 32s12 17 22 24l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-5 -12 -10 -30 -17 -53s-11 -40 -14 -50h77v-40h-85 c-12 -69 -29 -137 -51 -206c-18 -55 -35 -99 -52 -131c-13 -26 -27 -47 -41 -63c-25 -29 -50 -43 -76 -43c-25 0 -43 10 -56 29c-10 15 -15 33 -15 54c0 17 4 33 12 48c5 7 10 13 17 17s13 6 20 6c9 0 16 -4 21 -12s9 -15 11 -22s3 -12 3 -17c0 -9 -2 -17 -7 -24 s-9 -14 -14 -21s-8 -12 -11 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E523.xml b/data/Leipzig/E523.xml
new file mode 100644
index 00000000000..2ac61ae2cb9
--- /dev/null
+++ b/data/Leipzig/E523.xml
@@ -0,0 +1 @@
+<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M194 174c-14 0 -23 12 -23 29l1 11l3 12c0 5 -3 7 -8 7c-13 0 -26 -10 -38 -31l-16 -32c-21 -54 -35 -113 -53 -170h-60l57 194v5c0 11 -3 16 -8 16c-15 0 -20 -9 -30 -21c-9 -11 -17 -23 -25 -36l-14 8c6 15 16 25 28 38c19 19 50 48 83 48c15 0 22 -9 22 -28 c-1 -7 -1 -14 -2 -21c16 24 39 56 74 56c21 0 40 -19 40 -40c0 -30 -10 -45 -31 -45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E524.xml b/data/Leipzig/E524.xml
new file mode 100644
index 00000000000..af37987cb15
--- /dev/null
+++ b/data/Leipzig/E524.xml
@@ -0,0 +1 @@
+<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M81 33c21 0 38 15 40 34c0 7 -3 15 -8 22c-3 5 -9 11 -19 18c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4 c-17 0 -28 -17 -31 -36c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z "/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E525.xml b/data/Leipzig/E525.xml
new file mode 100644
index 00000000000..7f5493b72ac
--- /dev/null
+++ b/data/Leipzig/E525.xml
@@ -0,0 +1 @@
+<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M173 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E526.xml b/data/Leipzig/E526.xml
new file mode 100644
index 00000000000..9c99d494654
--- /dev/null
+++ b/data/Leipzig/E526.xml
@@ -0,0 +1 @@
+<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-39 115c2 2 19 36 24 43l41 70c19 17 14 17 25 22c11 6 36 12 51 12c21 0 32 -19 35 -41c22 17 49 41 85 41c21 0 43 -14 43 -35v-7l-63 -183c0 -13 4 -20 12 -21c8 0 17 5 26 15s15 16 16 17c4 7 19 32 20 35l14 41h23l-24 -63c-8 -22 -31 -45 -44 -58s-29 -20 -46 -21 c-18 0 -34 5 -49 14l-16 15c-3 7 -5 12 -5 17c20 63 44 124 65 186c0 7 -5 12 -15 13c-16 0 -31 -15 -44 -45l-64 -182h-71l77 214c0 9 -6 13 -17 13c-9 0 -17 -4 -22 -11s-47 -86 -55 -101h-22z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E527.xml b/data/Leipzig/E527.xml
new file mode 100644
index 00000000000..81837f1806a
--- /dev/null
+++ b/data/Leipzig/E527.xml
@@ -0,0 +1 @@
+<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1762 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM1700 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6 l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43 l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26 c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87 c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40 l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78 c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38 c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM1462 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39zM1162 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM862 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14 c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM562 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39zM262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E528.xml b/data/Leipzig/E528.xml
new file mode 100644
index 00000000000..4566b10c040
--- /dev/null
+++ b/data/Leipzig/E528.xml
@@ -0,0 +1 @@
+<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1462 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM1400 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6 l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43 l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26 c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38 c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7 c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94 c-23 -29 -55 -57 -101 -57zM1162 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM862 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14 c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM562 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39zM262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E529.xml b/data/Leipzig/E529.xml
new file mode 100644
index 00000000000..769d7b332e0
--- /dev/null
+++ b/data/Leipzig/E529.xml
@@ -0,0 +1 @@
+<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1162 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM1100 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6 l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43 l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23 c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40 l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM862 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14 c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM562 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39zM262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52A.xml b/data/Leipzig/E52A.xml
new file mode 100644
index 00000000000..512ad3fb4a3
--- /dev/null
+++ b/data/Leipzig/E52A.xml
@@ -0,0 +1 @@
+<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM200 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38 c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 71 -33 79 -78c11 18 21 33 31 46c19 25 45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4 c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21 c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-5 -9 -9 -17 -13 -26c-1 -42 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57zM858 130c2 18 3 31 4 39c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72 c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72zM558 130c2 18 3 31 4 39c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52B.xml b/data/Leipzig/E52B.xml
new file mode 100644
index 00000000000..0e57b046dcb
--- /dev/null
+++ b/data/Leipzig/E52B.xml
@@ -0,0 +1 @@
+<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M497 201c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c13 0 23 2 31 7s15 11 21 20c10 17 15 26 16 28c5 11 8 26 10 44s3 31 4 39c0 7 -1 13 -2 18s-3 9 -6 14c-5 9 -15 14 -28 14c-14 0 -24 -5 -29 -14zM197 201c-12 -21 -22 -45 -29 -72 c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c13 0 23 2 31 7s15 11 21 20c10 17 15 26 16 28c5 11 8 26 10 44s3 31 4 39c0 7 -1 13 -2 18s-3 9 -6 14c-5 9 -15 14 -28 14c-14 0 -24 -5 -29 -14zM23 124h-23c22 43 43 76 62 101s45 37 76 38c6 0 12 -4 18 -13 c7 -7 10 -16 10 -27l24 14l25 13c12 5 24 7 37 7c24 0 43 -9 58 -28c10 -13 18 -30 21 -50c11 18 21 33 31 46c19 25 45 37 76 38c6 0 12 -4 18 -13c7 -7 10 -16 10 -27l24 14l25 13c12 5 24 7 37 7c24 0 43 -9 58 -28s22 -44 23 -77c0 -14 -1 -27 -3 -38s-5 -21 -10 -29 s-11 -17 -19 -27c-14 -18 -30 -32 -47 -42s-35 -15 -54 -15c-9 0 -20 3 -33 10c-5 3 -10 7 -15 10s-9 8 -13 14l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-9 0 -17 -4 -25 -12s-16 -18 -23 -31l-11 -17l-10 -20 l-3 -6c0 -11 -1 -22 -3 -31c-2 -11 -5 -21 -10 -29s-11 -17 -19 -27c-14 -18 -30 -32 -47 -42s-35 -15 -54 -15c-9 0 -20 3 -33 10c-5 3 -10 7 -15 10s-9 8 -13 14l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3 c-9 0 -17 -4 -25 -12s-16 -18 -23 -31l-11 -17l-10 -20z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52C.xml b/data/Leipzig/E52C.xml
new file mode 100644
index 00000000000..9880bfad5ed
--- /dev/null
+++ b/data/Leipzig/E52C.xml
@@ -0,0 +1 @@
+<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M605 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17l-10 -20c-13 -30 -25 -60 -37 -90c-9 -22 -31 -45 -44 -58s-29 -20 -46 -21c-18 0 -34 5 -49 14l-16 15 c-3 7 -5 12 -5 17c20 63 44 124 65 186c0 7 -5 12 -15 13c-16 0 -31 -15 -44 -45l-64 -182h-71l77 214c0 9 -6 13 -17 13c-9 0 -17 -4 -22 -11s-12 -19 -20 -34l-64 -182h-69l77 210v4c0 10 -5 12 -12 16c-25 0 -52 -47 -66 -73c-5 -9 -12 -23 -21 -42h-22 c19 39 40 76 64 107c21 27 47 40 79 40c21 0 31 -19 34 -41c19 17 34 27 45 32c11 6 24 9 39 9c21 0 32 -19 35 -41c22 17 49 41 85 41c21 0 43 -14 43 -35v-7l-63 -183c0 -13 4 -20 12 -21c8 0 17 5 26 15s15 16 16 17c4 7 19 32 20 35l27 65c22 43 30 52 49 77 s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM667 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36 c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52D.xml b/data/Leipzig/E52D.xml
new file mode 100644
index 00000000000..0381d6b5031
--- /dev/null
+++ b/data/Leipzig/E52D.xml
@@ -0,0 +1 @@
+<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M311 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71zM337 262c21 0 43 -14 43 -35v-7l-63 -183c0 -13 4 -20 12 -21c8 0 17 5 26 15s15 16 16 17c4 7 19 32 20 35l14 41h23l-24 -63c-8 -22 -31 -45 -44 -58s-29 -20 -46 -21c-18 0 -34 5 -49 14l-16 15c-3 7 -5 12 -5 17 c20 63 44 124 65 186c0 7 -5 12 -15 13c-16 0 -31 -15 -44 -45l-64 -182h-71l77 214c0 9 -6 13 -17 13c-9 0 -17 -4 -22 -11s-12 -19 -20 -34l-64 -182h-69l77 210v4c0 10 -5 12 -12 16c-25 0 -52 -47 -66 -73c-5 -9 -12 -23 -21 -42h-22c19 39 40 76 64 107 c21 27 47 40 79 40c21 0 31 -19 34 -41c19 17 34 27 45 32c11 6 24 9 39 9c21 0 32 -19 35 -41c22 17 49 41 85 41z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52E.xml b/data/Leipzig/E52E.xml
new file mode 100644
index 00000000000..ca14b1496e1
--- /dev/null
+++ b/data/Leipzig/E52E.xml
@@ -0,0 +1 @@
+<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M239 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71zM200 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38 c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM262 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27 c20 33 22 32 26 72c2 18 3 31 4 39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E52F.xml b/data/Leipzig/E52F.xml
new file mode 100644
index 00000000000..de4b0c6a33c
--- /dev/null
+++ b/data/Leipzig/E52F.xml
@@ -0,0 +1 @@
+<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M555 376c0 -38 -19 -68 -50 -76c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 3 5 5 5 6l-6 9c-5 3 -10 5 -17 5c-37 0 -67 -52 -88 -156h75v-38h-83c-15 -93 -59 -250 -92 -318c-15 -31 -32 -58 -50 -80c-16 -21 -37 -36 -63 -43l-19 -2c-43 0 -66 40 -66 87 c0 39 18 53 44 67c24 0 38 -25 38 -49c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c7 29 13 59 20 89c13 61 26 121 39 182h-161c-14 -94 -56 -241 -94 -318c-33 -72 -69 -113 -110 -123l-18 -2c-21 0 -38 9 -49 26c-5 6 -10 15 -15 28c-2 12 -3 19 -4 33 c3 22 3 33 13 46c7 9 18 16 33 21c23 0 36 -26 37 -49c0 -11 -2 -17 -5 -23l-14 -23l-15 -19c0 -5 3 -7 10 -7c27 0 44 29 54 50l14 36l15 53c14 63 28 127 41 191l17 80h-57v38h70c20 67 51 121 103 159c25 17 52 25 83 25c33 0 49 -32 49 -66c0 -38 -18 -71 -51 -76 c-17 0 -26 11 -28 32c0 11 3 24 10 37c7 11 16 20 27 25c3 3 5 5 5 6c-7 10 -11 14 -25 14c-22 0 -40 -16 -54 -47s-25 -67 -33 -107h164c22 83 87 182 186 182c36 0 47 -31 49 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E530.xml b/data/Leipzig/E530.xml
new file mode 100644
index 00000000000..912010640fc
--- /dev/null
+++ b/data/Leipzig/E530.xml
@@ -0,0 +1 @@
+<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M363 -69c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7c19 0 35 14 48 42c13 32 23 60 33 97c14 62 27 123 41 185l18 86h-140c-14 -89 -60 -256 -93 -318c-15 -31 -30 -57 -47 -79s-38 -37 -65 -44l-18 -2c-44 0 -67 40 -67 87 c0 39 18 53 45 67c6 0 11 -1 14 -4c15 -6 23 -25 23 -45c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21 89 40 181 59 271h-141c-13 -85 -62 -255 -93 -318c-33 -72 -70 -113 -110 -123l-19 -2c-35 0 -51 24 -63 54l-5 33c5 39 13 55 46 67 c23 0 38 -26 38 -49c0 -8 -2 -16 -6 -23l-14 -23l-14 -19c0 -5 3 -7 10 -7c11 0 21 5 30 15c18 15 26 46 37 71l15 53c17 77 34 155 50 233c3 13 6 26 9 38h-57v38h69c9 33 23 62 40 89c17 28 38 51 63 70c25 17 53 25 83 25c33 0 49 -30 49 -66c0 -38 -19 -70 -50 -76 c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9c-5 3 -11 5 -18 5c-23 0 -41 -16 -55 -48s-25 -67 -32 -106h144c23 84 85 182 185 182c36 0 47 -31 49 -66c0 -18 -4 -35 -13 -51c-8 -12 -20 -20 -37 -25c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 0 5 2 5 6 c-4 10 -11 14 -23 14c-37 0 -67 -52 -88 -156h144c15 49 39 93 72 132c31 36 69 54 114 54c34 0 49 -36 49 -70c0 -37 -19 -68 -51 -74c-16 0 -25 11 -27 32c0 26 18 52 35 62c4 0 6 2 6 6c-5 9 -11 14 -24 14c-37 0 -67 -52 -88 -156h76v-38h-85c-7 -44 -15 -84 -26 -121 c-18 -75 -39 -141 -66 -197c-15 -28 -31 -55 -50 -79c-16 -21 -36 -36 -61 -44l-18 -2c-35 0 -53 23 -62 54c-4 10 -6 21 -6 33c4 37 15 57 46 67z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E531.xml b/data/Leipzig/E531.xml
new file mode 100644
index 00000000000..4f365e1b0b7
--- /dev/null
+++ b/data/Leipzig/E531.xml
@@ -0,0 +1 @@
+<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M132 -69c25 0 37 -24 37 -49c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21 89 40 181 59 271h-141c-13 -85 -62 -255 -93 -318c-33 -72 -70 -113 -110 -123l-19 -2c-35 0 -51 24 -63 54l-5 33c5 39 13 55 46 67c23 0 38 -26 38 -49c0 -8 -2 -16 -6 -23 l-14 -23l-14 -19c0 -5 3 -7 10 -7c11 0 21 5 30 15c18 15 26 46 37 71l15 53c17 77 34 155 50 233c3 13 6 26 9 38h-57v38h69c18 66 55 123 103 159c25 17 53 25 83 25c33 0 49 -30 49 -66c0 -38 -19 -70 -50 -76c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9 c-5 3 -11 5 -18 5c-23 0 -41 -16 -55 -48s-25 -67 -32 -106h144c23 84 85 182 185 182c36 0 47 -31 49 -66c0 -18 -4 -35 -13 -51c-8 -12 -20 -20 -37 -25c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 0 5 2 5 6c-4 10 -11 14 -23 14c-37 0 -67 -52 -88 -156h144 c15 49 39 93 72 132c31 36 69 54 114 54c34 0 49 -36 49 -70c0 -37 -19 -68 -51 -74c-16 0 -25 11 -27 32c0 26 18 52 35 62c4 0 6 2 6 6c-5 9 -11 14 -24 14c-37 0 -67 -52 -88 -156h146c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16 c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-143c-7 -44 -15 -84 -26 -121c-18 -75 -39 -141 -66 -197c-15 -28 -31 -55 -50 -79 c-16 -21 -36 -36 -61 -44l-18 -2c-35 0 -53 23 -62 54c-4 10 -6 21 -6 33c4 37 15 57 46 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7c19 0 35 14 48 42c13 32 23 60 33 97c14 62 27 123 41 185l18 86h-140 c-14 -89 -60 -256 -93 -318c-15 -31 -30 -57 -47 -79s-38 -37 -65 -44l-18 -2c-44 0 -67 40 -67 87c0 39 18 53 45 67z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E532.xml b/data/Leipzig/E532.xml
new file mode 100644
index 00000000000..625d20631c7
--- /dev/null
+++ b/data/Leipzig/E532.xml
@@ -0,0 +1 @@
+<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M782 -140c0 32 15 71 49 71c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c19 0 34 14 47 41s28 67 35 100l14 61l44 208h-144c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71 c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-143c-7 -44 -15 -84 -26 -121c-18 -75 -39 -141 -66 -197c-26 -48 -56 -105 -111 -123l-18 -2c-35 0 -53 23 -62 54c-4 10 -6 21 -6 33 c4 37 15 57 46 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7c19 0 35 14 48 42c13 32 23 60 33 97c14 62 27 123 41 185l18 86h-140c-14 -89 -60 -256 -93 -318c-15 -31 -30 -57 -47 -79s-38 -37 -65 -44l-18 -2 c-44 0 -67 40 -67 87c0 39 18 53 45 67c6 0 11 -1 14 -4c15 -6 23 -25 23 -45c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21 89 40 181 59 271h-141c-13 -85 -62 -255 -93 -318c-33 -72 -70 -113 -110 -123l-19 -2c-35 0 -51 24 -63 54l-5 33 c5 39 13 55 46 67c23 0 38 -26 38 -49c0 -8 -2 -16 -6 -23l-14 -23l-14 -19c0 -5 3 -7 10 -7c11 0 21 5 30 15c18 15 26 46 37 71l15 53c17 77 34 155 50 233c3 13 6 26 9 38h-57v38h69c18 66 55 123 103 159c25 17 53 25 83 25c33 0 49 -30 49 -66c0 -38 -19 -70 -50 -76 c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9c-5 3 -11 5 -18 5c-23 0 -41 -16 -55 -48s-25 -67 -32 -106h144c23 84 85 182 185 182c36 0 47 -31 49 -66c0 -18 -4 -35 -13 -51c-8 -12 -20 -20 -37 -25c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 0 5 2 5 6 c-4 10 -11 14 -23 14c-37 0 -67 -52 -88 -156h144c15 49 39 93 72 132c31 36 69 54 114 54c34 0 49 -36 49 -70c0 -37 -19 -68 -51 -74c-16 0 -25 11 -27 32c0 26 18 52 35 62c4 0 6 2 6 6c-5 9 -11 14 -24 14c-37 0 -67 -52 -88 -156h146c13 38 23 65 40 91 c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -86 -31 -105h148 c7 21 13 36 18 47c20 48 53 89 87 113c23 16 48 24 75 24c9 0 17 -1 23 -3c11 -4 25 -22 28 -35l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8 c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E533.xml b/data/Leipzig/E533.xml
new file mode 100644
index 00000000000..b86a7619961
--- /dev/null
+++ b/data/Leipzig/E533.xml
@@ -0,0 +1 @@
+<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1014 -140c0 32 15 71 49 71c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c19 0 34 14 47 41s28 67 35 100l14 61l44 208h-144c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71 c21 0 35 -31 35 -51s-13 -32 -21 -45c-4 -7 -13 -14 -13 -19c0 -3 3 -5 11 -6c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-143c-7 -44 -15 -84 -26 -121c-18 -75 -39 -141 -66 -197c-26 -48 -56 -105 -111 -123l-18 -2c-35 0 -53 23 -62 54c-4 10 -6 21 -6 33 c4 37 15 57 46 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7c19 0 35 14 48 42c13 32 23 60 33 97c14 62 27 123 41 185l18 86h-140c-14 -89 -60 -256 -93 -318c-15 -31 -30 -57 -47 -79s-38 -37 -65 -44l-18 -2 c-44 0 -67 40 -67 87c0 39 18 53 45 67c6 0 11 -1 14 -4c15 -6 23 -25 23 -45c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21 89 40 181 59 271h-141c-13 -85 -62 -255 -93 -318c-33 -72 -70 -113 -110 -123l-19 -2c-35 0 -51 24 -63 54l-5 33 c5 39 13 55 46 67c23 0 38 -26 38 -49c0 -8 -2 -16 -6 -23l-14 -23l-14 -19c0 -5 3 -7 10 -7c11 0 21 5 30 15c18 15 26 46 37 71l15 53c17 77 34 155 50 233c3 13 6 26 9 38h-60h-81c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83 c0 32 15 71 49 71c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-30 -21 -48 -103 -60 -148h70h80c9 33 18 62 35 89c17 28 38 51 63 70c25 17 53 25 83 25c33 0 49 -30 49 -66c0 -38 -19 -70 -50 -76 c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9c-5 3 -11 5 -18 5c-23 0 -41 -16 -55 -48s-25 -67 -32 -106h144c23 84 85 182 185 182c36 0 47 -31 49 -66c0 -18 -4 -35 -13 -51c-8 -12 -20 -20 -37 -25c-18 0 -28 11 -30 32c0 29 18 51 37 62c3 0 5 2 5 6 c-4 10 -11 14 -23 14c-37 0 -67 -52 -88 -156h144c15 49 39 93 72 132c31 36 69 54 114 54c34 0 49 -36 49 -70c0 -37 -19 -68 -51 -74c-16 0 -25 11 -27 32c0 26 18 52 35 62c4 0 6 2 6 6c-5 9 -11 14 -24 14c-37 0 -67 -52 -88 -156h146c13 38 23 65 40 91 c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -86 -31 -105h148 c7 21 13 36 18 47c20 48 53 89 87 113c23 16 48 24 75 24c9 0 17 -1 23 -3c11 -4 25 -22 28 -35l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-20 0 -25 14 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8 c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E534.xml b/data/Leipzig/E534.xml
new file mode 100644
index 00000000000..a1cc84253c7
--- /dev/null
+++ b/data/Leipzig/E534.xml
@@ -0,0 +1 @@
+<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M432 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13 c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM494 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z M-94 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E535.xml b/data/Leipzig/E535.xml
new file mode 100644
index 00000000000..31c43dd700b
--- /dev/null
+++ b/data/Leipzig/E535.xml
@@ -0,0 +1 @@
+<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M405 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM-94 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85 c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E536.xml b/data/Leipzig/E536.xml
new file mode 100644
index 00000000000..146e30af55b
--- /dev/null
+++ b/data/Leipzig/E536.xml
@@ -0,0 +1 @@
+<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71z M81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36 c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E537.xml b/data/Leipzig/E537.xml
new file mode 100644
index 00000000000..69472358d61
--- /dev/null
+++ b/data/Leipzig/E537.xml
@@ -0,0 +1 @@
+<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M628 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13 c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM690 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z M100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71z M81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36 c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E538.xml b/data/Leipzig/E538.xml
new file mode 100644
index 00000000000..47077996d3f
--- /dev/null
+++ b/data/Leipzig/E538.xml
@@ -0,0 +1 @@
+<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M990 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM690 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72 c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39zM628 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17 c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c45 0 72 -35 79 -78c25 41 51 83 107 84c14 0 28 -23 28 -40l24 14l25 13c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94 c-23 -29 -55 -57 -101 -57c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-4 -9 -9 -17 -13 -26c-1 -43 -12 -62 -32 -87c-23 -29 -55 -57 -101 -57zM100 -69 c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 54 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -24 13 -28 32c0 27 11 44 29 56l14 10c0 12 -10 16 -22 16c-11 0 -24 -4 -30 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71z M81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36 c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E539.xml b/data/Leipzig/E539.xml
new file mode 100644
index 00000000000..ffc7e82b10b
--- /dev/null
+++ b/data/Leipzig/E539.xml
@@ -0,0 +1 @@
+<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M601 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337 c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10 c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4 c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E53A.xml b/data/Leipzig/E53A.xml
new file mode 100644
index 00000000000..123f2e2fdaa
--- /dev/null
+++ b/data/Leipzig/E53A.xml
@@ -0,0 +1 @@
+<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M888 1c-22 0 -50 18 -61 34l-56 -158l-3 -4c3 -7 7 -10 12 -11h32v-29h-173v29h21c4 0 9 2 14 5c4 4 7 9 9 14l119 331v6l-3 10l-6 3c-23 0 -38 -25 -48 -43l-11 -17c-8 -15 -15 -31 -23 -47h-23c22 43 43 76 62 101s45 37 76 38c14 0 28 -23 28 -40l24 14l25 13 c12 5 24 7 37 7c54 0 80 -48 81 -105c0 -47 -11 -68 -32 -94c-23 -29 -55 -57 -101 -57zM950 169c0 26 -10 46 -36 46c-14 0 -24 -5 -29 -14c-12 -21 -22 -45 -29 -72c-7 -30 -10 -51 -10 -62c0 -24 7 -36 22 -36c27 0 41 11 52 27c20 33 22 32 26 72c2 18 3 31 4 39z M601 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85c-19 -109 -60 -255 -103 -337 c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10c-3 -5 -8 -9 -17 -10 c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9l13 4 c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E53B.xml b/data/Leipzig/E53B.xml
new file mode 100644
index 00000000000..047206be8c9
--- /dev/null
+++ b/data/Leipzig/E53B.xml
@@ -0,0 +1 @@
+<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M833 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM334 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85 c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM100 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70 c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-3 0 -6 -1 -8 -1c-19 0 -25 13 -28 32c0 27 11 44 29 56l14 10c0 12 -11 16 -23 16c-11 0 -23 -4 -29 -8c-29 -21 -48 -102 -60 -146h77v-40h-85 c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM81 33c21 0 38 15 40 34c0 18 -12 30 -27 40c-22 13 -38 26 -47 38s-14 26 -15 43c0 50 40 82 87 82l28 -3c9 -3 17 -7 24 -13c15 -9 23 -24 23 -43l-1 -10l-6 -10 c-3 -5 -8 -9 -17 -10c-17 0 -26 8 -29 24l4 19c0 10 -14 16 -24 18h-4c-17 0 -28 -17 -31 -36c0 -7 4 -15 11 -22c9 -7 18 -14 26 -21c28 -23 43 -37 44 -40c8 -10 12 -23 12 -39v-10c0 -21 -10 -39 -29 -54c-16 -10 -38 -18 -61 -20c-47 0 -89 26 -89 67l1 15l5 13l10 9 l13 4c16 0 24 -10 24 -31c0 -13 -5 -16 -8 -28c0 -8 11 -16 23 -16h13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E53C.xml b/data/Leipzig/E53C.xml
new file mode 100644
index 00000000000..d719c64d458
--- /dev/null
+++ b/data/Leipzig/E53C.xml
@@ -0,0 +1 @@
+<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60 c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106 c-45 0 -71 37 -71 83c0 32 15 71 49 71zM194 174c-14 0 -23 12 -23 29l1 11l3 12c0 5 -3 7 -8 7c-13 0 -26 -10 -38 -31l-16 -32c-21 -54 -35 -113 -53 -170h-60l57 194v5c0 11 -3 16 -8 16c-15 0 -20 -9 -30 -21c-9 -11 -17 -23 -25 -36l-14 8c6 15 16 25 28 38 c19 19 50 48 83 48c15 0 22 -9 22 -28c-1 -7 -1 -14 -2 -21c16 24 39 56 74 56c21 0 40 -19 40 -40c0 -30 -10 -45 -31 -45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E53D.xml b/data/Leipzig/E53D.xml
new file mode 100644
index 00000000000..14e3bf4af7b
--- /dev/null
+++ b/data/Leipzig/E53D.xml
@@ -0,0 +1 @@
+<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M630 115c21 0 34 -23 34 -48c0 -23 -8 -42 -24 -58c-15 -17 -39 -25 -73 -25c-12 0 -21 1 -27 4l-12 6l-17 10c-15 7 -24 10 -29 10c-9 0 -19 -5 -30 -14h-31v16l209 177l-64 -1c-23 -3 -32 -15 -44 -30h-24l30 87h189v-32l-211 -163c13 6 26 9 39 9c14 0 53 -18 63 -20 c9 1 14 8 14 19c-13 0 -20 8 -22 23c0 17 13 30 30 30zM131 -69c21 0 35 -31 35 -51s-13 -32 -21 -45c-5 -7 -8 -12 -11 -14c-6 -7 -1 -10 9 -11c35 0 54 55 67 89c7 18 12 35 15 52c21 88 39 179 58 269h-58v38h70c13 38 23 65 40 91c21 30 42 53 65 69s48 24 75 24 c28 0 46 -14 51 -38l4 -16c0 -33 -1 -36 -13 -60c-3 -7 -17 -25 -31 -27c-5 -1 -10 -1 -17 0c-13 3 -17 18 -19 31c0 27 11 44 29 56l14 10c0 9 -6 14 -18 16h-6c-11 0 -20 -2 -28 -8c-9 -7 -19 -21 -29 -43c-7 -18 -26 -84 -31 -103h77v-40h-85 c-19 -109 -60 -255 -103 -337c-24 -46 -64 -106 -117 -106c-45 0 -71 37 -71 83c0 32 15 71 49 71zM194 174c-14 0 -23 12 -23 29l1 11l3 12c0 5 -3 7 -8 7c-13 0 -26 -10 -38 -31l-16 -32c-21 -54 -35 -113 -53 -170h-60l57 194v5c0 11 -3 16 -8 16c-15 0 -20 -9 -30 -21 c-9 -11 -17 -23 -25 -36l-14 8c6 15 16 25 28 38c19 19 50 48 83 48c15 0 22 -9 22 -28c-1 -7 -1 -14 -2 -21c16 24 39 56 74 56c21 0 40 -19 40 -40c0 -30 -10 -45 -31 -45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E566.xml b/data/Leipzig/E566.xml
new file mode 100644
index 00000000000..907f2b440c5
--- /dev/null
+++ b/data/Leipzig/E566.xml
@@ -0,0 +1 @@
+<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 167l-36 -115l-1 -10c0 -10 5 -16 16 -19c32 18 48 43 48 75c0 20 -9 43 -27 69zM432 225c0 -21 -11 -36 -31 -37c-15 0 -20 10 -23 25l3 14l2 11l1 9l-4 4c-1 -1 -2 -1 -3 -1c-23 -13 -36 -24 -47 -48l-12 -27c-18 -50 -31 -105 -47 -157h-60l58 214c0 7 -3 5 -5 9 c-7 0 -25 -8 -51 -28l-37 -28c20 -34 31 -67 31 -97c0 -12 -1 -21 -4 -28l-6 -15c-1 -3 -5 -10 -12 -19c-14 -18 -30 -26 -49 -26c-30 0 -67 18 -67 52c1 1 1 6 3 15l20 84c-9 -5 -21 -8 -36 -8c-21 0 -29 7 -40 19c-10 12 -16 27 -16 47c0 23 6 33 17 45s25 18 46 18 c19 0 39 -8 60 -25l34 117h63l-46 -158l38 31l32 20c21 10 35 13 62 15c16 0 24 -7 24 -21l-1 -10l-6 -24c21 37 44 55 70 55c23 0 39 -23 39 -47zM18 208c0 -27 17 -47 45 -47l3 -2l13 4l23 9l14 55c-17 15 -35 22 -55 22c-26 0 -43 -17 -43 -41z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E567.xml b/data/Leipzig/E567.xml
new file mode 100644
index 00000000000..67a47b7de63
--- /dev/null
+++ b/data/Leipzig/E567.xml
@@ -0,0 +1 @@
+<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M468 118c0 -69 -38 -116 -106 -118c-23 0 -44 5 -63 15c-21 13 -45 32 -64 49c-23 24 -46 47 -69 70c-16 14 -31 25 -45 33s-26 12 -37 13c-20 0 -28 -14 -37 -28l-12 -26c-3 -9 -5 -16 -5 -19v-8c0 -29 13 -43 40 -43l9 2l11 9l7 7c6 4 14 8 24 8c17 0 28 -9 33 -28 c0 -34 -27 -53 -58 -54h-5c-18 0 -22 0 -36 8c-33 14 -55 54 -55 97c0 50 21 87 49 114c18 15 36 23 55 25c26 0 51 -7 75 -21c9 -5 15 -9 18 -11l18 -15c9 -7 25 -22 33 -31l65 -67l10 -9l22 -16c13 -7 26 -11 37 -11c37 0 55 36 55 70c0 28 -12 55 -39 55 c-6 -2 -11 -5 -17 -9l-18 -13c-3 -3 -9 -4 -18 -4c-19 0 -30 17 -32 37c0 28 28 42 58 44c43 0 70 -31 85 -62c8 -16 12 -36 12 -58v-5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E568.xml b/data/Leipzig/E568.xml
new file mode 100644
index 00000000000..7c071f11300
--- /dev/null
+++ b/data/Leipzig/E568.xml
@@ -0,0 +1 @@
+<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M468 126v-5c0 -22 -4 -42 -12 -58c-15 -31 -42 -62 -85 -62c-30 2 -58 16 -58 44c2 20 13 37 32 37c9 0 15 -1 18 -4l18 -13c6 -4 11 -7 17 -9c27 0 39 27 39 55c0 34 -18 70 -55 70c-11 0 -24 -4 -37 -11l-22 -16l-10 -9l-65 -67c-8 -9 -24 -24 -33 -31l-18 -15 c-3 -2 -9 -6 -18 -11c-24 -14 -49 -21 -75 -21c-19 2 -37 10 -55 25c-28 27 -49 64 -49 114c0 43 22 83 55 97c14 8 18 8 36 8h5c31 -1 58 -20 58 -54c-5 -19 -16 -28 -33 -28c-10 0 -18 4 -24 8l-7 7l-11 9l-9 2c-27 0 -40 -14 -40 -43v-8c0 -3 2 -10 5 -19l12 -26 c9 -14 17 -28 37 -28c11 1 23 5 37 13s29 19 45 33c23 23 46 46 69 70c19 17 43 36 64 49c19 10 40 15 63 15c68 -2 106 -49 106 -118z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E569.xml b/data/Leipzig/E569.xml
new file mode 100644
index 00000000000..1c396713737
--- /dev/null
+++ b/data/Leipzig/E569.xml
@@ -0,0 +1 @@
+<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M468 118c0 -69 -38 -116 -106 -118c-23 0 -44 5 -63 15c-16 10 -34 23 -50 37v-133h-30v162l-53 53c-16 14 -31 25 -45 33s-26 12 -37 13c-20 0 -28 -14 -37 -28l-12 -26c-3 -9 -5 -16 -5 -19v-8c0 -29 13 -43 40 -43l9 2l11 9l7 7c6 4 14 8 24 8c17 0 28 -9 33 -28 c0 -34 -27 -53 -58 -54h-5c-18 0 -22 0 -36 8c-33 14 -55 54 -55 97c0 50 21 87 49 114c18 15 36 23 55 25c26 0 51 -7 75 -21c9 -5 15 -9 18 -11l18 -15c1 -1 3 -2 4 -3v125h30v-154l64 -66l10 -9l22 -16c13 -7 26 -11 37 -11c37 0 55 36 55 70c0 28 -12 55 -39 55 c-6 -2 -11 -5 -17 -9l-18 -13c-3 -3 -9 -4 -18 -4c-19 0 -30 17 -32 37c0 28 28 42 58 44c43 0 70 -31 85 -62c8 -16 12 -36 12 -58v-5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56A.xml b/data/Leipzig/E56A.xml
new file mode 100644
index 00000000000..00d92312fea
--- /dev/null
+++ b/data/Leipzig/E56A.xml
@@ -0,0 +1 @@
+<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M126 468c69 0 116 -38 118 -106c0 -23 -5 -44 -15 -63c-13 -21 -32 -45 -49 -64c-24 -23 -47 -46 -70 -69c-14 -16 -25 -31 -33 -45s-12 -26 -13 -37c0 -20 14 -28 28 -37l26 -12c9 -3 16 -5 19 -5h8c29 0 43 13 43 40l-2 9l-9 11l-7 7c-4 6 -8 14 -8 24c0 17 9 28 28 33 c34 0 53 -27 54 -58c0 -23 0 -26 -8 -41c-14 -33 -54 -55 -97 -55c-50 0 -87 21 -114 49c-15 18 -23 36 -25 55c0 26 7 51 21 75c5 9 9 15 11 18l15 18c7 9 22 25 31 33l67 65l9 10l16 22c7 13 11 26 11 37c0 37 -36 55 -70 55c-28 0 -55 -12 -55 -39c2 -6 5 -11 9 -17 l13 -18c3 -3 4 -9 4 -18c0 -19 -17 -30 -37 -32c-28 0 -42 28 -44 58c0 43 31 70 62 85c16 8 35 12 58 12h5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56B.xml b/data/Leipzig/E56B.xml
new file mode 100644
index 00000000000..4f5042f6e3c
--- /dev/null
+++ b/data/Leipzig/E56B.xml
@@ -0,0 +1 @@
+<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M118 468h5c23 0 42 -4 58 -12c31 -15 62 -42 62 -85c-2 -30 -16 -58 -44 -58c-20 2 -37 13 -37 32c0 9 1 15 4 18l13 18c4 6 7 11 9 17c0 27 -27 39 -55 39c-34 0 -70 -18 -70 -55c0 -11 4 -24 11 -37l16 -22l9 -10l67 -65c9 -8 24 -24 31 -33l15 -18c2 -3 6 -9 11 -18 c14 -24 21 -49 21 -75c-2 -19 -10 -37 -25 -55c-27 -28 -64 -49 -114 -49c-43 0 -83 22 -97 55c-8 15 -8 18 -8 41c1 31 20 58 54 58c19 -5 28 -16 28 -33c0 -10 -4 -18 -8 -24l-7 -7l-9 -11l-2 -9c0 -27 14 -40 43 -40h8c3 0 10 2 19 5l26 12c14 9 28 17 28 37 c-1 11 -5 23 -13 37s-19 29 -33 45c-23 23 -46 46 -70 69c-17 19 -36 43 -49 64c-10 19 -15 40 -15 63c2 68 49 106 118 106z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56C.xml b/data/Leipzig/E56C.xml
new file mode 100644
index 00000000000..427ca0baf8a
--- /dev/null
+++ b/data/Leipzig/E56C.xml
@@ -0,0 +1 @@
+<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10 c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56D.xml b/data/Leipzig/E56D.xml
new file mode 100644
index 00000000000..44bc170f037
--- /dev/null
+++ b/data/Leipzig/E56D.xml
@@ -0,0 +1 @@
+<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l121 143c4 4 8 7 11 9s7 3 11 4c5 0 13 -6 25 -17l107 -94v184h30v-159l58 69c11 13 19 20 23 20l24 -16l84 -75l31 -25c3 1 7 5 13 12l14 15l34 44v-55l-106 -125c-8 -11 -16 -16 -23 -16c-3 1 -5 3 -7 4c-6 4 -12 9 -18 14l-78 70c-14 14 -25 21 -34 21l-5 -2 l-5 -5l-5 -6v-184h-30v149l-36 -45c-10 -11 -18 -16 -24 -16l-7 2l-10 8l-10 8l-88 80c-7 7 -14 11 -20 13c-3 0 -9 -4 -17 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56E.xml b/data/Leipzig/E56E.xml
new file mode 100644
index 00000000000..6dacafb476b
--- /dev/null
+++ b/data/Leipzig/E56E.xml
@@ -0,0 +1 @@
+<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M710 134l-109 -127c-3 -3 -5 -5 -7 -6l-6 -2c-5 2 -9 4 -10 5l-89 78c-5 5 -10 7 -17 8c-4 -1 -7 -3 -8 -4l-66 -79c-3 -5 -8 -8 -13 -8l-11 5l-89 78c-6 5 -11 7 -16 8c-4 -1 -7 -3 -8 -4l-67 -79c-5 -5 -10 -8 -14 -8c-2 0 -5 2 -10 5l-88 78c-5 5 -11 7 -17 8 c-5 -1 -7 -3 -8 -4l-57 -68v49l108 127l10 4c1 0 2 0 4 -1s6 -3 12 -7l88 -78l10 -5c4 0 9 3 14 8l67 79c3 3 6 4 8 4c5 0 10 -3 16 -8l89 -78l11 -5l6 1l7 7l67 79c3 3 6 4 7 4c4 -1 7 -3 8 -4l7 -6l89 -77c3 -3 7 -5 11 -5s8 3 13 8l58 67v-47z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E56F.xml b/data/Leipzig/E56F.xml
new file mode 100644
index 00000000000..3a78e721324
--- /dev/null
+++ b/data/Leipzig/E56F.xml
@@ -0,0 +1 @@
+<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 55c0 35 19 128 112 128c45 0 89 -20 123 -41v148h30v-168c1 -1 3 -2 4 -3l24 -18c28 -21 67 -51 97 -51c35 0 65 53 74 82c6 20 10 45 22 45c10 0 14 -13 14 -32c0 -35 -14 -144 -110 -144h-3c-11 0 -55 4 -122 46v-154h-30v176l-3 2c-15 11 -86 63 -120 63 c-35 0 -75 -24 -75 -87v-7c0 -12 -2 -36 -15 -36c-19 0 -22 32 -22 51z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E583.xml b/data/Leipzig/E583.xml
new file mode 100644
index 00000000000..55fd2fd3c9d
--- /dev/null
+++ b/data/Leipzig/E583.xml
@@ -0,0 +1 @@
+<symbol id="E583" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v330h26v-330h-26z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E587.xml b/data/Leipzig/E587.xml
new file mode 100644
index 00000000000..c7c3a81589d
--- /dev/null
+++ b/data/Leipzig/E587.xml
@@ -0,0 +1 @@
+<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l11 6l80 93l18 10h1c5 0 9 -2 12 -6l105 -93c5 -4 10 -8 16 -12c135 102 189 145 262 175c121 49 188 68 207 68c4 0 6 0 6 -2c0 -9 -64 -42 -183 -86c-88 -45 -200 -137 -333 -269l-6 -7c-9 -7 -16 -10 -20 -10 h-1c-3 0 -7 2 -10 6l-105 94c-6 5 -12 7 -19 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10h-1c-3 0 -7 2 -10 6v1l-104 93c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E59D.xml b/data/Leipzig/E59D.xml
new file mode 100644
index 00000000000..a95b7444d1b
--- /dev/null
+++ b/data/Leipzig/E59D.xml
@@ -0,0 +1 @@
+<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 17v47l129 120c6 5 9 8 19 8c5 0 10 -3 13 -5c0 0 53 -38 142 -102c3 -2 3 -2 3 -6s-7 -10 -7 -10c-22 -21 -44 -42 -67 -63c-7 -6 -9 -6 -19 -6c-5 0 -7 1 -10 3l-105 75c-8 6 -8 6 -18 6c-5 0 -8 -2 -12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E59E.xml b/data/Leipzig/E59E.xml
new file mode 100644
index 00000000000..6d3534f3af2
--- /dev/null
+++ b/data/Leipzig/E59E.xml
@@ -0,0 +1 @@
+<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 17v47l129 120c6 5 9 8 19 8c5 0 10 -3 13 -5l103 -74s7 -6 13 -7h2c9 0 14 4 14 4l82 74v-51l-143 -127c-7 -6 -9 -6 -19 -6c-5 0 -9 2 -13 5l-102 73c-8 6 -10 6 -18 6c-4 0 -6 -1 -12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B0.xml b/data/Leipzig/E5B0.xml
new file mode 100644
index 00000000000..9adf8632158
--- /dev/null
+++ b/data/Leipzig/E5B0.xml
@@ -0,0 +1 @@
+<symbol id="E5B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 6 -8 8 -5c112 117 270 143 367 143c50 0 85 -7 88 -12c0 0 -7 1 -19 1c-69 0 -316 -18 -484 -253c-5 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94 c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B1.xml b/data/Leipzig/E5B1.xml
new file mode 100644
index 00000000000..7942474898a
--- /dev/null
+++ b/data/Leipzig/E5B1.xml
@@ -0,0 +1 @@
+<symbol id="E5B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l26 30c7 10 17 24 33 42c5 7 6 9 16 15c2 1 3 1 5 1c16 0 30 -45 47 -77c56 -102 174 -276 356 -278c15 0 20 -10 20 -15c0 -9 -14 -15 -20 -15 h-20c-217 0 -381 233 -428 261l-95 -93c-8 -8 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B2.xml b/data/Leipzig/E5B2.xml
new file mode 100644
index 00000000000..2ce71bbf0a9
--- /dev/null
+++ b/data/Leipzig/E5B2.xml
@@ -0,0 +1 @@
+<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 400zM30 115l99 115l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h1h3c3 -1 6 -2 7 -4l2 -2l105 -93l17 -10l12 6l68 80v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6 l-105 94c-6 5 -13 7 -20 7c-3 0 -6 0 -8 -2l-81 -95c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-39 -45l-30 -36v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5 l-68 -81v379h30v-285z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B3.xml b/data/Leipzig/E5B3.xml
new file mode 100644
index 00000000000..9f293e2888b
--- /dev/null
+++ b/data/Leipzig/E5B3.xml
@@ -0,0 +1 @@
+<symbol id="E5B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 400zM30 115l99 115l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l118 130c121 128 172 254 191 254c7 0 9 -15 9 -51c0 -27 -378 -462 -378 -462c-7 -9 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94 c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81v379h30v-285z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B4.xml b/data/Leipzig/E5B4.xml
new file mode 100644
index 00000000000..5524b8d2791
--- /dev/null
+++ b/data/Leipzig/E5B4.xml
@@ -0,0 +1 @@
+<symbol id="E5B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M646 240h4c3 -1 6 -2 7 -4c35 -32 71 -63 107 -95l17 -10l11 6l80 93l18 10h1c5 0 9 -2 12 -6l105 -93l9 -7l7 -5c6 5 12 9 17 13l64 48c80 60 125 91 181 114c121 49 188 68 207 68c4 0 6 0 6 -2c0 -9 -64 -42 -183 -86c-88 -45 -200 -137 -333 -269l-6 -7 c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -5 0 -7 -2l-81 -95c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6h-1c-3 0 -7 2 -10 6l-105 94c-5 4 -12 7 -19 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94 c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -27 -29 -36 -52 -63l-25 -18c-11 -8 -26 -11 -45 -11c-76 0 -197 61 -201 164v10c0 80 101 157 189 169c0 0 13 1 14 1c20 0 27 -15 24 -12h-1c-15 0 -203 -63 -203 -155v-1c0 -28 6 -43 24 -63c34 -38 73 -65 140 -65 c20 0 36 8 62 23c50 44 90 99 135 149l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B5.xml b/data/Leipzig/E5B5.xml
new file mode 100644
index 00000000000..5c5cbf17798
--- /dev/null
+++ b/data/Leipzig/E5B5.xml
@@ -0,0 +1 @@
+<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 102l-5 5c-16 15 -35 60 -94 60c-49 0 -88 -45 -100 -60c-39 -48 -80 -116 -80 -179c0 -89 60 -141 60 -141c72 -68 192 -82 241 -82h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2h-7c-34 0 -89 1 -150 26c-102 42 -154 111 -158 214v5 c0 120 167 345 287 345h2c64 -1 97 -34 121 -60l16 -14l1 1c2 -3 5 -5 7 -8l58 -51l17 -10l10 5l81 94l17 10h2c5 0 9 -2 12 -6l105 -93l3 -2l13 -8l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-5 -7 -16 -10 -20 -10 c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-2 0 -4 0 -6 -1l-82 -96c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-1 1 -3 2 -4 3c-5 3 -10 4 -15 4c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-1 1 -2 2 -2 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B6.xml b/data/Leipzig/E5B6.xml
new file mode 100644
index 00000000000..22c98767ab1
--- /dev/null
+++ b/data/Leipzig/E5B6.xml
@@ -0,0 +1 @@
+<symbol id="E5B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 102l-5 5c-16 15 -35 60 -94 60c-49 0 -88 -45 -100 -60c-39 -48 -80 -116 -80 -179c0 -89 60 -141 60 -141c72 -68 192 -82 241 -82h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2h-7c-34 0 -89 1 -150 26c-102 42 -154 111 -158 214v5 c0 120 167 345 287 345h2c64 -1 97 -34 121 -60l16 -14l1 1c2 -3 5 -5 7 -8l58 -51l17 -10l10 5l81 94l17 10h2c5 0 9 -2 12 -6l105 -93l3 -2l13 -8l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c102 72 250 125 250 204c0 20 -2 37 -30 67 c-113 121 -135 139 -135 150c0 2 2 0 5 0c23 0 105 -48 185 -145c24 -29 17 -44 20 -65c0 -3 1 -6 1 -10c0 -96 -215 -188 -344 -322c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-2 0 -4 0 -6 -1l-82 -96c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6 l-105 94c-1 1 -3 2 -4 3c-5 3 -10 4 -15 4c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-1 1 -2 2 -2 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B7.xml b/data/Leipzig/E5B7.xml
new file mode 100644
index 00000000000..a8baa037577
--- /dev/null
+++ b/data/Leipzig/E5B7.xml
@@ -0,0 +1 @@
+<symbol id="E5B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M598 98c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -27 -29 -36 -52 -63l-25 -18c-11 -8 -26 -11 -45 -11c-76 0 -197 61 -201 164v10c0 80 101 157 189 169 c0 0 13 1 14 1c20 0 27 -15 24 -12h-1c-15 0 -203 -63 -203 -155v-1c0 -28 6 -43 24 -63c34 -38 73 -65 140 -65c20 0 36 8 62 23c50 44 90 99 135 149l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h4c3 -1 6 -2 7 -4c35 -32 71 -63 107 -95l17 -10l12 6l72 86 c5 5 9 9 15 11l11 6c5 0 9 -2 12 -6l105 -93l9 -7l2 -1v176h30v-158c6 7 11 13 17 20l39 46c10 12 21 22 25 22l24 -16l84 -75l31 -25c3 1 7 5 13 12l14 15l34 44v-55l-106 -125c-8 -11 -16 -16 -23 -16c-10 3 -17 12 -25 18l-78 70c-14 14 -25 21 -34 21l-4 -2l-11 -13 v-182h-30v147c-12 -14 -24 -28 -36 -43c-10 -11 -18 -16 -24 -16h-2c-5 0 -11 7 -15 10c-28 23 -54 49 -81 73l-19 17c-5 4 -12 7 -20 7c-4 0 -6 -1 -8 -2l-81 -95c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B8.xml b/data/Leipzig/E5B8.xml
new file mode 100644
index 00000000000..69277799d74
--- /dev/null
+++ b/data/Leipzig/E5B8.xml
@@ -0,0 +1 @@
+<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 102l-5 5c-16 15 -35 60 -94 60c-49 0 -88 -45 -100 -60c-39 -48 -80 -116 -80 -179c0 -89 60 -141 60 -141c72 -68 192 -82 241 -82h8c19 -1 26 -4 26 -8c0 -6 -14 -12 -26 -12c-7 0 -20 -2 -39 -2h-7c-34 0 -89 1 -150 26c-102 42 -154 111 -158 214v5 c0 120 167 345 287 345h2c64 -1 97 -34 121 -60l16 -14l1 1c2 -3 5 -5 7 -8l58 -51l17 -10l10 5l81 94l17 10h2c5 0 9 -2 12 -6l105 -93v178h30v-180l78 91l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-5 -7 -16 -10 -20 -10 c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-2 0 -4 0 -6 -1l-21 -25v-160h-30v125l-31 -36c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-1 1 -3 2 -4 3c-5 3 -10 4 -15 4c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-1 1 -2 2 -2 4z "/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5B9.xml b/data/Leipzig/E5B9.xml
new file mode 100644
index 00000000000..d7362933508
--- /dev/null
+++ b/data/Leipzig/E5B9.xml
@@ -0,0 +1 @@
+<symbol id="E5B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M129 -217c-33 -23 -71 -32 -98 -32c-18 0 -31 5 -31 11c0 8 19 19 68 29c122 24 345 392 430 439l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c135 102 189 145 262 175c121 49 188 68 207 68c4 0 6 0 6 -2 c0 -9 -64 -42 -183 -86c-89 -46 -204 -140 -340 -276c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-123 -133 -118 -186 -308 -319z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BA.xml b/data/Leipzig/E5BA.xml
new file mode 100644
index 00000000000..799ee1c35d1
--- /dev/null
+++ b/data/Leipzig/E5BA.xml
@@ -0,0 +1 @@
+<symbol id="E5BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-240 -217c-33 -23 -71 -32 -98 -32c-18 0 -31 5 -31 11c0 8 19 19 68 29c122 24 345 392 430 439l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c102 72 250 125 250 204c0 20 -2 37 -30 67 c-113 121 -135 139 -135 150c0 2 2 0 5 0c23 0 105 -48 185 -145c24 -29 17 -44 20 -65c0 -3 1 -6 1 -10c0 -96 -215 -188 -344 -322c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6 l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-123 -133 -118 -186 -308 -319z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BB.xml b/data/Leipzig/E5BB.xml
new file mode 100644
index 00000000000..87e52589a51
--- /dev/null
+++ b/data/Leipzig/E5BB.xml
@@ -0,0 +1 @@
+<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l10 5l81 94l17 10h2c5 0 9 -2 12 -6l105 -93l3 -2l13 -8l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c102 72 250 125 250 204c0 20 -2 37 -30 67c-113 121 -135 139 -135 150c0 2 2 0 5 0 c23 0 105 -48 185 -145c24 -29 17 -44 20 -65c0 -3 1 -6 1 -10c0 -96 -215 -188 -344 -322c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-2 0 -4 0 -6 -1l-82 -96c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-1 1 -3 2 -4 3c-5 3 -10 4 -15 4 c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BC.xml b/data/Leipzig/E5BC.xml
new file mode 100644
index 00000000000..e6dc7b62c1f
--- /dev/null
+++ b/data/Leipzig/E5BC.xml
@@ -0,0 +1 @@
+<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M768 240h4c3 -1 6 -2 7 -4c1 0 1 -1 2 -2l105 -93v168h30v-171l67 79v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 -1 -8 -2l-20 -23v-171h-30v135 l-31 -36c-2 -1 -4 -3 -5 -4c-6 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -26 -43 -52 -65 -77c0 15 -1 19 -3 25 c-15 52 -100 158 -187 158c-9 0 -18 -1 -27 -4c-50 -14 -135 -205 -158 -205c-4 0 -6 5 -6 17c0 1 59 233 183 233c59 0 178 -38 226 -132l98 113l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BD.xml b/data/Leipzig/E5BD.xml
new file mode 100644
index 00000000000..44cd63cbd37
--- /dev/null
+++ b/data/Leipzig/E5BD.xml
@@ -0,0 +1 @@
+<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l11 5l73 87c5 5 9 9 15 11l11 6c5 0 9 -2 12 -6l105 -93l9 -7l2 -1v176h30v-158c19 23 39 45 58 68c11 13 19 20 23 20l24 -16l84 -75l31 -25c3 1 7 5 13 12l14 15l34 44v-55l-106 -125c-8 -11 -16 -16 -23 -16 c-10 3 -17 12 -25 18l-78 70c-14 14 -25 21 -34 21l-4 -2l-11 -13v-182h-30v147c-12 -14 -24 -28 -36 -43c-10 -11 -18 -16 -24 -16h-2c-5 0 -11 7 -15 10c-35 29 -67 61 -101 91c-6 4 -12 6 -19 6c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10 c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BE.xml b/data/Leipzig/E5BE.xml
new file mode 100644
index 00000000000..b3d098cbea7
--- /dev/null
+++ b/data/Leipzig/E5BE.xml
@@ -0,0 +1 @@
+<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M378 50c-17 57 -98 186 -215 186c-31 0 -91 -6 -141 -45c0 0 -12 -7 -18 -7c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 47 61 174 61c55 0 174 -53 224 -152l98 113l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8 l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -26 -43 -52 -65 -77c0 15 -3 19 -3 25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5BF.xml b/data/Leipzig/E5BF.xml
new file mode 100644
index 00000000000..d9ed36d26ff
--- /dev/null
+++ b/data/Leipzig/E5BF.xml
@@ -0,0 +1 @@
+<symbol id="E5BF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M378 50c-17 57 -98 186 -215 186c-31 0 -91 -6 -141 -45c0 0 -12 -7 -18 -7c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 47 61 174 61c55 0 174 -53 224 -152l98 113l17 10c7 0 11 -2 12 -6l106 -93v179h30v-182l79 92l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8 l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-19 -22v-160h-30v125l-32 -37c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -26 -43 -52 -65 -77c0 15 -3 19 -3 25z "/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C0.xml b/data/Leipzig/E5C0.xml
new file mode 100644
index 00000000000..bde9cc7128c
--- /dev/null
+++ b/data/Leipzig/E5C0.xml
@@ -0,0 +1 @@
+<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M378 50c-17 57 -98 186 -215 186c-31 0 -91 -6 -141 -45c0 0 -12 -7 -18 -7c-2 0 -4 1 -4 3c0 3 3 10 11 21c0 0 47 61 174 61c55 0 174 -53 224 -152l98 113l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h1h3c3 -1 6 -2 7 -4c1 0 1 -1 2 -2l105 -93l17 -10 l12 6l68 80v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 -1 -8 -2l-81 -95c-2 -1 -4 -3 -5 -4c-6 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94 c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-39 -45l-30 -36v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -26 -43 -52 -65 -77c0 15 -3 19 -3 25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C1.xml b/data/Leipzig/E5C1.xml
new file mode 100644
index 00000000000..2fd40a2d740
--- /dev/null
+++ b/data/Leipzig/E5C1.xml
@@ -0,0 +1 @@
+<symbol id="E5C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 87c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 92 -152 185 -152c4 0 10 -1 15 0c65 11 102 43 172 125c50 56 98 113 147 170l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150 c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81c-34 -41 -86 -110 -190 -111c-104 0 -182 112 -209 177z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C2.xml b/data/Leipzig/E5C2.xml
new file mode 100644
index 00000000000..d302024cc67
--- /dev/null
+++ b/data/Leipzig/E5C2.xml
@@ -0,0 +1 @@
+<symbol id="E5C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 87c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 92 -152 185 -152c4 0 10 -1 15 0c65 11 102 43 172 125c50 56 98 113 147 170l17 10c7 0 11 -2 12 -6l106 -93l16 -9v178h30v-153l63 73l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150 c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-3 -3v-189h-30v154l-48 -56c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81c-34 -41 -86 -110 -190 -111c-104 0 -182 112 -209 177z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C3.xml b/data/Leipzig/E5C3.xml
new file mode 100644
index 00000000000..3b2717fd9da
--- /dev/null
+++ b/data/Leipzig/E5C3.xml
@@ -0,0 +1 @@
+<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 87c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 92 -152 185 -152c4 0 10 -1 15 0c65 11 102 43 172 125c50 56 98 113 147 170l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h1c6 0 9 -3 12 -6l105 -93l17 -10l12 6l68 80v-1l12 14l18 10c5 0 9 -2 12 -6 l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 -1 -8 -2l-81 -95c-5 -4 -14 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14 c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81c-34 -41 -86 -110 -190 -111c-104 0 -182 112 -209 177z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C4.xml b/data/Leipzig/E5C4.xml
new file mode 100644
index 00000000000..d6af2e853f3
--- /dev/null
+++ b/data/Leipzig/E5C4.xml
@@ -0,0 +1 @@
+<symbol id="E5C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 87c0 0 -1 2 -1 4c0 1 1 3 2 3s4 -2 8 -7c11 -14 92 -152 185 -152c4 0 10 -1 15 0c65 11 102 43 172 125c50 56 98 113 147 170l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l17 10h1c6 0 9 -3 12 -6l105 -93l16 -9v178h30v-153l51 60v-1l12 14l18 10 c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 -1 -8 -2l-4 -5v-188h-30v153l-47 -55c-5 -4 -14 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3 l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5l-68 -81c-34 -41 -86 -110 -190 -111c-104 0 -182 112 -209 177z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C5.xml b/data/Leipzig/E5C5.xml
new file mode 100644
index 00000000000..2a225c2abef
--- /dev/null
+++ b/data/Leipzig/E5C5.xml
@@ -0,0 +1 @@
+<symbol id="E5C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7c9 -6 8 -5 8 -5c102 72 250 125 250 204c0 20 -2 37 -30 67c-113 121 -135 139 -135 150c0 2 2 0 5 0c23 0 105 -48 185 -145c24 -29 17 -44 20 -65 c0 -3 1 -6 1 -10c0 -96 -215 -188 -344 -322c-6 -6 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C6.xml b/data/Leipzig/E5C6.xml
new file mode 100644
index 00000000000..e8e528f44a6
--- /dev/null
+++ b/data/Leipzig/E5C6.xml
@@ -0,0 +1 @@
+<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 71zM646 240h4c3 -1 6 -2 7 -4c35 -32 71 -63 107 -95l17 -10l12 6l68 80v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 0 -8 -2l-81 -95 c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -27 -45 -54 -68 -81h-9c-105 0 -241 25 -246 153v10 c0 77 63 141 92 182c0 0 5 2 6 2c0 -1 0 -4 -2 -8c-4 -14 -74 -85 -74 -164c0 -28 7 -53 25 -73c34 -38 72 -58 139 -58c20 0 43 2 69 6l30 44l99 115l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C7.xml b/data/Leipzig/E5C7.xml
new file mode 100644
index 00000000000..d96d5d1a4ff
--- /dev/null
+++ b/data/Leipzig/E5C7.xml
@@ -0,0 +1 @@
+<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 71zM646 240h4c3 -1 6 -2 7 -4c35 -32 71 -63 107 -95v179h30v-182l67 79v-1l12 14l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80v-59l-128 -150c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-3 0 -6 0 -8 -2l-20 -23v-160h-30 v124l-31 -36c-2 -1 -3 -3 -5 -4c-5 -4 -11 -6 -15 -6c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-69 -81v1l-12 -14c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5c-22 -27 -45 -54 -68 -81h-9 c-105 0 -241 25 -246 153v10c0 77 63 141 92 182c0 0 5 2 6 2c0 -1 0 -4 -2 -8c-4 -14 -74 -85 -74 -164c0 -28 7 -53 25 -73c34 -38 72 -58 139 -58c20 0 43 2 69 6l30 44l99 115l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5C8.xml b/data/Leipzig/E5C8.xml
new file mode 100644
index 00000000000..a8e2c59802b
--- /dev/null
+++ b/data/Leipzig/E5C8.xml
@@ -0,0 +1 @@
+<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 21v59l129 150l17 10c7 0 11 -2 12 -6l106 -93l17 -10l12 6l80 93l18 10c5 0 9 -2 12 -6l105 -93l9 -7l8 -5c5 1 9 4 12 8l68 80c1 2 3 3 6 3c22 0 90 -73 103 -102c27 -59 42 -84 42 -133c0 -12 -1 -26 -3 -42c-11 -101 -101 -186 -200 -186c-46 0 -95 16 -101 22 c-4 4 -6 14 -6 15l10 -3c30 -8 67 -18 97 -18c68 0 144 74 144 134v9c0 75 -16 119 -44 153c-25 31 -56 57 -68 66l-108 -127c-9 -7 -16 -10 -20 -10c-3 0 -7 2 -10 6l-105 94c-6 5 -13 7 -20 7c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10c-3 0 -7 2 -10 6l-105 94 c-6 6 -13 9 -20 9c-3 0 -7 -2 -10 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5E5.xml b/data/Leipzig/E5E5.xml
new file mode 100644
index 00000000000..29abaef5fc3
--- /dev/null
+++ b/data/Leipzig/E5E5.xml
@@ -0,0 +1 @@
+<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 152h-152v26h152v152h26v-152h152v-26h-152v-152h-26v152z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5E6.xml b/data/Leipzig/E5E6.xml
new file mode 100644
index 00000000000..baf29f0d395
--- /dev/null
+++ b/data/Leipzig/E5E6.xml
@@ -0,0 +1 @@
+<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 165c0 106 59 165 165 165s165 -59 165 -165s-59 -165 -165 -165s-165 59 -165 165zM28 152c4 -77 47 -120 124 -124v124h-124zM178 28c77 4 120 47 124 124h-124v-124zM178 178h124c-4 77 -47 120 -124 124v-124zM28 178h124v124c-77 -4 -120 -47 -124 -124z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E5E7.xml b/data/Leipzig/E5E7.xml
new file mode 100644
index 00000000000..d1516652d80
--- /dev/null
+++ b/data/Leipzig/E5E7.xml
@@ -0,0 +1 @@
+<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 165c0 106 59 165 165 165s165 -59 165 -165s-59 -165 -165 -165s-165 59 -165 165zM28 165c0 -90 47 -137 137 -137s137 47 137 137s-47 137 -137 137s-137 -47 -137 -137z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E610.xml b/data/Leipzig/E610.xml
new file mode 100644
index 00000000000..3c28e5edacd
--- /dev/null
+++ b/data/Leipzig/E610.xml
@@ -0,0 +1 @@
+<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 240h310v-240h-33v116h-244v-116h-33v240z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E611.xml b/data/Leipzig/E611.xml
new file mode 100644
index 00000000000..b245e7f0a21
--- /dev/null
+++ b/data/Leipzig/E611.xml
@@ -0,0 +1 @@
+<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0v240h33v-116h244v116h33v-240h-310z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E612.xml b/data/Leipzig/E612.xml
new file mode 100644
index 00000000000..c44bc8a3546
--- /dev/null
+++ b/data/Leipzig/E612.xml
@@ -0,0 +1 @@
+<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M283 338l-141 -338l-142 338h38l104 -248l104 248h37z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E613.xml b/data/Leipzig/E613.xml
new file mode 100644
index 00000000000..98df92f0bb9
--- /dev/null
+++ b/data/Leipzig/E613.xml
@@ -0,0 +1 @@
+<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M283 0h-37l-104 248l-104 -248h-38l142 338z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E614.xml b/data/Leipzig/E614.xml
new file mode 100644
index 00000000000..a62da41b9d9
--- /dev/null
+++ b/data/Leipzig/E614.xml
@@ -0,0 +1 @@
+<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 103c0 57 46 103 103 103s103 -46 103 -103s-46 -103 -103 -103s-103 46 -103 103zM28 103c0 -41 34 -75 75 -75s75 34 75 75s-34 75 -75 75s-75 -34 -75 -75z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E630.xml b/data/Leipzig/E630.xml
new file mode 100644
index 00000000000..e5e14babb39
--- /dev/null
+++ b/data/Leipzig/E630.xml
@@ -0,0 +1 @@
+<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 163c0 57 46 103 103 103s103 -46 103 -103c0 -53 -39 -96 -90 -102v-61h-26v61c-51 6 -90 49 -90 102zM116 89c35 6 62 37 62 74c0 41 -34 75 -75 75s-75 -34 -75 -75c0 -37 27 -68 62 -74v81h26v-81z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E631.xml b/data/Leipzig/E631.xml
new file mode 100644
index 00000000000..bf4103a3749
--- /dev/null
+++ b/data/Leipzig/E631.xml
@@ -0,0 +1 @@
+<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 103c0 53 39 96 90 102v61h26v-61c51 -6 90 -49 90 -102c0 -57 -46 -103 -103 -103s-103 46 -103 103zM116 177v-81h-26v81c-35 -6 -62 -37 -62 -74c0 -41 34 -75 75 -75s75 34 75 75c0 37 -27 68 -62 74z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E632.xml b/data/Leipzig/E632.xml
new file mode 100644
index 00000000000..05752ade7db
--- /dev/null
+++ b/data/Leipzig/E632.xml
@@ -0,0 +1 @@
+<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M103 206c53 0 96 -39 102 -90h61v-26h-61c-6 -51 -49 -90 -102 -90c-57 0 -103 46 -103 103s46 103 103 103zM177 90h-81v26h81c-6 35 -37 62 -74 62c-41 0 -75 -34 -75 -75s34 -75 75 -75c37 0 68 27 74 62z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E633.xml b/data/Leipzig/E633.xml
new file mode 100644
index 00000000000..c81234ec125
--- /dev/null
+++ b/data/Leipzig/E633.xml
@@ -0,0 +1 @@
+<symbol id="E633" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 152h-152v26h152v152h26v-152h152v-26h-152v-152h-26v152z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E638.xml b/data/Leipzig/E638.xml
new file mode 100644
index 00000000000..29d5737c3b5
--- /dev/null
+++ b/data/Leipzig/E638.xml
@@ -0,0 +1 @@
+<symbol id="E638" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 178h62v59c-31 -5 -56 -29 -62 -59zM178 236v-58h58c-6 29 -29 52 -58 58zM237 152h-59v-62c30 6 54 31 59 62zM89 152c5 -32 31 -58 63 -63v63h-63zM61 152h-61v26h61c7 46 44 82 91 87v65h26v-65c45 -7 80 -42 87 -87h65v-26h-65c-5 -47 -41 -84 -87 -91v-61h-26v61 c-48 5 -86 43 -91 91z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E645.xml b/data/Leipzig/E645.xml
new file mode 100644
index 00000000000..4e7fc6524b7
--- /dev/null
+++ b/data/Leipzig/E645.xml
@@ -0,0 +1 @@
+<symbol id="E645" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 280l-130 -130l130 -130l-20 -20l-130 134l-130 -134l-20 20l130 130l-130 130l20 20l130 -130l130 130z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E650.xml b/data/Leipzig/E650.xml
new file mode 100644
index 00000000000..84403bf5f94
--- /dev/null
+++ b/data/Leipzig/E650.xml
@@ -0,0 +1 @@
+<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M657 134c0 -35 -12 -66 -37 -93s-54 -41 -87 -41h-14c-6 8 -11 14 -14 17c-11 12 -21 18 -29 18c-15 0 -27 -3 -38 -10c-13 -11 -24 -19 -32 -25h-66l-40 47l-33 -47h-77c-5 19 -10 33 -13 42c-6 15 -13 22 -24 22h-3c-17 -2 -33 -12 -49 -30c-9 -11 -19 -23 -29 -34h-34 c0 29 34 67 103 113c33 22 49 46 49 72c0 17 -11 41 -32 71s-32 65 -33 106c0 15 1 30 3 47s6 37 11 61c-1 4 -4 7 -7 9s-9 3 -18 3c-19 -5 -33 -11 -42 -18c-28 -21 -42 -54 -42 -97c0 -11 2 -20 5 -27s8 -12 13 -15c2 -1 4 -1 6 -1c14 0 26 14 36 42c3 3 6 5 9 8 c1 -2 1 -6 1 -11c0 -15 -4 -28 -12 -40c-11 -16 -28 -26 -50 -31c-9 0 -17 5 -24 15c-9 13 -14 32 -14 55c0 45 15 82 45 110s68 42 113 42c52 0 92 -10 119 -30s41 -48 42 -83c0 -14 -2 -28 -7 -42c-12 -21 -27 -31 -44 -31c-18 0 -36 9 -53 28s-26 34 -26 47c0 6 2 9 7 10 c4 -11 8 -20 12 -25c12 -17 27 -26 46 -26c15 0 25 4 30 12s8 19 8 32c0 21 -8 36 -23 47s-35 19 -60 24c-10 2 -17 3 -20 3c-4 0 -13 -1 -26 -3c-5 -15 -9 -31 -11 -46s-3 -34 -3 -57c0 -21 7 -43 21 -68l54 -90c3 -13 4 -25 4 -37c0 -22 -8 -42 -25 -61 c-9 -9 -13 -17 -13 -22c9 -9 15 -20 18 -33s15 -23 36 -28c17 5 29 10 36 15s10 12 10 21c0 7 -4 19 -12 38c-5 13 -9 23 -11 30c-1 6 -1 11 -1 14c0 28 8 53 24 76s38 34 67 34c21 0 36 -4 44 -12s14 -23 17 -46c0 -3 1 -6 1 -9c0 -18 -8 -35 -22 -49 c-23 -21 -45 -41 -68 -61c6 -11 13 -21 21 -31c17 -21 33 -31 50 -31c12 0 25 5 39 15c4 3 10 8 17 15c-1 12 -2 22 -2 31c0 37 7 68 20 95c19 38 51 67 97 87c-21 47 -53 88 -96 124c-41 29 -82 57 -123 86c29 -3 66 -17 111 -44c55 -32 98 -70 131 -115 c42 -57 63 -118 63 -184zM379 227c-10 0 -20 -1 -31 -2s-18 -6 -22 -15s-7 -17 -8 -25s-2 -17 -2 -26v-20c28 0 46 9 55 28c5 11 8 31 8 60zM513 54c6 -13 16 -19 30 -19c16 0 30 8 43 24s19 39 20 70c0 25 -3 52 -10 80s-15 42 -25 43c-21 -9 -38 -26 -50 -52 s-18 -55 -18 -87c0 -23 3 -43 10 -59zM671 50c7 0 12 -3 17 -8s7 -11 7 -18s-3 -12 -8 -17s-12 -7 -19 -7s-12 3 -17 8s-7 12 -7 19c0 15 9 23 27 23z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E651.xml b/data/Leipzig/E651.xml
new file mode 100644
index 00000000000..7cab0b5af84
--- /dev/null
+++ b/data/Leipzig/E651.xml
@@ -0,0 +1 @@
+<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M267 0h-77c-5 19 -10 33 -13 42c-6 15 -13 22 -24 22h-3c-17 -2 -33 -12 -49 -30c-9 -11 -19 -23 -29 -34h-34c0 29 34 67 103 113c33 22 49 46 49 72c0 17 -11 41 -32 71s-32 65 -33 106c0 15 1 30 3 47s6 37 11 61c-1 4 -4 7 -7 9s-9 3 -18 3c-19 -5 -33 -11 -42 -18 c-28 -21 -42 -54 -42 -97c0 -11 2 -20 5 -27s8 -12 13 -15c2 -1 4 -1 6 -1c14 0 26 14 36 42c3 3 6 5 9 8c1 -2 1 -6 1 -11c0 -15 -4 -28 -12 -40c-11 -16 -28 -26 -50 -31c-9 0 -17 5 -24 15c-9 13 -14 32 -14 55c0 45 15 82 45 110s68 42 113 42c52 0 92 -10 119 -30 s41 -48 42 -83c0 -14 -2 -28 -7 -42c-12 -21 -27 -31 -44 -31c-18 0 -36 9 -53 28s-26 34 -26 47c0 6 2 9 7 10c4 -11 8 -20 12 -25c12 -17 27 -26 46 -26c15 0 25 4 30 12s8 19 8 32c0 21 -8 36 -23 47s-35 19 -60 24c-10 2 -17 3 -20 3c-4 0 -13 -1 -26 -3 c-5 -15 -9 -31 -11 -46s-3 -34 -3 -57c0 -21 7 -43 21 -68l54 -90c3 -13 4 -25 4 -37c0 -22 -8 -42 -25 -61c-9 -9 -13 -17 -13 -22c9 -9 15 -20 18 -33s15 -23 36 -28c17 5 30 9 36 15c24 27 35 37 39 37c1 0 1 -1 1 -2c0 -11 -47 -80 -53 -85z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E655.xml b/data/Leipzig/E655.xml
new file mode 100644
index 00000000000..611de7b0546
--- /dev/null
+++ b/data/Leipzig/E655.xml
@@ -0,0 +1 @@
+<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M217 245c-22 0 -39 -16 -39 -37c0 -18 21 -34 39 -35c20 0 35 18 35 37c0 21 -15 34 -35 35zM44 318c3 26 25 51 52 51c16 0 28 -4 32 -12c11 -14 14 -56 22 -76c6 -8 14 -12 25 -14l16 5c9 5 14 11 15 25c0 7 -2 13 -5 17l-11 18l-17 17l-9 22c0 28 25 47 53 47 s50 -23 50 -47c0 -20 -7 -25 -21 -39l-15 -20c-4 -7 -6 -13 -7 -18c1 -4 5 -11 5 -14l11 -11l14 -7c20 2 30 22 33 47c0 39 17 58 49 58c26 0 46 -21 46 -47c0 -29 -23 -46 -54 -46c-30 0 -45 -11 -48 -34l5 -12c1 -3 4 -5 7 -8c1 -2 6 -3 14 -5c10 2 17 6 23 12 c8 3 6 4 16 12l21 15c4 3 12 5 21 5c23 0 43 -26 44 -49c0 -20 -16 -41 -30 -49c-3 -1 -10 -3 -19 -4c-7 1 -16 7 -30 18l-26 19c-4 3 -11 4 -20 4c-8 0 -14 -1 -17 -4l-9 -19c2 -13 6 -21 14 -24l11 -4l27 -5c16 0 28 -4 37 -12c9 -6 13 -17 13 -34c0 -13 -5 -25 -14 -34 c-9 -8 -22 -13 -36 -16c-11 2 -23 8 -34 19c-8 11 -11 27 -11 47c0 11 -4 21 -7 27c-5 8 -14 12 -26 12c-19 0 -29 -15 -32 -31c3 -7 8 -14 11 -21c4 -8 8 -14 13 -21l8 -8l5 -10c3 -5 4 -13 5 -21c0 -26 -26 -39 -52 -39c-25 0 -45 15 -48 39c1 6 5 18 7 21 c11 14 22 29 33 43c2 4 3 10 4 19c0 17 -8 26 -24 29c-31 0 -40 -20 -40 -51s-17 -49 -48 -54c-33 7 -42 20 -50 52c3 31 25 46 66 46c19 0 37 12 37 31c0 8 -3 13 -8 16c-3 4 -8 7 -16 7c-10 0 -24 -6 -40 -18c-14 -9 -25 -16 -39 -21c-28 3 -45 20 -46 51 c0 26 18 47 44 47c19 0 31 -9 44 -19l18 -14l19 -7c18 4 26 12 26 23c0 23 -15 34 -46 34c-37 0 -57 14 -61 44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E659.xml b/data/Leipzig/E659.xml
new file mode 100644
index 00000000000..0b28ce8e25c
--- /dev/null
+++ b/data/Leipzig/E659.xml
@@ -0,0 +1 @@
+<symbol id="E659" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M942 0c-14 0 -24 13 -24 27c0 15 9 23 27 23c13 0 24 -13 24 -26c0 -14 -13 -24 -27 -24zM887 111v9c0 3 1 5 6 5c6 0 11 -2 11 -13c0 -4 0 -7 -1 -15c-7 -58 -24 -97 -68 -97c-28 0 -33 16 -33 39c0 11 1 24 1 38v62c0 24 0 46 1 79l2 16v1c0 3 -2 4 -6 4s-11 -1 -18 -1 h-19c-10 0 -16 2 -16 12s6 10 16 10h21c7 0 25 7 25 42c0 31 -28 57 -62 57c-32 0 -59 -29 -59 -57c0 -14 4 -30 13 -35c14 -8 26 -6 26 -13c0 -11 -5 -13 -13 -13s-20 9 -32 9c-5 0 -10 -1 -16 -1c-8 0 -16 -10 -16 -22c0 -3 -1 -10 -1 -18c0 -12 2 -28 14 -40l33 -29 c2 -2 22 -13 33 -42c4 -10 6 -19 6 -28c0 -44 -48 -70 -82 -70c-25 0 -56 22 -56 55c0 12 5 23 37 70c4 5 4 7 4 9s0 2 -4 7c-6 7 -23 44 -28 44c-3 0 -3 -4 -8 -15c-19 -40 -28 -82 -50 -118c-14 -23 -41 -52 -66 -52c-21 0 -43 18 -54 35c-12 19 -27 46 -27 81 c0 36 10 79 45 124c21 26 37 35 53 35c27 0 56 -37 68 -59c9 -15 9 -26 13 -26s6 7 12 19c15 29 33 59 72 59c4 0 12 0 12 1c0 4 -12 12 -12 33c0 41 35 72 94 72c66 0 90 -23 90 -73v-37c0 -5 7 -5 12 -5l40 -1c8 0 27 5 35 5c2 0 3 0 3 -1c0 -17 -26 -24 -37 -24h-43 c-10 0 -14 -4 -15 -19c-3 -54 -3 -93 -3 -125c0 -35 7 -46 16 -46c12 0 26 24 31 63zM476 232c-23 0 -36 -51 -36 -73c0 -15 5 -36 15 -60s30 -60 48 -60c20 0 42 52 42 78c0 32 -7 54 -14 68c-6 12 -43 47 -55 47zM651 116c-2 0 -3 -3 -7 -8c-9 -15 -10 -22 -10 -30v-2 c0 -14 26 -36 50 -36c10 0 16 11 16 19c0 10 -17 30 -36 49c-5 6 -11 8 -13 8zM302 535c37 0 47 -24 47 -62c0 -46 -31 -61 -61 -61c-4 0 -9 -1 -13 0c-76 10 -78 30 -130 30c-36 0 -106 -44 -106 -104c0 -59 38 -83 61 -83c46 0 93 52 168 52c54 0 110 -16 110 -117 c0 -136 -89 -190 -142 -190c-45.6821 0 -94.8746 31.906 -127 56c-13 10 -35 23 -45 23c-23 0 -34 -35 -45 -68c-3 -8 -1 -25 -11 -25c-7 0 -8 4 -8 9v4c0 36 19 77 32 99c16 26 33 33 51 33c54 0 62 -32 115 -62c26 -15 44 -26 62 -26c6 0 13 1 20 4c21 9 77 27 77 118 c0 56 -44 78 -70 80c-6 1 -12 0 -17 0c-68 0 -74 -41 -149 -41c-54 0 -99 48 -99 127c0 110 78 152 154 152c51 0 81 -25 132 -25c17 0 26 15 26 31c0 17 -8 33 -25 33c-11 0 -16 4 -16 7s3 5 9 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E65A.xml b/data/Leipzig/E65A.xml
new file mode 100644
index 00000000000..f6554107ff6
--- /dev/null
+++ b/data/Leipzig/E65A.xml
@@ -0,0 +1 @@
+<symbol id="E65A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M302 535c37 0 47 -24 47 -62c0 -46 -31 -61 -61 -61c-4 0 -9 -1 -13 0c-76 10 -78 30 -130 30c-36 0 -106 -44 -106 -104c0 -59 38 -83 61 -83c46 0 93 52 168 52c54 0 110 -16 110 -117c0 -136 -89 -190 -142 -190c-46 0 -95 32 -127 56c-13 10 -35 23 -45 23 c-23 0 -34 -35 -45 -68c-3 -8 -1 -25 -11 -25c-7 0 -8 4 -8 9v4c0 36 19 77 32 99c16 26 33 33 51 33c54 0 62 -32 115 -62c26 -15 44 -26 62 -26c6 0 13 1 20 4c21 9 77 27 77 118c0 56 -44 78 -70 80c-6 1 -12 0 -17 0c-68 0 -74 -41 -149 -41c-54 0 -99 48 -99 127 c0 110 78 152 154 152c51 0 81 -25 132 -25c17 0 26 15 26 31c0 17 -8 33 -25 33c-11 0 -16 4 -16 7s3 5 9 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E880.xml b/data/Leipzig/E880.xml
new file mode 100644
index 00000000000..80a304e7c21
--- /dev/null
+++ b/data/Leipzig/E880.xml
@@ -0,0 +1 @@
+<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 326c47 0 77 -43 77 -90c0 -112 -68 -236 -164 -236c-50 0 -79 43 -79 93c0 52 14 102 43 149c28 46 61 84 123 84zM191 268c0 21 -10 34 -25 39c-33 0 -61 -36 -85 -107c-19 -57 -29 -104 -29 -143l2 -14c3 -5 3 -8 7 -12c5 -7 11 -12 20 -12c30 0 62 34 82 107 l21 78c5 21 7 43 7 64z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E881.xml b/data/Leipzig/E881.xml
new file mode 100644
index 00000000000..4b21da34b5d
--- /dev/null
+++ b/data/Leipzig/E881.xml
@@ -0,0 +1 @@
+<symbol id="E881" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M207 311l-85 -275c-4 -6 7 -11 13 -13l18 -2h11l-6 -21h-158l6 21h15c7 0 14 2 21 5c9 1 16 8 20 20l55 176l-71 -56l-10 10l109 135h62z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E882.xml b/data/Leipzig/E882.xml
new file mode 100644
index 00000000000..72e887bf91f
--- /dev/null
+++ b/data/Leipzig/E882.xml
@@ -0,0 +1 @@
+<symbol id="E882" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 311c60 0 94 -21 94 -80c0 -27 -12 -51 -40 -64l-70 -32c-37 -10 -69 -30 -96 -60h21l26 -2l12 -6c14 -6 28 -11 42 -17c6 -3 13 -4 21 -4l15 4l11 8c5 5 11 13 19 26l17 -9l-16 -28c-2 -4 -16 -28 -20 -31c-19 -21 -38 -31 -57 -31h-10c-13 6 -25 12 -36 20l-15 11 c-12 7 -23 10 -32 10c-10 -3 -19 -8 -24 -17l-5 -9h-23c0 27 6 51 20 72c7 10 14 16 19 21l28 25c20 11 40 22 59 33l19 9c16 7 29 18 39 30c12 15 19 30 19 45l1 12c0 13 -4 24 -12 31c-6 9 -15 14 -28 14c-29 0 -46 -15 -52 -44l3 -12l2 -16c0 -20 -8 -29 -25 -29 c-14 0 -26 13 -26 28c0 48 52 92 100 92z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E883.xml b/data/Leipzig/E883.xml
new file mode 100644
index 00000000000..50cf62fde50
--- /dev/null
+++ b/data/Leipzig/E883.xml
@@ -0,0 +1 @@
+<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M161 326c52 0 94 -17 94 -68c0 -50 -40 -76 -82 -94c26 -21 39 -42 39 -64c0 -52 -56 -100 -118 -100h-12c-40 0 -82 23 -82 56c0 30 12 49 37 49c17 0 31 -16 34 -31c0 -5 -4 -12 -11 -21c-7 -5 -13 -10 -13 -21l11 -9l17 -4c21 0 40 12 56 37c13 21 19 45 19 70 c-9 30 -28 35 -66 35l6 23c34 0 60 4 77 13c20 11 30 35 30 70c0 28 -12 38 -39 40l-20 -3c-8 -3 -12 -9 -12 -16c2 -7 4 -11 5 -14l4 -11l3 -10l-3 -12c-5 -6 -11 -11 -20 -13c-2 0 -4 -1 -6 -1c-16 0 -30 13 -30 28c0 39 43 71 82 71z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E884.xml b/data/Leipzig/E884.xml
new file mode 100644
index 00000000000..5885ff2843b
--- /dev/null
+++ b/data/Leipzig/E884.xml
@@ -0,0 +1 @@
+<symbol id="E884" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M259 110l-6 -21h-59l-16 -52c-3 -6 0 -11 9 -14l34 -2l-6 -21h-155l6 21l18 1l15 4c9 3 16 11 20 23l13 40h-132l5 21c12 10 26 22 39 39l33 43c13 18 27 41 40 68l21 51h97l-36 -49c-13 -16 -33 -34 -49 -49c-36 -35 -76 -67 -115 -100l108 -3l20 72l80 77h5l-44 -149 h55z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E885.xml b/data/Leipzig/E885.xml
new file mode 100644
index 00000000000..e3ee8498859
--- /dev/null
+++ b/data/Leipzig/E885.xml
@@ -0,0 +1 @@
+<symbol id="E885" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M84 0c-49 0 -84 18 -84 66l1 14c2 5 4 9 7 14c7 7 16 11 27 14c7 0 13 -3 19 -9l4 -9l2 -11l-4 -13c-3 -5 -3 -6 -8 -11l-7 -16c0 -8 3 -13 10 -16l13 -4h15c22 0 42 15 59 45c15 27 23 52 23 75l-3 13c-2 8 -13 17 -21 20l-15 4l-17 -1l-16 -3l-17 -10l-23 -18h-21 l62 182c9 -3 25 -6 35 -9l33 -3h10l23 3l49 9c-19 -27 -53 -58 -89 -58h-10l-22 2c-9 3 -17 7 -26 11l-36 -108l18 12l20 9l22 5l26 3c9 0 19 -1 30 -5c14 -5 14 -6 24 -17c14 -15 22 -33 22 -58c0 -32 -13 -62 -41 -87c-28 -24 -60 -35 -94 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E886.xml b/data/Leipzig/E886.xml
new file mode 100644
index 00000000000..d6463ac33e7
--- /dev/null
+++ b/data/Leipzig/E886.xml
@@ -0,0 +1 @@
+<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M154 326c35 0 57 -16 60 -49c0 -7 -1 -13 -2 -16l-8 -14c-4 -7 -13 -12 -28 -15l-13 1l-12 7c-4 4 -7 11 -6 20l1 11l8 10l17 16c-2 7 -9 10 -20 10c-30 0 -53 -25 -69 -74l-9 -31l-6 -36c25 21 42 34 83 34c28 0 56 -29 56 -61c0 -65 -45 -139 -118 -139 c-69 0 -88 38 -88 108v18c0 6 1 13 3 20c0 21 2 20 9 39c17 50 45 95 83 120c20 13 39 21 59 21zM58 58c0 -24 5 -39 27 -39c18 0 35 15 48 47c10 25 16 42 16 72l-3 10l-6 12c-6 7 -14 12 -26 12c-11 0 -24 -11 -37 -33l-14 -40c-3 -15 -5 -28 -5 -41z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E887.xml b/data/Leipzig/E887.xml
new file mode 100644
index 00000000000..5fa252070d3
--- /dev/null
+++ b/data/Leipzig/E887.xml
@@ -0,0 +1 @@
+<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 311c-3 -25 -10 -47 -18 -67c-9 -23 -28 -58 -57 -105l-17 -35l-13 -35c-5 -19 -10 -45 -10 -69h-100c2 15 10 33 24 54c19 30 57 76 86 105c30 31 53 62 70 104l-2 2c-16 -16 -31 -26 -43 -32c-7 -3 -12 -5 -23 -5h-8l-27 16c-9 5 -19 8 -30 8c-5 0 -12 -1 -17 -6 l-16 -14c-7 -11 -14 -25 -21 -42h-21l38 121h20c-5 -9 -8 -16 -8 -21c0 -4 1 -7 2 -8l9 -6l24 20c10 8 24 15 40 15c11 0 29 -12 33 -21c10 -8 21 -14 31 -14h2l13 1l9 7c4 4 8 19 11 27h19z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E888.xml b/data/Leipzig/E888.xml
new file mode 100644
index 00000000000..7ea316ee2b6
--- /dev/null
+++ b/data/Leipzig/E888.xml
@@ -0,0 +1 @@
+<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M61 247c0 51 57 79 108 79c33 0 52 -12 72 -27c11 -9 19 -20 24 -31c5 -12 9 -24 9 -37c0 -11 -4 -21 -13 -32s-27 -23 -56 -37l14 -20l10 -16c4 -8 6 -14 7 -18l3 -19c0 -62 -58 -89 -124 -89c-58 0 -115 33 -115 87c0 48 48 72 89 88c-10 14 -15 18 -21 35l-6 18z M192 174c27 16 40 39 44 73c0 7 -2 13 -4 19c-3 7 -7 13 -12 19c-12 14 -26 22 -44 22c-27 0 -50 -13 -50 -37c0 -21 11 -44 34 -66zM175 62c0 17 -9 26 -19 42c-1 1 -3 4 -7 8c-16 16 -32 33 -48 50l-25 -17l-18 -16l-12 -21c-3 -7 -4 -17 -4 -28c0 -17 8 -32 23 -45 l24 -12c7 -3 16 -4 26 -4c21 0 35 5 46 12c9 6 15 14 15 25z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E889.xml b/data/Leipzig/E889.xml
new file mode 100644
index 00000000000..e7c80c89114
--- /dev/null
+++ b/data/Leipzig/E889.xml
@@ -0,0 +1 @@
+<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M131 326c61 0 94 -45 94 -111c0 -25 -4 -47 -11 -69s-18 -44 -32 -66c-32 -48 -70 -81 -120 -81c-32 0 -60 25 -62 60v8c4 13 13 22 27 22c7 0 13 -3 18 -8c3 -1 6 -8 8 -19c-2 -8 -5 -20 -5 -29c0 -8 3 -14 13 -14c20 0 40 18 61 54l14 35c5 9 12 34 15 44l-24 -13 l-13 -8c-13 -5 -21 -8 -37 -8c-43 0 -69 29 -69 72c0 33 11 63 32 90s52 41 91 41zM167 264c0 22 -9 38 -27 43c-21 0 -38 -12 -52 -36s-21 -48 -22 -71c0 -29 6 -43 31 -48h4c25 0 51 40 60 72c3 12 5 25 6 40z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E88A.xml b/data/Leipzig/E88A.xml
new file mode 100644
index 00000000000..4a16a6ef462
--- /dev/null
+++ b/data/Leipzig/E88A.xml
@@ -0,0 +1 @@
+<symbol id="E88A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M17 87c0 11 3 19 10 26s16 10 27 10s19 -3 26 -10s11 -16 11 -26s-4 -19 -11 -27c-7 -7 -17 -10 -27 -10s-19 3 -26 10s-10 16 -10 27zM53 207c0 11 4 20 11 27s17 10 27 10s19 -4 26 -11s10 -16 10 -26s-4 -19 -11 -26s-16 -10 -26 -10s-19 3 -26 10s-11 15 -11 26z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E901.xml b/data/Leipzig/E901.xml
new file mode 100644
index 00000000000..e0bfb1499be
--- /dev/null
+++ b/data/Leipzig/E901.xml
@@ -0,0 +1 @@
+<symbol id="E901" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M144 488c30 28 83 110 83 176c0 77 -39 150 -104 150c-15 0 -33 -6 -61 -34c-15 -15 -23 -44 -23 -79c0 -44 14 -96 43 -133c23 -29 44 -58 62 -80zM159 69c-57 0 -104 -31 -104 -98c0 -61 35 -63 51 -75c8 0 23 52 39 92l32 80c-6 1 -12 1 -18 1zM256 -25 c0 -76 -24 -122 -98 -122h-3c-28 0 -66 7 -84 15c-38 17 -71 55 -71 112c0 55 56 114 124 123c25 3 49 8 61 8c12 33 26 89 26 128c0 104 -55 180 -76 211c-51 -65 -79 -110 -90 -178c-1 -6 -4 -25 -4 -46c0 -18 2 -38 10 -50c5 -7 7 -16 7 -24c0 -13 -6 -24 -15 -24 c-5 0 -12 5 -19 17c-12 21 -24 38 -24 96c0 77 23 115 54 151c38 44 26 28 65 68l1 -1c0 3 -16 27 -60 79c-19 22 -58 58 -58 145c0 76 30 100 53 123c25 25 57 38 102 38c62 0 110 -83 110 -168c0 -13 -2 -26 -4 -39c-10 -52 -83 -130 -111 -163c24 -38 8 -3 55 -91 c34 -63 42 -84 42 -119c0 -10 -1 -22 -2 -37c-4 -63 -11 -76 -20 -116c7 0 12 1 21 -1c14 -4 20 -11 20 -19c0 -19 -30 -19 -52 -24c-6 -13 -67 -174 -67 -181c0 -2 9 -4 19 -4c25 0 41 21 56 73c8 28 14 39 22 39s10 -8 10 -19z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E902.xml b/data/Leipzig/E902.xml
new file mode 100644
index 00000000000..815229be60e
--- /dev/null
+++ b/data/Leipzig/E902.xml
@@ -0,0 +1 @@
+<symbol id="E902" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 -131c0 -21 -3 -36 -10 -46c-11 -17 -33 -25 -64 -25c-47 0 -77 9 -91 28c-11 15 -17 47 -17 94v43c0 13 0 26 1 37v41c0 13 0 26 -1 39c0 48 5 79 16 94c14 19 45 28 92 28c32 0 53 -8 64 -24c7 -10 10 -26 10 -47c0 -28 -9 -47 -26 -58c-13 -8 -33 -12 -58 -12h-23 c-7 0 -14 0 -21 1c-17 0 -26 -4 -26 -11v-51v-51c0 -8 8 -12 24 -12c4 0 11 0 22 1s19 1 25 1c25 0 44 -4 56 -11c18 -11 27 -30 27 -59zM-33 -230l-1 9l-1 94v51c0 7 -9 11 -26 11c-7 -1 -14 -1 -21 -1h-23c-21 0 -46 -13 -61 -13c-3 0 -6 1 -8 2c-14 8 -15 37 -15 62v19 c0 21 3 37 10 47c11 16 32 24 64 24c47 0 78 -9 92 -28c11 -15 16 -46 16 -94c-1 -13 -1 -26 -1 -39v-41c1 -24 1 -36 1 -37l-1 -66c-2 -30 3 -38 -12 -38c-12 0 -12 6 -13 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E904.xml b/data/Leipzig/E904.xml
new file mode 100644
index 00000000000..35f8a2cf18e
--- /dev/null
+++ b/data/Leipzig/E904.xml
@@ -0,0 +1 @@
+<symbol id="E904" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M428 -39l-54 -67l112 -138l52 66zM428 249l-54 -67l112 -138l52 66zM455 325l142 -178l-115 -144l115 -144l-129 -162v-580h-30v585l-127 157l116 144l-116 144zM232 -50v108h-199v-108h199zM266 -808h-34v693h-199v-93h-33v417h33v-86h199v86h34v-1017z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E906.xml b/data/Leipzig/E906.xml
new file mode 100644
index 00000000000..c951658bd94
--- /dev/null
+++ b/data/Leipzig/E906.xml
@@ -0,0 +1 @@
+<symbol id="E906" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 -131c0 -21 -3 -36 -10 -46c-11 -17 -33 -25 -64 -25c-47 0 -77 9 -91 28c-11 15 -17 47 -17 94v43c0 13 0 26 1 37v41c0 13 0 26 -1 39c0 48 5 79 16 94c14 19 45 28 92 28c32 0 53 -8 64 -24c7 -10 10 -26 10 -47c0 -28 -9 -47 -26 -58c-13 -8 -33 -12 -58 -12h-23 c-7 0 -14 0 -21 1c-17 0 -26 -4 -26 -11v-51v-51c0 -8 8 -12 24 -12c4 0 11 0 22 1s19 1 25 1c25 0 44 -4 56 -11c18 -11 27 -30 27 -59z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E907.xml b/data/Leipzig/E907.xml
new file mode 100644
index 00000000000..397dec58f1a
--- /dev/null
+++ b/data/Leipzig/E907.xml
@@ -0,0 +1 @@
+<symbol id="E907" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 206l2 431c0 12 7 17 14 17c8 0 17 -7 17 -17l3 -204l2 -315h79h8c11 0 30 1 35 6c8 8 8 139 8 192v27l4 222s-1 20 19 20s12 -20 12 -20v-244s-1 -200 -1 -246c-1 -8 -1 -12 -4 -19c-7 -7 -8 -7 -16 -7c-45 0 -71 3 -71 3l-69 -3v-49v-48l64 -3l82 -5s5 0 8 -3 s5 -7 5 -7l1 -62v-154s0 -20 -13 -20c-10 0 -14 5 -16 14l-7 138l-2 19s0 4 -3 7s-9 2 -9 2h-40h-70l-3 -28l-3 -132s0 -20 -15 -20c-17 0 -19 17 -19 17c-1 22 -3 96 -3 336c0 49 1 100 1 155z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E908.xml b/data/Leipzig/E908.xml
new file mode 100644
index 00000000000..f20df3799bd
--- /dev/null
+++ b/data/Leipzig/E908.xml
@@ -0,0 +1 @@
+<symbol id="E908" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 206l2 431c0 12 7 17 14 17c8 0 17 -7 17 -17l3 -204l2 -315h79h8c11 0 30 1 35 6c8 8 8 119 8 172v27l4 222s-1 20 19 20s12 -20 12 -20v-244s-1 -180 -1 -226c-1 -8 -1 -12 -4 -19c-7 -7 -8 -7 -16 -7c-45 0 -71 3 -71 3l-69 -3v-49v-48l64 -3l82 -5s5 0 8 -3 s5 -7 5 -7l1 -152v-154s0 -20 -13 -20c-10 0 -14 5 -16 14l-7 138l-2 109s0 4 -3 7s-9 2 -9 2h-40h-70l-3 -118l-3 -132s0 -20 -15 -20c-17 0 -19 17 -19 17c-1 22 -3 186 -3 426c0 49 1 100 1 155z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E909.xml b/data/Leipzig/E909.xml
new file mode 100644
index 00000000000..373ce47a94d
--- /dev/null
+++ b/data/Leipzig/E909.xml
@@ -0,0 +1 @@
+<symbol id="E909" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 206l2 431c0 12 7 17 14 17c8 0 17 -7 17 -17l3 -204l2 -315h79h8c11 0 30 1 35 6c8 8 8 69 8 122v27l4 222s-1 20 19 20s12 -20 12 -20v-244s-1 -130 -1 -176c-1 -8 -1 -12 -4 -19c-7 -7 -8 -7 -16 -7c-45 0 -71 3 -71 3l-69 -3v-49v-48l64 -3l82 -5s5 0 8 -3 s5 -7 5 -7l1 -262v-154s0 -20 -13 -20c-10 0 -14 5 -16 14l-7 138l-2 219s0 4 -3 7s-9 2 -9 2h-40h-70l-3 -378l-3 -132s0 -20 -15 -20c-17 0 -19 17 -19 17c-1 22 -3 446 -3 686c0 49 1 100 1 155z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E90A.xml b/data/Leipzig/E90A.xml
new file mode 100644
index 00000000000..5156616fdb5
--- /dev/null
+++ b/data/Leipzig/E90A.xml
@@ -0,0 +1 @@
+<symbol id="E90A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -206c0 55 -1 106 -1 155c0 240 2 404 3 426c0 0 2 17 19 17c15 0 15 -20 15 -20l3 -132l3 -118h70h40s6 -1 9 2s3 7 3 7l2 109l7 138c2 9 6 14 16 14c13 0 13 -20 13 -20v-154l-1 -152s-2 -4 -5 -7s-8 -3 -8 -3l-82 -5l-64 -3v-48v-49l69 -3s26 3 71 3c8 0 9 0 16 -7 c3 -7 3 -11 4 -19c0 -46 1 -226 1 -226v-244s8 -20 -12 -20s-19 20 -19 20l-4 222v27c0 53 0 164 -8 172c-5 5 -24 6 -35 6h-8h-79l-2 -315l-3 -204c0 -10 -9 -17 -17 -17c-7 0 -14 5 -14 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E90B.xml b/data/Leipzig/E90B.xml
new file mode 100644
index 00000000000..e30952a0b01
--- /dev/null
+++ b/data/Leipzig/E90B.xml
@@ -0,0 +1 @@
+<symbol id="E90B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -206c0 55 -1 106 -1 155c0 240 2 314 3 336c0 0 2 17 19 17c15 0 15 -20 15 -20l3 -135l3 -25h70h40s6 -1 9 2s3 7 3 7l2 16l7 141c2 9 6 14 16 14c13 0 13 -20 13 -20v-154l-1 -62s-2 -4 -5 -7s-8 -3 -8 -3l-82 -5l-64 -3v-48v-49l69 -3s26 3 71 3c8 0 9 0 16 -7 c3 -7 3 -11 4 -19c0 -46 1 -246 1 -246v-244s8 -20 -12 -20s-19 20 -19 20l-4 222v27c0 53 0 184 -8 192c-5 5 -24 6 -35 6h-8h-79l-2 -315l-3 -204c0 -10 -9 -17 -17 -17c-7 0 -14 5 -14 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E910.xml b/data/Leipzig/E910.xml
new file mode 100644
index 00000000000..e487461dab4
--- /dev/null
+++ b/data/Leipzig/E910.xml
@@ -0,0 +1 @@
+<symbol id="E910" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M177 0c0 35 28 63 63 63s63 -28 63 -63s-28 -63 -63 -63s-63 28 -63 63zM36 0c0 -113 91 -204 204 -204s204 91 204 204s-91 204 -204 204s-204 -91 -204 -204zM0 0c0 132 108 240 240 240s240 -108 240 -240s-108 -240 -240 -240s-240 108 -240 240z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E911.xml b/data/Leipzig/E911.xml
new file mode 100644
index 00000000000..89f2d4c91fd
--- /dev/null
+++ b/data/Leipzig/E911.xml
@@ -0,0 +1 @@
+<symbol id="E911" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 0c0 -113 91 -204 204 -204s204 91 204 204s-91 204 -204 204s-204 -91 -204 -204zM0 0c0 132 108 240 240 240s240 -108 240 -240s-108 -240 -240 -240s-240 108 -240 240z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E912.xml b/data/Leipzig/E912.xml
new file mode 100644
index 00000000000..dbdd2bd5d1f
--- /dev/null
+++ b/data/Leipzig/E912.xml
@@ -0,0 +1 @@
+<symbol id="E912" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 408h36v-169c124 -9 222 -113 222 -239s-98 -230 -222 -239v-169h-36v169c-124 9 -222 113 -222 239s98 230 222 239v169zM222 -203v406c-105 -9 -186 -96 -186 -203s81 -194 186 -203zM258 -203c105 9 186 96 186 203s-81 194 -186 203v-406z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E913.xml b/data/Leipzig/E913.xml
new file mode 100644
index 00000000000..0762770e86f
--- /dev/null
+++ b/data/Leipzig/E913.xml
@@ -0,0 +1 @@
+<symbol id="E913" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 408h36v-169c124 -9 222 -113 222 -239s-98 -230 -222 -239v-169h-36v169c-124 9 -222 113 -222 239s98 230 222 239v169zM258 60c26 -7 45 -31 45 -60s-19 -53 -45 -60v-143c105 9 186 96 186 203s-81 194 -186 203v-143zM222 -60c-26 7 -45 31 -45 60s19 53 45 60 v143c-105 -9 -186 -96 -186 -203s81 -194 186 -203v143z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E914.xml b/data/Leipzig/E914.xml
new file mode 100644
index 00000000000..88632803b14
--- /dev/null
+++ b/data/Leipzig/E914.xml
@@ -0,0 +1 @@
+<symbol id="E914" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M421 96c-46 77 -101 108 -181 108c-113 0 -204 -91 -204 -204s91 -204 204 -204c78 0 129 34 177 110c13 -8 15 -10 15 -10l-3 1s4 -2 21 -13c-41 -74 -120 -124 -210 -124c-132 0 -240 108 -240 240s108 240 240 240c89 0 163 -45 209 -122c-16 -13 -9 -8 -28 -22z M177 0c0 35 28 63 63 63s63 -28 63 -63s-28 -63 -63 -63s-63 28 -63 63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E915.xml b/data/Leipzig/E915.xml
new file mode 100644
index 00000000000..b23cd310075
--- /dev/null
+++ b/data/Leipzig/E915.xml
@@ -0,0 +1 @@
+<symbol id="E915" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M421 96c-46 77 -101 108 -181 108c-113 0 -204 -91 -204 -204s91 -204 204 -204c78 0 129 34 177 110c13 -8 15 -10 15 -10l-3 1s4 -2 21 -13c-41 -74 -120 -124 -210 -124c-132 0 -240 108 -240 240s108 240 240 240c89 0 163 -45 209 -122c-16 -13 -9 -8 -28 -22z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E916.xml b/data/Leipzig/E916.xml
new file mode 100644
index 00000000000..7207a76ba6f
--- /dev/null
+++ b/data/Leipzig/E916.xml
@@ -0,0 +1 @@
+<symbol id="E916" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M59 96c-19 14 -12 9 -28 22c46 77 120 122 209 122c132 0 240 -108 240 -240s-108 -240 -240 -240c-90 0 -169 50 -210 124c17 11 21 13 21 13l-3 -1s2 2 15 10c48 -76 99 -110 177 -110c113 0 204 91 204 204s-91 204 -204 204c-80 0 -135 -31 -181 -108z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E917.xml b/data/Leipzig/E917.xml
new file mode 100644
index 00000000000..d153ffdeb24
--- /dev/null
+++ b/data/Leipzig/E917.xml
@@ -0,0 +1 @@
+<symbol id="E917" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 60v143c-105 -9 -186 -96 -186 -203s81 -194 186 -203v143c-26 7 -45 31 -45 60s19 53 45 60zM222 408h36v-169c81 -5 148 -49 191 -121c-16 -13 -9 -8 -28 -22c-42 71 -93 103 -163 107v-143c26 -7 45 -31 45 -60s-19 -53 -45 -60v-143c68 5 115 39 159 109l12 -9 s4 -2 21 -13c-39 -69 -110 -117 -192 -123v-169h-36v169c-124 9 -222 113 -222 239s98 230 222 239v169z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E918.xml b/data/Leipzig/E918.xml
new file mode 100644
index 00000000000..62f813dc12c
--- /dev/null
+++ b/data/Leipzig/E918.xml
@@ -0,0 +1 @@
+<symbol id="E918" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M222 408h36v-169c81 -5 148 -49 191 -121c-16 -13 -9 -8 -28 -22c-42 71 -93 103 -163 107v-406c68 5 115 39 159 109l12 -9s4 -3 21 -13c-39 -69 -110 -117 -192 -123v-169h-36v169c-124 9 -222 113 -222 239s98 230 222 239v169zM222 -203v406 c-105 -9 -186 -96 -186 -203s81 -194 186 -203z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E919.xml b/data/Leipzig/E919.xml
new file mode 100644
index 00000000000..553672f8793
--- /dev/null
+++ b/data/Leipzig/E919.xml
@@ -0,0 +1 @@
+<symbol id="E919" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M59 96c-19 14 -12 9 -28 22c43 72 110 116 191 121v169h36v-169c124 -9 222 -113 222 -239s-98 -230 -222 -239v-169h-36v169c-82 6 -153 54 -192 123c17 10 21 13 21 13l12 9c44 -70 91 -104 159 -109v406c-70 -4 -121 -36 -163 -107zM258 -203c105 9 186 96 186 203 s-81 194 -186 203v-406z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91A.xml b/data/Leipzig/E91A.xml
new file mode 100644
index 00000000000..80d9bdd1a46
--- /dev/null
+++ b/data/Leipzig/E91A.xml
@@ -0,0 +1 @@
+<symbol id="E91A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M177 0c0 35 28 63 63 63s63 -28 63 -63s-28 -63 -63 -63s-63 28 -63 63zM59 96c-19 14 -12 9 -28 22c46 77 120 122 209 122c132 0 240 -108 240 -240s-108 -240 -240 -240c-90 0 -169 50 -210 124c17 11 21 13 21 13l12 9c48 -76 99 -110 177 -110c113 0 204 91 204 204 s-91 204 -204 204c-80 0 -135 -31 -181 -108z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91B.xml b/data/Leipzig/E91B.xml
new file mode 100644
index 00000000000..f81158cbf92
--- /dev/null
+++ b/data/Leipzig/E91B.xml
@@ -0,0 +1 @@
+<symbol id="E91B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M480 266l26 -26l-84 -84c36 -42 58 -96 58 -156c0 -132 -108 -240 -240 -240c-60 0 -114 22 -156 58l-84 -84l-26 26l84 84c-36 42 -58 96 -58 156c0 132 108 240 240 240c60 0 114 -22 156 -58zM397 131l-288 -288c35 -29 81 -47 131 -47c113 0 204 91 204 204 c0 50 -18 96 -47 131zM371 157c-35 29 -81 47 -131 47c-113 0 -204 -91 -204 -204c0 -50 18 -96 47 -131z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91C.xml b/data/Leipzig/E91C.xml
new file mode 100644
index 00000000000..e66bdd0a9f2
--- /dev/null
+++ b/data/Leipzig/E91C.xml
@@ -0,0 +1 @@
+<symbol id="E91C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M550 18v-36h-71c-9 -124 -113 -222 -239 -222s-230 98 -239 222h-76v36h76c9 124 113 222 239 222s230 -98 239 -222h71zM443 18c-9 105 -96 186 -203 186s-194 -81 -203 -186h406zM37 -18c9 -105 96 -186 203 -186s194 81 203 186h-406z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91D.xml b/data/Leipzig/E91D.xml
new file mode 100644
index 00000000000..231bbd96bff
--- /dev/null
+++ b/data/Leipzig/E91D.xml
@@ -0,0 +1 @@
+<symbol id="E91D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M480 266l26 -26l-84 -84c10 -12 19 -25 27 -38c-16 -13 -9 -8 -28 -22c-8 13 -16 25 -24 35l-288 -288c35 -29 81 -47 131 -47c78 0 129 34 177 110c17 -12 4 -3 33 -22c-41 -74 -120 -124 -210 -124c-60 0 -114 22 -156 58l-84 -84l-26 26l84 84c-36 42 -58 96 -58 156 c0 132 108 240 240 240c61 0 114 -21 156 -58zM83 -131l289 289c-36 32 -78 46 -132 46c-113 0 -204 -91 -204 -204c0 -50 18 -96 47 -131z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91E.xml b/data/Leipzig/E91E.xml
new file mode 100644
index 00000000000..8f6df2785e3
--- /dev/null
+++ b/data/Leipzig/E91E.xml
@@ -0,0 +1 @@
+<symbol id="E91E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M177 0c0 35 28 63 63 63c11 0 21 -3 30 -8l102 103c-36 32 -78 46 -132 46c-113 0 -204 -91 -204 -204c0 -50 18 -96 47 -131l102 101c-5 9 -8 19 -8 30zM480 266l26 -26l-84 -84c10 -12 19 -25 27 -38c-16 -13 -9 -8 -28 -22c-8 13 -16 25 -24 35l-102 -101 c5 -9 8 -19 8 -30c0 -35 -28 -63 -63 -63c-11 0 -21 3 -30 8l-101 -102c35 -29 81 -47 131 -47c78 0 129 34 177 110l12 -9s4 -3 21 -13c-41 -74 -120 -124 -210 -124c-60 0 -114 22 -156 58l-84 -84l-26 26l84 84c-36 42 -58 96 -58 156c0 132 108 240 240 240 c61 0 114 -21 156 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E91F.xml b/data/Leipzig/E91F.xml
new file mode 100644
index 00000000000..5a390be6151
--- /dev/null
+++ b/data/Leipzig/E91F.xml
@@ -0,0 +1 @@
+<symbol id="E91F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M59 96c-19 14 -12 9 -28 22c46 77 120 122 209 122c60 0 114 -22 156 -58l84 84l26 -26l-84 -84c36 -42 58 -96 58 -156c0 -132 -108 -240 -240 -240c-60 0 -114 22 -156 58l-84 -84l-26 26l84 84c-10 12 -20 25 -28 40c18 11 21 13 21 13l12 9c8 -12 16 -24 24 -34 l284 285c-35 29 -81 47 -131 47c-80 0 -135 -31 -181 -108zM111 -154c36 -34 76 -50 129 -50c113 0 204 91 204 204c0 50 -18 96 -47 131z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E920.xml b/data/Leipzig/E920.xml
new file mode 100644
index 00000000000..98101a350c1
--- /dev/null
+++ b/data/Leipzig/E920.xml
@@ -0,0 +1 @@
+<symbol id="E920" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c0 35 28 63 63 63s63 -28 63 -63s-28 -63 -63 -63s-63 28 -63 63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E921.xml b/data/Leipzig/E921.xml
new file mode 100644
index 00000000000..cc54baa70af
--- /dev/null
+++ b/data/Leipzig/E921.xml
@@ -0,0 +1 @@
+<symbol id="E921" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M94 0c0 -26 -22 -47 -48 -47s-46 21 -46 47s20 46 46 46s48 -20 48 -46zM223 0c0 -26 -21 -47 -47 -47s-47 21 -47 47s21 46 47 46s47 -20 47 -46z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E922.xml b/data/Leipzig/E922.xml
new file mode 100644
index 00000000000..6b8e7e7b828
--- /dev/null
+++ b/data/Leipzig/E922.xml
@@ -0,0 +1 @@
+<symbol id="E922" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 -0c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 39 40 39s40 -17 40 -39zM292 0c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 40 40 40s40 -18 40 -40zM186 0c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 40 40 40s40 -18 40 -40z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E923.xml b/data/Leipzig/E923.xml
new file mode 100644
index 00000000000..3d160858ad0
--- /dev/null
+++ b/data/Leipzig/E923.xml
@@ -0,0 +1 @@
+<symbol id="E923" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 48c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 39 40 39s40 -17 40 -39zM139 -48c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 40 40 40s40 -18 40 -40zM196 48c0 -22 -18 -40 -40 -40s-40 18 -40 40s18 40 40 40s40 -18 40 -40z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E924.xml b/data/Leipzig/E924.xml
new file mode 100644
index 00000000000..77f8d2865b0
--- /dev/null
+++ b/data/Leipzig/E924.xml
@@ -0,0 +1 @@
+<symbol id="E924" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 0c0 -60 48 -108 108 -108s107 48 107 108s-47 108 -107 108s-108 -48 -108 -108zM0 0c0 72 59 131 132 131s132 -59 132 -131s-59 -131 -132 -131s-132 59 -132 131z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E925.xml b/data/Leipzig/E925.xml
new file mode 100644
index 00000000000..b0314b3b3d8
--- /dev/null
+++ b/data/Leipzig/E925.xml
@@ -0,0 +1 @@
+<symbol id="E925" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 408h36v-816h-36v816z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E938.xml b/data/Leipzig/E938.xml
new file mode 100644
index 00000000000..31a69a81465
--- /dev/null
+++ b/data/Leipzig/E938.xml
@@ -0,0 +1 @@
+<symbol id="E938" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 194l157 -194l-157 -192l-155 192z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E939.xml b/data/Leipzig/E939.xml
new file mode 100644
index 00000000000..6278217d8c5
--- /dev/null
+++ b/data/Leipzig/E939.xml
@@ -0,0 +1 @@
+<symbol id="E939" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 194l157 -194l-157 -192l-155 192zM125 111l-57 -73l122 -149l56 71z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E93C.xml b/data/Leipzig/E93C.xml
new file mode 100644
index 00000000000..6ef5785af61
--- /dev/null
+++ b/data/Leipzig/E93C.xml
@@ -0,0 +1 @@
+<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 194l157 -194l-157 -192l-155 192zM125 111l-57 -73l122 -149l56 71z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E93D.xml b/data/Leipzig/E93D.xml
new file mode 100644
index 00000000000..09e015d1ea8
--- /dev/null
+++ b/data/Leipzig/E93D.xml
@@ -0,0 +1 @@
+<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 194l157 -194l-157 -192l-155 192z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E93E.xml b/data/Leipzig/E93E.xml
new file mode 100644
index 00000000000..2b5001d6ec2
--- /dev/null
+++ b/data/Leipzig/E93E.xml
@@ -0,0 +1 @@
+<symbol id="E93E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 760h30v-760h-30v760z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E93F.xml b/data/Leipzig/E93F.xml
new file mode 100644
index 00000000000..f490619595d
--- /dev/null
+++ b/data/Leipzig/E93F.xml
@@ -0,0 +1 @@
+<symbol id="E93F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -760v760h30v-760h-30z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E949.xml b/data/Leipzig/E949.xml
new file mode 100644
index 00000000000..37463dcdae5
--- /dev/null
+++ b/data/Leipzig/E949.xml
@@ -0,0 +1 @@
+<symbol id="E949" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 716v-716h-30v760h30l156 -227h-30z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E94A.xml b/data/Leipzig/E94A.xml
new file mode 100644
index 00000000000..ca0c5b339ec
--- /dev/null
+++ b/data/Leipzig/E94A.xml
@@ -0,0 +1 @@
+<symbol id="E94A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M28 -760h-6h-22v760h30v-715l126 182h30z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E94B.xml b/data/Leipzig/E94B.xml
new file mode 100644
index 00000000000..6aa3681ec1f
--- /dev/null
+++ b/data/Leipzig/E94B.xml
@@ -0,0 +1 @@
+<symbol id="E94B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 716v-73l156 -227h-30l-126 183v-599h-30v643v117h30l156 -227h-30z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E94C.xml b/data/Leipzig/E94C.xml
new file mode 100644
index 00000000000..ca0d33b793c
--- /dev/null
+++ b/data/Leipzig/E94C.xml
@@ -0,0 +1 @@
+<symbol id="E94C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 -760h-30v117v10v633h30v-593l126 177h30l-156 -227v-73l125 186h31z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9E0.xml b/data/Leipzig/E9E0.xml
new file mode 100644
index 00000000000..527eada372e
--- /dev/null
+++ b/data/Leipzig/E9E0.xml
@@ -0,0 +1 @@
+<symbol id="E9E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -49v426c0 13 2 36 18 36c12 -1 12 -18 12 -39c0 -20 -3 -362 -3 -362c0 -3 2 -9 11 -18c28 -33 74 -65 120 -65c6 0 28 2 28 35c0 37 -44 69 -76 86l-42 24s-9 1 -9 27v35c0 3 1 9 14 9c14 -1 50 -6 83 -26c32 -22 61 -38 61 -71v-185c0 -1 -14 -3 -26 -3h-2 c-20 0 -110 1 -171 60c0 0 -11 8 -18 31z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9E1.xml b/data/Leipzig/E9E1.xml
new file mode 100644
index 00000000000..212b0445a9e
--- /dev/null
+++ b/data/Leipzig/E9E1.xml
@@ -0,0 +1 @@
+<symbol id="E9E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M12 -140c-9 0 -12 5 -12 14v534c-0 8 2 12 9 12h18c5 0 9 -4 9 -12v-268h141c7 0 9 -4 9 -12v-256c0 -7 -3 -12 -12 -12h-162zM36 -75h114v150h-114v-150z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9E2.xml b/data/Leipzig/E9E2.xml
new file mode 100644
index 00000000000..dcd8b9f082e
--- /dev/null
+++ b/data/Leipzig/E9E2.xml
@@ -0,0 +1 @@
+<symbol id="E9E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -118c-6 2 -8 4 -10 10v359c4 1 8 2 10 2c4 0 8 -1 13 -2v-148c46 9 60 11 72 11c4 0 6 -4 7 -7v-355c0 -4 -3 -6 -7 -6c-1 0 -6 1 -14 4c1 2 1 34 1 99v45zM22 49c-1 0 -1 -37 -1 -111l63 10v111z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9E3.xml b/data/Leipzig/E9E3.xml
new file mode 100644
index 00000000000..9e39248eba4
--- /dev/null
+++ b/data/Leipzig/E9E3.xml
@@ -0,0 +1 @@
+<symbol id="E9E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -112c0 4 0 10 3 13l83 99l-83 100c-2 3 -3 10 -3 14c0 6 3 10 8 10c2 0 5 0 6 -1l86 -105l31 37l-38 45c-2 3 -11 15 -11 19c0 6 11 5 16 5c2 0 5 0 6 -1l42 -51l42 51c1 1 4 1 5 1c4 0 16 1 16 -7c0 -4 -8 -15 -10 -17l-38 -46l29 -36l88 105c1 1 4 1 5 1 c4 0 9 -3 9 -11c0 -4 -1 -11 -3 -13l-83 -100l83 -99c2 -3 3 -9 3 -14c0 -6 -3 -11 -9 -11c-1 0 -4 0 -5 2l-88 105l-30 -36l39 -46c6 -8 10 -15 10 -20c0 -6 -10 -5 -16 -5c-1 0 -4 0 -5 2l-42 51l-42 -51c-1 -2 -3 -2 -5 -2c-6 0 -16 -1 -16 7c0 4 3 10 10 18l38 45 l-31 37l-86 -105c-1 -2 -3 -2 -5 -2c-6 0 -9 4 -9 12zM146 36l-30 -36l30 -36l30 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F0.xml b/data/Leipzig/E9F0.xml
new file mode 100644
index 00000000000..e094eef8d97
--- /dev/null
+++ b/data/Leipzig/E9F0.xml
@@ -0,0 +1 @@
+<symbol id="E9F0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 500h40v-1000h-40v1000zM90 500h40v-1000h-40v1000z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F1.xml b/data/Leipzig/E9F1.xml
new file mode 100644
index 00000000000..32a5439751e
--- /dev/null
+++ b/data/Leipzig/E9F1.xml
@@ -0,0 +1 @@
+<symbol id="E9F1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 500h40v-1000h-40v1000z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F2.xml b/data/Leipzig/E9F2.xml
new file mode 100644
index 00000000000..c7300e27501
--- /dev/null
+++ b/data/Leipzig/E9F2.xml
@@ -0,0 +1 @@
+<symbol id="E9F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 250h40v-500h-40v500z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F3.xml b/data/Leipzig/E9F3.xml
new file mode 100644
index 00000000000..d6e01e57a34
--- /dev/null
+++ b/data/Leipzig/E9F3.xml
@@ -0,0 +1 @@
+<symbol id="E9F3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 250h40v-250h-40v250z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F4.xml b/data/Leipzig/E9F4.xml
new file mode 100644
index 00000000000..bb517789db4
--- /dev/null
+++ b/data/Leipzig/E9F4.xml
@@ -0,0 +1 @@
+<symbol id="E9F4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 250h40v-140h-40v140z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F5.xml b/data/Leipzig/E9F5.xml
new file mode 100644
index 00000000000..9298016c768
--- /dev/null
+++ b/data/Leipzig/E9F5.xml
@@ -0,0 +1 @@
+<symbol id="E9F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 140h40v-140h-40v140z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F6.xml b/data/Leipzig/E9F6.xml
new file mode 100644
index 00000000000..367c02b7ed7
--- /dev/null
+++ b/data/Leipzig/E9F6.xml
@@ -0,0 +1 @@
+<symbol id="E9F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M40 96v-96h-40v140h40l78 -69h-48z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F7.xml b/data/Leipzig/E9F7.xml
new file mode 100644
index 00000000000..8adab3301b8
--- /dev/null
+++ b/data/Leipzig/E9F7.xml
@@ -0,0 +1 @@
+<symbol id="E9F7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M78 96l-30 -25h-48l78 69h40v-140h-40v96z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E9F8.xml b/data/Leipzig/E9F8.xml
new file mode 100644
index 00000000000..310a999727e
--- /dev/null
+++ b/data/Leipzig/E9F8.xml
@@ -0,0 +1 @@
+<symbol id="E9F8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M78 96l-30 -25h-48l78 69h40v-140h-40v39l-30 -25h-48l78 69v13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EA02.xml b/data/Leipzig/EA02.xml
new file mode 100644
index 00000000000..b87d21b6494
--- /dev/null
+++ b/data/Leipzig/EA02.xml
@@ -0,0 +1 @@
+<symbol id="EA02" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 240c7 0 10 -4 12 -6l106 -93l17 -10l11 6l80 93l18 10h1c5 0 9 -2 12 -6l105 -93c5 -4 10 -8 16 -12c199 199 268 265 284 265c4 0 12 -6 12 -10c0 -16 -93 -126 -337 -369l-6 -7c-9 -7 -16 -10 -20 -10h-1c-3 0 -7 2 -10 6l-105 94c-6 5 -12 7 -19 7 c-4 0 -7 -1 -9 -3l-81 -94c-7 -7 -14 -10 -19 -10h-1c-3 0 -7 2 -10 6v1l-104 93c-6 6 -33 29 -50 39c0 16 98 103 98 103z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EA06.xml b/data/Leipzig/EA06.xml
new file mode 100644
index 00000000000..ca3b354a372
--- /dev/null
+++ b/data/Leipzig/EA06.xml
@@ -0,0 +1 @@
+<symbol id="EA06" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M50 311c0 2 3 3 7 3c3 0 7 -1 7 -3v-384c0 -16 0 -23 -9 -23c-28 0 -55 25 -55 40v152c3 0 25 -19 40 -19c7 0 10 1 10 25v209z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAA4.xml b/data/Leipzig/EAA4.xml
new file mode 100644
index 00000000000..34e8a5af208
--- /dev/null
+++ b/data/Leipzig/EAA4.xml
@@ -0,0 +1 @@
+<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44c-20 20 -12 36 0 24s22 -20 38 -20s70 64 86 64s42 -12 74 -44c20 -20 12 -36 0 -24s-22 20 -38 20s-70 -64 -86 -64s-42 12 -74 44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAA9.xml b/data/Leipzig/EAA9.xml
new file mode 100644
index 00000000000..ee5e137b2fd
--- /dev/null
+++ b/data/Leipzig/EAA9.xml
@@ -0,0 +1 @@
+<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44c-12 0 -4 17 0 24c32 32 48 44 64 44c35 0 66 -64 96 -64c10 0 25 9 38 20c12 0 4 -17 0 -24c-32 -32 -48 -44 -64 -44c-35 0 -66 64 -96 64c-10 0 -25 -9 -38 -20z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAAA.xml b/data/Leipzig/EAAA.xml
new file mode 100644
index 00000000000..e2fbc324f28
--- /dev/null
+++ b/data/Leipzig/EAAA.xml
@@ -0,0 +1 @@
+<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44c-4 7 -12 24 0 24c13 -11 28 -20 38 -20c30 0 61 64 96 64c16 0 32 -12 64 -44c4 -7 12 -24 0 -24c-13 11 -28 20 -38 20c-30 0 -61 -64 -96 -64c-16 0 -32 12 -64 44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAAD.xml b/data/Leipzig/EAAD.xml
new file mode 100644
index 00000000000..7fb1ebeedd3
--- /dev/null
+++ b/data/Leipzig/EAAD.xml
@@ -0,0 +1 @@
+<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44v24c32 32 48 44 64 44c35 0 66 -64 96 -64c10 0 24 8 37 19l-23 89l196 -100l-196 -100l22 86c-31 -31 -46 -42 -62 -42c-35 0 -66 64 -96 64c-10 0 -25 -9 -38 -20z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAAE.xml b/data/Leipzig/EAAE.xml
new file mode 100644
index 00000000000..da7a371cdac
--- /dev/null
+++ b/data/Leipzig/EAAE.xml
@@ -0,0 +1 @@
+<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 56l196 100l-23 -89c13 -10 27 -19 37 -19c30 0 61 64 96 64c16 0 32 -12 64 -44v-24c-13 11 -28 20 -38 20c-30 0 -61 -64 -96 -64c-16 0 -31 12 -62 42l22 -86z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EAAF.xml b/data/Leipzig/EAAF.xml
new file mode 100644
index 00000000000..e7ceac70f3e
--- /dev/null
+++ b/data/Leipzig/EAAF.xml
@@ -0,0 +1 @@
+<symbol id="EAAF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 44c-17 -5 -6 17 0 24c32 32 58 44 74 44c45 0 46 -64 76 -64c10 0 26 0 48 20c17 5 5 -17 0 -24c-32 -32 -58 -44 -74 -44c-45 0 -46 64 -76 64c-10 0 -26 0 -48 -20z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA7.xml b/data/Leipzig/EBA7.xml
new file mode 100644
index 00000000000..dca60ece822
--- /dev/null
+++ b/data/Leipzig/EBA7.xml
@@ -0,0 +1 @@
+<symbol id="EBA7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-82 763c12 4 35 8 70 14c38 6 61 10 67 12c7 2 12 2 14 2c7 0 11 -3 13 -9s3 -17 3 -33c0 -23 0 -42 -1 -58c-1 -11 -2.55285 -77.9923 -4 -201c-1 -85 2 -296 2 -335c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -23 496.965 -23 725c0 1 0 6 -1 16 c0 4 -2 5 -5 5c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10c-2 24 -2 37 -2 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA8.xml b/data/Leipzig/EBA8.xml
new file mode 100644
index 00000000000..7c0364f751e
--- /dev/null
+++ b/data/Leipzig/EBA8.xml
@@ -0,0 +1 @@
+<symbol id="EBA8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 1l10 770c0.128549 8.9984 1 15 2 19c2 3 6 5 12 5c0 0 12 -1 36 -4c79 -10 136 -17 172 -24c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5.13456 -104.997 -7 -202 c-2 -104 -9 -378 -20 -529z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA9.xml b/data/Leipzig/EBA9.xml
new file mode 100644
index 00000000000..5af36b72903
--- /dev/null
+++ b/data/Leipzig/EBA9.xml
@@ -0,0 +1 @@
+<symbol id="EBA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0l8 740v36c0 6 3 9 8 9l35 -5l80 -9c37 -5 72 -13 107 -25c46 -15 90 -36 132 -63c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -4.63296 -62.9761 -9 -187 c-5 -142 -8 -371 -11 -396h-44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAA.xml b/data/Leipzig/EBAA.xml
new file mode 100644
index 00000000000..af409240237
--- /dev/null
+++ b/data/Leipzig/EBAA.xml
@@ -0,0 +1 @@
+<symbol id="EBAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M377 435c-10.2893 0 -30 5.49144 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -98 26 -125 26c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c1.65723 -1.6582 2 -7.52637 2 -13v-49c0 -11 2 -20 0 -27c3 0 6 1 9 1c43 0 91 -11 151 -31l99 -34 c44 -13 66 -34 66 -72c0 -11 -3 -26 -6 -42c-2 -2 -4 -3 -6 -3c-4.08008 0 -23.2266 5 -26 5c1 8 4 23 4 29c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31c-11 0 -23 -1 -29 -2c-5 -36 -3.61719 -80.0146 -6 -138c-3 -73 -8 -270 -10 -291h-44l8 740 c0.0216185 1.99971 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c0 0 -27 10.6258 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21c0 -11.5061 -9.94969 -66 -13 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAB.xml b/data/Leipzig/EBAB.xml
new file mode 100644
index 00000000000..9a23398540b
--- /dev/null
+++ b/data/Leipzig/EBAB.xml
@@ -0,0 +1 @@
+<symbol id="EBAB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M392 226v-3c0 -10 -4 -44 -9 -45c-4 0 -28 9 -31 9c1 8 5 25 5 31c0 14 -2 23 -8 27c-13 8 -47 27 -102 43c-68 20 -121 24 -159 24c-8 0 -17 -1 -27 -3c-1 -21 -9.38086 -128.922 -11 -166l-6 -144l-44 1l8 740c0.0429688 4.0127 0 8 0 13c0 0 -1 23 -1 24c0 6 3 9 12 9 s31 -3 63 -10l87 -17c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 20 -128 38l-117 16l1 -82h15c37 0 90 -13 160 -38c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19 c0 -11 -13 -55 -14 -62c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-11c-6 0 -8 -1 -8 -7c0 -14 1 -38 1 -50c0 -10 0 -18 -2 -25h10c44 0 98 -11 160 -36l105 -43c30 -11 45 -26 45 -51c0 -9 -4 -28 -11 -58h-1 c-7 0 -25 9 -29 9c2 10 4 26 5 35c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2v-17v-65v-5c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -33c44.2412 -16.0879 67 -40 67 -79z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAC.xml b/data/Leipzig/EBAC.xml
new file mode 100644
index 00000000000..2779ebc5975
--- /dev/null
+++ b/data/Leipzig/EBAC.xml
@@ -0,0 +1 @@
+<symbol id="EBAC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M52 538v-54v-6h10c41 0 90 -10 150 -32l103 -37c45 -12 66 -35 66 -73c0 -9 -2 -31 -5 -50c-2 -2 -4 -2 -6 -2c-4 0 -22 11 -27 11c1 9 3 26 3 32c0 14 -3 22 -8 25c-15 9 -52 21 -105 38c-68 22 -119 34 -158 34c-12 0 -20 -1 -24 -2l-1 -67c3 0 5 -7 7 -7 c44 0 97 -1 158 -25l101 -40c44 -14 67 -41 67 -79c0 -10 -3 -24 -6 -42c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 3 16 3 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 4 -25 2c-1 -105 -2 -281 -4 -297l-44 1l3 826 c0.0762817 21.0029 -2 27 13 27c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28.7328 9.03846 -28 16c2 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1 c36 0 91 -12 164 -36c81 -27 128 -52 141 -73c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -14 1 -14 -8c0 -2 1 -7 2 -14c0 -6 -3 -14 -2 -19c1.76465 -8.8252 2 -18 -1 -29h9 c44 0 96 -13 163 -40l117 -50c26.8054 -11.4553 40 -25 40 -47c-2 -16 -5 -45 -8 -63c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v40c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 0 -14 0 -20z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC0.xml b/data/Leipzig/EBC0.xml
new file mode 100644
index 00000000000..ca3acb5c219
--- /dev/null
+++ b/data/Leipzig/EBC0.xml
@@ -0,0 +1 @@
+<symbol id="EBC0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M186.601 129c0 1.65039 0.0234375 3.26562 0.0234375 4.90039c0 8.15625 -0.584961 14.7139 -2.22754 16.9033c-4.77539 6.36719 -10.8975 11.5977 -21.5967 11.5977c-12.377 0 -17.1211 -1.43555 -25.8789 -3.82324 c-9.25488 -2.52441 -24.0615 -10.2568 -43.3174 -23.3184c-10.2236 -6.93555 -20.9873 -15.1816 -29.626 -23.8213c-10.8789 -10.8789 -17.7783 -22.0332 -17.7783 -31.2383v-1.12012c0 -7.49512 0.143555 -12.0684 6.31738 -18.2422 c4.60645 -4.60645 11.3818 -8.43848 23.083 -8.43848c22.1777 0 47.5176 0.592773 78.3662 26.8135c3.80664 3.23633 7.25488 6.40918 10.3535 9.50781c15.8418 15.8418 22.2812 29.5859 22.2812 40.2793zM278.999 5c0 -2.68945 -2.30762 -4.99902 -4.99902 -4.99902 h-59.2002c-2.06445 0 -3.94434 1.39648 -4.6416 3.1377c-3.51562 8.78906 -6.69336 23.4072 -9.12109 46.0615c-1.71484 14.2891 -3.94043 25.6143 -6.28516 33.0283c-13.4121 -14.4375 -27.4883 -28.5713 -41.5176 -41.041 c-32.7334 -27.8242 -58.5205 -35.3867 -98.4346 -35.3867c-11.2695 0 -22.5957 1.40918 -34.7012 9.19141c-12.1035 7.78027 -20.6973 26.9805 -20.6973 39.6074c0 36.9863 12.1719 53.3662 16.126 58.9023c1.67383 2.34277 5.18652 6.34961 10.5225 11.6855 c10.6113 10.6113 28.1133 25.9609 49.4111 38.5215c14.291 8.42676 68.5244 31.0898 98.5391 31.0898c4.73828 0 12.2168 -1.59961 16.7998 -1.59961c5.25977 0 32.0234 5.59668 43.9258 8.17871c4.03418 0.875 5.07129 1.4209 7.27441 1.4209 c2.68945 0 4.99902 -2.30762 4.99902 -4.99902v-4c0 -19.7256 -4.7998 -62.0996 -4.7998 -81.5996c0 -44.6494 12.4473 -78.4775 35.5029 -103.84c0.864258 -0.950195 1.29688 -2.15527 1.29688 -3.36035z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC1.xml b/data/Leipzig/EBC1.xml
new file mode 100644
index 00000000000..cf80e8bf4ba
--- /dev/null
+++ b/data/Leipzig/EBC1.xml
@@ -0,0 +1 @@
+<symbol id="EBC1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M116.8 148.001c-16.5664 0 -29.7793 -5.56348 -38.2012 -15.2148v-99.5869h45.4014c13.2275 0 24.3896 6.89258 32.0918 16.5195c0.0771484 0.0966797 0.157227 0.189453 0.242188 0.28125c9.40723 10.1299 13.8672 23.1201 13.8672 39.7998 c0 17.4912 -4.46094 31.2305 -14.5986 42.127c-10.3203 10.291 -23.3682 16.0742 -38.8027 16.0742zM78.5986 277.8c0 -22.3086 -0.799805 -50.1299 -0.799805 -72v-33.4004h10.2012c80.1406 0 138.599 -11.4727 138.599 -88.999 c0 -19.3984 -7.02637 -35.7627 -20.9609 -49.6973c-4.50879 -4.50879 -9.77441 -8.80273 -15.667 -12.8662c-19.6074 -13.0713 -38.1455 -20.8359 -57.1709 -20.8359l-1.59961 -0.00390625l-99.4033 4.00781c-2.58398 0.104492 -4.7959 2.35547 -4.7959 4.99512 c0 20.749 1.59961 29.7715 1.59961 42.4004c0 102.892 -9.59277 188.052 -29.3955 255.383c-0.135742 0.461914 -0.204102 0.939453 -0.204102 1.41699c0 2.68945 2.30762 4.99902 4.99902 4.99902h66.4004c1.90234 0 3.69531 -1.20605 4.47266 -2.76172 c2.30566 -4.61328 3.72559 -12.9824 3.72559 -25.4375v-7.2002z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC2.xml b/data/Leipzig/EBC2.xml
new file mode 100644
index 00000000000..8e0a020d19c
--- /dev/null
+++ b/data/Leipzig/EBC2.xml
@@ -0,0 +1 @@
+<symbol id="EBC2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247.398 182.6c0 -2.68945 -2.30762 -4.99902 -4.99902 -4.99902c-16.2461 0 -87.0928 10.9814 -104.494 14.4004h-1.10547c-7.91016 0 -13.4014 -12.207 -13.4014 -19.001c0 -3.55762 1.0791 -6.23242 1.55469 -9.7207l7.19238 -52.7471 c3.56738 -24.2559 8.41895 -43.1943 14.3818 -57.332c8.00391 3.57812 20.8232 9.39355 38.502 17.9043c7.04102 3.38965 15.4229 6.89453 18.9707 6.89453c0.0458984 0 0.400391 0.102539 0.955078 0.102539c2.45801 0 5.64355 -2.90918 5.64355 -5.90137 c0 -3.4209 -1.50977 -6.57715 -3.77832 -8.12988c-35.6797 -24.4131 -51.3916 -36.499 -101.295 -62.6982c-0.725586 -0.380859 -1.52539 -0.571289 -2.3252 -0.571289c-2.31738 0 -4.33887 1.7168 -4.85156 3.79199c-11.9365 48.2246 -26.6865 103.349 -33.8379 154.088 c-3.50293 -0.753906 -9.28125 -2.41406 -17.126 -5.55176c-16.9746 -6.46777 -28.3154 -9.92773 -36.1846 -9.92773c-4.24023 0 -10.5996 1.62012 -10.5996 7.39844c0 3.43652 2.27734 6.80859 4.88965 8.3252c28.9277 16.7979 95.0635 61.5615 120.219 74.5205 c0.716797 0.369141 1.50391 0.553711 2.29102 0.553711c0.276367 0 0.553711 -0.0224609 0.827148 -0.0683594l52.9189 -8.81934c36.7783 -7.04297 57.2969 -12.3232 65.4209 -16.1152c3.10742 -0.816406 5.03223 -4.00781 5.03223 -7.19629 c0 -3.69629 -4.80078 -16.9365 -4.80078 -19.2002z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC3.xml b/data/Leipzig/EBC3.xml
new file mode 100644
index 00000000000..1550cd9c2ba
--- /dev/null
+++ b/data/Leipzig/EBC3.xml
@@ -0,0 +1 @@
+<symbol id="EBC3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 182.001h-4.71582c-5.61426 -14.0156 -11.8857 -43.1748 -11.8857 -65.4004v-7.0166c1.15918 -15.5898 8.14746 -29.0996 20.2012 -41.1533c13.9413 -13.9448 31.1242 -22.8311 52.4004 -22.8311c16.0332 0 28.2695 5.13965 39.2207 16.0908 c10.5567 10.5567 17.3799 29.7745 17.3799 46.125v0.785156c0 21.1797 -9.44922 35.7607 -22.7627 45.5713c-9.0459 6.78418 -27.6777 17.7129 -55.7119 24.7432c-12.4785 2.33203 -33.001 2.98438 -34.126 3.08594zM8.39941 222.802 c-3.73926 0 -8.19824 2.13965 -8.19824 6.59863c0 0.632812 0.119141 1.26465 0.357422 1.86035l3.11621 7.79199c4.54785 15.2793 6.94629 36.5205 7.73047 54.5664c0.243164 5.59375 1.30762 12.7803 7.39453 12.7803c3.08008 0 6.40234 -1.99512 8.47168 -2.81055 c3.83496 -1.51172 6.90625 -2.72559 11.7148 -3.6875c0.183594 -0.0361328 0.364258 -0.0830078 0.542969 -0.140625l99.9648 -31.9893c74.3359 -23.1787 136.768 -37.5835 182.124 -52.7217c35.8223 -11.9561 67.9062 -36.7168 78.3105 -54.3457 c9.33311 -15.8139 13.4697 -32.0791 13.4697 -49.7041c0 -68.3848 -41.0693 -107.897 -103.982 -110.594c-0.0722656 -0.00292969 -0.143555 -0.00488281 -0.21582 -0.00488281h-1.60059c-29.5791 0 -43.1963 7.40625 -56.6367 14.126 c-7.2373 3.61914 -19.4033 12.165 -30.1455 22.9082c-5.07617 5.0752 -9.80566 10.6309 -13.4287 16.4658c-5.7002 8.6084 -9.58789 24.8477 -9.58789 36.2988c0 36.1631 5.11523 69.5273 15.3975 100.021c-18.6914 5.91211 -44.9824 12.5449 -80.1357 19.8682 c-46.2373 8.77051 -83.6094 13.5127 -111.862 13.5127c-4.87598 0 -8.3125 -0.799805 -12.8008 -0.799805z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC4.xml b/data/Leipzig/EBC4.xml
new file mode 100644
index 00000000000..a026a7830c5
--- /dev/null
+++ b/data/Leipzig/EBC4.xml
@@ -0,0 +1 @@
+<symbol id="EBC4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 107.599c2.68945 0 4.99902 -2.30762 4.99902 -4.99902c0 -0.625977 -0.117188 -1.25195 -0.350586 -1.84277l-13.5996 -34.3994c-0.62793 -1.58984 -1.95996 -2.49805 -3.55566 -3.0498c-3.86328 -1.50488 -10.8779 -9.6123 -14.8682 -14.3281 c-21.0625 -24.9639 -58.8965 -48.9785 -87.8252 -48.9785h-2.39941c-12.5586 0 -30.9932 13.084 -39.6611 22.3936c-11.3145 12.1523 -23.7383 29.1719 -23.7383 48.2051c0 18.4951 4.95801 42.1279 15.4941 70.4951c8.16797 22.751 16.2881 38.71 25.3633 47.7861 c2.32812 2.32715 4.76562 4.23633 7.35742 5.61426c-0.202148 2.03711 -0.214844 3.96289 -0.214844 5.75v0.754883c0 20.5254 12.3271 44.5625 27.7812 60.0166c7.8125 7.8125 16.6553 13.7051 25.9629 15.3096c0.282227 0.0488281 0.568359 0.0732422 0.854492 0.0732422 c3.86816 0 5.19531 -4.1084 5.79492 -6.12598c1.46484 -4.92773 3.03418 -11.5742 4.63574 -17.5791c0.112305 -0.422852 0.168945 -0.858398 0.168945 -1.29395c0 -1.74902 -1.0332 -3.45215 -2.42773 -4.28906c-7.44922 -4.46973 -15.1729 -11.1357 -15.1729 -20.5117 c0 -1.03125 4.41602 -14.2207 10.3604 -24.8066c1.25879 -2.24316 2.05176 -3.46191 2.47266 -3.88281c0.609375 -0.609375 2.62402 -1.51074 15.7686 -1.51074c14.6572 0 32.0156 9.28711 52.4648 29.7354c0.975586 0.975586 2.25488 1.46387 3.53516 1.46387 c4.69922 0 4.96875 -4.57715 5.77734 -8.68262c0.749023 -3.80273 1.62109 -7.86035 1.62109 -11.5156c0 -11.9629 -8.74609 -20.4453 -17.5957 -25.4346c-13.3037 -18.1318 -43.1738 -38.7646 -67.4033 -38.7646c-8.9082 0 -17.4824 2.27246 -24.6016 7.69238 c-0.711914 -0.301758 -1.54785 -0.862305 -2.52148 -1.83496c-8.55762 -8.55762 -15.0771 -38.9395 -15.0771 -51.2588c0 -22.9434 16.0596 -39.001 39.001 -39.001c7.76465 0 20.6719 4.94922 36.2627 15.8496l42.3291 31.9453 c0.886719 0.669922 1.94727 1.00488 3.00781 1.00488z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC5.xml b/data/Leipzig/EBC5.xml
new file mode 100644
index 00000000000..42ded00bcad
--- /dev/null
+++ b/data/Leipzig/EBC5.xml
@@ -0,0 +1 @@
+<symbol id="EBC5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M128 225c15 13 41 40 43 55v5c0 19 -8 28 -24 31c-18 -5 -28 -31 -28 -51c0 -6 7 -31 9 -40zM168 173c14 0 28 0 28 -6v-20c0 -3 -2 -5 -5 -5h-18c-10 0 -30 0 -38 -1c-3 -19 -9 -115 -11 -136c0 -2 -2 -4 -5 -4c-8 0 -18 -1 -26 -1c-3 0 -5 2 -5 5c0 6 1 13 1 19 c0 22 -1 37 -7 68l-8 40c-22 2 -60 3 -61 3h-8c-2 0 -3 1 -4 3c0 1 -1 3 -1 7v15c0 3 2 5 5 5h12c7 0 25 2 29 2c4 3 19 17 26 23c-4 29 -6 52 -6 67c0 63 26 98 87 98c39 0 58 -17 58 -55c1 -2 1 -6 0 -8c0 -52 -25 -69 -60 -87c-9 -4 -15 -10 -18 -13c-1 -1 -3 -2 -3 -2 c0 -4 -1 -12 -1 -17h39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC6.xml b/data/Leipzig/EBC6.xml
new file mode 100644
index 00000000000..cf2f3cfb7cd
--- /dev/null
+++ b/data/Leipzig/EBC6.xml
@@ -0,0 +1 @@
+<symbol id="EBC6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M116.199 225.6c0 -11.2432 1.61328 -16.2793 3.67578 -18.3418c1.81836 -1.81836 5.58301 -3.05859 13.7246 -3.05859c24.3242 0 63.7881 22.3799 84.5508 38.0498c0.0253906 0.755859 0.0507812 1.88672 0.0507812 3.35059 c0 2.65234 -0.452148 6.84082 -0.452148 12.667c-16.7266 3.36914 -32.7637 4.73438 -48.1494 4.73438c-20.3193 0 -34.5986 -3.16016 -44.7188 -8.94336c-6.33203 -3.79883 -8.68164 -12.2314 -8.68164 -28.458zM219.001 211.026 c-25.1074 -20.4629 -61.9219 -50.4902 -94.5811 -50.4902c-29.1387 0 -44.915 24.2773 -44.915 52.3271c0 21.5498 8.90625 45.2891 25.9395 62.3223c14.4121 14.4121 34.8936 24.2139 60.9561 24.2139c20.2949 0 37.6807 -2.57812 53.0898 -8.44922 c0.657227 5.2002 1.11035 13.2451 1.11035 23.4502c0 2.68945 2.30762 4.99902 4.99902 4.99902h40.8008c2.64258 0 4.89941 -2.21875 4.99512 -4.8125c0.268555 -7.24707 0.803711 -14.5303 0.803711 -21.7871c0 -2.64258 0.165039 -4.87598 0.375 -6.64941 c8.41797 5.87891 21.6113 9.64453 39.4609 12.3896c0.25293 0.0390625 0.508789 0.0585938 0.764648 0.0585938c2.3125 0 4.33203 -1.71191 4.84863 -3.78027c1.59766 -6.38477 3.35059 -13.2617 3.35059 -21.2188c0 -2.60254 -2.14746 -4.82031 -4.66406 -4.98828 c-10.165 -0.676758 -22.334 -5.3623 -36.2451 -13.8613c-0.000976562 -0.113281 -0.000976562 -0.228516 -0.000976562 -0.345703c0 -9.60156 0.978516 -17.8467 0.978516 -29.4629c0 -8.43945 -0.398438 -18.2852 -1.70117 -29.5215 c-8.07812 -69.6367 -24.3174 -127.102 -58.9062 -161.69c-20.0391 -20.0391 -46.1484 -32.0273 -79.374 -33.9209c-0.447266 -0.0253906 -0.901367 -0.0380859 -1.3623 -0.0380859c-17.7275 0 -45.5029 18.7656 -85.8437 50.5645 c-3.46094 2.21973 -10.5 3.86621 -19.4795 3.86621h-12.4482c-5.6582 -0.78418 -9.45215 -0.912109 -13.085 -0.912109c-5.22852 0 -6.18164 4.78711 -7.20605 7.69238c-1.01074 2.86719 -1.86035 4.36621 -1.86035 7.01855c0 1.94531 0.960938 3.5459 1.91602 4.50195 c3.80664 3.80664 9.78418 3.8623 17.1133 4.46484c11.8232 0.972656 32.6201 1.63184 48.3701 1.63184c9.82227 0 23.5039 -7.99121 44.333 -21.6113c0.0625 -0.0410156 0.124023 -0.0830078 0.18457 -0.126953c19.9131 -14.3369 33.3184 -20.6611 37.8818 -20.6611 h0.800781c10.7021 0 20.3242 4.08594 29.2764 13.0381c9.39941 9.39941 17.9932 24.3838 25.209 45.2314c9.48145 26.8613 14.1152 49.5645 14.1152 67.9316v48.626z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC7.xml b/data/Leipzig/EBC7.xml
new file mode 100644
index 00000000000..83e7ee10827
--- /dev/null
+++ b/data/Leipzig/EBC7.xml
@@ -0,0 +1 @@
+<symbol id="EBC7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 287c-35 0 -49 -43 -49 -77c0 -6 0 -11 1 -15c11 8 37 21 47 31c7 7 11 17 11 36c0 17 0 25 -10 25zM134 110c35 17 60 55 112 55c31 0 43 -30 43 -60c0 -22 -12 -44 -30 -59l-57 -45c-1 -1 -2 -1 -3 -1h-1l-32 5c-2 0 -4 3 -4 5s1 4 3 5c23 8 77 45 77 72 c0 19 -14 33 -33 33c-5 0 -24 -9 -51 -30l-70 -53c-1 -1 -2 -1 -3 -1c-3 0 -5 2 -5 5l-2 57c-1 18 -5 28 -7 30c-7 0 -14 -3 -23 -8l-24 -15c-1 0 -1 -1 -2 -1s-3 1 -4 2l-17 19c-1 1 -1 3 -1 4c0 5 7 5 11 6c26 7 54 14 60 35l20 64c11 32 24 56 40 74c1 1 2 2 4 2 c5 1 17 2 33 8s28 10 37 10c29 0 47 -14 47 -43c0 -19 -13 -42 -37 -66c-27 -27 -63 -54 -86 -66v-37zM71 128v0z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC8.xml b/data/Leipzig/EBC8.xml
new file mode 100644
index 00000000000..f738d7ab4c3
--- /dev/null
+++ b/data/Leipzig/EBC8.xml
@@ -0,0 +1 @@
+<symbol id="EBC8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1 113c0 6 4 7 4 20c0 10 2 23 10 23c3 0 5 -1 14 -1c19 0 30 4 35 10l11 28c1 2 3 3 5 3h1c20 -5 34 -7 39 -7c3 0 5 -2 5 -5v-2c-7 -19 -19 -41 -33 -65c-2 -3 -3 -13 -3 -28v-6c0 -13 0 -21 7 -21c10 0 34 17 39 29c1 2 3 3 5 3c3 0 5 -2 5 -5c1 -4 7 -11 7 -17 c0 -3 -1 -5 -3 -6c-17 -22 -42 -44 -63 -64c-1 -1 -3 -2 -4 -2l-31 4c-2 0 -4 2 -4 5c0 11 -3 29 -3 41c0 16 2 36 5 58c-2 2 -5 3 -11 3s-26 -3 -32 -3c-3 0 -5 2 -5 5zM100 209h-3c-15 0 -27 13 -27 27c0 17 15 31 32 31h1c16 0 29 -10 29 -26c0 -20 -13 -32 -32 -32z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBC9.xml b/data/Leipzig/EBC9.xml
new file mode 100644
index 00000000000..384a9a91647
--- /dev/null
+++ b/data/Leipzig/EBC9.xml
@@ -0,0 +1 @@
+<symbol id="EBC9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M80 183c14 1 45 6 45 19s-23 27 -35 31c-1 -1 -7 -4 -16 -11zM73 247c7 7 46 38 46 50v1c0 7 -12 16 -13 17h-2c-19 -19 -29 -42 -31 -68zM161 308c0 -19 -22 -39 -37 -52c14 -8 33 -28 33 -46c0 -22 -20 -41 -39 -44l-38 -6c0 -5 -1 -15 -1 -19v-4c15 0 48 4 65 5 c3 0 5 -2 5 -5v-8c0 -5 -4 -10 -9 -10h-1c-13 -1 -31 -4 -55 -8c-2 0 -3 -1 -3 -2v-79h1c2 1 16 11 22 15c1 1 2 1 3 1c3 0 5 -2 5 -5v-1c0 -3 4 -10 4 -14s-6 -10 -8 -12c-9 -9 -19 -10 -38 -12h-3c-9 0 -13 12 -19 12c-1 -5 0 -14 -6 -14h-3c-6 0 -9 3 -14 3 c-3 0 -5 2 -5 5c0 1 1 2 2 3s3 7 5 17c2 12 4 24 4 49l-1 31c-5 0 -19 -1 -23 -1c-5 0 -7 6 -7 12c0 12 13 14 23 14h8c0 17 -2 68 -2 83c0 18 1 29 3 37v1c7 20 15 39 26 55c13 22 33 44 60 46h4c6 0 17 -5 22 -12c0 0 17 -20 17 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBCA.xml b/data/Leipzig/EBCA.xml
new file mode 100644
index 00000000000..6422282629c
--- /dev/null
+++ b/data/Leipzig/EBCA.xml
@@ -0,0 +1 @@
+<symbol id="EBCA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 87c4 0 10 -9 10 -13c0 -1 0 -2 -1 -3c-16 -16 -46 -40 -62 -56c-6 -6 -10 -11 -11 -13s-2 -2 -4 -2h-24c-3 0 -5 2 -5 5c0 1 0 2 1 3c3 3 5 11 5 22c0 20 3 54 3 74c0 8 0 15 -1 21c-16 -11 -37 -25 -60 -25h-4c-4 0 -9 1 -9 6s6 12 7 15c0 2 -1 3 -1 4c0 2 3 5 5 5 c11 2 24 5 37 14c9 7 14 9 19 13l7 65c8 60 32 126 100 126h3c38 0 55 -24 55 -63c0 -49 -42 -84 -77 -109c-12 -9 -20 -13 -24 -19l-8 -87h1c6 0 33 17 38 17zM182 287c0 10 -6 17 -15 18h-2c-32 0 -39 -35 -39 -65v-9l3 -34l13 8c22 17 32 39 40 76v6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBCB.xml b/data/Leipzig/EBCB.xml
new file mode 100644
index 00000000000..6d18d18feec
--- /dev/null
+++ b/data/Leipzig/EBCB.xml
@@ -0,0 +1 @@
+<symbol id="EBCB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 101.4c-2.68945 0 -4.99902 2.30762 -4.99902 4.99902c0 0.767578 0.175781 1.53516 0.526367 2.2373c4.79883 9.59961 12.3809 19.7539 22.9521 30.3252c4.49805 4.49805 9.4668 9.00879 15.0703 13.6377c11.4033 9.77344 28.3721 22.6904 50.1162 37.1875 c20.6934 13.5293 34.998 23.8975 42.5918 30.7314c0.948242 0.853516 2.14453 1.28027 3.3418 1.28027c2.06445 0 3.94531 -1.39648 4.6416 -3.1377c5.12793 -12.8213 9.08496 -33.0137 13.9004 -61.9043c4.30176 -28.2686 8.14844 -48.5273 10.7344 -60.167 l66.5352 60.6855c9.31738 8.60156 17.7656 16.6924 25.3408 24.2676c17.6738 17.6729 30.5996 32.5703 38.7139 44.4697c0.874023 1.28223 2.50098 2.18555 4.13379 2.18555c2.47266 0 4.59375 -1.94141 4.94238 -4.24609l14.3721 -95.0146l4.60547 -20.1475 l148.203 115.951c0.901367 0.705078 1.98926 1.05762 3.07715 1.05762c2.17676 0 4.11621 -1.53516 4.74219 -3.41211c5.0166 -15.0518 10.5918 -43.1777 17.0117 -86.5156c4.71484 -35.0205 8.2793 -56.5254 9.30664 -62.5527 c2.0625 0.923828 7.07324 3.71777 14.085 8.38867c8.27246 6.00586 20.6045 9.81934 21.4434 9.80664c0 -0.0185547 -0.0605469 -0.0566406 -0.188477 -0.115234c6.30469 0 9.79883 -5.62109 9.79883 -11.3984c0 -1.36719 -0.59375 -2.75488 -1.64258 -3.70605 l-34.457 -31.251c-20.2344 -17.8066 -39.7021 -31.624 -56.9785 -40.6729c-0.724609 -0.379883 -1.52344 -0.569336 -2.32129 -0.569336c-2.56055 0 -4.75195 2.08008 -4.97754 4.53809l-6.39453 69.5439c-2.73926 23.9551 -6.06738 44.3535 -9.45898 60.6475 c-69.5195 -52.2119 -120.901 -95.3037 -153.276 -126.909c-0.970703 -0.947266 -2.23145 -1.4209 -3.49219 -1.4209c-2.125 0 -4.03711 1.46777 -4.69824 3.28516c-3.62891 9.98047 -5.87012 29.1289 -8.28125 57.2715c-1.94727 22.0615 -4.46777 38.2842 -6.93066 48.292 c-16.4873 -9.4502 -39.2832 -27.3691 -67.9043 -53.1289l-71.2002 -65.5996c-0.955078 -0.879883 -2.16992 -1.31934 -3.38574 -1.31934c-2.5 0 -4.6416 1.98242 -4.95508 4.33398c-1.62988 12.2285 -4.0127 37.7002 -7.2168 75.3369 c-2.94531 27.9893 -6.57227 51.1465 -10.833 69.3877c-3.82129 -1.36914 -11.6016 -5.41406 -22.9268 -12.959c-8.69141 -6.40723 -15.457 -11.9863 -20.0371 -16.5674c-3.29395 -3.29297 -5.41406 -6.08203 -6.3584 -7.97168 c-0.657227 -1.3125 -2.0127 -2.37598 -3.50977 -2.66797l-32.7998 -6.40039c-0.317383 -0.0615234 -0.640625 -0.0927734 -0.962891 -0.0927734z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBCC.xml b/data/Leipzig/EBCC.xml
new file mode 100644
index 00000000000..c654a5c7505
--- /dev/null
+++ b/data/Leipzig/EBCC.xml
@@ -0,0 +1 @@
+<symbol id="EBCC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330.8 100.199c4.38184 0 10.5986 -2.13574 10.5986 -7.39941c0 -1.26562 -0.476562 -2.53027 -1.42969 -3.50195l-49.9658 -50.9082c-17.7256 -17.7256 -33.041 -30.5537 -46.376 -37.9619c-0.751953 -0.417969 -1.58984 -0.626953 -2.42773 -0.626953 c-2.49316 0 -4.62891 1.97168 -4.95215 4.31152c-5.25781 38.1328 -11.416 87.7646 -18.875 119.353c-15.0859 -11.6533 -32.2412 -27.1016 -51.4629 -46.3232c-20.7949 -20.7949 -44.0166 -46.0059 -69.7314 -75.6172 c-0.939453 -1.08105 -2.37207 -1.72363 -3.77832 -1.72363c-2.44336 0 -4.54297 1.89648 -4.92773 4.15332c-10.751 63.0732 -16.4033 104.861 -17.4805 127.289c-11.5273 -6.55859 -25.2822 -17.8213 -33.0518 -26.5625 c-0.945312 -1.0625 -2.35547 -1.67969 -3.74023 -1.67969c-0.19043 0 -0.381836 0.0107422 -0.571289 0.0322266l-28 3.2002c-2.39941 0.274414 -4.42773 2.4375 -4.42773 4.9668c0 1.21191 0.4375 2.42285 1.31152 3.37695 c1.95117 2.12891 4.26367 4.54004 6.94922 7.22559c9.78516 9.78516 24.5469 23.2305 44.7178 39.623c16.1895 14.1641 39.7725 33.0928 50.7188 45.1348c0.951172 1.04688 2.33789 1.63867 3.70215 1.63867c2.17676 0 4.11621 -1.53516 4.74219 -3.41211 c3.34766 -10.043 7.37793 -27.0684 10.6084 -52.0879c3.33594 -22.0088 6.6709 -40.6104 10.4209 -55.7148c13.0459 12.8945 33.3633 30.6465 60.666 52.4883c35.1465 28.7568 58.3164 48.7363 70.1533 59.7842c0.958008 0.894531 2.18359 1.3418 3.40918 1.3418 c2.31348 0 4.33203 -1.71191 4.84961 -3.78027c4.02051 -16.083 9.65723 -40.2295 14.4873 -72.4287c3.94141 -24.7734 6.75195 -42.2393 8.28125 -51.2324c8.62207 5.10938 26.0996 17.042 35.582 17.042z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE0.xml b/data/Leipzig/EBE0.xml
new file mode 100644
index 00000000000..70a543e8757
--- /dev/null
+++ b/data/Leipzig/EBE0.xml
@@ -0,0 +1 @@
+<symbol id="EBE0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M46.9994 122c0 -31.6546 6.02829 -59.1559 16.5208 -75.3716c9.92803 -15.8848 18.7864 -28.6289 45.4798 -28.6289c26.1589 0 40.2571 16.2734 50.4547 32.5895c10.4579 16.1622 14.5459 40.6011 14.5459 73.4111c0 32.8236 -4.07153 57.1476 -15.4534 73.2719 c-11.5721 16.0229 -16.8963 28.7287 -45.5472 28.7287c-27.6659 0 -42.7777 -17.5063 -53.4547 -34.5895c-10.4399 -16.1343 -12.5459 -36.4399 -12.5459 -69.4111zM-2.99941 123c0 40.9423 18.417 72.5943 35.7116 92.9409c1.0816 1.27247 2.67619 2.30745 3.90212 3.34154 c22.5969 19.0608 35.6405 29.717 74.3856 29.717c40.7644 0 53.134 -11.7138 76.9274 -31.7003c0.0665658 -0.0559153 0.131266 -0.115179 0.193878 -0.177791c21.6304 -21.6304 34.8781 -53.4598 34.8781 -94.1213c0 -44.2834 -18.2069 -78.6745 -38.5026 -98.9701 c-19.863 -19.863 -39.9728 -27.0293 -76.4969 -27.0293h-1c-34.2852 0 -52.5574 7.05298 -71.8206 26.3162c-20.7184 20.7184 -38.1788 54.682 -38.1788 99.6832z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE1.xml b/data/Leipzig/EBE1.xml
new file mode 100644
index 00000000000..069d7cfe417
--- /dev/null
+++ b/data/Leipzig/EBE1.xml
@@ -0,0 +1 @@
+<symbol id="EBE1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1.30977 212.912c-1.41382 0 -3.39737 1.98033 -3.39737 3.39737c0 0.38667 0.088179 0.64011 0.088179 0.690225c0 1.82277 0.928332 3.29656 2.01872 4.38695c3.17118 3.17118 9.26313 5.45433 19.095 8.47951c4.90221 1.50837 9.80738 2.56603 14.5117 3.99732 c7.07189 2.1516 14.183 4.01193 21.3811 5.97506c14.0485 6.01065 24.0361 9.16057 29.9929 9.16057c7.26384 0 24.9994 -5.55225 24.9994 -16.9994c0 -8.75675 -0.931436 -34.5712 -1.88928 -48.4439c-0.632443 -9.15987 -1.11072 -16.1558 -1.11072 -21.5561v-7.94555 l2 -111.054v-9c0 -9.32659 1.01343 -11.2529 2.34968 -14.0172c1.28293 -2.65403 0.402619 -2.32948 3.30524 -3.05514c6.80411 -1.51202 13.4558 -3.18221 20.4211 -4.43452c7.53715 -1.35512 13.3137 -1.85919 16.4037 -4.94926 c0.848666 -0.848666 1.52025 -2.1162 1.52025 -3.54387c0 -1.33328 -0.619167 -2.5443 -1.43139 -3.35653c-3.62724 -3.62724 -11.9128 -3.64289 -24.2452 -3.64289c-0.107305 0 -0.214916 1.18442e-06 -0.322833 1.18442e-06h-83.9112 c-5.66508 -0.33324 -11.4073 -1 -17.0888 -1c-7.12644 0 -11.875 0.923094 -14.4736 3.52164c-0.833434 0.833434 -1.52585 2.0391 -1.52585 3.47777c0 1.6481 0.75802 3.12625 1.81559 4.18382c2.95421 2.95421 8.24485 4.03202 15.7844 4.79069l23.5671 3.92785 c7.62797 3.25191 7.83285 12.2838 7.83285 24.0976v4.98087l-1 158.019v4c0 6.67177 -5.94482 11.0006 -12.0006 11.0006c-3.51967 0 -9.34253 -0.926483 -18.2688 -2.91009c-8.25978 -2.06495 -15.3671 -2.08992 -20.3635 -2.08992 c-0.123871 0 -0.246444 1.5352e-05 -0.367705 1.5352e-05h-5c-0.0501153 0 -0.303556 -0.088179 -0.690225 -0.088179z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE2.xml b/data/Leipzig/EBE2.xml
new file mode 100644
index 00000000000..ecf5f18a9f8
--- /dev/null
+++ b/data/Leipzig/EBE2.xml
@@ -0,0 +1 @@
+<symbol id="EBE2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M87 248.999c40.5608 0 81.9994 -20.5017 81.9994 -62.9994c0 -13.9743 -6.44598 -27.5914 -17.5973 -42.7978c-9.15411 -12.2055 -18.1178 -25.8684 -31.3392 -39.3836c0 0 -44.9179 -45.9161 -44.9415 -45.94 c-0.0360394 -0.0360394 -0.0727707 -0.0709694 -0.110151 -0.10479c-9.04812 -8.18639 -14.5859 -13.0465 -17.9427 -15.9925c-2.37929 -2.08807 -4.34297 -3.09081 -4.34297 -4.44546c0 -0.119359 0.0103543 -0.231754 0.0279685 -0.336602 c6.72911 0 13.4582 -0.000534409 20.1873 -0.000534409l51.0593 1.00058c12.16 0 19.8895 1.017 22.0753 1.51372c1.6937 2.48891 4.94015 7.04395 8.03143 10.1352c1.48929 1.48929 3.14134 3.35105 5.89332 3.35105c2.14714 0 4.26322 -0.473588 5.82113 -2.03151 c1.96544 -1.96544 2.17828 -4.56794 2.17828 -6.9679c0 -0.0529648 -0.00139223 -0.10593 -0.0041767 -0.158834l-1.99623 -37.9284c-0.0594922 -6.37994 -5.99201 -7.94599 -12.0034 -7.94599c-1.30178 0 -2.64246 0.0337757 -3.99559 0.0337757h-50 c-35.9978 0 -66.9789 -0.00174341 -90.8742 -0.99738c-0.0419184 -0.0017466 -0.0838665 -0.0026199 -0.125815 -0.0026199h-2c-4.82697 0 -8.99941 1.66876 -8.99941 5.99941c-0.218042 2.45942 -1.89886 4.96481 -1.89886 8.62991 c0 2.69654 0.835286 6.54975 3.77695 9.49141c5.64272 5.64272 15.3719 14.3676 21.0985 20.0942c22.7972 20.8431 37.3098 35.4762 53.8285 53.8303c27.4438 29.4041 40.1949 68.9932 40.1949 86.9542c0 18.46 -11.7323 36.0006 -31.0006 36.0006h-10 c-20.2557 0 -30.3096 -5.48741 -49.2022 -20.4027c-4.16744 -3.12558 -6.64633 -3.59734 -9.79778 -3.59734c-5.33434 0 -7.99941 4.45552 -7.99941 8.99941c0 4.43645 2.78243 9.02565 9.87809 16.1213c20.5221 20.5221 44.3554 29.8781 70.1213 29.8781z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE3.xml b/data/Leipzig/EBE3.xml
new file mode 100644
index 00000000000..3c6418a102c
--- /dev/null
+++ b/data/Leipzig/EBE3.xml
@@ -0,0 +1 @@
+<symbol id="EBE3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M145.999 206c0 -21.589 -24.2937 -41.2395 -41.8466 -52.775c24.8193 -3.16322 36.9661 -11.9435 48.8951 -23.8725c9.64163 -9.64163 15.9514 -20.4636 15.9514 -34.3525c0 -17.9611 -8.18608 -38.7166 -26.1478 -56.6783 c-5.22496 -5.22496 -11.3273 -10.2441 -18.2422 -14.8541c-22.0307 -14.0195 -26.839 -15.3679 -43.8028 -20.3572c-18.3972 -5.11034 -36.6822 -6.10978 -52.8065 -6.10978c-12.7325 0 -22.2024 2.2669 -27.3393 7.40381 c-2.32806 2.32806 -3.66007 5.31475 -3.66007 8.5956c0 9.20231 8.46001 11.9994 17.9994 11.9994c5.41559 0 11.8063 -1.09736 20.0562 -4.19109c0.0970953 -0.0364107 0.192676 -0.0780247 0.286311 -0.124842c4.81861 -2.40931 7.28149 -2.81659 8.96553 -2.81659 c1.04633 0 1.66611 0.132522 2.69192 0.132522c5.68834 0 18.6947 5.70797 27.5431 10.6238c0.984545 0.54697 2.14935 0.929429 2.97915 1.27672c4.7487 1.98742 5.56735 2.24498 10.6311 6.46474c5.05039 3.95248 9.3383 7.6879 12.9402 11.2898 c12.5409 12.5409 16.907 23.3486 16.907 37.3455c0 24.7573 -19.3288 41.0006 -43.0006 41.0006c-6.91145 0 -21.5153 -2.64287 -26.2234 -3.89837l-15 -4c-0.254078 -0.0677541 -0.515344 -0.101631 -0.776611 -0.101631c-4.94713 0 -9.99941 5.05824 -9.99941 9.99941 c0 2.04589 1.12479 3.5264 2.27716 4.67878c3.2874 3.2874 9.56905 6.33938 18.5085 10.066l14.8033 6.90821c12.7391 7.65084 20.9397 13.6464 26.212 18.9186c8.93826 8.93826 9.95934 15.8086 11.2176 27.762c0.199293 1.79363 0.308637 3.49435 0.308637 5.09867 c0 7.06562 -2.3472 11.3286 -6.75797 14.6404c-7.6682 5.75758 -11.6876 8.92794 -22.5697 8.92794c-12.7577 0 -16.663 -0.687927 -33.5959 -9.65241c-2.16841 -1.14798 -4.5954 -1.98034 -6.85683 -2.94952c-5.41469 -4.23079 -11.3695 -6.39807 -14.5472 -6.39807 c-2.48393 0 -7.99941 2.28272 -7.99941 5.99941c0 7.3303 9.46566 14.9413 15.1482 19.3611c14.5228 11.4108 32.2311 17.6383 52.8512 17.6383c15.482 0 36.7456 -3.98959 48.5111 -10.4071c10.5741 -6.16822 25.4883 -17.6291 25.4883 -32.5923z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE4.xml b/data/Leipzig/EBE4.xml
new file mode 100644
index 00000000000..66090362e3f
--- /dev/null
+++ b/data/Leipzig/EBE4.xml
@@ -0,0 +1 @@
+<symbol id="EBE4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M118 -1.99941c-2.5413 0 -5.33271 -1 -8 -1h-3c-0.587337 0 -1.22426 -0.0306072 -1.88533 -0.0306072c-1.77718 0 -3.72884 0.221205 -5.36061 1.85297c-1.43836 1.43836 -1.75348 3.34213 -1.75348 5.17705c0 1.84945 0.977486 3.26123 2.00752 4.29127 c1.90349 1.90349 4.69859 3.41683 8.64935 5.39221c0.147975 0.0739875 0.300812 0.13498 0.456803 0.182977c5.99451 1.84447 15.7112 3.08963 17.8863 8.65803v37.4485l-106.001 -0.972359h-8c-8.26364 0 -16.9994 2.31834 -16.9994 9.99941 c0 3.99237 2.95192 6.99517 6.34409 11.2999c1.28791 1.63437 2.67705 3.78641 4.43535 5.71807l142.096 156.106c4.15577 4.15577 8.11664 6.87583 14.1238 6.87583c7.23857 0 14.9994 -2.29158 14.9994 -9.99941c0 0 0.0144199 -0.241523 0.0144199 -0.663211 c0 -1.97145 -0.315176 -7.88077 -3.89251 -11.4581l-142 -142c-0.39664 -0.39664 -1.31355 -1.84419 -2.05166 -3.06038c1.25385 0.0685571 2.4736 0.181111 3.93034 0.181111h71.8157c0.680409 0.488995 1.73622 1 3.18429 1h16.4595 c1.17974 0.498129 1.54142 0.862722 1.54142 3.04376l0.999692 69.9568c0 11.8317 11.2352 14.9994 23.9994 14.9994c6.52169 0 19.9994 -3.01195 19.9994 -11.9994v-71c0 -5.07909 -0.787003 -5.00059 3.00059 -5.00059c0 0 25.9994 -1.60847 25.9994 -9.99941 c0 -4.79378 -0.560611 -8.71897 -3.31925 -11.4776c-3.15563 -3.15563 -7.78162 -3.5218 -13.6802 -3.5218c-2.22657 0 -3.65938 0.67535 -5.08123 0.999785c-4.521 -0.0241309 -5.91936 -1.44445 -5.91936 -6.00037v-15.8836 c0.908781 -11.7416 1.84429 -18.1835 4.34313 -19.4329c1.19235 -0.596177 1.79082 -1.71349 2.55949 -2.48216c0.298658 -0.298658 1.64983 -0.996972 6.82919 -2.29181c6.23073 -1.55768 10.3519 -2.13294 12.8674 -4.64841 c0.761056 -0.761056 1.40082 -1.93407 1.40082 -3.26109c0 -1.75654 -0.254894 -3.99812 -2.00309 -5.74632c-1.73384 -1.73384 -4.16955 -2.25309 -6.99632 -2.25309c-15.532 0 -31.085 2 -43 2c-4.99257 0 -11.8328 -2.19098e-05 -20.6664 -0.981529 c-0.110824 -0.0123138 -0.222206 -0.0184707 -0.333587 -0.0184707h-10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE5.xml b/data/Leipzig/EBE5.xml
new file mode 100644
index 00000000000..3747a12fbfc
--- /dev/null
+++ b/data/Leipzig/EBE5.xml
@@ -0,0 +1 @@
+<symbol id="EBE5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -2.99941c-6.36094 0 -11.9994 2.5276 -11.9994 8.99941c0 1.33474 0.692379 2.08462 1.05652 2.44876c2.45825 2.45825 8.47519 3.8234 21.1364 7.44087c17.1554 4.76539 26.815 8.54848 27.6332 8.87271c19.3655 8.72423 29.0341 17.2416 39.8812 29.1734 c10.5617 12.482 16.2927 27.7874 16.2927 44.0643c0 18.5045 -5.99919 32.6829 -17.1219 42.8787c-9.67657 9.67657 -21.0616 17.3343 -42.6716 23.228c-5.35366 1.46009 -12.3406 2.913 -19.949 4.9861c-12.3519 2.90877 -20.3506 5.67392 -24.506 9.82933 c-1.64511 1.64511 -2.75138 3.72772 -2.75138 6.07794c0 3.39968 2.22443 8.14522 6.23535 17.1688c6.04583 15.1182 8.61928 23.8845 9.91884 27.7832c1.87005 5.61015 3.61258 10.4664 7.89324 11.8932c2.99915 0.999717 6.54203 2.15419 11.952 2.15419 l0.21889 0.0100674c1.12415 0.0709809 4.63378 0.494013 10.2018 1.17826c8.81906 1.08376 33.2751 3.8367 46.6527 5.80584c10.4889 1.54394 20.301 3.00583 28.9266 3.00583c5.93671 0 8.99941 -5.74455 8.99941 -10.9994c0 -13.472 -6.12911 -26.9994 -20.9994 -26.9994 c-3.42812 0 -5.16391 -0.948126 -7.85859 -0.998689c-18.0179 -1.50133 -36.1178 -3.02318 -54.072 -4.55053c-8.25461 -0.702209 -9.99305 -1.28145 -12.937 -2.73504c-2.16811 -1.07051 -3.26491 -1.70594 -3.68952 -2.13055 c-0.0257041 -0.0257041 -1.70263 -3.32985 -1.70263 -6.21497c0 -0.847385 4.16448 -2.24445 11.6868 -3.40173c6.97486 -0.996409 14.1004 -1.99249 20.4548 -4.10053c25.1581 -7.04944 47.5233 -16.122 62.1012 -28.6173 c15.753 -13.8997 31.0164 -33.5846 31.0164 -55.2512c0 -24.8488 -10.5204 -46.2169 -28.1848 -63.8813c-17.4873 -17.4873 -39.7427 -29.7961 -66.7584 -39.927c-0.0345648 -0.0129618 -0.0693214 -0.0252642 -0.10425 -0.0369072 c-18.3822 -6.12741 -33.7933 -7.15419 -46.952 -7.15419z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE6.xml b/data/Leipzig/EBE6.xml
new file mode 100644
index 00000000000..39eb63f5133
--- /dev/null
+++ b/data/Leipzig/EBE6.xml
@@ -0,0 +1 @@
+<symbol id="EBE6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M102 138.999c41.5302 0 76.9994 -23.4296 76.9994 -65.9994c0 -21.5221 -3.9846 -41.2214 -19.9536 -55.1943c-16.038 -14.9688 -47.6663 -20.8051 -71.0458 -20.8051c-52.5273 0 -90.9994 37.3419 -90.9994 89.9994c0 34.2408 14.352 65.5953 43.7022 94.9454 c5.8701 5.8701 12.2824 11.6159 19.3564 17.3424c20.1563 17.1329 66.2479 49.7116 96.9409 49.7116c4.1359 0 7.99941 -2.81745 7.99941 -6.99941c0 -0.591571 0.0812094 -1.44111 0.0812094 -2.4051c0 -1.81924 -0.289223 -4.04614 -1.9593 -5.71622 c-1.61729 -1.61729 -3.8716 -2.76598 -5.95493 -3.64317c-18.6396 -7.84825 -36.4625 -19.7095 -53.3601 -32.6312c-8.00357 -6.04714 -15.0912 -12.1759 -21.331 -18.4157c-28.3796 -28.3796 -39.4758 -59.1306 -39.4758 -96.1886 c0 -21.2827 6.52843 -41.5646 18.4909 -53.5271c7.18645 -7.18645 16.2986 -11.4735 27.5097 -11.4735c16.5621 0 23.4919 2.61059 37.2583 12.4437c5.69568 4.06834 7.74226 22.2106 7.74226 37.5569c0 28.4356 -14.4777 48.0006 -43.0006 48.0006 c-4.83073 0 -14.7758 -3 -20 -3c-3.39057 0 -6.48672 2.20297 -8.55013 4.26638c-1.08747 1.08747 -2.44929 2.44066 -2.44929 4.73303c0 2.06366 1.09146 3.64045 2.26299 4.81198c7.30205 7.30205 31.2167 12.1874 39.7364 12.1874z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE7.xml b/data/Leipzig/EBE7.xml
new file mode 100644
index 00000000000..adcd251f2d0
--- /dev/null
+++ b/data/Leipzig/EBE7.xml
@@ -0,0 +1 @@
+<symbol id="EBE7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M115.001 202c0 1.74074 0.846645 3.51149 0.968316 6.57022c-0.834553 0.620516 -1.93898 1.43051 -1.93898 1.43051l-101.03 -1.00015c-6.01323 0 -10.2837 0.131807 -13.1879 3.03602c-2.5545 2.5545 -2.83328 5.97425 -2.83328 10.2175 c0 1.18474 0.0217328 2.43368 0.0217328 3.74591c0 7.7221 0.0403777 14.101 4.20464 18.2653c2.75799 2.75799 6.73796 3.73411 11.7948 3.73411c6.53019 0 26.3529 -1 33 -1c15.0338 0 30.1291 -0.444336 45.333 -0.444336c20.4401 0 40.0413 1.35868 59.4994 2.43968 c0.0558297 0.00310165 0.11173 0.00465247 0.16763 0.00465247c4.58104 0 8.58802 -0.0652331 11.4026 -2.87986c2.06451 -2.06451 2.59677 -4.91777 2.59677 -8.11956c0 -4.12021 -15.6827 -39.1114 -19.3119 -45.3498l-75.9463 -180.87 c-2.94735 -6.63153 -10.9711 -14.7791 -17.7412 -14.7791c-5.44442 0 -16.9994 2.76915 -16.9994 9.99941c0 0.686781 -0.147067 3.87762 1.23409 7.16443l78.7659 187.443v0.392654z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE8.xml b/data/Leipzig/EBE8.xml
new file mode 100644
index 00000000000..344ce5d1d30
--- /dev/null
+++ b/data/Leipzig/EBE8.xml
@@ -0,0 +1 @@
+<symbol id="EBE8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M51.9994 192c0 -9.69122 2.68532 -19.0747 11.0869 -27.4763c1.40654 -1.40654 2.98092 -2.79013 4.74053 -4.14367c15.7309 -12.7813 22.6559 -14.3806 35.1731 -14.3806c11.5056 0 24.3628 5.92241 32.6933 15.919c7.35835 9.19794 8.30728 19.2245 8.30728 30.0816 c0 11.8338 -5.22379 18.9676 -13.0721 27.8145c-9.56569 7.60375 -19.7537 12.186 -33.9285 12.186c-15.9695 0 -28.2493 -6.15498 -36.977 -14.8827c-6.55323 -6.55323 -8.02354 -13.8173 -8.02354 -25.1179zM39.9994 57c0 -13.044 6.96956 -23.6359 16.0059 -31.7686 c9.2866 -8.35794 20.3489 -11.232 35.9947 -11.232c20.102 0 32.3158 6.78876 43.166 17.639c7.11857 7.11857 11.8346 14.8845 11.8346 25.3616c0 11.0133 -1.22633 16.9831 -4.12191 19.8787c-3.09935 3.09935 -5.15338 8.07694 -8.67646 10.7192 c-3.8997 2.92478 -6.86386 4.90691 -10.7806 7.8357c-6.34884 3.13056 -19.0783 5.47325 -27.8988 7.43912c-3.63566 0.810295 -4.95356 1.12784 -8.52278 1.12784c-6.80358 0 -25.4377 -7.26339 -36.719 -18.5447c-6.83543 -6.83543 -10.2816 -15.2204 -10.2816 -28.4559z M-2.99941 56c0 15.1782 2.87248 29.6765 15.6899 42.4939c2.74316 2.74316 5.87686 5.36513 9.54716 7.93434c11.0552 8.04012 19.4469 13.3091 29.9347 16.4555c3.96942 1.13412 8.15864 1.29443 11.6582 2.17142c-6.54442 4.77272 -17.0529 8.64916 -25.0507 12.2037 c-0.163226 0.072545 -0.321282 0.160375 -0.471989 0.263491c-5.86208 4.01089 -10.9342 8.05325 -15.1843 12.3034c-9.7987 9.7987 -15.1228 20.7633 -15.1228 34.1743c0 21.1795 17.3036 37.4753 32.3711 47.5202c17.4388 11.2839 37.0392 17.4792 58.6284 17.4792 c29.3287 0 54.2945 -7.63584 68.771 -22.1124c9.04274 -9.04274 14.2284 -20.9093 14.2284 -34.887c0 -12.6511 -4.74303 -23.6187 -14.4509 -33.3266c-5.02871 -5.02871 -11.3483 -9.72221 -19.0229 -14.2572c-3.89967 -2.30435 -9.85301 -6.01003 -14.586 -7.27188 c-1.50316 -0.599945 -3.50577 -1.42757 -4.53201 -1.91363c3.28208 -2.38512 10.3078 -5.32418 14.6807 -6.91143c2.9579 -1.07365 5.08104 -1.45615 6.7373 -2.91981c9.73262 -6.01391 18.835 -13.0509 24.7146 -18.9305 c8.50479 -8.50479 15.4593 -24.2883 15.4593 -40.4689c0 -16.3424 -6.90542 -30.9377 -18.3913 -42.4236c-4.11893 -4.11893 -8.72311 -7.77416 -13.9103 -11.0503c-16.898 -11.6174 -43.4327 -15.5255 -68.6978 -15.5255c-23.0825 0 -44.6362 1.86811 -59.5709 11.4423 c-15.5417 9.15472 -33.4285 25.849 -33.4285 47.5571z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBE9.xml b/data/Leipzig/EBE9.xml
new file mode 100644
index 00000000000..9cd94f8ca80
--- /dev/null
+++ b/data/Leipzig/EBE9.xml
@@ -0,0 +1 @@
+<symbol id="EBE9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M109 132.999c3.41418 0 5.99941 -2.58047 5.99941 -5.99941c0 -8.30426 -8.90271 -15.0516 -17.3451 -16.9277c-9.17045 -2.03788 -17.2844 -3.07176 -22.6543 -3.07176c-20.1432 0 -43.9297 2.68996 -57.0335 15.7937c-13.247 12.228 -20.9659 30.288 -20.9659 48.2057 c0 21.2944 10.6894 39.8402 26.0258 53.2595c16.5799 14.5074 42.1154 24.7399 64.9736 24.7399c26.6046 0 55.6606 -8.35346 72.1897 -26.9487c15.6938 -16.74 21.8097 -39.5771 21.8097 -64.0507c0 -6.3061 -1.03631 -17.4876 -4.07715 -31.6782 c-3.05489 -13.2379 -7.12531 -23.5065 -12.3403 -31.8506c-17.7025 -29.873 -43.5079 -51.9634 -73.993 -71.0166c-16.3703 -10.2314 -37.4682 -18.2402 -54.5326 -24.263c-5.22104 -1.95789 -9.42979 -2.34294 -12.3318 -2.34294 c-1.52019 0 -2.55487 0.151846 -3.72446 0.151846c-5.08589 0 -8.99941 4.62292 -8.99941 8.99941c0 2.71308 1.63305 4.92365 3.73597 7.02657c6.08035 6.08035 18.6085 10.9996 27.8514 15.621c29.5237 15.746 49.5195 29.4864 66.9755 53.1033 c17.6711 24.5432 27.4372 52.9492 27.4372 81.2492c0 17.607 -2.75619 26.7594 -10.5653 40.4404c-8.59035 13.2529 -22.1772 26.5602 -40.4353 26.5602c-16.4256 0 -28.7492 -8.46116 -36.4676 -19.6099c-6.82344 -10.7226 -10.533 -19.9402 -10.533 -35.3906 c0 -14.8027 7.45053 -27.4278 16.2003 -36.1777c6.4778 -6.4778 13.0667 -9.82293 21.8002 -9.82293c9.45771 0 21.5864 4 31 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/ED40.xml b/data/Leipzig/ED40.xml
new file mode 100644
index 00000000000..17dbbb53c39
--- /dev/null
+++ b/data/Leipzig/ED40.xml
@@ -0,0 +1 @@
+<symbol id="ED40" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M347 236v-33l-252 -86l252 -84v-33l-347 117zM373 236l347 -119l-347 -117v33l252 84l-252 86v33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/ED41.xml b/data/Leipzig/ED41.xml
new file mode 100644
index 00000000000..a8353868176
--- /dev/null
+++ b/data/Leipzig/ED41.xml
@@ -0,0 +1 @@
+<symbol id="ED41" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M347 -236l-347 119l347 117v-33l-252 -84l252 -86v-33zM373 -236v33l252 86l-252 84v33l347 -117z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland.xml b/data/Leland.xml
new file mode 100644
index 00000000000..cc89b379277
--- /dev/null
+++ b/data/Leland.xml
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bounding-boxes font-family="Leland" units-per-em="1000">
+  <g c="E527" x="-95.0" y="-163.0" w="2032.0" h="426.0" h-a-x="1970" n="dynamicPPPPPP">
+    <a n="opticalCenter" x="4.02" y="0.0"/>
+  </g>
+  <g c="E528" x="-95.0" y="-163.0" w="1708.0" h="425.0" h-a-x="1646" n="dynamicPPPPP">
+    <a n="opticalCenter" x="3.38" y="0.0"/>
+  </g>
+  <g c="E529" x="-95.0" y="-163.0" w="1384.0" h="426.0" h-a-x="1322" n="dynamicPPPP">
+    <a n="opticalCenter" x="2.73" y="0.0"/>
+  </g>
+  <g c="E52A" x="-95.0" y="-163.0" w="1060.0" h="426.0" h-a-x="998" n="dynamicPPP">
+    <a n="opticalCenter" x="2.08" y="0.0"/>
+  </g>
+  <g c="E52B" x="-95.0" y="-163.0" w="736.0" h="426.0" h-a-x="674" n="dynamicPP">
+    <a n="opticalCenter" x="1.43" y="0.0"/>
+  </g>
+  <g c="E52C" x="-7.0" y="-163.0" w="703.0" h="426.0" h-a-x="729" n="dynamicMP">
+    <a n="opticalCenter" x="1.5" y="0.0"/>
+  </g>
+  <g c="E52D" x="-7.0" y="-193.0" w="715.0" h="614.0" h-a-x="741" n="dynamicMF">
+    <a n="opticalCenter" x="1.52" y="0.0"/>
+  </g>
+  <g c="E52E" x="-95.0" y="-193.0" w="791.0" h="614.0" h-a-x="719" n="dynamicPF">
+    <a n="opticalCenter" x="1.54" y="0.0"/>
+  </g>
+  <g c="E52F" x="-137.0" y="-196.0" w="725.0" h="618.0" h-a-x="621" n="dynamicFF">
+    <a n="opticalCenter" x="1.26" y="0.0"/>
+  </g>
+  <g c="E530" x="-137.0" y="-196.0" w="975.0" h="619.0" h-a-x="871" n="dynamicFFF">
+    <a n="opticalCenter" x="1.82" y="0.0"/>
+  </g>
+  <g c="E531" x="-137.0" y="-196.0" w="1225.0" h="619.0" h-a-x="1121" n="dynamicFFFF">
+    <a n="opticalCenter" x="2.32" y="0.0"/>
+  </g>
+  <g c="E532" x="-137.0" y="-199.0" w="1475.0" h="618.0" h-a-x="1371" n="dynamicFFFFF">
+    <a n="opticalCenter" x="2.82" y="0.0"/>
+  </g>
+  <g c="E533" x="-137.0" y="-196.0" w="1725.0" h="619.0" h-a-x="1621" n="dynamicFFFFFF">
+    <a n="opticalCenter" x="3.32" y="0.0"/>
+  </g>
+  <g c="E534" x="-136.0" y="-193.0" w="717.0" h="614.0" h-a-x="614" n="dynamicFortePiano">
+    <a n="opticalCenter" x="1.31" y="0.0"/>
+  </g>
+  <g c="E535" x="-137.0" y="-193.0" w="600.0" h="614.0" h-a-x="480" n="dynamicForzando">
+    <a n="opticalCenter" x="1.07" y="0.0"/>
+  </g>
+  <g c="E536" x="0.0" y="-193.0" w="567.0" h="614.0" h-a-x="600" n="dynamicSforzando1">
+    <a n="opticalCenter" x="1.2" y="0.0"/>
+  </g>
+  <g c="E537" x="0.0" y="-193.0" w="807.0" h="614.0" h-a-x="840" n="dynamicSforzandoPiano">
+    <a n="opticalCenter" x="1.62" y="0.0"/>
+  </g>
+  <g c="E538" x="0.0" y="-193.0" w="1131.0" h="614.0" h-a-x="1164" n="dynamicSforzandoPianissimo">
+    <a n="opticalCenter" x="1.62" y="0.0"/>
+  </g>
+  <g c="E539" x="0.0" y="-193.0" w="698.0" h="614.0" h-a-x="715" n="dynamicSforzato">
+    <a n="opticalCenter" x="1.46" y="0.0"/>
+  </g>
+  <g c="E53A" x="0.0" y="-198.0" w="1012.0" h="614.0" h-a-x="1045" n="dynamicSforzatoPiano">
+    <a n="opticalCenter" x="1.46" y="0.0"/>
+  </g>
+  <g c="E53B" x="0.0" y="-196.0" w="950.0" h="618.0" h-a-x="967" n="dynamicSforzatoFF">
+    <a n="opticalCenter" x="1.97" y="0.0"/>
+  </g>
+  <g c="E53C" x="-12.0" y="-193.0" w="598.0" h="614.0" h-a-x="619" n="dynamicRinforzando1">
+    <a n="opticalCenter" x="1.27" y="0.0"/>
+  </g>
+  <g c="E53D" x="-12.0" y="-193.0" w="728.0" h="614.0" h-a-x="733" n="dynamicRinforzando2">
+    <a n="opticalCenter" x="1.53" y="0.0"/>
+  </g>
+  <g c="E000" x="-1.0" y="4.61" w="63.0" h="990.39" h-a-x="62" n="brace"/>
+  <g c="E003" x="0.0" y="0.0" w="491.0" h="279.0" h-a-x="491" n="bracketTop"/>
+  <g c="E004" x="0.0" y="-279.0" w="491.0" h="279.0" h-a-x="491" n="bracketBottom"/>
+  <g c="E043" x="0.0" y="322.0" w="104.0" h="356.0" h-a-x="104" n="repeatDots"/>
+  <g c="E044" x="0.0" y="-53.0" w="104.0" h="106.0" h-a-x="104" n="repeatDot"/>
+  <g c="E047" x="0.0" y="0.0" w="654.0" h="869.0" h-a-x="654" n="segno"/>
+  <g c="E048" x="0.0" y="-113.0" w="745.0" h="848.0" h-a-x="745" n="coda"/>
+  <g c="E049" x="0.0" y="-113.0" w="738.0" h="848.0" h-a-x="738" n="codaSquare"/>
+  <g c="E04B" x="0.0" y="-281.0" w="554.0" h="1562.0" h-a-x="554" n="segnoSerpent2"/>
+  <g c="E050" x="0.0" y="-666.0" w="640.0" h="1778.0" h-a-x="640" n="gClef"/>
+  <g c="E051" x="0.0" y="-898.0" w="640.0" h="2010.0" h-a-x="640" n="gClef15mb"/>
+  <g c="E052" x="0.0" y="-898.0" w="640.0" h="2011.0" h-a-x="640" n="gClef8vb"/>
+  <g c="E053" x="0.0" y="-666.0" w="640.0" h="2003.0" h-a-x="640" n="gClef8va"/>
+  <g c="E054" x="0.0" y="-667.0" w="640.0" h="2005.0" h-a-x="640" n="gClef15ma"/>
+  <g c="E055" x="0.0" y="-667.0" w="1044.0" h="1779.0" h-a-x="1044" n="gClef8vbOld"/>
+  <g c="E05C" x="0.0" y="-480.0" w="627.0" h="962.0" h-a-x="627" n="cClef"/>
+  <g c="E05D" x="0.0" y="-740.0" w="627.0" h="1222.0" h-a-x="627" n="cClef8vb"/>
+  <g c="E062" x="0.0" y="-617.0" w="664.0" h="868.0" h-a-x="663" n="fClef"/>
+  <g c="E063" x="0.0" y="-744.0" w="663.0" h="995.0" h-a-x="662" n="fClef15mb"/>
+  <g c="E064" x="0.0" y="-742.0" w="664.0" h="993.0" h-a-x="663" n="fClef8vb"/>
+  <g c="E065" x="0.0" y="-616.0" w="665.0" h="1104.0" h-a-x="664" n="fClef8va"/>
+  <g c="E066" x="0.0" y="-616.0" w="665.0" h="1108.0" h-a-x="664" n="fClef15ma"/>
+  <g c="E069" x="0.0" y="-252.0" w="352.0" h="504.0" h-a-x="352" n="unpitchedPercussionClef1"/>
+  <g c="E080" x="15.0" y="-254.0" w="374.0" h="509.0" h-a-x="404" n="timeSig0"/>
+  <g c="E081" x="15.0" y="-243.0" w="321.0" h="488.0" h-a-x="351" n="timeSig1"/>
+  <g c="E082" x="15.0" y="-243.0" w="362.0" h="488.0" h-a-x="392" n="timeSig2"/>
+  <g c="E083" x="14.98" y="-244.0" w="349.02" h="488.0" h-a-x="379" n="timeSig3"/>
+  <g c="E084" x="14.0" y="-248.0" w="428.0" h="497.0" h-a-x="457" n="timeSig4"/>
+  <g c="E085" x="15.0" y="-244.0" w="347.0" h="490.0" h-a-x="377" n="timeSig5"/>
+  <g c="E086" x="15.0" y="-244.0" w="372.0" h="489.0" h-a-x="402" n="timeSig6"/>
+  <g c="E087" x="15.0" y="-250.0" w="351.0" h="501.0" h-a-x="381" n="timeSig7"/>
+  <g c="E088" x="15.0" y="-248.0" w="378.0" h="494.0" h-a-x="408" n="timeSig8"/>
+  <g c="E089" x="15.0" y="-244.0" w="372.0" h="489.0" h-a-x="402" n="timeSig9"/>
+  <g c="E08A" x="0.0" y="-256.0" w="463.0" h="514.0" h-a-x="463" n="timeSigCommon"/>
+  <g c="E08B" x="0.0" y="-376.0" w="463.0" h="764.0" h-a-x="463" n="timeSigCutCommon"/>
+  <g c="E08C" x="0.0" y="-204.0" w="408.0" h="408.0" h-a-x="408" n="timeSigPlus"/>
+  <g c="E0A0" x="0.0" y="-178.0" w="538.0" h="357.0" h-a-x="539" n="noteheadDoubleWhole"/>
+  <g c="E0A1" x="0.0" y="-179.0" w="432.0" h="356.0" h-a-x="432" n="noteheadDoubleWholeSquare"/>
+  <g c="E0A2" x="0.0" y="-134.0" w="373.0" h="270.0" h-a-x="373" n="noteheadWhole">
+    <a n="cutOutNE" x="1.3" y="0.4"/>
+    <a n="cutOutNW" x="0.2" y="0.4"/>
+    <a n="cutOutSW" x="0.21" y="-0.4"/>
+    <a n="stemUpSE" x="1.28" y="-0.4"/>
+  </g>
+  <g c="E0A3" x="0.0" y="-133.0" w="325.0" h="265.0" n="noteheadHalf">
+    <a n="cutOutNE" x="1.18" y="0.42"/>
+    <a n="cutOutNW" x="0.27" y="0.31"/>
+    <a n="cutOutSE" x="1.07" y="-0.28"/>
+    <a n="cutOutSW" x="0.16" y="-0.46"/>
+    <a n="stemDownNW" x="0.0" y="-0.17"/>
+    <a n="stemUpSE" x="1.3" y="0.16"/>
+  </g>
+  <g c="E0A4" x="0.0" y="-133.0" w="325.0" h="265.0" n="noteheadBlack">
+    <a n="cutOutNE" x="1.18" y="0.42"/>
+    <a n="cutOutNW" x="0.27" y="0.31"/>
+    <a n="cutOutSE" x="1.07" y="-0.28"/>
+    <a n="cutOutSW" x="0.16" y="-0.46"/>
+    <a n="stemDownNW" x="0.0" y="-0.17"/>
+    <a n="stemUpSE" x="1.3" y="0.16"/>
+  </g>
+  <g c="E0A5" x="0.0" y="0.0" w="0" h="0.0" h-a-x="0" n="noteheadNull"/>
+  <g c="E0A9" x="0.0" y="-132.0" w="325.0" h="264.0" n="noteheadXBlack">
+    <a n="stemDownNW" x="0.0" y="-0.42"/>
+    <a n="stemUpSE" x="1.3" y="0.42"/>
+  </g>
+  <g c="E0AF" x="0.0" y="-132.0" w="325.0" h="264.0" n="noteheadPlusBlack">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.3" y="0.0"/>
+  </g>
+  <g c="E0D9" x="0.0" y="-132.0" w="335.0" h="265.0" h-a-x="335" n="noteheadDiamondHalf">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.34" y="0.0"/>
+  </g>
+  <g c="E0DB" x="0.0" y="-132.0" w="335.0" h="265.0" h-a-x="335" n="noteheadDiamondBlack">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.34" y="0.0"/>
+  </g>
+  <g c="E220" x="0.0" y="-93.0" w="290.0" h="189.0" h-a-x="290" n="tremolo1"/>
+  <g c="E221" x="0.0" y="-188.0" w="290.0" h="377.0" h-a-x="290" n="tremolo2"/>
+  <g c="E222" x="0.0" y="-283.0" w="290.0" h="566.0" h-a-x="290" n="tremolo3"/>
+  <g c="E223" x="0.0" y="-377.0" w="290.0" h="755.0" h-a-x="290" n="tremolo4"/>
+  <g c="E224" x="0.0" y="-471.0" w="290.0" h="944.0" h-a-x="290" n="tremolo5"/>
+  <g c="E22A" x="-150.0" y="-140.0" w="300.0" h="280.0" h-a-x="150" n="buzzRoll"/>
+  <g c="E240" x="0.0" y="-817.0" w="289.0" h="829.0" h-a-x="289" n="flag8thUp">
+    <a n="stemUpNW" x="0.0" y="-0.01"/>
+  </g>
+  <g c="E241" x="0.0" y="-12.0" w="309.0" h="829.0" h-a-x="309" n="flag8thDown">
+    <a n="stemDownSW" x="0.0" y="0.0"/>
+  </g>
+  <g c="E242" x="0.0" y="-820.0" w="279.0" h="832.0" h-a-x="280" n="flag16thUp">
+    <a n="stemUpNW" x="0.0" y="-0.0"/>
+  </g>
+  <g c="E243" x="0.0" y="-26.0" w="309.0" h="829.0" h-a-x="309" n="flag16thDown">
+    <a n="stemDownSW" x="0.0" y="-0.04"/>
+  </g>
+  <g c="E244" x="0.0" y="-821.0" w="279.0" h="1007.0" h-a-x="279" n="flag32ndUp">
+    <a n="stemUpNW" x="0.0" y="0.69"/>
+  </g>
+  <g c="E245" x="0.0" y="-216.0" w="309.0" h="1019.0" h-a-x="309" n="flag32ndDown">
+    <a n="stemDownSW" x="0.0" y="-0.8"/>
+  </g>
+  <g c="E246" x="0.0" y="-822.0" w="279.0" h="1195.0" h-a-x="279" n="flag64thUp">
+    <a n="stemUpNW" x="0.0" y="1.44"/>
+  </g>
+  <g c="E247" x="0.0" y="-403.0" w="309.0" h="1207.0" h-a-x="309" n="flag64thDown">
+    <a n="stemDownSW" x="0.0" y="-1.54"/>
+  </g>
+  <g c="E248" x="0.0" y="-821.0" w="279.0" h="1394.0" h-a-x="280" n="flag128thUp">
+    <a n="stemUpNW" x="0.0" y="2.24"/>
+  </g>
+  <g c="E249" x="0.0" y="-591.0" w="309.0" h="1394.0" h-a-x="309" n="flag128thDown">
+    <a n="stemDownSW" x="0.0" y="-2.3"/>
+  </g>
+  <g c="E24A" x="0.0" y="-820.08" w="279.0" h="1580.08" h-a-x="280" n="flag256thUp">
+    <a n="stemUpNW" x="0.0" y="2.99"/>
+  </g>
+  <g c="E24B" x="0.0" y="-779.0" w="309.0" h="1582.0" h-a-x="309" n="flag256thDown">
+    <a n="stemDownSW" x="0.0" y="-3.05"/>
+  </g>
+  <g c="E24C" x="0.0" y="-820.0" w="279.0" h="1763.0" h-a-x="279" n="flag512thUp">
+    <a n="stemUpNW" x="0.0" y="3.72"/>
+  </g>
+  <g c="E24D" x="0.0" y="-966.0" w="309.0" h="1770.0" h-a-x="309" n="flag512thDown">
+    <a n="stemDownSW" x="0.0" y="-3.8"/>
+  </g>
+  <g c="E24E" x="0.0" y="-820.0" w="279.0" h="1946.0" h-a-x="279" n="flag1024thUp">
+    <a n="stemUpNW" x="0.0" y="4.45"/>
+  </g>
+  <g c="E24F" x="0.0" y="-1142.0" w="309.0" h="1945.0" h-a-x="309" n="flag1024thDown">
+    <a n="stemDownSW" x="0.0" y="-4.5"/>
+  </g>
+  <g c="E260" x="0.0" y="-176.0" w="203.0" h="629.0" h-a-x="212" n="accidentalFlat">
+    <a n="cutOutNE" x="0.18" y="0.64"/>
+    <a n="cutOutSE" x="0.54" y="-0.42"/>
+  </g>
+  <g c="E261" x="0.0" y="-323.0" w="171.0" h="648.0" h-a-x="171" n="accidentalNatural">
+    <a n="cutOutNE" x="0.13" y="0.76"/>
+    <a n="cutOutSW" x="0.56" y="-0.75"/>
+  </g>
+  <g c="E262" x="0.0" y="-333.0" w="244.0" h="667.0" h-a-x="244" n="accidentalSharp">
+    <a n="cutOutNE" x="0.8" y="0.76"/>
+    <a n="cutOutNW" x="0.18" y="0.64"/>
+    <a n="cutOutSE" x="0.8" y="-0.64"/>
+    <a n="cutOutSW" x="0.18" y="-0.76"/>
+  </g>
+  <g c="E263" x="0.0" y="-137.0" w="275.0" h="275.0" h-a-x="275" n="accidentalDoubleSharp"/>
+  <g c="E264" x="0.0" y="-176.0" w="371.0" h="629.0" h-a-x="371" n="accidentalDoubleFlat">
+    <a n="cutOutNE" x="0.84" y="0.64"/>
+    <a n="cutOutSE" x="1.21" y="-0.42"/>
+  </g>
+  <g c="E265" x="0.0" y="-333.0" w="586.0" h="667.0" h-a-x="586" n="accidentalTripleSharp">
+    <a n="cutOutNE" x="1.0" y="0.56"/>
+    <a n="cutOutNW" x="0.18" y="0.64"/>
+    <a n="cutOutSE" x="1.0" y="-0.57"/>
+    <a n="cutOutSW" x="0.18" y="-0.76"/>
+  </g>
+  <g c="E266" x="0.0" y="-176.0" w="539.0" h="629.0" h-a-x="539" n="accidentalTripleFlat">
+    <a n="cutOutNE" x="1.51" y="0.64"/>
+    <a n="cutOutSE" x="1.88" y="-0.42"/>
+  </g>
+  <g c="E267" x="0.0" y="-323.0" w="440.0" h="776.0" h-a-x="440" n="accidentalNaturalFlat">
+    <a n="cutOutNE" x="1.12" y="0.64"/>
+    <a n="cutOutSE" x="1.49" y="-0.42"/>
+    <a n="cutOutSW" x="0.56" y="-0.75"/>
+  </g>
+  <g c="E268" x="0.0" y="-331.0" w="478.0" h="667.0" h-a-x="478" n="accidentalNaturalSharp">
+    <a n="cutOutNE" x="1.74" y="0.8"/>
+    <a n="cutOutSE" x="1.74" y="-0.63"/>
+    <a n="cutOutSW" x="0.56" y="-0.75"/>
+  </g>
+  <g c="E269" x="0.0" y="-333.0" w="535.0" h="667.0" h-a-x="535" n="accidentalSharpSharp">
+    <a n="cutOutNE" x="1.96" y="0.76"/>
+    <a n="cutOutNW" x="0.18" y="0.64"/>
+    <a n="cutOutSE" x="1.96" y="-0.64"/>
+    <a n="cutOutSW" x="0.18" y="-0.76"/>
+  </g>
+  <g c="E26A" x="0.0" y="-212.0" w="75.0" h="421.41" h-a-x="75" n="accidentalParensLeft"/>
+  <g c="E26B" x="0.0" y="-209.41" w="75.0" h="421.41" h-a-x="75" n="accidentalParensRight"/>
+  <g c="E26C" x="0.0" y="-205.0" w="73.0" h="411.0" h-a-x="73" n="accidentalBracketLeft"/>
+  <g c="E26D" x="0.0" y="-205.0" w="73.0" h="411.0" h-a-x="73" n="accidentalBracketRight"/>
+  <g c="E270" x="0.0" y="-165.0" w="280.0" h="619.0" h-a-x="280" n="accidentalQuarterToneFlatArrowUp">
+    <a n="cutOutNE" x="0.8" y="0.68"/>
+    <a n="cutOutSE" x="0.8" y="-0.42"/>
+    <a n="cutOutSW" x="0.29" y="1.22"/>
+  </g>
+  <g c="E271" x="0.0" y="-448.0" w="280.0" h="911.0" h-a-x="280" n="accidentalThreeQuarterTonesFlatArrowDown">
+    <a n="cutOutNE" x="0.48" y="0.68"/>
+    <a n="cutOutNW" x="0.31" y="-1.19"/>
+    <a n="cutOutSE" x="0.8" y="-0.42"/>
+  </g>
+  <g c="E272" x="0.0" y="-323.0" w="255.0" h="773.0" h-a-x="255" n="accidentalQuarterToneSharpNaturalArrowUp">
+    <a n="cutOutNE" x="0.8" y="0.76"/>
+    <a n="cutOutSW" x="0.31" y="1.2"/>
+  </g>
+  <g c="E273" x="0.0" y="-448.0" w="255.0" h="773.0" h-a-x="255" n="accidentalQuarterToneFlatNaturalArrowDown">
+    <a n="cutOutNE" x="0.7" y="-1.19"/>
+    <a n="cutOutSW" x="0.22" y="-0.75"/>
+  </g>
+  <g c="E274" x="0.0" y="-333.0" w="278.0" h="792.0" h-a-x="278" n="accidentalThreeQuarterTonesSharpArrowUp">
+    <a n="cutOutNE" x="0.92" y="1.64"/>
+    <a n="cutOutNW" x="0.18" y="0.64"/>
+    <a n="cutOutSE" x="0.8" y="-0.64"/>
+    <a n="cutOutSW" x="0.18" y="-0.78"/>
+  </g>
+  <g c="E275" x="0.0" y="-458.0" w="278.0" h="792.0" h-a-x="277" n="accidentalQuarterToneSharpArrowDown">
+    <a n="cutOutNE" x="0.93" y="0.76"/>
+    <a n="cutOutNW" x="0.31" y="0.64"/>
+    <a n="cutOutSE" x="0.8" y="-1.12"/>
+    <a n="cutOutSW" x="0.18" y="-1.6"/>
+  </g>
+  <g c="E280" x="0.0" y="-176.0" w="193.0" h="628.0" h-a-x="193" n="accidentalQuarterToneFlatStein">
+    <a n="cutOutNE" x="0.18" y="0.64"/>
+    <a n="cutOutNW" x="0.62" y="0.62"/>
+    <a n="cutOutSE" x="0.54" y="-0.42"/>
+    <a n="cutOutSW" x="0.27" y="-0.42"/>
+  </g>
+  <g c="E281" x="0.0" y="-176.0" w="422.0" h="628.0" h-a-x="422" n="accidentalThreeQuarterTonesFlatZimmermann">
+    <a n="cutOutNE" x="1.07" y="0.62"/>
+    <a n="cutOutNW" x="0.62" y="0.62"/>
+    <a n="cutOutSE" x="1.42" y="-0.42"/>
+    <a n="cutOutSW" x="0.27" y="-0.42"/>
+  </g>
+  <g c="E282" x="0.0" y="-316.0" w="180.0" h="636.0" h-a-x="180" n="accidentalQuarterToneSharpStein">
+    <a n="cutOutNE" x="0.44" y="0.77"/>
+    <a n="cutOutNW" x="0.28" y="0.69"/>
+    <a n="cutOutSE" x="0.44" y="-0.68"/>
+    <a n="cutOutSW" x="0.28" y="-0.75"/>
+  </g>
+  <g c="E283" x="0.0" y="-328.0" w="290.0" h="667.0" h-a-x="290" n="accidentalThreeQuarterTonesSharpStein">
+    <a n="cutOutNE" x="0.99" y="0.78"/>
+    <a n="cutOutNW" x="0.17" y="0.62"/>
+    <a n="cutOutSE" x="0.99" y="-0.62"/>
+    <a n="cutOutSW" x="0.17" y="-0.78"/>
+  </g>
+  <g c="E440" x="0.0" y="-176.0" w="277.0" h="630.0" h-a-x="277" n="accidentalBuyukMucennebFlat">
+    <a n="cutOutNE" x="0.95" y="0.64"/>
+    <a n="cutOutNW" x="0.28" y="1.46"/>
+    <a n="cutOutSE" x="0.84" y="-0.42"/>
+    <a n="cutOutSW" x="0.28" y="0.6"/>
+  </g>
+  <g c="E442" x="0.0" y="-176.0" w="277.0" h="630.0" h-a-x="277" n="accidentalBakiyeFlat">
+    <a n="cutOutNE" x="0.95" y="0.64"/>
+    <a n="cutOutNW" x="0.28" y="1.08"/>
+    <a n="cutOutSE" x="0.84" y="-0.42"/>
+    <a n="cutOutSW" x="0.28" y="0.69"/>
+  </g>
+  <g c="E446" x="0.0" y="-316.0" w="348.0" h="634.0" h-a-x="348" n="accidentalKucukMucennebSharp">
+    <a n="cutOutNE" x="0.77" y="0.81"/>
+    <a n="cutOutNW" x="0.62" y="0.68"/>
+    <a n="cutOutSE" x="0.76" y="-0.68"/>
+    <a n="cutOutSW" x="0.62" y="-0.8"/>
+  </g>
+  <g c="E447" x="0.0" y="-332.0" w="348.0" h="666.0" h-a-x="348" n="accidentalBuyukMucennebSharp">
+    <a n="cutOutNE" x="1.0" y="0.82"/>
+    <a n="cutOutNW" x="0.39" y="0.62"/>
+    <a n="cutOutSE" x="1.0" y="-0.62"/>
+    <a n="cutOutSW" x="0.39" y="-0.8"/>
+  </g>
+  <g c="E4A0" x="0.0" y="0.0" w="361.0" h="235.0" h-a-x="360" n="articAccentAbove"/>
+  <g c="E4A1" x="0.0" y="-235.0" w="361.0" h="235.0" h-a-x="360" n="articAccentBelow"/>
+  <g c="E4A2" x="-0.25" y="0.0" w="78.5" h="78.0" h-a-x="78" n="articStaccatoAbove"/>
+  <g c="E4A3" x="-0.25" y="-78.0" w="78.5" h="78.0" h-a-x="78" n="articStaccatoBelow"/>
+  <g c="E4A4" x="0.0" y="0.0" w="316.0" h="46.0" h-a-x="316" n="articTenutoAbove"/>
+  <g c="E4A5" x="0.0" y="-46.0" w="316.0" h="46.0" h-a-x="316" n="articTenutoBelow"/>
+  <g c="E4A6" x="0.0" y="0.0" w="127.0" h="248.0" h-a-x="127" n="articStaccatissimoAbove"/>
+  <g c="E4A7" x="0.0" y="-248.0" w="127.0" h="248.0" h-a-x="127" n="articStaccatissimoBelow"/>
+  <g c="E4AC" x="1.0" y="0.0" w="295.0" h="253.0" h-a-x="295" n="articMarcatoAbove"/>
+  <g c="E4AD" x="0.0" y="-253.0" w="295.0" h="253.0" h-a-x="296" n="articMarcatoBelow"/>
+  <g c="E4AE" x="1.0" y="0.0" w="295.0" h="386.0" h-a-x="296" n="articMarcatoStaccatoAbove"/>
+  <g c="E4AF" x="0.0" y="-386.0" w="295.0" h="386.0" h-a-x="296" n="articMarcatoStaccatoBelow"/>
+  <g c="E4B0" x="0.0" y="0.0" w="361.0" h="344.0" h-a-x="360" n="articAccentStaccatoAbove"/>
+  <g c="E4B1" x="0.0" y="-344.0" w="361.0" h="344.0" h-a-x="360" n="articAccentStaccatoBelow"/>
+  <g c="E4B2" x="0.0" y="0.0" w="316.0" h="187.0" h-a-x="316" n="articTenutoStaccatoAbove"/>
+  <g c="E4B3" x="0.0" y="-187.0" w="316.0" h="187.0" h-a-x="316" n="articTenutoStaccatoBelow"/>
+  <g c="E4B4" x="0.0" y="0.0" w="361.0" h="358.0" h-a-x="360" n="articTenutoAccentAbove"/>
+  <g c="E4B5" x="0.0" y="-358.0" w="361.0" h="358.0" h-a-x="360" n="articTenutoAccentBelow"/>
+  <g c="E4B6" x="0.0" y="0.0" w="212.0" h="212.0" h-a-x="212" n="articStressAbove"/>
+  <g c="E4B7" x="0.0" y="-212.0" w="212.0" h="212.0" h-a-x="212" n="articStressBelow"/>
+  <g c="E4B8" x="0.0" y="-162.0" w="342.0" h="162.0" h-a-x="342" n="articUnstressAbove"/>
+  <g c="E4B9" x="0.0" y="0.0" w="342.0" h="162.0" h-a-x="342" n="articUnstressBelow"/>
+  <g c="E4BA" x="0.0" y="0.0" w="488.0" h="122.0" h-a-x="489" n="articLaissezVibrerAbove"/>
+  <g c="E4BB" x="0.0" y="-122.0" w="488.0" h="122.0" h-a-x="489" n="articLaissezVibrerBelow"/>
+  <g c="E4BC" x="0.0" y="0.0" w="316.0" h="369.0" h-a-x="316" n="articMarcatoTenutoAbove"/>
+  <g c="E4BD" x="0.0" y="-369.0" w="316.0" h="369.0" h-a-x="316" n="articMarcatoTenutoBelow"/>
+  <g c="E4C0" x="0.0" y="0.0" w="622.0" h="368.0" h-a-x="622" n="fermataAbove"/>
+  <g c="E4C1" x="0.0" y="-368.0" w="622.0" h="368.0" h-a-x="622" n="fermataBelow"/>
+  <g c="E4C4" x="0.0" y="0.0" w="642.0" h="454.0" h-a-x="642" n="fermataShortAbove"/>
+  <g c="E4C5" x="0.0" y="-454.0" w="642.0" h="454.0" h-a-x="642" n="fermataShortBelow"/>
+  <g c="E4C6" x="0.0" y="0.0" w="623.0" h="368.0" h-a-x="623" n="fermataLongAbove"/>
+  <g c="E4C7" x="0.0" y="-368.0" w="623.0" h="368.0" h-a-x="623" n="fermataLongBelow"/>
+  <g c="E4C8" x="0.0" y="0.0" w="842.0" h="549.0" h-a-x="842" n="fermataVeryLongAbove"/>
+  <g c="E4C9" x="0.0" y="-549.0" w="842.0" h="549.0" h-a-x="842" n="fermataVeryLongBelow"/>
+  <g c="E4E0" x="0.0" y="-250.0" w="450.0" h="500.0" h-a-x="450" n="restMaxima"/>
+  <g c="E4E1" x="0.0" y="-250.0" w="125.0" h="500.0" h-a-x="125" n="restLonga"/>
+  <g c="E4E2" x="0.0" y="-11.0" w="125.0" h="273.0" h-a-x="125" n="restDoubleWhole"/>
+  <g c="E4E3" x="0.0" y="-131.0" w="325.0" h="136.0" n="restWhole"/>
+  <g c="E4E4" x="0.0" y="-4.0" w="325.0" h="136.0" n="restHalf"/>
+  <g c="E4E5" x="0.0" y="-331.0" w="235.0" h="732.0" h-a-x="235" n="restQuarter"/>
+  <g c="E4E6" x="0.0" y="-255.0" w="276.0" h="459.0" h-a-x="276" n="rest8th"/>
+  <g c="E4E7" x="1.0" y="-507.0" w="343.0" h="711.0" h-a-x="344" n="rest16th"/>
+  <g c="E4E8" x="0.0" y="-507.0" w="391.0" h="967.0" h-a-x="391" n="rest32nd"/>
+  <g c="E4E9" x="0.0" y="-758.0" w="423.0" h="1222.0" h-a-x="423" n="rest64th"/>
+  <g c="E4EA" x="-1.0" y="-759.0" w="476.0" h="1476.0" h-a-x="475" n="rest128th"/>
+  <g c="E4EB" x="0.0" y="-998.0" w="527.0" h="1721.0" h-a-x="526" n="rest256th"/>
+  <g c="E4EC" x="0.0" y="-1004.0" w="579.0" h="1971.0" h-a-x="579" n="rest512th"/>
+  <g c="E4ED" x="1.0" y="-1004.0" w="633.0" h="2230.0" h-a-x="634" n="rest1024th"/>
+  <g c="E4F2" x="0.0" y="-255.0" w="276.0" h="459.0" h-a-x="276" n="restQuarterOld"/>
+  <g c="E510" x="0.0" y="0.0" w="332.0" h="433.0" h-a-x="332" n="ottava"/>
+  <g c="E511" x="0.0" y="0.0" w="926.0" h="433.0" h-a-x="926" n="ottavaAlta"/>
+  <g c="E512" x="0.0" y="0.0" w="909.0" h="433.0" h-a-x="909" n="ottavaBassa"/>
+  <g c="E513" x="0.0" y="0.0" w="952.0" h="433.0" h-a-x="952" n="ottavaBassaBa"/>
+  <g c="E514" x="0.0" y="-9.0" w="627.0" h="434.0" h-a-x="627" n="quindicesima"/>
+  <g c="E515" x="0.0" y="-9.0" w="1422.0" h="434.0" h-a-x="1422" n="quindicesimaAlta"/>
+  <g c="E516" x="0.0" y="-9.0" w="1398.0" h="434.0" h-a-x="1398" n="quindicesimaBassa"/>
+  <g c="E517" x="0.0" y="0.0" w="681.0" h="424.0" h-a-x="681" n="ventiduesima"/>
+  <g c="E518" x="0.0" y="0.0" w="1483.0" h="424.0" h-a-x="1483" n="ventiduesimaAlta"/>
+  <g c="E519" x="0.0" y="-7.0" w="1483.0" h="431.0" h-a-x="1483" n="ventiduesimaBassa"/>
+  <g c="E51A" x="0.0" y="-43.0" w="160.0" h="515.0" h-a-x="160" n="octaveParensLeft"/>
+  <g c="E51B" x="0.0" y="-43.0" w="160.0" h="515.0" h-a-x="160" n="octaveParensRight"/>
+  <g c="E51C" x="0.0" y="-21.0" w="866.0" h="454.0" h-a-x="866" n="ottavaBassaVb"/>
+  <g c="E51D" x="0.0" y="-9.0" w="1354.0" h="434.0" h-a-x="1354" n="quindicesimaBassaMb"/>
+  <g c="E51E" x="0.0" y="-7.0" w="1439.0" h="431.0" h-a-x="1439" n="ventiduesimaBassaMb"/>
+  <g c="E520" x="-95.0" y="-163.0" w="412.0" h="426.0" h-a-x="350" n="dynamicPiano">
+    <a n="opticalCenter" x="0.78" y="0.0"/>
+  </g>
+  <g c="E521" x="-7.0" y="-2.0" w="381.0" h="253.0" h-a-x="391" n="dynamicMezzo">
+    <a n="opticalCenter" x="0.79" y="0.0"/>
+  </g>
+  <g c="E522" x="-137.0" y="-193.0" w="471.0" h="614.0" h-a-x="367" n="dynamicForte">
+    <a n="opticalCenter" x="0.81" y="0.0"/>
+  </g>
+  <g c="E523" x="-12.0" y="0.0" w="242.0" h="254.0" h-a-x="247" n="dynamicRinforzando">
+    <a n="opticalCenter" x="0.56" y="0.0"/>
+  </g>
+  <g c="E524" x="0.0" y="-5.0" w="208.0" h="268.0" h-a-x="208" n="dynamicSforzando">
+    <a n="opticalCenter" x="0.48" y="0.0"/>
+  </g>
+  <g c="E525" x="-42.0" y="-1.0" w="281.0" h="258.0" h-a-x="256" n="dynamicZ">
+    <a n="opticalCenter" x="0.6" y="0.0"/>
+  </g>
+  <g c="E526" x="-12.0" y="-1.0" w="267.0" h="255.0" h-a-x="272" n="dynamicNiente">
+    <a n="opticalCenter" x="0.54" y="0.0"/>
+  </g>
+  <g c="E566" x="-12.0" y="0.0" w="395.0" h="383.0" h-a-x="433" n="ornamentTrill"/>
+  <g c="E567" x="0.0" y="0.0" w="456.0" h="232.0" h-a-x="456" n="ornamentTurn"/>
+  <g c="E568" x="0.0" y="0.0" w="456.0" h="232.0" h-a-x="456" n="ornamentTurnInverted"/>
+  <g c="E569" x="0.0" y="-80.0" w="456.0" h="393.0" h-a-x="456" n="ornamentTurnSlash"/>
+  <g c="E56A" x="0.0" y="0.0" w="232.0" h="456.0" h-a-x="232" n="ornamentTurnUp"/>
+  <g c="E56B" x="0.0" y="0.0" w="232.0" h="456.0" h-a-x="232" n="ornamentTurnUpS"/>
+  <g c="E56C" x="0.0" y="0.0" w="473.0" h="248.0" h-a-x="473" n="ornamentShortTrill"/>
+  <g c="E56D" x="0.0" y="-77.0" w="473.0" h="393.0" h-a-x="473" n="ornamentMordent"/>
+  <g c="E56E" x="0.0" y="0.0" w="654.0" h="248.0" h-a-x="654" n="ornamentTremblement"/>
+  <g c="E5B2" x="0.0" y="0.0" w="680.0" h="388.0" h-a-x="680" n="ornamentPrecompAppoggTrill"/>
+  <g c="E5B5" x="0.0" y="-158.0" w="662.0" h="406.0" h-a-x="662" n="ornamentPrecompSlideTrillDAnglebert"/>
+  <g c="E5B8" x="0.0" y="-158.0" w="662.0" h="479.0" h-a-x="662" n="ornamentPrecompSlideTrillBach"/>
+  <g c="E5BB" x="0.0" y="0.0" w="662.0" h="406.0" h-a-x="662" n="ornamentPrecompTrillSuffixDandrieu"/>
+  <g c="E5BD" x="0.0" y="-73.0" w="653.0" h="393.0" h-a-x="653" n="ornamentPrecompTrillWithMordent"/>
+  <g c="E5C6" x="-1.0" y="0.0" w="703.0" h="389.0" h-a-x="702" n="ornamentPrecompMordentUpperPrefix"/>
+  <g c="E5C7" x="-0.03" y="-72.0" w="703.03" h="461.0" h-a-x="703" n="ornamentPrecompInvertedMordentUpperPrefix"/>
+  <g c="E5C8" x="0.0" y="-172.0" w="565.0" h="421.0" h-a-x="565" n="ornamentPrecompTrillLowerSuffix"/>
+  <g c="E5E5" x="0.0" y="0.0" w="312.0" h="312.0" h-a-x="312" n="brassMuteClosed"/>
+  <g c="E610" x="0.0" y="0.0" w="315.0" h="293.0" h-a-x="315" n="stringsDownBow"/>
+  <g c="E611" x="0.0" y="0.0" w="315.0" h="293.0" h-a-x="315" n="stringsDownBowTurned"/>
+  <g c="E612" x="0.0" y="0.0" w="262.0" h="343.0" h-a-x="262" n="stringsUpBow"/>
+  <g c="E613" x="0.0" y="37.0" w="262.0" h="343.0" h-a-x="262" n="stringsUpBowTurned"/>
+  <g c="E614" x="0.0" y="0.0" w="181.0" h="181.0" h-a-x="181" n="stringsHarmonic"/>
+  <g c="E630" x="0.0" y="0.0" w="269.0" h="389.0" h-a-x="269" n="pluckedSnapPizzicatoBelow"/>
+  <g c="E631" x="0.0" y="0.0" w="269.0" h="389.0" h-a-x="269" n="pluckedSnapPizzicatoAbove"/>
+  <g c="E632" x="0.0" y="0.0" w="389.0" h="269.0" h-a-x="389" n="pluckedBuzzPizzicato"/>
+  <g c="E650" x="0.0" y="-10.0" w="981.0" h="555.0" h-a-x="981" n="keyboardPedalPed"/>
+  <g c="E651" x="0.0" y="-10.0" w="450.0" h="555.0" h-a-x="450" n="keyboardPedalP"/>
+  <g c="E655" x="0.0" y="0.0" w="473.0" h="473.0" h-a-x="473" n="keyboardPedalUp"/>
+  <g c="E880" x="0.0" y="-7.0" w="273.0" h="370.0" h-a-x="273" n="tuplet0"/>
+  <g c="E881" x="0.0" y="0.0" w="239.0" h="363.0" h-a-x="239" n="tuplet1"/>
+  <g c="E882" x="0.0" y="0.0" w="297.0" h="362.0" h-a-x="297" n="tuplet2"/>
+  <g c="E883" x="0.0" y="-8.0" w="279.0" h="370.0" h-a-x="279" n="tuplet3"/>
+  <g c="E884" x="0.0" y="0.0" w="286.0" h="363.0" h-a-x="286" n="tuplet4"/>
+  <g c="E885" x="0.0" y="-6.0" w="295.0" h="370.0" h-a-x="295" n="tuplet5"/>
+  <g c="E886" x="0.0" y="-5.0" w="279.0" h="370.0" h-a-x="279" n="tuplet6"/>
+  <g c="E887" x="0.0" y="-5.0" w="272.0" h="370.0" h-a-x="272" n="tuplet7"/>
+  <g c="E888" x="0.0" y="-5.0" w="283.0" h="370.0" h-a-x="283" n="tuplet8"/>
+  <g c="E889" x="0.0" y="0.0" w="279.0" h="370.0" h-a-x="279" n="tuplet9"/>
+  <g c="E88A" x="0.0" y="58.0" w="111.0" h="210.0" h-a-x="111" n="tupletColon"/>
+  <g c="E93C" x="0.0" y="-132.0" w="335.0" h="265.0" n="mensuralNoteheadMinimaWhite">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.37" y="0.0"/>
+  </g>
+  <g c="E93D" x="0.0" y="-132.0" w="335.0" h="265.0" n="mensuralNoteheadSemiminimaWhite">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.37" y="0.0"/>
+  </g>
+  <g c="EAA4" x="-27.0" y="117.0" w="264.0" h="164.0" h-a-x="220" n="wiggleTrill">
+    <a n="repeatOffset" x="0.88" y="0.0"/>
+  </g>
+  <g c="EAA9" x="-22.0" y="0.0" w="264.0" h="164.0" h-a-x="220" n="wiggleArpeggiatoUp">
+    <a n="repeatOffset" x="0.88" y="0.0"/>
+  </g>
+  <g c="EAAA" x="-22.0" y="0.0" w="264.0" h="164.0" h-a-x="220" n="wiggleArpeggiatoDown">
+    <a n="repeatOffset" x="0.88" y="0.0"/>
+  </g>
+  <g c="EAAD" x="-24.0" y="-83.0" w="283.0" h="343.0" h-a-x="259" n="wiggleArpeggiatoUpArrow"/>
+  <g c="EAAE" x="-24.0" y="-84.0" w="283.0" h="343.0" h-a-x="259" n="wiggleArpeggiatoDownArrow"/>
+  <g c="E0F5" x="0.0" y="-212.0" w="75.0" h="421.41" h-a-x="75" n="noteheadParenthesisLeft"/>
+  <g c="E0F6" x="0.0" y="-209.41" w="75.0" h="421.41" h-a-x="75" n="noteheadParenthesisRight"/>
+  <g c="E4F6" x="0.0" y="-202.0" w="317.0" h="409.0" h-a-x="317" n="restQuarterZ"/>
+  <g c="E06A" x="0.0" y="-438.0" w="304.0" h="877.0" h-a-x="304" n="unpitchedPercussionClef2"/>
+  <g c="E4CE" x="0.0" y="0.0" w="191.0" h="321.0" h-a-x="191" n="breathMarkComma"/>
+  <g c="E500" x="0.0" y="-250.0" w="481.0" h="500.0" h-a-x="481" n="repeat1Bar"/>
+  <g c="E501" x="0.0" y="-250.0" w="735.0" h="500.0" h-a-x="735" n="repeat2Bars"/>
+  <g c="E502" x="0.0" y="-250.0" w="1243.0" h="500.0" h-a-x="1243" n="repeat4Bars"/>
+  <g c="E4A8" x="0.0" y="0.0" w="122.0" h="254.0" h-a-x="122" n="articStaccatissimoWedgeAbove"/>
+  <g c="E4A9" x="0.0" y="-254.0" w="122.0" h="254.0" h-a-x="122" n="articStaccatissimoWedgeBelow"/>
+  <g c="E56F" x="0.0" y="-13.0" w="503.0" h="250.0" h-a-x="503" n="ornamentHaydn"/>
+  <g c="E587" x="0.0" y="0.0" w="751.0" h="473.0" h-a-x="591" n="ornamentSchleifer"/>
+  <g c="E5E6" x="0.0" y="0.0" w="280.0" h="280.0" h-a-x="280" n="brassMuteHalfClosed"/>
+  <g c="E5E7" x="0.0" y="0.0" w="280.0" h="280.0" h-a-x="280" n="brassMuteOpen"/>
+  <g c="E59D" x="-43.0" y="0.0" w="231.0" h="247.0" h-a-x="172" n="ornamentZigZagLineNoRightEnd">
+    <a n="repeatOffset" x="0.69" y="0.0"/>
+  </g>
+  <g c="E5BC" x="0.0" y="-72.0" w="918.0" h="393.0" h-a-x="918" n="ornamentPrecompPortDeVoixMordent"/>
+  <g c="E59E" x="-2.0" y="0.0" w="263.0" h="248.0" h-a-x="261" n="ornamentZigZagLineWithRightEnd"/>
+  <g c="E5C0" x="0.0" y="0.0" w="884.0" h="248.0" h-a-x="884" n="ornamentPrecompDoubleCadenceLowerPrefix"/>
+  <g c="E5C3" x="0.0" y="0.0" w="857.0" h="248.0" h-a-x="857" n="ornamentPrecompDoubleCadenceUpperPrefix"/>
+  <g c="E5BE" x="0.0" y="0.0" w="704.0" h="248.0" h-a-x="704" n="ornamentPrecompCadence"/>
+  <g c="E583" x="0.0" y="109.0" w="37.0" h="280.0" h-a-x="37" n="ornamentVerticalLine"/>
+  <g c="E503" x="1.0" y="62.0" w="126.0" h="126.0" h-a-x="127" n="repeatBarUpperDot"/>
+  <g c="E504" x="0.0" y="-250.0" w="481.0" h="500.0" h-a-x="481" n="repeatBarSlash"/>
+  <g c="E505" x="1.0" y="-190.0" w="126.0" h="126.0" h-a-x="127" n="repeatBarLowerDot"/>
+</bounding-boxes>
diff --git a/data/Leland/E000.xml b/data/Leland/E000.xml
new file mode 100644
index 00000000000..261518ed78e
--- /dev/null
+++ b/data/Leland/E000.xml
@@ -0,0 +1 @@
+<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 500c18 -19 53 -57 53 -130c0 -91 -39 -183 -39 -240c0 -61 35 -118 37 -120v-2c1 -1 0 -2 -1 -3s-3 0 -4 2c-1 1 -55 56 -55 137c0 88 35 150 35 265c0 22 -9 57 -34 88c-1 1 -2 2 -2 3c1 1 1 3 2 3c25 31 34 66 34 88c0 115 -35 177 -35 265c0 82 54 136 55 137 c1 2 3 2 4 2c1 -1 1 -2 1 -3v-2c-2 -2 -37 -59 -37 -120c0 -57 39 -149 39 -240c0 -72 -35 -111 -53 -130z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E003.xml b/data/Leland/E003.xml
new file mode 100644
index 00000000000..48d97c3678d
--- /dev/null
+++ b/data/Leland/E003.xml
@@ -0,0 +1 @@
+<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 277c4 -3 7 -7 7 -12c0 -2 -1 -4 -1 -5c-1 -3 -60 -260 -368 -260h-122v104c0 8 6 13 14 13h159c191 0 291 154 293 157c2 4 7 5 11 5c2 0 5 -1 7 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E004.xml b/data/Leland/E004.xml
new file mode 100644
index 00000000000..f33648c1f0f
--- /dev/null
+++ b/data/Leland/E004.xml
@@ -0,0 +1 @@
+<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 -277c-2 -1 -5 -2 -7 -2c-4 0 -9 1 -11 5c-2 3 -102 157 -293 157h-159c-8 0 -14 5 -14 13v104h122c308 0 367 -257 368 -260c0 -1 1 -3 1 -5c0 -5 -3 -9 -7 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E043.xml b/data/Leland/E043.xml
new file mode 100644
index 00000000000..319a593ab9d
--- /dev/null
+++ b/data/Leland/E043.xml
@@ -0,0 +1 @@
+<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M104 625c0 -29 -23 -53 -52 -53s-52 24 -52 53s23 53 52 53s52 -24 52 -53zM104 375c0 -29 -23 -53 -52 -53s-52 24 -52 53s23 53 52 53s52 -24 52 -53z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E044.xml b/data/Leland/E044.xml
new file mode 100644
index 00000000000..7ce0b40bb71
--- /dev/null
+++ b/data/Leland/E044.xml
@@ -0,0 +1 @@
+<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M104 0c0 -29 -23 -53 -52 -53s-52 24 -52 53s23 53 52 53s52 -24 52 -53z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E047.xml b/data/Leland/E047.xml
new file mode 100644
index 00000000000..6df2fec4d13
--- /dev/null
+++ b/data/Leland/E047.xml
@@ -0,0 +1 @@
+<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 479l191 -98c56 -29 84 -85 84 -164s-49 -199 -203 -199c-153 0 -167 76 -171 95c-1 3 -1 6 -1 10c0 34 26 59 60 59s67 -24 77 -59c12 -40 38 -63 74 -63c40 0 95 31 95 118c0 43 -43 73 -96 102l-172 89l-205 -362c-2 -3 -6 -6 -9 -7c-4 0 -8 0 -11 2l-15 11 c-3 2 -6 7 -6 11c0 2 0 5 1 7l204 360l-189 99c-58 33 -87 83 -87 162s50 199 204 199c153 0 167 -76 171 -95c1 -3 1 -6 1 -9c0 -36 -26 -61 -61 -61c-34 0 -67 24 -77 59c-12 40 -38 64 -74 64c-40 0 -95 -31 -95 -118c0 -49 33 -68 82 -94l187 -96l204 361c2 4 8 7 12 7 c2 0 6 -1 8 -2l16 -11c3 -2 6 -8 6 -12c0 -2 -1 -4 -2 -6zM573 488c-34 0 -64 30 -64 64c0 35 29 65 64 65s64 -30 64 -65c0 -34 -30 -64 -64 -64zM82 289c-35 0 -65 29 -65 64s30 64 65 64c34 0 64 -30 64 -64s-30 -64 -64 -64z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E048.xml b/data/Leland/E048.xml
new file mode 100644
index 00000000000..0a6e6a1ef5b
--- /dev/null
+++ b/data/Leland/E048.xml
@@ -0,0 +1 @@
+<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M642 324h90c8 0 13 -6 13 -14v-10c0 -8 -5 -14 -13 -14h-91c-11 -154 -118 -277 -252 -286v-99c0 -8 -6 -14 -14 -14h-11c-8 0 -13 6 -13 14v99c-131 12 -236 134 -247 286h-90c-8 0 -14 6 -14 14v10c0 8 6 14 14 14h90c6 157 112 285 247 298v99c0 8 5 14 13 14h11 c8 0 14 -6 14 -14v-99c137 -10 247 -138 253 -298zM389 324h148c0 142 -40 257 -148 268v-268zM351 324v267c-103 -14 -142 -127 -142 -267h142zM351 286h-142c0 -134 45 -241 142 -255v255zM389 286v-255c101 11 147 118 147 255h-147z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E049.xml b/data/Leland/E049.xml
new file mode 100644
index 00000000000..2dd260aab39
--- /dev/null
+++ b/data/Leland/E049.xml
@@ -0,0 +1 @@
+<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M632 324h93c8 0 13 -5 13 -13v-12c0 -8 -5 -13 -13 -13h-93v-256c0 -17 -13 -30 -30 -30h-213v-99c0 -8 -6 -14 -14 -14h-11c-8 0 -14 6 -14 14v99h-214c-17 0 -30 13 -30 30v256h-92c-8 0 -14 5 -14 13v12c0 8 6 13 14 13h92v268c0 17 13 30 30 30h214v99 c0 8 6 14 14 14h11c8 0 14 -6 14 -14v-99h213c17 0 30 -13 30 -30v-268zM526 324v268h-137v-268h137zM350 324v268h-137v-268h137zM213 286v-256h137v256h-137zM389 286v-256h137v256h-137z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E04B.xml b/data/Leland/E04B.xml
new file mode 100644
index 00000000000..972b42ffd3c
--- /dev/null
+++ b/data/Leland/E04B.xml
@@ -0,0 +1 @@
+<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M225 101v-97c0 -7 -6 -13 -12 -13h-11c-7 0 -13 6 -13 13v112c-100 42 -189 103 -189 217c0 112 61 165 89 187c-54 46 -89 112 -89 174c0 86 19 127 76 183c-46 43 -76 115 -76 181c0 106 69 223 231 223c175 0 228 -64 251 -106c9 -17 16 -35 16 -53 c0 -46 -31 -64 -73 -64c-48 0 -78 33 -98 89c-16 44 -43 86 -120 86s-127 -46 -127 -105c0 -95 63 -134 109 -159v34c0 6 6 12 13 12h11c7 0 12 -6 12 -12v-54c26 -14 55 -28 104 -49v103c0 6 6 12 13 12h10c7 0 13 -6 13 -12v-118c100 -43 189 -104 189 -218 c0 -108 -57 -161 -86 -184c51 -39 86 -89 86 -161c0 -111 -61 -164 -88 -187c53 -45 88 -121 88 -193c0 -90 -49 -223 -230 -223c-88 0 -265 40 -265 157c0 35 19 68 56 73c74 0 89 -25 113 -95c18 -54 42 -87 119 -87s128 39 128 98c0 95 -63 142 -110 167v-28 c0 -7 -5 -13 -13 -13h-10c-8 0 -13 6 -13 13v48c-26 14 -55 28 -104 49zM189 624v177c-30 15 -59 32 -84 52c-3 -2 -25 -20 -25 -62c0 -95 62 -142 109 -167zM329 555v179c-34 16 -75 36 -104 49v-179c26 -14 55 -28 104 -49zM365 716l1 -177c27 -11 53 -24 77 -39 c3 2 32 18 32 73c0 84 -45 111 -110 143zM79 427c0 -76 50 -112 110 -142v170c-26 14 -52 29 -76 46c-4 -1 -34 -15 -34 -74zM225 438v-171c35 -17 75 -36 104 -50v172c-34 16 -75 36 -104 49zM442 154c3 2 33 24 33 74c0 97 -56 114 -86 131c-5 2 -13 7 -24 12v-171 c27 -13 53 -28 77 -46z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E050.xml b/data/Leland/E050.xml
new file mode 100644
index 00000000000..cb6519ba73f
--- /dev/null
+++ b/data/Leland/E050.xml
@@ -0,0 +1 @@
+<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M123 -513c0 66 44 123 114 123c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 0 -5 -1 -5 -3c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 155 55 155 159c0 53 -12 123 -31 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 322 217 406c21 17 73 70 74 71 c-17 112 -22 161 -22 215c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -178 -395c8 -56 18 -115 28 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141 c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153zM332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 70 -24 118 -39 118c-52 0 -98 -105 -107 -145zM420 -206l-58 329c-58 -14 -104 -63 -104 -124 c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166c0 94 62 190 153 217c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM562 -21c0 89 -65 150 -155 150 c7 -44 34 -203 55 -323c71 29 100 102 100 173z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E051.xml b/data/Leland/E051.xml
new file mode 100644
index 00000000000..4595de8156a
--- /dev/null
+++ b/data/Leland/E051.xml
@@ -0,0 +1 @@
+<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M269 773c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -178 -395c8 -56 18 -115 28 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141 c0 -63 -14 -129 -68 -167c-43 -26 -87 -34 -136 -34l-48 -179c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19l-3 -23h-139l3 23h18c12 0 19 0 22 2c2 2 3 5 5 12l35 132c2 6 2 9 2 11c0 3 0 5 -11 5h-32l6 22h2c30 0 70 11 84 21c-81 11 -154 65 -154 152c0 66 44 123 114 123 c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 0 -5 -1 -5 -3c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 155 55 155 159c0 53 -12 123 -31 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 322 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215z M332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 70 -24 118 -39 118c-52 0 -98 -105 -107 -145zM420 -206l-58 329c-58 -14 -104 -63 -104 -124c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166 c0 94 62 190 153 217c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM562 -21c0 13 -1 23 -2 32c-9 48 -52 118 -153 118c7 -44 34 -203 55 -323c71 29 100 102 100 173zM329 -867c0 -3 11 -9 24 -9 c27 0 48 29 48 67c0 24 -11 38 -29 38c-8 0 -12 -1 -27 -7c-2 -12 -9 -19 -19 -19c-8 0 -13 6 -13 14c0 7 4 13 13 17l29 103l3 -1c26 -6 48 -9 69 -9c16 0 29 2 43 8c3 1 3 1 4 1c3 0 5 -2 5 -5c0 -39 -47 -54 -77 -54c-14 0 -15 0 -38 5l-10 -34c14 5 24 7 38 7 c35 0 67 -22 67 -60c0 -57 -45 -93 -99 -93c-42 0 -68 21 -68 53c0 21 13 34 32 34c16 0 28 -10 28 -26c0 -13 -10 -25 -21 -27c-2 -1 -2 -1 -2 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E052.xml b/data/Leland/E052.xml
new file mode 100644
index 00000000000..58413ab1758
--- /dev/null
+++ b/data/Leland/E052.xml
@@ -0,0 +1 @@
+<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M640 3c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89c10 -57 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 114 123c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 4 -2c1 -1 22 -6 47 -6 c100 0 154 55 154 159c0 53 -12 123 -30 219c-24 -4 -51 -7 -80 -7c-186 0 -349 147 -349 335c0 199 126 321 217 405c21 18 73 71 74 71c-17 113 -22 162 -22 216c0 84 18 211 83 287c32 39 64 52 71 52c17 0 46 -36 70 -87c17 -36 45 -109 45 -201 c0 -158 -74 -284 -179 -395c9 -55 18 -115 28 -175c146 0 253 -102 253 -252zM332 822c-7 -31 -11 -64 -11 -102c0 -41 5 -81 11 -121c69 69 147 147 147 250c0 70 -25 118 -40 118c-52 0 -97 -105 -107 -145zM362 -212c20 0 38 2 58 7l-58 328c-58 -14 -104 -63 -104 -124 c0 -48 22 -75 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 216c-6 42 -14 88 -23 142c-15 -14 -31 -29 -48 -43c-87 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 28 101 101 101 173c0 12 -2 23 -3 31 c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322zM423 -717c0 -24 -14 -40 -43 -53c18 -13 28 -32 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 31 27 51 53 61c-15 14 -22 28 -22 47c0 45 41 71 83 71c33 0 67 -16 67 -53zM361 -757c15 12 21 23 21 39 c0 21 -11 33 -31 33s-34 -13 -34 -31c0 -12 5 -19 21 -28l1 -1c3 -2 7 -4 22 -12zM323 -877c22 0 38 15 38 34c0 14 -7 24 -27 35c-2 2 -2 2 -14 8c-3 1 -4 2 -8 4c-17 -10 -26 -27 -26 -46c0 -21 15 -35 37 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E053.xml b/data/Leland/E053.xml
new file mode 100644
index 00000000000..5e1f94ec52e
--- /dev/null
+++ b/data/Leland/E053.xml
@@ -0,0 +1 @@
+<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M640 3c0 -104 -73 -205 -171 -238c6 -38 12 -69 15 -89c10 -56 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s44 123 114 123c75 0 116 -57 116 -110c0 -64 -47 -105 -94 -112c-3 -1 -5 -2 -5 -3c0 -2 2 -3 3 -3c2 -1 23 -6 47 -6 c101 0 155 55 155 159c0 53 -12 124 -31 220c-23 -5 -50 -8 -79 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 70c-17 113 -22 162 -22 216c0 110 29 267 131 330c-39 3 -64 24 -65 54c0 31 27 51 53 62c-15 13 -21 27 -22 46c0 45 41 71 83 71 c33 0 67 -16 67 -53c0 -24 -14 -40 -43 -52c18 -14 28 -33 28 -56c0 -35 -25 -61 -64 -69c17 -13 38 -43 56 -81c16 -36 44 -109 44 -200c0 -159 -73 -285 -178 -396c8 -55 18 -114 28 -175c146 0 253 -102 253 -252zM444 1316c-20 0 -34 -12 -34 -30c0 -13 5 -20 21 -29 l1 -1c3 -2 7 -4 22 -12c15 12 21 23 21 39c0 21 -11 33 -31 33zM379 1160c0 -22 15 -36 37 -36s38 15 38 34c0 14 -7 24 -26 35h-1c-2 2 -2 2 -14 8c-3 2 -4 2 -8 4c-17 -10 -26 -26 -26 -45zM332 822c-8 -31 -11 -64 -11 -102c0 -41 5 -80 11 -121c69 69 146 147 146 251 c0 69 -24 118 -39 118c-52 0 -98 -105 -107 -146zM362 -212c19 0 38 3 58 7l-58 328c-58 -14 -104 -62 -104 -124c0 -48 22 -74 61 -98c12 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-7 41 -14 87 -23 141 c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 29 100 101 100 173c0 12 -1 23 -2 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E054.xml b/data/Leland/E054.xml
new file mode 100644
index 00000000000..93f2da49f97
--- /dev/null
+++ b/data/Leland/E054.xml
@@ -0,0 +1 @@
+<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 1131l-3 -23h-139l3 23h19c12 0 20 1 22 3c2 1 2 3 4 7c0 1 1 6 4 16l32 120c2 6 2 9 2 11c0 3 0 6 -11 6h-33l6 21h2c31 0 72 12 86 22v1h18l-49 -182c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19zM640 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89 c10 -56 16 -102 16 -141c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153s44 124 114 124c75 0 116 -58 116 -111c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -6 47 -6c101 0 155 55 155 159c0 53 -12 124 -30 220 c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 82 287c27 32 53 46 66 51c-20 8 -31 24 -31 45s13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27c-2 -1 -2 -2 -2 -3c0 -4 10 -9 23 -9 c27 0 49 29 49 67c0 24 -11 38 -30 38c-7 0 -12 -1 -26 -7c-2 -12 -9 -19 -20 -19c-7 0 -13 6 -13 14c0 7 4 13 13 17l30 103l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8c2 1 3 1 4 1c2 0 4 -2 4 -5c0 -11 -8 -27 -19 -37c-14 -12 -31 -17 -58 -17c-14 0 -14 0 -38 5l-9 -34 c14 5 25 7 38 7c37 0 67 -21 67 -60c0 -56 -46 -93 -100 -93c-5 0 -10 1 -15 1c17 -13 37 -42 54 -79c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c8 -55 18 -114 28 -174c146 0 253 -103 253 -253zM332 821c-7 -30 -11 -64 -11 -102c0 -41 5 -80 11 -121 c69 69 147 147 147 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM362 -212c19 0 38 2 58 6l-58 329c-58 -15 -104 -63 -104 -125c0 -48 22 -74 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-7 41 -14 87 -23 141 c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -307c0 -152 122 -251 265 -251zM462 -194c71 29 100 101 100 173c0 12 -1 23 -2 32c-9 47 -52 118 -153 118c7 -45 34 -204 55 -323z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E055.xml b/data/Leland/E055.xml
new file mode 100644
index 00000000000..50e80c19db0
--- /dev/null
+++ b/data/Leland/E055.xml
@@ -0,0 +1 @@
+<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1044 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 16 -89c9 -57 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -111c0 -63 -47 -104 -94 -111c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6 c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-74 0 -145 24 -203 64c-24 -20 -51 -36 -81 -46c7 -38 12 -69 16 -89c9 -57 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -111 c0 -63 -47 -104 -94 -111c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 83 288 c33 38 64 51 71 51c18 0 47 -36 70 -87c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -174c18 0 35 -2 51 -5c44 105 122 179 183 237c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 83 288c33 38 64 51 71 51c18 0 47 -36 70 -87 c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -174c146 0 253 -103 253 -253zM736 821c-7 -30 -11 -64 -11 -102c0 -41 6 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM332 821c-7 -30 -11 -64 -11 -102 c0 -41 6 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM676 346c-47 -40 -92 -90 -126 -145c27 -21 48 -47 63 -78c25 58 73 107 133 125c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43zM362 -213c20 0 38 3 58 7l-57 328 c-59 -14 -104 -62 -104 -124c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -134 96 -134 167c0 93 61 190 152 217c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43c-88 -77 -175 -186 -175 -308c0 -151 122 -251 265 -251zM462 -194 c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323zM866 -194c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323zM766 -213c20 0 38 3 58 7l-57 328c-59 -14 -104 -62 -104 -124 c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-42 0 -77 27 -100 62c-10 -27 -23 -53 -41 -76c48 -40 111 -63 179 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E05C.xml b/data/Leland/E05C.xml
new file mode 100644
index 00000000000..c731b84a229
--- /dev/null
+++ b/data/Leland/E05C.xml
@@ -0,0 +1 @@
+<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 30 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13 c-11 56 -33 151 -92 175v-436c0 -7 -5 -13 -12 -13s-13 6 -13 13v910c0 7 6 13 13 13s12 -6 12 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73 c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM13 469h72c7 0 13 -6 13 -13v-910 c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E05D.xml b/data/Leland/E05D.xml
new file mode 100644
index 00000000000..f60640ea965
--- /dev/null
+++ b/data/Leland/E05D.xml
@@ -0,0 +1 @@
+<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 30 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13 c-11 56 -33 151 -92 175v-436c0 -7 -6 -13 -13 -13s-12 6 -12 13v910c0 7 5 13 12 13s13 -6 13 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73 c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM13 469h72c7 0 13 -6 13 -13v-910 c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13zM368 -559c0 -24 -14 -41 -43 -53c18 -13 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 21 -74 54c0 31 28 50 53 62c-15 14 -22 27 -22 46c0 46 41 72 83 72c31 0 67 -18 67 -53zM283 -587l1 -1l22 -11 c16 12 21 23 21 39c0 21 -11 32 -31 32s-34 -12 -34 -30c0 -13 5 -20 21 -29zM257 -639c-17 -10 -26 -26 -26 -45c0 -21 15 -35 37 -35s38 14 38 33c0 14 -7 25 -26 36h-1l-14 7c-3 2 -4 2 -8 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E062.xml b/data/Leland/E062.xml
new file mode 100644
index 00000000000..2e654395f40
--- /dev/null
+++ b/data/Leland/E062.xml
@@ -0,0 +1 @@
+<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 251c180 0 274 -112 274 -286c0 -184 -158 -362 -298 -463c-91 -71 -205 -118 -207 -118l-3 -1c-7 0 -16 2 -19 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109 c8 7 25 17 35 21c9 3 20 5 32 5c56 0 106 -47 106 -104c0 -66 -50 -109 -114 -109c-74 0 -116 54 -116 127s38 139 97 182c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51 s-22 -51 -48 -51s-48 23 -48 51z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E063.xml b/data/Leland/E063.xml
new file mode 100644
index 00000000000..0ed47a1759e
--- /dev/null
+++ b/data/Leland/E063.xml
@@ -0,0 +1 @@
+<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M253 251c180 0 275 -111 275 -286c0 -67 -25 -145 -69 -220c-59 -100 -135 -174 -229 -242c-91 -71 -205 -119 -207 -119l-4 -1c-7 0 -15 2 -18 12c0 2 -1 4 -1 5c0 12 11 19 11 19h1c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250 c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109c8 7 24 17 34 21c9 3 19 5 32 5c57 0 107 -46 107 -104c0 -65 -49 -109 -112 -109c-75 0 -118 52 -118 127c0 73 38 139 97 182c1 0 61 44 137 44zM567 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50z M567 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM259 -710c0 -4 1 -6 22 -6h19l-3 -23h-139l3 23h19c12 0 20 0 22 3v1c1 1 2 1 3 6l1 1c0 1 1 5 4 15l32 120c1 3 2 8 2 11s0 6 -11 6h-33l6 21h2c31 1 72 12 86 22v1h18l-49 -182 c-3 -11 -4 -16 -4 -19zM490 -510c2 0 4 -1 4 -5c0 -11 -9 -27 -19 -36c-14 -12 -32 -18 -58 -18c-14 0 -15 0 -38 5l-9 -34c14 5 25 7 38 7c38 0 66 -20 66 -60c0 -55 -45 -93 -99 -93c-41 0 -68 21 -68 53c0 21 13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27 c-1 0 -2 -1 -2 -1c0 -5 10 -11 23 -11c27 0 49 29 49 67c0 25 -11 39 -30 39c-7 0 -11 -2 -26 -8c-2 -12 -10 -19 -20 -19c-8 0 -13 6 -13 14s4 14 13 18l30 102l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8l1 1h3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E064.xml b/data/Leland/E064.xml
new file mode 100644
index 00000000000..747bf027371
--- /dev/null
+++ b/data/Leland/E064.xml
@@ -0,0 +1 @@
+<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 251c180 0 274 -112 274 -286c0 -187 -156 -359 -298 -462c-91 -71 -205 -119 -207 -119l-3 -1c-7 0 -16 2 -19 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109 c8 7 25 17 35 21c9 3 20 5 32 5c56 0 106 -47 106 -104c0 -67 -48 -109 -112 -109c-75 0 -118 52 -118 127c0 73 38 139 97 182c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51 s-22 -51 -48 -51s-48 23 -48 51zM352 -560v-1c0 -24 -14 -41 -43 -53c18 -13 29 -33 29 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 34 25 49 52 61c-15 14 -21 28 -21 47c0 46 40 71 82 71c31 0 67 -16 67 -52zM267 -588l1 -1c4 -2 8 -5 22 -12c16 12 21 23 21 39 c0 21 -11 33 -31 33s-33 -13 -33 -31c0 -13 4 -19 20 -28zM242 -640c-17 -10 -26 -27 -26 -46c0 -21 14 -35 36 -35s39 15 39 34c0 14 -8 24 -27 35c-2 1 -2 2 -14 8c-3 2 -4 2 -8 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E065.xml b/data/Leland/E065.xml
new file mode 100644
index 00000000000..d0950d43648
--- /dev/null
+++ b/data/Leland/E065.xml
@@ -0,0 +1 @@
+<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M282 248c176 -12 244 -137 244 -284c0 -122 -83 -308 -298 -461c-92 -72 -205 -119 -205 -119c-9 0 -19 0 -22 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140c69 63 182 240 182 406s-48 251 -153 251c-155 0 -169 -133 -169 -133s28 28 69 28c55 0 105 -47 105 -103 c0 -64 -52 -109 -114 -109c-77 0 -115 58 -115 128c0 58 26 127 97 180c0 0 50 36 117 42c-32 7 -53 27 -53 54c0 32 27 53 54 64c-16 15 -22 29 -22 48c0 47 41 74 85 74c20 0 38 -5 50 -15c11 -8 19 -26 19 -39v-1c0 -25 -14 -43 -44 -55c19 -14 29 -34 29 -57 c0 -37 -27 -65 -69 -73zM278 404h2c4 -2 7 -5 22 -13c16 12 23 24 23 41c0 22 -12 34 -33 34c-20 0 -35 -13 -35 -32c0 -13 5 -20 21 -30zM252 351c-17 -11 -27 -27 -27 -47c0 -22 15 -37 38 -37s40 15 40 35c0 15 -8 26 -28 37c-3 2 -3 2 -15 8zM569 124c0 28 22 51 48 51 s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E066.xml b/data/Leland/E066.xml
new file mode 100644
index 00000000000..fef97caf1de
--- /dev/null
+++ b/data/Leland/E066.xml
@@ -0,0 +1 @@
+<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M225 278h20l-4 -23h-144l4 23h19c12 0 21 1 23 4c1 1 3 2 4 7c0 1 1 7 4 17l33 123c1 3 2 9 2 12s0 6 -12 6h-33l6 22h2c32 1 75 12 89 23h18l-50 -188c-3 -11 -4 -17 -4 -20c0 -4 1 -6 23 -6zM292 285l-2 -1v-1c0 -5 11 -11 25 -11c28 0 50 31 50 70c0 25 -11 40 -30 40 c-8 0 -13 -1 -28 -8c-2 -13 -9 -20 -20 -20c-8 0 -14 6 -14 14s5 15 14 19l30 105h3c27 -6 50 -10 71 -10c17 0 31 3 45 9h3l1 1c3 0 5 -2 5 -6c0 -11 -9 -28 -20 -37c-14 -12 -33 -18 -60 -18c-15 0 -15 0 -39 5l-10 -35c15 5 27 7 40 7c38 0 69 -22 69 -62 c0 -58 -48 -96 -103 -96c-43 0 -70 21 -70 54c0 21 13 36 33 36c17 0 29 -11 29 -27c0 -14 -8 -23 -22 -28zM252 249c198 0 273 -131 273 -285c0 -122 -82 -308 -297 -461c-92 -72 -206 -119 -206 -119c-9 0 -18 0 -21 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140 c69 63 181 240 181 406s-48 251 -153 251c-155 0 -168 -133 -168 -133s27 28 68 28c56 0 105 -48 105 -104c0 -64 -51 -108 -113 -108c-77 0 -116 57 -116 128c0 58 26 127 97 180c0 0 60 43 137 43zM569 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50 zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E069.xml b/data/Leland/E069.xml
new file mode 100644
index 00000000000..446a3a07235
--- /dev/null
+++ b/data/Leland/E069.xml
@@ -0,0 +1 @@
+<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M13 252h110c7 0 13 -6 13 -13v-478c0 -7 -6 -13 -13 -13h-110c-7 0 -13 6 -13 13v478c0 7 6 13 13 13zM229 252h110c7 0 13 -6 13 -13v-478c0 -7 -6 -13 -13 -13h-110c-7 0 -13 6 -13 13v478c0 7 6 13 13 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E06A.xml b/data/Leland/E06A.xml
new file mode 100644
index 00000000000..e3090c162d1
--- /dev/null
+++ b/data/Leland/E06A.xml
@@ -0,0 +1 @@
+<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 -422c0 -9 -7 -16 -16 -16h-272c-9 0 -16 7 -16 16v845c0 8 7 16 16 16h272c9 0 16 -8 16 -16v-845zM40 335v-669c0 -6 5 -10 10 -10h204c5 0 10 4 10 10v669c0 5 -4 10 -10 10h-204c-5 0 -10 -5 -10 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E080.xml b/data/Leland/E080.xml
new file mode 100644
index 00000000000..111e1c42d0b
--- /dev/null
+++ b/data/Leland/E080.xml
@@ -0,0 +1 @@
+<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M202 255c106 0 187 -110 187 -255s-81 -254 -187 -254s-187 109 -187 254s81 255 187 255zM261 -139v278c0 36 -16 75 -59 75s-59 -39 -59 -75v-278c0 -36 16 -75 59 -75s59 39 59 75z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E081.xml b/data/Leland/E081.xml
new file mode 100644
index 00000000000..c6bf36666e5
--- /dev/null
+++ b/data/Leland/E081.xml
@@ -0,0 +1 @@
+<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 -197h76c7 0 11 -5 11 -12v-22c0 -7 -4 -12 -11 -12h-274c-7 0 -12 5 -12 12v22c0 7 5 12 12 12h76v341l-71 -122c-2 -3 -6 -6 -10 -6c-2 0 -4 1 -6 2l-19 11c-3 2 -6 6 -6 10c0 2 0 4 1 6l112 194l4 4c2 1 4 2 6 2h99c7 0 12 -5 12 -12v-430z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E082.xml b/data/Leland/E082.xml
new file mode 100644
index 00000000000..c358ac2d291
--- /dev/null
+++ b/data/Leland/E082.xml
@@ -0,0 +1 @@
+<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M342 -39c4 10 11 14 18 14c9 0 17 -6 17 -19c0 -27 -23 -102 -41 -139s-61 -60 -93 -60s-60 16 -78 42s-29 60 -58 60c-24 0 -32 -10 -33 -16c-1 -3 -1 -6 -1 -9c0 -8 2 -19 8 -33c2 -5 3 -9 3 -13c0 -18 -17 -31 -33 -31c-12 0 -36 3 -36 50s30 89 30 89 c58 87 197 112 197 229c0 51 -11 86 -68 86c-15 0 -29 -3 -34 -5c-18 -5 -23 -12 -23 -18c0 -5 4 -10 7 -11c26 -10 46 -41 46 -69c0 -41 -33 -74 -74 -74s-75 33 -75 74c0 46 28 137 179 137s170 -83 170 -125c0 -60 -27 -112 -133 -145s-131 -71 -131 -71c10 2 18 3 26 3 c54 0 68 -40 133 -40c49 0 69 72 77 94z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E083.xml b/data/Leland/E083.xml
new file mode 100644
index 00000000000..36bdba64dd7
--- /dev/null
+++ b/data/Leland/E083.xml
@@ -0,0 +1 @@
+<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M272 16h-2c44 -14 94 -45 94 -118c0 -109 -104 -142 -200 -142c-74 0 -149 41 -149 123c0 36 29 65 65 65s64 -29 64 -65c0 -33 -27 -62 -60 -64c11 -8 37 -16 65 -16c42 0 87 18 87 85c0 70 -23 100 -67 106c-32 5 -55 5 -72 6c-11 1 -13 12 -13 12v20s1 14 13 14 s68 4 80 6s59 11 59 74c0 54 -45 79 -87 79c-19 0 -38 -5 -52 -15l-3 -3c28 -6 50 -34 50 -63c0 -36 -28 -64 -64 -64s-65 28 -65 64l1 2h-1s-5 122 167 122s175 -113 175 -122c0 -55 -35 -87 -85 -106z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E084.xml b/data/Leland/E084.xml
new file mode 100644
index 00000000000..83809dbd7b2
--- /dev/null
+++ b/data/Leland/E084.xml
@@ -0,0 +1 @@
+<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 -127h-172c-9 0 -11 6 -11 6s-6 11 -10 18c-1 2 -1 4 -1 6c0 6 3 11 3 11c26 37 56 87 82 168s31 155 31 155c1 6 6 12 14 12h148c4 0 8 -2 10 -4l22 -22c1 -1 3 -5 3 -10c0 -4 -1 -9 -5 -14c-118 -158 -229 -278 -229 -278h115v82c0 4 1 8 4 11l91 83c2 2 6 3 9 4 c2 0 5 -1 7 -2l12 -6c5 -2 8 -7 8 -13v-159h89c8 0 14 -7 14 -14v-19c0 -8 -6 -15 -14 -15h-89v-74h89c8 0 14 -6 14 -14v-19c0 -8 -6 -14 -14 -14h-303c-7 0 -14 6 -14 14v19c0 8 7 14 14 14h83v74z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E085.xml b/data/Leland/E085.xml
new file mode 100644
index 00000000000..8ace81d6da4
--- /dev/null
+++ b/data/Leland/E085.xml
@@ -0,0 +1 @@
+<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 218c0 16 7 21 22 21c7 0 12 -1 12 -1c43 -6 78 -10 114 -10c37 0 75 4 124 16c6 1 10 2 14 2c13 0 18 -6 18 -14c0 -3 -1 -7 -2 -10c-28 -74 -82 -89 -154 -89c-35 0 -68 4 -83 5h-1c-6 0 -11 -5 -11 -11v-63c0 -4 3 -7 7 -7c1 0 3 0 4 1c29 20 64 28 97 28 c100 0 174 -56 174 -162c0 -107 -85 -168 -187 -168c-77 0 -160 37 -160 125c0 34 27 70 66 70s73 -19 73 -68s-31 -60 -40 -66c-3 -2 -4 -4 -4 -7c0 -2 2 -5 5 -6c6 -4 19 -7 42 -7c71 0 90 66 90 125c0 48 -13 109 -84 109c-63 0 -74 -52 -79 -65c-2 -6 -6 -8 -10 -8 c-2 0 -3 1 -5 1c-5 1 -26 6 -35 8c-6 1 -7 8 -7 13v3c3 45 5 90 5 135c0 52 -5 100 -5 100z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E086.xml b/data/Leland/E086.xml
new file mode 100644
index 00000000000..2be5ee80de5
--- /dev/null
+++ b/data/Leland/E086.xml
@@ -0,0 +1 @@
+<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 48c63 0 140 -37 140 -135c0 -116 -131 -157 -166 -157s-72 2 -130 46c-59 52 -76 121 -76 182c0 56 15 105 25 129c20 46 85 132 175 132c100 0 142 -53 155 -89c4 -8 6 -23 6 -32v-3c0 -36 -29 -64 -65 -64s-64 28 -64 64c0 23 17 50 38 59c-10 11 -25 19 -50 19 c-70 0 -90 -74 -90 -131c0 -16 2 -32 5 -53c14 15 36 33 97 33zM210 -202c33 0 61 45 61 101s-28 102 -61 102s-60 -46 -60 -102s27 -101 60 -101z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E087.xml b/data/Leland/E087.xml
new file mode 100644
index 00000000000..b8e036d4f51
--- /dev/null
+++ b/data/Leland/E087.xml
@@ -0,0 +1 @@
+<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 -123c23 33 125 207 133 222c-10 -9 -47 -13 -67 -13c-80 0 -83 38 -118 38s-50 -31 -50 -54v-32c0 -6 -5 -11 -11 -11h-23c-6 0 -11 5 -11 11v185c0 6 5 11 11 11h23c6 0 11 -5 11 -11v-48c3 6 41 69 103 69c65 0 77 -85 119 -85c40 0 42 68 42 78c0 11 7 14 12 14 h18c6 0 10 -4 11 -14c1 -9 1 -14 1 -23c0 -22 -6 -78 -17 -109c-22 -63 -54 -148 -66 -195c-6 -22 -8 -46 -8 -67c0 -37 6 -68 6 -70v-3c1 -9 -16 -20 -25 -20c-7 0 -34 7 -62 6h-11c-32 -2 -42 -6 -58 -6c-11 0 -14 6 -14 17c0 37 29 77 51 110z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E088.xml b/data/Leland/E088.xml
new file mode 100644
index 00000000000..724845e996c
--- /dev/null
+++ b/data/Leland/E088.xml
@@ -0,0 +1 @@
+<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 18c52 -27 69 -72 69 -120c0 -81 -85 -146 -189 -146s-189 65 -189 146c0 48 25 85 70 111c-47 30 -57 66 -57 106c0 72 79 131 176 131s176 -59 176 -131c0 -40 -23 -72 -56 -97zM268 45c18 9 40 32 40 80c0 46 -42 75 -104 75c-43 0 -79 -16 -79 -55 c0 -45 75 -78 143 -100zM204 -192c64 0 98 35 98 62c0 55 -97 89 -165 112c0 0 -52 -16 -52 -83c0 -56 55 -91 119 -91z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E089.xml b/data/Leland/E089.xml
new file mode 100644
index 00000000000..bfb916e647d
--- /dev/null
+++ b/data/Leland/E089.xml
@@ -0,0 +1 @@
+<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 -47c-63 0 -140 37 -140 135c0 116 131 157 166 157s72 -2 130 -46c59 -52 76 -121 76 -182c0 -56 -15 -105 -25 -129c-20 -46 -85 -132 -175 -132c-100 0 -142 53 -155 89c-4 8 -6 23 -6 32v3c0 36 29 64 65 64s64 -28 64 -64c0 -23 -17 -50 -38 -59 c10 -11 25 -19 50 -19c70 0 90 74 90 131c0 16 -2 32 -5 53c-14 -15 -36 -33 -97 -33zM192 204c-33 0 -61 -46 -61 -102s28 -101 61 -101s60 45 60 101s-27 102 -60 102z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E08A.xml b/data/Leland/E08A.xml
new file mode 100644
index 00000000000..e47d42fd35b
--- /dev/null
+++ b/data/Leland/E08A.xml
@@ -0,0 +1 @@
+<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M325 179c2 1 2 3 2 4c0 2 0 3 -1 5c-11 17 -32 34 -79 34c-89 0 -111 -64 -111 -120v-191c0 -88 42 -135 129 -135c88 0 147 50 151 133c0 4 4 8 8 8h13c5 0 8 -3 8 -8c-4 -107 -81 -165 -180 -165c-250 0 -265 149 -265 268c0 65 25 246 243 246c170 0 209 -92 218 -135 c2 -7 2 -14 2 -21c0 -50 -40 -90 -90 -90h-11c-41 5 -74 37 -79 78c-1 4 -1 8 -1 12c0 32 18 61 43 77z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E08B.xml b/data/Leland/E08B.xml
new file mode 100644
index 00000000000..d42a715325c
--- /dev/null
+++ b/data/Leland/E08B.xml
@@ -0,0 +1 @@
+<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M424 -83h13c5 0 8 -3 8 -8c-4 -112 -84 -165 -189 -165v-109c0 -6 -5 -11 -11 -11h-27c-6 0 -11 5 -11 11v112c-195 21 -207 156 -207 265c0 61 22 225 207 244v121c0 6 5 11 11 11h27c6 0 11 -5 11 -11v-120c159 -4 196 -93 205 -134c2 -7 2 -14 2 -21 c0 -50 -40 -90 -90 -90h-10c-41 5 -75 37 -80 78c-1 4 -1 8 -1 12c0 32 18 61 43 77c2 1 2 2 2 4c0 1 0 2 -1 4c-10 16 -29 33 -70 35v-446c87 0 155 39 160 133c0 4 4 8 8 8zM136 102v-191c0 -66 23 -109 71 -126v432c-57 -16 -71 -68 -71 -115z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E08C.xml b/data/Leland/E08C.xml
new file mode 100644
index 00000000000..242992962da
--- /dev/null
+++ b/data/Leland/E08C.xml
@@ -0,0 +1 @@
+<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M227 23h167c7 0 14 -6 14 -13v-19c0 -7 -7 -14 -14 -14h-167v-167c0 -7 -6 -14 -13 -14h-20c-7 0 -13 7 -13 14v167h-168c-7 0 -13 7 -13 14v19c0 7 6 13 13 13h168v168c0 7 6 13 13 13h20c7 0 13 -6 13 -13v-168z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A0.xml b/data/Leland/E0A0.xml
new file mode 100644
index 00000000000..73fa6026100
--- /dev/null
+++ b/data/Leland/E0A0.xml
@@ -0,0 +1 @@
+<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM451 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v79c-30 -30 -81 -50 -158 -50c-78 0 -129 20 -159 50v-79c0 -6 -7 -14 -14 -14c-10 0 -23 0 -23 14v329 s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 159 49c77 0 128 -20 158 -49v78c0 8 6 14 14 14h9zM524 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM321 -97c24 8 33 25 33 51s-19 90 -33 117s-32 33 -59 33c-16 0 -32 -3 -44 -6 c-22 -7 -32 -21 -32 -45c0 -31 18 -96 32 -123c13 -24 32 -33 60 -33c15 0 31 3 43 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A1.xml b/data/Leland/E0A1.xml
new file mode 100644
index 00000000000..1bda177525d
--- /dev/null
+++ b/data/Leland/E0A1.xml
@@ -0,0 +1 @@
+<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M410 177h9c8 0 13 -6 13 -14v-328c0 -8 -5 -14 -13 -14h-9c-8 0 -14 6 -14 14v26h-359v-21c0 -8 -6 -14 -14 -14h-9c-8 0 -14 6 -14 14v323c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-22h359v22c0 8 6 14 14 14zM396 -70v143h-359v-143h359z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A2.xml b/data/Leland/E0A2.xml
new file mode 100644
index 00000000000..c02f172cc05
--- /dev/null
+++ b/data/Leland/E0A2.xml
@@ -0,0 +1 @@
+<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 136c138 0 186 -70 186 -135s-48 -135 -186 -135s-187 70 -187 135s49 135 187 135zM195 -102c40 0 76 8 76 57c0 25 -19 90 -33 116c-14 27 -32 33 -59 33c-16 0 -32 -2 -44 -6c-24 -8 -34 -24 -32 -51c1 -26 19 -91 32 -116s32 -33 60 -33z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A3.xml b/data/Leland/E0A3.xml
new file mode 100644
index 00000000000..e9fa6ec157b
--- /dev/null
+++ b/data/Leland/E0A3.xml
@@ -0,0 +1 @@
+<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M213 132c62 0 112 -33 112 -92c0 -88 -109 -173 -213 -173c-81 0 -112 48 -112 91c0 93 116 174 213 174zM75 -86c46 0 215 85 215 135c0 22 -16 36 -40 36c-47 0 -215 -86 -215 -135c0 -9 7 -36 40 -36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A4.xml b/data/Leland/E0A4.xml
new file mode 100644
index 00000000000..22a237ecc38
--- /dev/null
+++ b/data/Leland/E0A4.xml
@@ -0,0 +1 @@
+<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -42c0 92 116 174 213 174c62 0 112 -33 112 -92c0 -88 -109 -173 -213 -173c-81 0 -112 48 -112 91z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A5.xml b/data/Leland/E0A5.xml
new file mode 100644
index 00000000000..d4eec1c1f60
--- /dev/null
+++ b/data/Leland/E0A5.xml
@@ -0,0 +1 @@
+<symbol id="E0A5" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Leland/E0A9.xml b/data/Leland/E0A9.xml
new file mode 100644
index 00000000000..af28d67577b
--- /dev/null
+++ b/data/Leland/E0A9.xml
@@ -0,0 +1 @@
+<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M320 96l-122 -96l122 -96c3 -2 5 -6 5 -10c0 -3 -2 -7 -4 -9l-12 -13c-2 -3 -6 -4 -10 -4c-3 0 -7 1 -9 3l-127 101l-128 -101c-2 -2 -6 -3 -9 -3c-4 0 -8 1 -10 4l-12 13c-2 2 -4 6 -4 9c0 4 2 8 5 10l122 96l-122 96c-3 2 -5 6 -5 10s2 8 4 10l13 12c3 2 5 4 9 4 c3 0 7 -1 9 -3l128 -101l127 101c2 2 6 3 9 3c4 0 7 -2 10 -4l12 -12c2 -2 4 -5 4 -9v-1c0 -4 -2 -8 -5 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0AF.xml b/data/Leland/E0AF.xml
new file mode 100644
index 00000000000..189e1a86ee5
--- /dev/null
+++ b/data/Leland/E0AF.xml
@@ -0,0 +1 @@
+<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M186 23h128c6 0 11 -6 11 -14v-19c0 -7 -5 -13 -11 -13h-128v-101c0 -4 -6 -8 -14 -8h-19c-7 0 -13 4 -13 8v101h-129c-6 0 -11 6 -11 13v19c0 8 5 14 11 14h129v100c0 5 6 9 13 9h19c8 0 14 -4 14 -9v-100z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0D9.xml b/data/Leland/E0D9.xml
new file mode 100644
index 00000000000..11cac9c92f2
--- /dev/null
+++ b/data/Leland/E0D9.xml
@@ -0,0 +1 @@
+<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -9l-154 -120c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -8zM198 -80l73 57l-133 104l-74 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0DB.xml b/data/Leland/E0DB.xml
new file mode 100644
index 00000000000..fbf25eb58d4
--- /dev/null
+++ b/data/Leland/E0DB.xml
@@ -0,0 +1 @@
+<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -10l-154 -119c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0F5.xml b/data/Leland/E0F5.xml
new file mode 100644
index 00000000000..55e5f3507cf
--- /dev/null
+++ b/data/Leland/E0F5.xml
@@ -0,0 +1 @@
+<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0F6.xml b/data/Leland/E0F6.xml
new file mode 100644
index 00000000000..8ece1c15d6f
--- /dev/null
+++ b/data/Leland/E0F6.xml
@@ -0,0 +1 @@
+<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E220.xml b/data/Leland/E220.xml
new file mode 100644
index 00000000000..1d947ff9704
--- /dev/null
+++ b/data/Leland/E220.xml
@@ -0,0 +1 @@
+<symbol id="E220" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 33l290 63v-126l-290 -63v126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E221.xml b/data/Leland/E221.xml
new file mode 100644
index 00000000000..2e2940954c5
--- /dev/null
+++ b/data/Leland/E221.xml
@@ -0,0 +1 @@
+<symbol id="E221" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 126l290 63v-126l-290 -62v125zM0 -62l290 63v-126l-290 -63v126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E222.xml b/data/Leland/E222.xml
new file mode 100644
index 00000000000..27963c3afaf
--- /dev/null
+++ b/data/Leland/E222.xml
@@ -0,0 +1 @@
+<symbol id="E222" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 220l290 63v-126l-290 -63v126zM0 31l290 63v-126l-290 -62v125zM0 -157l290 63v-126l-290 -63v126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E223.xml b/data/Leland/E223.xml
new file mode 100644
index 00000000000..ff305e0d898
--- /dev/null
+++ b/data/Leland/E223.xml
@@ -0,0 +1 @@
+<symbol id="E223" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 315l290 63v-126l-290 -63v126zM0 126l290 63v-126l-290 -62v125zM0 -62l290 63v-126l-290 -63v126zM0 -251l290 63v-126l-290 -63v126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E224.xml b/data/Leland/E224.xml
new file mode 100644
index 00000000000..9a79084cbcb
--- /dev/null
+++ b/data/Leland/E224.xml
@@ -0,0 +1 @@
+<symbol id="E224" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 410l290 63v-126l-290 -63v126zM0 221l290 63v-126l-290 -63v126zM0 32l290 63v-126l-290 -63v126zM0 -156l290 62v-125l-290 -63v126zM0 -345l290 63v-126l-290 -63v126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E22A.xml b/data/Leland/E22A.xml
new file mode 100644
index 00000000000..e7b6cee88fc
--- /dev/null
+++ b/data/Leland/E22A.xml
@@ -0,0 +1 @@
+<symbol id="E22A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-76 -85h226v-55h-300v68l226 157h-226v55h300v-65z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E240.xml b/data/Leland/E240.xml
new file mode 100644
index 00000000000..0d01092cf13
--- /dev/null
+++ b/data/Leland/E240.xml
@@ -0,0 +1 @@
+<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -227v226c0 7 6 13 13 13c6 0 11 -4 12 -8c0 0 9 -36 10 -39c2 -4 19 -61 56 -118c27 -42 122 -165 119 -165c0 0 74 -95 79 -224c0 -91 -17 -184 -62 -264c-4 -7 -9 -11 -15 -11c-7 0 -11 3 -11 10c0 4 1 9 3 15c27 72 45 146 45 218c0 83 -29 126 -47 157 c-65 111 -151 165 -194 179c-7 2 -8 8 -8 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E241.xml b/data/Leland/E241.xml
new file mode 100644
index 00000000000..55675716aa4
--- /dev/null
+++ b/data/Leland/E241.xml
@@ -0,0 +1 @@
+<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 1v226c0 3 1 9 8 11c42 14 147 68 212 179c18 31 47 74 47 157c0 72 -16 125 -56 218c-2 5 -3 9 -3 12c0 6 2 10 7 12c1 1 3 1 5 1c6 0 12 -4 15 -11c54 -97 74 -173 74 -264c0 -88 -29 -154 -79 -224s-110 -117 -149 -182c-36 -59 -45 -97 -46 -101 c-1 -3 -10 -38 -10 -39c-1 -4 -7 -8 -12 -8c-7 0 -13 6 -13 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E242.xml b/data/Leland/E242.xml
new file mode 100644
index 00000000000..b3c6c123912
--- /dev/null
+++ b/data/Leland/E242.xml
@@ -0,0 +1 @@
+<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v381c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158c38 -56 89 -107 136 -169c34 -45 48 -92 48 -144c0 -49 -8 -86 -19 -123c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16 c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM209 -473c8 -11 17 -24 25 -40c1 10 2 20 2 30c0 37 -9 78 -48 129c-36 47 -101 115 -152 116c1 -8 2 -15 4 -20c6 -26 24 -60 63 -99c49 -49 79 -81 106 -116z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E243.xml b/data/Leland/E243.xml
new file mode 100644
index 00000000000..6dc27840c8a
--- /dev/null
+++ b/data/Leland/E243.xml
@@ -0,0 +1 @@
+<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -10v398c0 2 8 24 15 27c77 17 223 106 244 190l2 3c3 12 4 25 4 38c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -26 -2 -44 -5 -57c5 -37 8 -74 8 -107c0 -185 -139 -262 -193 -313c-40 -38 -71 -68 -86 -171 c-2 -8 -7 -16 -15 -16s-15 8 -15 16zM37 240c48 13 122 34 183 109c27 34 45 82 47 159c-27 -48 -96 -104 -154 -149s-67 -82 -73 -107c-1 -3 -2 -7 -3 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E244.xml b/data/Leland/E244.xml
new file mode 100644
index 00000000000..d69694acf21
--- /dev/null
+++ b/data/Leland/E244.xml
@@ -0,0 +1 @@
+<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -382v556c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158c38 -56 89 -107 136 -169c34 -45 48 -92 48 -144c0 -32 -4 -63 -11 -94c7 -23 11 -48 11 -73c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1 c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 -180c-36 47 -102 116 -153 116c5 -22 13 -47 28 -69c38 -55 121 -125 168 -187c1 -2 3 -4 4 -6c0 5 1 10 1 16c0 38 -9 79 -48 130z M209 -474c8 -11 17 -24 25 -39c1 12 2 24 2 36c0 37 -9 78 -48 130c-36 47 -101 109 -152 109c1 -8 2 -16 4 -21c6 -26 24 -60 63 -99c49 -50 79 -81 106 -116z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E245.xml b/data/Leland/E245.xml
new file mode 100644
index 00000000000..12af41b863f
--- /dev/null
+++ b/data/Leland/E245.xml
@@ -0,0 +1 @@
+<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -200v588c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 3 5 5c4 3 9 3 13 3c6 0 11 -2 15 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-1 -17 -4 -33 -7 -51 c6 -40 10 -80 10 -117c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM36 51 c49 14 127 39 189 115c26 33 42 75 42 149c-7 -13 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -27 -68z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E246.xml b/data/Leland/E246.xml
new file mode 100644
index 00000000000..04ee4c66230
--- /dev/null
+++ b/data/Leland/E246.xml
@@ -0,0 +1 @@
+<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -383v744c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169c34 -45 48 -92 48 -144c0 -35 -5 -67 -13 -101c9 -26 13 -52 13 -80c0 -34 -4 -67 -11 -100c7 -23 11 -48 11 -73c0 -50 -9 -94 -19 -131c3 -21 5 -46 5 -74c0 -56 -26 -110 -44 -139 c-4 -6 -8 -13 -14 -14c-2 0 -4 1 -6 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 5 1 11 1 16c-1 35 -8 71 -42 122c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9zM188 7c-37 47 -102 116 -153 116h-2c4 -24 13 -53 30 -78c38 -56 121 -130 168 -192c1 -1 2 -3 3 -4 c1 9 2 19 2 29c0 38 -9 78 -48 129zM231 -320c1 -2 3 -4 4 -6c0 7 1 15 1 22c0 38 -9 79 -48 130c-36 47 -101 110 -153 110c5 -23 14 -48 28 -69c38 -55 121 -126 168 -187zM209 -474c8 -11 17 -24 25 -39c1 12 2 23 2 35c0 38 -9 79 -48 130c-36 47 -101 110 -153 110 c2 -9 3 -17 5 -22c6 -25 24 -60 63 -99c49 -49 79 -80 106 -115z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E247.xml b/data/Leland/E247.xml
new file mode 100644
index 00000000000..48fc4bdf0d0
--- /dev/null
+++ b/data/Leland/E247.xml
@@ -0,0 +1 @@
+<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -387v775c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 -1 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -23 -6 -48 -12 -73 c7 -32 12 -64 12 -97v-20c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 43 229 109 229 243c0 6 0 11 -1 17 c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM35 48c112 42 231 109 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM36 -136c50 14 127 39 189 115c26 32 42 74 42 146c-7 -12 -16 -24 -26 -36 c-51 -58 -140 -105 -178 -160c-14 -20 -22 -44 -27 -65z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E248.xml b/data/Leland/E248.xml
new file mode 100644
index 00000000000..4fe9bbe48f7
--- /dev/null
+++ b/data/Leland/E248.xml
@@ -0,0 +1 @@
+<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -382v943c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -9 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -13 -100c9 -25 13 -50 13 -78c0 -37 -4 -72 -13 -109c9 -26 13 -52 13 -80c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79 c0 -50 -8 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -139c-4 -6 -8 -14 -15 -14c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9zM188 215c-37 47 -102 111 -153 111 h-2c4 -24 13 -53 30 -78c38 -55 121 -129 168 -191c1 -2 2 -4 4 -6c0 9 1 17 1 26c0 41 -8 86 -48 138zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -5 c1 11 2 23 2 34c0 38 -9 79 -48 130c-37 48 -102 110 -153 110h-2c4 -26 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c10 -55 28 -84 69 -125c49 -49 79 -75 106 -110z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E249.xml b/data/Leland/E249.xml
new file mode 100644
index 00000000000..86aa7fdd4a6
--- /dev/null
+++ b/data/Leland/E249.xml
@@ -0,0 +1 @@
+<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -575v963c0 2 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -24 -6 -48 -12 -73c7 -32 12 -64 12 -97v-20 c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-41 -34 -67 -68 -76 -121c110 42 229 109 229 243c0 5 0 11 -1 16 c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 48c112 42 231 108 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -23 -24 -48 -28 -71zM35 -139c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33 c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM36 -324c49 14 127 39 189 115c26 32 40 74 42 147c-7 -13 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24A.xml b/data/Leland/E24A.xml
new file mode 100644
index 00000000000..99ca160d871
--- /dev/null
+++ b/data/Leland/E24A.xml
@@ -0,0 +1 @@
+<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1129c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -9 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -12 -99c8 -25 12 -50 12 -77c0 -37 -4 -73 -13 -109c9 -25 13 -52 13 -79c0 -38 -4 -73 -13 -110c9 -25 13 -52 13 -80 c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79c0 -50 -8 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -138c-4 -6 -8 -15 -15 -14c-7 0 -12 5 -12 12c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10 zM188 402c-37 47 -102 111 -153 111h-2c5 -23 13 -52 30 -77c38 -55 121 -129 168 -191c1 -2 2 -4 4 -6c0 9 1 17 1 26c0 40 -8 85 -48 137zM231 57c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -25 13 -54 30 -79 c38 -55 121 -129 168 -191zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2 c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -26 24 -57 63 -96c49 -50 79 -76 106 -111z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24B.xml b/data/Leland/E24B.xml
new file mode 100644
index 00000000000..0fc5434fbe8
--- /dev/null
+++ b/data/Leland/E24B.xml
@@ -0,0 +1 @@
+<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -763v1151c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -60 11 -92v-18c-2 -23 -6 -48 -12 -72c7 -32 12 -64 12 -97v-20 c-2 -23 -5 -47 -12 -72c8 -31 12 -63 12 -95v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-43 -37 -65 -67 -76 -121 c111 42 229 108 229 243c0 5 0 11 -1 16c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 47c111 42 231 109 231 244c0 7 0 14 -1 20c-7 -11 -15 -22 -24 -32c-51 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72zM35 -140c112 43 231 109 231 245c0 5 0 11 -1 17 c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-14 -22 -23 -46 -28 -69zM35 -327c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM36 -512c49 14 127 39 189 115c26 32 40 74 42 147 c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24C.xml b/data/Leland/E24C.xml
new file mode 100644
index 00000000000..6411bf4c56c
--- /dev/null
+++ b/data/Leland/E24C.xml
@@ -0,0 +1 @@
+<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1312c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -33 -4 -65 -12 -97c8 -24 12 -49 12 -75c0 -37 -5 -72 -13 -108c9 -25 13 -52 13 -79c0 -37 -5 -73 -13 -109c9 -25 13 -51 13 -79c0 -38 -4 -73 -13 -110 c9 -25 13 -52 13 -80c0 -37 -5 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -8 -93 -19 -130c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121 c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 585c-37 47 -102 111 -153 111h-1c5 -23 13 -50 29 -73c38 -55 121 -129 168 -191c1 -2 3 -4 4 -6c0 8 1 15 1 23c0 41 -9 85 -48 136zM231 245c1 -2 2 -3 3 -5c1 11 2 23 2 34c0 38 -9 79 -48 130 c-37 48 -102 110 -153 110h-2c5 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2c4 -24 13 -54 30 -79c38 -55 121 -129 168 -191zM231 -133c1 -2 2 -3 3 -4c1 12 2 23 2 36 c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39 c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -26 24 -57 63 -96c49 -49 79 -76 106 -111z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24D.xml b/data/Leland/E24D.xml
new file mode 100644
index 00000000000..27c115a5ad1
--- /dev/null
+++ b/data/Leland/E24D.xml
@@ -0,0 +1 @@
+<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -950v1338c0 3 8 25 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 0 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -23 -6 -48 -12 -73 c7 -32 12 -64 12 -97v-20c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -71c7 -32 12 -64 12 -97v-20c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312 c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 43 229 109 229 243c0 6 0 11 -1 17c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM35 48c112 42 231 109 231 244c0 6 0 13 -1 20 c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM35 -139c112 42 231 109 231 244c0 6 0 12 -1 18c-7 -12 -15 -23 -24 -34c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM35 -327c113 42 231 109 231 245c0 6 0 11 -1 17 c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -515c113 43 231 108 231 245c0 6 0 12 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -21 -23 -46 -28 -69zM36 -699c49 14 127 39 189 115c26 32 42 74 42 147 c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24E.xml b/data/Leland/E24E.xml
new file mode 100644
index 00000000000..d26bb98225b
--- /dev/null
+++ b/data/Leland/E24E.xml
@@ -0,0 +1 @@
+<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1495c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -33 -4 -65 -12 -97c8 -24 12 -49 12 -75c0 -36 -4 -71 -12 -106c8 -25 12 -50 12 -77c0 -37 -5 -72 -13 -108c9 -25 13 -52 13 -79c0 -37 -4 -72 -13 -108 c9 -26 13 -52 13 -80c0 -38 -5 -73 -13 -110c9 -25 13 -52 13 -80c0 -37 -5 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -8 -93 -19 -130c3 -21 5 -45 5 -73c0 -57 -26 -111 -44 -139c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c16 41 23 88 23 132 c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 768c-37 47 -102 111 -153 111l-1 1c4 -23 13 -50 29 -74c38 -55 121 -129 168 -191c1 -2 3 -4 4 -6c0 8 1 15 1 23c0 41 -9 85 -48 136zM231 432c1 -2 2 -3 3 -5c1 10 2 21 2 31c0 38 -9 78 -48 129 c-37 48 -102 110 -153 110h-1c5 -23 13 -50 29 -74c38 -55 121 -129 168 -191zM231 245c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c5 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 57c1 -1 2 -3 3 -4c1 11 2 22 2 34 c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 13 -53 30 -79c38 -55 121 -129 168 -191zM231 -133c1 -1 2 -3 3 -4c1 12 2 24 2 36c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -1 2 -3 3 -4 c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -23 25 -39c1 11 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -25 24 -57 63 -96 c49 -49 79 -76 106 -111z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24F.xml b/data/Leland/E24F.xml
new file mode 100644
index 00000000000..1e376380303
--- /dev/null
+++ b/data/Leland/E24F.xml
@@ -0,0 +1 @@
+<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -1126v1514c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -60 11 -92v-18c-2 -23 -6 -47 -12 -72c7 -32 12 -64 12 -97v-20 c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -72c7 -32 12 -63 12 -96v-20c-1 -16 -4 -34 -7 -51c6 -41 10 -81 10 -118c0 -185 -139 -262 -193 -312 c-40 -38 -68 -83 -86 -156c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM113 359c-44 -37 -65 -67 -76 -121c111 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 47c112 43 231 109 231 245c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33 c-51 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72zM35 -139c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-14 -22 -23 -46 -28 -68zM35 -327c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33 c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -515c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -703c113 42 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33 c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -891c50 14 128 38 190 115c26 33 42 75 42 150c-7 -12 -16 -24 -26 -36c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E260.xml b/data/Leland/E260.xml
new file mode 100644
index 00000000000..0fb26990265
--- /dev/null
+++ b/data/Leland/E260.xml
@@ -0,0 +1 @@
+<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E261.xml b/data/Leland/E261.xml
new file mode 100644
index 00000000000..288ec457346
--- /dev/null
+++ b/data/Leland/E261.xml
@@ -0,0 +1 @@
+<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1c4 0 7 -1 9 -3zM28 -97l116 32v165l-116 -33v-164z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E262.xml b/data/Leland/E262.xml
new file mode 100644
index 00000000000..985e2ea46cd
--- /dev/null
+++ b/data/Leland/E262.xml
@@ -0,0 +1 @@
+<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E263.xml b/data/Leland/E263.xml
new file mode 100644
index 00000000000..7fca3023681
--- /dev/null
+++ b/data/Leland/E263.xml
@@ -0,0 +1 @@
+<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M86 -70v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h53l49 50v3l-49 49h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-53l-50 -50v-2 l50 -50h53c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 48h-3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E264.xml b/data/Leland/E264.xml
new file mode 100644
index 00000000000..a0f67d5bd76
--- /dev/null
+++ b/data/Leland/E264.xml
@@ -0,0 +1 @@
+<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 155c59 0 83 -48 83 -100c0 -103 -90 -185 -176 -228c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-36 -54 -87 -96 -145 -125c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301 c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -320c5 6 34 36 84 36zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM201 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E265.xml b/data/Leland/E265.xml
new file mode 100644
index 00000000000..7c30c262653
--- /dev/null
+++ b/data/Leland/E265.xml
@@ -0,0 +1 @@
+<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM397 -70v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h53l49 50v3l-49 49h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59 c0 -8 -6 -14 -14 -14h-53l-50 -50v-2l50 -50h53c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 48h-3zM78 74v-166l89 19v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E266.xml b/data/Leland/E266.xml
new file mode 100644
index 00000000000..17d1ab77b49
--- /dev/null
+++ b/data/Leland/E266.xml
@@ -0,0 +1 @@
+<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114c-36 -54 -87 -97 -145 -126c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114s0 -1 -1 -2l-3 -5l-2 -2l-1 -2s0 -1 -1 -1l-1 -3l-1 -1l-4 -4c-1 -1 -1 -2 -2 -3v-1l-1 -1 l-2 -1s0 -1 -1 -1l-1 -3c-55 -62 -120 -94 -124 -96h-1h-1l-1 -1h-2l-2 -1c-9 0 -15 6 -15 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37h10h1l1 -1h1h4c2 -1 2 -1 3 -1c3 -1 4 -1 6 -1l1 -1h1l1 -1h2l1 -1s1 0 2 -1h1h1l1 -1h1v-1 c4 -2 10 -5 13 -8l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM201 -127 c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM369 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E267.xml b/data/Leland/E267.xml
new file mode 100644
index 00000000000..ce56cbd44d6
--- /dev/null
+++ b/data/Leland/E267.xml
@@ -0,0 +1 @@
+<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M357 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1 c4 0 7 -1 9 -3zM270 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM28 -97l116 32v165l-116 -33v-164z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E268.xml b/data/Leland/E268.xml
new file mode 100644
index 00000000000..5ff999df08e
--- /dev/null
+++ b/data/Leland/E268.xml
@@ -0,0 +1 @@
+<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M467 107l-38 -7v-165l33 7c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1c4 0 7 -1 9 -3zM28 -97l116 32v165l-116 -33v-164zM312 76v-165l89 18v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E269.xml b/data/Leland/E269.xml
new file mode 100644
index 00000000000..28e1328e738
--- /dev/null
+++ b/data/Leland/E269.xml
@@ -0,0 +1 @@
+<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M524 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147 h28v-141l89 18v155h28v-149l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM369 74v-166l89 19v165zM78 74v-166l89 19v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26A.xml b/data/Leland/E26A.xml
new file mode 100644
index 00000000000..c7e8c32fcc4
--- /dev/null
+++ b/data/Leland/E26A.xml
@@ -0,0 +1 @@
+<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26B.xml b/data/Leland/E26B.xml
new file mode 100644
index 00000000000..7024793a36f
--- /dev/null
+++ b/data/Leland/E26B.xml
@@ -0,0 +1 @@
+<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26C.xml b/data/Leland/E26C.xml
new file mode 100644
index 00000000000..be872c41226
--- /dev/null
+++ b/data/Leland/E26C.xml
@@ -0,0 +1 @@
+<symbol id="E26C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M73 -181v-24h-61c-7 0 -12 5 -12 12v387c0 7 5 12 12 12h61v-24h-49v-363h49z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26D.xml b/data/Leland/E26D.xml
new file mode 100644
index 00000000000..f5c74e5017b
--- /dev/null
+++ b/data/Leland/E26D.xml
@@ -0,0 +1 @@
+<symbol id="E26D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M61 -205h-61v24h49v363h-49v24h61c7 0 12 -5 12 -12v-387c0 -7 -5 -12 -12 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E270.xml b/data/Leland/E270.xml
new file mode 100644
index 00000000000..e5f3b9a42c7
--- /dev/null
+++ b/data/Leland/E270.xml
@@ -0,0 +1 @@
+<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M197 166c59 0 83 -49 83 -101c0 -102 -90 -185 -175 -228c-2 -1 -5 -2 -8 -2h-1c-7 0 -13 6 -13 13l-5 506l-56 -42c-2 -2 -5 -3 -8 -3c-8 0 -14 6 -14 14c0 2 2 6 3 8l83 117c2 3 7 6 11 6s10 -3 12 -6l83 -117c1 -2 2 -6 2 -8c0 -8 -5 -14 -13 -14c-3 0 -7 1 -9 3 l-56 42l-2 -225c5 6 33 37 83 37zM111 -117c65 51 99 89 99 176c0 20 -3 57 -40 57c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E271.xml b/data/Leland/E271.xml
new file mode 100644
index 00000000000..93217248bce
--- /dev/null
+++ b/data/Leland/E271.xml
@@ -0,0 +1 @@
+<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M197 166c59 0 83 -49 83 -101c0 -41 -15 -90 -53 -133c-46 -52 -98 -83 -116 -92v-192l61 47c2 2 6 2 9 2c8 0 13 -5 13 -13c0 -2 -1 -6 -2 -8l-84 -118c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-83 118c-1 2 -3 6 -3 8c0 8 6 13 14 13c3 0 6 0 8 -2l61 -47v201l-6 600v1 c0 8 6 13 14 13h12c8 0 14 -5 14 -13v-1l-3 -320c5 6 33 37 83 37zM111 -117c65 51 98 91 98 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E272.xml b/data/Leland/E272.xml
new file mode 100644
index 00000000000..38fc3f9841b
--- /dev/null
+++ b/data/Leland/E272.xml
@@ -0,0 +1 @@
+<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 183c3 -2 6 -7 6 -11v-495h-28v175l-126 -35c-9 0 -18 2 -18 13v523l-61 -46c-2 -2 -5 -2 -8 -2c-8 0 -14 5 -14 13c0 2 2 6 3 8l83 118c2 3 7 6 11 6s10 -3 12 -6l83 -118c1 -2 2 -6 2 -8c0 -8 -5 -13 -13 -13c-3 0 -7 0 -9 2l-61 47v-204l126 35h1l2 1 c4 0 7 -1 9 -3zM111 -97l116 32v165l-116 -33v-164z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E273.xml b/data/Leland/E273.xml
new file mode 100644
index 00000000000..8e10b111a90
--- /dev/null
+++ b/data/Leland/E273.xml
@@ -0,0 +1 @@
+<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 -303c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8l-83 -118c-2 -3 -7 -5 -11 -5s-10 2 -12 5l-83 118c-1 2 -3 6 -3 8c0 8 6 14 14 14c3 0 7 -1 9 -3l61 -47v204l-126 -35c-9 0 -18 2 -18 13v496h28v-176l126 35h1l2 1c9 0 14 -6 14 -14v-523l62 46c2 2 5 3 8 3zM144 99 l-116 -33v-164l116 32v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E274.xml b/data/Leland/E274.xml
new file mode 100644
index 00000000000..fa4c0c1e8c1
--- /dev/null
+++ b/data/Leland/E274.xml
@@ -0,0 +1 @@
+<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M192 454l84 -118c1 -2 2 -5 2 -8c0 -8 -6 -14 -14 -14c-3 1 -5 2 -8 3l-61 47v-180l33 7c9 0 16 -4 16 -14v-59c0 -6 -4 -12 -11 -13l-38 -8v-165l33 7c4 0 8 0 11 -3c3 -2 5 -6 5 -10v-59c0 -7 -4 -13 -11 -14l-38 -8v-149h-28v144l-89 -18v-155h-28v149l-33 -7 c-5 0 -8 0 -12 3c-3 3 -5 7 -5 11v58c0 6 5 12 11 13l39 8v166l-33 -7c-8 0 -17 3 -17 13v58c0 7 5 13 11 14l39 8v123h28v-117l89 18v185l-61 -46c-2 -1 -5 -2 -8 -2c-4 -1 -7 1 -10 3c-3 3 -4 7 -4 11c0 2 1 5 2 7l84 118c2 3 7 5 11 5c5 0 9 -2 11 -5zM78 -92l89 19v164 l-89 -18v-165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E275.xml b/data/Leland/E275.xml
new file mode 100644
index 00000000000..ff3550efadf
--- /dev/null
+++ b/data/Leland/E275.xml
@@ -0,0 +1 @@
+<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M86 -452l-83 117c-2 3 -3 5 -3 8c0 4 2 7 4 10c3 2 6 4 9 4c4 0 7 -1 9 -3l61 -47v180l-32 -6c-8 0 -17 2 -17 13v59c0 7 5 13 11 14l38 8v164l-32 -7c-4 0 -9 1 -12 3c-3 3 -5 7 -5 11v59c0 7 5 12 11 14l38 7v150h28v-144l89 18v154h28v-149l34 7c1 0 1 1 2 1 c4 0 7 -2 9 -4c3 -2 5 -6 5 -10v-58c0 -7 -4 -12 -11 -14l-39 -8v-165l34 7h2c8 0 14 -6 14 -14v-58c0 -6 -4 -12 -11 -13l-39 -8v-123h-27v117l-90 -19v-185l61 46c3 2 6 3 9 3s7 -1 9 -4c3 -2 4 -5 4 -8c0 -1 1 -2 1 -2c-1 -3 -1 -6 -3 -8l-83 -117c-3 -4 -7 -6 -12 -6 c-4 0 -8 2 -11 6zM201 93l-90 -18v-165l90 18v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E280.xml b/data/Leland/E280.xml
new file mode 100644
index 00000000000..ae243dec532
--- /dev/null
+++ b/data/Leland/E280.xml
@@ -0,0 +1 @@
+<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c-84 50 -170 124 -170 231zM103 107c-36 0 -39 -34 -39 -55c0 -80 41 -127 99 -176l-1 198c0 -3 -1 -5 -1 -3c0 9 -14 36 -58 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E281.xml b/data/Leland/E281.xml
new file mode 100644
index 00000000000..2553ff5c588
--- /dev/null
+++ b/data/Leland/E281.xml
@@ -0,0 +1 @@
+<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M422 58c0 -76 -45 -131 -74 -159c-41 -39 -96 -72 -96 -72c-2 -1 -3 -3 -6 -3c-7 0 -13 6 -13 13l-4 602c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-2 -318c6 8 28 30 74 30c50 0 87 -31 87 -93zM0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8 c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c-84 50 -170 124 -170 231zM319 107c-44 0 -58 -27 -58 -36c0 -2 -1 0 -1 3l-1 -198c58 49 99 96 99 176c0 21 -3 55 -39 55zM103 107c-36 0 -39 -34 -39 -55c0 -80 41 -127 99 -176l-1 198c0 -3 -1 -5 -1 -3 c0 9 -14 36 -58 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E282.xml b/data/Leland/E282.xml
new file mode 100644
index 00000000000..0b249204a13
--- /dev/null
+++ b/data/Leland/E282.xml
@@ -0,0 +1 @@
+<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M169 100l-65 -13v-165l59 12c9 0 17 -2 17 -13v-59c0 -6 -5 -13 -11 -14l-65 -13v-151h-28v145l-59 -12c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l65 14v165l-59 -12c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l65 14v152h28v-146l59 12h1l1 1c9 0 15 -6 15 -14v-59 c0 -6 -5 -13 -11 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E283.xml b/data/Leland/E283.xml
new file mode 100644
index 00000000000..373acb42340
--- /dev/null
+++ b/data/Leland/E283.xml
@@ -0,0 +1 @@
+<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M278 110l-36 -7v-165l31 7c9 0 17 -3 17 -14v-59c0 -6 -6 -13 -12 -14l-36 -7v-147h-28v141l-59 -12v-146h-27v141l-53 -11v-145h-27v139l-31 -6c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l37 8v166l-31 -7c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l37 8v157h27v-151l53 11v156 h27v-151l59 12v155h28v-149l31 7c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14zM155 85v-165l59 12v165zM128 -85v165l-53 -11v-165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E440.xml b/data/Leland/E440.xml
new file mode 100644
index 00000000000..da75b5f727a
--- /dev/null
+++ b/data/Leland/E440.xml
@@ -0,0 +1 @@
+<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M194 156c60 0 83 -49 83 -101c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-3 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 362l-76 -45v44l76 45l-1 74l-75 -44v44l75 44l-1 79c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-1 -57l120 71v-44l-121 -71v-75l121 71v-44 l-122 -71l-1 -101c4 5 32 37 84 37zM107 -128c65 52 99 91 99 179c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E442.xml b/data/Leland/E442.xml
new file mode 100644
index 00000000000..c5c03840dbc
--- /dev/null
+++ b/data/Leland/E442.xml
@@ -0,0 +1 @@
+<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M194 156c60 0 83 -49 83 -101c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-2 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 384l-76 -44v44l76 44l-2 175c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-2 -153l121 71v-44l-121 -72l-2 -123c4 5 32 37 84 37zM108 -128 c65 51 98 93 98 179c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E446.xml b/data/Leland/E446.xml
new file mode 100644
index 00000000000..3f0ae1a1351
--- /dev/null
+++ b/data/Leland/E446.xml
@@ -0,0 +1 @@
+<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 84c3 -2 5 -6 5 -10v-59c0 -6 -4 -10 -10 -12l-151 -41v-41l92 25h1l1 1c4 0 7 -1 9 -3c3 -2 5 -6 5 -10v-59c0 -6 -3 -11 -9 -13l-99 -26v-152h-26v145l-92 -25h-3c-3 0 -6 0 -8 2c-3 2 -5 7 -5 11v58c0 6 3 10 9 12l99 27v40l-145 -39c-4 0 -8 0 -11 3 c-3 2 -5 6 -5 10v58c0 6 4 10 10 12l151 42v40l-92 -24h-1l-1 -1c-4 0 -7 1 -9 3c-3 2 -5 6 -5 10v58c0 6 3 11 9 13l99 27v152h26v-145l92 25h3c3 0 6 0 8 -2c3 -2 5 -7 5 -11v-59c0 -6 -3 -10 -9 -12l-99 -26v-41l145 39h1l1 1c4 0 7 -1 9 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E447.xml b/data/Leland/E447.xml
new file mode 100644
index 00000000000..3760e3b2549
--- /dev/null
+++ b/data/Leland/E447.xml
@@ -0,0 +1 @@
+<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 84c3 -2 5 -6 5 -10v-59c0 -5 -4 -11 -9 -12l-93 -25v-41l33 9h1l1 1c3 0 7 -2 9 -3c3 -2 5 -6 5 -10v-60c0 -5 -4 -11 -9 -12l-40 -11v-152h-26v145l-91 -24v-152h-26v145l-34 -9c-8 0 -16 3 -16 12v59c0 5 4 11 9 12l41 11v41l-87 -23h-1l-1 -1c-3 0 -7 2 -9 3 c-3 2 -5 6 -5 10v58c0 5 5 12 10 13l93 25v41l-34 -9c-4 0 -8 0 -11 2s-5 6 -5 10v59c0 5 4 11 9 12l41 11v153h26v-146l91 25v152h26v-145l33 9h1l2 1c8 0 13 -6 13 -13v-59c0 -5 -4 -12 -9 -13l-40 -11v-40l86 24h3c2 0 6 -2 8 -3zM220 96l-91 -24v-41l91 25v40zM129 -95 l91 25v41l-91 -25v-41z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A0.xml b/data/Leland/E4A0.xml
new file mode 100644
index 00000000000..afb02ccbd6e
--- /dev/null
+++ b/data/Leland/E4A0.xml
@@ -0,0 +1 @@
+<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 234l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A1.xml b/data/Leland/E4A1.xml
new file mode 100644
index 00000000000..b68f2c33050
--- /dev/null
+++ b/data/Leland/E4A1.xml
@@ -0,0 +1 @@
+<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -1l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A2.xml b/data/Leland/E4A2.xml
new file mode 100644
index 00000000000..31f221ae094
--- /dev/null
+++ b/data/Leland/E4A2.xml
@@ -0,0 +1 @@
+<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A3.xml b/data/Leland/E4A3.xml
new file mode 100644
index 00000000000..048a9208202
--- /dev/null
+++ b/data/Leland/E4A3.xml
@@ -0,0 +1 @@
+<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A4.xml b/data/Leland/E4A4.xml
new file mode 100644
index 00000000000..f1fe77c5da2
--- /dev/null
+++ b/data/Leland/E4A4.xml
@@ -0,0 +1 @@
+<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A5.xml b/data/Leland/E4A5.xml
new file mode 100644
index 00000000000..96f7c86338c
--- /dev/null
+++ b/data/Leland/E4A5.xml
@@ -0,0 +1 @@
+<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A6.xml b/data/Leland/E4A6.xml
new file mode 100644
index 00000000000..61aecc13235
--- /dev/null
+++ b/data/Leland/E4A6.xml
@@ -0,0 +1 @@
+<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M113 248c6 0 14 -4 14 -13c0 -11 -50 -220 -50 -220c-1 -4 -3 -15 -13 -15s-12 11 -13 15c0 0 -51 209 -51 220c0 9 9 13 15 13s9 -3 9 -3l35 -37c2 -2 3 -3 5 -3s3 1 5 3l35 37s3 3 9 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A7.xml b/data/Leland/E4A7.xml
new file mode 100644
index 00000000000..16b4b23a3bf
--- /dev/null
+++ b/data/Leland/E4A7.xml
@@ -0,0 +1 @@
+<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -248c-6 0 -14 4 -14 13c0 11 50 220 50 220c1 4 3 15 13 15s12 -11 13 -15c0 0 51 -209 51 -220c0 -9 -9 -13 -15 -13s-9 3 -9 3l-35 37c-2 2 -3 3 -5 3s-3 -1 -5 -3l-35 -37s-3 -3 -9 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A8.xml b/data/Leland/E4A8.xml
new file mode 100644
index 00000000000..9e9ea75a522
--- /dev/null
+++ b/data/Leland/E4A8.xml
@@ -0,0 +1 @@
+<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M118 254c2 0 4 -1 4 -5s-2 -12 -5 -21c-31 -101 -46 -220 -46 -220c-2 -5 -6 -8 -10 -8s-8 3 -10 8c0 0 -15 119 -46 220c-3 9 -5 17 -5 21s1 5 4 5c9 0 35 -23 57 -23c21 0 47 23 57 23z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A9.xml b/data/Leland/E4A9.xml
new file mode 100644
index 00000000000..c97a67e25c2
--- /dev/null
+++ b/data/Leland/E4A9.xml
@@ -0,0 +1 @@
+<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 -254c-2 0 -4 1 -4 5s2 12 5 21c31 101 46 220 46 220c2 5 6 8 10 8s8 -3 10 -8c0 0 15 -119 46 -220c3 -9 5 -17 5 -21s-2 -5 -4 -5c-10 0 -35 23 -57 23s-47 -23 -57 -23z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AC.xml b/data/Leland/E4AC.xml
new file mode 100644
index 00000000000..11fe7e283e8
--- /dev/null
+++ b/data/Leland/E4AC.xml
@@ -0,0 +1 @@
+<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 7l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AD.xml b/data/Leland/E4AD.xml
new file mode 100644
index 00000000000..86155a7b206
--- /dev/null
+++ b/data/Leland/E4AD.xml
@@ -0,0 +1 @@
+<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M271 -7l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AE.xml b/data/Leland/E4AE.xml
new file mode 100644
index 00000000000..c1a26420070
--- /dev/null
+++ b/data/Leland/E4AE.xml
@@ -0,0 +1 @@
+<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 140l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159zM120 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AF.xml b/data/Leland/E4AF.xml
new file mode 100644
index 00000000000..16fe991df87
--- /dev/null
+++ b/data/Leland/E4AF.xml
@@ -0,0 +1 @@
+<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M176 -11c15 -16 15 -40 0 -56c-8 -8 -18 -11 -28 -11s-20 3 -28 11c-15 16 -15 40 0 56c8 7 18 11 28 11s20 -4 28 -11zM271 -140l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B0.xml b/data/Leland/E4B0.xml
new file mode 100644
index 00000000000..5325ee699a8
--- /dev/null
+++ b/data/Leland/E4B0.xml
@@ -0,0 +1 @@
+<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 343l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1zM152 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56 c-8 -7 -18 -11 -28 -11s-20 4 -28 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B1.xml b/data/Leland/E4B1.xml
new file mode 100644
index 00000000000..40eef847928
--- /dev/null
+++ b/data/Leland/E4B1.xml
@@ -0,0 +1 @@
+<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11zM18 -110l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13 v23c0 8 6 14 15 14l2 -1h1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B2.xml b/data/Leland/E4B2.xml
new file mode 100644
index 00000000000..c3afd0b6c84
--- /dev/null
+++ b/data/Leland/E4B2.xml
@@ -0,0 +1 @@
+<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 187h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM130 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B3.xml b/data/Leland/E4B3.xml
new file mode 100644
index 00000000000..818f45a7de3
--- /dev/null
+++ b/data/Leland/E4B3.xml
@@ -0,0 +1 @@
+<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M130 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11zM14 -141h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B4.xml b/data/Leland/E4B4.xml
new file mode 100644
index 00000000000..c8e502340f0
--- /dev/null
+++ b/data/Leland/E4B4.xml
@@ -0,0 +1 @@
+<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 357l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1zM36 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18 c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B5.xml b/data/Leland/E4B5.xml
new file mode 100644
index 00000000000..7143013a19a
--- /dev/null
+++ b/data/Leland/E4B5.xml
@@ -0,0 +1 @@
+<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM18 -124l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14 l2 -1h1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B6.xml b/data/Leland/E4B6.xml
new file mode 100644
index 00000000000..dc4f51ed13c
--- /dev/null
+++ b/data/Leland/E4B6.xml
@@ -0,0 +1 @@
+<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 0c-4 0 -7 3 -7 7c0 36 140 199 140 199c3 3 9 6 14 6s11 -3 14 -6l38 -38c3 -3 6 -9 6 -14s-3 -11 -6 -14s-163 -140 -199 -140z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B7.xml b/data/Leland/E4B7.xml
new file mode 100644
index 00000000000..7d6546b71c9
--- /dev/null
+++ b/data/Leland/E4B7.xml
@@ -0,0 +1 @@
+<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -7c0 4 3 7 7 7c36 0 196 -137 199 -140s6 -9 6 -14s-3 -11 -6 -14l-38 -38c-3 -3 -9 -6 -14 -6s-11 3 -14 6c0 0 -140 163 -140 199z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B8.xml b/data/Leland/E4B8.xml
new file mode 100644
index 00000000000..f4860216a22
--- /dev/null
+++ b/data/Leland/E4B8.xml
@@ -0,0 +1 @@
+<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M332 0c9 -2 10 -9 10 -17c-1 -5 -25 -145 -171 -145s-170 140 -171 145c0 8 1 15 10 17c10 0 14 -3 17 -12c2 -6 17 -93 144 -93s142 87 144 93c3 9 7 12 17 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B9.xml b/data/Leland/E4B9.xml
new file mode 100644
index 00000000000..d521cd1f442
--- /dev/null
+++ b/data/Leland/E4B9.xml
@@ -0,0 +1 @@
+<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M332 0c-10 0 -14 3 -17 12c-2 6 -17 93 -144 93s-142 -87 -144 -93c-3 -9 -7 -12 -17 -12c-9 2 -10 9 -10 17c1 5 25 145 171 145s170 -140 171 -145c0 -8 -1 -15 -10 -17z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BA.xml b/data/Leland/E4BA.xml
new file mode 100644
index 00000000000..6205d216400
--- /dev/null
+++ b/data/Leland/E4BA.xml
@@ -0,0 +1 @@
+<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M368 48c-42 15 -82 21 -124 21s-80 -7 -124 -21c-40 -12 -94 -41 -100 -45c-4 -2 -7 -3 -10 -3c-5 0 -10 5 -10 10c0 3 1 6 4 9c0 1 21 26 61 52c37 23 97 51 179 51s143 -28 179 -51c40 -26 61 -51 61 -52c3 -3 4 -6 4 -9c0 -5 -5 -10 -10 -10c-3 0 -6 1 -10 3 c-6 4 -59 31 -100 45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BB.xml b/data/Leland/E4BB.xml
new file mode 100644
index 00000000000..398303d4844
--- /dev/null
+++ b/data/Leland/E4BB.xml
@@ -0,0 +1 @@
+<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 -48c42 -15 82 -21 124 -21s80 7 124 21c40 12 94 41 100 45c4 2 7 3 10 3c6 0 10 -5 10 -10c0 -3 -1 -6 -4 -9c0 -1 -21 -26 -61 -52c-36 -23 -97 -51 -179 -51s-142 28 -179 51c-40 26 -61 51 -61 52c-3 3 -4 6 -4 9c0 5 5 10 10 10c3 0 6 -1 10 -3 c6 -4 59 -31 100 -45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BC.xml b/data/Leland/E4BC.xml
new file mode 100644
index 00000000000..c7b968977fd
--- /dev/null
+++ b/data/Leland/E4BC.xml
@@ -0,0 +1 @@
+<symbol id="E4BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 123l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159zM14 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BD.xml b/data/Leland/E4BD.xml
new file mode 100644
index 00000000000..fb559f3cc36
--- /dev/null
+++ b/data/Leland/E4BD.xml
@@ -0,0 +1 @@
+<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM280 -123l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C0.xml b/data/Leland/E4C0.xml
new file mode 100644
index 00000000000..c2ef454df64
--- /dev/null
+++ b/data/Leland/E4C0.xml
@@ -0,0 +1 @@
+<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M540 260c49 -53 82 -161 82 -215c0 -20 -4 -32 -14 -32c-28 0 -14 86 -98 171c-74 74 -173 75 -197 75h-4c-24 0 -123 -1 -197 -75c-84 -85 -70 -171 -98 -171c-10 0 -14 13 -14 32c0 54 34 161 83 215c94 102 176 108 228 108s135 -6 229 -108zM242 69c0 38 31 69 69 69 s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C1.xml b/data/Leland/E4C1.xml
new file mode 100644
index 00000000000..8ad00deb3b7
--- /dev/null
+++ b/data/Leland/E4C1.xml
@@ -0,0 +1 @@
+<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M242 -69c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM540 -260c-94 -102 -177 -108 -229 -108s-134 6 -228 108c-49 54 -83 161 -83 215c0 19 4 32 14 32c28 0 14 -86 98 -171c74 -74 173 -75 197 -75h4c24 0 123 1 197 75c84 85 70 171 98 171 c10 0 14 -12 14 -32c0 -54 -33 -162 -82 -215z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C4.xml b/data/Leland/E4C4.xml
new file mode 100644
index 00000000000..ef2a3046f28
--- /dev/null
+++ b/data/Leland/E4C4.xml
@@ -0,0 +1 @@
+<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M331 448l308 -426c1 -2 3 -6 3 -8c0 -8 -6 -14 -14 -14h-43c-4 0 -9 3 -11 6l-254 351l-252 -351c-2 -3 -7 -6 -11 -6h-43c-8 0 -14 6 -14 14c0 2 2 6 3 8l306 426c2 3 7 6 11 6s9 -3 11 -6zM252 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C5.xml b/data/Leland/E4C5.xml
new file mode 100644
index 00000000000..28fb5569997
--- /dev/null
+++ b/data/Leland/E4C5.xml
@@ -0,0 +1 @@
+<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M639 -22l-308 -426c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-306 426c-1 2 -3 6 -3 8c0 8 6 14 14 14h43c4 0 9 -3 11 -6l252 -351l254 351c2 3 7 6 11 6h43c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8zM252 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C6.xml b/data/Leland/E4C6.xml
new file mode 100644
index 00000000000..357c7967891
--- /dev/null
+++ b/data/Leland/E4C6.xml
@@ -0,0 +1 @@
+<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M28 0h-28v354c0 8 6 14 14 14h595c8 0 14 -6 14 -14v-354h-27v277h-568v-277zM243 103c0 38 31 69 69 69s68 -31 68 -69s-30 -69 -68 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C7.xml b/data/Leland/E4C7.xml
new file mode 100644
index 00000000000..72813b00d02
--- /dev/null
+++ b/data/Leland/E4C7.xml
@@ -0,0 +1 @@
+<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -354v354h28v-277h568v277h27v-354c0 -8 -6 -14 -14 -14h-595c-8 0 -14 6 -14 14zM243 -103c0 38 31 69 69 69s68 -31 68 -69s-30 -69 -68 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C8.xml b/data/Leland/E4C8.xml
new file mode 100644
index 00000000000..0b91d5f12d1
--- /dev/null
+++ b/data/Leland/E4C8.xml
@@ -0,0 +1 @@
+<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M28 0h-28v536c0 8 6 13 14 13h814c8 0 14 -5 14 -13v-536h-28v459h-786v-459zM192 0h-28v354c0 8 6 14 14 14h486c8 0 14 -6 14 -14v-354h-28v277h-458v-277zM352 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C9.xml b/data/Leland/E4C9.xml
new file mode 100644
index 00000000000..59b70b18995
--- /dev/null
+++ b/data/Leland/E4C9.xml
@@ -0,0 +1 @@
+<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 -354v354h28v-277h458v277h28v-354c0 -8 -6 -14 -14 -14h-486c-8 0 -14 6 -14 14zM0 -536v536h28v-459h786v459h28v-536c0 -8 -6 -13 -14 -13h-814c-8 0 -14 5 -14 13zM352 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4CE.xml b/data/Leland/E4CE.xml
new file mode 100644
index 00000000000..50f7ae09b47
--- /dev/null
+++ b/data/Leland/E4CE.xml
@@ -0,0 +1 @@
+<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M57 0l-24 30c69 48 108 97 108 140c0 6 -1 9 -3 10c-1 1 -3 1 -4 1c-3 0 -5 -1 -8 -2s-17 -8 -46 -8c-43 0 -80 33 -80 76c0 40 32 74 80 74c67 0 111 -46 111 -122c0 -72 -42 -135 -134 -199z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E0.xml b/data/Leland/E4E0.xml
new file mode 100644
index 00000000000..a22188bcb7a
--- /dev/null
+++ b/data/Leland/E4E0.xml
@@ -0,0 +1 @@
+<symbol id="E4E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -250h-95c-9 0 -15 7 -15 15v470c0 8 6 15 15 15h95c8 0 15 -7 15 -15v-470c0 -8 -7 -15 -15 -15zM435 -250h-95c-9 0 -15 7 -15 15v470c0 8 6 15 15 15h95c8 0 15 -7 15 -15v-470c0 -8 -7 -15 -15 -15z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E1.xml b/data/Leland/E4E1.xml
new file mode 100644
index 00000000000..f6021bf214a
--- /dev/null
+++ b/data/Leland/E4E1.xml
@@ -0,0 +1 @@
+<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -250h-95c-8 0 -15 6 -15 15v470c0 8 7 15 15 15h95c8 0 15 -7 15 -15v-470c0 -9 -7 -15 -15 -15z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E2.xml b/data/Leland/E4E2.xml
new file mode 100644
index 00000000000..01a14cc6546
--- /dev/null
+++ b/data/Leland/E4E2.xml
@@ -0,0 +1 @@
+<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -11h-95c-8 0 -15 7 -15 15v243c0 8 7 15 15 15h95c9 0 15 -7 15 -15v-243c0 -8 -6 -15 -15 -15z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E3.xml b/data/Leland/E4E3.xml
new file mode 100644
index 00000000000..76aca09392a
--- /dev/null
+++ b/data/Leland/E4E3.xml
@@ -0,0 +1 @@
+<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 5h297c8 0 14 -6 14 -14v-108c0 -8 -6 -14 -14 -14h-297c-8 0 -14 6 -14 14v108c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E4.xml b/data/Leland/E4E4.xml
new file mode 100644
index 00000000000..c967591b281
--- /dev/null
+++ b/data/Leland/E4E4.xml
@@ -0,0 +1 @@
+<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 10v108c0 14 0 14 14 14h297c14 0 14 0 14 -14v-108c0 -14 0 -14 -14 -14h-297c-14 0 -14 0 -14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E5.xml b/data/Leland/E4E5.xml
new file mode 100644
index 00000000000..89101fafafa
--- /dev/null
+++ b/data/Leland/E4E5.xml
@@ -0,0 +1 @@
+<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M230 -166l2 -3c2 -3 3 -5 3 -8s-1 -6 -3 -9c-3 -4 -6 -5 -10 -5s-8 2 -8 2l-39 25c-8 5 -19 9 -32 9c-32 0 -56 -26 -56 -58c0 -18 7 -32 7 -32s32 -58 35 -63c1 -2 3 -5 3 -9s-2 -8 -7 -12c-2 -2 -4 -2 -6 -2c-7 0 -12 6 -12 6s-75 95 -96 127c-8 11 -11 25 -11 39 c0 51 40 93 91 93c12 0 21 -2 25 -3l-112 139c-2 2 -3 5 -3 8v9c0 2 1 6 2 8l101 154c2 3 3 8 3 12c0 5 -1 9 -3 12l-76 104s-3 5 -3 11c0 3 1 7 5 10c3 3 5 3 8 3c6 0 10 -6 10 -6l162 -219c2 -2 3 -5 3 -8v-9c0 -2 -1 -5 -2 -7l-102 -154c-1 -2 -2 -6 -2 -9 c0 -2 1 -5 2 -6l115 -142c3 -4 5 -6 6 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E6.xml b/data/Leland/E4E6.xml
new file mode 100644
index 00000000000..627b8f41a9c
--- /dev/null
+++ b/data/Leland/E4E6.xml
@@ -0,0 +1 @@
+<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M267 203c6 -3 9 -7 9 -12c0 -2 0 -4 -1 -5l-140 -441l-27 8l114 356c-34 -37 -69 -62 -122 -62c-47 0 -100 25 -100 79c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -19 -7 -35 -18 -48c54 10 102 72 125 118c2 5 7 8 13 8c1 0 3 -1 4 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E7.xml b/data/Leland/E4E7.xml
new file mode 100644
index 00000000000..07c82100825
--- /dev/null
+++ b/data/Leland/E4E7.xml
@@ -0,0 +1 @@
+<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 186l-195 -693l-27 7l102 365c-30 -39 -69 -65 -119 -66c-20 0 -37 2 -56 10c-26 9 -47 34 -47 64c0 40 30 74 70 74c39 0 73 -29 73 -69c0 -17 -6 -34 -17 -48c51 13 108 77 122 125l45 159c-30 -39 -69 -64 -119 -66c-47 0 -101 19 -103 75c0 39 30 72 69 74 c39 0 74 -30 74 -69c0 -18 -5 -34 -17 -48c55 14 95 68 119 116c3 5 7 8 13 8c1 0 3 0 5 -1c6 -2 9 -7 9 -12c0 -2 0 -3 -1 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E8.xml b/data/Leland/E4E8.xml
new file mode 100644
index 00000000000..63e2a6ec7a2
--- /dev/null
+++ b/data/Leland/E4E8.xml
@@ -0,0 +1 @@
+<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M151 49c-45 0 -90 29 -90 76c0 40 31 71 70 71s72 -27 72 -67c0 -18 -3 -33 -15 -48c56 14 99 84 119 134l39 161c-28 -39 -68 -67 -117 -70c-5 -1 -9 -1 -13 -1c-45 3 -92 23 -92 76c0 42 33 72 72 72s70 -29 70 -67c0 -18 -3 -33 -15 -48c49 12 94 71 113 113 c3 5 7 9 13 9c1 0 3 0 4 -1c6 -2 10 -6 10 -12c0 -1 0 -3 -1 -4l-232 -950l-27 6l91 371c-30 -41 -72 -70 -125 -70s-97 25 -97 77c0 40 32 70 71 70s71 -26 71 -66c0 -18 -3 -34 -14 -48c58 16 96 83 118 134l37 152c-4 -7 -41 -70 -132 -70z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E9.xml b/data/Leland/E4E9.xml
new file mode 100644
index 00000000000..5afe6949ece
--- /dev/null
+++ b/data/Leland/E4E9.xml
@@ -0,0 +1 @@
+<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M144 -752l78 377c-3 -8 -37 -75 -130 -75c-75 0 -92 48 -92 75s20 71 71 71c50 0 71 -44 71 -71c0 -16 -5 -30 -13 -41c15 5 30 12 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -75 -129 -75s-93 56 -93 76c0 19 16 71 72 71c55 0 71 -48 71 -71c0 -22 -5 -30 -13 -42 c59 20 90 83 112 136l33 159c-4 -8 -41 -75 -129 -75c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-29 -45 -73 -75 -129 -75c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72 c0 -14 -5 -29 -14 -41c16 5 31 13 43 24c39 36 62 85 66 92s6 10 15 10c1 0 2 0 3 -1c6 -1 10 -6 10 -12c0 -1 0 -2 -1 -3c-2 -8 -226 -1086 -251 -1206z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4EA.xml b/data/Leland/E4EA.xml
new file mode 100644
index 00000000000..f810aeaa9c1
--- /dev/null
+++ b/data/Leland/E4EA.xml
@@ -0,0 +1 @@
+<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M470 714c4 -3 5 -6 5 -9c0 -1 -1 -4 -1 -5c-2 -8 -279 -1339 -304 -1459l-27 6l78 374c-8 -15 -43 -72 -129 -72c-75 0 -93 48 -93 75s21 72 72 72c50 0 71 -44 71 -72c0 -16 -5 -29 -13 -41c15 5 30 13 43 24c24 23 57 73 69 109l33 162c-3 -8 -37 -75 -130 -75 c-75 0 -92 48 -92 75s20 72 71 72c50 0 71 -45 71 -72c0 -16 -5 -30 -13 -41c15 5 30 13 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -74 -129 -74s-93 56 -93 75s16 71 72 71c55 0 71 -48 71 -70c0 -23 -5 -30 -13 -42c59 20 90 81 112 135l33 159c-4 -8 -41 -75 -129 -75 c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-29 -45 -73 -75 -129 -75c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72c0 -14 -5 -29 -14 -41c53 17 86 70 109 117c4 6 7 9 15 9c1 0 5 -1 8 -3 z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4EB.xml b/data/Leland/E4EB.xml
new file mode 100644
index 00000000000..a1f40726b86
--- /dev/null
+++ b/data/Leland/E4EB.xml
@@ -0,0 +1 @@
+<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M516 723c6 -1 10 -7 11 -13c0 -1 -1 -2 -1 -3l-356 -1705l-27 6l79 375c-31 -40 -61 -67 -115 -73c-5 0 -10 -1 -15 -1c-42 0 -87 21 -92 68c0 41 21 74 64 79c40 0 73 -22 78 -64c0 -19 -2 -33 -13 -49c55 18 95 84 112 136l33 157c-27 -40 -64 -69 -114 -74 c-48 0 -101 9 -107 68c-1 3 -1 5 -1 8c1 36 28 66 64 70c39 0 75 -22 78 -64c1 -2 1 -5 1 -7c0 -15 -5 -30 -14 -41c16 4 31 12 43 24c37 33 65 96 70 112l33 155v3c-28 -40 -65 -69 -115 -74c-5 0 -10 -1 -15 -1c-43 0 -87 21 -92 68c-1 3 -1 5 -1 8c0 36 28 67 64 71 c41 0 74 -21 79 -64c0 -19 -2 -32 -13 -49c57 19 92 83 113 135c0 1 1 5 1 5l31 150c-28 -40 -63 -68 -114 -73c-4 -1 -9 -1 -13 -1c-15 0 -29 2 -43 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 36 27 67 64 71c3 1 5 1 7 1c37 0 68 -27 72 -64c0 -19 -2 -33 -13 -49 c15 5 30 13 43 24c35 33 61 89 68 107l33 158c-28 -40 -63 -68 -114 -73c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -49 31 -52 61c0 39 22 75 64 78c2 1 5 1 7 1c36 0 68 -27 71 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c58 18 93 84 113 137l33 154l-1 -1 c-9 -13 -20 -26 -31 -37c-25 -22 -55 -34 -83 -37c-5 0 -10 -1 -15 -1c-42 0 -88 21 -93 68c0 40 21 74 64 79c40 0 73 -22 78 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c16 5 31 13 43 25c39 35 63 81 66 92c3 8 9 9 17 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4EC.xml b/data/Leland/E4EC.xml
new file mode 100644
index 00000000000..c47824799cf
--- /dev/null
+++ b/data/Leland/E4EC.xml
@@ -0,0 +1 @@
+<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M566 967c10 0 13 -8 13 -16c-2 -7 -384 -1835 -409 -1955l-27 6l77 371c-10 -18 -46 -69 -127 -69c-75 0 -93 48 -93 75c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c52 17 91 77 109 126l34 161c-10 -17 -46 -70 -128 -70c-75 0 -93 48 -93 75 c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c52 17 92 79 110 128l34 163c-8 -14 -43 -72 -129 -72c-75 0 -93 48 -93 75c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c53 18 95 83 112 133l33 156c-3 -7 -37 -75 -130 -75 c-75 0 -93 48 -93 75c0 28 21 72 72 72c50 0 71 -44 71 -72c0 -15 -5 -29 -13 -41c53 18 101 89 114 140l31 147c-4 -7 -45 -74 -129 -74s-93 56 -93 75c0 20 15 72 71 72s72 -49 72 -71s-5 -30 -13 -42c15 5 30 13 43 24c35 33 62 94 69 112l33 158c-4 -7 -41 -74 -129 -74 c-71 0 -93 42 -93 76c0 35 27 70 71 70s72 -37 72 -72c0 -21 -7 -34 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -13 -13 -18 -31 -37c-19 -18 -57 -38 -98 -38c-42 0 -93 19 -93 75c0 44 34 72 71 72s72 -29 72 -72c0 -13 -5 -29 -14 -41 c52 17 86 71 109 117c4 6 7 9 14 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4ED.xml b/data/Leland/E4ED.xml
new file mode 100644
index 00000000000..71d9cbd21c2
--- /dev/null
+++ b/data/Leland/E4ED.xml
@@ -0,0 +1 @@
+<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M558 986l33 156c-27 -41 -65 -70 -115 -75c-4 -1 -9 -1 -13 -1c-45 0 -88 17 -95 68c0 40 22 73 64 78c39 0 75 -21 78 -63c1 -3 1 -6 1 -8c0 -15 -5 -30 -14 -41c16 5 31 13 43 24c39 36 63 82 66 92c2 6 7 9 13 10h4c6 -2 10 -7 11 -13c0 -1 0 -2 -1 -4l-462 -2213 l-27 6l79 376c-28 -41 -64 -68 -115 -73c-5 -1 -10 -1 -16 -1c-14 0 -28 2 -39 6c-28 8 -49 32 -52 62c0 40 22 73 64 78c39 0 73 -21 78 -63c0 -18 -2 -34 -13 -49c59 20 92 83 113 138l32 152c-28 -40 -64 -68 -114 -73h-13c-14 0 -29 1 -42 6c-28 8 -49 31 -52 61 c0 3 -1 5 -1 8c0 36 28 67 64 71c41 0 74 -21 79 -64c0 -19 -2 -33 -13 -49c56 19 94 85 112 137l33 155c-10 -14 -20 -26 -31 -37c-25 -22 -55 -34 -83 -37h-13c-15 0 -29 1 -43 6c-27 8 -49 32 -52 61c0 41 21 74 64 79c40 0 73 -22 78 -64c0 -19 -2 -33 -13 -49 c57 19 93 83 113 136l32 158c-27 -41 -64 -69 -114 -74c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 37 27 68 64 71c3 1 5 1 8 1c36 0 67 -27 71 -64c0 -19 -2 -33 -13 -49c15 5 30 13 43 24c36 34 64 97 69 113l33 158 c-27 -42 -65 -69 -115 -74c-4 -1 -8 -1 -13 -1c-44 0 -89 18 -94 68c0 39 21 73 63 78c40 0 74 -20 79 -63c0 -18 -2 -34 -13 -49c52 17 102 84 113 135c9 39 32 155 32 155c-26 -41 -64 -69 -114 -74c-5 0 -10 -1 -15 -1c-42 0 -87 21 -92 68c0 3 -1 5 -1 8 c0 36 28 67 64 71c41 0 74 -21 79 -64c0 -19 -2 -33 -13 -49c55 18 95 84 112 136l33 159c-27 -41 -64 -69 -114 -74c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 3 -1 6 -1 9c1 35 28 66 64 69c3 1 5 1 8 1c36 0 67 -27 71 -64c0 -19 -2 -33 -13 -49 c15 5 30 13 43 24c36 34 64 97 69 113z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4F2.xml b/data/Leland/E4F2.xml
new file mode 100644
index 00000000000..83db4811739
--- /dev/null
+++ b/data/Leland/E4F2.xml
@@ -0,0 +1 @@
+<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 203c1 0 3 1 4 1c6 0 11 -3 13 -8c4 -6 35 -65 80 -98c14 -10 29 -17 45 -20c-11 13 -18 29 -18 48c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -54 -53 -79 -100 -79c-52 0 -89 26 -122 62l114 -356l-26 -8l-141 441c-1 1 -1 3 -1 5c0 5 3 9 9 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4F6.xml b/data/Leland/E4F6.xml
new file mode 100644
index 00000000000..57d40d0e5b9
--- /dev/null
+++ b/data/Leland/E4F6.xml
@@ -0,0 +1 @@
+<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 -180l-7 9c-36 44 -80 92 -140 96c14 -12 23 -28 25 -47c1 -3 1 -6 1 -9c-1 -34 -25 -64 -60 -70c-4 -1 -8 -1 -12 -1c-35 0 -65 26 -71 61c0 32 6 56 35 73c21 14 51 21 76 21c17 0 34 -3 52 -10l-184 222c-2 3 -3 6 -3 8c0 5 2 8 6 11c2 1 5 1 7 2c1 0 2 -1 2 -1 c5 0 9 -2 12 -6c35 -44 81 -94 140 -98c-13 11 -22 27 -25 46c0 38 18 72 59 79c4 1 9 1 13 1c34 0 65 -25 70 -61c1 -3 1 -7 1 -10c0 -26 -14 -50 -36 -62c-14 -10 -32 -17 -52 -20c-7 -1 -14 -1 -22 -2c-18 0 -38 4 -56 12l194 -231c3 -4 4 -7 4 -10c0 -4 -2 -7 -5 -9 c-2 -1 -5 -2 -7 -2c-6 0 -13 3 -17 8z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E500.xml b/data/Leland/E500.xml
new file mode 100644
index 00000000000..1506ca3e653
--- /dev/null
+++ b/data/Leland/E500.xml
@@ -0,0 +1 @@
+<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E501.xml b/data/Leland/E501.xml
new file mode 100644
index 00000000000..782b11b261b
--- /dev/null
+++ b/data/Leland/E501.xml
@@ -0,0 +1 @@
+<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM735 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E502.xml b/data/Leland/E502.xml
new file mode 100644
index 00000000000..f30101c370e
--- /dev/null
+++ b/data/Leland/E502.xml
@@ -0,0 +1 @@
+<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM989 250l-355 -500h-126l355 500h126zM1243 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM1243 -126 c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E503.xml b/data/Leland/E503.xml
new file mode 100644
index 00000000000..1b85320442a
--- /dev/null
+++ b/data/Leland/E503.xml
@@ -0,0 +1 @@
+<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E504.xml b/data/Leland/E504.xml
new file mode 100644
index 00000000000..3c1a87dcd75
--- /dev/null
+++ b/data/Leland/E504.xml
@@ -0,0 +1 @@
+<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E505.xml b/data/Leland/E505.xml
new file mode 100644
index 00000000000..45bc91fff64
--- /dev/null
+++ b/data/Leland/E505.xml
@@ -0,0 +1 @@
+<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M127 -127c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E510.xml b/data/Leland/E510.xml
new file mode 100644
index 00000000000..d86ffccda1c
--- /dev/null
+++ b/data/Leland/E510.xml
@@ -0,0 +1 @@
+<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E511.xml b/data/Leland/E511.xml
new file mode 100644
index 00000000000..b55c43e64a7
--- /dev/null
+++ b/data/Leland/E511.xml
@@ -0,0 +1 @@
+<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM496 425l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28 c41 0 79 81 79 116c0 10 -1 12 -21 31c-10 9 -15 17 -15 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -75 -55 -198 -142 -198c-43 0 -76 28 -76 72c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM825 418h77l-48 -164c-5 -18 -5 -19 -5 -22 c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-27 0 -42 17 -42 42c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25 c32 24 45 46 45 80zM773 397c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145c0 21 -12 35 -30 35zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E512.xml b/data/Leland/E512.xml
new file mode 100644
index 00000000000..e56de61b91a
--- /dev/null
+++ b/data/Leland/E512.xml
@@ -0,0 +1 @@
+<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM479 244l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c40 0 79 83 79 117c0 10 -2 12 -22 31c-10 9 -14 16 -14 27c0 19 13 32 34 32c23 0 39 -17 39 -43c0 -74 -56 -199 -142 -199c-43 0 -76 28 -76 72c0 11 3 28 6 38 l16 54c5 18 7 28 7 33c0 12 -6 15 -30 15h-12l3 23zM808 237h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153 c29 0 50 -10 62 -30zM756 217c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144c0 21 -12 36 -30 36zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E513.xml b/data/Leland/E513.xml
new file mode 100644
index 00000000000..965c83bf969
--- /dev/null
+++ b/data/Leland/E513.xml
@@ -0,0 +1 @@
+<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM506 371l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -86 -77 -158 -161 -158c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM851 237h77l-48 -163c-5 -18 -5 -20 -5 -23 c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-30 0 -42 17 -42 43c-23 -30 -46 -43 -80 -43c-50 0 -86 37 -86 89c0 79 68 153 141 153c29 0 50 -10 62 -30zM798 217c-50 0 -76 -104 -76 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144 c0 21 -13 36 -31 36zM496 209c-48 0 -78 -111 -78 -148c0 -22 13 -38 32 -38c48 0 77 113 77 150c0 21 -13 36 -31 36zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E514.xml b/data/Leland/E514.xml
new file mode 100644
index 00000000000..fed60b5802c
--- /dev/null
+++ b/data/Leland/E514.xml
@@ -0,0 +1 @@
+<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E515.xml b/data/Leland/E515.xml
new file mode 100644
index 00000000000..b4b487e3870
--- /dev/null
+++ b/data/Leland/E515.xml
@@ -0,0 +1 @@
+<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM782 416l-14 -60c31 40 61 60 92 60c36 0 55 -22 55 -55c32 38 58 55 87 55c33 0 54 -21 54 -51 c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -69h-77l47 158c5 17 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM1321 409h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8 c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 4 -2 15c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM1269 388c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145 c0 21 -12 35 -30 35z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E516.xml b/data/Leland/E516.xml
new file mode 100644
index 00000000000..2c14e4d61d1
--- /dev/null
+++ b/data/Leland/E516.xml
@@ -0,0 +1 @@
+<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM758 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 58 54 87 54c32 0 54 -20 54 -51 c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1297 228h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8 c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153c29 0 50 -10 62 -30zM1245 208c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144 c0 21 -12 36 -30 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E517.xml b/data/Leland/E517.xml
new file mode 100644
index 00000000000..224ff7ddf4d
--- /dev/null
+++ b/data/Leland/E517.xml
@@ -0,0 +1 @@
+<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E518.xml b/data/Leland/E518.xml
new file mode 100644
index 00000000000..0fa35ac3044
--- /dev/null
+++ b/data/Leland/E518.xml
@@ -0,0 +1 @@
+<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM842 416l-14 -60c30 40 61 60 92 60c36 0 55 -22 55 -55 c32 38 59 55 88 55c32 0 53 -21 53 -51c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12 c-11 0 -26 -11 -41 -29c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM1381 409h77l-48 -164c-5 -18 -5 -19 -5 -22 c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-22 -35 -59 -84 -104 -84c-27 0 -42 17 -42 42c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 68 153 141 153c29 0 49 -10 61 -30zM1329 388c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145 c0 21 -12 35 -30 35z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E519.xml b/data/Leland/E519.xml
new file mode 100644
index 00000000000..132400e3076
--- /dev/null
+++ b/data/Leland/E519.xml
@@ -0,0 +1 @@
+<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM842 235l-14 -60c31 40 61 60 92 60c33 0 56 -22 56 -54 c32 38 58 54 87 54c33 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12 c-11 0 -26 -11 -41 -29c-19 -23 -32 -51 -49 -110l-17 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-11l3 23zM1381 228h77l-48 -163c-5 -18 -5 -20 -5 -23 c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-22 -35 -59 -84 -104 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 68 153 141 153c29 0 49 -10 61 -30zM1329 208c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38 c48 0 77 107 77 144c0 21 -12 36 -30 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51A.xml b/data/Leland/E51A.xml
new file mode 100644
index 00000000000..3fb900b3833
--- /dev/null
+++ b/data/Leland/E51A.xml
@@ -0,0 +1 @@
+<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M160 -13v-30c-44 23 -71 45 -99 81c-34 43 -61 122 -61 176v1c0 112 63 206 160 257v-31c-33 -23 -47 -41 -61 -77c-16 -40 -24 -90 -24 -149c0 -66 10 -122 29 -162c13 -29 27 -45 56 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51B.xml b/data/Leland/E51B.xml
new file mode 100644
index 00000000000..0b572f8becd
--- /dev/null
+++ b/data/Leland/E51B.xml
@@ -0,0 +1 @@
+<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 442v30c44 -23 71 -45 99 -82c34 -43 61 -121 61 -175c0 -112 -62 -207 -160 -258v30c33 23 47 42 61 78c16 40 24 90 24 150c0 66 -10 121 -29 161c-13 29 -27 45 -56 66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51C.xml b/data/Leland/E51C.xml
new file mode 100644
index 00000000000..9364df1e2f2
--- /dev/null
+++ b/data/Leland/E51C.xml
@@ -0,0 +1 @@
+<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM765 348l-45 -153c23 19 39 26 63 26c47 0 83 -37 83 -85c0 -86 -75 -157 -160 -157c-61 0 -100 31 -100 78c0 16 1 17 11 52l48 161c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 23zM479 221l-36 -122c-11 -45 -12 -47 -12 -57 c0 -15 14 -28 28 -28c41 0 79 81 79 116c0 10 -2 12 -22 31c-10 9 -14 17 -14 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -75 -55 -198 -142 -198c-43 0 -76 28 -76 72c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 16 -30 16h-12l4 23zM73 101c0 -43 29 -72 74 -72 s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM755 186c-50 0 -79 -111 -79 -149c0 -22 14 -37 33 -37c48 0 77 113 77 150c0 21 -13 36 -31 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51D.xml b/data/Leland/E51D.xml
new file mode 100644
index 00000000000..a8abdc9dc5d
--- /dev/null
+++ b/data/Leland/E51D.xml
@@ -0,0 +1 @@
+<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM1253 362l-45 -152c23 19 39 25 63 25c47 0 83 -36 83 -84c0 -86 -75 -158 -160 -158 c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 24zM758 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 58 54 87 54c32 0 54 -20 54 -51c0 -15 -4 -31 -11 -52l-29 -82c-2 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7 c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12 c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1243 200c-49 0 -79 -110 -79 -148c0 -22 14 -38 33 -38c48 0 77 113 77 150c0 21 -13 36 -31 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51E.xml b/data/Leland/E51E.xml
new file mode 100644
index 00000000000..df0a0b52312
--- /dev/null
+++ b/data/Leland/E51E.xml
@@ -0,0 +1 @@
+<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM1337 362l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84 c0 -85 -76 -158 -160 -158c-61 0 -101 31 -101 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM842 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 59 54 88 54c32 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11 c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 56 15 66 c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1327 200c-48 0 -78 -111 -78 -148c0 -22 13 -38 32 -38c48 0 77 113 77 150c0 21 -13 36 -31 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E520.xml b/data/Leland/E520.xml
new file mode 100644
index 00000000000..ad0205e542f
--- /dev/null
+++ b/data/Leland/E520.xml
@@ -0,0 +1 @@
+<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E521.xml b/data/Leland/E521.xml
new file mode 100644
index 00000000000..1454017e6ed
--- /dev/null
+++ b/data/Leland/E521.xml
@@ -0,0 +1 @@
+<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4 c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8 c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E522.xml b/data/Leland/E522.xml
new file mode 100644
index 00000000000..817d30b256c
--- /dev/null
+++ b/data/Leland/E522.xml
@@ -0,0 +1 @@
+<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E523.xml b/data/Leland/E523.xml
new file mode 100644
index 00000000000..03ab82570e5
--- /dev/null
+++ b/data/Leland/E523.xml
@@ -0,0 +1 @@
+<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109 c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E524.xml b/data/Leland/E524.xml
new file mode 100644
index 00000000000..a35b02cf99e
--- /dev/null
+++ b/data/Leland/E524.xml
@@ -0,0 +1 @@
+<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25 c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E525.xml b/data/Leland/E525.xml
new file mode 100644
index 00000000000..95d2aaa77e9
--- /dev/null
+++ b/data/Leland/E525.xml
@@ -0,0 +1 @@
+<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M159 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5 c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24 s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E526.xml b/data/Leland/E526.xml
new file mode 100644
index 00000000000..a922525e42a
--- /dev/null
+++ b/data/Leland/E526.xml
@@ -0,0 +1 @@
+<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 211l3 4c13 18 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -41 -10 -79 -23 -117c-4 -12 -8 -24 -8 -33c0 -6 2 -10 8 -12c2 -1 3 -1 5 -1c5 0 10 2 15 11c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -36 -32 -73 -77 -73c-34 0 -50 26 -50 57 c0 13 3 28 9 43c10 26 27 77 27 106c-1 4 -2 6 -5 7l-1 1h-2l-1 -1c-25 -10 -57 -52 -77 -193c0 -3 -1 -6 -1 -7c-2 -11 -6 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77 c5 0 10 -1 15 -2c29 -7 38 -41 38 -41z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E527.xml b/data/Leland/E527.xml
new file mode 100644
index 00000000000..68f276ad5f8
--- /dev/null
+++ b/data/Leland/E527.xml
@@ -0,0 +1 @@
+<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1867 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26 c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2 c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43 c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1 c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43z M168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM554 112h1c6 18 16 54 16 81c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3c25 12 49 59 62 98zM816 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2 c3 0 9 1 12 3zM1140 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1464 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9 c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1788 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43 c2 -1 5 -2 7 -2c3 0 9 1 12 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E528.xml b/data/Leland/E528.xml
new file mode 100644
index 00000000000..dec067dd401
--- /dev/null
+++ b/data/Leland/E528.xml
@@ -0,0 +1 @@
+<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1543 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136 c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26 c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 105 96 105 c4 0 7 0 11 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3 c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179 c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43 c2 -1 6 -2 8 -2c3 0 8 1 11 3zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM1140 14c42 20 79 133 79 180 c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1464 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E529.xml b/data/Leland/E529.xml
new file mode 100644
index 00000000000..90f6d9cc323
--- /dev/null
+++ b/data/Leland/E529.xml
@@ -0,0 +1 @@
+<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1219 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136 c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4 c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65 c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1 c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3z M816 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1140 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1 c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52A.xml b/data/Leland/E52A.xml
new file mode 100644
index 00000000000..e113b8e373b
--- /dev/null
+++ b/data/Leland/E52A.xml
@@ -0,0 +1 @@
+<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M895 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136 c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61 l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1 c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69 c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22 c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1c3 0 9 0 12 2c25 12 50 59 63 98z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52B.xml b/data/Leland/E52B.xml
new file mode 100644
index 00000000000..056b684b8bc
--- /dev/null
+++ b/data/Leland/E52B.xml
@@ -0,0 +1 @@
+<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M571 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43 c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z M492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52C.xml b/data/Leland/E52C.xml
new file mode 100644
index 00000000000..b0db6b10ee7
--- /dev/null
+++ b/data/Leland/E52C.xml
@@ -0,0 +1 @@
+<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M508 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192 c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70 c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86 c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11zM536 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52D.xml b/data/Leland/E52D.xml
new file mode 100644
index 00000000000..5ee19cde423
--- /dev/null
+++ b/data/Leland/E52D.xml
@@ -0,0 +1 @@
+<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M289 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45 c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200 c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35 l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52E.xml b/data/Leland/E52E.xml
new file mode 100644
index 00000000000..dd713d433f4
--- /dev/null
+++ b/data/Leland/E52E.xml
@@ -0,0 +1 @@
+<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M277 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c44 21 79 131 79 179 c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52F.xml b/data/Leland/E52F.xml
new file mode 100644
index 00000000000..7aae392f1cd
--- /dev/null
+++ b/data/Leland/E52F.xml
@@ -0,0 +1 @@
+<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 253l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1 c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53 c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170 c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E530.xml b/data/Leland/E530.xml
new file mode 100644
index 00000000000..77e53a9c5fd
--- /dev/null
+++ b/data/Leland/E530.xml
@@ -0,0 +1 @@
+<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M837 357v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c5 4 6 7 6 13c0 4 -2 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11 v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 20 -16c3 0 5 0 7 1c3 1 7 2 9 4 c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 16 69 24 99l34 134h-159v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40 c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h156l1 2 c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h157v2 c25 75 66 171 160 171c41 0 84 -21 90 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E531.xml b/data/Leland/E531.xml
new file mode 100644
index 00000000000..861853b3c00
--- /dev/null
+++ b/data/Leland/E531.xml
@@ -0,0 +1 @@
+<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1018 381c0 1 -1 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81 c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 20 -16c3 0 5 0 7 1c3 1 7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 3h-156v-2c-7 -23 -16 -55 -25 -87 c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122 c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5 c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19 c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2 c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2 c24 75 67 171 160 171c41 0 84 -21 90 -66v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 8 6 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E532.xml b/data/Leland/E532.xml
new file mode 100644
index 00000000000..f3ffff8d861
--- /dev/null
+++ b/data/Leland/E532.xml
@@ -0,0 +1 @@
+<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M947 -174c3 0 5 0 7 1c3 1 7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81 c0 27 25 53 52 53c36 0 46 -27 46 -41c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279 c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2 c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12 c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5 c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-63c-6 0 -10 4 -10 10v22c0 6 4 11 10 11h76l1 1c25 74 66 171 159 171c28 0 68 -13 82 -39c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4 c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c25 74 67 171 159 171c28 0 68 -13 82 -39c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19 c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c25 74 67 171 159 171c28 0 68 -13 82 -39 c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1 c25 74 67 171 159 171c46 0 92 -26 92 -77c0 -6 0 -12 -2 -17c-5 -20 -28 -36 -49 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1 c25 75 66 171 160 171c41 0 84 -21 90 -66v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 8 6 13c0 2 0 3 -1 5c-1 3 -5 6 -8 7c-4 1 -6 1 -8 1c-3 0 -7 0 -9 -1c-7 -2 -15 -10 -19 -16 c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-1 0 -9 -2 -9 -9s5 -16 20 -16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E533.xml b/data/Leland/E533.xml
new file mode 100644
index 00000000000..5b632cee412
--- /dev/null
+++ b/data/Leland/E533.xml
@@ -0,0 +1 @@
+<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1177 -155c0 -10 9 -15 18 -15c5 0 14 1 18 5c9 6 16 14 22 26c10 20 17 50 30 101l3 12c9 37 17 70 24 100c2 8 3 15 5 22c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36 c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87 c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122 c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5 c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40 c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2 c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8 c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8 c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 75 66 170 159 170c45 0 92 -25 92 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1v1c25 75 67 171 160 171c40 0 85 -24 90 -67v-3l1 -5c0 -6 -1 -13 -2 -19c-6 -20 -28 -36 -49 -36c-15 0 -25 5 -34 17c-2 2 -3 6 -4 9c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 12 c0 2 0 3 -1 5c-1 3 -5 6 -8 7c-1 1 -2 1 -3 1l-3 1c-4 0 -8 0 -11 -2c-7 -2 -15 -10 -19 -16c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36 c-48 0 -82 31 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -3 -9 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E534.xml b/data/Leland/E534.xml
new file mode 100644
index 00000000000..6a2831e75e3
--- /dev/null
+++ b/data/Leland/E534.xml
@@ -0,0 +1 @@
+<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-84 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM393 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM421 12c3 0 8 0 11 2c44 21 79 131 79 179 c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E535.xml b/data/Leland/E535.xml
new file mode 100644
index 00000000000..d72f3ddcd77
--- /dev/null
+++ b/data/Leland/E535.xml
@@ -0,0 +1 @@
+<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM383 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11 c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23 c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21 c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E536.xml b/data/Leland/E536.xml
new file mode 100644
index 00000000000..acb35a5cfbe
--- /dev/null
+++ b/data/Leland/E536.xml
@@ -0,0 +1 @@
+<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68 c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28 c0 7 3 19 17 27z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E537.xml b/data/Leland/E537.xml
new file mode 100644
index 00000000000..f17fcaa8979
--- /dev/null
+++ b/data/Leland/E537.xml
@@ -0,0 +1 @@
+<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM619 -159h-225v21h62l99 275c5 10 22 52 22 77c0 7 -1 13 -5 16c-2 2 -4 2 -7 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 32 -44 32l-2 6l-59 -160h76v-21zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38 s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58 c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM646 16c3 0 9 0 12 2c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E538.xml b/data/Leland/E538.xml
new file mode 100644
index 00000000000..7fd5c34085f
--- /dev/null
+++ b/data/Leland/E538.xml
@@ -0,0 +1 @@
+<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM1061 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20 h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4 c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 228c0 0 -8 13 -34 13 s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83 c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM658 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM982 14 c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E539.xml b/data/Leland/E539.xml
new file mode 100644
index 00000000000..a99ebb621a5
--- /dev/null
+++ b/data/Leland/E539.xml
@@ -0,0 +1 @@
+<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68 c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28 c0 7 3 19 17 27zM618 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6 c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25 c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53A.xml b/data/Leland/E53A.xml
new file mode 100644
index 00000000000..834bbd83f19
--- /dev/null
+++ b/data/Leland/E53A.xml
@@ -0,0 +1 @@
+<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -65c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM824 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM168 223c0 0 -8 13 -34 13s-45 -21 -45 -38 s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58 c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM618 198c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3 c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34 c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6zM852 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32 c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53B.xml b/data/Leland/E53B.xml
new file mode 100644
index 00000000000..e8017be21c5
--- /dev/null
+++ b/data/Leland/E53B.xml
@@ -0,0 +1 @@
+<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M414 253l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1 c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53 c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170 c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133zM168 228 c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60 c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM870 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18 c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27 c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53C.xml b/data/Leland/E53C.xml
new file mode 100644
index 00000000000..d8279a406ef
--- /dev/null
+++ b/data/Leland/E53C.xml
@@ -0,0 +1 @@
+<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4 c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2 c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53D.xml b/data/Leland/E53D.xml
new file mode 100644
index 00000000000..f4dfb47caa2
--- /dev/null
+++ b/data/Leland/E53D.xml
@@ -0,0 +1 @@
+<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM636 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11 c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23 c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21 c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6zM189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12 h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E566.xml b/data/Leland/E566.xml
new file mode 100644
index 00000000000..270523050c4
--- /dev/null
+++ b/data/Leland/E566.xml
@@ -0,0 +1 @@
+<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M322 275c39 0 61 -30 61 -61s-12 -52 -46 -52c-27 0 -40 26 -40 38s3 27 17 36c-1 1 -3 1 -4 1c-6 0 -15 -4 -24 -11c-11 -10 -21 -29 -21 -29l-42 -95s-16 -50 -16 -72v-19s-2 -11 -15 -11h-45s-9 1 -12 9s-6 15 -6 15s-34 -24 -65 -24s-64 11 -64 59 c0 22 24 100 46 166h-44s-14 1 -14 12v13s2 12 14 12h56c13 37 23 65 23 65s1 5 5 8s50 41 52 43s7 5 10 5h9c7 0 14 -7 14 -14v-2l-34 -105h103s8 0 13 -5l8 -8s22 26 61 26zM154 99c9 31 40 123 40 123s0 3 -3 3h-66l-30 -93s-11 -29 -11 -52c0 -13 4 -26 18 -26 c17 0 44 18 52 45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E567.xml b/data/Leland/E567.xml
new file mode 100644
index 00000000000..51a3ef8430a
--- /dev/null
+++ b/data/Leland/E567.xml
@@ -0,0 +1 @@
+<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M366 232c51 0 90 -47 90 -118c0 -75 -64 -114 -121 -114c-34 0 -60 12 -85 35l-105 98c-26 23 -41 31 -70 31c-25 0 -45 -20 -45 -45v-1c0 -28 11 -43 30 -43c21 0 26 15 48 15c23 0 41 -16 41 -45c0 -30 -31 -45 -58 -45c-51 0 -91 47 -91 118c0 75 64 114 121 114 c34 0 61 -12 86 -35l104 -98c26 -23 42 -31 71 -31c25 0 44 20 44 45v1c0 28 -11 43 -30 43c-21 0 -26 -15 -48 -15c-23 0 -41 16 -41 45c0 30 32 45 59 45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E568.xml b/data/Leland/E568.xml
new file mode 100644
index 00000000000..fd8958ea916
--- /dev/null
+++ b/data/Leland/E568.xml
@@ -0,0 +1 @@
+<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 232c27 0 59 -15 59 -45c0 -29 -18 -45 -41 -45c-22 0 -27 15 -48 15c-19 0 -30 -15 -30 -43v-1c0 -25 19 -45 44 -45c29 0 45 8 71 31l104 98c25 23 52 35 86 35c57 0 121 -39 121 -114c0 -71 -40 -118 -91 -118c-27 0 -58 15 -58 45c0 29 18 45 41 45 c22 0 27 -15 48 -15c19 0 30 15 30 43v1c0 25 -20 45 -45 45c-29 0 -44 -8 -70 -31l-105 -98c-25 -23 -51 -35 -85 -35c-57 0 -121 39 -121 114c0 71 39 118 90 118z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E569.xml b/data/Leland/E569.xml
new file mode 100644
index 00000000000..632733a292a
--- /dev/null
+++ b/data/Leland/E569.xml
@@ -0,0 +1 @@
+<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M366 232c51 0 90 -47 90 -118c0 -75 -64 -114 -121 -114c-34 0 -60 12 -85 35l-4 3v-105c0 -8 -5 -13 -13 -13h-9c-8 0 -14 5 -14 13v139l-65 61c-26 23 -41 31 -70 31c-25 0 -45 -20 -45 -45v-1c0 -28 11 -43 30 -43c21 0 26 15 48 15c23 0 41 -16 41 -45 c0 -30 -31 -45 -58 -45c-51 0 -91 47 -91 118c0 75 64 114 121 114c34 0 61 -12 86 -35l3 -3v105c0 8 6 14 14 14h9c8 0 13 -6 13 -14v-139l65 -61c26 -23 42 -31 71 -31c25 0 44 20 44 45v1c0 28 -11 43 -30 43c-21 0 -26 -15 -48 -15c-23 0 -41 16 -41 45 c0 30 32 45 59 45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56A.xml b/data/Leland/E56A.xml
new file mode 100644
index 00000000000..44c7fd491f8
--- /dev/null
+++ b/data/Leland/E56A.xml
@@ -0,0 +1 @@
+<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 91c0 -51 -47 -91 -118 -91c-75 0 -114 64 -114 121c0 34 12 61 35 86l98 104c23 26 31 42 31 71c0 25 -20 44 -45 44h-1c-28 0 -43 -11 -43 -30c0 -21 15 -26 15 -48c0 -23 -16 -41 -45 -41c-30 0 -45 32 -45 59c0 51 47 90 118 90c75 0 114 -64 114 -121 c0 -34 -12 -60 -35 -85l-98 -105c-23 -26 -31 -41 -31 -70c0 -25 20 -45 45 -45h1c28 0 43 11 43 30c0 21 -15 26 -15 48c0 23 16 41 45 41c30 0 45 -31 45 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56B.xml b/data/Leland/E56B.xml
new file mode 100644
index 00000000000..5d96d85ef34
--- /dev/null
+++ b/data/Leland/E56B.xml
@@ -0,0 +1 @@
+<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 366c0 -27 -15 -59 -45 -59c-29 0 -45 18 -45 41c0 22 15 27 15 48c0 19 -15 30 -43 30h-1c-25 0 -45 -19 -45 -44c0 -29 8 -45 31 -71l98 -104c23 -25 35 -52 35 -86c0 -57 -39 -121 -114 -121c-71 0 -118 40 -118 91c0 27 15 58 45 58c29 0 45 -18 45 -41 c0 -22 -15 -27 -15 -48c0 -19 15 -30 43 -30h1c25 0 45 20 45 45c0 29 -8 44 -31 70l-98 105c-23 25 -35 51 -35 85c0 57 39 121 114 121c71 0 118 -39 118 -90z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56C.xml b/data/Leland/E56C.xml
new file mode 100644
index 00000000000..24b1187141d
--- /dev/null
+++ b/data/Leland/E56C.xml
@@ -0,0 +1 @@
+<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M449 210l24 -15l-117 -188c-2 -4 -8 -7 -12 -7s-10 2 -12 6l-78 125l-73 -124c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-74 124l-59 -98l-24 15l117 193c3 4 8 7 12 7s10 -3 12 -7l74 -122l72 122c2 4 8 7 12 7s9 -3 11 -7l80 -126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56D.xml b/data/Leland/E56D.xml
new file mode 100644
index 00000000000..c2c0b8015d4
--- /dev/null
+++ b/data/Leland/E56D.xml
@@ -0,0 +1 @@
+<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M449 210l24 -15l-117 -188c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 124l-2 -3v-191c0 -8 -6 -14 -14 -14h-8c-8 0 -14 6 -14 14v129l-35 -59c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-74 124l-59 -98l-24 15l117 193c2 4 8 7 12 7s10 -3 12 -7l74 -122l1 1v182c0 8 6 14 14 14h8 c8 0 14 -6 14 -14v-120l35 59c2 4 7 7 11 7s10 -3 12 -7l80 -126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56E.xml b/data/Leland/E56E.xml
new file mode 100644
index 00000000000..a57e5cbc544
--- /dev/null
+++ b/data/Leland/E56E.xml
@@ -0,0 +1 @@
+<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M630 210l24 -14l-118 -189c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-79 126l-78 -126c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7h-1c-4 0 -10 3 -12 7l-74 125l-59 -99l-24 15l117 193v1c2 4 6 6 12 6c4 0 10 -2 12 -6l75 -123l72 121v1 c2 4 8 7 12 7s10 -2 12 -6l79 -127l59 95l18 31c2 4 8 7 12 7c7 0 9 -2 12 -6l79 -127z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56F.xml b/data/Leland/E56F.xml
new file mode 100644
index 00000000000..0aa20110f39
--- /dev/null
+++ b/data/Leland/E56F.xml
@@ -0,0 +1 @@
+<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M499 192c3 -16 4 -31 4 -44c0 -106 -68 -148 -125 -148c-56 0 -89 16 -115 39l-28 29l-64 -75c-3 -4 -8 -6 -12 -6s-7 1 -10 4c-4 3 -6 7 -6 12c0 4 1 7 4 11l65 77l-21 20c-20 20 -52 52 -91 52c-47 0 -64 -51 -64 -107c0 -9 0 -18 1 -26c0 -9 -3 -14 -16 -14 c-14 0 -17 14 -17 16c-3 15 -4 28 -4 41c0 108 68 151 125 151c56 0 89 -16 115 -40l28 -28l64 75c3 4 7 6 12 6c4 0 7 -1 11 -4c3 -3 5 -8 5 -12s-1 -8 -4 -11l-65 -77l21 -20c20 -20 52 -52 91 -52c47 0 64 51 64 107c0 9 0 17 -1 26c0 9 5 14 16 14c14 0 17 -15 17 -16z "/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E583.xml b/data/Leland/E583.xml
new file mode 100644
index 00000000000..3423b2de17f
--- /dev/null
+++ b/data/Leland/E583.xml
@@ -0,0 +1 @@
+<symbol id="E583" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 123v252c0 8 6 14 14 14h9c7 0 14 -6 14 -14v-252c0 -8 -7 -14 -14 -14h-9c-8 0 -14 6 -14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E587.xml b/data/Leland/E587.xml
new file mode 100644
index 00000000000..49247f8c72e
--- /dev/null
+++ b/data/Leland/E587.xml
@@ -0,0 +1 @@
+<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M737 473c8 0 14 -6 14 -14s-6 -14 -14 -14c-36 0 -80 -29 -133 -88s-156 -218 -239 -351c-2 -4 -6 -6 -12 -6c-2 0 -4 0 -6 2c-2 1 -4 3 -5 4l-79 127l-78 -126c-2 -4 -7 -7 -11 -7c-6 0 -10 2 -12 7l-79 126l-59 -95l-24 15l117 189h1c2 4 6 6 11 6s9 -2 12 -6l79 -126 l78 126c2 4 6 6 11 6s9 -2 12 -6l78 -124c75 119 134 202 184 258c60 66 109 97 154 97z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E59D.xml b/data/Leland/E59D.xml
new file mode 100644
index 00000000000..a4d825d59ae
--- /dev/null
+++ b/data/Leland/E59D.xml
@@ -0,0 +1 @@
+<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 240l90 -148l-50 -85c-3 -4 -5 -7 -12 -7c-6 0 -9 3 -12 7s-67 112 -74 124l-59 -98l-24 14c11 19 114 188 117 193s7 7 12 7c4 0 9 -2 12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E59E.xml b/data/Leland/E59E.xml
new file mode 100644
index 00000000000..a8080db2af7
--- /dev/null
+++ b/data/Leland/E59E.xml
@@ -0,0 +1 @@
+<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 89l-16 26l78 126c2 4 7 7 11 7c6 0 10 -2 12 -6l79 -127l59 95l24 -15l-117 -189h-1c-2 -4 -6 -6 -11 -6s-9 2 -12 6l-79 126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5B2.xml b/data/Leland/E5B2.xml
new file mode 100644
index 00000000000..6df5b6b5fa5
--- /dev/null
+++ b/data/Leland/E5B2.xml
@@ -0,0 +1 @@
+<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M597 118l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-79 -126c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-75 125l-76 -126c-3 -5 -9 -9 -16 -9l-3 1c-8 2 -14 10 -14 17v358c1 7 7 12 14 12s13 -5 14 -12 v-323l115 192c2 4 6 6 12 6c4 0 10 -2 12 -6l75 -123l72 122c2 4 8 7 12 7s10 -2 12 -6l79 -127l78 126c2 4 7 7 11 7c6 0 10 -2 12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5B5.xml b/data/Leland/E5B5.xml
new file mode 100644
index 00000000000..18554711c0f
--- /dev/null
+++ b/data/Leland/E5B5.xml
@@ -0,0 +1 @@
+<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M579 115l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-9 3 -12 7l-78 126l-78 -126c-3 -4 -8 -7 -12 -7s-10 3 -12 7l-78 124l-73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7l-75 125l-19 -33c-29 -48 -44 -92 -44 -135c0 -35 10 -68 30 -101c1 -2 2 -5 2 -7 c0 -5 -3 -10 -7 -12c-2 -2 -5 -2 -7 -2c-5 0 -10 3 -12 6c-23 39 -34 77 -34 117c0 47 16 96 48 149l77 126v1c3 4 5 7 10 7h2c2 0 6 -1 8 -2l1 -1h1l1 -1v-1c1 0 1 -1 1 -2l75 -122l73 123c2 3 7 6 12 6c2 0 5 -1 7 -2l4 -4l79 -127l59 95h1l18 32c2 3 7 6 12 6 c6 0 9 -2 12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5B8.xml b/data/Leland/E5B8.xml
new file mode 100644
index 00000000000..4e665d51f7b
--- /dev/null
+++ b/data/Leland/E5B8.xml
@@ -0,0 +1 @@
+<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M579 115l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-4 -6v-185c0 -8 -6 -14 -14 -14h-9c-8 0 -14 6 -14 14v126l-37 -61c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 125l-73 -125c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-75 125l-19 -32 c-29 -48 -43 -92 -43 -135c0 -35 10 -69 29 -102c1 -2 2 -5 2 -7c0 -7 -7 -14 -14 -14c-4 0 -10 3 -12 7c-22 38 -34 77 -34 117c0 47 16 96 48 148l77 128c2 4 6 6 12 6c2 0 5 -1 7 -2h2v-1h1l1 -1v-1s1 -1 1 -2l75 -122l73 123c2 4 8 7 12 7c5 0 9 -3 11 -7l79 -127l3 5 v187c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-127l19 30v1l19 31c2 4 8 6 12 6c6 0 8 -2 11 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BB.xml b/data/Leland/E5BB.xml
new file mode 100644
index 00000000000..be98da33f6f
--- /dev/null
+++ b/data/Leland/E5BB.xml
@@ -0,0 +1 @@
+<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M628 399c23 -38 34 -77 34 -117c0 -47 -16 -95 -48 -148l-77 -128c-2 -4 -8 -6 -12 -6c-6 0 -11 4 -13 9l-74 120l-73 -122c-2 -4 -8 -7 -12 -7s-9 2 -11 6l-79 127l-78 -126c-2 -4 -8 -7 -12 -7c-6 0 -8 3 -11 7l-79 126l-59 -95l-24 15l117 189c2 4 8 6 12 6 s10 -2 12 -6l78 -126l78 126c2 4 8 6 12 6s10 -2 12 -6l78 -125l73 125c2 4 8 6 12 6s10 -2 12 -6l75 -126l19 32c29 48 43 92 43 135c0 35 -9 69 -29 102c-1 2 -2 5 -2 7c0 7 7 14 14 14c4 0 10 -3 12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BC.xml b/data/Leland/E5BC.xml
new file mode 100644
index 00000000000..d0f645f17b4
--- /dev/null
+++ b/data/Leland/E5BC.xml
@@ -0,0 +1 @@
+<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M289 34c-3 -5 -6 -7 -12 -7c-10 0 -14 8 -15 15s-1 37 -16 70c-21 45 -55 68 -103 68c-47 0 -81 -23 -99 -68c-16 -37 -15 -66 -16 -72c0 -9 -5 -13 -15 -13s-13 9 -13 14s1 41 18 82c23 55 67 85 125 85c59 0 103 -30 129 -85c6 -15 11 -29 14 -42l96 161c2 3 5 6 9 6 c6 0 11 -1 14 -6l75 -123l73 123c2 3 7 6 12 6c2 0 5 0 7 -2c2 0 4 -3 5 -4l79 -127l4 7v185c0 8 6 14 13 14h9c8 0 14 -6 14 -14v-126l37 61c2 3 8 6 12 6c6 0 9 -2 12 -6l79 -127l59 95l23 -14l-117 -189c-2 -4 -7 -7 -11 -7h-1c-4 0 -9 3 -11 7l-79 126l-3 -5v-187 c0 -7 -6 -13 -14 -13h-9c-7 0 -13 6 -13 13v128c-4 -6 -36 -58 -39 -62c-3 -5 -8 -7 -12 -7s-9 2 -12 7c-2 4 -70 112 -77 124l-74 -124c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-74 124c-6 -9 -56 -92 -59 -97z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BD.xml b/data/Leland/E5BD.xml
new file mode 100644
index 00000000000..63bcf3effd7
--- /dev/null
+++ b/data/Leland/E5BD.xml
@@ -0,0 +1 @@
+<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M570 115l59 95l24 -15l-117 -189c-2 -3 -8 -6 -12 -6s-9 3 -12 6l-78 126l-3 -4v-187c0 -7 -6 -14 -14 -14h-9c-7 0 -14 7 -14 14v128l-38 -62c-3 -4 -8 -7 -12 -7s-10 3 -12 6l-78 125l-73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7l-74 124l-59 -98l-24 14l116 194 c3 4 6 7 12 7c5 0 10 -3 12 -7l75 -122l73 122c2 4 7 7 12 7c2 0 5 -1 7 -2l4 -4l79 -127l4 6v186c0 7 7 13 14 13h9c8 0 14 -6 14 -13v-127l18 30h1l18 31c2 4 7 7 12 7c6 0 9 -2 12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BE.xml b/data/Leland/E5BE.xml
new file mode 100644
index 00000000000..061b422b057
--- /dev/null
+++ b/data/Leland/E5BE.xml
@@ -0,0 +1 @@
+<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M704 196l-117 -189c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -77 125c-8 -13 -72 -121 -74 -125c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -97c-2 -4 -6 -7 -13 -7c-6 0 -13 6 -14 13c0 1 -1 37 -17 72c-21 45 -55 68 -103 68 c-35 0 -63 -13 -83 -39c-3 -3 -7 -5 -11 -5c-3 0 -6 1 -8 3c-4 2 -6 6 -6 11c0 2 1 6 3 8c25 33 61 50 105 50c59 0 103 -29 129 -85c6 -15 11 -30 14 -43c25 41 95 159 97 162c1 3 5 6 11 6s10 -3 12 -6c2 -4 68 -111 75 -122c7 11 70 117 73 122c2 4 7 6 12 6 c4 0 9 -2 12 -6c2 -5 71 -114 79 -127l58 95z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C0.xml b/data/Leland/E5C0.xml
new file mode 100644
index 00000000000..add821710b9
--- /dev/null
+++ b/data/Leland/E5C0.xml
@@ -0,0 +1 @@
+<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M255 33c-2 -3 -6 -6 -13 -6s-14 6 -14 13c0 1 -1 37 -17 72c-21 45 -56 68 -103 68c-35 0 -63 -13 -83 -39c-3 -4 -7 -6 -11 -6c-3 1 -6 1 -9 3c-3 3 -5 7 -5 11c0 3 1 6 3 9c25 33 60 50 105 50c79 0 126 -56 143 -128c24 41 95 158 96 161c2 4 6 7 12 7s10 -3 12 -7 c2 -3 68 -110 75 -122c7 12 70 118 73 122c2 5 7 7 11 7c5 0 9 -2 12 -7c3 -4 72 -114 79 -126l78 126c2 4 7 7 11 7c6 0 10 -2 12 -7l79 -126l59 95l24 -14l-117 -189c-3 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126c-8 -13 -76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7 s-70 112 -78 124c-7 -12 -71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -98z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C3.xml b/data/Leland/E5C3.xml
new file mode 100644
index 00000000000..312478e95af
--- /dev/null
+++ b/data/Leland/E5C3.xml
@@ -0,0 +1 @@
+<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M267 97c-27 -45 -61 -70 -119 -70s-103 29 -128 85c-18 40 -20 80 -20 81c0 8 6 15 14 15c7 0 14 -6 14 -14c0 -3 2 -36 18 -72c20 -44 53 -67 102 -67s74 22 100 65c25 43 71 120 72 122c2 3 6 6 12 6s10 -3 12 -6c2 -4 68 -111 75 -122c7 11 70 117 73 122 c2 4 7 6 12 6c4 0 8 -2 11 -6c3 -5 72 -114 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-2 -3 -8 -6 -12 -7c-4 0 -9 3 -12 7l-78 126c-8 -12 -76 -122 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -78 125c-7 -13 -71 -121 -73 -125 c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-1 -1 -10 -16 -20 -34z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C6.xml b/data/Leland/E5C6.xml
new file mode 100644
index 00000000000..e0a63d6f9a7
--- /dev/null
+++ b/data/Leland/E5C6.xml
@@ -0,0 +1 @@
+<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M360 242c3 -5 79 -127 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-9 3 -12 7l-78 126s-76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-78 124 -78 124s-71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7 c-3 4 -74 124 -74 124s-57 -93 -59 -98c-3 -4 -8 -6 -12 -6c-5 0 -8 2 -11 5s-51 64 -51 168c0 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134c0 0 103 172 105 176c2 3 6 6 12 6s10 -3 12 -6 c2 -4 75 -123 75 -123s70 118 73 123c2 4 7 6 12 6c4 0 8 -2 11 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C7.xml b/data/Leland/E5C7.xml
new file mode 100644
index 00000000000..e8ac5f34c22
--- /dev/null
+++ b/data/Leland/E5C7.xml
@@ -0,0 +1 @@
+<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M574 0c-5 0 -9 3 -12 7l-78 126l-3 -5v-187c0 -7 -6 -13 -14 -13h-9c-7 0 -14 6 -14 13v128c-3 -6 -35 -58 -38 -62c-4 -5 -8 -7 -12 -7s-9 2 -12 7c-3 4 -70 112 -78 124l-73 -124c-1 -1 -5 -7 -12 -7c-6 0 -10 3 -12 7l-74 124l-59 -97c-1 -1 -2 -3 -4 -4 c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -11 5c-33 41 -51 104 -51 168c-1 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134l105 176c3 3 6 6 11 6s10 -1 13 -6l75 -123l73 123c2 3 6 6 10 6c5 0 7 0 9 -2 c1 0 3 -3 4 -4l79 -127l4 7v185c0 8 7 14 14 14h9c8 0 14 -6 14 -14v-126l37 61c2 3 7 6 12 6c4 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-1 -1 -4 -7 -12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C8.xml b/data/Leland/E5C8.xml
new file mode 100644
index 00000000000..afc2f27c7ee
--- /dev/null
+++ b/data/Leland/E5C8.xml
@@ -0,0 +1 @@
+<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 117c7 12 72 121 74 125c2 3 7 7 12 7s9 -3 12 -7l74 -125c5 9 53 89 59 98c3 6 8 7 11 7c4 0 8 -2 11 -5c43 -49 71 -125 71 -203c0 -62 -17 -125 -56 -180c-3 -3 -7 -6 -11 -6c-3 1 -6 1 -8 3c-4 3 -7 8 -7 11s2 6 3 9c36 49 52 107 52 164c0 63 -21 125 -53 169 l-106 -177c-2 -4 -6 -7 -12 -7c-5 0 -9 3 -12 7l-75 122l-73 -122c-2 -4 -6 -7 -11 -7c-7 0 -10 4 -12 7s-72 114 -79 126l-79 -127c-2 -4 -6 -6 -11 -6c-8 0 -15 6 -15 14s123 204 139 228c3 3 6 7 12 7s9 -3 12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5E5.xml b/data/Leland/E5E5.xml
new file mode 100644
index 00000000000..6aacc46a8a9
--- /dev/null
+++ b/data/Leland/E5E5.xml
@@ -0,0 +1 @@
+<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 178h119v119c0 10 11 15 22 15s22 -5 22 -15v-119h119c10 0 15 -11 15 -22s-5 -22 -15 -22h-119v-119c0 -10 -11 -15 -22 -15s-22 5 -22 15v119h-119c-10 0 -15 11 -15 22s5 22 15 22z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5E6.xml b/data/Leland/E5E6.xml
new file mode 100644
index 00000000000..1b83fd24541
--- /dev/null
+++ b/data/Leland/E5E6.xml
@@ -0,0 +1 @@
+<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140s-140 63 -140 140s63 140 140 140zM251 154c-6 50 -47 91 -97 97v-97h97zM61 219c-18 -17 -29 -40 -33 -65h98v97c-25 -3 -48 -14 -65 -32zM28 126c8 -50 47 -91 98 -97v97h-98zM154 29c50 6 91 47 97 97h-97v-97z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5E7.xml b/data/Leland/E5E7.xml
new file mode 100644
index 00000000000..967297fdb4b
--- /dev/null
+++ b/data/Leland/E5E7.xml
@@ -0,0 +1 @@
+<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140s-140 63 -140 140s63 140 140 140zM140 28c62 0 112 50 112 112s-50 112 -112 112s-112 -50 -112 -112s50 -112 112 -112z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E610.xml b/data/Leland/E610.xml
new file mode 100644
index 00000000000..033d5523332
--- /dev/null
+++ b/data/Leland/E610.xml
@@ -0,0 +1 @@
+<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M28 0h-28v279s6 14 14 14h287c8 0 14 -6 14 -14v-279h-28v202h-259v-202z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E611.xml b/data/Leland/E611.xml
new file mode 100644
index 00000000000..ee73733f264
--- /dev/null
+++ b/data/Leland/E611.xml
@@ -0,0 +1 @@
+<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 14v279h28v-202h259v202h28v-279c0 -8 -6 -14 -14 -14h-287c-8 0 -14 14 -14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E612.xml b/data/Leland/E612.xml
new file mode 100644
index 00000000000..5601b0f499d
--- /dev/null
+++ b/data/Leland/E612.xml
@@ -0,0 +1 @@
+<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 337c1 -2 2 -6 2 -9l-1 -3v-1l-117 -315c-2 -5 -8 -9 -13 -9s-11 4 -13 9l-117 315v1l-1 3c0 9 6 15 14 15h14c5 0 11 -4 13 -9l90 -252l90 252c2 5 8 9 13 9h14c4 0 10 -3 12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E613.xml b/data/Leland/E613.xml
new file mode 100644
index 00000000000..26df9057438
--- /dev/null
+++ b/data/Leland/E613.xml
@@ -0,0 +1 @@
+<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 43c-2 -3 -8 -6 -12 -6h-14c-5 0 -11 4 -13 9l-90 252l-90 -252c-2 -5 -8 -9 -13 -9h-14c-8 0 -14 6 -14 15l1 3v1l117 315c2 5 8 9 13 9s11 -4 13 -9l117 -315v-1l1 -3c0 -3 -1 -7 -2 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E614.xml b/data/Leland/E614.xml
new file mode 100644
index 00000000000..7ff474d5354
--- /dev/null
+++ b/data/Leland/E614.xml
@@ -0,0 +1 @@
+<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M91 181c50 0 90 -40 90 -90s-40 -91 -90 -91s-91 41 -91 91s41 90 91 90zM91 153c-35 0 -63 -27 -63 -62s28 -63 63 -63s62 28 62 63s-27 62 -62 62z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E630.xml b/data/Leland/E630.xml
new file mode 100644
index 00000000000..7f3ab6b6b67
--- /dev/null
+++ b/data/Leland/E630.xml
@@ -0,0 +1 @@
+<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 121v-107c0 -8 -6 -14 -13 -14c-8 0 -14 6 -14 14v107c-68 7 -121 64 -121 134c0 74 60 134 135 134c74 0 134 -60 134 -134c0 -70 -53 -127 -121 -134zM135 361c-59 0 -107 -47 -107 -106c0 -54 40 -99 93 -106v106c0 8 6 14 14 14c7 0 13 -6 13 -14v-106 c53 7 93 52 93 106c0 59 -48 106 -106 106z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E631.xml b/data/Leland/E631.xml
new file mode 100644
index 00000000000..ec3682f0c60
--- /dev/null
+++ b/data/Leland/E631.xml
@@ -0,0 +1 @@
+<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 375v-107c68 -7 121 -64 121 -134c0 -74 -60 -134 -134 -134c-75 0 -135 60 -135 134c0 70 53 127 121 134v107c0 8 6 14 14 14c7 0 13 -6 13 -14zM135 28c58 0 106 48 106 106c0 54 -40 99 -93 106v-106c0 -7 -6 -14 -13 -14c-8 0 -14 7 -14 14v106 c-53 -7 -93 -52 -93 -106c0 -58 48 -106 107 -106z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E632.xml b/data/Leland/E632.xml
new file mode 100644
index 00000000000..3fb6f9caedd
--- /dev/null
+++ b/data/Leland/E632.xml
@@ -0,0 +1 @@
+<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M375 121h-107c-7 -68 -64 -121 -134 -121c-74 0 -134 60 -134 135c0 74 60 134 134 134c70 0 127 -53 134 -121h107c8 0 14 -6 14 -13c0 -8 -6 -14 -14 -14zM28 135c0 -59 48 -107 106 -107c54 0 99 40 106 93h-106c-7 0 -14 6 -14 14c0 7 7 13 14 13h106 c-7 53 -52 93 -106 93c-58 0 -106 -47 -106 -106z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E650.xml b/data/Leland/E650.xml
new file mode 100644
index 00000000000..4e9cab7471b
--- /dev/null
+++ b/data/Leland/E650.xml
@@ -0,0 +1 @@
+<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M171 352c0 -54 -42 -98 -83 -98s-88 23 -88 98s90 193 244 193c88 0 206 -45 206 -148c0 -45 -28 -79 -74 -79c-34 0 -70 20 -92 66c-3 6 -7 14 -7 21c0 11 6 21 18 21c9 0 18 -9 24 -15c7 -6 25 -23 44 -23c14 0 24 9 24 23c0 25 -25 67 -89 84 c-19 -10 -52 -84 -52 -106c0 -7 1 -13 5 -19c15 -21 56 -79 61 -85c2 -4 23 -36 23 -69c0 -34 -34 -69 -59 -88c1 0 11 3 43 -31c14 -15 37 -29 56 -29c6 0 11 1 16 4c22 13 31 25 32 26c-4 16 -7 35 -7 56c0 74 32 163 110 163c40 0 74 -32 74 -74c0 -26 -13 -55 -45 -83 c-40 -34 -61 -53 -63 -55c1 -5 12 -51 54 -51c40 0 78 34 86 44c-1 7 -1 17 -1 28c0 52 15 142 113 176c-33 58 -136 104 -198 127c-2 1 -19 8 -20 22c0 1 0 2 1 3c1 8 7 10 14 11c2 0 3 -1 4 -1c7 0 14 -2 21 -3c64 -11 287 -83 311 -289c1 -8 1 -16 1 -24 c0 -71 -44 -156 -124 -156c-47 0 -94 34 -109 74c-7 -7 -71 -73 -131 -73c-51 0 -79 67 -82 74c-44 -37 -66 -74 -100 -74c-30 0 -43 8 -62 34c-11 15 -22 41 -39 41c-21 0 -36 -28 -47 -40c-15 -16 -42 -38 -64 -38c-11 0 -20 5 -26 18c-4 7 -5 13 -5 19c0 37 60 63 71 70 c15 10 49 28 83 57c18 16 26 30 26 43c0 10 -4 19 -10 27c-16 22 -53 65 -70 90c-6 9 -8 20 -8 30c0 23 9 43 10 45c15 39 48 98 56 112c-61 0 -113 -24 -149 -75c-20 -26 -27 -50 -27 -68c0 -20 10 -34 22 -35c2 -1 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25 c15 0 20 -14 20 -27zM522 273c-26 0 -44 -32 -44 -90c0 -13 1 -27 3 -42c3 3 31 32 54 57c12 13 17 28 17 41c0 19 -11 34 -30 34zM758 61c27 6 40 20 40 84c0 54 -14 88 -29 116c-7 -1 -72 -11 -72 -120c0 -45 23 -81 53 -81c3 0 6 0 8 1zM940 8c-23 0 -42 21 -42 46 c0 26 19 47 42 47c22 0 41 -21 41 -47c0 -25 -19 -46 -41 -46z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E651.xml b/data/Leland/E651.xml
new file mode 100644
index 00000000000..8aa64f74e69
--- /dev/null
+++ b/data/Leland/E651.xml
@@ -0,0 +1 @@
+<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 407c0 9 9 19 18 19c10 0 19 -9 25 -15c7 -6 25 -22 43 -22c16 0 25 7 25 23c0 24 -25 67 -89 83c-2 -1 -17 -14 -30 -42c-10 -21 -23 -44 -22 -64c0 -7 1 -13 5 -18c15 -22 56 -79 61 -86c2 -3 23 -35 23 -69c0 -32 -35 -70 -59 -88c1 0 11 3 43 -31 c14 -15 37 -29 56 -29c6 0 16 2 21 5c10 7 23 17 31 23c3 3 7 5 11 5c7 0 12 -4 12 -11c0 -4 -1 -7 -3 -12c-21 -34 -81 -85 -115 -85c-30 0 -43 8 -62 34c-11 16 -22 41 -39 41c-21 0 -36 -27 -48 -40c-15 -16 -41 -38 -63 -38c-11 0 -20 5 -27 18c-3 7 -4 13 -4 19 c0 38 60 63 71 70c15 10 49 28 83 57c18 16 26 30 26 44c0 9 -4 18 -10 27c-16 21 -53 64 -70 89c-6 9 -9 20 -9 30c0 23 10 43 11 45c15 40 48 98 56 112c-76 0 -176 -59 -176 -143c0 -20 10 -33 22 -35c2 0 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25 c16 0 19 -12 19 -26c0 -54 -41 -99 -82 -99s-88 23 -88 98c0 76 90 193 243 193c89 0 207 -43 207 -148c0 -46 -29 -79 -75 -79c-33 0 -69 21 -91 66c-1 1 -8 14 -8 23z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E655.xml b/data/Leland/E655.xml
new file mode 100644
index 00000000000..fdf68e70a6c
--- /dev/null
+++ b/data/Leland/E655.xml
@@ -0,0 +1 @@
+<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 48c-32 0 -66 34 -66 66c0 19 12 32 31 32c6 0 11 -1 16 -3c6 -2 12 -4 16 -4s8 2 13 7l25 24c7 7 3 19 -1 28v1c-5 10 -12 22 -21 22h-34c-15 0 -15 -7 -22 -19s-18 -23 -31 -23c-22 0 -40 25 -40 57s18 58 40 58c13 0 24 -11 31 -23s7 -20 22 -20h34 c9 0 16 12 20 21c0 0 0 1 1 2c4 9 8 22 1 29l-24 24c-5 5 -9 6 -13 6c-5 0 -10 -2 -17 -4c-5 -1 -10 -2 -15 -2c-20 0 -32 12 -32 32c0 32 34 66 66 66c19 0 32 -12 32 -31c0 -6 -1 -11 -3 -16c-2 -6 -4 -11 -4 -16s2 -9 7 -14l24 -24c3 -3 6 -4 10 -4c6 0 13 3 18 5h1l1 1 c9 4 21 11 21 20v34c0 15 -7 15 -19 22s-23 18 -23 31c0 22 25 40 57 40s58 -18 58 -40c0 -13 -11 -24 -23 -31s-20 -7 -20 -22v-34c0 -9 12 -16 21 -20c0 0 1 0 2 -1c5 -2 12 -5 18 -5c4 0 8 1 11 4l24 24c5 5 6 9 6 13c0 5 -2 10 -4 17c-1 5 -2 10 -2 15c0 19 11 32 31 32 c32 0 67 -35 67 -67c0 -20 -13 -31 -32 -31c-5 0 -10 1 -15 2c-7 2 -12 4 -17 4c-4 0 -8 -1 -13 -6l-24 -24c-7 -7 -3 -20 1 -29c5 -11 12 -23 21 -23h34c15 0 15 8 22 20s18 23 31 23c22 0 40 -26 40 -58s-18 -57 -40 -57c-13 0 -24 11 -31 23s-7 19 -22 19h-34 c-9 0 -16 -12 -21 -22v-1c-4 -9 -8 -21 -1 -28l24 -24c5 -5 9 -7 14 -7s10 2 16 4c5 2 10 3 16 3c19 0 31 -13 31 -32c0 -32 -34 -66 -66 -66c-20 0 -32 12 -32 32c0 5 1 10 2 15c2 7 4 12 4 17c0 4 -1 7 -6 12l-24 25c-3 3 -7 4 -11 4c-12 0 -41 -13 -41 -26v-34 c0 -15 8 -15 20 -22s23 -18 23 -31c0 -22 -26 -40 -58 -40s-57 18 -57 40c0 13 11 24 23 31s19 7 19 22v34c0 9 -12 16 -21 20l-1 1h-1c-5 2 -12 5 -18 5c-4 0 -7 -1 -10 -4l-24 -25c-5 -5 -7 -9 -7 -13s2 -10 4 -16c2 -5 3 -10 3 -16c0 -19 -13 -31 -32 -31zM173 236 c0 -32 31 -63 63 -63c33 0 64 30 64 63c0 35 -29 64 -64 64s-63 -29 -63 -64z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E880.xml b/data/Leland/E880.xml
new file mode 100644
index 00000000000..bb47ef425ac
--- /dev/null
+++ b/data/Leland/E880.xml
@@ -0,0 +1 @@
+<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 233c0 -128 -79 -240 -170 -240c-62 0 -103 51 -103 129c0 94 62 241 173 241c61 0 100 -50 100 -130zM170 337c-61 0 -96 -236 -96 -282c0 -22 12 -36 30 -36c24 0 40 23 60 89c18 58 34 146 34 186c0 27 -11 43 -28 43z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E881.xml b/data/Leland/E881.xml
new file mode 100644
index 00000000000..00c4d80268b
--- /dev/null
+++ b/data/Leland/E881.xml
@@ -0,0 +1 @@
+<symbol id="E881" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M239 363l-78 -289c-5 -17 -7 -27 -7 -32c0 -11 8 -14 41 -14h26l-5 -28h-216l4 28h26c24 1 34 2 39 7c3 3 5 5 7 13c1 2 3 11 7 26l52 194c3 8 3 14 3 19c0 10 -4 14 -22 14h-47l7 25c52 2 118 20 141 37h22z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E882.xml b/data/Leland/E882.xml
new file mode 100644
index 00000000000..ae526a89e77
--- /dev/null
+++ b/data/Leland/E882.xml
@@ -0,0 +1 @@
+<symbol id="E882" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 128l22 -8l-44 -120h-234v4c0 21 25 49 90 106c50 44 77 68 92 88c20 24 31 53 31 78c0 32 -23 55 -56 55c-28 0 -55 -18 -55 -36c0 -8 3 -10 20 -18c18 -8 27 -20 27 -37c0 -25 -17 -42 -42 -42c-29 0 -50 24 -50 57c0 62 54 107 129 107c32 0 61 -9 80 -24 c18 -16 31 -43 31 -69c0 -35 -21 -71 -62 -102c-10 -8 -10 -9 -99 -62c-29 -18 -43 -28 -51 -36h101c36 1 45 7 65 49z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E883.xml b/data/Leland/E883.xml
new file mode 100644
index 00000000000..daa786bc38d
--- /dev/null
+++ b/data/Leland/E883.xml
@@ -0,0 +1 @@
+<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 185c42 -10 74 -27 74 -77c0 -66 -60 -116 -142 -116c-68 0 -111 32 -111 83c0 31 19 52 47 52c25 0 41 -16 41 -39c0 -18 -9 -30 -26 -36c-9 -3 -11 -4 -11 -10c0 -12 22 -24 44 -24c56 0 74 62 74 108c0 31 -11 48 -34 48c-5 0 -5 0 -16 -3c-3 -1 -9 -2 -12 -2 c-11 0 -18 6 -18 17s7 18 17 18c4 0 7 -1 13 -3c7 -3 11 -3 17 -3c40 0 63 53 63 87c0 31 -17 50 -45 50c-21 0 -42 -10 -42 -21c0 -3 0 -3 9 -10c11 -9 16 -19 16 -31c0 -21 -17 -37 -39 -37c-25 0 -42 18 -42 45c0 46 50 81 114 81c65 0 109 -34 109 -83 c0 -60 -50 -83 -100 -94z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E884.xml b/data/Leland/E884.xml
new file mode 100644
index 00000000000..cf0ee948767
--- /dev/null
+++ b/data/Leland/E884.xml
@@ -0,0 +1 @@
+<symbol id="E884" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M282 128l-6 -33h-62l-5 -21c-5 -17 -7 -27 -7 -32c0 -11 8 -14 41 -14h9l-4 -28h-186l3 28h13c24 1 34 2 39 7c3 3 5 5 7 13c2 5 2 10 7 26l5 21h-136v28l237 240h49l-63 -235h59zM145 129l39 141l-138 -141h99z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E885.xml b/data/Leland/E885.xml
new file mode 100644
index 00000000000..71766256291
--- /dev/null
+++ b/data/Leland/E885.xml
@@ -0,0 +1 @@
+<symbol id="E885" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M54 201l47 163c42 -10 79 -15 113 -15c28 0 49 5 72 14c3 1 5 1 6 1c2 0 3 -1 3 -4c0 -16 -14 -42 -30 -56c-22 -19 -50 -27 -91 -27c-23 0 -23 0 -64 9l-20 -67c26 10 45 14 68 14c63 0 104 -36 104 -93c0 -84 -66 -146 -156 -146c-65 0 -106 32 -106 81 c0 31 18 52 47 52c25 0 41 -16 41 -39c0 -20 -10 -33 -30 -40c-5 -2 -6 -3 -6 -6c0 -11 20 -22 43 -22c46 0 82 50 82 113c0 42 -19 67 -52 67c-13 0 -21 -2 -47 -13c-3 -20 -12 -30 -27 -30c-10 0 -17 8 -17 18c0 11 7 20 20 26z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E886.xml b/data/Leland/E886.xml
new file mode 100644
index 00000000000..d901b1d8b38
--- /dev/null
+++ b/data/Leland/E886.xml
@@ -0,0 +1 @@
+<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 224c55 0 94 -37 94 -91c0 -75 -64 -138 -142 -138c-67 0 -110 48 -110 126c0 108 71 244 193 244c50 0 86 -27 86 -64c0 -26 -17 -43 -43 -43c-23 0 -41 15 -41 36c0 10 4 19 12 28c3 4 4 5 4 8c0 5 -8 9 -18 9c-55 0 -82 -96 -93 -136c20 16 34 21 58 21zM136 193 c-50 0 -58 -83 -58 -119s11 -55 33 -55c47 0 58 89 58 123c0 33 -12 51 -33 51z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E887.xml b/data/Leland/E887.xml
new file mode 100644
index 00000000000..adf9b51fdb9
--- /dev/null
+++ b/data/Leland/E887.xml
@@ -0,0 +1 @@
+<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M271 365l1 -19c-95 -163 -117 -209 -131 -289c-7 -32 -13 -62 -54 -62c-27 0 -46 17 -46 42c0 34 13 52 149 228l19 25h-113c-29 0 -43 -12 -64 -50l-8 -15l-24 7l53 133c42 -5 63 -5 97 -5c36 0 64 1 121 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E888.xml b/data/Leland/E888.xml
new file mode 100644
index 00000000000..4d0f7fee246
--- /dev/null
+++ b/data/Leland/E888.xml
@@ -0,0 +1 @@
+<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 109c0 -67 -60 -114 -145 -114c-69 0 -115 34 -115 84c0 51 45 82 88 98c-27 24 -38 46 -38 77c0 65 53 111 129 111c62 0 104 -33 104 -82c0 -39 -23 -65 -74 -84c33 -21 51 -53 51 -90zM226 282c0 36 -21 57 -55 57s-58 -23 -58 -54c0 -22 9 -34 35 -50 c7 -4 12 -8 40 -22c28 21 38 40 38 69zM62 81c0 -37 26 -61 64 -61s67 26 67 59c0 25 -14 43 -46 61c-4 3 -4 2 -24 12c-6 3 -7 4 -15 8c-30 -17 -46 -46 -46 -79z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E889.xml b/data/Leland/E889.xml
new file mode 100644
index 00000000000..692b7c3dc23
--- /dev/null
+++ b/data/Leland/E889.xml
@@ -0,0 +1 @@
+<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M121 141c-55 0 -94 37 -94 91c0 75 65 138 143 138c67 0 109 -48 109 -126c0 -108 -72 -244 -193 -244c-50 0 -86 27 -86 64c0 26 18 43 44 43c23 0 40 -15 40 -36c0 -10 -4 -18 -12 -27c-3 -4 -4 -6 -4 -9c0 -5 8 -9 18 -9c55 0 82 96 93 136c-20 -16 -34 -21 -58 -21z M169 347c-49 0 -58 -88 -58 -123c0 -33 11 -52 32 -52c50 0 59 84 59 120s-11 55 -33 55z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E88A.xml b/data/Leland/E88A.xml
new file mode 100644
index 00000000000..f711208dec4
--- /dev/null
+++ b/data/Leland/E88A.xml
@@ -0,0 +1 @@
+<symbol id="E88A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M70 186c-23 0 -37 18 -37 39c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44zM37 58c-23 0 -37 18 -37 39c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E93C.xml b/data/Leland/E93C.xml
new file mode 100644
index 00000000000..45c33675a94
--- /dev/null
+++ b/data/Leland/E93C.xml
@@ -0,0 +1 @@
+<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -9l-154 -120c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -8zM198 -80l73 57l-133 104l-74 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E93D.xml b/data/Leland/E93D.xml
new file mode 100644
index 00000000000..b97be880543
--- /dev/null
+++ b/data/Leland/E93D.xml
@@ -0,0 +1 @@
+<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -10l-154 -119c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAA4.xml b/data/Leland/EAA4.xml
new file mode 100644
index 00000000000..c76376b0916
--- /dev/null
+++ b/data/Leland/EAA4.xml
@@ -0,0 +1 @@
+<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 202c0 0 4 -3 4 -8c0 -2 -1 -5 -4 -8l-48 -48c-8 -9 -27 -21 -48 -21c-10 0 -21 3 -32 11c-10 9 -74 63 -74 63s-3 3 -7 3c-2 0 -4 -1 -6 -3l-11 -11s-4 -3 -7 -3s-6 1 -9 4c-8 7 -14 14 -14 14s-4 4 -4 9c0 3 1 5 4 8l48 48c8 9 27 21 48 21c10 0 21 -3 32 -11 c10 -9 74 -64 74 -64s2 -3 6 -3c2 0 4 1 6 3l11 11s4 3 7 3s7 -1 10 -4c8 -7 14 -14 14 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAA9.xml b/data/Leland/EAA9.xml
new file mode 100644
index 00000000000..f1bbb04b33a
--- /dev/null
+++ b/data/Leland/EAA9.xml
@@ -0,0 +1 @@
+<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 85c0 0 4 -3 4 -8c0 -2 -1 -5 -4 -8l-48 -48c-8 -9 -27 -21 -48 -21c-10 0 -21 3 -32 11c-10 9 -74 63 -74 63s-3 3 -7 3c-2 0 -4 -1 -6 -3l-11 -11s-4 -3 -7 -3s-6 1 -9 4c-8 7 -14 14 -14 14s-4 4 -4 9c0 3 1 5 4 8l48 48c8 9 27 21 48 21c10 0 21 -3 32 -11 c10 -9 74 -64 74 -64s2 -3 6 -3c2 0 4 1 6 3l11 11s4 3 7 3s7 -1 10 -4c8 -7 14 -14 14 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAAA.xml b/data/Leland/EAAA.xml
new file mode 100644
index 00000000000..fb104294b4d
--- /dev/null
+++ b/data/Leland/EAAA.xml
@@ -0,0 +1 @@
+<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-18 85c0 0 6 7 14 14c3 3 7 4 10 4s5 -1 7 -3l11 -11c2 -2 4 -3 6 -3c4 0 6 3 6 3s64 55 74 64c11 8 22 11 32 11c21 0 40 -12 48 -21l48 -48c3 -3 4 -5 4 -8c0 -5 -4 -9 -4 -9s-6 -7 -14 -14c-3 -3 -6 -4 -9 -4s-5 1 -7 3l-11 11c-2 2 -4 3 -6 3c-4 0 -7 -3 -7 -3 s-64 -54 -74 -63c-11 -8 -22 -11 -32 -11c-21 0 -40 12 -48 21l-48 48c-3 3 -4 6 -4 8c0 5 4 8 4 8z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAAD.xml b/data/Leland/EAAD.xml
new file mode 100644
index 00000000000..b79eb6ef0f4
--- /dev/null
+++ b/data/Leland/EAAD.xml
@@ -0,0 +1 @@
+<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 255l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20l-208 -147c-4 -2 -10 -4 -14 -4c-13 0 -24 11 -24 24c0 5 2 11 5 15l54 71c3 4 5 9 5 14c0 16 -16 30 -34 30c-8 0 -16 -3 -23 -10c-2 -1 -4 -2 -7 -2s-6 1 -10 4s-10 10 -14 14c0 0 -3 2 -3 7c0 2 1 6 3 9 c27 32 50 42 93 42l-65 85c-3 4 -4 11 -4 15c0 14 10 25 24 25c4 0 10 -3 14 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAAE.xml b/data/Leland/EAAE.xml
new file mode 100644
index 00000000000..ac30ea1a826
--- /dev/null
+++ b/data/Leland/EAAE.xml
@@ -0,0 +1 @@
+<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 68l-208 -147c-4 -2 -10 -5 -14 -5c-14 0 -24 11 -24 25c0 4 1 11 4 15l65 85c-42 0 -66 9 -93 42c-2 3 -3 7 -3 9c0 5 3 7 3 7c4 4 10 11 14 14s7 4 10 4s5 -1 7 -2c7 -7 15 -10 23 -10c18 0 34 14 34 30c0 5 -2 10 -5 14l-54 71c-3 4 -5 10 -5 15c0 13 11 24 24 24 c4 0 10 -2 14 -4l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma.xml b/data/Petaluma.xml
new file mode 100644
index 00000000000..8d2987dfe0d
--- /dev/null
+++ b/data/Petaluma.xml
@@ -0,0 +1,599 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bounding-boxes font-family="Petaluma" units-per-em="1000">
+  <g c="E440" x="1.87" y="-248.0" w="285.13" h="680.47" h-a-x="287" n="accidentalBuyukMucennebFlat">
+    <a n="cutOutSE" x="0.87" y="0.31"/>
+    <a n="cutOutSW" x="0.32" y="1.46"/>
+  </g>
+  <g c="E441" x="-10.0" y="-231.0" w="208.0" h="680.0" h-a-x="198" n="accidentalKucukMucennebFlat">
+    <a n="cutOutNE" x="0.29" y="1.77"/>
+    <a n="cutOutSE" x="0.29" y="0.16"/>
+  </g>
+  <g c="E442" x="1.87" y="-236.0" w="285.13" h="680.0" h-a-x="287" n="accidentalBakiyeFlat">
+    <a n="cutOutNE" x="0.64" y="2.59"/>
+    <a n="cutOutNW" x="0.4" y="2.22"/>
+    <a n="cutOutSE" x="0.67" y="0.16"/>
+    <a n="cutOutSW" x="0.29" y="1.58"/>
+  </g>
+  <g c="E443" x="-10.0" y="-231.0" w="208.0" h="680.0" h-a-x="198" n="accidentalKomaFlat">
+    <a n="cutOutNW" x="0.55" y="1.72"/>
+    <a n="cutOutSW" x="0.49" y="0.12"/>
+  </g>
+  <g c="E444" x="0.0" y="-338.0" w="300.0" h="689.0" h-a-x="300" n="accidentalKomaSharp">
+    <a n="cutOutNE" x="0.72" y="2.17"/>
+    <a n="cutOutNW" x="0.51" y="2.04"/>
+    <a n="cutOutSE" x="0.66" y="0.71"/>
+    <a n="cutOutSW" x="0.43" y="0.52"/>
+  </g>
+  <g c="E445" x="-25.0" y="-356.0" w="412.0" h="767.0" h-a-x="377" n="accidentalBakiyeSharp">
+    <a n="cutOutNE" x="1.19" y="2.43"/>
+    <a n="cutOutNW" x="0.62" y="2.16"/>
+    <a n="cutOutSE" x="1.18" y="0.76"/>
+    <a n="cutOutSW" x="0.55" y="0.49"/>
+  </g>
+  <g c="E446" x="-0.15" y="-420.0" w="359.15" h="763.0" h-a-x="360" n="accidentalKucukMucennebSharp">
+    <a n="cutOutNE" x="0.91" y="2.6"/>
+    <a n="cutOutNW" x="0.66" y="2.46"/>
+    <a n="cutOutSE" x="0.8" y="0.69"/>
+    <a n="cutOutSW" x="0.61" y="0.63"/>
+  </g>
+  <g c="E447" x="-1.0" y="-460.0" w="468.0" h="810.0" h-a-x="468" n="accidentalBuyukMucennebSharp">
+    <a n="cutOutNE" x="1.43" y="2.74"/>
+    <a n="cutOutNW" x="0.6" y="2.59"/>
+    <a n="cutOutSE" x="1.4" y="0.91"/>
+    <a n="cutOutSW" x="0.6" y="0.73"/>
+  </g>
+  <g c="E4A0" x="0.0" y="0.0" w="425.0" h="326.0" h-a-x="425" n="articAccentAbove"/>
+  <g c="E4A1" x="0.0" y="-326.0" w="425.0" h="326.0" h-a-x="425" n="articAccentBelow"/>
+  <g c="E4A2" x="1.42" y="0.0" w="110.58" h="156.0" h-a-x="111" n="articStaccatoAbove"/>
+  <g c="E4A3" x="1.42" y="-156.0" w="110.67" h="156.0" h-a-x="111" n="articStaccatoBelow"/>
+  <g c="E4A4" x="0.35" y="0.0" w="470.77" h="56.0" h-a-x="471" n="articTenutoAbove"/>
+  <g c="E4A5" x="0.35" y="-59.0" w="470.77" h="56.0" h-a-x="471" n="articTenutoBelow"/>
+  <g c="E4A6" x="0.0" y="0.0" w="139.0" h="411.0" h-a-x="139" n="articStaccatissimoAbove"/>
+  <g c="E4A7" x="0.0" y="-411.0" w="139.0" h="411.0" h-a-x="139" n="articStaccatissimoBelow"/>
+  <g c="E4A8" x="0.0" y="0.0" w="85.0" h="295.0" h-a-x="85" n="articStaccatissimoWedgeAbove"/>
+  <g c="E4A9" x="0.0" y="-295.0" w="85.0" h="295.0" h-a-x="85" n="articStaccatissimoWedgeBelow"/>
+  <g c="E4AA" x="-0.1" y="0.0" w="64.1" h="452.0" h-a-x="64" n="articStaccatissimoStrokeAbove"/>
+  <g c="E4AB" x="0.0" y="-452.0" w="64.1" h="452.0" h-a-x="64" n="articStaccatissimoStrokeBelow"/>
+  <g c="E4AC" x="0.04" y="0.0" w="395.96" h="328.0" h-a-x="396" n="articMarcatoAbove"/>
+  <g c="E4AD" x="0.0" y="-328.0" w="395.96" h="328.0" h-a-x="396" n="articMarcatoBelow"/>
+  <g c="E4AE" x="0.0" y="0.0" w="416.0" h="483.0" h-a-x="416" n="articMarcatoStaccatoAbove"/>
+  <g c="E4AF" x="0.0" y="-483.0" w="416.0" h="483.0" h-a-x="416" n="articMarcatoStaccatoBelow"/>
+  <g c="E4B0" x="0.0" y="0.0" w="385.0" h="505.0" h-a-x="385" n="articAccentStaccatoAbove"/>
+  <g c="E4B1" x="0.0" y="-505.66" w="385.0" h="504.66" h-a-x="385" n="articAccentStaccatoBelow"/>
+  <g c="E4B2" x="0.0" y="0.0" w="472.0" h="270.0" h-a-x="472" n="articTenutoStaccatoAbove"/>
+  <g c="E4B3" x="0.0" y="-270.0" w="472.0" h="270.0" h-a-x="472" n="articTenutoStaccatoBelow"/>
+  <g c="E4B4" x="0.0" y="0.0" w="521.0" h="438.0" h-a-x="521" n="articTenutoAccentAbove"/>
+  <g c="E4B5" x="0.0" y="-438.0" w="521.0" h="438.0" h-a-x="521" n="articTenutoAccentBelow"/>
+  <g c="E4B6" x="0.0" y="0.0" w="305.0" h="319.0" h-a-x="305" n="articStressAbove"/>
+  <g c="E4B7" x="0.0" y="-319.0" w="305.0" h="319.0" h-a-x="305" n="articStressBelow"/>
+  <g c="E4B8" x="0.0" y="0.0" w="492.0" h="296.0" h-a-x="492" n="articUnstressAbove"/>
+  <g c="E4B9" x="0.0" y="-296.0" w="492.0" h="296.0" h-a-x="492" n="articUnstressBelow"/>
+  <g c="E4BA" x="-0.4" y="0.0" w="412.4" h="181.0" h-a-x="413" n="articLaissezVibrerAbove"/>
+  <g c="E4BB" x="-0.4" y="-181.0" w="412.4" h="181.0" h-a-x="412" n="articLaissezVibrerBelow"/>
+  <g c="E4BC" x="0.0" y="0.0" w="537.0" h="422.0" h-a-x="537" n="articMarcatoTenutoAbove"/>
+  <g c="E4BD" x="0.0" y="-422.0" w="537.0" h="422.0" h-a-x="537" n="articMarcatoTenutoBelow"/>
+  <g c="E500" x="0.0" y="-250.0" w="599.11" h="425.0" h-a-x="599" n="repeat1Bar"/>
+  <g c="E501" x="0.01" y="-246.92" w="774.99" h="609.74" h-a-x="775" n="repeat2Bars"/>
+  <g c="E502" x="0.0" y="-304.0" w="1374.0" h="608.0" h-a-x="1374" n="repeat4Bars"/>
+  <g c="E503" x="0.0" y="62.0" w="114.0" h="151.0" h-a-x="114" n="repeatBarUpperDot"/>
+  <g c="E504" x="0.0" y="-225.19" w="630.0" h="490.32" h-a-x="630" n="repeatBarSlash"/>
+  <g c="E505" x="0.0" y="-206.0" w="114.0" h="151.0" h-a-x="114" n="repeatBarLowerDot"/>
+  <g c="E5E5" x="0.0" y="0.0" w="274.0" h="260.0" h-a-x="274" n="brassMuteClosed"/>
+  <g c="E5E6" x="0.5" y="0.0" w="314.5" h="309.0" h-a-x="315" n="brassMuteHalfClosed"/>
+  <g c="E5E7" x="1.0" y="0.0" w="312.01" h="309.0" h-a-x="312" n="brassMuteOpen"/>
+  <g c="E050" x="0.0" y="-559.0" w="664.0" h="1568.0" h-a-x="664" n="gClef"/>
+  <g c="E051" x="0.0" y="-885.0" w="664.0" h="1894.0" h-a-x="664" n="gClef15mb"/>
+  <g c="E052" x="0.0" y="-840.0" w="664.0" h="1849.0" h-a-x="664" n="gClef8vb"/>
+  <g c="E053" x="0.0" y="-559.0" w="664.0" h="1872.21" h-a-x="664" n="gClef8va"/>
+  <g c="E054" x="0.0" y="-559.0" w="664.0" h="1909.65" h-a-x="664" n="gClef15ma"/>
+  <g c="E055" x="0.0" y="-559.0" w="1040.0" h="1568.0" h-a-x="1040" n="gClef8vbOld"/>
+  <g c="E056" x="0.0" y="-561.0" w="822.0" h="1567.35" h-a-x="822" n="gClef8vbCClef"/>
+  <g c="E05C" x="0.0" y="-543.0" w="731.0" h="1086.0" h-a-x="731" n="cClef"/>
+  <g c="E05D" x="0.0" y="-921.0" w="731.0" h="1464.0" h-a-x="731" n="cClef8vb"/>
+  <g c="E062" x="0.0" y="-496.0" w="776.0" h="712.0" h-a-x="776" n="fClef"/>
+  <g c="E063" x="0.0" y="-856.0" w="776.0" h="1072.0" h-a-x="776" n="fClef15mb"/>
+  <g c="E064" x="0.0" y="-814.0" w="776.0" h="1030.0" h-a-x="776" n="fClef8vb"/>
+  <g c="E065" x="0.0" y="-496.0" w="776.0" h="1053.21" h-a-x="776" n="fClef8va"/>
+  <g c="E066" x="0.0" y="-496.0" w="776.0" h="1060.65" h-a-x="776" n="fClef15ma"/>
+  <g c="E069" x="0.0" y="-250.0" w="379.14" h="500.0" h-a-x="379" n="unpitchedPercussionClef1"/>
+  <g c="E06A" x="0.0" y="-447.0" w="298.34" h="894.0" h-a-x="298" n="unpitchedPercussionClef2"/>
+  <g c="E073" x="0.0" y="-559.0" w="664.0" h="1568.0" h-a-x="664" n="gClefReversed"/>
+  <g c="E074" x="0.0" y="-560.0" w="664.0" h="1568.0" h-a-x="664" n="gClefTurned"/>
+  <g c="E075" x="0.0" y="-543.0" w="731.0" h="1086.0" h-a-x="731" n="cClefReversed"/>
+  <g c="E076" x="0.0" y="-463.0" w="776.0" h="712.0" h-a-x="776" n="fClefReversed"/>
+  <g c="E077" x="0.0" y="-463.0" w="776.0" h="712.0" h-a-x="776" n="fClefTurned"/>
+  <g c="E566" x="1.0" y="-18.0" w="550.0" h="557.0" h-a-x="551" n="ornamentTrill"/>
+  <g c="E567" x="0.0" y="0.0" w="574.0" h="312.0" h-a-x="574" n="ornamentTurn"/>
+  <g c="E568" x="0.0" y="0.0" w="574.0" h="312.0" n="ornamentTurnInverted"/>
+  <g c="E569" x="0.0" y="-106.0" w="574.0" h="511.0" h-a-x="574" n="ornamentTurnSlash"/>
+  <g c="E56A" x="0.0" y="0.0" w="312.0" h="574.0" h-a-x="312" n="ornamentTurnUp"/>
+  <g c="E56B" x="0.0" y="0.0" w="312.0" h="574.0" h-a-x="312" n="ornamentTurnUpS"/>
+  <g c="E56C" x="0.0" y="0.0" w="747.0" h="243.0" h-a-x="747" n="ornamentShortTrill"/>
+  <g c="E56D" x="0.0" y="0.0" w="700.0" h="497.0" h-a-x="700" n="ornamentMordent"/>
+  <g c="E56E" x="0.0" y="0.0" w="982.18" h="224.0" h-a-x="982" n="ornamentTremblement"/>
+  <g c="E56F" x="0.0" y="-101.08" w="500.0" h="361.12" h-a-x="500" n="ornamentHaydn"/>
+  <g c="E520" x="-49.0" y="-142.0" w="375.5" h="657.0" h-a-x="327" n="dynamicPiano">
+    <a n="opticalCenter" x="1.22" y="0.0"/>
+  </g>
+  <g c="E521" x="-18.0" y="-50.0" w="577.0" h="415.0" h-a-x="500" n="dynamicMezzo">
+    <a n="opticalCenter" x="0.87" y="0.0"/>
+  </g>
+  <g c="E522" x="-144.0" y="-115.39" w="455.3" h="619.39" h-a-x="281" n="dynamicForte">
+    <a n="opticalCenter" x="1.26" y="0.0"/>
+  </g>
+  <g c="E523" x="-75.0" y="-90.0" w="397.1" h="415.0" h-a-x="310" n="dynamicRinforzando">
+    <a n="opticalCenter" x="0.61" y="0.0"/>
+  </g>
+  <g c="E524" x="0.0" y="0.0" w="296.0" h="379.0" h-a-x="296" n="dynamicSforzando">
+    <a n="opticalCenter" x="0.44" y="0.0"/>
+  </g>
+  <g c="E525" x="-42.74" y="0.0" w="373.74" h="328.0" h-a-x="331" n="dynamicZ">
+    <a n="opticalCenter" x="0.5" y="0.0"/>
+  </g>
+  <g c="E526" x="-20.0" y="0.0" w="307.0" h="414.0" h-a-x="287" n="dynamicNiente">
+    <a n="opticalCenter" x="0.62" y="0.0"/>
+  </g>
+  <g c="E527" x="-103.0" y="-274.0" w="1901.03" h="668.0" h-a-x="1798" n="dynamicPPPPPP">
+    <a n="opticalCenter" x="4.25" y="0.0"/>
+  </g>
+  <g c="E528" x="-99.0" y="-285.0" w="1595.0" h="658.0" h-a-x="1496" n="dynamicPPPPP">
+    <a n="opticalCenter" x="3.55" y="0.0"/>
+  </g>
+  <g c="E529" x="-114.0" y="-277.06" w="1311.0" h="663.06" h-a-x="1197" n="dynamicPPPP">
+    <a n="opticalCenter" x="3.0" y="0.0"/>
+  </g>
+  <g c="E52A" x="-101.13" y="-321.0" w="994.13" h="679.0" h-a-x="893" n="dynamicPPP">
+    <a n="opticalCenter" x="2.37" y="0.0"/>
+  </g>
+  <g c="E52B" x="-96.0" y="-282.57" w="683.0" h="662.98" h-a-x="587" n="dynamicPP">
+    <a n="opticalCenter" x="1.71" y="0.0"/>
+  </g>
+  <g c="E52C" x="-25.0" y="-243.0" w="835.02" h="654.0" h-a-x="810" n="dynamicMP">
+    <a n="opticalCenter" x="1.85" y="0.0"/>
+  </g>
+  <g c="E52D" x="-15.0" y="-186.0" w="886.39" h="618.0" h-a-x="866" n="dynamicMF">
+    <a n="opticalCenter" x="1.8" y="0.0"/>
+  </g>
+  <g c="E52E" x="-44.0" y="-274.0" w="712.0" h="715.0" h-a-x="668" n="dynamicPF">
+    <a n="opticalCenter" x="1.68" y="0.0"/>
+  </g>
+  <g c="E52F" x="-119.0" y="-197.0" w="702.0" h="625.0" h-a-x="583" n="dynamicFF">
+    <a n="opticalCenter" x="1.85" y="0.0"/>
+  </g>
+  <g c="E530" x="-49.0" y="-197.0" w="945.0" h="632.0" h-a-x="896" n="dynamicFFF">
+    <a n="opticalCenter" x="2.47" y="0.0"/>
+  </g>
+  <g c="E531" x="-49.0" y="-197.0" w="1222.0" h="645.0" h-a-x="1173" n="dynamicFFFF">
+    <a n="opticalCenter" x="2.82" y="0.0"/>
+  </g>
+  <g c="E532" x="-49.0" y="-195.2" w="1423.0" h="669.2" h-a-x="1374" n="dynamicFFFFF">
+    <a n="opticalCenter" x="2.98" y="0.0"/>
+  </g>
+  <g c="E533" x="-49.0" y="-197.0" w="1676.0" h="669.0" h-a-x="1627" n="dynamicFFFFFF">
+    <a n="opticalCenter" x="3.5" y="0.0"/>
+  </g>
+  <g c="E534" x="-49.0" y="-245.82" w="728.0" h="717.82" h-a-x="679" n="dynamicFortePiano">
+    <a n="opticalCenter" x="1.5" y="0.0"/>
+  </g>
+  <g c="E535" x="-49.0" y="-195.39" w="753.0" h="619.39" h-a-x="704" n="dynamicForzando">
+    <a n="opticalCenter" x="1.35" y="0.0"/>
+  </g>
+  <g c="E536" x="0.0" y="-155.0" w="655.5" h="619.0" h-a-x="685" n="dynamicSforzando1">
+    <a n="opticalCenter" x="1.3" y="0.0"/>
+  </g>
+  <g c="E537" x="0.0" y="-232.0" w="946.5" h="696.0" h-a-x="947" n="dynamicSforzandoPiano">
+    <a n="opticalCenter" x="1.9" y="0.0"/>
+  </g>
+  <g c="E538" x="0.0" y="-242.0" w="1270.5" h="716.0" h-a-x="1271" n="dynamicSforzandoPianissimo">
+    <a n="opticalCenter" x="1.97" y="0.0"/>
+  </g>
+  <g c="E539" x="0.0" y="-166.0" w="936.0" h="619.0" h-a-x="936" n="dynamicSforzato">
+    <a n="opticalCenter" x="1.76" y="0.0"/>
+  </g>
+  <g c="E53A" x="0.0" y="-280.0" w="1259.5" h="734.0" h-a-x="1260" n="dynamicSforzatoPiano">
+    <a n="opticalCenter" x="1.85" y="0.0"/>
+  </g>
+  <g c="E53B" x="0.0" y="-169.0" w="1181.0" h="625.0" h-a-x="1181" n="dynamicSforzatoFF">
+    <a n="opticalCenter" x="2.28" y="0.0"/>
+  </g>
+  <g c="E53C" x="-75.0" y="-115.39" w="729.5" h="619.39" h-a-x="654" n="dynamicRinforzando1">
+    <a n="opticalCenter" x="1.56" y="0.0"/>
+  </g>
+  <g c="E53D" x="-75.0" y="-155.39" w="1046.0" h="619.39" h-a-x="971" n="dynamicRinforzando2">
+    <a n="opticalCenter" x="2.08" y="0.0"/>
+  </g>
+  <g c="E240" x="0.0" y="-819.0" w="261.0" h="819.0" h-a-x="261" n="flag8thUp">
+    <a n="graceNoteSlashNE" x="1.28" y="-0.8"/>
+    <a n="graceNoteSlashSW" x="-0.64" y="-2.46"/>
+    <a n="stemUpNW" x="0.0" y="-0.18"/>
+  </g>
+  <g c="E241" x="0.0" y="0.0" w="261.0" h="819.0" h-a-x="261" n="flag8thDown">
+    <a n="graceNoteSlashNW" x="-0.6" y="2.17"/>
+    <a n="graceNoteSlashSE" x="1.33" y="0.63"/>
+    <a n="stemDownSW" x="0.0" y="0.18"/>
+  </g>
+  <g c="E242" x="0.0" y="-819.4" w="327.16" h="819.4" h-a-x="327" n="flag16thUp">
+    <a n="stemUpNW" x="0.0" y="-0.47"/>
+  </g>
+  <g c="E243" x="0.0" y="0.0" w="327.16" h="819.0" h-a-x="327" n="flag16thDown">
+    <a n="stemDownSW" x="0.0" y="0.41"/>
+  </g>
+  <g c="E244" x="-0.2" y="-849.47" w="268.29" h="998.55" h-a-x="268" n="flag32ndUp">
+    <a n="stemUpNW" x="0.0" y="0.2"/>
+  </g>
+  <g c="E245" x="-2.8" y="-169.08" w="270.9" h="998.55" h-a-x="268" n="flag32ndDown">
+    <a n="stemDownSW" x="0.0" y="-0.17"/>
+  </g>
+  <g c="E246" x="-4.0" y="-823.54" w="286.0" h="1170.54" h-a-x="282" n="flag64thUp">
+    <a n="stemUpNW" x="-0.02" y="1.17"/>
+  </g>
+  <g c="E247" x="-5.0" y="-375.0" w="286.0" h="1170.54" h-a-x="281" n="flag64thDown">
+    <a n="stemDownSW" x="-0.01" y="-0.94"/>
+  </g>
+  <g c="E248" x="0.0" y="-804.0" w="252.0" h="1334.0" h-a-x="252" n="flag128thUp">
+    <a n="stemUpNW" x="0.0" y="1.76"/>
+  </g>
+  <g c="E249" x="-0.89" y="-580.0" w="252.89" h="1334.0" n="flag128thDown">
+    <a n="stemDownSW" x="0.0" y="-1.85"/>
+  </g>
+  <g c="E24A" x="0.0" y="-827.04" w="272.0" h="1527.04" h-a-x="272" n="flag256thUp">
+    <a n="stemUpNW" x="0.0" y="2.57"/>
+  </g>
+  <g c="E24B" x="0.0" y="-750.0" w="272.0" h="1527.04" n="flag256thDown">
+    <a n="stemDownSW" x="0.0" y="-2.58"/>
+  </g>
+  <g c="E24C" x="-6.0" y="-843.05" w="290.0" h="1734.05" h-a-x="284" n="flag512thUp">
+    <a n="stemUpNW" x="0.0" y="3.31"/>
+  </g>
+  <g c="E24D" x="-6.0" y="-939.0" w="290.0" h="1734.05" h-a-x="594" n="flag512thDown">
+    <a n="stemDownSW" x="0.0" y="-3.54"/>
+  </g>
+  <g c="E24E" x="-6.0" y="-822.99" w="275.0" h="1902.99" h-a-x="269" n="flag1024thUp">
+    <a n="stemUpNW" x="0.0" y="3.89"/>
+  </g>
+  <g c="E24F" x="-6.0" y="-1200.0" w="275.0" h="1903.0" h-a-x="594" n="flag1024thDown">
+    <a n="stemDownSW" x="0.0" y="-4.28"/>
+  </g>
+  <g c="E270" x="-40.47" y="-239.0" w="240.47" h="828.0" h-a-x="200" n="accidentalQuarterToneFlatArrowUp">
+    <a n="cutOutNE" x="0.62" y="1.66"/>
+    <a n="cutOutSE" x="0.51" y="0.16"/>
+  </g>
+  <g c="E271" x="-49.35" y="-434.0" w="256.35" h="879.0" h-a-x="207" n="accidentalThreeQuarterTonesFlatArrowDown">
+    <a n="cutOutNE" x="0.48" y="2.48"/>
+    <a n="cutOutSE" x="0.6" y="1.04"/>
+  </g>
+  <g c="E272" x="-41.47" y="-471.0" w="256.97" h="1053.0" h-a-x="215" n="accidentalQuarterToneSharpNaturalArrowUp">
+    <a n="cutOutNE" x="0.59" y="2.68"/>
+    <a n="cutOutSW" x="0.79" y="1.1"/>
+  </g>
+  <g c="E273" x="0.0" y="-520.0" w="256.05" h="969.0" h-a-x="210" n="accidentalQuarterToneFlatNaturalArrowDown">
+    <a n="cutOutNE" x="0.24" y="2.88"/>
+    <a n="cutOutSW" x="0.41" y="1.33"/>
+  </g>
+  <g c="E274" x="-26.0" y="-363.0" w="412.0" h="868.0" h-a-x="376" n="accidentalThreeQuarterTonesSharpArrowUp">
+    <a n="cutOutNE" x="1.16" y="2.46"/>
+    <a n="cutOutSE" x="1.18" y="0.76"/>
+    <a n="cutOutSW" x="0.54" y="0.52"/>
+  </g>
+  <g c="E275" x="-21.0" y="-518.0" w="412.0" h="919.0" h-a-x="381" n="accidentalQuarterToneSharpArrowDown">
+    <a n="cutOutNE" x="1.16" y="3.07"/>
+    <a n="cutOutNW" x="0.55" y="1.15"/>
+    <a n="cutOutSW" x="-1.02" y="-0.9"/>
+  </g>
+  <g c="E4C0" x="-0.05" y="2.02" w="472.05" h="451.98" h-a-x="472" n="fermataAbove"/>
+  <g c="E4C1" x="-0.31" y="-430.0" w="518.88" h="429.08" h-a-x="519" n="fermataBelow"/>
+  <g c="E4C2" x="0.0" y="-31.0" w="711.0" h="527.0" h-a-x="711" n="fermataVeryShortAbove"/>
+  <g c="E4C3" x="0.0" y="-475.0" w="697.0" h="488.0" h-a-x="697" n="fermataVeryShortBelow"/>
+  <g c="E4C4" x="0.0" y="-18.09" w="545.0" h="366.09" h-a-x="545" n="fermataShortAbove"/>
+  <g c="E4C5" x="0.0" y="-335.0" w="565.0" h="345.0" h-a-x="565" n="fermataShortBelow"/>
+  <g c="E4C6" x="0.0" y="-6.0" w="591.49" h="343.1" h-a-x="591" n="fermataLongAbove"/>
+  <g c="E4C7" x="0.0" y="-335.0" w="602.0" h="342.0" h-a-x="602" n="fermataLongBelow"/>
+  <g c="E4C8" x="0.0" y="-14.1" w="715.0" h="451.1" h-a-x="715" n="fermataVeryLongAbove"/>
+  <g c="E4C9" x="-0.01" y="-427.0" w="686.46" h="457.0" h-a-x="686" n="fermataVeryLongBelow"/>
+  <g c="E4CE" x="0.0" y="0.0" w="148.0" h="275.0" h-a-x="148" n="breathMarkComma"/>
+  <g c="E650" x="0.0" y="-13.0" w="944.0" h="563.0" h-a-x="944" n="keyboardPedalPed"/>
+  <g c="E651" x="0.0" y="0.0" w="314.0" h="549.0" h-a-x="314" n="keyboardPedalP"/>
+  <g c="E655" x="0.0" y="0.0" w="436.6" h="461.0" h-a-x="437" n="keyboardPedalUp"/>
+  <g c="E659" x="0.0" y="0.0" w="1140.0" h="539.0" h-a-x="1140" n="keyboardPedalSost"/>
+  <g c="E65A" x="0.0" y="0.0" w="324.0" h="538.0" h-a-x="324" n="keyboardPedalS"/>
+  <g c="E938" x="0.0" y="0.0" w="0.0" h="0.0" n="mensuralNoteheadSemibrevisBlack"/>
+  <g c="E939" x="0.0" y="0.0" w="0.0" h="0.0" n="mensuralNoteheadSemibrevisVoid"/>
+  <g c="E93C" x="-0.11" y="-249.0" w="484.11" h="498.0" h-a-x="484" n="mensuralNoteheadMinimaWhite"/>
+  <g c="E93D" x="0.0" y="0.0" w="0.0" h="0.0" n="mensuralNoteheadSemiminimaWhite"/>
+  <g c="E93E" x="0.0" y="0.0" w="0.0" h="0.0" n="mensuralCombStemUp"/>
+  <g c="E93F" x="0.0" y="0.0" w="0.0" h="0.0" n="mensuralCombStemDown"/>
+  <g c="E949" x="0.0" y="0.0" w="0.0" h="0.0" n="mensuralCombStemUpFlagSemiminima"/>
+  <g c="E94A" x="0.0" y="0.0" w="0.0" h="0.0" n="mensuralCombStemDownFlagSemiminima"/>
+  <g c="E94B" x="0.0" y="0.0" w="0.0" h="0.0" n="mensuralCombStemUpFlagFusa"/>
+  <g c="E94C" x="0.0" y="0.0" w="0.0" h="0.0" n="mensuralCombStemDownFlagFusa"/>
+  <g c="EAA4" x="-56.16" y="109.85" w="424.29" h="176.18" h-a-x="340" n="wiggleTrill">
+    <a n="repeatOffset" x="1.36" y="0.0"/>
+  </g>
+  <g c="EAA9" x="-22.0" y="0.0" w="322.0" h="176.0" h-a-x="259" n="wiggleArpeggiatoUp">
+    <a n="repeatOffset" x="1.04" y="0.0"/>
+  </g>
+  <g c="EAAA" x="-41.0" y="0.0" w="322.0" h="176.0" h-a-x="259" n="wiggleArpeggiatoDown">
+    <a n="repeatOffset" x="2.23" y="0.0"/>
+  </g>
+  <g c="EAAD" x="-22.0" y="-15.17" w="526.0" h="210.17" h-a-x="504" n="wiggleArpeggiatoUpArrow">
+    <a n="repeatOffset" x="2.02" y="0.0"/>
+  </g>
+  <g c="EAAE" x="0.0" y="-9.0" w="526.0" h="210.0" h-a-x="496" n="wiggleArpeggiatoDownArrow">
+    <a n="repeatOffset" x="2.06" y="0.0"/>
+  </g>
+  <g c="EAAF" x="-27.0" y="0.0" w="390.0" h="176.0" h-a-x="313" n="wiggleGlissando">
+    <a n="repeatOffset" x="1.25" y="0.0"/>
+  </g>
+  <g c="E0A0" x="-0.44" y="-223.03" w="614.63" h="446.03" h-a-x="614" n="noteheadDoubleWhole">
+    <a n="noteheadOrigin" x="0.52" y="0.0"/>
+  </g>
+  <g c="E0A1" x="0.0" y="-209.39" w="474.0" h="420.39" h-a-x="474" n="noteheadDoubleWholeSquare">
+    <a n="noteheadOrigin" x="0.02" y="-0.03"/>
+  </g>
+  <g c="E0A2" x="0.0" y="-186.17" w="380.17" h="351.17" h-a-x="380" n="noteheadWhole">
+    <a n="cutOutNW" x="0.0" y="0.39"/>
+    <a n="cutOutSE" x="1.52" y="0.86"/>
+  </g>
+  <g c="E0A3" x="0.0" y="-174.0" w="334.0" h="349.0" h-a-x="334" n="noteheadHalf">
+    <a n="cutOutNW" x="0.2" y="0.49"/>
+    <a n="cutOutSE" x="1.12" y="0.73"/>
+    <a n="splitStemDownNE" x="0.96" y="-0.3"/>
+    <a n="splitStemDownNW" x="0.13" y="-0.43"/>
+    <a n="splitStemUpSE" x="1.11" y="0.37"/>
+    <a n="splitStemUpSW" x="0.33" y="0.38"/>
+    <a n="stemDownNW" x="0.0" y="-0.25"/>
+    <a n="stemUpSE" x="1.31" y="0.28"/>
+  </g>
+  <g c="E0A4" x="0.0" y="-164.0" w="334.05" h="328.0" h-a-x="334" n="noteheadBlack">
+    <a n="cutOutNW" x="0.34" y="0.5"/>
+    <a n="cutOutSE" x="1.12" y="0.82"/>
+    <a n="splitStemDownNE" x="0.99" y="-0.3"/>
+    <a n="splitStemDownNW" x="0.12" y="-0.49"/>
+    <a n="splitStemUpSE" x="1.12" y="0.47"/>
+    <a n="splitStemUpSW" x="0.36" y="0.36"/>
+    <a n="stemDownNW" x="0.0" y="-0.24"/>
+    <a n="stemUpSE" x="1.34" y="0.29"/>
+  </g>
+  <g c="E0A5" x="0.0" y="0.0" w="0.0" h="0.0" n="noteheadNull"/>
+  <g c="E0A9" x="0.0" y="-156.0" w="289.0" h="313.0" h-a-x="289" n="noteheadXBlack">
+    <a n="stemDownNW" x="0.0" y="-0.6"/>
+    <a n="stemUpSE" x="1.12" y="0.56"/>
+  </g>
+  <g c="E0AF" x="1.0" y="-161.0" w="332.35" h="321.0" h-a-x="333" n="noteheadPlusBlack">
+    <a n="stemDownNW" x="0.0" y="0.01"/>
+    <a n="stemUpSE" x="1.33" y="-0.06"/>
+  </g>
+  <g c="E0B5" x="0.0" y="-157.0" w="476.0" h="314.0" h-a-x="476" n="noteheadWholeWithX"/>
+  <g c="E0B6" x="0.0" y="-148.67" w="520.0" h="300.67" h-a-x="520" n="noteheadHalfWithX">
+    <a n="stemDownNW" x="0.0" y="-0.02"/>
+    <a n="stemUpSE" x="2.08" y="0.12"/>
+  </g>
+  <g c="E0B7" x="0.0" y="-142.0" w="359.0" h="284.0" h-a-x="359" n="noteheadVoidWithX">
+    <a n="stemDownNW" x="0.0" y="-0.04"/>
+    <a n="stemUpSE" x="1.44" y="0.09"/>
+  </g>
+  <g c="E0D9" x="0.0" y="-148.0" w="295.0" h="296.0" h-a-x="294" n="noteheadDiamondHalf">
+    <a n="stemDownNW" x="0.0" y="-0.0"/>
+    <a n="stemUpSE" x="1.18" y="-0.08"/>
+  </g>
+  <g c="E0DA" x="0.0" y="-147.0" w="499.0" h="294.0" h-a-x="499" n="noteheadDiamondHalfWide">
+    <a n="stemDownNW" x="0.0" y="0.01"/>
+    <a n="stemUpSE" x="2.0" y="-0.02"/>
+  </g>
+  <g c="E0DB" x="0.0" y="-146.0" w="310.0" h="292.0" h-a-x="309" n="noteheadDiamondBlack">
+    <a n="stemDownNW" x="0.01" y="0.0"/>
+    <a n="stemUpSE" x="1.24" y="-0.06"/>
+  </g>
+  <g c="E0DC" x="0.0" y="-132.46" w="647.0" h="266.46" h-a-x="647" n="noteheadDiamondBlackWide">
+    <a n="stemDownNW" x="0.0" y="0.02"/>
+    <a n="stemUpSE" x="2.58" y="0.01"/>
+  </g>
+  <g c="E0DD" x="0.0" y="-129.0" w="262.0" h="257.1" h-a-x="262" n="noteheadDiamondWhite">
+    <a n="stemDownNW" x="0.0" y="0.04"/>
+    <a n="stemUpSE" x="1.05" y="-0.06"/>
+  </g>
+  <g c="E0DE" x="0.0" y="-142.46" w="585.0" h="286.46" h-a-x="585" n="noteheadDiamondWhiteWide">
+    <a n="stemDownNW" x="0.01" y="0.02"/>
+    <a n="stemUpSE" x="2.34" y="-0.01"/>
+  </g>
+  <g c="E0F5" x="0.0" y="-197.0" w="106.0" h="394.0" h-a-x="76" n="noteheadParenthesisLeft"/>
+  <g c="E0F6" x="-30.0" y="-199.08" w="112.0" h="405.08" h-a-x="81" n="noteheadParenthesisRight"/>
+  <g c="E0FA" x="0.0" y="-130.0" w="489.0" h="260.0" h-a-x="490" n="noteheadWholeFilled"/>
+  <g c="E510" x="10.0" y="0.0" w="212.04" h="422.0" h-a-x="222" n="ottava"/>
+  <g c="E511" x="10.0" y="0.0" w="625.0" h="426.0" h-a-x="635" n="ottavaAlta"/>
+  <g c="E512" x="10.0" y="-37.81" w="616.0" h="459.81" h-a-x="610" n="ottavaBassa"/>
+  <g c="E513" x="10.0" y="-10.0" w="612.11" h="444.2" h-a-x="622" n="ottavaBassaBa"/>
+  <g c="E514" x="0.0" y="0.0" w="317.0" h="478.55" h-a-x="317" n="quindicesima"/>
+  <g c="E515" x="0.0" y="-1.0" w="784.09" h="486.77" h-a-x="784" n="quindicesimaAlta"/>
+  <g c="E516" x="0.0" y="-20.0" w="784.09" h="499.55" h-a-x="784" n="quindicesimaBassa"/>
+  <g c="E517" x="10.0" y="-5.0" w="426.0" h="527.0" h-a-x="446" n="ventiduesima"/>
+  <g c="E518" x="10.0" y="-5.0" w="901.09" h="527.0" h-a-x="921" n="ventiduesimaAlta"/>
+  <g c="E519" x="10.0" y="-30.39" w="901.09" h="552.39" h-a-x="921" n="ventiduesimaBassa"/>
+  <g c="E51A" x="-0.13" y="-20.0" w="147.13" h="520.0" h-a-x="122" n="octaveParensLeft"/>
+  <g c="E51B" x="-26.0" y="-20.0" w="156.0" h="543.0" h-a-x="130" n="octaveParensRight"/>
+  <g c="E51C" x="0.0" y="0.0" w="613.0" h="422.0" n="ottavaBassaVb"/>
+  <g c="E51D" x="0.0" y="-30.0" w="791.0" h="499.55" h-a-x="791" n="quindicesimaBassaMb"/>
+  <g c="E51E" x="0.0" y="-17.0" w="856.0" h="537.0" h-a-x="856" n="ventiduesimaBassaMb"/>
+  <g c="E583" x="0.0" y="93.0" w="35.0" h="314.0" h-a-x="36" n="ornamentVerticalLine"/>
+  <g c="E587" x="-0.23" y="-50.0" w="1056.23" h="704.0" h-a-x="1056" n="ornamentSchleifer"/>
+  <g c="E630" x="0.0" y="0.0" w="211.0" h="307.0" h-a-x="211" n="pluckedSnapPizzicatoBelow"/>
+  <g c="E631" x="0.0" y="0.0" w="201.0" h="325.0" h-a-x="201" n="pluckedSnapPizzicatoAbove"/>
+  <g c="E632" x="0.0" y="-0.05" w="311.0" h="187.05" h-a-x="311" n="pluckedBuzzPizzicato"/>
+  <g c="E633" x="0.0" y="0.0" w="271.0" h="284.0" h-a-x="271" n="pluckedLeftHandPizzicato"/>
+  <g c="E638" x="0.07" y="0.0" w="363.93" h="316.0" h-a-x="364" n="pluckedDamp"/>
+  <g c="E5B0" x="0.0" y="-12.0" w="1042.0" h="363.0" h-a-x="1042" n="ornamentPrecompSlide"/>
+  <g c="E5B1" x="0.0" y="-70.0" w="1066.08" h="342.0" h-a-x="1066" n="ornamentPrecompDescendingSlide"/>
+  <g c="E5B2" x="-0.11" y="-50.0" w="1066.11" h="583.17" h-a-x="1066" n="ornamentPrecompAppoggTrill"/>
+  <g c="E5B3" x="0.0" y="-20.0" w="833.0" h="628.0" h-a-x="833" n="ornamentPrecompAppoggTrillSuffix"/>
+  <g c="E5B4" x="0.0" y="-60.0" w="1565.46" h="578.81" h-a-x="1565" n="ornamentPrecompTurnTrillDAnglebert"/>
+  <g c="E5B5" x="0.0" y="-380.0" w="1088.0" h="632.0" h-a-x="1088" n="ornamentPrecompSlideTrillDAnglebert"/>
+  <g c="E5B6" x="0.0" y="-364.0" w="1101.07" h="757.0" h-a-x="1101" n="ornamentPrecompSlideTrillMarpurg"/>
+  <g c="E5B7" x="0.0" y="-169.0" w="1387.0" h="611.0" h-a-x="1386" n="ornamentPrecompTurnTrillBach"/>
+  <g c="E5B8" x="0.0" y="-380.0" w="1185.0" h="845.0" h-a-x="1185" n="ornamentPrecompSlideTrillBach"/>
+  <g c="E5B9" x="0.0" y="-200.0" w="1425.0" h="692.0" h-a-x="1425" n="ornamentPrecompSlideTrillMuffat"/>
+  <g c="E5BA" x="0.0" y="-202.0" w="1109.0" h="704.0" h-a-x="1109" n="ornamentPrecompSlideTrillSuffixMuffat"/>
+  <g c="E5BB" x="0.0" y="-20.0" w="1003.0" h="541.0" h-a-x="1003" n="ornamentPrecompTrillSuffixDandrieu"/>
+  <g c="E5BC" x="-0.14" y="-290.0" w="1422.14" h="774.0" h-a-x="1423" n="ornamentPrecompPortDeVoixMordent"/>
+  <g c="E5BD" x="0.0" y="-160.0" w="945.78" h="637.0" h-a-x="946" n="ornamentPrecompTrillWithMordent"/>
+  <g c="E5BE" x="0.0" y="-3.0" w="1067.0" h="394.0" h-a-x="1067" n="ornamentPrecompCadence"/>
+  <g c="E5BF" x="0.0" y="-174.0" w="1167.0" h="569.0" h-a-x="1167" n="ornamentPrecompCadenceWithTurn"/>
+  <g c="E5C0" x="0.0" y="-10.0" w="1322.0" h="359.0" h-a-x="1322" n="ornamentPrecompDoubleCadenceLowerPrefix"/>
+  <g c="E5C1" x="-0.63" y="-20.0" w="931.63" h="304.0" h-a-x="932" n="ornamentPrecompCadenceUpperPrefix"/>
+  <g c="E5C2" x="0.0" y="-190.0" w="1082.0" h="670.0" h-a-x="1082" n="ornamentPrecompCadenceUpperPrefixTurn"/>
+  <g c="E5C3" x="0.0" y="-30.0" w="1246.0" h="326.03" h-a-x="1246" n="ornamentPrecompDoubleCadenceUpperPrefix"/>
+  <g c="E5C4" x="0.0" y="-237.0" w="1226.0" h="673.0" h-a-x="1226" n="ornamentPrecompDoubleCadenceUpperPrefixTurn"/>
+  <g c="E5C5" x="0.0" y="0.0" w="736.0" h="559.0" h-a-x="736" n="ornamentPrecompMordentRelease"/>
+  <g c="E5C6" x="-0.09" y="-30.0" w="1151.09" h="463.61" h-a-x="1151" n="ornamentPrecompMordentUpperPrefix"/>
+  <g c="E5C7" x="0.0" y="-150.0" w="1151.0" h="622.06" h-a-x="1151" n="ornamentPrecompInvertedMordentUpperPrefix"/>
+  <g c="E5C8" x="0.0" y="-309.0" w="833.0" h="628.0" h-a-x="833" n="ornamentPrecompTrillLowerSuffix"/>
+  <g c="E043" x="0.0" y="291.0" w="144.0" h="401.0" h-a-x="144" n="repeatDots"/>
+  <g c="E044" x="0.0" y="-83.0" w="143.0" h="159.0" h-a-x="143" n="repeatDot"/>
+  <g c="E045" x="20.0" y="-12.0" w="1057.19" h="453.0" h-a-x="1077" n="dalSegno"/>
+  <g c="E046" x="20.0" y="-32.0" w="1146.02" h="444.0" h-a-x="1166" n="daCapo"/>
+  <g c="E047" x="0.0" y="-65.0" w="798.0" h="871.0" h-a-x="798" n="segno"/>
+  <g c="E048" x="0.0" y="-196.0" w="1380.0" h="1233.0" h-a-x="1380" n="coda"/>
+  <g c="E049" x="0.0" y="-250.0" w="971.0" h="1213.0" h-a-x="971" n="codaSquare"/>
+  <g c="E04B" x="0.0" y="-35.0" w="408.0" h="1031.0" h-a-x="408" n="segnoSerpent2"/>
+  <g c="E4E0" x="0.0" y="-255.0" w="366.0" h="510.0" h-a-x="366" n="restMaxima"/>
+  <g c="E4E1" x="0.0" y="-249.24" w="139.06" h="496.83" h-a-x="139" n="restLonga"/>
+  <g c="E4E2" x="0.0" y="0.0" w="122.0" h="249.0" h-a-x="122" n="restDoubleWhole"/>
+  <g c="E4E3" x="0.89" y="-120.0" w="499.11" h="134.0" n="restWhole"/>
+  <g c="E4E4" x="0.0" y="0.0" w="518.4" h="162.0" h-a-x="518" n="restHalf"/>
+  <g c="E4E5" x="-0.38" y="-415.0" w="263.38" h="830.0" h-a-x="263" n="restQuarter"/>
+  <g c="E4E6" x="0.0" y="-260.0" w="289.0" h="521.0" h-a-x="289" n="rest8th"/>
+  <g c="E4E7" x="0.0" y="-328.28" w="333.0" h="572.28" h-a-x="333" n="rest16th"/>
+  <g c="E4E8" x="0.0" y="-497.5" w="347.0" h="980.5" h-a-x="347" n="rest32nd"/>
+  <g c="E4E9" x="0.0" y="-720.0" w="428.0" h="1193.68" h-a-x="428" n="rest64th"/>
+  <g c="E4EA" x="0.67" y="-711.0" w="490.33" h="1430.0" h-a-x="490" n="rest128th"/>
+  <g c="E4EB" x="0.0" y="-940.28" w="526.0" h="1675.28" h-a-x="526" n="rest256th"/>
+  <g c="E4EC" x="0.0" y="-1031.0" w="604.0" h="1970.0" h-a-x="604" n="rest512th"/>
+  <g c="E4ED" x="0.0" y="-952.0" w="662.08" h="2180.25" h-a-x="662" n="rest1024th"/>
+  <g c="E4F2" x="0.0" y="-258.0" w="284.0" h="527.0" h-a-x="284" n="restQuarterOld"/>
+  <g c="E4F6" x="0.0" y="-226.0" w="293.0" h="452.0" h-a-x="293" n="restQuarterZ"/>
+  <g c="E101" x="0.0" y="-254.0" w="488.0" h="508.0" h-a-x="488" n="noteheadSlashHorizontalEnds">
+    <a n="stemDownNW" x="0.0" y="-0.93"/>
+    <a n="stemUpSE" x="1.95" y="0.88"/>
+  </g>
+  <g c="E102" x="0.0" y="-254.54" w="954.51" h="510.54" h-a-x="955" n="noteheadSlashWhiteWhole"/>
+  <g c="E103" x="0.0" y="-243.0" w="730.0" h="486.0" h-a-x="730" n="noteheadSlashWhiteHalf">
+    <a n="stemDownNW" x="0.0" y="-0.84"/>
+    <a n="stemUpSE" x="2.92" y="0.84"/>
+  </g>
+  <g c="E000" x="0.0" y="0.0" w="78.0" h="998.54" h-a-x="78" n="brace"/>
+  <g c="E003" x="0.0" y="0.0" w="508.0" h="370.0" h-a-x="508" n="bracketTop"/>
+  <g c="E004" x="0.0" y="-393.0" w="496.0" h="393.0" h-a-x="496" n="bracketBottom"/>
+  <g c="E260" x="1.0" y="-208.0" w="208.0" h="680.0" h-a-x="208" n="accidentalFlat">
+    <a n="cutOutNE" x="0.27" y="1.72"/>
+    <a n="cutOutSE" x="0.39" y="0.17"/>
+  </g>
+  <g c="E261" x="0.0" y="-456.0" w="213.5" h="918.0" h-a-x="214" n="accidentalNatural">
+    <a n="cutOutNE" x="0.24" y="2.67"/>
+    <a n="cutOutSW" x="0.57" y="1.1"/>
+  </g>
+  <g c="E262" x="-22.0" y="-384.0" w="412.0" h="767.0" h-a-x="380" n="accidentalSharp">
+    <a n="cutOutNE" x="1.16" y="2.44"/>
+    <a n="cutOutNW" x="0.5" y="0.51"/>
+    <a n="cutOutSE" x="0.84" y="-0.45"/>
+    <a n="cutOutSW" x="0.14" y="-0.75"/>
+  </g>
+  <g c="E263" x="0.0" y="-159.0" w="287.0" h="318.0" h-a-x="287" n="accidentalDoubleSharp"/>
+  <g c="E264" x="0.0" y="-220.0" w="359.0" h="666.0" h-a-x="359" n="accidentalDoubleFlat">
+    <a n="cutOutNE" x="0.89" y="1.8"/>
+    <a n="cutOutSE" x="1.07" y="0.46"/>
+  </g>
+  <g c="E265" x="-40.0" y="-347.0" w="669.0" h="695.0" h-a-x="629" n="accidentalTripleSharp">
+    <a n="cutOutNE" x="1.28" y="2.07"/>
+    <a n="cutOutNW" x="0.58" y="1.84"/>
+    <a n="cutOutSE" x="2.03" y="0.64"/>
+    <a n="cutOutSW" x="0.57" y="0.36"/>
+  </g>
+  <g c="E266" x="0.0" y="-206.26" w="589.0" h="663.26" h-a-x="589" n="accidentalTripleFlat">
+    <a n="cutOutNE" x="1.75" y="1.56"/>
+    <a n="cutOutSE" x="1.94" y="0.19"/>
+  </g>
+  <g c="E267" x="0.0" y="-341.81" w="474.0" h="789.81" h-a-x="474" n="accidentalNaturalFlat">
+    <a n="cutOutNE" x="1.22" y="2.15"/>
+    <a n="cutOutSE" x="0.79" y="0.49"/>
+    <a n="cutOutSW" x="0.57" y="0.52"/>
+  </g>
+  <g c="E268" x="-4.48" y="-370.0" w="598.92" h="756.0" h-a-x="564" n="accidentalNaturalSharp">
+    <a n="cutOutNE" x="1.91" y="2.3"/>
+    <a n="cutOutSE" x="1.94" y="0.7"/>
+    <a n="cutOutSW" x="0.55" y="0.61"/>
+  </g>
+  <g c="E269" x="-20.0" y="-393.0" w="698.0" h="795.0" h-a-x="678" n="accidentalSharpSharp">
+    <a n="cutOutNE" x="2.25" y="2.39"/>
+    <a n="cutOutNW" x="0.56" y="2.16"/>
+    <a n="cutOutSE" x="2.26" y="0.87"/>
+    <a n="cutOutSW" x="0.49" y="0.68"/>
+  </g>
+  <g c="E26A" x="0.0" y="-270.0" w="130.19" h="537.61" h-a-x="130" n="accidentalParensLeft"/>
+  <g c="E26B" x="-0.44" y="-275.0" w="139.44" h="552.0" h-a-x="139" n="accidentalParensRight"/>
+  <g c="E26C" x="0.0" y="-288.0" w="101.0" h="576.0" h-a-x="101" n="accidentalBracketLeft"/>
+  <g c="E26D" x="0.0" y="-282.6" w="90.44" h="568.6" h-a-x="90" n="accidentalBracketRight"/>
+  <g c="E280" x="0.0" y="-240.0" w="208.0" h="680.0" h-a-x="208" n="accidentalQuarterToneFlatStein">
+    <a n="cutOutNW" x="0.53" y="1.67"/>
+    <a n="cutOutSW" x="0.48" y="0.12"/>
+  </g>
+  <g c="E281" x="0.0" y="-240.0" w="422.0" h="680.0" h-a-x="422" n="accidentalThreeQuarterTonesFlatZimmermann">
+    <a n="cutOutNE" x="1.19" y="1.72"/>
+    <a n="cutOutNW" x="0.56" y="1.73"/>
+  </g>
+  <g c="E282" x="0.0" y="-338.0" w="300.0" h="689.0" h-a-x="300" n="accidentalQuarterToneSharpStein">
+    <a n="cutOutNE" x="0.64" y="2.21"/>
+    <a n="cutOutNW" x="0.51" y="2.04"/>
+    <a n="cutOutSE" x="0.66" y="0.71"/>
+    <a n="cutOutSW" x="0.5" y="0.52"/>
+  </g>
+  <g c="E283" x="-23.0" y="-373.0" w="411.0" h="818.0" h-a-x="388" n="accidentalThreeQuarterTonesSharpStein">
+    <a n="cutOutNE" x="1.4" y="2.49"/>
+    <a n="cutOutNW" x="0.4" y="2.15"/>
+    <a n="cutOutSE" x="1.29" y="0.84"/>
+    <a n="cutOutSW" x="0.32" y="0.64"/>
+  </g>
+  <g c="E610" x="0.0" y="-0.1" w="306.0" h="366.1" h-a-x="306" n="stringsDownBow"/>
+  <g c="E611" x="0.0" y="0.0" w="298.0" h="348.0" h-a-x="298" n="stringsDownBowTurned"/>
+  <g c="E612" x="0.0" y="0.0" w="219.28" h="489.0" h-a-x="219" n="stringsUpBow"/>
+  <g c="E613" x="0.0" y="0.0" w="218.0" h="502.1" h-a-x="218" n="stringsUpBowTurned"/>
+  <g c="E614" x="0.0" y="0.0" w="191.0" h="202.0" h-a-x="191" n="stringsHarmonic"/>
+  <g c="E080" x="20.0" y="-358.16" w="493.0" h="717.16" h-a-x="533" n="timeSig0"/>
+  <g c="E081" x="20.0" y="-364.0" w="263.0" h="730.0" h-a-x="303" n="timeSig1"/>
+  <g c="E082" x="20.0" y="-378.72" w="640.46" h="760.72" h-a-x="680" n="timeSig2"/>
+  <g c="E083" x="19.82" y="-392.0" w="520.18" h="784.0" h-a-x="560" n="timeSig3"/>
+  <g c="E084" x="20.0" y="-489.59" w="613.08" h="980.78" h-a-x="653" n="timeSig4"/>
+  <g c="E085" x="19.66" y="-389.0" w="563.34" h="778.0" h-a-x="603" n="timeSig5"/>
+  <g c="E086" x="20.0" y="-363.0" w="545.0" h="726.0" h-a-x="585" n="timeSig6"/>
+  <g c="E087" x="20.36" y="-345.0" w="571.64" h="690.0" h-a-x="612" n="timeSig7"/>
+  <g c="E088" x="20.0" y="-428.0" w="484.15" h="856.0" h-a-x="524" n="timeSig8"/>
+  <g c="E089" x="20.0" y="-421.0" w="474.0" h="842.0" h-a-x="514" n="timeSig9"/>
+  <g c="E08A" x="20.0" y="-298.0" w="565.0" h="592.5" h-a-x="605" n="timeSigCommon"/>
+  <g c="E08B" x="20.0" y="-687.04" w="675.0" h="1374.04" h-a-x="715" n="timeSigCutCommon"/>
+  <g c="E08C" x="0.0" y="-358.0" w="661.0" h="716.0" h-a-x="661" n="timeSigPlus"/>
+  <g c="E08D" x="0.0" y="-197.0" w="418.0" h="396.0" h-a-x="418" n="timeSigPlusSmall"/>
+  <g c="E08E" x="0.0" y="-423.0" w="405.0" h="846.0" h-a-x="405" n="timeSigFractionalSlash"/>
+  <g c="E08F" x="0.0" y="-177.0" w="559.0" h="353.0" h-a-x="559" n="timeSigEquals"/>
+  <g c="E090" x="0.0" y="-54.0" w="662.0" h="109.0" h-a-x="662" n="timeSigMinus"/>
+  <g c="E091" x="0.0" y="-305.0" w="574.08" h="610.0" h-a-x="574" n="timeSigMultiply"/>
+  <g c="E092" x="0.0" y="-405.0" w="173.45" h="809.0" h-a-x="173" n="timeSigParensLeftSmall"/>
+  <g c="E093" x="0.0" y="-422.0" w="154.4" h="844.0" h-a-x="154" n="timeSigParensRightSmall"/>
+  <g c="E094" x="0.56" y="-728.0" w="399.07" h="1456.0" h-a-x="399" n="timeSigParensLeft"/>
+  <g c="E095" x="0.0" y="-722.63" w="274.26" h="1447.63" h-a-x="274" n="timeSigParensRight"/>
+  <g c="E220" x="-158.0" y="-88.0" w="314.19" h="176.0" h-a-x="156" n="tremolo1"/>
+  <g c="E221" x="-148.0" y="-177.0" w="297.0" h="354.0" h-a-x="149" n="tremolo2"/>
+  <g c="E222" x="-146.6" y="-253.0" w="293.82" h="506.0" h-a-x="147" n="tremolo3"/>
+  <g c="E223" x="-159.0" y="-342.0" w="318.0" h="684.0" h-a-x="159" n="tremolo4"/>
+  <g c="E224" x="-161.0" y="-437.0" w="322.0" h="874.0" h-a-x="161" n="tremolo5"/>
+  <g c="E22A" x="-175.0" y="-123.0" w="352.0" h="244.24" h-a-x="177" n="buzzRoll"/>
+  <g c="E880" x="10.0" y="3.0" w="272.0" h="449.0" h-a-x="292" n="tuplet0"/>
+  <g c="E881" x="10.0" y="-40.0" w="210.51" h="534.0" h-a-x="231" n="tuplet1"/>
+  <g c="E882" x="11.0" y="-20.0" w="350.0" h="484.0" h-a-x="370" n="tuplet2"/>
+  <g c="E883" x="10.0" y="-20.0" w="326.0" h="489.0" h-a-x="356" n="tuplet3"/>
+  <g c="E884" x="10.0" y="-50.0" w="329.0" h="556.19" h-a-x="349" n="tuplet4"/>
+  <g c="E885" x="10.0" y="-10.0" w="350.98" h="523.0" h-a-x="351" n="tuplet5"/>
+  <g c="E886" x="10.0" y="-10.0" w="281.0" h="514.0" h-a-x="301" n="tuplet6"/>
+  <g c="E887" x="10.0" y="-24.0" w="310.0" h="515.0" h-a-x="310" n="tuplet7"/>
+  <g c="E888" x="10.0" y="-40.0" w="267.43" h="594.0" h-a-x="287" n="tuplet8"/>
+  <g c="E889" x="10.0" y="0.0" w="302.0" h="664.0" h-a-x="322" n="tuplet9"/>
+  <g c="E88A" x="10.0" y="80.0" w="125.0" h="314.0" h-a-x="145" n="tupletColon"/>
+  <g c="E645" x="-157.0" y="0.0" w="314.0" h="325.0" h-a-x="157" n="vocalSprechgesang"/>
+</bounding-boxes>
diff --git a/data/Petaluma/E000.xml b/data/Petaluma/E000.xml
new file mode 100644
index 00000000000..7a993cdf518
--- /dev/null
+++ b/data/Petaluma/E000.xml
@@ -0,0 +1 @@
+<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M69 1c-1 -1 -2 -1 -3 -1c-3 0 -6 3 -8 5c-46 26 -58 70 -57 118v11c3 58 12 116 19 174c7 50 16 99 16 150c0 24 -4 48 -28 61c-6 3 -8 8 -8 13c0 6 3 11 9 14c13 5 21 14 26 27c7 20 10 41 13 62c1 9 1 18 1 28c0 48 -11 95 -19 142c-5 26 -9 53 -9 79c0 16 1 32 5 48 c4 18 10 36 23 51c3 3 6 7 10 10s9 7 14 5c3 -2 5 -6 5 -9c0 -8 -1 -12 -10 -16c-14 -5 -21 -20 -26 -34c-8 -21 -11 -43 -11 -64c0 -12 1 -25 3 -37c7 -50 21 -99 24 -150c1 -14 2 -28 2 -41c0 -25 -3 -50 -9 -74c-4 -15 -9 -30 -21 -41c-4 -3 -2 -5 0 -8 c15 -24 17 -51 17 -77c0 -37 -4 -73 -9 -109c-7 -50 -12 -100 -18 -150c-4 -32 -6 -65 -5 -98c2 -30 14 -52 44 -63c5 -2 9 -6 11 -12c1 -4 5 -10 -1 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E003.xml b/data/Petaluma/E003.xml
new file mode 100644
index 00000000000..6ac8f2d1c65
--- /dev/null
+++ b/data/Petaluma/E003.xml
@@ -0,0 +1 @@
+<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 0c-10 0 -15 3 -15 14c1 14 0 30 0 44c0 9 0 17 1 25c2 18 11 24 26 24c27 0 54 -2 80 -2c36 0 72 2 108 9c103 20 174 81 226 168c12 20 19 42 27 64c3 7 6 15 13 19c5 3 10 5 13 5c5 0 8 -3 10 -13c3 -11 4 -22 4 -33c0 -21 -5 -42 -13 -63 c-63 -166 -200 -261 -386 -261h-24c-23 0 -47 1 -70 0z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E004.xml b/data/Petaluma/E004.xml
new file mode 100644
index 00000000000..b8ea4ab3d2d
--- /dev/null
+++ b/data/Petaluma/E004.xml
@@ -0,0 +1 @@
+<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M483 -393c-11 0 -20 6 -23 19c-5 29 -15 57 -29 83c-68 127 -159 197 -306 192c-31 -2 -63 -1 -94 -6c-15 -2 -24 4 -28 23c-2 7 -2 15 -2 22c0 9 1 17 1 25c0 6 -1 13 -2 19v3c0 10 8 12 18 12c28 -1 56 0 93 0c10 0 21 1 32 1c42 0 87 -5 129 -29 c84 -47 147 -112 187 -198c19 -40 31 -82 36 -126c0 -3 1 -6 1 -9c0 -4 -1 -8 -2 -12c-2 -7 1 -19 -11 -19z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E043.xml b/data/Petaluma/E043.xml
new file mode 100644
index 00000000000..efacfe5209e
--- /dev/null
+++ b/data/Petaluma/E043.xml
@@ -0,0 +1 @@
+<symbol id="E043" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M58 544c-47 0 -45 0 -47 42c0 10 -1 19 -1 28c0 19 2 37 7 56c3 14 9 19 23 19c12 0 24 0 36 2c4 1 8 1 12 1c32 0 44 -24 44 -53c0 -63 -13 -95 -74 -95zM37 292c-3 -1 -5 -1 -7 -1c-13 0 -21 9 -21 19c-1 26 -9 51 -9 76c0 9 1 19 4 28c4 15 9 24 27 26c16 2 31 8 48 8 c4 0 7 -1 10 -1c6 2 10 3 14 3c19 0 25 -20 34 -34c5 -7 7 -16 7 -27c0 -32 -21 -75 -47 -83c-19 -6 -40 -8 -60 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E044.xml b/data/Petaluma/E044.xml
new file mode 100644
index 00000000000..d9233b79db2
--- /dev/null
+++ b/data/Petaluma/E044.xml
@@ -0,0 +1 @@
+<symbol id="E044" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M37 -82c-3 -1 -5 -1 -7 -1c-13 0 -21 9 -21 19c-1 27 -9 52 -9 78c0 9 1 17 3 26c5 15 10 24 28 26c16 2 31 8 48 8c4 0 7 -1 10 -1c5 2 10 3 14 3c18 0 25 -20 34 -34c4 -7 6 -16 6 -26c0 -33 -21 -76 -46 -84c-20 -6 -41 -8 -60 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E045.xml b/data/Petaluma/E045.xml
new file mode 100644
index 00000000000..693dcbd30a8
--- /dev/null
+++ b/data/Petaluma/E045.xml
@@ -0,0 +1 @@
+<symbol id="E045" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M773 -10c-33 5 -65 13 -96 26c-6 3 -12 5 -18 5c-7 0 -13 -3 -19 -10c-4 -5 -10 -8 -16 -8c-3 0 -7 1 -10 3c-10 4 -9 14 -9 23c0 7 1 14 1 22c0 26 -4 53 -14 79c-4 9 -3 21 -4 31v2c0 9 9 13 16 17c1 1 3 1 4 1c4 0 6 -8 8 -11c51 -68 124 -72 199 -72c1 0 2 0 3 1 c15 5 36 7 37 24c1 15 -19 19 -33 23c-33 10 -68 17 -102 26c-30 7 -57 21 -79 43c-18 18 -29 39 -32 65c-3 27 -2 54 -8 80c-5 25 22 56 52 68c10 4 20 7 30 8c15 3 30 3 46 5c43 0 83 -13 123 -26c6 -2 12 -3 18 -3c5 0 10 1 15 3c4 2 8 3 11 3c9 0 15 -7 17 -20 c5 -21 13 -41 18 -62c1 -5 2 -10 2 -15c0 -8 -2 -16 -7 -24c-9 -13 -14 -19 -21 -19c-6 0 -12 6 -22 17c-4 4 -9 8 -14 10c-39 15 -78 26 -119 26c-15 0 -30 -2 -46 -5c-9 -2 -22 -2 -23 -10v-2c0 -8 13 -11 20 -15c35 -19 74 -28 112 -39c14 -4 28 -8 41 -13 c54 -23 83 -59 83 -109c0 -13 -2 -26 -6 -41c-22 -82 -61 -109 -124 -109c-10 0 -22 1 -34 2zM489 -4c-9 0 -17 3 -19 14c-5 25 -15 49 -16 74h-2c-7 0 -10 -6 -13 -10c-36 -44 -84 -61 -139 -66c-38 -3 -76 -4 -114 -4h-76h-38c-24 -1 -35 15 -47 29c-3 4 -5 8 -5 11 c0 5 4 9 15 11c8 2 15 3 23 3c5 0 11 -1 17 -2h5c9 0 13 5 14 17c3 76 7 153 7 229c0 17 -1 34 -1 51c-1 22 -7 36 -32 35c-5 0 -11 1 -16 2c-15 4 -25 13 -25 29c1 15 17 14 26 14c27 0 54 1 80 1c43 0 86 -2 128 -12c25 -6 52 -8 77 -13c86 -17 141 -85 143 -171 c2 -49 -3 -96 -23 -142c13 8 27 8 40 11c10 2 22 10 32 10c4 0 7 -2 10 -5c16 -20 37 -39 33 -70c-3 -23 -18 -40 -41 -43zM222 71c76 25 132 100 133 179c1 81 -51 133 -130 132c-17 0 -23 -6 -22 -23c2 -27 5 -55 5 -83c-1 -64 -4 -128 -6 -191v-3c0 -10 3 -14 9 -14 c3 0 7 1 11 3zM1028 0c-13 -5 -24 -7 -32 -7c-19 0 -27 13 -34 46c-2 9 -3 16 -3 22c0 18 9 29 32 40c15 8 31 14 45 22c6 3 11 5 15 5c8 0 13 -6 18 -16c6 -15 9 -31 8 -47c0 -31 -18 -55 -49 -65z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E046.xml b/data/Petaluma/E046.xml
new file mode 100644
index 00000000000..c312f786b0e
--- /dev/null
+++ b/data/Petaluma/E046.xml
@@ -0,0 +1 @@
+<symbol id="E046" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M46 -1h-4c-13 0 -19 9 -22 19v3c0 11 14 11 19 13c16 5 33 6 49 8c9 1 14 3 14 12c5 73 13 145 13 217c0 24 -1 48 -3 71c-1 13 -5 18 -19 18c-17 0 -35 3 -52 5c-13 2 -17 12 -19 22v2c0 10 11 8 17 11c9 3 20 6 30 6c48 0 96 6 144 6c24 0 47 -1 71 -5 c31 -4 62 -8 91 -20c69 -28 101 -74 102 -149c0 -66 -19 -124 -65 -173c-28 -30 -64 -41 -102 -46c-70 -9 -140 -20 -211 -20h-27c-9 1 -17 0 -26 0zM839 -6h-26c-100 13 -184 52 -232 148c-10 20 -15 41 -15 61c0 39 16 75 40 109c44 63 114 100 183 100c14 0 28 -1 42 -5 c59 -17 95 -57 120 -111c2 -5 3 -12 3 -18c0 -9 -3 -14 -8 -14c-3 0 -6 2 -10 5c-12 9 -25 17 -32 28c-16 23 -35 30 -55 30c-15 0 -30 -4 -44 -7c-73 -22 -122 -70 -143 -144c-2 -7 -3 -14 -3 -22c0 -41 33 -78 77 -79c71 -2 134 17 183 71c7 7 12 10 18 10c4 0 8 -1 13 -3 c23 -11 39 -28 52 -48c4 -7 5 -12 5 -17c0 -11 -7 -21 -15 -30c-42 -42 -95 -59 -153 -64zM229 52c35 3 66 14 87 44c30 43 49 89 49 143c0 32 -2 65 -24 91c-27 32 -65 33 -103 35c-2 -1 -4 -1 -5 -1c-10 0 -15 -3 -15 -15c0 -42 6 -81 6 -122c0 -15 0 -31 -2 -46 c-5 -38 -5 -77 -7 -115c0 -11 2 -15 14 -14zM1101 -20c-13 -1 -65 60 -64 76c1 15 58 59 76 59c18 -1 53 -50 53 -76c1 -16 -46 -58 -65 -59zM527 -32c-16 0 -17 21 -26 31c-16 20 -24 34 -24 48c0 16 13 30 36 50c13 11 23 17 31 17c11 0 18 -10 27 -32 c5 -15 11 -30 11 -47c0 -14 -5 -25 -18 -33c-4 -3 -7 -7 -11 -9c-11 -6 -13 -25 -26 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E047.xml b/data/Petaluma/E047.xml
new file mode 100644
index 00000000000..a16b54305fa
--- /dev/null
+++ b/data/Petaluma/E047.xml
@@ -0,0 +1 @@
+<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -65c-8 0 -11 2 -11 6s3 9 6 14c20 40 48 73 78 106c34 37 67 75 101 112c50 54 101 108 152 162c-4 2 -7 3 -11 4c-38 16 -76 31 -97 70c-13 24 -19 48 -19 72c0 25 7 50 21 74c33 53 70 104 127 133c18 10 36 14 54 14c26 0 52 -9 78 -19c25 -9 45 -27 67 -42 c7 -5 10 -9 10 -15c0 -4 -2 -8 -5 -13c-15 -21 -36 -34 -59 -43c-4 -1 -7 -2 -10 -2c-10 0 -18 4 -27 11c-28 21 -58 38 -95 38c-42 0 -71 -26 -71 -66c0 -49 21 -102 81 -124l29 -12l3 3c81 90 166 176 244 268c30 37 65 70 99 104c4 5 9 9 14 13c3 2 7 3 10 3 c5 0 11 -2 15 -5c2 -1 3 -3 3 -4c0 -4 -5 -9 -6 -13c-3 -13 -12 -22 -21 -32c-108 -117 -214 -236 -321 -355c39 -18 74 -41 105 -73c15 -15 28 -32 40 -50c14 -22 20 -44 20 -66c0 -20 -5 -40 -15 -60c-40 -76 -100 -129 -184 -152c-11 -3 -23 -4 -34 -5 c-34 -1 -67 1 -98 13c-9 3 -17 8 -25 13c-15 11 -22 22 -22 33c0 10 4 20 12 32c10 16 22 29 35 42c6 6 11 8 16 8c8 0 15 -5 20 -12c24 -31 58 -48 96 -48c13 0 26 2 39 6c44 13 68 40 68 73c0 18 -6 37 -19 57c-32 51 -77 84 -127 109c-85 -92 -170 -184 -254 -276 c-27 -29 -52 -59 -77 -89c-9 -11 -19 -16 -35 -17zM598 372c-15 1 -26 10 -34 20c-10 12 -32 17 -31 32c2 14 16 27 26 39c16 22 28 32 42 32c12 0 24 -8 42 -23s27 -25 27 -36c0 -10 -9 -21 -26 -37c-13 -12 -26 -25 -46 -27zM174 243h-4c-7 0 -14 4 -20 8 c-13 10 -25 22 -40 31c-8 5 -12 10 -12 15c0 6 4 11 11 18c13 13 23 28 37 41c8 7 15 11 23 11c6 0 12 -2 19 -7c19 -15 39 -29 58 -43c4 -3 8 -6 6 -14c-7 -23 -54 -61 -78 -60z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E048.xml b/data/Petaluma/E048.xml
new file mode 100644
index 00000000000..908dc599283
--- /dev/null
+++ b/data/Petaluma/E048.xml
@@ -0,0 +1 @@
+<symbol id="E048" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M714 -196c-12 0 -9 17 -11 27c-5 24 -5 49 -5 74c0 33 2 66 2 99c-14 0 -29 1 -43 2c-64 7 -127 22 -184 50c-61 30 -108 77 -134 142c-21 52 -42 104 -42 162c0 7 0 14 1 21l-272 -3h-26c20 33 33 64 55 87c5 6 15 7 27 7c10 0 21 -1 30 -1l201 3c15 58 41 112 82 161 c71 84 166 120 273 133l38 3c1 68 2 135 2 203c0 15 4 30 6 45c2 12 11 16 22 18h1c13 0 12 -12 12 -18c2 -34 3 -67 2 -101c-1 -48 -1 -96 -1 -144c5 0 11 0 16 -1c155 -4 260 -81 300 -234c4 -19 7 -37 7 -56l275 3h6c8 0 16 -1 24 -1c1 -6 2 -12 2 -17 c0 -25 -12 -45 -26 -64c-6 -9 -21 -16 -32 -16c-86 0 -172 -1 -258 -2c0 -3 -1 -6 -1 -9c-13 -89 -44 -170 -98 -242c-60 -79 -137 -120 -227 -129c-1 -49 -2 -98 -2 -147c0 -10 0 -20 -2 -29c-3 -11 -8 -26 -20 -26zM746 479c45 1 90 2 135 2c41 0 82 1 123 1 c-14 45 -42 83 -83 112c-53 37 -111 53 -172 55c-1 -57 -1 -113 -3 -170zM401 475l301 3c1 38 1 71 2 93c0 26 1 51 1 77c-6 0 -12 -1 -18 -1c-53 -6 -106 -14 -155 -40c-61 -32 -103 -77 -131 -132zM741 128c12 1 24 3 36 5c64 14 116 48 154 101c32 45 50 98 67 151 c0 0 1 0 1 1c-85 -1 -170 -2 -255 -2c-2 -86 -1 -171 -3 -256zM700 125c0 75 1 172 1 259c-50 -1 -100 0 -151 -1c-60 -1 -120 -1 -180 -2l-3 -17c-2 -13 -3 -25 -3 -37c0 -67 32 -115 94 -144c77 -36 157 -57 242 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E049.xml b/data/Petaluma/E049.xml
new file mode 100644
index 00000000000..10aeaa5fb2f
--- /dev/null
+++ b/data/Petaluma/E049.xml
@@ -0,0 +1 @@
+<symbol id="E049" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M516 -250c-52 83 -34 170 -45 255c-71 -3 -142 -6 -212 -10c-21 -1 -36 10 -35 29l15 287v5c0 11 -3 15 -17 16c-62 4 -124 10 -186 15c-18 1 -35 5 -36 32c25 6 49 8 74 8c56 0 112 -11 169 -14c6 64 12 128 12 192c0 50 -4 99 -15 149c18 10 37 12 55 12s35 -2 53 -2 c40 1 81 1 125 1c-2 48 -5 98 -8 148c-1 17 -3 35 -5 52c-1 4 -1 8 -1 12c0 12 5 22 22 26c23 -20 21 -50 24 -78c6 -53 9 -108 12 -161c50 -5 100 -9 149 -16c96 -13 81 -36 88 -101c8 -73 7 -146 11 -219v-18c37 -3 73 -4 108 -8c34 -5 72 2 98 -31c-34 -8 -68 -9 -102 -9 h-105l-12 -312c-31 -6 -68 -19 -106 -19c-33 0 -66 8 -99 12c-8 1 -15 1 -28 2c3 -38 6 -73 8 -108s3 -69 3 -104c0 -12 -8 -25 -14 -43zM361 364h100c3 105 7 208 11 314c-38 1 -74 3 -110 5c7 -45 10 -89 10 -133c0 -62 -6 -124 -11 -186zM619 368h3c15 0 18 6 18 20 c0 31 0 62 -1 92c-1 63 -4 125 -7 187l-116 12v-310h51c17 0 35 0 52 -1zM515 320v-269h113l9 269h-122zM357 318l-12 -267h124c-3 90 -5 178 -8 267h-104z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E04B.xml b/data/Petaluma/E04B.xml
new file mode 100644
index 00000000000..ca0e25396f7
--- /dev/null
+++ b/data/Petaluma/E04B.xml
@@ -0,0 +1 @@
+<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M168 -35c-45 0 -94 29 -132 80c-3 4 -5 8 -5 12c0 3 2 6 4 10c14 15 22 34 37 49c9 9 16 14 22 14s13 -5 22 -16c31 -38 71 -65 123 -68h6c12 0 16 4 16 14c0 2 0 6 -1 9c-3 14 -9 25 -16 36c-4 -6 -8 -12 -14 -12c-8 0 -9 6 -9 11c0 9 -2 21 -2 30l-12 12l-14 13 c0 -10 -1 -19 -1 -28c0 -7 0 -15 -2 -21c-3 -9 -7 -19 -17 -19c-11 2 -8 13 -9 22c-3 24 -4 48 -5 72c-29 20 -60 37 -87 59c-46 38 -71 76 -71 119c0 30 11 61 32 96c5 10 11 20 17 29c-32 30 -50 69 -50 106c0 13 2 25 6 37c12 35 40 60 67 84c-12 11 -22 23 -32 36 c-17 24 -26 48 -26 73c0 19 5 37 15 57c10 18 21 36 33 53c29 42 68 62 113 62c11 0 23 -1 35 -4c57 -12 108 -38 148 -83c7 -8 10 -15 10 -23c0 -5 -1 -10 -4 -16c-10 -22 -50 -54 -70 -55l-4 -1c-7 1 -10 8 -15 14c-32 39 -70 70 -122 79c-9 1 -20 3 -29 3 c-14 0 -27 -3 -34 -13c-2 -4 -3 -7 -3 -12c0 -14 13 -32 22 -46c10 -16 23 -31 37 -44v24c-1 16 2 32 2 48c1 14 13 14 21 16c1 0 2 1 2 1c6 0 5 -9 8 -14c3 -6 4 -12 4 -19c0 -6 -1 -12 -1 -18c1 -23 1 -46 2 -69c11 -9 24 -17 36 -24v30c0 16 3 31 5 47c2 12 11 13 19 15 c2 1 3 1 4 1c7 0 5 -10 8 -15c4 -8 3 -17 3 -25v-75c43 -24 85 -50 119 -86c19 -20 29 -41 29 -63c0 -17 -6 -34 -18 -51c-15 -22 -33 -41 -57 -55c0 0 -1 0 -1 -1c41 -23 67 -60 67 -113c0 -51 -31 -89 -76 -113c-11 -6 -22 -14 -35 -16c14 -12 28 -26 40 -42 c16 -22 25 -46 25 -69c0 -27 -11 -53 -32 -76c-50 -54 -76 -68 -153 -68zM152 543l-3 117c-14 8 -29 17 -42 27c-8 -13 -11 -28 -9 -46c5 -42 23 -74 54 -98zM219 506v27c0 9 1 19 1 28h1v57c-11 7 -22 14 -34 20c1 -21 1 -42 1 -64c1 -18 1 -37 2 -55c9 -5 19 -9 29 -13z M309 473c1 3 3 6 5 9c5 9 8 18 8 27c0 15 -8 31 -25 49c-12 13 -24 23 -37 34v-44c0 -14 0 -28 -1 -43v-14c16 -5 32 -11 47 -17c1 0 2 0 3 -1zM155 317c-1 38 -1 75 -1 113c-23 8 -45 17 -66 30c-3 -9 -4 -18 -4 -27c0 -27 13 -53 29 -74c12 -16 26 -29 42 -42zM216 275 l3 -3c1 15 1 30 1 45v93c-1 1 -2 1 -3 1c-8 2 -16 5 -25 7c1 -29 1 -55 1 -79v-49c7 -5 15 -10 23 -15zM255 246l9 -6c2 1 3 2 4 3c20 18 29 41 29 65c0 30 -16 62 -39 82c-1 -20 -1 -40 -1 -59c-1 -28 -2 -56 -2 -85z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E050.xml b/data/Petaluma/E050.xml
new file mode 100644
index 00000000000..0f2ae283504
--- /dev/null
+++ b/data/Petaluma/E050.xml
@@ -0,0 +1 @@
+<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 -559c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86 c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32c24 0 31 -25 36 -46c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14 l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3z M278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195 c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180 zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45c0 -20 3 -34 3 -34s34 -9 69 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E051.xml b/data/Petaluma/E051.xml
new file mode 100644
index 00000000000..69913faab49
--- /dev/null
+++ b/data/Petaluma/E051.xml
@@ -0,0 +1 @@
+<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M287 -885c-42 0 -47 29 -52 55c-2 13 0 27 -1 41c0 6 4 12 10 12h1c6 0 7 -7 8 -12c1 -3 1 -6 1 -10c0 -24 11 -37 27 -37c8 0 17 3 26 8c26 14 38 39 46 66c3 11 7 23 7 35c0 5 0 10 -2 15c-9 25 -28 39 -48 39c-12 0 -23 -4 -35 -12c-6 -4 -11 -7 -14 -7 c-4 0 -6 6 -8 18c-1 7 -1 13 -1 20c0 31 8 61 15 92c1 4 1 7 2 10c1 1 1 2 2 4c-5 -3 -11 -6 -17 -8s-11 -3 -16 -3c-10 0 -18 5 -24 14l-3 -33c-6 -55 -7 -110 -8 -166c0 -36 -2 -71 -3 -107c0 -4 -1 -8 -2 -11c-2 -4 -5 -9 -10 -9s-6 6 -7 10c-3 20 -5 39 -4 59 c5 74 2 149 11 222c0 3 0 5 -1 10c-14 -12 -24 -24 -39 -29c-3 -1 -6 -2 -9 -2c-5 0 -8 3 -9 12c-2 9 -3 16 -3 20c0 10 6 13 24 21c16 7 26 21 36 34c3 3 5 7 8 9c-1 4 -3 9 -5 13c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14 l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32 c24 0 31 -25 36 -46c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236 c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -111 -34 -211 -108 -296c3 -1 7 -3 10 -3c21 -1 37 8 54 17c5 3 9 5 12 5c6 0 9 -7 9 -24c0 -28 -24 -41 -61 -47c-33 -5 -33 -3 -41 -36c-2 -6 -4 -12 -1 -18c11 3 21 5 31 5c38 0 62 -27 68 -74 c1 -10 2 -20 2 -30c0 -28 -5 -55 -14 -82c-7 -23 -21 -41 -38 -57c-12 -12 -25 -17 -40 -17zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52 c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5 c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45 c0 -20 3 -34 3 -34s34 -9 69 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E052.xml b/data/Petaluma/E052.xml
new file mode 100644
index 00000000000..259bb4730ad
--- /dev/null
+++ b/data/Petaluma/E052.xml
@@ -0,0 +1 @@
+<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M217 -834c-28 13 -39 36 -41 66c-1 5 0 10 0 17c-3 26 8 48 27 67c5 5 8 9 6 18c-5 15 -7 30 -7 43c0 25 7 48 20 69c-5 4 -9 9 -12 16c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2 c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32c24 0 31 -25 36 -46 c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57 c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -99 -27 -189 -84 -267c4 -5 7 -13 9 -20c3 -11 5 -21 5 -31c0 -22 -7 -44 -14 -64c-2 -6 -4 -12 -4 -17c0 -6 2 -11 9 -18c16 -16 21 -36 21 -56c0 -9 -1 -17 -2 -25c-6 -37 -20 -70 -50 -95c-15 -13 -31 -19 -48 -19 c-9 0 -19 2 -29 6zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55 c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7 c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45c0 -20 3 -34 3 -34s34 -9 69 -9zM253 -625c4 -1 7 -2 11 -2c10 0 20 5 27 18 s11 27 13 41v4c0 8 -5 15 -14 15c-27 1 -55 -14 -57 -49c0 -10 6 -24 20 -27zM263 -792c26 4 45 21 55 46c2 6 3 11 3 17c0 14 -7 29 -17 41c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2c-23 -9 -43 -23 -61 -39c-14 -12 -20 -22 -20 -31c0 -14 13 -24 33 -34c9 -5 20 -6 34 -7z "/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E053.xml b/data/Petaluma/E053.xml
new file mode 100644
index 00000000000..905691a82e5
--- /dev/null
+++ b/data/Petaluma/E053.xml
@@ -0,0 +1 @@
+<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 -559c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86 c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 86 30 167 80 237c-16 13 -23 33 -24 55c-1 5 0 10 0 17c-3 26 8 48 27 67c5 5 8 9 6 18c-4 15 -7 29 -7 43c0 39 17 73 46 104c4 4 8 8 10 13c8 20 25 22 43 21 s24 -16 28 -30c3 -11 5 -21 5 -31c0 -22 -7 -44 -14 -64c-2 -6 -4 -12 -4 -17c0 -6 2 -11 9 -18c16 -16 21 -36 21 -56c0 -9 -1 -17 -2 -25c-6 -37 -20 -70 -50 -95c-5 -5 -11 -8 -16 -11c1 -1 1 -2 1 -3c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81 c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309 c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3zM345 1173c4 -1 7 -2 11 -2c10 0 20 5 27 18s11 27 13 41v4c0 8 -5 15 -14 15c-27 1 -55 -14 -57 -49c0 -10 6 -24 20 -27zM355 1006c26 4 45 21 55 46c2 6 3 11 3 17c0 14 -7 29 -17 41c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2 c-23 -9 -43 -23 -61 -39c-14 -12 -20 -22 -20 -31c0 -14 13 -24 33 -34c3 -2 7 -3 12 -4h2c4 0 8 -1 11 -2s6 -1 9 -1zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13 c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177 c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45 c0 -20 3 -34 3 -34s34 -9 69 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E054.xml b/data/Petaluma/E054.xml
new file mode 100644
index 00000000000..fe948d0bb75
--- /dev/null
+++ b/data/Petaluma/E054.xml
@@ -0,0 +1 @@
+<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 -559c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86 c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239l6 7c-2 -1 -4 -2 -6 -2c-5 0 -6 6 -7 10c-3 20 -5 39 -4 59c5 74 2 149 11 222c0 3 0 5 -1 10c-14 -12 -24 -24 -39 -29c-3 -1 -6 -2 -9 -2 c-5 0 -8 3 -9 12c-2 9 -3 16 -3 20c0 10 6 13 24 21c16 7 26 21 36 34c5 6 11 14 19 11c7 -3 9 -12 9 -20c-1 -18 -2 -37 -4 -55c-6 -55 -7 -110 -8 -166c0 -36 -2 -71 -3 -107c0 -4 -1 -8 -2 -11c-1 -1 -1 -2 -2 -4c9 12 20 22 34 22c3 0 6 0 8 -1l-3 15c-2 13 0 27 -1 41 c0 6 4 12 10 12h1c6 0 7 -7 8 -12c1 -3 1 -6 1 -10c0 -24 11 -37 27 -37c8 0 17 3 26 8c26 14 38 39 46 66c3 11 7 23 7 35c0 5 0 10 -2 15c-9 25 -28 39 -48 39c-12 0 -23 -4 -35 -12c-6 -4 -11 -7 -14 -7c-4 0 -6 6 -8 18c-1 7 -1 13 -1 20c0 31 8 61 15 92c1 4 1 7 2 10 c5 9 1 21 9 28c3 3 5 4 8 4c7 0 13 -7 20 -7c21 -1 37 8 54 17c5 3 9 5 12 5c6 0 9 -7 9 -24c0 -28 -24 -41 -61 -47c-33 -5 -33 -3 -41 -36c-2 -6 -4 -12 -1 -18c11 3 21 5 31 5c38 0 62 -27 68 -74c1 -10 2 -20 2 -30c0 -28 -5 -55 -14 -82c-7 -23 -21 -41 -38 -57 c-12 -12 -25 -17 -40 -17c-6 0 -13 1 -20 3c-1 0 -2 1 -3 1c1 -3 1 -6 2 -9c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124 c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112 c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26 c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM391 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176 c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45c0 -20 3 -34 3 -34s34 -9 69 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E055.xml b/data/Petaluma/E055.xml
new file mode 100644
index 00000000000..408381cbece
--- /dev/null
+++ b/data/Petaluma/E055.xml
@@ -0,0 +1 @@
+<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M238 -559c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-33 12 -66 34 -87 54c-36 35 -57 98 -57 160c0 30 5 60 16 86 c21 53 54 100 84 147c43 66 93 126 138 190c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32c24 0 31 -25 36 -46c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81c-14 -93 -116 -274 -116 -274s0 -9 1 -14 l26 -97s6 4 12 7c45 27 93 40 143 40h4c39 56 82 108 121 164c-1 5 -3 11 -3 17c-11 80 -24 161 -24 242c0 14 0 28 1 42c5 87 30 168 81 239c11 15 24 32 42 32c24 0 31 -25 36 -46c18 -70 45 -138 55 -210c3 -20 4 -40 4 -61c0 -27 -2 -54 -7 -81 c-14 -93 -116 -274 -116 -274s0 -9 1 -14l26 -97s6 4 12 7c45 27 93 40 143 40c20 0 40 -2 60 -6c80 -15 115 -61 115 -124c0 -14 -1 -29 -5 -44c-20 -92 -64 -175 -140 -236c-29 -23 -61 -41 -94 -57c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309 c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3c-12 0 -22 7 -28 21c-7 15 -14 31 -20 46c-1 4 -2 7 -2 11c0 9 5 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 5 0 14 0 14l-12 -2c-15 -2 -30 -3 -44 -3c-49 0 -95 11 -141 28c-19 7 -37 17 -54 28 c-13 -8 -27 -15 -41 -22c-6 -2 -20 -10 -20 -10s-1 -15 -1 -24c-3 -117 -37 -222 -120 -309c-8 -9 -18 -15 -30 -19c-6 -2 -11 -3 -16 -3zM278 498c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM654 498 c38 70 56 146 69 224c3 20 5 40 5 59c0 38 -6 75 -18 112c-51 -81 -69 -166 -69 -253c0 -47 5 -94 13 -142zM175 -94c0 6 0 9 -1 13c-3 18 -5 35 -5 52c0 67 24 128 74 177c18 18 46 54 46 54s-7 40 -15 65l-7 22l-42 -55c-49 -63 -96 -126 -135 -195c-2 -3 -8 -20 -9 -26 c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c7 -17 29 -27 55 -36c13 -4 25 -9 39 -10zM656 191l9 11s-7 40 -15 65l-7 22l-33 -44c22 -14 38 -32 46 -54zM767 -63l4 -28l18 7c84 37 143 97 183 177c-2 1 -4 3 -6 5c-23 24 -53 29 -83 35c-25 5 -49 7 -74 7c-26 0 -51 -2 -77 -7 c-3 -4 -3 -9 -2 -16c14 -63 29 -115 37 -180zM376 22c1 27 6 54 16 78c5 14 11 27 18 39c-18 0 -36 -2 -54 -6c-3 -4 -3 -9 -2 -16c7 -34 15 -64 22 -95zM463 -57c34 21 62 47 87 77c5 30 16 58 33 84c-17 15 -38 21 -60 26c-20 -30 -39 -60 -57 -91c-2 -3 -8 -20 -9 -26 c-2 -12 -4 -24 -4 -35c0 -9 1 -18 4 -26c1 -3 3 -7 6 -9zM285 -111c29 -2 55 5 55 5s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-36 -32 -70 -66 -80 -114c-4 -16 -5 -32 -5 -45c0 -20 3 -34 3 -34s34 -9 69 -9zM661 -111c29 -2 55 5 55 5 s1 9 0 15c-4 59 -19 117 -28 176c-1 7 -2 11 -6 11c-2 0 -5 -2 -8 -5c-8 -7 -15 -13 -22 -20c-13 -49 -34 -94 -63 -134v-5c0 -20 3 -34 3 -34s34 -9 69 -9zM394 -84l1 -7l2 1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E056.xml b/data/Petaluma/E056.xml
new file mode 100644
index 00000000000..3c5be8974ea
--- /dev/null
+++ b/data/Petaluma/E056.xml
@@ -0,0 +1 @@
+<symbol id="E056" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M239 -561c-13 0 -22 9 -31 27c-7 13 -13 27 -18 41c-1 3 -2 6 -2 9c0 9 7 16 16 17c38 3 56 32 75 58c36 50 51 109 62 169c1 3 1 5 1 7c0 5 -3 6 -10 6c-17 0 -33 -2 -49 -2c-66 0 -130 13 -184 56c-47 37 -85 83 -96 145c-2 13 -3 26 -3 39c0 40 10 79 29 116 c38 75 87 141 136 209c18 25 36 51 57 73c11 12 15 25 15 38c0 17 -6 33 -8 49c-9 68 -18 135 -18 203c0 12 0 25 1 37c6 87 31 169 83 241c11 15 26 32 44 29c19 -4 26 -26 31 -45c17 -69 44 -136 54 -207c3 -23 5 -46 5 -68c0 -70 -15 -137 -44 -202 c-20 -44 -41 -87 -70 -125c-6 -8 -9 -16 -9 -25c0 -4 1 -8 2 -13c6 -25 13 -51 17 -76c2 -13 4 -19 10 -19c4 0 9 3 16 7c43 26 88 37 135 37c24 0 49 -3 73 -8c70 -15 104 -59 104 -133c0 -28 -8 -53 -18 -79c-42 -113 -111 -201 -225 -247c-12 -5 -17 -12 -16 -25 c0 -97 -26 -186 -79 -267c-16 -24 -34 -47 -58 -62c-11 -7 -20 -10 -28 -10zM783 439c-53 2 -107 3 -160 3c-7 1 -14 1 -17 10c-6 26 -13 52 -18 78v4c0 12 7 19 21 17c36 -4 73 -4 110 -4h45c17 0 20 5 20 20c-1 80 1 159 -5 239c-1 13 -1 25 -1 38c0 40 3 81 5 120 c0 10 5 16 13 18c1 0 2 1 3 1c7 0 6 -10 9 -15c4 -8 5 -18 5 -27c0 -11 -2 -23 -1 -34c1 -26 1 -51 1 -77c0 -15 -1 -29 -1 -44c0 -78 6 -155 7 -233c0 -17 2 -34 2 -51c0 -11 -1 -23 -4 -35c-5 -19 -13 -29 -34 -28zM278 501c35 47 73 187 73 289c0 41 -6 76 -21 97 c-47 -79 -66 -162 -66 -248c0 -45 5 -91 14 -138zM805 -140c-13 38 -14 73 -13 109c1 19 1 37 1 56c0 76 -4 153 -5 229c0 19 -7 24 -24 22c-52 -6 -103 -4 -155 -6c-10 0 -18 1 -18 13c1 21 -4 41 -4 62c0 25 6 34 27 34c31 0 62 -2 94 -2c26 0 53 1 79 7h4 c7 0 9 -6 12 -13c11 -34 11 -70 13 -104c4 -100 6 -200 6 -300v-60c-1 -16 -2 -31 -17 -47zM176 -98c-3 24 -6 48 -6 71c0 18 2 36 7 54c16 62 53 111 98 153c6 6 13 9 11 21c-7 28 -12 56 -18 88c-19 -24 -34 -43 -49 -63c-46 -59 -90 -119 -127 -185 c-10 -17 -15 -40 -15 -60c0 -17 4 -32 12 -40c24 -23 54 -33 87 -39zM399 -92c4 0 8 3 13 5c76 36 138 85 175 162c3 6 4 10 4 15c0 6 -3 10 -10 15c-9 7 -19 12 -30 16c-38 12 -77 16 -123 19c-17 1 -39 -5 -61 -7c-9 -1 -14 -3 -14 -12c0 -2 0 -5 1 -8 c15 -63 29 -126 35 -191c1 -10 5 -14 10 -14zM287 -114v1h31c18 0 23 7 22 28c-5 56 -20 111 -27 167c-1 8 -3 12 -6 12c-2 0 -6 -1 -10 -5c-39 -33 -74 -71 -82 -123c-3 -17 -5 -30 -5 -41c0 -29 14 -38 62 -38c5 0 10 -1 15 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E05C.xml b/data/Petaluma/E05C.xml
new file mode 100644
index 00000000000..89782880a50
--- /dev/null
+++ b/data/Petaluma/E05C.xml
@@ -0,0 +1 @@
+<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M91 -543c-3 0 -8 3 -15 7c-13 9 -28 16 -41 25c-16 11 -23 24 -23 44v258c-5 94 -3 187 -6 280c-3 65 -3 129 -3 194v149c0 26 0 53 -2 79l-1 10c0 4 1 8 2 11c7 19 16 29 29 29c7 0 15 -3 25 -10c36 -25 64 -54 61 -104c-7 -95 -3 -190 -6 -285c-5 -161 -7 -323 -9 -484 c-1 -61 -3 -123 -4 -184c-1 -13 -2 -19 -7 -19zM427 -535c-24 0 -48 3 -73 9c-45 12 -86 35 -118 70l-8 9l-5 8v-24c0 -14 1 -27 -6 -40c-2 -4 -4 -8 -9 -8c-6 0 -7 6 -7 10c0 22 -5 43 -5 64c0 53 1 107 1 160s-1 106 -3 159c-2 62 -1 125 -2 187c-1 65 -1 131 -1 196v197 c0 12 1 24 4 35c3 9 9 13 15 14h1c9 0 7 -9 8 -14c4 -12 5 -24 5 -37c0 -7 0 -15 -1 -22v-837c8 4 19 2 29 2h18c4 1 7 1 11 1c16 0 34 -8 51 -8c7 0 13 1 20 4c1 1 2 1 4 1c7 0 12 -10 15 -19c9 -30 26 -46 51 -46c10 0 21 3 34 8c51 22 94 52 116 104c11 25 17 49 17 71 c0 47 -24 89 -69 125c-24 18 -49 33 -78 40c-4 1 -7 2 -10 2c-6 0 -12 -3 -17 -9c-14 -17 -29 -33 -34 -54c-2 -11 -8 -17 -19 -19c-15 -2 -30 -5 -45 -5c-19 0 -38 4 -56 18c-10 3 -13 7 -13 19c0 18 2 37 4 57c3 27 4 54 4 81c0 30 -1 60 -3 90c-1 13 -2 26 -6 38 c-2 0 -5 1 -6 2c-3 3 -5 5 -5 8c0 2 2 4 6 5c0 5 5 7 10 8c8 1 15 4 22 6c14 8 26 17 41 22c10 3 19 6 29 6c7 0 14 -1 22 -4c38 -12 77 -21 116 -31c4 -1 7 -2 11 -2c7 0 15 3 23 8c36 21 57 55 61 94c1 11 2 23 2 34c0 68 -23 128 -82 174c-22 17 -48 21 -74 24h-2 c-9 0 -17 -5 -23 -12c-16 -20 -25 -41 -25 -65c0 -7 0 -15 2 -22c1 -4 1 -8 1 -11c0 -21 -12 -35 -34 -42c-23 -7 -47 -9 -70 -13c-17 -2 -27 6 -29 21c-1 13 -2 24 -2 35c0 56 19 89 80 115l114 48c22 9 43 13 63 13c51 0 96 -25 137 -61c50 -44 85 -100 94 -167 c2 -11 2 -22 2 -33c0 -65 -30 -113 -98 -153c-47 -28 -116 -44 -183 -40c-13 -3 -26 -4 -39 -4c-15 0 -30 1 -46 4c1 -14 2 -28 2 -42c0 -10 -1 -20 -1 -30c1 -7 1 -15 1 -22c0 -17 -2 -34 -3 -51c25 12 51 21 80 25c25 3 49 9 74 9c6 0 11 0 16 -1c88 -9 165 -102 172 -189 c1 -14 2 -28 2 -42c0 -80 -23 -151 -96 -201c-56 -38 -119 -60 -185 -60z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E05D.xml b/data/Petaluma/E05D.xml
new file mode 100644
index 00000000000..7b2c21d6a1a
--- /dev/null
+++ b/data/Petaluma/E05D.xml
@@ -0,0 +1 @@
+<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M91 -543c-3 0 -8 3 -15 7c-13 9 -28 16 -41 25c-16 11 -23 24 -23 44v258c-5 94 -3 187 -6 280c-3 65 -3 129 -3 194v149c0 26 0 53 -2 79l-1 10c0 4 1 8 2 11c7 19 16 29 29 29c7 0 15 -3 25 -10c36 -25 64 -54 61 -104c-7 -95 -3 -190 -6 -285c-5 -161 -7 -323 -9 -484 c-1 -61 -3 -123 -4 -184c-1 -13 -2 -19 -7 -19zM304 -921c-12 0 -25 2 -37 8c-36 16 -50 45 -52 82c-1 6 0 13 0 21c-3 32 10 60 34 84c6 6 10 12 7 23c-5 18 -8 36 -8 53c0 48 21 91 57 130c2 3 5 6 8 9c-29 13 -55 31 -77 55l-8 9l-5 8v-24c0 -14 1 -27 -6 -40 c-2 -4 -4 -8 -9 -8c-6 0 -7 6 -7 10c0 22 -5 43 -5 64c0 53 1 107 1 160s-1 106 -3 159c-2 62 -1 125 -2 187c-1 65 -1 131 -1 196v197c0 12 1 24 4 35c3 9 9 13 15 14h1c9 0 7 -9 8 -14c4 -12 5 -24 5 -37c0 -7 0 -15 -1 -22v-837c8 4 19 2 29 2h18c4 1 7 1 11 1 c16 0 34 -8 51 -8c7 0 13 1 20 4c1 1 2 1 4 1c7 0 12 -10 15 -19c9 -30 26 -46 51 -46c10 0 21 3 34 8c51 22 94 52 116 104c11 25 17 49 17 71c0 47 -24 89 -69 125c-24 18 -49 33 -78 40c-4 1 -7 2 -10 2c-6 0 -12 -3 -17 -9c-14 -17 -29 -33 -34 -54 c-2 -11 -8 -17 -19 -19c-15 -2 -30 -5 -45 -5c-19 0 -38 4 -56 18c-10 3 -13 7 -13 19c0 18 2 37 4 57c3 27 4 54 4 81c0 30 -1 60 -3 90c-1 13 -2 26 -6 38c-2 0 -5 1 -6 2c-3 3 -5 5 -5 8c0 2 2 4 6 5c0 5 5 7 10 8c8 1 15 4 22 6c14 8 26 17 41 22c10 3 19 6 29 6 c7 0 14 -1 22 -4c38 -12 77 -21 116 -31c4 -1 7 -2 11 -2c7 0 15 3 23 8c36 21 57 55 61 94c1 11 2 23 2 34c0 68 -23 128 -82 174c-22 17 -48 21 -74 24h-2c-9 0 -17 -5 -23 -12c-16 -20 -25 -41 -25 -65c0 -7 0 -15 2 -22c1 -4 1 -8 1 -11c0 -21 -12 -35 -34 -42 c-23 -7 -47 -9 -70 -13c-17 -2 -27 6 -29 21c-1 13 -2 24 -2 35c0 56 19 89 80 115l114 48c22 9 43 13 63 13c51 0 96 -25 137 -61c50 -44 85 -100 94 -167c2 -11 2 -22 2 -33c0 -65 -30 -113 -98 -153c-47 -28 -116 -44 -183 -40c-13 -3 -26 -4 -39 -4c-15 0 -30 1 -46 4 c1 -14 2 -28 2 -42c0 -10 -1 -20 -1 -30c1 -7 1 -15 1 -22c0 -17 -2 -34 -3 -51c25 12 51 21 80 25c25 3 49 9 74 9c6 0 11 0 16 -1c88 -9 165 -102 172 -189c1 -14 2 -28 2 -42c0 -80 -23 -151 -96 -201c-61 -41 -130 -63 -202 -59c1 -7 1 -13 1 -20c0 -27 -7 -53 -17 -80 c-3 -7 -4 -14 -4 -20c0 -7 3 -15 11 -23c20 -20 27 -45 27 -71c0 -10 -1 -21 -3 -31c-7 -46 -25 -87 -63 -119c-18 -15 -38 -23 -58 -23zM325 -654c13 0 26 6 34 22c9 16 13 34 16 52v4c0 11 -7 19 -20 19c-33 0 -66 -18 -69 -61c0 -13 8 -30 25 -34c5 -1 10 -2 14 -2z M324 -861c32 5 56 27 69 58c3 7 4 13 4 20c0 18 -10 37 -22 53c-6 8 -13 11 -21 11c-4 0 -8 -1 -13 -3c-29 -11 -53 -29 -76 -49c-18 -15 -25 -28 -25 -39c0 -17 16 -30 41 -42c12 -6 26 -8 43 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E062.xml b/data/Petaluma/E062.xml
new file mode 100644
index 00000000000..322838a3297
--- /dev/null
+++ b/data/Petaluma/E062.xml
@@ -0,0 +1 @@
+<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 -490c-27 -4 -53 -6 -79 -6c-44 0 -86 5 -130 14c-35 7 -46 32 -58 58c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21c40 -12 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-14 63 -39 120 -84 164 c-35 35 -79 49 -127 49c-7 0 -14 0 -22 -1c-32 -2 -48 -21 -48 -48c0 -6 1 -12 2 -18c4 -16 6 -32 6 -48c0 -45 -18 -85 -58 -117c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c14 47 46 80 79 113 c75 75 168 113 273 122c8 1 17 1 25 1c113 0 198 -65 214 -193c3 -22 5 -45 5 -60c-1 -90 -10 -170 -50 -244c-61 -112 -147 -190 -279 -209zM707 64l-7 -1c-15 0 -20 12 -17 23c9 32 4 67 23 96c5 8 8 24 20 18c16 -8 39 6 47 -25c2 -8 3 -16 3 -23c0 -27 -13 -48 -26 -70 c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 21 25 15c14 -5 31 0 31 -30c0 -43 -32 -91 -68 -92z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E063.xml b/data/Petaluma/E063.xml
new file mode 100644
index 00000000000..2443e226e7d
--- /dev/null
+++ b/data/Petaluma/E063.xml
@@ -0,0 +1 @@
+<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M242 -842c-5 0 -6 6 -7 10c-3 20 -5 39 -4 59c4 74 2 149 11 222c0 3 0 5 -1 10c-14 -12 -24 -24 -39 -29c-3 -1 -6 -2 -9 -2c-5 0 -8 3 -9 12c-2 9 -3 16 -3 20c0 10 6 13 24 21c12 5 20 15 28 24c-10 -1 -21 -1 -31 -1c-44 0 -88 5 -132 14c-35 7 -45 32 -58 58 c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21c40 -13 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-18 62 -39 119 -84 164c-35 35 -79 49 -127 49c-7 0 -14 0 -22 -1c-32 -4 -48 -21 -48 -48c0 -6 1 -12 2 -18 c3 -16 6 -32 6 -48c0 -45 -19 -84 -58 -117c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c13 47 46 80 79 113c75 75 168 109 273 122c8 1 17 1 25 1c113 0 197 -65 214 -193c3 -22 5 -45 5 -60 c0 -90 -10 -170 -50 -244c-61 -112 -147 -190 -279 -209l-10 -1v-3c-1 -18 -2 -37 -4 -55c-6 -55 -8 -110 -8 -166c0 -36 -3 -71 -3 -107c0 -4 -1 -8 -2 -11c-2 -4 -5 -9 -10 -9zM707 64l-7 -1c-15 0 -20 12 -17 23c9 32 5 67 23 96c5 8 8 24 20 18c16 -8 39 6 47 -25 c2 -8 3 -16 3 -23c0 -27 -14 -47 -26 -70c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 20 25 15c14 -5 31 0 31 -30c0 -43 -32 -91 -68 -92zM341 -856c-42 0 -47 29 -52 55c-2 13 0 27 -1 41c0 6 4 12 10 12h1c6 0 7 -7 8 -12 c1 -3 1 -6 1 -10c0 -24 11 -37 27 -37c8 0 17 3 26 8c26 14 39 39 46 66c3 11 7 23 7 35c0 5 0 10 -2 15c-10 25 -28 39 -48 39c-12 0 -23 -4 -35 -12c-6 -4 -11 -7 -14 -7c-4 0 -6 6 -8 18c-1 7 -1 13 -1 20c0 31 7 61 15 92c1 4 1 7 2 10c5 9 1 21 9 28c3 3 5 4 8 4 c7 0 13 -7 20 -7c21 -1 38 7 54 17c5 3 9 5 12 5c6 0 9 -7 9 -24c0 -28 -24 -41 -61 -47c-33 -5 -33 -3 -41 -36c-2 -6 -4 -12 -1 -18c11 3 21 5 31 5c38 0 63 -27 68 -74c1 -10 2 -20 2 -30c0 -28 -6 -55 -14 -82c-7 -23 -21 -41 -38 -57c-12 -12 -25 -17 -40 -17z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E064.xml b/data/Petaluma/E064.xml
new file mode 100644
index 00000000000..c19dc6a5e74
--- /dev/null
+++ b/data/Petaluma/E064.xml
@@ -0,0 +1 @@
+<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M274 -814c-9 0 -19 2 -29 6c-28 13 -39 36 -41 66c-1 5 0 10 0 17c-3 26 8 48 27 67c5 5 8 9 6 18c-4 15 -7 29 -7 43c0 39 16 74 46 104l3 3c-27 -4 -53 -6 -79 -6c-44 0 -86 5 -130 14c-35 7 -45 32 -58 58c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21 c40 -13 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-14 63 -39 119 -84 164c-35 35 -79 49 -127 49c-7 0 -14 0 -22 -1c-32 -2 -48 -21 -48 -48c0 -6 1 -12 2 -18c4 -16 6 -32 6 -48c0 -45 -19 -84 -58 -117 c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c13 47 46 80 79 113c75 75 168 113 273 122c8 1 17 1 25 1c113 0 197 -65 214 -193c3 -22 5 -45 5 -60c0 -90 -10 -170 -50 -244c-49 -90 -115 -159 -208 -192 c3 -5 5 -11 7 -16c3 -11 5 -21 5 -31c0 -22 -7 -44 -14 -64c-2 -6 -4 -12 -4 -17c0 -6 2 -11 9 -18c16 -16 21 -36 21 -56c0 -9 -1 -17 -2 -25c-6 -37 -20 -69 -50 -95c-15 -13 -31 -19 -48 -19zM707 64l-7 -1c-15 0 -20 12 -17 23c9 32 5 67 23 96c5 8 8 24 20 18 c16 -8 39 6 47 -25c2 -8 3 -16 3 -23c0 -27 -13 -48 -26 -70c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 21 25 15c14 -5 31 0 31 -30c0 -43 -32 -92 -68 -92zM292 -601c10 0 20 5 27 18s11 27 13 41v4c0 8 -5 15 -14 15 c-27 1 -55 -14 -57 -49c0 -10 6 -24 20 -27c4 -1 7 -2 11 -2zM291 -766c26 4 45 21 55 46c2 6 3 11 3 17c0 14 -7 29 -17 41c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2c-23 -9 -43 -23 -61 -39c-14 -12 -20 -22 -20 -31c0 -14 13 -24 33 -34c9 -5 20 -6 34 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E065.xml b/data/Petaluma/E065.xml
new file mode 100644
index 00000000000..f11745a3fc2
--- /dev/null
+++ b/data/Petaluma/E065.xml
@@ -0,0 +1 @@
+<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M200 -496c-44 0 -86 5 -130 14c-35 7 -45 32 -58 58c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21c40 -13 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-14 63 -39 119 -84 164c-35 35 -79 49 -127 49 c-7 0 -14 0 -22 -1c-32 -2 -48 -21 -48 -48c0 -6 1 -12 2 -18c4 -16 6 -32 6 -48c0 -45 -19 -84 -58 -117c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c13 47 46 80 79 113c57 57 124 92 199 110c-6 1 -11 3 -17 5 c-28 13 -39 36 -41 66c-1 5 0 10 0 17c-3 26 8 48 27 67c5 5 8 9 6 18c-4 15 -7 29 -7 43c0 39 16 74 46 104c4 4 8 8 10 13c8 20 25 22 43 21s24 -16 28 -30c3 -11 5 -21 5 -31c0 -22 -7 -44 -14 -64c-2 -6 -4 -12 -4 -17c0 -6 2 -11 9 -18c16 -16 21 -36 21 -56 c0 -9 -1 -17 -2 -25c-6 -37 -20 -70 -50 -95c-4 -4 -8 -6 -12 -9l26 3c8 1 17 1 25 1c113 0 197 -65 214 -193c3 -22 5 -45 5 -60c0 -90 -10 -170 -50 -244c-61 -112 -147 -189 -279 -209c-27 -4 -53 -6 -79 -6zM320 415c10 0 20 5 27 18s11 27 13 41v4c0 8 -5 15 -14 15 c-27 1 -55 -14 -57 -49c0 -10 6 -24 20 -27c4 -1 7 -2 11 -2zM319 250c26 4 45 21 55 46c2 6 3 11 3 17c0 14 -7 29 -17 41c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2c-23 -9 -43 -23 -61 -39c-14 -12 -20 -22 -20 -31c0 -14 13 -24 33 -34c9 -5 20 -6 34 -7zM707 64l-7 -1 c-15 0 -20 12 -17 23c9 32 5 67 23 96c5 8 8 24 20 18c16 -8 39 6 47 -25c2 -8 3 -16 3 -23c0 -27 -13 -48 -26 -70c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 21 25 15c14 -5 31 0 31 -30c0 -43 -32 -92 -68 -92z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E066.xml b/data/Petaluma/E066.xml
new file mode 100644
index 00000000000..a2dc3cf0a8d
--- /dev/null
+++ b/data/Petaluma/E066.xml
@@ -0,0 +1 @@
+<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M200 -496c-44 0 -86 5 -130 14c-35 7 -45 32 -58 58c-5 10 -8 21 -11 32c-1 3 -1 6 -1 9c0 14 12 26 27 21c40 -13 80 -14 121 -14h65c75 0 147 20 209 67c32 24 56 52 76 85c13 21 21 41 21 64c0 6 0 14 -2 21c-14 63 -39 119 -84 164c-35 35 -79 49 -127 49 c-7 0 -14 0 -22 -1c-32 -2 -48 -21 -48 -48c0 -6 1 -12 2 -18c4 -16 6 -32 6 -48c0 -45 -19 -84 -58 -117c-18 -15 -37 -23 -57 -23c-14 0 -28 4 -43 12c-3 1 -5 3 -8 4c-48 22 -72 58 -72 103c0 13 2 27 6 42c13 47 46 80 79 113c52 52 114 87 182 106c-2 2 -2 5 -3 7 c-3 20 -5 39 -4 59c4 74 2 149 11 222c0 3 0 5 -1 10c-14 -12 -24 -24 -39 -29c-3 -1 -6 -2 -9 -2c-5 0 -8 3 -9 12c-2 9 -3 16 -3 20c0 10 6 13 24 21c16 7 26 21 36 34c5 6 11 14 19 11c7 -3 9 -12 9 -20c-1 -18 -2 -37 -4 -55c-6 -55 -8 -110 -8 -166 c0 -36 -3 -71 -3 -107c0 -4 -1 -8 -2 -11l-2 -3c15 4 30 7 46 9c-3 8 -5 18 -7 26c-2 13 0 27 -1 41c0 6 4 12 10 12h1c6 0 7 -7 8 -12c1 -3 1 -6 1 -10c0 -24 11 -37 27 -37c8 0 17 3 26 8c26 14 39 39 46 66c3 11 7 23 7 35c0 5 0 10 -2 15c-9 25 -28 39 -48 39 c-12 0 -23 -4 -35 -12c-6 -4 -11 -7 -14 -7c-4 0 -6 6 -8 18c-1 7 -1 13 -1 20c0 31 7 61 15 92c1 4 1 7 2 10c5 9 1 21 9 28c3 3 5 4 8 4c7 0 13 -7 20 -7c21 -1 37 8 54 17c5 3 9 5 12 5c6 0 9 -7 9 -24c0 -28 -24 -41 -61 -47c-33 -5 -33 -3 -41 -36c-2 -6 -4 -12 -1 -18 c11 3 21 5 31 5c38 0 63 -27 68 -74c1 -10 2 -20 2 -30c0 -28 -6 -55 -14 -82c-5 -16 -14 -30 -25 -43c93 -14 159 -78 174 -190c3 -22 5 -45 5 -60c0 -90 -10 -170 -50 -244c-61 -112 -147 -189 -279 -209c-27 -4 -53 -6 -79 -6zM707 64l-7 -1c-15 0 -20 12 -17 23 c9 32 5 67 23 96c5 8 8 24 20 18c16 -8 39 6 47 -25c2 -8 3 -16 3 -23c0 -27 -13 -48 -26 -70c-8 -15 -27 -19 -43 -18zM675 -195h-2c-14 0 -18 11 -14 22c10 28 10 59 28 85c6 9 10 21 25 15c14 -5 31 0 31 -30c0 -43 -32 -92 -68 -92z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E069.xml b/data/Petaluma/E069.xml
new file mode 100644
index 00000000000..ab983913851
--- /dev/null
+++ b/data/Petaluma/E069.xml
@@ -0,0 +1 @@
+<symbol id="E069" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M334 -250c-35 0 -85 21 -96 46c-3 7 -5 14 -5 21c1 44 1 88 1 132v255c2 37 8 41 44 45c6 1 11 1 17 1c12 0 24 -1 35 -1c23 0 30 -13 33 -33c8 -53 7 -107 9 -161c3 -87 5 -173 7 -260c1 -21 -3 -35 -27 -43c-5 -2 -11 -2 -18 -2zM100 -237c-4 0 -8 0 -12 1 c-33 8 -71 7 -86 49c-2 5 -2 9 -2 13c0 11 4 21 4 32v66c0 53 0 106 1 159c1 47 6 94 7 141c1 15 8 24 21 24c17 -1 34 1 50 1c13 0 26 -1 38 -4c33 -7 37 -12 37 -46c1 -23 0 -46 0 -69c-13 -104 -11 -208 -12 -312c0 -9 5 -19 5 -27c0 -5 -2 -10 -7 -13 c-13 -8 -28 -15 -44 -15z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E06A.xml b/data/Petaluma/E06A.xml
new file mode 100644
index 00000000000..0cb9f402282
--- /dev/null
+++ b/data/Petaluma/E06A.xml
@@ -0,0 +1 @@
+<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M76 -447c-14 0 -28 1 -42 1c-20 2 -28 10 -29 30c-1 22 -4 44 -5 66c0 10 2 16 6 20v569c1 31 -1 63 0 94c0 3 -1 7 -1 9c-3 21 -5 34 -5 45c0 27 14 27 56 37c69 16 141 16 211 23h3c5 0 9 -2 11 -5c0 1 1 1 1 1c10 0 7 -14 10 -19c6 -14 7 -30 6 -45 c-1 -135 -3 -270 -5 -405c-2 -95 -4 -189 -4 -284v-44c0 -17 -1 -34 -16 -49c0 -3 -1 -5 -2 -8c-4 -11 -13 -19 -26 -21c-56 -8 -112 -15 -169 -15zM84 -326c58 0 113 6 168 15h8v138c0 47 0 93 -1 139c-3 116 -3 232 -4 348v18h-4c-62 -7 -125 -8 -187 -19 c-4 0 -8 -1 -12 -2c-4 0 -8 -2 -12 -4v-141c0 -72 0 -143 -2 -214c-2 -92 -3 -183 -4 -275c18 0 35 -2 50 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E073.xml b/data/Petaluma/E073.xml
new file mode 100644
index 00000000000..f34359f8b04
--- /dev/null
+++ b/data/Petaluma/E073.xml
@@ -0,0 +1 @@
+<symbol id="E073" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M426 -559c-5 0 -10 1 -16 3c-12 4 -22 10 -30 19c-83 87 -117 192 -120 309c0 9 -1 24 -1 24s-14 8 -20 10c-33 16 -65 34 -94 57c-76 61 -120 144 -140 236c-4 15 -5 30 -5 44c0 63 35 109 115 124c20 4 40 6 60 6c50 0 98 -13 143 -40c6 -3 12 -7 12 -7l26 97 c1 5 1 14 1 14s-102 181 -116 274c-5 27 -7 54 -7 81c0 21 1 41 4 61c10 72 37 140 55 210c5 21 12 46 36 46c18 0 31 -17 42 -32c51 -71 76 -152 81 -239c1 -14 1 -28 1 -42c0 -81 -13 -162 -24 -242c0 -6 -2 -12 -3 -17c45 -64 95 -124 138 -190c30 -47 63 -94 84 -147 c11 -26 16 -56 16 -86c0 -62 -21 -125 -57 -160c-21 -20 -54 -42 -87 -54c-46 -17 -92 -28 -141 -28c-14 0 -29 1 -44 3l-12 2s-1 -9 0 -14c11 -60 26 -119 62 -169c19 -26 37 -55 75 -58c11 -1 16 -8 16 -17c0 -4 -1 -7 -2 -11c-6 -15 -13 -31 -20 -46 c-6 -14 -16 -21 -28 -21zM386 498c8 48 13 95 13 142c0 87 -18 172 -69 253c-12 -37 -18 -74 -18 -112c0 -19 2 -39 5 -59c13 -78 31 -154 69 -224zM489 -94c14 1 26 6 39 10c26 9 48 19 55 36c3 8 4 17 4 26c0 11 -2 23 -4 35c-1 6 -7 23 -9 26c-39 69 -86 132 -135 195 l-42 55l-7 -22c-8 -25 -15 -65 -15 -65s28 -36 46 -54c50 -49 74 -110 74 -177c0 -17 -2 -34 -5 -52c-1 -4 -1 -7 -1 -13zM251 -84l18 -7l4 28c8 65 23 117 37 180c0 3 1 5 1 7c0 4 -1 6 -3 9c-26 5 -51 7 -77 7c-25 0 -49 -2 -74 -7c-30 -6 -60 -11 -83 -35 c-2 -2 -4 -4 -6 -5c40 -80 99 -140 183 -177zM379 -111c35 0 69 9 69 9s3 14 3 34c0 13 -1 29 -5 45c-10 48 -44 82 -80 114c-3 3 -6 5 -8 5c-4 0 -5 -4 -6 -11c-9 -59 -24 -117 -28 -176c-1 -6 0 -15 0 -15s26 -7 55 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E074.xml b/data/Petaluma/E074.xml
new file mode 100644
index 00000000000..7593b6e6897
--- /dev/null
+++ b/data/Petaluma/E074.xml
@@ -0,0 +1 @@
+<symbol id="E074" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M329 -560c-24 0 -31 25 -36 46c-18 70 -45 138 -55 210c-3 20 -4 40 -4 61c0 27 2 54 7 81c14 93 116 274 116 274s0 9 -1 14l-26 97s-6 -4 -12 -7c-45 -27 -93 -40 -143 -40c-20 0 -40 2 -60 6c-80 15 -115 61 -115 124c0 14 1 29 5 44c20 92 64 175 140 236 c29 23 61 41 94 57c6 2 20 10 20 10s1 15 1 24c3 117 37 222 120 309c8 9 18 15 30 19c6 2 11 3 16 3c12 0 22 -7 28 -21c7 -15 14 -31 20 -46c1 -4 2 -7 2 -11c0 -9 -5 -16 -16 -17c-38 -3 -56 -32 -75 -58c-36 -50 -51 -109 -62 -169c-1 -5 0 -14 0 -14l12 2 c15 2 30 3 44 3c49 0 95 -11 141 -28c33 -12 66 -34 87 -54c36 -35 57 -98 57 -160c0 -30 -5 -60 -16 -86c-21 -53 -54 -100 -84 -147c-43 -66 -93 -126 -138 -190c1 -5 3 -11 3 -17c11 -80 24 -161 24 -242c0 -14 0 -28 -1 -42c-5 -87 -30 -168 -81 -239 c-11 -15 -24 -32 -42 -32zM358 353c2 0 5 2 8 5c36 32 70 66 80 114c4 16 5 32 5 45c0 20 -3 34 -3 34s-34 9 -69 9c-29 2 -55 -5 -55 -5s-1 -9 0 -15c4 -59 19 -117 28 -176c1 -7 2 -11 6 -11zM390 182l7 -22l42 55c49 63 96 126 135 195c2 3 8 20 9 26c2 12 4 24 4 35 c0 9 -1 18 -4 26c-7 17 -29 27 -55 36c-13 4 -25 9 -39 10c0 -6 0 -9 1 -13c3 -18 5 -35 5 -52c0 -67 -24 -128 -74 -177c-18 -18 -46 -54 -46 -54s7 -40 15 -65zM231 309c26 0 51 2 77 7c3 4 3 9 2 16c-14 63 -29 115 -37 180l-4 28l-18 -7c-84 -37 -143 -97 -183 -177 c2 -1 4 -3 6 -5c23 -24 53 -29 83 -35c25 -5 49 -7 74 -7zM330 -444c51 81 69 166 69 253c0 47 -5 94 -13 142c-38 -70 -56 -146 -69 -224c-3 -20 -5 -40 -5 -59c0 -38 6 -75 18 -112z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E075.xml b/data/Petaluma/E075.xml
new file mode 100644
index 00000000000..a98b4cc16f3
--- /dev/null
+++ b/data/Petaluma/E075.xml
@@ -0,0 +1 @@
+<symbol id="E075" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M640 -543c-5 0 -6 6 -7 19c-1 61 -3 123 -4 184c-2 161 -4 323 -9 484c-3 95 1 190 -6 285c-3 50 25 79 61 104c10 7 18 10 25 10c13 0 22 -10 29 -29c1 -3 2 -7 2 -11l-1 -10c-2 -26 -2 -53 -2 -79v-149c0 -65 0 -129 -3 -194c-3 -93 -1 -186 -6 -280v-258 c0 -20 -7 -33 -23 -44c-13 -9 -28 -16 -41 -25c-7 -4 -12 -7 -15 -7zM304 -535c-66 0 -129 22 -185 60c-73 50 -96 121 -96 201c0 14 1 28 2 42c7 87 84 180 172 189c5 1 10 1 16 1c25 0 49 -6 74 -9c29 -4 55 -13 80 -25c-1 17 -3 34 -3 51c0 7 0 15 1 22c0 10 -1 20 -1 30 c0 14 1 28 2 42c-16 -3 -31 -4 -46 -4c-13 0 -26 1 -39 4c-67 -4 -136 12 -183 40c-68 40 -98 88 -98 153c0 11 0 22 2 33c9 67 44 123 94 167c41 36 86 61 137 61c20 0 41 -4 63 -13l114 -48c61 -26 80 -59 80 -115c0 -11 -1 -22 -2 -35c-2 -15 -12 -23 -29 -21 c-23 4 -47 6 -70 13c-22 7 -34 21 -34 42c0 3 0 7 1 11c2 7 2 15 2 22c0 24 -9 45 -25 65c-6 7 -14 12 -23 12h-2c-26 -3 -52 -7 -74 -24c-59 -46 -82 -106 -82 -174c0 -11 1 -23 2 -34c4 -39 25 -73 61 -94c8 -5 16 -8 23 -8c4 0 7 1 11 2c39 10 78 19 116 31 c8 3 15 4 22 4c10 0 19 -3 29 -6c15 -5 27 -14 41 -22c7 -2 14 -5 22 -6c5 -1 10 -3 10 -8c4 -1 6 -3 6 -5c0 -3 -2 -5 -5 -8c-1 -1 -4 -2 -6 -2c-4 -12 -5 -25 -6 -38c-2 -30 -3 -60 -3 -90c0 -27 1 -54 4 -81c2 -20 4 -39 4 -57c0 -12 -3 -16 -13 -19 c-18 -14 -37 -18 -56 -18c-15 0 -30 3 -45 5c-11 2 -17 8 -19 19c-5 21 -20 37 -34 54c-5 6 -11 9 -17 9c-3 0 -6 -1 -10 -2c-29 -7 -54 -22 -78 -40c-45 -36 -69 -78 -69 -125c0 -22 6 -46 17 -71c22 -52 65 -82 116 -104c13 -5 24 -8 34 -8c25 0 42 16 51 46 c3 9 8 19 15 19c2 0 3 0 4 -1c7 -3 13 -4 20 -4c17 0 35 8 51 8c4 0 7 0 11 -1h18c10 0 21 2 29 -2v837c-1 7 -1 15 -1 22c0 13 1 25 5 37c1 5 -1 14 8 14h1c6 -1 12 -5 15 -14c3 -11 4 -23 4 -35v-197c0 -65 0 -131 -1 -196c-1 -62 0 -125 -2 -187c-2 -53 -3 -106 -3 -159 s1 -107 1 -160c0 -21 -5 -42 -5 -64c0 -4 -1 -10 -7 -10c-5 0 -7 4 -9 8c-7 13 -6 26 -6 40v24l-5 -8l-8 -9c-32 -35 -73 -58 -118 -70c-25 -6 -49 -9 -73 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E076.xml b/data/Petaluma/E076.xml
new file mode 100644
index 00000000000..4d3f743cebd
--- /dev/null
+++ b/data/Petaluma/E076.xml
@@ -0,0 +1 @@
+<symbol id="E076" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M576 -463c-26 0 -52 2 -79 6c-132 19 -218 97 -279 209c-40 74 -49 154 -50 244c0 15 2 38 5 60c16 128 101 193 214 193c8 0 17 0 25 -1c105 -9 198 -47 273 -122c33 -33 65 -66 79 -113c4 -15 6 -29 6 -42c0 -45 -24 -81 -72 -103c-3 -1 -5 -3 -8 -4 c-15 -8 -29 -12 -43 -12c-20 0 -39 8 -57 23c-40 32 -58 72 -58 117c0 16 2 32 6 48c1 6 2 12 2 18c0 27 -16 46 -48 48c-8 1 -15 1 -22 1c-48 0 -92 -14 -127 -49c-45 -44 -70 -101 -84 -164c-2 -7 -2 -15 -2 -21c0 -23 8 -43 21 -64c20 -33 44 -61 76 -85 c62 -47 134 -67 209 -67h65c41 0 81 2 121 14c2 1 5 1 7 1c11 0 20 -10 20 -22c0 -3 0 -6 -1 -9c-3 -11 -6 -22 -11 -32c-12 -26 -23 -51 -58 -58c-44 -9 -86 -14 -130 -14zM69 97c-16 -1 -35 3 -43 18c-13 22 -26 43 -26 70c0 7 1 15 3 23c8 31 31 17 47 25c2 1 3 1 5 1 c8 0 11 -12 15 -19c19 -29 14 -64 23 -96c0 -2 1 -4 1 -5c0 -11 -8 -20 -25 -17zM101 -162c-36 1 -68 49 -68 92c0 30 17 25 31 30c3 1 5 2 7 2c10 0 13 -10 18 -17c18 -26 18 -57 28 -85c1 -3 1 -5 1 -8c0 -8 -5 -15 -17 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E077.xml b/data/Petaluma/E077.xml
new file mode 100644
index 00000000000..305a61a98aa
--- /dev/null
+++ b/data/Petaluma/E077.xml
@@ -0,0 +1 @@
+<symbol id="E077" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M412 -462c-8 -1 -17 -1 -25 -1c-113 0 -198 65 -214 193c-3 22 -5 45 -5 60c1 90 10 170 50 244c61 112 147 190 279 209c27 4 53 6 79 6c44 0 86 -5 130 -14c35 -7 46 -32 58 -58c5 -10 8 -21 11 -32c1 -3 1 -6 1 -9c0 -14 -12 -26 -27 -21c-40 12 -80 14 -121 14h-65 c-75 0 -147 -20 -209 -67c-32 -24 -56 -52 -76 -85c-13 -21 -21 -41 -21 -64c0 -6 0 -14 2 -21c14 -63 39 -120 84 -164c35 -35 79 -49 127 -49c7 0 14 0 22 1c32 2 48 21 48 48c0 6 -1 12 -2 18c-4 16 -6 32 -6 48c0 45 18 85 58 117c18 15 37 23 57 23c14 0 28 -4 43 -12 c3 -1 5 -3 8 -4c48 -22 72 -58 72 -103c0 -13 -2 -27 -6 -42c-14 -47 -46 -80 -79 -113c-75 -75 -168 -113 -273 -122zM64 -174c-14 5 -31 0 -31 30c0 43 32 91 68 92h2c14 0 18 -11 14 -22c-10 -28 -10 -59 -28 -85c-6 -9 -10 -21 -25 -15zM50 -447c-16 8 -39 -6 -47 25 c-2 8 -3 16 -3 23c0 27 13 48 26 70c8 15 27 19 43 18l7 1c15 0 20 -12 17 -23c-9 -32 -4 -67 -23 -96c-5 -8 -8 -24 -20 -18z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E080.xml b/data/Petaluma/E080.xml
new file mode 100644
index 00000000000..1c4d952c84e
--- /dev/null
+++ b/data/Petaluma/E080.xml
@@ -0,0 +1 @@
+<symbol id="E080" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M237 -358c-35 -2 -63 15 -86 40c-90 101 -131 209 -131 324c0 69 15 141 43 214c25 66 70 111 138 132c11 4 22 3 33 5c15 2 30 2 44 2c95 0 154 -47 194 -147c28 -68 41 -152 41 -236c0 -13 0 -27 -1 -40c-2 -55 -15 -114 -43 -171c-37 -76 -99 -108 -177 -119 c-18 -3 -37 -4 -55 -4zM286 -314c13 0 26 7 39 21c28 31 47 66 61 105c20 54 21 110 21 168c0 80 -18 174 -48 245c-14 33 -32 62 -62 83c-5 4 -10 6 -15 6c-4 0 -8 -1 -13 -3c-40 -14 -64 -45 -83 -79c-39 -69 -52 -144 -56 -222c-6 -120 38 -219 119 -305 c12 -13 24 -19 37 -19z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E081.xml b/data/Petaluma/E081.xml
new file mode 100644
index 00000000000..29f5d134288
--- /dev/null
+++ b/data/Petaluma/E081.xml
@@ -0,0 +1 @@
+<symbol id="E081" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M183 -364c-22 0 -32 6 -31 24c10 127 7 254 17 381c4 63 6 127 6 191c0 13 -3 19 -10 19c-3 -1 -7 -1 -11 -3c-13 -4 -27 -6 -40 -6c-24 0 -48 5 -73 10c-7 1 -16 2 -19 12c-1 4 -2 8 -2 11c0 5 3 8 14 9c54 3 99 25 133 69c3 3 6 6 9 8c7 4 16 5 24 5 c35 0 74 -25 78 -57c3 -34 5 -67 5 -100c0 -13 0 -25 -1 -38l-18 -475c0 -12 -3 -24 -4 -36c0 -8 -4 -13 -12 -14c-22 -4 -42 -10 -65 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E082.xml b/data/Petaluma/E082.xml
new file mode 100644
index 00000000000..013beeae96e
--- /dev/null
+++ b/data/Petaluma/E082.xml
@@ -0,0 +1 @@
+<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M69 -377c-6 4 -7 12 -8 20c0 8 0 16 -1 23c-1 8 -2 16 -2 24c0 22 6 42 19 63c39 63 83 122 134 175c47 48 94 95 137 146c30 36 52 77 69 119c2 5 4 10 4 14c0 13 -11 22 -22 30c-30 22 -66 33 -104 33c-45 0 -92 -15 -130 -48s-72 -70 -105 -109c-3 -3 -5 -7 -9 -11 c-6 -6 -13 -15 -21 -15s-10 5 -10 10s3 12 2 17c-2 8 -2 16 -2 23c0 44 25 77 57 109c40 40 76 84 129 107c39 17 78 29 119 29c20 0 40 -3 61 -10c57 -19 84 -52 84 -116c0 -6 0 -13 -1 -20c-8 -111 -56 -206 -129 -287c-36 -40 -72 -79 -110 -117c-5 -5 -9 -10 -18 -21 c16 4 31 6 46 6c34 0 65 -10 96 -22c37 -16 76 -27 115 -27c23 0 46 4 69 12s42 19 60 37c11 11 23 20 35 30c6 5 14 11 21 7c6 -3 6 -14 6 -22c5 -64 -31 -106 -81 -138c-42 -27 -85 -39 -129 -39c-37 0 -75 10 -113 24c-22 8 -43 17 -65 22c-12 3 -25 4 -37 4 c-20 0 -39 -4 -58 -16c-29 -19 -60 -37 -87 -59c-6 -5 -13 -12 -21 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E083.xml b/data/Petaluma/E083.xml
new file mode 100644
index 00000000000..ed11ad429ec
--- /dev/null
+++ b/data/Petaluma/E083.xml
@@ -0,0 +1 @@
+<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 -375c-29 10 -54 25 -80 40c-16 10 -28 24 -32 41c-7 32 -15 61 -13 94c0 15 8 23 19 26c2 1 3 1 5 1c10 0 11 -13 12 -18c7 -24 24 -33 44 -45c47 -25 96 -41 146 -41c28 0 57 5 86 16c58 22 91 68 109 126c1 4 2 7 2 11c0 22 -21 37 -37 49c-24 20 -52 30 -81 30 c-11 0 -23 -2 -35 -5c-33 -8 -67 -16 -93 -42c-5 -5 -12 -9 -19 -6c-9 4 -9 13 -8 21v2c-3 11 -4 21 -4 30c0 53 37 85 75 120c63 58 117 123 172 197h-272c-36 0 -72 -2 -107 -5h-3c-14 0 -17 6 -16 19c2 21 1 42 5 62c3 21 13 29 33 31c60 6 121 6 182 6h39 c55 0 111 -2 166 -2c22 0 44 1 66 7c4 1 7 2 10 2c8 0 13 -5 16 -17c2 -9 3 -18 3 -26c0 -21 -6 -41 -19 -59c-51 -71 -100 -142 -158 -211c16 -4 31 -8 46 -13c56 -23 88 -67 94 -123c2 -18 3 -37 3 -55c0 -79 -22 -154 -86 -211c-52 -45 -111 -69 -174 -69 c-31 0 -63 6 -96 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E084.xml b/data/Petaluma/E084.xml
new file mode 100644
index 00000000000..d4f75f77404
--- /dev/null
+++ b/data/Petaluma/E084.xml
@@ -0,0 +1 @@
+<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M422 -489c-8 3 -7 15 -7 24c-1 10 -1 20 -1 31c0 46 5 90 7 134c4 57 5 114 7 171c-7 -2 -14 -2 -21 -2c-7 1 -14 1 -21 2c-62 4 -124 14 -186 14c-47 0 -92 -10 -136 -29c-7 -4 -13 -6 -17 -6c-8 1 -11 6 -12 21c0 9 -5 18 -9 27s-6 18 -6 27c0 25 15 46 31 66 c50 63 84 135 125 204c29 49 62 96 91 145c23 40 48 79 62 124c2 6 6 11 9 17c5 8 15 11 23 10c8 0 8 -11 9 -17c1 -7 2 -14 2 -21c0 -24 -7 -47 -16 -70c-37 -97 -94 -183 -147 -270c-23 -38 -41 -77 -63 -119c22 3 44 4 66 4c62 1 122 -9 183 -13c11 -1 23 -1 35 0 c0 65 -2 131 -3 197c-1 18 4 36 5 54c1 15 10 23 22 23c13 0 12 -16 13 -24c3 -37 4 -75 6 -112c2 -44 4 -88 4 -132c36 7 71 19 105 34l7 3c11 6 20 9 26 9c13 -1 18 -12 18 -37c1 -53 -7 -65 -56 -88c-33 -15 -66 -27 -101 -34v-10c-4 -95 -2 -191 -13 -286 c-3 -20 -5 -40 -18 -57c-5 -8 -13 -17 -23 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E085.xml b/data/Petaluma/E085.xml
new file mode 100644
index 00000000000..ad370c36d72
--- /dev/null
+++ b/data/Petaluma/E085.xml
@@ -0,0 +1 @@
+<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M92 -372c-17 8 -35 15 -53 21c-14 4 -21 16 -19 26c8 34 0 70 18 102c7 13 13 17 28 15c41 -5 77 -23 115 -36c20 -8 40 -11 60 -11c50 0 95 23 125 64c14 21 33 40 33 66c0 7 -1 13 -4 20c-15 43 -47 69 -86 87c-40 18 -83 23 -126 28c-19 3 -27 5 -27 14c0 4 2 11 6 20 c7 18 11 36 9 56c0 5 -1 10 -1 14c0 33 12 63 25 94c16 36 29 73 50 107c9 14 17 20 30 21c20 2 39 0 48 0c73 0 139 15 203 41c1 1 3 2 4 2c15 7 26 10 34 10c15 0 19 -14 19 -49c0 -40 -13 -68 -57 -82c-66 -20 -131 -41 -200 -41c-19 0 -27 -4 -29 -20 c-1 -20 -8 -39 -16 -57c-2 -4 -3 -8 -3 -10c0 -7 5 -9 15 -10c28 -4 55 -13 82 -24c71 -31 107 -88 107 -155c0 -22 -4 -45 -12 -68c-24 -74 -62 -140 -118 -194c-37 -36 -108 -68 -179 -68c-28 1 -56 5 -81 17z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E086.xml b/data/Petaluma/E086.xml
new file mode 100644
index 00000000000..d6533f1062f
--- /dev/null
+++ b/data/Petaluma/E086.xml
@@ -0,0 +1 @@
+<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M271 -360c-10 -2 -20 -3 -30 -3c-29 0 -57 6 -84 18c-66 30 -100 85 -120 152c-12 37 -17 73 -17 109c0 72 22 141 60 207c34 60 71 116 126 157c58 43 122 73 194 82c4 1 8 1 12 1c26 -1 49 -13 63 -35c9 -15 13 -30 13 -47c0 -16 -4 -32 -11 -48c-4 -7 -9 -11 -15 -11 c-3 0 -8 1 -12 5c-16 13 -33 18 -51 18c-15 0 -31 -4 -46 -9c-112 -33 -189 -105 -237 -210c-15 -34 -30 -67 -42 -102c-4 -12 -6 -24 -6 -35c0 -16 4 -32 12 -47c19 -35 46 -60 82 -74c30 136 110 226 241 265c18 5 34 8 50 8c68 -1 112 -52 112 -134 c0 -102 -42 -178 -134 -225c-50 -25 -105 -34 -160 -42zM244 -248h5c48 2 96 11 142 25c49 15 88 44 116 87c5 8 7 14 7 20c0 10 -6 17 -16 24c-21 14 -43 20 -66 20c-18 1 -36 -3 -55 -11c-66 -27 -118 -71 -151 -136c-4 -8 -15 -17 -9 -25c5 -8 17 -3 27 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E087.xml b/data/Petaluma/E087.xml
new file mode 100644
index 00000000000..613d932c686
--- /dev/null
+++ b/data/Petaluma/E087.xml
@@ -0,0 +1 @@
+<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M176 -345c-23 0 -34 7 -34 24c0 4 1 9 2 14c11 45 24 90 40 134c51 141 129 268 222 386c2 2 3 5 6 12c-44 -11 -87 -16 -130 -16c-26 0 -52 2 -77 6c-67 10 -126 35 -170 88c-8 10 -20 23 -12 33c4 6 13 9 23 9c5 0 10 -1 15 -2c30 -6 56 -17 78 -41 c34 -37 80 -52 127 -52c53 0 104 13 153 35c17 7 34 14 49 24c19 14 40 20 61 20c12 0 25 -2 37 -5c17 -4 26 -11 26 -21c0 -6 -4 -14 -12 -23c-93 -109 -177 -223 -242 -352c-37 -74 -67 -152 -84 -234c-4 -19 -12 -29 -33 -31c-15 -1 -29 -8 -45 -8z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E088.xml b/data/Petaluma/E088.xml
new file mode 100644
index 00000000000..9edfb5f7132
--- /dev/null
+++ b/data/Petaluma/E088.xml
@@ -0,0 +1 @@
+<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M184 -428c-81 0 -161 64 -161 157c0 11 1 22 3 33c9 44 18 87 38 128c15 31 34 59 67 77c-20 14 -43 22 -59 39c-40 44 -52 100 -52 156c0 105 50 189 142 242c29 17 58 24 85 24c77 0 141 -59 160 -141c5 -26 8 -52 8 -78c0 -36 -5 -73 -15 -109c-1 -4 -3 -8 -3 -12 c1 -5 3 -9 9 -13c71 -46 98 -108 98 -178c1 -27 -3 -56 -11 -85c-37 -149 -151 -223 -292 -239c-6 -1 -11 -1 -17 -1zM179 73c43 0 78 8 112 12c16 2 25 9 34 20c27 34 36 76 43 117v5v3c0 8 -5 16 -10 23c-30 40 -72 60 -115 60c-37 0 -75 -15 -106 -46 c-32 -33 -54 -72 -68 -116c-2 -6 -2 -11 -2 -15c0 -13 6 -23 19 -33c30 -22 63 -30 93 -30zM228 -304c61 4 119 25 167 67c18 16 29 37 29 63c0 36 -14 65 -34 92c-23 32 -49 48 -79 48c-17 0 -36 -5 -56 -16c-33 -18 -65 -37 -95 -59c-20 -15 -38 -32 -45 -57 c-3 -9 -5 -17 -5 -26c1 -57 52 -111 118 -112z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E089.xml b/data/Petaluma/E089.xml
new file mode 100644
index 00000000000..c8d123a2f99
--- /dev/null
+++ b/data/Petaluma/E089.xml
@@ -0,0 +1 @@
+<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 -421c-63 0 -115 45 -129 110c-6 30 -14 60 -14 91c1 18 9 32 16 48c3 6 9 10 15 10c8 0 9 -9 11 -15c3 -11 4 -23 4 -35c2 -62 37 -99 90 -99c10 0 21 1 32 4c58 14 98 54 136 97c66 74 92 166 114 259c6 24 10 49 15 73c-21 -36 -46 -68 -75 -97 c-42 -42 -95 -62 -146 -62c-67 0 -132 35 -165 105c-19 40 -28 82 -28 121c0 117 80 218 205 231c9 1 17 1 26 1c98 0 187 -62 216 -181c6 -26 8 -52 8 -78c0 -25 -2 -49 -4 -74c-8 -85 -29 -167 -60 -247c-37 -95 -92 -176 -179 -233c-30 -20 -60 -29 -88 -29zM236 72 c95 0 151 56 187 123c3 6 5 12 5 17c0 11 -6 21 -15 30c-16 16 -34 30 -54 41c-35 20 -71 29 -105 29c-67 0 -126 -37 -159 -106c-5 -9 -7 -18 -7 -27c0 -12 4 -23 12 -34c35 -47 83 -70 136 -73z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08A.xml b/data/Petaluma/E08A.xml
new file mode 100644
index 00000000000..c16a58146c3
--- /dev/null
+++ b/data/Petaluma/E08A.xml
@@ -0,0 +1 @@
+<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M308 -281c-32 -11 -64 -17 -95 -17c-46 0 -90 13 -133 45c-44 34 -51 82 -59 131c-1 4 -1 8 -1 12c0 133 52 242 148 331c52 48 115 67 182 73c52 4 77 -16 92 -66c6 -17 9 -35 9 -53c0 -21 -4 -41 -13 -61c-31 -73 -73 -133 -152 -161c-7 -3 -14 -4 -20 -4 c-32 0 -67 24 -85 45c-11 13 -16 26 -16 39c0 15 6 31 18 49c20 30 48 45 77 45c22 -1 44 -9 64 -24c4 -3 8 -4 11 -4h2c8 0 15 7 22 10c11 6 23 14 20 32c-5 35 -20 52 -48 52c-6 -1 -12 -1 -19 -3c-106 -21 -181 -79 -214 -185c-4 -16 -6 -31 -6 -46c0 -9 1 -18 2 -28 c3 -22 13 -40 31 -54c38 -32 78 -45 121 -45c26 0 53 5 80 13c88 28 153 83 205 157c6 9 14 18 21 26c5 5 11 12 18 12c14 0 15 -13 15 -22c0 -17 0 -34 -9 -49c-62 -113 -141 -209 -268 -250z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08B.xml b/data/Petaluma/E08B.xml
new file mode 100644
index 00000000000..3f6bb3c91ea
--- /dev/null
+++ b/data/Petaluma/E08B.xml
@@ -0,0 +1 @@
+<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M392 -687c-15 0 -9 19 -13 29c-9 28 -11 57 -11 86c0 20 1 39 2 59c4 61 2 122 4 182v38l-15 -6c-37 -11 -75 -14 -110 -17c-70 3 -130 20 -176 72c-37 42 -53 89 -53 141c0 12 1 25 3 38c8 58 23 114 55 164c60 96 132 178 243 216c22 7 44 11 67 11c1 59 3 118 4 177 c0 6 0 11 -1 21c-23 -16 -42 -31 -62 -44c-9 -6 -15 -9 -20 -9c-7 0 -11 8 -13 24c-4 21 -11 42 -10 64c1 9 0 19 7 24c41 34 78 73 126 98c7 4 12 6 16 6c6 0 8 -7 8 -22c-1 -102 -8 -205 -9 -308v-32c13 -2 27 -4 40 -7c33 -7 67 -11 94 -33c26 -20 41 -50 41 -81 c0 -10 -2 -20 -5 -30c-21 -63 -54 -117 -119 -144c-6 -2 -9 -5 -13 -10c-10 -14 -26 -25 -44 -34c-1 -55 -3 -110 -4 -166c29 7 58 17 85 30c57 27 112 58 151 109c6 7 12 11 19 11c3 0 5 -1 8 -2c6 -2 8 -7 8 -12s-2 -10 -3 -15c-14 -47 -45 -83 -82 -115 c-56 -48 -120 -78 -187 -103l-3 -159c-1 -68 -3 -136 -4 -204l-3 -16c-4 -13 -7 -32 -21 -31zM285 -200c11 0 23 1 35 2c19 3 38 5 57 9l3 161c-8 -1 -16 -2 -24 -2c-10 0 -18 1 -27 3c-18 5 -29 15 -34 35c-3 13 -6 26 -6 39c0 11 2 22 7 33c14 34 50 58 88 67 c1 21 1 43 1 64c-6 0 -12 1 -18 1c-21 0 -42 -3 -63 -10c-51 -17 -88 -53 -124 -92c-29 -32 -49 -70 -71 -106c-7 -12 -11 -28 -11 -46c0 -33 13 -70 36 -95c42 -46 94 -63 151 -63zM482 137c12 0 23 6 34 11c4 1 6 4 6 6c0 3 -2 6 -4 9c-8 10 -17 18 -28 23 c-19 7 -38 13 -58 18c0 -18 0 -36 -1 -54c12 -1 23 -4 33 -9c6 -3 12 -4 18 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08C.xml b/data/Petaluma/E08C.xml
new file mode 100644
index 00000000000..e76e1d0ffe8
--- /dev/null
+++ b/data/Petaluma/E08C.xml
@@ -0,0 +1 @@
+<symbol id="E08C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M420 -358c-3 0 -7 1 -11 2c-14 2 -30 1 -44 2c-24 2 -33 15 -34 37c-6 72 -9 144 -9 216v33s-16 -1 -35 -3c-69 -7 -139 -16 -209 -23c-15 -3 -27 -4 -36 -4c-38 1 -42 17 -42 75c0 27 6 32 34 32c5 0 11 0 17 1c69 7 138 15 207 24l65 7s0 43 1 63c2 69 5 138 8 206 c1 16 -2 38 14 45c3 2 6 3 9 3c14 -1 27 -12 39 -19c26 -15 36 -36 34 -67c-6 -70 -5 -230 -5 -230s148 -9 210 -15c15 -1 21 -9 25 -21c2 -8 3 -16 3 -23c0 -15 -4 -31 -8 -45s-15 -19 -30 -18c-58 4 -116 11 -174 12l-24 1s0 -12 1 -24c2 -30 7 -190 10 -239 c0 -4 1 -7 1 -10c0 -12 -4 -18 -17 -18z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08D.xml b/data/Petaluma/E08D.xml
new file mode 100644
index 00000000000..bd190228dc1
--- /dev/null
+++ b/data/Petaluma/E08D.xml
@@ -0,0 +1 @@
+<symbol id="E08D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M209 -197c-8 0 -10 6 -10 14c0 7 1 14 1 20c-1 44 0 87 5 130v5c0 9 -4 13 -14 13h-85c-11 1 -26 0 -43 0c-14 0 -29 0 -44 3c-14 3 -17 12 -19 21v3c0 9 12 7 17 9c15 5 30 7 45 7c18 0 36 -2 54 -1c10 1 20 1 30 1c14 0 28 0 42 -1h3c14 0 18 7 18 21l6 110 c0 6 1 13 1 19c2 12 9 22 21 22c14 -1 12 -16 12 -25v-51c0 -25 0 -51 -2 -76v-4c0 -14 5 -16 20 -16c33 0 65 -2 98 -4c9 0 19 -1 28 -3c11 -3 25 -7 25 -18c0 -13 -16 -7 -25 -8c-20 -5 -39 -6 -59 -6c-25 0 -50 1 -74 -2c-13 -2 -16 -5 -18 -18c-5 -45 1 -90 -13 -133 c-4 -12 -7 -32 -20 -32z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08E.xml b/data/Petaluma/E08E.xml
new file mode 100644
index 00000000000..fb4492d463a
--- /dev/null
+++ b/data/Petaluma/E08E.xml
@@ -0,0 +1 @@
+<symbol id="E08E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M37 -423c-9 0 -10 9 -14 14c-17 20 -23 40 -23 60c0 23 9 46 22 72c75 145 293 601 332 681c4 9 10 19 19 19s14 -11 18 -20c9 -16 11 -35 14 -49c-1 -16 -5 -27 -10 -38c-76 -159 -306 -642 -346 -725c-3 -5 -4 -13 -12 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E08F.xml b/data/Petaluma/E08F.xml
new file mode 100644
index 00000000000..45ea9b3b94c
--- /dev/null
+++ b/data/Petaluma/E08F.xml
@@ -0,0 +1 @@
+<symbol id="E08F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M362 70c-135 0 -292 5 -310 4c-2 1 -3 1 -4 1h-3c-9 0 -13 4 -17 14c-7 18 -19 34 -24 54c-2 6 -3 11 -3 15c0 12 9 18 27 17c54 1 214 1 338 1c31 0 60 -1 84 -1c25 0 45 1 58 1c23 0 36 -7 41 -29c4 -15 10 -30 10 -45c0 -6 -1 -12 -4 -18c-5 -11 -92 -14 -193 -14z M54 -177h-4c-5 0 -9 2 -12 6c-11 21 -27 39 -36 61c-1 4 -2 8 -2 11c0 12 8 19 24 19c78 1 387 12 463 16c19 0 29 -8 37 -23c2 -4 4 -9 5 -13c7 -19 10 -33 10 -43c0 -19 -15 -24 -54 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E090.xml b/data/Petaluma/E090.xml
new file mode 100644
index 00000000000..8cc494fb42d
--- /dev/null
+++ b/data/Petaluma/E090.xml
@@ -0,0 +1 @@
+<symbol id="E090" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 -54c-5 1 -10 2 -11 8c-4 24 -16 46 -16 72c0 22 10 28 29 28h298c123 0 247 0 295 1c23 0 31 -11 35 -29c1 -2 1 -5 1 -7c2 -13 4 -24 4 -33c0 -32 -18 -41 -64 -39c-33 0 -159 1 -284 1s-249 0 -280 -1c-3 0 -5 -1 -7 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E091.xml b/data/Petaluma/E091.xml
new file mode 100644
index 00000000000..080e5013d74
--- /dev/null
+++ b/data/Petaluma/E091.xml
@@ -0,0 +1 @@
+<symbol id="E091" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M63 -305c-12 1 -22 12 -42 36c-14 16 -21 26 -21 35c0 11 9 20 27 34c73 57 141 120 210 182c6 5 9 9 9 14c0 4 -3 8 -9 13c-62 53 -121 108 -183 161c-27 22 -19 51 -23 78v4c0 7 2 15 3 22c3 12 9 19 18 19c4 -1 9 -3 14 -8c76 -71 160 -131 236 -202 c8 -7 14 -10 20 -10h2c5 0 12 5 19 13c59 61 112 128 163 197c11 15 19 22 27 22c9 -1 17 -10 26 -28c7 -15 15 -30 15 -52c1 -12 -8 -23 -16 -35c-44 -66 -92 -128 -148 -184c-6 -7 -9 -11 -9 -16c0 -4 2 -8 8 -15c45 -47 88 -95 130 -143c10 -12 15 -30 15 -49 c0 -23 -7 -47 -20 -60c-5 -5 -9 -7 -13 -7c-6 1 -12 5 -17 11l-120 132c-16 17 -32 34 -47 51c-4 4 -7 6 -11 6h-1c-3 0 -7 -3 -11 -6c-63 -63 -130 -122 -198 -180c-4 -2 -6 -5 -9 -8c-22 -18 -34 -27 -44 -27z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E092.xml b/data/Petaluma/E092.xml
new file mode 100644
index 00000000000..38292844435
--- /dev/null
+++ b/data/Petaluma/E092.xml
@@ -0,0 +1 @@
+<symbol id="E092" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M137 -405h-1c-7 0 -11 10 -14 17c-49 99 -102 197 -113 310c-4 38 -6 76 -9 113c2 75 18 145 49 212c24 51 51 100 88 144c6 9 15 13 23 13c11 0 13 -13 13 -21c2 -32 -2 -60 -24 -87c-41 -49 -67 -108 -86 -169c-11 -34 -17 -70 -20 -106c-3 -50 11 -98 28 -144 c21 -59 49 -116 77 -172c8 -16 11 -33 11 -50c0 -13 -2 -26 -5 -39c-2 -9 -7 -20 -17 -21z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E093.xml b/data/Petaluma/E093.xml
new file mode 100644
index 00000000000..609e6e38ef8
--- /dev/null
+++ b/data/Petaluma/E093.xml
@@ -0,0 +1 @@
+<symbol id="E093" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 -422c-4 0 -7 3 -9 12l-9 44c-1 5 -2 11 -2 16c0 13 5 26 14 38c60 83 81 179 89 278c2 21 3 42 3 63c0 74 -12 146 -45 215c-13 27 -25 54 -55 69c-10 5 -16 39 -16 66c0 17 2 31 7 36c5 4 9 7 14 7c3 0 6 -1 10 -3c22 -11 38 -29 49 -50c41 -80 63 -165 68 -254 c2 -39 8 -77 6 -99c-2 -139 -20 -259 -73 -371c-10 -22 -24 -42 -39 -60c-5 -5 -9 -7 -12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E094.xml b/data/Petaluma/E094.xml
new file mode 100644
index 00000000000..09955a2f3fd
--- /dev/null
+++ b/data/Petaluma/E094.xml
@@ -0,0 +1 @@
+<symbol id="E094" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M390 -728c-7 0 -17 6 -25 5c-54 0 -86 32 -113 73c-45 70 -92 137 -127 213c-61 133 -116 267 -124 415c-1 14 0 28 0 43c5 142 38 279 87 412c33 90 69 179 124 259c14 22 26 36 41 36c13 0 28 -10 49 -37c11 -16 17 -23 17 -31c1 -8 -6 -17 -20 -34 c-35 -47 -56 -102 -80 -155c-51 -118 -88 -241 -108 -368c-5 -36 -8 -72 -8 -107c0 -82 15 -163 43 -242c45 -130 108 -252 182 -368c17 -25 38 -47 56 -72c8 -11 20 -26 14 -38c-2 -3 -5 -4 -8 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E095.xml b/data/Petaluma/E095.xml
new file mode 100644
index 00000000000..98491eb9fb1
--- /dev/null
+++ b/data/Petaluma/E095.xml
@@ -0,0 +1 @@
+<symbol id="E095" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -721c-2 1 -3 3 -3 5c0 5 3 10 4 15c19 81 56 156 76 238c24 99 55 196 72 297c9 54 13 109 13 165c0 50 -3 100 -8 150c-16 163 -82 309 -166 447c-10 16 -14 30 -14 44c0 16 5 30 13 46c12 25 22 39 34 39c11 0 22 -10 36 -33c101 -160 173 -330 187 -522 c2 -35 2 -70 4 -88c3 -123 -20 -224 -43 -326c-28 -127 -69 -250 -117 -371c-12 -33 -31 -63 -53 -90c-4 -4 -8 -8 -13 -11c-7 -5 -15 -9 -22 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A0.xml b/data/Petaluma/E0A0.xml
new file mode 100644
index 00000000000..137f5544ccf
--- /dev/null
+++ b/data/Petaluma/E0A0.xml
@@ -0,0 +1 @@
+<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 -223c-13 -1 -8 21 -11 32c-7 27 -9 55 -9 83c0 24 1 48 1 72v11c0 8 0 17 -1 25c0 11 -1 22 -1 33c0 23 1 46 1 69c0 24 -1 47 -4 70c-1 10 0 21 0 31c0 12 9 18 18 20h2c7 0 8 -9 10 -15c12 -24 11 -51 12 -77c2 -32 2 -64 2 -96c0 -57 -1 -114 -1 -170v-50 c-3 -15 -3 -36 -19 -38zM588 -218c-8 2 -7 13 -8 21c-7 68 -6 137 -9 183v132c0 19 0 38 1 56c-1 3 -1 6 -1 10c0 9 2 19 15 25c3 2 6 2 8 2c5 0 8 -2 9 -9c3 -8 6 -16 6 -25c-1 -32 -1 -65 -1 -97c0 -70 2 -140 6 -210c1 -24 -2 -47 -9 -70c-3 -8 -8 -19 -17 -18zM526 -202 c-10 21 -12 42 -12 62c-1 22 -2 44 -2 66v88c1 37 0 73 -3 109c-1 14 3 27 4 41c1 11 9 12 16 14c1 0 2 1 3 1c7 0 7 -8 9 -12c3 -8 5 -16 5 -23c3 -60 6 -119 6 -178c0 -29 0 -57 -1 -85s2 -58 -25 -83zM89 -181c-5 1 -7 6 -7 11c-3 28 -9 54 -9 82c1 5 1 10 1 15 c1 11 1 22 1 33c1 34 -3 69 -3 103c0 30 3 61 4 91c0 14 7 20 17 22h2c12 0 13 -13 13 -20c2 -29 2 -58 2 -86v-17c-1 -11 -1 -22 -1 -32c0 -39 3 -77 3 -116c0 -15 0 -31 -2 -46c-1 -12 -2 -23 -10 -33c-2 -4 -6 -9 -11 -7zM339 -168c-51 1 -92 9 -131 26 c-36 16 -52 50 -64 85c-11 31 -15 63 -15 96c0 14 7 25 17 33c50 41 106 67 166 67c21 0 41 -3 63 -9c56 -16 100 -72 104 -130c1 -12 2 -25 2 -38v-17c-5 -60 -68 -118 -142 -113zM340 -61c27 0 50 4 71 21c12 11 18 19 18 26c1 8 -8 15 -26 24c-30 14 -58 20 -85 20 c-41 0 -82 -14 -122 -35c-7 -4 -17 -9 -17 -18c0 -10 12 -13 20 -16c38 -15 78 -20 113 -21c10 -1 19 -1 28 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A1.xml b/data/Petaluma/E0A1.xml
new file mode 100644
index 00000000000..e471b915e3f
--- /dev/null
+++ b/data/Petaluma/E0A1.xml
@@ -0,0 +1 @@
+<symbol id="E0A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M450 -209c-7 1 -5 9 -6 14c-2 21 -3 43 -4 58h-250h-92l-46 -1c-12 0 -14 -5 -16 -15c-3 -13 -1 -28 -12 -38c-3 -4 -6 -9 -11 -8c-6 2 -4 8 -5 13c-4 32 -5 64 -5 96c0 27 1 55 1 83c0 14 0 28 -1 42c-1 32 -3 64 -3 95c0 18 0 35 3 53c2 14 7 24 21 24h1 c12 0 8 -15 12 -22c1 -2 1 -4 1 -6c0 -7 -2 -14 -2 -20s2 -11 8 -13c5 -2 11 -2 18 -2c8 -1 17 1 25 0c93 -4 186 -9 280 -9h38c19 0 33 2 33 21c0 2 -1 5 -1 8v3c0 8 4 18 4 27c0 12 8 15 16 17h2c8 0 6 -9 8 -14c3 -5 3 -12 3 -18c1 -108 3 -217 4 -324 c0 -18 -3 -37 -10 -54c-2 -6 -7 -12 -14 -10zM50 -46c22 4 43 5 65 5h37c53 0 107 -1 161 -1c36 0 71 0 107 2c16 0 21 6 21 19c0 25 -1 48 -1 77c-11 -7 -19 -11 -29 -11h-182c-58 -1 -116 1 -174 5l-7 1c-6 -1 -11 -3 -11 -14c1 -23 1 -48 1 -72v-4c0 -6 3 -9 12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A2.xml b/data/Petaluma/E0A2.xml
new file mode 100644
index 00000000000..0312794326b
--- /dev/null
+++ b/data/Petaluma/E0A2.xml
@@ -0,0 +1 @@
+<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M380 28c1 30 -2 59 -23 82c-33 37 -81 55 -130 55c-54 0 -109 -23 -142 -67c-37 -49 -62 -104 -81 -161c-3 -9 -4 -17 -4 -25c0 -27 15 -49 43 -62l28 -12c28 -10 54 -26 84 -24c100 6 222 81 225 214zM172 -74c-32 0 -58 12 -85 22c-7 3 -10 7 -10 12s4 11 7 16 c25 38 60 61 105 72c7 2 13 3 20 3c29 0 52 -17 78 -29c10 -5 15 -12 15 -20c0 -6 -2 -12 -6 -18c-8 -12 -17 -21 -29 -28c-30 -17 -62 -27 -95 -30z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A3.xml b/data/Petaluma/E0A3.xml
new file mode 100644
index 00000000000..ad358995733
--- /dev/null
+++ b/data/Petaluma/E0A3.xml
@@ -0,0 +1 @@
+<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M333 39c1 5 1 10 1 15c0 64 -74 121 -123 121c-5 0 -10 -1 -14 -2c-109 -34 -197 -107 -197 -220c0 -16 2 -33 6 -51c8 -35 24 -61 59 -70c17 -4 34 -6 51 -6c114 0 216 94 217 213zM148 -71c-19 1 -27 1 -36 3c-23 5 -59 0 -64 25c-5 23 20 49 42 62c36 19 70 47 113 47 c5 0 9 0 13 -1c29 -4 43 -28 61 -46c1 -1 2 -4 2 -7s-1 -7 -2 -8c-40 -37 -87 -60 -129 -75z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A4.xml b/data/Petaluma/E0A4.xml
new file mode 100644
index 00000000000..68e34a709a0
--- /dev/null
+++ b/data/Petaluma/E0A4.xml
@@ -0,0 +1 @@
+<symbol id="E0A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M78 -162c-56 13 -78 53 -78 103c0 6 1 12 1 18c8 82 124 205 231 205c17 0 33 -3 48 -10c52 -21 51 -56 54 -82c3 -105 -140 -236 -236 -236c-7 0 -13 1 -20 2z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0A5.xml b/data/Petaluma/E0A5.xml
new file mode 100644
index 00000000000..d4eec1c1f60
--- /dev/null
+++ b/data/Petaluma/E0A5.xml
@@ -0,0 +1 @@
+<symbol id="E0A5" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/E0A9.xml b/data/Petaluma/E0A9.xml
new file mode 100644
index 00000000000..7fd677db4bc
--- /dev/null
+++ b/data/Petaluma/E0A9.xml
@@ -0,0 +1 @@
+<symbol id="E0A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -156c-6 2 -13 -1 -15 5c-1 1 -1 3 -1 4c0 6 4 10 7 16c31 46 70 85 107 126c-4 3 -7 6 -11 10c-31 31 -60 63 -88 97c-5 7 -8 13 -8 18c0 6 3 12 8 18c3 4 5 5 8 5c6 0 13 -7 19 -9c11 -3 18 -13 25 -22c24 -29 49 -56 76 -83c29 36 58 70 89 104c8 9 18 24 29 24 c4 0 9 -2 13 -6c4 -3 5 -7 5 -11c0 -10 -10 -22 -17 -31c-26 -39 -56 -75 -87 -110c21 -19 42 -37 64 -55c16 -14 28 -31 41 -47c7 -7 9 -16 9 -26v-4c0 -5 0 -11 -6 -13h-3c-7 0 -13 5 -18 9c-39 34 -79 67 -117 102l-50 -56c-15 -18 -31 -34 -47 -51 c-9 -10 -20 -13 -32 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0AF.xml b/data/Petaluma/E0AF.xml
new file mode 100644
index 00000000000..698e7cbd5dd
--- /dev/null
+++ b/data/Petaluma/E0AF.xml
@@ -0,0 +1 @@
+<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M178 -161c-8 0 -9 9 -9 15l-13 125c-46 2 -89 5 -133 6c-14 1 -20 9 -22 18v4c0 7 10 8 16 11c17 5 34 8 51 6c28 -1 56 -3 84 -5l-6 63c-1 20 5 39 8 59c2 12 9 19 21 19c13 -1 11 -13 12 -21l15 -123l85 -6c13 -1 25 -4 36 -10c5 -4 12 -8 10 -15c-1 -7 -10 -8 -16 -8 c-20 -1 -40 -4 -56 -4c-6 0 -11 1 -15 1c-14 1 -27 2 -40 2l5 -52c3 -27 -2 -53 -18 -75c-4 -5 -8 -10 -15 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0B5.xml b/data/Petaluma/E0B5.xml
new file mode 100644
index 00000000000..76611c46072
--- /dev/null
+++ b/data/Petaluma/E0B5.xml
@@ -0,0 +1 @@
+<symbol id="E0B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 -157c-90 4 -171 41 -232 117c-16 20 -24 43 -24 65c0 31 16 61 48 80c56 34 115 52 178 52c19 0 39 -2 59 -5c82 -14 141 -55 179 -128c8 -17 12 -34 12 -51c0 -41 -23 -79 -61 -97c-41 -19 -102 -31 -159 -33zM238 26c12 11 24 21 36 31c11 10 22 19 33 28 c-15 14 -30 25 -45 32c-7 2 -13 6 -21 2c-25 -10 -52 -19 -75 -33l10 -9c21 -17 42 -34 62 -51zM145 -54c26 22 52 45 77 67l-75 61c-22 -18 -33 -41 -33 -64s10 -45 31 -64zM356 -70c5 10 9 22 9 33c0 32 -16 70 -39 101l-65 -56c31 -26 63 -52 95 -78zM261 -115 c5 -1 11 -2 16 -2c24 0 49 12 66 31c-19 14 -37 31 -57 47c-13 11 -27 22 -41 33c-26 -22 -51 -43 -76 -65c-1 0 -1 0 -1 -1c28 -20 59 -35 93 -43z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0B6.xml b/data/Petaluma/E0B6.xml
new file mode 100644
index 00000000000..1dc77f61e29
--- /dev/null
+++ b/data/Petaluma/E0B6.xml
@@ -0,0 +1 @@
+<symbol id="E0B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M195 -148c-46 -4 -89 10 -128 37c-40 27 -67 66 -67 107c0 34 18 69 62 101c30 22 63 32 97 38c10 3 24 3 28 4c29 3 57 13 86 13c7 -1 14 -1 21 -3c17 -3 33 -6 49 -16c14 -10 32 -11 49 -14c4 2 7 2 11 2c5 0 10 -2 12 -6c1 -1 1 -2 1 -2c28 -9 55 -19 78 -39 c17 -14 26 -28 26 -43c0 -12 -5 -24 -15 -37c-40 -55 -91 -92 -151 -115c2 -4 3 -8 4 -12c0 -3 -1 -7 -3 -9c-3 -3 -7 -1 -10 2l-11 12c-13 -4 -26 -8 -40 -11c-32 -6 -64 -11 -99 -9zM251 28l95 65c-21 7 -44 11 -66 14c-26 -3 -50 -6 -73 -13c15 -22 30 -44 44 -66z M242 -112c21 8 41 18 60 29l-53 78l-75 -50c-10 -7 -21 -11 -32 -12h-7c-3 0 -6 1 -8 5v1c0 5 4 8 8 10l99 68l-47 69c-16 -7 -30 -16 -44 -29c-27 -23 -38 -46 -38 -68c0 -24 14 -47 36 -68c21 -22 47 -39 75 -39c9 1 17 2 26 6zM266 7l54 -78c34 23 63 52 86 88 c5 8 7 15 7 22c0 10 -6 21 -18 30c-6 4 -12 8 -19 11c-36 -24 -73 -49 -110 -73z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0B7.xml b/data/Petaluma/E0B7.xml
new file mode 100644
index 00000000000..ff64a3f78be
--- /dev/null
+++ b/data/Petaluma/E0B7.xml
@@ -0,0 +1 @@
+<symbol id="E0B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M176 -142c-75 1 -125 30 -161 83c-10 14 -15 31 -15 49c0 32 16 65 44 87c9 6 18 12 28 17c-1 2 -1 4 1 7c4 5 9 3 13 1c36 18 76 27 116 34l17 3c10 2 21 3 31 3c32 -1 61 -11 82 -42c17 -24 27 -51 27 -77c0 -21 -6 -41 -18 -62c-39 -66 -98 -99 -165 -103zM186 14 l80 -72c16 13 30 28 41 45c12 19 17 38 17 58c0 7 0 15 -2 22c-4 20 -17 33 -34 33l-10 -1c-4 -1 -8 -2 -12 -2zM169 28l66 68c-39 -3 -76 -12 -111 -27l5 -5c14 -12 27 -24 40 -36zM61 -82c5 6 13 11 18 16l78 81l-51 46c-10 -6 -21 -12 -31 -19c-26 -17 -40 -43 -40 -72 c0 -6 1 -13 2 -20c4 -15 13 -25 24 -32zM101 -97c14 -4 28 -5 42 -5c37 0 75 12 107 33c-26 23 -51 46 -77 70l-78 -81l-12 -12c6 -2 12 -3 18 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0D9.xml b/data/Petaluma/E0D9.xml
new file mode 100644
index 00000000000..28267874a43
--- /dev/null
+++ b/data/Petaluma/E0D9.xml
@@ -0,0 +1 @@
+<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 -144c-30 16 -50 44 -76 65c-25 20 -46 44 -70 65c-8 7 -12 13 -12 19s3 11 10 18c37 37 72 76 108 113c5 5 8 12 17 12c7 0 12 -4 16 -9c46 -48 92 -97 138 -146c4 -4 6 -8 6 -12c0 -5 -3 -9 -7 -13c-35 -36 -70 -72 -105 -109c-4 -5 -8 -7 -13 -7c-3 0 -7 2 -12 4z M145 -109c13 -7 25 22 39 33c8 7 15 16 23 24c12 11 18 23 17 34c-1 56 -32 90 -64 124c-2 2 -3 2 -4 2c-3 0 -5 -3 -7 -5c-38 -34 -59 -74 -59 -121c0 -10 1 -20 3 -30c5 -32 30 -48 52 -61z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DA.xml b/data/Petaluma/E0DA.xml
new file mode 100644
index 00000000000..3808ca73ee5
--- /dev/null
+++ b/data/Petaluma/E0DA.xml
@@ -0,0 +1 @@
+<symbol id="E0DA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 -143c-78 43 -155 86 -233 128c-4 2 -7 4 -10 7c-9 6 -13 11 -13 16c0 4 5 9 15 14c62 36 125 71 188 106c11 6 22 12 33 19c8 -4 14 -6 20 -9c72 -38 143 -75 214 -113c6 -3 12 -8 17 -13c8 -7 12 -13 12 -18c0 -6 -5 -11 -16 -18c-66 -39 -131 -78 -196 -118 c-6 -4 -11 -5 -16 -5s-10 1 -15 4zM227 -108c7 -3 13 -5 18 -5c6 -1 12 1 18 6c21 15 44 30 67 42c28 15 34 40 38 65c0 21 -16 55 -30 69c-24 22 -46 33 -67 33c-22 0 -44 -12 -69 -36c-20 -20 -33 -52 -33 -84c0 -35 16 -71 58 -90z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DB.xml b/data/Petaluma/E0DB.xml
new file mode 100644
index 00000000000..b1d67b026b8
--- /dev/null
+++ b/data/Petaluma/E0DB.xml
@@ -0,0 +1 @@
+<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M185 -146c-7 4 -17 7 -24 13l-155 129c-4 4 -6 7 -6 10c0 4 3 7 7 11c45 40 91 81 135 123c5 5 10 6 14 6c7 0 13 -4 19 -10c36 -37 71 -74 106 -111c2 -2 3 -4 5 -5c16 -18 24 -27 24 -36s-9 -18 -28 -37c-27 -27 -53 -55 -81 -82c-4 -4 -8 -10 -16 -11z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DC.xml b/data/Petaluma/E0DC.xml
new file mode 100644
index 00000000000..66c41fe294f
--- /dev/null
+++ b/data/Petaluma/E0DC.xml
@@ -0,0 +1 @@
+<symbol id="E0DC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M339 -132c-20 3 -37 8 -53 14c-86 36 -172 71 -258 106c-6 3 -13 5 -19 9c-6 3 -9 6 -9 9s3 6 9 8c98 40 196 79 294 118c4 1 7 2 11 2c7 0 14 -2 21 -5l285 -114c6 -2 11 -5 17 -9c7 -4 10 -8 10 -12s-3 -7 -12 -10l-280 -111c-6 -2 -12 -7 -16 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DD.xml b/data/Petaluma/E0DD.xml
new file mode 100644
index 00000000000..560c82c0c65
--- /dev/null
+++ b/data/Petaluma/E0DD.xml
@@ -0,0 +1 @@
+<symbol id="E0DD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 -123c-4 -4 -9 -6 -16 -6c-12 0 -28 7 -38 18c-22 26 -44 52 -67 78c-6 8 -12 15 -18 22c-10 11 -16 16 -16 21c0 6 6 11 17 22l91 85c6 5 11 12 16 11c19 -1 32 -7 42 -19c30 -35 59 -70 90 -105c4 -5 6 -9 6 -13c0 -5 -2 -9 -7 -14c-34 -33 -67 -66 -100 -100z M135 -84l75 78c3 3 5 7 8 11c-2 3 -3 5 -5 7l-63 72c-2 3 -5 4 -7 4c-3 0 -6 -1 -9 -4c-27 -27 -55 -53 -84 -79c-3 -3 -5 -6 -5 -8c0 -3 2 -6 5 -9c21 -23 43 -47 63 -71c5 -5 8 -8 11 -8c4 0 7 2 11 7z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0DE.xml b/data/Petaluma/E0DE.xml
new file mode 100644
index 00000000000..845ae53e899
--- /dev/null
+++ b/data/Petaluma/E0DE.xml
@@ -0,0 +1 @@
+<symbol id="E0DE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 -142c-7 2 -20 3 -31 9l-248 135c-6 3 -9 7 -9 10s3 6 9 9l262 120c6 2 11 3 15 3c8 0 15 -2 22 -6c86 -41 172 -82 257 -124c8 -3 20 -7 20 -17c0 -11 -13 -12 -21 -16l-246 -116c-8 -4 -15 -9 -30 -7zM320 -95c67 38 138 69 210 104c-73 36 -144 70 -214 104 c-3 1 -5 2 -9 2c-6 0 -12 -3 -18 -6c-34 -15 -67 -31 -100 -46c-43 -20 -85 -40 -133 -63c59 -32 113 -58 165 -90c19 -11 36 -19 54 -19c14 1 29 5 45 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0F5.xml b/data/Petaluma/E0F5.xml
new file mode 100644
index 00000000000..66207be3985
--- /dev/null
+++ b/data/Petaluma/E0F5.xml
@@ -0,0 +1 @@
+<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M93 -197c-5 0 -9 7 -11 11c-45 66 -76 138 -82 212c1 65 24 115 68 154c7 6 13 17 22 17c4 0 7 -2 11 -4c4 -3 5 -9 5 -16c0 -11 -4 -25 -11 -31c-29 -27 -52 -57 -61 -95c-4 -15 -5 -29 -5 -42c0 -48 20 -92 45 -134c10 -17 22 -31 26 -51l1 -10c0 -4 -1 -7 -5 -9 c-1 -2 -2 -2 -3 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0F6.xml b/data/Petaluma/E0F6.xml
new file mode 100644
index 00000000000..4633884590e
--- /dev/null
+++ b/data/Petaluma/E0F6.xml
@@ -0,0 +1 @@
+<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-12 -196c-3 4 -5 11 -5 17c0 9 3 18 10 25c10 9 22 15 29 26c23 36 36 80 36 123c0 62 -25 123 -80 161c-4 3 -8 18 -8 29c0 7 1 13 4 16c4 3 7 5 10 5c7 0 13 -7 19 -12c44 -37 66 -87 73 -143c2 -13 6 -26 6 -40c0 -3 0 -7 -1 -10c-3 -53 -14 -105 -39 -153 c-6 -12 -14 -24 -25 -31c-9 -6 -21 -23 -29 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E0FA.xml b/data/Petaluma/E0FA.xml
new file mode 100644
index 00000000000..0c75bdbecd1
--- /dev/null
+++ b/data/Petaluma/E0FA.xml
@@ -0,0 +1 @@
+<symbol id="E0FA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M201 -130c-79 5 -139 44 -186 105c-10 14 -15 28 -15 43c0 25 16 49 45 69c39 26 83 36 128 40c20 2 40 3 60 3c65 0 128 -11 189 -42c25 -12 46 -29 58 -54c6 -12 9 -25 9 -37c0 -26 -14 -50 -40 -66c-59 -35 -124 -47 -190 -56c-19 -2 -38 -3 -58 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E101.xml b/data/Petaluma/E101.xml
new file mode 100644
index 00000000000..6b0fa0a884f
--- /dev/null
+++ b/data/Petaluma/E101.xml
@@ -0,0 +1 @@
+<symbol id="E101" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M55 -254c-10 0 -20 1 -31 2c-10 1 -18 4 -22 15c-1 3 -2 5 -2 7c0 6 5 10 9 15c97 120 195 240 292 361c23 28 47 55 68 84c13 16 28 24 46 24c4 0 7 -1 10 -1c18 -3 37 -5 52 -16c7 -5 11 -10 11 -16c0 -4 -2 -8 -6 -13c-68 -74 -128 -154 -191 -232 c-59 -73 -124 -141 -179 -216c-6 -8 -12 -13 -21 -13c-3 0 -6 1 -10 2c-8 -2 -17 -3 -26 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E102.xml b/data/Petaluma/E102.xml
new file mode 100644
index 00000000000..b9bb9977af8
--- /dev/null
+++ b/data/Petaluma/E102.xml
@@ -0,0 +1 @@
+<symbol id="E102" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M443 -254c-78 3 -155 11 -233 18c-43 4 -86 7 -130 10h-19c-4 0 -9 0 -13 -1h-3c-2 0 -4 0 -8 1c-2 1 -4 1 -7 1c-4 0 -7 -1 -11 -1c-6 1 -12 2 -16 12c-1 3 -3 7 -3 10c0 4 2 7 6 12c122 139 244 278 365 419c6 7 15 12 24 16v1c0 8 11 8 16 9c16 2 32 3 47 3 c24 0 47 -2 70 -3c74 -3 147 -5 220 -9c37 -2 75 -2 112 -4c3 2 7 2 11 1c12 -1 19 0 25 -3c1 0 2 0 3 -1c8 0 16 -1 24 -2c5 -1 11 -3 15 -5c8 -4 19 -10 16 -19c0 -2 -2 -4 -3 -5c3 -19 -21 -30 -33 -43c-75 -81 -151 -161 -227 -241c-49 -51 -96 -104 -147 -155 c-4 -4 -7 -7 -12 -9c0 -1 1 -2 0 -3c-2 -5 -8 -3 -13 -4c-25 -3 -50 -7 -76 -5zM434 -217c1 3 4 7 7 11l381 410c-111 5 -221 9 -332 14c0 -5 -4 -10 -9 -15l-115 -130l-156 -174c-27 -31 -53 -62 -81 -92h1c54 -4 108 -10 162 -13c48 -3 95 -6 142 -11z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E103.xml b/data/Petaluma/E103.xml
new file mode 100644
index 00000000000..dbeccf854d3
--- /dev/null
+++ b/data/Petaluma/E103.xml
@@ -0,0 +1 @@
+<symbol id="E103" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 -243c-57 6 -115 6 -172 8c-4 -2 -9 -3 -15 -3c-5 0 -10 1 -15 2c-5 -1 -9 -2 -14 -2c-13 0 -26 5 -39 7c-6 1 -11 3 -14 6c-1 1 -1 2 -2 2c-3 3 -5 6 -5 11v2c0 5 3 7 6 8c1 2 2 4 4 6c121 139 242 277 362 416c13 15 25 21 39 21c5 0 10 0 15 -2l22 3 c12 0 25 1 37 1c66 0 131 -6 197 -6c5 0 10 -1 14 -3c6 -2 14 -5 18 -9l3 -2c8 -4 13 -8 13 -14c0 -3 -2 -7 -7 -13c-46 -53 -90 -106 -136 -160c-44 -52 -89 -105 -133 -158c-31 -35 -60 -72 -91 -107c-10 -11 -24 -9 -37 -9c-17 -2 -34 -3 -50 -5zM272 -202 c112 134 225 268 337 403c-13 -1 -27 -1 -42 -1c-23 0 -53 -1 -83 -5c-1 -2 -3 -4 -5 -7c-50 -56 -99 -113 -149 -170c-44 -50 -88 -100 -133 -150c-19 -23 -39 -45 -59 -68h54c26 0 53 0 80 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E220.xml b/data/Petaluma/E220.xml
new file mode 100644
index 00000000000..da11b267dcf
--- /dev/null
+++ b/data/Petaluma/E220.xml
@@ -0,0 +1 @@
+<symbol id="E220" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-143 -88c-8 0 -11 5 -11 13c0 18 -4 35 -4 53c0 6 1 11 1 16c3 16 9 25 24 29l260 63c4 2 6 2 8 2c7 0 11 -5 15 -14c4 -11 7 -21 6 -39c0 -4 -1 -14 -3 -24c-4 -19 -13 -31 -33 -36c-85 -20 -170 -40 -255 -62c-3 -1 -6 -1 -8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E221.xml b/data/Petaluma/E221.xml
new file mode 100644
index 00000000000..036d685acd8
--- /dev/null
+++ b/data/Petaluma/E221.xml
@@ -0,0 +1 @@
+<symbol id="E221" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-135 3c-9 0 -13 5 -12 17v24v3c-1 56 0 57 55 72c70 18 140 36 210 55c5 2 9 3 12 3c12 -1 16 -8 18 -22l1 -13c0 -17 -4 -33 -9 -48c-3 -12 -12 -19 -25 -23c-80 -21 -160 -44 -241 -67c-3 0 -7 -1 -9 -1zM-133 -177c-7 0 -10 4 -10 15c0 20 -5 39 -5 59 c1 21 10 29 29 33l216 44c9 2 16 3 22 3c15 1 17 -8 17 -35l-1 -10c-1 -49 -8 -56 -56 -66c-68 -13 -135 -26 -203 -41c-4 -2 -7 -2 -9 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E222.xml b/data/Petaluma/E222.xml
new file mode 100644
index 00000000000..152ae79238b
--- /dev/null
+++ b/data/Petaluma/E222.xml
@@ -0,0 +1 @@
+<symbol id="E222" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-132 113l-5 -1c-8 0 -11 7 -9 16c4 22 3 45 8 68c4 16 13 21 26 23l230 33c3 0 6 1 9 1c12 0 19 -6 19 -18c0 -3 0 -6 -1 -9c-2 -18 -8 -36 -15 -53c-5 -11 -15 -19 -28 -21c-75 -13 -150 -25 -226 -38c-2 -1 -5 -1 -8 -1zM-129 -75c-9 0 -12 6 -10 16c1 4 1 8 1 12 c0 6 0 11 -1 16c-2 45 7 54 50 63c66 14 132 29 199 44c5 1 10 2 14 2c14 0 17 -8 17 -32c-3 -13 -7 -31 -13 -48c-5 -13 -16 -20 -31 -24c-73 -15 -146 -31 -219 -48c-3 -1 -5 -1 -7 -1zM-131 -253c-6 0 -10 3 -9 11c0 25 2 50 4 75c1 13 12 17 22 19c77 19 154 37 231 55 c7 2 13 3 17 3c12 0 14 -8 13 -29c-8 -61 -17 -71 -64 -81c-69 -15 -138 -34 -206 -52c-3 -1 -6 -1 -8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E223.xml b/data/Petaluma/E223.xml
new file mode 100644
index 00000000000..f78e638b51a
--- /dev/null
+++ b/data/Petaluma/E223.xml
@@ -0,0 +1 @@
+<symbol id="E223" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-140 179c-11 0 -15 6 -13 22c1 14 -2 29 -2 43c0 10 1 21 8 29c15 20 45 16 68 22l185 42c11 3 19 5 25 5c15 0 19 -7 19 -26c0 -5 -1 -10 -1 -15c-4 -52 -9 -57 -59 -68c-73 -17 -146 -35 -219 -53c-4 0 -8 -1 -11 -1zM-146 6c-4 0 -7 1 -8 9c-2 17 -4 35 -5 48 c0 44 3 47 41 55l229 49c7 2 13 3 17 3c14 0 18 -8 16 -30c0 -15 -3 -30 -6 -45c-4 -15 -14 -25 -29 -28l-248 -60c-3 0 -5 -1 -7 -1zM-135 -171l-5 -1c-11 0 -12 7 -12 13c0 12 -2 25 -2 37c0 10 0 19 1 28c0 18 10 25 26 28l258 42c3 0 5 1 7 1c12 0 18 -7 20 -21 c1 -6 1 -11 1 -16c0 -14 -2 -29 -7 -43c-5 -15 -17 -22 -31 -24zM-145 -342c-5 0 -8 2 -8 10c0 17 -5 34 -5 53c0 6 0 12 2 18c3 13 8 20 20 23c87 18 174 37 262 54h8c10 0 11 -7 11 -16v-6c0 -4 0 -7 3 -10c-6 -51 -8 -70 -60 -78c-76 -12 -150 -30 -225 -47 c-3 -1 -6 -1 -8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E224.xml b/data/Petaluma/E224.xml
new file mode 100644
index 00000000000..e26e2d07878
--- /dev/null
+++ b/data/Petaluma/E224.xml
@@ -0,0 +1 @@
+<symbol id="E224" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-139 292c-13 0 -14 7 -19 31c-3 11 -3 21 -3 29c0 41 2 42 42 48c82 11 164 23 246 36c3 1 6 1 9 1c13 -1 20 -7 22 -22c1 -5 2 -11 2 -17c0 -16 -4 -31 -9 -46c-4 -12 -13 -18 -27 -20c-80 -12 -160 -25 -240 -38c-10 -1 -17 -2 -23 -2zM-138 90c-7 -1 -10 3 -9 13 c1 18 -9 34 -5 50c0 37 0 37 36 45l234 55c7 2 12 3 16 3c11 -1 14 -8 16 -26c2 -19 -3 -37 -7 -54c-3 -13 -13 -22 -27 -25l-246 -60c-3 -1 -6 -1 -8 -1zM-130 -85c-7 1 -11 3 -12 12c-2 18 -3 37 -5 51c1 43 4 46 42 54l235 46c5 2 9 2 13 2c14 0 17 -8 17 -31 c0 -16 -4 -32 -9 -47c-4 -12 -13 -21 -27 -25l-247 -60c-3 -2 -5 -2 -7 -2zM-146 -272c-8 0 -11 6 -11 18c1 15 -2 30 -2 46c0 7 1 14 2 20c2 14 7 21 19 24c86 20 172 40 259 58c2 1 5 1 6 1c12 0 12 -10 12 -20c0 -4 0 -8 1 -11c-1 -51 -15 -67 -63 -79 c-71 -17 -142 -35 -212 -55c-5 -1 -8 -2 -11 -2zM-124 -435l-7 -2c-9 1 -16 5 -14 16c2 18 -4 34 -2 52c2 37 6 42 42 47c74 12 148 23 222 34l10 2c7 0 13 1 18 1c12 0 16 -6 16 -24c0 -4 -1 -9 -1 -16c-1 -6 -2 -19 -6 -32c-4 -16 -13 -27 -30 -30z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E22A.xml b/data/Petaluma/E22A.xml
new file mode 100644
index 00000000000..8e79c70c7bd
--- /dev/null
+++ b/data/Petaluma/E22A.xml
@@ -0,0 +1 @@
+<symbol id="E22A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-74 -123c-28 1 -55 5 -82 14c-9 3 -16 6 -18 18c0 2 -1 3 -1 4c0 9 8 12 13 16l156 120c2 2 6 3 4 8c-25 0 -50 -3 -76 -3c-18 -1 -37 1 -55 6c-10 3 -19 7 -29 9c-15 4 -12 17 -12 26v1c0 8 10 7 16 7l246 18c27 2 51 -9 74 -22c10 -6 15 -13 15 -19 c0 -8 -5 -15 -15 -23c-52 -39 -105 -78 -158 -116l1 -5c25 2 49 2 73 5c5 1 9 1 14 1c22 0 42 -7 62 -15c5 -2 10 -6 14 -10s8 -9 8 -14c0 -12 -11 -11 -18 -11c-70 -5 -140 -9 -210 -14c-8 -1 -15 -1 -22 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E240.xml b/data/Petaluma/E240.xml
new file mode 100644
index 00000000000..f56fca5791d
--- /dev/null
+++ b/data/Petaluma/E240.xml
@@ -0,0 +1 @@
+<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M184 -813c-4 -4 -7 -6 -10 -6s-6 4 -7 12c-1 13 -6 26 -7 39c-1 9 -2 18 -2 26c0 16 4 31 20 44c18 15 28 38 38 60c3 6 4 13 4 20c0 13 -5 27 -6 41c-7 76 -43 140 -91 197c-19 23 -37 48 -56 71c-47 62 -67 132 -67 209v56c0 19 4 35 24 44h5c7 -17 14 -34 14 -52 c0 -11 2 -26 2 -35c1 -46 18 -79 46 -115c24 -30 47 -61 71 -91c54 -68 81 -146 93 -231c4 -26 6 -52 6 -78c0 -39 -5 -78 -17 -117c-11 -36 -35 -66 -60 -94z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E241.xml b/data/Petaluma/E241.xml
new file mode 100644
index 00000000000..b791e6752a2
--- /dev/null
+++ b/data/Petaluma/E241.xml
@@ -0,0 +1 @@
+<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M184 813c25 -28 49 -58 60 -94c12 -39 17 -78 17 -117c0 -26 -2 -52 -6 -78c-12 -85 -39 -163 -93 -231c-24 -30 -47 -61 -71 -91c-28 -36 -49 -75 -50 -121c0 -9 2 -18 2 -29c0 -18 -7 -35 -14 -52h-5c-20 9 -24 25 -24 44v56c0 77 20 147 67 209c19 23 37 48 56 71 c48 57 84 121 91 197c1 14 6 28 6 41c0 7 -1 14 -4 20c-10 22 -20 45 -38 60c-16 13 -20 28 -20 44c0 8 1 17 2 26c1 13 6 26 7 39c1 8 4 12 7 12s6 -2 10 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E242.xml b/data/Petaluma/E242.xml
new file mode 100644
index 00000000000..66c2ce9fd1b
--- /dev/null
+++ b/data/Petaluma/E242.xml
@@ -0,0 +1 @@
+<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 -819c-7 3 -4 10 -4 15c1 100 -41 182 -105 253c-71 78 -126 164 -155 266c-16 54 -24 110 -24 167c0 15 0 28 1 42c0 7 3 14 6 21c2 5 7 7 13 8c0 9 -1 17 -1 25c0 15 9 18 18 21c2 0 3 1 4 1c9 0 9 -11 11 -17c7 -20 6 -42 15 -62c15 -38 44 -64 72 -91 c58 -57 118 -113 149 -191c18 -45 31 -91 35 -140c1 -24 5 -48 4 -69c1 -34 -3 -66 -7 -98c2 -15 2 -29 3 -40c1 -31 -1 -57 -10 -82c-3 -8 -6 -15 -11 -21c-4 -4 -8 -10 -14 -8zM287 -567c5 72 -21 136 -66 193c-34 42 -75 79 -113 117c-19 19 -35 40 -48 62 c11 -34 27 -65 41 -97c30 -70 84 -122 129 -181c23 -29 42 -61 57 -94z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E243.xml b/data/Petaluma/E243.xml
new file mode 100644
index 00000000000..abac4516c61
--- /dev/null
+++ b/data/Petaluma/E243.xml
@@ -0,0 +1 @@
+<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 0c-1 0 -18 3 -21 5c-16 11 -20 44 -20 56v57c0 57 8 113 24 167c29 102 84 188 155 266c64 71 106 153 105 253c0 2 -1 5 -1 8s1 5 5 7h2c5 0 9 -5 12 -8c5 -6 8 -13 11 -21c9 -25 11 -51 10 -82c-1 -11 -1 -25 -3 -40c4 -32 8 -64 7 -98c1 -21 -3 -45 -4 -69 c-4 -49 -17 -95 -35 -140c-31 -78 -91 -134 -149 -191c-28 -27 -57 -53 -72 -91c-9 -20 -8 -42 -15 -62c-2 -6 -2 -17 -11 -17zM60 195c13 22 29 43 48 62c38 38 79 75 113 117c41 52 67 111 67 175c0 6 -1 12 -1 18c-15 -33 -34 -65 -57 -94c-45 -59 -99 -111 -129 -181 c-14 -32 -30 -63 -41 -97z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E244.xml b/data/Petaluma/E244.xml
new file mode 100644
index 00000000000..778a6196aab
--- /dev/null
+++ b/data/Petaluma/E244.xml
@@ -0,0 +1 @@
+<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M224 -849c-8 2 -2 14 -4 21c-2 9 -3 19 -3 28c0 25 6 50 6 75c0 8 0 16 -2 23c-16 78 -50 146 -111 199c-22 19 -45 37 -64 60c-31 37 -41 80 -41 126c0 41 -2 83 -2 125c1 42 -3 83 -3 124c1 13 0 26 0 38c0 39 3 75 0 113c-1 18 2 35 4 52c2 10 11 12 17 14h2 c5 1 5 -8 8 -12c2 -4 6 -10 6 -15c-2 -51 31 -81 68 -103c95 -58 137 -166 136 -276c1 -22 -3 -47 -11 -73c-2 -6 -2 -11 -2 -17c0 -18 7 -37 9 -55c1 -10 2 -20 2 -29c0 -20 -3 -40 -8 -61c-2 -6 -2 -13 -2 -19c0 -12 3 -23 8 -33c21 -50 31 -100 31 -150 c1 -42 -6 -85 -19 -128c-2 -3 -3 -7 -5 -10c-5 -8 -10 -20 -20 -17zM198 -261c1 4 2 9 2 15c0 59 -74 146 -137 173c1 -21 9 -37 21 -52c36 -45 89 -76 114 -136zM191 -456c-7 106 -77 166 -142 232c-2 -13 -4 -26 -4 -37c1 -29 9 -56 32 -81c36 -38 80 -67 114 -114z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E245.xml b/data/Petaluma/E245.xml
new file mode 100644
index 00000000000..3b9ab581080
--- /dev/null
+++ b/data/Petaluma/E245.xml
@@ -0,0 +1 @@
+<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M224 829c10 3 15 -9 20 -17c2 -3 3 -7 5 -10c13 -43 20 -86 19 -128c0 -50 -10 -100 -31 -150c-5 -10 -8 -21 -8 -33c0 -6 0 -13 2 -19c5 -21 8 -41 8 -61c0 -9 -1 -19 -2 -29c-2 -18 -9 -37 -9 -55c0 -6 0 -11 2 -17c8 -26 12 -51 11 -73c1 -110 -41 -218 -136 -276 c-37 -22 -70 -52 -68 -103c0 -5 -4 -11 -6 -15c-3 -4 -3 -13 -8 -12h-2c-6 2 -15 4 -17 14c-2 17 -4 34 -4 52v113c0 12 0 31 -1 44c-6 41 5 76 4 118c0 42 2 84 2 125c0 46 10 89 41 126c19 23 42 41 64 60c61 53 95 121 111 199c2 7 2 15 2 23c0 25 -6 50 -6 75 c0 9 1 19 3 28c2 7 -4 19 4 21zM191 436c-34 -47 -78 -76 -114 -114c-23 -25 -31 -52 -32 -81c0 -11 2 -24 4 -37c65 66 135 126 142 232zM198 241c-25 -60 -78 -91 -114 -136c-12 -15 -20 -31 -21 -52c63 27 137 114 137 173c0 6 -1 11 -2 15z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E246.xml b/data/Petaluma/E246.xml
new file mode 100644
index 00000000000..5d51be61171
--- /dev/null
+++ b/data/Petaluma/E246.xml
@@ -0,0 +1 @@
+<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 -823c-4 2 -5 6 -5 9c0 4 1 9 1 13c-2 99 -30 187 -102 259c-18 18 -38 34 -58 50c-38 31 -58 72 -62 121c-2 20 -3 40 -3 60c0 39 3 79 6 119c3 44 -7 88 -10 133c0 12 -1 23 -1 35v48c0 28 -1 57 -5 84c-4 26 -5 52 -5 77v52c0 21 0 43 -3 65v6c0 8 1 16 3 25 s11 12 18 13c1 1 1 1 2 1c6 0 7 -8 10 -13c9 -19 14 -40 14 -60c0 -17 7 -29 17 -41c28 -33 66 -54 97 -84c36 -35 67 -74 80 -123c5 -22 8 -44 8 -71c0 -9 -1 -18 -1 -27c-2 -5 -2 -11 -2 -16c0 -32 23 -64 27 -99c2 -17 4 -35 4 -53c0 -34 -5 -68 -14 -100 c-5 -16 -10 -32 -10 -49c0 -5 0 -9 1 -14c2 -9 2 -19 2 -28c0 -30 -5 -58 -9 -86c0 -3 -1 -6 -1 -8c0 -11 3 -20 7 -29c18 -51 33 -102 33 -156c0 -34 -5 -67 -18 -97c-4 -9 -11 -19 -21 -16zM199 -61c4 8 6 15 6 22c0 5 -1 10 -4 16c-11 21 -23 43 -42 59 c-38 32 -75 64 -116 98c12 -101 86 -146 156 -195zM207 -285c3 -3 6 -5 9 -5s5 3 8 11c3 10 5 20 5 29c0 31 -18 56 -43 75c-45 35 -91 69 -133 114c1 -41 4 -76 29 -102c40 -42 83 -81 125 -122zM208 -480c1 6 1 12 1 17c0 33 -10 58 -29 79c-37 42 -86 71 -122 121 c-1 -6 -1 -13 -1 -20c0 -28 8 -50 24 -70c36 -46 88 -75 127 -127z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E247.xml b/data/Petaluma/E247.xml
new file mode 100644
index 00000000000..5443bff1a60
--- /dev/null
+++ b/data/Petaluma/E247.xml
@@ -0,0 +1 @@
+<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M242 795c10 3 17 -7 21 -16c13 -30 18 -63 18 -97c0 -54 -15 -105 -33 -156c-4 -9 -7 -18 -7 -29c0 -2 1 -5 1 -8c4 -28 9 -56 9 -86c0 -9 0 -19 -2 -28c-1 -5 -1 -9 -1 -14c0 -17 5 -33 10 -49c9 -32 14 -66 14 -100c0 -18 -2 -36 -4 -53c-4 -35 -27 -67 -27 -99 c0 -5 0 -11 2 -16c0 -9 1 -18 1 -27c0 -27 -3 -49 -8 -71c-13 -49 -44 -88 -80 -123c-31 -30 -69 -51 -97 -84c-10 -12 -17 -24 -17 -41c0 -20 -5 -41 -14 -60c-3 -5 -4 -13 -10 -13c-1 0 -1 0 -2 1c-7 1 -16 4 -18 13s-3 17 -3 25v6c3 22 3 44 3 65v52c0 25 1 51 5 77 c4 27 5 56 5 84v48c0 12 1 23 1 35c3 45 13 89 10 133c-3 40 -6 80 -6 119c0 20 1 40 3 60c4 49 24 90 62 121c20 16 40 32 58 50c72 72 100 160 102 259c0 4 -1 9 -1 13c0 3 1 7 5 9zM207 452c-39 -52 -91 -81 -127 -127c-16 -20 -24 -42 -24 -70c0 -7 0 -14 1 -20 c36 50 85 79 122 121c19 21 29 46 29 79c0 5 0 11 -1 17zM206 257c-42 -41 -85 -80 -125 -122c-25 -26 -28 -61 -29 -102c42 45 88 79 133 114c25 19 43 44 43 75c0 9 -2 19 -5 29c-3 8 -5 11 -8 11s-6 -2 -9 -5zM198 33c-70 -49 -144 -94 -156 -195c41 34 78 66 116 98 c19 16 31 38 42 59c3 6 4 11 4 16c0 7 -2 14 -6 22z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E248.xml b/data/Petaluma/E248.xml
new file mode 100644
index 00000000000..1caa8a73376
--- /dev/null
+++ b/data/Petaluma/E248.xml
@@ -0,0 +1 @@
+<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M207 -804c-7 0 -8 3 -8 9c0 5 2 11 1 16s0 10 0 15c-8 86 -16 173 -63 249c-26 42 -63 76 -98 111c-19 19 -31 39 -31 66c0 29 -2 59 -2 89c0 20 1 38 3 57c4 33 5 67 5 100c0 26 -1 53 -1 79c0 20 1 39 2 59c1 14 2 29 2 43c0 39 -2 76 -2 112c0 33 -11 64 -14 97 c-1 9 -1 19 -1 28c0 29 0 57 1 87c1 25 -1 47 -1 71c0 10 10 20 12 31c3 11 13 11 20 14c1 0 2 1 3 1c5 0 5 -8 8 -13c4 -8 9 -15 9 -25c0 -37 25 -57 50 -78c22 -19 46 -35 67 -55c57 -57 82 -125 82 -201c0 -12 -1 -24 -2 -37c-1 -8 -4 -17 -10 -21c-9 -8 -12 -14 -12 -21 s4 -15 7 -24c10 -32 18 -63 18 -93c0 -29 -7 -57 -22 -86c-2 -2 -2 -4 -2 -6c0 -4 1 -7 2 -10c12 -38 21 -76 21 -114c0 -25 -4 -49 -13 -73c-6 -15 -7 -29 -7 -44c0 -26 6 -52 6 -77c0 -5 -1 -10 -1 -14c-2 -16 -1 -34 -7 -47c-5 -11 -7 -21 -7 -31c0 -14 3 -27 6 -41 c7 -37 13 -74 13 -111c0 -28 -3 -55 -12 -83c0 -2 0 -5 -1 -7c-6 -9 -11 -22 -21 -22zM211 104c1 95 -49 144 -159 226c26 -98 107 -152 159 -226zM188 -51c-20 78 -85 122 -130 186c-1 -7 -2 -13 -2 -19c0 -28 11 -48 32 -66c36 -32 74 -60 100 -101zM194 -275 c-7 80 -78 188 -137 212c-1 -5 -1 -10 -1 -15c0 -30 16 -55 36 -77c33 -39 70 -74 102 -120zM173 -423c-14 77 -82 117 -125 175c13 -79 89 -113 125 -175z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E249.xml b/data/Petaluma/E249.xml
new file mode 100644
index 00000000000..01bdd8ce1ae
--- /dev/null
+++ b/data/Petaluma/E249.xml
@@ -0,0 +1 @@
+<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M207 754c10 0 15 -13 21 -22c1 -2 1 -5 1 -7c9 -28 12 -55 12 -83c0 -37 -6 -74 -13 -111c-3 -14 -6 -27 -6 -41c0 -10 2 -20 7 -31c6 -13 5 -31 7 -47c0 -4 1 -9 1 -14c0 -25 -6 -51 -6 -77c0 -15 1 -29 7 -44c9 -24 13 -48 13 -73c0 -38 -9 -76 -21 -114 c-1 -3 -2 -6 -2 -10c0 -2 0 -4 2 -6c15 -29 22 -57 22 -86c0 -30 -8 -61 -18 -93c-3 -9 -7 -17 -7 -24s3 -13 12 -21c6 -4 9 -13 10 -21c1 -13 2 -25 2 -37c0 -76 -25 -144 -82 -201c-21 -20 -45 -36 -67 -55c-25 -21 -50 -41 -50 -78c0 -10 -5 -17 -9 -25 c-3 -5 -3 -13 -8 -13c-1 0 -2 1 -3 1c-7 3 -29 6 -32 17c-2 13 0 93 0 99c-2 30 0 58 0 87c0 9 0 19 1 28c3 33 14 64 14 97c0 36 2 73 2 112c0 14 -1 29 -2 43c-1 20 -2 39 -2 59c0 26 1 53 1 79c0 33 -1 67 -5 100c-2 19 -3 37 -3 57c0 30 2 60 2 89c0 27 12 47 31 66 c35 35 72 69 98 111c47 76 55 163 63 249c0 5 -1 10 0 15s-1 11 -1 16c0 6 1 9 8 9zM173 373c-36 -62 -112 -96 -125 -175c43 58 111 98 125 175zM194 225c-32 -46 -69 -81 -102 -120c-20 -22 -36 -47 -36 -77c0 -5 0 -10 1 -15c59 24 130 132 137 212zM188 1 c-26 -41 -64 -69 -100 -101c-21 -18 -32 -38 -32 -66c0 -6 1 -12 2 -19c45 64 110 108 130 186zM211 -154c-52 -74 -133 -128 -159 -226c110 82 160 131 159 226z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24A.xml b/data/Petaluma/E24A.xml
new file mode 100644
index 00000000000..2257550d0a7
--- /dev/null
+++ b/data/Petaluma/E24A.xml
@@ -0,0 +1 @@
+<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M218 -827c-12 2 -5 18 -7 27c-2 12 -6 23 -4 36s3 25 3 37c0 88 -48 158 -100 227c-21 27 -43 55 -65 81c-31 36 -35 80 -36 123c-1 60 -2 120 -2 179c0 49 1 98 2 147c1 23 1 45 1 68c0 74 -3 148 -3 222c0 23 0 45 1 67c2 32 -1 64 -6 95c-1 9 -2 18 -2 27v86v62 c0 8 3 15 4 23c3 14 11 17 20 20h3c10 0 9 -12 9 -16c3 -73 55 -110 103 -151c39 -33 78 -68 102 -115c20 -40 31 -82 31 -123c0 -34 -8 -69 -22 -104c-2 -4 -3 -8 -3 -11s1 -6 2 -10c6 -20 8 -40 8 -59c0 -27 -5 -53 -12 -80c-2 -5 -2 -9 -2 -14c0 -13 5 -24 8 -37 c3 -14 4 -28 4 -42c0 -26 -4 -52 -11 -78c-3 -13 -5 -25 -5 -37c0 -13 2 -26 6 -39c5 -15 7 -30 7 -46c0 -14 -2 -29 -7 -43c-4 -11 -5 -22 -5 -32c0 -15 3 -30 5 -45c2 -10 2 -21 2 -31c0 -34 -8 -68 -17 -101c-2 -8 -3 -16 -3 -23c0 -17 5 -33 9 -49 c11 -40 18 -79 18 -119c0 -26 -3 -51 -9 -77c-2 -6 -3 -13 -6 -19c-5 -10 -8 -27 -21 -26zM225 231c2 10 3 18 3 26c0 15 -4 29 -13 50c-33 78 -106 118 -165 177c-3 -46 14 -80 39 -111c40 -50 95 -86 136 -142zM209 71c0 25 -11 47 -23 68c-30 54 -90 79 -126 128 c-3 -31 10 -56 26 -78c34 -47 85 -76 123 -118zM203 -104c3 8 4 14 4 20c0 4 0 8 -2 13c-10 25 -28 43 -47 62c-32 32 -74 55 -103 93c0 -28 14 -50 33 -68c40 -38 85 -69 115 -120zM185 -231c-23 71 -87 106 -137 158c0 -27 9 -46 27 -59c40 -29 78 -61 110 -99zM194 -480 c3 21 8 38 8 55c0 9 -1 17 -5 26c-27 67 -73 117 -133 156c-4 2 -7 4 -10 4c-4 0 -6 -5 -6 -19c0 -23 8 -42 22 -59c42 -52 89 -100 124 -163z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24B.xml b/data/Petaluma/E24B.xml
new file mode 100644
index 00000000000..b3a8109a281
--- /dev/null
+++ b/data/Petaluma/E24B.xml
@@ -0,0 +1 @@
+<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M218 777c13 1 16 -16 21 -26c3 -6 4 -13 6 -19c6 -26 9 -51 9 -77c0 -40 -7 -79 -18 -119c-4 -16 -9 -32 -9 -49c0 -7 1 -15 3 -23c9 -33 17 -67 17 -101c0 -10 0 -21 -2 -31c-2 -15 -5 -30 -5 -45c0 -10 1 -21 5 -32c5 -14 7 -29 7 -43c0 -16 -2 -31 -7 -46 c-4 -13 -6 -26 -6 -39c0 -12 2 -24 5 -37c7 -26 11 -52 11 -78c0 -14 -1 -28 -4 -42c-3 -13 -8 -24 -8 -37c0 -5 0 -9 2 -14c7 -27 12 -53 12 -80c0 -19 -2 -39 -8 -59c-1 -4 -2 -7 -2 -10s1 -7 3 -11c14 -35 22 -70 22 -104c0 -41 -11 -83 -31 -123 c-24 -47 -63 -82 -102 -115c-48 -41 -100 -78 -103 -151c0 -4 1 -16 -9 -16h-3c-9 3 -17 6 -20 20c-1 8 -2 16 -2 24c0 20 -1 42 -1 61c0 29 -1 57 -1 86c0 9 1 18 2 27c5 31 8 63 6 95c-1 22 -1 44 -1 67c0 74 3 148 3 222c0 23 0 45 -1 68c-1 49 -2 98 -2 147 c0 59 1 119 2 179c1 43 5 87 36 123c22 26 44 54 65 81c52 69 100 139 100 227c0 12 -1 24 -3 37s2 24 4 36c2 9 -5 25 7 27zM194 430c-35 -63 -82 -111 -124 -163c-14 -17 -22 -36 -22 -59c0 -14 2 -19 6 -19c3 0 6 2 10 4c60 39 106 89 133 156c4 9 5 17 5 26 c0 17 -5 34 -8 55zM185 181c-32 -38 -70 -70 -110 -99c-18 -13 -27 -32 -27 -59c50 52 114 87 137 158zM203 54c-30 -51 -75 -82 -115 -120c-19 -18 -33 -40 -33 -68c29 38 71 61 103 93c19 19 37 37 47 62c2 5 2 9 2 13c0 6 -1 12 -4 20zM209 -121 c-38 -42 -89 -71 -123 -118c-16 -22 -29 -47 -26 -78c36 49 96 74 126 128c12 21 23 43 23 68zM225 -281c-41 -56 -96 -92 -136 -142c-25 -31 -42 -65 -39 -111c59 59 132 99 165 177c9 21 13 35 13 50c0 8 -1 16 -3 26z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24C.xml b/data/Petaluma/E24C.xml
new file mode 100644
index 00000000000..22df236bb97
--- /dev/null
+++ b/data/Petaluma/E24C.xml
@@ -0,0 +1 @@
+<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M211 -842c-5 3 -4 8 -4 13c-1 12 -2 23 -2 35c0 22 3 44 10 66c4 11 6 22 6 33c0 29 -13 56 -27 83c-28 56 -71 100 -113 144s-67 94 -67 156c0 73 -12 144 -17 215c-1 26 -3 53 -3 79c0 27 2 53 6 79c1 9 1 18 1 26c-1 54 -4 108 -4 162c0 22 1 44 2 66c3 39 3 77 3 116 c0 61 -2 123 -2 185c0 38 2 75 2 114c0 27 -2 53 -2 80c0 9 1 18 1 27c0 13 2 27 6 40c2 9 11 14 19 14c5 0 10 -2 12 -7c35 -70 106 -100 159 -150c25 -23 49 -45 66 -75c14 -27 21 -53 21 -79c0 -35 -12 -68 -38 -99c-2 -3 -3 -5 -3 -7c0 -4 5 -7 7 -11 c12 -27 20 -54 20 -81c0 -16 -3 -33 -10 -50c-3 -6 -5 -12 -9 -17c-5 -9 -13 -17 -23 -16c-8 1 -9 6 -9 12c0 38 -22 66 -43 93c-30 38 -66 70 -96 116c4 -85 47 -144 95 -199c41 -47 79 -94 88 -158c4 -26 7 -51 7 -76c0 -23 -3 -46 -9 -68c-4 -15 -6 -30 -6 -45 c0 -6 0 -13 1 -19c2 -26 -4 -50 -13 -72c-3 -8 -5 -15 -5 -22c0 -5 1 -11 3 -17c8 -21 11 -42 11 -64c0 -25 -4 -50 -10 -75c-1 -5 -2 -10 -2 -14c0 -6 1 -11 3 -16c15 -38 23 -75 23 -113c0 -35 -7 -69 -22 -104c-2 -3 -2 -6 -2 -9c0 -4 1 -8 3 -12c8 -25 13 -51 16 -77 c2 -13 3 -26 3 -39c0 -48 -11 -94 -27 -140c-3 -7 -6 -13 -11 -18c-5 -4 -10 -8 -15 -5zM231 496c-4 97 -80 139 -145 189c31 -77 92 -129 145 -189zM217 94c-25 89 -106 138 -145 214c-1 -41 2 -80 33 -110c31 -31 62 -63 93 -93c4 -5 8 -12 19 -11zM202 -81 c-24 83 -100 124 -152 185c24 -83 103 -121 152 -185zM206 -260c-25 93 -110 136 -163 205c0 -33 6 -62 30 -86c42 -42 87 -80 133 -119zM218 -494c3 51 -13 95 -51 131c-36 34 -72 67 -110 103c-3 -42 23 -66 44 -93c38 -47 87 -86 117 -141z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24D.xml b/data/Petaluma/E24D.xml
new file mode 100644
index 00000000000..f22c732dcbe
--- /dev/null
+++ b/data/Petaluma/E24D.xml
@@ -0,0 +1 @@
+<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M211 794c5 3 10 -1 15 -5c5 -5 8 -11 11 -18c16 -46 27 -92 27 -140c0 -13 -1 -26 -3 -39c-3 -26 -8 -52 -16 -77c-2 -4 -3 -8 -3 -12c0 -3 0 -6 2 -9c15 -35 22 -69 22 -104c0 -38 -8 -75 -23 -113c-2 -5 -3 -10 -3 -16c0 -4 1 -9 2 -14c6 -25 10 -50 10 -75 c0 -22 -3 -43 -11 -64c-2 -6 -3 -12 -3 -17c0 -7 2 -14 5 -22c9 -22 15 -46 13 -72c-1 -6 -1 -13 -1 -19c0 -15 2 -30 6 -45c6 -22 9 -45 9 -68c0 -25 -3 -50 -7 -76c-9 -64 -47 -111 -88 -158c-48 -55 -91 -114 -95 -199c30 46 66 78 96 116c21 27 43 55 43 93 c0 6 1 11 9 12c10 1 18 -7 23 -16c4 -5 6 -11 9 -17c7 -17 10 -34 10 -50c0 -27 -8 -54 -20 -81c-2 -4 -7 -7 -7 -11c0 -2 1 -4 3 -7c26 -31 38 -64 38 -99c0 -26 -7 -52 -21 -79c-17 -30 -41 -52 -66 -75c-53 -50 -124 -80 -159 -150c-2 -5 -7 -7 -12 -7c-8 0 -17 5 -19 14 c-4 13 -6 27 -6 40c0 9 -1 18 -1 27c0 27 2 53 2 80c0 39 -2 76 -2 114c0 62 2 124 2 185c0 39 0 77 -3 116c-1 22 -2 44 -2 66c0 54 3 108 4 162c0 8 0 17 -1 26c-4 26 -6 52 -6 79c0 26 2 53 3 79c5 71 17 142 17 215c0 62 25 112 67 156s85 88 113 144c14 27 27 54 27 83 c0 11 -2 22 -6 33c-7 22 -10 44 -10 66c0 12 1 23 2 35c0 5 -1 10 4 13zM218 446c-30 -55 -79 -94 -117 -141c-21 -27 -47 -51 -44 -93c38 36 74 69 110 103c38 36 54 80 51 131zM206 212c-46 -39 -91 -77 -133 -119c-24 -24 -30 -53 -30 -86c53 69 138 112 163 205zM202 33 c-49 -64 -128 -102 -152 -185c52 61 128 102 152 185zM217 -142c-11 1 -15 -6 -19 -11c-31 -30 -62 -62 -93 -93c-31 -30 -34 -69 -33 -110c39 76 120 125 145 214zM231 -544c-53 -60 -114 -112 -145 -189c65 50 141 92 145 189z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24E.xml b/data/Petaluma/E24E.xml
new file mode 100644
index 00000000000..435b410f5aa
--- /dev/null
+++ b/data/Petaluma/E24E.xml
@@ -0,0 +1 @@
+<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 -822c-5 2 -6 7 -6 14c0 36 3 72 8 109c1 7 2 15 2 22c0 52 -29 92 -70 128c-58 50 -108 109 -122 185c-9 46 -16 93 -16 140c0 11 0 22 1 34c2 25 2 49 2 74v87c0 14 0 28 1 42c3 79 9 158 9 237c-1 72 -9 144 -12 217c-2 27 2 54 7 81c1 7 1 13 1 20v4 c0 4 0 7 -1 11c-6 34 -8 67 -8 100s2 66 3 99c2 46 3 92 3 137c0 31 0 61 -2 92c-1 19 4 38 10 56c4 10 13 11 21 13h2c6 0 7 -7 7 -11c6 -65 54 -97 100 -130c54 -39 95 -87 108 -155c4 -20 6 -40 9 -61c0 -23 -5 -45 -16 -64c-4 -8 -6 -16 -6 -23c0 -8 2 -16 7 -25 c14 -32 21 -65 21 -98c0 -28 -5 -56 -15 -83c-3 -5 -4 -10 -4 -15c1 -13 6 -24 8 -36c2 -8 2 -17 2 -25c0 -23 -4 -45 -9 -67c-2 -7 -3 -15 -3 -22c1 -11 3 -21 7 -32c15 -34 22 -70 22 -105c0 -33 -6 -67 -17 -100c-7 -20 -13 -39 -13 -61c0 -5 0 -10 1 -15 c1 -7 2 -13 2 -20c0 -15 -3 -30 -7 -44c-2 -7 -3 -13 -3 -20c0 -11 3 -21 8 -33c12 -25 22 -52 22 -80c0 -15 -2 -30 -9 -46c-1 -3 -1 -7 -3 -9c-10 -10 -14 -21 -14 -32c0 -14 6 -28 11 -43c6 -19 9 -39 9 -58c0 -30 -8 -59 -23 -86c-2 -3 -3 -5 -3 -7c0 -5 2 -9 3 -13 c11 -35 15 -69 15 -104c0 -36 -4 -71 -11 -107c-4 -22 -9 -42 -21 -60c-4 -7 -9 -16 -18 -12zM198 676c-7 99 -80 147 -154 200c11 -102 93 -142 154 -200zM205 478c-17 99 -107 138 -163 204c2 -32 14 -60 34 -84c37 -46 88 -77 129 -120zM204 304 c-21 89 -107 122 -158 185c17 -92 102 -126 158 -185zM213 46c8 118 -70 174 -147 236c25 -95 101 -152 147 -236zM187 -87c-24 83 -94 132 -132 202c0 -87 48 -148 132 -202zM215 -310c-11 45 -31 82 -66 112c-33 28 -68 53 -94 87c22 -91 88 -147 160 -199zM208 -483 c-7 22 -12 45 -30 62c-42 40 -90 72 -123 121c27 -81 98 -125 153 -183z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E24F.xml b/data/Petaluma/E24F.xml
new file mode 100644
index 00000000000..2804cc51c58
--- /dev/null
+++ b/data/Petaluma/E24F.xml
@@ -0,0 +1 @@
+<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M31 -1200h-2c-8 2 -17 3 -21 13c-6 18 -11 37 -10 56c2 31 2 61 2 92c0 45 -1 91 -3 137c-1 33 -3 66 -3 99s2 66 8 100c1 4 1 7 1 11v4c0 7 0 13 -1 20c-5 27 -9 54 -7 81c3 73 11 145 12 217c0 79 -6 158 -9 237c-1 14 -1 28 -1 42v87c0 25 0 49 -2 74 c-1 12 -1 23 -1 34c0 47 7 94 16 140c14 76 64 135 122 185c41 36 70 76 70 128c0 7 -1 15 -2 22c-5 37 -8 73 -8 109c0 7 1 12 6 14c2 1 3 1 4 1c7 0 11 -7 14 -13c12 -18 17 -38 21 -60c7 -36 11 -71 11 -107c0 -35 -4 -69 -15 -104c-1 -4 -3 -8 -3 -13c0 -2 1 -4 3 -7 c15 -27 23 -56 23 -86c0 -19 -3 -39 -9 -58c-5 -15 -11 -29 -11 -43c0 -11 4 -22 14 -32c2 -2 2 -6 3 -9c7 -16 9 -31 9 -46c0 -28 -10 -55 -22 -80c-5 -12 -8 -22 -8 -33c0 -7 1 -13 3 -20c4 -14 7 -29 7 -44c0 -7 -1 -13 -2 -20c-1 -5 -1 -10 -1 -15c0 -22 6 -41 13 -61 c11 -33 17 -67 17 -100c0 -35 -7 -71 -22 -105c-4 -11 -6 -21 -7 -32c0 -7 1 -15 3 -22c5 -22 9 -44 9 -67c0 -8 0 -17 -2 -25c-2 -12 -7 -23 -8 -36c0 -5 1 -10 4 -15c10 -27 15 -55 15 -83c0 -33 -7 -66 -21 -98c-5 -9 -7 -17 -7 -25c0 -7 2 -15 6 -23 c11 -19 16 -41 16 -64c-3 -21 -5 -41 -9 -61c-13 -68 -54 -116 -108 -155c-46 -33 -94 -65 -100 -130c0 -4 -1 -11 -7 -11zM55 180c33 49 81 81 123 121c18 17 23 40 30 62c-55 -58 -126 -102 -153 -183zM55 -9c26 34 61 59 94 87c35 30 55 67 66 112 c-72 -52 -138 -108 -160 -199zM55 -235c38 70 108 119 132 202c-84 -54 -132 -115 -132 -202zM66 -402c77 62 155 118 147 236c-46 -84 -122 -141 -147 -236zM46 -609c51 63 137 96 158 185c-56 -59 -141 -93 -158 -185zM42 -802c56 66 146 105 163 204 c-41 -43 -92 -74 -129 -120c-20 -24 -32 -52 -34 -84zM44 -996c74 53 147 101 154 200c-61 -58 -143 -98 -154 -200z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E260.xml b/data/Petaluma/E260.xml
new file mode 100644
index 00000000000..3265cab36b6
--- /dev/null
+++ b/data/Petaluma/E260.xml
@@ -0,0 +1 @@
+<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M20 -208c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c0 85 14 168 17 253c2 59 5 118 5 177v31c-1 28 2 57 3 85c0 14 8 23 19 24h1c10 0 10 -13 12 -20c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -4 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5 c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM47 -73c45 32 87 66 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66c-3 -28 -4 -55 -6 -81z "/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E261.xml b/data/Petaluma/E261.xml
new file mode 100644
index 00000000000..53eed12ef0e
--- /dev/null
+++ b/data/Petaluma/E261.xml
@@ -0,0 +1 @@
+<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M177 -456c-13 0 -10 16 -13 26c-7 24 -9 48 -9 72c0 36 5 73 5 109v95l-5 -1l-121 -18c-4 -1 -7 -1 -10 -1c-12 0 -19 5 -19 22c0 19 -3 39 -3 59c-1 29 -2 58 -2 88c0 35 1 70 2 105c3 101 11 201 10 302c0 20 -6 50 27 60c7 -16 10 -32 10 -49c1 -19 1 -37 1 -56 c0 -57 -3 -115 -6 -172c49 4 98 9 145 22c21 5 17 -17 22 -27c4 -9 2 -21 2 -24l-1 -18v-6l-1 -12v-3c-1 -13 -3 -28 -3 -28c-2 -67 -5 -134 -7 -201c0 -32 2 -64 2 -96c-2 -70 -3 -139 -5 -208c0 -6 -2 -11 -3 -17c-4 -9 -7 -23 -18 -23zM40 -44v-12c40 5 81 12 121 23 c0 26 2 53 3 79l3 30l-6 -1c-34 -1 -68 -3 -102 -6c-7 -1 -14 0 -20 0l-1 -13c-1 -33 1 -66 2 -100z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E262.xml b/data/Petaluma/E262.xml
new file mode 100644
index 00000000000..5a18ee278b3
--- /dev/null
+++ b/data/Petaluma/E262.xml
@@ -0,0 +1 @@
+<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M140 -384c-9 0 -7 12 -9 19c-12 34 -16 68 -16 103c0 14 0 27 1 40c-36 -8 -72 -15 -108 -23c-4 -1 -7 -2 -9 -2c-8 1 -11 6 -11 17c-1 23 -10 45 -10 69s12 32 33 37c37 9 74 16 111 23c2 16 4 32 5 49l3 90c-32 -6 -64 -11 -97 -16c-4 -1 -7 -2 -10 -2 c-13 1 -18 7 -16 26c1 12 -7 25 -4 36c0 45 6 51 47 58c28 5 56 9 84 15c1 31 2 62 4 94c0 16 -3 35 19 46c8 -15 8 -29 9 -44c2 -30 3 -60 3 -90l53 12c-1 58 -3 116 -3 175v19c1 11 11 14 19 16h3h1c6 0 5 -9 7 -14c9 -43 11 -87 13 -130l3 -54c32 9 63 19 94 32 c4 2 8 2 11 2h2c6 0 9 -5 13 -15s5 -21 5 -31c0 -18 -5 -35 -9 -53c-4 -16 -17 -24 -32 -29c-27 -9 -54 -17 -82 -24c0 -32 -1 -64 -2 -96c-1 -15 -1 -30 -2 -44l17 3c24 4 49 9 72 15c4 1 7 1 11 1h2c11 0 16 -9 17 -22c1 -10 0 -19 0 -32c-4 -53 -11 -61 -66 -72l-58 -12 c1 -24 3 -49 3 -73c0 -8 0 -16 -1 -25c0 -12 -1 -25 -8 -36c-3 -5 -5 -12 -11 -11c-6 0 -10 6 -11 11c-14 40 -22 81 -24 123l-44 -9c-1 -20 -3 -40 -5 -60c-1 -7 -1 -16 -1 -23c0 -11 1 -21 1 -32c0 -12 -1 -25 -5 -38c-2 -7 -4 -18 -12 -19zM167 -92l42 9 c3 46 5 92 10 138c-16 -4 -32 -7 -49 -10c0 -24 0 -47 -1 -71c-1 -22 -1 -44 -2 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E263.xml b/data/Petaluma/E263.xml
new file mode 100644
index 00000000000..516333674a0
--- /dev/null
+++ b/data/Petaluma/E263.xml
@@ -0,0 +1 @@
+<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M58 -159c-5 0 -10 3 -15 10c-10 15 -25 27 -35 42c-6 7 -8 14 -8 21s4 15 10 21c21 22 43 43 64 63c-6 5 -12 9 -18 13c-17 11 -28 53 -28 84c0 12 2 22 5 29c4 6 10 5 14 8c3 2 5 2 7 2c3 0 6 -1 10 -4c28 -18 56 -38 83 -58c14 17 28 33 43 49c8 9 18 17 28 25 c10 9 18 13 25 13s14 -6 22 -20c11 -17 19 -36 22 -51c0 -14 -2 -21 -8 -25c-19 -16 -36 -34 -53 -53l36 -29c16 -13 23 -29 24 -52c-4 -16 -1 -36 -11 -53c-5 -9 -11 -15 -18 -15c-5 0 -10 3 -16 8c-26 22 -53 44 -80 65c-7 -7 -14 -14 -22 -21c-23 -20 -43 -42 -65 -63 c-6 -6 -11 -9 -16 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E264.xml b/data/Petaluma/E264.xml
new file mode 100644
index 00000000000..4ed049fcb82
--- /dev/null
+++ b/data/Petaluma/E264.xml
@@ -0,0 +1 @@
+<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 -220c-3 0 -6 0 -9 2c-11 4 -10 14 -13 24c-6 26 -8 51 -8 77c0 54 9 109 10 163c1 75 8 150 8 225c0 29 -1 57 -4 86c-1 5 -1 11 -1 16c0 10 1 20 3 30c2 12 12 14 21 16h2c8 0 7 -9 10 -15c5 -11 7 -24 7 -37c1 -49 4 -99 4 -148c0 -20 -1 -40 -2 -60 c0 -3 1 -6 1 -11c19 9 38 17 55 17c20 0 39 -9 58 -35v39c0 41 -1 81 -1 121c0 37 1 73 5 109c2 11 4 22 7 33c2 10 13 13 20 14h1c8 0 5 -10 8 -15c5 -12 3 -25 3 -38v-203h1c6 0 9 6 14 9c17 13 35 20 54 20c9 0 19 -2 29 -6c38 -16 46 -54 46 -93c0 -45 -12 -87 -36 -125 c-34 -54 -67 -108 -114 -153c-7 -7 -12 -17 -29 -13c-14 4 -13 9 -14 18c-3 21 -4 41 -4 62c0 16 1 32 2 49c-17 -29 -35 -59 -53 -87s-36 -57 -61 -80c-6 -6 -12 -11 -20 -11zM209 -50c37 40 67 84 97 129c2 3 3 6 3 9c0 4 -3 8 -7 11c-11 10 -23 16 -36 16 c-7 0 -15 -2 -22 -5c-21 -9 -33 -26 -34 -50v-55c0 -18 0 -36 -1 -55zM52 -102c35 36 57 81 81 125c1 1 1 3 1 5c0 3 -1 6 -2 8c-11 12 -24 22 -40 22c-3 0 -6 0 -10 -1c-18 -4 -31 -14 -31 -36c1 -41 1 -81 1 -123z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E265.xml b/data/Petaluma/E265.xml
new file mode 100644
index 00000000000..da08f86562c
--- /dev/null
+++ b/data/Petaluma/E265.xml
@@ -0,0 +1 @@
+<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M122 -347h-1c-12 0 -7 18 -10 28c-7 31 -8 63 -7 95c-25 -7 -51 -13 -76 -20c-9 -2 -15 -4 -19 -4c-10 1 -10 8 -10 30c-2 5 -2 12 -2 19c0 12 1 25 2 38c1 14 8 22 21 25c30 6 59 13 88 21c1 38 3 75 6 113c-43 -9 -87 -17 -130 -26c-3 -1 -6 -1 -8 -1 c-11 0 -16 8 -15 22c1 6 0 13 0 19v2c-1 10 -1 18 -1 25c0 35 11 42 58 49c34 5 67 12 100 19c0 51 -2 101 -4 152c0 8 1 16 2 24c2 10 12 13 20 16c1 0 2 1 2 1c6 -1 6 -10 9 -14c9 -19 10 -40 10 -61c1 -18 1 -36 1 -54c0 -19 0 -37 -1 -55c25 6 49 11 73 17v54 c-1 34 -7 67 -5 100c0 15 3 29 4 43s11 16 19 17c1 1 2 1 2 1c8 0 8 -10 10 -16c4 -14 4 -29 4 -44c0 -16 0 -31 1 -46c2 -33 4 -66 4 -99c22 5 44 11 67 15c7 3 14 3 19 3c18 0 26 -9 26 -30c0 -4 -1 -8 -1 -12c-7 -54 -14 -64 -66 -78c-16 -4 -32 -7 -48 -11l-3 -102 c20 5 41 11 62 17c7 1 13 2 18 2c18 1 24 -12 22 -37c-8 -62 -20 -74 -69 -85c-13 -3 -26 -7 -38 -10c-2 -32 -3 -65 -5 -97c-1 -18 -5 -37 -27 -48c-6 25 -7 50 -7 75v32c0 10 1 19 1 29l-72 -18c-2 -32 -3 -64 -5 -96v-8c-4 -12 -7 -31 -21 -31zM408 -235 c-13 1 -12 14 -15 23c-2 5 -6 10 -8 15c-5 14 -10 27 -10 40c0 15 5 29 19 44c17 18 32 37 48 56c-11 9 -21 19 -30 29c-15 16 -11 39 -18 58c-5 12 -1 27 -2 40v2c0 14 14 14 22 19c1 1 3 1 4 1c5 0 8 -7 10 -12c11 -20 28 -35 46 -48c8 -6 16 -11 23 -17 c17 21 33 41 51 61c11 12 23 32 39 26c17 -6 19 -29 21 -47c1 -5 0 -10 0 -15c1 -3 1 -6 1 -9c0 -16 -8 -29 -19 -42c-7 -9 -14 -18 -21 -26c11 -8 22 -15 34 -21c21 -11 26 -30 26 -50c0 -4 -1 -9 -1 -14c0 -17 1 -34 -12 -47c-5 -5 -9 -8 -14 -8c-4 0 -7 1 -11 4 c-26 22 -54 42 -81 62c-26 -35 -52 -70 -78 -104c-7 -9 -11 -22 -24 -20zM154 -103c23 7 46 13 69 20c1 34 3 69 4 104c-23 -6 -46 -10 -70 -15c0 -36 -2 -73 -3 -109z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E266.xml b/data/Petaluma/E266.xml
new file mode 100644
index 00000000000..7bfdf2ff66e
--- /dev/null
+++ b/data/Petaluma/E266.xml
@@ -0,0 +1 @@
+<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M408 -205c-7 3 -6 10 -5 17c0 2 0 3 -1 4c-13 53 -13 108 -13 162v30c-3 -12 -8 -24 -13 -36c-29 -60 -78 -104 -125 -151c-3 -3 -8 -6 -12 -6c-1 0 -1 1 -1 1s0 -1 -1 -1c-2 -3 -7 -8 -11 -7c-4 0 -5 6 -7 11c-9 37 -12 74 -13 112c-3 118 -5 236 -5 354 c0 50 5 99 8 149c0 13 8 23 19 23c12 0 14 -14 15 -24c2 -16 1 -32 1 -48c-4 -50 -5 -99 -5 -148c0 -34 0 -69 1 -103v-5c3 2 7 4 11 6c18 7 36 14 55 17c4 1 8 1 11 1c23 0 40 -16 52 -35c9 -13 15 -27 19 -40v78c0 86 1 172 4 258c1 14 2 28 17 28c16 0 17 -17 17 -29 v-240h1v-24c4 3 10 5 16 7c18 5 36 10 54 10c20 0 39 -6 57 -22c27 -24 35 -55 35 -88c0 -7 0 -16 -1 -24c-12 -94 -68 -158 -140 -213l-7 -6c-11 -7 -21 -24 -33 -18zM44 -200c-4 0 -8 3 -9 11v2c-2 -2 -4 -3 -7 -3c-9 1 -7 11 -10 19c-22 59 -12 121 -17 182 c0 56 -1 112 -1 168c0 28 0 56 1 83c2 43 1 86 7 129c2 14 11 21 21 23c1 -1 1 -1 2 -1c9 0 8 -12 11 -19c4 -9 6 -19 6 -30c0 -7 -1 -16 -2 -24c-3 -55 -4 -110 -4 -165v-51c16 7 32 14 48 18c13 3 24 5 34 5c48 0 69 -33 69 -87c0 -94 -52 -164 -111 -228 c-8 -10 -17 -19 -27 -27c-4 -3 -8 -5 -11 -5zM429 -94c3 3 7 6 11 8c37 26 67 59 92 97c3 4 5 8 5 12c0 5 -3 9 -8 14c-16 16 -34 24 -53 24c-14 1 -28 -3 -43 -11l-7 -3c1 -24 1 -48 1 -73c0 -22 1 -45 2 -68zM243 28l3 -104c8 9 17 18 26 27c21 21 37 44 55 65 c5 5 7 10 7 13c0 7 -7 10 -15 14c-6 3 -13 4 -19 4c-17 1 -33 -10 -49 -16zM47 -91c32 32 63 66 86 106c3 6 5 10 5 14c0 7 -6 11 -19 11c-28 1 -52 -6 -74 -21c0 -1 -1 -1 -1 -1c1 -14 1 -29 2 -44c1 -22 1 -43 1 -65z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E267.xml b/data/Petaluma/E267.xml
new file mode 100644
index 00000000000..8b660810232
--- /dev/null
+++ b/data/Petaluma/E267.xml
@@ -0,0 +1 @@
+<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M250 -198c-3 2 -4 4 -4 7c0 4 2 9 3 13c1 3 1 7 2 12c-4 14 -4 29 -4 43c0 96 1 190 8 284c5 84 2 168 4 252c0 6 0 11 1 17c0 12 11 16 19 18h3c8 0 6 -11 8 -15c9 -27 11 -56 11 -85c0 -11 -1 -22 -1 -34c-1 -64 -3 -128 -6 -192c26 29 65 46 99 57c6 2 14 3 21 3 c41 3 60 -17 60 -79c0 -8 0 -17 -1 -27c-9 -69 -57 -145 -126 -209c-24 -21 -49 -41 -76 -59c-6 -4 -13 -12 -21 -6zM157 -341c-5 2 -4 8 -5 13c-3 22 -4 44 -4 66c0 28 1 56 2 84v11c-5 -3 -11 -5 -18 -8c-28 -9 -56 -20 -84 -31c-4 -2 -8 -2 -11 -2c-10 0 -18 3 -22 1 c-8 39 -9 76 -10 113c-2 74 -5 146 -5 219c0 46 1 92 4 138c3 33 7 65 10 98c2 12 10 19 21 19c0 1 1 1 1 1c10 0 8 -12 11 -18c4 -9 5 -17 5 -26c0 -15 -4 -30 -6 -45c-4 -49 -7 -98 -8 -146c2 0 5 1 8 2c33 7 66 18 97 33c9 5 30 17 40 17c13 0 13 -15 13 -23v-113h2 c-4 -112 -7 -225 -12 -337c-1 -20 -2 -42 -16 -59c-3 -4 -7 -10 -13 -7zM44 -100h1c36 8 69 24 103 36l5 2c1 51 3 103 4 155c-7 -9 -17 -17 -29 -22c-29 -13 -59 -22 -89 -32c1 -16 1 -32 2 -48c2 -31 3 -61 3 -91zM288 -89c2 2 5 4 8 6c47 28 80 70 113 113 c5 7 12 14 12 23c0 4 -1 7 -3 11c-9 14 -23 17 -38 15c-34 -6 -62 -23 -85 -49l-5 -6c-1 -37 0 -75 -2 -113z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E268.xml b/data/Petaluma/E268.xml
new file mode 100644
index 00000000000..d10d33468bd
--- /dev/null
+++ b/data/Petaluma/E268.xml
@@ -0,0 +1 @@
+<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M314 -370c-11 0 -11 12 -11 22c0 38 -2 77 -2 115v17c-16 -3 -32 -7 -48 -10c-13 -3 -21 -5 -27 -5c-12 0 -13 9 -15 35c0 7 -1 13 -2 16c2 54 7 59 56 70c12 2 24 5 36 7c0 42 -1 83 -1 125l-66 -12c-12 -3 -25 -4 -37 -8c-2 -1 -4 -1 -6 -1c-8 0 -11 7 -10 14 c1 5 1 9 1 14c0 12 -1 24 -1 35c0 6 0 12 1 18c3 20 12 30 31 34c27 6 54 11 82 15c1 0 2 1 3 1v100c0 16 3 31 5 47c1 12 9 17 19 19c1 -1 2 -1 4 -1h1c8 0 6 -10 8 -16c5 -13 6 -28 6 -42c0 -33 -2 -65 -2 -98c30 8 59 18 89 27v186c0 16 2 32 19 32c21 0 19 -25 19 -41 v-165c20 6 41 12 62 12c27 1 35 -13 35 -50c0 -50 -21 -75 -72 -85c-7 -1 -14 -2 -22 -4c1 -20 1 -40 1 -60s0 -40 -1 -60c28 7 57 13 86 19c5 1 10 2 15 2c16 0 24 -8 24 -24c1 -4 0 -9 0 -13c-11 -58 -11 -75 -77 -87l-48 -9c0 -39 0 -77 -4 -115c0 -4 0 -9 -1 -12 c-4 -11 -8 -27 -21 -27c-5 1 -7 5 -7 10s2 11 1 15c-6 40 -7 80 -7 121c-30 -7 -60 -13 -90 -20v-86c0 -20 -2 -41 -10 -60c-3 -7 -8 -17 -16 -17zM157 -358c-9 2 -8 13 -8 20l-3 96c-1 34 -3 69 -4 103c-7 -4 -14 -8 -24 -12c-33 -13 -66 -27 -95 -48l-2 -2 c-3 -4 -18 -4 -20 -3c-3 2 -4 6 -4 10s1 7 1 10c1 7 -4 88 -2 121c3 49 7 172 7 173c1 25 -3 94 -3 148c1 27 1 51 4 62c2 12 9 17 18 19c1 -1 2 -1 2 -1c9 0 8 -10 10 -16c3 -7 4 -16 4 -24c1 -52 1 -104 1 -157l66 27c14 5 26 6 35 6c10 1 17 -1 20 0c0 -1 1 -1 1 -1 c11 0 9 -12 10 -17c3 -35 5 -69 6 -103v-34c1 -11 1 -22 1 -33v-34c0 -63 9 -127 9 -191c0 -21 -1 -43 -4 -65c-1 -13 -2 -27 -9 -39c-4 -7 -9 -16 -17 -15zM35 -89c33 19 68 34 103 49c0 1 1 1 1 1l-3 123c-8 -11 -22 -19 -45 -27c-18 -7 -36 -16 -53 -24 c-1 -12 -1 -24 -1 -36c0 -29 -1 -57 -2 -86zM340 -94c30 6 60 13 89 19c0 40 -1 80 -1 120c-29 -5 -59 -11 -89 -16c1 -41 1 -82 1 -123z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E269.xml b/data/Petaluma/E269.xml
new file mode 100644
index 00000000000..00bcabee975
--- /dev/null
+++ b/data/Petaluma/E269.xml
@@ -0,0 +1 @@
+<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M403 -393c-9 0 -7 9 -7 14c-7 59 -8 118 -9 176l-46 -10c-4 -1 -8 -2 -11 -2c-11 0 -15 8 -16 22l2 65s-36 -9 -48 -13c-2 0 -4 -1 -6 -2v-129c0 -18 -2 -35 -11 -51c-3 -4 -5 -8 -10 -8c-6 0 -8 6 -8 12c-3 31 -10 62 -10 95c0 23 0 47 1 70l-70 -21v-35 c0 -23 1 -46 1 -69c0 -22 -1 -45 -3 -67c-1 -8 -1 -15 -4 -22c-3 -8 -8 -17 -16 -17c-10 0 -8 12 -10 20c-8 33 -11 68 -11 102c0 26 2 51 3 76c-34 -11 -68 -22 -101 -35c-7 -3 -13 -4 -17 -4c-9 0 -11 7 -12 24c-1 15 -4 30 -4 39c1 42 2 45 43 58c32 10 64 19 95 29v117 c-31 -8 -62 -17 -92 -27c-10 -4 -16 -6 -20 -6c-8 0 -9 7 -8 26c0 17 -1 34 -1 50c0 24 14 34 36 40l87 24l3 144v17c1 12 10 19 20 21h3c10 0 7 -13 9 -19c3 -11 5 -23 5 -35c0 -8 -1 -18 -2 -26c-1 -31 -2 -61 -2 -92l64 18c-1 55 -1 110 -2 165c0 14 2 28 4 43 c2 13 11 15 20 17c1 0 2 1 3 1c8 0 6 -9 9 -14c7 -13 8 -26 8 -40v-159l44 12c13 4 24 6 32 6c15 0 20 -8 20 -27c0 -5 0 -12 -1 -20c-1 -4 -2 -7 -3 -14l28 4v113c0 12 1 24 2 36c0 12 9 17 18 19c1 -1 2 -1 2 -1h1c9 0 7 -11 9 -17c5 -27 6 -55 6 -83v-61c27 4 55 9 82 14 c0 31 1 62 1 93c1 36 2 72 4 108c0 6 1 13 3 18c3 8 11 11 18 11h1c8 0 5 -9 8 -13c3 -5 3 -10 3 -15c0 -65 1 -131 1 -194c23 5 46 10 69 16c4 1 7 1 10 2c7 2 13 2 18 2c23 0 35 -13 35 -38c0 -4 0 -9 -1 -13c-7 -56 -17 -64 -72 -75l-60 -12c-3 -39 -4 -78 -4 -116 c5 2 10 3 15 4c29 8 58 18 87 25c6 1 12 2 17 2c18 0 23 -11 23 -41c0 -43 -12 -76 -67 -86c-25 -5 -50 -10 -76 -16c0 -39 -1 -78 -5 -116c-1 -15 -3 -30 -15 -42c-4 -3 -7 -6 -9 -5c-3 1 -5 3 -6 9c-2 17 -3 34 -3 51c0 31 0 63 1 94c-25 -5 -49 -11 -74 -17 c0 -46 0 -92 1 -138c0 -17 0 -35 -10 -51c-3 -4 -6 -10 -12 -10zM383 -88c0 0 2 -1 4 0c0 40 0 80 -1 120c-13 -2 -25 -4 -37 -7c-11 -2 -18 -3 -24 -3c-15 0 -17 8 -20 35c-2 18 -1 35 -1 35l-35 -9c-2 -1 -5 -2 -7 -2v-114l27 9c19 5 37 13 57 17c6 1 11 2 15 2 c15 0 19 -8 20 -31c0 -11 2 -52 2 -52zM155 -65l69 21c0 36 0 71 -2 107v7l-66 -18c-1 -39 -1 -78 -1 -117zM422 -82c26 5 51 11 77 17c1 39 1 79 2 118l-82 -15c0 -34 1 -68 2 -101c0 -7 0 -13 1 -19z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E26A.xml b/data/Petaluma/E26A.xml
new file mode 100644
index 00000000000..34d2fd6670a
--- /dev/null
+++ b/data/Petaluma/E26A.xml
@@ -0,0 +1 @@
+<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M74 -270c-5 0 -10 4 -15 12c-40 59 -56 124 -59 194v40c0 99 23 191 86 270c4 5 9 9 13 13c7 7 16 10 24 8c9 -3 7 -14 7 -21c1 -34 -8 -64 -29 -91c-36 -49 -60 -101 -60 -162c0 -12 1 -25 3 -38c6 -36 21 -69 41 -99c13 -20 20 -40 20 -60c0 -12 -2 -25 -7 -37 c-3 -7 -6 -14 -10 -19c-5 -7 -9 -10 -14 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E26B.xml b/data/Petaluma/E26B.xml
new file mode 100644
index 00000000000..eece2c16186
--- /dev/null
+++ b/data/Petaluma/E26B.xml
@@ -0,0 +1 @@
+<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M40 -275c-14 0 -11 15 -11 28c0 3 0 6 -1 8c-2 9 -3 17 -3 26c0 20 6 39 19 57c31 42 50 92 54 142c1 7 1 13 1 20c0 62 -26 119 -80 159c-14 11 -21 20 -19 37v19c0 11 -1 22 0 33c0 15 7 23 18 23c5 0 10 -1 16 -5c36 -19 57 -50 72 -86c22 -54 33 -110 33 -177 c0 -86 -22 -174 -72 -255c-8 -11 -15 -29 -27 -29z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E26C.xml b/data/Petaluma/E26C.xml
new file mode 100644
index 00000000000..f31829b6a46
--- /dev/null
+++ b/data/Petaluma/E26C.xml
@@ -0,0 +1 @@
+<symbol id="E26C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 -288c-6 0 -12 1 -17 3c-8 3 -8 11 -8 16c-2 47 -16 94 -16 124c0 5 0 8 1 12c8 126 7 226 8 325c0 23 3 45 4 67c0 16 10 23 24 25c13 2 27 2 40 3c2 0 3 1 5 1c5 0 7 -4 9 -10c4 -12 5 -23 5 -35c0 -14 -2 -28 -6 -42c-3 -9 -9 -19 -17 -19c-26 1 -21 -17 -21 -32 c-3 -104 -5 -209 -8 -313c0 -9 0 -14 10 -14h3c7 0 14 2 21 2c5 0 11 -1 14 -7c7 -11 9 -23 9 -35c0 -11 -2 -22 -4 -32c-5 -22 -32 -39 -56 -39z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E26D.xml b/data/Petaluma/E26D.xml
new file mode 100644
index 00000000000..34f099db093
--- /dev/null
+++ b/data/Petaluma/E26D.xml
@@ -0,0 +1 @@
+<symbol id="E26D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M13 -282c-7 0 -10 3 -10 10c1 9 1 19 1 29s0 20 1 31c3 19 9 33 31 35c12 1 11 10 10 18c-3 17 -4 36 -4 54c0 30 3 60 4 89c3 60 8 119 6 179c0 12 -4 17 -12 17h-8c-8 -2 -14 -3 -18 -3c-10 0 -10 6 -13 27c-1 6 -1 11 -1 17c0 13 1 25 2 37c1 14 8 20 20 24 c10 2 19 4 27 4c26 0 40 -17 41 -52c1 -26 0 -53 0 -79c1 -66 -7 -132 -7 -198c0 -11 0 -24 1 -36c2 -28 3 -56 5 -84c2 -22 -1 -44 -5 -66c-7 -41 -29 -57 -71 -53z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E270.xml b/data/Petaluma/E270.xml
new file mode 100644
index 00000000000..4c0dca3f8fa
--- /dev/null
+++ b/data/Petaluma/E270.xml
@@ -0,0 +1 @@
+<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -239c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c1 85 14 168 17 253c2 59 5 118 5 177v31c-1 23 1 47 2 70v17c0 9 -2 12 -7 12c-2 0 -5 -1 -8 -2c-8 -3 -16 -6 -24 -10c-5 -3 -9 -4 -13 1c-5 4 -6 9 -2 15c26 45 42 94 50 146c1 6 2 8 4 8s5 -2 8 -5c4 -3 6 -9 8 -14 c16 -42 37 -81 62 -118c3 -3 8 -6 4 -11c-2 -3 -4 -3 -7 -3h-21c-16 0 -21 -1 -21 -15v-2c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -3 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257 c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM38 -104c45 32 89 65 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66c-3 -28 -4 -55 -6 -81z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E271.xml b/data/Petaluma/E271.xml
new file mode 100644
index 00000000000..0c20b80e89b
--- /dev/null
+++ b/data/Petaluma/E271.xml
@@ -0,0 +1 @@
+<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M34 -434c-2 0 -4 2 -7 4c-5 4 -7 9 -9 15c-15 42 -37 81 -62 118c-2 3 -8 6 -4 11c2 3 5 3 8 3c9 0 16 -1 22 -1c16 0 20 3 20 18c0 5 0 12 -1 20c-1 29 -1 58 -2 87c0 2 0 3 1 4c-1 10 -1 20 -1 30c1 85 14 168 17 253c2 59 5 118 5 177v31c-1 28 2 57 3 85 c0 14 8 23 19 24h1c10 0 10 -13 12 -20c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -3 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-13 -9 -26 -19 -38 -29v-39c0 -9 2 -13 6 -13 c3 0 6 1 9 3c8 3 16 6 24 10c2 1 4 2 7 2c2 0 4 -1 7 -3c5 -5 5 -9 2 -15c-27 -46 -43 -94 -51 -146c-1 -6 -2 -8 -4 -8zM45 -100c45 32 89 65 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66 c-3 -28 -4 -55 -6 -81z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E272.xml b/data/Petaluma/E272.xml
new file mode 100644
index 00000000000..17450e8d9ce
--- /dev/null
+++ b/data/Petaluma/E272.xml
@@ -0,0 +1 @@
+<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M213 165c4 -9 2 -21 2 -24l-1 -18v-6l-1 -12v-3c-1 -13 -3 -28 -3 -28c-2 -67 -5 -134 -7 -201c0 -32 2 -64 2 -96c-2 -70 -3 -139 -5 -208c0 -6 -2 -11 -3 -17c-4 -9 -7 -23 -18 -23c-13 0 -10 16 -13 26c-7 24 -9 48 -9 72c0 36 5 73 5 109v95l-5 -1l-121 -18 c-4 -1 -7 -1 -10 -1c-12 0 -19 5 -19 22c0 19 -3 39 -3 59c-1 29 -2 58 -2 88c0 35 1 70 2 105c3 101 11 201 10 302c0 10 -1 22 1 34c-1 3 -3 4 -6 4c-2 0 -5 -1 -9 -2c-8 -4 -16 -6 -23 -11c-6 -2 -10 -3 -14 1c-5 5 -6 9 -2 15c26 46 43 94 50 146c1 6 3 8 5 8s4 -2 7 -4 c4 -4 6 -9 8 -15c16 -42 38 -80 63 -117c2 -4 7 -7 3 -12c-2 -3 -7 -3 -12 -2c-25 1 -34 1 -36 -9c1 -8 2 -17 2 -25c1 -19 1 -37 1 -56c0 -57 -3 -115 -6 -172c49 4 98 9 145 22c21 5 17 -17 22 -27zM166 31l3 30l-6 -1c-34 -1 -68 -3 -102 -6c-7 -1 -14 0 -20 0l-1 -13 c-1 -33 1 -66 2 -100v-12c40 5 81 12 121 23c0 26 2 53 3 79z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E273.xml b/data/Petaluma/E273.xml
new file mode 100644
index 00000000000..c3fd2a148f1
--- /dev/null
+++ b/data/Petaluma/E273.xml
@@ -0,0 +1 @@
+<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M199 -520c-2 0 -4 2 -7 4c-5 4 -7 9 -9 15c-15 42 -37 81 -62 118c-2 3 -8 6 -4 11c3 4 8 3 12 3c6 -1 11 -1 15 -1c5 0 8 0 11 1c0 35 5 72 5 107v95l-5 -1l-121 -18c-4 -1 -7 -1 -10 -1c-12 0 -19 5 -19 22c0 19 -3 39 -3 59c-1 29 -2 58 -2 88c0 35 1 70 2 105 c3 101 11 201 10 302c0 20 -6 50 27 60c7 -16 10 -32 10 -49c1 -19 1 -37 1 -56c0 -57 -3 -115 -6 -172c49 4 98 9 145 22c21 5 17 -17 22 -27c4 -9 2 -21 2 -24l-1 -18v-6l-1 -12v-3c-1 -13 -3 -28 -3 -28c-2 -67 -5 -134 -7 -201c0 -32 2 -64 2 -96l-3 -137 c1 -3 3 -5 5 -5c3 0 5 1 9 3c8 3 16 6 24 10c2 1 4 2 7 2c2 0 4 -1 7 -3c5 -5 5 -9 2 -15c-27 -46 -43 -94 -51 -146c-1 -6 -2 -8 -4 -8zM40 -57v-12c40 5 81 12 121 23c0 26 2 53 3 79l3 30l-6 -1c-34 -1 -68 -3 -102 -6c-7 -1 -14 0 -20 0l-1 -13c-1 -33 1 -66 2 -100z "/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E274.xml b/data/Petaluma/E274.xml
new file mode 100644
index 00000000000..ff1452d1b7e
--- /dev/null
+++ b/data/Petaluma/E274.xml
@@ -0,0 +1 @@
+<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M136 -363c-9 0 -7 12 -9 19c-12 34 -16 68 -16 103c0 14 0 27 1 40c-36 -8 -72 -15 -108 -23c-4 -1 -7 -2 -9 -2c-8 1 -11 6 -11 17c-1 23 -10 45 -10 69s12 32 33 37c37 9 74 16 111 23c2 16 4 32 5 49l3 90c-32 -6 -64 -11 -97 -16c-4 -1 -7 -2 -10 -2 c-13 1 -18 7 -16 26c1 12 -7 25 -4 36c0 45 6 51 47 58c28 5 56 9 84 15c1 20 2 40 2 60v5c1 8 1 16 1 25c0 23 -2 46 -1 70c0 9 -2 12 -7 12c-2 0 -5 -1 -9 -2c-7 -4 -16 -6 -23 -11c-6 -3 -9 -3 -14 1c-5 5 -6 9 -2 15c26 46 43 94 50 146c1 6 3 8 5 8s4 -2 7 -4 c4 -4 7 -9 9 -15c15 -42 37 -81 62 -118c2 -3 7 -6 4 -11c-3 -3 -8 -3 -12 -3c-7 0 -13 1 -18 1c-22 0 -21 -6 -20 -38c1 -8 1 -17 1 -25c0 -17 -1 -34 -1 -51c1 -20 1 -39 1 -59l53 12c-1 58 -3 83 -3 142v19c1 11 11 14 19 16h4c6 0 5 -9 7 -14c9 -43 11 -54 13 -97l3 -54 c32 9 63 19 94 32c4 2 8 2 11 2h2c6 0 9 -5 13 -15s5 -21 5 -31c0 -18 -5 -35 -9 -53c-4 -16 -17 -24 -32 -29c-27 -9 -54 -17 -82 -24c0 -32 -1 -64 -2 -96c-1 -15 -1 -30 -2 -44l17 3c24 4 49 9 72 15c4 1 7 1 11 1h2c11 0 16 -9 17 -22c1 -10 0 -19 0 -32 c-4 -53 -11 -61 -66 -72l-58 -12c1 -24 3 -49 3 -73c0 -8 0 -16 -1 -25c0 -12 -1 -25 -8 -36c-3 -5 -5 -12 -11 -11c-6 0 -10 6 -11 11c-14 40 -22 81 -24 123l-44 -9c-1 -20 -3 -40 -5 -60c-1 -7 -1 -16 -1 -23c0 -11 1 -21 1 -32c0 -12 -1 -25 -5 -38 c-2 -7 -4 -18 -12 -19zM163 -71l42 9c3 46 5 92 10 138c-16 -4 -32 -7 -49 -10c0 -24 0 -47 -1 -71c-1 -22 -1 -44 -2 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E275.xml b/data/Petaluma/E275.xml
new file mode 100644
index 00000000000..14ade428454
--- /dev/null
+++ b/data/Petaluma/E275.xml
@@ -0,0 +1 @@
+<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M253 -514c-5 4 -7 9 -9 15c-15 42 -37 81 -62 118c-2 3 -8 6 -4 11c3 4 8 3 12 3c7 0 13 -1 18 -1c16 0 20 3 20 18c0 5 0 12 -1 20c0 12 -18 108 -20 145l-44 -9c-1 -20 -3 -40 -5 -60c-1 -7 -1 -16 -1 -23c0 -11 1 -21 1 -32c0 -12 -1 -25 -5 -38c-2 -7 -4 -18 -12 -19 c-9 0 -7 12 -9 19c-12 34 -16 68 -16 103c0 14 0 27 1 40c-36 -8 -72 -15 -108 -23c-4 -1 -7 -2 -9 -2c-8 1 -11 6 -11 17c-1 23 -10 45 -10 69s12 32 33 37c37 9 74 16 111 23c2 16 4 32 5 49l3 90c-32 -6 -64 -11 -97 -16c-4 -1 -7 -2 -10 -2c-13 1 -18 7 -16 26 c1 12 -7 25 -4 36c0 45 6 51 47 58c28 5 56 9 84 15c1 31 2 62 4 94c0 16 -3 35 19 46c8 -15 8 -29 9 -44c2 -30 3 -60 3 -90l53 12c-1 58 -3 116 -3 175v19c1 11 11 14 19 16h4c6 0 5 -9 7 -14c9 -43 11 -87 13 -130l3 -54c32 9 63 19 94 32c4 2 8 2 11 2h2 c6 0 9 -5 13 -15s5 -21 5 -31c0 -18 -5 -35 -9 -53c-4 -16 -17 -24 -32 -29c-27 -9 -54 -17 -82 -24c0 -32 -1 -64 -2 -96c-1 -15 -1 -30 -2 -44l17 3c24 4 49 9 72 15c4 1 7 1 11 1h2c11 0 16 -9 17 -22c1 -10 0 -19 0 -32c-4 -53 -11 -61 -66 -72l-58 -12 c1 -24 3 -49 3 -73c0 -8 -2 -83 -2 -101c0 -9 2 -13 6 -13c3 0 6 1 9 3c8 3 16 6 24 10c2 1 4 2 7 2c2 0 4 -1 7 -3c5 -5 5 -9 2 -15c-27 -46 -43 -94 -51 -146c-1 -6 -2 -8 -4 -8s-4 2 -7 4zM168 -74l42 9c3 46 5 92 10 138c-16 -4 -32 -7 -49 -10c0 -24 0 -47 -1 -71 c-1 -22 -1 -44 -2 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E280.xml b/data/Petaluma/E280.xml
new file mode 100644
index 00000000000..8903029d851
--- /dev/null
+++ b/data/Petaluma/E280.xml
@@ -0,0 +1 @@
+<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M189 -240c-3 0 -7 2 -12 7c-13 11 -28 22 -42 32c-88 63 -135 148 -135 257c0 14 0 27 2 41c5 49 33 77 75 77c9 0 19 -2 30 -5c14 -4 28 -11 42 -17l1 -1v26c0 38 -2 76 -4 114c0 22 -2 43 -2 65c0 21 2 43 7 64c2 7 2 20 12 20h1c11 -1 19 -10 19 -24 c1 -28 4 -57 3 -85v-31c0 -59 3 -118 5 -177c3 -85 17 -168 17 -253c0 -33 -2 -68 -11 -101c-2 -6 -4 -9 -8 -9zM162 -105c-2 26 -3 53 -6 81c-2 22 -3 44 -3 66l-4 2c-19 8 -38 18 -59 18c-7 0 -15 -2 -23 -5c-16 -6 -24 -14 -23 -25c0 -6 1 -12 5 -20 c26 -51 68 -85 113 -117z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E281.xml b/data/Petaluma/E281.xml
new file mode 100644
index 00000000000..9a560dd3f9a
--- /dev/null
+++ b/data/Petaluma/E281.xml
@@ -0,0 +1 @@
+<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M189 -240c-3 0 -7 2 -12 7c-13 11 -28 22 -42 32c-88 63 -135 148 -135 257c0 14 0 27 2 41c5 49 33 77 75 77c9 0 19 -2 30 -5c14 -4 28 -11 42 -17l1 -1v26c0 38 -2 76 -4 114c0 22 -2 43 -2 65c0 21 2 43 7 64c2 7 2 20 12 20h1c11 -1 19 -10 19 -24 c1 -28 4 -57 3 -85v-31c0 -59 3 -118 5 -177c3 -85 17 -168 17 -253c0 -33 -2 -68 -11 -101c-2 -6 -4 -9 -8 -9zM233 -240c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c0 85 14 168 17 253c2 59 5 118 5 177v31c-1 28 2 57 3 85c0 14 8 23 19 24h1c10 0 10 -13 12 -20 c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -4 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM162 -105c-2 26 -3 53 -6 81c-2 22 -3 44 -3 66 l-4 2c-19 8 -38 18 -59 18c-7 0 -15 -2 -23 -5c-16 -6 -24 -14 -23 -25c0 -6 1 -12 5 -20c26 -51 68 -85 113 -117zM260 -105c45 32 87 66 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66 c-3 -28 -4 -55 -6 -81z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E282.xml b/data/Petaluma/E282.xml
new file mode 100644
index 00000000000..c2806f57070
--- /dev/null
+++ b/data/Petaluma/E282.xml
@@ -0,0 +1 @@
+<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M135 -338c-11 23 -10 47 -11 69c-1 31 1 61 5 91v8l-86 -21c-4 -1 -7 -1 -9 -1c-8 0 -11 5 -11 16c1 9 1 19 1 28c0 56 -5 56 54 69l54 12c0 22 -1 44 -2 66s-2 44 -2 66c-34 -7 -69 -19 -104 -19h-5c-10 0 -13 5 -14 14c-2 19 -4 38 -5 57c0 28 4 33 33 37 c32 4 64 10 95 17c0 37 -3 74 -3 111c0 15 1 30 2 45c1 13 4 21 19 24c15 -45 13 -91 14 -137c1 -12 1 -23 1 -35c26 6 52 13 78 16c8 1 14 2 20 2c20 0 25 -11 23 -40c-4 -56 -11 -64 -65 -73c-19 -3 -37 -7 -55 -11c0 -29 -1 -58 0 -87c0 -15 1 -30 1 -45l107 27 c7 2 12 3 16 3c11 0 14 -9 14 -32c0 -18 -3 -35 -10 -53c-5 -12 -14 -20 -28 -24c-32 -7 -64 -15 -97 -23c-1 -46 -6 -93 -9 -139c-1 -14 -7 -26 -21 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E283.xml b/data/Petaluma/E283.xml
new file mode 100644
index 00000000000..f3bd27007c8
--- /dev/null
+++ b/data/Petaluma/E283.xml
@@ -0,0 +1 @@
+<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M79 -373c-14 37 -23 74 -23 112c0 16 1 32 1 48c-17 -3 -35 -7 -53 -11c-3 -1 -5 -1 -8 -1c-5 0 -9 2 -9 10c0 25 -9 48 -10 73c0 24 10 33 30 38l57 12l6 85c1 19 2 39 2 58c-15 -2 -30 -5 -45 -7c-3 0 -5 -1 -7 -1c-11 0 -15 5 -15 20c1 16 -3 33 -3 50 c0 27 9 41 32 44c14 3 28 5 42 8c0 27 0 54 2 81c1 14 4 27 4 41c0 10 7 16 14 17h1c7 0 4 -10 7 -15c2 -4 3 -9 3 -14c0 -35 0 -70 1 -105c19 4 38 7 56 11c1 25 0 50 -2 75c-1 28 -2 55 -2 83v34c0 6 1 12 7 15c5 3 9 7 13 7s8 -3 10 -13c7 -34 10 -68 12 -102 c2 -30 3 -60 4 -90c21 5 41 10 62 16c3 71 7 142 16 212c1 6 3 13 6 18c2 6 7 9 13 9c8 0 5 -8 7 -13c3 -8 4 -16 4 -24c0 -9 -1 -17 -2 -25c-5 -56 -9 -111 -12 -167c14 5 27 9 40 14c12 5 21 7 28 7c15 0 20 -12 20 -43c-4 -12 -1 -27 -5 -42c-4 -21 -18 -34 -39 -41 c-16 -5 -32 -10 -48 -14c-1 -21 -1 -41 -2 -61c-1 -28 -3 -56 -4 -83c18 3 36 8 55 11c7 2 13 2 17 2c13 0 17 -7 18 -28v-6c0 -70 -16 -81 -67 -91c-7 -2 -13 -3 -20 -4c1 -12 1 -24 1 -36c0 -25 -2 -51 -5 -76c-1 -15 -3 -28 -18 -42c-8 36 -8 69 -10 101 c-1 16 -1 31 -1 46l-60 -12c0 -20 1 -40 3 -59c-3 -26 0 -48 -8 -69c-3 -6 -6 -16 -14 -14c-7 1 -9 9 -12 16c-13 38 -20 77 -22 115c-15 -3 -30 -6 -45 -10c-2 -42 -6 -84 -6 -127c0 -14 -1 -30 -17 -43zM204 -64c18 4 37 7 56 11c0 47 1 94 3 141c-18 -5 -37 -9 -55 -13 v-41c0 -20 0 -40 -2 -60c-1 -13 -1 -25 -2 -38zM107 -83l44 9c2 25 4 50 5 74c1 22 3 44 4 66c-17 -4 -33 -6 -50 -9c0 -14 0 -29 -1 -43c-1 -32 -2 -65 -2 -97z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E440.xml b/data/Petaluma/E440.xml
new file mode 100644
index 00000000000..1b11f0b5d2f
--- /dev/null
+++ b/data/Petaluma/E440.xml
@@ -0,0 +1 @@
+<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M285 89c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c1 85 14 168 17 253c0 14 1 28 2 42l-90 -39c-2 27 -7 52 -6 77c0 12 6 20 18 24l81 33v31c-31 -13 -62 -25 -93 -38 c-2 25 -7 48 -6 71c0 12 6 19 18 23c28 10 55 20 82 31c1 13 2 26 2 38c0 14 8 23 19 24h1c10 0 10 -13 12 -20c2 -8 4 -17 5 -26l101 42c20 8 25 6 28 -12c3 -19 -1 -37 -9 -57c-3 -8 -11 -15 -20 -19c-33 -14 -66 -27 -100 -41v-16c0 -4 0 -9 -1 -14c34 15 68 31 102 46 c20 8 25 6 28 -13c3 -21 -1 -41 -9 -61c-3 -9 -11 -16 -20 -21c-34 -15 -69 -31 -104 -46v-5v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77zM243 24c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66 c-3 -28 -4 -55 -6 -81c45 32 89 65 113 117c4 8 5 14 5 20z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E441.xml b/data/Petaluma/E441.xml
new file mode 100644
index 00000000000..c33c349363e
--- /dev/null
+++ b/data/Petaluma/E441.xml
@@ -0,0 +1 @@
+<symbol id="E441" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 -231c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c1 85 14 168 17 253c2 59 5 118 5 177v31c-1 28 2 57 3 85c0 14 8 23 19 24h1c10 0 10 -13 12 -20c5 -21 7 -43 7 -64c0 -22 -2 -43 -2 -65c-2 -38 -3 -76 -4 -114v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5 c42 0 70 -28 75 -77c2 -14 2 -27 2 -41c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM36 -96c45 32 89 65 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66c-3 -28 -4 -55 -6 -81z "/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E442.xml b/data/Petaluma/E442.xml
new file mode 100644
index 00000000000..2ef1cbbff9d
--- /dev/null
+++ b/data/Petaluma/E442.xml
@@ -0,0 +1 @@
+<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 -236c-4 0 -6 3 -8 9c-9 33 -11 68 -11 101c0 85 14 168 17 253l3 86c-30 -15 -60 -29 -91 -44c-2 30 -7 57 -6 85c0 14 6 22 18 27c27 11 54 24 81 37v17c-1 28 2 57 3 85c0 14 8 23 19 24h1c10 0 10 -13 12 -20c5 -21 7 -43 7 -64c0 -8 0 -15 -1 -22 c34 16 66 35 100 49c7 3 13 5 16 5c7 0 9 -6 12 -19c1 -5 1 -10 1 -15c0 -18 -4 -35 -10 -53c-3 -10 -11 -18 -20 -23c-34 -17 -68 -34 -103 -50c0 -17 -1 -34 -1 -51v-26l1 1c14 6 28 13 42 17c11 3 21 5 30 5c42 0 70 -28 75 -77c2 -14 2 -27 2 -41 c0 -109 -47 -194 -135 -257c-14 -10 -29 -21 -42 -32c-5 -5 -9 -7 -12 -7zM125 -101c45 32 87 66 113 117c4 8 5 14 5 20c1 11 -7 19 -23 25c-8 3 -16 5 -23 5c-21 0 -40 -10 -59 -18l-4 -2c0 -22 -1 -44 -3 -66c-3 -28 -4 -55 -6 -81z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E443.xml b/data/Petaluma/E443.xml
new file mode 100644
index 00000000000..cc072e90132
--- /dev/null
+++ b/data/Petaluma/E443.xml
@@ -0,0 +1 @@
+<symbol id="E443" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 -231c-3 0 -7 2 -12 7c-13 11 -28 22 -42 32c-88 63 -135 148 -135 257c0 14 0 27 2 41c5 49 33 77 75 77c9 0 19 -2 30 -5c14 -4 28 -11 42 -17l1 -1v26c-1 38 -2 76 -4 114c0 22 -2 43 -2 65c0 21 2 43 7 64c2 7 2 20 12 20h1c11 -1 19 -10 19 -24 c1 -28 4 -57 3 -85v-31c0 -59 3 -118 5 -177c3 -85 16 -168 17 -253c0 -33 -2 -68 -11 -101c-2 -6 -4 -9 -8 -9zM152 -96c-2 26 -3 53 -6 81c-2 22 -3 44 -3 66l-4 2c-19 8 -38 18 -59 18c-7 0 -15 -2 -23 -5c-16 -6 -24 -14 -23 -25c0 -6 1 -12 5 -20 c24 -52 68 -85 113 -117z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E444.xml b/data/Petaluma/E444.xml
new file mode 100644
index 00000000000..df419762e78
--- /dev/null
+++ b/data/Petaluma/E444.xml
@@ -0,0 +1 @@
+<symbol id="E444" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M135 -338c-11 23 -10 47 -11 69c-1 31 1 61 5 91v8l-86 -21c-4 -1 -7 -1 -9 -1c-8 0 -11 5 -11 16c1 9 1 19 1 28c0 56 -5 56 54 69l54 12c0 22 -1 44 -2 66s-2 44 -2 66c-34 -7 -69 -19 -104 -19h-5c-10 0 -13 5 -14 14c-2 19 -4 38 -5 57c0 28 4 33 33 37 c32 4 64 10 95 17c0 37 -3 74 -3 111c0 15 1 30 2 45c1 13 4 21 19 24c15 -45 13 -91 14 -137c1 -12 1 -23 1 -35c26 6 52 13 78 16c8 1 14 2 20 2c20 0 25 -11 23 -40c-4 -56 -11 -64 -65 -73c-19 -3 -37 -7 -55 -11c0 -29 -1 -58 0 -87c0 -15 1 -30 1 -45l107 27 c7 2 12 3 16 3c11 0 14 -9 14 -32c0 -18 -3 -35 -10 -53c-5 -12 -14 -20 -28 -24c-32 -7 -64 -15 -97 -23c-1 -46 -6 -93 -9 -139c-1 -14 -7 -26 -21 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E445.xml b/data/Petaluma/E445.xml
new file mode 100644
index 00000000000..d6e55d6dd1f
--- /dev/null
+++ b/data/Petaluma/E445.xml
@@ -0,0 +1 @@
+<symbol id="E445" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M137 -356c-9 0 -7 12 -9 19c-12 34 -16 68 -16 103c0 14 0 27 1 40c-36 -8 -72 -15 -108 -23c-4 -1 -7 -2 -9 -2c-8 1 -11 6 -11 17c-1 23 -10 45 -10 69s12 32 33 37c37 9 74 16 111 23c2 16 4 32 5 49l3 90c-32 -6 -64 -11 -97 -16c-4 -1 -7 -2 -10 -2 c-13 1 -18 7 -16 26c1 12 -7 25 -4 36c0 45 6 51 47 58c28 5 56 9 84 15c1 31 2 62 4 94c0 16 -3 35 19 46c8 -15 8 -29 9 -44c2 -30 3 -60 3 -90l53 12c-1 58 -3 116 -3 175v19c1 11 11 14 19 16h4c6 0 5 -9 7 -14c9 -43 11 -87 13 -130l3 -54c32 9 63 19 94 32 c4 2 8 2 11 2h2c6 0 9 -5 13 -15s5 -21 5 -31c0 -18 -5 -35 -9 -53c-4 -16 -17 -24 -32 -29c-27 -9 -54 -17 -82 -24c0 -32 -1 -64 -2 -96c-1 -15 -1 -30 -2 -44l17 3c24 4 49 9 72 15c4 1 7 1 11 1h2c11 0 16 -9 17 -22c1 -10 0 -19 0 -32c-4 -53 -11 -61 -66 -72l-58 -12 c1 -24 3 -49 3 -73c0 -8 0 -16 -1 -25c0 -12 -1 -25 -8 -36c-3 -5 -5 -12 -11 -11c-6 0 -10 6 -11 11c-14 40 -22 81 -24 123l-44 -9c-1 -20 -3 -40 -5 -60c-1 -7 -1 -16 -1 -23c0 -11 1 -21 1 -32c0 -12 -1 -25 -5 -38c-2 -7 -4 -18 -12 -19zM164 -64l42 9 c3 46 5 92 10 138c-16 -4 -32 -7 -49 -10c0 -24 0 -47 -1 -71c-1 -22 -1 -44 -2 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E446.xml b/data/Petaluma/E446.xml
new file mode 100644
index 00000000000..8e9789c18fa
--- /dev/null
+++ b/data/Petaluma/E446.xml
@@ -0,0 +1 @@
+<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 -420c-8 37 -9 70 -10 102c-1 25 -1 50 -1 74l-66 -15c-3 -1 -6 -1 -9 -1c-10 0 -14 6 -12 19c1 15 -7 29 -4 41c0 41 2 42 40 49c17 3 34 7 51 10c0 21 0 42 1 63c-45 -10 -90 -20 -135 -32c-3 -1 -6 -1 -9 -1c-7 0 -11 3 -10 15v55c2 42 4 46 46 55 c37 8 74 16 112 25c0 8 0 16 1 25c0 9 1 18 1 26l-100 -15h-5c-10 0 -13 6 -12 17v22c0 62 0 61 60 72c21 4 42 7 63 10c3 40 6 80 11 120c1 6 3 13 6 18c2 6 7 9 13 9c8 0 5 -8 7 -13c3 -8 4 -16 4 -24c0 -9 -1 -17 -2 -25l-6 -79c19 4 39 7 59 12c5 1 10 2 14 2 c10 0 14 -6 14 -19c0 -18 -3 -37 -7 -56s-17 -30 -36 -34c-17 -4 -34 -7 -51 -11c0 -17 -1 -33 -2 -50c46 10 92 20 137 31c4 1 8 1 11 1c18 0 21 -12 21 -35c0 -20 -4 -39 -11 -59c-5 -15 -17 -24 -33 -27c-43 -11 -85 -19 -128 -28c-1 -21 -3 -42 -4 -63c28 6 55 12 82 19 c4 1 7 1 9 1c10 0 12 -5 13 -17c2 -21 -1 -41 -6 -61c-4 -15 -14 -25 -30 -29l-66 -15c1 -19 2 -39 2 -58c0 -28 -1 -55 -5 -83c-1 -15 -4 -28 -18 -43z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E447.xml b/data/Petaluma/E447.xml
new file mode 100644
index 00000000000..cd86e5ebac9
--- /dev/null
+++ b/data/Petaluma/E447.xml
@@ -0,0 +1 @@
+<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M160 -460c-8 36 -9 69 -10 102s-1 65 -1 97c-15 -4 -30 -8 -44 -13c-2 -1 -4 -1 -5 -1c-7 0 -6 7 -6 10c-2 16 -1 32 -1 46c0 12 -1 21 -1 28c0 18 6 20 49 32l8 3c1 18 1 36 2 55c-24 -5 -47 -9 -71 -13c-22 -4 -43 -10 -65 -15c-3 -1 -5 -1 -7 -1c-5 0 -8 2 -7 11 c1 18 -2 37 -2 55c0 31 10 44 32 49l124 27v9c1 13 2 25 2 38c-20 -3 -40 -7 -61 -10c-2 0 -4 -1 -5 -1c-6 0 -8 4 -8 10c-1 13 0 26 0 39c0 7 0 14 -1 21c-4 26 11 37 33 40c16 3 32 5 48 8c3 37 5 74 11 110c1 6 3 13 6 18c3 4 7 8 12 8c9 0 5 -8 7 -12c4 -8 5 -16 5 -25 c0 -8 -1 -16 -2 -25l-6 -69c35 6 70 13 105 20c3 44 6 88 12 131c1 5 1 10 3 14c2 8 8 14 15 14c10 0 7 -10 8 -15c3 -9 4 -17 4 -26c0 -8 -1 -16 -2 -24c-4 -29 -6 -58 -8 -87c13 2 26 5 40 8c4 1 8 2 11 2c10 0 17 -6 17 -20c0 -17 -1 -34 -3 -51c-2 -21 -16 -34 -36 -39 c-12 -2 -23 -4 -35 -7c0 -14 -1 -28 -1 -41c26 5 52 11 77 17l17 3c11 3 19 5 25 5c15 0 19 -10 22 -43v-19c-1 -7 -1 -19 -4 -30c-5 -20 -19 -32 -41 -36l-101 -18c-1 -14 -2 -29 -2 -43c19 5 39 9 58 14c4 1 7 1 9 1c8 0 12 -3 14 -15c1 -6 2 -13 2 -19 c0 -16 -3 -31 -6 -47c-3 -13 -11 -23 -27 -27s-33 -7 -50 -11c2 -24 3 -48 3 -72c0 -26 -1 -53 -4 -80c-1 -15 -3 -28 -19 -42c-8 36 -10 70 -10 103c0 28 -1 56 -1 84c-36 -8 -71 -17 -107 -26c1 -31 2 -62 2 -93c0 -27 -2 -55 -5 -83c-1 -11 -5 -22 -18 -33zM188 19 l105 24c1 9 1 18 2 27v15c-35 -7 -70 -14 -105 -20c0 -15 -1 -30 -2 -46zM182 -123v-25c35 10 71 19 106 27c1 15 1 30 2 45c-36 -7 -71 -13 -107 -19c0 -10 0 -19 -1 -28z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A0.xml b/data/Petaluma/E4A0.xml
new file mode 100644
index 00000000000..f4dc8244ff5
--- /dev/null
+++ b/data/Petaluma/E4A0.xml
@@ -0,0 +1 @@
+<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M19 1c0 -1 0 -1 -1 -1h-7c-4 0 -9 1 -11 6v3c0 6 6 11 9 16c28 48 74 67 124 82c40 12 77 34 117 49c-68 25 -135 51 -203 75c-11 3 -16 8 -16 14c0 3 2 7 6 12c17 20 30 43 50 60c8 6 14 9 21 9c4 0 9 -1 14 -3c69 -28 138 -56 209 -82c29 -11 57 -24 84 -38 c7 -4 10 -8 10 -13c0 -2 -1 -6 -3 -10c-13 -27 -35 -45 -60 -52c-43 -12 -78 -39 -121 -50c-65 -15 -124 -47 -187 -70c-11 -4 -22 -8 -35 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A1.xml b/data/Petaluma/E4A1.xml
new file mode 100644
index 00000000000..985f07d4cff
--- /dev/null
+++ b/data/Petaluma/E4A1.xml
@@ -0,0 +1 @@
+<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -326h-7c-4 0 -9 1 -11 6v3c0 6 6 10 9 16c28 47 74 67 124 82c40 11 77 34 117 49c-68 25 -135 51 -203 75c-11 3 -16 8 -16 14c0 3 2 7 6 12c17 20 30 43 50 60c8 6 14 9 21 9c4 0 9 -1 14 -3c69 -28 138 -56 209 -82c29 -11 57 -24 84 -39c7 -3 10 -7 10 -12 c0 -3 -1 -6 -3 -10c-13 -27 -35 -46 -60 -52c-43 -12 -78 -39 -121 -50c-65 -16 -124 -48 -187 -70c-11 -4 -22 -8 -35 -8h-1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A2.xml b/data/Petaluma/E4A2.xml
new file mode 100644
index 00000000000..6de3365d20b
--- /dev/null
+++ b/data/Petaluma/E4A2.xml
@@ -0,0 +1 @@
+<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 0c-7 0 -15 6 -23 19s-17 24 -32 27c-10 2 -13 9 -11 17c6 25 6 50 14 74c5 15 15 17 28 19c15 -6 37 -7 43 -27c4 -13 20 -13 23 -26c2 -8 2 -17 2 -25c0 -23 -8 -43 -20 -62c-7 -11 -16 -16 -24 -16z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A3.xml b/data/Petaluma/E4A3.xml
new file mode 100644
index 00000000000..3ae5596cf6e
--- /dev/null
+++ b/data/Petaluma/E4A3.xml
@@ -0,0 +1 @@
+<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M92 -140c-7 -11 -16 -16 -24 -16c-7 0 -16 6 -23 19c-8 13 -17 23 -32 27c-10 2 -13 9 -11 17c5 25 6 50 14 74c5 15 15 17 28 19c15 -6 36 -7 43 -27c4 -13 19 -13 23 -26c2 -8 2 -17 2 -25c1 -23 -7 -43 -20 -62z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A4.xml b/data/Petaluma/E4A4.xml
new file mode 100644
index 00000000000..ab69a31c7ea
--- /dev/null
+++ b/data/Petaluma/E4A4.xml
@@ -0,0 +1 @@
+<symbol id="E4A4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M95 0c-20 0 -42 2 -64 11c-6 3 -13 6 -18 11c-7 8 -15 17 -12 27c4 10 16 5 24 6h86c23 0 43 1 66 1c60 0 119 -2 178 -4c34 -1 66 -1 99 -11c13 -4 18 -10 17 -22c0 -12 -11 -11 -19 -12c-21 -5 -44 -7 -66 -7c-15 0 -33 2 -51 3c-16 1 -35 1 -51 1 c-49 0 -98 -3 -147 -3c-13 0 -29 -1 -42 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A5.xml b/data/Petaluma/E4A5.xml
new file mode 100644
index 00000000000..8de3cb74ba9
--- /dev/null
+++ b/data/Petaluma/E4A5.xml
@@ -0,0 +1 @@
+<symbol id="E4A5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M95 -59c-20 0 -42 2 -64 11c-6 3 -13 6 -18 11c-7 8 -15 17 -12 27c4 10 16 5 24 6h86c23 0 43 1 66 1c60 0 119 -2 178 -4c34 -1 66 -1 99 -11c13 -4 18 -10 17 -22c0 -12 -11 -11 -19 -12c-21 -5 -44 -7 -66 -7c-15 0 -33 2 -51 3c-16 1 -35 1 -51 1 c-49 0 -98 -3 -147 -3c-13 0 -29 -1 -42 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A6.xml b/data/Petaluma/E4A6.xml
new file mode 100644
index 00000000000..bddb34d7c11
--- /dev/null
+++ b/data/Petaluma/E4A6.xml
@@ -0,0 +1 @@
+<symbol id="E4A6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M72 0h-5c-3 4 -7 9 -9 14c-22 58 -28 120 -39 180c-9 47 -9 95 -19 142v4c2 26 22 39 38 54c12 12 26 17 40 17c20 0 38 -13 48 -36c8 -19 13 -40 13 -60c0 -7 -1 -14 -2 -21c-12 -72 -27 -143 -37 -214c-4 -28 -1 -60 -28 -80z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A7.xml b/data/Petaluma/E4A7.xml
new file mode 100644
index 00000000000..b720c0342be
--- /dev/null
+++ b/data/Petaluma/E4A7.xml
@@ -0,0 +1 @@
+<symbol id="E4A7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M61 -411c-20 0 -38 13 -48 36c-8 19 -13 40 -13 60c0 7 1 14 2 21c12 72 27 143 37 214c4 28 1 60 28 80h5c3 -4 7 -9 9 -14c22 -58 28 -120 39 -180c9 -47 9 -95 19 -142v-4c-2 -26 -22 -39 -38 -54c-12 -12 -26 -17 -40 -17z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A8.xml b/data/Petaluma/E4A8.xml
new file mode 100644
index 00000000000..22f0f382296
--- /dev/null
+++ b/data/Petaluma/E4A8.xml
@@ -0,0 +1 @@
+<symbol id="E4A8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42 0c-13 11 -11 27 -12 41v10c0 69 -8 135 -26 202c-2 8 -4 15 -4 20c0 18 12 22 43 22c28 0 42 -9 42 -31c0 -7 -2 -16 -5 -27c-20 -65 -20 -131 -27 -197c-1 -14 -2 -28 -11 -40z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4A9.xml b/data/Petaluma/E4A9.xml
new file mode 100644
index 00000000000..f8fb1013eb5
--- /dev/null
+++ b/data/Petaluma/E4A9.xml
@@ -0,0 +1 @@
+<symbol id="E4A9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M42 -295c-28 0 -42 9 -42 31c0 7 2 16 5 27c20 65 20 131 27 197c1 14 2 28 11 40c13 -11 11 -27 12 -41v-10c0 -69 8 -135 26 -202c2 -8 4 -15 4 -20c0 -18 -12 -22 -43 -22z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AA.xml b/data/Petaluma/E4AA.xml
new file mode 100644
index 00000000000..71921c39e8b
--- /dev/null
+++ b/data/Petaluma/E4AA.xml
@@ -0,0 +1 @@
+<symbol id="E4AA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 0c-4 0 -8 5 -10 14c-10 38 -17 76 -16 115v34c1 23 0 44 0 61c1 18 1 36 1 53v49c0 28 1 56 5 83c1 7 3 14 4 21c3 16 16 21 28 22h1c11 0 12 -14 14 -23c10 -38 10 -78 10 -117c0 -36 1 -73 1 -109c0 -48 -1 -96 -5 -144c-1 -20 -5 -38 -20 -52c-5 -5 -9 -7 -13 -7z "/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AB.xml b/data/Petaluma/E4AB.xml
new file mode 100644
index 00000000000..862afdfd5da
--- /dev/null
+++ b/data/Petaluma/E4AB.xml
@@ -0,0 +1 @@
+<symbol id="E4AB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M26 -452h-1c-11 0 -12 14 -14 23c-10 38 -10 78 -10 117c0 36 -1 73 -1 109c0 48 1 96 5 144c1 20 5 38 20 52c5 5 9 7 13 7s8 -5 10 -14c10 -38 17 -76 16 -115v-34c-1 -23 0 -44 0 -61c-1 -18 -1 -36 -1 -53v-49c0 -28 -1 -56 -5 -83c-1 -7 -3 -14 -4 -21 c-3 -16 -16 -21 -28 -22z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AC.xml b/data/Petaluma/E4AC.xml
new file mode 100644
index 00000000000..c6fa073f1a3
--- /dev/null
+++ b/data/Petaluma/E4AC.xml
@@ -0,0 +1 @@
+<symbol id="E4AC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M331 0c-7 0 -14 3 -20 10c-40 50 -86 95 -120 149c-6 9 -9 18 -14 28c-43 -48 -79 -100 -119 -150c-8 -10 -17 -17 -29 -21c-3 -2 -7 -2 -10 -2c-13 0 -22 10 -18 25c8 34 17 68 38 97c39 54 84 102 129 151c8 8 14 17 22 25c7 8 14 21 27 14l4 -3c8 -1 15 -6 19 -15v-1 c3 -4 6 -9 7 -14c34 -64 91 -109 133 -166c9 -12 16 -25 16 -41c-5 -30 -17 -58 -42 -77c-7 -5 -15 -9 -23 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AD.xml b/data/Petaluma/E4AD.xml
new file mode 100644
index 00000000000..a2d0ff8d79e
--- /dev/null
+++ b/data/Petaluma/E4AD.xml
@@ -0,0 +1 @@
+<symbol id="E4AD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 -326l-4 3c-8 1 -15 6 -19 15v1c-3 4 -6 9 -7 14c-34 64 -91 109 -133 166c-9 12 -16 25 -16 41c5 30 17 58 42 77c7 5 15 9 23 9c7 0 14 -3 20 -10c40 -50 86 -95 120 -149c6 -9 9 -18 14 -28c43 48 79 100 119 150c8 10 17 17 29 21c3 2 7 2 10 2 c13 0 22 -10 18 -25c-8 -34 -17 -68 -38 -97c-39 -54 -84 -102 -129 -151c-8 -8 -14 -17 -22 -25c-7 -8 -14 -21 -27 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AE.xml b/data/Petaluma/E4AE.xml
new file mode 100644
index 00000000000..c96054dca09
--- /dev/null
+++ b/data/Petaluma/E4AE.xml
@@ -0,0 +1 @@
+<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 191c-1 2 -2 3 -2 5c0 5 4 11 6 15c47 87 106 166 161 248c11 16 23 24 38 24c8 0 17 -2 27 -6c35 -14 60 -41 86 -67c28 -30 55 -62 83 -92c8 -8 15 -16 15 -26c0 -3 -1 -6 -2 -9c-2 -48 -37 -85 -77 -85c-3 0 -7 0 -10 1c-12 2 -18 8 -25 17c-36 43 -65 93 -106 133 c-3 2 -6 5 -9 8c-6 7 -11 11 -16 11c-6 0 -12 -4 -18 -13c-27 -41 -54 -81 -83 -120c-13 -17 -26 -35 -47 -43c-7 -2 -15 -6 -21 -1zM206 0c-31 1 -42 5 -42 21c0 7 2 16 6 28c7 25 10 50 24 73c7 12 14 21 24 21c5 0 10 -2 17 -7c11 -8 31 -1 34 -20c2 -10 3 -19 5 -28 c5 -26 -32 -80 -57 -86c-5 -1 -9 -2 -11 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4AF.xml b/data/Petaluma/E4AF.xml
new file mode 100644
index 00000000000..2fd012f69d3
--- /dev/null
+++ b/data/Petaluma/E4AF.xml
@@ -0,0 +1 @@
+<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 -143c-5 0 -10 2 -17 7c-11 8 -31 1 -34 20c-2 10 -3 19 -5 28c-5 26 32 80 57 86c5 1 9 2 11 2c31 -1 42 -5 42 -21c0 -7 -2 -16 -6 -28c-7 -25 -10 -50 -24 -73c-7 -12 -14 -21 -24 -21zM211 -483c-8 0 -17 2 -27 6c-35 14 -60 41 -86 67c-28 30 -55 62 -83 92 c-8 8 -15 16 -15 26c0 3 1 6 2 9c2 48 37 85 77 85c3 0 7 0 10 -1c12 -2 18 -8 25 -17c36 -43 65 -93 106 -133c3 -2 6 -5 9 -8c6 -7 11 -11 16 -11c6 0 12 4 18 13c27 41 54 81 83 120c13 17 26 35 47 43c7 2 15 6 21 1c1 -2 2 -3 2 -5c0 -5 -4 -11 -6 -15 c-47 -87 -106 -166 -161 -248c-11 -16 -23 -24 -38 -24z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B0.xml b/data/Petaluma/E4B0.xml
new file mode 100644
index 00000000000..5dabd2c359f
--- /dev/null
+++ b/data/Petaluma/E4B0.xml
@@ -0,0 +1 @@
+<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 176c-10 3 -22 3 -24 14v1c0 8 12 11 19 15c67 35 141 53 209 86c7 3 15 5 28 10c-61 23 -116 43 -171 64l-9 3c-53 20 -68 24 -68 48c0 13 4 31 9 60c3 19 12 28 27 28c5 0 11 -2 18 -4c76 -26 152 -54 228 -80c23 -8 46 -14 68 -22c17 -5 27 -16 27 -34 c0 -44 -18 -69 -60 -82c-74 -22 -142 -59 -215 -84c-20 -6 -39 -14 -58 -20c-9 -2 -19 -5 -28 -3zM186 0c-8 3 -21 -1 -26 11c-2 6 -3 11 -3 15c0 7 2 13 7 20c12 17 20 36 34 52c8 9 20 14 31 14c12 0 23 -5 30 -13c4 -4 5 -8 5 -11c0 -7 -3 -13 -4 -19 c-4 -30 -46 -69 -74 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B1.xml b/data/Petaluma/E4B1.xml
new file mode 100644
index 00000000000..2dcd5513340
--- /dev/null
+++ b/data/Petaluma/E4B1.xml
@@ -0,0 +1 @@
+<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M229 -113c-11 0 -23 5 -31 14c-14 16 -22 35 -34 52c-5 7 -7 13 -7 20c0 4 1 9 3 15c5 12 18 8 26 11c28 0 70 -39 74 -69c1 -6 4 -12 4 -19c0 -3 -1 -7 -5 -11c-7 -8 -18 -13 -30 -13zM24 -505c-10 3 -22 3 -24 14v1c0 8 12 11 19 15c67 35 141 53 209 86 c7 3 15 5 28 10c-61 23 -116 43 -171 64l-9 3c-53 20 -68 24 -68 48c0 13 4 31 9 60c3 19 12 28 27 28c5 0 11 -2 18 -4c76 -26 152 -54 228 -80c23 -8 46 -14 68 -22c17 -5 27 -16 27 -34c0 -44 -18 -69 -60 -82c-74 -22 -142 -59 -215 -84c-20 -6 -39 -14 -58 -20 c-9 -2 -19 -5 -28 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B2.xml b/data/Petaluma/E4B2.xml
new file mode 100644
index 00000000000..71bec4c1001
--- /dev/null
+++ b/data/Petaluma/E4B2.xml
@@ -0,0 +1 @@
+<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M388 217h-46c-100 5 -200 5 -301 5c-4 0 -8 0 -12 1c-12 3 -29 7 -29 20v1c0 10 17 9 27 12c42 11 85 14 128 14c32 0 65 -2 98 -4c54 -3 109 -4 164 -6c13 0 26 -1 38 -4c13 -2 15 -12 17 -20v-2c0 -8 -10 -8 -16 -10c-22 -7 -45 -7 -68 -7zM217 0c-25 2 -41 16 -54 32 c-2 2 -2 5 -2 7c0 8 6 16 11 18c29 14 46 45 79 54c8 2 15 5 21 5c7 0 13 -4 17 -17c4 -12 24 -18 17 -34c-10 -20 -20 -42 -44 -50c-16 -5 -32 -11 -45 -15z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B3.xml b/data/Petaluma/E4B3.xml
new file mode 100644
index 00000000000..483793ab50f
--- /dev/null
+++ b/data/Petaluma/E4B3.xml
@@ -0,0 +1 @@
+<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M200 -116c-7 0 -13 4 -17 17c-4 12 -24 18 -17 34c10 20 20 42 44 50c16 5 32 11 45 15c25 -2 41 -16 54 -32c2 -2 2 -5 2 -7c0 -8 -6 -16 -11 -18c-29 -14 -46 -45 -79 -54c-8 -2 -15 -5 -21 -5zM317 -270c-32 0 -65 2 -98 4c-54 3 -109 4 -164 6c-13 0 -26 1 -38 4 c-13 2 -15 12 -17 20v2c0 8 10 8 16 10c22 7 45 7 68 7h46c100 -5 200 -5 301 -5c4 0 8 0 12 -1c12 -3 29 -7 29 -20v-1c0 -10 -17 -9 -27 -12c-42 -11 -85 -14 -128 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B4.xml b/data/Petaluma/E4B4.xml
new file mode 100644
index 00000000000..01262c8be9c
--- /dev/null
+++ b/data/Petaluma/E4B4.xml
@@ -0,0 +1 @@
+<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M103 99c-14 0 -27 2 -39 18c76 36 160 45 236 88c-55 27 -103 56 -151 87c-33 22 -70 39 -97 69c-10 11 -16 18 -16 24c0 7 8 12 25 19c22 9 39 26 63 32c8 2 15 2 22 2c19 0 35 -5 52 -17c44 -29 90 -57 136 -83c24 -15 51 -28 63 -59c5 -12 16 -23 28 -31 c11 -8 17 -15 17 -21c0 -7 -6 -14 -18 -22c-56 -39 -120 -57 -184 -76c-45 -14 -89 -30 -137 -30zM86 0c-15 0 -30 1 -44 4c-4 0 -9 -1 -12 1c-13 5 -30 10 -30 24c1 13 19 8 29 11c46 12 93 7 140 10c58 3 116 7 174 7c16 0 31 0 47 -1c35 -1 71 -10 107 -10 c14 0 21 -11 24 -23v-3c0 -10 -14 -7 -19 -12c-13 -8 -28 -4 -44 -5c-51 7 -103 9 -156 9c-52 -1 -104 -7 -155 -9c-20 -1 -41 -3 -61 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B5.xml b/data/Petaluma/E4B5.xml
new file mode 100644
index 00000000000..e154e86a60a
--- /dev/null
+++ b/data/Petaluma/E4B5.xml
@@ -0,0 +1 @@
+<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 -57c-58 0 -116 4 -174 7c-47 3 -94 -2 -140 10c-10 3 -28 -2 -29 11c0 14 17 19 30 24c3 2 8 1 12 1c14 3 29 4 44 4c20 0 41 -2 61 -3c51 -2 103 -8 155 -9c53 0 105 2 156 9c16 -1 31 3 44 -5c5 -5 19 -2 19 -12v-3c-3 -12 -10 -23 -24 -23c-36 0 -72 -9 -107 -10 c-16 -1 -31 -1 -47 -1zM103 -438c-14 0 -27 2 -39 18c76 36 160 45 236 88c-55 27 -103 56 -151 87c-33 22 -70 39 -97 69c-10 11 -16 18 -16 24c0 7 8 12 25 19c22 9 39 26 63 32c8 2 15 2 22 2c19 0 35 -5 52 -17c44 -29 90 -57 136 -83c24 -15 51 -28 63 -59 c5 -12 16 -23 28 -31c11 -8 17 -15 17 -21c0 -7 -6 -14 -18 -22c-56 -39 -120 -57 -184 -76c-45 -14 -89 -30 -137 -30z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B6.xml b/data/Petaluma/E4B6.xml
new file mode 100644
index 00000000000..e148c5c8c5a
--- /dev/null
+++ b/data/Petaluma/E4B6.xml
@@ -0,0 +1 @@
+<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 0c-4 0 -9 0 -14 2c17 47 44 87 74 127c40 55 80 111 129 159c19 18 43 31 71 31c21 0 31 -14 31 -37c0 -47 -30 -78 -61 -103c-65 -54 -130 -108 -194 -163c-10 -9 -21 -16 -36 -16z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B7.xml b/data/Petaluma/E4B7.xml
new file mode 100644
index 00000000000..afebf9434ef
--- /dev/null
+++ b/data/Petaluma/E4B7.xml
@@ -0,0 +1 @@
+<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M274 -319c-28 0 -52 13 -71 31c-49 48 -89 104 -129 159c-30 40 -57 80 -74 127c5 2 10 2 14 2c15 0 26 -7 36 -16c64 -55 129 -109 194 -163c31 -25 61 -56 61 -103c0 -23 -10 -37 -31 -37z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B8.xml b/data/Petaluma/E4B8.xml
new file mode 100644
index 00000000000..57177adb210
--- /dev/null
+++ b/data/Petaluma/E4B8.xml
@@ -0,0 +1 @@
+<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M227 0c-97 0 -171 71 -209 155c-13 28 -18 56 -18 86c0 9 0 18 1 27c1 14 4 28 19 28h1c11 0 13 -14 15 -23c21 -68 66 -114 127 -146c27 -14 56 -21 86 -21c57 0 115 26 152 73c21 27 41 54 53 87c2 8 7 13 13 17c5 3 9 5 12 5c5 0 9 -4 11 -14c1 -8 2 -16 2 -23 c0 -26 -8 -50 -20 -74c-31 -61 -73 -114 -134 -148c-39 -22 -67 -29 -111 -29z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4B9.xml b/data/Petaluma/E4B9.xml
new file mode 100644
index 00000000000..f8537c765a2
--- /dev/null
+++ b/data/Petaluma/E4B9.xml
@@ -0,0 +1 @@
+<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M21 -296h-1c-15 0 -18 14 -19 28c-1 9 -1 18 -1 27c0 30 5 58 18 86c38 84 112 155 209 155c44 0 72 -7 111 -29c61 -34 103 -87 134 -148c12 -24 20 -48 20 -74c0 -7 -1 -15 -2 -23c-2 -10 -6 -14 -11 -14c-3 0 -7 2 -12 5c-6 4 -11 9 -13 17c-12 33 -32 60 -53 87 c-37 47 -95 73 -152 73c-30 0 -59 -7 -86 -21c-61 -32 -106 -78 -127 -146c-2 -9 -4 -23 -15 -23z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4BA.xml b/data/Petaluma/E4BA.xml
new file mode 100644
index 00000000000..8a4740a5bbf
--- /dev/null
+++ b/data/Petaluma/E4BA.xml
@@ -0,0 +1 @@
+<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M404 0c-40 74 -112 95 -186 105c-10 1 -20 2 -29 2c-61 0 -116 -26 -164 -69c-4 -3 -8 -7 -12 -11c-3 -3 -6 -7 -10 -5c-5 2 -3 7 -3 11c-2 46 21 77 60 100c37 22 78 38 119 46c8 2 16 2 24 2c35 0 69 -14 100 -29c19 -8 38 -19 53 -33c27 -27 53 -55 56 -96v-7 c0 -4 -2 -7 -8 -16z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4BB.xml b/data/Petaluma/E4BB.xml
new file mode 100644
index 00000000000..fdc9f5c8a89
--- /dev/null
+++ b/data/Petaluma/E4BB.xml
@@ -0,0 +1 @@
+<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M404 0c6 -9 8 -12 8 -16v-7c-3 -41 -29 -69 -56 -96c-15 -14 -34 -25 -53 -33c-31 -15 -65 -29 -100 -29c-8 0 -16 0 -24 2c-41 8 -82 24 -119 46c-39 23 -62 54 -60 100c0 4 -2 9 3 11c4 2 7 -2 10 -5c4 -4 8 -8 12 -11c48 -43 103 -69 164 -69c9 0 19 1 29 2 c74 10 146 31 186 105z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4BC.xml b/data/Petaluma/E4BC.xml
new file mode 100644
index 00000000000..b5a8aaf38a9
--- /dev/null
+++ b/data/Petaluma/E4BC.xml
@@ -0,0 +1 @@
+<symbol id="E4BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 127c-6 2 -7 5 -7 9c0 5 4 13 3 19c-1 5 -1 11 -1 16c0 63 39 110 76 157c21 25 42 50 62 76c10 12 20 18 31 18c8 0 17 -4 25 -12c45 -43 87 -90 127 -139c10 -13 13 -29 12 -46c2 -19 -6 -37 -12 -55c-6 -15 -16 -23 -28 -23c-9 0 -19 5 -28 15 c-38 44 -72 90 -106 137c-5 6 -8 9 -11 9s-5 -4 -9 -9c-34 -47 -74 -89 -99 -141c-2 -4 -5 -8 -8 -12c-7 -9 -15 -23 -27 -19zM211 0c-50 0 -100 0 -150 1c-24 0 -44 7 -61 24v5c50 12 101 15 152 15c19 0 39 -1 59 -1h292c6 0 11 0 17 -1c11 0 13 -11 16 -18 c1 -2 1 -3 1 -4c0 -7 -10 -6 -14 -9c-11 -9 -26 -9 -39 -9c-91 -2 -182 -3 -273 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4BD.xml b/data/Petaluma/E4BD.xml
new file mode 100644
index 00000000000..6901a244037
--- /dev/null
+++ b/data/Petaluma/E4BD.xml
@@ -0,0 +1 @@
+<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 -45c-51 0 -102 3 -152 15v5c17 17 37 24 61 24c50 1 100 1 150 1c91 0 182 -1 273 -3c13 0 28 0 39 -9c4 -3 14 -2 14 -9c0 -1 0 -2 -1 -4c-3 -7 -5 -18 -16 -18c-6 -1 -11 -1 -17 -1h-292c-20 0 -40 -1 -59 -1zM271 -422c-8 0 -17 4 -25 12c-45 43 -87 90 -127 139 c-10 13 -13 29 -12 46c-2 19 6 37 12 55c6 15 16 23 28 23c9 0 19 -5 28 -15c38 -44 72 -90 106 -137c5 -6 8 -9 11 -9s5 4 9 9c34 47 74 89 99 141c2 4 5 8 8 12c7 9 15 23 27 19c6 -2 7 -5 7 -9s-3 -11 -3 -17c0 -5 1 -12 1 -18c0 -63 -39 -110 -76 -157 c-21 -25 -42 -50 -62 -76c-10 -12 -20 -18 -31 -18z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C0.xml b/data/Petaluma/E4C0.xml
new file mode 100644
index 00000000000..243880b98a8
--- /dev/null
+++ b/data/Petaluma/E4C0.xml
@@ -0,0 +1 @@
+<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 7c-4 -4 -3 -4 -7 -4c-9 -3 -12 1 -13 10c-4 35 -4 73 -4 108c-5 15 -3 33 0 52c15 75 56 137 109 192c27 28 51 61 90 74c24 8 51 15 73 15c39 -3 78 -20 114 -60c54 -60 83 -126 83 -201c-5 -21 -6 -39 -9 -58c-3 -22 -5 -43 -11 -64c-2 -7 -4 -14 -8 -20 c-6 -9 -14 -21 -26 -16c-9 3 -4 17 -5 26v23c0 7 6 16 6 22c-5 86 -51 145 -118 193c-16 11 -27 19 -42 19c-23 -3 -42 -10 -62 -24c-31 -22 -59 -49 -84 -78c-36 -41 -49 -90 -59 -141c-5 -24 -8 -49 -27 -68zM235 26c-18 2 -36 2 -54 7c-20 6 -27 23 -25 54 c2 22 19 20 31 20c21 1 41 -5 60 -15c13 -7 23 -15 23 -27c-5 -6 -5 -10 -6 -13c0 -22 5 -24 -7 -24c-9 -3 -14 -3 -22 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C1.xml b/data/Petaluma/E4C1.xml
new file mode 100644
index 00000000000..5b933bbba6d
--- /dev/null
+++ b/data/Petaluma/E4C1.xml
@@ -0,0 +1 @@
+<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M239 -427c-10 -2 -19 -3 -28 -3c-42 0 -78 20 -113 46c-79 59 -97 142 -98 229c-2 43 6 81 14 119c1 5 3 9 4 14c5 14 16 22 29 21c10 -2 8 -17 10 -26c1 -4 1 -9 1 -13c0 -15 -4 -30 -6 -44c-3 -14 -4 -27 -4 -40c0 -58 29 -105 77 -144c31 -26 65 -44 103 -44 c13 0 27 2 41 7c49 16 89 46 121 87c34 43 60 91 81 142c3 5 6 9 7 15c4 14 16 20 27 20c12 0 12 -16 13 -27c3 -38 -6 -74 -23 -108c-36 -77 -75 -151 -148 -201c-33 -23 -68 -41 -108 -50zM288 -132l-35 5c-43 9 -66 38 -66 79c0 5 0 10 1 16c1 8 11 13 26 13 c49 0 88 -41 88 -90c0 -19 -4 -24 -14 -23z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C2.xml b/data/Petaluma/E4C2.xml
new file mode 100644
index 00000000000..a7ce6a44d84
--- /dev/null
+++ b/data/Petaluma/E4C2.xml
@@ -0,0 +1 @@
+<symbol id="E4C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M707 -31c-24 28 -46 51 -66 75c-86 103 -176 203 -264 304c-7 8 -12 12 -17 12s-10 -4 -17 -11c-76 -76 -151 -155 -227 -231c-24 -24 -46 -51 -69 -76c-11 -13 -24 -23 -47 -27c15 29 33 51 51 73c66 81 124 167 185 252c33 46 65 91 97 137c9 13 18 19 28 19 c8 0 17 -6 26 -18c100 -134 200 -268 298 -405c15 -21 26 -45 26 -74c0 -9 -2 -19 -4 -30zM581 -11l-75 62c-48 39 -95 78 -141 119c-4 4 -8 6 -11 6s-6 -2 -11 -6c-60 -48 -120 -96 -178 -146l-8 -6c-8 -5 -18 -19 -26 -12c-2 2 -3 4 -3 6c0 6 10 13 13 19 c25 50 65 87 100 128c34 39 68 78 100 119c8 10 14 15 19 15c6 0 10 -6 16 -18c3 -7 8 -13 13 -19c55 -66 112 -132 166 -199c13 -15 27 -31 27 -56c0 -4 0 -8 -1 -12zM344 0c-6 0 -10 5 -13 12c-8 20 -14 41 -22 61c-2 4 -2 8 -2 12c0 9 4 16 12 22c24 16 39 25 51 25 c14 0 23 -15 32 -52c2 -10 5 -20 5 -33c0 -12 -2 -23 -21 -25c-11 -1 -21 -11 -31 -18c-4 -3 -8 -4 -11 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C3.xml b/data/Petaluma/E4C3.xml
new file mode 100644
index 00000000000..9c8823c7609
--- /dev/null
+++ b/data/Petaluma/E4C3.xml
@@ -0,0 +1 @@
+<symbol id="E4C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M352 -266c-5 0 -10 3 -16 9l-173 172c-20 20 -34 48 -43 76c-1 3 -1 5 -1 7c0 5 2 9 5 12c2 2 4 3 6 3c4 0 7 -6 10 -8c58 -50 117 -99 174 -150c10 -8 17 -12 25 -12c7 0 14 3 23 10c62 48 123 97 186 142c7 5 13 9 24 7c-1 -35 -9 -67 -34 -92 c-56 -56 -114 -110 -170 -166c-6 -6 -11 -10 -16 -10zM349 -475c-8 1 -11 8 -14 12c-85 113 -167 228 -254 339c-25 32 -50 64 -71 99c-4 6 -7 13 -9 19c-1 1 -1 3 -1 4c0 4 4 9 6 11s3 3 5 3c4 0 6 -6 8 -8c31 -31 60 -62 89 -93c82 -87 165 -171 243 -262 c6 -7 11 -11 16 -11s10 3 16 11c95 112 190 223 286 335l7 9c5 6 12 8 18 5c2 -1 3 -3 3 -5c0 -4 -2 -7 -3 -10c-11 -34 -36 -61 -57 -89c-86 -115 -175 -229 -263 -343c-7 -10 -15 -19 -25 -26zM338 -114c-14 0 -13 5 -16 13c-4 24 -9 48 -13 72c0 3 -1 7 1 9 c11 20 32 14 49 19h3c11 0 14 -12 16 -20c3 -17 4 -33 5 -47c0 -27 -20 -46 -45 -46z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C4.xml b/data/Petaluma/E4C4.xml
new file mode 100644
index 00000000000..c2de0405058
--- /dev/null
+++ b/data/Petaluma/E4C4.xml
@@ -0,0 +1 @@
+<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -18c-9 3 -4 13 -5 19c0 13 -6 24 -6 37c0 3 1 7 2 10c-1 4 -1 7 -1 10c0 15 7 26 18 37c79 79 153 162 229 244c5 5 10 9 15 9c4 0 9 -2 14 -7l256 -237c8 -8 12 -26 12 -46c0 -25 -6 -51 -16 -59c-2 -3 -4 -4 -6 -4s-4 3 -7 5c-49 47 -100 91 -148 138l-103 99 c-3 3 -6 5 -9 5s-6 -2 -10 -6c-73 -81 -147 -162 -221 -242c-4 -5 -7 -13 -14 -12zM248 17c-8 0 -10 4 -11 12c-3 25 -6 48 -6 73c0 20 18 32 47 32c20 0 19 -15 20 -29c1 -7 1 -15 1 -23c0 -48 -6 -53 -44 -63c-3 -2 -5 -2 -7 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C5.xml b/data/Petaluma/E4C5.xml
new file mode 100644
index 00000000000..c7d6a798ca5
--- /dev/null
+++ b/data/Petaluma/E4C5.xml
@@ -0,0 +1 @@
+<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M268 -335c-6 0 -13 6 -24 19c-43 50 -85 101 -128 151c-36 42 -74 84 -102 132c-4 6 -6 12 -9 17c-3 4 -5 9 -5 14c0 3 1 7 5 10c2 2 4 2 6 2c5 0 9 -7 13 -10c85 -73 170 -147 254 -221c5 -5 9 -7 13 -7s7 2 12 6c72 70 145 139 219 207c11 10 20 25 43 23 c-10 -37 -34 -63 -57 -89c-70 -80 -143 -157 -215 -235c-12 -13 -19 -19 -25 -19zM265 -148c-13 0 -17 10 -18 30c-1 28 -5 55 -5 83c1 25 19 25 34 29c5 1 9 2 14 2c9 0 17 -4 21 -18c4 -12 9 -24 9 -37c-2 -16 -3 -33 -6 -49c-4 -17 -15 -30 -32 -36c-7 -2 -12 -4 -17 -4z "/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C6.xml b/data/Petaluma/E4C6.xml
new file mode 100644
index 00000000000..a1a49928bb6
--- /dev/null
+++ b/data/Petaluma/E4C6.xml
@@ -0,0 +1 @@
+<symbol id="E4C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -6c-10 0 -8 11 -8 18c-4 43 -6 86 -6 129c0 42 1 85 1 128v32c0 31 7 37 37 36l490 -12c36 -1 39 -6 44 -50c7 -58 13 -117 19 -175c3 -29 -8 -69 -26 -88c-8 35 -9 68 -12 100l-9 95c-1 12 -6 13 -16 13c-112 4 -223 9 -334 11c-49 1 -98 2 -147 5 c-1 -1 -2 -1 -3 -1c-12 0 -15 -5 -15 -18c2 -39 -1 -78 4 -118c1 -8 1 -15 1 -23c0 -22 -3 -45 -9 -66c-1 -8 -5 -16 -11 -16zM280 2c-21 0 -22 8 -30 43c0 1 0 3 -1 4c-2 9 -3 17 -3 24c0 35 22 51 66 47c7 0 8 -4 11 -9c9 -17 9 -35 9 -53v-15c0 -5 0 -9 -1 -14 c-2 -14 -9 -23 -26 -25c-10 -1 -18 -2 -25 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C7.xml b/data/Petaluma/E4C7.xml
new file mode 100644
index 00000000000..5df952682d9
--- /dev/null
+++ b/data/Petaluma/E4C7.xml
@@ -0,0 +1 @@
+<symbol id="E4C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M551 -335h-263v1h-259c-15 0 -23 2 -25 20c-2 22 -4 43 -4 65c0 55 7 110 10 165c1 22 2 46 5 69c2 14 11 21 21 22h1c11 0 9 -14 10 -21c2 -9 2 -19 2 -28c0 -29 -6 -58 -6 -88c-1 -26 -5 -51 -8 -76v-5c0 -11 6 -16 19 -16c65 0 130 3 196 2c95 -1 191 -2 286 -2 c20 0 24 6 23 24c-3 47 -5 94 -5 142c0 13 3 26 5 40c1 7 8 8 12 9h1c6 0 6 -6 6 -10c5 -36 10 -72 13 -109c3 -34 5 -68 10 -102c1 -5 1 -10 1 -15c0 -21 -5 -41 -11 -60s-20 -27 -40 -27zM284 -127c-22 0 -24 10 -31 48c-2 14 -1 30 -1 45v2c0 8 6 13 12 17 c15 7 31 9 47 9c9 0 17 0 26 -1c11 0 12 -13 14 -22c1 -4 1 -7 1 -11c0 -7 -1 -15 -1 -22c0 -8 1 -16 0 -24c-1 -24 -13 -36 -36 -38c-13 -2 -23 -3 -31 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C8.xml b/data/Petaluma/E4C8.xml
new file mode 100644
index 00000000000..8f194ea45c9
--- /dev/null
+++ b/data/Petaluma/E4C8.xml
@@ -0,0 +1 @@
+<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -14c-3 1 -6 7 -7 11c-2 25 -11 48 -11 73c0 113 5 227 5 340c0 19 8 27 27 27c107 0 213 -1 320 -2c108 -1 217 -2 326 -2c15 0 23 -4 25 -19c3 -20 6 -41 6 -62c3 -103 5 -206 6 -309c0 -19 -1 -39 -21 -56c-3 28 -6 55 -7 82c-3 79 -3 158 -8 238 c-1 17 -8 20 -24 20c-170 0 -341 4 -511 4h-44c-15 0 -29 0 -44 2c-2 -1 -4 -1 -6 -1h-2c-12 0 -14 -8 -14 -21v-274c0 -14 0 -27 -5 -40c-2 -5 -4 -12 -11 -11zM130 -6c-7 0 -8 15 -10 25c-16 80 -14 161 -14 243c0 16 7 22 25 22c138 -5 277 -4 415 -13 c16 -1 24 -5 28 -21c10 -41 10 -82 17 -123c5 -29 4 -58 4 -88c0 -15 -3 -30 -16 -42c-12 16 -9 35 -11 51c-6 32 -8 65 -10 97c-1 18 -8 20 -22 21l-219 9c-54 2 -108 4 -162 7h-3c-11 0 -13 -4 -13 -15c-2 -43 7 -86 5 -129c0 -6 1 -12 0 -17c-2 -11 -1 -26 -14 -27z M332 2c-27 1 -28 13 -35 59c-2 10 -3 21 -3 31c0 15 9 22 25 23c14 2 28 3 43 4c5 -1 9 0 13 0c22 0 26 -9 28 -38c1 -7 0 -13 0 -19h1v-20c-1 -20 -9 -32 -32 -35c-18 -3 -31 -5 -40 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4C9.xml b/data/Petaluma/E4C9.xml
new file mode 100644
index 00000000000..3d490ea5bb6
--- /dev/null
+++ b/data/Petaluma/E4C9.xml
@@ -0,0 +1 @@
+<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M39 -427c-20 0 -24 8 -28 25c-6 24 -6 48 -6 73v37c0 91 -5 182 -5 273c0 12 -1 24 15 31c10 -16 14 -34 14 -53c0 -62 0 -123 1 -185c0 -17 2 -35 2 -52c0 -5 0 -11 -1 -17c-2 -28 0 -29 30 -29c27 -1 55 0 82 0c159 0 319 4 478 5c6 1 11 1 17 1c11 0 15 5 15 16v89 c0 43 0 86 -4 129c-1 10 -1 21 -1 31c0 22 2 45 5 67c2 10 9 12 18 16c6 -14 7 -27 7 -40s-1 -25 0 -38c3 -45 4 -89 4 -134s1 -89 4 -134c2 -27 -3 -54 -10 -80c-4 -16 -14 -25 -34 -25c-149 0 -297 -1 -446 -4c-52 -1 -104 0 -157 -2zM548 -271c-141 7 -282 9 -424 9 c-19 0 -21 9 -23 24c-5 34 -5 67 -5 101v64c-1 16 -3 31 -3 46c0 8 0 15 2 23c2 11 6 17 18 21c9 -17 11 -35 11 -52c0 -15 -1 -30 0 -45c1 -11 1 -21 1 -31v-34c0 -10 4 -14 16 -14l406 -9c12 0 15 3 15 14v135c0 14 0 29 19 35c8 -22 6 -44 6 -66v-44c0 -22 0 -44 2 -66 c1 -6 1 -12 1 -18c0 -24 -4 -47 -10 -70c-4 -16 -13 -24 -32 -23zM333 -114c-5 0 -11 1 -18 1c-10 1 -12 7 -12 14v38v12c0 43 -7 50 63 50c26 0 27 -8 27 -46c0 -52 -12 -69 -60 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4CE.xml b/data/Petaluma/E4CE.xml
new file mode 100644
index 00000000000..0ff468f2637
--- /dev/null
+++ b/data/Petaluma/E4CE.xml
@@ -0,0 +1 @@
+<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M83 0c1 16 0 31 0 46c0 28 3 55 28 78c-4 1 -8 1 -12 1c-13 0 -23 -4 -34 -6c-8 -2 -14 -3 -19 -3c-14 0 -19 8 -25 30c-6 23 -18 45 -20 70c0 4 -1 8 -1 12c0 20 8 28 32 35c5 2 10 2 15 2c12 2 26 10 38 10c4 0 8 -1 12 -4c22 -16 42 -37 46 -67c3 -20 5 -39 5 -59 c0 -31 -5 -61 -18 -91c-9 -21 -22 -40 -47 -54z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E0.xml b/data/Petaluma/E4E0.xml
new file mode 100644
index 00000000000..2100669b45d
--- /dev/null
+++ b/data/Petaluma/E4E0.xml
@@ -0,0 +1 @@
+<symbol id="E4E0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 -255c-33 0 -42 9 -40 42c4 78 12 156 11 234v42c0 56 1 112 1 168c0 10 3 15 12 18c13 4 25 6 37 6c17 0 34 -4 51 -12c13 -6 17 -19 17 -34v-186c1 -14 1 -28 1 -44c0 -60 -6 -130 -6 -200c0 -8 -2 -16 -10 -17c-25 -3 -47 -17 -74 -17zM32 -248 c-21 0 -31 18 -31 38c-1 71 -1 142 -1 213h2v208c-1 31 11 41 45 42c15 0 31 -1 45 -6c17 -5 28 -18 28 -37v-422c0 -10 -3 -17 -13 -19c-23 -4 -44 -13 -67 -16c-3 -1 -6 -1 -8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E1.xml b/data/Petaluma/E4E1.xml
new file mode 100644
index 00000000000..2e24b00e1fa
--- /dev/null
+++ b/data/Petaluma/E4E1.xml
@@ -0,0 +1 @@
+<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M40 -249c-27 2 -34 8 -36 35v64c-3 39 -4 79 -4 118c0 77 4 155 9 233v2c0 6 -3 13 -3 18c0 4 2 8 6 11c14 9 30 18 49 15c16 -2 34 -3 49 -9c19 -8 30 -24 29 -48c-4 -94 -7 -188 -10 -282c-1 -42 1 -84 -4 -127c-1 -9 -1 -19 -12 -20c-25 -1 -48 -12 -73 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E2.xml b/data/Petaluma/E4E2.xml
new file mode 100644
index 00000000000..7359c90125a
--- /dev/null
+++ b/data/Petaluma/E4E2.xml
@@ -0,0 +1 @@
+<symbol id="E4E2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 0c-18 0 -27 11 -27 33v88h-2v48c0 17 -1 33 -1 50c0 15 14 17 22 21c14 6 29 9 44 9c11 0 21 -2 31 -4c16 -5 25 -15 25 -34s-2 -39 -2 -58c0 -29 1 -57 2 -86c0 -27 -2 -48 -36 -53c-15 -2 -30 -10 -46 -13c-4 -1 -7 -1 -10 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E3.xml b/data/Petaluma/E4E3.xml
new file mode 100644
index 00000000000..791933a1f4a
--- /dev/null
+++ b/data/Petaluma/E4E3.xml
@@ -0,0 +1 @@
+<symbol id="E4E3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 -120h-194c-48 0 -53 18 -52 62c1 8 6 18 6 28c0 6 -1 12 -1 18c0 8 2 15 14 17c14 3 28 9 44 8c118 -1 237 -1 356 -1c11 0 20 2 31 2c5 0 10 0 16 -2c15 -5 22 -12 27 -26s6 -28 6 -43c0 -7 -1 -15 -1 -23c-1 -21 -27 -39 -53 -39h-199v-1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E4.xml b/data/Petaluma/E4E4.xml
new file mode 100644
index 00000000000..163a1915fc2
--- /dev/null
+++ b/data/Petaluma/E4E4.xml
@@ -0,0 +1 @@
+<symbol id="E4E4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 0c-48 0 -66 19 -64 66c0 14 -1 28 -3 41c-1 7 -1 12 -1 17c0 29 13 38 51 38h196c49 0 99 -3 149 -3c23 0 46 2 69 2c27 0 41 -12 46 -40c3 -21 9 -42 7 -64c-2 -37 -18 -55 -56 -56c-25 -1 -51 -1 -76 -1h-318z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E5.xml b/data/Petaluma/E4E5.xml
new file mode 100644
index 00000000000..8920a8e2071
--- /dev/null
+++ b/data/Petaluma/E4E5.xml
@@ -0,0 +1 @@
+<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M105 -414c-1 -1 -3 -1 -4 -1c-5 0 -9 7 -15 9c-10 3 -15 11 -19 19c-33 65 -60 133 -67 206c-5 61 40 112 108 121c6 1 12 -1 19 5c-16 35 -36 69 -58 100c-14 21 -27 42 -37 65c-2 5 -4 10 -4 15c0 8 5 16 15 23c20 15 42 27 63 39c16 10 24 17 24 26c0 7 -4 15 -13 26 c-30 40 -49 87 -80 127c-6 8 -10 16 -10 24c0 7 4 15 14 21c5 3 9 4 13 4c10 0 19 -9 26 -16c30 -27 51 -61 68 -97c25 -53 56 -102 86 -152c9 -14 12 -27 12 -40c0 -19 -7 -38 -18 -56c-12 -23 -31 -40 -49 -59c-7 -7 -11 -13 -11 -20c0 -4 2 -9 5 -15 c20 -41 36 -85 66 -121c15 -18 19 -42 23 -65l1 -7c0 -9 -4 -18 -13 -22c-2 -1 -3 -1 -5 -1c-8 0 -15 9 -20 16c-18 25 -35 52 -67 62c-7 2 -13 5 -20 1c-28 -12 -53 -53 -53 -87c0 -3 0 -7 1 -11c8 -35 17 -69 25 -104c1 -4 3 -8 3 -12c-2 -8 -1 -18 -9 -23z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E6.xml b/data/Petaluma/E4E6.xml
new file mode 100644
index 00000000000..e7123776f14
--- /dev/null
+++ b/data/Petaluma/E4E6.xml
@@ -0,0 +1 @@
+<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 -260c20 112 64 217 87 330c-29 -18 -53 -34 -82 -45c-16 -6 -31 -8 -43 -8c-52 0 -76 41 -76 87c0 7 1 14 2 22c6 37 12 74 31 107c11 19 19 28 32 28c6 0 14 -2 23 -6c19 -9 14 -31 14 -48c0 -9 -4 -18 -8 -25c-2 -4 -3 -7 -3 -11s2 -9 6 -13s8 -6 12 -6s8 2 12 4 c29 18 57 36 82 60c16 15 38 25 62 29c3 1 5 1 8 1c12 0 15 -9 16 -23v-5c0 -7 -2 -14 -4 -20c-36 -109 -54 -223 -93 -330c-13 -36 -27 -71 -45 -104c-6 -12 -15 -23 -33 -24z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E7.xml b/data/Petaluma/E4E7.xml
new file mode 100644
index 00000000000..a10a7959985
--- /dev/null
+++ b/data/Petaluma/E4E7.xml
@@ -0,0 +1 @@
+<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M145 -327c-4 2 -5 6 -5 10c0 43 13 85 23 126c3 10 9 20 6 30c-2 1 -3 1 -5 1c-5 0 -9 -4 -12 -8c-11 -12 -26 -18 -41 -24c-22 -9 -40 -12 -54 -12c-31 0 -45 22 -53 75c-3 13 -4 27 -4 41c0 19 3 37 12 55c8 14 18 31 36 27c22 -5 50 1 61 -31c5 -13 14 -24 13 -40v-2 c0 -9 8 -9 14 -6c27 11 56 16 65 51c9 34 16 68 34 104c-28 -13 -47 -29 -71 -38c-22 -8 -40 -13 -56 -13c-44 0 -67 34 -67 106c0 26 5 52 19 76c12 19 48 36 74 36c4 0 9 -1 13 -2c10 -3 18 -25 18 -43c0 -4 0 -8 -1 -12c-1 -9 -5 -18 -9 -31c49 21 84 55 124 82 c1 1 2 2 4 3c8 7 17 10 26 10c6 0 11 -1 15 -3c7 -4 9 -11 9 -20c0 -41 -24 -72 -36 -109c-29 -88 -54 -177 -72 -269c-5 -25 -8 -52 -12 -78c-5 -32 -19 -60 -42 -83c-7 -7 -17 -13 -26 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E8.xml b/data/Petaluma/E4E8.xml
new file mode 100644
index 00000000000..5e3eaad3aad
--- /dev/null
+++ b/data/Petaluma/E4E8.xml
@@ -0,0 +1 @@
+<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M123 -497c-12 2 -13 16 -15 27c-4 20 -15 37 -15 57c-2 60 17 115 33 171c1 1 2 2 2 4c3 12 10 27 10 39c0 3 -1 6 -2 8c-2 3 -4 4 -8 4c-9 0 -23 -8 -33 -9c-8 -3 -16 -3 -23 -3c-36 0 -58 21 -65 63c-3 18 -7 36 -7 54c0 12 2 24 6 36c8 24 35 44 64 44 c24 0 41 -14 55 -33c2 -3 1 -9 4 -11c9 -6 0 -28 15 -24c16 3 36 7 41 30c10 43 21 84 34 132c-39 -24 -71 -48 -115 -48c-35 0 -57 20 -64 57c-4 23 -10 45 -10 68c2 33 13 49 44 58c8 2 16 4 25 4c30 0 60 -15 76 -39c3 -5 6 -7 9 -7c2 0 5 1 8 3c30 19 61 36 61 80 c0 20 10 40 16 64c-40 -24 -71 -53 -112 -66c-12 -4 -24 -6 -36 -7c-3 -1 -6 -1 -9 -1c-19 0 -33 12 -38 31c-8 27 -15 55 -15 84c0 5 1 10 1 15c6 48 38 77 82 77c8 0 16 -1 24 -2c18 -4 37 -11 48 -26c6 -9 12 -13 17 -13c7 1 14 5 20 11l39 33c9 8 21 15 32 15 c4 0 8 -1 11 -3c9 -5 14 -18 14 -31c0 -4 -1 -8 -2 -12c-10 -53 -21 -106 -31 -159c-21 -103 -41 -207 -63 -311c-18 -79 -34 -158 -48 -238c-12 -62 -27 -123 -41 -184c-2 -9 -6 -17 -11 -24c-6 -10 -16 -21 -28 -18z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4E9.xml b/data/Petaluma/E4E9.xml
new file mode 100644
index 00000000000..74eed922866
--- /dev/null
+++ b/data/Petaluma/E4E9.xml
@@ -0,0 +1 @@
+<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 -720c-12 0 -13 12 -16 20c-5 12 -11 25 -15 37c-4 10 -5 20 -5 30c0 21 6 41 12 61c16 53 26 106 40 162c-23 -9 -42 -22 -64 -27c-10 -3 -19 -4 -28 -4c-32 0 -55 17 -59 49c-2 15 -4 31 -4 46c0 21 3 42 10 63c9 26 41 43 74 43c13 0 26 -2 38 -9 c17 -9 34 -21 40 -39c3 -8 6 -10 9 -10s6 3 9 6c5 3 9 9 12 14c2 2 2 5 3 7c8 32 24 62 26 99c-17 -5 -32 -11 -48 -15c-10 -3 -19 -4 -28 -4c-19 0 -36 6 -50 23c-8 9 -13 19 -13 32v48c0 10 1 21 3 32c9 35 34 56 70 56c33 0 57 -20 66 -55c1 -3 1 -7 1 -11 c34 6 42 30 47 56c7 29 13 58 20 90c-26 -16 -50 -30 -78 -35c-6 -1 -11 -1 -17 -1c-32 0 -61 16 -64 62c-1 18 -4 36 -4 54c0 9 1 18 3 27c6 29 34 50 63 50c10 0 20 -3 30 -9c22 -13 40 -28 44 -56c36 15 63 34 63 78c0 20 8 39 14 64l-40 -30c-23 -18 -49 -25 -77 -25 c-17 0 -36 3 -41 19c-11 29 -21 58 -21 89c0 10 2 20 4 30c8 33 30 52 62 60c8 2 16 3 24 3c22 0 41 -8 57 -28c4 -5 7 -8 11 -8c3 0 7 2 11 5c15 12 33 22 49 33c11 8 25 15 35 10c10 -6 11 -22 11 -35c0 -21 -4 -41 -11 -61c-35 -99 -50 -203 -76 -304 c-28 -109 -48 -219 -73 -328c-22 -96 -48 -191 -72 -286c-12 -47 -24 -93 -31 -141c-1 -7 -3 -14 -6 -20c-5 -9 -10 -17 -20 -17z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4EA.xml b/data/Petaluma/E4EA.xml
new file mode 100644
index 00000000000..cca3aaf99cb
--- /dev/null
+++ b/data/Petaluma/E4EA.xml
@@ -0,0 +1 @@
+<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 -705c-7 -4 -12 -6 -16 -6c-8 0 -11 7 -12 22c-1 8 -1 15 -1 23c0 64 20 125 32 188c3 16 7 31 11 50c-28 -15 -51 -29 -79 -35c-7 -1 -15 -2 -21 -2c-46 0 -79 31 -75 79c3 37 -4 75 19 109c11 16 31 25 51 25c8 0 16 -1 23 -4c24 -10 34 -24 34 -47v-4 c0 -4 0 -8 -1 -12c-2 -7 -2 -14 -2 -22c60 14 99 75 100 163c-22 -13 -42 -27 -65 -35c-11 -4 -22 -6 -31 -6c-36 0 -59 27 -56 67c2 25 -1 51 5 76c6 27 22 44 49 50c9 2 17 4 25 4c18 0 35 -7 49 -23c9 -10 5 -21 8 -33c37 13 54 40 60 77c4 20 9 40 14 62 c-29 -23 -54 -46 -90 -54c-9 -2 -17 -3 -25 -3c-38 0 -61 25 -61 70c0 38 -1 76 19 109c15 24 43 38 70 38c19 0 38 -6 53 -19c13 -10 10 -27 18 -40c58 29 59 86 72 141c-27 -12 -50 -23 -75 -28c-4 -1 -8 -1 -12 -1c-32 0 -57 23 -58 57c-1 31 2 63 10 94 c7 27 34 46 64 46c29 0 60 -26 64 -55c0 -3 1 -6 1 -10c26 9 40 24 46 52c7 35 20 68 32 107c-30 -19 -57 -35 -89 -35c-20 -1 -40 1 -58 11s-28 25 -27 47c0 12 -1 24 -1 37c0 12 1 25 3 37c6 29 24 45 52 53c8 3 17 4 26 4c22 0 41 -8 59 -22c12 -9 8 -25 12 -41 c19 16 38 25 49 43c7 11 18 14 28 14c5 0 9 -1 13 -1c11 -1 11 -18 12 -27c1 -7 1 -13 1 -20c0 -27 -6 -54 -14 -81c-36 -122 -72 -244 -100 -367c-35 -154 -70 -306 -104 -460c-19 -86 -39 -172 -55 -259l-30 -162c-3 -17 -10 -32 -26 -41z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4EB.xml b/data/Petaluma/E4EB.xml
new file mode 100644
index 00000000000..15e8612e1d7
--- /dev/null
+++ b/data/Petaluma/E4EB.xml
@@ -0,0 +1 @@
+<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 -940c-11 3 -10 15 -12 24c-6 20 -9 40 -9 59c0 21 4 42 11 63c15 39 21 80 33 119c2 8 3 16 5 26c-24 -12 -47 -22 -71 -27h-13c-28 -1 -49 16 -55 45c-5 24 -9 48 -9 73c0 43 28 71 64 71c9 -1 19 -3 28 -6c19 -8 38 -14 47 -35c1 -3 4 -7 7 -5c15 13 36 18 47 36 c1 1 1 3 1 4l24 99c-20 -11 -39 -21 -57 -30c-14 -6 -28 -9 -42 -9h-6c-6 0 -13 1 -19 3c-26 7 -42 24 -43 51c-1 10 -2 20 -2 30c1 13 1 28 2 42c3 36 19 54 55 62c9 2 19 3 28 3c41 -2 53 -14 56 -53c51 13 62 32 79 131c-26 -11 -48 -28 -75 -35c-10 -3 -19 -4 -28 -4 c-35 0 -56 23 -59 67c-1 16 -2 32 -2 47c1 13 1 25 2 39c3 26 19 39 42 47c10 4 22 7 33 7c14 -1 26 -5 37 -14c8 -7 11 -16 11 -26c0 -12 -4 -26 -5 -38c74 26 110 75 112 152c-25 -11 -48 -24 -74 -31c-13 -2 -22 -3 -32 -3c-35 0 -55 24 -62 67c-2 12 -3 24 -3 35 c1 14 2 28 4 41c4 25 20 38 42 45c10 4 21 6 32 6c13 0 25 -4 36 -13c10 -10 14 -23 14 -37c0 -7 -1 -14 -2 -20c29 9 52 25 73 43c2 2 6 5 6 7c0 33 18 63 20 97c-27 -11 -52 -20 -79 -25h-13c-29 0 -52 18 -59 49c-5 22 -9 44 -9 66c0 38 32 70 70 70c17 0 28 -5 34 -23 c3 -8 4 -16 4 -24v-18c43 0 81 29 89 68c4 19 7 38 11 56l17 58c-27 -17 -49 -32 -74 -40c-13 -3 -24 -6 -37 -6c-5 0 -11 0 -17 1c-19 4 -32 16 -36 33c-6 25 -13 50 -13 76c1 4 1 9 2 13c2 27 32 52 66 56c5 1 9 1 13 1c26 -1 39 -12 47 -38c1 -4 3 -7 5 -12 c24 10 40 32 62 44l14 9c8 4 15 6 20 6c11 0 16 -9 18 -28c-1 -6 0 -12 0 -17c0 -47 -13 -91 -26 -135c-34 -114 -55 -231 -76 -349c-18 -100 -39 -199 -69 -296c-27 -86 -47 -173 -67 -261c-19 -85 -39 -170 -62 -254c-20 -74 -37 -148 -58 -222c-7 -25 -11 -51 -16 -77 c-2 -8 -4 -15 -9 -22c-6 -7 -13 -16 -23 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4EC.xml b/data/Petaluma/E4EC.xml
new file mode 100644
index 00000000000..a201693adee
--- /dev/null
+++ b/data/Petaluma/E4EC.xml
@@ -0,0 +1 @@
+<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M125 -1031c-5 0 -9 4 -11 11c-6 18 -17 33 -25 51c-5 12 -7 24 -7 36c0 22 7 44 13 66c17 61 32 123 48 185c1 3 0 7 0 12c-19 -8 -36 -17 -54 -23c-9 -3 -18 -4 -27 -4c-31 0 -58 16 -60 42c-1 12 -2 24 -2 36c0 25 3 50 13 74c8 22 43 40 71 40c4 0 7 0 10 -1 c25 -4 35 -20 41 -61c29 11 51 27 59 60c7 29 17 58 21 93c-14 -10 -26 -18 -37 -25c-21 -13 -43 -22 -68 -19c-33 6 -54 25 -52 58c2 28 1 57 10 85c8 26 22 44 50 48c5 1 10 1 15 1c24 0 45 -8 62 -26c1 0 1 -1 2 -1c7 -7 0 -26 11 -23c17 4 36 16 42 33 c11 31 16 66 24 102c-23 -9 -39 -21 -59 -28c-12 -4 -25 -6 -36 -6c-16 0 -32 4 -46 15c-16 11 -26 27 -23 47c2 24 4 49 10 73c9 37 28 55 59 55c4 0 8 0 12 -1c35 -3 51 -26 52 -74c30 19 65 27 75 68c8 34 23 66 28 103c-24 -12 -45 -24 -66 -34c-13 -6 -26 -9 -39 -9 c-15 0 -31 4 -46 13c-19 12 -28 29 -27 50c1 30 4 60 16 89c10 25 39 43 67 43c7 0 14 -2 20 -4c21 -8 34 -23 35 -47v-29c36 23 74 37 80 88c3 27 15 54 16 84c-34 -13 -65 -31 -100 -39c-9 -2 -18 -3 -27 -3c-5 0 -11 0 -16 1c-27 4 -44 24 -44 51c0 22 0 43 4 65 c7 39 25 58 60 64c3 1 7 1 11 1c28 0 59 -17 71 -43c4 -9 7 -11 11 -11s8 2 13 4c31 12 52 31 52 68c0 14 10 27 7 43c-22 -7 -44 -14 -67 -14c-21 -1 -40 5 -58 13c-21 9 -30 26 -28 50c2 27 4 54 10 81c8 34 38 59 72 59c5 0 9 0 14 -1c29 -7 45 -29 58 -55 c3 -6 -1 -20 8 -19c11 0 19 10 25 20c0 2 0 3 1 5c10 41 21 83 33 129c-28 -16 -54 -26 -81 -26c-9 0 -19 1 -29 4c-31 9 -43 24 -43 55v32c0 11 0 22 2 32c6 32 18 45 50 49c8 1 15 1 21 1c38 0 46 -14 46 -57c28 7 49 25 69 43c11 9 22 22 35 22c3 0 7 -1 10 -3 c10 -5 12 -16 12 -28c0 -7 -1 -15 -2 -23c-4 -35 -21 -67 -32 -102c-31 -100 -53 -202 -76 -305c-25 -112 -46 -225 -73 -337c-23 -95 -45 -190 -70 -284c-27 -101 -48 -203 -69 -305c-22 -105 -43 -211 -67 -316c-16 -71 -35 -142 -53 -213c-5 -17 -12 -33 -24 -46 c-5 -5 -9 -8 -13 -8z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4ED.xml b/data/Petaluma/E4ED.xml
new file mode 100644
index 00000000000..7f159a15d96
--- /dev/null
+++ b/data/Petaluma/E4ED.xml
@@ -0,0 +1 @@
+<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M157 -952c-7 0 -9 7 -12 12c-12 28 -19 55 -19 83c0 17 3 34 8 52c13 41 20 85 26 130c-27 -15 -52 -30 -83 -30c-49 0 -77 26 -77 75c0 20 1 39 4 59c5 44 35 73 78 73c47 0 72 -31 69 -83c33 13 45 40 52 73c7 35 18 69 28 108l-24 -18c-22 -14 -44 -23 -67 -23 c-14 0 -29 4 -44 11c-29 14 -36 38 -36 63c0 11 2 23 3 34c2 24 1 52 22 71c15 13 32 19 50 19h5c8 0 16 -2 24 -5c29 -11 47 -31 47 -64c71 22 61 87 78 143c-23 -13 -42 -24 -61 -33c-15 -8 -29 -12 -44 -12c-14 0 -28 4 -42 14c-18 13 -29 30 -26 51c3 24 3 47 7 71 c7 40 29 51 62 54s68 -18 76 -47c3 -9 5 -13 9 -13c3 0 7 1 13 4c39 16 50 48 57 84c4 20 10 39 16 62c-34 -15 -60 -35 -93 -42c-8 -1 -15 -2 -21 -2c-42 0 -67 27 -65 75c0 22 4 43 7 64c6 41 56 58 97 58c17 0 32 -5 42 -13c15 -13 22 -28 23 -50c22 13 41 24 46 50 c7 37 18 73 28 115c-31 -21 -55 -42 -85 -54c-13 -5 -26 -8 -39 -8c-19 0 -37 6 -55 16c-15 8 -26 22 -27 40c0 30 -1 61 4 91c7 40 45 59 78 59c11 0 22 -2 31 -7c23 -13 45 -28 47 -59c0 -7 2 -9 5 -9s7 1 11 3c48 24 71 62 75 115c1 15 5 29 8 48 c-38 -26 -78 -40 -122 -40c-47 0 -69 18 -69 60c1 22 1 43 4 65c5 33 27 47 55 55c9 2 18 4 27 4c20 0 37 -7 53 -23c8 -8 11 -18 10 -29v-5c0 -6 2 -9 6 -9c3 0 6 1 10 3c29 18 59 33 62 74c1 27 11 53 18 82c-31 -18 -60 -34 -95 -34c-40 0 -61 23 -61 64c0 20 0 40 3 60 c6 38 32 63 69 64c24 2 42 -11 50 -37c3 -10 4 -21 7 -33c31 15 56 30 60 70c4 37 14 73 23 113l-24 -20c-23 -21 -50 -34 -80 -42c-8 -2 -14 -3 -21 -3c-24 0 -38 17 -38 46c0 37 4 73 18 109c11 29 34 42 67 42c20 0 38 -5 47 -29c2 -4 4 -5 6 -5c3 0 6 5 9 7 c18 16 37 33 54 50c9 10 21 16 31 12c11 -3 10 -17 10 -27c1 -34 -8 -65 -18 -96c-27 -84 -40 -171 -59 -257c-22 -101 -46 -201 -65 -302c-31 -167 -77 -332 -114 -497c-28 -124 -62 -247 -91 -371c-22 -95 -51 -189 -74 -283c-24 -99 -45 -197 -60 -297 c-2 -13 -5 -27 -13 -39c-3 -4 -5 -10 -11 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4F2.xml b/data/Petaluma/E4F2.xml
new file mode 100644
index 00000000000..5857ced675b
--- /dev/null
+++ b/data/Petaluma/E4F2.xml
@@ -0,0 +1 @@
+<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 -258h-3c-8 0 -11 13 -16 20c-35 42 -41 94 -54 144c-28 106 -49 213 -84 318c-2 6 -6 14 -6 21c0 6 3 13 12 19c5 4 8 5 11 5c4 0 8 -3 12 -7c26 -26 44 -57 72 -81c8 -7 16 -16 32 -22c-5 11 -7 21 -7 29c0 20 11 35 32 48c13 8 27 12 39 12c22 0 41 -12 55 -35 c17 -29 26 -60 26 -93c0 -6 0 -13 -1 -20c-6 -41 -39 -70 -80 -70c-19 0 -40 6 -61 21c-14 10 -26 22 -43 36c18 -53 31 -101 43 -150c11 -44 23 -88 33 -132c3 -11 3 -22 3 -33c0 -12 -2 -27 -15 -30z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E4F6.xml b/data/Petaluma/E4F6.xml
new file mode 100644
index 00000000000..11a055e86d9
--- /dev/null
+++ b/data/Petaluma/E4F6.xml
@@ -0,0 +1 @@
+<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 -226c-11 1 -22 5 -32 15c-21 18 -41 37 -57 60c-6 8 -9 16 -9 24c0 6 2 13 5 19c17 42 47 63 91 63c12 1 25 -1 40 -4c-25 53 -44 108 -73 158c-16 28 -35 55 -44 87c-1 3 -1 5 -1 8c0 8 5 14 10 19c2 2 4 3 6 3c6 0 11 -7 15 -10c23 -16 38 -40 58 -60 c11 -10 20 -22 36 -26c1 2 2 4 2 5c0 3 -3 6 -4 8c-5 12 -7 21 -7 29c0 12 6 22 20 36c13 12 27 18 42 18c9 0 18 -2 27 -6c28 -12 70 -86 70 -131c0 -7 -1 -13 -3 -19c-12 -32 -32 -50 -62 -50c-6 0 -12 0 -18 2c-22 4 -43 11 -66 27c21 -46 41 -87 59 -129 c15 -33 32 -64 51 -94c4 -6 7 -12 9 -19c2 -6 3 -11 3 -16c0 -6 -2 -12 -8 -15c-2 -2 -3 -2 -5 -2c-6 0 -10 11 -16 16c-17 16 -32 33 -46 52c-9 13 -24 17 -41 20c1 -6 1 -12 1 -19c0 -16 -3 -33 -15 -47c-11 -15 -24 -22 -38 -22z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E500.xml b/data/Petaluma/E500.xml
new file mode 100644
index 00000000000..6f24d702962
--- /dev/null
+++ b/data/Petaluma/E500.xml
@@ -0,0 +1 @@
+<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M150 68c-11 8 -19 20 -29 28c-9 8 -12 15 -12 22c0 9 4 17 11 25c3 4 7 7 10 11c14 14 24 21 35 21s22 -9 36 -26c17 -21 23 -32 23 -47c3 -15 -13 -21 -22 -30c-12 -13 -18 -20 -25 -20c-6 0 -13 6 -27 16zM53 -232c-3 -1 -5 -2 -7 -2c-5 0 -8 4 -10 8 c-10 22 -26 42 -34 65c-2 5 -2 9 -2 13c0 12 7 19 18 24c96 38 184 91 275 137l258 132c4 2 7 3 10 3c5 0 9 -3 14 -8c19 -18 19 -43 24 -61c1 -22 -5 -35 -22 -43c-151 -76 -302 -153 -451 -234c-23 -12 -49 -21 -73 -34zM534 -250c-4 0 -9 2 -12 5c-14 18 -34 31 -48 50 c-5 7 -7 13 -7 19s2 12 7 18c7 10 18 18 23 30c5 11 12 15 18 15s13 -3 19 -9c21 -17 37 -39 42 -61c0 -14 -35 -67 -42 -67z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E501.xml b/data/Petaluma/E501.xml
new file mode 100644
index 00000000000..e528002bb5d
--- /dev/null
+++ b/data/Petaluma/E501.xml
@@ -0,0 +1 @@
+<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M631 286c-6 19 -7 40 -19 58c-14 23 -20 24 -43 8c-136 -96 -274 -191 -416 -280c-43 -27 -86 -55 -128 -83c-29 -19 -30 -26 -17 -56c9 -20 25 -35 35 -54c4 -6 10 -10 20 -3l240 159c103 67 203 138 303 209c14 11 23 23 25 42zM231 235c0 29 -34 71 -60 80 c-10 3 -13 -1 -15 -9c-5 -15 -9 -30 -15 -45c-14 -40 -12 -48 21 -74l30 -24c7 -5 14 -7 18 4c10 23 19 46 21 68zM775 158c-5 17 -6 37 -16 55c-12 23 -23 25 -44 10c-117 -83 -242 -155 -356 -243c-56 -43 -117 -80 -178 -116c-18 -10 -23 -22 -15 -43s23 -39 32 -60 c3 -8 9 -11 18 -4c38 25 78 49 116 76c100 70 197 144 300 208c37 23 73 46 109 69c17 11 33 23 34 48zM743 -73c-8 29 -26 51 -50 68c-15 11 -26 9 -34 -10c-7 -16 -16 -31 -25 -46c-11 -17 -10 -33 8 -45l51 -40c4 -3 11 -6 15 0c13 24 26 47 35 73z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E502.xml b/data/Petaluma/E502.xml
new file mode 100644
index 00000000000..2f024728777
--- /dev/null
+++ b/data/Petaluma/E502.xml
@@ -0,0 +1 @@
+<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M54 -185c-4 0 -7 3 -10 8c-13 22 -32 41 -41 66c-2 4 -3 8 -3 11c0 6 3 11 8 16c25 26 56 42 86 61c160 100 317 205 471 315c11 8 20 12 27 12c10 0 17 -8 24 -26c7 -15 10 -32 14 -44c-1 -22 -9 -36 -24 -46c-55 -38 -109 -76 -163 -114c-119 -84 -242 -161 -364 -241 c-5 -4 -11 -7 -15 -12c-3 -4 -7 -6 -10 -6zM202 103c-8 0 -19 15 -48 36c-14 10 -22 22 -22 36c0 7 2 16 8 25c8 12 10 27 13 41c3 12 8 18 15 18c4 0 9 -3 15 -7c24 -19 46 -40 48 -74c-2 -7 -3 -15 -5 -23c-12 -37 -16 -52 -24 -52zM566 -255c-4 0 -7 3 -9 7 c-14 22 -33 42 -42 67c-2 4 -3 8 -3 11c0 5 3 10 8 16c25 26 56 42 86 60c160 101 317 206 471 316c11 7 20 12 27 12c10 0 17 -8 25 -26c6 -16 9 -32 13 -45c-1 -22 -9 -35 -24 -45l-163 -114c-118 -85 -242 -162 -364 -242c-5 -3 -11 -7 -15 -11s-7 -6 -10 -6zM275 -250 c-4 0 -7 4 -8 7c-9 22 -24 39 -32 61c-3 6 -4 12 -4 17c0 10 6 18 17 25c167 95 314 221 480 319c23 14 45 31 67 46c4 3 7 4 10 4c4 0 7 -2 12 -6c20 -20 19 -47 26 -68c-2 -25 -17 -37 -35 -48c-62 -40 -124 -81 -186 -120c-70 -43 -132 -95 -199 -142 c-46 -32 -96 -58 -140 -92c-3 -2 -5 -3 -8 -3zM807 -304c-4 0 -8 4 -9 8c-8 21 -24 39 -32 61c-2 6 -3 12 -3 16c0 11 5 18 17 25c167 96 314 222 480 320c23 14 44 30 67 46c3 3 6 4 9 4c4 0 8 -2 13 -7c20 -19 18 -46 25 -67c-1 -26 -17 -38 -34 -49 c-62 -40 -124 -80 -187 -120c-69 -43 -132 -95 -199 -141c-45 -32 -95 -59 -139 -93c-3 -2 -5 -3 -8 -3zM1302 -205c-3 0 -7 2 -9 4c-17 14 -37 25 -53 41c-8 7 -11 14 -11 22c0 6 2 12 5 18l24 44c8 15 13 22 20 22c5 0 12 -4 22 -13c20 -16 37 -35 43 -64 c-9 -24 -21 -48 -36 -71c-2 -2 -3 -3 -5 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E503.xml b/data/Petaluma/E503.xml
new file mode 100644
index 00000000000..f67cd470f55
--- /dev/null
+++ b/data/Petaluma/E503.xml
@@ -0,0 +1 @@
+<symbol id="E503" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M73 62c-3 0 -7 2 -9 4c-17 14 -37 25 -53 41c-8 7 -11 14 -11 22c0 6 2 12 5 18l24 44c8 15 13 22 20 22c5 0 12 -4 22 -13c20 -16 37 -35 43 -64c-9 -24 -21 -48 -36 -71c-2 -2 -3 -3 -5 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E504.xml b/data/Petaluma/E504.xml
new file mode 100644
index 00000000000..a0bb4577fc1
--- /dev/null
+++ b/data/Petaluma/E504.xml
@@ -0,0 +1 @@
+<symbol id="E504" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M54 -225c-4 1 -7 4 -10 8c-15 20 -32 41 -41 66c-2 4 -3 8 -3 11c0 7 3 11 8 17c23 28 56 41 86 60c159 101 325 196 471 315c11 9 20 14 27 13c10 -1 17 -9 24 -26c7 -16 10 -32 14 -45c-1 -22 -9 -35 -24 -45c-56 -37 -109 -77 -163 -115c-119 -84 -242 -161 -364 -241 c-5 -3 -12 -6 -15 -11s-7 -8 -10 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E505.xml b/data/Petaluma/E505.xml
new file mode 100644
index 00000000000..c98f0e5cee8
--- /dev/null
+++ b/data/Petaluma/E505.xml
@@ -0,0 +1 @@
+<symbol id="E505" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M73 -206c-3 0 -7 2 -9 4c-17 14 -37 25 -53 41c-8 7 -11 14 -11 22c0 6 2 12 5 18l24 44c8 15 13 22 20 22c5 0 12 -4 22 -13c20 -16 37 -35 43 -64c-9 -24 -21 -48 -36 -71c-2 -2 -3 -3 -5 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E510.xml b/data/Petaluma/E510.xml
new file mode 100644
index 00000000000..8eb348b0a8e
--- /dev/null
+++ b/data/Petaluma/E510.xml
@@ -0,0 +1 @@
+<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 0c-13 0 -25 3 -38 8c-36 14 -52 46 -52 84c0 45 22 114 70 152c-19 13 -31 38 -31 66c0 25 9 52 30 77c22 25 46 35 66 35c34 0 60 -26 62 -51c2 -36 -12 -74 -28 -99c16 -16 42 -64 43 -93c1 -62 -18 -115 -67 -157c-17 -15 -36 -22 -55 -22zM115 286 c30 1 42 21 45 50c3 19 -10 31 -28 31c-2 0 -5 0 -8 -1c-31 -6 -36 -26 -36 -44c0 -19 12 -36 27 -36zM108 57c46 0 69 47 69 90c0 27 -10 52 -30 57c-6 1 -12 2 -18 2c-36 0 -59 -28 -67 -51c-4 -12 -6 -24 -6 -35c0 -36 19 -63 52 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E511.xml b/data/Petaluma/E511.xml
new file mode 100644
index 00000000000..597914b3919
--- /dev/null
+++ b/data/Petaluma/E511.xml
@@ -0,0 +1 @@
+<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M596 128c-7 3 -6 11 -6 17v112c-18 -28 -32 -51 -47 -74c-10 -15 -21 -31 -39 -31c-25 0 -37 22 -47 42c-4 8 -5 17 -5 25c0 13 3 25 4 38c7 62 31 115 81 155c12 9 27 14 41 14c9 0 17 -2 23 -6c18 -11 29 -38 29 -60c0 -13 -2 -27 -2 -41c0 -20 2 -41 3 -62 c1 -18 4 -37 4 -56c0 -17 -2 -33 -10 -50c-3 -6 -5 -12 -10 -16c-6 -4 -11 -10 -19 -7zM100 0c-13 0 -25 3 -38 8c-36 14 -52 46 -52 84c0 45 22 114 70 152c-19 13 -31 38 -31 66c0 25 9 52 30 77c22 25 46 35 66 35c34 0 60 -26 62 -51c2 -36 -12 -74 -28 -99 c16 -16 42 -64 43 -93c1 -62 -18 -115 -67 -157c-17 -15 -36 -22 -55 -22zM337 183c-11 0 -10 13 -13 21c-21 44 -37 91 -63 133c-7 12 13 68 25 73c2 1 4 1 5 1c7 0 12 -5 16 -12c18 -32 33 -65 47 -99c3 -8 5 -17 14 -25c20 35 39 69 59 103c8 14 17 38 34 29 c5 -3 6 -7 6 -12c0 -10 -7 -24 -12 -33c-30 -54 -61 -107 -92 -161c-6 -10 -15 -19 -26 -18zM115 286c30 1 42 21 45 50c3 19 -10 31 -28 31c-2 0 -5 0 -8 -1c-31 -6 -36 -26 -36 -44c0 -19 12 -36 27 -36zM519 234c4 0 9 3 15 11c15 23 29 47 40 72c1 3 2 7 2 9 c0 10 -7 16 -12 23c-3 4 -7 5 -11 5s-9 -1 -13 -4c-28 -18 -42 -45 -48 -76c0 -11 5 -20 11 -28c6 -7 10 -12 16 -12zM108 57c46 0 69 47 69 90c0 27 -10 52 -30 57c-6 1 -12 2 -18 2c-36 0 -59 -28 -67 -51c-4 -12 -6 -24 -6 -35c0 -36 19 -63 52 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E512.xml b/data/Petaluma/E512.xml
new file mode 100644
index 00000000000..078556350f0
--- /dev/null
+++ b/data/Petaluma/E512.xml
@@ -0,0 +1 @@
+<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M100 0c-13 0 -25 3 -38 8c-36 14 -52 46 -52 84c0 45 22 114 70 152c-19 13 -31 38 -31 66c0 25 9 52 30 77c22 25 46 35 66 35c34 0 60 -26 62 -51c2 -36 -12 -74 -28 -99c16 -16 42 -64 43 -93c1 -62 -18 -115 -67 -157c-17 -15 -36 -22 -55 -22zM115 286 c30 1 42 21 45 50c3 19 -10 31 -28 31c-2 0 -5 0 -8 -1c-31 -6 -36 -26 -36 -44c0 -19 12 -36 27 -36zM587 -37c-7 3 -6 11 -6 17v112c-18 -28 -32 -51 -47 -74c-10 -15 -21 -31 -39 -31c-25 0 -37 22 -47 42c-4 8 -5 17 -5 25c0 13 3 25 4 38c7 62 30 117 81 155 c12 9 27 14 41 14c9 0 17 -2 23 -6c18 -11 29 -38 29 -60c0 -13 -2 -27 -2 -41c0 -20 2 -41 3 -62c1 -18 4 -37 4 -56c0 -17 -2 -33 -10 -50c-3 -6 -5 -12 -10 -16c-6 -4 -11 -10 -19 -7zM328 18c-11 0 -10 13 -13 21c-21 44 -38 90 -63 133c-7 12 13 68 25 73c2 1 4 1 5 1 c7 0 12 -5 16 -12c18 -32 34 -65 47 -99c3 -8 5 -17 14 -25c20 35 39 69 59 103c8 14 17 38 34 29c5 -3 6 -7 6 -12c0 -10 -7 -24 -12 -33c-30 -54 -60 -108 -92 -161c-6 -10 -15 -19 -26 -18zM108 57c46 0 69 47 69 90c0 27 -10 52 -30 57c-6 1 -12 2 -18 2 c-36 0 -59 -28 -67 -51c-4 -12 -6 -24 -6 -35c0 -36 19 -63 52 -63zM510 69c4 0 9 3 15 11c15 23 29 47 40 72c1 3 2 7 2 9c0 10 -7 16 -12 23c-3 4 -7 5 -11 5s-9 -1 -13 -4c-28 -18 -42 -45 -48 -76c0 -11 5 -20 11 -28c6 -7 10 -12 16 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E513.xml b/data/Petaluma/E513.xml
new file mode 100644
index 00000000000..9ce4306bf53
--- /dev/null
+++ b/data/Petaluma/E513.xml
@@ -0,0 +1 @@
+<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 -10c-11 0 -24 3 -36 8c-36 15 -50 45 -52 82c-1 6 0 13 0 22c0 4 -1 7 -1 11c0 27 14 51 35 72c6 6 10 12 7 23c-6 17 -9 35 -9 52c0 49 22 92 58 131c4 5 10 10 13 17c11 25 31 27 53 26c22 -2 30 -20 35 -38c4 -13 5 -26 5 -38c1 -27 -7 -54 -17 -81 c-3 -8 -5 -14 -5 -20c1 -8 4 -15 12 -23c20 -20 26 -46 26 -72v-8c0 -7 -1 -14 -2 -21c-7 -47 -26 -88 -63 -119c-19 -16 -39 -24 -59 -24zM279 0c-16 0 -27 9 -33 25c-2 4 -2 9 -2 14c0 13 5 26 10 38c3 6 7 11 7 19c-3 81 9 161 9 242c0 20 17 32 31 43c2 1 3 2 5 2 c5 0 5 -7 6 -13c-1 -21 0 -41 0 -63c1 -24 0 -49 -4 -76c14 13 22 22 31 29c11 10 24 15 36 15c18 0 33 -10 45 -29c6 -10 10 -22 12 -34c2 -11 3 -22 3 -33c0 -83 -56 -147 -130 -173c-10 -4 -19 -6 -26 -6zM120 257c14 0 27 6 35 22c9 17 13 34 16 52v3v2 c0 10 -8 18 -17 18c-34 2 -69 -17 -72 -61c0 -13 7 -30 25 -34c4 -1 9 -2 13 -2zM586 -9c-9 2 -7 11 -7 18v110c-17 -27 -31 -48 -45 -70c-5 -7 -10 -15 -16 -21c-9 -9 -18 -14 -26 -14c-9 1 -17 5 -27 14c-19 17 -25 37 -25 57c1 13 3 26 5 39c8 55 29 105 73 142 c16 15 32 21 46 21c23 1 41 -16 55 -47c1 -4 1 -8 1 -12c1 -11 -5 -23 -4 -34c4 -46 4 -91 6 -137c1 -21 -5 -39 -16 -56c-4 -7 -12 -13 -20 -10zM318 59c4 1 7 2 12 4c38 15 63 55 63 96c0 16 -3 32 -12 46c-9 16 -23 31 -41 26c-19 -5 -32 -20 -32 -42c0 -17 1 -43 1 -55 c1 -7 1 -16 1 -27c0 -10 0 -21 -1 -31v-3c0 -10 3 -14 9 -14zM510 93l6 5c20 25 37 53 48 84v7v2c0 9 -7 16 -14 21c-3 3 -7 4 -10 4c-6 0 -13 -3 -18 -8c-22 -18 -35 -42 -42 -69c-3 -15 16 -46 30 -46zM120 50c32 5 56 27 69 58c2 7 3 13 3 20c1 19 -10 37 -22 53 c-6 7 -13 11 -21 11c-3 0 -8 -1 -12 -3c-29 -11 -53 -29 -76 -49c-18 -15 -26 -28 -26 -39c1 -17 17 -30 42 -42c12 -6 25 -8 43 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E514.xml b/data/Petaluma/E514.xml
new file mode 100644
index 00000000000..c0f2950217d
--- /dev/null
+++ b/data/Petaluma/E514.xml
@@ -0,0 +1 @@
+<symbol id="E514" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M77 18c-8 0 -8 8 -9 13c-3 19 -6 37 -6 57c0 5 1 11 1 16c6 93 2 186 13 278v3c0 2 0 5 -1 9c-17 -15 -30 -30 -49 -36c-4 -1 -8 -3 -11 -3c-6 0 -10 4 -12 15s-3 19 -3 25c0 13 6 16 30 27c20 8 32 26 45 42c7 7 13 17 23 14c9 -4 12 -15 12 -25c-1 -23 -3 -46 -6 -69 c-7 -69 -8 -138 -9 -207c0 -45 -3 -90 -4 -134c0 -5 -1 -10 -3 -14c-2 -5 -5 -11 -11 -11zM201 0c-8 0 -17 1 -26 4c-30 9 -34 39 -40 65c-1 6 -1 12 -1 18c0 11 1 22 0 33c0 8 4 15 12 15h1c8 0 9 -8 11 -15c1 -4 0 -8 0 -12c1 -30 15 -46 36 -46c9 0 20 3 31 9 c33 18 47 50 57 83c4 14 10 28 10 43c0 6 -1 13 -3 19c-11 32 -34 49 -60 49c-14 0 -29 -5 -44 -15c-8 -6 -13 -8 -17 -8c-6 0 -8 6 -10 21c-1 9 -2 18 -2 27c0 39 11 77 19 115c1 3 1 8 3 11c6 11 0 27 11 36c3 3 6 4 9 4c9 0 17 -8 26 -8c26 -2 46 10 67 21c7 4 12 6 15 6 c6 0 8 -7 10 -20c1 -4 1 -8 1 -11c0 -33 -30 -49 -75 -57c-41 -7 -42 -4 -52 -45c-1 -5 -3 -10 -3 -15c0 -2 1 -5 2 -8c14 4 27 6 38 6c48 0 79 -33 86 -92c1 -11 2 -23 2 -34c0 -36 -6 -72 -18 -107c-9 -28 -26 -50 -47 -71c-14 -15 -31 -21 -49 -21z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E515.xml b/data/Petaluma/E515.xml
new file mode 100644
index 00000000000..ab7457ef670
--- /dev/null
+++ b/data/Petaluma/E515.xml
@@ -0,0 +1 @@
+<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M528 178c7 37 17 71 20 106c1 10 2 21 2 31c0 23 -3 45 -13 66c-3 10 -8 20 -20 20c-17 0 -25 -11 -25 -26v-87c1 -21 -9 -38 -21 -54c-3 -5 -7 -10 -13 -8c-7 3 -4 10 -4 15v118c0 10 -2 20 -5 30c-3 11 -9 21 -22 21c-15 0 -27 -11 -26 -28c2 -39 4 -78 8 -117 c3 -26 -12 -42 -27 -58c-3 -4 -6 -6 -9 -6s-5 4 -6 13l-15 200c-2 27 11 46 24 66c3 5 7 7 12 5c5 -1 5 -5 5 -9c1 -13 3 -27 4 -41c21 24 38 35 52 35s26 -12 38 -37c9 6 18 12 28 18c9 6 18 8 26 8c14 0 24 -9 32 -29c10 -26 14 -53 14 -81c0 -19 -2 -38 -6 -58 c-6 -32 -9 -68 -30 -96c-6 -8 -11 -13 -23 -17zM747 184c-9 2 -7 11 -7 18v110l-45 -70c-4 -7 -9 -15 -15 -21c-9 -9 -18 -14 -26 -14c-9 0 -18 5 -28 14c-19 17 -24 38 -24 58c0 13 2 26 4 39c8 54 29 104 73 141c18 15 33 22 47 22c22 0 39 -17 54 -47c2 -4 2 -8 2 -12 c0 -11 -6 -23 -5 -35c4 -46 5 -91 7 -137c1 -21 -6 -39 -17 -56c-4 -7 -11 -13 -20 -10zM77 17c-8 0 -8 8 -9 13c-3 19 -6 37 -6 57c0 5 1 11 1 16c6 93 2 186 13 278v3c0 2 0 5 -1 9c-17 -15 -30 -30 -49 -36c-4 -1 -8 -3 -11 -3c-6 0 -10 4 -12 15s-3 19 -3 25 c0 13 6 16 30 27c20 8 32 26 45 42c7 7 13 17 23 14c9 -4 12 -15 12 -25c-1 -23 -4 -46 -6 -69c-6 -69 -9 -138 -9 -207c0 -45 -4 -90 -4 -134c0 -5 -1 -10 -3 -14c-2 -5 -5 -11 -11 -11zM201 -1c-8 0 -17 1 -26 4c-30 10 -34 39 -40 65c-1 6 -1 12 -1 18c0 11 1 22 0 33 c0 8 4 15 12 15h1c8 0 9 -8 11 -15c1 -4 0 -8 0 -12c1 -30 15 -46 36 -46c9 0 20 3 31 9c33 18 48 50 57 83c4 14 10 28 10 43c0 6 -1 13 -3 19c-11 32 -34 49 -60 49c-14 0 -29 -5 -44 -15c-8 -6 -13 -8 -17 -8c-6 0 -8 6 -10 21c-1 9 -2 18 -2 27c0 39 11 77 19 115 c1 3 1 8 3 11c6 11 0 27 11 36c3 3 6 4 9 4c9 0 17 -8 26 -8c26 -2 46 10 67 21c7 4 12 6 15 6c6 0 8 -7 10 -20c1 -4 1 -8 1 -11c0 -33 -30 -49 -75 -57c-41 -7 -42 -4 -52 -45c-1 -5 -3 -10 -3 -15c0 -2 1 -5 2 -8c14 4 27 6 38 6c48 0 81 -33 86 -92c1 -11 2 -23 2 -34 c0 -36 -7 -72 -18 -107c-9 -28 -27 -49 -47 -71c-14 -15 -31 -21 -49 -21zM671 286l6 5c21 25 38 53 48 84c1 3 1 5 1 8c0 9 -7 16 -14 22c-4 3 -7 4 -11 4c-6 0 -12 -4 -18 -8c-22 -18 -35 -42 -41 -69c-4 -15 16 -46 29 -46z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E516.xml b/data/Petaluma/E516.xml
new file mode 100644
index 00000000000..30e3c3c155c
--- /dev/null
+++ b/data/Petaluma/E516.xml
@@ -0,0 +1 @@
+<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M77 19c-8 0 -8 8 -9 13c-3 19 -6 37 -6 57c0 5 1 11 1 16c6 93 2 186 13 278v3c0 2 0 5 -1 9c-17 -15 -30 -30 -49 -36c-4 -1 -8 -3 -11 -3c-6 0 -10 4 -12 15s-3 19 -3 25c0 13 6 16 30 27c20 8 32 26 45 42c7 7 13 17 23 14c9 -4 12 -15 12 -25c-1 -23 -4 -46 -6 -69 c-6 -69 -9 -138 -9 -207c0 -45 -4 -90 -4 -134c0 -5 -1 -10 -3 -14c-2 -5 -5 -11 -11 -11zM201 1c-8 0 -17 1 -26 4c-30 10 -34 39 -40 65c-1 6 -1 12 -1 18c0 11 1 22 0 33c0 8 4 15 12 15h1c8 0 9 -8 11 -15c1 -4 0 -8 0 -12c1 -30 15 -46 36 -46c9 0 20 3 31 9 c33 18 48 50 57 83c4 14 10 28 10 43c0 6 -1 13 -3 19c-11 32 -34 49 -60 49c-14 0 -29 -5 -44 -15c-8 -6 -13 -8 -17 -8c-6 0 -8 6 -10 21c-1 9 -2 18 -2 27c0 39 11 77 19 115c1 3 1 8 3 11c6 11 0 27 11 36c3 3 6 4 9 4c9 0 17 -8 26 -8c26 -2 46 10 67 21c7 4 12 6 15 6 c6 0 8 -7 10 -20c1 -4 1 -8 1 -11c0 -33 -30 -49 -75 -57c-41 -7 -42 -4 -52 -45c-1 -5 -3 -10 -3 -15c0 -2 1 -5 2 -8c14 4 27 6 38 6c48 0 81 -33 86 -92c1 -11 2 -23 2 -34c0 -36 -7 -72 -18 -107c-9 -28 -27 -49 -47 -71c-14 -15 -31 -21 -49 -21zM528 -20 c7 37 17 71 20 106c1 10 2 21 2 31c0 23 -3 45 -13 66c-3 10 -8 20 -20 20c-17 0 -25 -11 -25 -26v-87c1 -21 -9 -38 -21 -54c-3 -5 -7 -10 -13 -8c-7 3 -4 10 -4 15v118c0 10 -2 20 -5 30c-3 11 -9 21 -22 21c-15 0 -27 -11 -26 -28c2 -39 4 -78 8 -117 c3 -26 -12 -42 -27 -58c-3 -4 -6 -6 -9 -6s-5 4 -6 13l-15 200c-2 27 11 46 24 66c3 5 7 7 12 5c5 -1 5 -5 5 -9c1 -13 3 -27 4 -41c21 24 38 35 52 35s26 -12 38 -37c9 6 18 12 28 18c9 6 18 8 26 8c14 0 24 -9 32 -29c10 -26 14 -53 14 -81c0 -19 -2 -38 -6 -58 c-6 -32 -9 -68 -30 -96c-6 -8 -11 -13 -23 -17zM747 -14c-9 2 -7 11 -7 18v110l-45 -70c-4 -7 -9 -15 -15 -21c-9 -9 -18 -14 -26 -14c-9 0 -18 5 -28 14c-19 17 -24 38 -24 58c0 13 2 26 4 39c8 54 29 104 73 141c18 15 33 22 47 22c22 0 39 -17 54 -47c2 -4 2 -8 2 -12 c0 -11 -6 -23 -5 -35c4 -46 5 -91 7 -137c1 -21 -6 -39 -17 -56c-4 -7 -11 -13 -20 -10zM671 88l6 5c21 25 38 53 48 84c1 3 1 5 1 8c0 9 -7 16 -14 22c-4 3 -7 4 -11 4c-6 0 -12 -4 -18 -8c-22 -18 -35 -42 -41 -69c-4 -15 16 -46 29 -46z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E517.xml b/data/Petaluma/E517.xml
new file mode 100644
index 00000000000..04723187f46
--- /dev/null
+++ b/data/Petaluma/E517.xml
@@ -0,0 +1 @@
+<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 -5c-5 16 -8 30 -8 44c0 36 17 66 32 96c33 66 73 130 100 201l15 40c3 8 4 15 4 22c0 22 -14 41 -42 54c-10 4 -19 7 -28 7c-19 0 -36 -10 -49 -30c-10 -16 -16 -34 -18 -54c-1 -11 -3 -21 -12 -33c-4 16 -7 32 -7 47c0 35 13 67 32 97c16 25 36 36 60 36 c8 0 17 -1 27 -4c34 -10 57 -43 58 -79c2 -75 -19 -143 -51 -208c-20 -41 -42 -81 -65 -127c10 3 19 4 28 4c42 0 73 -31 110 -46c5 -2 7 -13 7 -25c0 -10 -2 -22 -6 -29c-4 -6 -7 -8 -11 -8c-6 0 -12 5 -18 7c-9 4 -18 10 -26 16c-20 15 -39 23 -58 23 c-23 0 -45 -12 -66 -35c-3 -3 -4 -7 -8 -16zM199 0c-15 -6 -29 8 -40 18c-9 8 -18 17 -29 23c-13 7 -25 11 -37 11c-19 0 -36 -8 -55 -27c-4 -4 -8 -9 -13 -13c-4 -3 -7 -5 -9 -5c-3 0 -4 4 -5 11c-1 5 -1 10 -1 15c0 25 8 47 24 68c46 61 86 124 112 196c8 22 15 44 21 66 c2 7 3 14 3 21c0 12 -3 24 -10 36c-11 19 -24 28 -41 28c-6 0 -12 -1 -19 -3c-41 -12 -60 -37 -65 -80c-1 -9 -3 -16 -10 -21c-4 17 -6 34 -6 49c0 55 25 95 87 116c6 2 13 3 19 3c32 0 60 -28 63 -69c1 -12 2 -24 2 -35c0 -52 -12 -101 -29 -149c-18 -50 -42 -96 -72 -144 c35 -1 60 -15 83 -36c9 -7 18 -16 30 -19c11 -3 15 -11 12 -22c-3 -14 0 -33 -15 -38z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E518.xml b/data/Petaluma/E518.xml
new file mode 100644
index 00000000000..e6fd8998433
--- /dev/null
+++ b/data/Petaluma/E518.xml
@@ -0,0 +1 @@
+<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 -5c-5 16 -8 30 -8 44c0 36 17 66 32 96c33 66 74 130 100 200l15 41c3 8 4 15 4 22c0 22 -14 41 -42 54c-10 4 -19 7 -28 7c-19 0 -36 -11 -49 -30c-10 -17 -16 -34 -18 -54c-1 -11 -3 -21 -12 -33c-4 16 -7 32 -7 47c0 35 13 67 32 97c16 25 36 36 60 36 c8 0 17 -1 27 -4c34 -10 57 -43 58 -80c2 -74 -19 -142 -51 -207c-20 -41 -42 -82 -65 -127c10 3 19 4 28 4c42 0 73 -31 110 -46c5 -2 7 -13 7 -25c0 -11 -2 -22 -6 -29c-4 -6 -7 -8 -11 -8c-6 0 -12 4 -18 7c-9 4 -18 9 -26 16c-20 16 -39 23 -58 23 c-23 0 -45 -12 -66 -36c-3 -2 -4 -7 -8 -15zM199 0c-15 -6 -29 8 -40 17c-9 9 -18 18 -29 24c-13 7 -25 11 -37 11c-19 -1 -36 -8 -55 -27c-4 -4 -8 -9 -13 -13c-4 -3 -7 -5 -9 -5c-3 0 -4 3 -5 11c-1 5 -1 10 -1 15c0 25 8 47 24 68c46 60 86 123 112 196c8 22 14 43 21 66 c2 7 3 14 3 21c0 12 -3 24 -10 36c-11 19 -24 28 -41 28c-6 0 -12 -1 -19 -3c-41 -12 -60 -37 -65 -81c-1 -8 -3 -15 -10 -20c-4 17 -6 34 -6 49c0 55 25 95 87 116c6 2 13 3 19 3c32 0 59 -28 63 -70c1 -11 2 -23 2 -34c0 -52 -12 -101 -29 -149c-18 -50 -42 -96 -72 -144 c35 -2 60 -16 83 -36c9 -8 18 -16 30 -19c11 -3 15 -12 12 -22c-3 -14 0 -33 -15 -38zM874 200c-9 3 -7 12 -7 19v110c-17 -27 -31 -49 -45 -70c-4 -8 -9 -15 -15 -21c-9 -9 -18 -14 -26 -14c-9 0 -18 5 -28 14c-12 11 -18 23 -21 36c-17 -26 -45 -37 -72 -49 c-2 -1 -4 -1 -6 -1c-5 0 -6 5 -6 10c0 57 1 115 1 172c0 7 1 13 0 19c-1 10 -2 21 -14 21c-17 0 -29 -9 -25 -27c3 -15 5 -30 5 -45c0 -30 -6 -60 -13 -89c-6 -21 -22 -31 -36 -43c-3 -2 -9 -4 -11 -1s-2 5 -2 7c0 3 1 6 2 9c9 26 11 52 11 78c0 14 -1 29 -3 43 c-2 19 -5 37 -17 52c-6 8 -12 16 -23 11c-10 -4 -19 -9 -18 -24c3 -45 3 -91 4 -136c0 -21 -18 -45 -37 -50c-2 0 -4 -1 -6 -1c-6 0 -9 3 -9 12c0 48 -2 96 -2 144c0 24 0 48 2 72c2 23 23 33 39 45c2 2 4 2 5 2c5 0 8 -4 7 -12c-1 -6 -3 -14 -3 -22c0 -5 1 -9 2 -13 c10 8 18 13 26 19c12 9 22 13 31 13c12 0 22 -8 32 -24c4 -7 7 -10 10 -10s6 3 10 8c10 13 24 22 39 27c6 2 12 4 17 4c15 -1 25 -12 25 -32c0 -53 1 -107 1 -160l-1 -10c0 -4 1 -8 5 -10c2 -1 3 -2 5 -2c5 0 9 6 14 9c3 2 5 3 8 4c0 13 2 27 4 40c8 55 29 105 73 142 c18 15 33 22 47 22c22 0 40 -17 54 -48c2 -3 2 -7 2 -11c0 -12 -6 -23 -5 -36c3 -45 5 -90 7 -136c1 -21 -6 -39 -17 -56c-4 -7 -11 -13 -20 -11zM798 293c1 1 4 2 6 5c21 25 38 53 48 84c1 3 1 5 1 8c0 9 -7 16 -14 22c-4 3 -7 4 -11 4c-6 -1 -12 -4 -18 -8 c-22 -18 -35 -42 -41 -70c-4 -14 16 -45 29 -45z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E519.xml b/data/Petaluma/E519.xml
new file mode 100644
index 00000000000..45f7e1ee432
--- /dev/null
+++ b/data/Petaluma/E519.xml
@@ -0,0 +1 @@
+<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M243 -5c-5 16 -8 30 -8 44c0 36 17 66 32 96c33 66 74 130 100 200l15 41c3 8 4 15 4 22c0 22 -14 41 -42 54c-10 4 -19 7 -28 7c-19 0 -36 -11 -49 -30c-10 -17 -16 -34 -18 -54c-1 -11 -3 -21 -12 -33c-4 16 -7 32 -7 47c0 35 13 67 32 97c16 25 36 36 60 36 c8 0 17 -1 27 -4c34 -10 57 -43 58 -80c2 -74 -19 -142 -51 -207c-20 -41 -42 -82 -65 -127c10 3 19 4 28 4c42 0 73 -31 110 -46c5 -2 7 -13 7 -25c0 -11 -2 -22 -6 -29c-4 -6 -7 -8 -11 -8c-6 0 -12 4 -18 7c-9 4 -18 9 -26 16c-20 16 -39 23 -58 23 c-23 0 -45 -12 -66 -36c-3 -2 -4 -7 -8 -15zM199 0c-15 -6 -29 8 -40 17c-9 9 -18 18 -29 24c-13 7 -25 11 -37 11c-19 -1 -36 -8 -55 -27c-4 -4 -8 -9 -13 -13c-4 -3 -7 -5 -9 -5c-3 0 -4 3 -5 11c-1 5 -1 10 -1 15c0 25 8 47 24 68c46 60 86 123 112 196c8 22 14 43 21 66 c2 7 3 14 3 21c0 12 -3 24 -10 36c-11 19 -24 28 -41 28c-6 0 -12 -1 -19 -3c-41 -12 -60 -37 -65 -81c-1 -8 -3 -15 -10 -20c-4 17 -6 34 -6 49c0 55 25 95 87 116c6 2 13 3 19 3c32 0 59 -28 63 -70c1 -11 2 -23 2 -34c0 -52 -12 -101 -29 -149c-18 -50 -42 -96 -72 -144 c35 -2 60 -16 83 -36c9 -8 18 -16 30 -19c11 -3 15 -12 12 -22c-3 -14 0 -33 -15 -38zM874 -30c-9 3 -7 12 -7 19v110c-17 -27 -31 -49 -45 -70c-4 -8 -9 -15 -15 -21c-9 -9 -18 -14 -26 -14c-9 0 -18 5 -28 14c-12 11 -18 23 -21 36c-17 -26 -45 -37 -72 -49 c-2 -1 -4 -1 -6 -1c-5 0 -6 5 -6 10c0 57 1 115 1 172c0 7 1 13 0 19c-1 10 -2 21 -14 21c-17 0 -29 -9 -25 -27c3 -15 5 -30 5 -45c0 -30 -6 -60 -13 -89c-6 -21 -22 -31 -36 -43c-3 -2 -9 -4 -11 -1s-2 5 -2 7c0 3 1 6 2 9c9 26 11 52 11 78c0 14 -1 29 -3 43 c-2 19 -5 37 -17 52c-6 8 -12 16 -23 11c-10 -4 -19 -9 -18 -24c3 -45 3 -91 4 -136c0 -21 -18 -45 -37 -50c-2 0 -4 -1 -6 -1c-6 0 -9 3 -9 12c0 48 -2 96 -2 144c0 24 0 48 2 72c2 23 23 33 39 45c2 2 4 2 5 2c5 0 8 -4 7 -12c-1 -6 -3 -14 -3 -22c0 -5 1 -9 2 -13 c10 8 18 13 26 19c12 9 22 13 31 13c12 0 22 -8 32 -24c4 -7 7 -10 10 -10s6 3 10 8c10 13 24 22 39 27c6 2 12 4 17 4c15 -1 25 -12 25 -32c0 -53 1 -107 1 -160l-1 -10c0 -4 1 -8 5 -10c2 -1 3 -2 5 -2c5 0 9 6 14 9c3 2 5 3 8 4c0 13 2 27 4 40c8 55 29 105 73 142 c18 15 33 22 47 22c22 0 40 -17 54 -48c2 -3 2 -7 2 -11c0 -12 -6 -23 -5 -36c3 -45 5 -90 7 -136c1 -21 -6 -39 -17 -56c-4 -7 -11 -13 -20 -11zM798 73c1 1 4 2 6 5c21 25 38 53 48 84c1 3 1 5 1 8c0 9 -7 16 -14 22c-4 3 -7 4 -11 4c-6 -1 -12 -4 -18 -8 c-22 -18 -35 -42 -41 -70c-4 -14 16 -45 29 -45z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51A.xml b/data/Petaluma/E51A.xml
new file mode 100644
index 00000000000..8c76f511ed0
--- /dev/null
+++ b/data/Petaluma/E51A.xml
@@ -0,0 +1 @@
+<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M138 -20c-2 0 -5 2 -8 5c-74 60 -120 136 -125 232c-1 18 -6 36 -5 55c7 78 25 150 89 203c6 5 12 9 18 12c8 4 17 13 26 13c3 0 7 -1 10 -4c3 -2 4 -7 4 -13c0 -15 -9 -38 -19 -43c-69 -35 -108 -111 -108 -189c0 -50 15 -101 49 -138c19 -21 36 -43 58 -60 c15 -12 18 -27 18 -42c0 -7 -1 -15 -1 -22c-1 -5 -2 -9 -6 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51B.xml b/data/Petaluma/E51B.xml
new file mode 100644
index 00000000000..b16a44b03ac
--- /dev/null
+++ b/data/Petaluma/E51B.xml
@@ -0,0 +1 @@
+<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -20c-1 9 -2 17 -2 25c0 19 4 36 22 52c49 44 69 105 78 168c2 11 2 22 2 32c0 81 -47 141 -114 190c-15 10 -22 28 -22 45c0 8 1 15 4 22c2 6 4 9 7 9c2 0 5 -1 9 -4c66 -49 120 -106 131 -192c3 -24 5 -47 5 -70c0 -99 -27 -191 -103 -267c-3 -3 -7 -6 -11 -9 c-1 -1 -3 -1 -6 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51C.xml b/data/Petaluma/E51C.xml
new file mode 100644
index 00000000000..c7340146616
--- /dev/null
+++ b/data/Petaluma/E51C.xml
@@ -0,0 +1 @@
+<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 0c-13 0 -25 3 -38 8c-36 14 -52 46 -52 84c0 45 22 114 70 152c-19 13 -31 38 -31 66c0 25 9 52 30 77c22 25 46 35 66 35c34 0 60 -26 62 -51c2 -36 -12 -74 -28 -99c16 -16 42 -64 43 -93c1 -62 -18 -115 -67 -157c-17 -15 -36 -22 -55 -22zM105 286 c30 1 42 21 45 50c3 19 -10 31 -28 31c-2 0 -5 0 -8 -1c-31 -6 -36 -26 -36 -44c0 -19 12 -36 27 -36zM499 15c-9 -3 -17 -4 -24 -4c-14 0 -23 6 -29 21c-1 3 -1 7 -1 10c0 12 5 24 10 36c2 5 7 9 4 15c-2 73 9 143 9 212c0 18 16 29 26 38c2 1 4 2 5 2c5 0 6 -6 6 -11 c0 -18 1 -36 1 -54c0 -22 -1 -44 -5 -69c13 14 20 20 28 27c10 9 20 13 30 13c15 0 30 -9 40 -26c5 -9 9 -20 11 -29c2 -10 3 -20 3 -30c0 -72 -50 -128 -114 -151zM318 18c-11 0 -10 13 -13 21c-21 44 -38 90 -63 133c-7 12 13 68 25 73c2 1 4 1 5 1c7 0 12 -5 16 -12 c18 -32 34 -65 47 -99c3 -8 5 -17 14 -25c20 35 39 69 59 103c8 14 17 38 34 29c5 -3 6 -7 6 -12c0 -10 -7 -24 -12 -33c-30 -54 -60 -108 -92 -161c-6 -10 -15 -19 -26 -18zM521 65c35 13 56 49 56 85c0 14 -3 28 -10 40c-9 13 -22 26 -38 21c-17 -4 -28 -17 -28 -39 c1 -7 1 -16 1 -24c0 -9 0 -16 1 -22v-50v-4c0 -7 3 -9 8 -9c3 0 6 0 10 2zM98 57c46 0 69 47 69 90c0 27 -10 52 -30 57c-6 1 -12 2 -18 2c-36 0 -59 -28 -67 -51c-4 -12 -6 -24 -6 -35c0 -36 19 -63 52 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51D.xml b/data/Petaluma/E51D.xml
new file mode 100644
index 00000000000..3efdcc5d6a0
--- /dev/null
+++ b/data/Petaluma/E51D.xml
@@ -0,0 +1 @@
+<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M77 9c-8 0 -8 8 -9 13c-3 19 -6 37 -6 57c0 5 1 11 1 16c6 93 2 186 13 278v3c0 2 0 5 -1 9c-17 -15 -30 -30 -49 -36c-4 -1 -8 -3 -11 -3c-6 0 -10 4 -12 15s-3 19 -3 25c0 13 6 16 30 27c20 8 32 26 45 42c7 7 13 17 23 14c9 -4 12 -15 12 -25c-1 -23 -4 -46 -6 -69 c-6 -69 -9 -138 -9 -207c0 -45 -4 -90 -4 -134c0 -5 -1 -10 -3 -14c-2 -5 -5 -11 -11 -11zM201 -9c-8 0 -17 1 -26 4c-30 10 -34 39 -40 65c-1 6 -1 12 -1 18c0 11 1 22 0 33c0 8 4 15 12 15h1c8 0 9 -8 11 -15c1 -4 0 -8 0 -12c1 -30 15 -46 36 -46c9 0 20 3 31 9 c33 18 48 50 57 83c4 14 10 28 10 43c0 6 -1 13 -3 19c-11 32 -34 49 -60 49c-14 0 -29 -5 -44 -15c-8 -6 -13 -8 -17 -8c-6 0 -8 6 -10 21c-1 9 -2 18 -2 27c0 39 11 77 19 115c1 3 1 8 3 11c6 11 0 27 11 36c3 3 6 4 9 4c9 0 17 -8 26 -8c26 -2 46 10 67 21c7 4 12 6 15 6 c6 0 8 -7 10 -20c1 -4 1 -8 1 -11c0 -33 -30 -49 -75 -57c-41 -7 -42 -4 -52 -45c-1 -5 -3 -10 -3 -15c0 -2 1 -5 2 -8c14 4 27 6 38 6c48 0 81 -33 86 -92c1 -11 2 -23 2 -34c0 -36 -7 -72 -18 -107c-9 -28 -27 -49 -47 -71c-14 -15 -31 -21 -49 -21zM634 -7 c-16 0 -27 8 -32 24c-2 5 -2 9 -2 14c0 13 5 26 10 38c3 6 7 11 7 19c-3 81 9 161 9 242c0 20 17 32 31 43c2 2 4 2 6 2c4 1 5 -6 5 -13c0 -18 1 -37 1 -56c0 -26 -1 -53 -6 -83c14 13 23 22 32 29c13 10 25 15 37 15c17 0 32 -10 43 -29c6 -10 11 -22 13 -33 c2 -13 3 -24 3 -35c0 -83 -57 -146 -130 -172c-10 -4 -19 -5 -27 -5zM528 -30c7 37 17 71 20 106c1 10 2 21 2 31c0 23 -3 45 -13 66c-3 10 -8 20 -20 20c-17 0 -25 -11 -25 -26v-87c1 -21 -9 -38 -21 -54c-3 -5 -7 -10 -13 -8c-7 3 -4 10 -4 15v118c0 10 -2 20 -5 30 c-3 11 -9 21 -22 21c-15 0 -27 -11 -26 -28c2 -39 4 -78 8 -117c3 -26 -12 -42 -27 -58c-3 -4 -6 -6 -9 -6s-5 4 -6 13l-15 200c-2 27 11 46 24 66c3 5 7 7 12 5c5 -1 5 -5 5 -9c1 -13 3 -27 4 -41c21 24 38 35 52 35s26 -12 38 -37c9 6 18 12 28 18c9 6 18 8 26 8 c14 0 24 -9 32 -29c10 -26 14 -53 14 -81c0 -19 -2 -38 -6 -58c-6 -32 -9 -68 -30 -96c-6 -8 -11 -13 -23 -17zM674 52c3 0 7 1 11 3c39 14 64 55 64 96c0 16 -4 32 -12 46c-9 16 -23 31 -41 26c-19 -5 -32 -20 -32 -42c0 -17 0 -43 1 -55c1 -6 1 -16 1 -26 c0 -11 0 -22 -1 -32v-3c0 -9 3 -13 9 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E51E.xml b/data/Petaluma/E51E.xml
new file mode 100644
index 00000000000..92f7550d6dc
--- /dev/null
+++ b/data/Petaluma/E51E.xml
@@ -0,0 +1 @@
+<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 -7c-5 16 -8 30 -8 44c0 36 17 66 32 96c33 66 73 130 100 201l15 40c3 8 4 15 4 22c0 22 -14 41 -42 54c-10 4 -19 7 -28 7c-19 0 -36 -10 -49 -30c-10 -16 -16 -34 -18 -54c-1 -11 -3 -21 -12 -33c-4 16 -7 32 -7 47c0 35 13 67 32 97c16 25 36 36 60 36 c8 0 17 -1 27 -4c34 -10 57 -43 58 -79c2 -75 -19 -143 -51 -208c-20 -41 -42 -81 -65 -127c10 3 19 4 28 4c42 0 73 -31 110 -46c5 -2 7 -13 7 -25c0 -10 -2 -22 -6 -29c-4 -6 -7 -8 -11 -8c-6 0 -12 5 -18 7c-9 4 -18 10 -26 16c-20 15 -39 23 -58 23 c-23 0 -45 -12 -66 -35c-3 -3 -4 -7 -8 -16zM189 -2c-15 -6 -29 8 -40 18c-9 8 -18 17 -29 23c-13 7 -25 11 -37 11c-19 0 -36 -8 -55 -27c-4 -4 -8 -9 -13 -13c-4 -3 -7 -5 -9 -5c-3 0 -4 4 -5 11c-1 5 -1 10 -1 15c0 25 8 47 24 68c46 61 86 124 112 196c8 22 15 44 21 66 c2 7 3 14 3 21c0 12 -3 24 -10 36c-11 19 -24 28 -41 28c-6 0 -12 -1 -19 -3c-41 -12 -60 -37 -65 -80c-1 -9 -3 -16 -10 -21c-4 17 -6 34 -6 49c0 55 25 95 87 116c6 2 13 3 19 3c32 0 60 -28 63 -69c1 -12 2 -24 2 -35c0 -52 -12 -101 -29 -149c-18 -50 -42 -96 -72 -144 c35 -1 60 -15 83 -36c9 -7 18 -16 30 -19c11 -3 15 -11 12 -22c-3 -14 0 -33 -15 -38zM699 6c-16 0 -27 8 -32 24c-2 5 -2 9 -2 14c0 13 5 26 10 38c3 6 7 11 7 19c-3 81 9 161 9 242c0 20 17 32 31 43c2 2 4 2 6 2c4 1 5 -6 5 -13c0 -18 1 -37 1 -56c0 -26 -1 -53 -6 -83 c14 13 23 22 32 29c13 10 25 15 37 15c17 0 32 -10 43 -29c6 -10 11 -22 13 -33c2 -13 3 -24 3 -35c0 -83 -57 -146 -130 -172c-10 -4 -19 -5 -27 -5zM605 -17c7 37 17 71 20 106c1 10 2 21 2 31c0 23 -3 45 -13 66c-3 10 -8 20 -20 20c-17 0 -25 -11 -25 -26v-87 c1 -21 -9 -38 -21 -54c-3 -5 -7 -10 -13 -8c-7 3 -4 10 -4 15v118c0 10 -2 20 -5 30c-3 11 -9 21 -22 21c-15 0 -27 -11 -26 -28c2 -39 4 -78 8 -117c3 -26 -12 -42 -27 -58c-3 -4 -6 -6 -9 -6s-5 4 -6 13l-15 200c-2 27 11 46 24 66c3 5 7 7 12 5c5 -1 5 -5 5 -9 c1 -13 3 -27 4 -41c21 24 38 35 52 35s26 -12 38 -37c9 6 18 12 28 18c9 6 18 8 26 8c14 0 24 -9 32 -29c10 -26 14 -53 14 -81c0 -19 -2 -38 -6 -58c-6 -32 -9 -68 -30 -96c-6 -8 -11 -13 -23 -17zM739 65c3 0 7 1 11 3c39 14 64 55 64 96c0 16 -4 32 -12 46 c-9 16 -23 31 -41 26c-19 -5 -32 -20 -32 -42c0 -17 0 -43 1 -55c1 -6 1 -16 1 -26c0 -11 0 -22 -1 -32v-3c0 -9 3 -13 9 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E520.xml b/data/Petaluma/E520.xml
new file mode 100644
index 00000000000..37890419912
--- /dev/null
+++ b/data/Petaluma/E520.xml
@@ -0,0 +1 @@
+<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-39 -142c-3 0 -6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74c20 21 22 51 27 78c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-7c-3 0 -7 0 -9 4c-1 1 -1 2 -1 3c0 4 4 8 6 12c24 49 74 76 113 111c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8 s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6c44 0 80 -42 78 -117c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20 c-18 -26 -38 -48 -71 -56c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5c-3 -1 -7 -2 -10 -2zM136 179c17 2 34 5 50 10c19 6 33 19 37 35c8 32 16 63 16 96c0 9 -1 19 -3 29c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169 c0 -2 0 -4 -1 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E521.xml b/data/Petaluma/E521.xml
new file mode 100644
index 00000000000..ed05057d9a7
--- /dev/null
+++ b/data/Petaluma/E521.xml
@@ -0,0 +1 @@
+<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M30 -49c-17 0 -26 4 -24 25c6 83 10 165 15 248v5c3 8 4 14 4 20c0 8 -3 12 -12 12c-5 0 -10 -1 -17 -3c-2 0 -4 -1 -6 -1c-4 0 -7 1 -8 6v3c0 4 4 8 7 11c27 28 57 54 87 79c6 5 12 9 19 9c4 0 8 -1 13 -3c12 -6 13 -14 13 -23c0 -35 -10 -70 -10 -105v-21 c33 52 67 95 111 128c9 7 19 11 29 11c17 0 32 -12 36 -34c3 -18 3 -36 5 -59c19 18 35 35 52 51c18 17 36 35 61 40c6 1 11 2 16 2c22 0 36 -15 36 -41c1 -71 -12 -140 -9 -211c0 -22 4 -43 9 -64c3 -9 7 -13 12 -13c3 0 7 2 12 5l43 31c6 4 11 6 16 6s10 -2 14 -6 c3 -3 5 -6 5 -9c0 -6 -7 -11 -11 -15c-31 -37 -69 -65 -114 -79c-12 -4 -22 -6 -31 -6c-26 0 -41 17 -49 52c-4 18 -6 36 -6 54c0 12 0 23 2 34c6 50 12 100 13 150v29c-23 -27 -33 -54 -42 -81c-18 -51 -39 -102 -47 -157c-4 -29 -51 -61 -83 -61c-21 0 -19 10 -18 22 l24 202c1 9 2 18 2 28c0 9 -1 19 -3 30c-16 -25 -27 -46 -36 -69c-21 -55 -29 -114 -49 -170c-12 -31 -51 -62 -81 -62z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E522.xml b/data/Petaluma/E522.xml
new file mode 100644
index 00000000000..d6d1aeee2b7
--- /dev/null
+++ b/data/Petaluma/E522.xml
@@ -0,0 +1 @@
+<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-70 -115c-22 -2 -44 4 -65 12c-6 2 -9 5 -9 8s3 6 6 9c21 17 39 36 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 37 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -15 31 -30 42c-8 5 -14 8 -20 8c-8 0 -15 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-22 -23 -47 -43 -81 -39c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -74 -115 -159 -190 -168z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E523.xml b/data/Petaluma/E523.xml
new file mode 100644
index 00000000000..5bfc0d49d84
--- /dev/null
+++ b/data/Petaluma/E523.xml
@@ -0,0 +1 @@
+<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 -90c-8 0 -10 7 -9 20c7 91 12 182 19 273v8c0 6 0 11 -4 18c-31 -23 -57 -51 -97 -62c7 21 21 34 31 48c33 40 76 69 114 103c5 5 10 7 14 7c9 0 18 -8 19 -21c2 -27 4 -52 3 -78c4 5 7 9 10 14c24 33 59 47 96 58c20 6 39 11 59 11c13 0 26 -3 39 -8 c6 -3 13 -3 12 -13c0 -18 -37 -68 -55 -72c-2 -1 -3 -1 -5 -1c-3 0 -6 2 -10 3c-13 3 -26 5 -38 5c-44 0 -86 -21 -111 -58c0 -9 -1 -18 -2 -26c-3 -49 -9 -96 -12 -145c-2 -31 -33 -73 -61 -81c-5 -2 -9 -3 -12 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E524.xml b/data/Petaluma/E524.xml
new file mode 100644
index 00000000000..2e929d56a8d
--- /dev/null
+++ b/data/Petaluma/E524.xml
@@ -0,0 +1 @@
+<symbol id="E524" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M105 0c-35 0 -68 16 -96 42c-6 5 -9 12 -9 18c0 5 2 10 5 16c13 20 24 41 39 59c6 7 13 14 23 10c3 -1 4 -3 4 -5c0 -4 -4 -8 -4 -12v-2c0 -8 5 -13 12 -17c29 -22 60 -35 101 -34h2c3 0 6 -1 11 -1c5 1 11 2 14 9c0 2 1 5 1 8c0 9 -6 18 -11 26c-12 20 -32 26 -52 32 c-23 8 -47 12 -67 29c-19 16 -29 39 -29 63c0 14 3 28 11 40c15 24 32 47 52 68c20 20 49 30 78 30c41 0 84 -19 103 -53c2 -3 3 -5 3 -8s-1 -6 -3 -9c-10 -17 -25 -30 -41 -41c-7 -5 -14 -11 -20 -11s-12 4 -17 16c-10 20 -50 33 -77 33c-6 0 -11 0 -16 -2 c-6 -1 -7 -4 -7 -8c0 -2 1 -6 2 -9c9 -33 33 -51 64 -61c23 -7 47 -12 68 -27s32 -35 32 -55c0 -12 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-6 -1 -10 -1 -16 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E525.xml b/data/Petaluma/E525.xml
new file mode 100644
index 00000000000..5cf92abc7b7
--- /dev/null
+++ b/data/Petaluma/E525.xml
@@ -0,0 +1 @@
+<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-31 0c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14 c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12 c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E526.xml b/data/Petaluma/E526.xml
new file mode 100644
index 00000000000..54949ab8d44
--- /dev/null
+++ b/data/Petaluma/E526.xml
@@ -0,0 +1 @@
+<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 0c-15 0 -22 12 -21 35c5 79 10 158 14 236v8c2 8 4 15 4 21c0 7 -3 12 -11 12c-4 0 -10 -1 -17 -4c-1 0 -3 -1 -5 -1c-4 0 -8 1 -9 6v3c0 5 3 8 6 11c27 28 56 53 85 78c7 6 13 9 21 9c4 0 9 -1 14 -4c13 -7 11 -19 11 -29c-3 -36 -7 -71 -11 -107c0 -3 -2 -7 4 -9 c29 46 61 89 104 123c10 8 19 12 30 12c5 0 10 -1 16 -3c20 -7 24 -23 25 -40c1 -28 2 -56 2 -84c0 -41 -2 -81 -7 -122c-2 -15 -6 -30 -6 -45c0 -43 -27 -65 -62 -82c-7 -3 -14 -5 -21 -5c-5 0 -11 1 -16 4c-4 3 -6 6 -6 11s2 11 3 16l24 216c0 4 1 8 1 13c0 7 -1 14 -5 23 c-35 -52 -51 -109 -64 -166c-5 -19 -12 -37 -16 -56c-7 -37 -32 -59 -65 -74c-9 -4 -16 -6 -22 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E527.xml b/data/Petaluma/E527.xml
new file mode 100644
index 00000000000..8cc3114b079
--- /dev/null
+++ b/data/Petaluma/E527.xml
@@ -0,0 +1 @@
+<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1797 262c4 -39 -4 -77 -18 -114c-21 -57 -38 -117 -82 -163c-16 -17 -35 -26 -54 -26c-8 0 -15 2 -23 4l-4 -22c-10 -39 -24 -74 -45 -106c27 7 54 10 79 19c5 2 11 3 17 3h2c4 0 8 -2 10 -5c1 -1 1 -3 1 -4c0 -7 -6 -15 -10 -21c-23 -29 -48 -54 -86 -61 s-76 -18 -114 -28l3 9h-1c10 22 18 43 34 59c35 38 44 84 46 132c2 47 4 95 4 142c0 53 -2 105 -5 156c-1 17 0 33 0 55c-13 -11 -24 -23 -37 -33c2 -9 2 -19 2 -30c-9 -104 -45 -193 -131 -259c-17 -13 -34 -18 -51 -18c-14 0 -29 4 -44 8c-3 -15 -7 -30 -10 -46 c-5 -28 -17 -55 -30 -79c31 7 61 20 91 28c4 1 9 2 13 2s6 0 8 -2c1 -3 2 -4 2 -6c0 -5 -4 -11 -7 -16c-18 -30 -40 -57 -78 -69c-37 -10 -72 -24 -115 -26v1c-1 1 -2 1 -2 2c-2 1 -2 3 -2 5c0 3 2 7 4 10c54 75 63 165 81 252c14 67 28 134 41 201c4 16 6 34 6 53 c0 7 0 13 -1 20c-23 -17 -42 -33 -63 -48c-5 -3 -12 -11 -19 -4c-1 1 -2 2 -2 4c0 4 5 9 7 13c20 57 69 87 113 122c5 4 10 5 15 5c3 1 6 0 10 -1c9 -4 9 -13 9 -21s-1 -16 -1 -24c13 9 31 11 47 10c46 -3 79 -19 96 -50c5 8 11 15 19 21c25 22 47 44 71 68c6 6 12 10 19 10 c3 0 5 -1 8 -2c5 -2 6 -6 6 -10s-1 -9 -2 -14c-1 -13 -2 -25 -2 -37c0 -15 1 -30 2 -45c20 27 61 43 99 43c17 1 33 -3 46 -10c24 -13 26 -35 28 -57zM989 -37l-3 -23c-5 -39 -24 -72 -46 -103c32 3 62 14 94 22c4 1 8 2 12 2s8 -1 10 -3c2 -3 3 -5 3 -7c0 -5 -4 -11 -7 -15 c-20 -33 -42 -61 -84 -69c-46 -9 -91 -22 -141 -35c17 34 32 67 60 86c17 25 24 54 27 83c10 92 17 183 25 274l9 105c-27 -18 -46 -46 -79 -57c-8 -80 -36 -154 -81 -221c-22 -33 -52 -63 -98 -58c-5 1 -8 1 -11 2c-11 -34 -25 -66 -42 -97h1c29 0 58 9 87 13c3 0 5 1 7 1 c8 0 13 -3 13 -10c0 -3 -1 -7 -4 -12c-20 -33 -39 -66 -85 -69c-29 -2 -57 -8 -86 -14c-10 -10 -22 -18 -40 -20c6 22 16 40 29 55l2 3c5 9 11 18 18 26c17 30 27 63 37 96c24 80 30 161 30 244c0 41 -2 81 -4 122c-24 -18 -41 -39 -65 -50c-1 0 -3 -1 -4 -2 c-1 -38 -9 -75 -23 -110c-23 -57 -48 -113 -98 -153c-16 -13 -33 -19 -49 -19c-7 0 -15 1 -22 4c-4 -40 -11 -78 -28 -113c22 5 43 11 65 16c6 1 13 3 18 3c4 1 7 0 9 -3s3 -5 3 -8c0 -7 -5 -14 -9 -20c-18 -34 -43 -59 -83 -65c-44 -7 -88 -15 -135 -36c18 42 33 79 68 97 l3 11c8 50 11 101 13 152c3 89 9 177 23 265c1 4 1 9 1 19c-24 -17 -41 -40 -74 -41c-5 -82 -31 -157 -96 -216c-24 -22 -53 -33 -85 -38c-11 -46 -26 -92 -44 -137c22 4 45 7 67 10h5c8 0 12 -3 12 -8c0 -3 -1 -7 -4 -12c-22 -36 -47 -65 -94 -71c-17 -2 -33 -4 -49 -8 c-2 -2 -4 -4 -6 -5c-7 -5 -17 -11 -24 -5c-7 -4 -14 -7 -21 -12c-3 -2 -6 -3 -11 -3c-2 0 -5 0 -8 1c16 28 31 55 51 79c4 5 8 7 12 10c22 61 40 124 49 190c6 43 9 87 9 132c0 41 -2 81 -7 123c-26 -8 -45 -31 -78 -30c21 33 41 62 71 80c18 12 37 23 54 35c7 5 13 7 20 7 h4c2 0 5 0 8 -1c7 -4 9 -9 9 -15c0 -3 -1 -6 -1 -10c1 -10 1 -19 2 -29c23 20 50 34 78 37c4 0 7 1 11 1c37 0 66 -24 67 -62c1 -14 0 -28 0 -42c18 32 34 61 61 83c19 16 42 28 59 48c5 5 11 7 18 7h3c2 0 5 0 8 -1c6 -3 7 -7 7 -11s-1 -9 -2 -12c-6 -27 -9 -55 -12 -82 c16 31 40 55 74 67c13 3 24 5 36 5c38 0 63 -29 66 -76c29 44 68 78 105 115c6 6 13 10 21 10c3 0 6 0 9 -2c6 -2 8 -7 8 -12l-1 -10c0 -21 1 -41 1 -62c11 14 26 27 45 35c17 7 34 10 51 10c35 0 56 -22 58 -57c1 -6 1 -12 1 -18s0 -12 -1 -18c16 23 31 44 54 60 c22 16 39 37 57 57c6 7 12 14 19 18c5 3 9 4 13 4c8 0 13 -7 12 -19l-6 -72c24 20 54 33 91 33c65 0 90 -39 90 -87c0 -5 0 -11 -1 -18c-11 -103 -59 -190 -150 -246c-18 -11 -38 -21 -61 -18zM799 90c10 31 16 62 16 94c0 31 -10 53 -29 60c-7 2 -14 4 -22 4 c-16 0 -33 -6 -46 -16c0 -62 -2 -124 -14 -185c2 -1 4 0 6 0c3 0 5 0 9 -1c6 -3 12 -3 18 -3c28 0 53 18 62 47zM1452 122c1 6 1 14 1 22s0 16 -1 23c-6 45 -37 75 -83 77c-3 0 -6 1 -9 1c-4 0 -7 -1 -11 -2c-3 -11 -5 -22 -7 -33l-30 -147c3 0 6 0 10 -1c11 -2 23 -5 35 -9 c7 -2 14 -3 21 -3c42 0 71 36 74 72zM185 104c9 12 13 34 13 56c0 24 -5 48 -14 60c-11 13 -27 19 -45 19c-12 1 -24 -2 -36 -8c1 -53 -1 -106 -9 -159v-2c7 3 16 5 27 5c19 -1 36 11 53 20c4 2 8 5 11 9zM468 57c32 22 50 52 53 91c0 14 0 28 -4 43c-6 21 -16 41 -39 45 c-4 1 -8 1 -12 1c-20 0 -38 -8 -53 -24c-8 -9 -13 -20 -21 -29c-2 -38 -3 -77 -5 -115c3 0 7 -1 11 -3c15 -7 30 -18 47 -18c7 1 15 3 23 9zM1015 220c-4 -51 -8 -103 -13 -155c3 1 7 2 11 2c3 0 6 0 9 -1c5 -1 10 -2 15 -2c51 0 103 52 103 103c0 6 -1 12 -2 17 c-8 32 -31 50 -62 50c-22 0 -42 -5 -61 -14zM1741 141c3 12 5 23 5 35c0 15 -4 28 -16 39c-12 10 -25 13 -38 13c-15 0 -30 -4 -45 -7c-7 -1 -13 -5 -18 -9v-18c0 -38 1 -76 1 -114c1 -1 2 -1 2 -1c22 -12 37 -17 50 -17c26 0 38 24 58 69c1 3 0 7 1 10zM1472 -254v1v-1z "/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E528.xml b/data/Petaluma/E528.xml
new file mode 100644
index 00000000000..ee08cdd5e1a
--- /dev/null
+++ b/data/Petaluma/E528.xml
@@ -0,0 +1 @@
+<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1116 -285c24 31 40 63 69 81c23 41 29 87 33 134c9 109 16 218 21 327c1 4 0 9 0 15c-13 -7 -23 -18 -34 -27c-10 -98 -53 -179 -123 -249c-20 -20 -43 -35 -70 -40c-8 -45 -24 -86 -48 -124l64 12c4 1 8 2 12 2c3 0 6 -1 8 -3s3 -4 3 -7c0 -5 -4 -11 -7 -15 c-21 -32 -41 -64 -86 -68c-44 -4 -89 -14 -136 -22c13 33 30 59 49 85c3 4 10 5 15 6c7 0 13 1 19 2c18 39 25 82 30 125c8 72 13 145 13 218c0 24 -1 47 -2 71c-1 11 -2 22 -4 37c-27 -18 -48 -41 -74 -57c-10 -60 -24 -120 -55 -173c-31 -54 -77 -82 -133 -93 c-2 -14 -4 -28 -7 -42c-7 -32 -14 -56 -26 -77c21 6 42 13 63 19c6 2 13 4 19 4c5 0 9 -1 12 -5c1 -2 1 -3 1 -5c0 -8 -6 -18 -12 -24c-21 -24 -42 -46 -77 -54c-46 -10 -90 -29 -137 -39c-4 -1 -7 -2 -12 -2c-3 0 -6 0 -10 1c28 32 45 71 88 85c11 28 12 59 17 98 c13 104 23 209 33 313c0 6 1 12 1 19c0 10 -1 21 -7 31c-28 -20 -49 -48 -78 -69c-11 -61 -29 -120 -72 -171c-31 -37 -68 -58 -109 -72c-4 -20 -7 -40 -12 -60c-5 -27 -12 -51 -21 -73c21 6 41 12 62 17c3 1 5 1 8 1c5 0 10 -2 12 -8c-13 -33 -34 -60 -64 -72 c-49 -20 -101 -30 -149 -49c-5 -2 -10 -4 -14 0c-1 1 -2 3 -2 5c0 3 2 6 4 9c4 5 7 9 9 14c14 31 33 53 63 65c12 40 18 82 23 123c10 82 17 163 17 245c0 29 0 58 -2 87c-5 -2 -9 -5 -14 -8c2 -8 4 -16 4 -24c0 -12 -3 -24 -8 -37c-35 -92 -85 -177 -180 -218 c-7 -3 -14 -5 -21 -7c-2 -10 -3 -20 -5 -30c-7 -46 -18 -82 -36 -113c21 4 42 10 63 13l7 1c6 0 10 -3 10 -8c0 -3 -1 -7 -4 -12c-17 -31 -38 -59 -74 -67c-41 -9 -81 -22 -121 -35c-7 -2 -13 -6 -21 -2c15 38 38 67 69 85c9 21 15 42 18 65c15 111 37 220 32 332 c-1 24 -1 47 -1 74c-36 -19 -57 -52 -100 -50c17 28 35 52 58 69c31 23 59 49 89 72c6 5 11 7 17 7c3 0 7 -1 10 -2c9 -4 8 -13 8 -20v-54c20 21 54 33 86 33c18 0 35 -4 49 -11c14 -8 26 -18 35 -29c15 15 32 30 49 44c13 11 25 22 39 31c4 3 8 4 12 4c7 0 12 -6 13 -17 c2 -24 3 -48 4 -72c27 26 58 43 99 43c43 0 71 -19 71 -57c0 -3 -1 -6 -1 -10c34 36 70 69 107 101c7 6 14 11 23 11c3 0 6 0 10 -2c13 -6 13 -19 14 -30c0 -16 1 -32 0 -48c16 14 34 25 56 34c15 6 31 9 48 9c9 0 18 -1 27 -3c22 -5 37 -20 37 -41c0 -3 0 -6 -1 -9 c1 0 2 1 2 1c33 18 59 44 86 69c5 6 11 11 18 15c8 5 15 8 20 8c10 0 17 -9 18 -26c2 -21 3 -43 4 -65c13 12 27 24 43 33c21 12 42 18 56 18c45 0 70 -15 78 -43c24 26 49 49 76 71c8 6 16 11 25 11c3 0 6 0 10 -2c15 -6 16 -20 15 -32c0 -10 -1 -19 -1 -29 c20 15 44 26 72 31c9 2 17 3 24 3c41 0 64 -26 70 -73c2 -12 2 -24 2 -36c0 -82 -39 -149 -92 -212c-22 -26 -46 -53 -80 -66c-8 -3 -15 -5 -22 -6c-1 -3 -1 -6 -1 -9c-7 -47 -23 -88 -49 -122c28 6 55 13 83 20c3 1 6 1 9 1c5 0 9 -1 11 -4c2 -2 2 -4 2 -5 c0 -5 -4 -10 -6 -14c-19 -24 -38 -47 -71 -56c-46 -13 -91 -29 -138 -39c-6 -2 -12 -3 -26 -5zM1357 33c14 0 26 8 35 23c20 33 26 70 26 107c0 12 -1 25 -2 37c-5 35 -27 56 -55 56c-11 0 -23 -4 -36 -10c-2 -42 -5 -84 -7 -126c-1 -23 -3 -46 -5 -69l2 -2 c7 -4 13 -8 21 -11s15 -5 21 -5zM691 28c10 3 20 5 31 6c40 2 42 5 51 44c9 41 18 83 26 124c1 5 1 9 1 12c0 18 -10 27 -32 30c-4 0 -7 1 -10 1c-19 0 -35 -7 -49 -17c-1 -19 -2 -38 -4 -57c-5 -48 -8 -95 -14 -143zM1050 46c8 0 16 1 24 5c17 7 32 18 39 37 c12 33 22 67 22 102c0 30 -26 51 -57 51c-6 0 -13 -1 -20 -3c-11 -4 -21 -10 -30 -17c0 -56 -3 -113 -7 -169c1 0 1 -1 2 -1c9 -3 18 -5 27 -5zM377 39h1c84 22 72 -1 93 91l9 40c1 6 2 11 2 17c0 16 -6 32 -20 43c-8 6 -19 9 -31 9c-15 0 -31 -4 -42 -12 c0 -63 -4 -126 -12 -188zM92 61c5 1 10 2 16 2c38 3 71 15 94 49c9 13 14 28 14 43c0 20 -8 41 -24 59c-15 16 -37 24 -58 24c-12 0 -23 -2 -33 -7c-1 -57 -3 -114 -9 -170z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E529.xml b/data/Petaluma/E529.xml
new file mode 100644
index 00000000000..29dcae8f891
--- /dev/null
+++ b/data/Petaluma/E529.xml
@@ -0,0 +1 @@
+<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M807 -276c22 52 49 97 106 112c11 30 14 61 16 93c6 89 6 178 10 267c1 21 5 42 5 63c0 6 0 12 -1 18c-21 -14 -41 -28 -61 -41c1 -64 -16 -124 -49 -182c-28 -50 -63 -93 -119 -113c-5 -2 -11 -3 -17 -3c-8 -36 -23 -68 -43 -96c24 4 49 7 73 10h6c9 0 14 -3 14 -10 c0 -3 -1 -6 -2 -9c-16 -38 -33 -72 -81 -78c-41 -5 -83 -8 -122 -29c2 51 22 85 58 102c18 28 23 61 27 94c11 92 16 184 16 277c0 18 1 36 1 54c-1 5 -1 12 -7 15c-1 1 -3 1 -4 1c-4 0 -6 -6 -9 -8c-18 -13 -35 -28 -56 -40c-17 -93 -55 -176 -131 -240 c-16 -12 -32 -22 -51 -28c-5 -38 -14 -74 -35 -107c19 4 39 10 58 14c3 1 7 2 11 2s8 -2 10 -7c-2 -18 -39 -71 -68 -78c-46 -11 -93 -20 -138 -35c-4 -2 -10 -5 -13 0c-1 1 -2 3 -2 4c0 4 4 7 6 10l17 29c14 22 30 40 57 48c10 30 13 63 16 96c9 96 15 192 21 289 c0 6 1 14 1 22c0 15 -3 30 -14 30c-12 0 -26 -19 -38 -29c2 -12 2 -24 2 -37c-5 -58 -44 -117 -87 -173c-26 -34 -57 -56 -98 -63l-2 -17c-8 -41 -23 -78 -44 -112l82 16c4 0 8 1 11 1c4 1 7 0 9 -4c0 -1 1 -2 1 -3c0 -5 -4 -11 -7 -16c-17 -31 -37 -59 -76 -67 c-34 -7 -67 -14 -102 -22c-6 -4 -11 -5 -20 -5c-19 -4 -38 -8 -58 -13c14 31 26 57 44 81c9 10 21 14 34 17l22 4c18 42 26 87 26 134c0 102 -6 202 -6 303c0 7 0 15 -5 23c-29 -15 -47 -48 -90 -52c16 22 27 41 42 58c28 31 59 59 94 84c7 5 14 8 19 8c10 0 16 -8 19 -24 c4 -24 6 -47 7 -70c10 11 22 20 37 27c17 8 33 12 49 12c37 0 69 -20 86 -55c11 13 23 25 36 35c19 14 36 30 54 44c9 7 17 11 24 11c11 0 20 -10 24 -28c2 -10 3 -20 4 -31c19 16 42 28 72 33c6 1 12 2 18 2c44 0 76 -31 77 -75c8 10 16 19 26 27c23 20 48 38 73 58 c9 7 17 10 24 10c13 0 21 -9 22 -28c1 -15 1 -30 1 -46c26 26 60 42 105 45c33 1 46 -10 52 -43c1 -3 1 -6 2 -9c31 33 75 52 109 82c5 4 10 6 14 6c11 0 20 -11 19 -27c0 -7 -1 -15 -1 -23c19 15 41 26 66 31c7 1 13 2 19 2c46 0 87 -34 91 -88c1 -13 2 -26 2 -38 c0 -91 -34 -170 -101 -237c-19 -19 -42 -28 -66 -28c-9 0 -17 1 -26 3c-3 -20 -6 -40 -13 -60c-6 -20 -15 -39 -25 -56c13 3 27 6 40 8c6 2 14 4 20 4c5 0 9 -1 12 -5c2 -3 3 -5 3 -8c0 -8 -7 -17 -11 -25c-18 -31 -42 -55 -81 -59c-41 -4 -81 -17 -118 -35 c-7 -3 -15 -7 -24 -4zM1059 62c15 0 29 4 44 14c28 19 44 42 41 75c-3 38 -11 76 -53 94c-7 3 -16 4 -24 4c-17 1 -35 -5 -52 -15l-6 -160c3 0 5 -1 8 -2c14 -6 28 -10 42 -10zM393 40c6 3 14 5 24 5c44 2 77 44 85 96c1 9 2 18 2 27c0 6 -1 13 -1 19c-3 39 -26 62 -57 62 c-13 0 -27 -4 -42 -13c-6 -65 -8 -131 -11 -196zM98 55c4 1 9 2 14 2c3 0 7 -1 11 -1c49 -4 84 34 84 88c0 10 -2 21 -4 32c-8 33 -31 51 -60 62c-7 3 -13 4 -19 4c-11 0 -21 -4 -31 -11c0 -13 0 -26 1 -39c0 -46 4 -91 4 -137zM748 63c18 0 32 10 41 32c13 26 19 54 25 82 c1 3 1 6 1 10c0 15 -7 29 -12 43c-3 7 -12 8 -21 8c-23 -1 -44 -6 -63 -17c-1 -10 -1 -20 -2 -30c-4 -41 -4 -81 -5 -121c1 -1 2 -1 3 -1c3 0 7 0 11 -2c8 -3 15 -4 22 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52A.xml b/data/Petaluma/E52A.xml
new file mode 100644
index 00000000000..6cda41b7bf6
--- /dev/null
+++ b/data/Petaluma/E52A.xml
@@ -0,0 +1 @@
+<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M198 -321c-1 2 -3 3 -5 4c22 40 33 86 87 100c5 1 10 2 15 4c20 25 28 57 32 92c1 10 1 19 1 29c0 35 -5 70 -7 105c-2 19 -2 39 -2 58c0 52 5 104 10 156c0 9 1 17 2 29c-24 -12 -40 -33 -65 -44c4 -20 6 -41 6 -62c0 -30 -4 -61 -15 -90c-23 -61 -74 -117 -146 -117 c-8 0 -16 1 -23 2c-2 -12 -4 -24 -7 -36c-8 -34 -21 -64 -38 -92l77 15c7 1 16 6 17 -3c-1 -27 -46 -77 -72 -85c-51 -16 -104 -22 -155 -40c-2 -1 -5 -1 -6 -1c-5 0 -7 3 -3 11c1 3 2 6 4 9c37 67 34 74 78 82c16 41 22 84 23 129c2 96 13 193 13 291c0 13 0 27 -5 43 c-25 -22 -44 -47 -82 -50c25 37 45 72 78 96c16 12 31 23 46 35c6 6 13 9 20 9c4 0 7 -1 11 -2c8 -2 9 -7 9 -13c0 -27 3 -52 4 -79l42 36c16 14 34 20 51 20c26 0 48 -16 59 -48c4 -12 7 -24 10 -37c7 9 15 17 22 25c29 33 64 60 98 89c5 5 11 7 17 7c4 0 7 0 11 -2 c6 -3 8 -7 8 -11s-1 -8 -1 -12l-3 -41c20 15 43 27 72 33c4 1 10 2 15 2c38 0 71 -31 71 -71v-41c5 4 10 7 13 11c36 35 73 68 109 101c7 7 15 13 24 13c3 0 7 -1 10 -3c11 -7 11 -21 10 -33l-1 -4c22 15 46 24 76 29c6 1 12 1 17 1c31 0 48 -15 54 -50c5 -31 9 -62 9 -92 c0 -23 -2 -45 -8 -67c-21 -77 -97 -144 -179 -164c-1 -9 -1 -18 -2 -28c-2 -46 -19 -83 -45 -115c15 5 31 12 46 17c10 3 20 6 25 7h6c9 0 13 -3 13 -7c0 -3 -1 -6 -3 -9c-14 -25 -28 -50 -54 -62c-49 -23 -100 -41 -152 -55c-5 -1 -12 -5 -16 0c-1 2 -1 3 -1 4 c0 4 3 7 5 11c5 9 10 18 16 27c11 18 23 35 43 44c15 22 23 47 25 75l6 83l1 19c5 87 15 173 29 259v15c-27 -14 -45 -42 -76 -47v-53c0 -29 -9 -55 -26 -78c-35 -47 -77 -83 -130 -102c-1 -58 -19 -107 -52 -150c10 4 21 8 32 11c7 2 15 5 22 5c6 0 11 -2 14 -6 c0 -2 1 -4 1 -7c0 -8 -8 -18 -14 -26c-20 -31 -48 -47 -82 -58c-47 -15 -93 -33 -139 -50zM710 22h4c12 -1 24 3 36 4c41 6 47 13 52 54c2 16 3 31 3 47c0 31 -5 62 -10 94c-4 25 -12 34 -30 34c-5 0 -10 -1 -15 -2c-7 -1 -13 -3 -18 -5c-4 -26 -7 -53 -10 -79 c-6 -49 -9 -98 -12 -147zM412 31c3 0 6 1 9 1c14 0 27 9 41 11c27 4 33 20 33 43c-1 21 0 43 0 65v10c0 8 0 17 -1 25c-4 33 -23 52 -51 52c-8 0 -18 -2 -28 -6l-7 -3c0 -3 0 -6 -1 -10c-3 -20 -4 -41 -4 -61c0 -43 5 -85 9 -127zM171 26c11 0 17 6 17 23 c0 51 1 102 -17 151c-8 22 -20 34 -35 34c-10 0 -21 -6 -33 -16l-3 -3c-1 -51 -4 -101 -7 -151c-1 -6 -1 -13 -1 -19c2 0 5 -1 8 -2c20 -7 41 -11 62 -16c3 -1 7 -1 9 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52B.xml b/data/Petaluma/E52B.xml
new file mode 100644
index 00000000000..d94d8a3c62d
--- /dev/null
+++ b/data/Petaluma/E52B.xml
@@ -0,0 +1 @@
+<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-93 -280c-2 1 -3 3 -3 5c0 5 6 10 10 14l15 24c14 23 32 38 54 49c15 41 22 84 25 127c5 74 8 148 10 222c1 37 14 73 12 115c-31 -24 -55 -52 -98 -58c19 32 36 60 61 82c26 23 52 46 77 71c6 5 13 9 21 9c3 1 6 0 10 -1c7 -4 9 -10 9 -16c0 -3 -1 -7 -1 -9 c-4 -29 -6 -58 -7 -87c17 19 37 34 64 45c15 6 31 9 47 9h6c5 0 10 -1 15 -2c24 -4 39 -18 43 -41c11 11 24 21 41 26c35 10 60 39 88 62c5 4 9 11 17 11h3c7 0 14 -1 10 -14c-7 -26 -14 -53 -19 -79c23 22 51 40 86 51c8 2 15 4 22 4c24 0 41 -15 52 -44 c7 -22 10 -43 10 -64c0 -26 -4 -52 -11 -78c-19 -70 -52 -131 -112 -176c-21 -16 -45 -23 -71 -27c1 -52 -9 -91 -33 -125c24 7 48 17 72 24l18 6c2 0 4 1 5 1c6 0 12 -3 15 -6c2 -2 2 -3 2 -5c0 -4 -4 -8 -6 -12c-15 -26 -35 -46 -63 -56c-45 -16 -91 -28 -137 -42 c-14 -5 -28 -8 -44 -8c-5 0 -11 1 -16 1c27 36 49 72 93 84c6 20 9 41 9 63c0 19 -1 38 -1 57c0 108 12 214 40 319c2 6 4 12 2 19c-23 -13 -45 -29 -70 -40c-3 -97 -39 -180 -121 -241c-23 -17 -48 -27 -75 -32c-1 -8 -3 -16 -5 -25c-9 -39 -21 -71 -38 -100 c28 8 56 15 85 19c3 0 6 1 9 1c5 0 9 -1 11 -8c-2 -6 -3 -11 -6 -14c-23 -29 -45 -57 -87 -65c-43 -8 -86 -20 -126 -42c-6 -3 -14 -9 -19 -3zM436 38c31 0 61 20 70 50c7 23 12 46 12 69c0 22 -4 43 -13 64c-8 19 -18 29 -33 29c-8 0 -16 -3 -26 -8c-15 -8 -28 -17 -41 -28 c-8 -54 -12 -108 -12 -163c2 0 5 -1 8 -3c11 -7 23 -10 35 -10zM121 37c14 0 28 6 41 9c8 3 15 8 17 18c11 40 23 80 21 122c-1 18 1 41 -20 47c-10 3 -20 5 -30 5c-13 1 -27 -3 -39 -13c-4 -4 -8 -8 -11 -12c-2 -42 -3 -84 -6 -127c-2 -14 -2 -29 -3 -44c5 0 11 -1 17 -3 c4 -2 9 -2 13 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52C.xml b/data/Petaluma/E52C.xml
new file mode 100644
index 00000000000..761b9f84524
--- /dev/null
+++ b/data/Petaluma/E52C.xml
@@ -0,0 +1 @@
+<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M446 -243c-3 0 -6 1 -8 3s-2 4 -2 6c0 6 5 11 8 15c16 26 32 52 55 72c4 3 6 8 7 12c16 51 27 102 30 155c0 3 1 6 -3 10c-21 -18 -42 -36 -66 -50c-19 -10 -37 -19 -58 -22c-4 -1 -9 -1 -12 -1c-21 0 -35 11 -44 33c-9 23 -13 47 -13 71c0 22 3 44 6 66 c6 43 8 86 11 129v5c0 3 0 8 -4 12c-20 -25 -32 -53 -42 -82c-17 -50 -38 -100 -45 -153c0 -8 -5 -14 -9 -20c-14 -22 -36 -33 -60 -41c-6 -2 -10 -3 -14 -3c-14 0 -18 10 -16 30c6 64 15 127 22 191c2 11 3 22 3 34c0 10 -1 20 -3 31c-28 -42 -44 -83 -55 -127 c-10 -39 -21 -77 -33 -115c-11 -35 -40 -49 -70 -59c-6 -2 -11 -3 -15 -3c-13 0 -19 9 -17 31c7 80 11 161 14 241c1 10 6 20 6 31c0 3 -1 6 -2 10c-11 0 -20 -7 -31 -5c-3 1 -8 0 -10 4c-1 1 -1 3 -1 4c0 3 2 6 4 8c10 11 20 22 31 31c19 17 38 34 58 50c6 6 12 9 19 9 c4 0 8 -1 13 -3c14 -7 13 -19 12 -29c-2 -35 -10 -71 -10 -107c0 -3 0 -6 1 -9c19 23 35 47 54 70c18 21 37 40 59 56c8 6 16 9 25 9c16 0 32 -11 37 -30c5 -20 2 -40 6 -63c19 19 35 37 54 54c18 16 36 34 62 38c4 1 7 1 11 1c22 0 37 -14 38 -38c1 -34 -3 -68 -6 -103 c-4 -41 -6 -83 -4 -124c1 -19 5 -36 11 -54c2 -7 6 -10 10 -10c3 0 5 1 8 3c23 14 41 33 67 42c5 3 4 12 5 18c0 25 1 51 1 76c0 13 0 26 -1 39c0 6 -1 12 -1 17c0 19 2 38 3 56c0 3 1 7 1 11c0 3 0 6 -3 9c-15 -8 -28 -22 -47 -21c-4 1 -10 -1 -13 4c0 1 -1 2 -1 3 c0 4 3 7 5 10c22 29 41 61 75 79c13 8 23 19 34 30c5 5 10 7 16 7c4 0 8 -1 13 -3c10 -3 12 -8 9 -17c-6 -22 -3 -44 -5 -71c24 18 44 34 68 44c13 6 26 9 38 9c43 0 78 -33 78 -83c1 -97 -36 -176 -110 -241c-24 -21 -45 -46 -80 -49c-8 -1 -10 -8 -12 -16 c-8 -38 -20 -75 -37 -113c18 1 32 10 48 14c6 1 11 3 16 5c3 1 6 2 9 2c6 0 13 -3 18 -7c3 -2 3 -4 3 -7c0 -5 -4 -11 -6 -15c-15 -27 -35 -52 -68 -60c-40 -10 -80 -23 -119 -39c-4 -2 -8 -4 -12 -5s-9 -2 -14 -2zM623 235v-157c42 0 69 13 83 41c8 16 9 34 11 51 c3 19 6 37 6 55c0 10 -1 21 -4 31c-5 13 -12 23 -26 28c-5 1 -9 2 -14 2c-28 0 -56 -23 -56 -51z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52D.xml b/data/Petaluma/E52D.xml
new file mode 100644
index 00000000000..7403b8cae60
--- /dev/null
+++ b/data/Petaluma/E52D.xml
@@ -0,0 +1 @@
+<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 -186c-18 0 -36 5 -54 12c-7 2 -10 5 -10 9c0 2 2 5 5 8c20 16 38 36 62 48c7 4 13 5 20 3c3 -1 6 -3 9 -4c9 -3 17 -5 23 -5c16 0 25 10 36 34c13 29 17 60 21 90s5 60 8 90c2 19 5 38 5 57c-1 10 -4 12 -13 12h-82c-9 0 -19 1 -29 7c1 4 2 7 4 9c18 14 30 36 49 49 c13 9 25 13 40 12h12c16 1 17 1 17 18c1 28 13 50 30 71c21 26 43 52 71 71c10 7 20 13 31 18c13 6 27 9 41 9c22 0 44 -8 61 -23c14 -13 27 -27 32 -47c2 -5 2 -9 -1 -13c-18 -23 -40 -39 -69 -48c-2 -1 -5 -1 -8 -1c-2 0 -5 1 -8 1c-5 2 -7 4 -9 10c-6 22 -20 40 -41 49 c-4 2 -8 3 -11 3c-8 0 -13 -5 -17 -15c-6 -16 -8 -32 -7 -49c0 -14 2 -28 2 -43c0 -8 4 -11 11 -11l93 -9c3 0 6 0 9 -1c13 -3 19 -8 19 -15c0 -5 -2 -10 -6 -16c-4 -5 -8 -10 -13 -13c-13 -7 -25 -15 -37 -22c-7 -4 -15 -6 -23 -6c-6 0 -13 1 -19 2c-9 1 -16 2 -21 2 c-12 0 -13 -6 -16 -30c-3 -22 -3 -44 -5 -66c-2 -27 -8 -53 -12 -80c-1 -9 -4 -18 -8 -27c-21 -41 -47 -78 -84 -106c-24 -18 -52 -30 -81 -40c-9 -3 -18 -4 -27 -4zM32 -50c-20 1 -24 5 -23 25c1 27 4 55 5 82c4 55 7 109 9 164c1 10 6 20 6 31c0 3 -1 6 -2 10 c-11 -2 -21 -7 -32 -5c-4 1 -8 0 -10 5v2c0 3 2 7 4 9c14 14 28 31 44 43c17 14 32 29 50 42c4 3 9 5 14 5c16 0 25 -8 25 -23c0 -19 -1 -38 -4 -56c-2 -12 -4 -24 -4 -36l-3 -36c6 1 7 5 9 9c28 46 62 87 105 120c7 6 16 8 24 8c17 0 33 -10 39 -28c2 -9 4 -18 4 -28v-36 c10 5 15 13 20 18c22 22 41 44 66 60c8 6 16 10 25 13c5 2 10 3 15 3c10 0 19 -4 28 -9c6 -4 10 -8 10 -15c1 -9 3 -17 3 -26c0 -31 -5 -63 -6 -95c-2 -29 -4 -58 -4 -87c0 -22 1 -45 6 -67c1 -7 3 -14 5 -21c3 -7 6 -10 10 -10c3 0 6 1 9 3c5 3 10 7 16 11c9 7 19 15 29 21 c8 5 12 7 16 7c5 0 9 -4 20 -12c-14 -29 -39 -49 -66 -67c-21 -14 -43 -28 -69 -32c-6 -1 -12 -2 -18 -2c-5 0 -10 1 -15 2c-13 4 -22 12 -27 25c-10 25 -15 50 -15 76c0 7 0 14 1 21c8 56 13 112 16 169v6c0 6 0 11 -4 17c-18 -21 -28 -45 -37 -69 c-17 -45 -34 -90 -45 -138c-1 -6 -3 -12 -3 -18c-1 -18 -9 -33 -23 -43c-19 -15 -37 -31 -63 -29c-3 0 -7 0 -10 1c-4 2 -7 4 -7 10c4 42 9 84 14 126c5 45 15 89 12 135c0 3 0 6 -1 14c-27 -43 -46 -85 -57 -130c-8 -39 -19 -77 -32 -115c-5 -15 -13 -27 -26 -35 c-11 -7 -22 -14 -33 -20c-6 -4 -13 -5 -20 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52E.xml b/data/Petaluma/E52E.xml
new file mode 100644
index 00000000000..7c1b4849104
--- /dev/null
+++ b/data/Petaluma/E52E.xml
@@ -0,0 +1 @@
+<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-32 -274c-4 0 -7 1 -10 4c-2 2 -2 4 -2 6c0 6 9 13 12 20c13 25 29 47 51 66c5 4 7 11 8 17c17 54 27 108 29 164c2 47 7 94 5 141c0 10 -1 20 -1 31c0 31 2 62 2 95c-16 -9 -30 -22 -48 -22c-5 0 -10 1 -16 3c8 20 22 36 34 52c12 15 27 29 44 39c14 9 27 21 39 33 c5 5 9 6 14 6c6 0 13 -3 19 -5c6 -3 5 -9 3 -15c-4 -12 -4 -25 -4 -38c0 -10 0 -20 -1 -31c23 13 41 29 62 40c14 6 27 9 40 9c14 0 27 -3 41 -8c28 -10 38 -33 41 -60c1 -9 0 -19 0 -32c17 14 35 12 53 12c9 0 18 1 18 14c0 35 17 62 40 87c28 31 57 62 97 80 c10 5 20 7 31 7c43 0 90 -31 99 -72v-3c0 -5 -2 -9 -5 -12c-17 -22 -39 -37 -66 -44c-5 -1 -8 -2 -11 -2c-8 0 -11 5 -15 17c-7 17 -19 31 -35 41c-6 3 -11 5 -15 5c-8 0 -14 -6 -19 -18c-5 -14 -7 -28 -7 -42c0 -17 2 -33 4 -50c1 -10 11 -8 17 -9c28 -3 56 -6 83 -8 c13 0 28 -3 31 -14c4 -11 -7 -21 -17 -29c-21 -16 -43 -30 -70 -30c-6 0 -13 1 -20 3s-12 3 -15 3c-9 0 -10 -7 -12 -25c-5 -50 -5 -100 -18 -149c-2 -9 -2 -18 -6 -26c-36 -78 -92 -133 -178 -153c-6 -1 -11 -2 -17 -2c-19 0 -37 6 -55 13c-6 2 -8 5 -8 8s2 6 5 8 c21 16 39 36 62 49c4 2 8 3 12 3s8 -1 13 -3c10 -3 19 -5 27 -5c19 0 30 12 39 39c9 28 15 57 18 87c4 36 8 73 11 110c1 11 1 22 2 33c0 8 -3 12 -11 12h-63c-7 0 -8 -5 -10 -10c-20 -80 -78 -132 -139 -181c-10 -8 -22 -12 -35 -14c-10 -2 -15 -6 -17 -17 c-7 -38 -20 -75 -39 -116c22 7 39 13 56 19c6 1 11 4 16 4h3c12 0 19 -5 19 -14c0 -3 -1 -7 -3 -11c-14 -30 -35 -53 -68 -62c-42 -12 -83 -25 -122 -41c-6 -3 -15 -7 -22 -7zM143 205v-159c14 1 28 5 43 9c25 6 39 23 44 47c4 15 6 30 8 45c2 16 5 33 5 49 c0 10 -1 19 -4 29c-5 14 -12 24 -27 29c-5 1 -9 2 -14 2c-27 0 -55 -23 -55 -51z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E52F.xml b/data/Petaluma/E52F.xml
new file mode 100644
index 00000000000..7a79235c07f
--- /dev/null
+++ b/data/Petaluma/E52F.xml
@@ -0,0 +1 @@
+<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M190 -197c-17 0 -34 6 -50 12c-7 2 -9 5 -9 8s2 7 6 11c11 10 24 21 36 31c13 10 26 17 41 17c7 0 14 -1 22 -5c5 -2 10 -3 14 -3c14 0 25 10 34 30c9 21 14 42 17 65c8 62 17 125 17 188h-4c-50 0 -100 2 -150 4c-1 -25 -3 -49 -5 -74c-5 -37 -6 -75 -17 -111 c-25 -82 -99 -152 -191 -167c-4 -1 -8 -1 -13 -1c-16 0 -32 5 -48 11c-6 2 -9 6 -9 9c0 4 3 8 6 11c11 10 23 20 35 29c13 11 27 20 42 20c7 0 14 -2 22 -6c4 -2 9 -3 13 -3c10 0 19 6 27 16c13 17 17 37 21 58c13 69 20 139 21 210c-32 0 -65 -1 -97 -1c-9 0 -20 0 -23 8 c0 1 -1 2 -1 3c0 7 9 12 15 17c5 4 8 10 12 14c20 20 40 37 72 35h22c9 78 74 162 147 186c6 2 12 3 19 3c44 0 99 -38 99 -78c0 -18 -17 -27 -31 -36s-27 -21 -45 -21c-4 0 -9 1 -14 3s-3 7 -4 10c-2 5 -2 10 -5 13c-13 17 -25 41 -50 36c-18 -5 -22 -20 -22 -37 c0 -26 3 -54 3 -82l84 -3c11 -1 22 -1 33 -1s22 1 33 1c3 75 54 125 115 169c18 14 37 20 56 20c17 0 34 -5 52 -15c4 -2 9 -4 12 -8c14 -15 33 -29 33 -51c0 -3 0 -6 -1 -9c-5 -19 -58 -52 -77 -50c-9 0 -16 2 -18 14c-2 17 -16 29 -29 40c-7 6 -14 9 -20 9 c-10 0 -18 -8 -22 -24c-4 -12 -5 -25 -5 -38c0 -19 3 -38 4 -57c37 -1 74 -4 111 -9c14 -2 21 -7 21 -15c0 -5 -3 -11 -9 -17c-23 -23 -48 -43 -83 -39c-13 2 -27 3 -40 4c-1 -65 -6 -130 -26 -192c-28 -87 -94 -142 -186 -161c-4 -1 -8 -1 -13 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E530.xml b/data/Petaluma/E530.xml
new file mode 100644
index 00000000000..74f76702b58
--- /dev/null
+++ b/data/Petaluma/E530.xml
@@ -0,0 +1 @@
+<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M522 -197c-11 0 -21 1 -31 3c-10 1 -20 8 -23 16v2c0 6 9 10 14 15c8 6 14 14 21 20c13 12 26 23 42 23c8 0 16 -2 25 -7c6 -3 12 -5 17 -5c13 0 23 10 30 26c20 46 20 95 20 143c0 39 2 78 6 117c-33 -1 -65 -2 -98 -2c-23 0 -46 1 -69 1c0 -12 -1 -23 -1 -34 s1 -22 1 -34c0 -48 -4 -96 -17 -142c-6 -21 -15 -41 -32 -55c-47 -42 -95 -82 -162 -82c-17 0 -53 2 -62 19c-6 10 18 21 28 31c15 15 31 27 51 27c9 0 19 -2 29 -7c11 -5 19 -8 26 -8c14 0 22 12 29 37c13 47 14 95 15 143c1 37 3 73 7 109l-44 3c-20 1 -40 2 -60 2 c-17 0 -33 0 -50 -1h-4c-1 -5 -1 -9 -1 -13c-1 -14 -1 -29 -1 -43c0 -23 1 -47 1 -70c0 -18 -1 -35 -2 -53c-3 -51 -24 -90 -67 -118c-45 -29 -92 -48 -143 -48c-17 0 -34 2 -51 6c-4 1 -7 3 -11 4c-1 1 -2 2 -4 5c23 18 48 35 76 47c3 1 5 1 8 1c8 0 16 -4 24 -6 c10 -3 18 -5 25 -5c15 0 22 9 32 30c11 26 14 52 14 79c0 11 -1 21 -1 32c0 51 1 101 5 152c-41 2 -82 6 -125 8c15 29 28 54 46 77c7 10 17 11 27 10c21 -3 41 -4 62 -6c7 54 40 93 82 124c19 14 41 24 61 37c11 7 23 10 34 10c42 0 84 -37 99 -67c1 -2 1 -3 1 -4 c0 -5 -4 -7 -7 -9c-21 -18 -47 -27 -74 -33c-2 0 -4 -1 -5 -1c-8 0 -14 4 -19 14c-8 17 -24 37 -42 34c-17 -2 -23 -26 -28 -44c-6 -21 -10 -42 -12 -64c55 0 110 0 165 -2l9 47c12 52 51 83 90 114c21 17 42 26 66 26c11 0 23 -2 36 -7c32 -12 48 -38 60 -67 c1 -3 1 -5 1 -7c0 -3 -1 -5 -4 -8c-21 -21 -44 -36 -72 -42l-7 -1c-6 0 -11 3 -14 14c-6 21 -20 37 -41 46c-4 2 -7 3 -10 3c-5 0 -7 -3 -10 -12c-10 -37 -14 -74 -18 -111c57 -4 114 -6 172 -5l9 37c20 68 65 115 121 152c9 6 18 9 29 9c19 0 39 -10 55 -27 c17 -18 25 -30 25 -40c0 -13 -11 -23 -34 -38c-9 -6 -18 -12 -27 -16c-6 -3 -11 -5 -15 -5c-7 0 -13 5 -18 16c-6 14 -18 31 -32 31c-17 0 -17 -23 -20 -38c-5 -27 -10 -53 -14 -80c2 1 4 1 6 1c34 0 68 5 103 7h9c7 0 14 -1 17 -7l1 -4c0 -8 -7 -16 -12 -23 c-25 -35 -59 -50 -102 -52c-11 0 -21 -1 -32 -1l-3 -53c0 -18 1 -37 1 -55c0 -10 0 -19 -1 -28c-8 -106 -69 -170 -161 -212c-13 -6 -27 -8 -40 -8z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E531.xml b/data/Petaluma/E531.xml
new file mode 100644
index 00000000000..423cd0cd2d5
--- /dev/null
+++ b/data/Petaluma/E531.xml
@@ -0,0 +1 @@
+<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M244 -197c-5 0 -10 0 -15 1c-11 2 -16 5 -16 10c0 3 3 7 7 13c13 16 26 31 40 45c6 7 12 10 19 10c3 0 6 0 10 -2c9 -4 18 -6 28 -6c20 0 34 8 43 27c32 62 37 129 37 197v41c0 14 0 28 1 42c-55 1 -109 5 -164 8h-5c-1 -35 1 -71 1 -107c2 -103 -44 -177 -132 -227 c-35 -19 -71 -28 -109 -32h-10c-10 0 -19 1 -28 7c18 22 37 42 59 59c7 5 15 4 23 4c10 1 20 2 31 1c40 -4 56 19 66 54c9 32 10 65 9 99c0 19 -1 38 -1 57c0 28 1 56 4 83c-19 -2 -39 -4 -59 -7c-9 -2 -19 -2 -29 -2c-8 0 -15 0 -23 1c-7 1 -10 3 -10 6s2 5 4 8 c17 20 31 42 51 60c5 5 10 8 17 6c13 -3 25 -4 38 -4c8 0 16 0 24 1c20 78 68 132 139 168c10 5 19 7 28 7c18 0 35 -9 51 -23c3 -3 7 -6 10 -10c17 -22 26 -34 26 -43c0 -11 -12 -19 -35 -34c-9 -6 -19 -10 -28 -15c-6 -3 -11 -4 -16 -4c-8 0 -14 4 -19 17 c-6 16 -18 29 -34 38c-5 2 -8 4 -11 4c-5 0 -9 -4 -11 -11c-7 -29 -15 -58 -20 -87c12 1 25 1 37 1c46 0 92 -4 138 -8c22 71 73 121 131 164c9 6 18 9 29 9c13 0 27 -4 40 -9c27 -9 51 -25 63 -54c2 -6 6 -10 0 -17c-19 -21 -41 -38 -67 -48c-3 -1 -6 -2 -8 -2 c-5 0 -8 3 -11 10c-11 27 -35 38 -60 45c-2 1 -5 1 -7 1c-6 0 -11 -3 -15 -10c-16 -29 -21 -60 -23 -92c23 1 47 2 70 2c10 0 21 0 31 -1c25 0 49 -2 74 -3c2 12 4 24 7 36c15 69 59 117 118 151c11 6 21 10 32 10c16 0 32 -7 46 -19c16 -13 31 -27 42 -45c3 -3 4 -6 4 -9 c0 -4 -2 -7 -5 -11c-16 -17 -36 -30 -56 -40c-5 -3 -10 -5 -15 -5c-8 0 -16 5 -22 14c-9 16 -24 25 -38 36c-5 3 -8 4 -11 4c-5 0 -8 -5 -10 -13c-10 -38 -15 -75 -17 -113c45 -2 89 -4 134 -3h45c2 25 7 51 19 73c29 54 64 107 130 122c7 2 14 2 21 2c36 0 68 -21 88 -60 c2 -5 4 -10 4 -15c0 -7 -3 -13 -9 -19c-18 -17 -38 -34 -62 -42c-4 -1 -6 -2 -9 -2c-4 0 -7 3 -8 12c-5 27 -36 50 -64 52h-3c-11 0 -14 -6 -17 -15c-9 -26 -11 -53 -11 -79c0 -10 1 -20 1 -30c39 -1 79 0 118 5c7 1 15 2 23 2c9 0 18 -2 28 -8c-23 -30 -49 -55 -86 -60 c-28 -3 -55 -6 -82 -7c0 -72 -5 -143 -37 -209c-35 -76 -85 -137 -170 -160c-6 -2 -11 -2 -17 -2c-4 0 -9 0 -13 1c-15 4 -23 11 -23 20c0 6 3 13 9 20c12 16 23 32 36 45c5 5 10 7 15 7c4 0 9 -2 14 -6c11 -8 21 -12 31 -12c17 0 31 11 40 31c27 63 34 129 38 196 c-2 23 -3 45 -4 68h-19c-20 1 -40 -1 -60 -1l-101 3v-23c0 -15 1 -30 1 -45c0 -52 -5 -103 -35 -149c-39 -62 -89 -113 -162 -134c-4 -1 -8 -2 -11 -2c-7 0 -14 -1 -22 -1c-9 0 -18 2 -23 11c-7 14 13 21 18 32c3 7 9 12 13 17c11 12 20 20 35 20c5 0 10 0 16 -2 c8 -2 16 -3 23 -3c25 0 40 15 50 47c12 38 13 78 14 118v42l3 75c-56 1 -113 2 -169 2v-17c1 -60 -2 -119 -24 -177c-30 -78 -80 -138 -159 -172c-18 -7 -36 -12 -55 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E532.xml b/data/Petaluma/E532.xml
new file mode 100644
index 00000000000..a4136881a2b
--- /dev/null
+++ b/data/Petaluma/E532.xml
@@ -0,0 +1 @@
+<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M989 -195c-18 -2 -30 11 -39 29c-3 7 -6 14 -6 22s3 16 10 24c12 15 20 34 34 48c6 6 12 10 17 10c6 0 11 -5 16 -15c6 -14 11 -35 28 -35c20 0 17 25 19 40c12 87 29 175 40 262c-52 -3 -104 -6 -156 -6c-1 -14 -3 -29 -3 -44c-8 -132 -85 -214 -196 -273 c-17 -9 -37 -10 -56 -13h-6c-4 0 -9 1 -11 5c-1 1 -1 2 -1 3c0 5 5 8 7 12c4 7 9 13 14 19c17 24 35 40 69 44c69 8 89 37 94 117c3 44 6 88 10 133c-33 0 -67 1 -100 1c-24 0 -48 0 -72 -1c1 -25 3 -49 3 -73c0 -10 0 -21 -1 -30c-5 -106 -53 -185 -142 -241 c-19 -11 -39 -18 -60 -22c-17 -2 -30 5 -41 16c-4 5 -7 10 -7 15c0 4 2 9 7 14c14 13 25 29 40 44c6 6 12 9 18 9c5 0 11 -3 18 -10c9 -10 19 -15 28 -15c13 0 24 11 31 30c18 44 23 89 23 135c0 22 -1 44 -2 65s-2 41 -2 62c-63 -1 -127 -2 -190 -2c0 -10 1 -21 1 -31 c0 -67 -9 -135 -31 -199c-21 -60 -59 -109 -121 -130c-6 -2 -12 -3 -18 -3c-24 0 -48 16 -60 36c-2 3 -3 6 -3 8c0 4 2 6 4 9c15 15 24 35 40 51c7 7 13 10 20 10h2c5 0 10 -3 16 -8c19 -15 27 -24 34 -24c8 0 12 13 19 40c11 43 16 87 16 135c0 15 0 31 -1 48 c-2 19 -2 40 -2 61c-44 1 -88 1 -132 1c-2 -43 -4 -86 -8 -128c-8 -82 -51 -143 -114 -193c-25 -20 -52 -36 -85 -40h-7c-10 0 -19 2 -27 8c-9 6 -16 13 -16 21c0 5 3 11 9 17c13 14 23 30 36 45c5 5 10 8 15 8h2c4 0 9 -3 13 -6c12 -11 24 -16 35 -16c17 0 31 13 39 38 c17 52 18 107 21 161c1 16 2 33 2 50c0 12 -1 24 -1 36c-45 0 -90 1 -135 4c-3 0 -6 1 -11 2c12 29 26 55 45 79c4 5 9 6 14 6h10c27 -1 53 -2 80 -2c0 12 2 24 4 36c12 73 56 122 118 153c10 5 20 7 30 7c40 0 81 -31 93 -72v-3c0 -5 -3 -7 -5 -11c-16 -22 -40 -34 -64 -44 c-4 -2 -8 -3 -12 -3c-7 0 -12 4 -13 16c0 1 -2 2 -3 4c-11 16 -24 39 -43 39c-22 0 -19 -32 -20 -51c-1 -24 -1 -49 -1 -73c48 -1 95 -3 142 -4c5 18 12 37 21 55c27 54 71 96 120 130c13 9 27 13 40 13c24 0 49 -14 65 -41c11 -18 17 -29 17 -38c0 -12 -10 -22 -32 -38 c-7 -6 -14 -12 -23 -17c-8 -5 -14 -7 -19 -7c-7 0 -12 6 -18 19c-4 8 -9 16 -14 22c-13 17 -24 25 -34 25c-11 0 -21 -11 -31 -33c-14 -30 -18 -61 -20 -92c66 -3 132 -3 198 -3l1 10c6 35 20 65 42 92c20 24 42 46 65 68c21 20 41 28 61 28c33 0 62 -24 82 -54 c4 -7 7 -13 7 -18c0 -8 -5 -15 -14 -21c-13 -9 -26 -19 -40 -26c-8 -5 -15 -8 -22 -8c-8 0 -16 5 -21 19c-7 19 -26 27 -43 35c-3 1 -6 2 -8 2c-9 0 -11 -10 -13 -18c-11 -35 -16 -72 -18 -109h4c59 0 119 -2 178 -3c1 10 2 20 4 30c10 73 54 122 111 160c18 12 37 18 55 18 c37 0 71 -25 81 -67c0 -3 2 -6 2 -9v-3c0 -5 -4 -10 -7 -14c-15 -22 -37 -37 -61 -48c-3 -2 -7 -3 -10 -3c-5 0 -8 3 -8 13c0 14 -9 25 -18 35c-11 11 -23 20 -39 20c-2 0 -5 0 -8 -1c-18 -4 -17 -22 -18 -35c-3 -33 -6 -65 -8 -97c25 -1 51 -1 76 -1h39c14 0 29 1 44 1v1 c7 83 54 142 118 188c18 12 36 18 54 18c36 0 69 -23 83 -62c2 -4 2 -8 2 -12c0 -5 -2 -10 -6 -16c-15 -18 -33 -32 -54 -43c-5 -3 -11 -5 -15 -5c-8 0 -14 5 -16 18c-3 17 -15 28 -29 36c-8 5 -16 7 -23 7c-14 1 -24 -9 -27 -29c-5 -32 -9 -65 -13 -97c42 3 84 6 125 8 c5 0 12 2 17 2c7 0 12 -2 15 -6c4 -11 -7 -21 -15 -31c-25 -28 -54 -40 -94 -42l-58 -3c0 -5 -1 -10 -2 -15c-9 -72 -16 -143 -32 -213s-63 -117 -122 -152c-10 -6 -21 -9 -36 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E533.xml b/data/Petaluma/E533.xml
new file mode 100644
index 00000000000..6853246142b
--- /dev/null
+++ b/data/Petaluma/E533.xml
@@ -0,0 +1 @@
+<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M465 -197c-11 0 -21 3 -30 10c-8 6 -12 11 -12 17c0 5 3 10 9 16c14 16 28 33 45 47c6 5 12 7 17 7h2c5 0 10 -3 15 -7c3 -2 5 -5 8 -7c6 -4 11 -6 15 -6c8 0 13 5 17 16c13 30 16 63 23 95c15 68 15 138 20 207v5c-21 1 -41 1 -62 2c-20 1 -39 2 -59 2 c-14 0 -28 -1 -42 -1l-15 -199c-4 -52 -27 -96 -69 -129c-23 -18 -44 -39 -75 -44c-6 -1 -11 -2 -17 -2c-19 0 -37 7 -54 16c-6 3 -9 7 -9 12c0 3 1 7 4 10c16 16 26 37 43 52c6 5 11 12 21 9c11 1 20 -8 30 -12c9 -3 15 -5 20 -5c9 0 12 7 15 24c10 56 5 113 14 169 c5 32 8 64 10 96c-35 -1 -70 4 -104 6c-7 0 -13 1 -19 1c0 -11 1 -22 1 -33c0 -71 -10 -141 -38 -208c-30 -72 -81 -127 -156 -157c-9 -4 -17 -5 -25 -5c-22 0 -40 12 -51 34c-4 7 -6 14 -6 21c0 8 3 15 10 23c14 15 24 34 39 48c7 6 12 10 17 10c6 0 10 -5 14 -16 c4 -10 10 -19 17 -26c10 -10 19 -14 28 -14c10 0 20 8 27 24c25 56 30 116 34 175c1 16 0 32 0 48c1 27 -2 55 -4 82h-3c-22 0 -42 -9 -63 -12c-20 -3 -40 -8 -61 -8c-6 0 -13 1 -20 2v2c0 5 3 8 6 11c12 9 22 21 33 31c15 14 30 25 52 25c15 0 30 5 45 9c2 0 5 0 7 1 c0 31 3 62 20 89c23 37 51 68 88 91c11 7 25 11 40 11c24 0 51 -10 69 -27c3 -4 7 -7 10 -11c12 -13 18 -23 18 -31c0 -11 -8 -20 -20 -30c-14 -11 -27 -22 -43 -29c-5 -3 -10 -4 -14 -4c-7 0 -13 4 -18 13c-8 15 -20 27 -36 34c-8 3 -13 5 -17 5c-8 0 -10 -9 -10 -33 s2 -48 5 -71c12 -1 24 -1 36 -2c32 -3 64 -4 96 -5v4c3 42 21 78 49 107c30 32 58 65 103 80c9 3 18 4 27 4c45 0 87 -32 103 -71c1 -3 1 -5 1 -8c0 -4 -1 -8 -4 -12c-18 -23 -40 -40 -67 -52c-3 -1 -6 -2 -8 -2c-5 0 -8 3 -12 11c-15 30 -36 55 -73 57 c-15 0 -24 -5 -27 -21c-4 -19 -7 -37 -8 -56c0 -15 -1 -30 -2 -44c39 0 77 2 116 2c15 0 29 0 44 -1h9c1 9 4 18 6 27c18 66 63 112 118 148c15 10 32 14 48 14c40 0 79 -26 100 -57c3 -4 4 -8 4 -12c0 -3 -1 -7 -5 -11c-16 -22 -37 -35 -59 -48c-5 -2 -10 -4 -14 -4 c-7 0 -14 5 -19 15c-11 21 -44 39 -65 39h-3c-8 0 -11 -6 -14 -13c-8 -23 -12 -46 -14 -70c-1 -10 -1 -21 -2 -31c18 0 35 -1 53 -1c26 -1 51 2 77 3c22 1 44 1 67 1c3 15 8 31 14 46c20 51 54 94 102 123c15 9 33 14 51 14c31 0 63 -14 81 -37c7 -9 10 -16 10 -22 s-3 -12 -11 -20c-16 -16 -33 -30 -53 -39c-5 -2 -10 -5 -14 -5c-6 0 -11 4 -16 14c-10 19 -32 27 -55 30h-3c-13 0 -15 -12 -17 -22c-5 -26 -9 -53 -13 -79c15 1 31 1 46 1c30 0 60 -1 91 -1h37c2 11 5 23 8 35c16 55 48 100 93 136c16 13 34 19 53 19c23 0 45 -9 62 -26 c21 -21 32 -33 32 -45c0 -13 -11 -25 -34 -43l-15 -12c-10 -7 -18 -11 -24 -11c-8 0 -15 6 -24 19c-11 15 -24 27 -42 33c-4 1 -7 2 -9 2c-7 0 -12 -5 -14 -14c-7 -31 -11 -62 -14 -93v-3h20c23 -1 46 -1 69 -1c11 1 22 1 34 1c11 0 23 0 34 -1c18 70 61 128 118 179 c10 9 21 11 33 11c8 0 17 -1 26 -3c30 -4 55 -18 75 -41c9 -10 14 -17 14 -26c0 -7 -4 -14 -10 -24c-13 -18 -30 -34 -49 -45c-5 -3 -10 -5 -15 -5s-10 4 -15 14c-11 22 -32 35 -56 42c-8 3 -14 4 -19 4c-10 0 -13 -7 -18 -25c-6 -27 -11 -55 -13 -84c15 0 30 -1 45 -1 c19 -1 37 -2 56 -2c11 0 23 1 35 2h5c9 0 19 -2 27 -9c-5 -14 -15 -23 -27 -31c-26 -19 -56 -27 -88 -27h-55v-2c-2 -54 -4 -107 -10 -160c-5 -42 -23 -79 -50 -110c-33 -38 -66 -79 -120 -91c-9 -2 -18 -4 -27 -4c-12 0 -24 4 -36 14c-6 5 -6 9 -3 13c14 19 25 39 41 57 c6 7 13 10 20 10c4 0 7 0 11 -2c1 0 2 -1 2 -1c12 -4 23 -6 32 -6c27 0 42 18 46 55c8 74 16 149 16 224v5c-42 3 -84 3 -126 3h-28c-3 -42 -7 -83 -13 -125c-4 -27 -11 -55 -20 -81c-29 -83 -88 -138 -172 -166c-6 -2 -12 -4 -19 -4c-6 0 -13 2 -20 5c-8 4 -11 10 -6 18 c15 21 28 43 46 61c4 5 9 6 15 6c6 -1 11 -2 17 -4c7 -2 14 -2 19 -2c19 0 30 9 38 32c21 61 25 124 30 188c1 25 4 49 7 73c-31 1 -61 1 -92 1c-26 0 -52 0 -77 -1c-6 -66 -12 -132 -34 -196c-22 -65 -58 -119 -114 -159c-27 -19 -57 -27 -90 -27c-6 0 -14 0 -17 7v3 c0 5 4 9 7 12c13 17 25 35 40 50c7 6 13 12 22 11c8 0 15 -1 21 -1c28 0 30 7 44 45c21 56 25 115 32 174l9 79c-21 -1 -41 -1 -61 -2c-43 -2 -87 -3 -130 -3c-1 -18 -3 -36 -4 -54c-7 -72 -16 -144 -44 -211c-21 -50 -60 -85 -105 -115c-15 -10 -33 -14 -51 -18 c-4 -1 -7 -1 -11 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E534.xml b/data/Petaluma/E534.xml
new file mode 100644
index 00000000000..b60488eb4e5
--- /dev/null
+++ b/data/Petaluma/E534.xml
@@ -0,0 +1 @@
+<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M287 -243c-1 1 -2 3 -2 4c0 5 8 8 10 13c17 29 39 49 63 63c24 71 44 142 54 216c6 46 10 92 10 138c0 40 -3 81 -8 121c-17 -7 -30 -19 -44 -30c5 -1 9 -3 11 -7c1 -1 2 -3 2 -5c0 -8 -8 -15 -13 -21c-25 -30 -54 -49 -98 -49c-16 0 -32 -1 -48 -1c0 -25 1 -50 1 -75 c0 -42 -3 -84 -15 -126c-19 -67 -105 -151 -203 -151c-19 0 -37 2 -56 8l57 56c8 7 17 9 27 7l19 -3c9 -1 16 -2 23 -2c30 0 41 13 51 52c7 28 9 56 9 85c0 30 -2 60 -2 90v58l-153 -3c-4 0 -8 1 -15 1c17 29 31 55 53 75c11 10 25 12 38 12c11 0 22 -2 33 -2 c16 -1 32 -1 47 -2c2 14 4 28 8 42c19 65 64 108 117 143c9 6 20 8 31 8c43 0 98 -34 107 -71l1 -4c0 -4 -3 -7 -6 -11c-18 -21 -42 -34 -67 -44c-4 -1 -7 -2 -11 -2h-2c-6 0 -11 4 -15 15c-6 21 -26 33 -48 40c-2 1 -4 1 -6 1c-7 0 -8 -9 -10 -15c-8 -34 -11 -69 -12 -103 c37 0 74 1 110 3c16 22 33 41 53 58c21 18 44 34 67 50c7 5 15 7 21 7c13 0 23 -9 25 -27c2 -17 3 -35 5 -52c25 26 56 45 97 50c5 1 9 1 13 1c34 0 54 -19 61 -57c2 -9 2 -18 2 -27c0 -27 -6 -54 -14 -79c-26 -80 -77 -142 -143 -192c-12 -9 -25 -15 -38 -17 c-5 -21 -11 -42 -18 -63c-7 -22 -14 -44 -22 -66c11 3 23 6 35 8c16 4 32 12 51 11h7c4 0 9 -1 11 -5c1 -1 1 -3 1 -4c0 -6 -5 -11 -8 -15c-24 -27 -49 -50 -86 -58c-31 -7 -62 -14 -92 -24c-1 0 -2 -1 -3 -1c-18 -6 -36 -12 -53 -20c-6 -3 -14 -8 -20 -2zM532 78 c12 -1 24 8 30 20c19 38 32 77 32 119c0 8 0 16 -1 23c-4 30 -20 45 -42 45c-8 0 -17 -2 -27 -6c-5 -2 -11 -5 -16 -9c1 -17 1 -36 1 -54c0 -46 -3 -91 -9 -137c3 2 7 3 11 3c4 -1 8 -1 13 -3c3 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E535.xml b/data/Petaluma/E535.xml
new file mode 100644
index 00000000000..934a0733597
--- /dev/null
+++ b/data/Petaluma/E535.xml
@@ -0,0 +1 @@
+<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 -195c-22 -2 -44 4 -65 12c-6 2 -9 5 -9 8s3 6 6 9c21 17 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 37 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -15 31 -30 42c-8 5 -14 8 -20 8c-8 0 -15 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-22 -23 -47 -44 -81 -39c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -74 -115 -161 -190 -168zM342 0c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5 c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58 c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E536.xml b/data/Petaluma/E536.xml
new file mode 100644
index 00000000000..76b6ebb8147
--- /dev/null
+++ b/data/Petaluma/E536.xml
@@ -0,0 +1 @@
+<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M265 -155c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40l-10 1c-15 0 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM105 0c-35 0 -68 16 -96 42c-6 5 -9 12 -9 18c0 5 2 11 5 15c12 21 24 42 40 60 c6 8 12 14 21 10c4 -1 5 -3 5 -5c0 -4 -4 -8 -4 -12v-2c0 -8 6 -12 12 -17c28 -22 60 -35 101 -34h2c3 0 6 -1 11 -1s11 2 13 9c1 2 2 5 2 8c0 10 -6 18 -11 26c-12 19 -32 26 -52 32c-23 7 -47 12 -67 29c-19 16 -29 39 -29 63c0 13 4 28 11 41c15 23 32 46 52 67 c20 20 49 30 78 30c41 0 84 -19 104 -53c1 -3 2 -5 2 -8c0 -4 -1 -6 -3 -9c-10 -17 -26 -30 -41 -42c-7 -4 -14 -10 -20 -10c-7 0 -12 4 -17 16c-10 20 -50 33 -77 33c-6 0 -11 -1 -15 -2c-7 -1 -8 -4 -8 -8c0 -2 1 -6 2 -9c8 -33 33 -51 64 -61c24 -7 47 -12 68 -27 s32 -35 32 -55c0 -11 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-6 -1 -10 -1 -16 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E537.xml b/data/Petaluma/E537.xml
new file mode 100644
index 00000000000..12dfbc59aa5
--- /dev/null
+++ b/data/Petaluma/E537.xml
@@ -0,0 +1 @@
+<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M265 -155c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40l-10 1c-15 0 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM581 -232c-3 0 -6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74 c20 21 22 51 27 78c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-7c-3 0 -7 0 -9 4c-1 1 -1 2 -1 3c0 4 4 8 6 12c24 49 74 76 113 111c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6 c44 0 80 -42 78 -117c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20c-18 -26 -38 -48 -71 -56c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5 c-3 -1 -7 -2 -10 -2zM105 0c-35 0 -68 16 -96 42c-6 5 -9 12 -9 18c0 5 2 11 5 15c12 21 24 42 40 60c6 8 12 14 21 10c4 -1 5 -3 5 -5c0 -4 -4 -8 -4 -12v-2c0 -8 6 -12 12 -17c28 -22 60 -35 101 -34h2c3 0 6 -1 11 -1s11 2 13 9c1 2 2 5 2 8c0 10 -6 18 -11 26 c-12 19 -32 26 -52 32c-23 7 -47 12 -67 29c-19 16 -29 39 -29 63c0 13 4 28 11 41c15 23 32 46 52 67c20 20 49 30 78 30c41 0 84 -19 104 -53c1 -3 2 -5 2 -8c0 -4 -1 -6 -3 -9c-10 -17 -26 -30 -41 -42c-7 -4 -14 -10 -20 -10c-7 0 -12 4 -17 16c-10 20 -50 33 -77 33 c-6 0 -11 -1 -15 -2c-7 -1 -8 -4 -8 -8c0 -2 1 -6 2 -9c8 -33 33 -51 64 -61c24 -7 47 -12 68 -27s32 -35 32 -55c0 -11 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-6 -1 -10 -1 -16 -1zM756 89c17 2 34 5 50 10c19 6 33 19 37 35c8 32 16 63 16 96c0 9 -1 19 -3 29 c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169c0 -2 0 -4 -1 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E538.xml b/data/Petaluma/E538.xml
new file mode 100644
index 00000000000..9cdbdd615b6
--- /dev/null
+++ b/data/Petaluma/E538.xml
@@ -0,0 +1 @@
+<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M265 -145c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40c-3 0 -7 0 -10 1c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM591 -242c-3 0 -6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74 c20 21 22 51 27 78c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-7c-3 0 -7 0 -9 4c-1 1 -1 2 -1 3c0 4 4 8 6 12c24 49 74 76 113 111c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6 c32 0 60 -22 72 -64c27 43 71 70 108 103c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6c44 0 80 -42 78 -117c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125 c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20c-18 -26 -38 -48 -71 -56c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5c-3 -1 -7 -2 -10 -2s-6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74c20 21 22 51 27 78 c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-1c1 -8 1 -17 1 -26c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20c-18 -26 -38 -48 -71 -56 c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5c-3 -1 -7 -2 -10 -2zM106 0c-36 0 -69 16 -97 42c-6 5 -9 12 -9 18s2 11 5 16c12 20 24 41 40 60c6 7 12 13 21 10c4 -2 5 -4 5 -6c0 -4 -4 -8 -4 -12v-2c0 -8 6 -12 12 -17c28 -22 60 -34 101 -33h2c3 0 6 -1 11 -1s11 1 14 8 c0 3 1 5 1 8c0 10 -6 18 -11 26c-12 19 -32 26 -52 32c-23 7 -47 12 -67 29c-19 16 -29 39 -29 63c0 14 4 28 11 41c16 24 32 46 52 67c20 20 49 30 78 30c41 0 84 -19 104 -52c2 -4 3 -6 3 -9s-2 -6 -4 -9c-10 -17 -26 -30 -41 -42c-6 -4 -14 -10 -20 -10s-12 4 -17 16 c-10 20 -49 34 -77 34c-6 0 -11 -1 -15 -2c-7 -2 -8 -5 -8 -8s1 -7 2 -9c9 -34 33 -51 64 -61c24 -8 47 -12 68 -28c21 -15 32 -34 32 -55c0 -11 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-5 -1 -10 -1 -15 -1zM1100 115c17 2 34 5 50 10c19 6 33 19 37 35 c7 32 16 63 16 96c0 9 -1 19 -3 29c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169c0 -2 0 -4 -1 -6zM786 109c17 2 34 5 50 10c19 6 33 19 37 35c8 32 16 63 16 96c0 9 -1 19 -3 29c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12 c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169c0 -2 0 -4 -1 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E539.xml b/data/Petaluma/E539.xml
new file mode 100644
index 00000000000..a3f3c2bd538
--- /dev/null
+++ b/data/Petaluma/E539.xml
@@ -0,0 +1 @@
+<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M245 -166c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40c-3 0 -7 0 -10 1c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM96 0c-32 0 -62 15 -88 39c-6 5 -8 10 -8 16c0 5 1 10 5 14 c10 20 21 39 35 55c6 7 12 13 20 10c4 -2 5 -4 5 -5c0 -4 -4 -8 -4 -11v-2c0 -7 5 -12 11 -16c26 -20 55 -31 93 -31h1h10c5 0 10 1 13 7c1 3 2 5 2 8c0 9 -6 16 -10 24c-12 17 -30 23 -49 29c-21 7 -42 11 -61 27c-17 14 -26 36 -26 57c0 13 3 26 10 38c14 21 29 42 47 62 c19 18 45 27 72 27c38 0 77 -17 95 -48c2 -4 3 -5 3 -8s-2 -6 -4 -8c-9 -16 -23 -28 -37 -39c-6 -4 -13 -9 -19 -9c-5 0 -10 4 -16 14c-9 19 -45 31 -70 31c-5 0 -10 -1 -14 -1c-6 -2 -7 -5 -7 -8c0 -2 1 -6 2 -8c8 -31 30 -47 59 -56c21 -7 43 -11 62 -25s29 -32 29 -51 c0 -10 -2 -21 -8 -31c-29 -56 -76 -92 -138 -100c-5 -1 -10 -1 -15 -1zM574 12c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8 c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9 c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E53A.xml b/data/Petaluma/E53A.xml
new file mode 100644
index 00000000000..5af00553174
--- /dev/null
+++ b/data/Petaluma/E53A.xml
@@ -0,0 +1 @@
+<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M245 -165c-19 0 -38 5 -56 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-20 -21 -42 -40 -71 -40c-3 0 -7 0 -10 1c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -77 -123 -168 -199 -168zM894 -280c-3 0 -6 1 -8 4c-1 2 -2 4 -2 5c0 5 3 9 6 13c17 26 34 51 55 74 c20 21 22 51 27 78c17 93 18 188 18 282v85c-16 -5 -27 -19 -45 -19h-7c-3 0 -7 0 -9 4c-1 1 -1 2 -1 3c0 4 4 8 6 12c24 49 74 76 113 111c4 4 8 5 11 5c6 0 12 -4 18 -6c4 -2 6 -4 6 -8s-2 -8 -3 -12c-1 -24 -3 -48 -4 -72c25 23 52 44 77 54c10 4 20 6 29 6 c44 0 80 -42 78 -117c7 -95 -60 -178 -152 -244c-14 -10 -30 -16 -47 -19c-8 -42 -21 -84 -40 -125c22 7 41 12 59 20c5 2 10 3 15 3c7 0 14 -2 18 -7c2 -2 3 -5 3 -8c0 -7 -5 -15 -9 -20c-18 -26 -38 -48 -71 -56c-39 -9 -78 -22 -115 -39c-5 -2 -11 -5 -16 -5 c-3 -1 -7 -2 -10 -2zM97 0c-33 0 -63 15 -89 39c-6 5 -8 11 -8 16s1 10 5 15c11 19 21 38 36 55c6 6 11 12 20 9c3 -2 4 -3 4 -5c0 -3 -3 -8 -3 -11v-2c0 -7 5 -11 10 -15c26 -21 55 -32 93 -31h2c2 0 5 -1 10 -1s10 1 12 7c1 3 2 5 2 8c0 9 -6 17 -10 24 c-12 18 -30 23 -49 29c-20 7 -42 11 -60 27c-18 14 -27 36 -27 57c0 13 3 26 10 38c14 22 29 43 47 62c19 18 45 27 72 27c38 0 77 -17 95 -48c2 -3 3 -5 3 -8s-2 -5 -4 -8c-9 -16 -23 -27 -37 -38c-6 -4 -13 -9 -18 -9c-6 0 -11 3 -16 14c-9 18 -45 31 -70 31 c-6 0 -10 -1 -15 -2c-5 -2 -7 -4 -7 -8c0 -2 2 -5 2 -8c8 -31 30 -47 59 -56c22 -7 43 -11 62 -25c20 -14 30 -32 30 -51c0 -10 -3 -21 -9 -31c-29 -56 -76 -91 -138 -100c-5 -1 -9 -1 -14 -1zM584 13c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30 c-26 -2 -50 -5 -75 -5c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21 c-19 -22 -40 -42 -64 -58c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3 c-8 -4 -18 -11 -27 -11zM1069 41c17 2 34 5 50 10c19 6 33 19 37 35c8 32 16 63 16 96c0 9 -1 19 -3 29c-5 26 -21 40 -41 40c-10 0 -22 -4 -33 -12c-8 -7 -16 -15 -23 -23c-1 -56 0 -113 -2 -169c0 -2 0 -4 -1 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E53B.xml b/data/Petaluma/E53B.xml
new file mode 100644
index 00000000000..9a178e8235d
--- /dev/null
+++ b/data/Petaluma/E53B.xml
@@ -0,0 +1 @@
+<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M503 -169c-17 0 -34 6 -50 12c-7 2 -9 5 -9 8s2 7 6 11c11 10 24 21 36 31c13 10 26 17 41 17c7 0 14 -1 22 -5c5 -2 10 -3 14 -3c14 0 25 10 34 30c9 21 14 42 17 65c8 62 17 125 17 188h-4c-50 0 -100 2 -150 4c-1 -25 -3 -49 -5 -74c-5 -37 -6 -75 -17 -111 c-25 -82 -99 -152 -191 -167c-4 -1 -8 -1 -13 -1c-16 0 -32 5 -48 11c-6 2 -9 6 -9 9c0 4 3 8 6 11c11 10 23 20 35 29c13 11 27 20 42 20c7 0 14 -2 22 -6c4 -2 9 -3 13 -3c10 0 19 6 27 16c13 17 17 37 21 58c13 69 20 139 21 210c-32 0 -65 -1 -97 -1c-9 0 -20 0 -23 8 c0 1 -1 2 -1 3c0 7 9 12 15 17c5 4 8 10 12 14c20 20 40 37 72 35h22c9 78 74 162 147 186c6 2 12 3 19 3c44 0 99 -38 99 -78c0 -18 -17 -27 -31 -36s-27 -21 -45 -21c-4 0 -9 1 -14 3s-3 7 -4 10c-2 5 -2 10 -5 13c-13 17 -25 41 -50 36c-18 -5 -22 -20 -22 -37 c0 -26 3 -54 3 -82l84 -3c11 -1 22 -1 33 -1s22 1 33 1c3 75 54 125 115 169c18 14 37 20 56 20c17 0 34 -5 52 -15c4 -2 9 -4 12 -8c14 -15 33 -29 33 -51c0 -3 0 -6 -1 -9c-5 -19 -58 -52 -77 -50c-9 0 -16 2 -18 14c-2 17 -16 29 -29 40c-7 6 -14 9 -20 9 c-10 0 -18 -8 -22 -24c-4 -12 -5 -25 -5 -38c0 -19 3 -38 4 -57c37 -1 74 -4 111 -9c14 -2 21 -7 21 -15c0 -5 -3 -11 -9 -17c-23 -23 -48 -43 -83 -39c-13 2 -27 3 -40 4c-1 -65 -6 -130 -26 -192c-28 -87 -94 -142 -186 -161c-4 -1 -8 -1 -13 -1zM105 0 c-35 0 -68 16 -96 42c-6 5 -9 12 -9 18c0 5 2 10 5 16c13 20 24 41 39 59c6 7 13 14 23 10c3 -1 4 -3 4 -5c0 -4 -4 -8 -4 -12v-2c0 -8 5 -13 12 -17c29 -22 60 -35 101 -34h2c3 0 6 -1 11 -1c5 1 11 2 14 9c0 2 1 5 1 8c0 9 -6 18 -11 26c-12 20 -32 26 -52 32 c-23 8 -47 12 -67 29c-19 16 -29 39 -29 63c0 14 3 28 11 40c15 24 32 47 52 68c20 20 49 30 78 30c41 0 84 -19 103 -53c2 -3 3 -5 3 -8s-1 -6 -3 -9c-10 -17 -25 -30 -41 -41c-7 -5 -14 -11 -20 -11s-12 4 -17 16c-10 20 -50 33 -77 33c-6 0 -11 0 -16 -2 c-6 -1 -7 -4 -7 -8c0 -2 1 -6 2 -9c9 -33 33 -51 64 -61c23 -7 47 -12 68 -27s32 -35 32 -55c0 -12 -3 -23 -9 -34c-32 -61 -83 -100 -151 -109c-6 -1 -10 -1 -16 -1zM819 29c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5 c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58 c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E53C.xml b/data/Petaluma/E53C.xml
new file mode 100644
index 00000000000..5cbc9cbf51c
--- /dev/null
+++ b/data/Petaluma/E53C.xml
@@ -0,0 +1 @@
+<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 -115c-22 -2 -44 4 -65 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-22 -23 -47 -44 -81 -39c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -74 -115 -161 -190 -168zM16 0c-8 0 -10 7 -9 20c7 91 12 182 19 273v8c0 6 0 11 -4 18c-31 -23 -57 -51 -97 -62 c7 21 21 34 31 48c33 40 76 69 114 103c5 5 10 7 14 7c9 0 17 -8 19 -21c3 -27 4 -52 3 -78c4 5 7 9 10 14c24 33 59 48 96 58c20 6 39 11 59 11c13 0 26 -3 39 -8c6 -3 13 -3 12 -13c0 -18 -37 -68 -55 -72c-2 -1 -3 -1 -5 -1c-3 0 -6 2 -10 3c-13 3 -26 5 -38 5 c-44 0 -86 -21 -111 -58c0 -9 -1 -18 -2 -26c-3 -49 -9 -96 -12 -145c-2 -31 -33 -73 -61 -81c-5 -2 -9 -3 -12 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E53D.xml b/data/Petaluma/E53D.xml
new file mode 100644
index 00000000000..a89fddfe684
--- /dev/null
+++ b/data/Petaluma/E53D.xml
@@ -0,0 +1 @@
+<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 -155c-22 -2 -44 4 -65 12c-6 2 -9 5 -9 8s3 6 6 9c19 19 39 35 62 49c5 3 9 4 13 4s8 -1 12 -3c11 -4 20 -6 27 -6c20 0 31 13 40 42c13 42 16 86 21 129c4 37 7 73 7 110h-44c-15 0 -30 0 -44 1c-7 0 -14 0 -22 1c-7 1 -10 4 -10 7s1 7 5 10c18 18 33 38 55 53 c7 4 15 5 23 5h35c0 73 52 116 102 159c22 19 45 29 70 29c17 0 34 -4 51 -14c4 -2 9 -4 12 -7c17 -17 38 -33 34 -59c-3 -19 -57 -54 -78 -54c-9 0 -16 1 -19 13c-4 18 -14 32 -30 42c-8 5 -14 8 -20 8c-8 0 -14 -7 -19 -21c-4 -12 -5 -25 -5 -37c0 -15 2 -31 3 -46v-13 c34 -1 67 -4 100 -8c4 0 8 0 12 -1c14 -4 21 -9 21 -16c0 -5 -3 -10 -9 -17c-22 -23 -47 -44 -81 -39c-15 2 -29 3 -43 4c-3 -63 -10 -125 -23 -186c-16 -74 -115 -161 -190 -168zM16 -40c-8 0 -10 7 -9 20c7 91 12 182 19 273v8c0 6 0 11 -4 18c-31 -23 -57 -51 -97 -62 c7 21 21 34 31 48c33 40 76 69 114 103c5 5 10 7 14 7c9 0 18 -8 19 -21c2 -27 4 -52 3 -78c4 5 7 9 10 14c24 33 59 47 96 58c20 6 39 11 59 11c13 0 26 -3 39 -8c6 -3 13 -3 12 -13c0 -18 -37 -68 -55 -72c-2 -1 -3 -1 -5 -1c-3 0 -6 2 -10 3c-13 3 -26 5 -38 5 c-44 0 -86 -21 -111 -58c0 -9 -1 -18 -2 -26c-3 -49 -9 -96 -12 -145c-2 -31 -33 -73 -61 -81c-5 -2 -9 -3 -12 -3zM609 10c-4 0 -7 2 -10 5c-7 9 9 20 15 30c39 66 107 101 160 153l33 30c-26 -2 -50 -5 -75 -5c-13 0 -26 1 -38 3h-10c-19 2 -42 6 -50 22 c-6 10 17 21 25 33c8 11 20 20 29 30c5 6 11 8 17 8c4 0 7 -1 11 -2c24 -10 47 -14 70 -14c33 0 67 8 101 18c17 5 35 9 53 14c5 1 10 3 15 3c6 0 11 -2 14 -7c1 -2 2 -4 2 -6c-1 -8 -7 -16 -12 -21c-19 -22 -40 -42 -64 -58c-48 -32 -91 -72 -138 -115c18 0 34 1 49 1 c11 0 22 -1 33 -2c43 -4 80 -29 118 -48c6 -3 8 -6 8 -9c-1 -3 -3 -7 -5 -11c-18 -31 -47 -49 -78 -49c-15 0 -30 4 -45 12c-32 17 -65 27 -97 27c-33 0 -66 -9 -98 -28c-2 -1 -4 -3 -6 -3c-8 -4 -18 -11 -27 -11z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E566.xml b/data/Petaluma/E566.xml
new file mode 100644
index 00000000000..f4490cc963a
--- /dev/null
+++ b/data/Petaluma/E566.xml
@@ -0,0 +1 @@
+<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M223 425c24 4 31 -10 31 -36c0 -20 -6 -40 -14 -58c-4 -9 -14 -10 -23 -10h-5c-7 0 -13 -1 -15 -7c-3 -8 -5 -8 -8 -7l-54 -3c3 -62 6 -124 12 -186c1 -11 -2 -27 12 -27c6 0 22 10 24 12l19 19c6 6 14 13 22 11c10 -3 13 -14 14 -23c1 -8 0 -8 0 -16 c2 -48 -12 -81 -51 -106c-11 -7 -25 1 -33 -3c-3 -2 -6 -3 -9 -3c-11 0 -21 11 -27 27c-9 23 -12 48 -13 72c-3 74 -9 147 -12 221c-22 -1 -41 -2 -56 -2c-21 0 -33 3 -35 14v-3s-1 9 -1 20c0 16 1 37 2 43c2 22 13 32 33 34l54 6v40c1 22 4 43 5 65c0 13 9 20 17 20 c22 0 16 -41 18 -58c2 -18 2 -28 2 -38v-25c31 2 61 2 91 7zM527 408c18 -8 24 -20 24 -48c0 -58 -6 -76 -64 -88c-25 -5 -48 -19 -70 -31c-13 -7 -14 -20 -14 -31v-119c0 -7 0 -15 -2 -22c-4 -11 -10 -23 -20 -23c-13 0 -11 15 -13 25c-4 14 -15 123 -15 134 c0 10 3 19 8 29c1 2 2 6 2 12c0 4 -1 8 -1 13c-23 -28 -43 -52 -63 -77c-4 -5 -8 -13 -15 -13c-11 0 -11 13 -12 22c0 7 -2 14 -3 21c-1 9 -5 25 -4 33c2 12 7 31 24 49c25 27 46 59 70 88c8 10 17 22 30 18c12 -3 12 -19 16 -30c2 -6 2 -13 3 -23c30 15 58 29 86 42 c15 7 26 22 33 19z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E567.xml b/data/Petaluma/E567.xml
new file mode 100644
index 00000000000..4566f98f3c8
--- /dev/null
+++ b/data/Petaluma/E567.xml
@@ -0,0 +1 @@
+<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M452 0c-18 0 -37 4 -55 11c-67 26 -118 75 -171 121c-29 27 -57 55 -99 62c-5 1 -10 1 -15 1c-29 0 -56 -14 -70 -37c-4 -7 -5 -13 -5 -18c0 -9 6 -16 18 -22c15 -7 30 -11 45 -11s29 3 43 11c6 3 10 5 14 5c9 0 12 -9 14 -21c1 -8 1 -16 1 -17c0 -58 -10 -71 -55 -81 c-6 -1 -11 -2 -17 -2c-33 0 -70 18 -79 47c-11 36 -21 73 -21 110c0 23 4 46 14 69c20 44 54 72 97 72c21 0 45 -7 70 -22c49 -32 88 -76 135 -110c28 -20 54 -39 86 -51c20 -7 39 -10 59 -10c8 0 15 0 23 1c26 3 53 20 53 37c0 16 -23 46 -43 52c-13 4 -26 8 -39 8 c-8 0 -16 -1 -24 -5c-3 -1 -5 -2 -7 -2c-4 0 -5 4 -6 10l-9 59c-2 26 8 39 33 43c7 1 13 2 20 2c44 0 83 -29 99 -76c9 -27 13 -54 13 -81c0 -21 -3 -42 -7 -63c-14 -60 -62 -92 -115 -92z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E568.xml b/data/Petaluma/E568.xml
new file mode 100644
index 00000000000..ff830825fff
--- /dev/null
+++ b/data/Petaluma/E568.xml
@@ -0,0 +1 @@
+<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M462 0c-7 0 -13 1 -20 2c-25 4 -35 17 -33 43l9 59c1 6 2 10 6 10c2 0 4 -1 7 -2c8 -4 16 -5 24 -5c13 0 26 4 39 8c20 6 43 36 43 52c0 17 -27 34 -53 37c-8 1 -15 1 -23 1c-20 0 -39 -3 -59 -10c-32 -12 -58 -31 -86 -51c-47 -34 -86 -78 -135 -110 c-25 -15 -49 -22 -70 -22c-43 0 -77 28 -97 72c-10 23 -14 46 -14 69c0 37 10 74 21 110c9 29 46 47 79 47c6 0 11 -1 17 -2c45 -10 55 -23 55 -81c0 -1 0 -9 -1 -17c-2 -12 -5 -21 -14 -21c-4 0 -8 2 -14 5c-14 8 -28 11 -43 11s-30 -4 -45 -11c-12 -6 -18 -13 -18 -22 c0 -5 1 -11 5 -18c14 -23 41 -37 70 -37c5 0 10 0 15 1c42 7 70 35 99 62c53 46 104 95 171 121c18 7 37 11 55 11c53 0 101 -32 115 -92c4 -21 7 -42 7 -63c0 -27 -4 -54 -13 -81c-16 -47 -55 -76 -99 -76z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E569.xml b/data/Petaluma/E569.xml
new file mode 100644
index 00000000000..a2e289bd96b
--- /dev/null
+++ b/data/Petaluma/E569.xml
@@ -0,0 +1 @@
+<symbol id="E569" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M306 -106c-27 52 -35 102 -33 155c0 13 0 27 1 41c-16 13 -32 27 -48 41c-30 26 -57 54 -99 62c-5 1 -10 1 -15 1c-29 0 -57 -14 -70 -37c-4 -7 -5 -13 -5 -18c0 -9 6 -16 18 -22c15 -7 30 -11 45 -11s29 3 43 11c6 3 10 5 14 5c9 0 12 -9 14 -21c1 -8 1 -16 1 -17 c0 -58 -10 -71 -55 -81c-6 -1 -11 -2 -17 -2c-33 0 -70 18 -79 47c-11 36 -21 73 -21 110c0 23 4 46 14 69c19 44 54 72 97 72c21 0 45 -7 70 -22c34 -23 64 -51 95 -78l3 180c0 5 -1 10 1 14c3 5 8 11 13 12h2c4 0 4 -6 6 -9c12 -17 13 -37 13 -57c0 -34 1 -71 1 -105v-66 c1 0 1 -1 1 -1c28 -20 54 -40 86 -51c20 -7 39 -10 59 -10c8 0 15 0 23 1c26 3 53 20 53 37c0 16 -23 46 -43 52c-13 4 -26 8 -39 8c-8 0 -16 -1 -24 -5c-3 -1 -5 -2 -7 -2c-4 0 -5 4 -6 10l-9 59c-2 26 8 39 33 43c7 1 13 2 20 2c44 0 83 -29 99 -76c9 -27 13 -54 13 -81 c0 -21 -3 -42 -7 -63c-14 -60 -62 -92 -115 -92c-18 0 -37 4 -55 11c-29 11 -56 28 -81 46c0 -33 0 -66 1 -98c0 -20 -1 -40 -11 -64z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56A.xml b/data/Petaluma/E56A.xml
new file mode 100644
index 00000000000..de6bf95a711
--- /dev/null
+++ b/data/Petaluma/E56A.xml
@@ -0,0 +1 @@
+<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 0c-21 0 -42 3 -63 7c-60 14 -92 62 -92 115c0 18 4 37 11 55c26 67 75 118 121 171c27 29 55 57 62 99c1 5 1 10 1 15c0 29 -14 56 -37 70c-7 4 -13 5 -18 5c-9 0 -16 -6 -22 -18c-7 -15 -11 -30 -11 -45s3 -29 11 -43c3 -6 5 -10 5 -14c0 -9 -9 -12 -21 -14 c-8 -1 -16 -1 -17 -1c-58 0 -71 10 -81 55c-1 6 -2 11 -2 17c0 33 18 70 47 79c36 11 73 21 110 21c23 0 46 -4 69 -14c44 -20 72 -54 72 -97c0 -21 -7 -45 -22 -70c-32 -49 -76 -88 -110 -135c-20 -28 -39 -54 -51 -86c-7 -20 -10 -39 -10 -59c0 -8 0 -15 1 -23 c3 -26 20 -53 37 -53c16 0 46 23 52 43c4 13 8 26 8 39c0 8 -1 16 -5 24c-1 3 -2 5 -2 7c0 4 4 5 10 6l59 9c26 2 39 -8 43 -33c1 -7 2 -13 2 -20c0 -44 -29 -83 -76 -99c-27 -9 -54 -13 -81 -13z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56B.xml b/data/Petaluma/E56B.xml
new file mode 100644
index 00000000000..676f6b54358
--- /dev/null
+++ b/data/Petaluma/E56B.xml
@@ -0,0 +1 @@
+<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M157 0c-27 0 -54 4 -81 13c-47 16 -76 55 -76 99c0 7 1 13 2 20c4 25 17 35 43 33l59 -9c6 -1 10 -2 10 -6c0 -2 -1 -4 -2 -7c-4 -8 -5 -16 -5 -24c0 -13 4 -26 8 -39c6 -20 36 -43 52 -43c17 0 34 27 37 53c1 8 1 15 1 23c0 20 -3 39 -10 59c-12 32 -31 58 -51 86 c-34 47 -78 86 -110 135c-15 25 -22 49 -22 70c0 43 28 77 72 97c23 10 46 14 69 14c37 0 74 -10 110 -21c29 -9 47 -46 47 -79c0 -6 -1 -11 -2 -17c-10 -45 -23 -55 -81 -55c-1 0 -9 0 -17 1c-12 2 -21 5 -21 14c0 4 2 8 5 14c8 14 11 28 11 43s-4 30 -11 45 c-6 12 -13 18 -22 18c-5 0 -11 -1 -18 -5c-23 -14 -37 -41 -37 -70c0 -5 0 -10 1 -15c7 -42 35 -70 62 -99c46 -53 95 -104 121 -171c7 -18 11 -37 11 -55c0 -53 -32 -101 -92 -115c-21 -4 -42 -7 -63 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56C.xml b/data/Petaluma/E56C.xml
new file mode 100644
index 00000000000..2f1c7682bb8
--- /dev/null
+++ b/data/Petaluma/E56C.xml
@@ -0,0 +1 @@
+<symbol id="E56C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M263 0c-17 0 -33 8 -46 25c-21 27 -42 54 -59 85c-9 16 -15 23 -22 23s-15 -5 -28 -16c-29 -25 -50 -58 -79 -84c-7 -7 -14 -14 -29 -16c16 45 32 86 64 119c25 26 48 54 74 79c19 17 37 24 55 24c24 0 47 -14 65 -34c23 -26 45 -52 63 -81c5 -7 8 -10 12 -10s7 4 12 10 c21 25 40 54 65 76c12 11 24 15 35 15c10 0 20 -3 31 -8c19 -10 37 -21 50 -39c16 -23 40 -39 54 -64c2 -4 4 -5 6 -5c3 0 6 7 9 10l100 106c10 10 21 18 32 26c2 2 4 2 7 2c4 0 8 -1 11 -3c2 -2 2 -3 2 -4c0 -4 -5 -7 -6 -11c-9 -20 -27 -36 -42 -52 c-46 -50 -94 -100 -142 -149c-15 -15 -31 -23 -48 -23c-16 0 -33 8 -48 24c-25 25 -50 49 -62 84c-2 6 -4 8 -6 8c-4 0 -7 -4 -10 -8c-18 -24 -36 -47 -54 -70c-9 -12 -20 -21 -32 -29c-12 -7 -23 -10 -34 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56D.xml b/data/Petaluma/E56D.xml
new file mode 100644
index 00000000000..f91f6c84387
--- /dev/null
+++ b/data/Petaluma/E56D.xml
@@ -0,0 +1 @@
+<symbol id="E56D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M356 0c-18 38 -33 75 -35 115c-1 25 -1 50 -1 75c-12 -15 -23 -31 -35 -46c-17 -23 -34 -35 -51 -35c-16 0 -32 9 -49 28c-24 27 -49 55 -66 87c-5 9 -11 14 -17 14c-5 0 -10 -4 -16 -11c-24 -26 -48 -52 -71 -78c-4 -4 -7 -8 -14 -9c-1 7 -1 13 -1 19 c0 81 52 133 109 182c7 6 14 10 22 10c9 0 17 -4 26 -11c27 -23 45 -53 69 -79c1 -2 2 -5 3 -6c17 -22 27 -33 38 -33c10 0 21 11 38 32c6 7 12 15 18 23c2 64 6 129 5 193c0 12 5 19 14 27c21 -31 23 -67 24 -101v-69c8 7 16 13 25 19c14 9 24 13 33 13c13 0 23 -9 35 -29 c20 -30 41 -58 67 -84c5 -6 10 -9 14 -9s9 4 14 10c35 38 71 75 113 106c2 1 3 3 5 5c7 6 18 10 24 6c3 -2 4 -5 4 -8c0 -5 -3 -12 -5 -16c-10 -24 -23 -47 -42 -66c-44 -40 -87 -80 -126 -125c-10 -12 -19 -17 -28 -17c-10 0 -20 7 -31 19c-24 26 -45 55 -66 84 c-7 10 -13 14 -19 14c-5 0 -10 -3 -16 -8v-145c0 -15 2 -31 2 -46c0 -8 0 -15 -2 -23c-1 -8 -2 -17 -11 -27z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56E.xml b/data/Petaluma/E56E.xml
new file mode 100644
index 00000000000..e39833e8b17
--- /dev/null
+++ b/data/Petaluma/E56E.xml
@@ -0,0 +1 @@
+<symbol id="E56E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0c18 39 23 76 56 100c27 21 52 45 75 70c15 15 28 22 41 22c13 1 26 -7 40 -22c17 -16 33 -33 47 -51c5 -7 10 -10 14 -10c5 0 10 3 15 8l80 76c15 14 30 21 46 21c13 0 26 -4 39 -12c28 -17 53 -41 72 -68c6 -9 12 -13 18 -13c5 0 10 3 17 8c24 17 45 37 67 57 c24 23 46 35 68 35c21 0 42 -11 66 -33c18 -16 34 -34 48 -54c7 -10 13 -14 20 -14c6 0 13 4 21 9c31 21 56 50 83 75c10 9 22 14 33 18c3 1 6 2 9 2c6 0 9 -5 6 -15c-7 -28 -17 -54 -37 -74c-38 -39 -77 -77 -122 -108c-18 -12 -34 -18 -50 -18c-22 0 -41 11 -61 33 c-19 22 -41 42 -61 64c-4 5 -8 7 -11 7s-7 -2 -11 -6c-23 -21 -47 -41 -70 -62c-16 -13 -33 -23 -52 -29c-7 -2 -14 -4 -21 -4c-15 0 -28 7 -40 19c-23 23 -45 47 -68 70c-5 6 -10 9 -14 9c-5 0 -10 -3 -15 -9c-20 -22 -41 -43 -62 -64c-9 -9 -19 -17 -30 -23 c-13 -7 -23 -10 -32 -10c-13 0 -24 7 -38 24c-16 19 -35 37 -50 57c-5 6 -9 9 -13 9c-5 0 -9 -3 -14 -8c-22 -21 -44 -40 -65 -61c-11 -9 -23 -17 -44 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E56F.xml b/data/Petaluma/E56F.xml
new file mode 100644
index 00000000000..66fb1cc4ee0
--- /dev/null
+++ b/data/Petaluma/E56F.xml
@@ -0,0 +1 @@
+<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M165 -101c-9 2 -4 13 -5 19l-3 43c-2 22 7 41 20 59c11 15 21 30 31 45c-31 15 -62 29 -97 33c-5 1 -10 1 -15 1c-31 0 -48 -13 -62 -47c-3 -10 -5 -20 -17 -32c-6 30 -17 58 -17 86c0 10 1 20 5 31c17 46 46 68 93 68c9 0 19 0 29 -2c52 -7 97 -30 142 -54 c18 24 36 47 55 69c11 13 25 24 38 36c5 4 11 8 17 5c3 -2 4 -4 4 -6c0 -3 -2 -7 -3 -9c-1 -24 -11 -45 -24 -64c-12 -19 -25 -37 -37 -56c25 -10 51 -18 79 -18c42 0 56 11 65 51c3 14 9 28 14 42c3 8 9 10 14 10c8 0 9 -3 9 -7c0 -3 -1 -7 -1 -9c-5 -50 -16 -98 -41 -143 c-17 -31 -55 -50 -95 -50c-10 0 -21 1 -31 4c-26 8 -49 20 -72 34c-28 -41 -55 -82 -80 -125c-3 -6 -7 -15 -15 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E583.xml b/data/Petaluma/E583.xml
new file mode 100644
index 00000000000..de4c292ead4
--- /dev/null
+++ b/data/Petaluma/E583.xml
@@ -0,0 +1 @@
+<symbol id="E583" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M32 94c-2 -1 -3 -1 -4 -1c-5 0 -8 6 -12 9c-11 8 -16 18 -16 32v261c0 4 1 9 6 11c1 1 3 1 4 1c6 0 10 -8 15 -12c8 -9 10 -20 10 -31c-1 -43 -1 -85 -1 -127h1v-135c0 -3 0 -6 -3 -8z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E587.xml b/data/Petaluma/E587.xml
new file mode 100644
index 00000000000..beab4d31d93
--- /dev/null
+++ b/data/Petaluma/E587.xml
@@ -0,0 +1 @@
+<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M541 -34c-14 -11 -25 -16 -35 -16c-13 0 -24 8 -39 23c-24 24 -38 52 -55 80c-5 7 -9 15 -15 22c-15 19 -27 28 -39 28c-11 0 -25 -8 -40 -26c-21 -26 -44 -49 -69 -70c-16 -14 -32 -21 -46 -21c-19 0 -36 11 -50 35c-10 17 -23 33 -35 48c-9 12 -19 18 -29 18 c-7 0 -15 -3 -24 -9c-12 -7 -21 -17 -32 -25c-10 -8 -20 -16 -33 -19c-4 66 45 135 107 152c5 1 10 2 15 2c12 0 24 -5 33 -16c16 -17 29 -37 43 -57c13 -18 25 -27 39 -27c12 0 25 7 39 22c22 23 43 47 65 69c17 17 33 26 48 26c18 0 35 -12 51 -35c21 -30 38 -61 58 -91 c11 -16 21 -24 32 -24c9 0 19 8 30 22c59 75 118 149 172 226c61 86 121 172 190 251c33 38 71 69 114 95c5 3 9 5 13 5s7 -3 7 -12c0 -33 -8 -67 -34 -89c-79 -66 -146 -143 -204 -228c-67 -98 -138 -193 -213 -286c-20 -25 -38 -53 -64 -73z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B0.xml b/data/Petaluma/E5B0.xml
new file mode 100644
index 00000000000..b980c536567
--- /dev/null
+++ b/data/Petaluma/E5B0.xml
@@ -0,0 +1 @@
+<symbol id="E5B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M542 5c-13 -11 -24 -17 -33 -17c-12 0 -22 10 -31 31c-17 40 -33 80 -49 119l-6 13c-11 22 -20 33 -30 33c-9 0 -18 -8 -31 -25c-27 -36 -55 -72 -85 -106c-16 -19 -34 -36 -58 -45c-8 -3 -14 -4 -20 -4c-12 0 -20 6 -29 22c-18 32 -31 66 -52 96c-8 12 -14 18 -21 18 c-5 0 -11 -5 -19 -16l-41 -57c-8 -10 -18 -20 -37 -25c10 34 22 64 38 91c20 34 46 63 72 92c9 10 20 15 30 15c11 0 22 -6 32 -18c9 -11 16 -22 23 -34c10 -18 19 -36 30 -54c11 -19 18 -28 27 -28c7 0 16 7 30 21c38 38 66 85 100 126c9 12 18 24 33 30c7 3 14 4 20 4 c12 0 22 -4 32 -14c21 -21 32 -48 43 -74c13 -30 26 -61 38 -91c3 -5 4 -12 10 -13h1c7 0 8 8 10 13c28 62 62 119 116 162c68 55 143 81 224 81c27 0 55 -3 84 -9c7 -2 14 -3 21 -5c20 -4 28 -7 28 -15c0 -6 -4 -14 -12 -27c-6 -10 -13 -20 -21 -29 c-11 -13 -24 -17 -42 -15c-29 3 -58 6 -86 6c-38 0 -76 -4 -113 -17c-72 -25 -131 -67 -163 -141c-15 -35 -33 -69 -63 -94z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B1.xml b/data/Petaluma/E5B1.xml
new file mode 100644
index 00000000000..ca380f659a9
--- /dev/null
+++ b/data/Petaluma/E5B1.xml
@@ -0,0 +1 @@
+<symbol id="E5B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M929 -70c-42 0 -84 6 -123 26c-65 34 -111 86 -137 154l-16 36c-19 -51 -41 -96 -73 -136c-10 -12 -21 -24 -35 -32c-10 -6 -19 -9 -27 -9c-14 0 -25 10 -33 29c-15 39 -29 78 -44 117c-8 19 -13 49 -32 52c-13 3 -21 -28 -31 -45c-21 -35 -42 -69 -72 -98 c-19 -18 -36 -27 -52 -27c-18 0 -36 11 -55 34c-28 33 -51 70 -84 99c-6 5 -10 7 -14 7c-5 0 -9 -4 -15 -10c-16 -19 -33 -36 -51 -54c-8 -9 -18 -17 -35 -20c18 48 45 86 75 121l30 35c14 15 27 23 41 23c12 0 24 -6 38 -18c27 -23 49 -52 71 -80c20 -26 34 -39 48 -39 c15 0 28 15 45 46c20 37 40 74 66 107c13 16 26 24 38 24c13 0 25 -9 36 -27c23 -40 39 -84 55 -127c5 -13 11 -25 17 -37c3 -6 5 -13 12 -14c9 0 12 8 14 14c17 39 33 78 49 116c8 19 16 37 28 53c8 12 16 18 23 18c8 0 16 -7 23 -20c16 -30 24 -64 42 -93 c53 -84 128 -129 228 -132c25 -1 49 -1 74 -1c12 0 15 -4 12 -16c-10 -37 -42 -69 -81 -73c-18 -2 -37 -3 -55 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B2.xml b/data/Petaluma/E5B2.xml
new file mode 100644
index 00000000000..a2a4e810799
--- /dev/null
+++ b/data/Petaluma/E5B2.xml
@@ -0,0 +1 @@
+<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M130 -32c-12 -12 -25 -18 -37 -18c-15 0 -29 9 -41 25c-24 32 -28 71 -34 110c-14 90 -16 181 -18 272c-1 50 5 100 9 150c1 12 4 28 19 26c8 -1 10 -16 9 -26c-4 -43 -6 -86 -6 -129c0 -28 1 -56 2 -84c2 -63 8 -126 23 -187c2 -8 4 -16 8 -22c9 -14 17 -30 35 -30 c21 0 35 16 43 32c19 38 30 79 43 119c7 21 18 32 32 32c8 0 18 -3 28 -10c36 -25 63 -61 90 -95c9 -10 14 -16 18 -16s8 7 13 21c11 30 19 59 28 89c9 29 24 44 44 44c11 0 24 -5 39 -15c44 -30 78 -71 113 -110c14 -17 27 -34 42 -51c7 -8 12 -11 16 -11c5 0 9 5 13 16 c13 37 23 75 43 109c11 19 26 30 42 30c10 0 22 -5 33 -14c32 -24 54 -56 78 -87c12 -15 18 -22 24 -22c7 0 14 6 28 17l130 105c7 6 13 12 24 11c2 -11 3 -23 3 -34c0 -26 -6 -51 -27 -72c-48 -48 -100 -89 -155 -128c-7 -5 -14 -8 -20 -8c-9 0 -16 5 -25 15 c-26 32 -55 63 -83 94c-10 11 -18 16 -24 16c-9 0 -15 -8 -22 -24c-10 -23 -17 -48 -27 -71c-9 -24 -16 -56 -45 -60c-26 -4 -41 22 -56 41c-33 42 -70 79 -108 117c-19 19 -32 28 -42 28c-13 0 -21 -15 -29 -46s-16 -62 -34 -89c-9 -13 -16 -20 -25 -20c-8 0 -16 5 -26 15 c-30 30 -50 68 -84 94c-12 9 -18 14 -23 14s-7 -8 -13 -26c-13 -40 -24 -80 -50 -115c-6 -8 -11 -16 -18 -22z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B3.xml b/data/Petaluma/E5B3.xml
new file mode 100644
index 00000000000..fc5342ec3bf
--- /dev/null
+++ b/data/Petaluma/E5B3.xml
@@ -0,0 +1 @@
+<symbol id="E5B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M135 5c-15 -13 -29 -19 -42 -19c-16 0 -31 9 -45 27c-22 28 -28 62 -32 96c-10 83 -16 167 -16 250c0 22 0 43 1 65s3 43 5 65c1 10 6 18 17 21c9 -17 10 -35 9 -53c-2 -35 -3 -70 -3 -106c0 -59 3 -119 10 -179c3 -24 10 -47 29 -66c9 -9 19 -14 28 -14c11 0 21 6 31 17 c21 23 30 52 47 77c14 21 25 31 38 31c10 0 21 -5 36 -15c37 -24 71 -52 102 -83c7 -7 13 -11 17 -11c6 0 11 6 15 18l27 81c6 17 14 26 24 26c7 0 14 -4 23 -13c35 -35 75 -65 107 -103c17 -20 33 -29 53 -29c12 0 26 4 41 11c45 21 74 60 95 104c26 55 47 113 47 175 c0 41 -6 81 -21 117c-7 17 -9 35 -9 52c0 16 1 32 1 48v1c0 7 6 10 12 12h2c5 0 7 -5 10 -9c18 -28 28 -60 32 -92c4 -35 7 -70 7 -105c0 -80 -13 -158 -45 -235c-26 -62 -59 -120 -115 -162c-23 -17 -44 -25 -65 -25c-22 0 -43 9 -66 28c-36 29 -66 64 -99 97 c-5 5 -9 15 -16 11c-5 -1 -7 -11 -8 -18c-6 -24 -11 -48 -23 -70c-11 -21 -23 -31 -36 -31c-10 0 -21 6 -34 17c-26 22 -50 46 -75 69l-5 5c-16 13 -26 19 -34 19c-10 0 -18 -10 -31 -30c-15 -24 -25 -51 -46 -72z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B4.xml b/data/Petaluma/E5B4.xml
new file mode 100644
index 00000000000..ecde004b234
--- /dev/null
+++ b/data/Petaluma/E5B4.xml
@@ -0,0 +1 @@
+<symbol id="E5B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M996 -52c-13 -5 -22 -8 -31 -8c-14 0 -24 8 -37 27c-30 44 -57 92 -80 141c-6 13 -13 25 -24 37c-7 -18 -14 -33 -20 -50c-12 -34 -31 -65 -55 -91c-14 -15 -29 -24 -43 -24s-27 7 -41 24c-38 46 -75 92 -102 150l-29 -68c-13 -31 -32 -58 -51 -86c-6 -7 -13 -14 -20 -20 c-14 -12 -27 -18 -38 -18c-14 0 -27 9 -41 26c-28 34 -53 70 -78 106c-9 12 -13 18 -18 18c-4 0 -9 -7 -17 -22c-32 -54 -76 -87 -140 -92c-52 -4 -102 27 -119 77c-8 24 -12 47 -12 71c0 22 4 45 12 67c19 52 37 105 80 144c26 24 65 38 101 38c26 0 50 -7 66 -22 c7 -6 10 -10 10 -16c0 -3 -1 -6 -3 -10c-10 -23 -25 -43 -43 -59c-5 -4 -9 -7 -15 -7c-4 0 -10 2 -16 7c-14 12 -28 16 -44 16s-32 -5 -48 -12c-26 -11 -40 -30 -40 -58c0 -45 10 -89 46 -119c19 -16 42 -24 65 -24c33 0 64 15 85 44c13 18 25 37 37 56c10 16 23 24 36 24 c11 0 22 -5 33 -16c32 -32 53 -72 82 -105c3 -3 5 -7 8 -10c7 -6 11 -22 21 -22c17 0 21 18 25 32c15 52 33 104 60 150c10 17 21 25 34 25c11 0 22 -7 33 -22c38 -51 74 -103 111 -154c4 -6 8 -15 17 -15c10 0 9 12 12 18c16 42 33 83 57 120c13 20 26 30 40 30 c13 0 26 -8 39 -25c36 -47 61 -99 93 -148c4 -5 7 -11 10 -16c5 -10 11 -15 17 -15s12 4 19 10c30 26 53 57 80 86c62 66 125 130 190 195c43 43 87 85 134 123c32 26 70 40 106 60c4 3 9 4 13 1c5 -3 1 -7 0 -11c-9 -29 -21 -55 -45 -74c-102 -81 -198 -168 -290 -261 c-62 -63 -121 -128 -183 -190c-14 -14 -30 -26 -49 -33z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B5.xml b/data/Petaluma/E5B5.xml
new file mode 100644
index 00000000000..b3d84dc5454
--- /dev/null
+++ b/data/Petaluma/E5B5.xml
@@ -0,0 +1 @@
+<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M389 -374c-13 -4 -25 -6 -38 -6c-26 0 -51 8 -75 15c-149 43 -237 145 -270 293c-4 18 -6 35 -6 52c0 79 45 145 124 179c21 9 42 13 64 13c31 0 62 -8 92 -19c34 -13 69 -27 101 -44c15 -8 30 -12 44 -12c19 0 38 7 56 19c38 26 77 48 111 79c7 7 15 12 24 15 c6 2 12 3 18 3c12 0 21 -5 29 -19c13 -22 21 -46 31 -70c4 -8 7 -12 11 -12s7 3 11 10c19 30 37 62 55 92c12 20 25 30 37 30c13 0 25 -10 38 -28c20 -27 32 -59 47 -89c5 -10 11 -14 17 -14c5 0 10 2 17 6c27 19 46 45 68 67c23 23 48 43 74 61c5 3 8 5 11 5 c5 0 7 -4 8 -14c0 -39 -6 -73 -36 -102c-35 -33 -67 -69 -101 -103c-10 -10 -21 -20 -34 -26c-8 -4 -14 -6 -20 -6c-10 0 -17 6 -25 19c-17 27 -26 60 -45 86c-8 11 -15 27 -32 26c-17 0 -17 -18 -24 -29c-10 -19 -18 -39 -28 -58c-4 -9 -9 -17 -15 -24 c-8 -10 -16 -22 -29 -22c-20 0 -23 18 -29 31c-6 17 -12 35 -20 51c-7 15 -16 23 -26 23c-8 0 -17 -4 -26 -13c-30 -30 -64 -55 -99 -79c-34 -23 -53 -33 -69 -33c-20 0 -36 15 -73 36c-26 15 -51 31 -80 41c-22 8 -43 13 -63 13c-28 0 -54 -9 -78 -31 c-33 -31 -50 -66 -50 -106c0 -13 2 -26 5 -39c21 -91 73 -163 155 -213c18 -11 38 -12 59 -14c31 -3 61 -11 84 -40z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B6.xml b/data/Petaluma/E5B6.xml
new file mode 100644
index 00000000000..6330cbdaf78
--- /dev/null
+++ b/data/Petaluma/E5B6.xml
@@ -0,0 +1 @@
+<symbol id="E5B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M314 -364c-85 0 -153 37 -207 108c-50 66 -86 138 -103 221c-3 15 -4 30 -4 45c0 29 6 58 18 86c44 103 117 172 234 181c6 0 12 1 17 1c61 0 111 -25 149 -73c22 -28 39 -59 61 -86c4 -5 8 -14 15 -14c12 0 5 12 7 19c8 37 11 75 33 108c13 19 28 28 42 28 c13 0 27 -8 40 -25c32 -42 67 -83 101 -125c4 -5 8 -10 13 -14c8 -7 14 -11 19 -11c6 0 11 7 15 21c8 28 17 54 33 79c17 27 35 40 56 40c15 0 31 -6 50 -19c31 -21 61 -45 93 -66c12 -8 22 -12 31 -12c13 0 23 10 31 31c4 10 5 21 5 31c0 51 -42 98 -99 99 c-41 1 -40 1 -53 39c-1 3 -1 6 -2 9c-3 16 -6 27 -6 36c0 15 7 20 29 20c8 0 18 -1 30 -2c73 -6 104 -62 124 -123c11 -34 15 -71 15 -110c1 -37 -9 -74 -28 -108c-11 -20 -24 -31 -40 -31c-9 0 -19 4 -30 11c-37 24 -71 52 -106 76c-13 9 -25 14 -35 14 c-15 0 -27 -10 -40 -30c-13 -21 -19 -45 -28 -69c-1 -3 -1 -6 -2 -9c-8 -23 -19 -35 -32 -35c-10 0 -21 6 -33 20c-38 45 -73 93 -111 137c-11 13 -20 20 -29 20c-11 0 -20 -9 -29 -26c-17 -33 -14 -70 -23 -105c-3 -12 -6 -25 -18 -28c-2 -1 -3 -1 -5 -1 c-10 0 -17 9 -23 18c-23 35 -49 67 -74 100c-34 44 -78 62 -126 62c-17 0 -36 -3 -54 -7c-108 -24 -181 -144 -181 -228c0 -72 53 -152 129 -181c47 -18 97 -23 147 -21c18 0 28 -6 33 -22c6 -19 12 -36 13 -56v-3c0 -12 -6 -16 -19 -17c-15 -2 -29 -3 -43 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B7.xml b/data/Petaluma/E5B7.xml
new file mode 100644
index 00000000000..a5c08ddd14f
--- /dev/null
+++ b/data/Petaluma/E5B7.xml
@@ -0,0 +1 @@
+<symbol id="E5B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1072 -169c-4 23 -10 47 -12 71c-5 60 -7 121 -11 181c-1 15 -2 29 -2 44c-13 -22 -24 -42 -36 -63c-14 -25 -33 -45 -56 -61c-9 -6 -16 -9 -23 -9c-9 0 -17 6 -26 19c-33 47 -64 96 -97 144c-3 6 -8 11 -15 19c-17 -37 -30 -74 -51 -106c-13 -20 -26 -40 -45 -56 c-12 -11 -23 -16 -33 -16c-15 0 -27 11 -39 33c-23 43 -46 86 -56 137c-12 -5 -12 -15 -15 -22c-14 -33 -29 -65 -49 -94c-5 -7 -10 -13 -15 -19c-14 -14 -23 -21 -32 -21s-17 8 -29 24c-26 35 -50 72 -76 106c-6 8 -11 12 -16 12s-9 -4 -15 -13c-26 -39 -50 -80 -89 -108 c-30 -22 -59 -33 -88 -33c-42 0 -81 24 -112 71c-24 36 -34 74 -34 111c0 71 37 138 79 183c19 20 51 29 83 29c36 0 72 -12 96 -32c7 -6 8 -9 5 -17c-9 -25 -26 -44 -45 -63c-5 -5 -9 -8 -14 -8c-4 0 -9 3 -15 8c-15 14 -42 21 -68 21c-19 0 -37 -3 -50 -11 c-8 -5 -15 -11 -15 -22c1 -55 45 -151 105 -173c12 -5 25 -7 37 -7c22 0 43 8 61 26c30 30 51 66 76 99c5 8 11 16 18 22c10 10 18 15 26 15s17 -5 26 -15c35 -36 61 -78 90 -118c2 -3 5 -6 9 -12c18 40 35 77 51 115l21 42c6 12 16 19 29 19s18 -12 21 -22 c17 -50 37 -100 63 -145c8 -14 15 -21 22 -21s13 7 20 21c17 34 30 70 45 105c8 16 16 33 25 48c7 11 16 17 24 17s17 -5 25 -14c30 -34 54 -71 78 -108c15 -21 29 -42 43 -63c4 -6 7 -8 10 -8c4 0 7 4 11 9c23 28 37 61 53 93c0 27 -1 53 -3 80c-1 18 -2 35 -2 53 c0 31 2 62 5 92c1 11 5 21 15 22h1c11 0 7 -13 11 -19c2 -4 2 -10 2 -14c-1 -21 -1 -41 -1 -61c0 -33 1 -66 2 -99c3 5 6 10 9 14c8 12 16 17 24 17c9 0 17 -5 25 -16c32 -43 54 -92 89 -134c9 -11 16 -17 22 -17s11 5 20 15c26 28 42 64 64 95c10 14 20 27 32 39 c6 6 14 11 21 8c4 -2 6 -5 6 -8c0 -5 -3 -9 -5 -13c-9 -26 -23 -49 -39 -71c-30 -42 -56 -87 -91 -125c-5 -5 -11 -10 -16 -14c-17 -13 -31 -20 -43 -20c-16 0 -30 11 -46 34c-25 32 -46 67 -69 104c1 -8 1 -16 1 -24c3 -73 10 -146 10 -218c0 -12 -1 -24 -1 -36 c0 -17 -1 -33 -16 -48z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B8.xml b/data/Petaluma/E5B8.xml
new file mode 100644
index 00000000000..ee8bbd777a6
--- /dev/null
+++ b/data/Petaluma/E5B8.xml
@@ -0,0 +1 @@
+<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M433 -378c-7 -1 -14 -2 -21 -2c-20 0 -39 5 -58 11c-78 25 -142 78 -209 123c-12 8 -22 19 -34 26c-77 45 -111 112 -111 183c0 46 15 92 38 133c21 37 45 73 69 109c25 37 59 54 101 54c6 0 12 0 19 -1c27 -4 44 -20 61 -38c36 -39 73 -77 109 -117c5 -5 8 -7 12 -7 c3 0 7 2 11 6c25 21 41 50 60 77s33 41 48 41c14 0 28 -11 48 -34c26 -30 49 -62 74 -94c7 -9 13 -15 20 -15c5 0 11 4 19 11c12 11 24 24 35 37c0 5 -1 11 -1 16c-3 72 -11 145 -16 217c-2 31 4 62 12 92c2 9 8 15 16 15c9 0 9 -9 9 -16c5 -50 11 -101 14 -152 c2 -21 5 -42 5 -65c0 -7 0 -15 -1 -23c2 -11 3 -21 4 -32c11 14 21 29 31 44c15 22 32 33 50 33c14 0 29 -7 44 -21c35 -33 61 -75 91 -113c8 -10 13 -16 18 -16s9 4 17 14c35 40 69 81 104 122c16 19 34 38 64 40c-8 -48 -36 -84 -67 -117c-32 -34 -62 -69 -91 -105 c-14 -17 -29 -32 -47 -44c-11 -6 -19 -9 -26 -9c-11 0 -20 6 -31 20c-26 33 -47 71 -76 102c-3 2 -4 5 -7 7c-13 14 -21 21 -29 21c-9 0 -17 -8 -28 -25c-5 -7 -10 -14 -15 -20c0 -61 -5 -123 -5 -186c0 -31 -2 -62 -10 -92c-2 -10 -6 -20 -11 -29c-3 -6 -9 -14 -16 -13 c-5 1 -6 5 -6 9l1 10c1 58 0 116 6 174c1 15 2 29 2 43c0 10 -1 20 -1 30c-9 -11 -19 -23 -28 -33c-8 -9 -15 -18 -24 -24c-25 -18 -38 -28 -49 -28c-12 0 -21 13 -41 39c-25 32 -52 63 -77 96c-6 7 -10 10 -15 10s-10 -5 -15 -13c-15 -21 -29 -42 -45 -62 c-25 -32 -41 -48 -59 -48c-15 0 -32 14 -58 40c-37 37 -68 80 -109 112c-13 10 -26 15 -37 15c-17 0 -32 -10 -41 -31c-28 -66 -67 -127 -79 -199c-1 -4 -1 -7 -1 -11c0 -10 4 -19 12 -28c60 -68 133 -120 215 -161c22 -11 45 -18 69 -18c6 0 11 0 17 1c21 2 35 -6 47 -21 c13 -16 27 -30 34 -49c2 -4 2 -7 2 -10c0 -6 -3 -10 -13 -11z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5B9.xml b/data/Petaluma/E5B9.xml
new file mode 100644
index 00000000000..538bede4c2b
--- /dev/null
+++ b/data/Petaluma/E5B9.xml
@@ -0,0 +1 @@
+<symbol id="E5B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M10 -200c-3 0 -5 1 -10 1c13 29 30 53 48 77c7 9 18 9 29 8c57 0 113 8 166 30c104 43 191 106 252 204c33 53 65 105 101 156c14 20 26 28 36 28c14 0 26 -14 36 -32c21 -37 37 -76 56 -114l8 -16c11 40 19 77 40 109c9 14 16 29 26 43c8 12 19 18 30 18 c9 0 19 -5 27 -14c9 -9 16 -21 21 -32c24 -53 55 -105 81 -157c4 -8 10 -14 17 -23c22 51 46 97 74 142c62 100 154 166 258 218c32 16 62 34 98 43c4 1 8 3 12 3c3 0 6 -1 8 -4c0 -1 1 -2 1 -3c0 -5 -3 -11 -5 -15c-18 -36 -41 -62 -79 -78c-80 -34 -152 -78 -217 -134 c-47 -40 -78 -89 -93 -149c-11 -43 -26 -85 -55 -121c-13 -15 -25 -23 -36 -23s-22 7 -33 22c-38 51 -65 109 -92 166c-5 9 -9 19 -15 35c-9 -36 -15 -66 -23 -94c-9 -32 -29 -57 -54 -78c-11 -9 -20 -14 -27 -14c-10 0 -18 10 -26 28c-23 52 -48 104 -71 156 c-4 9 -7 13 -11 13s-8 -4 -13 -12c-32 -52 -64 -105 -102 -153c-118 -149 -271 -234 -463 -234z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BA.xml b/data/Petaluma/E5BA.xml
new file mode 100644
index 00000000000..ac4e527b865
--- /dev/null
+++ b/data/Petaluma/E5BA.xml
@@ -0,0 +1 @@
+<symbol id="E5BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -202c18 30 35 56 58 77c10 9 23 9 36 10c73 6 130 46 181 95c81 77 136 174 203 262c13 17 24 26 35 26s22 -8 36 -23s24 -33 34 -51c17 -30 36 -59 55 -87c2 -4 6 -9 10 -10h1c7 0 5 8 7 12c24 57 45 115 83 164c14 18 27 27 41 27c12 0 25 -8 39 -24 c43 -49 83 -100 125 -151c10 -12 18 -18 26 -18s17 6 27 18c27 32 37 70 37 109c0 11 -1 22 -2 33c-9 69 -44 119 -110 144c-7 2 -9 6 -9 10c0 3 1 5 2 8c9 20 19 39 28 58c5 11 12 15 21 15c3 0 7 0 10 -1c68 -12 120 -71 131 -147c2 -14 4 -29 4 -43 c0 -42 -11 -83 -30 -122c-27 -56 -61 -108 -112 -147c-13 -10 -28 -17 -44 -23c-6 -2 -12 -3 -17 -3c-24 0 -38 20 -52 38c-36 46 -74 92 -112 139c-19 -33 -28 -69 -39 -104c-12 -38 -34 -67 -62 -95c-11 -11 -21 -16 -30 -16c-12 0 -23 8 -35 24c-36 48 -63 102 -94 152 c-5 8 -9 12 -13 12c-5 0 -9 -4 -14 -12c-55 -80 -111 -158 -181 -225c-66 -64 -139 -113 -231 -127c-13 -2 -26 -2 -43 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BB.xml b/data/Petaluma/E5BB.xml
new file mode 100644
index 00000000000..30514c3d25f
--- /dev/null
+++ b/data/Petaluma/E5BB.xml
@@ -0,0 +1 @@
+<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M549 -11c-10 -6 -18 -9 -25 -9c-12 0 -20 9 -26 29c-15 49 -28 98 -42 146c-4 14 -6 30 -20 42c-25 -47 -46 -93 -76 -136c-16 -23 -31 -49 -56 -64c-10 -6 -18 -10 -25 -10c-10 0 -17 8 -24 24c-15 34 -25 70 -39 104c-13 28 -23 57 -46 79c-9 10 -15 15 -20 15 c-6 0 -10 -6 -18 -17c-33 -49 -55 -104 -91 -152c-9 -13 -23 -35 -36 -28c-4 2 -5 4 -5 8c0 8 12 21 16 30c40 78 87 151 133 226c11 18 27 27 43 27c14 0 28 -6 42 -20c30 -30 43 -69 58 -106c8 -19 15 -39 22 -58c5 -13 5 -34 19 -34c13 0 16 19 23 31c23 39 43 80 65 119 c9 16 18 31 28 45c9 13 19 19 29 19s21 -7 29 -21c25 -44 34 -95 50 -144c5 -15 9 -30 15 -45c1 -5 3 -13 10 -11c3 0 6 6 8 10c25 45 49 91 73 137c11 21 24 42 39 62c8 12 19 17 29 17c11 0 22 -5 30 -17c17 -22 23 -49 34 -73c10 -22 19 -44 30 -65c10 -19 22 -28 35 -28 c10 0 22 5 35 16c25 21 39 48 41 80c1 8 1 15 1 23c0 61 -19 115 -73 155c-24 18 -51 25 -79 25c-10 0 -20 -1 -31 -3c-4 0 -7 -1 -10 -1c-8 0 -11 2 -11 7c0 4 2 9 5 16c6 11 9 23 11 36c7 30 28 40 55 44c7 1 14 2 21 2c77 0 148 -59 169 -141c6 -23 9 -45 9 -67 c0 -65 -26 -125 -67 -182c-23 -32 -47 -63 -81 -83c-19 -10 -36 -18 -51 -18c-20 0 -38 13 -56 48s-30 73 -47 109c-2 6 -4 13 -11 13c-6 0 -7 -7 -9 -12c-30 -56 -56 -114 -95 -165c-10 -13 -22 -25 -37 -34z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BC.xml b/data/Petaluma/E5BC.xml
new file mode 100644
index 00000000000..0251abfecf1
--- /dev/null
+++ b/data/Petaluma/E5BC.xml
@@ -0,0 +1 @@
+<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M911 -290c-15 43 -20 84 -21 124c-1 45 -2 89 -2 133c-8 5 -14 15 -19 29c-20 55 -29 114 -50 170c-1 1 -1 3 -2 4c-7 13 -10 34 -27 34c-14 0 -15 -19 -21 -30c-23 -46 -45 -92 -67 -139c-9 -17 -19 -33 -33 -46c-14 -14 -28 -22 -40 -22c-16 0 -29 14 -39 40 c-15 44 -29 89 -45 133c-5 14 -4 37 -19 38c-14 2 -16 -21 -24 -34c-20 -32 -32 -69 -56 -99l-12 -18c-11 -11 -21 -17 -30 -17c-11 0 -20 9 -29 27c-16 33 -28 69 -48 100c-17 26 -37 51 -61 70c-23 18 -48 26 -74 26c-30 0 -62 -11 -88 -35c-37 -35 -55 -76 -55 -125 c0 -31 -11 -59 -22 -87c-4 -10 -11 -19 -27 -25c-2 76 18 145 41 213c16 48 42 87 81 118c35 28 71 41 106 41c43 0 86 -20 122 -63c32 -38 50 -81 70 -125c3 -5 5 -12 8 -17c4 -5 6 -15 15 -13c7 1 10 8 13 13c20 39 40 77 60 117c5 10 11 19 19 27c7 8 16 12 24 12 c10 0 20 -7 27 -19c23 -39 30 -84 47 -125c7 -17 13 -34 20 -52c3 -9 8 -19 18 -20h1c10 0 15 10 19 18c23 47 45 95 68 142c8 18 18 36 29 52c13 17 28 25 42 25c16 0 32 -10 42 -32c8 -17 14 -35 20 -53l6 139c2 36 9 71 9 107c0 10 5 16 13 18h2c9 0 7 -10 9 -15 c4 -14 5 -27 5 -41c0 -9 0 -19 -1 -28c-6 -94 -10 -187 -12 -281c4 -12 7 -25 11 -37c3 -9 6 -19 16 -20h1c10 0 11 10 15 17c25 44 46 91 71 135c10 18 22 35 35 51c12 14 25 21 37 21c15 0 29 -11 39 -31c18 -36 25 -75 36 -113c7 -25 15 -37 26 -37c9 0 19 7 33 20 c35 32 58 74 87 110c19 23 36 47 55 70c5 6 11 12 17 17c5 4 12 6 18 2c2 -1 2 -3 2 -5c0 -4 -1 -8 -2 -11c-8 -23 -21 -43 -35 -62c-47 -63 -93 -126 -143 -188c-17 -21 -38 -35 -64 -45c-8 -3 -14 -4 -20 -4c-14 0 -23 8 -31 26c-18 40 -22 83 -37 123c-2 6 -4 11 -7 16 c-4 9 -9 13 -13 13c-5 0 -9 -4 -15 -13c-28 -42 -47 -88 -71 -132c-13 -24 -26 -48 -48 -65c-5 -4 -9 -7 -14 -9c2 -65 6 -130 9 -195c1 -22 -6 -41 -20 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BD.xml b/data/Petaluma/E5BD.xml
new file mode 100644
index 00000000000..182fd6e06ae
--- /dev/null
+++ b/data/Petaluma/E5BD.xml
@@ -0,0 +1 @@
+<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M591 -160c-10 31 -16 60 -17 89c-1 31 -1 63 -1 95c-8 -9 -16 -16 -27 -22c-6 -3 -11 -4 -17 -4c-8 0 -15 4 -22 14c-32 51 -59 105 -85 159c-2 5 -4 11 -8 15c-3 4 -7 8 -10 8s-6 -3 -10 -9c-20 -36 -35 -74 -51 -110c-11 -25 -24 -48 -42 -67c-10 -12 -20 -18 -28 -18 c-10 0 -19 9 -27 26c-20 43 -40 86 -61 129c-1 3 -2 5 -4 8c-11 16 -19 24 -27 24s-15 -9 -25 -26c-27 -46 -51 -93 -84 -135c-11 -14 -23 -25 -45 -31c11 32 21 61 39 86c41 56 71 117 109 174c12 18 29 28 47 28c14 0 27 -6 38 -19c25 -33 39 -71 57 -107 c8 -16 15 -33 25 -54c23 53 45 100 72 145c6 11 12 22 19 33c11 17 24 25 37 25c12 0 25 -8 35 -24c19 -30 34 -63 51 -95c14 -26 29 -52 43 -77c0 87 -2 175 -2 262c0 18 -1 37 -1 55c0 14 0 27 3 41c2 10 6 18 15 19c9 0 8 -13 9 -19c2 -7 2 -15 2 -23c0 -7 0 -15 -1 -23 c0 -17 -1 -35 -1 -52c0 -76 4 -151 6 -227c24 42 49 84 74 126c10 17 20 40 45 40c30 0 33 -27 41 -47l45 -108c3 -6 3 -17 11 -17h1c8 0 11 9 15 15l78 117c6 8 12 16 21 20c3 1 6 2 8 2c4 0 6 -3 4 -12c-6 -25 -18 -46 -31 -67c-30 -49 -63 -96 -94 -143 c-3 -4 -5 -8 -9 -12c-14 -14 -25 -22 -35 -22c-12 0 -22 11 -33 34c-18 38 -32 77 -49 116c-3 7 -4 19 -14 20c-9 0 -10 -11 -15 -18c-22 -35 -40 -72 -61 -107c1 -61 -1 -122 3 -182c1 -16 1 -32 -16 -48z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BE.xml b/data/Petaluma/E5BE.xml
new file mode 100644
index 00000000000..59898b6f75a
--- /dev/null
+++ b/data/Petaluma/E5BE.xml
@@ -0,0 +1 @@
+<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M602 5c-8 -5 -15 -8 -21 -8c-11 0 -18 8 -24 24c-14 37 -32 73 -43 111c-1 6 -4 16 -12 16h-1c-8 0 -10 -8 -13 -14c-16 -29 -31 -59 -51 -86c-5 -7 -10 -14 -16 -20c-11 -11 -20 -16 -28 -16c-9 0 -17 9 -24 27c-23 60 -37 124 -75 178c-21 30 -45 56 -80 68 c-17 6 -33 9 -49 9c-45 0 -87 -22 -118 -63c-13 -16 -22 -37 -47 -45c22 110 90 191 198 204c6 1 12 1 17 1c55 0 97 -30 131 -73c42 -53 55 -119 80 -178c3 -7 6 -14 10 -26l50 81c8 13 15 26 25 37c10 12 21 18 32 18c12 0 24 -9 33 -25c20 -35 29 -76 45 -113l9 -17 c14 8 19 21 27 33l72 116c1 2 2 4 4 6c20 29 40 44 59 44c20 0 39 -16 56 -49c23 -44 43 -89 63 -134c3 -8 6 -12 9 -12s6 3 10 10c21 33 46 62 73 91c13 14 29 24 46 34c5 3 12 5 16 1c2 -1 2 -3 2 -4c0 -4 -2 -8 -3 -11c-16 -35 -40 -64 -69 -88c-30 -24 -46 -59 -69 -88 c-11 -14 -22 -29 -39 -38c-8 -4 -14 -6 -20 -6c-11 0 -19 7 -25 20c-20 44 -42 86 -57 132c-3 9 -8 17 -13 25c-9 13 -17 20 -24 20s-14 -7 -23 -21c-34 -53 -63 -107 -103 -154c-6 -7 -13 -13 -20 -17z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5BF.xml b/data/Petaluma/E5BF.xml
new file mode 100644
index 00000000000..6d22abd4052
--- /dev/null
+++ b/data/Petaluma/E5BF.xml
@@ -0,0 +1 @@
+<symbol id="E5BF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M739 -174c-5 30 -12 56 -13 82l-3 130c-12 -17 -25 -33 -44 -44c-11 -7 -19 -10 -27 -10c-12 0 -21 8 -29 26c-18 41 -35 82 -53 123c-3 7 -5 20 -14 20s-11 -12 -15 -20c-16 -25 -30 -52 -46 -78c-6 -10 -14 -19 -22 -27c-14 -14 -23 -21 -31 -21c-9 0 -14 10 -24 34 c-24 57 -50 107 -103 145c-42 30 -85 45 -129 45c-31 0 -63 -8 -95 -22s-61 -33 -91 -57c8 78 53 116 116 145c41 19 80 27 116 27c92 0 166 -53 215 -127c18 -27 26 -59 41 -93l55 97c7 12 14 25 23 36s19 16 29 16c13 0 24 -7 33 -21c27 -42 38 -90 58 -134 c6 -13 11 -20 17 -20c4 0 9 5 16 16l3 4l-6 267v16c0 8 7 11 13 13c1 0 2 1 3 1c5 0 5 -8 7 -11c4 -9 6 -18 6 -28c1 -72 2 -144 4 -216c18 26 35 51 53 76s34 39 50 39c15 0 30 -14 45 -45c18 -38 37 -77 56 -115c7 -14 13 -22 20 -22s14 6 23 17c47 57 94 113 142 168 c7 8 15 15 24 10c4 -2 5 -5 5 -8c0 -5 -4 -11 -6 -15c-14 -32 -34 -59 -56 -86c-44 -54 -85 -110 -138 -155c-7 -6 -15 -12 -23 -17s-16 -7 -22 -7c-11 0 -20 6 -28 20c-29 44 -46 96 -73 142c-6 9 -10 14 -14 14s-9 -5 -14 -13l-41 -63c3 -71 -1 -142 4 -212 c1 -14 0 -29 -17 -42z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C0.xml b/data/Petaluma/E5C0.xml
new file mode 100644
index 00000000000..92efc8aec2b
--- /dev/null
+++ b/data/Petaluma/E5C0.xml
@@ -0,0 +1 @@
+<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M412 -1c-8 -6 -14 -9 -20 -9c-8 0 -13 7 -18 22l-30 100c-23 76 -108 144 -199 144c-25 0 -50 -5 -75 -16c-24 -10 -47 -20 -70 -33c7 31 16 60 33 85s47 29 73 39c30 13 60 18 87 18c78 0 142 -44 185 -100c30 -39 35 -89 50 -134c1 -2 1 -5 2 -7c2 -5 1 -14 8 -16h1 c7 0 8 8 11 13c28 46 48 95 80 138c14 19 27 29 40 29s25 -11 37 -32c24 -42 53 -80 79 -120c6 -9 10 -12 13 -12c5 0 7 8 11 16c15 41 33 80 54 117c4 7 8 14 13 20c10 11 21 17 32 17c10 0 20 -5 30 -15c33 -33 58 -72 83 -110c10 -15 21 -28 32 -43c6 -8 11 -11 17 -11 s12 4 18 13c14 21 30 42 43 64c15 23 32 46 49 67c13 16 28 25 42 25s28 -8 40 -24c21 -28 34 -61 49 -93l20 -42c13 30 25 56 37 82c8 15 17 30 26 46c3 5 8 7 13 7c11 0 14 -4 14 -8c0 -3 -1 -6 -2 -8c-23 -61 -34 -127 -77 -179c-2 -1 -3 -3 -5 -5 c-17 -21 -33 -32 -48 -32c-16 0 -31 15 -44 44c-15 33 -27 69 -49 98c-9 12 -14 18 -20 18s-11 -6 -19 -17c-22 -34 -45 -67 -67 -101c-3 -4 -6 -9 -10 -13c-25 -25 -42 -38 -60 -38c-17 0 -34 14 -54 44c-27 41 -53 82 -85 120c-5 6 -9 9 -12 9c-4 0 -7 -5 -9 -13 c-15 -39 -27 -79 -50 -113c-4 -6 -7 -11 -11 -16c-14 -20 -26 -29 -39 -29s-25 10 -39 31c-28 41 -60 80 -80 127c-3 8 -7 12 -11 12s-9 -4 -13 -12c-18 -35 -37 -69 -56 -103c-13 -23 -28 -44 -50 -61z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C1.xml b/data/Petaluma/E5C1.xml
new file mode 100644
index 00000000000..958f626fbed
--- /dev/null
+++ b/data/Petaluma/E5C1.xml
@@ -0,0 +1 @@
+<symbol id="E5C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M161 -20c-64 0 -102 33 -129 83c-15 28 -27 58 -32 89c-4 35 12 66 25 98c3 5 9 6 15 6c8 0 7 -8 8 -12c8 -31 18 -61 33 -90c29 -51 67 -76 115 -76c19 0 39 3 61 12c50 20 78 61 106 103c14 23 28 46 44 68c7 11 16 16 25 16s18 -4 27 -12c41 -37 73 -80 102 -127 c5 -8 11 -16 18 -26c22 45 42 88 63 130c4 8 9 17 14 24c9 12 20 18 31 18s21 -6 31 -18c37 -44 53 -99 81 -147c4 -7 4 -20 14 -19c9 0 11 12 14 20c22 43 47 84 82 119c7 7 7 7 22 11c0 -27 -12 -51 -25 -73c-32 -54 -64 -107 -102 -158c-2 -4 -6 -7 -9 -10 c-11 -9 -19 -14 -26 -14c-9 0 -16 7 -24 22c-22 42 -42 85 -62 127c-8 14 -15 35 -31 35c-13 0 -14 -22 -21 -35c-16 -30 -29 -61 -43 -92c-3 -5 -6 -11 -10 -16c-14 -20 -24 -30 -34 -30c-9 0 -19 10 -32 30c-27 41 -54 83 -88 120c-11 11 -16 17 -21 17 c-4 0 -9 -6 -17 -17c-24 -34 -42 -72 -70 -102c-43 -46 -93 -74 -155 -74z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C2.xml b/data/Petaluma/E5C2.xml
new file mode 100644
index 00000000000..9a6de9afb05
--- /dev/null
+++ b/data/Petaluma/E5C2.xml
@@ -0,0 +1 @@
+<symbol id="E5C2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M671 -190c-11 19 -10 38 -11 56c-4 44 -6 89 -6 134v2c-5 3 -11 8 -17 16c-40 44 -80 87 -127 123c-6 5 -11 7 -15 7c-6 0 -10 -4 -16 -12c-26 -41 -55 -78 -94 -108c-33 -25 -69 -36 -106 -36c-21 0 -42 3 -63 10c-124 41 -192 130 -215 255c-1 4 -1 9 -1 13 c0 27 12 53 21 79c3 7 9 9 16 9h1c9 0 5 -9 7 -14c29 -114 92 -200 206 -241c25 -9 48 -13 69 -13c50 0 89 24 128 75c16 21 32 43 48 65c10 14 20 20 32 20c9 0 19 -4 29 -11c35 -24 64 -53 93 -83c-1 16 -2 33 -2 50c0 74 -6 149 -8 224c-1 12 3 24 4 36c1 9 7 13 14 14h2 c7 0 5 -9 7 -14c3 -12 6 -26 6 -39c3 -91 4 -182 7 -273c0 -11 0 -22 1 -32v-1c10 -11 17 -16 23 -16c7 0 13 6 20 20l53 102c11 18 21 28 32 28c10 0 20 -9 31 -27c25 -42 50 -85 75 -128c4 -7 8 -16 17 -16c11 0 12 11 15 18c23 53 51 104 86 150c9 12 20 19 30 28 c4 5 10 8 15 5c3 -2 4 -4 4 -7s-2 -7 -3 -10c-9 -28 -24 -53 -40 -78c-31 -48 -58 -99 -83 -150c-9 -18 -22 -33 -39 -45c-10 -7 -20 -11 -29 -11c-14 0 -25 8 -34 25c-19 36 -43 70 -59 107l-19 32c-12 -24 -21 -44 -31 -63c-14 -27 -31 -53 -55 -72c-2 -2 -4 -3 -5 -5 l3 -110v-53c-1 -13 -4 -25 -17 -35z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C3.xml b/data/Petaluma/E5C3.xml
new file mode 100644
index 00000000000..d6ef04e8d95
--- /dev/null
+++ b/data/Petaluma/E5C3.xml
@@ -0,0 +1 @@
+<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M250 -30c-49 0 -90 24 -129 55c-58 46 -87 110 -118 174c-2 5 -3 9 -3 14c0 14 9 27 13 41c5 16 5 42 27 42c17 1 19 -23 26 -37c34 -68 76 -129 145 -169c26 -15 51 -22 75 -22c32 0 62 13 92 39c42 37 75 82 107 128c1 1 1 2 2 4c16 23 28 35 40 35c13 0 25 -12 41 -36 c24 -36 48 -73 71 -110c5 -8 9 -12 13 -12s8 4 14 10c23 29 40 62 63 90c5 6 9 13 14 19c10 11 19 17 28 17c8 0 17 -6 24 -18c24 -38 45 -77 69 -115c7 -12 8 -31 25 -31c16 0 18 19 25 30c20 34 36 70 56 104c10 17 24 26 38 26c13 0 27 -9 35 -29c16 -40 42 -75 70 -107 c7 -8 12 -12 18 -12s12 5 19 14c23 29 38 65 67 90c8 7 16 16 29 11c-2 -19 -9 -35 -19 -50c-33 -49 -62 -101 -104 -143c-14 -14 -26 -20 -37 -20c-12 0 -24 8 -39 26c-28 31 -50 65 -66 104c-2 5 -5 14 -12 14s-8 -9 -11 -14c-20 -38 -39 -78 -66 -113 c-7 -8 -14 -17 -24 -23c-9 -6 -17 -9 -24 -9c-10 0 -19 7 -27 21l-70 124c-5 9 -9 14 -13 14s-9 -4 -14 -13c-19 -31 -45 -58 -63 -90c-5 -8 -13 -14 -20 -21c-10 -9 -18 -14 -24 -14c-9 0 -16 7 -24 21l-84 134c-4 6 -6 9 -9 9s-7 -3 -11 -8c-32 -40 -58 -87 -97 -123 s-79 -71 -138 -71z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C4.xml b/data/Petaluma/E5C4.xml
new file mode 100644
index 00000000000..8d873b386af
--- /dev/null
+++ b/data/Petaluma/E5C4.xml
@@ -0,0 +1 @@
+<symbol id="E5C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M888 -237c-19 44 -33 82 -35 124c-2 51 -4 101 -5 152c-2 -1 -3 -3 -4 -4c-14 -14 -24 -21 -34 -21s-20 8 -33 25c-22 29 -45 59 -65 89c-6 9 -11 18 -21 24c-19 -28 -35 -57 -50 -87c-3 -6 -5 -13 -9 -19c-11 -19 -23 -42 -46 -41c-18 0 -22 24 -30 39 c-18 33 -34 67 -56 97c-9 11 -14 17 -19 17c-4 0 -9 -6 -17 -18c-19 -29 -36 -60 -58 -87c-38 -46 -96 -71 -157 -71c-46 0 -93 14 -132 45c-53 42 -95 90 -114 155c-2 7 -3 14 -3 21c0 29 16 56 29 82c2 4 6 7 9 7c5 0 10 -4 13 -14c30 -81 79 -145 159 -182 c26 -12 52 -17 78 -17c56 0 108 28 143 82l54 84c9 12 18 18 27 18s18 -5 28 -16c29 -31 47 -69 66 -107c5 -10 10 -21 22 -33c18 46 45 84 69 123c10 16 21 24 31 24c11 0 21 -7 32 -22c25 -35 51 -70 75 -106c4 -5 7 -9 10 -11c-1 42 -2 85 -4 127c-3 55 -5 110 -8 165v10 c0 3 0 6 1 9c1 4 6 9 10 10h2c3 0 4 -5 7 -8c13 -20 17 -43 18 -66c3 -72 7 -144 10 -217c21 27 42 53 62 79c10 13 21 20 31 20s21 -7 31 -21c28 -39 48 -83 76 -121c6 -8 10 -12 15 -12c4 0 8 4 14 11c27 34 52 69 83 98c5 4 8 8 13 11c5 4 12 6 18 3c2 -1 2 -3 2 -5 c0 -3 -2 -8 -3 -11c-7 -26 -23 -47 -39 -68c-25 -30 -53 -59 -75 -92c-6 -8 -13 -15 -20 -21c-17 -16 -29 -24 -40 -24c-12 0 -24 10 -38 32c-19 30 -38 61 -54 93c-8 16 -13 24 -20 24c-5 0 -12 -7 -22 -19c-10 -13 -20 -27 -31 -40l3 -57c3 -66 7 -133 11 -200 c1 -18 0 -38 -10 -62z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C5.xml b/data/Petaluma/E5C5.xml
new file mode 100644
index 00000000000..7821cb272e2
--- /dev/null
+++ b/data/Petaluma/E5C5.xml
@@ -0,0 +1 @@
+<symbol id="E5C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M566 11c-10 -4 -19 -6 -27 -6c-18 0 -32 11 -42 33c-20 44 -38 89 -57 134c-5 11 -11 22 -18 38l-32 -72c-15 -39 -36 -74 -62 -106c-5 -7 -11 -12 -17 -17c-12 -10 -22 -15 -31 -15c-13 0 -24 10 -33 29c-21 43 -41 87 -61 132c-4 9 -8 14 -13 14c-4 0 -9 -3 -15 -8 c-34 -31 -69 -61 -104 -92c-15 -12 -30 -22 -54 -29c18 40 32 76 61 102c42 37 85 73 127 110c14 13 26 19 36 19c14 0 25 -11 36 -33c17 -35 32 -70 48 -104c6 -13 11 -27 24 -39l43 98c16 36 32 72 54 104c8 12 18 18 28 18c9 0 19 -6 28 -17c32 -39 43 -88 64 -132 c8 -17 15 -34 23 -51c6 -12 14 -18 24 -18c6 0 13 2 19 7c29 20 47 47 51 84c1 12 2 24 2 36c0 49 -10 95 -31 141c-30 63 -80 90 -148 85h-4c-10 0 -14 3 -14 8c0 3 1 7 3 11c4 13 9 26 11 39c8 38 39 45 76 45c64 0 116 -37 145 -106c21 -49 30 -97 30 -143 c0 -83 -31 -161 -88 -235c-21 -29 -48 -51 -82 -64z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C6.xml b/data/Petaluma/E5C6.xml
new file mode 100644
index 00000000000..62538bb6000
--- /dev/null
+++ b/data/Petaluma/E5C6.xml
@@ -0,0 +1 @@
+<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M112 -8c-43 12 -67 41 -84 77c-22 47 -29 97 -28 144c-1 66 11 124 29 182c5 16 10 43 28 38c6 -2 8 -7 8 -14c0 -10 -4 -23 -8 -32c-12 -31 -17 -62 -17 -93s4 -61 13 -92c8 -29 19 -58 40 -81c20 -22 41 -32 66 -32c15 0 31 4 49 12c45 22 79 58 111 96l36 42 c11 12 22 18 33 18c10 0 19 -3 30 -11c40 -27 68 -66 100 -100c15 -16 22 -25 28 -25s11 10 22 30c14 28 30 55 45 81c9 16 21 24 33 24c9 0 19 -5 28 -16c33 -40 61 -84 91 -127c7 -10 11 -16 14 -16c4 0 7 6 14 17c25 40 49 79 74 118c9 13 19 20 29 20s20 -7 28 -21 c28 -49 58 -97 86 -147c5 -9 9 -13 13 -13c5 0 9 4 15 12c26 34 51 71 77 106l8 12c6 7 14 17 24 11c3 -1 4 -4 4 -7c0 -5 -4 -11 -5 -16c-12 -34 -33 -64 -52 -94c-19 -29 -41 -57 -62 -85c-1 -2 -3 -5 -5 -7c-19 -22 -34 -33 -47 -33c-14 0 -28 13 -42 38 c-23 41 -45 82 -67 123c-4 9 -8 14 -11 14c-4 0 -7 -4 -12 -13c-18 -33 -41 -64 -61 -98c-6 -10 -14 -21 -23 -29c-10 -10 -17 -14 -24 -14s-15 6 -25 19c-32 41 -55 89 -89 129c-5 6 -9 9 -12 9s-6 -4 -10 -12c-14 -27 -29 -53 -43 -79c-6 -11 -12 -21 -20 -30 c-10 -11 -18 -17 -26 -17c-10 0 -19 7 -30 20c-34 41 -66 83 -107 117c-7 5 -12 8 -18 8c-7 0 -13 -5 -20 -13c-38 -44 -70 -93 -121 -124c-26 -16 -51 -30 -81 -30c-8 0 -17 2 -26 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C7.xml b/data/Petaluma/E5C7.xml
new file mode 100644
index 00000000000..1770a0f2bde
--- /dev/null
+++ b/data/Petaluma/E5C7.xml
@@ -0,0 +1 @@
+<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M774 -146c-2 -3 -4 -4 -6 -4s-4 2 -6 6c-1 3 -2 8 -2 12c2 37 -5 74 -5 112v46c-2 -3 -3 -5 -5 -7c-17 -23 -31 -35 -44 -35s-26 11 -44 32c-33 38 -65 77 -97 117c-5 7 -9 10 -13 10c-5 0 -9 -5 -14 -14c-18 -32 -29 -67 -52 -97c-12 -14 -20 -21 -27 -21 c-8 0 -15 8 -23 24c-22 43 -43 87 -65 131c-7 14 -11 21 -15 21s-9 -7 -18 -20c-31 -44 -54 -95 -92 -134c-33 -34 -70 -52 -107 -52c-16 0 -31 3 -46 9c-47 19 -68 61 -81 106c-9 30 -12 59 -12 89c0 38 5 77 13 115c11 50 22 100 37 150c4 11 8 23 24 22c1 -6 1 -13 1 -19 c0 -27 -7 -52 -14 -77c-11 -38 -17 -76 -17 -115c0 -29 4 -58 15 -87c19 -49 47 -91 111 -91c37 0 65 21 89 51c32 41 58 85 85 130c12 20 24 31 36 31c11 0 23 -10 34 -29l61 -109c4 -8 9 -16 14 -26c21 26 29 55 44 81c15 24 30 37 46 37c14 0 28 -10 44 -28l99 -117 c6 -8 11 -12 16 -12s10 4 14 12c-3 80 -6 160 -6 240v46c0 16 2 28 21 31c7 -15 8 -30 8 -45c0 -71 2 -143 5 -214c10 25 20 49 32 73c15 27 31 41 48 41c15 0 31 -11 47 -34c30 -43 55 -88 83 -132c11 -19 20 -28 28 -28s16 10 27 30c28 51 46 106 76 156c6 11 10 31 26 24 c3 -1 4 -4 4 -8c0 -7 -4 -19 -7 -27c-29 -78 -60 -156 -104 -226c-12 -19 -27 -35 -46 -46c-6 -4 -12 -5 -18 -5c-10 0 -18 5 -26 17c-31 43 -60 88 -86 134c-10 16 -21 36 -38 37c-13 0 -15 -25 -21 -38c-7 -16 -15 -32 -22 -48l3 -130c0 -24 0 -48 -2 -71 c-1 -10 -4 -19 -10 -27z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5C8.xml b/data/Petaluma/E5C8.xml
new file mode 100644
index 00000000000..6b094cdf3ff
--- /dev/null
+++ b/data/Petaluma/E5C8.xml
@@ -0,0 +1 @@
+<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M540 -308l-23 3c-43 10 -61 25 -61 57c0 9 1 19 4 31l6 20c5 18 9 25 17 25c5 0 13 -3 24 -9c28 -15 55 -21 82 -21c37 0 75 13 112 33c56 30 74 72 74 122c0 14 -2 29 -4 44c-8 59 -27 115 -56 166c-4 7 -9 13 -14 19c-11 13 -17 19 -22 19c-6 0 -10 -7 -18 -23 c-22 -43 -45 -85 -66 -127c-12 -24 -26 -46 -49 -62c-8 -6 -15 -8 -22 -8c-9 0 -16 6 -23 20c-25 49 -45 100 -68 150c-9 20 -20 38 -35 54c-4 5 -8 8 -12 8c-3 0 -6 -3 -10 -11c-21 -42 -42 -85 -62 -128c-8 -17 -16 -35 -28 -50c-6 -9 -14 -17 -25 -17 c-15 0 -17 15 -21 25c-14 46 -29 92 -50 136c-3 4 -4 9 -7 13c-9 15 -16 22 -23 22c-8 0 -15 -7 -25 -20c-29 -38 -57 -79 -88 -115c-12 -14 -25 -25 -47 -37c11 47 12 89 49 121c40 34 69 79 98 123c13 20 29 30 44 30c16 0 31 -11 44 -32c28 -45 37 -99 58 -149 c9 0 9 8 12 13c24 50 47 99 71 148c11 23 25 34 40 34c14 0 28 -10 42 -29c39 -53 59 -116 88 -174c5 -10 7 -26 18 -27c10 0 14 15 20 24c31 51 57 105 83 158c12 25 27 37 44 37c13 0 28 -9 42 -26c61 -74 80 -163 80 -256c0 -102 -35 -193 -113 -261 c-47 -41 -99 -74 -164 -74c-5 0 -11 1 -16 1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5E5.xml b/data/Petaluma/E5E5.xml
new file mode 100644
index 00000000000..2331b5ae355
--- /dev/null
+++ b/data/Petaluma/E5E5.xml
@@ -0,0 +1 @@
+<symbol id="E5E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M141 0c-5 0 -8 8 -13 11c-9 7 -12 17 -12 29l3 72c-15 0 -29 0 -44 -1c-14 0 -28 -1 -43 -2c-11 0 -19 0 -25 12c-5 10 -7 17 -7 22c0 9 8 11 27 11h93l3 88v7c0 5 1 9 5 10c1 0 2 1 3 1c6 0 10 -7 14 -12c7 -9 11 -20 10 -33l-3 -57c32 0 64 1 96 1c20 0 24 -14 26 -28 v-3c0 -13 -8 -14 -16 -14c-37 0 -72 -1 -108 -2c0 -2 0 -4 -1 -6v-87l1 -10c0 -3 -1 -6 -5 -8c-1 -1 -2 -1 -4 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5E6.xml b/data/Petaluma/E5E6.xml
new file mode 100644
index 00000000000..f8fad0ea687
--- /dev/null
+++ b/data/Petaluma/E5E6.xml
@@ -0,0 +1 @@
+<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M185 0h-24c-92 0 -157 59 -159 143c-2 7 -2 11 0 14v1c2 38 23 68 47 95l11 10c34 29 59 46 87 46c26 0 54 -13 96 -43c39 -28 64 -68 71 -117c1 -6 1 -12 1 -18c0 -70 -62 -126 -130 -131zM150 121v-78c53 2 97 21 125 70c7 13 12 27 12 42c-1 21 -9 42 -26 59 c-15 16 -32 29 -52 37c-15 6 -32 13 -49 13c-6 0 -12 0 -18 -3l3 -4c8 -10 11 -21 10 -33l-3 -57h63h34c20 0 23 -13 25 -28c1 -1 1 -2 1 -3c0 -13 -10 -14 -19 -14c-35 0 -70 -1 -106 -1zM40 163h81c0 29 1 58 2 87v2c-37 -20 -66 -50 -83 -89zM90 51l27 -6v4 c1 24 1 47 2 71h-43c-15 0 -29 -1 -43 -2h-3c1 -32 21 -55 60 -67z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E5E7.xml b/data/Petaluma/E5E7.xml
new file mode 100644
index 00000000000..859977dcadb
--- /dev/null
+++ b/data/Petaluma/E5E7.xml
@@ -0,0 +1 @@
+<symbol id="E5E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M184 0h-24c-95 0 -159 61 -159 148c0 43 20 76 47 105c3 3 7 6 10 10c34 29 59 46 87 46c27 0 55 -13 97 -43c39 -28 64 -68 71 -117v-18c1 -70 -61 -126 -129 -131zM146 43c54 1 100 20 127 70c8 13 12 27 12 42c0 21 -9 42 -25 59c-15 16 -32 29 -52 37 c-16 6 -33 14 -50 14c-7 0 -14 -1 -21 -5c-47 -21 -82 -55 -101 -103c-5 -14 -8 -27 -8 -38c1 -32 21 -56 61 -68c18 -5 37 -8 57 -8z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E610.xml b/data/Petaluma/E610.xml
new file mode 100644
index 00000000000..c27cc13e675
--- /dev/null
+++ b/data/Petaluma/E610.xml
@@ -0,0 +1 @@
+<symbol id="E610" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M281 0c-8 1 -4 10 -5 16c-4 27 -5 54 -5 80s1 51 0 74v43l-13 5c-37 17 -76 23 -115 23c-18 0 -35 -1 -53 -3c-21 -2 -40 -8 -56 -21v-42c-1 -8 -1 -17 -1 -26c0 -16 1 -33 1 -51c0 -20 -1 -40 -5 -61c-1 -3 0 -7 -1 -10c-4 -10 -8 -25 -19 -25c-11 1 -8 17 -8 27 c-1 22 -1 45 -1 68c0 46 0 92 3 137c2 21 2 41 2 62v8c2 21 17 33 37 42c33 14 66 20 100 20c32 0 65 -5 97 -13c20 -5 43 -5 55 -27c5 -9 8 -23 8 -39l1 -1c2 -35 3 -68 3 -100c0 -46 -1 -91 -1 -140c0 -13 -3 -24 -10 -34c-3 -6 -8 -13 -14 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E611.xml b/data/Petaluma/E611.xml
new file mode 100644
index 00000000000..22a485aa88c
--- /dev/null
+++ b/data/Petaluma/E611.xml
@@ -0,0 +1 @@
+<symbol id="E611" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 0c-38 0 -76 10 -115 25c-16 7 -31 20 -33 37v41s1 13 1 19v1c0 2 0 3 -1 3c0 2 1 2 1 3v6c6 53 3 107 5 160c0 13 2 26 3 38c0 9 7 14 13 15h1c3 0 5 -8 7 -13c3 -10 4 -20 4 -30c0 -11 1 -23 1 -34c0 -38 -2 -75 -4 -113l11 -3c27 -12 55 -22 84 -27 c10 -2 19 -2 29 -2c34 0 67 9 98 25c6 3 11 5 16 6c0 24 1 49 2 73c2 30 3 59 3 89c0 9 2 19 12 20c12 0 12 -12 11 -19c-1 -46 1 -92 1 -138c0 -34 -1 -69 -5 -103l-3 -8c-4 -18 -15 -32 -33 -42c-36 -20 -73 -29 -109 -29z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E612.xml b/data/Petaluma/E612.xml
new file mode 100644
index 00000000000..9ff444328f5
--- /dev/null
+++ b/data/Petaluma/E612.xml
@@ -0,0 +1 @@
+<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M105 0h-1c-15 40 -23 81 -31 121c-23 99 -44 199 -66 298c-3 16 -5 32 -7 47v2c0 12 6 14 9 14c6 0 9 -7 12 -12c15 -27 21 -70 30 -105c21 -90 42 -173 58 -265v-9c27 125 55 249 83 374c4 19 8 24 19 24c5 0 8 -5 8 -10c2 -31 -7 -64 -13 -94 c-25 -120 -51 -238 -78 -356c-3 -11 -10 -21 -23 -29z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E613.xml b/data/Petaluma/E613.xml
new file mode 100644
index 00000000000..bbe25b81533
--- /dev/null
+++ b/data/Petaluma/E613.xml
@@ -0,0 +1 @@
+<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M201 0c-13 54 -26 102 -38 150c-20 82 -41 165 -62 248c-5 -24 -8 -49 -13 -74c-17 -79 -33 -159 -51 -238c-5 -21 -11 -56 -34 -67c-2 6 -3 15 -3 25c0 29 8 71 15 100c25 110 48 219 72 329c1 4 4 9 4 13c1 10 6 17 15 16c1 0 3 0 4 -1c6 -1 10 -11 11 -17 c27 -110 53 -220 79 -330c7 -28 14 -56 17 -84c1 -8 1 -20 1 -28c0 -15 -1 -30 -17 -42z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E614.xml b/data/Petaluma/E614.xml
new file mode 100644
index 00000000000..39894d6a32f
--- /dev/null
+++ b/data/Petaluma/E614.xml
@@ -0,0 +1 @@
+<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M99 0c-50 0 -99 53 -99 107c0 47 44 95 88 95c52 0 103 -59 103 -117c0 -48 -40 -85 -92 -85zM85 47c19 0 41 6 56 17c15 10 22 25 22 40c0 16 -8 32 -25 42c-13 7 -25 11 -37 11c-16 0 -31 -7 -46 -19c-16 -13 -28 -35 -28 -52c0 -5 1 -9 3 -13c11 -21 32 -27 55 -26z "/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E630.xml b/data/Petaluma/E630.xml
new file mode 100644
index 00000000000..0bf7f685721
--- /dev/null
+++ b/data/Petaluma/E630.xml
@@ -0,0 +1 @@
+<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M101 5c-14 8 -22 18 -21 34v83c-42 18 -80 63 -80 103c0 32 48 82 82 82c47 -2 85 -21 113 -61c11 -15 16 -32 16 -47c0 -37 -28 -70 -68 -81c-9 -3 -19 -4 -24 -5h-1v-16h2v-81c0 -11 -2 -16 -7 -16c-3 0 -7 2 -12 5zM80 153v56c0 5 1 9 6 10h3c5 0 10 -4 14 -7 c10 -9 16 -19 15 -33v-22c23 7 42 21 53 45c3 7 5 14 5 21c0 17 -10 31 -28 38c-10 4 -21 6 -31 6c-23 0 -44 -9 -63 -28c-12 -11 -17 -23 -17 -36c0 -8 2 -16 6 -25c8 -18 21 -23 37 -25z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E631.xml b/data/Petaluma/E631.xml
new file mode 100644
index 00000000000..2c4cc9cee05
--- /dev/null
+++ b/data/Petaluma/E631.xml
@@ -0,0 +1 @@
+<symbol id="E631" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M119 0c-57 0 -119 59 -119 115c0 40 41 90 80 98c0 28 1 57 2 85c0 4 -1 10 -1 15c0 7 2 12 10 12c15 0 26 -12 30 -27c1 -5 0 -10 0 -15v-96c20 -20 43 -36 58 -60c11 -19 22 -37 22 -58c0 -38 -34 -69 -82 -69zM93 38c16 0 30 4 44 12c18 9 27 23 27 40c0 4 -1 9 -2 13 c-7 24 -23 41 -41 55v-75c-42 12 -42 12 -42 50c0 10 0 20 1 29c-24 -17 -44 -38 -44 -71c0 -32 22 -53 57 -53z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E632.xml b/data/Petaluma/E632.xml
new file mode 100644
index 00000000000..eb68d0f9645
--- /dev/null
+++ b/data/Petaluma/E632.xml
@@ -0,0 +1 @@
+<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M109 0c-35 5 -75 24 -99 68c-7 12 -10 25 -10 37c0 21 10 41 29 57c20 17 43 25 66 25c27 0 54 -11 80 -33c6 -6 12 -12 20 -16c11 -6 19 -14 24 -24c24 1 47 2 71 2c20 0 20 -18 21 -32v-3c0 -12 -13 -9 -20 -9c-22 1 -43 0 -65 -1c-2 -12 -8 -23 -17 -33 c-23 -24 -51 -39 -100 -38zM96 34c28 2 53 13 74 33c-17 -1 -34 -2 -51 -4c-20 -6 -25 11 -32 25c-2 4 -3 7 -3 9c0 5 4 8 12 9c29 3 58 5 87 7l-2 3c-15 24 -39 36 -63 36c-22 0 -45 -10 -63 -30c-10 -11 -15 -24 -15 -37c0 -7 1 -15 4 -22c9 -24 29 -27 52 -29z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E633.xml b/data/Petaluma/E633.xml
new file mode 100644
index 00000000000..668fa46876c
--- /dev/null
+++ b/data/Petaluma/E633.xml
@@ -0,0 +1 @@
+<symbol id="E633" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 0c-13 1 -33 -1 -36 20c-2 8 -2 16 -2 24v79c-25 1 -50 1 -75 1c-15 0 -34 17 -35 31v2c0 8 5 9 11 9c35 0 69 1 99 1v90c0 4 -2 10 -2 16s3 11 11 11c15 0 33 -10 33 -31v-88c33 -2 61 -3 89 -4c24 0 27 -17 30 -33v-3c0 -6 -6 -7 -12 -7c-35 0 -70 3 -105 4v-98 c0 -4 1 -9 1 -14s-1 -10 -7 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E638.xml b/data/Petaluma/E638.xml
new file mode 100644
index 00000000000..4d8fce5bf0a
--- /dev/null
+++ b/data/Petaluma/E638.xml
@@ -0,0 +1 @@
+<symbol id="E638" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 0c-13 0 -36 0 -36 24v43c-34 14 -61 44 -73 79c-14 0 -28 1 -41 1c-21 0 -38 6 -52 21c-3 4 -8 8 -5 14s8 4 12 4h79c1 8 2 16 4 24c9 32 44 61 77 63h4v5c0 5 0 10 1 14c1 2 1 5 1 8v4c0 6 1 12 8 12c15 0 30 -10 30 -28c0 -12 -2 -25 -2 -37c27 -15 56 -26 72 -57 c4 -8 8 -15 11 -23c5 0 11 -1 16 -1c18 -1 35 -2 45 -21c3 -5 5 -9 5 -13c0 -5 -6 -8 -16 -7l-45 3c-1 -9 -4 -18 -9 -27c-18 -31 -45 -44 -79 -45v-38c0 -3 1 -8 1 -12c0 -5 -2 -10 -8 -10zM173 179v36c-5 2 -9 3 -13 3c-16 0 -21 -17 -28 -30l-3 -7c15 -1 29 -2 44 -2z M215 176l54 -3c-1 2 -1 5 -2 8c-8 23 -28 30 -49 32h-3v-37zM172 101v40l-43 3c5 -25 19 -40 43 -43zM215 137v-33c11 4 22 9 32 17c5 4 9 9 12 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E645.xml b/data/Petaluma/E645.xml
new file mode 100644
index 00000000000..b05084a66c3
--- /dev/null
+++ b/data/Petaluma/E645.xml
@@ -0,0 +1 @@
+<symbol id="E645" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-132 0l-16 20c-6 7 -9 12 -9 19c0 5 3 12 11 19l114 108l-104 102c-8 8 -11 16 -11 24c0 9 3 17 6 26c1 5 5 6 8 6c7 -1 11 -5 15 -9c39 -40 79 -79 118 -119c40 38 80 77 120 114c4 5 9 15 16 15c3 0 6 -2 10 -6c6 -7 11 -14 11 -22c0 -6 -3 -12 -10 -19 c-39 -37 -78 -74 -117 -112c39 -39 78 -78 118 -117c5 -6 7 -11 7 -17c0 -4 -1 -8 -3 -13c-5 -10 -9 -16 -14 -16c-4 0 -9 3 -15 9c-42 41 -83 83 -124 124c-18 -18 -36 -35 -54 -52c-26 -26 -50 -54 -77 -84z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E650.xml b/data/Petaluma/E650.xml
new file mode 100644
index 00000000000..0abd8c57632
--- /dev/null
+++ b/data/Petaluma/E650.xml
@@ -0,0 +1 @@
+<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M15 0c-12 0 -15 6 -15 13c0 2 0 5 1 8c4 31 9 62 13 93c7 51 11 103 16 154c7 67 7 133 7 200v7c0 10 -1 18 -12 18c-2 0 -5 0 -9 -1c-2 0 -5 4 -11 7c28 13 36 49 71 49c6 0 13 2 19 2c5 -1 11 -2 16 -8c5 -4 15 -2 23 -2c13 1 25 1 38 1c17 0 33 -1 50 -6 c53 -16 85 -53 92 -106c1 -4 1 -9 1 -13c0 -41 -26 -71 -62 -93c-44 -27 -88 -52 -140 -62c-16 -3 -11 -20 -13 -30l-24 -177c-3 -22 -39 -54 -61 -54zM119 295c40 -2 109 24 121 79c1 6 2 11 2 17c0 54 -49 108 -108 115h-6c-12 0 -16 -6 -16 -21c1 -22 2 -44 2 -67 c0 -29 -2 -59 -5 -88c0 -8 0 -16 -1 -23c0 -9 3 -12 11 -12zM680 4c-9 0 -11 8 -10 27c2 22 4 44 7 71c-36 -32 -71 -57 -111 -74c-16 -5 -29 -8 -43 -8c-34 0 -57 25 -61 70c0 6 -1 11 -1 16c0 67 35 118 91 155c30 20 62 35 97 35c10 -1 21 -2 31 -5c2 1 4 0 5 0 c9 0 10 6 12 14c7 54 15 108 23 161c1 10 -1 22 13 24c12 3 25 7 36 7c8 0 16 -2 23 -8c4 -3 5 -8 5 -13c0 -7 -2 -15 -3 -22c-7 -47 -14 -94 -19 -142c-8 -81 -20 -161 -24 -242c-2 -38 -24 -50 -51 -61c-9 -3 -15 -5 -20 -5zM273 -12c-3 -1 -7 -1 -10 -1 c-42 0 -76 44 -76 96c0 55 23 103 55 145c42 55 105 92 167 92c2 0 9 0 16 -1c19 -3 34 -12 42 -31c2 -5 3 -9 3 -14c0 -13 -7 -24 -16 -35c-33 -41 -80 -62 -129 -78c-6 -2 -12 -3 -18 -5c-33 -8 -51 -27 -51 -55c0 -10 3 -22 8 -34c12 -29 25 -44 38 -44c12 0 25 11 42 32 c7 9 15 17 20 27c14 29 40 32 67 34c1 1 2 1 3 1c6 0 9 -2 9 -6c0 -3 -1 -6 -3 -10c-38 -65 -97 -90 -167 -113zM274 167c47 9 81 31 109 63c7 9 13 20 13 33v3c0 9 -4 16 -11 22c-3 2 -5 3 -7 3c-6 -1 -11 -7 -16 -10l-19 -15c-29 -27 -53 -58 -69 -99zM574 62 c7 0 14 3 22 10c35 30 58 69 82 108c3 4 3 9 1 14c-10 28 -25 51 -56 60c-6 2 -12 4 -18 4s-12 -2 -18 -8c-32 -32 -51 -72 -55 -108c0 -32 6 -51 18 -65c8 -10 16 -15 24 -15zM890 8c-20 5 -41 8 -60 18c-9 5 -12 12 -12 19c0 5 3 11 6 16c11 15 25 29 47 29 c21 0 40 -8 58 -19c10 -5 15 -14 15 -22c0 -9 -6 -18 -16 -25c-11 -8 -23 -14 -38 -16z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E651.xml b/data/Petaluma/E651.xml
new file mode 100644
index 00000000000..e3b0e4ebe44
--- /dev/null
+++ b/data/Petaluma/E651.xml
@@ -0,0 +1 @@
+<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M16 0h-4c-10 0 -12 5 -12 12c0 3 0 7 1 10c9 64 19 128 26 192c6 67 11 134 11 202c0 19 0 38 -1 57c0 13 -1 22 -17 18h-2c-5 0 -7 4 -12 8c26 13 36 48 71 48c6 0 12 2 18 2c5 0 10 -2 15 -7c3 -3 7 -3 10 -3c5 0 11 1 16 1h36c16 0 33 -1 49 -6c53 -15 85 -52 92 -105 c1 -5 1 -10 1 -14c0 -41 -26 -71 -62 -93c-43 -26 -87 -54 -138 -61c-16 -3 -12 -18 -13 -27c-9 -57 -16 -114 -23 -170c-5 -35 -28 -59 -62 -64zM119 294c41 -1 112 25 122 84c1 4 1 8 1 13c0 52 -50 108 -108 114h-6c-12 0 -16 -5 -16 -20c1 -23 2 -45 2 -67 c0 -29 -2 -59 -5 -88c0 -8 0 -16 -1 -24c0 -8 3 -11 11 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E655.xml b/data/Petaluma/E655.xml
new file mode 100644
index 00000000000..28992272f28
--- /dev/null
+++ b/data/Petaluma/E655.xml
@@ -0,0 +1 @@
+<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M229 0c-5 0 -9 7 -13 9c-28 17 -38 41 -38 72c0 16 2 32 2 48c-29 -28 -60 -55 -90 -83c-4 -3 -7 -6 -11 -6c-2 0 -5 2 -7 7c-1 2 -2 3 -3 4c-18 22 -27 33 -27 43c0 11 11 20 33 40c21 18 41 37 61 55h-36c-19 0 -38 -2 -56 -4c-43 -1 -44 -1 -44 40c0 24 6 35 31 35 c38 1 76 2 114 4c-19 16 -39 32 -59 46c-29 21 -27 50 -27 79c0 9 3 13 8 13c4 0 9 -3 14 -7c36 -27 71 -56 105 -86c1 17 1 34 2 51c1 33 2 65 11 101c24 -22 37 -44 37 -72v-102c35 35 71 70 107 105c10 9 19 25 31 22c15 -4 14 -23 18 -37c2 -5 2 -11 2 -13 c0 -10 0 -17 -6 -23l-66 -67c28 1 57 3 85 5c24 2 32 -6 29 -30c-1 -9 -2 -19 -4 -28c-3 -11 -9 -17 -22 -18c-34 -1 -67 -3 -101 -5l19 -18c16 -15 32 -28 49 -39c21 -13 29 -31 26 -53v-4c0 -13 0 -29 -11 -34c-1 -1 -3 -1 -4 -1c-8 0 -16 12 -23 17 c-45 37 -87 77 -129 117c-1 -55 -1 -110 -1 -165l1 -10c0 -3 -1 -5 -4 -7c-1 -1 -2 -1 -3 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E659.xml b/data/Petaluma/E659.xml
new file mode 100644
index 00000000000..9efc3de2d79
--- /dev/null
+++ b/data/Petaluma/E659.xml
@@ -0,0 +1 @@
+<symbol id="E659" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M157 0c-6 0 -13 0 -19 1c-54 7 -100 28 -128 78c-7 12 -10 26 -10 40c0 36 21 74 51 83c-1 -5 -1 -11 -1 -16c0 -67 54 -121 130 -126c6 0 12 -1 17 -1c39 0 54 14 54 46c0 10 -1 22 -4 35c-12 68 -56 105 -111 136c-38 22 -71 49 -85 93c-3 9 -5 18 -5 27c0 5 1 11 2 16 c12 44 36 81 71 111c12 11 28 16 43 16c9 0 19 -2 27 -5c56 -19 104 -48 135 -101c2 -5 3 -9 3 -13c0 -5 -2 -10 -7 -15c-11 -12 -21 -25 -38 -28c-7 0 -5 7 -6 11c-9 18 -20 34 -39 44c-12 7 -23 15 -33 23c-14 12 -30 20 -47 23c-9 2 -19 5 -29 5c-9 0 -17 -3 -24 -13 c-6 -9 -9 -18 -9 -27c0 -11 3 -22 8 -32c15 -30 38 -53 66 -72c16 -11 34 -21 50 -32c62 -40 89 -98 87 -171c-3 -61 -69 -136 -149 -136zM899 10c-19 0 -33 17 -36 48c-4 35 -5 71 -5 107c0 21 1 43 1 65c0 15 -2 22 -12 22c-3 0 -7 -1 -12 -2c-14 -4 -29 -6 -43 -12 c5 55 7 58 55 69c13 3 17 8 17 21v6c0 7 1 15 1 22c0 3 0 7 -1 10s-1 6 -1 9c0 19 11 32 24 44c7 6 12 16 22 11c5 -2 6 -7 6 -12c0 -29 0 -57 -1 -86v-4c0 -9 3 -13 11 -13c2 0 5 0 8 1c21 3 43 5 64 7h3c13 0 17 -7 14 -20c-7 -31 -17 -39 -50 -41c-46 -3 -51 -3 -51 -39 c0 -38 1 -74 3 -112c0 -11 2 -21 5 -31c2 -7 5 -16 13 -19c1 0 2 -1 4 -1c8 0 10 10 14 14c24 29 43 62 73 85c6 4 10 10 19 10c3 0 6 0 9 -1c-37 -53 -68 -107 -120 -144c-12 -9 -24 -14 -34 -14zM428 22c-47 -6 -98 42 -98 108c0 5 0 11 1 17c8 55 37 98 77 134 c5 4 11 7 16 10c12 5 24 7 36 7c58 0 118 -49 118 -108c0 -66 -55 -141 -118 -163c-11 -4 -21 -7 -32 -5zM654 15c-17 0 -33 2 -48 10c-12 6 -30 13 -25 28c5 18 19 33 35 44c1 1 2 1 3 1c4 0 7 -3 10 -6c19 -21 42 -25 67 -25c14 0 28 2 43 2c-9 14 -19 21 -30 28 c-33 21 -65 43 -94 69c-14 13 -21 24 -21 35c0 10 6 20 17 33c11 12 23 24 36 35c24 20 39 28 53 28c17 0 31 -11 56 -27c8 -5 12 -11 12 -17s-4 -12 -11 -18c-8 -6 -16 -12 -24 -17c-4 -2 -7 -4 -11 -4s-7 2 -11 8c-9 15 -27 18 -41 27c-3 1 -6 2 -9 2c-3 1 -6 0 -9 -3 c-3 -4 -4 -7 -4 -10c0 -4 1 -7 3 -10c10 -16 25 -27 40 -38c28 -19 57 -38 85 -58c18 -14 27 -26 27 -40c0 -12 -8 -25 -22 -39c-23 -22 -50 -36 -81 -36c-15 0 -31 -2 -46 -2zM463 67c20 0 39 8 51 22c15 17 18 39 17 61c1 5 1 10 1 15c0 25 -11 46 -34 57 c-25 12 -51 25 -80 28h-4c-8 0 -14 -1 -19 -9c-11 -20 -18 -44 -18 -69c0 -30 11 -61 36 -85c14 -13 32 -20 50 -20zM1089 12h-3c-10 0 -16 3 -16 12c0 3 0 7 2 11c1 3 1 7 1 11c0 5 0 9 1 12c4 34 9 37 43 37c17 0 23 -7 23 -19c0 -2 0 -5 -1 -8c-5 -39 -17 -56 -50 -56z "/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E65A.xml b/data/Petaluma/E65A.xml
new file mode 100644
index 00000000000..3ffb34d33c4
--- /dev/null
+++ b/data/Petaluma/E65A.xml
@@ -0,0 +1 @@
+<symbol id="E65A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M149 0c-57 0 -105 24 -138 77c-7 12 -11 26 -11 41c0 31 15 65 39 81c3 2 8 6 13 3c-1 -8 -2 -16 -2 -23c0 -53 37 -96 100 -114c11 -3 22 -5 33 -5c49 -3 68 9 68 46c0 8 -1 18 -3 30c-11 69 -56 109 -112 141c-38 21 -71 48 -85 93c-3 8 -5 17 -5 25c0 5 1 10 2 15 c11 45 36 83 71 113c13 11 28 15 43 15c10 0 19 -1 28 -4c54 -18 101 -47 131 -98c2 -3 3 -7 3 -11c0 -20 -22 -48 -40 -48c-7 0 -6 5 -8 9c-8 21 -22 37 -42 47c-22 12 -39 34 -64 41c-13 4 -26 9 -38 9c-9 0 -19 -3 -27 -11c-6 -6 -9 -15 -9 -27c0 -13 4 -29 12 -43 c15 -27 38 -47 63 -64c22 -15 45 -28 66 -44c43 -33 70 -90 70 -142c0 -15 -2 -30 -7 -44c-20 -55 -57 -96 -117 -105c-12 -2 -23 -3 -34 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E880.xml b/data/Petaluma/E880.xml
new file mode 100644
index 00000000000..284a01ac5c3
--- /dev/null
+++ b/data/Petaluma/E880.xml
@@ -0,0 +1 @@
+<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M163 3c-13 0 -26 3 -38 8c-14 6 -28 10 -41 17c-47 25 -68 72 -73 134c0 8 -1 16 -1 29c0 91 30 174 82 240c12 15 27 21 42 21c13 0 26 -4 39 -11c67 -36 100 -108 107 -198c1 -13 2 -26 2 -38c0 -54 -13 -102 -37 -148c-19 -37 -50 -54 -82 -54zM124 67c5 0 11 4 19 11 c48 42 57 110 63 178c0 35 -6 69 -14 101c-4 15 -10 22 -17 22c-4 0 -10 -4 -15 -11c-23 -35 -44 -73 -54 -118c-6 -26 -10 -53 -10 -80c0 -26 4 -51 11 -77c5 -18 10 -26 17 -26z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E881.xml b/data/Petaluma/E881.xml
new file mode 100644
index 00000000000..9848145dcca
--- /dev/null
+++ b/data/Petaluma/E881.xml
@@ -0,0 +1 @@
+<symbol id="E881" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -40c-1 8 -1 15 -1 23c0 20 1 41 5 61c3 17 15 20 29 22c47 5 48 5 56 49c13 74 37 145 53 218c1 3 2 6 2 10c0 2 -1 5 -3 8c-16 -12 -31 -25 -47 -37c-10 -8 -23 -16 -35 -16c-4 0 -7 0 -11 2c-5 2 -7 7 -7 12c0 8 4 18 2 25c-1 3 -1 7 -1 10c0 14 6 28 6 43v1 c0 9 9 13 15 14c35 3 54 29 79 47c14 11 26 23 40 34c7 5 12 8 16 8c7 0 10 -6 11 -19c2 -31 -2 -63 -9 -93c-14 -59 -32 -118 -45 -177c-9 -40 -14 -80 -21 -120c-1 -2 -1 -4 -1 -5c0 -7 4 -9 11 -9c11 0 24 1 35 1c19 0 26 -5 26 -20c0 -2 -1 -6 -1 -9 c-3 -14 -5 -28 -9 -42c-6 -22 -19 -34 -45 -35c-49 0 -99 -4 -150 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E882.xml b/data/Petaluma/E882.xml
new file mode 100644
index 00000000000..65e7fb9776d
--- /dev/null
+++ b/data/Petaluma/E882.xml
@@ -0,0 +1 @@
+<symbol id="E882" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M348 -20c-6 0 -11 8 -16 12c-34 30 -69 61 -114 71c-14 4 -28 6 -42 6c-25 0 -51 -7 -72 -27c-13 -12 -28 -22 -41 -33c-4 -4 -8 -6 -11 -6c-5 0 -8 4 -10 11c-7 20 -20 38 -27 58c-2 7 -4 13 -4 19c0 11 6 20 17 29c47 33 92 68 138 102c35 26 70 54 95 90 c6 8 9 14 9 19c0 7 -7 12 -21 17c-12 4 -24 6 -36 6c-57 0 -109 -44 -116 -104c0 -6 -2 -11 -9 -20c-16 38 -35 71 -35 110c0 13 3 25 11 36c22 34 49 62 88 78c17 7 34 10 49 10c54 0 94 -40 112 -108c5 -19 7 -38 7 -56c0 -51 -20 -96 -62 -135c-4 -3 -9 -6 -10 -13 c23 -15 45 -31 68 -48c34 -25 41 -61 45 -99v-6c0 -7 -2 -15 -8 -18c-2 -1 -3 -1 -5 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E883.xml b/data/Petaluma/E883.xml
new file mode 100644
index 00000000000..2c22e5829d3
--- /dev/null
+++ b/data/Petaluma/E883.xml
@@ -0,0 +1 @@
+<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M171 -20c-32 0 -65 14 -94 33c-5 3 -9 8 -14 12c-36 28 -53 58 -53 94c0 15 3 31 9 49c3 8 6 12 10 12s8 -3 14 -8c40 -38 81 -76 140 -84c45 -6 88 37 102 69c6 14 -10 37 -30 48c-10 5 -20 7 -31 7c-12 0 -24 -3 -36 -8c-18 -8 -35 -19 -51 -30c-6 -4 -13 -11 -19 -6 c-3 2 -4 6 -4 9c0 4 1 8 2 12c0 61 33 106 70 149l18 25c-37 2 -73 4 -107 4c-14 0 -27 0 -40 -1h-5c-9 0 -13 2 -13 8c0 3 1 7 3 13c6 19 10 39 17 59c6 14 14 20 29 20c73 0 146 3 220 3c14 0 20 -4 18 -19c-3 -31 -13 -59 -33 -82c-13 -15 -27 -30 -42 -47 c17 -5 34 -4 48 -13c21 -13 34 -31 36 -56c1 -8 1 -16 1 -24c0 -81 -33 -150 -87 -211c-23 -26 -51 -37 -78 -37z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E884.xml b/data/Petaluma/E884.xml
new file mode 100644
index 00000000000..8770c9b0ede
--- /dev/null
+++ b/data/Petaluma/E884.xml
@@ -0,0 +1 @@
+<symbol id="E884" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M188 -50c-12 35 -25 69 -25 104c0 11 1 22 4 34c2 10 4 17 4 22c0 11 -8 12 -29 14c-11 1 -22 1 -32 1c-18 0 -36 -1 -53 -7c-5 -1 -9 -2 -12 -2c-9 0 -14 5 -20 18c-10 21 -15 40 -15 59c0 29 13 55 38 83c56 62 102 133 140 208c5 10 11 24 22 22c9 -2 8 -17 10 -27 c3 -11 4 -22 4 -33c0 -19 -4 -37 -14 -55c-26 -47 -43 -99 -76 -143c-3 -4 -4 -7 -4 -9c0 -4 4 -6 11 -5c1 0 2 0 2 -1c9 -1 17 -1 23 -1c22 0 24 7 34 38l23 71c2 6 7 12 13 12c4 -1 8 -8 9 -13c6 -19 11 -37 11 -56c0 -12 -2 -23 -7 -35c-3 -6 -4 -12 -4 -17 c0 -10 7 -17 25 -18c16 -2 32 -7 48 -13c11 -5 17 -11 19 -22c2 -10 2 -20 2 -31c0 -10 0 -20 -2 -31c-2 -14 -10 -21 -25 -21c-26 0 -50 9 -75 14c-4 1 -7 2 -9 2c-6 0 -9 -4 -10 -15c-3 -37 -9 -74 -13 -111c-2 -13 -5 -25 -17 -36z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E885.xml b/data/Petaluma/E885.xml
new file mode 100644
index 00000000000..5f42d98adee
--- /dev/null
+++ b/data/Petaluma/E885.xml
@@ -0,0 +1 @@
+<symbol id="E885" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M133 -10c-37 0 -74 12 -99 37c-13 13 -21 29 -22 47c-1 16 -2 32 -2 48c0 11 0 21 1 31c0 11 5 17 17 23c7 -41 34 -63 73 -71c14 -3 28 -5 42 -5c29 0 57 8 83 26c19 13 28 21 28 31c0 8 -7 18 -21 33c-26 27 -61 43 -93 43c-15 0 -30 -3 -43 -10 c-11 -6 -20 -14 -29 -21c-6 -4 -12 -12 -19 -8c-6 4 -5 12 -6 20c-1 7 -1 15 -1 22c0 56 25 106 41 159c15 51 42 76 97 74c32 -1 65 6 97 10c25 3 49 6 65 28c3 4 9 6 13 6c8 -2 6 -9 5 -14c-2 -62 -23 -113 -90 -124c-44 -7 -88 -12 -132 -20c-11 -2 -24 -1 -25 -21 c18 5 34 9 51 9c8 0 15 -1 23 -3c71 -18 113 -69 113 -140c0 -9 0 -19 -2 -29c-6 -46 -16 -92 -46 -129c-27 -34 -73 -52 -119 -52z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E886.xml b/data/Petaluma/E886.xml
new file mode 100644
index 00000000000..ad120251dbc
--- /dev/null
+++ b/data/Petaluma/E886.xml
@@ -0,0 +1 @@
+<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M145 -10c-33 0 -67 17 -91 49c-30 40 -38 86 -42 135c-1 14 -2 29 -2 43c0 70 17 135 62 193c44 56 98 94 171 94c32 0 48 -9 48 -28c0 -6 -2 -14 -5 -23c-2 -8 -5 -15 -7 -23c-6 -25 -16 -32 -41 -30c-66 5 -138 -37 -173 -109c25 18 44 37 71 42c5 1 10 1 16 1 c39 0 81 -26 99 -69c13 -32 20 -64 20 -96c0 -46 -15 -90 -42 -132c-21 -32 -52 -47 -84 -47zM160 98c11 0 22 2 33 7c20 9 36 30 36 47c0 27 -41 67 -80 73c-16 4 -36 -8 -54 -22c-19 -15 -28 -25 -28 -36s8 -22 24 -38c20 -20 45 -31 69 -31z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E887.xml b/data/Petaluma/E887.xml
new file mode 100644
index 00000000000..f9454203688
--- /dev/null
+++ b/data/Petaluma/E887.xml
@@ -0,0 +1 @@
+<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M21 -24c-10 0 -8 12 -9 21c-1 14 -2 27 -2 41c0 23 3 46 10 68c9 27 27 47 42 69c48 70 102 136 158 201c1 1 1 3 2 8c-35 -4 -70 -7 -104 -7c-14 0 -28 1 -42 2c-46 5 -59 6 -59 30c0 9 2 23 5 41c5 29 9 39 27 39h4c5 0 12 -1 21 -3c24 -4 49 -6 73 -6 c42 0 83 5 125 10c8 1 14 1 20 1c20 0 28 -6 28 -23c0 -7 -2 -17 -4 -29c-11 -64 -53 -110 -91 -158c-60 -76 -121 -152 -171 -236c-10 -17 -11 -35 -18 -52c-4 -6 -7 -17 -15 -17z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E888.xml b/data/Petaluma/E888.xml
new file mode 100644
index 00000000000..6132d5ae0cb
--- /dev/null
+++ b/data/Petaluma/E888.xml
@@ -0,0 +1 @@
+<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M129 -40c-34 0 -67 12 -87 33c-24 23 -22 59 -29 90c-2 9 -3 19 -3 28c0 49 23 89 57 126c12 13 19 25 19 39c0 7 -2 15 -5 24c-12 31 -19 64 -19 97c0 13 1 25 3 38c8 51 47 95 98 107c7 1 14 3 20 5c13 5 23 7 33 7c21 0 34 -12 47 -39c11 -23 16 -48 14 -73 c2 -66 -20 -121 -66 -167c-5 -5 -8 -9 -8 -14c0 -4 2 -8 6 -13c29 -40 42 -82 42 -125c0 -35 -8 -71 -25 -106c-19 -40 -58 -57 -97 -57zM143 323c3 0 7 2 11 6c22 22 46 41 66 65c8 10 16 20 19 33c-2 13 -10 22 -22 19c-13 -4 -25 -2 -37 -4c-20 -2 -39 -9 -55 -21 c-18 -14 -26 -22 -26 -33c0 -8 6 -18 16 -33c6 -8 13 -16 18 -25c4 -5 7 -7 10 -7zM118 65h8c31 0 58 14 80 40c5 6 7 11 7 16c0 4 -2 9 -6 13l-57 65c-3 3 -6 5 -8 5c-4 0 -8 -3 -11 -7c-16 -18 -33 -35 -48 -54c-13 -16 -35 -36 -28 -52c10 -20 39 -25 63 -26z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E889.xml b/data/Petaluma/E889.xml
new file mode 100644
index 00000000000..bcea5cf17d4
--- /dev/null
+++ b/data/Petaluma/E889.xml
@@ -0,0 +1 @@
+<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M190 0c-2 31 -10 59 -10 88c0 11 2 23 5 35c17 61 30 124 45 185c1 4 2 8 2 10c0 6 -3 7 -10 7c-12 0 -22 -1 -33 -1c-55 0 -105 15 -145 59c-3 4 -7 8 -10 13c-12 24 -24 67 -24 111c0 35 8 70 28 97c27 34 86 60 139 60c12 0 23 -1 34 -4c48 -11 87 -60 96 -117 c3 -19 5 -37 5 -56c0 -53 -12 -104 -28 -155c-28 -97 -49 -195 -69 -294c-3 -13 -9 -25 -25 -38zM217 433c13 0 26 1 40 2c2 0 4 1 6 3c6 7 10 21 10 35c0 10 -2 20 -6 26c-22 37 -60 52 -99 52c-37 0 -75 -13 -99 -33c-11 -9 -16 -15 -16 -22s7 -13 20 -23 c43 -33 92 -40 144 -40z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E88A.xml b/data/Petaluma/E88A.xml
new file mode 100644
index 00000000000..b0d9c9541b3
--- /dev/null
+++ b/data/Petaluma/E88A.xml
@@ -0,0 +1 @@
+<symbol id="E88A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M103 245c-6 0 -10 8 -11 12c-12 36 -35 69 -35 108c0 21 20 16 28 26c1 2 3 3 4 3c5 0 11 -7 15 -11c29 -23 24 -58 31 -87c0 -21 -10 -35 -24 -47c-3 -3 -6 -4 -8 -4zM63 80c-8 0 -14 8 -16 15c-9 31 -28 57 -36 89c-1 4 -1 7 -1 10c0 19 16 24 27 33c3 2 6 3 9 3 c8 0 12 -9 18 -14c29 -22 23 -58 33 -85c-2 -20 -9 -36 -24 -47c-4 -3 -7 -4 -10 -4z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E938.xml b/data/Petaluma/E938.xml
new file mode 100644
index 00000000000..b930c986864
--- /dev/null
+++ b/data/Petaluma/E938.xml
@@ -0,0 +1 @@
+<symbol id="E938" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/E939.xml b/data/Petaluma/E939.xml
new file mode 100644
index 00000000000..1423ea61a3c
--- /dev/null
+++ b/data/Petaluma/E939.xml
@@ -0,0 +1 @@
+<symbol id="E939" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/E93C.xml b/data/Petaluma/E93C.xml
new file mode 100644
index 00000000000..0a528eb9d30
--- /dev/null
+++ b/data/Petaluma/E93C.xml
@@ -0,0 +1 @@
+<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M255 -249c-8 0 -16 2 -19 4c-4 5 -9 11 -14 16c-10 6 -20 13 -29 21c-7 6 -10 13 -10 19c-52 54 -104 110 -154 168c-6 7 -31 35 -29 44c0 7 3 12 8 17c61 59 122 119 183 179c7 7 13 9 22 7c0 8 3 13 9 19c3 3 5 4 7 4c6 0 10 -8 14 -12c67 -66 134 -132 200 -200 c7 -7 41 -54 41 -64v-6c0 -5 -4 -8 -8 -12l-206 -200c-3 -3 -9 -4 -15 -4zM208 -156l183 175c-36 35 -72 71 -108 105c-7 6 -12 12 -18 19c-56 -55 -112 -110 -167 -165l-3 -3c38 -44 76 -87 113 -131z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E93D.xml b/data/Petaluma/E93D.xml
new file mode 100644
index 00000000000..4bc3e5c8b33
--- /dev/null
+++ b/data/Petaluma/E93D.xml
@@ -0,0 +1 @@
+<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/E93E.xml b/data/Petaluma/E93E.xml
new file mode 100644
index 00000000000..4e5fcbe4288
--- /dev/null
+++ b/data/Petaluma/E93E.xml
@@ -0,0 +1 @@
+<symbol id="E93E" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/E93F.xml b/data/Petaluma/E93F.xml
new file mode 100644
index 00000000000..fd01e3a5f20
--- /dev/null
+++ b/data/Petaluma/E93F.xml
@@ -0,0 +1 @@
+<symbol id="E93F" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/E949.xml b/data/Petaluma/E949.xml
new file mode 100644
index 00000000000..0ebd82b9e4c
--- /dev/null
+++ b/data/Petaluma/E949.xml
@@ -0,0 +1 @@
+<symbol id="E949" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/E94A.xml b/data/Petaluma/E94A.xml
new file mode 100644
index 00000000000..ae1f94a046d
--- /dev/null
+++ b/data/Petaluma/E94A.xml
@@ -0,0 +1 @@
+<symbol id="E94A" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/E94B.xml b/data/Petaluma/E94B.xml
new file mode 100644
index 00000000000..a880ac235b4
--- /dev/null
+++ b/data/Petaluma/E94B.xml
@@ -0,0 +1 @@
+<symbol id="E94B" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/E94C.xml b/data/Petaluma/E94C.xml
new file mode 100644
index 00000000000..7b25e47a03f
--- /dev/null
+++ b/data/Petaluma/E94C.xml
@@ -0,0 +1 @@
+<symbol id="E94C" viewBox="0 0 1000 1000" overflow="inherit"/>
\ No newline at end of file
diff --git a/data/Petaluma/EAA4.xml b/data/Petaluma/EAA4.xml
new file mode 100644
index 00000000000..78bab80c589
--- /dev/null
+++ b/data/Petaluma/EAA4.xml
@@ -0,0 +1 @@
+<symbol id="EAA4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M229 110c39 0 86 25 111 51c39 39 36 85 0 61c-22 -16 -22 -19 -45 -36c-24 -18 -45 -10 -64 11l-56 55c-24 29 -58 41 -84 30c-36 -15 -63 -36 -91 -60c-20 -16 -69 -46 -53 -69c9 -12 32 -10 53 8c40 34 85 60 136 9l23 -24c19 -20 40 -38 70 -36z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAA9.xml b/data/Petaluma/EAA9.xml
new file mode 100644
index 00000000000..3e8971981c3
--- /dev/null
+++ b/data/Petaluma/EAA9.xml
@@ -0,0 +1 @@
+<symbol id="EAA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 3c-29 9 -27 8 -55 22c-14 7 -50 24 -65 35c-22 16 -22 26 -22 46c0 11 8 29 22 20c24 -15 38 -32 54 -49c4 -4 8 -6 11 -6c4 0 8 2 12 7c20 20 28 47 40 71c9 18 19 27 36 27c3 0 6 0 10 -1c35 -5 61 -25 96 -49c28 -19 41 -45 41 -61c0 -10 -5 -17 -14 -17 c-7 0 -16 4 -27 12c-14 10 -22 18 -32 26c-4 3 -8 5 -10 5c-4 0 -5 -4 -8 -10c-11 -22 -21 -44 -38 -63c-11 -12 -22 -18 -35 -18c-5 0 -11 1 -16 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAAA.xml b/data/Petaluma/EAAA.xml
new file mode 100644
index 00000000000..f4c376e924f
--- /dev/null
+++ b/data/Petaluma/EAAA.xml
@@ -0,0 +1 @@
+<symbol id="EAAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M139 3c-5 -2 -11 -3 -16 -3c-13 0 -24 6 -35 18c-17 19 -27 41 -38 63c-3 6 -4 10 -8 10c-2 0 -6 -2 -10 -5c-10 -8 -18 -16 -32 -26c-11 -8 -21 -12 -27 -12c-9 0 -14 7 -14 17c0 16 13 42 41 61c35 24 61 44 96 49c4 1 7 1 10 1c17 0 27 -9 36 -27 c12 -24 20 -51 40 -71c5 -5 8 -7 12 -7s7 2 11 6c16 17 30 34 54 49c3 2 5 2 7 2c10 0 15 -13 15 -22c0 -20 0 -30 -22 -46c-15 -11 -51 -28 -65 -35c-28 -14 -26 -13 -55 -22z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAAD.xml b/data/Petaluma/EAAD.xml
new file mode 100644
index 00000000000..f51ecae2c17
--- /dev/null
+++ b/data/Petaluma/EAAD.xml
@@ -0,0 +1 @@
+<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M282 -13c-4 3 -4 7 -4 12c0 31 13 64 6 63c-17 -2 -27 8 -50 19c-8 3 -13 6 -17 6s-6 -2 -8 -6c-11 -22 -21 -44 -38 -63c-11 -12 -22 -18 -35 -18c-5 0 -11 1 -16 3c-29 9 -27 8 -55 22c-14 7 -50 24 -65 35c-22 16 -22 26 -22 46c0 11 8 29 22 20c24 -15 38 -32 54 -49 c4 -4 8 -6 11 -6c4 0 8 2 12 7c20 20 28 47 40 71c9 18 19 27 36 27c3 0 6 0 10 -1c32 -5 82 -65 123 -72c2 11 -7 16 -14 31c-5 12 -16 23 -23 34c-2 4 -3 7 -3 10c0 4 1 7 5 11s8 6 12 6c3 0 6 -1 10 -3c68 -40 141 -65 219 -76c9 -1 12 -3 12 -7c0 -2 -2 -6 -6 -10 c-6 -7 -14 -10 -22 -13c-63 -24 -121 -56 -177 -94c-5 -3 -9 -11 -17 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAAE.xml b/data/Petaluma/EAAE.xml
new file mode 100644
index 00000000000..03248967aca
--- /dev/null
+++ b/data/Petaluma/EAAE.xml
@@ -0,0 +1 @@
+<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 201c4 0 8 -2 12 -6s5 -7 5 -11c0 -3 -1 -6 -3 -10c-7 -11 -18 -22 -23 -34c-7 -15 -16 -20 -14 -31c41 7 91 67 123 72c4 1 7 1 10 1c17 0 27 -9 36 -27c12 -24 20 -51 40 -71c4 -5 8 -7 12 -7c3 0 7 2 11 6c16 17 30 34 54 49c3 2 5 2 7 2c10 0 15 -13 15 -22 c0 -20 0 -30 -22 -46c-15 -11 -51 -28 -65 -35c-28 -14 -26 -13 -55 -22c-5 -2 -11 -3 -16 -3c-13 0 -24 6 -35 18c-17 19 -27 41 -38 63c-2 4 -4 6 -8 6s-9 -3 -17 -6c-23 -11 -33 -21 -50 -19c-7 1 5 -28 6 -57v-6c0 -5 0 -9 -4 -12c-2 -2 -4 -2 -6 -2c-4 0 -7 5 -11 7 c-56 38 -114 70 -177 94c-8 3 -16 6 -22 13c-4 4 -6 8 -6 10c0 4 3 6 12 7c78 11 151 36 219 76c4 2 7 3 10 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/EAAF.xml b/data/Petaluma/EAAF.xml
new file mode 100644
index 00000000000..849eaf602a0
--- /dev/null
+++ b/data/Petaluma/EAAF.xml
@@ -0,0 +1 @@
+<symbol id="EAAF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 0c-6 0 -13 1 -19 3c-35 9 -33 8 -67 22c-16 7 -60 24 -78 35c-27 16 -27 26 -27 46c0 11 10 29 27 20c29 -15 46 -32 65 -49c5 -4 10 -6 13 -6c5 0 10 2 15 7c24 20 34 47 48 71c11 18 23 27 44 27c4 0 7 0 12 -1c42 -5 74 -25 116 -49c34 -19 50 -45 50 -61 c0 -10 -6 -17 -17 -17c-9 0 -19 4 -33 12c-17 10 -26 18 -39 26c-4 3 -9 5 -12 5c-4 0 -6 -4 -9 -10c-14 -22 -26 -44 -46 -63c-14 -12 -27 -18 -43 -18z"/></symbol>
\ No newline at end of file

From 34c307b2a6ba348f22c317c97335d4c5603d23c6 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Wed, 26 Jan 2022 11:52:16 +0100
Subject: [PATCH 144/403] update Leipzig metadata file

---
 data/Leipzig.xml                 |   86 +-
 data/Leipzig/EBA7.xml            |    2 +-
 data/Leipzig/EBA8.xml            |    2 +-
 data/Leipzig/EBA9.xml            |    2 +-
 data/Leipzig/EBAA.xml            |    2 +-
 data/Leipzig/EBAB.xml            |    2 +-
 data/Leipzig/EBAC.xml            |    2 +-
 fonts/Leipzig.svg                |   47 +-
 fonts/json/leipzig_metadata.json | 3003 +++++++++++++++---------------
 9 files changed, 1593 insertions(+), 1555 deletions(-)

diff --git a/data/Leipzig.xml b/data/Leipzig.xml
index 1e5728b9500..8ba34e638fe 100644
--- a/data/Leipzig.xml
+++ b/data/Leipzig.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bounding-boxes font-family="Leipzig" units-per-em="1000">
-  <g c="E0A3" x="0.0" y="-132.0" w="314.0" h="270.0" h-a-x="314" n="noteheadHalf"/>
+  <g c="E0A3" x="0.0" y="-132.0" w="314.0" h="270.0" h-a-x="314" n="noteheadHalf">
+    <a n="cutOutNW" x="0.14" y="0.24"/>
+    <a n="cutOutSE" x="1.08" y="-0.24"/>
+    <a n="stemDownNW" x="0.0" y="-0.14"/>
+    <a n="stemUpSE" x="1.26" y="0.16"/>
+  </g>
   <g c="E080" x="20.0" y="-250.0" w="414.0" h="501.0" h-a-x="454" n="timeSig0"/>
   <g c="E081" x="20.0" y="-250.0" w="296.0" h="500.0" h-a-x="336" n="timeSig1"/>
   <g c="E082" x="20.0" y="-251.0" w="402.0" h="502.0" h-a-x="442" n="timeSig2"/>
@@ -17,7 +22,12 @@
     <a n="stemDownNW" x="0.0" y="0.0"/>
     <a n="stemUpSE" x="1.62" y="0.0"/>
   </g>
-  <g c="E0A4" x="0.0" y="-133.0" w="314.0" h="266.0" h-a-x="314" n="noteheadBlack"/>
+  <g c="E0A4" x="0.0" y="-133.0" w="314.0" h="266.0" h-a-x="314" n="noteheadBlack">
+    <a n="cutOutNW" x="0.14" y="0.24"/>
+    <a n="cutOutSE" x="1.09" y="-0.24"/>
+    <a n="stemDownNW" x="-0.0" y="-0.16"/>
+    <a n="stemUpSE" x="1.26" y="0.16"/>
+  </g>
   <g c="E05C" x="0.0" y="-502.0" w="606.0" h="1004.0" h-a-x="656" n="cClef"/>
   <g c="E05D" x="0.0" y="-735.0" w="606.0" h="1237.0" h-a-x="616" n="cClef8vb"/>
   <g c="E051" x="-1.0" y="-893.0" w="647.0" h="1976.0" h-a-x="650" n="gClef15mb"/>
@@ -30,10 +40,24 @@
   <g c="E064" x="4.0" y="-750.0" w="694.0" h="1001.0" h-a-x="698" n="fClef8vb"/>
   <g c="E065" x="4.0" y="-581.0" w="694.0" h="1048.0" h-a-x="698" n="fClef8va"/>
   <g c="E066" x="4.0" y="-581.0" w="694.0" h="1066.0" h-a-x="698" n="fClef15ma"/>
-  <g c="E262" x="0.0" y="-339.0" w="197.0" h="694.0" h-a-x="197" n="accidentalSharp"/>
-  <g c="E261" x="0.0" y="-351.0" w="157.0" h="702.0" h-a-x="157" n="accidentalNatural"/>
-  <g c="E260" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="200" n="accidentalFlat"/>
-  <g c="E264" x="0.0" y="-175.0" w="388.0" h="644.0" h-a-x="388" n="accidentalDoubleFlat"/>
+  <g c="E262" x="0.0" y="-339.0" w="197.0" h="694.0" h-a-x="197" n="accidentalSharp">
+    <a n="cutOutNE" x="0.62" y="0.84"/>
+    <a n="cutOutNW" x="0.16" y="0.64"/>
+    <a n="cutOutSE" x="0.62" y="-0.64"/>
+    <a n="cutOutSW" x="0.16" y="-0.82"/>
+  </g>
+  <g c="E261" x="0.0" y="-351.0" w="157.0" h="702.0" h-a-x="157" n="accidentalNatural">
+    <a n="cutOutNE" x="0.08" y="0.74"/>
+    <a n="cutOutSW" x="0.55" y="-0.76"/>
+  </g>
+  <g c="E260" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="200" n="accidentalFlat">
+    <a n="cutOutNE" x="0.1" y="0.56"/>
+    <a n="cutOutSE" x="0.43" y="-0.34"/>
+  </g>
+  <g c="E264" x="0.0" y="-175.0" w="388.0" h="644.0" h-a-x="388" n="accidentalDoubleFlat">
+    <a n="cutOutNE" x="0.86" y="0.56"/>
+    <a n="cutOutSE" x="1.23" y="-0.3"/>
+  </g>
   <g c="E266" x="0.0" y="-175.0" w="578.0" h="644.0" h-a-x="578" n="accidentalTripleFlat">
     <a n="cutOutNE" x="1.62" y="0.57"/>
     <a n="cutOutSE" x="1.97" y="-0.31"/>
@@ -136,7 +160,10 @@
   <g c="E939" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" n="mensuralNoteheadSemibrevisVoid"/>
   <g c="E93C" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" n="mensuralNoteheadMinimaWhite"/>
   <g c="E93D" x="0.0" y="-192.0" w="312.0" h="386.0" h-a-x="312" n="mensuralNoteheadSemiminimaWhite"/>
-  <g c="E101" x="0.0" y="-250.0" w="460.0" h="500.0" h-a-x="460" n="noteheadSlashHorizontalEnds"/>
+  <g c="E101" x="0.0" y="-250.0" w="460.0" h="500.0" h-a-x="460" n="noteheadSlashHorizontalEnds">
+    <a n="stemDownNW" x="0.0" y="-1.0"/>
+    <a n="stemUpSE" x="1.84" y="1.0"/>
+  </g>
   <g c="E501" x="0.0" y="-242.0" w="750.0" h="484.0" h-a-x="751" n="repeat2Bars"/>
   <g c="E502" x="0.0" y="-242.0" w="1234.0" h="484.0" h-a-x="1234" n="repeat4Bars"/>
   <g c="E901" x="0.0" y="-147.0" w="268.0" h="991.0" h-a-x="268" n="mensuralGclefPetrucci"/>
@@ -230,12 +257,32 @@
   <g c="E9F8" x="0.0" y="0.0" w="118.0" h="140.0" n="mensuralRestSemifusa"/>
   <g c="E26C" x="0.0" y="-260.0" w="90.0" h="520.0" h-a-x="90" n="accidentalBracketLeft"/>
   <g c="E26D" x="0.0" y="-260.0" w="90.0" h="520.0" h-a-x="90" n="accidentalBracketRight"/>
-  <g c="E270" x="-43.0" y="-184.0" w="263.0" h="786.0" h-a-x="221" n="accidentalQuarterToneFlatArrowUp"/>
-  <g c="E271" x="-46.0" y="-354.0" w="266.0" h="848.0" h-a-x="220" n="accidentalThreeQuarterTonesFlatArrowDown"/>
-  <g c="E272" x="-46.0" y="-377.0" w="223.0" h="862.0" h-a-x="178" n="accidentalQuarterToneSharpNaturalArrowUp"/>
-  <g c="E273" x="0.0" y="-485.0" w="221.0" h="862.0" h-a-x="157" n="accidentalQuarterToneFlatNaturalArrowDown"/>
-  <g c="E274" x="-24.0" y="-364.0" w="221.0" h="825.0" h-a-x="197" n="accidentalThreeQuarterTonesSharpArrowUp"/>
-  <g c="E275" x="-25.0" y="-473.0" w="222.0" h="855.0" h-a-x="197" n="accidentalQuarterToneSharpArrowDown"/>
+  <g c="E270" x="-43.0" y="-184.0" w="263.0" h="786.0" h-a-x="221" n="accidentalQuarterToneFlatArrowUp">
+    <a n="cutOutNE" x="0.56" y="0.57"/>
+    <a n="cutOutSE" x="0.5" y="-0.36"/>
+  </g>
+  <g c="E271" x="-46.0" y="-354.0" w="266.0" h="848.0" h-a-x="220" n="accidentalThreeQuarterTonesFlatArrowDown">
+    <a n="cutOutNE" x="0.19" y="0.58"/>
+    <a n="cutOutSE" x="0.59" y="-0.27"/>
+  </g>
+  <g c="E272" x="-46.0" y="-377.0" w="223.0" h="862.0" h-a-x="178" n="accidentalQuarterToneSharpNaturalArrowUp">
+    <a n="cutOutNE" x="0.47" y="0.78"/>
+    <a n="cutOutSW" x="0.63" y="-0.83"/>
+  </g>
+  <g c="E273" x="0.0" y="-485.0" w="221.0" h="862.0" h-a-x="157" n="accidentalQuarterToneFlatNaturalArrowDown">
+    <a n="cutOutNE" x="0.08" y="0.77"/>
+    <a n="cutOutSW" x="0.27" y="-0.83"/>
+  </g>
+  <g c="E274" x="-24.0" y="-364.0" w="221.0" h="825.0" h-a-x="197" n="accidentalThreeQuarterTonesSharpArrowUp">
+    <a n="cutOutNE" x="0.62" y="0.88"/>
+    <a n="cutOutSE" x="0.62" y="-0.69"/>
+    <a n="cutOutSW" x="0.16" y="-0.87"/>
+  </g>
+  <g c="E275" x="-25.0" y="-473.0" w="222.0" h="855.0" h-a-x="197" n="accidentalQuarterToneSharpArrowDown">
+    <a n="cutOutNE" x="0.62" y="0.86"/>
+    <a n="cutOutNW" x="0.16" y="0.7"/>
+    <a n="cutOutSE" x="0.62" y="-0.68"/>
+  </g>
   <g c="E280" x="0.0" y="-175.0" w="198.0" h="644.0" h-a-x="198" n="accidentalQuarterToneFlatStein">
     <a n="cutOutNW" x="0.7" y="0.58"/>
     <a n="cutOutSW" x="0.37" y="-0.33"/>
@@ -312,7 +359,7 @@
   <g c="EBE7" x="-3.02" y="-3.0" w="168.02" h="252.0" h-a-x="162" n="luteItalianFret7"/>
   <g c="EBE8" x="-3.0" y="-3.0" w="194.0" h="252.0" h-a-x="188" n="luteItalianFret8"/>
   <g c="EBE9" x="-3.0" y="-3.15" w="185.0" h="252.15" h-a-x="179" n="luteItalianFret9"/>
-  <g c="EBA7" x="-82.0" y="0.0" w="174.0" h="791.0" h-a-x="92" n="luteDurationWhole"/>
+  <g c="EBA7" x="0.0" y="0.0" w="88.0" h="791.0" h-a-x="88" n="luteDurationWhole"/>
   <g c="EBA8" x="-1.0" y="0.0" w="405.0" h="795.0" h-a-x="403" n="luteDurationHalf"/>
   <g c="EBAA" x="0.0" y="0.0" w="392.0" h="781.0" h-a-x="393" n="luteDuration8th"/>
   <g c="EBA9" x="0.0" y="0.0" w="390.0" h="785.0" h-a-x="389" n="luteDurationQuarter"/>
@@ -337,9 +384,14 @@
   <g c="EBCC" x="0.2" y="-0.2" w="341.2" h="210.8" h-a-x="341" n="luteFrenchFretN"/>
   <g c="E000" x="0.11" y="1.15" w="92.63" h="997.71" n="brace"/>
   <g c="E645" x="-150.0" y="0.0" w="300.0" h="300.0" h-a-x="150" n="vocalSprechgesang"/>
-  <g c="E0A5" x="0.0" y="0.0" w="314" h="0.0" h-a-x="314" n="noteheadNull"/>
-  <g c="E0A9" x="0.0" y="-125.0" w="290.0" h="250.0" h-a-x="290" n="noteheadXBlack"/>
-  <g c="E0AF" x="-1.0" y="-133.0" w="267.0" h="266.0" h-a-x="266" n="noteheadPlusBlack"/>
+  <g c="E0A9" x="0.0" y="-125.0" w="290.0" h="250.0" h-a-x="290" n="noteheadXBlack">
+    <a n="stemDownNW" x="0.0" y="-0.44"/>
+    <a n="stemUpSE" x="1.16" y="0.44"/>
+  </g>
+  <g c="E0AF" x="-1.0" y="-133.0" w="267.0" h="266.0" h-a-x="266" n="noteheadPlusBlack">
+    <a n="stemDownNW" x="0.0" y="0.0"/>
+    <a n="stemUpSE" x="1.06" y="0.0"/>
+  </g>
   <g c="E0DB" x="0.0" y="-160.0" w="314.0" h="320.0" h-a-x="314" n="noteheadDiamondBlack">
     <a n="stemDownNW" x="0.0" y="0.0"/>
     <a n="stemUpSE" x="1.26" y="0.0"/>
diff --git a/data/Leipzig/EBA7.xml b/data/Leipzig/EBA7.xml
index dca60ece822..adc90d10478 100644
--- a/data/Leipzig/EBA7.xml
+++ b/data/Leipzig/EBA7.xml
@@ -1 +1 @@
-<symbol id="EBA7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-82 763c12 4 35 8 70 14c38 6 61 10 67 12c7 2 12 2 14 2c7 0 11 -3 13 -9s3 -17 3 -33c0 -23 0 -42 -1 -58c-1 -11 -2.55285 -77.9923 -4 -201c-1 -85 2 -296 2 -335c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -23 496.965 -23 725c0 1 0 6 -1 16 c0 4 -2 5 -5 5c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10c-2 24 -2 37 -2 38z"/></symbol>
\ No newline at end of file
+<symbol id="EBA7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 770c0 5 6 4 51 19c7 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 157 -9 514 -24 741c-1 15 -4 25 -4 29z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA8.xml b/data/Leipzig/EBA8.xml
index 7c0364f751e..4aefb2cf9a5 100644
--- a/data/Leipzig/EBA8.xml
+++ b/data/Leipzig/EBA8.xml
@@ -1 +1 @@
-<symbol id="EBA8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-1 1l10 770c0.128549 8.9984 1 15 2 19c2 3 6 5 12 5c0 0 12 -1 36 -4c79 -10 136 -17 172 -24c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5.13456 -104.997 -7 -202 c-2 -104 -9 -378 -20 -529z"/></symbol>
\ No newline at end of file
+<symbol id="EBA8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 771c0 16 0 24 14 24c71 -6 175 -22 208 -28c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5 -105 -7 -202c-2 -104 -9 -378 -20 -529l-46 1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBA9.xml b/data/Leipzig/EBA9.xml
index 5af36b72903..2972dcd3470 100644
--- a/data/Leipzig/EBA9.xml
+++ b/data/Leipzig/EBA9.xml
@@ -1 +1 @@
-<symbol id="EBA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0l8 740v36c0 6 3 9 8 9l35 -5l80 -9c37 -5 72 -13 107 -25c46 -15 90 -36 132 -63c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -4.63296 -62.9761 -9 -187 c-5 -142 -8 -371 -11 -396h-44z"/></symbol>
\ No newline at end of file
+<symbol id="EBA9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M377 435c-10 0 -30 5 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-54 25 -196 73 -261 73c-2 0 -6 0 -13 -1c-2 -1 -5 -63 -9 -187c-5 -142 -8 -371 -11 -396h-44l8 740v36c0 6 3 9 8 9l35 -5l80 -9c94 -13 170 -44 239 -88c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50 c0 0 -27 11 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21c0 -12 -10 -66 -13 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAA.xml b/data/Leipzig/EBAA.xml
index af409240237..71dc4e24390 100644
--- a/data/Leipzig/EBAA.xml
+++ b/data/Leipzig/EBAA.xml
@@ -1 +1 @@
-<symbol id="EBAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M377 435c-10.2893 0 -30 5.49144 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -98 26 -125 26c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c1.65723 -1.6582 2 -7.52637 2 -13v-49c0 -11 2 -20 0 -27c3 0 6 1 9 1c43 0 91 -11 151 -31l99 -34 c44 -13 66 -34 66 -72c0 -11 -3 -26 -6 -42c-2 -2 -4 -3 -6 -3c-4.08008 0 -23.2266 5 -26 5c1 8 4 23 4 29c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31c-11 0 -23 -1 -29 -2c-5 -36 -3.61719 -80.0146 -6 -138c-3 -73 -8 -270 -10 -291h-44l8 740 c0.0216185 1.99971 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c0 0 -27 10.6258 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39 c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21c0 -11.5061 -9.94969 -66 -13 -66z"/></symbol>
\ No newline at end of file
+<symbol id="EBAA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0l8 740c0 2 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c0 0 -27 11 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39c81 -29 129 -54 142 -75 c3 -6 3 -13 3 -21c0 -12 -10 -66 -13 -66c-10 0 -30 5 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-53 24 -194 73 -257 73c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c2 -2 2 -8 2 -13v-49c0 -11 2 -20 0 -27c3 0 6 1 9 1c43 0 91 -11 151 -31l99 -34c44 -13 66 -34 66 -72 c0 -11 -3 -26 -6 -42c-2 -2 -4 -3 -6 -3c-4 0 -23 5 -26 5c1 8 4 23 4 29c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31c-11 0 -23 -1 -29 -2c-5 -36 -4 -80 -6 -138c-3 -73 -8 -270 -10 -291h-44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAB.xml b/data/Leipzig/EBAB.xml
index 9a23398540b..8f8863556b5 100644
--- a/data/Leipzig/EBAB.xml
+++ b/data/Leipzig/EBAB.xml
@@ -1 +1 @@
-<symbol id="EBAB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M392 226v-3c0 -10 -4 -44 -9 -45c-4 0 -28 9 -31 9c1 8 5 25 5 31c0 14 -2 23 -8 27c-13 8 -47 27 -102 43c-68 20 -121 24 -159 24c-8 0 -17 -1 -27 -3c-1 -21 -9.38086 -128.922 -11 -166l-6 -144l-44 1l8 740c0.0429688 4.0127 0 8 0 13c0 0 -1 23 -1 24c0 6 3 9 12 9 s31 -3 63 -10l87 -17c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 20 -128 38l-117 16l1 -82h15c37 0 90 -13 160 -38c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19 c0 -11 -13 -55 -14 -62c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-11c-6 0 -8 -1 -8 -7c0 -14 1 -38 1 -50c0 -10 0 -18 -2 -25h10c44 0 98 -11 160 -36l105 -43c30 -11 45 -26 45 -51c0 -9 -4 -28 -11 -58h-1 c-7 0 -25 9 -29 9c2 10 4 26 5 35c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2v-17v-65v-5c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -33c44.2412 -16.0879 67 -40 67 -79z"/></symbol>
\ No newline at end of file
+<symbol id="EBAB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0l8 740v13s-1 23 -1 24c0 6 3 9 12 9s31 -3 63 -10l87 -17c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 20 -128 38l-117 16l1 -82h15c37 0 90 -13 160 -38 c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19c0 -11 -13 -55 -14 -62c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-11c-6 0 -8 -1 -8 -7c0 -14 1 -38 1 -50c0 -10 0 -18 -2 -25h10c44 0 98 -11 160 -36l105 -43 c30 -11 45 -26 45 -51c0 -9 -4 -28 -11 -58h-1c-7 0 -25 9 -29 9c2 10 4 26 5 35c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2v-87c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -33c44 -16 67 -40 67 -79v-3c0 -10 -4 -44 -9 -45 c-4 0 -28 9 -31 9c1 8 5 25 5 31c0 14 -2 23 -8 27c-13 8 -47 27 -102 43c-68 20 -121 24 -159 24c-8 0 -17 -1 -27 -3c-1 -21 -9 -129 -11 -166l-6 -144z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/EBAC.xml b/data/Leipzig/EBAC.xml
index 2779ebc5975..0e82da64d0e 100644
--- a/data/Leipzig/EBAC.xml
+++ b/data/Leipzig/EBAC.xml
@@ -1 +1 @@
-<symbol id="EBAC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M52 538v-54v-6h10c41 0 90 -10 150 -32l103 -37c45 -12 66 -35 66 -73c0 -9 -2 -31 -5 -50c-2 -2 -4 -2 -6 -2c-4 0 -22 11 -27 11c1 9 3 26 3 32c0 14 -3 22 -8 25c-15 9 -52 21 -105 38c-68 22 -119 34 -158 34c-12 0 -20 -1 -24 -2l-1 -67c3 0 5 -7 7 -7 c44 0 97 -1 158 -25l101 -40c44 -14 67 -41 67 -79c0 -10 -3 -24 -6 -42c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 3 16 3 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 4 -25 2c-1 -105 -2 -281 -4 -297l-44 1l3 826 c0.0762817 21.0029 -2 27 13 27c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28.7328 9.03846 -28 16c2 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1 c36 0 91 -12 164 -36c81 -27 128 -52 141 -73c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -14 1 -14 -8c0 -2 1 -7 2 -14c0 -6 -3 -14 -2 -19c1.76465 -8.8252 2 -18 -1 -29h9 c44 0 96 -13 163 -40l117 -50c26.8054 -11.4553 40 -25 40 -47c-2 -16 -5 -45 -8 -63c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v40c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 0 -14 0 -20z"/></symbol>
\ No newline at end of file
+<symbol id="EBAC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 0l3 826v11c0 12 1 16 13 16c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28 9 -28 16c0 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1c36 0 91 -12 164 -36 c81 -27 128 -52 141 -73c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -14 1 -14 -8c0 -2 1 -7 2 -14c0 -6 -3 -14 -2 -19c2 -9 2 -18 -1 -29h9c44 0 96 -13 163 -40l117 -50 c27 -11 40 -25 40 -47c-2 -16 -5 -45 -8 -63c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v40c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 0 -14 0 -20v-60h10c41 0 90 -10 150 -32l103 -37c45 -12 66 -35 66 -73 c0 -9 -2 -31 -5 -50c-2 -2 -4 -2 -6 -2c-4 0 -22 11 -27 11c1 9 3 26 3 32c0 14 -3 22 -8 25c-15 9 -52 21 -105 38c-68 22 -119 34 -158 34c-12 0 -20 -1 -24 -2l-1 -67c3 0 5 -7 7 -7c44 0 97 -1 158 -25l101 -40c44 -14 67 -41 67 -79c0 -10 -3 -24 -6 -42 c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 3 16 3 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 4 -25 2c-1 -105 -2 -281 -4 -297z"/></symbol>
\ No newline at end of file
diff --git a/fonts/Leipzig.svg b/fonts/Leipzig.svg
index abef620cf1d..da7fa78b1ff 100644
--- a/fonts/Leipzig.svg
+++ b/fonts/Leipzig.svg
@@ -2,8 +2,8 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20201107 at Tue Jan 18 14:46:26 2022
- By Laurent Pugin
+Created by FontForge 20201107 at Wed Jan 26 11:43:59 2022
+ By Klaus Rettinghaus
 Created by Etienne Darbellay, Jean-Francois Marti, Laurent Pugin, and Klaus Rettinghaus.
 This font is licensed under the SIL Open Font License \(http://scripts.sil.org/OFL\).
 Version 5.2.66
@@ -1061,32 +1061,28 @@ c-3.05489 -13.2379 -7.12531 -23.5065 -12.3403 -31.8506c-17.7025 -29.873 -43.5079
 c-1.52019 0 -2.55487 0.151846 -3.72446 0.151846c-5.08589 0 -8.99941 4.62292 -8.99941 8.99941c0 2.71308 1.63305 4.92365 3.73597 7.02657c6.08035 6.08035 18.6085 10.9996 27.8514 15.621c29.5237 15.746 49.5195 29.4864 66.9755 53.1033
 c17.6711 24.5432 27.4372 52.9492 27.4372 81.2492c0 17.607 -2.75619 26.7594 -10.5653 40.4404c-8.59035 13.2529 -22.1772 26.5602 -40.4353 26.5602c-16.4256 0 -28.7492 -8.46116 -36.4676 -19.6099c-6.82344 -10.7226 -10.533 -19.9402 -10.533 -35.3906
 c0 -14.8027 7.45053 -27.4278 16.2003 -36.1777c6.4778 -6.4778 13.0667 -9.82293 21.8002 -9.82293c9.45771 0 21.5864 4 31 4z" />
-    <glyph glyph-name="uniEBA7" unicode="&#xeba7;" horiz-adv-x="92" 
-d="M-82 763c12 4 35 8 70 14c38 6 61 10 67 12c7 2 12 2 14 2c7 0 11 -3 13 -9s3 -17 3 -33c0 -23 0 -42 -1 -58c-1 -11 -2.55285 -77.9923 -4 -201c-1 -85 2 -296 2 -335c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -23 496.965 -23 725c0 1 0 6 -1 16
-c0 4 -2 5 -5 5c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10c-2 24 -2 37 -2 38z" />
+    <glyph glyph-name="uniEBA7" unicode="&#xeba7;" horiz-adv-x="88" 
+d="M0 770c0 5 6 4 51 19c7 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 157 -9 514 -24 741c-1 15 -4 25 -4 29z" />
     <glyph glyph-name="uniEBA8" unicode="&#xeba8;" horiz-adv-x="403" 
-d="M-1 1l10 770c0.128549 8.9984 1 15 2 19c2 3 6 5 12 5c0 0 12 -1 36 -4c79 -10 136 -17 172 -24c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5.13456 -104.997 -7 -202
-c-2 -104 -9 -378 -20 -529z" />
+d="M9 771c0 16 0 24 14 24c71 -6 175 -22 208 -28c85 -16 143 -34 173 -56c-12 -27 -21 -42 -25 -42c-1 0 -1 0 -2 1l-104 34c-67 20 -123 30 -165 30c-13 0 -25 -1 -36 -3c-3 -38 -5 -105 -7 -202c-2 -104 -9 -378 -20 -529l-46 1z" />
     <glyph glyph-name="uniEBAA" unicode="&#xebaa;" horiz-adv-x="393" 
-d="M377 435c-10.2893 0 -30 5.49144 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -98 26 -125 26c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c1.65723 -1.6582 2 -7.52637 2 -13v-49c0 -11 2 -20 0 -27c3 0 6 1 9 1c43 0 91 -11 151 -31l99 -34
-c44 -13 66 -34 66 -72c0 -11 -3 -26 -6 -42c-2 -2 -4 -3 -6 -3c-4.08008 0 -23.2266 5 -26 5c1 8 4 23 4 29c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31c-11 0 -23 -1 -29 -2c-5 -36 -3.61719 -80.0146 -6 -138c-3 -73 -8 -270 -10 -291h-44l8 740
-c0.0216185 1.99971 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c0 0 -27 10.6258 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39
-c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21c0 -11.5061 -9.94969 -66 -13 -66z" />
+d="M0 0l8 740c0 2 1 12 3 32c0 6 4 9 11 9c3 0 12 -1 27 -3c160 -22 267 -54 321 -95c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c0 0 -27 11 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39c81 -29 129 -54 142 -75
+c3 -6 3 -13 3 -21c0 -12 -10 -66 -13 -66c-10 0 -30 5 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-53 24 -194 73 -257 73c-2 0 -6 0 -13 -1c-2 -1 -3 -4 -3 -9c2 -2 2 -8 2 -13v-49c0 -11 2 -20 0 -27c3 0 6 1 9 1c43 0 91 -11 151 -31l99 -34c44 -13 66 -34 66 -72
+c0 -11 -3 -26 -6 -42c-2 -2 -4 -3 -6 -3c-4 0 -23 5 -26 5c1 8 4 23 4 29c0 14 -2 24 -8 27c-12 7 -46 18 -102 35c-68 20 -121 31 -159 31c-11 0 -23 -1 -29 -2c-5 -36 -4 -80 -6 -138c-3 -73 -8 -270 -10 -291h-44z" />
     <glyph glyph-name="uniEBA9" unicode="&#xeba9;" horiz-adv-x="389" 
-d="M0 0l8 740v36c0 6 3 9 8 9l35 -5l80 -9c37 -5 72 -13 107 -25c46 -15 90 -36 132 -63c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50c-2 1 -8 4 -19 9c-5 3 -8 5 -8 7c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39
-c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21s-1 -20 -4 -34c-5 -21 -9 -32 -9 -32c-6 0 -11 1 -16 3s-9 4 -11 6s-3 4 -3 5v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-37 17 -81 33 -132 47c-58 17 -102 26 -129 26c-2 0 -6 0 -13 -1c-2 -1 -4.63296 -62.9761 -9 -187
-c-5 -142 -8 -371 -11 -396h-44z" />
+d="M377 435c-10 0 -30 5 -30 14v2c4 12 6 22 6 30c0 14 -5 24 -15 30c-54 25 -196 73 -261 73c-2 0 -6 0 -13 -1c-2 -1 -5 -63 -9 -187c-5 -142 -8 -371 -11 -396h-44l8 740v36c0 6 3 9 8 9l35 -5l80 -9c94 -13 170 -44 239 -88c8 -21 13 -44 13 -68c0 -22 -6 -39 -15 -50
+c0 0 -27 11 -27 16c3 15 5 28 5 37c0 21 -9 38 -30 50c-24 15 -69 29 -133 44l-117 12l3 -88h12c35 0 90 -13 164 -39c81 -29 129 -54 142 -75c3 -6 3 -13 3 -21c0 -12 -10 -66 -13 -66z" />
     <glyph glyph-name="uniEBAB" unicode="&#xebab;" horiz-adv-x="392" 
-d="M392 226v-3c0 -10 -4 -44 -9 -45c-4 0 -28 9 -31 9c1 8 5 25 5 31c0 14 -2 23 -8 27c-13 8 -47 27 -102 43c-68 20 -121 24 -159 24c-8 0 -17 -1 -27 -3c-1 -21 -9.38086 -128.922 -11 -166l-6 -144l-44 1l8 740c0.0429688 4.0127 0 8 0 13c0 0 -1 23 -1 24c0 6 3 9 12 9
-s31 -3 63 -10l87 -17c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 20 -128 38l-117 16l1 -82h15c37 0 90 -13 160 -38c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19
-c0 -11 -13 -55 -14 -62c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-11c-6 0 -8 -1 -8 -7c0 -14 1 -38 1 -50c0 -10 0 -18 -2 -25h10c44 0 98 -11 160 -36l105 -43c30 -11 45 -26 45 -51c0 -9 -4 -28 -11 -58h-1
-c-7 0 -25 9 -29 9c2 10 4 26 5 35c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2v-17v-65v-5c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -33c44.2412 -16.0879 67 -40 67 -79z" />
+d="M0 0l8 740v13s-1 23 -1 24c0 6 3 9 12 9s31 -3 63 -10l87 -17c73 -14 153 -38 200 -73c9 -21 14 -42 14 -63c0 -19 -6 -35 -15 -46c-5 3 -27 10 -27 16c0 10 4 20 4 27c0 22 -12 38 -34 50c-20 11 -62 20 -128 38l-117 16l1 -82h15c37 0 90 -13 160 -38
+c80 -29 127 -55 139 -76c3 -6 4 -12 4 -19c0 -11 -13 -55 -14 -62c-8 2 -30 9 -30 16c0 13 2 29 5 38c0 8 -2 13 -7 17c-4 4 -13 9 -27 13c-54 24 -162 60 -229 60h-11c-6 0 -8 -1 -8 -7c0 -14 1 -38 1 -50c0 -10 0 -18 -2 -25h10c44 0 98 -11 160 -36l105 -43
+c30 -11 45 -26 45 -51c0 -9 -4 -28 -11 -58h-1c-7 0 -25 9 -29 9c2 10 4 26 5 35c0 8 -2 13 -6 16c-15 9 -48 21 -99 39c-68 23 -120 34 -156 34c-11 0 -19 -1 -24 -2v-87c4 0 9 1 13 1c43 0 93 -10 151 -28l99 -33c44 -16 67 -40 67 -79v-3c0 -10 -4 -44 -9 -45
+c-4 0 -28 9 -31 9c1 8 5 25 5 31c0 14 -2 23 -8 27c-13 8 -47 27 -102 43c-68 20 -121 24 -159 24c-8 0 -17 -1 -27 -3c-1 -21 -9 -129 -11 -166l-6 -144z" />
     <glyph glyph-name="uniEBAC" unicode="&#xebac;" horiz-adv-x="381" 
-d="M52 538v-54v-6h10c41 0 90 -10 150 -32l103 -37c45 -12 66 -35 66 -73c0 -9 -2 -31 -5 -50c-2 -2 -4 -2 -6 -2c-4 0 -22 11 -27 11c1 9 3 26 3 32c0 14 -3 22 -8 25c-15 9 -52 21 -105 38c-68 22 -119 34 -158 34c-12 0 -20 -1 -24 -2l-1 -67c3 0 5 -7 7 -7
-c44 0 97 -1 158 -25l101 -40c44 -14 67 -41 67 -79c0 -10 -3 -24 -6 -42c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 3 16 3 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 4 -25 2c-1 -105 -2 -281 -4 -297l-44 1l3 826
-c0.0762817 21.0029 -2 27 13 27c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28.7328 9.03846 -28 16c2 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1
-c36 0 91 -12 164 -36c81 -27 128 -52 141 -73c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -14 1 -14 -8c0 -2 1 -7 2 -14c0 -6 -3 -14 -2 -19c1.76465 -8.8252 2 -18 -1 -29h9
-c44 0 96 -13 163 -40l117 -50c26.8054 -11.4553 40 -25 40 -47c-2 -16 -5 -45 -8 -63c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v40c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 0 -14 0 -20z" />
+d="M0 0l3 826v11c0 12 1 16 13 16c1 0 2 -1 3 -1c70 -8 138 -17 200 -34c66 -18 115 -40 148 -65c7 -18 11 -34 11 -48c0 -19 -5 -35 -15 -47c-5 2 -28 9 -28 16c0 19 6 32 6 36c0 16 -10 28 -31 37c-17 7 -61 18 -131 35l-115 11l-1 -64c4 0 8 1 12 1c36 0 91 -12 164 -36
+c81 -27 128 -52 141 -73c3 -7 4 -14 4 -21c0 -8 -11 -65 -13 -65c-10 0 -30 5 -30 13v3c4 11 6 20 6 29c0 14 -5 25 -15 31c-59 26 -191 73 -260 73c-13 0 -14 1 -14 -8c0 -2 1 -7 2 -14c0 -6 -3 -14 -2 -19c2 -9 2 -18 -1 -29h9c44 0 96 -13 163 -40l117 -50
+c27 -11 40 -25 40 -47c-2 -16 -5 -45 -8 -63c-2 -2 -4 -2 -6 -2c-9 0 -19 12 -26 12v40c-1 6 -3 11 -6 13c-19 11 -54 26 -105 44c-70 26 -124 39 -162 39c-9 0 -16 -1 -21 -2c-1 -7 0 -14 0 -20v-60h10c41 0 90 -10 150 -32l103 -37c45 -12 66 -35 66 -73
+c0 -9 -2 -31 -5 -50c-2 -2 -4 -2 -6 -2c-4 0 -22 11 -27 11c1 9 3 26 3 32c0 14 -3 22 -8 25c-15 9 -52 21 -105 38c-68 22 -119 34 -158 34c-12 0 -20 -1 -24 -2l-1 -67c3 0 5 -7 7 -7c44 0 97 -1 158 -25l101 -40c44 -14 67 -41 67 -79c0 -10 -3 -24 -6 -42
+c-3 -2 -5 -2 -7 -2c-4 0 -22 12 -25 12c1 8 3 16 3 22c0 14 -2 23 -8 26c-15 9 -50 21 -104 39c-71 23 -126 35 -163 35c-7 0 -16 4 -25 2c-1 -105 -2 -281 -4 -297z" />
     <glyph glyph-name="uniE24C" unicode="&#xe24c;" horiz-adv-x="274" 
 d="M251 484c4 19 4 34 4 49v11c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c37 -34 74 -75 97 -125zM247 -270c4 11 8 28 8 54c0 105 -80 173 -168 200c-11 3 -27 6 -47 9c9 -17 23 -61 53 -88c4 -3 -2 3 61 -56c35 -33 70 -72 93 -119
 zM276 -196c0 -58 -10 -86 -19 -97c12 -30 19 -63 19 -99c0 -32 -7 -65 -17 -96c11 -29 17 -60 17 -94c0 -71 -32 -148 -67 -190c-6 -5 -10 -7 -13 -7s-5 2 -5 5l4 10c1 3 6 8 11 16c32 48 49 100 49 149c0 89 -55 168 -168 203c-18 5 -47 9 -87 16v1330h22
@@ -1207,8 +1203,6 @@ d="M92 7c3 -5 -4 -8 -7 -4c-54 81 -70 151 -70 214c0 46 9 89 16 125c6 29 12 54 12
 c6 -30 11 -58 11 -83c0 -39 -13 -72 -56 -97c43 -25 56 -58 56 -97c0 -25 -5 -53 -11 -83c-7 -38 -16 -80 -16 -126c0 -55 12 -118 50 -187z" />
     <glyph glyph-name="uniE645" unicode="&#xe645;" horiz-adv-x="150" 
 d="M150 280l-130 -130l130 -130l-20 -20l-130 134l-130 -134l-20 20l130 130l-130 130l20 20l130 -130l130 130z" />
-    <glyph glyph-name="uniE0A5" unicode="&#xe0a5;" horiz-adv-x="314" 
- />
     <glyph glyph-name="uniE0A9" unicode="&#xe0a9;" horiz-adv-x="290" 
 d="M0 -110c0 4 1 8 5 11l119 99l-119 100c-3 3 -5 8 -5 12c0 6 5 13 12 13c3 0 6 -1 8 -2l124 -105l126 105c2 1 5 2 7 2c6 0 13 -6 13 -14c0 -4 -2 -9 -5 -11l-119 -100l119 -99c3 -3 5 -7 5 -12c0 -6 -5 -14 -13 -14c-2 0 -5 1 -7 3l-126 105l-124 -105c-2 -2 -4 -3 -7 -3
 c-8 0 -13 7 -13 15z" />
@@ -1704,5 +1698,8 @@ d="M-30 125h570v-250h-570v250z" />
 d="M0 -240v480c0 8 2 10 10 10h30c8 0 10 -2 10 -10v-115h450v-250h-450v-115c0 -8 -2 -10 -10 -10h-30c-8 0 -10 2 -10 10z" />
     <glyph glyph-name="uniE4F1" unicode="&#xe4f1;" horiz-adv-x="500" 
 d="M0 -125v250h450v115c0 8 2 10 10 10h30c8 0 10 -2 10 -10v-480c0 -8 -2 -10 -10 -10h-30c-8 0 -10 2 -10 10v115h-450z" />
+    <glyph glyph-name="uniEBA6" unicode="&#xeba6;" horiz-adv-x="92" 
+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" />
   </font>
 </defs></svg>
diff --git a/fonts/json/leipzig_metadata.json b/fonts/json/leipzig_metadata.json
index 584cd388cff..358b3ff0a93 100644
--- a/fonts/json/leipzig_metadata.json
+++ b/fonts/json/leipzig_metadata.json
@@ -1,5 +1,4 @@
 {
-    "_comment": "Automatically generated Metadata for the Leipzig font. Most (but not all) of these metadata come from the SMuFL specifications.",
     "engravingDefaults": {
         "arrowShaftThickness": 0.16,
         "barlineSeparation": 0.4,
@@ -31,7 +30,7 @@
         "tupletBracketThickness": 0.16
     },
     "fontName": "Leipzig",
-    "fontVersion": "5.2.64",
+    "fontVersion": "5.2.66",
     "glyphBBoxes": {
         "4stringTabClef": {
             "bBoxNE": [
@@ -113,6 +112,36 @@
                 -1.356
             ]
         },
+        "accidentalDoubleFlat": {
+            "bBoxNE": [
+                1.552,
+                1.876
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.7
+            ]
+        },
+        "accidentalDoubleSharp": {
+            "bBoxNE": [
+                1.028,
+                0.48
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.48
+            ]
+        },
+        "accidentalFlat": {
+            "bBoxNE": [
+                0.792,
+                1.876
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.7
+            ]
+        },
         "accidentalKomaFlat": {
             "bBoxNE": [
                 0.792,
@@ -153,6 +182,16 @@
                 -1.356
             ]
         },
+        "accidentalNatural": {
+            "bBoxNE": [
+                0.628,
+                1.404
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.404
+            ]
+        },
         "accidentalNaturalFlat": {
             "bBoxNE": [
                 1.512,
@@ -193,6 +232,26 @@
                 -1.0
             ]
         },
+        "accidentalQuarterToneFlatArrowUp": {
+            "bBoxNE": [
+                0.88,
+                2.408
+            ],
+            "bBoxSW": [
+                -0.172,
+                -0.736
+            ]
+        },
+        "accidentalQuarterToneFlatNaturalArrowDown": {
+            "bBoxNE": [
+                0.884,
+                1.508
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.94
+            ]
+        },
         "accidentalQuarterToneFlatStein": {
             "bBoxNE": [
                 0.792,
@@ -203,6 +262,26 @@
                 -0.7
             ]
         },
+        "accidentalQuarterToneSharpArrowDown": {
+            "bBoxNE": [
+                0.788,
+                1.528
+            ],
+            "bBoxSW": [
+                -0.1,
+                -1.892
+            ]
+        },
+        "accidentalQuarterToneSharpNaturalArrowUp": {
+            "bBoxNE": [
+                0.708,
+                1.94
+            ],
+            "bBoxSW": [
+                -0.184,
+                -1.508
+            ]
+        },
         "accidentalQuarterToneSharpStein": {
             "bBoxNE": [
                 0.424,
@@ -213,6 +292,16 @@
                 -1.356
             ]
         },
+        "accidentalSharp": {
+            "bBoxNE": [
+                0.788,
+                1.42
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.356
+            ]
+        },
         "accidentalSharpSharp": {
             "bBoxNE": [
                 1.648,
@@ -223,6 +312,16 @@
                 -1.356
             ]
         },
+        "accidentalThreeQuarterTonesFlatArrowDown": {
+            "bBoxNE": [
+                0.88,
+                1.976
+            ],
+            "bBoxSW": [
+                -0.184,
+                -1.416
+            ]
+        },
         "accidentalThreeQuarterTonesFlatZimmermann": {
             "bBoxNE": [
                 1.664,
@@ -233,6 +332,16 @@
                 -0.7
             ]
         },
+        "accidentalThreeQuarterTonesSharpArrowUp": {
+            "bBoxNE": [
+                0.788,
+                1.844
+            ],
+            "bBoxSW": [
+                -0.096,
+                -1.456
+            ]
+        },
         "accidentalThreeQuarterTonesSharpStein": {
             "bBoxNE": [
                 1.212,
@@ -263,6 +372,16 @@
                 -1.356
             ]
         },
+        "articAccentAbove": {
+            "bBoxNE": [
+                1.388,
+                0.944
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "articAccentBelow": {
             "bBoxNE": [
                 1.388,
@@ -273,6 +392,16 @@
                 -0.944
             ]
         },
+        "articAccentStaccatoAbove": {
+            "bBoxNE": [
+                1.388,
+                1.384
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "articAccentStaccatoBelow": {
             "bBoxNE": [
                 1.388,
@@ -303,6 +432,16 @@
                 -0.384
             ]
         },
+        "articMarcatoAbove": {
+            "bBoxNE": [
+                1.092,
+                1.06
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "articMarcatoBelow": {
             "bBoxNE": [
                 1.096,
@@ -313,6 +452,16 @@
                 -1.06
             ]
         },
+        "articMarcatoStaccatoAbove": {
+            "bBoxNE": [
+                1.092,
+                1.5
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "articMarcatoStaccatoBelow": {
             "bBoxNE": [
                 1.096,
@@ -363,6 +512,16 @@
                 -0.944
             ]
         },
+        "articStaccatissimoAbove": {
+            "bBoxNE": [
+                0.4422,
+                0.976
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "articStaccatissimoBelow": {
             "bBoxNE": [
                 0.4422,
@@ -413,6 +572,16 @@
                 -0.896
             ]
         },
+        "articStaccatoAbove": {
+            "bBoxNE": [
+                0.38,
+                0.376
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "articStaccatoBelow": {
             "bBoxNE": [
                 0.38,
@@ -443,6 +612,16 @@
                 -0.7781
             ]
         },
+        "articTenutoAbove": {
+            "bBoxNE": [
+                1.384,
+                0.144
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "articTenutoAccentAbove": {
             "bBoxNE": [
                 1.388,
@@ -473,6 +652,16 @@
                 -0.144
             ]
         },
+        "articTenutoStaccatoAbove": {
+            "bBoxNE": [
+                1.388,
+                0.692
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "articTenutoStaccatoBelow": {
             "bBoxNE": [
                 1.388,
@@ -503,6 +692,26 @@
                 -0.668
             ]
         },
+        "barlineDouble": {
+            "bBoxNE": [
+                0.704,
+                4.0
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "barlineFinal": {
+            "bBoxNE": [
+                1.052,
+                4.0
+            ],
+            "bBoxSW": [
+                0.004,
+                0.0
+            ]
+        },
         "barlineHeavy": {
             "bBoxNE": [
                 0.5,
@@ -523,6 +732,36 @@
                 0.0
             ]
         },
+        "barlineReverseFinal": {
+            "bBoxNE": [
+                1.052,
+                4.0
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "barlineShort": {
+            "bBoxNE": [
+                0.152,
+                4.0
+            ],
+            "bBoxSW": [
+                0.0,
+                2.0
+            ]
+        },
+        "barlineSingle": {
+            "bBoxNE": [
+                0.152,
+                4.0
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "barlineTick": {
             "bBoxNE": [
                 0.152,
@@ -533,6 +772,16 @@
                 3.0
             ]
         },
+        "brace": {
+            "bBoxNE": [
+                0.3709,
+                3.9954
+            ],
+            "bBoxSW": [
+                0.0004,
+                0.0046
+            ]
+        },
         "bracketBottom": {
             "bBoxNE": [
                 1.596,
@@ -583,6 +832,16 @@
                 0.0
             ]
         },
+        "breathMarkComma": {
+            "bBoxNE": [
+                0.72,
+                1.2
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "buzzRoll": {
             "bBoxNE": [
                 0.624,
@@ -593,6 +852,16 @@
                 -0.464
             ]
         },
+        "cClef": {
+            "bBoxNE": [
+                2.424,
+                2.008
+            ],
+            "bBoxSW": [
+                0.0,
+                -2.008
+            ]
+        },
         "cClef8vb": {
             "bBoxNE": [
                 2.424,
@@ -633,6 +902,16 @@
                 -2.008
             ]
         },
+        "chantCclef": {
+            "bBoxNE": [
+                0.724,
+                0.808
+            ],
+            "bBoxSW": [
+                -0.004,
+                -0.808
+            ]
+        },
         "chantCustosStemDownPosHigh": {
             "bBoxNE": [
                 0.256,
@@ -693,11 +972,21 @@
                 -0.384
             ]
         },
-        "clef15": {
+        "chantFclef": {
             "bBoxNE": [
-                0.92,
-                0.652
-            ],
+                0.724,
+                0.808
+            ],
+            "bBoxSW": [
+                -0.756,
+                -1.072
+            ]
+        },
+        "clef15": {
+            "bBoxNE": [
+                0.92,
+                0.652
+            ],
             "bBoxSW": [
                 0.0,
                 -0.008
@@ -713,6 +1002,16 @@
                 0.0
             ]
         },
+        "coda": {
+            "bBoxNE": [
+                2.148,
+                2.32
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.292
+            ]
+        },
         "codaSquare": {
             "bBoxNE": [
                 2.148,
@@ -723,6 +1022,26 @@
                 -0.292
             ]
         },
+        "daCapo": {
+            "bBoxNE": [
+                3.74,
+                1.624
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.088
+            ]
+        },
+        "dalSegno": {
+            "bBoxNE": [
+                3.44,
+                1.616
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.056
+            ]
+        },
         "dynamicFF": {
             "bBoxNE": [
                 2.22,
@@ -773,6 +1092,16 @@
                 -0.892
             ]
         },
+        "dynamicForte": {
+            "bBoxNE": [
+                1.22,
+                1.768
+            ],
+            "bBoxSW": [
+                -0.572,
+                -0.892
+            ]
+        },
         "dynamicFortePiano": {
             "bBoxNE": [
                 2.26,
@@ -813,6 +1142,16 @@
                 -0.668
             ]
         },
+        "dynamicMezzo": {
+            "bBoxNE": [
+                1.712,
+                1.048
+            ],
+            "bBoxSW": [
+                -0.176,
+                -0.072
+            ]
+        },
         "dynamicNiente": {
             "bBoxNE": [
                 1.252,
@@ -883,6 +1222,26 @@
                 -0.668
             ]
         },
+        "dynamicPiano": {
+            "bBoxNE": [
+                1.332,
+                1.052
+            ],
+            "bBoxSW": [
+                -0.196,
+                -0.668
+            ]
+        },
+        "dynamicRinforzando": {
+            "bBoxNE": [
+                0.9,
+                1.036
+            ],
+            "bBoxSW": [
+                -0.08,
+                0.0
+            ]
+        },
         "dynamicRinforzando1": {
             "bBoxNE": [
                 2.12,
@@ -903,6 +1262,16 @@
                 -0.892
             ]
         },
+        "dynamicSforzando": {
+            "bBoxNE": [
+                0.776,
+                1.08
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "dynamicSforzando1": {
             "bBoxNE": [
                 1.996,
@@ -963,6 +1332,26 @@
                 -0.892
             ]
         },
+        "dynamicZ": {
+            "bBoxNE": [
+                1.04,
+                0.996
+            ],
+            "bBoxSW": [
+                -0.144,
+                -0.064
+            ]
+        },
+        "fClef": {
+            "bBoxNE": [
+                2.792,
+                1.004
+            ],
+            "bBoxSW": [
+                0.016,
+                -2.324
+            ]
+        },
         "fClef15ma": {
             "bBoxNE": [
                 2.792,
@@ -983,6 +1372,26 @@
                 -3.02
             ]
         },
+        "fClef8va": {
+            "bBoxNE": [
+                2.792,
+                1.868
+            ],
+            "bBoxSW": [
+                0.016,
+                -2.324
+            ]
+        },
+        "fClef8vb": {
+            "bBoxNE": [
+                2.792,
+                1.004
+            ],
+            "bBoxSW": [
+                0.016,
+                -3.0
+            ]
+        },
         "fClefChange": {
             "bBoxNE": [
                 1.848,
@@ -1013,6 +1422,26 @@
                 -2.324
             ]
         },
+        "fermataAbove": {
+            "bBoxNE": [
+                2.42,
+                1.28
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.012
+            ]
+        },
+        "fermataBelow": {
+            "bBoxNE": [
+                2.42,
+                0.012
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.28
+            ]
+        },
         "fermataLongAbove": {
             "bBoxNE": [
                 3.156,
@@ -1263,6 +1692,16 @@
                 -2.28
             ]
         },
+        "flag128thUp": {
+            "bBoxNE": [
+                1.104,
+                2.28
+            ],
+            "bBoxSW": [
+                0.0,
+                -3.116
+            ]
+        },
         "flag16thDown": {
             "bBoxNE": [
                 1.104,
@@ -1273,6 +1712,16 @@
                 0.0
             ]
         },
+        "flag16thUp": {
+            "bBoxNE": [
+                1.104,
+                0.0
+            ],
+            "bBoxSW": [
+                0.0,
+                -3.116
+            ]
+        },
         "flag256thDown": {
             "bBoxNE": [
                 1.104,
@@ -1303,6 +1752,16 @@
                 -0.76
             ]
         },
+        "flag32ndUp": {
+            "bBoxNE": [
+                1.104,
+                0.76
+            ],
+            "bBoxSW": [
+                0.0,
+                -3.116
+            ]
+        },
         "flag512thDown": {
             "bBoxNE": [
                 1.108,
@@ -1333,6 +1792,16 @@
                 -1.52
             ]
         },
+        "flag64thUp": {
+            "bBoxNE": [
+                1.104,
+                1.52
+            ],
+            "bBoxSW": [
+                0.0,
+                -3.116
+            ]
+        },
         "flag8thDown": {
             "bBoxNE": [
                 1.104,
@@ -1343,6 +1812,26 @@
                 0.0
             ]
         },
+        "flag8thUp": {
+            "bBoxNE": [
+                1.104,
+                0.0
+            ],
+            "bBoxSW": [
+                0.0,
+                -2.776
+            ]
+        },
+        "gClef": {
+            "bBoxNE": [
+                2.584,
+                4.332
+            ],
+            "bBoxSW": [
+                -0.004,
+                -2.62
+            ]
+        },
         "gClef15ma": {
             "bBoxNE": [
                 2.6,
@@ -1363,6 +1852,26 @@
                 -3.572
             ]
         },
+        "gClef8va": {
+            "bBoxNE": [
+                2.584,
+                5.268
+            ],
+            "bBoxSW": [
+                -0.004,
+                -2.62
+            ]
+        },
+        "gClef8vb": {
+            "bBoxNE": [
+                2.584,
+                4.332
+            ],
+            "bBoxSW": [
+                -0.004,
+                -3.56
+            ]
+        },
         "gClef8vbCClef": {
             "bBoxNE": [
                 3.052,
@@ -1433,6 +1942,16 @@
                 0.0
             ]
         },
+        "keyboardPedalPed": {
+            "bBoxNE": [
+                2.78,
+                2.056
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "keyboardPedalS": {
             "bBoxNE": [
                 1.512,
@@ -1453,6 +1972,16 @@
                 -0.056
             ]
         },
+        "keyboardPedalUp": {
+            "bBoxNE": [
+                1.724,
+                1.672
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "leftRepeatSmall": {
             "bBoxNE": [
                 1.86,
@@ -1466,291 +1995,301 @@
         "luteDuration16th": {
             "bBoxNE": [
                 1.568,
-                2.544
+                3.144
             ],
             "bBoxSW": [
-                -0.0,
-                0.0
+                0.0,
+                -0.004
             ]
         },
         "luteDuration32nd": {
             "bBoxNE": [
                 1.544,
-                2.812
+                3.412
             ],
             "bBoxSW": [
-                0.004,
+                0.0,
                 -0.004
             ]
         },
         "luteDuration8th": {
             "bBoxNE": [
                 1.568,
-                2.524
+                3.124
             ],
             "bBoxSW": [
-                -0.0,
-                -0.0
+                0.0,
+                0.0
+            ]
+        },
+        "luteDurationDoubleWhole": {
+            "bBoxNE": [
+                0.368,
+                3.164
+            ],
+            "bBoxSW": [
+                -0.328,
+                0.0
             ]
         },
         "luteDurationHalf": {
             "bBoxNE": [
                 1.616,
-                2.58
+                3.18
             ],
             "bBoxSW": [
-                -0.0,
-                -0.004
+                -0.004,
+                0.0
             ]
         },
         "luteDurationQuarter": {
             "bBoxNE": [
                 1.56,
-                2.54
+                3.14
             ],
             "bBoxSW": [
-                -0.0,
-                -0.0
+                0.0,
+                0.0
             ]
         },
         "luteDurationWhole": {
             "bBoxNE": [
                 0.352,
-                2.564
+                3.164
             ],
             "bBoxSW": [
-                -0.328,
-                -0.0
+                0.0,
+                0.0
             ]
         },
         "luteFrenchFretA": {
             "bBoxNE": [
-                1.34,
-                0.924
+                1.116,
+                0.8112
             ],
             "bBoxSW": [
-                -0.0,
-                -0.04
+                -0.0024,
+                0.0
             ]
         },
         "luteFrenchFretB": {
             "bBoxNE": [
-                0.944,
-                1.5
+                0.9064,
+                1.2528
             ],
             "bBoxSW": [
-                -0.144,
-                -0.016
+                -0.004,
+                -0.0
             ]
         },
         "luteFrenchFretC": {
             "bBoxNE": [
-                0.892,
-                1.116
+                1.0088,
+                0.936
             ],
             "bBoxSW": [
-                -0.316,
-                0.0
+                0.0024,
+                0.0032
             ]
         },
         "luteFrenchFretD": {
             "bBoxNE": [
-                1.028,
-                1.48
+                1.6536,
+                1.2256
             ],
             "bBoxSW": [
-                -0.988,
-                -0.0
+                0.0008,
+                0.0016
             ]
         },
         "luteFrenchFretE": {
             "bBoxNE": [
-                0.888,
-                1.332
+                0.7504,
+                1.1056
             ],
             "bBoxSW": [
-                -0.0,
+                0.0,
                 0.0
             ]
         },
         "luteFrenchFretF": {
             "bBoxNE": [
-                1.016,
-                1.416
+                0.847,
+                1.42
             ],
             "bBoxSW": [
-                0.0,
-                -0.388
+                -0.0,
+                0.0
             ]
         },
         "luteFrenchFretG": {
             "bBoxNE": [
-                1.192,
-                0.768
+                1.284,
+                1.2776
             ],
             "bBoxSW": [
-                -0.364,
-                -0.78
+                -0.0008,
+                -0.0009
             ]
         },
         "luteFrenchFretH": {
             "bBoxNE": [
-                0.996,
-                1.408
+                1.156,
+                1.312
             ],
             "bBoxSW": [
-                -0.4,
-                -0.184
+                0.0,
+                -0.0
             ]
         },
         "luteFrenchFretI": {
             "bBoxNE": [
-                0.492,
-                1.272
+                0.608,
+                1.068
             ],
             "bBoxSW": [
-                -0.216,
-                -0.012
+                0.004,
+                0.0
             ]
         },
         "luteFrenchFretK": {
             "bBoxNE": [
-                0.748,
-                1.764
+                0.644,
+                1.42
             ],
             "bBoxSW": [
-                -0.004,
-                -0.008
+                0.0,
+                0.0
             ]
         },
         "luteFrenchFretL": {
             "bBoxNE": [
-                0.788,
-                1.692
+                0.932,
+                1.392
             ],
             "bBoxSW": [
-                -0.324,
+                0.004,
                 -0.0
             ]
         },
         "luteFrenchFretM": {
             "bBoxNE": [
-                2.156,
-                1.088
+                2.196,
+                0.9128
             ],
             "bBoxSW": [
-                -0.544,
-                -0.008
+                -0.004,
+                -0.004
             ]
         },
         "luteFrenchFretN": {
             "bBoxNE": [
-                1.224,
-                1.004
+                1.3656,
+                0.8424
             ],
             "bBoxSW": [
-                -0.432,
-                0.0
+                0.0008,
+                -0.0008
             ]
         },
         "luteItalianFret0": {
             "bBoxNE": [
-                0.88,
-                0.984
+                0.892,
+                0.996
             ],
             "bBoxSW": [
-                -0.0,
-                -0.0
+                -0.012,
+                -0.012
             ]
         },
         "luteItalianFret1": {
             "bBoxNE": [
-                0.6,
-                0.984
+                0.612,
+                0.996
             ],
             "bBoxSW": [
-                0.004,
-                -0.004
+                -0.0084,
+                -0.016
             ]
         },
         "luteItalianFret2": {
             "bBoxNE": [
-                0.664,
-                0.984
+                0.676,
+                0.996
             ],
             "bBoxSW": [
-                -0.0038,
-                0.0
+                -0.0156,
+                -0.012
             ]
         },
         "luteItalianFret3": {
             "bBoxNE": [
-                0.664,
-                0.984
+                0.676,
+                0.996
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                -0.012,
+                -0.012
             ]
         },
         "luteItalianFret4": {
             "bBoxNE": [
-                0.792,
-                0.984
+                0.804,
+                0.996
             ],
             "bBoxSW": [
-                -0.004,
-                0.0
+                -0.016,
+                -0.0121
             ]
         },
         "luteItalianFret5": {
             "bBoxNE": [
-                0.596,
-                1.004
+                0.608,
+                1.016
             ],
             "bBoxSW": [
-                -0.0,
-                -0.0
+                -0.012,
+                -0.012
             ]
         },
         "luteItalianFret6": {
             "bBoxNE": [
-                0.704,
-                0.984
+                0.716,
+                0.996
             ],
             "bBoxSW": [
-                0.0,
-                -0.0
+                -0.012,
+                -0.012
             ]
         },
         "luteItalianFret7": {
             "bBoxNE": [
-                0.648,
-                0.984
+                0.66,
+                0.996
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                -0.0121,
+                -0.012
             ]
         },
         "luteItalianFret8": {
             "bBoxNE": [
-                0.752,
-                0.984
+                0.764,
+                0.996
             ],
             "bBoxSW": [
-                -0.0,
-                0.0
+                -0.012,
+                -0.012
             ]
         },
         "luteItalianFret9": {
             "bBoxNE": [
-                0.716,
-                0.984
+                0.728,
+                0.996
             ],
             "bBoxSW": [
-                -0.0,
-                -0.0006
+                -0.012,
+                -0.0126
             ]
         },
         "medRenFlatHardB": {
@@ -1763,6 +2302,16 @@
                 -0.56
             ]
         },
+        "medRenFlatSoftB": {
+            "bBoxNE": [
+                0.868,
+                1.652
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.56
+            ]
+        },
         "medRenNatural": {
             "bBoxNE": [
                 0.408,
@@ -1773,6 +2322,16 @@
                 -1.016
             ]
         },
+        "medRenSharpCroix": {
+            "bBoxNE": [
+                1.168,
+                0.4963
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.4963
+            ]
+        },
         "mensuralCclefPetrucciPosHigh": {
             "bBoxNE": [
                 0.8263,
@@ -1943,6 +2502,26 @@
                 -0.768
             ]
         },
+        "mensuralNoteheadSemibrevisBlack": {
+            "bBoxNE": [
+                1.248,
+                0.776
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.768
+            ]
+        },
+        "mensuralNoteheadSemibrevisVoid": {
+            "bBoxNE": [
+                1.248,
+                0.776
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.768
+            ]
+        },
         "mensuralNoteheadSemiminimaWhite": {
             "bBoxNE": [
                 1.248,
@@ -1953,6 +2532,26 @@
                 -0.768
             ]
         },
+        "mensuralProlation1": {
+            "bBoxNE": [
+                1.92,
+                0.96
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.96
+            ]
+        },
+        "mensuralProlation10": {
+            "bBoxNE": [
+                1.92,
+                1.632
+            ],
+            "bBoxSW": [
+                0.12,
+                -1.632
+            ]
+        },
         "mensuralProlation11": {
             "bBoxNE": [
                 1.92,
@@ -1963,6 +2562,26 @@
                 -0.96
             ]
         },
+        "mensuralProlation2": {
+            "bBoxNE": [
+                1.92,
+                0.96
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.96
+            ]
+        },
+        "mensuralProlation3": {
+            "bBoxNE": [
+                1.92,
+                1.632
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.632
+            ]
+        },
         "mensuralProlation4": {
             "bBoxNE": [
                 1.92,
@@ -1973,6 +2592,36 @@
                 -1.632
             ]
         },
+        "mensuralProlation5": {
+            "bBoxNE": [
+                1.8,
+                0.96
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.96
+            ]
+        },
+        "mensuralProlation6": {
+            "bBoxNE": [
+                1.8,
+                0.96
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.96
+            ]
+        },
+        "mensuralProlation7": {
+            "bBoxNE": [
+                1.92,
+                0.96
+            ],
+            "bBoxSW": [
+                0.12,
+                -0.96
+            ]
+        },
         "mensuralProlation8": {
             "bBoxNE": [
                 1.8,
@@ -1983,6 +2632,16 @@
                 -1.632
             ]
         },
+        "mensuralProlation9": {
+            "bBoxNE": [
+                1.8,
+                1.632
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.632
+            ]
+        },
         "mensuralProlationCombiningDot": {
             "bBoxNE": [
                 0.504,
@@ -2093,6 +2752,16 @@
                 -1.064
             ]
         },
+        "mensuralRestBrevis": {
+            "bBoxNE": [
+                0.16,
+                1.0
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "mensuralRestFusa": {
             "bBoxNE": [
                 0.472,
@@ -2103,44 +2772,104 @@
                 0.0
             ]
         },
-        "mensuralRestMaxima": {
+        "mensuralRestLongaImperfecta": {
             "bBoxNE": [
-                0.52,
-                2.0
+                0.16,
+                1.0
             ],
             "bBoxSW": [
                 0.0,
-                -2.0
+                -1.0
             ]
         },
-        "mensuralRestSemifusa": {
+        "mensuralRestLongaPerfecta": {
             "bBoxNE": [
-                0.472,
-                0.56
+                0.16,
+                2.0
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -2.0
             ]
         },
-        "noteheadDiamondBlack": {
+        "mensuralRestMaxima": {
             "bBoxNE": [
-                1.256,
-                0.64
+                0.52,
+                2.0
             ],
             "bBoxSW": [
                 0.0,
-                -0.64
+                -2.0
             ]
         },
-        "noteheadDiamondBlackWide": {
+        "mensuralRestMinima": {
             "bBoxNE": [
-                1.4,
-                0.5
+                0.16,
+                0.56
             ],
             "bBoxSW": [
                 0.0,
-                -0.5
+                0.0
+            ]
+        },
+        "mensuralRestSemibrevis": {
+            "bBoxNE": [
+                0.16,
+                1.0
+            ],
+            "bBoxSW": [
+                0.0,
+                0.44
+            ]
+        },
+        "mensuralRestSemifusa": {
+            "bBoxNE": [
+                0.472,
+                0.56
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "mensuralRestSemiminima": {
+            "bBoxNE": [
+                0.472,
+                0.56
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "noteheadBlack": {
+            "bBoxNE": [
+                1.256,
+                0.532
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.532
+            ]
+        },
+        "noteheadDiamondBlack": {
+            "bBoxNE": [
+                1.256,
+                0.64
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.64
+            ]
+        },
+        "noteheadDiamondBlackWide": {
+            "bBoxNE": [
+                1.4,
+                0.5
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.5
             ]
         },
         "noteheadDiamondHalf": {
@@ -2203,6 +2932,16 @@
                 -0.68
             ]
         },
+        "noteheadHalf": {
+            "bBoxNE": [
+                1.256,
+                0.552
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.528
+            ]
+        },
         "noteheadHalfWithX": {
             "bBoxNE": [
                 1.256,
@@ -2233,6 +2972,26 @@
                 -0.96
             ]
         },
+        "noteheadPlusBlack": {
+            "bBoxNE": [
+                1.064,
+                0.532
+            ],
+            "bBoxSW": [
+                -0.004,
+                -0.532
+            ]
+        },
+        "noteheadSlashHorizontalEnds": {
+            "bBoxNE": [
+                1.84,
+                1.0
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.0
+            ]
+        },
         "noteheadSlashWhiteHalf": {
             "bBoxNE": [
                 2.94,
@@ -2303,6 +3062,16 @@
                 -0.532
             ]
         },
+        "noteheadXBlack": {
+            "bBoxNE": [
+                1.16,
+                0.5
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.5
+            ]
+        },
         "octaveParensLeft": {
             "bBoxNE": [
                 0.46,
@@ -2333,6 +3102,16 @@
                 -0.428
             ]
         },
+        "ornamentLeftVerticalStroke": {
+            "bBoxNE": [
+                0.12,
+                1.6
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "ornamentMordent": {
             "bBoxNE": [
                 2.344,
@@ -2623,6 +3402,56 @@
                 -0.004
             ]
         },
+        "ornamentTrill": {
+            "bBoxNE": [
+                1.728,
+                1.456
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "ornamentTurn": {
+            "bBoxNE": [
+                1.872,
+                0.976
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "ornamentTurnInverted": {
+            "bBoxNE": [
+                1.872,
+                0.976
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "ornamentTurnSlash": {
+            "bBoxNE": [
+                1.872,
+                1.276
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.324
+            ]
+        },
+        "ornamentTurnUp": {
+            "bBoxNE": [
+                0.976,
+                1.872
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "ornamentTurnUpS": {
             "bBoxNE": [
                 0.976,
@@ -2643,6 +3472,26 @@
                 0.0
             ]
         },
+        "ornamentZigZagLineNoRightEnd": {
+            "bBoxNE": [
+                1.224,
+                0.768
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "ornamentZigZagLineWithRightEnd": {
+            "bBoxNE": [
+                1.5,
+                0.768
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "ottava": {
             "bBoxNE": [
                 1.064,
@@ -2653,6 +3502,26 @@
                 0.004
             ]
         },
+        "ottavaAlta": {
+            "bBoxNE": [
+                2.628,
+                1.4
+            ],
+            "bBoxSW": [
+                0.0,
+                0.004
+            ]
+        },
+        "ottavaBassa": {
+            "bBoxNE": [
+                2.6,
+                1.328
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "ottavaBassaBa": {
             "bBoxNE": [
                 2.496,
@@ -2683,6 +3552,16 @@
                 0.0
             ]
         },
+        "pluckedDamp": {
+            "bBoxNE": [
+                1.32,
+                1.32
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "pluckedLeftHandPizzicato": {
             "bBoxNE": [
                 1.32,
@@ -2703,6 +3582,16 @@
                 0.0
             ]
         },
+        "pluckedSnapPizzicatoBelow": {
+            "bBoxNE": [
+                0.824,
+                1.064
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "quindicesima": {
             "bBoxNE": [
                 1.704,
@@ -2713,6 +3602,26 @@
                 -0.032
             ]
         },
+        "quindicesimaAlta": {
+            "bBoxNE": [
+                3.704,
+                1.308
+            ],
+            "bBoxSW": [
+                0.012,
+                -0.032
+            ]
+        },
+        "quindicesimaBassa": {
+            "bBoxNE": [
+                3.664,
+                1.284
+            ],
+            "bBoxSW": [
+                0.012,
+                -0.032
+            ]
+        },
         "quindicesimaBassaMb": {
             "bBoxNE": [
                 3.536,
@@ -2723,6 +3632,26 @@
                 -0.032
             ]
         },
+        "repeat1Bar": {
+            "bBoxNE": [
+                2.032,
+                0.968
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.968
+            ]
+        },
+        "repeat2Bars": {
+            "bBoxNE": [
+                3.0,
+                0.968
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.968
+            ]
+        },
         "repeat4Bars": {
             "bBoxNE": [
                 4.936,
@@ -2773,36 +3702,96 @@
                 -0.2
             ]
         },
-        "repeatRightLeft": {
+        "repeatDots": {
             "bBoxNE": [
-                3.124,
-                4.0
+                0.4,
+                2.7
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                1.3
             ]
         },
-        "rest1024th": {
+        "repeatLeft": {
             "bBoxNE": [
-                3.176,
-                4.576
+                1.812,
+                4.0
             ],
             "bBoxSW": [
-                -0.004,
-                -3.82
+                0.0,
+                0.0
             ]
         },
-        "rest256th": {
+        "repeatRight": {
             "bBoxNE": [
-                2.564,
-                2.708
+                1.812,
+                4.0
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "repeatRightLeft": {
+            "bBoxNE": [
+                3.124,
+                4.0
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "rest1024th": {
+            "bBoxNE": [
+                3.176,
+                4.576
+            ],
+            "bBoxSW": [
+                -0.004,
+                -3.82
+            ]
+        },
+        "rest128th": {
+            "bBoxNE": [
+                2.316,
+                2.708
+            ],
+            "bBoxSW": [
+                0.028,
+                -2.936
+            ]
+        },
+        "rest16th": {
+            "bBoxNE": [
+                1.3,
+                0.696
+            ],
+            "bBoxSW": [
+                0.004,
+                -1.968
+            ]
+        },
+        "rest256th": {
+            "bBoxNE": [
+                2.564,
+                2.708
             ],
             "bBoxSW": [
                 -0.004,
                 -3.82
             ]
         },
+        "rest32nd": {
+            "bBoxNE": [
+                1.596,
+                1.652
+            ],
+            "bBoxSW": [
+                0.004,
+                -1.94
+            ]
+        },
         "rest512th": {
             "bBoxNE": [
                 2.88,
@@ -2813,6 +3802,36 @@
                 -3.82
             ]
         },
+        "rest64th": {
+            "bBoxNE": [
+                1.92,
+                1.652
+            ],
+            "bBoxSW": [
+                0.008,
+                -2.872
+            ]
+        },
+        "rest8th": {
+            "bBoxNE": [
+                1.104,
+                0.732
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.0
+            ]
+        },
+        "restDoubleWhole": {
+            "bBoxNE": [
+                0.5,
+                1.0
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "restDoubleWholeLegerLine": {
             "bBoxNE": [
                 1.044,
@@ -2823,6 +3842,16 @@
                 -0.064
             ]
         },
+        "restHBar": {
+            "bBoxNE": [
+                3.0,
+                1.0
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.0
+            ]
+        },
         "restHBarLeft": {
             "bBoxNE": [
                 2.0,
@@ -2853,6 +3882,16 @@
                 -1.0
             ]
         },
+        "restHalf": {
+            "bBoxNE": [
+                1.2,
+                0.5
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "restHalfLegerLine": {
             "bBoxNE": [
                 1.744,
@@ -2883,6 +3922,16 @@
                 -1.0
             ]
         },
+        "restQuarter": {
+            "bBoxNE": [
+                1.22,
+                1.488
+            ],
+            "bBoxSW": [
+                -0.0,
+                -1.552
+            ]
+        },
         "restQuarterOld": {
             "bBoxNE": [
                 1.104,
@@ -2903,6 +3952,16 @@
                 -1.04
             ]
         },
+        "restWhole": {
+            "bBoxNE": [
+                1.2,
+                0.0
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.5
+            ]
+        },
         "restWholeLegerLine": {
             "bBoxNE": [
                 1.744,
@@ -2923,6 +3982,16 @@
                 0.5
             ]
         },
+        "segno": {
+            "bBoxNE": [
+                1.644,
+                2.052
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "segnoSerpent2": {
             "bBoxNE": [
                 1.8,
@@ -2933,6 +4002,16 @@
                 -0.136
             ]
         },
+        "stringsDownBow": {
+            "bBoxNE": [
+                1.24,
+                0.96
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "stringsDownBowTurned": {
             "bBoxNE": [
                 1.24,
@@ -2943,6 +4022,26 @@
                 0.0
             ]
         },
+        "stringsHarmonic": {
+            "bBoxNE": [
+                0.824,
+                0.824
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
+        "stringsUpBow": {
+            "bBoxNE": [
+                1.132,
+                1.352
+            ],
+            "bBoxSW": [
+                0.0,
+                0.0
+            ]
+        },
         "stringsUpBowTurned": {
             "bBoxNE": [
                 1.132,
@@ -3053,6 +4152,26 @@
                 -1.0
             ]
         },
+        "timeSigCommon": {
+            "bBoxNE": [
+                1.656,
+                1.004
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.996
+            ]
+        },
+        "timeSigCutCommon": {
+            "bBoxNE": [
+                1.668,
+                1.272
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.276
+            ]
+        },
         "timeSigEquals": {
             "bBoxNE": [
                 1.368,
@@ -3153,6 +4272,36 @@
                 -0.504
             ]
         },
+        "tremolo1": {
+            "bBoxNE": [
+                0.652,
+                0.5
+            ],
+            "bBoxSW": [
+                -0.652,
+                -0.496
+            ]
+        },
+        "tremolo2": {
+            "bBoxNE": [
+                0.652,
+                0.772
+            ],
+            "bBoxSW": [
+                -0.652,
+                -0.772
+            ]
+        },
+        "tremolo3": {
+            "bBoxNE": [
+                0.648,
+                1.032
+            ],
+            "bBoxSW": [
+                -0.648,
+                -1.032
+            ]
+        },
         "tremolo4": {
             "bBoxNE": [
                 0.648,
@@ -3283,1237 +4432,77 @@
                 0.2
             ]
         },
-        "uniE000": {
+        "unpitchedPercussionClef1": {
             "bBoxNE": [
-                0.3709,
-                3.9954
+                1.3,
+                1.0
             ],
             "bBoxSW": [
-                0.0004,
-                0.0046
+                0.0,
+                -1.0
             ]
         },
-        "uniE030": {
+        "unpitchedPercussionClef2": {
             "bBoxNE": [
-                0.152,
-                4.0
+                1.028,
+                1.58
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -1.584
             ]
         },
-        "uniE031": {
+        "ventiduesima": {
             "bBoxNE": [
-                0.704,
-                4.0
+                2.016,
+                1.244
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.06
             ]
         },
-        "uniE032": {
+        "ventiduesimaAlta": {
             "bBoxNE": [
-                1.052,
-                4.0
+                4.084,
+                1.268
             ],
             "bBoxSW": [
-                0.004,
-                0.0
+                0.0,
+                -0.06
             ]
         },
-        "uniE033": {
+        "ventiduesimaBassa": {
             "bBoxNE": [
-                1.052,
-                4.0
+                3.964,
+                1.244
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.06
             ]
         },
-        "uniE038": {
+        "ventiduesimaBassaMb": {
             "bBoxNE": [
-                0.152,
-                4.0
+                3.836,
+                1.244
             ],
             "bBoxSW": [
                 0.0,
-                2.0
+                -0.06
             ]
         },
-        "uniE040": {
+        "vocalSprechgesang": {
             "bBoxNE": [
-                1.812,
-                4.0
+                0.6,
+                1.2
             ],
             "bBoxSW": [
-                0.0,
+                -0.6,
                 0.0
             ]
         },
-        "uniE041": {
-            "bBoxNE": [
-                1.812,
-                4.0
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE043": {
-            "bBoxNE": [
-                0.4,
-                2.7
-            ],
-            "bBoxSW": [
-                0.0,
-                1.3
-            ]
-        },
-        "uniE045": {
-            "bBoxNE": [
-                3.44,
-                1.616
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.056
-            ]
-        },
-        "uniE046": {
-            "bBoxNE": [
-                3.74,
-                1.624
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.088
-            ]
-        },
-        "uniE047": {
-            "bBoxNE": [
-                1.644,
-                2.052
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE048": {
-            "bBoxNE": [
-                2.148,
-                2.32
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.292
-            ]
-        },
-        "uniE050": {
-            "bBoxNE": [
-                2.584,
-                4.332
-            ],
-            "bBoxSW": [
-                -0.004,
-                -2.62
-            ]
-        },
-        "uniE052": {
-            "bBoxNE": [
-                2.584,
-                4.332
-            ],
-            "bBoxSW": [
-                -0.004,
-                -3.56
-            ]
-        },
-        "uniE053": {
-            "bBoxNE": [
-                2.584,
-                5.268
-            ],
-            "bBoxSW": [
-                -0.004,
-                -2.62
-            ]
-        },
-        "uniE05C": {
-            "bBoxNE": [
-                2.424,
-                2.008
-            ],
-            "bBoxSW": [
-                0.0,
-                -2.008
-            ]
-        },
-        "uniE062": {
-            "bBoxNE": [
-                2.792,
-                1.004
-            ],
-            "bBoxSW": [
-                0.016,
-                -2.324
-            ]
-        },
-        "uniE064": {
-            "bBoxNE": [
-                2.792,
-                1.004
-            ],
-            "bBoxSW": [
-                0.016,
-                -3.0
-            ]
-        },
-        "uniE065": {
-            "bBoxNE": [
-                2.792,
-                1.868
-            ],
-            "bBoxSW": [
-                0.016,
-                -2.324
-            ]
-        },
-        "uniE069": {
-            "bBoxNE": [
-                1.3,
-                1.0
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.0
-            ]
-        },
-        "uniE06A": {
-            "bBoxNE": [
-                1.028,
-                1.58
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.584
-            ]
-        },
-        "uniE08A": {
-            "bBoxNE": [
-                1.656,
-                1.004
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.996
-            ]
-        },
-        "uniE08B": {
-            "bBoxNE": [
-                1.668,
-                1.272
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.276
-            ]
-        },
-        "uniE0A3": {
-            "bBoxNE": [
-                1.256,
-                0.552
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.528
-            ]
-        },
-        "uniE0A4": {
-            "bBoxNE": [
-                1.256,
-                0.532
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.532
-            ]
-        },
-        "uniE0A5": {
-            "bBoxNE": [
-                0.0,
-                0.0
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE0A9": {
-            "bBoxNE": [
-                1.16,
-                0.5
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.5
-            ]
-        },
-        "uniE0AF": {
-            "bBoxNE": [
-                1.064,
-                0.532
-            ],
-            "bBoxSW": [
-                -0.004,
-                -0.532
-            ]
-        },
-        "uniE101": {
-            "bBoxNE": [
-                1.84,
-                1.0
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.0
-            ]
-        },
-        "uniE220": {
-            "bBoxNE": [
-                0.652,
-                0.5
-            ],
-            "bBoxSW": [
-                -0.652,
-                -0.496
-            ]
-        },
-        "uniE221": {
-            "bBoxNE": [
-                0.652,
-                0.772
-            ],
-            "bBoxSW": [
-                -0.652,
-                -0.772
-            ]
-        },
-        "uniE222": {
-            "bBoxNE": [
-                0.648,
-                1.032
-            ],
-            "bBoxSW": [
-                -0.648,
-                -1.032
-            ]
-        },
-        "uniE240": {
-            "bBoxNE": [
-                1.104,
-                0.0
-            ],
-            "bBoxSW": [
-                0.0,
-                -2.776
-            ]
-        },
-        "uniE242": {
-            "bBoxNE": [
-                1.104,
-                0.0
-            ],
-            "bBoxSW": [
-                0.0,
-                -3.116
-            ]
-        },
-        "uniE244": {
-            "bBoxNE": [
-                1.104,
-                0.76
-            ],
-            "bBoxSW": [
-                0.0,
-                -3.116
-            ]
-        },
-        "uniE246": {
-            "bBoxNE": [
-                1.104,
-                1.52
-            ],
-            "bBoxSW": [
-                0.0,
-                -3.116
-            ]
-        },
-        "uniE248": {
-            "bBoxNE": [
-                1.104,
-                2.28
-            ],
-            "bBoxSW": [
-                0.0,
-                -3.116
-            ]
-        },
-        "uniE260": {
-            "bBoxNE": [
-                0.792,
-                1.876
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.7
-            ]
-        },
-        "uniE261": {
-            "bBoxNE": [
-                0.628,
-                1.404
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.404
-            ]
-        },
-        "uniE262": {
-            "bBoxNE": [
-                0.788,
-                1.42
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.356
-            ]
-        },
-        "uniE263": {
-            "bBoxNE": [
-                1.028,
-                0.48
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.48
-            ]
-        },
-        "uniE264": {
-            "bBoxNE": [
-                1.552,
-                1.876
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.7
-            ]
-        },
-        "uniE270": {
-            "bBoxNE": [
-                0.88,
-                2.408
-            ],
-            "bBoxSW": [
-                -0.172,
-                -0.736
-            ]
-        },
-        "uniE271": {
-            "bBoxNE": [
-                0.88,
-                1.976
-            ],
-            "bBoxSW": [
-                -0.184,
-                -1.416
-            ]
-        },
-        "uniE272": {
-            "bBoxNE": [
-                0.708,
-                1.94
-            ],
-            "bBoxSW": [
-                -0.184,
-                -1.508
-            ]
-        },
-        "uniE273": {
-            "bBoxNE": [
-                0.884,
-                1.508
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.94
-            ]
-        },
-        "uniE274": {
-            "bBoxNE": [
-                0.788,
-                1.844
-            ],
-            "bBoxSW": [
-                -0.096,
-                -1.456
-            ]
-        },
-        "uniE275": {
-            "bBoxNE": [
-                0.788,
-                1.528
-            ],
-            "bBoxSW": [
-                -0.1,
-                -1.892
-            ]
-        },
-        "uniE4A0": {
-            "bBoxNE": [
-                1.388,
-                0.944
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4A2": {
-            "bBoxNE": [
-                0.38,
-                0.376
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4A4": {
-            "bBoxNE": [
-                1.384,
-                0.144
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4A6": {
-            "bBoxNE": [
-                0.4422,
-                0.976
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4AC": {
-            "bBoxNE": [
-                1.092,
-                1.06
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4AE": {
-            "bBoxNE": [
-                1.092,
-                1.5
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4B0": {
-            "bBoxNE": [
-                1.388,
-                1.384
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4B2": {
-            "bBoxNE": [
-                1.388,
-                0.692
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4C0": {
-            "bBoxNE": [
-                2.42,
-                1.28
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.012
-            ]
-        },
-        "uniE4C1": {
-            "bBoxNE": [
-                2.42,
-                0.012
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.28
-            ]
-        },
-        "uniE4CE": {
-            "bBoxNE": [
-                0.72,
-                1.2
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4E2": {
-            "bBoxNE": [
-                0.5,
-                1.0
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4E3": {
-            "bBoxNE": [
-                1.2,
-                0.0
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.5
-            ]
-        },
-        "uniE4E4": {
-            "bBoxNE": [
-                1.2,
-                0.5
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE4E5": {
-            "bBoxNE": [
-                1.22,
-                1.488
-            ],
-            "bBoxSW": [
-                -0.0,
-                -1.552
-            ]
-        },
-        "uniE4E6": {
-            "bBoxNE": [
-                1.104,
-                0.732
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.0
-            ]
-        },
-        "uniE4E7": {
-            "bBoxNE": [
-                1.3,
-                0.696
-            ],
-            "bBoxSW": [
-                0.004,
-                -1.968
-            ]
-        },
-        "uniE4E8": {
-            "bBoxNE": [
-                1.596,
-                1.652
-            ],
-            "bBoxSW": [
-                0.004,
-                -1.94
-            ]
-        },
-        "uniE4E9": {
-            "bBoxNE": [
-                1.92,
-                1.652
-            ],
-            "bBoxSW": [
-                0.008,
-                -2.872
-            ]
-        },
-        "uniE4EA": {
-            "bBoxNE": [
-                2.316,
-                2.708
-            ],
-            "bBoxSW": [
-                0.028,
-                -2.936
-            ]
-        },
-        "uniE4EE": {
-            "bBoxNE": [
-                3.0,
-                1.0
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.0
-            ]
-        },
-        "uniE500": {
-            "bBoxNE": [
-                2.032,
-                0.968
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.968
-            ]
-        },
-        "uniE501": {
-            "bBoxNE": [
-                3.0,
-                0.968
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.968
-            ]
-        },
-        "uniE511": {
-            "bBoxNE": [
-                2.628,
-                1.4
-            ],
-            "bBoxSW": [
-                0.0,
-                0.004
-            ]
-        },
-        "uniE512": {
-            "bBoxNE": [
-                2.6,
-                1.328
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE515": {
-            "bBoxNE": [
-                3.704,
-                1.308
-            ],
-            "bBoxSW": [
-                0.012,
-                -0.032
-            ]
-        },
-        "uniE516": {
-            "bBoxNE": [
-                3.664,
-                1.284
-            ],
-            "bBoxSW": [
-                0.012,
-                -0.032
-            ]
-        },
-        "uniE520": {
-            "bBoxNE": [
-                1.332,
-                1.052
-            ],
-            "bBoxSW": [
-                -0.196,
-                -0.668
-            ]
-        },
-        "uniE521": {
-            "bBoxNE": [
-                1.712,
-                1.048
-            ],
-            "bBoxSW": [
-                -0.176,
-                -0.072
-            ]
-        },
-        "uniE522": {
-            "bBoxNE": [
-                1.22,
-                1.768
-            ],
-            "bBoxSW": [
-                -0.572,
-                -0.892
-            ]
-        },
-        "uniE523": {
-            "bBoxNE": [
-                0.9,
-                1.036
-            ],
-            "bBoxSW": [
-                -0.08,
-                0.0
-            ]
-        },
-        "uniE524": {
-            "bBoxNE": [
-                0.776,
-                1.08
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE525": {
-            "bBoxNE": [
-                1.04,
-                0.996
-            ],
-            "bBoxSW": [
-                -0.144,
-                -0.064
-            ]
-        },
-        "uniE566": {
-            "bBoxNE": [
-                1.728,
-                1.456
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE567": {
-            "bBoxNE": [
-                1.872,
-                0.976
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE568": {
-            "bBoxNE": [
-                1.872,
-                0.976
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE569": {
-            "bBoxNE": [
-                1.872,
-                1.276
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.324
-            ]
-        },
-        "uniE56A": {
-            "bBoxNE": [
-                0.976,
-                1.872
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE594": {
-            "bBoxNE": [
-                0.12,
-                1.6
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE59D": {
-            "bBoxNE": [
-                1.224,
-                0.768
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE59E": {
-            "bBoxNE": [
-                1.5,
-                0.768
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE610": {
-            "bBoxNE": [
-                1.24,
-                0.96
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE612": {
-            "bBoxNE": [
-                1.132,
-                1.352
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE614": {
-            "bBoxNE": [
-                0.824,
-                0.824
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE630": {
-            "bBoxNE": [
-                0.824,
-                1.064
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE638": {
-            "bBoxNE": [
-                1.32,
-                1.32
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE650": {
-            "bBoxNE": [
-                2.78,
-                2.056
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE655": {
-            "bBoxNE": [
-                1.724,
-                1.672
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE902": {
-            "bBoxNE": [
-                0.724,
-                0.808
-            ],
-            "bBoxSW": [
-                -0.756,
-                -1.072
-            ]
-        },
-        "uniE906": {
-            "bBoxNE": [
-                0.724,
-                0.808
-            ],
-            "bBoxSW": [
-                -0.004,
-                -0.808
-            ]
-        },
-        "uniE910": {
-            "bBoxNE": [
-                1.92,
-                0.96
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.96
-            ]
-        },
-        "uniE911": {
-            "bBoxNE": [
-                1.92,
-                0.96
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.96
-            ]
-        },
-        "uniE912": {
-            "bBoxNE": [
-                1.92,
-                1.632
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.632
-            ]
-        },
-        "uniE914": {
-            "bBoxNE": [
-                1.8,
-                0.96
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.96
-            ]
-        },
-        "uniE915": {
-            "bBoxNE": [
-                1.8,
-                0.96
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.96
-            ]
-        },
-        "uniE916": {
-            "bBoxNE": [
-                1.92,
-                0.96
-            ],
-            "bBoxSW": [
-                0.12,
-                -0.96
-            ]
-        },
-        "uniE918": {
-            "bBoxNE": [
-                1.8,
-                1.632
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.632
-            ]
-        },
-        "uniE919": {
-            "bBoxNE": [
-                1.92,
-                1.632
-            ],
-            "bBoxSW": [
-                0.12,
-                -1.632
-            ]
-        },
-        "uniE938": {
-            "bBoxNE": [
-                1.248,
-                0.776
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.768
-            ]
-        },
-        "uniE939": {
-            "bBoxNE": [
-                1.248,
-                0.776
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.768
-            ]
-        },
-        "uniE9E0": {
-            "bBoxNE": [
-                0.868,
-                1.652
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.56
-            ]
-        },
-        "uniE9E3": {
-            "bBoxNE": [
-                1.168,
-                0.4963
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.4963
-            ]
-        },
-        "uniE9F1": {
-            "bBoxNE": [
-                0.16,
-                2.0
-            ],
-            "bBoxSW": [
-                0.0,
-                -2.0
-            ]
-        },
-        "uniE9F2": {
-            "bBoxNE": [
-                0.16,
-                1.0
-            ],
-            "bBoxSW": [
-                0.0,
-                -1.0
-            ]
-        },
-        "uniE9F3": {
-            "bBoxNE": [
-                0.16,
-                1.0
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE9F4": {
-            "bBoxNE": [
-                0.16,
-                1.0
-            ],
-            "bBoxSW": [
-                0.0,
-                0.44
-            ]
-        },
-        "uniE9F5": {
-            "bBoxNE": [
-                0.16,
-                0.56
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE9F6": {
-            "bBoxNE": [
-                0.472,
-                0.56
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "uniE9F9": {
-            "bBoxNE": [
-                0.0,
-                0.0
-            ],
-            "bBoxSW": [
-                0.0,
-                0.0
-            ]
-        },
-        "ventiduesima": {
-            "bBoxNE": [
-                2.016,
-                1.244
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.06
-            ]
-        },
-        "ventiduesimaAlta": {
-            "bBoxNE": [
-                4.084,
-                1.268
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.06
-            ]
-        },
-        "ventiduesimaBassa": {
-            "bBoxNE": [
-                3.964,
-                1.244
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.06
-            ]
-        },
-        "ventiduesimaBassaMb": {
-            "bBoxNE": [
-                3.836,
-                1.244
-            ],
-            "bBoxSW": [
-                0.0,
-                -0.06
-            ]
-        },
-        "vocalSprechgesang": {
-            "bBoxNE": [
-                0.6,
-                1.2
-            ],
-            "bBoxSW": [
-                -0.6,
-                0.0
-            ]
-        },
-        "wiggleArpeggiatoDown": {
+        "wiggleArpeggiatoDown": {
             "bBoxNE": [
                 0.8174,
                 0.448
@@ -4631,6 +4620,26 @@
                 -0.82
             ]
         },
+        "accidentalDoubleFlat": {
+            "cutOutNE": [
+                0.856,
+                0.56
+            ],
+            "cutOutSE": [
+                1.232,
+                -0.3
+            ]
+        },
+        "accidentalFlat": {
+            "cutOutNE": [
+                0.096,
+                0.564
+            ],
+            "cutOutSE": [
+                0.432,
+                -0.344
+            ]
+        },
         "accidentalKomaFlat": {
             "cutOutNW": [
                 0.7,
@@ -4687,6 +4696,16 @@
                 -0.812
             ]
         },
+        "accidentalNatural": {
+            "cutOutNE": [
+                0.08,
+                0.736
+            ],
+            "cutOutSW": [
+                0.548,
+                -0.76
+            ]
+        },
         "accidentalNaturalFlat": {
             "cutOutNE": [
                 0.816,
@@ -4715,14 +4734,58 @@
                 -0.772
             ]
         },
+        "accidentalQuarterToneFlatArrowUp": {
+            "cutOutNE": [
+                0.564,
+                0.572
+            ],
+            "cutOutSE": [
+                0.504,
+                -0.364
+            ]
+        },
+        "accidentalQuarterToneFlatNaturalArrowDown": {
+            "cutOutNE": [
+                0.08,
+                0.772
+            ],
+            "cutOutSW": [
+                0.268,
+                -0.828
+            ]
+        },
         "accidentalQuarterToneFlatStein": {
             "cutOutNW": [
                 0.7,
                 0.584
             ],
             "cutOutSW": [
-                0.368,
-                -0.332
+                0.368,
+                -0.332
+            ]
+        },
+        "accidentalQuarterToneSharpArrowDown": {
+            "cutOutNE": [
+                0.624,
+                0.864
+            ],
+            "cutOutNW": [
+                0.16,
+                0.696
+            ],
+            "cutOutSE": [
+                0.62,
+                -0.684
+            ]
+        },
+        "accidentalQuarterToneSharpNaturalArrowUp": {
+            "cutOutNE": [
+                0.468,
+                0.784
+            ],
+            "cutOutSW": [
+                0.632,
+                -0.828
             ]
         },
         "accidentalQuarterToneSharpStein": {
@@ -4743,6 +4806,24 @@
                 -0.812
             ]
         },
+        "accidentalSharp": {
+            "cutOutNE": [
+                0.624,
+                0.844
+            ],
+            "cutOutNW": [
+                0.16,
+                0.644
+            ],
+            "cutOutSE": [
+                0.624,
+                -0.64
+            ],
+            "cutOutSW": [
+                0.16,
+                -0.82
+            ]
+        },
         "accidentalSharpSharp": {
             "cutOutNE": [
                 1.48,
@@ -4761,6 +4842,16 @@
                 -0.82
             ]
         },
+        "accidentalThreeQuarterTonesFlatArrowDown": {
+            "cutOutNE": [
+                0.188,
+                0.58
+            ],
+            "cutOutSE": [
+                0.588,
+                -0.272
+            ]
+        },
         "accidentalThreeQuarterTonesFlatZimmermann": {
             "cutOutNE": [
                 0.972,
@@ -4779,6 +4870,20 @@
                 -0.32
             ]
         },
+        "accidentalThreeQuarterTonesSharpArrowUp": {
+            "cutOutNE": [
+                0.62,
+                0.88
+            ],
+            "cutOutSE": [
+                0.624,
+                -0.688
+            ],
+            "cutOutSW": [
+                0.164,
+                -0.872
+            ]
+        },
         "accidentalThreeQuarterTonesSharpStein": {
             "cutOutNE": [
                 1.052,
@@ -4825,6 +4930,24 @@
                 -0.5
             ]
         },
+        "noteheadBlack": {
+            "cutOutNW": [
+                0.144,
+                0.24
+            ],
+            "cutOutSE": [
+                1.088,
+                -0.244
+            ],
+            "stemDownNW": [
+                -0.0,
+                -0.156
+            ],
+            "stemUpSE": [
+                1.256,
+                0.156
+            ]
+        },
         "noteheadDiamondBlack": {
             "stemDownNW": [
                 0.0,
@@ -4885,6 +5008,24 @@
                 -0.0
             ]
         },
+        "noteheadHalf": {
+            "cutOutNW": [
+                0.14,
+                0.24
+            ],
+            "cutOutSE": [
+                1.076,
+                -0.24
+            ],
+            "stemDownNW": [
+                0.0,
+                -0.144
+            ],
+            "stemUpSE": [
+                1.256,
+                0.164
+            ]
+        },
         "noteheadHalfWithX": {
             "cutOutNW": [
                 0.14,
@@ -4903,6 +5044,26 @@
                 0.164
             ]
         },
+        "noteheadPlusBlack": {
+            "stemDownNW": [
+                0.0,
+                0.0
+            ],
+            "stemUpSE": [
+                1.064,
+                0.0
+            ]
+        },
+        "noteheadSlashHorizontalEnds": {
+            "stemDownNW": [
+                0.0,
+                -1.0
+            ],
+            "stemUpSE": [
+                1.84,
+                1.0
+            ]
+        },
         "noteheadSlashWhiteHalf": {
             "stemDownNW": [
                 0.0,
@@ -4989,43 +5150,7 @@
                 0.0
             ]
         },
-        "uniE0A3": {
-            "cutOutNW": [
-                0.14,
-                0.24
-            ],
-            "cutOutSE": [
-                1.076,
-                -0.24
-            ],
-            "stemDownNW": [
-                0.0,
-                -0.144
-            ],
-            "stemUpSE": [
-                1.256,
-                0.164
-            ]
-        },
-        "uniE0A4": {
-            "cutOutNW": [
-                0.144,
-                0.24
-            ],
-            "cutOutSE": [
-                1.088,
-                -0.244
-            ],
-            "stemDownNW": [
-                -0.0,
-                -0.156
-            ],
-            "stemUpSE": [
-                1.256,
-                0.156
-            ]
-        },
-        "uniE0A9": {
+        "noteheadXBlack": {
             "stemDownNW": [
                 0.0,
                 -0.44
@@ -5034,142 +5159,6 @@
                 1.16,
                 0.444
             ]
-        },
-        "uniE0AF": {
-            "stemDownNW": [
-                0.0,
-                0.0
-            ],
-            "stemUpSE": [
-                1.064,
-                0.0
-            ]
-        },
-        "uniE101": {
-            "stemDownNW": [
-                0.0,
-                -1.0
-            ],
-            "stemUpSE": [
-                1.84,
-                1.0
-            ]
-        },
-        "uniE260": {
-            "cutOutNE": [
-                0.096,
-                0.564
-            ],
-            "cutOutSE": [
-                0.432,
-                -0.344
-            ]
-        },
-        "uniE261": {
-            "cutOutNE": [
-                0.08,
-                0.736
-            ],
-            "cutOutSW": [
-                0.548,
-                -0.76
-            ]
-        },
-        "uniE262": {
-            "cutOutNE": [
-                0.624,
-                0.844
-            ],
-            "cutOutNW": [
-                0.16,
-                0.644
-            ],
-            "cutOutSE": [
-                0.624,
-                -0.64
-            ],
-            "cutOutSW": [
-                0.16,
-                -0.82
-            ]
-        },
-        "uniE264": {
-            "cutOutNE": [
-                0.856,
-                0.56
-            ],
-            "cutOutSE": [
-                1.232,
-                -0.3
-            ]
-        },
-        "uniE270": {
-            "cutOutNE": [
-                0.564,
-                0.572
-            ],
-            "cutOutSE": [
-                0.504,
-                -0.364
-            ]
-        },
-        "uniE271": {
-            "cutOutNE": [
-                0.188,
-                0.58
-            ],
-            "cutOutSE": [
-                0.588,
-                -0.272
-            ]
-        },
-        "uniE272": {
-            "cutOutNE": [
-                0.468,
-                0.784
-            ],
-            "cutOutSW": [
-                0.632,
-                -0.828
-            ]
-        },
-        "uniE273": {
-            "cutOutNE": [
-                0.08,
-                0.772
-            ],
-            "cutOutSW": [
-                0.268,
-                -0.828
-            ]
-        },
-        "uniE274": {
-            "cutOutNE": [
-                0.62,
-                0.88
-            ],
-            "cutOutSE": [
-                0.624,
-                -0.688
-            ],
-            "cutOutSW": [
-                0.164,
-                -0.872
-            ]
-        },
-        "uniE275": {
-            "cutOutNE": [
-                0.624,
-                0.864
-            ],
-            "cutOutNW": [
-                0.16,
-                0.696
-            ],
-            "cutOutSE": [
-                0.62,
-                -0.684
-            ]
         }
     }
 }
\ No newline at end of file

From 0d14795a6befd821a013f47f699bd7ade05807fe Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Wed, 26 Jan 2022 12:49:44 +0100
Subject: [PATCH 145/403] use double

---
 src/iomei.cpp   | 2 +-
 src/options.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/iomei.cpp b/src/iomei.cpp
index f0d770ab87b..ecc2dcfad61 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -3662,7 +3662,7 @@ bool MEIInput::ReadPage(Object *parent, pugi::xml_node page)
         page.remove_attribute("surface");
     }
     if (page.attribute("ppu")) {
-        vrvPage->m_PPUFactor = page.attribute("ppu").as_float();
+        vrvPage->m_PPUFactor = page.attribute("ppu").as_double();
     }
 
     parent->AddChild(vrvPage);
diff --git a/src/options.cpp b/src/options.cpp
index 5fb3ad9042e..caa33e8fec9 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -240,7 +240,7 @@ void OptionDbl::Init(double defaultValue, double minValue, double maxValue)
 
 bool OptionDbl::SetValue(const std::string &value)
 {
-    return SetValue(std::stof(value));
+    return SetValue(std::stod(value));
 }
 
 std::string OptionDbl::GetStrValue() const

From 18c70f22868f88f04523f57f78883f32263dde7d Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Wed, 26 Jan 2022 13:46:27 +0100
Subject: [PATCH 146/403] change to float

---
 src/vrv.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vrv.cpp b/src/vrv.cpp
index ec97b2f6aad..78e1e1b4322 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -229,7 +229,7 @@ bool Resources::LoadFont(const std::string &fontName)
                     smuflCode, unitsPerEm);
                 continue;
             }
-            double x = 0.0, y = 0.0, width = 0.0, height = 0.0;
+            float x = 0.0, y = 0.0, width = 0.0, height = 0.0;
             // Not check for missing values...
             if (current.attribute("x")) x = current.attribute("x").as_float();
             if (current.attribute("y")) y = current.attribute("y").as_float();
@@ -285,7 +285,7 @@ bool Resources::InitTextFont(const std::string &fontName, const StyleAttributes
             // We create a glyph with only the units per em which is the only info we need for
             // the bounding boxes; path and codeStr will remain [unset]
             Glyph glyph(unitsPerEm);
-            double x = 0.0, y = 0.0, width = 0.0, height = 0.0;
+            float x = 0.0, y = 0.0, width = 0.0, height = 0.0;
             // Not check for missing values...
             if (current.attribute("x")) x = current.attribute("x").as_float();
             if (current.attribute("y")) y = current.attribute("y").as_float();

From 026f23f271245123b6d73bc83b46a4a9d8829b8e Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 26 Jan 2022 18:15:06 +0100
Subject: [PATCH 147/403] Refine calculation of end points

for slurs starting at a single grace note
---
 src/slur.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/slur.cpp b/src/slur.cpp
index 5aca94d57ce..3c0f40611c4 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -1025,13 +1025,11 @@ std::pair<Point, Point> Slur::AdjustCoordinates(
                         x2 += 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
                     }
                 }
-                else if ((end->GetContentTop() >= start->GetContentTop())
-                    && (end->GetContentBottom() <= start->GetContentTop())) {
-                    y2 = end->GetDrawingY() + unit * 3;
-                }
                 else {
-                    y2 = end->GetDrawingTop(doc, staff->m_drawingStaffSize);
-                    x2 += endRadius - doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                    const int yMin = y1 - unit * 4;
+                    const int yTop = end->GetDrawingTop(doc, staff->m_drawingStaffSize);
+                    y2 = std::max(end->GetDrawingY() + unit * 2, yMin);
+                    y2 = std::min(yTop - unit, y2);
                 }
             }
             // portato slurs
@@ -1084,7 +1082,15 @@ std::pair<Point, Point> Slur::AdjustCoordinates(
                     }
                 }
                 else {
-                    x2 -= endRadius + 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                    const int yMax = y1 + unit;
+                    const int yBottom = end->GetDrawingBottom(doc, staff->m_drawingStaffSize);
+                    y2 = std::min(end->GetDrawingY(), yMax);
+                    if (y2 < yBottom + unit) {
+                        y2 = yBottom + unit;
+                    }
+                    else {
+                        x2 -= endRadius + 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                    }
                 }
             }
             // portato slurs

From c73047decf67b181f7d7e50ca7b64b82694da857 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 27 Jan 2022 11:46:28 +0100
Subject: [PATCH 148/403] Remove unused params

---
 include/vrv/functorparams.h | 11 ++++-------
 src/measure.cpp             |  8 ++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 307c0111b8e..bb3be7025e6 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -988,9 +988,10 @@ class CalcDotsParams : public FunctorParams {
 //----------------------------------------------------------------------------
 
 /**
- * member 0: std::vector<double>: a stack of maximum duration filled by the functor
- * member 1: double: the duration of the current measure
- * member 2: the current bpm
+ * member 0: the current score time
+ * member 1: the current time in seconds
+ * member 2: the current tempo
+ * member 3: the tempo adjustment
  **/
 
 class CalcMaxMeasureDurationParams : public FunctorParams {
@@ -999,15 +1000,11 @@ class CalcMaxMeasureDurationParams : public FunctorParams {
     {
         m_currentScoreTime = 0.0;
         m_currentRealTimeSeconds = 0.0;
-        m_maxCurrentScoreTime = 0.0;
-        m_maxCurrentRealTimeSeconds = 0.0;
         m_currentTempo = 120.0;
         m_tempoAdjustment = 1.0;
     }
     double m_currentScoreTime;
     double m_currentRealTimeSeconds;
-    double m_maxCurrentScoreTime;
-    double m_maxCurrentRealTimeSeconds;
     double m_currentTempo;
     double m_tempoAdjustment;
 };
diff --git a/src/measure.cpp b/src/measure.cpp
index a18ffca3372..e2dcbd37277 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -1562,8 +1562,8 @@ int Measure::CalcMaxMeasureDuration(FunctorParams *functorParams)
     assert(params);
 
     m_scoreTimeOffset.clear();
-    m_scoreTimeOffset.push_back(params->m_maxCurrentScoreTime);
-    params->m_maxCurrentScoreTime += m_measureAligner.GetRightAlignment()->GetTime() * DURATION_4 / DUR_MAX;
+    m_scoreTimeOffset.push_back(params->m_currentScoreTime);
+    params->m_currentScoreTime += m_measureAligner.GetRightAlignment()->GetTime() * DURATION_4 / DUR_MAX;
 
     // search for tempo marks in the measure
     Tempo *tempo = dynamic_cast<Tempo *>(this->FindDescendantByType(TEMPO));
@@ -1585,8 +1585,8 @@ int Measure::CalcMaxMeasureDuration(FunctorParams *functorParams)
 
     m_realTimeOffsetMilliseconds.clear();
     // m_realTimeOffsetMilliseconds.push_back(int(params->m_maxCurrentRealTimeSeconds * 1000.0 + 0.5));
-    m_realTimeOffsetMilliseconds.push_back(params->m_maxCurrentRealTimeSeconds * 1000.0);
-    params->m_maxCurrentRealTimeSeconds
+    m_realTimeOffsetMilliseconds.push_back(params->m_currentRealTimeSeconds * 1000.0);
+    params->m_currentRealTimeSeconds
         += (m_measureAligner.GetRightAlignment()->GetTime() * DURATION_4 / DUR_MAX) * 60.0 / m_currentTempo;
 
     return FUNCTOR_CONTINUE;

From c55223e94cddc08b9be7ab44961b4c5a5241eb6f Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 27 Jan 2022 13:25:43 +0100
Subject: [PATCH 149/403] Include multi rest factor

---
 include/vrv/functorparams.h |  3 +++
 include/vrv/layerelement.h  |  5 +++++
 include/vrv/measure.h       |  3 +++
 include/vrv/object.h        |  3 ++-
 src/doc.cpp                 |  3 ++-
 src/layerelement.cpp        | 14 ++++++++++++++
 src/measure.cpp             | 17 ++++++++++++++---
 7 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index bb3be7025e6..35998d0e533 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -992,6 +992,7 @@ class CalcDotsParams : public FunctorParams {
  * member 1: the current time in seconds
  * member 2: the current tempo
  * member 3: the tempo adjustment
+ * member 4: factor for multibar rests
  **/
 
 class CalcMaxMeasureDurationParams : public FunctorParams {
@@ -1002,11 +1003,13 @@ class CalcMaxMeasureDurationParams : public FunctorParams {
         m_currentRealTimeSeconds = 0.0;
         m_currentTempo = 120.0;
         m_tempoAdjustment = 1.0;
+        m_multiRestFactor = 1;
     }
     double m_currentScoreTime;
     double m_currentRealTimeSeconds;
     double m_currentTempo;
     double m_tempoAdjustment;
+    int m_multiRestFactor;
 };
 
 //----------------------------------------------------------------------------
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 94a8cc5ea7f..36bf469b38e 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -391,6 +391,11 @@ class LayerElement : public Object,
      */
     int GenerateTimemap(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::CalcMaxMeasureDuration
+     */
+    int CalcMaxMeasureDuration(FunctorParams *functorParams) override;
+
     /**
      * See Object::ResetDrawing
      */
diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index ab17c80da87..d1ae1e067ef 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -458,7 +458,10 @@ class Measure : public Object,
     /**
      * See Object::CalcMaxMeasureDuration
      */
+    ///@{
     int CalcMaxMeasureDuration(FunctorParams *functorParams) override;
+    int CalcMaxMeasureDurationEnd(FunctorParams *functorParams) override;
+    ///@}
 
     /**
      * See Object::CalcOnsetOffset
diff --git a/include/vrv/object.h b/include/vrv/object.h
index e6a03d3aaae..e1526da1a21 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -1289,8 +1289,9 @@ class Object : public BoundingBox {
     /**
      * Calculate the maximum duration of each measure.
      */
+    ///@{
     virtual int CalcMaxMeasureDuration(FunctorParams *) { return FUNCTOR_CONTINUE; }
-
+    virtual int CalcMaxMeasureDurationEnd(FunctorParams *) { return FUNCTOR_CONTINUE; }
     ///@}
 
     /**
diff --git a/src/doc.cpp b/src/doc.cpp
index f266071b504..7ff5ed17d43 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -274,7 +274,8 @@ void Doc::CalculateMidiTimemap()
     calcMaxMeasureDurationParams.m_currentTempo = tempo;
     calcMaxMeasureDurationParams.m_tempoAdjustment = m_options->m_midiTempoAdjustment.GetValue();
     Functor calcMaxMeasureDuration(&Object::CalcMaxMeasureDuration);
-    this->Process(&calcMaxMeasureDuration, &calcMaxMeasureDurationParams);
+    Functor calcMaxMeasureDurationEnd(&Object::CalcMaxMeasureDurationEnd);
+    this->Process(&calcMaxMeasureDuration, &calcMaxMeasureDurationParams, &calcMaxMeasureDurationEnd);
 
     // Then calculate the onset and offset times (w.r.t. the measure) for every note
     CalcOnsetOffsetParams calcOnsetOffsetParams;
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index e1fdc978a16..e11b050a2b3 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -2514,6 +2514,20 @@ int LayerElement::GenerateTimemap(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int LayerElement::CalcMaxMeasureDuration(FunctorParams *functorParams)
+{
+    CalcMaxMeasureDurationParams *params = vrv_params_cast<CalcMaxMeasureDurationParams *>(functorParams);
+    assert(params);
+
+    if (this->Is(MULTIREST)) {
+        MultiRest *multiRest = vrv_cast<MultiRest *>(this);
+        assert(multiRest);
+        params->m_multiRestFactor = multiRest->GetNum();
+    }
+
+    return FUNCTOR_SIBLINGS;
+}
+
 int LayerElement::ResetDrawing(FunctorParams *functorParams)
 {
     m_drawingCueSize = false;
diff --git a/src/measure.cpp b/src/measure.cpp
index e2dcbd37277..1d2e0142faf 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -1563,7 +1563,6 @@ int Measure::CalcMaxMeasureDuration(FunctorParams *functorParams)
 
     m_scoreTimeOffset.clear();
     m_scoreTimeOffset.push_back(params->m_currentScoreTime);
-    params->m_currentScoreTime += m_measureAligner.GetRightAlignment()->GetTime() * DURATION_4 / DUR_MAX;
 
     // search for tempo marks in the measure
     Tempo *tempo = dynamic_cast<Tempo *>(this->FindDescendantByType(TEMPO));
@@ -1586,8 +1585,20 @@ int Measure::CalcMaxMeasureDuration(FunctorParams *functorParams)
     m_realTimeOffsetMilliseconds.clear();
     // m_realTimeOffsetMilliseconds.push_back(int(params->m_maxCurrentRealTimeSeconds * 1000.0 + 0.5));
     m_realTimeOffsetMilliseconds.push_back(params->m_currentRealTimeSeconds * 1000.0);
-    params->m_currentRealTimeSeconds
-        += (m_measureAligner.GetRightAlignment()->GetTime() * DURATION_4 / DUR_MAX) * 60.0 / m_currentTempo;
+
+    return FUNCTOR_CONTINUE;
+}
+
+int Measure::CalcMaxMeasureDurationEnd(FunctorParams *functorParams)
+{
+    CalcMaxMeasureDurationParams *params = vrv_params_cast<CalcMaxMeasureDurationParams *>(functorParams);
+    assert(params);
+
+    const double scoreTimeIncrement
+        = m_measureAligner.GetRightAlignment()->GetTime() * params->m_multiRestFactor * DURATION_4 / DUR_MAX;
+    params->m_currentScoreTime += scoreTimeIncrement;
+    params->m_currentRealTimeSeconds += scoreTimeIncrement * 60.0 / m_currentTempo;
+    params->m_multiRestFactor = 1;
 
     return FUNCTOR_CONTINUE;
 }

From 41206fddaf26468ee0dea1991d5bf7779382482d Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 13:57:03 +0100
Subject: [PATCH 150/403] Add StemSameasDrawingRole member to note

---
 include/vrv/note.h   | 13 +++++++--
 include/vrv/vrvdef.h |  6 ++++
 src/note.cpp         | 68 +++++++++++++++++++++++++++++++++++++-------
 3 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index cb11ad6f7bd..f07e9bcc7fd 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -245,8 +245,8 @@ class Note : public LayerElement,
     /**
      * Resovle @stem.sameas links by instanciating Note::m_stemSameas (*Note).
      * Called twice from Object::PrepareLinks. Once to fill uuid / note pairs,
-     * and once to resolve the link. The direction of the link depends on the
-     * stem direction and not on the presence of the @stem.sameas
+     * and once to resolve the link. The link is bi-directional, which means
+     * that both notes have their m_stemSameas pointer instanciated.
      */
     void ResolveStemSameas(PrepareLinkingParams *params);
 
@@ -443,6 +443,15 @@ class Note : public LayerElement,
      * It means that the pointing note is not necessary the note carrying the @stem.sameas.
      */
     Note *m_stemSameas;
+
+    /**
+     * The role in a stem.sameas situation.
+     * Set in Note::ResolveStemSameas and then in Note::CalcStemDirForSameasNote
+     * Used to determine if the note is the primary one (normal stem, e.g., with flag)
+     * or the secondary one (linking both notes). This depends on the drawing stem direction,
+     * which can be encoded but otherwise calculated by CalcStemDirForSameasNote
+     */
+    StemSameasDrawingRole m_stemSameasRole;
 };
 
 //----------------------------------------------------------------------------
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 9925c2123f2..3a2499ab921 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -603,6 +603,12 @@ enum Accessor { SELF = 0, CONTENT };
 
 enum { KEY_LEFT = 37, KEY_UP = 38, KEY_RIGHT = 39, KEY_DOWN = 40 };
 
+//----------------------------------------------------------------------------
+// Stem sameas drawing role
+//----------------------------------------------------------------------------
+
+enum StemSameasDrawingRole { SAMEAS_NONE = 0, SAMEAS_UNSET, SAMEAS_PRIMARY, SAMEAS_SECONDARY };
+
 //----------------------------------------------------------------------------
 // Legacy Wolfgang defines
 //----------------------------------------------------------------------------
diff --git a/src/note.cpp b/src/note.cpp
index cb9afe7954c..b7d3bf5e884 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -125,6 +125,7 @@ void Note::Reset()
     m_scoreTimeTiedDuration = 0.0;
 
     m_stemSameas = NULL;
+    m_stemSameasRole = SAMEAS_NONE;
 }
 
 bool Note::IsSupportedChild(Object *child)
@@ -566,23 +567,65 @@ void Note::ResolveStemSameas(PrepareLinkingParams *params)
     else {
         const std::string uuid = this->GetUuid();
         if (params->m_stemSameasUuidPairs.count(uuid)) {
-            Note *noteWithStemSameas = params->m_stemSameasUuidPairs.at(uuid);
-            // By default (stem up) the pointing note is the one with @stem.sameas (lower)
-            Note *targetNote = noteWithStemSameas;
-            if (this->HasStemDir() && this->GetStemDir() == STEMDIRECTION_down) {
-                this->SetStemSameasNote(noteWithStemSameas);
-                targetNote = this;
-            }
-            else {
-                noteWithStemSameas->SetStemSameasNote(this);
+            Note *noteStemSameas = params->m_stemSameasUuidPairs.at(uuid);
+            // Instanciate the bi-directional references and mark the roles as unset
+            this->SetStemSameasNote(noteStemSameas);
+            this->m_stemSameasRole = SAMEAS_UNSET;
+            noteStemSameas->SetStemSameasNote(this);
+            noteStemSameas->m_stemSameasRole = SAMEAS_UNSET;
+            // Also resovle beams and instanciate the bi-directional references
+            Beam *beamStemSameas = noteStemSameas->IsInBeam();
+            if (beamStemSameas) {
+                Beam *thisBeam = this->IsInBeam();
+                if (!thisBeam) {
+                    // This is one thing that can go wrong. We can have many others here...
+                    // E.g., not the same number of notes, conflicting durations, not all notes sharing stems, ...
+                    // Not sure everything could be checked here.
+                    LogError("Notes with @stem.sameas in a beam should refer only to a note also in beam.");
+                }
+                else {
+                    thisBeam->SetStemSameasBeam(beamStemSameas);
+                    beamStemSameas->SetStemSameasBeam(thisBeam);
+                }
             }
-            Beam *beam = targetNote->IsInBeam();
-            if (beam) beam->SetStemSameasNotes(true);
             params->m_stemSameasUuidPairs.erase(uuid);
         }
     }
 }
 
+data_STEMDIRECTION Note::CalcStemDirForSameasNote(int verticalCenter)
+{
+    assert(m_stemSameas);
+    assert(m_stemSameas->HasStemSameasNote());
+    assert(m_stemSameas->GetStemSameasNote() == this);
+
+    // This is the first of the of the note pair, we need to calculate and set the stem direction
+    if (m_stemSameasRole == SAMEAS_UNSET) {
+        data_STEMDIRECTION stemDir = STEMDIRECTION_up;
+        Note *topNote = (this->GetDrawingY() > m_stemSameas->GetDrawingY()) ? this : m_stemSameas;
+        Note *bottomNote = (this->GetDrawingY() > m_stemSameas->GetDrawingY()) ? m_stemSameas : this;
+        // First check if we have an encoded stem direction
+        if (this->HasStemDir()) {
+            stemDir = this->GetStemDir();
+        }
+        // Otherwise auto determine it
+        else {
+            const int topY = topNote->GetDrawingY();
+            const int bottomY = bottomNote->GetDrawingY();
+            const int middlePoint = (topY + bottomY) / 2;
+            stemDir = (middlePoint > verticalCenter) ? STEMDIRECTION_down : STEMDIRECTION_up;
+        }
+        // We also set the role to both notes accordingly
+        topNote->m_stemSameasRole = (stemDir == STEMDIRECTION_up) ? SAMEAS_PRIMARY : SAMEAS_SECONDARY;
+        bottomNote->m_stemSameasRole = (stemDir == STEMDIRECTION_up) ? SAMEAS_SECONDARY : SAMEAS_PRIMARY;
+        return stemDir;
+    }
+    else {
+        // Otherwise use the stem direction set for the other note previously when this method was called for it
+        return m_stemSameas->GetDrawingStemDir();
+    }
+}
+
 bool Note::IsEnharmonicWith(Note *note)
 {
     return (this->GetMIDIPitch() == note->GetMIDIPitch());
@@ -1371,6 +1414,7 @@ int Note::ResetDrawing(FunctorParams *functorParams)
     m_drawingLoc = 0;
     m_flippedNotehead = false;
     m_stemSameas = NULL;
+    m_stemSameasRole = SAMEAS_NONE;
 
     return FUNCTOR_CONTINUE;
 }
@@ -1382,6 +1426,8 @@ int Note::ResetHorizontalAlignment(FunctorParams *functorParams)
 
     m_drawingLoc = 0;
     m_flippedNotehead = false;
+    // Re-mark the role as unsed if we have a shared stem
+    if (this->HasStemSameasNote()) m_stemSameasRole = SAMEAS_UNSET;
 
     return FUNCTOR_CONTINUE;
 }

From 79a989b3872bddf6b6f979bcc4b26d8af7eb02e1 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 27 Jan 2022 13:58:10 +0100
Subject: [PATCH 151/403] Move tempo handling

---
 include/vrv/tempo.h |  5 +++++
 src/measure.cpp     | 19 +------------------
 src/tempo.cpp       | 23 +++++++++++++++++++++++
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/include/vrv/tempo.h b/include/vrv/tempo.h
index 7f7ee62fee4..5d87a1c717d 100644
--- a/include/vrv/tempo.h
+++ b/include/vrv/tempo.h
@@ -77,6 +77,11 @@ class Tempo : public ControlElement,
      */
     int ResetDrawing(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::CalcMaxMeasureDuration
+     */
+    int CalcMaxMeasureDuration(FunctorParams *functorParams) override;
+
 private:
     //
 public:
diff --git a/src/measure.cpp b/src/measure.cpp
index 1d2e0142faf..53f3cb8324a 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -1564,24 +1564,6 @@ int Measure::CalcMaxMeasureDuration(FunctorParams *functorParams)
     m_scoreTimeOffset.clear();
     m_scoreTimeOffset.push_back(params->m_currentScoreTime);
 
-    // search for tempo marks in the measure
-    Tempo *tempo = dynamic_cast<Tempo *>(this->FindDescendantByType(TEMPO));
-    if (tempo && tempo->HasMidiBpm()) {
-        params->m_currentTempo = tempo->GetMidiBpm();
-    }
-    else if (tempo && tempo->HasMm()) {
-        double mm = tempo->GetMm();
-        int mmUnit = 4;
-        if (tempo->HasMmUnit() && (tempo->GetMmUnit() > DURATION_breve)) {
-            mmUnit = pow(2, (int)tempo->GetMmUnit() - 2);
-        }
-        if (tempo->HasMmDots()) {
-            mmUnit = 2 * mmUnit - (mmUnit / pow(2, tempo->GetMmDots()));
-        }
-        params->m_currentTempo = mm * 4.0 / mmUnit + 0.5;
-    }
-    m_currentTempo = params->m_currentTempo * params->m_tempoAdjustment;
-
     m_realTimeOffsetMilliseconds.clear();
     // m_realTimeOffsetMilliseconds.push_back(int(params->m_maxCurrentRealTimeSeconds * 1000.0 + 0.5));
     m_realTimeOffsetMilliseconds.push_back(params->m_currentRealTimeSeconds * 1000.0);
@@ -1596,6 +1578,7 @@ int Measure::CalcMaxMeasureDurationEnd(FunctorParams *functorParams)
 
     const double scoreTimeIncrement
         = m_measureAligner.GetRightAlignment()->GetTime() * params->m_multiRestFactor * DURATION_4 / DUR_MAX;
+    m_currentTempo = params->m_currentTempo * params->m_tempoAdjustment;
     params->m_currentScoreTime += scoreTimeIncrement;
     params->m_currentRealTimeSeconds += scoreTimeIncrement * 60.0 / m_currentTempo;
     params->m_multiRestFactor = 1;
diff --git a/src/tempo.cpp b/src/tempo.cpp
index 60f7105fada..890e3f25183 100644
--- a/src/tempo.cpp
+++ b/src/tempo.cpp
@@ -127,4 +127,27 @@ int Tempo::ResetDrawing(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Tempo::CalcMaxMeasureDuration(FunctorParams *functorParams)
+{
+    CalcMaxMeasureDurationParams *params = vrv_params_cast<CalcMaxMeasureDurationParams *>(functorParams);
+    assert(params);
+
+    if (this->HasMidiBpm()) {
+        params->m_currentTempo = this->GetMidiBpm();
+    }
+    else if (this->HasMm()) {
+        double mm = this->GetMm();
+        int mmUnit = 4;
+        if (this->HasMmUnit() && (this->GetMmUnit() > DURATION_breve)) {
+            mmUnit = pow(2, (int)this->GetMmUnit() - 2);
+        }
+        if (this->HasMmDots()) {
+            mmUnit = 2 * mmUnit - (mmUnit / pow(2, this->GetMmDots()));
+        }
+        params->m_currentTempo = mm * 4.0 / mmUnit + 0.5;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv

From 8df8f603a69f4d95ad5dff74df76d17a4a81d539 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 13:58:16 +0100
Subject: [PATCH 152/403] Use m_stemSameasRole members in stem direction
 calculation

---
 include/vrv/note.h |  8 ++++++++
 src/note.cpp       | 11 ++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index f07e9bcc7fd..0298f6bc530 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -250,6 +250,14 @@ class Note : public LayerElement,
      */
     void ResolveStemSameas(PrepareLinkingParams *params);
 
+    /**
+     * Calculate the stem direction of the pair of notes.
+     * The presence of a StemSameasNote() needs to be check before calling it.
+     * Encoded stem direction on the calling note is taken into account.
+     * Called from Note::CalcStem
+     */
+    data_STEMDIRECTION CalcStemDirForSameasNote(int verticalCenter);
+
 public:
     //----------------//
     // Static methods //
diff --git a/src/note.cpp b/src/note.cpp
index b7d3bf5e884..16cb2b6e0ce 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1034,7 +1034,7 @@ int Note::CalcStem(FunctorParams *functorParams)
 
     // Stems have been calculated previously in Beam or fTrem - siblings because flags do not need to
     // be processed either - except when there is a stemSameasNote
-    if ((this->IsInBeam() || this->IsInFTrem()) && !this->HasStemSameasNote()) {
+    if ((this->IsInBeam() || this->IsInFTrem())) {
         return FUNCTOR_SIBLINGS;
     }
 
@@ -1069,7 +1069,7 @@ int Note::CalcStem(FunctorParams *functorParams)
     params->m_interface = this;
     params->m_dur = this->GetActualDur();
     params->m_isGraceNote = this->IsGraceNote();
-    params->m_stemSameas = this->HasStemSameasNote();
+    params->m_stemSameas = false;
 
     int staffSize = staff->m_drawingStaffSize;
 
@@ -1082,8 +1082,7 @@ int Note::CalcStem(FunctorParams *functorParams)
     data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
 
     if (this->HasStemSameasNote()) {
-        // for stem same as notes, the direction is up if the note also carries the @stem.sameas attribute (default)
-        stemDir = (this->HasStemSameas()) ? STEMDIRECTION_up : STEMDIRECTION_down;
+        stemDir = this->CalcStemDirForSameasNote(params->m_verticalCenter);
     }
     else if (stem->HasStemDir()) {
         stemDir = stem->GetStemDir();
@@ -1104,8 +1103,10 @@ int Note::CalcStem(FunctorParams *functorParams)
     stem->SetDrawingYRel(0);
 
     // Use the params->m_chordStemLength for the length of the stem beetween the notes
-    if (this->HasStemSameasNote()) {
+    // The value of m_stemSameasRole is set by Note::CalcStemDirForSameasNote
+    if (this->HasStemSameasNote() && m_stemSameasRole == SAMEAS_SECONDARY) {
         params->m_chordStemLength = -std::abs(this->GetDrawingY() - this->GetStemSameasNote()->GetDrawingY());
+        params->m_stemSameas = true;
     }
 
     return FUNCTOR_CONTINUE;

From ee8fe829ddcaaa9371b9c9c516cf9871d956a327 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 13:59:18 +0100
Subject: [PATCH 153/403] Add m_stemSameas pointer to Beam (bi-directional)

---
 include/vrv/beam.h | 8 ++++++--
 src/beam.cpp       | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 8accf201ea4..85a5dc61967 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -220,8 +220,12 @@ class Beam : public LayerElement,
     int CalcLayerOverlap(Doc *doc, Object *beam, int directionBias, int y1, int y2);
 
 private:
-    /** A flag indicating that we have notes with stem shared and that it should not be drawn */
-    bool m_stemSameAsNotes;
+    /**
+     * A pointer to the beam with which stem are shared.
+     * The pointer is bi-directional (each beam points to the other one.
+     * It is the in Note::ResovleStemSameas()
+     */
+    Beam *m_stemSameas;
 
 public:
     /** */
diff --git a/src/beam.cpp b/src/beam.cpp
index 93aef952975..5d817c4db76 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1215,7 +1215,7 @@ void Beam::Reset()
     ResetColor();
     ResetCue();
 
-    m_stemSameAsNotes = false;
+    m_stemSameas = NULL;
 }
 
 bool Beam::IsSupportedChild(Object *child)
@@ -1692,9 +1692,10 @@ int Beam::ResetDrawing(FunctorParams *functorParams)
 {
     // Call parent one too
     LayerElement::ResetDrawing(functorParams);
+    BeamDrawingInterface::Reset();
 
     m_beamSegment.Reset();
-    m_stemSameAsNotes = false;
+    m_stemSameas = NULL;
 
     // We want the list of the ObjectListInterface to be re-generated
     this->Modify();

From f4af9fb8a74ee67ccf03e1fd7e5a2c18500d2ba1 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 14:00:00 +0100
Subject: [PATCH 154/403] Adjust selection of referenced notes when removing
 IDs in MEI output

---
 src/object.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/object.cpp b/src/object.cpp
index f708fff7246..2e724060b5e 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1467,14 +1467,9 @@ int Object::FindAllReferencedObjects(FunctorParams *functorParams)
     if (this->Is(NOTE)) {
         Note *note = vrv_cast<Note *>(this);
         assert(note);
-        if (note->HasStemSameasNote()) {
-            // We need to check where the @stem.sameas attribute actually is because of the handling
-            // of share stem pointers depending on the stem direction.
-            // If it is on this note, then the reference we want to keep is the other note.
-            // Otherwise it means that the @stem.sameas is on the other note that we already have
-            // the one that is actually referenced
-            if (note->HasStemSameas()) note = note->GetStemSameasNote();
-            params->m_elements->push_back(note);
+        // The note has a stem.sameas that was resolved the a note, then that one is referenced
+        if (note->HasStemSameas() && note->HasStemSameasNote()) {
+            params->m_elements->push_back(note->GetStemSameasNote());
         }
     }
     // These will also be referred to as milestones in page-based MEI

From 1d60b788d17bd51d6a4f6e76e464e9d446ac82b7 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 14:01:59 +0100
Subject: [PATCH 155/403] Add m_stemSameasRole to Beam and use them for beam
 place calculation

---
 include/vrv/beam.h |  48 +++++++++++++++-
 src/beam.cpp       | 133 ++++++++++++++++++++++++++++++++++++---------
 src/view_beam.cpp  |  15 +++--
 3 files changed, 162 insertions(+), 34 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 85a5dc61967..2fdbfa19d31 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -77,12 +77,34 @@ class BeamSegment {
     int GetStartingY() const;
     ///@}
 
+    /**
+     * @name Getters for the stem same as role.
+     */
+    ///@{
+    bool StemSameas() const { return (m_stemSameasRole != SAMEAS_NONE); }
+    bool StemSameasIsUnset() const { return (m_stemSameasRole == SAMEAS_UNSET); }
+    bool StemSameasIsPrimary() const { return (m_stemSameasRole == SAMEAS_PRIMARY); }
+    bool StemSameasIsSecondary() const { return (m_stemSameasRole == SAMEAS_SECONDARY); }
+    ///@}
+
+    /**
+     * @name Methods to intialize and update the role for stem.sameas context
+     * Before the drawing beam place has been calculated, the role is marked as unset.
+     * Then it is marked as primary or secondary depending on the beam place.
+     */
+    ///@{
+    void InitSameasRoles(Beam *sameasBeam, data_BEAMPLACE &drawingPlace);
+    void UpdateSameasRoles(data_BEAMPLACE place);
+    ///@}
+
 private:
     // Helper to adjust beam positioning with regards to ledger lines (top and bottom of the staff)
     void AdjustBeamToLedgerLines(Doc *doc, Staff *staff, BeamDrawingInterface *beamInterface);
 
     void CalcBeamInit(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
 
+    void CalcBeamInitForNotePair(Note *note1, Note *note2, Staff *staff, int &yMax, int &yMin);
+
     bool CalcBeamSlope(
         Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, bool &shorten, int &step);
 
@@ -130,6 +152,20 @@ class BeamSegment {
      * An array of coordinates for each element
      **/
     ArrayOfBeamElementCoords m_beamElementCoordRefs;
+
+    /**
+     * @name The role in a stem.sameas situation.
+     * Set in BeamSegment::InitSameasRoles and then in UpdateSameasRoles
+     * Used to determine if the beam is the primary one (normal stems and beams)
+     * or the secondary one (linking both notes). This depends on the drawing stem direction,
+     * which can be encoded but otherwise calculated by CalcBeamPlace.
+     * The pointer to the other beam m_stemSameasReverseRole is set only for the first of the
+     * two beam and is not bi-directional. Is is set in InitSameasRoles.
+     */
+    ///@{
+    StemSameasDrawingRole m_stemSameasRole;
+    StemSameasDrawingRole *m_stemSameasReverseRole;
+    ///@}
 };
 
 //----------------------------------------------------------------------------
@@ -175,11 +211,12 @@ class Beam : public LayerElement,
     bool IsTabBeam();
 
     /**
-     * @name Setter and getter for the stemSameasNote flag
+     * @name Checker, getter and setter for a beam with which the stems are shared
      */
     ///@{
-    void SetStemSameasNotes(bool stemSameasNotes) { m_stemSameAsNotes = stemSameasNotes; }
-    bool GetStemSameasNotes() const { return m_stemSameAsNotes; }
+    bool HasStemSameasBeam() const { return (m_stemSameas); }
+    Beam *GetStemSameasBeam() const { return m_stemSameas; }
+    void SetStemSameasBeam(Beam *stemSameas) { m_stemSameas = stemSameas; }
     ///@}
 
     //----------//
@@ -201,6 +238,11 @@ class Beam : public LayerElement,
      */
     int CalcStem(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::ResetHorizontalAlignment
+     */
+    int ResetHorizontalAlignment(FunctorParams *functorParams) override;
+
     /**
      * See Object::ResetDrawing
      */
diff --git a/src/beam.cpp b/src/beam.cpp
index 5d817c4db76..049efa08f70 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -62,6 +62,9 @@ void BeamSegment::Reset()
 
     m_firstNoteOrChord = NULL;
     m_lastNoteOrChord = NULL;
+
+    m_stemSameasRole = SAMEAS_NONE;
+    m_stemSameasReverseRole = NULL;
 }
 
 const ArrayOfBeamElementCoords *BeamSegment::GetElementCoordRefs() const
@@ -443,39 +446,37 @@ void BeamSegment::CalcBeamInit(
             m_nbNotesOrChords++;
         }
 
+        int chordYMax = 0;
+        int chordYMin = 0;
+
         if (coord->m_element->Is(CHORD)) {
-            int max = 0;
-            int min = 0;
             Chord *chord = vrv_cast<Chord *>(coord->m_element);
             assert(chord);
-            chord->GetYExtremes(max, min);
-
-            SetExtrema(max);
-            SetExtrema(min);
-
-            int linesAbove = 0;
-            int linesBelow = 0;
             Note *bottomNote = chord->GetBottomNote();
             assert(bottomNote);
-            if (bottomNote->HasLedgerLines(linesAbove, linesBelow, staff)) {
-                m_ledgerLinesBelow += linesBelow;
-            }
             Note *topNote = chord->GetTopNote();
             assert(topNote);
-            if (topNote->HasLedgerLines(linesAbove, linesBelow, staff)) {
-                m_ledgerLinesAbove += linesAbove;
-            }
+            this->CalcBeamInitForNotePair(bottomNote, topNote, staff, chordYMax, chordYMin);
+            SetExtrema(chordYMax);
+            SetExtrema(chordYMin);
         }
         else if (coord->m_element->Is(NOTE)) {
             Note *note = vrv_cast<Note *>(coord->m_element);
             assert(note);
-            SetExtrema(note->GetDrawingY());
-
-            int linesAbove = 0;
-            int linesBelow = 0;
-            if (note->HasLedgerLines(linesAbove, linesBelow, staff)) {
-                m_ledgerLinesBelow += linesBelow;
-                m_ledgerLinesAbove += linesAbove;
+            // In a stem.sameas context, use both notes to determine the beam place (e,g, same as a chord)
+            if (note->HasStemSameasNote()) {
+                this->CalcBeamInitForNotePair(note, note->GetStemSameasNote(), staff, chordYMax, chordYMin);
+                SetExtrema(chordYMax);
+                SetExtrema(chordYMin);
+            }
+            else {
+                SetExtrema(note->GetDrawingY());
+                int linesAbove = 0;
+                int linesBelow = 0;
+                if (note->HasLedgerLines(linesAbove, linesBelow, staff)) {
+                    m_ledgerLinesBelow += linesBelow;
+                    m_ledgerLinesAbove += linesAbove;
+                }
             }
         }
         else {
@@ -486,6 +487,27 @@ void BeamSegment::CalcBeamInit(
     m_weightedPlace = ((m_verticalCenter - yMin) > (yMax - m_verticalCenter)) ? BEAMPLACE_above : BEAMPLACE_below;
 }
 
+void BeamSegment::CalcBeamInitForNotePair(Note *note1, Note *note2, Staff *staff, int &yMax, int &yMin)
+{
+    assert(note1);
+    assert(note2);
+
+    Note *bottomNote = (note1->GetDrawingY() > note2->GetDrawingY()) ? note2 : note1;
+    Note *topNote = (note1->GetDrawingY() > note2->GetDrawingY()) ? note1 : note2;
+
+    yMax = bottomNote->GetDrawingY();
+    yMin = topNote->GetDrawingY();
+
+    int linesAbove = 0;
+    int linesBelow = 0;
+    if (bottomNote->HasLedgerLines(linesAbove, linesBelow, staff)) {
+        m_ledgerLinesBelow += linesBelow;
+    }
+    if (topNote->HasLedgerLines(linesAbove, linesBelow, staff)) {
+        m_ledgerLinesAbove += linesAbove;
+    }
+}
+
 bool BeamSegment::CalcBeamSlope(
     Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, bool &shorten, int &step)
 {
@@ -1020,7 +1042,9 @@ void BeamSegment::CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterfac
     }
     // Look at the layer direction or, finally, at the note position
     else {
-        data_STEMDIRECTION layerStemDir = layer->GetDrawingStemDir(&m_beamElementCoordRefs);
+        data_STEMDIRECTION layerStemDir = STEMDIRECTION_NONE;
+        // Do not look at the layer context when notes from different layers are stemmed together
+        if (!this->StemSameas()) layerStemDir = layer->GetDrawingStemDir(&m_beamElementCoordRefs);
         // Layer direction ?
         if (layerStemDir == STEMDIRECTION_NONE) {
             if (m_ledgerLinesBelow != m_ledgerLinesAbove) {
@@ -1037,6 +1061,12 @@ void BeamSegment::CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterfac
         }
     }
 
+    // If we have a stem.sameas context and it is unset, update the roles.
+    // This will update the roles for both beams
+    if (this->StemSameasIsUnset()) {
+        this->UpdateSameasRoles(beamInterface->m_drawingPlace);
+    }
+
     // For now force it above
     // if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) beamInterface->m_drawingPlace = BEAMPLACE_above;
 }
@@ -1188,6 +1218,46 @@ int BeamSegment::GetStartingY() const
     return (m_beamElementCoordRefs.empty() ? 0 : m_beamElementCoordRefs.at(0)->m_yBeam);
 }
 
+void BeamSegment::InitSameasRoles(Beam *sameasBeam, data_BEAMPLACE &initialPlace)
+{
+    if (!sameasBeam) return;
+
+    // This is the first time and the first beam for which we are calling it.
+    // All we need to do is setting the pointer to the role of the other beam
+    // and make both of them as unset
+    if (m_stemSameasRole == SAMEAS_NONE) {
+        m_stemSameasReverseRole = &sameasBeam->m_beamSegment.m_stemSameasRole;
+        m_stemSameasRole = SAMEAS_UNSET;
+        (*m_stemSameasReverseRole) = SAMEAS_UNSET;
+    }
+    // The reverse role is not set, which means we are calling it from the second beam.
+    // We need to set the initial place of the beam as previously calculated for the first one.
+    // If the role of the second beam (this) has been mark as is primary, it means the beam
+    // has been place below, above if secondary.
+    else if (!m_stemSameasReverseRole) {
+        initialPlace = (this->StemSameasIsPrimary()) ? BEAMPLACE_below : BEAMPLACE_above;
+    }
+    // Otherwise, calling it (again) from the first beam, nothing to do.
+}
+
+void BeamSegment::UpdateSameasRoles(data_BEAMPLACE place)
+{
+    if (!m_stemSameasReverseRole || !this->StemSameasIsUnset()) return;
+
+    // Because m_stemSameasReverseRole is instanciated, then it means we are in
+    // the first of the beams sharing the stems.
+    // The beam is placed above, this one is primary, the other secondary.
+    if (place == BEAMPLACE_above) {
+        m_stemSameasRole = SAMEAS_PRIMARY;
+        (*m_stemSameasReverseRole) = SAMEAS_SECONDARY;
+    }
+    // The beam is placed below, this one is secondary, the other primary.
+    else {
+        m_stemSameasRole = SAMEAS_SECONDARY;
+        (*m_stemSameasReverseRole) = SAMEAS_PRIMARY;
+    }
+}
+
 //----------------------------------------------------------------------------
 // Beam
 //----------------------------------------------------------------------------
@@ -1667,7 +1737,7 @@ int Beam::CalcStem(FunctorParams *functorParams)
     CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
     assert(params);
 
-    if (this->IsTabBeam() || this->GetStemSameasNotes()) return FUNCTOR_CONTINUE;
+    if (this->IsTabBeam()) return FUNCTOR_CONTINUE;
 
     const ArrayOfObjects *beamChildren = this->GetList(this);
 
@@ -1678,12 +1748,25 @@ int Beam::CalcStem(FunctorParams *functorParams)
 
     m_beamSegment.InitCoordRefs(this->GetElementCoords());
 
+    data_BEAMPLACE initialPlace = this->GetPlace();
+    if (this->HasStemSameasBeam()) m_beamSegment.InitSameasRoles(this->GetStemSameasBeam(), initialPlace);
+
     Layer *layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(layer);
     Staff *staff = vrv_cast<Staff *>(layer->GetFirstAncestor(STAFF));
     assert(staff);
 
-    m_beamSegment.CalcBeam(layer, staff, params->m_doc, this, this->GetPlace());
+    m_beamSegment.CalcBeam(layer, staff, params->m_doc, this, initialPlace);
+
+    return FUNCTOR_CONTINUE;
+}
+
+int Beam::ResetHorizontalAlignment(FunctorParams *functorParams)
+{
+    LayerElement::ResetHorizontalAlignment(functorParams);
+
+    m_beamSegment.m_stemSameasRole = SAMEAS_NONE;
+    m_beamSegment.m_stemSameasReverseRole = NULL;
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 08195e76810..8439f63b122 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -42,7 +42,6 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     assert(beam);
 
     const bool isTabBeam = beam->IsTabBeam();
-    const bool hasStemSameas = beam->GetStemSameasNotes();
 
     /******************************************************************/
     // initialization
@@ -56,14 +55,17 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
     beam->m_beamSegment.InitCoordRefs(beam->GetElementCoords());
 
+    data_BEAMPLACE initialPlace = beam->GetPlace();
+    if (beam->HasStemSameasBeam()) beam->m_beamSegment.InitSameasRoles(beam->GetStemSameasBeam(), initialPlace);
+
     /******************************************************************/
     // Calculate the beam slope and position
 
     if (isTabBeam) {
-        beam->m_beamSegment.CalcTabBeam(layer, beam->m_beamStaff, m_doc, beam, beam->GetPlace());
+        beam->m_beamSegment.CalcTabBeam(layer, beam->m_beamStaff, m_doc, beam, initialPlace);
     }
-    else if (!hasStemSameas) {
-        beam->m_beamSegment.CalcBeam(layer, beam->m_beamStaff, m_doc, beam, beam->GetPlace());
+    else if (!beam->m_beamSegment.StemSameasIsSecondary()) {
+        beam->m_beamSegment.CalcBeam(layer, beam->m_beamStaff, m_doc, beam, initialPlace);
     }
 
     /******************************************************************/
@@ -77,9 +79,10 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     DrawLayerChildren(dc, beam, layer, staff, measure);
 
     /******************************************************************/
-    // Draw the beamSegment
+    // Draw the beamSegment - but not if it is a secondary beam in a stem.sameas
 
-    if (!hasStemSameas) DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
+    if (!beam->m_beamSegment.StemSameasIsSecondary())
+        DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
 
     dc->EndGraphic(element, this);
 }

From 0c719163ed60ebd3637ab94fe5aec4d5bfc90d2f Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 14:02:34 +0100
Subject: [PATCH 156/403] Adjust rendering for secondary beam with shared stems

---
 src/beam.cpp | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 049efa08f70..c4279c58406 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -187,14 +187,40 @@ void BeamSegment::CalcBeam(
             assert(beamInterface);
 
             assert(coord->m_closestNote);
+
             y1 = coord->m_yBeam;
+            bool isStemSameas = false;
+
+            // With stem.sameas the y is not the beam one but the one of the other note
+            // We also need to adjust the length differently (below)
+            if (this->StemSameasIsSecondary() && el->Is(NOTE)) {
+                Note *note = vrv_cast<Note *>(el);
+                assert(note);
+                if (note->HasStemSameasNote()) {
+                    y1 = note->GetStemSameasNote()->GetDrawingY();
+                    isStemSameas = true;
+                }
+            }
+
             y2 = coord->m_closestNote->GetDrawingY();
             if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
-                y1 -= doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                if (isStemSameas) {
+                    // Move up according to the cut-outs
+                    y1 += stemmedInterface->GetStemUpSE(doc, staff->m_drawingStaffSize, beamInterface->m_cueSize).y;
+                }
+                else {
+                    // Move down to ensure the stem is slightly shorter than the top-beam
+                    y1 -= doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                }
                 y2 += stemmedInterface->GetStemUpSE(doc, staff->m_drawingStaffSize, beamInterface->m_cueSize).y;
             }
             else if (beamInterface->m_drawingPlace == BEAMPLACE_below) {
-                y1 += doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                if (isStemSameas) {
+                    y1 += stemmedInterface->GetStemDownNW(doc, staff->m_drawingStaffSize, beamInterface->m_cueSize).y;
+                }
+                else {
+                    y1 += doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                }
                 y2 += stemmedInterface->GetStemDownNW(doc, staff->m_drawingStaffSize, beamInterface->m_cueSize).y;
             }
             else if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) {

From 5095559272f3e8c0162f026a5d744dab893c438e Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 14:29:20 +0100
Subject: [PATCH 157/403] Adjust code comments

---
 include/vrv/beam.h          | 10 +++++-----
 include/vrv/functorparams.h |  4 ++--
 include/vrv/note.h          |  8 ++------
 src/beam.cpp                |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 2fdbfa19d31..3ffd24a57ef 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -157,10 +157,10 @@ class BeamSegment {
      * @name The role in a stem.sameas situation.
      * Set in BeamSegment::InitSameasRoles and then in UpdateSameasRoles
      * Used to determine if the beam is the primary one (normal stems and beams)
-     * or the secondary one (linking both notes). This depends on the drawing stem direction,
+     * or the secondary one (linking both notes). This depends on the drawing beam place,
      * which can be encoded but otherwise calculated by CalcBeamPlace.
      * The pointer to the other beam m_stemSameasReverseRole is set only for the first of the
-     * two beam and is not bi-directional. Is is set in InitSameasRoles.
+     * two beams and is not bi-directional. Is is set in InitSameasRoles.
      */
     ///@{
     StemSameasDrawingRole m_stemSameasRole;
@@ -263,9 +263,9 @@ class Beam : public LayerElement,
 
 private:
     /**
-     * A pointer to the beam with which stem are shared.
-     * The pointer is bi-directional (each beam points to the other one.
-     * It is the in Note::ResovleStemSameas()
+     * A pointer to the beam with which stems are shared.
+     * The pointer is bi-directional – each beam points to the other one.
+     * It is set in Note::ResovleStemSameas()
      */
     Beam *m_stemSameas;
 
diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 38981cf7a69..39d308a3e5e 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -461,8 +461,8 @@ class AdjustHarmGrpsSpacingParams : public FunctorParams {
  * member 4: the doc
  * member 5: a pointer to the functor for passing it to the system aligner
  * member 6: a pointer to the end functor for passing it to the system aligner
- * member 7: flag whether element is in unison
- * member 8: flag whether element (note) has as stem same as note
+ * member 7: flag whether the element is in unison
+ * member 8: flag whether the element (note) has as stem.sameas note
  * member 9: the total shift of the current note or chord
  **/
 
diff --git a/include/vrv/note.h b/include/vrv/note.h
index 0298f6bc530..56a2c7af9e7 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -443,12 +443,8 @@ class Note : public LayerElement,
 
     /**
      * A pointer to a note with which the note shares its stem and implementing @stem.sameas.
-     * The other note is always the one with the stem going outward (up or down). This means
-     * that the note pointing to it will have a stem linking the two notes.
-     * The current implementation requires the notes with the @stem.sameas to be in a lower layer.
-     * The note in the upper layer has no attribute. By default, stems go up but the @stem.dir
-     * value is supported. If the stem is going down, the upper note will have a m_stemSameas Note.
-     * It means that the pointing note is not necessary the note carrying the @stem.sameas.
+     * The pointer is bi-directional (both notes point to each other).
+     * It is set in Note::ResolveStemSameas
      */
     Note *m_stemSameas;
 
diff --git a/src/beam.cpp b/src/beam.cpp
index c4279c58406..a98a5005a7c 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1250,7 +1250,7 @@ void BeamSegment::InitSameasRoles(Beam *sameasBeam, data_BEAMPLACE &initialPlace
 
     // This is the first time and the first beam for which we are calling it.
     // All we need to do is setting the pointer to the role of the other beam
-    // and make both of them as unset
+    // and mark both of them as unset
     if (m_stemSameasRole == SAMEAS_NONE) {
         m_stemSameasReverseRole = &sameasBeam->m_beamSegment.m_stemSameasRole;
         m_stemSameasRole = SAMEAS_UNSET;

From 044455d3a03aaf0dbaa10b9da61003bf3ba6533b Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 27 Jan 2022 15:11:26 +0100
Subject: [PATCH 158/403] Further improvement

---
 src/slur.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/slur.cpp b/src/slur.cpp
index 3c0f40611c4..0c0235715d4 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -1029,7 +1029,10 @@ std::pair<Point, Point> Slur::AdjustCoordinates(
                     const int yMin = y1 - unit * 4;
                     const int yTop = end->GetDrawingTop(doc, staff->m_drawingStaffSize);
                     y2 = std::max(end->GetDrawingY() + unit * 2, yMin);
-                    y2 = std::min(yTop - unit, y2);
+                    if (y2 > yTop - unit * 2) {
+                        y2 = yTop;
+                        x2 += endRadius - doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                    }
                 }
             }
             // portato slurs
@@ -1086,7 +1089,7 @@ std::pair<Point, Point> Slur::AdjustCoordinates(
                     const int yBottom = end->GetDrawingBottom(doc, staff->m_drawingStaffSize);
                     y2 = std::min(end->GetDrawingY(), yMax);
                     if (y2 < yBottom + unit) {
-                        y2 = yBottom + unit;
+                        y2 = yBottom + unit * 2;
                     }
                     else {
                         x2 -= endRadius + 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);

From 113f32fb443f84168da2fefa2b7c1a904f2726b0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 22:14:00 +0100
Subject: [PATCH 159/403] Move note onset / offset members to the
 DurationInterface and instanciate them for rests

---
 include/vrv/durationinterface.h |  70 ++++++++++++++++++++
 include/vrv/note.h              |  53 ---------------
 include/vrv/rest.h              |   9 ++-
 src/durationinterface.cpp       | 112 ++++++++++++++++++++++++++++++++
 src/layerelement.cpp            |   9 +++
 src/note.cpp                    |  90 +------------------------
 src/rest.cpp                    |   8 +++
 7 files changed, 207 insertions(+), 144 deletions(-)

diff --git a/include/vrv/durationinterface.h b/include/vrv/durationinterface.h
index c99bf1eb68d..324643b6056 100644
--- a/include/vrv/durationinterface.h
+++ b/include/vrv/durationinterface.h
@@ -15,6 +15,7 @@
 
 namespace vrv {
 
+class FunctorParams;
 class Mensur;
 class Object;
 
@@ -108,6 +109,39 @@ class DurationInterface : public Interface,
      */
     bool HasIdenticalDurationInterface(DurationInterface *otherDurationInterface);
 
+    /**
+     * MIDI timing information
+     */
+    ///@{
+    void SetScoreTimeOnset(double scoreTime);
+    void SetRealTimeOnsetSeconds(double timeInSeconds);
+    void SetScoreTimeOffset(double scoreTime);
+    void SetRealTimeOffsetSeconds(double timeInSeconds);
+    void SetScoreTimeTiedDuration(double timeInSeconds);
+    double GetScoreTimeOnset() const;
+    double GetRealTimeOnsetMilliseconds() const;
+    double GetScoreTimeOffset() const;
+    double GetScoreTimeTiedDuration() const;
+    double GetRealTimeOffsetMilliseconds() const;
+    double GetScoreTimeDuration() const;
+    ///@}
+
+    //-----------------//
+    // Pseudo functors //
+    //-----------------//
+
+    /**
+     * We have functors in the interface for avoiding code duplication in each implementation class.
+     * Since we are in an interface, we need to pass the  Object (implementation) to
+     * the functor methods. These are not called by the Process/Call loop but by the implementation
+     * classes explicitely. See FloatingObject::FillStaffCurrentTimeSpanning for an example.
+     */
+
+    /**
+     * See Object::GenerateTimemap
+     */
+    virtual int InterfaceGenerateTimemap(FunctorParams *functorParams, Object *object);
+
 private:
     /**
      * Calculate the actual duration => translate mensural values
@@ -117,6 +151,42 @@ class DurationInterface : public Interface,
 public:
     //
 private:
+    /**
+     * The score-time onset of the note in the measure (duration from the start of measure in
+     * quarter notes).
+     */
+    double m_scoreTimeOnset;
+
+    /**
+     * The score-time off-time of the note in the measure (duration from the start of the measure
+     * in quarter notes).  This is the duration of the printed note.  If the note is the start of
+     * a tied group, the score time of the tied group is this variable plus m_scoreTimeTiedDuration.
+     * If this note is a secondary note in a tied group, then this value is the score time end
+     * of the printed note, and the m_scoreTimeTiedDuration is -1.0 to indicate that it should not
+     * be exported when creating a MIDI file.
+     */
+    double m_scoreTimeOffset;
+
+    /**
+     * The time in milliseconds since the start of the measure element that contains the note.
+     */
+    double m_realTimeOnsetMilliseconds;
+
+    /**
+     * The time in milliseconds since the start of the measure element to end of printed note.
+     * The real-time duration of a tied group is not currently tracked (this gets complicated
+     * if there is a tempo change during a note sustain, which is currently not supported).
+     */
+    double m_realTimeOffsetMilliseconds;
+
+    /**
+     * If the note is the first in a tied group, then m_scoreTimeTiedDuration contains the
+     * score-time duration (in quarter notes) of all tied notes in the group after this note.
+     * If the note is a secondary note in a tied group, then this variable is set to -1.0 to
+     * indicate that it should not be written to MIDI output.
+     */
+    double m_scoreTimeTiedDuration;
+
     /**
      * The default duration: extracted from scoreDef/staffDef and used when no duration attribute is given
      */
diff --git a/include/vrv/note.h b/include/vrv/note.h
index ae131487a7b..b700ec87022 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -210,23 +210,6 @@ class Note : public LayerElement,
      */
     bool IsVisible() const;
 
-    /**
-     * MIDI timing information
-     */
-    ///@{
-    void SetScoreTimeOnset(double scoreTime);
-    void SetRealTimeOnsetSeconds(double timeInSeconds);
-    void SetScoreTimeOffset(double scoreTime);
-    void SetRealTimeOffsetSeconds(double timeInSeconds);
-    void SetScoreTimeTiedDuration(double timeInSeconds);
-    double GetScoreTimeOnset() const;
-    double GetRealTimeOnsetMilliseconds() const;
-    double GetScoreTimeOffset() const;
-    double GetScoreTimeTiedDuration() const;
-    double GetRealTimeOffsetMilliseconds() const;
-    double GetScoreTimeDuration() const;
-    ///@}
-
     /**
      * MIDI pitch
      */
@@ -378,42 +361,6 @@ class Note : public LayerElement,
      * Position in the cluster (1-indexed position in said cluster; 0 if does not have position)
      */
     int m_clusterPosition;
-
-    /**
-     * The score-time onset of the note in the measure (duration from the start of measure in
-     * quarter notes).
-     */
-    double m_scoreTimeOnset;
-
-    /**
-     * The score-time off-time of the note in the measure (duration from the start of the measure
-     * in quarter notes).  This is the duration of the printed note.  If the note is the start of
-     * a tied group, the score time of the tied group is this variable plus m_scoreTimeTiedDuration.
-     * If this note is a secondary note in a tied group, then this value is the score time end
-     * of the printed note, and the m_scoreTimeTiedDuration is -1.0 to indicate that it should not
-     * be exported when creating a MIDI file.
-     */
-    double m_scoreTimeOffset;
-
-    /**
-     * The time in milliseconds since the start of the measure element that contains the note.
-     */
-    double m_realTimeOnsetMilliseconds;
-
-    /**
-     * The time in milliseconds since the start of the measure element to end of printed note.
-     * The real-time duration of a tied group is not currently tracked (this gets complicated
-     * if there is a tempo change during a note sustain, which is currently not supported).
-     */
-    double m_realTimeOffsetMilliseconds;
-
-    /**
-     * If the note is the first in a tied group, then m_scoreTimeTiedDuration contains the
-     * score-time duration (in quarter notes) of all tied notes in the group after this note.
-     * If the note is a secondary note in a tied group, then this variable is set to -1.0 to
-     * indicate that it should not be written to MIDI output.
-     */
-    double m_scoreTimeTiedDuration;
 };
 
 //----------------------------------------------------------------------------
diff --git a/include/vrv/rest.h b/include/vrv/rest.h
index 1861145c8cc..f93dce58561 100644
--- a/include/vrv/rest.h
+++ b/include/vrv/rest.h
@@ -84,6 +84,11 @@ class Rest : public LayerElement,
     wchar_t GetRestGlyph(int duration) const;
     ///@}
 
+    /**
+     * Get the vertical location for the rests that are located on other layers
+     */
+    int GetOptimalLayerLocation(Staff *staff, Layer *layer, int defaultLocation);
+
     //----------//
     // Functors //
     //----------//
@@ -124,9 +129,9 @@ class Rest : public LayerElement,
     int Transpose(FunctorParams *functorParams) override;
 
     /**
-     * Get the vertical location for the rests that are located on other layers
+     * See Object::GenerateTimemap
      */
-    int GetOptimalLayerLocation(Staff *staff, Layer *layer, int defaultLocation);
+    int GenerateTimemap(FunctorParams *functorParams) override;
 
 private:
     /**
diff --git a/src/durationinterface.cpp b/src/durationinterface.cpp
index 72ebb5a6839..7f8fae8b122 100644
--- a/src/durationinterface.cpp
+++ b/src/durationinterface.cpp
@@ -17,6 +17,7 @@
 
 #include "beam.h"
 #include "chord.h"
+#include "functorparams.h"
 #include "mensur.h"
 #include "note.h"
 #include "vrv.h"
@@ -64,6 +65,12 @@ void DurationInterface::Reset()
     ResetStaffIdent();
 
     m_durDefault = DURATION_NONE;
+
+    m_scoreTimeOnset = 0.0;
+    m_scoreTimeOffset = 0.0;
+    m_realTimeOnsetMilliseconds = 0;
+    m_realTimeOffsetMilliseconds = 0;
+    m_scoreTimeTiedDuration = 0.0;
 }
 
 double DurationInterface::GetInterfaceAlignmentDuration(int num, int numBase)
@@ -235,4 +242,109 @@ bool DurationInterface::HasIdenticalDurationInterface(DurationInterface *otherDu
     */
 }
 
+void DurationInterface::SetScoreTimeOnset(double scoreTime)
+{
+    m_scoreTimeOnset = scoreTime;
+}
+
+void DurationInterface::SetRealTimeOnsetSeconds(double timeInSeconds)
+{
+    // m_realTimeOnsetMilliseconds = int(timeInSeconds * 1000.0 + 0.5);
+    m_realTimeOnsetMilliseconds = timeInSeconds * 1000.0;
+}
+
+void DurationInterface::SetScoreTimeOffset(double scoreTime)
+{
+    m_scoreTimeOffset = scoreTime;
+}
+
+void DurationInterface::SetRealTimeOffsetSeconds(double timeInSeconds)
+{
+    // m_realTimeOffsetMilliseconds = int(timeInSeconds * 1000.0 + 0.5);
+    m_realTimeOffsetMilliseconds = timeInSeconds * 1000.0;
+}
+
+void DurationInterface::SetScoreTimeTiedDuration(double scoreTime)
+{
+    m_scoreTimeTiedDuration = scoreTime;
+}
+
+double DurationInterface::GetScoreTimeOnset() const
+{
+    return m_scoreTimeOnset;
+}
+
+double DurationInterface::GetRealTimeOnsetMilliseconds() const
+{
+    return m_realTimeOnsetMilliseconds;
+}
+
+double DurationInterface::GetScoreTimeOffset() const
+{
+    return m_scoreTimeOffset;
+}
+
+double DurationInterface::GetRealTimeOffsetMilliseconds() const
+{
+    return m_realTimeOffsetMilliseconds;
+}
+
+double DurationInterface::GetScoreTimeTiedDuration() const
+{
+    return m_scoreTimeTiedDuration;
+}
+
+double DurationInterface::GetScoreTimeDuration() const
+{
+    return this->GetScoreTimeOffset() - this->GetScoreTimeOnset();
+}
+
+//----------------------------------------------------------------------------
+// Interface pseudo functor (redirected)
+//----------------------------------------------------------------------------
+
+int DurationInterface::InterfaceGenerateTimemap(FunctorParams *functorParams, Object *object)
+{
+    GenerateTimemapParams *params = vrv_params_cast<GenerateTimemapParams *>(functorParams);
+    assert(params);
+
+    double realTimeStart = params->m_realTimeOffsetMilliseconds + this->GetRealTimeOnsetMilliseconds();
+    double scoreTimeStart = params->m_scoreTimeOffset + this->GetScoreTimeOnset();
+
+    double realTimeEnd = params->m_realTimeOffsetMilliseconds + this->GetRealTimeOffsetMilliseconds();
+    double scoreTimeEnd = params->m_scoreTimeOffset + this->GetScoreTimeOffset();
+
+    bool isRest = (object->Is(REST));
+
+    TimemapEntry startEntry;
+    if (params->m_timemap.count(realTimeStart) > 0) startEntry = params->m_timemap.at(realTimeStart);
+
+    // Should check if value for realTimeStart already exists and if so, then
+    // ensure that it is equal to scoreTimeStart:
+    startEntry.qstamp = scoreTimeStart;
+
+    // Store the element ID in list to turn on at given time - note or rest
+    if (!isRest) startEntry.notesOn.push_back(object->GetUuid());
+    if (isRest) startEntry.restsOn.push_back(object->GetUuid());
+
+    TimemapEntry endEntry;
+    if (params->m_timemap.count(realTimeEnd) > 0) endEntry = params->m_timemap.at(realTimeEnd);
+
+    // Should check if value for realTimeEnd already exists and if so, then
+    // ensure that it is equal to scoreTimeEnd:
+    endEntry.qstamp = scoreTimeEnd;
+
+    // Store the element ID in list to turn off at given time - notes or rest
+    if (!isRest) endEntry.notesOff.push_back(object->GetUuid());
+    if (isRest) endEntry.restsOff.push_back(object->GetUuid());
+
+    startEntry.tempo = params->m_currentTempo;
+
+    // Update the timemap
+    params->m_timemap[realTimeStart] = startEntry;
+    params->m_timemap[realTimeEnd] = endEntry;
+
+    return FUNCTOR_SIBLINGS;
+}
+
 } // namespace vrv
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index e1fdc978a16..9867c23c4cf 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -2406,6 +2406,15 @@ int LayerElement::CalcOnsetOffset(FunctorParams *functorParams)
         incrementScoreTime = incrementScoreTime / (DUR_MAX / DURATION_4);
         params->m_currentScoreTime += incrementScoreTime;
         params->m_currentRealTimeSeconds += incrementScoreTime * 60.0 / params->m_currentTempo;
+        // For rests to be possibly added to the timemap
+        if (element->Is(REST)) {
+            Rest *rest = vrv_cast<Rest *>(element);
+            double realTimeIncrementSeconds = incrementScoreTime * 60.0 / params->m_currentTempo;
+            rest->SetScoreTimeOnset(params->m_currentScoreTime);
+            rest->SetRealTimeOnsetSeconds(params->m_currentRealTimeSeconds);
+            rest->SetScoreTimeOffset(params->m_currentScoreTime + incrementScoreTime);
+            rest->SetRealTimeOffsetSeconds(params->m_currentRealTimeSeconds + realTimeIncrementSeconds);
+        }
     }
     else if (element->Is(NOTE)) {
         Note *note = vrv_cast<Note *>(element);
diff --git a/src/note.cpp b/src/note.cpp
index a1f791e82af..222d4b9d233 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -117,12 +117,6 @@ void Note::Reset()
 
     m_drawingLoc = 0;
     m_flippedNotehead = false;
-
-    m_scoreTimeOnset = 0.0;
-    m_scoreTimeOffset = 0.0;
-    m_realTimeOnsetMilliseconds = 0;
-    m_realTimeOffsetMilliseconds = 0;
-    m_scoreTimeTiedDuration = 0.0;
 }
 
 bool Note::IsSupportedChild(Object *child)
@@ -554,33 +548,6 @@ bool Note::IsEnharmonicWith(Note *note)
     return (this->GetMIDIPitch() == note->GetMIDIPitch());
 }
 
-void Note::SetScoreTimeOnset(double scoreTime)
-{
-    m_scoreTimeOnset = scoreTime;
-}
-
-void Note::SetRealTimeOnsetSeconds(double timeInSeconds)
-{
-    // m_realTimeOnsetMilliseconds = int(timeInSeconds * 1000.0 + 0.5);
-    m_realTimeOnsetMilliseconds = timeInSeconds * 1000.0;
-}
-
-void Note::SetScoreTimeOffset(double scoreTime)
-{
-    m_scoreTimeOffset = scoreTime;
-}
-
-void Note::SetRealTimeOffsetSeconds(double timeInSeconds)
-{
-    // m_realTimeOffsetMilliseconds = int(timeInSeconds * 1000.0 + 0.5);
-    m_realTimeOffsetMilliseconds = timeInSeconds * 1000.0;
-}
-
-void Note::SetScoreTimeTiedDuration(double scoreTime)
-{
-    m_scoreTimeTiedDuration = scoreTime;
-}
-
 int Note::GetMIDIPitch(const int shift)
 {
     int pitch = 0;
@@ -624,36 +591,6 @@ int Note::GetMIDIPitch(const int shift)
     return pitch + shift;
 }
 
-double Note::GetScoreTimeOnset() const
-{
-    return m_scoreTimeOnset;
-}
-
-double Note::GetRealTimeOnsetMilliseconds() const
-{
-    return m_realTimeOnsetMilliseconds;
-}
-
-double Note::GetScoreTimeOffset() const
-{
-    return m_scoreTimeOffset;
-}
-
-double Note::GetRealTimeOffsetMilliseconds() const
-{
-    return m_realTimeOffsetMilliseconds;
-}
-
-double Note::GetScoreTimeTiedDuration() const
-{
-    return m_scoreTimeTiedDuration;
-}
-
-double Note::GetScoreTimeDuration() const
-{
-    return this->GetScoreTimeOffset() - this->GetScoreTimeOnset();
-}
-
 int Note::GetChromaticAlteration()
 {
     Accid *accid = this->GetDrawingAccid();
@@ -1457,35 +1394,10 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
 
 int Note::GenerateTimemap(FunctorParams *functorParams)
 {
-    GenerateTimemapParams *params = vrv_params_cast<GenerateTimemapParams *>(functorParams);
-    assert(params);
-
     Note *note = vrv_cast<Note *>(this->ThisOrSameasAsLink());
     assert(note);
 
-    double realTimeStart = params->m_realTimeOffsetMilliseconds + note->GetRealTimeOnsetMilliseconds();
-    double scoreTimeStart = params->m_scoreTimeOffset + note->GetScoreTimeOnset();
-
-    double realTimeEnd = params->m_realTimeOffsetMilliseconds + note->GetRealTimeOffsetMilliseconds();
-    double scoreTimeEnd = params->m_scoreTimeOffset + note->GetScoreTimeOffset();
-
-    // Should check if value for realTimeStart already exists and if so, then
-    // ensure that it is equal to scoreTimeStart:
-    params->realTimeToScoreTime[realTimeStart] = scoreTimeStart;
-
-    // Store the element ID in list to turn on at given time.
-    params->realTimeToOnElements[realTimeStart].push_back(this->GetUuid());
-
-    // Should check if value for realTimeEnd already exists and if so, then
-    // ensure that it is equal to scoreTimeEnd:
-    params->realTimeToScoreTime[realTimeEnd] = scoreTimeEnd;
-
-    // Store the element ID in list to turn off at given time.
-    params->realTimeToOffElements[realTimeEnd].push_back(this->GetUuid());
-
-    params->realTimeToTempo[realTimeStart] = params->m_currentTempo;
-
-    return FUNCTOR_SIBLINGS;
+    return note->InterfaceGenerateTimemap(functorParams, note);
 }
 
 int Note::Transpose(FunctorParams *functorParams)
diff --git a/src/rest.cpp b/src/rest.cpp
index 8c997932944..45a79c21152 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -732,4 +732,12 @@ int Rest::Transpose(FunctorParams *functorParams)
     return FUNCTOR_SIBLINGS;
 }
 
+int Rest::GenerateTimemap(FunctorParams *functorParams)
+{
+    GenerateTimemapParams *params = vrv_params_cast<GenerateTimemapParams *>(functorParams);
+    assert(params);
+
+    return this->InterfaceGenerateTimemap(functorParams, this);
+}
+
 } // namespace vrv

From 3ed7876ba7499f277795f119f4943254e1ea18b6 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 22:15:33 +0100
Subject: [PATCH 160/403] Add parameters to Toolkit::RenderToTimemap and use
 jsonxx for the timemap generation

---
 emscripten/verovio-proxy.js |   6 +-
 include/vrv/doc.h           |   5 +-
 include/vrv/functorparams.h |  30 ++++++---
 include/vrv/toolkit.h       |   6 +-
 src/doc.cpp                 | 130 ++++++++++++++++--------------------
 src/measure.cpp             |  16 +++++
 src/toolkit.cpp             |  28 ++++++--
 7 files changed, 121 insertions(+), 100 deletions(-)

diff --git a/emscripten/verovio-proxy.js b/emscripten/verovio-proxy.js
index 481f19b2d15..6f585983949 100644
--- a/emscripten/verovio-proxy.js
+++ b/emscripten/verovio-proxy.js
@@ -97,7 +97,7 @@ verovio.vrvToolkit.renderToPAE = Module.cwrap( 'vrvToolkit_renderToPAE', 'string
 verovio.vrvToolkit.renderToSVG = Module.cwrap( 'vrvToolkit_renderToSVG', 'string', ['number', 'number', 'string'] );
 
 // char *renderToTimemap(Toolkit *ic)
-verovio.vrvToolkit.renderToTimemap = Module.cwrap( 'vrvToolkit_renderToTimemap', 'string', ['number'] );
+verovio.vrvToolkit.renderToTimemap = Module.cwrap( 'vrvToolkit_renderToTimemap', 'string', ['number', 'string'] );
 
 // void resetXmlIdSeed(Toolkit *ic, int seed) 
 verovio.vrvToolkit.resetXmlIdSeed = Module.cwrap( 'vrvToolkit_resetXmlIdSeed', null, ['number', 'number'] );
@@ -295,9 +295,9 @@ verovio.toolkit.prototype.renderToSVG = function ( pageNo, options )
     return verovio.vrvToolkit.renderToSVG( this.ptr, pageNo, JSON.stringify( options ) );
 };
 
-verovio.toolkit.prototype.renderToTimemap = function ()
+verovio.toolkit.prototype.renderToTimemap = function ( options = {})
 {
-    return JSON.parse( verovio.vrvToolkit.renderToTimemap( this.ptr ) );
+    return JSON.parse( verovio.vrvToolkit.renderToTimemap( this.ptr, JSON.stringify( options ) ) );
 };
 
 verovio.toolkit.prototype.resetXmlIdSeed = function ( seed )
diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index 84fdc82194e..7e9032d1c9a 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -222,10 +222,7 @@ class Doc : public Object {
      * Extract a timemap from the document to a JSON string.
      * Run trough all the layers and fill the timemap file content.
      */
-    bool ExportTimemap(std::string &output);
-    void PrepareJsonTimemap(std::string &output, std::map<double, double> &realTimeToScoreTime,
-        std::map<double, std::vector<std::string>> &realTimeToOnElements,
-        std::map<double, std::vector<std::string>> &realTimeToOffElements, std::map<double, double> &realTimeToTempo);
+    bool ExportTimemap(std::string &output, bool includeRests, bool includeMeasures);
 
     /**
      * Extract music features to JSON string.
diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 307c0111b8e..0088f2cfaa9 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1626,13 +1626,24 @@ class GenerateMIDIParams : public FunctorParams {
 //----------------------------------------------------------------------------
 
 /**
- * member 0: mapping of real times to score times
- * member 1: mapping of real times to elements which should be highlighted at time
- * member 2: mapping of real times to elements which should be unhighlighted at time
- * member 3: mapping of real times to tempos
- * member 4: Score time from the start of the piece to previous barline in quarter notes
- * member 5: Real time from the start of the piece to previous barline in ms
- * member 6: Currently active tempo
+ * Helper struct to store timemap entries
+ */
+struct TimemapEntry {
+    double tempo = -1000.0;
+    double qstamp;
+    std::vector<std::string> notesOn;
+    std::vector<std::string> notesOff;
+    std::vector<std::string> restsOn;
+    std::vector<std::string> restsOff;
+    std::string measureOn;
+};
+
+/**
+ * member 0: mapping of real times with TimemapEntry
+ * member 1: Score time from the start of the piece to previous barline in quarter notes
+ * member 2: Real time from the start of the piece to previous barline in ms
+ * member 3: Currently active tempo
+ * member 4: The functor for redirection
  **/
 
 class GenerateTimemapParams : public FunctorParams {
@@ -1644,10 +1655,7 @@ class GenerateTimemapParams : public FunctorParams {
         m_currentTempo = 120.0;
         m_functor = functor;
     }
-    std::map<double, double> realTimeToScoreTime;
-    std::map<double, std::vector<std::string>> realTimeToOnElements;
-    std::map<double, std::vector<std::string>> realTimeToOffElements;
-    std::map<double, double> realTimeToTempo;
+    std::map<double, TimemapEntry> m_timemap;
     double m_scoreTimeOffset;
     double m_realTimeOffsetMilliseconds;
     double m_currentTempo;
diff --git a/include/vrv/toolkit.h b/include/vrv/toolkit.h
index 3734f912456..18d38e7919b 100644
--- a/include/vrv/toolkit.h
+++ b/include/vrv/toolkit.h
@@ -380,9 +380,10 @@ class Toolkit {
     /**
      * Render a document to a timemap
      *
+     * @param jsonOptions A stringified JSON objects with the timemap options
      * @return The timemap as a string
      */
-    std::string RenderToTimemap();
+    std::string RenderToTimemap(const std::string &jsonOptions = "");
 
     /**
      * Render a document to timemap and save it to the file
@@ -390,9 +391,10 @@ class Toolkit {
      * This methods is not available in the JavaScript version of the toolkit.
      *
      * @param @filename The output filename
+     * @param jsonOptions A stringified JSON objects with the timemap options
      * @return True if the file was successfully written
      */
-    bool RenderToTimemapFile(const std::string &filename);
+    bool RenderToTimemapFile(const std::string &filename, const std::string &jsonOptions = "");
 
     //@}
 
diff --git a/src/doc.cpp b/src/doc.cpp
index f266071b504..0c1c8da42d7 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -395,7 +395,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     }
 }
 
-bool Doc::ExportTimemap(std::string &output)
+bool Doc::ExportTimemap(std::string &output, bool includeRests, bool includeMeasures)
 {
     if (!Doc::HasMidiTimemap()) {
         // generate MIDI timemap before progressing
@@ -410,8 +410,62 @@ bool Doc::ExportTimemap(std::string &output)
     GenerateTimemapParams generateTimemapParams(&generateTimemap);
     this->Process(&generateTimemap, &generateTimemapParams);
 
-    PrepareJsonTimemap(output, generateTimemapParams.realTimeToScoreTime, generateTimemapParams.realTimeToOnElements,
-        generateTimemapParams.realTimeToOffElements, generateTimemapParams.realTimeToTempo);
+    includeRests = true;
+    includeMeasures = true;
+
+    double currentTempo = -1000.0;
+    double newTempo;
+
+    jsonxx::Array timemap;
+
+    for (auto &[tstamp, entry] : generateTimemapParams.m_timemap) {
+        jsonxx::Object o;
+        o << "tstamp" << tstamp;
+        o << "qstamp" << entry.qstamp;
+
+        // on / off
+        if (!entry.notesOn.empty()) {
+            jsonxx::Array notesOn;
+            for (auto note : entry.notesOn) notesOn << note;
+            o << "on" << notesOn;
+        }
+        if (!entry.notesOff.empty()) {
+            jsonxx::Array notesOff;
+            for (auto note : entry.notesOff) notesOff << note;
+            o << "off" << notesOff;
+        }
+
+        // restsOn / restsOff
+        if (includeRests) {
+            if (!entry.restsOn.empty()) {
+                jsonxx::Array restsOn;
+                for (auto rest : entry.restsOn) restsOn << rest;
+                o << "restsOn" << restsOn;
+            }
+            if (!entry.restsOff.empty()) {
+                jsonxx::Array restsOff;
+                for (auto rest : entry.restsOff) restsOff << rest;
+                o << "restsOff" << restsOff;
+            }
+        }
+
+        // tempo
+        if (entry.tempo != -1000.0) {
+            newTempo = entry.tempo;
+            if (newTempo != currentTempo) {
+                currentTempo = newTempo;
+                o << "tempo" << std::to_string(currentTempo);
+            }
+        }
+
+        // measureOn
+        if (includeMeasures && !entry.measureOn.empty()) {
+            o << "measureOn" << entry.measureOn;
+        }
+
+        timemap << o;
+    }
+    output = timemap.json();
 
     return true;
 }
@@ -436,76 +490,6 @@ bool Doc::ExportFeatures(std::string &output, const std::string &options)
     return true;
 }
 
-void Doc::PrepareJsonTimemap(std::string &output, std::map<double, double> &realTimeToScoreTime,
-    std::map<double, std::vector<std::string>> &realTimeToOnElements,
-    std::map<double, std::vector<std::string>> &realTimeToOffElements, std::map<double, double> &realTimeToTempo)
-{
-
-    double currentTempo = -1000.0;
-    double newTempo;
-    int mapsize = (int)realTimeToScoreTime.size();
-    output = "";
-    output.reserve(mapsize * 100); // Estimate 100 characters for each entry.
-    output += "[\n";
-    auto lastit = realTimeToScoreTime.end();
-    lastit--;
-    for (auto it = realTimeToScoreTime.begin(); it != realTimeToScoreTime.end(); ++it) {
-        output += "\t{\n";
-        output += "\t\t\"tstamp\":\t";
-        output += std::to_string(it->first);
-        output += ",\n";
-        output += "\t\t\"qstamp\":\t";
-        output += std::to_string(it->second);
-
-        auto ittempo = realTimeToTempo.find(it->first);
-        if (ittempo != realTimeToTempo.end()) {
-            newTempo = ittempo->second;
-            if (newTempo != currentTempo) {
-                currentTempo = newTempo;
-                output += ",\n\t\t\"tempo\":\t";
-                output += std::to_string(currentTempo);
-            }
-        }
-
-        auto iton = realTimeToOnElements.find(it->first);
-        if (iton != realTimeToOnElements.end()) {
-            output += ",\n\t\t\"on\":\t[";
-            for (int ion = 0; ion < (int)iton->second.size(); ++ion) {
-                output += "\"";
-                output += iton->second[ion];
-                output += "\"";
-                if (ion < (int)iton->second.size() - 1) {
-                    output += ", ";
-                }
-            }
-            output += "]";
-        }
-
-        auto itoff = realTimeToOffElements.find(it->first);
-        if (itoff != realTimeToOffElements.end()) {
-            output += ",\n\t\t\"off\":\t[";
-            for (int ioff = 0; ioff < (int)itoff->second.size(); ++ioff) {
-                output += "\"";
-                output += itoff->second[ioff];
-                output += "\"";
-                if (ioff < (int)itoff->second.size() - 1) {
-                    output += ", ";
-                }
-            }
-            output += "]";
-        }
-
-        output += "\n\t}";
-        if (it == lastit) {
-            output += "\n";
-        }
-        else {
-            output += ",\n";
-        }
-    }
-    output += "]\n";
-}
-
 void Doc::PrepareDrawing()
 {
     if (m_drawingPreparationDone) {
diff --git a/src/measure.cpp b/src/measure.cpp
index a18ffca3372..dca7d7155e1 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -1553,6 +1553,22 @@ int Measure::GenerateTimemap(FunctorParams *functorParams)
     params->m_realTimeOffsetMilliseconds = m_realTimeOffsetMilliseconds.back();
     params->m_currentTempo = m_currentTempo;
 
+    double scoreTimeStart = params->m_scoreTimeOffset;
+    double realTimeStart = params->m_realTimeOffsetMilliseconds;
+
+    TimemapEntry startEntry;
+    if (params->m_timemap.count(realTimeStart) > 0) startEntry = params->m_timemap.at(realTimeStart);
+
+    // Should check if value for realTimeStart already exists and if so, then
+    // ensure that it is equal to scoreTimeStart:
+    startEntry.qstamp = scoreTimeStart;
+
+    // Add the measureOn
+    startEntry.measureOn = this->GetUuid();
+
+    // Update the timemap
+    params->m_timemap[realTimeStart] = startEntry;
+
     return FUNCTOR_CONTINUE;
 }
 
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index d482e7360dd..d81cce1c301 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -1399,12 +1399,29 @@ bool Toolkit::RenderToPAEFile(const std::string &filename)
     return true;
 }
 
-std::string Toolkit::RenderToTimemap()
+std::string Toolkit::RenderToTimemap(const std::string &jsonOptions)
 {
+    bool includeMeasures = true;
+    bool includeRests = true;
+
+    jsonxx::Object json;
+
+    // Read JSON options if not empty
+    if (!jsonOptions.empty()) {
+        if (!json.parse(jsonOptions)) {
+            LogWarning("Cannot parse JSON std::string. Using default options.");
+        }
+        else {
+            if (json.has<jsonxx::Boolean>("includeMeasures"))
+                includeMeasures = json.get<jsonxx::Boolean>("includeMeasures");
+            if (json.has<jsonxx::Boolean>("includeRests")) includeRests = json.get<jsonxx::Boolean>("includeRests");
+        }
+    }
+
     this->ResetLogBuffer();
 
     std::string output;
-    m_doc.ExportTimemap(output);
+    m_doc.ExportTimemap(output, includeRests, includeMeasures);
     return output;
 }
 
@@ -1476,12 +1493,9 @@ bool Toolkit::RenderToMIDIFile(const std::string &filename)
     return true;
 }
 
-bool Toolkit::RenderToTimemapFile(const std::string &filename)
+bool Toolkit::RenderToTimemapFile(const std::string &filename, const std::string &jsonOptions)
 {
-    this->ResetLogBuffer();
-
-    std::string outputString;
-    m_doc.ExportTimemap(outputString);
+    std::string outputString = this->RenderToTimemap(jsonOptions);
 
     std::ofstream output(filename.c_str());
     if (!output.is_open()) {

From de3ef2f5d82ec55e38075a3ac5b1a90d1f0b199c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 22:28:49 +0100
Subject: [PATCH 161/403] Remove parameters overwrite

---
 src/doc.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/doc.cpp b/src/doc.cpp
index 0c1c8da42d7..cf816616616 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -410,9 +410,6 @@ bool Doc::ExportTimemap(std::string &output, bool includeRests, bool includeMeas
     GenerateTimemapParams generateTimemapParams(&generateTimemap);
     this->Process(&generateTimemap, &generateTimemapParams);
 
-    includeRests = true;
-    includeMeasures = true;
-
     double currentTempo = -1000.0;
     double newTempo;
 

From 67782e485ca72d5228c3e605e915ceda67194988 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 27 Jan 2022 22:40:39 +0100
Subject: [PATCH 162/403] Fix order for rests (add values before
 incrementation)

---
 src/layerelement.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 9867c23c4cf..715aac25a97 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -2404,8 +2404,6 @@ int LayerElement::CalcOnsetOffset(FunctorParams *functorParams)
         incrementScoreTime = element->GetAlignmentDuration(
             params->m_currentMensur, params->m_currentMeterSig, true, params->m_notationType);
         incrementScoreTime = incrementScoreTime / (DUR_MAX / DURATION_4);
-        params->m_currentScoreTime += incrementScoreTime;
-        params->m_currentRealTimeSeconds += incrementScoreTime * 60.0 / params->m_currentTempo;
         // For rests to be possibly added to the timemap
         if (element->Is(REST)) {
             Rest *rest = vrv_cast<Rest *>(element);
@@ -2415,6 +2413,8 @@ int LayerElement::CalcOnsetOffset(FunctorParams *functorParams)
             rest->SetScoreTimeOffset(params->m_currentScoreTime + incrementScoreTime);
             rest->SetRealTimeOffsetSeconds(params->m_currentRealTimeSeconds + realTimeIncrementSeconds);
         }
+        params->m_currentScoreTime += incrementScoreTime;
+        params->m_currentRealTimeSeconds += incrementScoreTime * 60.0 / params->m_currentTempo;
     }
     else if (element->Is(NOTE)) {
         Note *note = vrv_cast<Note *>(element);

From d2a7a1b9431a34f642f3a4078c8a6972831a7d58 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 28 Jan 2022 08:38:35 +0100
Subject: [PATCH 163/403] Remove unused variable

---
 src/rest.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/rest.cpp b/src/rest.cpp
index 45a79c21152..02b4774de9b 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -734,9 +734,6 @@ int Rest::Transpose(FunctorParams *functorParams)
 
 int Rest::GenerateTimemap(FunctorParams *functorParams)
 {
-    GenerateTimemapParams *params = vrv_params_cast<GenerateTimemapParams *>(functorParams);
-    assert(params);
-
     return this->InterfaceGenerateTimemap(functorParams, this);
 }
 

From 2c16bb8e247b2ad2df8e8b5305f568956ca6294a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 28 Jan 2022 08:58:02 +0100
Subject: [PATCH 164/403] Adjust Toolkit::GetElementsAtTime to include rests
 and measure

---
 include/vrv/comparison.h | 13 +++++++------
 src/toolkit.cpp          | 26 +++++++++++++++++---------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/include/vrv/comparison.h b/include/vrv/comparison.h
index ae0b46c723e..fce69e014d3 100644
--- a/include/vrv/comparison.h
+++ b/include/vrv/comparison.h
@@ -454,25 +454,26 @@ class MeasureOnsetOffsetComparison : public ClassIdComparison {
 };
 
 //----------------------------------------------------------------------------
-// NoteOnsetOffsetComparison
+// NoteOrRestOnsetOffsetComparison
 //----------------------------------------------------------------------------
 
 /**
  * This class evaluates if the object is a note being played at the given time.
  */
-class NoteOnsetOffsetComparison : public ClassIdComparison {
+class NoteOrRestOnsetOffsetComparison : public ClassIdsComparison {
 
 public:
-    NoteOnsetOffsetComparison(const int time) : ClassIdComparison(NOTE) { m_time = time; }
+    NoteOrRestOnsetOffsetComparison(const int time) : ClassIdsComparison({ NOTE, REST }) { m_time = time; }
 
     void SetTime(int time) { m_time = time; }
 
     bool operator()(Object *object) override
     {
         if (!MatchesType(object)) return false;
-        Note *note = vrv_cast<Note *>(object);
-        assert(note);
-        return ((m_time >= note->GetRealTimeOnsetMilliseconds()) && (m_time <= note->GetRealTimeOffsetMilliseconds()));
+        DurationInterface *interface = object->GetDurationInterface();
+        assert(interface);
+        return ((m_time >= interface->GetRealTimeOnsetMilliseconds())
+            && (m_time <= interface->GetRealTimeOffsetMilliseconds()));
     }
 
 private:
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index d81cce1c301..4a4ec89ad10 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -1432,6 +1432,7 @@ std::string Toolkit::GetElementsAtTime(int millisec)
     jsonxx::Object o;
     jsonxx::Array noteArray;
     jsonxx::Array chordArray;
+    jsonxx::Array restArray;
 
     // Here we need to check that the midi timemap is done
     if (!m_doc.HasMidiTimemap()) {
@@ -1454,19 +1455,24 @@ std::string Toolkit::GetElementsAtTime(int millisec)
     Page *page = dynamic_cast<Page *>(measure->GetFirstAncestor(PAGE));
     if (page) pageNo = page->GetIdx() + 1;
 
-    NoteOnsetOffsetComparison matchNoteTime(millisec - measureTimeOffset);
-    ListOfObjects notes;
+    NoteOrRestOnsetOffsetComparison matchTime(millisec - measureTimeOffset);
+    ListOfObjects notesOrRests;
     ListOfObjects chords;
 
-    measure->FindAllDescendantsByComparison(&notes, &matchNoteTime);
+    measure->FindAllDescendantsByComparison(&notesOrRests, &matchTime);
 
     // Fill the JSON object
-    for (auto const item : notes) {
-        noteArray << item->GetUuid();
-        Note *note = vrv_cast<Note *>(item);
-        assert(note);
-        Chord *chord = note->IsChordTone();
-        if (chord) chords.push_back(chord);
+    for (auto const item : notesOrRests) {
+        if (item->Is(NOTE)) {
+            noteArray << item->GetUuid();
+            Note *note = vrv_cast<Note *>(item);
+            assert(note);
+            Chord *chord = note->IsChordTone();
+            if (chord) chords.push_back(chord);
+        }
+        else if (item->Is(REST)) {
+            restArray << item->GetUuid();
+        }
     }
     chords.unique();
     for (auto const item : chords) {
@@ -1475,7 +1481,9 @@ std::string Toolkit::GetElementsAtTime(int millisec)
 
     o << "notes" << noteArray;
     o << "chords" << chordArray;
+    o << "rests" << restArray;
     o << "page" << pageNo;
+    o << "measure" << measure->GetUuid();
 
     return o.json();
 }

From 96f4bdbafd77ce489ac130283e3cc85043862221 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 28 Jan 2022 10:46:56 +0100
Subject: [PATCH 165/403] Fix typos

---
 include/vrv/page.h | 2 +-
 src/system.cpp     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/vrv/page.h b/include/vrv/page.h
index 7d754cef5cf..d139609bd66 100644
--- a/include/vrv/page.h
+++ b/include/vrv/page.h
@@ -100,7 +100,7 @@ class Page : public Object {
     void LayOutHorizontally();
 
     /**
-     * Layout out the measures horizontally using the cached values.
+     * Lay out the measures horizontally using the cached values.
      * This should be done in preparation of cast-off which is based on measure positioning.
      * The content of the measures is not laid out and keeps previously cached positioning.
      */
diff --git a/src/system.cpp b/src/system.cpp
index f7d4ab52a41..24889e0339a 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1003,8 +1003,6 @@ int System::CastOffPages(FunctorParams *functorParams)
         currentShift += params->m_pgHead2Height + params->m_pgFoot2Height;
     }
 
-    // LogMessage("System: %d", this->GetHeight());
-
     const int systemMaxPerPage = params->m_doc->GetOptions()->m_systemMaxPerPage.GetValue();
     const int childCount = params->m_currentPage->GetChildCount();
     if ((systemMaxPerPage && systemMaxPerPage == childCount)

From cb0ad5f87ccd010423ed1162e5185e893a2b3608 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 13:53:56 +0100
Subject: [PATCH 166/403] Remove DurationInterface GenerateTimemap pseudo
 functor

---
 include/vrv/durationinterface.h |  5 ----
 src/durationinterface.cpp       | 44 ---------------------------------
 2 files changed, 49 deletions(-)

diff --git a/include/vrv/durationinterface.h b/include/vrv/durationinterface.h
index 324643b6056..d58a72c0bf6 100644
--- a/include/vrv/durationinterface.h
+++ b/include/vrv/durationinterface.h
@@ -137,11 +137,6 @@ class DurationInterface : public Interface,
      * classes explicitely. See FloatingObject::FillStaffCurrentTimeSpanning for an example.
      */
 
-    /**
-     * See Object::GenerateTimemap
-     */
-    virtual int InterfaceGenerateTimemap(FunctorParams *functorParams, Object *object);
-
 private:
     /**
      * Calculate the actual duration => translate mensural values
diff --git a/src/durationinterface.cpp b/src/durationinterface.cpp
index 7f8fae8b122..8e8b2d9ea1e 100644
--- a/src/durationinterface.cpp
+++ b/src/durationinterface.cpp
@@ -303,48 +303,4 @@ double DurationInterface::GetScoreTimeDuration() const
 // Interface pseudo functor (redirected)
 //----------------------------------------------------------------------------
 
-int DurationInterface::InterfaceGenerateTimemap(FunctorParams *functorParams, Object *object)
-{
-    GenerateTimemapParams *params = vrv_params_cast<GenerateTimemapParams *>(functorParams);
-    assert(params);
-
-    double realTimeStart = params->m_realTimeOffsetMilliseconds + this->GetRealTimeOnsetMilliseconds();
-    double scoreTimeStart = params->m_scoreTimeOffset + this->GetScoreTimeOnset();
-
-    double realTimeEnd = params->m_realTimeOffsetMilliseconds + this->GetRealTimeOffsetMilliseconds();
-    double scoreTimeEnd = params->m_scoreTimeOffset + this->GetScoreTimeOffset();
-
-    bool isRest = (object->Is(REST));
-
-    TimemapEntry startEntry;
-    if (params->m_timemap.count(realTimeStart) > 0) startEntry = params->m_timemap.at(realTimeStart);
-
-    // Should check if value for realTimeStart already exists and if so, then
-    // ensure that it is equal to scoreTimeStart:
-    startEntry.qstamp = scoreTimeStart;
-
-    // Store the element ID in list to turn on at given time - note or rest
-    if (!isRest) startEntry.notesOn.push_back(object->GetUuid());
-    if (isRest) startEntry.restsOn.push_back(object->GetUuid());
-
-    TimemapEntry endEntry;
-    if (params->m_timemap.count(realTimeEnd) > 0) endEntry = params->m_timemap.at(realTimeEnd);
-
-    // Should check if value for realTimeEnd already exists and if so, then
-    // ensure that it is equal to scoreTimeEnd:
-    endEntry.qstamp = scoreTimeEnd;
-
-    // Store the element ID in list to turn off at given time - notes or rest
-    if (!isRest) endEntry.notesOff.push_back(object->GetUuid());
-    if (isRest) endEntry.restsOff.push_back(object->GetUuid());
-
-    startEntry.tempo = params->m_currentTempo;
-
-    // Update the timemap
-    params->m_timemap[realTimeStart] = startEntry;
-    params->m_timemap[realTimeEnd] = endEntry;
-
-    return FUNCTOR_SIBLINGS;
-}
-
 } // namespace vrv

From 7bd6fa666c0b7b3ce7ddd4bd25062ce98d6c8219 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 13:54:43 +0100
Subject: [PATCH 167/403] Change GenerateTimemapParams to use Timemap class

---
 include/vrv/functorparams.h | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 606fe040643..03617319926 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -57,6 +57,7 @@ class StemmedDrawingInterface;
 class Syl;
 class System;
 class SystemAligner;
+class Timemap;
 class Transposer;
 class TupletNum;
 class Turn;
@@ -1631,19 +1632,6 @@ class GenerateMIDIParams : public FunctorParams {
 // GenerateTimemapParams
 //----------------------------------------------------------------------------
 
-/**
- * Helper struct to store timemap entries
- */
-struct TimemapEntry {
-    double tempo = -1000.0;
-    double qstamp;
-    std::vector<std::string> notesOn;
-    std::vector<std::string> notesOff;
-    std::vector<std::string> restsOn;
-    std::vector<std::string> restsOff;
-    std::string measureOn;
-};
-
 /**
  * member 0: mapping of real times with TimemapEntry
  * member 1: Score time from the start of the piece to previous barline in quarter notes
@@ -1654,17 +1642,18 @@ struct TimemapEntry {
 
 class GenerateTimemapParams : public FunctorParams {
 public:
-    GenerateTimemapParams(Functor *functor)
+    GenerateTimemapParams(Timemap *timemap, Functor *functor)
     {
         m_scoreTimeOffset = 0.0;
         m_realTimeOffsetMilliseconds = 0;
         m_currentTempo = 120.0;
+        m_timemap = timemap;
         m_functor = functor;
     }
-    std::map<double, TimemapEntry> m_timemap;
     double m_scoreTimeOffset;
     double m_realTimeOffsetMilliseconds;
     double m_currentTempo;
+    Timemap *m_timemap;
     Functor *m_functor;
 };
 

From 070895b892aa63c4e91692fbe58fa7eedc572eb0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 13:55:38 +0100
Subject: [PATCH 168/403] Add Timemap class

---
 Verovio.xcodeproj/project.pbxproj |  16 +++
 include/vrv/timemap.h             |  79 +++++++++++++
 src/timemap.cpp                   | 177 ++++++++++++++++++++++++++++++
 3 files changed, 272 insertions(+)
 create mode 100644 include/vrv/timemap.h
 create mode 100644 src/timemap.cpp

diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
index b4c2e36b470..e905a8ea6d3 100644
--- a/Verovio.xcodeproj/project.pbxproj
+++ b/Verovio.xcodeproj/project.pbxproj
@@ -648,6 +648,12 @@
 		4DCB7AA426D3C9600047F01D /* crc.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DCB7AA226D3C9600047F01D /* crc.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4DD11DC42240E78B00A405D8 /* c_wrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD11DC22240E78B00A405D8 /* c_wrapper.cpp */; };
 		4DD11DC52240E78B00A405D8 /* c_wrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD11DC32240E78B00A405D8 /* c_wrapper.h */; };
+		4DD7C0FC27A55CEA00B9C017 /* timemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD7C0FB27A55CEA00B9C017 /* timemap.cpp */; };
+		4DD7C0FD27A55CEA00B9C017 /* timemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD7C0FB27A55CEA00B9C017 /* timemap.cpp */; };
+		4DD7C0FF27A55CFD00B9C017 /* timemap.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD7C0FE27A55CFD00B9C017 /* timemap.h */; };
+		4DD7C10027A55CFD00B9C017 /* timemap.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD7C0FE27A55CFD00B9C017 /* timemap.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4DD7C10127A5650600B9C017 /* timemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD7C0FB27A55CEA00B9C017 /* timemap.cpp */; };
+		4DD7C10227A5650600B9C017 /* timemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD7C0FB27A55CEA00B9C017 /* timemap.cpp */; };
 		4DDBBB571C7AE43E00054AFF /* hairpin.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DDBBB551C7AE43E00054AFF /* hairpin.h */; };
 		4DDBBB581C7AE43E00054AFF /* dynam.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DDBBB561C7AE43E00054AFF /* dynam.h */; };
 		4DDBBB5B1C7AE45900054AFF /* dynam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DDBBB591C7AE45900054AFF /* dynam.cpp */; };
@@ -1547,6 +1553,8 @@
 		4DCB7AA226D3C9600047F01D /* crc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crc.h; path = include/crc/crc.h; sourceTree = SOURCE_ROOT; };
 		4DD11DC22240E78B00A405D8 /* c_wrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = c_wrapper.cpp; path = tools/c_wrapper.cpp; sourceTree = "<group>"; };
 		4DD11DC32240E78B00A405D8 /* c_wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = c_wrapper.h; path = tools/c_wrapper.h; sourceTree = "<group>"; };
+		4DD7C0FB27A55CEA00B9C017 /* timemap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = timemap.cpp; path = src/timemap.cpp; sourceTree = "<group>"; };
+		4DD7C0FE27A55CFD00B9C017 /* timemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = timemap.h; path = include/vrv/timemap.h; sourceTree = "<group>"; };
 		4DDBBB551C7AE43E00054AFF /* hairpin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hairpin.h; path = include/vrv/hairpin.h; sourceTree = "<group>"; };
 		4DDBBB561C7AE43E00054AFF /* dynam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynam.h; path = include/vrv/dynam.h; sourceTree = "<group>"; };
 		4DDBBB591C7AE45900054AFF /* dynam.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dynam.cpp; path = src/dynam.cpp; sourceTree = "<group>"; };
@@ -2210,6 +2218,8 @@
 				E79ADDC326BD1AE900527E4B /* runtimeclock.h */,
 				4D98CCDA25D26E3C00DC7A2C /* smufl.cpp */,
 				4D1D733B1A1D0390001E08F6 /* smufl.h */,
+				4DD7C0FB27A55CEA00B9C017 /* timemap.cpp */,
+				4DD7C0FE27A55CFD00B9C017 /* timemap.h */,
 				8F086EBF188539540037FD8E /* toolkit.cpp */,
 				8F59291618854BF800FE51AD /* toolkit.h */,
 				4DC3B9E4239E2ABE007F185E /* transposition.cpp */,
@@ -2618,6 +2628,7 @@
 				4D1BE7821C69434C0086DC0E /* MidiFile.h in Headers */,
 				4D9C53121B52E4AE0003C6EC /* core.h in Headers */,
 				4DEC4DD221C8295700D1D273 /* supplied.h in Headers */,
+				4DD7C0FF27A55CFD00B9C017 /* timemap.h in Headers */,
 				4D1BD1B921908D78000D35B2 /* halfmrpt.h in Headers */,
 				4DF4407A1D3D085600152B7E /* functorparams.h in Headers */,
 				4DA0EADD22BB77AF00A7EBEB /* zone.h in Headers */,
@@ -2709,6 +2720,7 @@
 				4D79642726C167200026288B /* pagemilestone.h in Headers */,
 				BB4C4B1C22A932CF001F6AF0 /* arpeg.h in Headers */,
 				BB4C4B2A22A932CF001F6AF0 /* harm.h in Headers */,
+				4DD7C10027A55CFD00B9C017 /* timemap.h in Headers */,
 				BB4C4AAC22A932A0001F6AF0 /* svgdevicecontext.h in Headers */,
 				BB4C4ADE22A932BC001F6AF0 /* add.h in Headers */,
 				BB4C4B4C22A932D7001F6AF0 /* custos.h in Headers */,
@@ -3066,6 +3078,7 @@
 				4D1694071E3A44F300569BF4 /* iomusxml.cpp in Sources */,
 				4D7927D120ECCC6D0002A45D /* view_slur.cpp in Sources */,
 				4DF21D1322B3D17D009821DE /* ioabc.cpp in Sources */,
+				4DD7C10127A5650600B9C017 /* timemap.cpp in Sources */,
 				4D1694081E3A44F300569BF4 /* iopae.cpp in Sources */,
 				4D1694091E3A44F300569BF4 /* atts_critapp.cpp in Sources */,
 				4D16940A1E3A44F300569BF4 /* fermata.cpp in Sources */,
@@ -3323,6 +3336,7 @@
 				4D5FA9111E16A93F00F3B919 /* boundingbox.cpp in Sources */,
 				4DC12A841F741110000440E9 /* pgfoot2.cpp in Sources */,
 				8F086EF9188539540037FD8E /* object.cpp in Sources */,
+				4DD7C10227A5650600B9C017 /* timemap.cpp in Sources */,
 				8F086EFA188539540037FD8E /* page.cpp in Sources */,
 				8F086EFB188539540037FD8E /* pitchinterface.cpp in Sources */,
 				BDEF9EC726725234008A3A47 /* caesura.cpp in Sources */,
@@ -3495,6 +3509,7 @@
 				4D4FCD141F54570E0009C455 /* staffdef.cpp in Sources */,
 				4DEC4D7C21C8048700D1D273 /* abbr.cpp in Sources */,
 				403BEFF9206C00FF00D022D5 /* beatrpt.cpp in Sources */,
+				4DD7C0FC27A55CEA00B9C017 /* timemap.cpp in Sources */,
 				8F3DD33C18854B2E0051330C /* barline.cpp in Sources */,
 				4DB3D8D51F83D12B00B5FC2B /* tempo.cpp in Sources */,
 				4DEC4DA021C81E9400D1D273 /* orig.cpp in Sources */,
@@ -3710,6 +3725,7 @@
 				BB4C4B9922A932E5001F6AF0 /* linkinginterface.cpp in Sources */,
 				BB4C4A6A22A9321F001F6AF0 /* atts_externalsymbols.cpp in Sources */,
 				BB4C4AAD22A932A6001F6AF0 /* io.cpp in Sources */,
+				4DD7C0FD27A55CEA00B9C017 /* timemap.cpp in Sources */,
 				BB4C4B2322A932CF001F6AF0 /* dynam.cpp in Sources */,
 				BB4C4B6522A932D7001F6AF0 /* multirest.cpp in Sources */,
 				BB4C4AB322A932A6001F6AF0 /* iohumdrum.cpp in Sources */,
diff --git a/include/vrv/timemap.h b/include/vrv/timemap.h
new file mode 100644
index 00000000000..dbd1f74d7a5
--- /dev/null
+++ b/include/vrv/timemap.h
@@ -0,0 +1,79 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        timemap.h
+// Author:      Laurent Pugin
+// Created:     29/01/2022
+// Copyright (c) Authors and others. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __VRV_TIMEMAP_H__
+#define __VRV_TIMEMAP_H__
+
+#include <assert.h>
+#include <map>
+#include <string>
+#include <vector>
+
+//----------------------------------------------------------------------------
+
+namespace vrv {
+
+class Object;
+class GenerateTimemapParams;
+
+//----------------------------------------------------------------------------
+// TimemapEntry
+//----------------------------------------------------------------------------
+
+/**
+ * Helper struct to store timemap entries
+ */
+struct TimemapEntry {
+    double tempo = -1000.0;
+    double qstamp;
+    std::vector<std::string> notesOn;
+    std::vector<std::string> notesOff;
+    std::vector<std::string> restsOn;
+    std::vector<std::string> restsOff;
+    std::string measureOn;
+};
+
+//----------------------------------------------------------------------------
+// Timemap
+//----------------------------------------------------------------------------
+
+/**
+ * This class represents a clock to measure runtime.
+ */
+class Timemap {
+public:
+    /**
+     * @name Constructors, destructors, and other standard methods
+     */
+    ///@{
+    Timemap();
+    virtual ~Timemap();
+    ///@}
+
+    /** Resets the clock */
+    void Reset();
+
+    void AddEntry(Object *object, GenerateTimemapParams *params);
+
+    /**
+     * Write the current timemap to a JSON string
+     */
+    void ToJson(std::string &output);
+
+private:
+    //
+public:
+    //
+private:
+    /** The time point at which the clock was started */
+    std::map<double, TimemapEntry> m_map;
+
+}; // class Timemap
+
+} // namespace vrv
+
+#endif // __VRV_RUNTIMECLOCK_H__
diff --git a/src/timemap.cpp b/src/timemap.cpp
new file mode 100644
index 00000000000..255d88347a8
--- /dev/null
+++ b/src/timemap.cpp
@@ -0,0 +1,177 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        timemap.cpp
+// Author:      Laurent Pugin
+// Created:     29/01/2022
+// Copyright (c) Authors and others. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+
+#include "timemap.h"
+
+//----------------------------------------------------------------------------
+
+#include <assert.h>
+
+//----------------------------------------------------------------------------
+
+#include "functorparams.h"
+#include "measure.h"
+#include "note.h"
+#include "rest.h"
+#include "vrv.h"
+
+namespace vrv {
+
+//----------------------------------------------------------------------------
+// Timemap
+//----------------------------------------------------------------------------
+
+Timemap::Timemap()
+{
+    this->Reset();
+}
+
+Timemap::~Timemap() {}
+
+void Timemap::Reset() {}
+
+void Timemap::AddEntry(Object *object, GenerateTimemapParams *params)
+{
+    assert(object);
+    assert(params);
+
+    // It is a bit weird to have a timemap parameter, but we need it to call this method from the functor.
+    // Just make sure they are the same because below we use m_map (and not params->m_timemap)
+    assert(params->m_timemap == this);
+
+    TimemapEntry emptyEntry;
+
+    if (object->Is({ NOTE, REST })) {
+        DurationInterface *interface = object->GetDurationInterface();
+        assert(interface);
+
+        double realTimeStart = params->m_realTimeOffsetMilliseconds + interface->GetRealTimeOnsetMilliseconds();
+        double scoreTimeStart = params->m_scoreTimeOffset + interface->GetScoreTimeOnset();
+
+        double realTimeEnd = params->m_realTimeOffsetMilliseconds + interface->GetRealTimeOffsetMilliseconds();
+        double scoreTimeEnd = params->m_scoreTimeOffset + interface->GetScoreTimeOffset();
+
+        bool isRest = (object->Is(REST));
+
+        /*********** start values ***********/
+
+        if (m_map.count(realTimeStart) == 0) {
+            m_map[realTimeStart] = emptyEntry;
+        }
+        TimemapEntry *startEntry = &m_map.at(realTimeStart);
+
+        // Should check if value for realTimeStart already exists and if so, then
+        // ensure that it is equal to scoreTimeStart:
+        startEntry->qstamp = scoreTimeStart;
+
+        // Store the element ID in list to turn on at given time - note or rest
+        if (!isRest) startEntry->notesOn.push_back(object->GetUuid());
+        if (isRest) startEntry->restsOn.push_back(object->GetUuid());
+
+        // Also add the tempo the
+        startEntry->tempo = params->m_currentTempo;
+
+        /*********** end values ***********/
+
+        if (m_map.count(realTimeEnd) == 0) {
+            m_map[realTimeEnd] = emptyEntry;
+        }
+        TimemapEntry *endEntry = &m_map.at(realTimeEnd);
+
+        // Should check if value for realTimeEnd already exists and if so, then
+        // ensure that it is equal to scoreTimeEnd:
+        endEntry->qstamp = scoreTimeEnd;
+
+        // Store the element ID in list to turn off at given time - notes or rest
+        if (!isRest) endEntry->notesOff.push_back(object->GetUuid());
+        if (isRest) endEntry->restsOff.push_back(object->GetUuid());
+    }
+    else if (object->Is(MEASURE)) {
+
+        Measure *measure = vrv_cast<Measure *>(object);
+        assert(measure);
+
+        // Deal with repeated music later, for now get the last times.
+        double scoreTimeStart = params->m_scoreTimeOffset;
+        double realTimeStart = params->m_realTimeOffsetMilliseconds;
+
+        if (m_map.count(realTimeStart) == 0) {
+            m_map[realTimeStart] = emptyEntry;
+        }
+        TimemapEntry *startEntry = &m_map.at(realTimeStart);
+
+        // Should check if value for realTimeStart already exists and if so, then
+        // ensure that it is equal to scoreTimeStart:
+        startEntry->qstamp = scoreTimeStart;
+
+        // Add the measureOn
+        startEntry->measureOn = measure->GetUuid();
+    }
+}
+
+void Timemap::ToJson(std::string &output)
+{
+
+    bool includeRests = true;
+    bool includeMeasures = true;
+
+    double currentTempo = -1000.0;
+    double newTempo;
+
+    jsonxx::Array timemap;
+
+    for (auto &[tstamp, entry] : m_map) {
+        jsonxx::Object o;
+        o << "tstamp" << tstamp;
+        o << "qstamp" << entry.qstamp;
+
+        // on / off
+        if (!entry.notesOn.empty()) {
+            jsonxx::Array notesOn;
+            for (auto note : entry.notesOn) notesOn << note;
+            o << "on" << notesOn;
+        }
+        if (!entry.notesOff.empty()) {
+            jsonxx::Array notesOff;
+            for (auto note : entry.notesOff) notesOff << note;
+            o << "off" << notesOff;
+        }
+
+        // restsOn / restsOff
+        if (includeRests) {
+            if (!entry.restsOn.empty()) {
+                jsonxx::Array restsOn;
+                for (auto rest : entry.restsOn) restsOn << rest;
+                o << "restsOn" << restsOn;
+            }
+            if (!entry.restsOff.empty()) {
+                jsonxx::Array restsOff;
+                for (auto rest : entry.restsOff) restsOff << rest;
+                o << "restsOff" << restsOff;
+            }
+        }
+
+        // tempo
+        if (entry.tempo != -1000.0) {
+            newTempo = entry.tempo;
+            if (newTempo != currentTempo) {
+                currentTempo = newTempo;
+                o << "tempo" << std::to_string(currentTempo);
+            }
+        }
+
+        // measureOn
+        if (includeMeasures && !entry.measureOn.empty()) {
+            o << "measureOn" << entry.measureOn;
+        }
+
+        timemap << o;
+    }
+    output = timemap.json();
+}
+
+} // namespace vrv

From 9dca0cb1eea9f5c83fd27a958c1b0ecca1210772 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 13:56:06 +0100
Subject: [PATCH 169/403] Use Timemap class in Doc::ExportToTimemap

---
 src/doc.cpp | 58 ++++-------------------------------------------------
 1 file changed, 4 insertions(+), 54 deletions(-)

diff --git a/src/doc.cpp b/src/doc.cpp
index 7d7228ec61c..d0c2bdad6cf 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -55,6 +55,7 @@
 #include "syllable.h"
 #include "system.h"
 #include "text.h"
+#include "timemap.h"
 #include "timestamp.h"
 #include "transposition.h"
 #include "verse.h"
@@ -406,63 +407,12 @@ bool Doc::ExportTimemap(std::string &output, bool includeRests, bool includeMeas
         output = "";
         return false;
     }
+    Timemap timemap;
     Functor generateTimemap(&Object::GenerateTimemap);
-    GenerateTimemapParams generateTimemapParams(&generateTimemap);
+    GenerateTimemapParams generateTimemapParams(&timemap, &generateTimemap);
     this->Process(&generateTimemap, &generateTimemapParams);
 
-    double currentTempo = -1000.0;
-    double newTempo;
-
-    jsonxx::Array timemap;
-
-    for (auto &[tstamp, entry] : generateTimemapParams.m_timemap) {
-        jsonxx::Object o;
-        o << "tstamp" << tstamp;
-        o << "qstamp" << entry.qstamp;
-
-        // on / off
-        if (!entry.notesOn.empty()) {
-            jsonxx::Array notesOn;
-            for (auto note : entry.notesOn) notesOn << note;
-            o << "on" << notesOn;
-        }
-        if (!entry.notesOff.empty()) {
-            jsonxx::Array notesOff;
-            for (auto note : entry.notesOff) notesOff << note;
-            o << "off" << notesOff;
-        }
-
-        // restsOn / restsOff
-        if (includeRests) {
-            if (!entry.restsOn.empty()) {
-                jsonxx::Array restsOn;
-                for (auto rest : entry.restsOn) restsOn << rest;
-                o << "restsOn" << restsOn;
-            }
-            if (!entry.restsOff.empty()) {
-                jsonxx::Array restsOff;
-                for (auto rest : entry.restsOff) restsOff << rest;
-                o << "restsOff" << restsOff;
-            }
-        }
-
-        // tempo
-        if (entry.tempo != -1000.0) {
-            newTempo = entry.tempo;
-            if (newTempo != currentTempo) {
-                currentTempo = newTempo;
-                o << "tempo" << std::to_string(currentTempo);
-            }
-        }
-
-        // measureOn
-        if (includeMeasures && !entry.measureOn.empty()) {
-            o << "measureOn" << entry.measureOn;
-        }
-
-        timemap << o;
-    }
-    output = timemap.json();
+    timemap.ToJson(output);
 
     return true;
 }

From cb7da407e983d244f0dea5f13924920014b62c40 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 13:56:33 +0100
Subject: [PATCH 170/403] Use Timemap class in Measure, Note and Rest

---
 src/measure.cpp | 24 +++++-------------------
 src/note.cpp    |  8 +++++++-
 src/rest.cpp    |  8 +++++++-
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/measure.cpp b/src/measure.cpp
index dca7d7155e1..cf88ad7f239 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -36,6 +36,7 @@
 #include "tempo.h"
 #include "tie.h"
 #include "timeinterface.h"
+#include "timemap.h"
 #include "timestamp.h"
 #include "vrv.h"
 
@@ -1548,26 +1549,11 @@ int Measure::GenerateTimemap(FunctorParams *functorParams)
     GenerateTimemapParams *params = vrv_params_cast<GenerateTimemapParams *>(functorParams);
     assert(params);
 
-    // Deal with repeated music later, for now get the last times.
-    params->m_scoreTimeOffset = m_scoreTimeOffset.back();
-    params->m_realTimeOffsetMilliseconds = m_realTimeOffsetMilliseconds.back();
-    params->m_currentTempo = m_currentTempo;
-
-    double scoreTimeStart = params->m_scoreTimeOffset;
-    double realTimeStart = params->m_realTimeOffsetMilliseconds;
-
-    TimemapEntry startEntry;
-    if (params->m_timemap.count(realTimeStart) > 0) startEntry = params->m_timemap.at(realTimeStart);
-
-    // Should check if value for realTimeStart already exists and if so, then
-    // ensure that it is equal to scoreTimeStart:
-    startEntry.qstamp = scoreTimeStart;
-
-    // Add the measureOn
-    startEntry.measureOn = this->GetUuid();
+    params->m_scoreTimeOffset = this->m_scoreTimeOffset.back();
+    params->m_realTimeOffsetMilliseconds = this->m_realTimeOffsetMilliseconds.back();
+    params->m_currentTempo = this->m_currentTempo;
 
-    // Update the timemap
-    params->m_timemap[realTimeStart] = startEntry;
+    params->m_timemap->AddEntry(this, params);
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/note.cpp b/src/note.cpp
index 8509f84c54a..3847ca35d96 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -32,6 +32,7 @@
 #include "syl.h"
 #include "tabgrp.h"
 #include "tie.h"
+#include "timemap.h"
 #include "transposition.h"
 #include "tuning.h"
 #include "verse.h"
@@ -1486,10 +1487,15 @@ int Note::GenerateMIDI(FunctorParams *functorParams)
 
 int Note::GenerateTimemap(FunctorParams *functorParams)
 {
+    GenerateTimemapParams *params = vrv_params_cast<GenerateTimemapParams *>(functorParams);
+    assert(params);
+
     Note *note = vrv_cast<Note *>(this->ThisOrSameasAsLink());
     assert(note);
 
-    return note->InterfaceGenerateTimemap(functorParams, note);
+    params->m_timemap->AddEntry(note, params);
+
+    return FUNCTOR_SIBLINGS;
 }
 
 int Note::Transpose(FunctorParams *functorParams)
diff --git a/src/rest.cpp b/src/rest.cpp
index 02b4774de9b..71868875d6b 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -23,6 +23,7 @@
 #include "smufl.h"
 #include "staff.h"
 #include "system.h"
+#include "timemap.h"
 #include "transposition.h"
 #include "vrv.h"
 
@@ -734,7 +735,12 @@ int Rest::Transpose(FunctorParams *functorParams)
 
 int Rest::GenerateTimemap(FunctorParams *functorParams)
 {
-    return this->InterfaceGenerateTimemap(functorParams, this);
+    GenerateTimemapParams *params = vrv_params_cast<GenerateTimemapParams *>(functorParams);
+    assert(params);
+
+    params->m_timemap->AddEntry(this, params);
+
+    return FUNCTOR_SIBLINGS;
 }
 
 } // namespace vrv

From b2472bea0a37a1be70c18b0a003cd810a9e0e3fa Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 14:05:11 +0100
Subject: [PATCH 171/403] Add missing parameter to the export (rests and
 measures) and cleanup

---
 include/vrv/timemap.h | 14 +++++++++-----
 src/doc.cpp           |  2 +-
 src/timemap.cpp       |  6 +-----
 src/toolkit.cpp       |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/vrv/timemap.h b/include/vrv/timemap.h
index dbd1f74d7a5..676961a01c1 100644
--- a/include/vrv/timemap.h
+++ b/include/vrv/timemap.h
@@ -42,7 +42,7 @@ struct TimemapEntry {
 //----------------------------------------------------------------------------
 
 /**
- * This class represents a clock to measure runtime.
+ * This class holds a timemap for exporting onset / offset values.
  */
 class Timemap {
 public:
@@ -54,26 +54,30 @@ class Timemap {
     virtual ~Timemap();
     ///@}
 
-    /** Resets the clock */
+    /** Resets the timemap */
     void Reset();
 
+    /**
+     * Add an entry to the timemap.
+     * Currently support note and rest (duration interfaces) and measure.
+     */
     void AddEntry(Object *object, GenerateTimemapParams *params);
 
     /**
      * Write the current timemap to a JSON string
      */
-    void ToJson(std::string &output);
+    void ToJson(std::string &output, bool includetRests, bool includetMeasures);
 
 private:
     //
 public:
     //
 private:
-    /** The time point at which the clock was started */
+    /** The map with time values as keys */
     std::map<double, TimemapEntry> m_map;
 
 }; // class Timemap
 
 } // namespace vrv
 
-#endif // __VRV_RUNTIMECLOCK_H__
+#endif // __VRV_TIMEMAP_H__
diff --git a/src/doc.cpp b/src/doc.cpp
index d0c2bdad6cf..00ed4fb6942 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -412,7 +412,7 @@ bool Doc::ExportTimemap(std::string &output, bool includeRests, bool includeMeas
     GenerateTimemapParams generateTimemapParams(&timemap, &generateTimemap);
     this->Process(&generateTimemap, &generateTimemapParams);
 
-    timemap.ToJson(output);
+    timemap.ToJson(output, includeRests, includeMeasures);
 
     return true;
 }
diff --git a/src/timemap.cpp b/src/timemap.cpp
index 255d88347a8..cdf223b7d26 100644
--- a/src/timemap.cpp
+++ b/src/timemap.cpp
@@ -113,12 +113,8 @@ void Timemap::AddEntry(Object *object, GenerateTimemapParams *params)
     }
 }
 
-void Timemap::ToJson(std::string &output)
+void Timemap::ToJson(std::string &output, bool includeRests, bool includeMeasures)
 {
-
-    bool includeRests = true;
-    bool includeMeasures = true;
-
     double currentTempo = -1000.0;
     double newTempo;
 
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index d81cce1c301..9639eed9250 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -1401,8 +1401,8 @@ bool Toolkit::RenderToPAEFile(const std::string &filename)
 
 std::string Toolkit::RenderToTimemap(const std::string &jsonOptions)
 {
-    bool includeMeasures = true;
-    bool includeRests = true;
+    bool includeMeasures = false;
+    bool includeRests = false;
 
     jsonxx::Object json;
 

From d15646d3f82ea3d04239458ff33543bb78303187 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 14:17:16 +0100
Subject: [PATCH 172/403] Clear map in Timemap reset and cleanup

---
 include/vrv/functorparams.h | 8 ++++----
 src/timemap.cpp             | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 03617319926..044fc0f7413 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1633,10 +1633,10 @@ class GenerateMIDIParams : public FunctorParams {
 //----------------------------------------------------------------------------
 
 /**
- * member 0: mapping of real times with TimemapEntry
- * member 1: Score time from the start of the piece to previous barline in quarter notes
- * member 2: Real time from the start of the piece to previous barline in ms
- * member 3: Currently active tempo
+ * member 0: Score time from the start of the piece to previous barline in quarter notes
+ * member 1: Real time from the start of the piece to previous barline in ms
+ * member 2: Currently active tempo
+ * member 3: A pointer to the Timemap
  * member 4: The functor for redirection
  **/
 
diff --git a/src/timemap.cpp b/src/timemap.cpp
index cdf223b7d26..1650b9c40a8 100644
--- a/src/timemap.cpp
+++ b/src/timemap.cpp
@@ -32,7 +32,10 @@ Timemap::Timemap()
 
 Timemap::~Timemap() {}
 
-void Timemap::Reset() {}
+void Timemap::Reset()
+{
+    m_map.clear();
+}
 
 void Timemap::AddEntry(Object *object, GenerateTimemapParams *params)
 {

From a589e60093729eae2a93fcf37e55dd87556c8bbb Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 17:54:38 +0100
Subject: [PATCH 173/403] Fix and cleanup ClassIdComparison and
 ClassIdsComparison operators

---
 include/vrv/comparison.h | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/include/vrv/comparison.h b/include/vrv/comparison.h
index fce69e014d3..35d7c570d81 100644
--- a/include/vrv/comparison.h
+++ b/include/vrv/comparison.h
@@ -60,23 +60,11 @@ class ClassIdComparison : public Comparison {
 public:
     ClassIdComparison(ClassId classId) { m_classId = classId; }
 
-    bool operator()(Object *object) override
-    {
-        if (object->Is(m_classId)) {
-            return true;
-        }
-        return false;
-    }
+    bool operator()(Object *object) override { return this->MatchesType(object); }
 
     ClassId GetType() { return m_classId; }
 
-    bool MatchesType(Object *object) override
-    {
-        if (object->Is(m_classId)) {
-            return true;
-        }
-        return false;
-    }
+    bool MatchesType(Object *object) override { return (object->Is(m_classId)); }
 
 protected:
     ClassId m_classId;
@@ -95,15 +83,9 @@ class ClassIdsComparison : public Comparison {
         m_supportReverse = true;
     }
 
-    bool operator()(Object *object) override
-    {
-        if (object->Is(m_classIds)) {
-            return Result(true);
-        }
-        return Result(false);
-    }
+    bool operator()(Object *object) override { return Result(this->MatchesType(object)); }
 
-    bool MatchesType(Object *object) override { return true; }
+    bool MatchesType(Object *object) override { return (object->Is(m_classIds)); }
 
 protected:
     std::vector<ClassId> m_classIds;

From 600678c932aa9b08d6b4342dfca694c9b5076993 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 17:58:50 +0100
Subject: [PATCH 174/403] Update changelog [skip-ci]

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61d9ec593fa..fdd8b33a82b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,12 @@
 ## [unreleased]
 * Support for `beatRpt@beatdef`
 * Support for `scoreDef` and `staffDef` `@dur.default` (@eNote-GmBH)
-* Support for MIDI output of grace notes (@eNote-GmBH)
+* Support for MIDI output of grace notes and multi-measure rests (@eNote-GmBH)
+* Support for `@stem.sameas` on notes for orchestra scores
 * Improved tablature MIDI output (@paul-bayleaf)
+* Additional parameters to the redoLayout method for faster cached layout redoing
+* Additional parameters to the renderToTimemap method for including rests and measure
+* Additional ids for rests and measure added to the getElementsAtTime methods
 * Preliminary support for tablature MusicXML import (@paul-bayleaf)
 
 ## [3.8.1] - 2022-01-10

From baf7c67dc3ca189a773cd274b1559f425a11063b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 18:41:14 +0100
Subject: [PATCH 175/403] Remove virtual specifier to Comparison::MatchType
 [skip-ci]

* Having a pure virtual method was useless
* The method only need to be given in ClassIdComparison and ClassIdsComparison
---
 include/vrv/comparison.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/vrv/comparison.h b/include/vrv/comparison.h
index 35d7c570d81..3cf1658c21d 100644
--- a/include/vrv/comparison.h
+++ b/include/vrv/comparison.h
@@ -31,7 +31,6 @@ class Comparison {
 
 public:
     virtual bool operator()(Object *object) = 0;
-    virtual bool MatchesType(Object *object) = 0;
     // For classes that do a reverse comparison, return reversed result
     bool Result(bool comparison) { return (m_reverse) ? !comparison : comparison; }
     // Set reverse comparison.
@@ -64,7 +63,7 @@ class ClassIdComparison : public Comparison {
 
     ClassId GetType() { return m_classId; }
 
-    bool MatchesType(Object *object) override { return (object->Is(m_classId)); }
+    bool MatchesType(Object *object) { return (object->Is(m_classId)); }
 
 protected:
     ClassId m_classId;
@@ -85,7 +84,7 @@ class ClassIdsComparison : public Comparison {
 
     bool operator()(Object *object) override { return Result(this->MatchesType(object)); }
 
-    bool MatchesType(Object *object) override { return (object->Is(m_classIds)); }
+    bool MatchesType(Object *object) { return (object->Is(m_classIds)); }
 
 protected:
     std::vector<ClassId> m_classIds;
@@ -108,8 +107,6 @@ class InterfaceComparison : public Comparison {
         return false;
     }
 
-    bool MatchesType(Object *object) override { return true; }
-
 protected:
     InterfaceId m_interfaceId;
 };
@@ -179,8 +176,6 @@ class IsEditorialElementComparison : public Comparison {
         if (object->IsEditorialElement()) return Result(true);
         return Result(false);
     }
-
-    bool MatchesType(Object *object) override { return true; }
 };
 
 //----------------------------------------------------------------------------

From 911f5dbef37583e87ffb2fdc006c665891cfc0a5 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 19:18:55 +0100
Subject: [PATCH 176/403] Allow tabGrp within tuplet

---
 src/iomei.cpp  | 3 +++
 src/tuplet.cpp | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/iomei.cpp b/src/iomei.cpp
index ecc2dcfad61..7109fe00acb 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -3356,6 +3356,9 @@ bool MEIInput::IsAllowed(std::string element, Object *filterParent)
         else if (element == "tuplet") {
             return true;
         }
+        else if (element == "tuplet") {
+            return true;
+        }
         else {
             return false;
         }
diff --git a/src/tuplet.cpp b/src/tuplet.cpp
index 74e32e3dde9..8e240081a18 100644
--- a/src/tuplet.cpp
+++ b/src/tuplet.cpp
@@ -26,6 +26,7 @@
 #include "rest.h"
 #include "space.h"
 #include "staff.h"
+#include "tabgrp.h"
 #include "vrv.h"
 
 namespace vrv {
@@ -101,6 +102,9 @@ bool Tuplet::IsSupportedChild(Object *child)
     else if (child->Is(SPACE)) {
         assert(dynamic_cast<Space *>(child));
     }
+    else if (child->Is(TABGRP)) {
+        assert(dynamic_cast<TabGrp *>(child));
+    }
     else if (child->Is(TUPLET)) {
         assert(dynamic_cast<Tuplet *>(child));
     }

From eab4b89ecaa42e5fee246415804c4ef6c326792f Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 19:25:12 +0100
Subject: [PATCH 177/403] fix typo

---
 src/iomei.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iomei.cpp b/src/iomei.cpp
index 7109fe00acb..63bc543dce8 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -3353,7 +3353,7 @@ bool MEIInput::IsAllowed(std::string element, Object *filterParent)
         else if (element == "space") {
             return true;
         }
-        else if (element == "tuplet") {
+        else if (element == "tabGrp") {
             return true;
         }
         else if (element == "tuplet") {

From 1ef06b015d496d1d3e2b4b78be8aaa7e819af0c4 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 29 Jan 2022 22:16:52 +0100
Subject: [PATCH 178/403] Add this-> to calls to object methods (cosmetic
 changes)

* No change in the test-suite evaluated locally
---
 src/abbr.cpp               |    6 +-
 src/accid.cpp              |   44 +-
 src/add.cpp                |    6 +-
 src/anchoredtext.cpp       |    4 +-
 src/annot.cpp              |   10 +-
 src/app.cpp                |    4 +-
 src/areaposinterface.cpp   |   10 +-
 src/arpeg.cpp              |   34 +-
 src/artic.cpp              |   37 +-
 src/barline.cpp            |   25 +-
 src/bboxdevicecontext.cpp  |   46 +-
 src/beam.cpp               |   22 +-
 src/beatrpt.cpp            |   14 +-
 src/boundingbox.cpp        |   20 +-
 src/bracketspan.cpp        |   20 +-
 src/breath.cpp             |   12 +-
 src/btrem.cpp              |   10 +-
 src/caesura.cpp            |   12 +-
 src/choice.cpp             |    4 +-
 src/chord.cpp              |   42 +-
 src/clef.cpp               |   76 +-
 src/controlelement.cpp     |   28 +-
 src/corr.cpp               |    6 +-
 src/course.cpp             |   18 +-
 src/custos.cpp             |   22 +-
 src/damage.cpp             |    6 +-
 src/del.cpp                |    6 +-
 src/devicecontext.cpp      |    2 +-
 src/dir.cpp                |   26 +-
 src/doc.cpp                |   74 +-
 src/dot.cpp                |   12 +-
 src/drawinginterface.cpp   |   17 +-
 src/durationinterface.cpp  |   38 +-
 src/dynam.cpp              |   28 +-
 src/editorial.cpp          |   22 +-
 src/elementpart.cpp        |   58 +-
 src/ending.cpp             |   10 +-
 src/expand.cpp             |    6 +-
 src/expansion.cpp          |    4 +-
 src/expansionmap.cpp       |   20 +-
 src/f.cpp                  |    8 +-
 src/facsimileinterface.cpp |    6 +-
 src/fb.cpp                 |    2 +-
 src/featureextractor.cpp   |    2 +-
 src/fermata.cpp            |   47 +-
 src/fig.cpp                |    4 +-
 src/fing.cpp               |   10 +-
 src/floatingobject.cpp     |   20 +-
 src/ftrem.cpp              |   12 +-
 src/gliss.cpp              |   20 +-
 src/gracegrp.cpp           |   14 +-
 src/grpsym.cpp             |   48 +-
 src/hairpin.cpp            |   32 +-
 src/halfmrpt.cpp           |    6 +-
 src/harm.cpp               |   16 +-
 src/horizontalaligner.cpp  |   54 +-
 src/instrdef.cpp           |   18 +-
 src/iomei.cpp              | 1590 ++++++++++++++++++------------------
 src/iopae.cpp              |   64 +-
 src/keyaccid.cpp           |   16 +-
 src/keysig.cpp             |   28 +-
 src/label.cpp              |    2 +-
 src/labelabbr.cpp          |    2 +-
 src/layer.cpp              |   87 +-
 src/layerelement.cpp       |  147 ++--
 src/lb.cpp                 |    2 +-
 src/lem.cpp                |    6 +-
 src/ligature.cpp           |    6 +-
 src/linkinginterface.cpp   |    6 +-
 src/lv.cpp                 |    6 +-
 src/mdiv.cpp               |   14 +-
 src/measure.cpp            |   60 +-
 src/mensur.cpp             |   32 +-
 src/metersig.cpp           |   14 +-
 src/metersiggrp.cpp        |   22 +-
 src/mnum.cpp               |   18 +-
 src/mordent.cpp            |   42 +-
 src/mrest.cpp              |   20 +-
 src/mrpt.cpp               |    6 +-
 src/mrpt2.cpp              |    6 +-
 src/mspace.cpp             |    2 +-
 src/multirest.cpp          |   38 +-
 src/multirpt.cpp           |    6 +-
 src/nc.cpp                 |   22 +-
 src/neume.cpp              |    6 +-
 src/note.cpp               |   90 +-
 src/num.cpp                |    2 +-
 src/object.cpp             |   14 +-
 src/octave.cpp             |   28 +-
 src/options.cpp            |   28 +-
 src/orig.cpp               |    6 +-
 src/page.cpp               |   28 +-
 src/pageelement.cpp        |   14 +-
 src/pagemilestone.cpp      |    4 +-
 src/pages.cpp              |   10 +-
 src/pb.cpp                 |    6 +-
 src/pedal.cpp              |   46 +-
 src/pgfoot.cpp             |    2 +-
 src/pgfoot2.cpp            |    2 +-
 src/pghead.cpp             |    2 +-
 src/pghead2.cpp            |    2 +-
 src/phrase.cpp             |    2 +-
 src/pitchinflection.cpp    |    4 +-
 src/pitchinterface.cpp     |   14 +-
 src/plica.cpp              |    6 +-
 src/plistinterface.cpp     |    6 +-
 src/positioninterface.cpp  |   10 +-
 src/proport.cpp            |    6 +-
 src/rdg.cpp                |    6 +-
 src/ref.cpp                |    2 +-
 src/reg.cpp                |    6 +-
 src/reh.cpp                |   18 +-
 src/rend.cpp               |   26 +-
 src/rest.cpp               |  108 +--
 src/restore.cpp            |    6 +-
 src/runningelement.cpp     |   28 +-
 src/sb.cpp                 |    6 +-
 src/score.cpp              |   10 +-
 src/scoredef.cpp           |   36 +-
 src/scoredefinterface.cpp  |   38 +-
 src/section.cpp            |   10 +-
 src/sic.cpp                |    6 +-
 src/slur.cpp               |   44 +-
 src/space.cpp              |    4 +-
 src/staff.cpp              |   26 +-
 src/staffdef.cpp           |   40 +-
 src/staffgrp.cpp           |   30 +-
 src/subst.cpp              |    4 +-
 src/supplied.cpp           |    6 +-
 src/surface.cpp            |   14 +-
 src/svg.cpp                |    2 +-
 src/svgdevicecontext.cpp   |   63 +-
 src/syl.cpp                |   16 +-
 src/syllable.cpp           |   10 +-
 src/system.cpp             |   20 +-
 src/systemelement.cpp      |   14 +-
 src/systemmilestone.cpp    |    4 +-
 src/tabdursym.cpp          |    6 +-
 src/tabgrp.cpp             |    4 +-
 src/tempo.cpp              |   28 +-
 src/text.cpp               |    2 +-
 src/textdirinterface.cpp   |    6 +-
 src/textelement.cpp        |   30 +-
 src/tie.cpp                |   54 +-
 src/timeinterface.cpp      |   28 +-
 src/timestamp.cpp          |    2 +-
 src/toolkit.cpp            |   50 +-
 src/transposition.cpp      |  166 ++--
 src/trill.cpp              |   42 +-
 src/tuning.cpp             |    8 +-
 src/tuplet.cpp             |   20 +-
 src/turn.cpp               |   36 +-
 src/unclear.cpp            |    6 +-
 src/verse.cpp              |   18 +-
 src/verticalaligner.cpp    |   76 +-
 src/view.cpp               |    2 +-
 src/view_beam.cpp          |   18 +-
 src/view_control.cpp       |  178 ++--
 src/view_element.cpp       |  228 +++---
 src/view_graph.cpp         |   10 +-
 src/view_mensural.cpp      |   86 +-
 src/view_neume.cpp         |    8 +-
 src/view_page.cpp          |  309 +++----
 src/view_running.cpp       |    6 +-
 src/view_slur.cpp          |    6 +-
 src/view_tab.cpp           |   16 +-
 src/view_text.cpp          |   40 +-
 src/view_tuplet.cpp        |   14 +-
 src/zone.cpp               |   10 +-
 169 files changed, 2964 insertions(+), 2934 deletions(-)

diff --git a/src/abbr.cpp b/src/abbr.cpp
index d5d63af0e3a..1d422f0eede 100644
--- a/src/abbr.cpp
+++ b/src/abbr.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Abbr> s_factory("abbr", ABBR);
 
 Abbr::Abbr() : EditorialElement(ABBR, "abbr-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Abbr::~Abbr() {}
@@ -35,7 +35,7 @@ Abbr::~Abbr() {}
 void Abbr::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/accid.cpp b/src/accid.cpp
index a4e43397d63..8ba9c2206ad 100644
--- a/src/accid.cpp
+++ b/src/accid.cpp
@@ -39,15 +39,15 @@ Accid::Accid()
     , AttExtSym()
 {
 
-    RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
-    RegisterAttClass(ATT_ACCIDENTAL);
-    RegisterAttClass(ATT_ACCIDENTALGESTURAL);
-    RegisterAttClass(ATT_ACCIDLOG);
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_ENCLOSINGCHARS);
-    RegisterAttClass(ATT_EXTSYM);
-
-    Reset();
+    this->RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
+    this->RegisterAttClass(ATT_ACCIDENTAL);
+    this->RegisterAttClass(ATT_ACCIDENTALGESTURAL);
+    this->RegisterAttClass(ATT_ACCIDLOG);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_ENCLOSINGCHARS);
+    this->RegisterAttClass(ATT_EXTSYM);
+
+    this->Reset();
 }
 
 Accid::~Accid() {}
@@ -56,12 +56,12 @@ void Accid::Reset()
 {
     LayerElement::Reset();
     PositionInterface::Reset();
-    ResetAccidental();
-    ResetAccidentalGestural();
-    ResetAccidLog();
-    ResetColor();
-    ResetEnclosingChars();
-    ResetExtSym();
+    this->ResetAccidental();
+    this->ResetAccidentalGestural();
+    this->ResetAccidLog();
+    this->ResetColor();
+    this->ResetEnclosingChars();
+    this->ResetExtSym();
 
     m_drawingUnison = NULL;
 }
@@ -73,13 +73,13 @@ std::wstring Accid::GetSymbolStr(const data_NOTATIONTYPE notationType) const
     wchar_t code = 0;
 
     // If there is glyph.num, prioritize it
-    if (HasGlyphNum()) {
-        code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        code = this->GetGlyphNum();
         if (NULL == Resources::GetGlyph(code)) code = 0;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL == Resources::GetGlyph(code)) code = 0;
     }
 
@@ -88,15 +88,15 @@ std::wstring Accid::GetSymbolStr(const data_NOTATIONTYPE notationType) const
             case NOTATIONTYPE_mensural:
             case NOTATIONTYPE_mensural_black:
             case NOTATIONTYPE_mensural_white:
-                switch (GetAccid()) {
+                switch (this->GetAccid()) {
                     case ACCIDENTAL_WRITTEN_s: code = SMUFL_E9E3_medRenSharpCroix; break;
                     case ACCIDENTAL_WRITTEN_f: code = SMUFL_E9E0_medRenFlatSoftB; break;
                     case ACCIDENTAL_WRITTEN_n: code = SMUFL_E9E2_medRenNatural; break;
                     // we do not want to ignore non-mensural accidentals
-                    default: code = GetAccidGlyph(GetAccid()); break;
+                    default: code = this->GetAccidGlyph(this->GetAccid()); break;
                 }
                 break;
-            default: code = GetAccidGlyph(GetAccid()); break;
+            default: code = this->GetAccidGlyph(this->GetAccid()); break;
         }
     }
 
diff --git a/src/add.cpp b/src/add.cpp
index 8ebef1b2267..26372480f64 100644
--- a/src/add.cpp
+++ b/src/add.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Add> s_factory("add", ADD);
 
 Add::Add() : EditorialElement(ADD, "add-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Add::~Add() {}
@@ -35,7 +35,7 @@ Add::~Add() {}
 void Add::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/anchoredtext.cpp b/src/anchoredtext.cpp
index df0a2bf3dc0..c81949ba9b7 100644
--- a/src/anchoredtext.cpp
+++ b/src/anchoredtext.cpp
@@ -28,9 +28,9 @@ static const ClassRegistrar<AnchoredText> s_factory("anchoredText", ANCHOREDTEXT
 
 AnchoredText::AnchoredText() : ControlElement(ANCHOREDTEXT, "anchtxt-"), TextDirInterface()
 {
-    RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
+    this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
 
-    Reset();
+    this->Reset();
 }
 
 AnchoredText::~AnchoredText() {}
diff --git a/src/annot.cpp b/src/annot.cpp
index 72840572fc9..abdc42082e9 100644
--- a/src/annot.cpp
+++ b/src/annot.cpp
@@ -26,10 +26,10 @@ static const ClassRegistrar<Annot> s_factory("annot", ANNOT);
 
 Annot::Annot() : EditorialElement(ANNOT, "annot-"), TextListInterface(), AttPlist(), AttSource()
 {
-    RegisterAttClass(ATT_PLIST);
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_PLIST);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Annot::~Annot() {}
@@ -37,8 +37,8 @@ Annot::~Annot() {}
 void Annot::Reset()
 {
     EditorialElement::Reset();
-    ResetPlist();
-    ResetSource();
+    this->ResetPlist();
+    this->ResetSource();
 }
 
 bool Annot::IsSupportedChild(Object *child)
diff --git a/src/app.cpp b/src/app.cpp
index 5d5a7550aea..59fd24a22a4 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -29,14 +29,14 @@ App::App() : EditorialElement(APP, "app-")
 {
     m_level = EDITORIAL_UNDEFINED;
 
-    Reset();
+    this->Reset();
 }
 
 App::App(EditorialLevel level) : EditorialElement(APP, "app-")
 {
     m_level = level;
 
-    Reset();
+    this->Reset();
 }
 
 void App::Reset()
diff --git a/src/areaposinterface.cpp b/src/areaposinterface.cpp
index 757e755e62b..f1611565818 100644
--- a/src/areaposinterface.cpp
+++ b/src/areaposinterface.cpp
@@ -21,18 +21,18 @@ namespace vrv {
 
 AreaPosInterface::AreaPosInterface() : Interface(), AttHorizontalAlign(), AttVerticalAlign()
 {
-    RegisterInterfaceAttClass(ATT_HORIZONTALALIGN);
-    RegisterInterfaceAttClass(ATT_VERTICALALIGN);
+    this->RegisterInterfaceAttClass(ATT_HORIZONTALALIGN);
+    this->RegisterInterfaceAttClass(ATT_VERTICALALIGN);
 
-    Reset();
+    this->Reset();
 }
 
 AreaPosInterface::~AreaPosInterface() {}
 
 void AreaPosInterface::Reset()
 {
-    ResetHorizontalAlign();
-    ResetVerticalAlign();
+    this->ResetHorizontalAlign();
+    this->ResetVerticalAlign();
 }
 
 } // namespace vrv
diff --git a/src/arpeg.cpp b/src/arpeg.cpp
index 11b388e0f92..5c38a90f08a 100644
--- a/src/arpeg.cpp
+++ b/src/arpeg.cpp
@@ -32,14 +32,14 @@ static const ClassRegistrar<Arpeg> s_factory("arpeg", ARPEG);
 Arpeg::Arpeg()
     : ControlElement(ARPEG, "arpeg-"), PlistInterface(), TimePointInterface(), AttArpegLog(), AttArpegVis(), AttColor()
 {
-    RegisterInterface(PlistInterface::GetAttClasses(), PlistInterface::IsInterface());
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterAttClass(ATT_ARPEGLOG);
-    RegisterAttClass(ATT_ARPEGVIS);
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_ENCLOSINGCHARS);
-
-    Reset();
+    this->RegisterInterface(PlistInterface::GetAttClasses(), PlistInterface::IsInterface());
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterAttClass(ATT_ARPEGLOG);
+    this->RegisterAttClass(ATT_ARPEGVIS);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_ENCLOSINGCHARS);
+
+    this->Reset();
 }
 
 Arpeg::~Arpeg() {}
@@ -49,10 +49,10 @@ void Arpeg::Reset()
     ControlElement::Reset();
     PlistInterface::Reset();
     TimePointInterface::Reset();
-    ResetArpegLog();
-    ResetArpegVis();
-    ResetColor();
-    ResetEnclosingChars();
+    this->ResetArpegLog();
+    this->ResetArpegVis();
+    this->ResetColor();
+    this->ResetEnclosingChars();
 
     m_drawingXRel = 0;
     m_cachedXRel = VRV_UNSET;
@@ -64,7 +64,7 @@ int Arpeg::GetDrawingX() const
     // @staff are not taken into account for arpeg (only @plist)
     // The positioner for Arpeg uses the top note as objectX
     if (this->GetCurrentFloatingPositioner()) {
-        return (GetCurrentFloatingPositioner()->GetDrawingX());
+        return (this->GetCurrentFloatingPositioner()->GetDrawingX());
     }
 
     // Otherwise get the measure - no cast to Measure is necessary
@@ -89,14 +89,14 @@ bool Arpeg::IsValidRef(Object *ref) const
 void Arpeg::SetDrawingXRel(int drawingXRel)
 {
     // Cache is currently not used for Arpeg
-    ResetCachedDrawingX();
+    this->ResetCachedDrawingX();
 
     m_drawingXRel = drawingXRel;
     // Also update the positioner drawingXRel - this is a duplication but we need it in
     // the positioner too for the bounding box calculation and for the DrawingX value
     // See GetDrawingX
-    if (GetCurrentFloatingPositioner()) {
-        GetCurrentFloatingPositioner()->SetDrawingXRel(m_drawingXRel);
+    if (this->GetCurrentFloatingPositioner()) {
+        this->GetCurrentFloatingPositioner()->SetDrawingXRel(m_drawingXRel);
     }
 }
 
@@ -181,7 +181,7 @@ void Arpeg::GetDrawingTopBottomNotes(Note *&top, Note *&bottom)
 
 Staff *Arpeg::GetCrossStaff()
 {
-    const ArrayOfObjects *refs = GetRefs();
+    const ArrayOfObjects *refs = this->GetRefs();
     if (refs->empty()) return NULL;
 
     // Find if there is at least one element that is not cross staff
diff --git a/src/artic.cpp b/src/artic.cpp
index 7e8d70f30a8..215153a02bf 100644
--- a/src/artic.cpp
+++ b/src/artic.cpp
@@ -46,13 +46,13 @@ Artic::Artic()
     , AttExtSym()
     , AttPlacementRelEvent()
 {
-    RegisterAttClass(ATT_ARTICULATION);
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_ENCLOSINGCHARS);
-    RegisterAttClass(ATT_EXTSYM);
-    RegisterAttClass(ATT_PLACEMENTRELEVENT);
+    this->RegisterAttClass(ATT_ARTICULATION);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_ENCLOSINGCHARS);
+    this->RegisterAttClass(ATT_EXTSYM);
+    this->RegisterAttClass(ATT_PLACEMENTRELEVENT);
 
-    Reset();
+    this->Reset();
 }
 
 Artic::~Artic() {}
@@ -60,11 +60,11 @@ Artic::~Artic() {}
 void Artic::Reset()
 {
     LayerElement::Reset();
-    ResetArticulation();
-    ResetColor();
-    ResetEnclosingChars();
-    ResetExtSym();
-    ResetPlacementRelEvent();
+    this->ResetArticulation();
+    this->ResetColor();
+    this->ResetEnclosingChars();
+    this->ResetExtSym();
+    this->ResetPlacementRelEvent();
 
     m_drawingPlace = STAFFREL_NONE;
 }
@@ -187,13 +187,13 @@ void Artic::AddSlurPositioner(FloatingCurvePositioner *positioner, bool start)
 wchar_t Artic::GetArticGlyph(data_ARTICULATION artic, data_STAFFREL place) const
 {
     // If there is glyph.num, prioritize it
-    if (HasGlyphNum()) {
-        wchar_t code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        wchar_t code = this->GetGlyphNum();
         if (NULL != Resources::GetGlyph(code)) return code;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
@@ -323,7 +323,8 @@ int Artic::ConvertMarkupArtic(FunctorParams *functorParams)
     ConvertMarkupArticParams *params = vrv_params_cast<ConvertMarkupArticParams *>(functorParams);
     assert(params);
 
-    if (this->GetArtic().size() > 1) params->m_articPairsToConvert.emplace_back(std::make_pair(GetParent(), this));
+    if (this->GetArtic().size() > 1)
+        params->m_articPairsToConvert.emplace_back(std::make_pair(this->GetParent(), this));
 
     return FUNCTOR_CONTINUE;
 }
@@ -400,7 +401,7 @@ int Artic::AdjustArtic(FunctorParams *functorParams)
     int yIn, yOut, yRel;
 
     Staff *staff = this->GetAncestorStaff(RESOLVE_CROSS_STAFF);
-    Beam *beam = dynamic_cast<Beam *>(GetFirstAncestor(BEAM));
+    Beam *beam = dynamic_cast<Beam *>(this->GetFirstAncestor(BEAM));
     int staffYBottom = -params->m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize);
 
     // Avoid in artic to be in legder lines
@@ -539,7 +540,7 @@ int Artic::CalculateHorizontalShift(Doc *doc, LayerElement *parent, data_STEMDIR
     if ((parent->GetChildCount(ARTIC) > 1) || (doc->GetOptions()->m_staccatoCenter.GetValue())) {
         return shift;
     }
-    data_ARTICULATION artic = GetArticFirst();
+    data_ARTICULATION artic = this->GetArticFirst();
     switch (artic) {
         case ARTICULATION_stacc:
         case ARTICULATION_stacciss: {
diff --git a/src/barline.cpp b/src/barline.cpp
index 8ce7793c104..1e483de270c 100644
--- a/src/barline.cpp
+++ b/src/barline.cpp
@@ -33,21 +33,21 @@ static const ClassRegistrar<BarLine> s_factory("barLine", BARLINE);
 
 BarLine::BarLine() : LayerElement(BARLINE, "bline-"), AttBarLineLog(), AttColor(), AttNNumberLike(), AttVisibility()
 {
-    RegisterAttClass(ATT_BARLINELOG);
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_VISIBILITY);
+    this->RegisterAttClass(ATT_BARLINELOG);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_VISIBILITY);
 
-    Reset();
+    this->Reset();
 }
 
 BarLine::BarLine(ClassId classId)
     : LayerElement(classId, "bline-"), AttBarLineLog(), AttColor(), AttNNumberLike(), AttVisibility()
 {
-    RegisterAttClass(ATT_BARLINELOG);
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_VISIBILITY);
+    this->RegisterAttClass(ATT_BARLINELOG);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_VISIBILITY);
 
-    Reset();
+    this->Reset();
 }
 
 BarLine::~BarLine() {}
@@ -56,9 +56,9 @@ void BarLine::Reset()
 {
     LayerElement::Reset();
 
-    ResetBarLineLog();
-    ResetColor();
-    ResetVisibility();
+    this->ResetBarLineLog();
+    this->ResetColor();
+    this->ResetVisibility();
 
     m_position = BarLinePosition::None;
 }
@@ -71,7 +71,8 @@ bool BarLine::SetAlignment(Alignment *alignment)
 
 bool BarLine::HasRepetitionDots() const
 {
-    if (GetForm() == BARRENDITION_rptstart || GetForm() == BARRENDITION_rptend || GetForm() == BARRENDITION_rptboth) {
+    if (this->GetForm() == BARRENDITION_rptstart || this->GetForm() == BARRENDITION_rptend
+        || this->GetForm() == BARRENDITION_rptboth) {
         return true;
     }
     return false;
diff --git a/src/bboxdevicecontext.cpp b/src/bboxdevicecontext.cpp
index db62c835b03..631394c3472 100644
--- a/src/bboxdevicecontext.cpp
+++ b/src/bboxdevicecontext.cpp
@@ -37,12 +37,12 @@ BBoxDeviceContext::BBoxDeviceContext(View *view, int width, int height, unsigned
     m_drawingText = false;
     m_textAlignment = HORIZONTALALIGNMENT_left;
 
-    SetBrush(AxNONE, AxSOLID);
-    SetPen(AxNONE, 1, AxSOLID);
+    this->SetBrush(AxNONE, AxSOLID);
+    this->SetPen(AxNONE, 1, AxSOLID);
 
     m_update = update;
 
-    ResetGraphicRotation();
+    this->ResetGraphicRotation();
 }
 
 BBoxDeviceContext::~BBoxDeviceContext() {}
@@ -53,7 +53,7 @@ void BBoxDeviceContext::StartGraphic(Object *object, std::string gClass, std::st
     object->BoundingBox::ResetBoundingBox();
     m_objects.push_back(object);
 
-    ResetGraphicRotation();
+    this->ResetGraphicRotation();
 }
 
 void BBoxDeviceContext::ResumeGraphic(Object *object, std::string gId)
@@ -67,7 +67,7 @@ void BBoxDeviceContext::EndGraphic(Object *object, View *view)
     assert(m_objects.back() == object);
     m_objects.pop_back();
 
-    ResetGraphicRotation();
+    this->ResetGraphicRotation();
 }
 
 void BBoxDeviceContext::EndResumedGraphic(Object *object, View *view)
@@ -76,7 +76,7 @@ void BBoxDeviceContext::EndResumedGraphic(Object *object, View *view)
     assert(m_objects.back() == object);
     m_objects.pop_back();
 
-    ResetGraphicRotation();
+    this->ResetGraphicRotation();
 }
 
 void BBoxDeviceContext::RotateGraphic(Point const &orig, double angle)
@@ -143,7 +143,7 @@ void BBoxDeviceContext::DrawQuadBezierPath(Point bezier[3])
         pMax = pMax.max(Point(qx, qy));
     }
 
-    UpdateBB(pMin.x, pMin.y, pMax.x, pMax.y);
+    this->UpdateBB(pMin.x, pMin.y, pMax.x, pMax.y);
 }
 
 void BBoxDeviceContext::DrawCubicBezierPath(Point bezier[4])
@@ -154,7 +154,7 @@ void BBoxDeviceContext::DrawCubicBezierPath(Point bezier[4])
 
     BoundingBox::ApproximateBezierBoundingBox(bezier, pos, width, height, minYPos, maxYPos);
     // LogDebug("x %d, y %d, width %d, height %d", pos.x, pos.y, width, height);
-    UpdateBB(pos.x, pos.y, pos.x + width, pos.y + height);
+    this->UpdateBB(pos.x, pos.y, pos.x + width, pos.y + height);
 }
 
 void BBoxDeviceContext::DrawCubicBezierPathFilled(Point bezier1[4], Point bezier2[4])
@@ -165,20 +165,20 @@ void BBoxDeviceContext::DrawCubicBezierPathFilled(Point bezier1[4], Point bezier
 
     BoundingBox::ApproximateBezierBoundingBox(bezier1, pos, width, height, minYPos, maxYPos);
     // LogDebug("x %d, y %d, width %d, height %d", pos.x, pos.y, width, height);
-    UpdateBB(pos.x, pos.y, pos.x + width, pos.y + height);
+    this->UpdateBB(pos.x, pos.y, pos.x + width, pos.y + height);
     BoundingBox::ApproximateBezierBoundingBox(bezier2, pos, width, height, minYPos, maxYPos);
     // LogDebug("x %d, y %d, width %d, height %d", pos.x, pos.y, width, height);
-    UpdateBB(pos.x, pos.y, pos.x + width, pos.y + height);
+    this->UpdateBB(pos.x, pos.y, pos.x + width, pos.y + height);
 }
 
 void BBoxDeviceContext::DrawCircle(int x, int y, int radius)
 {
-    DrawEllipse(x - radius, y - radius, 2 * radius, 2 * radius);
+    this->DrawEllipse(x - radius, y - radius, 2 * radius, 2 * radius);
 }
 
 void BBoxDeviceContext::DrawEllipse(int x, int y, int width, int height)
 {
-    UpdateBB(x, y, x + width, y + height);
+    this->UpdateBB(x, y, x + width, y + height);
 }
 
 void BBoxDeviceContext::DrawEllipticArc(int x, int y, int width, int height, double start, double end)
@@ -188,7 +188,7 @@ void BBoxDeviceContext::DrawEllipticArc(int x, int y, int width, int height, dou
         penWidth += 1;
     }
     // needs to be fixed - for now uses the entire rectangle
-    UpdateBB(x - penWidth / 2, y - penWidth / 2, x + width + penWidth / 2, y + height + penWidth / 2);
+    this->UpdateBB(x - penWidth / 2, y - penWidth / 2, x + width + penWidth / 2, y + height + penWidth / 2);
 }
 
 void BBoxDeviceContext::DrawLine(int x1, int y1, int x2, int y2)
@@ -214,7 +214,7 @@ void BBoxDeviceContext::DrawLine(int x1, int y1, int x2, int y2)
         p1++;
     }
 
-    UpdateBB(x1 - p1, y1 - p1, x2 + p2, y2 + p2);
+    this->UpdateBB(x1 - p1, y1 - p1, x2 + p2, y2 + p2);
 }
 
 void BBoxDeviceContext::DrawPolygon(int n, Point points[], int xOffset, int yOffset, int fillStyle)
@@ -233,12 +233,12 @@ void BBoxDeviceContext::DrawPolygon(int n, Point points[], int xOffset, int yOff
         if (points[i].y + yOffset < y1) y1 = points[i].y + yOffset;
         if (points[i].y + yOffset > y2) y2 = points[i].y + yOffset;
     }
-    UpdateBB(x1, y1, x2, y2);
+    this->UpdateBB(x1, y1, x2, y2);
 }
 
 void BBoxDeviceContext::DrawRectangle(int x, int y, int width, int height)
 {
-    DrawRoundedRectangle(x, y, width, height, 0);
+    this->DrawRoundedRectangle(x, y, width, height, 0);
 }
 
 void BBoxDeviceContext::DrawRoundedRectangle(int x, int y, int width, int height, int radius)
@@ -258,12 +258,12 @@ void BBoxDeviceContext::DrawRoundedRectangle(int x, int y, int width, int height
         penWidth += 1;
     }
 
-    UpdateBB(x - penWidth / 2, y - penWidth / 2, x + width + penWidth / 2, y + height + penWidth / 2);
+    this->UpdateBB(x - penWidth / 2, y - penWidth / 2, x + width + penWidth / 2, y + height + penWidth / 2);
 }
 
 void BBoxDeviceContext::DrawPlaceholder(int x, int y)
 {
-    UpdateBB(x, y, x, y);
+    this->UpdateBB(x, y, x, y);
 }
 
 void BBoxDeviceContext::StartText(int x, int y, data_HORIZONTALALIGNMENT alignment)
@@ -320,7 +320,7 @@ void BBoxDeviceContext::DrawText(
         m_textHeight = height;
         m_textAscent = 0;
         m_textDescent = 0;
-        UpdateBB(m_textX, m_textY, m_textX + m_textWidth, m_textY + m_textHeight);
+        this->UpdateBB(m_textX, m_textY, m_textX + m_textWidth, m_textY + m_textHeight);
     }
 
     else {
@@ -334,7 +334,7 @@ void BBoxDeviceContext::DrawText(
         }
 
         TextExtend extend;
-        GetTextExtent(wtext, &extend, true);
+        this->GetTextExtent(wtext, &extend, true);
         m_textWidth += extend.m_width;
         // keep that maximum values for ascent and descent
         m_textAscent = std::max(m_textAscent, extend.m_ascent);
@@ -346,7 +346,7 @@ void BBoxDeviceContext::DrawText(
         else if (m_textAlignment == HORIZONTALALIGNMENT_center) {
             m_textX -= (extend.m_width / 2);
         }
-        UpdateBB(m_textX, m_textY + m_textDescent, m_textX + m_textWidth, m_textY - m_textAscent);
+        this->UpdateBB(m_textX, m_textY + m_textDescent, m_textX + m_textWidth, m_textY - m_textAscent);
     }
 }
 
@@ -378,7 +378,7 @@ void BBoxDeviceContext::DrawMusicText(const std::wstring &text, int x, int y, bo
         // because we are in the drawing context, y position is already flipped
         int y_off = y - g_y * m_fontStack.top()->GetPointSize() / glyph->GetUnitsPerEm();
 
-        UpdateBB(x_off, y_off, x_off + g_w * m_fontStack.top()->GetPointSize() / glyph->GetUnitsPerEm(),
+        this->UpdateBB(x_off, y_off, x_off + g_w * m_fontStack.top()->GetPointSize() / glyph->GetUnitsPerEm(),
             // idem, y position is flipped
             y_off - g_h * m_fontStack.top()->GetPointSize() / glyph->GetUnitsPerEm(), smuflGlyph);
 
@@ -391,7 +391,7 @@ void BBoxDeviceContext::DrawSpline(int n, Point points[]) {}
 
 void BBoxDeviceContext::DrawSvgShape(int x, int y, int width, int height, pugi::xml_node svg)
 {
-    DrawRoundedRectangle(x, y, width, height, 0);
+    this->DrawRoundedRectangle(x, y, width, height, 0);
 }
 
 void BBoxDeviceContext::UpdateBB(int x1, int y1, int x2, int y2, wchar_t glyph)
diff --git a/src/beam.cpp b/src/beam.cpp
index a98a5005a7c..a1c313ffc03 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -41,7 +41,7 @@ namespace vrv {
 
 BeamSegment::BeamSegment()
 {
-    Reset();
+    this->Reset();
 }
 
 BeamSegment::~BeamSegment()
@@ -1292,12 +1292,12 @@ static const ClassRegistrar<Beam> s_factory("beam", BEAM);
 
 Beam::Beam() : LayerElement(BEAM, "beam-"), BeamDrawingInterface(), AttBeamedWith(), AttBeamRend(), AttColor(), AttCue()
 {
-    RegisterAttClass(ATT_BEAMEDWITH);
-    RegisterAttClass(ATT_BEAMREND);
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CUE);
+    this->RegisterAttClass(ATT_BEAMEDWITH);
+    this->RegisterAttClass(ATT_BEAMREND);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CUE);
 
-    Reset();
+    this->Reset();
 }
 
 Beam::~Beam() {}
@@ -1306,10 +1306,10 @@ void Beam::Reset()
 {
     LayerElement::Reset();
     BeamDrawingInterface::Reset();
-    ResetBeamedWith();
-    ResetBeamRend();
-    ResetColor();
-    ResetCue();
+    this->ResetBeamedWith();
+    this->ResetBeamRend();
+    this->ResetColor();
+    this->ResetCue();
 
     m_stemSameas = NULL;
 }
@@ -1630,7 +1630,7 @@ void BeamElementCoord::SetClosestNote(data_STEMDIRECTION stemDir)
 
 int Beam::CalcLayerOverlap(Doc *doc, Object *beam, int directionBias, int y1, int y2)
 {
-    Layer *parentLayer = vrv_cast<Layer *>(GetFirstAncestor(LAYER));
+    Layer *parentLayer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     if (!parentLayer) return 0;
     // Check whether there are elements on other layer in the duration of the current beam. If there are none - stop
     // here, there's nothing to be done
diff --git a/src/beatrpt.cpp b/src/beatrpt.cpp
index 30a1119ccda..fd6088351fc 100644
--- a/src/beatrpt.cpp
+++ b/src/beatrpt.cpp
@@ -36,10 +36,10 @@ static const ClassRegistrar<BeatRpt> s_factory("beatRpt", BEATRPT);
 
 BeatRpt::BeatRpt() : LayerElement(BEATRPT, "beatrpt-"), AttColor(), AttBeatRptLog(), AttBeatRptVis()
 {
-    RegisterAttClass(ATT_BEATRPTLOG);
-    RegisterAttClass(ATT_BEATRPTVIS);
-    RegisterAttClass(ATT_COLOR);
-    Reset();
+    this->RegisterAttClass(ATT_BEATRPTLOG);
+    this->RegisterAttClass(ATT_BEATRPTVIS);
+    this->RegisterAttClass(ATT_COLOR);
+    this->Reset();
 }
 
 BeatRpt::~BeatRpt() {}
@@ -47,9 +47,9 @@ BeatRpt::~BeatRpt() {}
 void BeatRpt::Reset()
 {
     LayerElement::Reset();
-    ResetBeatRptLog();
-    ResetBeatRptVis();
-    ResetColor();
+    this->ResetBeatRptLog();
+    this->ResetBeatRptVis();
+    this->ResetColor();
 
     m_scoreTimeOnset = 0.0;
 }
diff --git a/src/boundingbox.cpp b/src/boundingbox.cpp
index 76843d58de9..7d3b7718852 100644
--- a/src/boundingbox.cpp
+++ b/src/boundingbox.cpp
@@ -39,7 +39,7 @@ BoundingBox::BoundingBox()
     rect2[0] = Point(25, 25);
     rect2[1] = Point(100, 100);
 
-    ResetBoundingBox();
+    this->ResetBoundingBox();
 }
 
 bool BoundingBox::Is(const std::vector<ClassId> &classIds) const
@@ -54,7 +54,7 @@ void BoundingBox::UpdateContentBBoxX(int x1, int x2)
     int minX = std::min(x1, x2);
     int maxX = std::max(x1, x2);
 
-    int drawingX = GetDrawingX();
+    int drawingX = this->GetDrawingX();
 
     minX -= drawingX;
     maxX -= drawingX;
@@ -63,7 +63,7 @@ void BoundingBox::UpdateContentBBoxX(int x1, int x2)
     if (m_contentBB_x2 < maxX) m_contentBB_x2 = maxX;
 
     // LogDebug("CB Is:  %i %i %i %i %s", m_contentBB_x1,m_contentBB_y1, m_contentBB_x2, m_contentBB_y2,
-    // GetClassName().c_str());
+    // this->GetClassName().c_str());
 }
 
 void BoundingBox::UpdateContentBBoxY(int y1, int y2)
@@ -73,7 +73,7 @@ void BoundingBox::UpdateContentBBoxY(int y1, int y2)
     int min_y = std::min(y1, y2);
     int max_y = std::max(y1, y2);
 
-    int drawingY = GetDrawingY();
+    int drawingY = this->GetDrawingY();
 
     min_y -= drawingY;
     max_y -= drawingY;
@@ -82,7 +82,7 @@ void BoundingBox::UpdateContentBBoxY(int y1, int y2)
     if (m_contentBB_y2 < max_y) m_contentBB_y2 = max_y;
 
     // LogDebug("CB Is:  %i %i %i %i %s", m_contentBB_x1,m_contentBB_y1, m_contentBB_x2, m_contentBB_y2,
-    // GetClassName().c_str());
+    // this->GetClassName().c_str());
 }
 
 void BoundingBox::UpdateSelfBBoxX(int x1, int x2)
@@ -92,7 +92,7 @@ void BoundingBox::UpdateSelfBBoxX(int x1, int x2)
     int minX = std::min(x1, x2);
     int maxX = std::max(x1, x2);
 
-    int drawingX = GetDrawingX();
+    int drawingX = this->GetDrawingX();
 
     minX -= drawingX;
     maxX -= drawingX;
@@ -110,7 +110,7 @@ void BoundingBox::UpdateSelfBBoxY(int y1, int y2)
     int min_y = std::min(y1, y2);
     int max_y = std::max(y1, y2);
 
-    int drawingY = GetDrawingY();
+    int drawingY = this->GetDrawingY();
 
     min_y -= drawingY;
     max_y -= drawingY;
@@ -159,7 +159,7 @@ bool BoundingBox::HasEmptyBB() const
 
 bool BoundingBox::HasContentBB() const
 {
-    return (HasContentHorizontalBB() && HasContentVerticalBB());
+    return (this->HasContentHorizontalBB() && this->HasContentVerticalBB());
 }
 
 bool BoundingBox::HasContentHorizontalBB() const
@@ -174,7 +174,7 @@ bool BoundingBox::HasContentVerticalBB() const
 
 bool BoundingBox::HasSelfBB() const
 {
-    return (HasSelfHorizontalBB() && HasSelfVerticalBB());
+    return (this->HasSelfHorizontalBB() && this->HasSelfVerticalBB());
 }
 
 bool BoundingBox::HasSelfHorizontalBB() const
@@ -1078,7 +1078,7 @@ SegmentedLine::SegmentedLine(int start, int end)
 void SegmentedLine::GetStartEnd(int &start, int &end, int idx)
 {
     assert(idx >= 0);
-    assert(idx < GetSegmentCount());
+    assert(idx < this->GetSegmentCount());
 
     start = m_segments.at(idx).first;
     end = m_segments.at(idx).second;
diff --git a/src/bracketspan.cpp b/src/bracketspan.cpp
index 33b04c09a28..2fa5b35a4c1 100644
--- a/src/bracketspan.cpp
+++ b/src/bracketspan.cpp
@@ -35,13 +35,13 @@ BracketSpan::BracketSpan()
     , AttLineRend()
     , AttLineRendBase()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_BRACKETSPANLOG);
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_LINEREND);
-    RegisterAttClass(ATT_LINERENDBASE);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_BRACKETSPANLOG);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_LINEREND);
+    this->RegisterAttClass(ATT_LINERENDBASE);
 
-    Reset();
+    this->Reset();
 }
 
 BracketSpan::~BracketSpan() {}
@@ -50,10 +50,10 @@ void BracketSpan::Reset()
 {
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetBracketSpanLog();
-    ResetColor();
-    ResetLineRend();
-    ResetLineRendBase();
+    this->ResetBracketSpanLog();
+    this->ResetColor();
+    this->ResetLineRend();
+    this->ResetLineRendBase();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/breath.cpp b/src/breath.cpp
index a4af1bcd749..0fbcd79d707 100644
--- a/src/breath.cpp
+++ b/src/breath.cpp
@@ -25,11 +25,11 @@ static const ClassRegistrar<Breath> s_factory("breath", BREATH);
 
 Breath::Breath() : ControlElement(BREATH, "breath-"), TimePointInterface(), AttColor(), AttPlacementRelStaff()
 {
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_PLACEMENTRELSTAFF);
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
 
-    Reset();
+    this->Reset();
 }
 
 Breath::~Breath() {}
@@ -38,8 +38,8 @@ void Breath::Reset()
 {
     ControlElement::Reset();
     TimePointInterface::Reset();
-    ResetColor();
-    ResetPlacementRelStaff();
+    this->ResetColor();
+    this->ResetPlacementRelStaff();
 }
 
 } // namespace vrv
diff --git a/src/btrem.cpp b/src/btrem.cpp
index d092d1e0351..dd0440a5c71 100644
--- a/src/btrem.cpp
+++ b/src/btrem.cpp
@@ -32,10 +32,10 @@ static const ClassRegistrar<BTrem> s_factory("btrem", BTREM);
 
 BTrem::BTrem() : LayerElement(BTREM, "btrem-"), AttBTremLog(), AttTremMeasured()
 {
-    RegisterAttClass(ATT_BTREMLOG);
-    RegisterAttClass(ATT_TREMMEASURED);
+    this->RegisterAttClass(ATT_BTREMLOG);
+    this->RegisterAttClass(ATT_TREMMEASURED);
 
-    Reset();
+    this->Reset();
 }
 
 BTrem::~BTrem() {}
@@ -43,8 +43,8 @@ BTrem::~BTrem() {}
 void BTrem::Reset()
 {
     LayerElement::Reset();
-    ResetBTremLog();
-    ResetTremMeasured();
+    this->ResetBTremLog();
+    this->ResetTremMeasured();
 }
 
 bool BTrem::IsSupportedChild(Object *child)
diff --git a/src/caesura.cpp b/src/caesura.cpp
index a4b3df3474b..a5452bc93cf 100644
--- a/src/caesura.cpp
+++ b/src/caesura.cpp
@@ -25,11 +25,11 @@ static const ClassRegistrar<Caesura> s_factory("caesura", CAESURA);
 
 Caesura::Caesura() : ControlElement(CAESURA, "caesura-"), TimePointInterface(), AttColor(), AttPlacementRelStaff()
 {
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_PLACEMENTRELSTAFF);
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
 
-    Reset();
+    this->Reset();
 }
 
 Caesura::~Caesura() {}
@@ -38,8 +38,8 @@ void Caesura::Reset()
 {
     ControlElement::Reset();
     TimePointInterface::Reset();
-    ResetColor();
-    ResetPlacementRelStaff();
+    this->ResetColor();
+    this->ResetPlacementRelStaff();
 }
 
 } // namespace vrv
diff --git a/src/choice.cpp b/src/choice.cpp
index af9c1b4ab7b..22b43ae10e7 100644
--- a/src/choice.cpp
+++ b/src/choice.cpp
@@ -34,14 +34,14 @@ Choice::Choice() : EditorialElement(CHOICE, "choice-")
 {
     m_level = EDITORIAL_UNDEFINED;
 
-    Reset();
+    this->Reset();
 }
 
 Choice::Choice(EditorialLevel level) : EditorialElement(CHOICE, "choice-")
 {
     m_level = level;
 
-    Reset();
+    this->Reset();
 }
 
 void Choice::Reset()
diff --git a/src/chord.cpp b/src/chord.cpp
index c5fd0f9ccde..77b983a7fae 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -78,16 +78,16 @@ Chord::Chord()
     , AttTiePresent()
     , AttVisibility()
 {
-    RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CUE);
-    RegisterAttClass(ATT_GRACED);
-    RegisterAttClass(ATT_STEMS);
-    RegisterAttClass(ATT_STEMSCMN);
-    RegisterAttClass(ATT_TIEPRESENT);
-    RegisterAttClass(ATT_VISIBILITY);
+    this->RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CUE);
+    this->RegisterAttClass(ATT_GRACED);
+    this->RegisterAttClass(ATT_STEMS);
+    this->RegisterAttClass(ATT_STEMSCMN);
+    this->RegisterAttClass(ATT_TIEPRESENT);
+    this->RegisterAttClass(ATT_VISIBILITY);
 
-    Reset();
+    this->Reset();
 }
 
 Chord::~Chord()
@@ -101,13 +101,13 @@ void Chord::Reset()
     DrawingListInterface::Reset();
     StemmedDrawingInterface::Reset();
     DurationInterface::Reset();
-    ResetColor();
-    ResetCue();
-    ResetGraced();
-    ResetStems();
-    ResetStemsCmn();
-    ResetTiePresent();
-    ResetVisibility();
+    this->ResetColor();
+    this->ResetCue();
+    this->ResetGraced();
+    this->ResetStems();
+    this->ResetStemsCmn();
+    this->ResetTiePresent();
+    this->ResetVisibility();
 
     ClearClusters();
 }
@@ -490,7 +490,7 @@ int Chord::AdjustOverlappingLayers(
             otherElementLocations.insert(note->GetDrawingLoc());
         }
     }
-    const ArrayOfObjects *notes = GetList(this);
+    const ArrayOfObjects *notes = this->GetList(this);
     assert(notes);
     // get current chord positions
     std::set<int> chordElementLocations;
@@ -500,8 +500,8 @@ int Chord::AdjustOverlappingLayers(
         chordElementLocations.insert(note->GetDrawingLoc());
     }
     const int expectedElementsInUnison
-        = CountElementsInUnison(chordElementLocations, otherElementLocations, GetDrawingStemDir());
-    const bool isLowerPosition = (STEMDIRECTION_down == GetDrawingStemDir() && (otherElementLocations.size() > 0)
+        = CountElementsInUnison(chordElementLocations, otherElementLocations, this->GetDrawingStemDir());
+    const bool isLowerPosition = (STEMDIRECTION_down == this->GetDrawingStemDir() && (otherElementLocations.size() > 0)
         && (*chordElementLocations.begin() >= *otherElementLocations.begin()));
     int actualElementsInUnison = 0;
     // process each note of the chord separately, storing locations in the set
@@ -520,7 +520,7 @@ int Chord::AdjustOverlappingLayers(
         isUnison = true;
     }
     else if (margin) {
-        SetDrawingXRel(GetDrawingXRel() + margin);
+        this->SetDrawingXRel(this->GetDrawingXRel() + margin);
         return margin;
     }
     return 0;
@@ -828,7 +828,7 @@ int Chord::PrepareLayerElementParts(FunctorParams *functorParams)
         if (currentStem->DeleteChild(currentFlag)) currentFlag = NULL;
     }
 
-    SetDrawingStem(currentStem);
+    this->SetDrawingStem(currentStem);
 
     // Also set the drawing stem object (or NULL) to all child notes
     const ArrayOfObjects *childList = this->GetList(this); // make sure it's initialized
diff --git a/src/clef.cpp b/src/clef.cpp
index 8fa6e6ea3b0..8daecb5f291 100644
--- a/src/clef.cpp
+++ b/src/clef.cpp
@@ -30,15 +30,15 @@ static const ClassRegistrar<Clef> s_factory("clef", CLEF);
 Clef::Clef()
     : LayerElement(CLEF, "clef-"), AttClefShape(), AttColor(), AttLineLoc(), AttOctaveDisplacement(), AttVisibility()
 {
-    RegisterAttClass(ATT_CLEFSHAPE);
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_ENCLOSINGCHARS);
-    RegisterAttClass(ATT_EXTSYM);
-    RegisterAttClass(ATT_LINELOC);
-    RegisterAttClass(ATT_OCTAVEDISPLACEMENT);
-    RegisterAttClass(ATT_VISIBILITY);
-
-    Reset();
+    this->RegisterAttClass(ATT_CLEFSHAPE);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_ENCLOSINGCHARS);
+    this->RegisterAttClass(ATT_EXTSYM);
+    this->RegisterAttClass(ATT_LINELOC);
+    this->RegisterAttClass(ATT_OCTAVEDISPLACEMENT);
+    this->RegisterAttClass(ATT_VISIBILITY);
+
+    this->Reset();
 }
 
 Clef::~Clef() {}
@@ -46,13 +46,13 @@ Clef::~Clef() {}
 void Clef::Reset()
 {
     LayerElement::Reset();
-    ResetClefShape();
-    ResetColor();
-    ResetEnclosingChars();
-    ResetExtSym();
-    ResetLineLoc();
-    ResetOctaveDisplacement();
-    ResetVisibility();
+    this->ResetClefShape();
+    this->ResetColor();
+    this->ResetEnclosingChars();
+    this->ResetExtSym();
+    this->ResetLineLoc();
+    this->ResetOctaveDisplacement();
+    this->ResetVisibility();
 }
 
 int Clef::GetClefLocOffset() const
@@ -64,28 +64,28 @@ int Clef::GetClefLocOffset() const
     }
 
     int offset = 0;
-    if (GetShape() == CLEFSHAPE_G) {
+    if (this->GetShape() == CLEFSHAPE_G) {
         offset = -4;
     }
-    else if (GetShape() == CLEFSHAPE_GG) {
+    else if (this->GetShape() == CLEFSHAPE_GG) {
         offset = 3;
     }
-    else if (GetShape() == CLEFSHAPE_F) {
+    else if (this->GetShape() == CLEFSHAPE_F) {
         offset = 4;
     }
 
-    offset += (GetLine() - 1) * 2;
+    offset += (this->GetLine() - 1) * 2;
 
     int disPlace = 0;
-    if (GetDisPlace() == STAFFREL_basic_above)
+    if (this->GetDisPlace() == STAFFREL_basic_above)
         disPlace = -1;
-    else if (GetDisPlace() == STAFFREL_basic_below)
+    else if (this->GetDisPlace() == STAFFREL_basic_below)
         disPlace = 1;
 
     // ignore disPlace for gClef8vbOld
-    if (GetShape() == CLEFSHAPE_GG) disPlace = 0;
+    if (this->GetShape() == CLEFSHAPE_GG) disPlace = 0;
 
-    if ((disPlace != 0) && (GetDis() != OCTAVE_DIS_NONE)) offset += (disPlace * (GetDis() - 1));
+    if ((disPlace != 0) && (this->GetDis() != OCTAVE_DIS_NONE)) offset += (disPlace * (this->GetDis() - 1));
 
     return offset;
 }
@@ -97,29 +97,29 @@ int Clef::GetClefLocOffset() const
 wchar_t Clef::GetClefGlyph(const data_NOTATIONTYPE notationtype) const
 {
     // If there is glyph.num, prioritize it
-    if (HasGlyphNum()) {
-        wchar_t code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        wchar_t code = this->GetGlyphNum();
         if (NULL != Resources::GetGlyph(code)) return code;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
     switch (notationtype) {
         case NOTATIONTYPE_neume:
             // neume clefs
-            return (GetShape() == CLEFSHAPE_F) ? SMUFL_E902_chantFclef : SMUFL_E906_chantCclef;
+            return (this->GetShape() == CLEFSHAPE_F) ? SMUFL_E902_chantFclef : SMUFL_E906_chantCclef;
             break;
         case NOTATIONTYPE_mensural:
         case NOTATIONTYPE_mensural_white:
             // mensural clefs
-            switch (GetShape()) {
+            switch (this->GetShape()) {
                 case CLEFSHAPE_G: return SMUFL_E901_mensuralGclefPetrucci; break;
                 case CLEFSHAPE_F: return SMUFL_E904_mensuralFclefPetrucci; break;
                 case CLEFSHAPE_C:
-                    switch (GetLine()) {
+                    switch (this->GetLine()) {
                         case 1: return SMUFL_E907_mensuralCclefPetrucciPosLowest; break;
                         case 2: return SMUFL_E908_mensuralCclefPetrucciPosLow; break;
                         case 3: return SMUFL_E909_mensuralCclefPetrucciPosMiddle; break;
@@ -130,7 +130,7 @@ wchar_t Clef::GetClefGlyph(const data_NOTATIONTYPE notationtype) const
                 default: return SMUFL_E909_mensuralCclefPetrucciPosMiddle; break;
             }
         case NOTATIONTYPE_mensural_black:
-            switch (GetShape()) {
+            switch (this->GetShape()) {
                 case CLEFSHAPE_C: return SMUFL_E906_chantCclef; break;
                 case CLEFSHAPE_F: return SMUFL_E902_chantFclef; break;
                 default:
@@ -140,9 +140,9 @@ wchar_t Clef::GetClefGlyph(const data_NOTATIONTYPE notationtype) const
             [[fallthrough]];
         default:
             // cmn clefs
-            switch (GetShape()) {
+            switch (this->GetShape()) {
                 case CLEFSHAPE_G:
-                    switch (GetDis()) {
+                    switch (this->GetDis()) {
                         case OCTAVE_DIS_8:
                             return (this->GetDisPlace() == STAFFREL_basic_above) ? SMUFL_E053_gClef8va
                                                                                  : SMUFL_E052_gClef8vb;
@@ -155,7 +155,7 @@ wchar_t Clef::GetClefGlyph(const data_NOTATIONTYPE notationtype) const
                     }
                 case CLEFSHAPE_GG: return SMUFL_E055_gClef8vbOld;
                 case CLEFSHAPE_F:
-                    switch (GetDis()) {
+                    switch (this->GetDis()) {
                         case OCTAVE_DIS_8:
                             return (this->GetDisPlace() == STAFFREL_basic_above) ? SMUFL_E065_fClef8va
                                                                                  : SMUFL_E064_fClef8vb;
@@ -167,7 +167,7 @@ wchar_t Clef::GetClefGlyph(const data_NOTATIONTYPE notationtype) const
                         default: return SMUFL_E062_fClef; break;
                     }
                 case CLEFSHAPE_C:
-                    switch (GetDis()) {
+                    switch (this->GetDis()) {
                         case OCTAVE_DIS_8: return SMUFL_E05D_cClef8vb; break;
                         default: return SMUFL_E05C_cClef; break;
                     }
@@ -195,7 +195,7 @@ int Clef::AdjustBeams(FunctorParams *functorParams)
 
     Staff *staff = this->GetAncestorStaff();
 
-    auto currentShapeIter = topToMiddleProportions.find(GetShape());
+    auto currentShapeIter = topToMiddleProportions.find(this->GetShape());
     if (currentShapeIter == topToMiddleProportions.end()) return FUNCTOR_CONTINUE;
 
     // const int directionBias = (vrv_cast<Beam *>(params->m_beam)->m_drawingPlace == BEAMPLACE_above) ? 1 : -1;
@@ -205,7 +205,7 @@ int Clef::AdjustBeams(FunctorParams *functorParams)
     // Proportion of the glyph about Y point is defined in the topToMiddleProportions map and used when
     // left and right margins are calculated
     const int clefPosition = staff->GetDrawingY()
-        - params->m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - GetLine());
+        - params->m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - this->GetLine());
     const int clefGlyphHeight
         = params->m_doc->GetGlyphHeight(currentShapeIter->second.first, staff->m_drawingStaffSize, true);
     const int beamWidth = params->m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, false);
diff --git a/src/controlelement.cpp b/src/controlelement.cpp
index 5b9153b4457..aa97697e515 100644
--- a/src/controlelement.cpp
+++ b/src/controlelement.cpp
@@ -29,31 +29,31 @@ namespace vrv {
 
 ControlElement::ControlElement() : FloatingObject(CONTROL_ELEMENT, "ce"), LinkingInterface(), AttLabelled(), AttTyped()
 {
-    RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 ControlElement::ControlElement(ClassId classId)
     : FloatingObject(classId, "ce"), LinkingInterface(), AttLabelled(), AttTyped()
 {
-    RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 ControlElement::ControlElement(ClassId classId, const std::string &classIdStr)
     : FloatingObject(classId, classIdStr), LinkingInterface(), AttLabelled(), AttTyped()
 {
-    RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 ControlElement::~ControlElement() {}
@@ -62,8 +62,8 @@ void ControlElement::Reset()
 {
     FloatingObject::Reset();
     LinkingInterface::Reset();
-    ResetLabelled();
-    ResetTyped();
+    this->ResetLabelled();
+    this->ResetTyped();
 }
 
 data_HORIZONTALALIGNMENT ControlElement::GetChildRendAlignment()
diff --git a/src/corr.cpp b/src/corr.cpp
index e8900690f6e..29427e0ae30 100644
--- a/src/corr.cpp
+++ b/src/corr.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Corr> s_factory("corr", CORR);
 
 Corr::Corr() : EditorialElement(CORR, "corr-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Corr::~Corr() {}
@@ -35,7 +35,7 @@ Corr::~Corr() {}
 void Corr::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/course.cpp b/src/course.cpp
index 26a1d9d02da..2cf1b2183c6 100644
--- a/src/course.cpp
+++ b/src/course.cpp
@@ -23,12 +23,12 @@ static const ClassRegistrar<Course> s_factory("course", COURSE);
 
 Course::Course() : Object(COURSE, "course-"), AttAccidental(), AttNNumberLike(), AttOctave(), AttPitch()
 {
-    RegisterAttClass(ATT_ACCIDENTAL);
-    RegisterAttClass(ATT_NNUMBERLIKE);
-    RegisterAttClass(ATT_OCTAVE);
-    RegisterAttClass(ATT_PITCH);
+    this->RegisterAttClass(ATT_ACCIDENTAL);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_OCTAVE);
+    this->RegisterAttClass(ATT_PITCH);
 
-    Reset();
+    this->Reset();
 }
 
 Course::~Course() {}
@@ -36,10 +36,10 @@ Course::~Course() {}
 void Course::Reset()
 {
     Object::Reset();
-    ResetAccidental();
-    ResetNNumberLike();
-    ResetOctave();
-    ResetPitch();
+    this->ResetAccidental();
+    this->ResetNNumberLike();
+    this->ResetOctave();
+    this->ResetPitch();
 }
 
 bool Course::IsSupportedChild(Object *child)
diff --git a/src/custos.cpp b/src/custos.cpp
index b725e5fd750..954a1e13dd4 100644
--- a/src/custos.cpp
+++ b/src/custos.cpp
@@ -25,12 +25,12 @@ static const ClassRegistrar<Custos> s_factory("custos", CUSTOS);
 
 Custos::Custos() : LayerElement(CUSTOS, "custos-"), PitchInterface(), PositionInterface(), AttColor(), AttExtSym()
 {
-    RegisterInterface(PitchInterface::GetAttClasses(), PitchInterface::IsInterface());
-    RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_EXTSYM);
+    this->RegisterInterface(PitchInterface::GetAttClasses(), PitchInterface::IsInterface());
+    this->RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_EXTSYM);
 
-    Reset();
+    this->Reset();
 }
 
 Custos::~Custos() {}
@@ -40,8 +40,8 @@ void Custos::Reset()
     LayerElement::Reset();
     PitchInterface::Reset();
     PositionInterface::Reset();
-    ResetColor();
-    ResetExtSym();
+    this->ResetColor();
+    this->ResetExtSym();
 }
 
 bool Custos::IsSupportedChild(Object *child)
@@ -58,13 +58,13 @@ bool Custos::IsSupportedChild(Object *child)
 wchar_t Custos::GetCustosGlyph(const data_NOTATIONTYPE notationtype) const
 {
     // If there is glyph.num, prioritize it
-    if (HasGlyphNum()) {
-        wchar_t code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        wchar_t code = this->GetGlyphNum();
         if (NULL != Resources::GetGlyph(code)) return code;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
diff --git a/src/damage.cpp b/src/damage.cpp
index e4db04543ff..01922aab5dd 100644
--- a/src/damage.cpp
+++ b/src/damage.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Damage> s_factory("damage", DAMAGE);
 
 Damage::Damage() : EditorialElement(DAMAGE, "damage-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Damage::~Damage() {}
@@ -35,7 +35,7 @@ Damage::~Damage() {}
 void Damage::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/del.cpp b/src/del.cpp
index 566bbfe3a97..3274ceed36f 100644
--- a/src/del.cpp
+++ b/src/del.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Del> s_factory("del", DEL);
 
 Del::Del() : EditorialElement(DEL, "del-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Del::~Del() {}
@@ -35,7 +35,7 @@ Del::~Del() {}
 void Del::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/devicecontext.cpp b/src/devicecontext.cpp
index 7b90e08b10f..78281819060 100644
--- a/src/devicecontext.cpp
+++ b/src/devicecontext.cpp
@@ -175,7 +175,7 @@ void DeviceContext::ReactivateGraphic()
 void DeviceContext::GetTextExtent(const std::string &string, TextExtend *extend, bool typeSize)
 {
     std::wstring wtext(string.begin(), string.end());
-    GetTextExtent(wtext, extend, typeSize);
+    this->GetTextExtent(wtext, extend, typeSize);
 }
 
 void DeviceContext::GetTextExtent(const std::wstring &string, TextExtend *extend, bool typeSize)
diff --git a/src/dir.cpp b/src/dir.cpp
index fb8efbbecf6..10dd6198676 100644
--- a/src/dir.cpp
+++ b/src/dir.cpp
@@ -37,14 +37,14 @@ Dir::Dir()
     , AttLineRendBase()
     , AttVerticalGroup()
 {
-    RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_LANG);
-    RegisterAttClass(ATT_EXTENDER);
-    RegisterAttClass(ATT_LINERENDBASE);
-    RegisterAttClass(ATT_VERTICALGROUP);
-
-    Reset();
+    this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_LANG);
+    this->RegisterAttClass(ATT_EXTENDER);
+    this->RegisterAttClass(ATT_LINERENDBASE);
+    this->RegisterAttClass(ATT_VERTICALGROUP);
+
+    this->Reset();
 }
 
 Dir::~Dir() {}
@@ -54,10 +54,10 @@ void Dir::Reset()
     ControlElement::Reset();
     TextDirInterface::Reset();
     TimeSpanningInterface::Reset();
-    ResetExtender();
-    ResetLang();
-    ResetLineRendBase();
-    ResetVerticalGroup();
+    this->ResetExtender();
+    this->ResetLang();
+    this->ResetLineRendBase();
+    this->ResetVerticalGroup();
 }
 
 bool Dir::IsSupportedChild(Object *child)
@@ -76,7 +76,7 @@ bool Dir::IsSupportedChild(Object *child)
 
 bool Dir::AreChildrenAlignedTo(data_HORIZONTALALIGNMENT alignment) const
 {
-    const ArrayOfObjects *children = GetChildren();
+    const ArrayOfObjects *children = this->GetChildren();
     bool hasHalign = std::any_of(children->begin(), children->end(), [&alignment](Object *child) {
         AttHorizontalAlign *hAlign = dynamic_cast<AttHorizontalAlign *>(child);
         return (hAlign && (hAlign->GetHalign() == alignment));
diff --git a/src/doc.cpp b/src/doc.cpp
index e4af6b680bc..6e511316910 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -76,7 +76,7 @@ Doc::Doc() : Object(DOC, "doc-")
 {
     m_options = new Options();
 
-    Reset();
+    this->Reset();
 }
 
 Doc::~Doc()
@@ -163,7 +163,7 @@ bool Doc::GenerateDocumentScoreDef()
         return false;
     }
 
-    GetCurrentScoreDef()->Reset();
+    this->GetCurrentScoreDef()->Reset();
     StaffGrp *staffGrp = new StaffGrp();
     for (auto &object : staves) {
         Staff *staff = vrv_cast<Staff *>(object);
@@ -174,7 +174,7 @@ bool Doc::GenerateDocumentScoreDef()
         if (!measure->IsMeasuredMusic()) staffDef->SetNotationtype(NOTATIONTYPE_mensural);
         staffGrp->AddChild(staffDef);
     }
-    GetCurrentScoreDef()->AddChild(staffGrp);
+    this->GetCurrentScoreDef()->AddChild(staffGrp);
 
     LogMessage("ScoreDef generated");
 
@@ -183,7 +183,7 @@ bool Doc::GenerateDocumentScoreDef()
 
 bool Doc::GenerateFooter()
 {
-    if (GetCurrentScoreDef()->FindDescendantByType(PGFOOT)) {
+    if (this->GetCurrentScoreDef()->FindDescendantByType(PGFOOT)) {
         return false;
     }
 
@@ -192,33 +192,33 @@ bool Doc::GenerateFooter()
     pgFoot->IsGenerated(true);
     pgFoot->LoadFooter();
     pgFoot->SetType("autogenerated");
-    GetCurrentScoreDef()->AddChild(pgFoot);
+    this->GetCurrentScoreDef()->AddChild(pgFoot);
 
     PgFoot2 *pgFoot2 = new PgFoot2();
     pgFoot2->IsGenerated(true);
     pgFoot2->LoadFooter();
     pgFoot2->SetType("autogenerated");
-    GetCurrentScoreDef()->AddChild(pgFoot2);
+    this->GetCurrentScoreDef()->AddChild(pgFoot2);
 
     return true;
 }
 
 bool Doc::GenerateHeader()
 {
-    if (GetCurrentScoreDef()->FindDescendantByType(PGHEAD)) return false;
+    if (this->GetCurrentScoreDef()->FindDescendantByType(PGHEAD)) return false;
 
     PgHead *pgHead = new PgHead();
     // We mark it as generated for not having it written in the output
     pgHead->IsGenerated(true);
     pgHead->GenerateFromMEIHeader(m_header);
     pgHead->SetType("autogenerated");
-    GetCurrentScoreDef()->AddChild(pgHead);
+    this->GetCurrentScoreDef()->AddChild(pgHead);
 
     PgHead2 *pgHead2 = new PgHead2();
     pgHead2->IsGenerated(true);
     pgHead2->AddPageNum(HORIZONTALALIGNMENT_center, VERTICALALIGNMENT_top);
     pgHead2->SetType("autogenerated");
-    GetCurrentScoreDef()->AddChild(pgHead2);
+    this->GetCurrentScoreDef()->AddChild(pgHead2);
 
     return true;
 }
@@ -254,7 +254,7 @@ void Doc::CalculateMidiTimemap()
     m_MIDITimemapTempo = 0.0;
 
     // This happens if the document was never cast off (breaks none option in the toolkit)
-    if (!m_drawingPage && GetPageCount() == 1) {
+    if (!m_drawingPage && this->GetPageCount() == 1) {
         Page *page = this->SetDrawingPage(0);
         if (!page) {
             return;
@@ -266,8 +266,8 @@ void Doc::CalculateMidiTimemap()
     double tempo = MIDI_TEMPO;
 
     // Set tempo
-    if (GetCurrentScoreDef()->HasMidiBpm()) {
-        tempo = GetCurrentScoreDef()->GetMidiBpm();
+    if (this->GetCurrentScoreDef()->HasMidiBpm()) {
+        tempo = this->GetCurrentScoreDef()->GetMidiBpm();
     }
 
     // We first calculate the maximum duration of each measure
@@ -305,8 +305,8 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     double tempo = MIDI_TEMPO;
 
     // set MIDI tempo
-    if (GetCurrentScoreDef()->HasMidiBpm()) {
-        tempo = GetCurrentScoreDef()->GetMidiBpm();
+    if (this->GetCurrentScoreDef()->HasMidiBpm()) {
+        tempo = this->GetCurrentScoreDef()->GetMidiBpm();
     }
     midiFile->addTempo(0, 0, tempo);
 
@@ -336,7 +336,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
          staves != prepareProcessingListsParams.m_layerTree.child.end(); ++staves) {
 
         int transSemi = 0;
-        if (StaffDef *staffDef = GetCurrentScoreDef()->GetStaffDef(staves->first)) {
+        if (StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staves->first)) {
             // get the transposition (semi-tone) value for the staff
             if (staffDef->HasTransSemi()) transSemi = staffDef->GetTransSemi();
             midiTrack = staffDef->GetN();
@@ -369,7 +369,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
                 if (!trackName.empty()) midiFile->addTrackName(midiTrack, 0, trackName);
             }
             // set MIDI time signature
-            MeterSig *meterSig = dynamic_cast<MeterSig *>(GetCurrentScoreDef()->FindDescendantByType(METERSIG));
+            MeterSig *meterSig = dynamic_cast<MeterSig *>(this->GetCurrentScoreDef()->FindDescendantByType(METERSIG));
             if (meterSig && meterSig->HasCount()) {
                 midiFile->addTimeSignature(midiTrack, 0, meterSig->GetTotalCount(), meterSig->GetUnit());
             }
@@ -770,7 +770,7 @@ void Doc::PrepareDrawing()
     this->Process(&prepareDynamEnclosure, NULL);
 
     Functor scoreDefSetGrpSym(&Object::ScoreDefSetGrpSym);
-    GetCurrentScoreDef()->Process(&scoreDefSetGrpSym, NULL);
+    this->GetCurrentScoreDef()->Process(&scoreDefSetGrpSym, NULL);
 
     // LogElapsedTimeEnd ("Preparing drawing");
 
@@ -827,7 +827,7 @@ void Doc::ScoreDefSetGrpSymDoc()
     // Group symbols need to be resolved using scoreDef, since there might be @starid/@endid attributes that determine
     // their positioning
     Functor scoreDefSetGrpSym(&Object::ScoreDefSetGrpSym);
-    // GetCurrentScoreDef()->Process(&scoreDefSetGrpSym, NULL);
+    // this->GetCurrentScoreDef()->Process(&scoreDefSetGrpSym, NULL);
     ScoreDefSetGrpSymParams scoreDefSetGrpSymParams(&scoreDefSetGrpSym);
     this->Process(&scoreDefSetGrpSym, &scoreDefSetGrpSymParams);
 }
@@ -1159,7 +1159,7 @@ void Doc::TransposeDoc()
         // Find the starting key tonic of the data to use in calculating the tranposition interval:
         // Set transposition by key tonic.
         // Detect the current key from the keysignature.
-        KeySig *keysig = dynamic_cast<KeySig *>(GetCurrentScoreDef()->FindDescendantByType(KEYSIG));
+        KeySig *keysig = dynamic_cast<KeySig *>(this->GetCurrentScoreDef()->FindDescendantByType(KEYSIG));
         // If there is no keysignature, assume it is C.
         TransPitch currentKey = TransPitch(0, 0, 0);
         if (keysig && keysig->HasPname()) {
@@ -1176,7 +1176,7 @@ void Doc::TransposeDoc()
     }
 
     else if (transposer.IsValidSemitones(transpositionOption)) {
-        KeySig *keysig = dynamic_cast<KeySig *>(GetCurrentScoreDef()->FindDescendantByType(KEYSIG, 3));
+        KeySig *keysig = dynamic_cast<KeySig *>(this->GetCurrentScoreDef()->FindDescendantByType(KEYSIG, 3));
         int fifths = 0;
         if (keysig) {
             fifths = keysig->GetFifthsInt();
@@ -1203,7 +1203,7 @@ void Doc::TransposeDoc()
         transpose.m_visibleOnly = false;
     }
 
-    GetCurrentScoreDef()->Process(&transpose, &transposeParams);
+    this->GetCurrentScoreDef()->Process(&transpose, &transposeParams);
     this->Process(&transpose, &transposeParams);
 }
 
@@ -1343,7 +1343,7 @@ int Doc::GetGlyphLeft(wchar_t code, int staffSize, bool graceSize) const
 
 int Doc::GetGlyphRight(wchar_t code, int staffSize, bool graceSize) const
 {
-    return GetGlyphLeft(code, staffSize, graceSize) + GetGlyphWidth(code, staffSize, graceSize);
+    return this->GetGlyphLeft(code, staffSize, graceSize) + this->GetGlyphWidth(code, staffSize, graceSize);
 }
 
 int Doc::GetGlyphBottom(wchar_t code, int staffSize, bool graceSize) const
@@ -1360,7 +1360,7 @@ int Doc::GetGlyphBottom(wchar_t code, int staffSize, bool graceSize) const
 
 int Doc::GetGlyphTop(wchar_t code, int staffSize, bool graceSize) const
 {
-    return GetGlyphBottom(code, staffSize, graceSize) + GetGlyphHeight(code, staffSize, graceSize);
+    return this->GetGlyphBottom(code, staffSize, graceSize) + this->GetGlyphHeight(code, staffSize, graceSize);
 }
 
 int Doc::GetTextGlyphHeight(wchar_t code, FontInfo *font, bool graceSize) const
@@ -1457,32 +1457,32 @@ int Doc::GetDrawingBrevisWidth(int staffSize) const
 
 int Doc::GetDrawingBarLineWidth(int staffSize) const
 {
-    return m_options->m_barLineWidth.GetValue() * GetDrawingUnit(staffSize);
+    return m_options->m_barLineWidth.GetValue() * this->GetDrawingUnit(staffSize);
 }
 
 int Doc::GetDrawingStaffLineWidth(int staffSize) const
 {
-    return m_options->m_staffLineWidth.GetValue() * GetDrawingUnit(staffSize);
+    return m_options->m_staffLineWidth.GetValue() * this->GetDrawingUnit(staffSize);
 }
 
 int Doc::GetDrawingStemWidth(int staffSize) const
 {
-    return m_options->m_stemWidth.GetValue() * GetDrawingUnit(staffSize);
+    return m_options->m_stemWidth.GetValue() * this->GetDrawingUnit(staffSize);
 }
 
 int Doc::GetDrawingDynamHeight(int staffSize, bool withMargin) const
 {
-    int height = GetGlyphHeight(SMUFL_E522_dynamicForte, staffSize, false);
+    int height = this->GetGlyphHeight(SMUFL_E522_dynamicForte, staffSize, false);
     // This should be styled
-    if (withMargin) height += GetDrawingUnit(staffSize);
+    if (withMargin) height += this->GetDrawingUnit(staffSize);
     return height;
 }
 
 int Doc::GetDrawingHairpinSize(int staffSize, bool withMargin) const
 {
-    int size = m_options->m_hairpinSize.GetValue() * GetDrawingUnit(staffSize);
+    int size = m_options->m_hairpinSize.GetValue() * this->GetDrawingUnit(staffSize);
     // This should be styled
-    if (withMargin) size += GetDrawingUnit(staffSize);
+    if (withMargin) size += this->GetDrawingUnit(staffSize);
     return size;
 }
 
@@ -1641,12 +1641,12 @@ double Doc::GetStaffDistance(const ClassId classId, int staffIndex, data_STAFFRE
             distance = m_options->m_dynamDist.GetDefault();
 
             // Inspect the scoreDef attribute
-            if (GetCurrentScoreDef()->HasDynamDist()) {
-                distance = GetCurrentScoreDef()->GetDynamDist();
+            if (this->GetCurrentScoreDef()->HasDynamDist()) {
+                distance = this->GetCurrentScoreDef()->GetDynamDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasDynamDist()) {
                 distance = staffDef->GetDynamDist();
             }
@@ -1660,12 +1660,12 @@ double Doc::GetStaffDistance(const ClassId classId, int staffIndex, data_STAFFRE
             distance = m_options->m_harmDist.GetDefault();
 
             // Inspect the scoreDef attribute
-            if (GetCurrentScoreDef()->HasHarmDist()) {
-                distance = GetCurrentScoreDef()->GetHarmDist();
+            if (this->GetCurrentScoreDef()->HasHarmDist()) {
+                distance = this->GetCurrentScoreDef()->GetHarmDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasHarmDist()) {
                 distance = staffDef->GetHarmDist();
             }
@@ -1752,7 +1752,7 @@ Page *Doc::SetDrawingPage(int pageIdx)
     m_drawingLyricFontSize = m_options->m_unit.GetValue() * m_options->m_lyricSize.GetValue();
     m_fingeringFontSize = m_drawingLyricFontSize * m_options->m_fingeringScale.GetValue();
 
-    glyph_size = GetGlyphWidth(SMUFL_E0A2_noteheadWhole, 100, 0);
+    glyph_size = this->GetGlyphWidth(SMUFL_E0A2_noteheadWhole, 100, 0);
 
     m_drawingBrevisWidth = (int)((glyph_size * 0.8) / 2);
 
diff --git a/src/dot.cpp b/src/dot.cpp
index ba04aba2f9a..0273a4afe65 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -26,11 +26,11 @@ static const ClassRegistrar<Dot> s_factory("dot", DOT);
 
 Dot::Dot() : LayerElement(DOT, "dot-"), PositionInterface(), AttColor(), AttDotLog()
 {
-    RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_DOTLOG);
+    this->RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_DOTLOG);
 
-    Reset();
+    this->Reset();
 }
 
 Dot::~Dot() {}
@@ -39,8 +39,8 @@ void Dot::Reset()
 {
     LayerElement::Reset();
     PositionInterface::Reset();
-    ResetColor();
-    ResetDotLog();
+    this->ResetColor();
+    this->ResetDotLog();
 
     m_drawingPreviousElement = NULL;
     m_drawingNextElement = NULL;
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 141ce8a2bd7..e1f48e1f3ac 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -27,7 +27,7 @@ namespace vrv {
 
 DrawingListInterface::DrawingListInterface()
 {
-    Reset();
+    this->Reset();
 }
 
 DrawingListInterface::~DrawingListInterface() {}
@@ -67,7 +67,7 @@ void DrawingListInterface::ResetDrawingList()
 
 BeamDrawingInterface::BeamDrawingInterface() : ObjectListInterface()
 {
-    Reset();
+    this->Reset();
 }
 
 BeamDrawingInterface::~BeamDrawingInterface()
@@ -259,7 +259,7 @@ bool BeamDrawingInterface::IsHorizontal()
         return true;
     }
 
-    if (HasOneStepHeight()) return true;
+    if (this->HasOneStepHeight()) return true;
 
     // if (m_drawingPlace == BEAMPLACE_mixed) return true;
 
@@ -442,7 +442,7 @@ int BeamDrawingInterface::GetPosition(Object *object, LayerElement *element)
 
 StaffDefDrawingInterface::StaffDefDrawingInterface()
 {
-    Reset();
+    this->Reset();
 }
 
 StaffDefDrawingInterface::~StaffDefDrawingInterface() {}
@@ -517,10 +517,11 @@ bool StaffDefDrawingInterface::DrawMeterSigGrp()
 
 void StaffDefDrawingInterface::AlternateCurrentMeterSig(Measure *measure)
 {
-    if (MeterSigGrp *meterSigGrp = GetCurrentMeterSigGrp(); meterSigGrp->GetFunc() == meterSigGrpLog_FUNC_alternating) {
+    if (MeterSigGrp *meterSigGrp = this->GetCurrentMeterSigGrp();
+        meterSigGrp->GetFunc() == meterSigGrpLog_FUNC_alternating) {
         meterSigGrp->SetMeasureBasedCount(measure);
         MeterSig *meter = meterSigGrp->GetSimplifiedMeterSig();
-        SetCurrentMeterSig(meter);
+        this->SetCurrentMeterSig(meter);
         delete meter;
     }
 }
@@ -531,7 +532,7 @@ void StaffDefDrawingInterface::AlternateCurrentMeterSig(Measure *measure)
 
 StemmedDrawingInterface::StemmedDrawingInterface()
 {
-    Reset();
+    this->Reset();
 }
 
 StemmedDrawingInterface::~StemmedDrawingInterface() {}
@@ -593,7 +594,7 @@ Point StemmedDrawingInterface::GetDrawingStemEnd(Object *object)
             return Point(object->GetDrawingX(), object->GetDrawingY());
         }
     }
-    return Point(m_drawingStem->GetDrawingX(), m_drawingStem->GetDrawingY() - GetDrawingStemLen());
+    return Point(m_drawingStem->GetDrawingX(), m_drawingStem->GetDrawingY() - this->GetDrawingStemLen());
 }
 
 } // namespace vrv
diff --git a/src/durationinterface.cpp b/src/durationinterface.cpp
index 8e8b2d9ea1e..e8ef560d98b 100644
--- a/src/durationinterface.cpp
+++ b/src/durationinterface.cpp
@@ -39,30 +39,30 @@ DurationInterface::DurationInterface()
     , AttFermataPresent()
     , AttStaffIdent()
 {
-    RegisterInterfaceAttClass(ATT_AUGMENTDOTS);
-    RegisterInterfaceAttClass(ATT_BEAMSECONDARY);
-    RegisterInterfaceAttClass(ATT_DURATIONGESTURAL);
-    RegisterInterfaceAttClass(ATT_DURATIONLOGICAL);
-    RegisterInterfaceAttClass(ATT_DURATIONQUALITY);
-    RegisterInterfaceAttClass(ATT_DURATIONRATIO);
-    RegisterInterfaceAttClass(ATT_FERMATAPRESENT);
-    RegisterInterfaceAttClass(ATT_STAFFIDENT);
-
-    Reset();
+    this->RegisterInterfaceAttClass(ATT_AUGMENTDOTS);
+    this->RegisterInterfaceAttClass(ATT_BEAMSECONDARY);
+    this->RegisterInterfaceAttClass(ATT_DURATIONGESTURAL);
+    this->RegisterInterfaceAttClass(ATT_DURATIONLOGICAL);
+    this->RegisterInterfaceAttClass(ATT_DURATIONQUALITY);
+    this->RegisterInterfaceAttClass(ATT_DURATIONRATIO);
+    this->RegisterInterfaceAttClass(ATT_FERMATAPRESENT);
+    this->RegisterInterfaceAttClass(ATT_STAFFIDENT);
+
+    this->Reset();
 }
 
 DurationInterface::~DurationInterface() {}
 
 void DurationInterface::Reset()
 {
-    ResetAugmentDots();
-    ResetBeamSecondary();
-    ResetDurationGestural();
-    ResetDurationLogical();
-    ResetDurationQuality();
-    ResetDurationRatio();
-    ResetFermataPresent();
-    ResetStaffIdent();
+    this->ResetAugmentDots();
+    this->ResetBeamSecondary();
+    this->ResetDurationGestural();
+    this->ResetDurationLogical();
+    this->ResetDurationQuality();
+    this->ResetDurationRatio();
+    this->ResetFermataPresent();
+    this->ResetStaffIdent();
 
     m_durDefault = DURATION_NONE;
 
@@ -87,7 +87,7 @@ double DurationInterface::GetInterfaceAlignmentDuration(int num, int numBase)
     if (noteDots != -1) {
         duration = 2 * duration - (duration / pow(2, noteDots));
     }
-    // LogDebug("Duration %d; Dot %d; Alignment %f", noteDur, GetDots(), duration);
+    // LogDebug("Duration %d; Dot %d; Alignment %f", noteDur, this->GetDots(), duration);
     return duration;
 }
 
diff --git a/src/dynam.cpp b/src/dynam.cpp
index 4392649f986..7dbef9cc3ad 100644
--- a/src/dynam.cpp
+++ b/src/dynam.cpp
@@ -47,16 +47,16 @@ Dynam::Dynam()
     , AttMidiValue2()
     , AttVerticalGroup()
 {
-    RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_ENCLOSINGCHARS);
-    RegisterAttClass(ATT_EXTENDER);
-    RegisterAttClass(ATT_LINERENDBASE);
-    RegisterAttClass(ATT_MIDIVALUE);
-    RegisterAttClass(ATT_MIDIVALUE2);
-    RegisterAttClass(ATT_VERTICALGROUP);
-
-    Reset();
+    this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_ENCLOSINGCHARS);
+    this->RegisterAttClass(ATT_EXTENDER);
+    this->RegisterAttClass(ATT_LINERENDBASE);
+    this->RegisterAttClass(ATT_MIDIVALUE);
+    this->RegisterAttClass(ATT_MIDIVALUE2);
+    this->RegisterAttClass(ATT_VERTICALGROUP);
+
+    this->Reset();
 }
 
 Dynam::~Dynam() {}
@@ -66,10 +66,10 @@ void Dynam::Reset()
     ControlElement::Reset();
     TextDirInterface::Reset();
     TimeSpanningInterface::Reset();
-    ResetEnclosingChars();
-    ResetExtender();
-    ResetLineRendBase();
-    ResetVerticalGroup();
+    this->ResetEnclosingChars();
+    this->ResetExtender();
+    this->ResetLineRendBase();
+    this->ResetVerticalGroup();
 }
 
 bool Dynam::IsSupportedChild(Object *child)
diff --git a/src/editorial.cpp b/src/editorial.cpp
index f8bad86a3fd..58c0063e6b9 100644
--- a/src/editorial.cpp
+++ b/src/editorial.cpp
@@ -36,36 +36,36 @@ namespace vrv {
 EditorialElement::EditorialElement()
     : Object(EDITORIAL_ELEMENT, "ee-"), SystemMilestoneInterface(), AttLabelled(), AttTyped()
 {
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 EditorialElement::EditorialElement(ClassId classId)
     : Object(classId, "ee-"), SystemMilestoneInterface(), AttLabelled(), AttTyped()
 {
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 EditorialElement::EditorialElement(ClassId classId, const std::string &classIdStr)
     : Object(classId, classIdStr), SystemMilestoneInterface(), AttLabelled(), AttTyped()
 {
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 void EditorialElement::Reset()
 {
     Object::Reset();
     SystemMilestoneInterface::Reset();
-    ResetLabelled();
-    ResetTyped();
+    this->ResetLabelled();
+    this->ResetTyped();
 
     m_visibility = Visible;
 }
diff --git a/src/elementpart.cpp b/src/elementpart.cpp
index b294486817d..51889c2f76a 100644
--- a/src/elementpart.cpp
+++ b/src/elementpart.cpp
@@ -32,9 +32,9 @@ namespace vrv {
 
 Dots::Dots() : LayerElement(DOTS, "dots-"), AttAugmentDots()
 {
-    RegisterAttClass(ATT_AUGMENTDOTS);
+    this->RegisterAttClass(ATT_AUGMENTDOTS);
 
-    Reset();
+    this->Reset();
 }
 
 Dots::~Dots() {}
@@ -42,7 +42,7 @@ Dots::~Dots() {}
 void Dots::Reset()
 {
     LayerElement::Reset();
-    ResetAugmentDots();
+    this->ResetAugmentDots();
 
     m_isAdjusted = false;
     m_flagShift = 0;
@@ -69,7 +69,7 @@ std::set<int> &Dots::ModifyDotLocsForStaff(Staff *staff)
 Flag::Flag() : LayerElement(FLAG, "flag-")
 {
 
-    Reset();
+    this->Reset();
 }
 
 Flag::~Flag() {}
@@ -131,9 +131,9 @@ Point Flag::GetStemDownNW(Doc *doc, int staffSize, bool graceSize, wchar_t &code
 
 TupletBracket::TupletBracket() : LayerElement(TUPLET_BRACKET, "bracket-"), AttTupletVis()
 {
-    RegisterAttClass(ATT_TUPLETVIS);
+    this->RegisterAttClass(ATT_TUPLETVIS);
 
-    Reset();
+    this->Reset();
 }
 
 TupletBracket::~TupletBracket() {}
@@ -141,7 +141,7 @@ TupletBracket::~TupletBracket() {}
 void TupletBracket::Reset()
 {
     LayerElement::Reset();
-    ResetTupletVis();
+    this->ResetTupletVis();
 
     m_drawingXRelLeft = 0;
     m_drawingXRelRight = 0;
@@ -204,10 +204,10 @@ int TupletBracket::GetDrawingYRight()
 
 TupletNum::TupletNum() : LayerElement(TUPLET_NUM, "num-"), AttNumberPlacement(), AttTupletVis()
 {
-    RegisterAttClass(ATT_NUMBERPLACEMENT);
-    RegisterAttClass(ATT_TUPLETVIS);
+    this->RegisterAttClass(ATT_NUMBERPLACEMENT);
+    this->RegisterAttClass(ATT_TUPLETVIS);
 
-    Reset();
+    this->Reset();
 }
 
 TupletNum::~TupletNum() {}
@@ -215,8 +215,8 @@ TupletNum::~TupletNum() {}
 void TupletNum::Reset()
 {
     LayerElement::Reset();
-    ResetNumberPlacement();
-    ResetTupletVis();
+    this->ResetNumberPlacement();
+    this->ResetTupletVis();
 
     m_alignedBracket = NULL;
 }
@@ -273,11 +273,11 @@ void TupletNum::SetAlignedBracket(TupletBracket *alignedBracket)
 
 Stem::Stem() : LayerElement(STEM, "stem-"), AttGraced(), AttStems(), AttStemsCmn()
 {
-    RegisterAttClass(ATT_GRACED);
-    RegisterAttClass(ATT_STEMS);
-    RegisterAttClass(ATT_STEMSCMN);
+    this->RegisterAttClass(ATT_GRACED);
+    this->RegisterAttClass(ATT_STEMS);
+    this->RegisterAttClass(ATT_STEMSCMN);
 
-    Reset();
+    this->Reset();
 }
 
 Stem::~Stem() {}
@@ -285,9 +285,9 @@ Stem::~Stem() {}
 void Stem::Reset()
 {
     LayerElement::Reset();
-    ResetGraced();
-    ResetStems();
-    ResetStemsCmn();
+    this->ResetGraced();
+    this->ResetStems();
+    this->ResetStemsCmn();
 
     m_drawingStemDir = STEMDIRECTION_NONE;
     m_drawingStemLen = 0;
@@ -319,7 +319,7 @@ int Stem::CompareToElementPosition(Doc *doc, LayerElement *otherElement, int mar
     currentFlag = vrv_cast<Flag *>(FindDescendantByType(FLAG, 1));
     if (currentFlag && currentFlag->m_drawingNbFlags) {
         wchar_t flagGlyph = currentFlag->GetFlagGlyph(STEMDIRECTION_down);
-        const int flagWidth = doc->GetGlyphWidth(flagGlyph, staff->m_drawingStaffSize, GetDrawingCueSize());
+        const int flagWidth = doc->GetGlyphWidth(flagGlyph, staff->m_drawingStaffSize, this->GetDrawingCueSize());
         horizontalMargin += flagWidth;
     }
 
@@ -333,26 +333,26 @@ int Stem::CompareToElementPosition(Doc *doc, LayerElement *otherElement, int mar
 
 void Stem::AdjustFlagPlacement(Doc *doc, Flag *flag, int staffSize, int verticalCenter, int duration)
 {
-    LayerElement *parent = vrv_cast<LayerElement *>(GetParent());
+    LayerElement *parent = vrv_cast<LayerElement *>(this->GetParent());
     if (!parent) return;
 
-    const data_STEMDIRECTION stemDirection = GetDrawingStemDir();
+    const data_STEMDIRECTION stemDirection = this->GetDrawingStemDir();
     // For overlapping purposes we don't care for flags shorter than 16th since they grow in opposite direction
     wchar_t flagGlyph = SMUFL_E242_flag16thUp;
     if (duration < DURATION_16) flagGlyph = flag->GetFlagGlyph(stemDirection);
-    const int glyphHeight = doc->GetGlyphHeight(flagGlyph, staffSize, GetDrawingCueSize());
+    const int glyphHeight = doc->GetGlyphHeight(flagGlyph, staffSize, this->GetDrawingCueSize());
 
     // Make sure that flags don't overlap with notehead. Upward flags cannot overlap with noteheads so check
     // only downward ones
     const int adjustmentStep = doc->GetDrawingUnit(staffSize);
     if (stemDirection == STEMDIRECTION_down) {
-        const int noteheadMargin = GetDrawingStemLen() - (glyphHeight + parent->GetDrawingRadius(doc));
+        const int noteheadMargin = this->GetDrawingStemLen() - (glyphHeight + parent->GetDrawingRadius(doc));
         if ((duration > DURATION_16) && (noteheadMargin < 0)) {
             int offset = 0;
             if (noteheadMargin % adjustmentStep < -adjustmentStep / 3 * 2) offset = adjustmentStep / 2;
             const int heightToAdjust = (noteheadMargin / adjustmentStep) * adjustmentStep - offset;
-            SetDrawingStemLen(GetDrawingStemLen() - heightToAdjust);
-            flag->SetDrawingYRel(-GetDrawingStemLen());
+            this->SetDrawingStemLen(this->GetDrawingStemLen() - heightToAdjust);
+            flag->SetDrawingYRel(-this->GetDrawingStemLen());
         }
     }
 
@@ -372,7 +372,7 @@ void Stem::AdjustFlagPlacement(Doc *doc, Flag *flag, int staffSize, int vertical
 
     // Make sure that flags don't overlap with first (top or bottom) ledger line (effectively avoiding all ledgers)
     const int directionBias = (stemDirection == STEMDIRECTION_down) ? -1 : 1;
-    const int position = GetDrawingY() - GetDrawingStemLen() - directionBias * glyphHeight;
+    const int position = this->GetDrawingY() - this->GetDrawingStemLen() - directionBias * glyphHeight;
     const int ledgerPosition = verticalCenter - 6 * directionBias * adjustmentStep;
     const int displacementMargin = (position - ledgerPosition) * directionBias;
 
@@ -382,8 +382,8 @@ void Stem::AdjustFlagPlacement(Doc *doc, Flag *flag, int staffSize, int vertical
             offset = adjustmentStep / 2;
         }
         const int heightToAdjust = (displacementMargin / adjustmentStep - 1) * adjustmentStep * directionBias - offset;
-        SetDrawingStemLen(GetDrawingStemLen() + heightToAdjust);
-        flag->SetDrawingYRel(-GetDrawingStemLen());
+        this->SetDrawingStemLen(this->GetDrawingStemLen() + heightToAdjust);
+        flag->SetDrawingYRel(-this->GetDrawingStemLen());
     }
 }
 
diff --git a/src/ending.cpp b/src/ending.cpp
index 6d2d3211691..2432c48c662 100644
--- a/src/ending.cpp
+++ b/src/ending.cpp
@@ -31,10 +31,10 @@ static const ClassRegistrar<Ending> s_factory("ending", ENDING);
 
 Ending::Ending() : SystemElement(ENDING, "ending-"), SystemMilestoneInterface(), AttLineRend(), AttNNumberLike()
 {
-    RegisterAttClass(ATT_LINEREND);
-    RegisterAttClass(ATT_NINTEGER);
+    this->RegisterAttClass(ATT_LINEREND);
+    this->RegisterAttClass(ATT_NINTEGER);
 
-    Reset();
+    this->Reset();
 }
 
 Ending::~Ending() {}
@@ -43,8 +43,8 @@ void Ending::Reset()
 {
     SystemElement::Reset();
     SystemMilestoneInterface::Reset();
-    ResetLineRend();
-    ResetNNumberLike();
+    this->ResetLineRend();
+    this->ResetNNumberLike();
 }
 
 bool Ending::IsSupportedChild(Object *child)
diff --git a/src/expand.cpp b/src/expand.cpp
index 788966bb043..48951e46edb 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Expan> s_factory("expan", EXPAN);
 
 Expan::Expan() : EditorialElement(EXPAN, "expan-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Expan::~Expan() {}
@@ -35,7 +35,7 @@ Expan::~Expan() {}
 void Expan::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/expansion.cpp b/src/expansion.cpp
index 4820a07323c..ac1c2372444 100644
--- a/src/expansion.cpp
+++ b/src/expansion.cpp
@@ -23,9 +23,9 @@ static const ClassRegistrar<Expansion> s_factory("expansion", EXPANSION);
 
 Expansion::Expansion() : SystemElement(EXPANSION, "expansion-"), PlistInterface()
 {
-    RegisterInterface(PlistInterface::GetAttClasses(), PlistInterface::IsInterface());
+    this->RegisterInterface(PlistInterface::GetAttClasses(), PlistInterface::IsInterface());
 
-    Reset();
+    this->Reset();
 }
 
 Expansion::~Expansion() {}
diff --git a/src/expansionmap.cpp b/src/expansionmap.cpp
index 0384e5213dd..00efe631291 100644
--- a/src/expansionmap.cpp
+++ b/src/expansionmap.cpp
@@ -131,7 +131,7 @@ bool ExpansionMap::UpdateIds(Object *object)
             // @startid
             std::string oldStartId = interface->GetStartid();
             if (oldStartId.rfind("#", 0) == 0) oldStartId = oldStartId.substr(1, oldStartId.size() - 1);
-            std::string newStartId = GetExpansionIdsForElement(oldStartId).back();
+            std::string newStartId = this->GetExpansionIdsForElement(oldStartId).back();
             if (!newStartId.empty()) interface->SetStartid("#" + newStartId);
         }
         if (o->HasInterface(INTERFACE_TIME_SPANNING)) {
@@ -140,12 +140,12 @@ bool ExpansionMap::UpdateIds(Object *object)
             // @startid
             std::string oldStartId = interface->GetStartid();
             if (oldStartId.rfind("#", 0) == 0) oldStartId = oldStartId.substr(1, oldStartId.size() - 1);
-            std::string newStartId = GetExpansionIdsForElement(oldStartId).back();
+            std::string newStartId = this->GetExpansionIdsForElement(oldStartId).back();
             if (!newStartId.empty()) interface->SetStartid("#" + newStartId);
             // @endid
             oldStartId = interface->GetEndid();
             if (oldStartId.rfind("#", 0) == 0) oldStartId = oldStartId.substr(1, oldStartId.size() - 1);
-            std::string newEndId = GetExpansionIdsForElement(oldStartId).back();
+            std::string newEndId = this->GetExpansionIdsForElement(oldStartId).back();
             if (!newEndId.empty()) interface->SetEndid("#" + newEndId);
         }
         if (o->HasInterface(INTERFACE_PLIST)) {
@@ -155,7 +155,7 @@ bool ExpansionMap::UpdateIds(Object *object)
             xsdAnyURI_List newList;
             for (std::string oldRefString : oldList) {
                 if (oldRefString.rfind("#", 0) == 0) oldRefString = oldRefString.substr(1, oldRefString.size() - 1);
-                newList.push_back("#" + GetExpansionIdsForElement(oldRefString).back());
+                newList.push_back("#" + this->GetExpansionIdsForElement(oldRefString).back());
             }
             interface->SetPlist(newList);
         }
@@ -165,32 +165,32 @@ bool ExpansionMap::UpdateIds(Object *object)
             // @sameas
             std::string oldIdString = interface->GetSameas();
             if (oldIdString.rfind("#", 0) == 0) oldIdString = oldIdString.substr(1, oldIdString.size() - 1);
-            std::string newIdString = GetExpansionIdsForElement(oldIdString).back();
+            std::string newIdString = this->GetExpansionIdsForElement(oldIdString).back();
             if (!newIdString.empty()) interface->SetSameas("#" + newIdString);
             // @next
             oldIdString = interface->GetNext();
             if (oldIdString.rfind("#", 0) == 0) oldIdString = oldIdString.substr(1, oldIdString.size() - 1);
-            newIdString = GetExpansionIdsForElement(oldIdString).back();
+            newIdString = this->GetExpansionIdsForElement(oldIdString).back();
             if (!newIdString.empty()) interface->SetNext("#" + newIdString);
             // @prev
             oldIdString = interface->GetPrev();
             if (oldIdString.rfind("#", 0) == 0) oldIdString = oldIdString.substr(1, oldIdString.size() - 1);
-            newIdString = GetExpansionIdsForElement(oldIdString).back();
+            newIdString = this->GetExpansionIdsForElement(oldIdString).back();
             if (!newIdString.empty()) interface->SetPrev("#" + newIdString);
             // @copyof
             oldIdString = interface->GetCopyof();
             if (oldIdString.rfind("#", 0) == 0) oldIdString = oldIdString.substr(1, oldIdString.size() - 1);
-            newIdString = GetExpansionIdsForElement(oldIdString).back();
+            newIdString = this->GetExpansionIdsForElement(oldIdString).back();
             if (!newIdString.empty()) interface->SetCopyof("#" + newIdString);
             // @corresp
             oldIdString = interface->GetCorresp();
             if (oldIdString.rfind("#", 0) == 0) oldIdString = oldIdString.substr(1, oldIdString.size() - 1);
-            newIdString = GetExpansionIdsForElement(oldIdString).back();
+            newIdString = this->GetExpansionIdsForElement(oldIdString).back();
             if (!newIdString.empty()) interface->SetCorresp("#" + newIdString);
             // @synch
             oldIdString = interface->GetSynch();
             if (oldIdString.rfind("#", 0) == 0) oldIdString = oldIdString.substr(1, oldIdString.size() - 1);
-            newIdString = GetExpansionIdsForElement(oldIdString).back();
+            newIdString = this->GetExpansionIdsForElement(oldIdString).back();
             if (!newIdString.empty()) interface->SetSynch("#" + newIdString);
         }
         UpdateIds(o);
diff --git a/src/f.cpp b/src/f.cpp
index 1e637156044..1c95160ed67 100644
--- a/src/f.cpp
+++ b/src/f.cpp
@@ -27,10 +27,10 @@ static const ClassRegistrar<F> s_factory("f", FIGURE);
 
 F::F() : TextElement(FIGURE, "f-"), TimeSpanningInterface(), AttExtender()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_EXTENDER);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_EXTENDER);
 
-    Reset();
+    this->Reset();
 }
 
 F::~F() {}
@@ -39,7 +39,7 @@ void F::Reset()
 {
     TextElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetExtender();
+    this->ResetExtender();
 }
 
 bool F::IsSupportedChild(Object *child)
diff --git a/src/facsimileinterface.cpp b/src/facsimileinterface.cpp
index 7976a69ec9b..1e0e52b6fef 100644
--- a/src/facsimileinterface.cpp
+++ b/src/facsimileinterface.cpp
@@ -26,15 +26,15 @@ namespace vrv {
 
 FacsimileInterface::FacsimileInterface() : Interface(), AttFacsimile()
 {
-    RegisterInterfaceAttClass(ATT_FACSIMILE);
-    Reset();
+    this->RegisterInterfaceAttClass(ATT_FACSIMILE);
+    this->Reset();
 }
 
 FacsimileInterface::~FacsimileInterface() {}
 
 void FacsimileInterface::Reset()
 {
-    ResetFacsimile();
+    this->ResetFacsimile();
     this->SetZone(NULL);
 }
 
diff --git a/src/fb.cpp b/src/fb.cpp
index 22375353816..dad3261b642 100644
--- a/src/fb.cpp
+++ b/src/fb.cpp
@@ -28,7 +28,7 @@ static const ClassRegistrar<Fb> s_factory("fb", FB);
 Fb::Fb() : Object(FB, "fb-")
 {
 
-    Reset();
+    this->Reset();
 }
 
 Fb::~Fb() {}
diff --git a/src/featureextractor.cpp b/src/featureextractor.cpp
index 788cdd1564d..06da2109214 100644
--- a/src/featureextractor.cpp
+++ b/src/featureextractor.cpp
@@ -37,7 +37,7 @@ namespace vrv {
 FeatureExtractor::FeatureExtractor(const std::string &options)
 {
     // We currently have no option support
-    Reset();
+    this->Reset();
 }
 
 FeatureExtractor::~FeatureExtractor() {}
diff --git a/src/fermata.cpp b/src/fermata.cpp
index 00e4372fabe..7e3f1bba181 100644
--- a/src/fermata.cpp
+++ b/src/fermata.cpp
@@ -33,14 +33,14 @@ Fermata::Fermata()
     , AttFermataVis()
     , AttPlacementRelStaff()
 {
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_ENCLOSINGCHARS);
-    RegisterAttClass(ATT_EXTSYM);
-    RegisterAttClass(ATT_FERMATAVIS);
-    RegisterAttClass(ATT_PLACEMENTRELSTAFF);
-
-    Reset();
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_ENCLOSINGCHARS);
+    this->RegisterAttClass(ATT_EXTSYM);
+    this->RegisterAttClass(ATT_FERMATAVIS);
+    this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
+
+    this->Reset();
 }
 
 Fermata::~Fermata() {}
@@ -49,11 +49,11 @@ void Fermata::Reset()
 {
     ControlElement::Reset();
     TimePointInterface::Reset();
-    ResetColor();
-    ResetEnclosingChars();
-    ResetExtSym();
-    ResetFermataVis();
-    ResetPlacementRelStaff();
+    this->ResetColor();
+    this->ResetEnclosingChars();
+    this->ResetExtSym();
+    this->ResetFermataVis();
+    this->ResetPlacementRelStaff();
 }
 
 void Fermata::ConvertFromAnalyticalMarkup(
@@ -73,28 +73,31 @@ void Fermata::ConvertFromAnalyticalMarkup(
 wchar_t Fermata::GetFermataGlyph() const
 {
     // If there is glyph.num, prioritize it
-    if (HasGlyphNum()) {
-        wchar_t code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        wchar_t code = this->GetGlyphNum();
         if (NULL != Resources::GetGlyph(code)) return code;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
     // check for shape
-    if (GetShape() == fermataVis_SHAPE_angular) {
-        if (GetForm() == fermataVis_FORM_inv || (GetPlace() == STAFFREL_below && !(GetForm() == fermataVis_FORM_norm)))
+    if (this->GetShape() == fermataVis_SHAPE_angular) {
+        if (this->GetForm() == fermataVis_FORM_inv
+            || (this->GetPlace() == STAFFREL_below && !(this->GetForm() == fermataVis_FORM_norm)))
             return SMUFL_E4C5_fermataShortBelow;
         return SMUFL_E4C4_fermataShortAbove;
     }
-    else if (GetShape() == fermataVis_SHAPE_square) {
-        if (GetForm() == fermataVis_FORM_inv || (GetPlace() == STAFFREL_below && !(GetForm() == fermataVis_FORM_norm)))
+    else if (this->GetShape() == fermataVis_SHAPE_square) {
+        if (this->GetForm() == fermataVis_FORM_inv
+            || (this->GetPlace() == STAFFREL_below && !(this->GetForm() == fermataVis_FORM_norm)))
             return SMUFL_E4C7_fermataLongBelow;
         return SMUFL_E4C6_fermataLongAbove;
     }
-    else if (GetForm() == fermataVis_FORM_inv || (GetPlace() == STAFFREL_below && !(GetForm() == fermataVis_FORM_norm)))
+    else if (this->GetForm() == fermataVis_FORM_inv
+        || (this->GetPlace() == STAFFREL_below && !(this->GetForm() == fermataVis_FORM_norm)))
         return SMUFL_E4C1_fermataBelow;
 
     // If no other attributes match, return default one (fermataAbove)
diff --git a/src/fig.cpp b/src/fig.cpp
index 93bb20697b1..5103baf7c89 100644
--- a/src/fig.cpp
+++ b/src/fig.cpp
@@ -27,9 +27,9 @@ static const ClassRegistrar<Fig> s_factory("fig", FIG);
 
 Fig::Fig() : TextElement(FIG, "fig-"), AreaPosInterface()
 {
-    RegisterInterface(AreaPosInterface::GetAttClasses(), AreaPosInterface::IsInterface());
+    this->RegisterInterface(AreaPosInterface::GetAttClasses(), AreaPosInterface::IsInterface());
 
-    Reset();
+    this->Reset();
 }
 
 Fig::~Fig() {}
diff --git a/src/fing.cpp b/src/fing.cpp
index c9b68cacba6..9c5f4a92b4b 100644
--- a/src/fing.cpp
+++ b/src/fing.cpp
@@ -24,11 +24,11 @@ static const ClassRegistrar<Fing> s_factory("fing", FING);
 
 Fing::Fing() : ControlElement(FING, "fing-"), TimePointInterface(), TextDirInterface(), AttNNumberLike()
 {
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 Fing::~Fing() {}
@@ -38,7 +38,7 @@ void Fing::Reset()
     ControlElement::Reset();
     TimePointInterface::Reset();
     TextDirInterface::Reset();
-    ResetNNumberLike();
+    this->ResetNNumberLike();
 }
 
 bool Fing::IsSupportedChild(Object *child)
diff --git a/src/floatingobject.cpp b/src/floatingobject.cpp
index 4d6dc7a0ec3..ea251fd0419 100644
--- a/src/floatingobject.cpp
+++ b/src/floatingobject.cpp
@@ -53,17 +53,17 @@ thread_local std::vector<void *> FloatingObject::s_drawingObjectIds;
 
 FloatingObject::FloatingObject() : Object(FLOATING_OBJECT, "fe")
 {
-    Reset();
+    this->Reset();
 }
 
 FloatingObject::FloatingObject(ClassId classId) : Object(classId, "fe")
 {
-    Reset();
+    this->Reset();
 }
 
 FloatingObject::FloatingObject(ClassId classId, const std::string &classIdStr) : Object(classId, classIdStr)
 {
-    Reset();
+    this->Reset();
 
     m_currentPositioner = NULL;
     m_maxDrawingYRel = VRV_UNSET;
@@ -279,14 +279,14 @@ FloatingPositioner::FloatingPositioner(FloatingObject *object, StaffAlignment *a
     else {
         m_place = STAFFREL_NONE;
     }
-    ResetPositioner();
+    this->ResetPositioner();
 }
 
 void FloatingPositioner::ResetPositioner()
 {
     BoundingBox::ResetBoundingBox();
-    ResetCachedDrawingX();
-    ResetCachedDrawingY();
+    this->ResetCachedDrawingX();
+    this->ResetCachedDrawingY();
 
     m_objectX = NULL;
     m_objectY = NULL;
@@ -328,7 +328,7 @@ void FloatingPositioner::SetObjectXY(Object *objectX, Object *objectY)
 
 void FloatingPositioner::SetDrawingXRel(int drawingXRel)
 {
-    ResetCachedDrawingX();
+    this->ResetCachedDrawingX();
     m_drawingXRel = drawingXRel;
 }
 
@@ -343,7 +343,7 @@ void FloatingPositioner::SetDrawingYRel(int drawingYRel, bool force)
     }
 
     if (setValue) {
-        ResetCachedDrawingY();
+        this->ResetCachedDrawingY();
         m_drawingYRel = drawingYRel;
     }
 }
@@ -484,7 +484,7 @@ int FloatingPositioner::GetSpaceBelow(Doc *doc, StaffAlignment *staffAlignment,
 FloatingCurvePositioner::FloatingCurvePositioner(FloatingObject *object, StaffAlignment *alignment, char spanningType)
     : FloatingPositioner(object, alignment, spanningType)
 {
-    ResetCurveParams();
+    this->ResetCurveParams();
 }
 
 FloatingCurvePositioner::~FloatingCurvePositioner()
@@ -496,7 +496,7 @@ void FloatingCurvePositioner::ResetPositioner()
 {
     FloatingPositioner::ResetPositioner();
 
-    ResetCurveParams();
+    this->ResetCurveParams();
 }
 
 void FloatingCurvePositioner::ClearSpannedElements()
diff --git a/src/ftrem.cpp b/src/ftrem.cpp
index dec5979218c..994490d82ee 100644
--- a/src/ftrem.cpp
+++ b/src/ftrem.cpp
@@ -36,10 +36,10 @@ static const ClassRegistrar<FTrem> s_factory("fTrem", FTREM);
 
 FTrem::FTrem() : LayerElement(FTREM, "ftrem-"), BeamDrawingInterface(), AttFTremVis(), AttTremMeasured()
 {
-    RegisterAttClass(ATT_FTREMVIS);
-    RegisterAttClass(ATT_TREMMEASURED);
+    this->RegisterAttClass(ATT_FTREMVIS);
+    this->RegisterAttClass(ATT_TREMMEASURED);
 
-    Reset();
+    this->Reset();
 }
 
 FTrem::~FTrem() {}
@@ -48,8 +48,8 @@ void FTrem::Reset()
 {
     LayerElement::Reset();
     BeamDrawingInterface::Reset();
-    ResetFTremVis();
-    ResetTremMeasured();
+    this->ResetFTremVis();
+    this->ResetTremMeasured();
 }
 
 bool FTrem::IsSupportedChild(Object *child)
@@ -123,7 +123,7 @@ int FTrem::CalcStem(FunctorParams *functorParams)
         return FUNCTOR_CONTINUE;
     }
 
-    if (GetElementCoords()->size() != 2) {
+    if (this->GetElementCoords()->size() != 2) {
         LogError("Stem calculation: <fTrem> element has invalid number of descendants.");
         return FUNCTOR_CONTINUE;
     }
diff --git a/src/gliss.cpp b/src/gliss.cpp
index babe8853298..c4f1933af62 100644
--- a/src/gliss.cpp
+++ b/src/gliss.cpp
@@ -34,13 +34,13 @@ Gliss::Gliss()
     , AttLineRendBase()
     , AttNNumberLike()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_LINEREND);
-    RegisterAttClass(ATT_LINERENDBASE);
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_LINEREND);
+    this->RegisterAttClass(ATT_LINERENDBASE);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 Gliss::~Gliss() {}
@@ -49,10 +49,10 @@ void Gliss::Reset()
 {
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetColor();
-    ResetLineRend();
-    ResetLineRendBase();
-    ResetNNumberLike();
+    this->ResetColor();
+    this->ResetLineRend();
+    this->ResetLineRendBase();
+    this->ResetNNumberLike();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/gracegrp.cpp b/src/gracegrp.cpp
index d5611e15dd8..1cf7beb3617 100644
--- a/src/gracegrp.cpp
+++ b/src/gracegrp.cpp
@@ -36,11 +36,11 @@ static const ClassRegistrar<GraceGrp> s_factory("graceGrp", GRACEGRP);
 
 GraceGrp::GraceGrp() : LayerElement(GRACEGRP, "gracegrp-"), AttColor(), AttGraced(), AttGraceGrpLog()
 {
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_GRACED);
-    RegisterAttClass(ATT_GRACEGRPLOG);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_GRACED);
+    this->RegisterAttClass(ATT_GRACEGRPLOG);
 
-    Reset();
+    this->Reset();
 }
 
 GraceGrp::~GraceGrp() {}
@@ -48,9 +48,9 @@ GraceGrp::~GraceGrp() {}
 void GraceGrp::Reset()
 {
     LayerElement::Reset();
-    ResetColor();
-    ResetGraced();
-    ResetGraceGrpLog();
+    this->ResetColor();
+    this->ResetGraced();
+    this->ResetGraceGrpLog();
 }
 
 bool GraceGrp::IsSupportedChild(Object *child)
diff --git a/src/grpsym.cpp b/src/grpsym.cpp
index fae02a6a8bb..b6628c1b560 100644
--- a/src/grpsym.cpp
+++ b/src/grpsym.cpp
@@ -30,13 +30,13 @@ static const ClassRegistrar<GrpSym> s_factory("grpSym", GRPSYM);
 GrpSym::GrpSym()
     : Object(GRPSYM, "grpsym-"), AttColor(), AttGrpSymLog(), AttStaffGroupingSym(), AttStartId(), AttStartEndId()
 {
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_GRPSYMLOG);
-    RegisterAttClass(ATT_STAFFGROUPINGSYM);
-    RegisterAttClass(ATT_STARTID);
-    RegisterAttClass(ATT_STARTENDID);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_GRPSYMLOG);
+    this->RegisterAttClass(ATT_STAFFGROUPINGSYM);
+    this->RegisterAttClass(ATT_STARTID);
+    this->RegisterAttClass(ATT_STARTENDID);
 
-    Reset();
+    this->Reset();
 }
 
 GrpSym::~GrpSym() {}
@@ -44,11 +44,11 @@ GrpSym::~GrpSym() {}
 void GrpSym::Reset()
 {
     Object::Reset();
-    ResetColor();
-    ResetGrpSymLog();
-    ResetStaffGroupingSym();
-    ResetStartId();
-    ResetStartEndId();
+    this->ResetColor();
+    this->ResetGrpSymLog();
+    this->ResetStaffGroupingSym();
+    this->ResetStartId();
+    this->ResetStartEndId();
 
     m_startDef = NULL;
     m_endDef = NULL;
@@ -84,13 +84,13 @@ int GrpSym::ScoreDefSetGrpSym(FunctorParams *)
 {
     // For the grpSym that is encoded in the scope of the staffGrp just get first and last staffDefs and set then as
     // starting and ending points
-    if (GetParent()->Is(STAFFGRP)) {
-        StaffGrp *staffGrp = vrv_cast<StaffGrp *>(GetParent());
+    if (this->GetParent()->Is(STAFFGRP)) {
+        StaffGrp *staffGrp = vrv_cast<StaffGrp *>(this->GetParent());
         assert(staffGrp);
         auto [firstDef, lastDef] = staffGrp->GetFirstLastStaffDef();
         if (firstDef && lastDef) {
-            SetStartDef(firstDef);
-            SetEndDef(lastDef);
+            this->SetStartDef(firstDef);
+            this->SetEndDef(lastDef);
             staffGrp->SetGroupSymbol(this);
         }
     }
@@ -98,13 +98,13 @@ int GrpSym::ScoreDefSetGrpSym(FunctorParams *)
     // @startid and @endid. We also need to make sure that @level attribute is adhered to, hence we limit search depth.
     // Finally, we need to make sure that both starting and ending elements have the same parent (since we cannot draw
     // cross-group grpSym)
-    else if (GetParent()->Is(SCOREDEF)) {
-        ScoreDef *scoreDef = vrv_cast<ScoreDef *>(GetParent());
+    else if (this->GetParent()->Is(SCOREDEF)) {
+        ScoreDef *scoreDef = vrv_cast<ScoreDef *>(this->GetParent());
         assert(scoreDef);
 
-        const std::string startId = ExtractUuidFragment(GetStartid());
-        const std::string endId = ExtractUuidFragment(GetEndid());
-        const int level = GetLevel();
+        const std::string startId = ExtractUuidFragment(this->GetStartid());
+        const std::string endId = ExtractUuidFragment(this->GetEndid());
+        const int level = this->GetLevel();
 
         UuidComparison compare(STAFFDEF, startId);
         StaffDef *start = vrv_cast<StaffDef *>(scoreDef->FindDescendantByComparison(&compare, level));
@@ -112,18 +112,18 @@ int GrpSym::ScoreDefSetGrpSym(FunctorParams *)
         StaffDef *end = vrv_cast<StaffDef *>(scoreDef->FindDescendantByComparison(&compare, level));
 
         if (!start || !end) {
-            LogWarning("Could not find startid/endid on level %d for <'%s'>", level, GetUuid().c_str());
+            LogWarning("Could not find startid/endid on level %d for <'%s'>", level, this->GetUuid().c_str());
             return FUNCTOR_CONTINUE;
         }
 
         if (start->GetParent() != end->GetParent()) {
-            LogWarning("<'%s'> has mismatching parents for startid:<'%s'> and endid:<'%s'>", GetUuid().c_str(),
+            LogWarning("<'%s'> has mismatching parents for startid:<'%s'> and endid:<'%s'>", this->GetUuid().c_str(),
                 startId.c_str(), endId.c_str());
             return FUNCTOR_CONTINUE;
         }
 
-        SetStartDef(start);
-        SetEndDef(end);
+        this->SetStartDef(start);
+        this->SetEndDef(end);
         StaffGrp *staffGrp = vrv_cast<StaffGrp *>(start->GetParent());
         staffGrp->SetGroupSymbol(this);
     }
diff --git a/src/hairpin.cpp b/src/hairpin.cpp
index d2f2e1964b5..a59e5ab040e 100644
--- a/src/hairpin.cpp
+++ b/src/hairpin.cpp
@@ -40,14 +40,14 @@ Hairpin::Hairpin()
     , AttPlacementRelStaff()
     , AttVerticalGroup()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_HAIRPINLOG);
-    RegisterAttClass(ATT_HAIRPINVIS);
-    RegisterAttClass(ATT_PLACEMENTRELSTAFF);
-    RegisterAttClass(ATT_VERTICALGROUP);
-
-    Reset();
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_HAIRPINLOG);
+    this->RegisterAttClass(ATT_HAIRPINVIS);
+    this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
+    this->RegisterAttClass(ATT_VERTICALGROUP);
+
+    this->Reset();
 }
 
 Hairpin::~Hairpin() {}
@@ -56,11 +56,11 @@ void Hairpin::Reset()
 {
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetColor();
-    ResetHairpinLog();
-    ResetHairpinVis();
-    ResetPlacementRelStaff();
-    ResetVerticalGroup();
+    this->ResetColor();
+    this->ResetHairpinLog();
+    this->ResetHairpinVis();
+    this->ResetPlacementRelStaff();
+    this->ResetVerticalGroup();
 
     m_leftLink = NULL;
     m_rightLink = NULL;
@@ -160,8 +160,8 @@ void Hairpin::SetRightLink(ControlElement *rightLink)
 
 std::pair<int, int> Hairpin::GetBarlineOverlapAdjustment(int doubleUnit, int leftX, int rightX, int spanningType)
 {
-    Measure *startMeasure = vrv_cast<Measure *>(GetStart()->GetFirstAncestor(MEASURE));
-    Measure *endMeasure = vrv_cast<Measure *>(GetEnd()->GetFirstAncestor(MEASURE));
+    Measure *startMeasure = vrv_cast<Measure *>(this->GetStart()->GetFirstAncestor(MEASURE));
+    Measure *endMeasure = vrv_cast<Measure *>(this->GetEnd()->GetFirstAncestor(MEASURE));
 
     if (!startMeasure || !endMeasure) return { 0, 0 };
 
@@ -187,7 +187,7 @@ std::pair<int, int> Hairpin::GetBarlineOverlapAdjustment(int doubleUnit, int lef
         rightBarline = endMeasure->GetRightBarLine();
     }
     else if (spanningType == SPANNING_START) {
-        System *startSystem = vrv_cast<System *>(GetStart()->GetFirstAncestor(SYSTEM));
+        System *startSystem = vrv_cast<System *>(this->GetStart()->GetFirstAncestor(SYSTEM));
         if (startSystem) {
             ClassIdComparison cmp(MEASURE);
             Measure *measure
diff --git a/src/halfmrpt.cpp b/src/halfmrpt.cpp
index 5b1711f7beb..867a3cf2ef4 100644
--- a/src/halfmrpt.cpp
+++ b/src/halfmrpt.cpp
@@ -32,9 +32,9 @@ static const ClassRegistrar<HalfmRpt> s_factory("halfmRpt", HALFMRPT);
 
 HalfmRpt::HalfmRpt() : LayerElement(HALFMRPT, "mrpt-")
 {
-    RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_COLOR);
 
-    Reset();
+    this->Reset();
 }
 
 HalfmRpt::~HalfmRpt() {}
@@ -42,7 +42,7 @@ HalfmRpt::~HalfmRpt() {}
 void HalfmRpt::Reset()
 {
     LayerElement::Reset();
-    ResetColor();
+    this->ResetColor();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/harm.cpp b/src/harm.cpp
index 4edd2739a49..05335449ee2 100644
--- a/src/harm.cpp
+++ b/src/harm.cpp
@@ -41,12 +41,12 @@ Harm::Harm()
     , AttLang()
     , AttNNumberLike()
 {
-    RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_LANG);
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_LANG);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 Harm::~Harm() {}
@@ -56,8 +56,8 @@ void Harm::Reset()
     ControlElement::Reset();
     TextDirInterface::Reset();
     TimeSpanningInterface::Reset();
-    ResetLang();
-    ResetNNumberLike();
+    this->ResetLang();
+    this->ResetNNumberLike();
 }
 
 bool Harm::IsSupportedChild(Object *child)
@@ -129,7 +129,7 @@ bool Harm::GetBassPitch(TransPitch &pitch)
     for (unsigned int pos = 0; pos < text.length(); pos++) {
         if (text.at(pos) == L'/') {
             pos++;
-            return GetRootPitch(pitch, pos);
+            return this->GetRootPitch(pitch, pos);
         }
     }
     return false;
diff --git a/src/horizontalaligner.cpp b/src/horizontalaligner.cpp
index 1e36fd692de..b9b7847dfb1 100644
--- a/src/horizontalaligner.cpp
+++ b/src/horizontalaligner.cpp
@@ -38,7 +38,7 @@ namespace vrv {
 
 HorizontalAligner::HorizontalAligner(ClassId classId) : Object(classId)
 {
-    Reset();
+    this->Reset();
 }
 
 HorizontalAligner::~HorizontalAligner() {}
@@ -54,8 +54,8 @@ Alignment *HorizontalAligner::SearchAlignmentAtTime(double time, AlignmentType t
     idx = -1; // the index if we reach the end.
     Alignment *alignment = NULL;
     // First try to see if we already have something at the time position
-    for (i = 0; i < GetAlignmentCount(); ++i) {
-        alignment = vrv_cast<Alignment *>(GetChildren()->at(i));
+    for (i = 0; i < this->GetAlignmentCount(); ++i) {
+        alignment = vrv_cast<Alignment *>(this->GetChildren()->at(i));
         assert(alignment);
 
         double alignment_time = alignment->GetTime();
@@ -100,7 +100,7 @@ MeasureAligner::MeasureAligner() : HorizontalAligner(MEASURE_ALIGNER)
     m_rightAlignment = NULL;
     m_rightBarLineAlignment = NULL;
 
-    Reset();
+    this->Reset();
 }
 
 MeasureAligner::~MeasureAligner() {}
@@ -138,7 +138,7 @@ Alignment *MeasureAligner::GetAlignmentAtTime(double time, AlignmentType type)
             this->SetMaxTime(time);
         }
         else {
-            idx = GetAlignmentCount();
+            idx = this->GetAlignmentCount();
         }
     }
     Alignment *newAlignment = new Alignment(time, type);
@@ -158,7 +158,7 @@ void MeasureAligner::SetMaxTime(double time)
     int i;
     Alignment *alignment = NULL;
     // Increase the time position for all alignment from the right barline
-    for (i = idx; i < GetAlignmentCount(); ++i) {
+    for (i = idx; i < this->GetAlignmentCount(); ++i) {
         alignment = vrv_cast<Alignment *>(this->GetChildren()->at(i));
         assert(alignment);
         // Change it only if higher than before
@@ -301,7 +301,7 @@ void MeasureAligner::AdjustGraceNoteSpacing(Doc *doc, Alignment *alignment, int
 
 GraceAligner::GraceAligner() : HorizontalAligner(GRACE_ALIGNER)
 {
-    Reset();
+    this->Reset();
 }
 
 GraceAligner::~GraceAligner() {}
@@ -321,7 +321,7 @@ Alignment *GraceAligner::GetAlignmentAtTime(double time, AlignmentType type)
     if (alignment != NULL) return alignment;
     // nothing found until the end
     if (idx == -1) {
-        idx = GetAlignmentCount();
+        idx = this->GetAlignmentCount();
     }
     Alignment *newAlignment = new Alignment(time, type);
     AddAlignment(newAlignment, idx);
@@ -436,12 +436,12 @@ void GraceAligner::SetGraceAligmentXPos(Doc *doc)
 
 Alignment::Alignment() : Object(ALIGNMENT)
 {
-    Reset();
+    this->Reset();
 }
 
 Alignment::Alignment(double time, AlignmentType type) : Object(ALIGNMENT)
 {
-    Reset();
+    this->Reset();
     m_time = time;
     m_type = type;
 }
@@ -521,7 +521,7 @@ AlignmentReference *Alignment::GetAlignmentReference(int staffN)
 
 void Alignment::SetXRel(int xRel)
 {
-    ResetCachedDrawingX();
+    this->ResetCachedDrawingX();
     m_xRel = xRel;
 }
 
@@ -562,7 +562,7 @@ bool Alignment::AddLayerElementRef(LayerElement *element)
             }
         }
     }
-    AlignmentReference *alignmentRef = GetAlignmentReference(staffN);
+    AlignmentReference *alignmentRef = this->GetAlignmentReference(staffN);
     element->SetAlignmentLayerN(layerN);
     alignmentRef->AddChild(element);
 
@@ -650,7 +650,7 @@ std::pair<int, int> Alignment::GetAlignmentTopBottom()
     int max = VRV_UNSET, min = VRV_UNSET;
     // Iterate over each element in each alignment reference and find max/min Y value - these will serve as top/bottom
     // values for the Alignment
-    for (auto child : *GetChildren()) {
+    for (auto child : *this->GetChildren()) {
         AlignmentReference *reference = dynamic_cast<AlignmentReference *>(child);
         for (auto element : *reference->GetChildren()) {
             const int top = element->GetSelfTop();
@@ -684,18 +684,18 @@ void Alignment::AddToAccidSpace(Accid *accid)
 
 AlignmentReference::AlignmentReference() : Object(ALIGNMENT_REFERENCE), AttNInteger()
 {
-    RegisterAttClass(ATT_NINTEGER);
+    this->RegisterAttClass(ATT_NINTEGER);
 
-    Reset();
+    this->Reset();
 
     this->SetAsReferenceObject();
 }
 
 AlignmentReference::AlignmentReference(int staffN) : Object(ALIGNMENT_REFERENCE), AttNInteger()
 {
-    RegisterAttClass(ATT_NINTEGER);
+    this->RegisterAttClass(ATT_NINTEGER);
 
-    Reset();
+    this->Reset();
 
     this->SetAsReferenceObject();
     this->SetN(staffN);
@@ -706,7 +706,7 @@ AlignmentReference::~AlignmentReference() {}
 void AlignmentReference::Reset()
 {
     Object::Reset();
-    ResetNInteger();
+    this->ResetNInteger();
 
     m_accidSpace.clear();
     m_layerCount = 0;
@@ -790,7 +790,7 @@ bool AlignmentReference::HasAccidVerticalOverlap(const ArrayOfObjects *objects)
 
 TimestampAligner::TimestampAligner() : Object(TIMESTAMP_ALIGNER)
 {
-    Reset();
+    this->Reset();
 }
 
 TimestampAligner::~TimestampAligner() {}
@@ -811,7 +811,7 @@ TimestampAttr *TimestampAligner::GetTimestampAtTime(double time)
     ArrayOfObjects *children = this->GetChildrenForModification();
 
     // First try to see if we already have something at the time position
-    for (i = 0; i < GetChildCount(); ++i) {
+    for (i = 0; i < this->GetChildCount(); ++i) {
         timestampAttr = vrv_cast<TimestampAttr *>(children->at(i));
         assert(timestampAttr);
 
@@ -862,8 +862,8 @@ int MeasureAligner::JustifyX(FunctorParams *functorParams)
     JustifyXParams *params = vrv_params_cast<JustifyXParams *>(functorParams);
     assert(params);
 
-    params->m_leftBarLineX = GetLeftBarLineAlignment()->GetXRel();
-    params->m_rightBarLineX = GetRightBarLineAlignment()->GetXRel();
+    params->m_leftBarLineX = this->GetLeftBarLineAlignment()->GetXRel();
+    params->m_rightBarLineX = this->GetRightBarLineAlignment()->GetXRel();
 
     return FUNCTOR_CONTINUE;
 }
@@ -943,7 +943,7 @@ int Alignment::AdjustArpeg(FunctorParams *functorParams)
             params->m_measureAligner->AdjustProportionally(boundaries);
             // After adjusting, make sure that arpeggio does not overlap with elements from the previous alignment
             if (m_type == ALIGNMENT_CLEF) {
-                auto [currentMin, currentMax] = GetAlignmentTopBottom();
+                auto [currentMin, currentMax] = this->GetAlignmentTopBottom();
                 Note *topNote = NULL;
                 Note *bottomNote = NULL;
                 std::get<1>(*iter)->GetDrawingTopBottomNotes(topNote, bottomNote);
@@ -1033,8 +1033,8 @@ int Alignment::AdjustGraceXPos(FunctorParams *functorParams)
             AttNIntegerComparison matchStaff(ALIGNMENT_REFERENCE, (*iter));
             filters.push_back(&matchStaff);
 
-            if (HasGraceAligner(graceAlignerId)) {
-                GetGraceAligner(graceAlignerId)
+            if (this->HasGraceAligner(graceAlignerId)) {
+                this->GetGraceAligner(graceAlignerId)
                     ->Process(params->m_functor, params, params->m_functorEnd, &filters, UNLIMITED_DEPTH, BACKWARD);
 
                 // There was not grace notes for that staff
@@ -1252,7 +1252,7 @@ int Alignment::SetAlignmentXPos(FunctorParams *functorParams)
         iter->second->SetGraceAligmentXPos(params->m_doc);
     }
 
-    SetXRel(params->m_previousXRel + intervalXRel * DEFINITION_FACTOR);
+    this->SetXRel(params->m_previousXRel + intervalXRel * DEFINITION_FACTOR);
     params->m_previousTime = m_time;
     params->m_previousXRel = m_xRel;
 
@@ -1296,7 +1296,7 @@ int Alignment::JustifyX(FunctorParams *functorParams)
     }
     else if (m_type < ALIGNMENT_MEASURE_RIGHT_BARLINE) {
         // All elements up to the next barline, move them but also take into account the leftBarlineX
-        SetXRel(ceil(
+        this->SetXRel(ceil(
             (((double)m_xRel - (double)params->m_leftBarLineX) * params->m_justifiableRatio) + params->m_leftBarLineX));
     }
     else {
diff --git a/src/instrdef.cpp b/src/instrdef.cpp
index ea21ef8798b..b5100e22c9f 100644
--- a/src/instrdef.cpp
+++ b/src/instrdef.cpp
@@ -27,12 +27,12 @@ static const ClassRegistrar<InstrDef> s_factory("instrDef", INSTRDEF);
 InstrDef::InstrDef()
     : Object(INSTRDEF, "instrdef-"), AttChannelized(), AttLabelled(), AttMidiInstrument(), AttNNumberLike()
 {
-    RegisterAttClass(ATT_CHANNELIZED);
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_MIDIINSTRUMENT);
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_CHANNELIZED);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_MIDIINSTRUMENT);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 InstrDef::~InstrDef() {}
@@ -40,10 +40,10 @@ InstrDef::~InstrDef() {}
 void InstrDef::Reset()
 {
     Object::Reset();
-    ResetChannelized();
-    ResetLabelled();
-    ResetMidiInstrument();
-    ResetNNumberLike();
+    this->ResetChannelized();
+    this->ResetLabelled();
+    this->ResetMidiInstrument();
+    this->ResetNNumberLike();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/iomei.cpp b/src/iomei.cpp
index ecc2dcfad61..ecb85cf9033 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -1315,7 +1315,7 @@ bool MEIOutput::WriteDoc(Doc *doc)
     Facsimile *facs = doc->GetFacsimile();
     if ((facs != NULL) && (facs->GetChildCount() > 0)) {
         pugi::xml_node facsimile = music.append_child("facsimile");
-        WriteFacsimile(facsimile, facs);
+        this->WriteFacsimile(facsimile, facs);
         m_nodeStack.push_back(facsimile);
     }
 
@@ -1337,7 +1337,7 @@ void MEIOutput::WriteMdiv(pugi::xml_node currentNode, Mdiv *mdiv)
 {
     assert(mdiv);
 
-    WriteXmlId(currentNode, mdiv);
+    this->WriteXmlId(currentNode, mdiv);
     mdiv->WriteLabelled(currentNode);
     mdiv->WriteNNumberLike(currentNode);
 }
@@ -1351,7 +1351,7 @@ void MEIOutput::WritePages(pugi::xml_node currentNode, Pages *pages)
         m_currentNode.append_child(pugi::node_comment).set_value("Coordinates in MEI axis direction");
     }
 
-    WriteXmlId(currentNode, pages);
+    this->WriteXmlId(currentNode, pages);
     pages->WriteLabelled(currentNode);
     pages->WriteNNumberLike(currentNode);
 }
@@ -1360,7 +1360,7 @@ void MEIOutput::WriteScore(pugi::xml_node currentNode, Score *score)
 {
     assert(score);
 
-    WriteXmlId(currentNode, score);
+    this->WriteXmlId(currentNode, score);
     score->WriteLabelled(currentNode);
     score->WriteNNumberLike(currentNode);
 }
@@ -1369,7 +1369,7 @@ void MEIOutput::WritePage(pugi::xml_node currentNode, Page *page)
 {
     assert(page);
 
-    WriteXmlId(currentNode, page);
+    this->WriteXmlId(currentNode, page);
     // size and margins but only if any - we rely on page.height only to check this
     if (page->m_pageHeight != -1) {
         currentNode.append_attribute("page.width") = StringFormat("%d", page->m_pageWidth / DEFINITION_FACTOR).c_str();
@@ -1394,7 +1394,7 @@ void MEIOutput::WritePageElement(pugi::xml_node currentNode, PageElement *pageEl
 {
     assert(pageElement);
 
-    WriteXmlId(currentNode, pageElement);
+    this->WriteXmlId(currentNode, pageElement);
     pageElement->WriteTyped(currentNode);
 }
 
@@ -1402,7 +1402,7 @@ void MEIOutput::WritePageMilestoneEnd(pugi::xml_node currentNode, PageMilestoneE
 {
     assert(milestoneEnd && milestoneEnd->GetStart());
 
-    WritePageElement(currentNode, milestoneEnd);
+    this->WritePageElement(currentNode, milestoneEnd);
     currentNode.append_attribute("startid") = ("#" + UuidToMeiStr(milestoneEnd->GetStart())).c_str();
     std::string meiElementName = milestoneEnd->GetStart()->GetClassName();
     std::transform(meiElementName.begin(), meiElementName.begin() + 1, meiElementName.begin(), ::tolower);
@@ -1413,7 +1413,7 @@ void MEIOutput::WriteSystem(pugi::xml_node currentNode, System *system)
 {
     assert(system);
 
-    WriteXmlId(currentNode, system);
+    this->WriteXmlId(currentNode, system);
     // margins
     currentNode.append_attribute("system.leftmar")
         = StringFormat("%d", system->m_systemLeftMar / DEFINITION_FACTOR).c_str();
@@ -1430,7 +1430,7 @@ void MEIOutput::WriteSystemElement(pugi::xml_node currentNode, SystemElement *sy
 {
     assert(systemElement);
 
-    WriteXmlId(currentNode, systemElement);
+    this->WriteXmlId(currentNode, systemElement);
     systemElement->WriteTyped(currentNode);
 }
 
@@ -1438,7 +1438,7 @@ void MEIOutput::WriteSystemMilestoneEnd(pugi::xml_node currentNode, SystemMilest
 {
     assert(milestoneEnd && milestoneEnd->GetStart());
 
-    WriteSystemElement(currentNode, milestoneEnd);
+    this->WriteSystemElement(currentNode, milestoneEnd);
     currentNode.append_attribute("startid") = ("#" + UuidToMeiStr(milestoneEnd->GetStart())).c_str();
     std::string meiElementName = milestoneEnd->GetStart()->GetClassName();
     std::transform(meiElementName.begin(), meiElementName.begin() + 1, meiElementName.begin(), ::tolower);
@@ -1449,7 +1449,7 @@ void MEIOutput::WriteSection(pugi::xml_node currentNode, Section *section)
 {
     assert(section);
 
-    WriteSystemElement(currentNode, section);
+    this->WriteSystemElement(currentNode, section);
     section->WriteNNumberLike(currentNode);
     section->WriteSectionVis(currentNode);
 }
@@ -1458,7 +1458,7 @@ void MEIOutput::WriteEnding(pugi::xml_node currentNode, Ending *ending)
 {
     assert(ending);
 
-    WriteSystemElement(currentNode, ending);
+    this->WriteSystemElement(currentNode, ending);
     ending->WriteLineRend(currentNode);
     ending->WriteNNumberLike(currentNode);
 }
@@ -1467,15 +1467,15 @@ void MEIOutput::WriteExpansion(pugi::xml_node currentNode, Expansion *expansion)
 {
     assert(expansion);
 
-    WritePlistInterface(currentNode, expansion);
-    WriteSystemElement(currentNode, expansion);
+    this->WritePlistInterface(currentNode, expansion);
+    this->WriteSystemElement(currentNode, expansion);
 }
 
 void MEIOutput::WritePb(pugi::xml_node currentNode, Pb *pb)
 {
     assert(pb);
 
-    WriteSystemElement(currentNode, pb);
+    this->WriteSystemElement(currentNode, pb);
     pb->WriteNNumberLike(currentNode);
 }
 
@@ -1483,7 +1483,7 @@ void MEIOutput::WriteSb(pugi::xml_node currentNode, Sb *sb)
 {
     assert(sb);
 
-    WriteSystemElement(currentNode, sb);
+    this->WriteSystemElement(currentNode, sb);
     sb->WriteNNumberLike(currentNode);
 }
 
@@ -1491,7 +1491,7 @@ void MEIOutput::WriteScoreDefElement(pugi::xml_node currentNode, ScoreDefElement
 {
     assert(scoreDefElement);
 
-    WriteXmlId(currentNode, scoreDefElement);
+    this->WriteXmlId(currentNode, scoreDefElement);
     scoreDefElement->WriteMeasureNumbers(currentNode);
     scoreDefElement->WriteSpacing(currentNode);
     scoreDefElement->WriteSystems(currentNode);
@@ -1502,8 +1502,8 @@ void MEIOutput::WriteScoreDef(pugi::xml_node currentNode, ScoreDef *scoreDef)
 {
     assert(scoreDef);
 
-    WriteScoreDefElement(currentNode, scoreDef);
-    WriteScoreDefInterface(currentNode, scoreDef);
+    this->WriteScoreDefElement(currentNode, scoreDef);
+    this->WriteScoreDefInterface(currentNode, scoreDef);
     scoreDef->WriteDistances(currentNode);
     scoreDef->WriteEndings(currentNode);
     scoreDef->WriteOptimization(currentNode);
@@ -1514,7 +1514,7 @@ void MEIOutput::WriteRunningElement(pugi::xml_node currentNode, RunningElement *
 {
     assert(runningElement);
 
-    WriteXmlId(currentNode, runningElement);
+    this->WriteXmlId(currentNode, runningElement);
     runningElement->WriteHorizontalAlign(currentNode);
     runningElement->WriteTyped(currentNode);
 }
@@ -1529,7 +1529,7 @@ void MEIOutput::WriteGrpSym(pugi::xml_node currentNode, GrpSym *grpSym)
         return;
     }
 
-    WriteXmlId(currentNode, grpSym);
+    this->WriteXmlId(currentNode, grpSym);
     grpSym->WriteColor(currentNode);
     grpSym->WriteGrpSymLog(currentNode);
     grpSym->WriteStaffGroupingSym(currentNode);
@@ -1541,35 +1541,35 @@ void MEIOutput::WritePgFoot(pugi::xml_node currentNode, PgFoot *pgFoot)
 {
     assert(pgFoot);
 
-    WriteRunningElement(currentNode, pgFoot);
+    this->WriteRunningElement(currentNode, pgFoot);
 }
 
 void MEIOutput::WritePgFoot2(pugi::xml_node currentNode, PgFoot2 *pgFoot2)
 {
     assert(pgFoot2);
 
-    WriteRunningElement(currentNode, pgFoot2);
+    this->WriteRunningElement(currentNode, pgFoot2);
 }
 
 void MEIOutput::WritePgHead(pugi::xml_node currentNode, PgHead *pgHead)
 {
     assert(pgHead);
 
-    WriteRunningElement(currentNode, pgHead);
+    this->WriteRunningElement(currentNode, pgHead);
 }
 
 void MEIOutput::WritePgHead2(pugi::xml_node currentNode, PgHead2 *pgHead2)
 {
     assert(pgHead2);
 
-    WriteRunningElement(currentNode, pgHead2);
+    this->WriteRunningElement(currentNode, pgHead2);
 }
 
 void MEIOutput::WriteStaffGrp(pugi::xml_node currentNode, StaffGrp *staffGrp)
 {
     assert(staffGrp);
 
-    WriteXmlId(currentNode, staffGrp);
+    this->WriteXmlId(currentNode, staffGrp);
     staffGrp->WriteBasic(currentNode);
     staffGrp->WriteLabelled(currentNode);
     staffGrp->WriteNNumberLike(currentNode);
@@ -1582,8 +1582,8 @@ void MEIOutput::WriteStaffDef(pugi::xml_node currentNode, StaffDef *staffDef)
 {
     assert(staffDef);
 
-    WriteScoreDefElement(currentNode, staffDef);
-    WriteScoreDefInterface(currentNode, staffDef);
+    this->WriteScoreDefElement(currentNode, staffDef);
+    this->WriteScoreDefInterface(currentNode, staffDef);
     staffDef->WriteDistances(currentNode);
     staffDef->WriteLabelled(currentNode);
     staffDef->WriteNInteger(currentNode);
@@ -1599,7 +1599,7 @@ void MEIOutput::WriteInstrDef(pugi::xml_node currentNode, InstrDef *instrDef)
 {
     assert(instrDef);
 
-    WriteXmlId(currentNode, instrDef);
+    this->WriteXmlId(currentNode, instrDef);
     instrDef->WriteChannelized(currentNode);
     instrDef->WriteLabelled(currentNode);
     instrDef->WriteMidiInstrument(currentNode);
@@ -1610,21 +1610,21 @@ void MEIOutput::WriteLabel(pugi::xml_node currentNode, Label *label)
 {
     assert(label);
 
-    WriteXmlId(currentNode, label);
+    this->WriteXmlId(currentNode, label);
 }
 
 void MEIOutput::WriteLabelAbbr(pugi::xml_node currentNode, LabelAbbr *labelAbbr)
 {
     assert(labelAbbr);
 
-    WriteXmlId(currentNode, labelAbbr);
+    this->WriteXmlId(currentNode, labelAbbr);
 }
 
 void MEIOutput::WriteTuning(pugi::xml_node currentNode, Tuning *tuning)
 {
     assert(tuning);
 
-    WriteXmlId(currentNode, tuning);
+    this->WriteXmlId(currentNode, tuning);
     tuning->WriteCourseLog(currentNode);
 }
 
@@ -1632,7 +1632,7 @@ void MEIOutput::WriteCourse(pugi::xml_node currentNode, Course *course)
 {
     assert(course);
 
-    WriteXmlId(currentNode, course);
+    this->WriteXmlId(currentNode, course);
     course->WriteAccidental(currentNode);
     course->WriteNNumberLike(currentNode);
     course->WriteOctave(currentNode);
@@ -1643,7 +1643,7 @@ void MEIOutput::WriteMeasure(pugi::xml_node currentNode, Measure *measure)
 {
     assert(measure);
 
-    WriteXmlId(currentNode, measure);
+    this->WriteXmlId(currentNode, measure);
     measure->WriteBarring(currentNode);
     measure->WriteMeasureLog(currentNode);
     measure->WriteMeterConformanceBar(currentNode);
@@ -1663,8 +1663,8 @@ void MEIOutput::WriteMeterSigGrp(pugi::xml_node currentNode, MeterSigGrp *meterS
 {
     assert(meterSigGrp);
 
-    WriteXmlId(currentNode, meterSigGrp);
-    WriteLinkingInterface(currentNode, meterSigGrp);
+    this->WriteXmlId(currentNode, meterSigGrp);
+    this->WriteLinkingInterface(currentNode, meterSigGrp);
     meterSigGrp->WriteBasic(currentNode);
     meterSigGrp->WriteLabelled(currentNode);
     meterSigGrp->WriteMeterSigGrpLog(currentNode);
@@ -1675,15 +1675,15 @@ void MEIOutput::WriteFb(pugi::xml_node currentNode, Fb *fb)
 {
     assert(fb);
 
-    WriteXmlId(currentNode, fb);
+    this->WriteXmlId(currentNode, fb);
 }
 
 void MEIOutput::WriteControlElement(pugi::xml_node currentNode, ControlElement *controlElement)
 {
     assert(controlElement);
 
-    WriteXmlId(currentNode, controlElement);
-    WriteLinkingInterface(currentNode, controlElement);
+    this->WriteXmlId(currentNode, controlElement);
+    this->WriteLinkingInterface(currentNode, controlElement);
     controlElement->WriteLabelled(currentNode);
     controlElement->WriteTyped(currentNode);
 }
@@ -1692,17 +1692,17 @@ void MEIOutput::WriteAnchoredText(pugi::xml_node currentNode, AnchoredText *anch
 {
     assert(anchoredText);
 
-    WriteControlElement(currentNode, anchoredText);
-    WriteTextDirInterface(currentNode, anchoredText);
+    this->WriteControlElement(currentNode, anchoredText);
+    this->WriteTextDirInterface(currentNode, anchoredText);
 }
 
 void MEIOutput::WriteArpeg(pugi::xml_node currentNode, Arpeg *arpeg)
 {
     assert(arpeg);
 
-    WriteControlElement(currentNode, arpeg);
-    WritePlistInterface(currentNode, arpeg);
-    WriteTimePointInterface(currentNode, arpeg);
+    this->WriteControlElement(currentNode, arpeg);
+    this->WritePlistInterface(currentNode, arpeg);
+    this->WriteTimePointInterface(currentNode, arpeg);
     arpeg->WriteArpegLog(currentNode);
     arpeg->WriteArpegVis(currentNode);
     arpeg->WriteColor(currentNode);
@@ -1713,8 +1713,8 @@ void MEIOutput::WriteBracketSpan(pugi::xml_node currentNode, BracketSpan *bracke
 {
     assert(bracketSpan);
 
-    WriteControlElement(currentNode, bracketSpan);
-    WriteTimeSpanningInterface(currentNode, bracketSpan);
+    this->WriteControlElement(currentNode, bracketSpan);
+    this->WriteTimeSpanningInterface(currentNode, bracketSpan);
     bracketSpan->WriteBracketSpanLog(currentNode);
     bracketSpan->WriteColor(currentNode);
     bracketSpan->WriteLineRend(currentNode);
@@ -1725,8 +1725,8 @@ void MEIOutput::WriteBreath(pugi::xml_node currentNode, Breath *breath)
 {
     assert(breath);
 
-    WriteControlElement(currentNode, breath);
-    WriteTimePointInterface(currentNode, breath);
+    this->WriteControlElement(currentNode, breath);
+    this->WriteTimePointInterface(currentNode, breath);
     breath->WriteColor(currentNode);
     breath->WritePlacementRelStaff(currentNode);
 }
@@ -1735,8 +1735,8 @@ void MEIOutput::WriteCaesura(pugi::xml_node currentNode, Caesura *caesura)
 {
     assert(caesura);
 
-    WriteControlElement(currentNode, caesura);
-    WriteTimePointInterface(currentNode, caesura);
+    this->WriteControlElement(currentNode, caesura);
+    this->WriteTimePointInterface(currentNode, caesura);
     caesura->WriteColor(currentNode);
     caesura->WritePlacementRelStaff(currentNode);
 }
@@ -1745,9 +1745,9 @@ void MEIOutput::WriteDir(pugi::xml_node currentNode, Dir *dir)
 {
     assert(dir);
 
-    WriteControlElement(currentNode, dir);
-    WriteTextDirInterface(currentNode, dir);
-    WriteTimeSpanningInterface(currentNode, dir);
+    this->WriteControlElement(currentNode, dir);
+    this->WriteTextDirInterface(currentNode, dir);
+    this->WriteTimeSpanningInterface(currentNode, dir);
     dir->WriteLang(currentNode);
     dir->WriteLineRendBase(currentNode);
     dir->WriteExtender(currentNode);
@@ -1758,9 +1758,9 @@ void MEIOutput::WriteDynam(pugi::xml_node currentNode, Dynam *dynam)
 {
     assert(dynam);
 
-    WriteControlElement(currentNode, dynam);
-    WriteTextDirInterface(currentNode, dynam);
-    WriteTimeSpanningInterface(currentNode, dynam);
+    this->WriteControlElement(currentNode, dynam);
+    this->WriteTextDirInterface(currentNode, dynam);
+    this->WriteTimeSpanningInterface(currentNode, dynam);
     dynam->WriteEnclosingChars(currentNode);
     dynam->WriteExtender(currentNode);
     dynam->WriteLineRendBase(currentNode);
@@ -1773,8 +1773,8 @@ void MEIOutput::WriteFermata(pugi::xml_node currentNode, Fermata *fermata)
 {
     assert(fermata);
 
-    WriteControlElement(currentNode, fermata);
-    WriteTimePointInterface(currentNode, fermata);
+    this->WriteControlElement(currentNode, fermata);
+    this->WriteTimePointInterface(currentNode, fermata);
     fermata->WriteColor(currentNode);
     fermata->WriteEnclosingChars(currentNode);
     fermata->WriteExtSym(currentNode);
@@ -1786,9 +1786,9 @@ void MEIOutput::WriteFing(pugi::xml_node currentNode, Fing *fing)
 {
     assert(fing);
 
-    WriteControlElement(currentNode, fing);
-    WriteTextDirInterface(currentNode, fing);
-    WriteTimePointInterface(currentNode, fing);
+    this->WriteControlElement(currentNode, fing);
+    this->WriteTextDirInterface(currentNode, fing);
+    this->WriteTimePointInterface(currentNode, fing);
     fing->WriteNNumberLike(currentNode);
 }
 
@@ -1796,8 +1796,8 @@ void MEIOutput::WriteGliss(pugi::xml_node currentNode, Gliss *gliss)
 {
     assert(gliss);
 
-    WriteControlElement(currentNode, gliss);
-    WriteTimeSpanningInterface(currentNode, gliss);
+    this->WriteControlElement(currentNode, gliss);
+    this->WriteTimeSpanningInterface(currentNode, gliss);
     gliss->WriteColor(currentNode);
     gliss->WriteLineRend(currentNode);
     gliss->WriteLineRendBase(currentNode);
@@ -1808,8 +1808,8 @@ void MEIOutput::WriteHairpin(pugi::xml_node currentNode, Hairpin *hairpin)
 {
     assert(hairpin);
 
-    WriteControlElement(currentNode, hairpin);
-    WriteTimeSpanningInterface(currentNode, hairpin);
+    this->WriteControlElement(currentNode, hairpin);
+    this->WriteTimeSpanningInterface(currentNode, hairpin);
     hairpin->WriteColor(currentNode);
     hairpin->WriteHairpinLog(currentNode);
     hairpin->WriteHairpinVis(currentNode);
@@ -1821,9 +1821,9 @@ void MEIOutput::WriteHarm(pugi::xml_node currentNode, Harm *harm)
 {
     assert(harm);
 
-    WriteControlElement(currentNode, harm);
-    WriteTextDirInterface(currentNode, harm);
-    WriteTimeSpanningInterface(currentNode, harm);
+    this->WriteControlElement(currentNode, harm);
+    this->WriteTextDirInterface(currentNode, harm);
+    this->WriteTimeSpanningInterface(currentNode, harm);
     harm->WriteLang(currentNode);
     harm->WriteNNumberLike(currentNode);
 }
@@ -1832,8 +1832,8 @@ void MEIOutput::WriteLv(pugi::xml_node currentNode, Lv *lv)
 {
     assert(lv);
 
-    WriteControlElement(currentNode, lv);
-    WriteTimeSpanningInterface(currentNode, lv);
+    this->WriteControlElement(currentNode, lv);
+    this->WriteTimeSpanningInterface(currentNode, lv);
     lv->WriteColor(currentNode);
     lv->WriteCurvature(currentNode);
     lv->WriteCurveRend(currentNode);
@@ -1843,9 +1843,9 @@ void MEIOutput::WriteMNum(pugi::xml_node currentNode, MNum *mNum)
 {
     assert(mNum);
 
-    WriteControlElement(currentNode, mNum);
-    WriteTextDirInterface(currentNode, mNum);
-    WriteTimePointInterface(currentNode, mNum);
+    this->WriteControlElement(currentNode, mNum);
+    this->WriteTextDirInterface(currentNode, mNum);
+    this->WriteTimePointInterface(currentNode, mNum);
     mNum->WriteColor(currentNode);
     mNum->WriteLang(currentNode);
     mNum->WriteTypography(currentNode);
@@ -1855,8 +1855,8 @@ void MEIOutput::WriteMordent(pugi::xml_node currentNode, Mordent *mordent)
 {
     assert(mordent);
 
-    WriteControlElement(currentNode, mordent);
-    WriteTimePointInterface(currentNode, mordent);
+    this->WriteControlElement(currentNode, mordent);
+    this->WriteTimePointInterface(currentNode, mordent);
     mordent->WriteColor(currentNode);
     mordent->WriteExtSym(currentNode);
     mordent->WriteOrnamentAccid(currentNode);
@@ -1868,8 +1868,8 @@ void MEIOutput::WriteOctave(pugi::xml_node currentNode, Octave *octave)
 {
     assert(octave);
 
-    WriteControlElement(currentNode, octave);
-    WriteTimeSpanningInterface(currentNode, octave);
+    this->WriteControlElement(currentNode, octave);
+    this->WriteTimeSpanningInterface(currentNode, octave);
     octave->WriteColor(currentNode);
     octave->WriteExtender(currentNode);
     octave->WriteLineRend(currentNode);
@@ -1882,8 +1882,8 @@ void MEIOutput::WritePedal(pugi::xml_node currentNode, Pedal *pedal)
 {
     assert(pedal);
 
-    WriteControlElement(currentNode, pedal);
-    WriteTimeSpanningInterface(currentNode, pedal);
+    this->WriteControlElement(currentNode, pedal);
+    this->WriteTimeSpanningInterface(currentNode, pedal);
     pedal->WriteColor(currentNode);
     pedal->WriteExtSym(currentNode);
     pedal->WritePedalLog(currentNode);
@@ -1896,24 +1896,24 @@ void MEIOutput::WritePhrase(pugi::xml_node currentNode, Phrase *phrase)
 {
     assert(phrase);
 
-    WriteSlur(currentNode, phrase);
+    this->WriteSlur(currentNode, phrase);
 }
 
 void MEIOutput::WritePitchInflection(pugi::xml_node currentNode, PitchInflection *pitchInflection)
 {
     assert(pitchInflection);
 
-    WriteControlElement(currentNode, pitchInflection);
-    WriteTimeSpanningInterface(currentNode, pitchInflection);
+    this->WriteControlElement(currentNode, pitchInflection);
+    this->WriteTimeSpanningInterface(currentNode, pitchInflection);
 }
 
 void MEIOutput::WriteReh(pugi::xml_node currentNode, Reh *reh)
 {
     assert(reh);
 
-    WriteControlElement(currentNode, reh);
-    WriteTextDirInterface(currentNode, reh);
-    WriteTimePointInterface(currentNode, reh);
+    this->WriteControlElement(currentNode, reh);
+    this->WriteTextDirInterface(currentNode, reh);
+    this->WriteTimePointInterface(currentNode, reh);
     reh->WriteColor(currentNode);
     reh->WriteLang(currentNode);
     reh->WriteVerticalGroup(currentNode);
@@ -1923,8 +1923,8 @@ void MEIOutput::WriteSlur(pugi::xml_node currentNode, Slur *slur)
 {
     assert(slur);
 
-    WriteControlElement(currentNode, slur);
-    WriteTimeSpanningInterface(currentNode, slur);
+    this->WriteControlElement(currentNode, slur);
+    this->WriteTimeSpanningInterface(currentNode, slur);
     slur->WriteColor(currentNode);
     slur->WriteCurvature(currentNode);
     slur->WriteCurveRend(currentNode);
@@ -1935,7 +1935,7 @@ void MEIOutput::WriteStaff(pugi::xml_node currentNode, Staff *staff)
 {
     assert(staff);
 
-    WriteXmlId(currentNode, staff);
+    this->WriteXmlId(currentNode, staff);
     staff->WriteFacsimile(currentNode);
     staff->WriteNInteger(currentNode);
     staff->WriteTyped(currentNode);
@@ -1952,9 +1952,9 @@ void MEIOutput::WriteTempo(pugi::xml_node currentNode, Tempo *tempo)
 {
     assert(tempo);
 
-    WriteControlElement(currentNode, tempo);
-    WriteTextDirInterface(currentNode, tempo);
-    WriteTimePointInterface(currentNode, tempo);
+    this->WriteControlElement(currentNode, tempo);
+    this->WriteTextDirInterface(currentNode, tempo);
+    this->WriteTimePointInterface(currentNode, tempo);
     tempo->WriteLang(currentNode);
     tempo->WriteMidiTempo(currentNode);
     tempo->WriteMmTempo(currentNode);
@@ -1964,8 +1964,8 @@ void MEIOutput::WriteTie(pugi::xml_node currentNode, Tie *tie)
 {
     assert(tie);
 
-    WriteControlElement(currentNode, tie);
-    WriteTimeSpanningInterface(currentNode, tie);
+    this->WriteControlElement(currentNode, tie);
+    this->WriteTimeSpanningInterface(currentNode, tie);
     tie->WriteColor(currentNode);
     tie->WriteCurvature(currentNode);
     tie->WriteCurveRend(currentNode);
@@ -1975,8 +1975,8 @@ void MEIOutput::WriteTrill(pugi::xml_node currentNode, Trill *trill)
 {
     assert(trill);
 
-    WriteControlElement(currentNode, trill);
-    WriteTimeSpanningInterface(currentNode, trill);
+    this->WriteControlElement(currentNode, trill);
+    this->WriteTimeSpanningInterface(currentNode, trill);
     trill->WriteColor(currentNode);
     trill->WriteExtender(currentNode);
     trill->WriteExtSym(currentNode);
@@ -1990,8 +1990,8 @@ void MEIOutput::WriteTurn(pugi::xml_node currentNode, Turn *turn)
 {
     assert(turn);
 
-    WriteControlElement(currentNode, turn);
-    WriteTimePointInterface(currentNode, turn);
+    this->WriteControlElement(currentNode, turn);
+    this->WriteTimePointInterface(currentNode, turn);
     turn->WriteColor(currentNode);
     turn->WriteExtSym(currentNode);
     turn->WriteOrnamentAccid(currentNode);
@@ -2003,7 +2003,7 @@ void MEIOutput::WriteLayer(pugi::xml_node currentNode, Layer *layer)
 {
     assert(layer);
 
-    WriteXmlId(currentNode, layer);
+    this->WriteXmlId(currentNode, layer);
     layer->WriteNInteger(currentNode);
     layer->WriteTyped(currentNode);
     layer->WriteVisibility(currentNode);
@@ -2013,8 +2013,8 @@ void MEIOutput::WriteLayerElement(pugi::xml_node currentNode, LayerElement *elem
 {
     assert(element);
 
-    WriteXmlId(currentNode, element);
-    WriteLinkingInterface(currentNode, element);
+    this->WriteXmlId(currentNode, element);
+    this->WriteLinkingInterface(currentNode, element);
     element->WriteLabelled(currentNode);
     element->WriteTyped(currentNode);
     if (element->m_xAbs != VRV_UNSET) {
@@ -2034,8 +2034,8 @@ void MEIOutput::WriteAccid(pugi::xml_node currentNode, Accid *accid)
         return;
     }
 
-    WriteLayerElement(currentNode, accid);
-    WritePositionInterface(currentNode, accid);
+    this->WriteLayerElement(currentNode, accid);
+    this->WritePositionInterface(currentNode, accid);
     accid->WriteAccidental(currentNode);
     accid->WriteAccidentalGestural(currentNode);
     accid->WriteAccidLog(currentNode);
@@ -2054,7 +2054,7 @@ void MEIOutput::WriteArtic(pugi::xml_node currentNode, Artic *artic)
         return;
     }
 
-    WriteLayerElement(currentNode, artic);
+    this->WriteLayerElement(currentNode, artic);
     artic->WriteArticulation(currentNode);
     artic->WriteColor(currentNode);
     artic->WriteEnclosingChars(currentNode);
@@ -2066,7 +2066,7 @@ void MEIOutput::WriteBarLine(pugi::xml_node currentNode, BarLine *barLine)
 {
     assert(barLine);
 
-    WriteLayerElement(currentNode, barLine);
+    this->WriteLayerElement(currentNode, barLine);
     barLine->WriteBarLineLog(currentNode);
     barLine->WriteColor(currentNode);
     barLine->WriteNNumberLike(currentNode);
@@ -2077,7 +2077,7 @@ void MEIOutput::WriteBeam(pugi::xml_node currentNode, Beam *beam)
 {
     assert(beam);
 
-    WriteLayerElement(currentNode, beam);
+    this->WriteLayerElement(currentNode, beam);
     beam->WriteBeamedWith(currentNode);
     beam->WriteBeamRend(currentNode);
     beam->WriteColor(currentNode);
@@ -2088,7 +2088,7 @@ void MEIOutput::WriteBeatRpt(pugi::xml_node currentNode, BeatRpt *beatRpt)
 {
     assert(beatRpt);
 
-    WriteLayerElement(currentNode, beatRpt);
+    this->WriteLayerElement(currentNode, beatRpt);
     beatRpt->WriteColor(currentNode);
     beatRpt->WriteBeatRptLog(currentNode);
     beatRpt->WriteBeatRptVis(currentNode);
@@ -2098,7 +2098,7 @@ void MEIOutput::WriteBTrem(pugi::xml_node currentNode, BTrem *bTrem)
 {
     assert(bTrem);
 
-    WriteLayerElement(currentNode, bTrem);
+    this->WriteLayerElement(currentNode, bTrem);
     bTrem->WriteBTremLog(currentNode);
     bTrem->WriteTremMeasured(currentNode);
 }
@@ -2107,8 +2107,8 @@ void MEIOutput::WriteChord(pugi::xml_node currentNode, Chord *chord)
 {
     assert(chord);
 
-    WriteLayerElement(currentNode, chord);
-    WriteDurationInterface(currentNode, chord);
+    this->WriteLayerElement(currentNode, chord);
+    this->WriteDurationInterface(currentNode, chord);
     chord->WriteColor(currentNode);
     chord->WriteCue(currentNode);
     chord->WriteGraced(currentNode);
@@ -2136,8 +2136,8 @@ void MEIOutput::WriteClef(pugi::xml_node currentNode, Clef *clef)
         return;
     }
 
-    WriteLayerElement(currentNode, clef);
-    WriteFacsimileInterface(currentNode, clef);
+    this->WriteLayerElement(currentNode, clef);
+    this->WriteFacsimileInterface(currentNode, clef);
     clef->WriteClefShape(currentNode);
     clef->WriteColor(currentNode);
     clef->WriteEnclosingChars(currentNode);
@@ -2151,10 +2151,10 @@ void MEIOutput::WriteCustos(pugi::xml_node currentNode, Custos *custos)
 {
     assert(custos);
 
-    WriteFacsimileInterface(currentNode, custos);
-    WritePitchInterface(currentNode, custos);
-    WritePositionInterface(currentNode, custos);
-    WriteLayerElement(currentNode, custos);
+    this->WriteFacsimileInterface(currentNode, custos);
+    this->WritePitchInterface(currentNode, custos);
+    this->WritePositionInterface(currentNode, custos);
+    this->WriteLayerElement(currentNode, custos);
     custos->WriteColor(currentNode);
     custos->WriteExtSym(currentNode);
 }
@@ -2163,8 +2163,8 @@ void MEIOutput::WriteDot(pugi::xml_node currentNode, Dot *dot)
 {
     assert(dot);
 
-    WriteLayerElement(currentNode, dot);
-    WritePositionInterface(currentNode, dot);
+    this->WriteLayerElement(currentNode, dot);
+    this->WritePositionInterface(currentNode, dot);
     dot->WriteColor(currentNode);
     dot->WriteDotLog(currentNode);
 }
@@ -2173,7 +2173,7 @@ void MEIOutput::WriteFTrem(pugi::xml_node currentNode, FTrem *fTrem)
 {
     assert(fTrem);
 
-    WriteLayerElement(currentNode, fTrem);
+    this->WriteLayerElement(currentNode, fTrem);
     fTrem->WriteFTremVis(currentNode);
     fTrem->WriteTremMeasured(currentNode);
 }
@@ -2182,7 +2182,7 @@ void MEIOutput::WriteGraceGrp(pugi::xml_node currentNode, GraceGrp *graceGrp)
 {
     assert(graceGrp);
 
-    WriteLayerElement(currentNode, graceGrp);
+    this->WriteLayerElement(currentNode, graceGrp);
     graceGrp->WriteColor(currentNode);
     graceGrp->WriteGraced(currentNode);
     graceGrp->WriteGraceGrpLog(currentNode);
@@ -2192,7 +2192,7 @@ void MEIOutput::WriteHalfmRpt(pugi::xml_node currentNode, HalfmRpt *halfmRpt)
 {
     assert(halfmRpt);
 
-    WriteLayerElement(currentNode, halfmRpt);
+    this->WriteLayerElement(currentNode, halfmRpt);
     halfmRpt->WriteColor(currentNode);
 }
 
@@ -2200,8 +2200,8 @@ void MEIOutput::WriteKeyAccid(pugi::xml_node currentNode, KeyAccid *keyAccid)
 {
     assert(keyAccid);
 
-    WriteLayerElement(currentNode, keyAccid);
-    WritePitchInterface(currentNode, keyAccid);
+    this->WriteLayerElement(currentNode, keyAccid);
+    this->WritePitchInterface(currentNode, keyAccid);
     keyAccid->WriteAccidental(currentNode);
     keyAccid->WriteColor(currentNode);
     keyAccid->WriteEnclosingChars(currentNode);
@@ -2228,7 +2228,7 @@ void MEIOutput::WriteKeySig(pugi::xml_node currentNode, KeySig *keySig)
         return;
     }
 
-    WriteLayerElement(currentNode, keySig);
+    this->WriteLayerElement(currentNode, keySig);
     keySig->WriteAccidental(currentNode);
     keySig->WritePitch(currentNode);
     keySig->WriteKeySigAnl(currentNode);
@@ -2241,7 +2241,7 @@ void MEIOutput::WriteLigature(pugi::xml_node currentNode, Ligature *ligature)
 {
     assert(ligature);
 
-    WriteLayerElement(currentNode, ligature);
+    this->WriteLayerElement(currentNode, ligature);
     ligature->WriteLigatureVis(currentNode);
 }
 
@@ -2271,7 +2271,7 @@ void MEIOutput::WriteMensur(pugi::xml_node currentNode, Mensur *mensur)
         return;
     }
 
-    WriteLayerElement(currentNode, mensur);
+    this->WriteLayerElement(currentNode, mensur);
     mensur->WriteColor(currentNode);
     mensur->WriteCue(currentNode);
     mensur->WriteDurationRatio(currentNode);
@@ -2297,7 +2297,7 @@ void MEIOutput::WriteMeterSig(pugi::xml_node currentNode, MeterSig *meterSig)
         return;
     }
 
-    WriteLayerElement(currentNode, meterSig);
+    this->WriteLayerElement(currentNode, meterSig);
     meterSig->WriteEnclosingChars(currentNode);
     meterSig->WriteMeterSigLog(currentNode);
     meterSig->WriteMeterSigVis(currentNode);
@@ -2307,8 +2307,8 @@ void MEIOutput::WriteMRest(pugi::xml_node currentNode, MRest *mRest)
 {
     assert(mRest);
 
-    WriteLayerElement(currentNode, mRest);
-    WritePositionInterface(currentNode, mRest);
+    this->WriteLayerElement(currentNode, mRest);
+    this->WritePositionInterface(currentNode, mRest);
     mRest->WriteColor(currentNode);
     mRest->WriteCue(currentNode);
     mRest->WriteFermataPresent(currentNode);
@@ -2319,7 +2319,7 @@ void MEIOutput::WriteMRpt(pugi::xml_node currentNode, MRpt *mRpt)
 {
     assert(mRpt);
 
-    WriteLayerElement(currentNode, mRpt);
+    this->WriteLayerElement(currentNode, mRpt);
     mRpt->WriteColor(currentNode);
 }
 
@@ -2327,7 +2327,7 @@ void MEIOutput::WriteMRpt2(pugi::xml_node currentNode, MRpt2 *mRpt2)
 {
     assert(mRpt2);
 
-    WriteLayerElement(currentNode, mRpt2);
+    this->WriteLayerElement(currentNode, mRpt2);
     mRpt2->WriteColor(currentNode);
 }
 
@@ -2335,15 +2335,15 @@ void MEIOutput::WriteMSpace(pugi::xml_node currentNode, MSpace *mSpace)
 {
     assert(mSpace);
 
-    WriteLayerElement(currentNode, mSpace);
+    this->WriteLayerElement(currentNode, mSpace);
 }
 
 void MEIOutput::WriteMultiRest(pugi::xml_node currentNode, MultiRest *multiRest)
 {
     assert(multiRest);
 
-    WriteLayerElement(currentNode, multiRest);
-    WritePositionInterface(currentNode, multiRest);
+    this->WriteLayerElement(currentNode, multiRest);
+    this->WritePositionInterface(currentNode, multiRest);
     multiRest->WriteColor(currentNode);
     multiRest->WriteMultiRestVis(currentNode);
     multiRest->WriteNumbered(currentNode);
@@ -2355,7 +2355,7 @@ void MEIOutput::WriteMultiRpt(pugi::xml_node currentNode, MultiRpt *multiRpt)
 {
     assert(multiRpt);
 
-    WriteLayerElement(currentNode, multiRpt);
+    this->WriteLayerElement(currentNode, multiRpt);
     multiRpt->WriteNumbered(currentNode);
 }
 
@@ -2363,11 +2363,11 @@ void MEIOutput::WriteNc(pugi::xml_node currentNode, Nc *nc)
 {
     assert(nc);
 
-    WriteLayerElement(currentNode, nc);
-    WriteDurationInterface(currentNode, nc);
-    WriteFacsimileInterface(currentNode, nc);
-    WritePitchInterface(currentNode, nc);
-    WritePositionInterface(currentNode, nc);
+    this->WriteLayerElement(currentNode, nc);
+    this->WriteDurationInterface(currentNode, nc);
+    this->WriteFacsimileInterface(currentNode, nc);
+    this->WritePitchInterface(currentNode, nc);
+    this->WritePositionInterface(currentNode, nc);
     nc->WriteColor(currentNode);
     nc->WriteIntervalMelodic(currentNode);
     nc->WriteNcForm(currentNode);
@@ -2377,8 +2377,8 @@ void MEIOutput::WriteNeume(pugi::xml_node currentNode, Neume *neume)
 {
     assert(neume);
 
-    WriteLayerElement(currentNode, neume);
-    WriteFacsimileInterface(currentNode, neume);
+    this->WriteLayerElement(currentNode, neume);
+    this->WriteFacsimileInterface(currentNode, neume);
     neume->WriteColor(currentNode);
 }
 
@@ -2386,10 +2386,10 @@ void MEIOutput::WriteNote(pugi::xml_node currentNode, Note *note)
 {
     assert(note);
 
-    WriteLayerElement(currentNode, note);
-    WriteDurationInterface(currentNode, note);
-    WritePitchInterface(currentNode, note);
-    WritePositionInterface(currentNode, note);
+    this->WriteLayerElement(currentNode, note);
+    this->WriteDurationInterface(currentNode, note);
+    this->WritePitchInterface(currentNode, note);
+    this->WritePositionInterface(currentNode, note);
     note->WriteColor(currentNode);
     note->WriteColoration(currentNode);
     note->WriteCue(currentNode);
@@ -2409,9 +2409,9 @@ void MEIOutput::WriteRest(pugi::xml_node currentNode, Rest *rest)
 {
     assert(rest);
 
-    WriteLayerElement(currentNode, rest);
-    WriteDurationInterface(currentNode, rest);
-    WritePositionInterface(currentNode, rest);
+    this->WriteLayerElement(currentNode, rest);
+    this->WriteDurationInterface(currentNode, rest);
+    this->WritePositionInterface(currentNode, rest);
     rest->WriteColor(currentNode);
     rest->WriteCue(currentNode);
     rest->WriteExtSym(currentNode);
@@ -2422,7 +2422,7 @@ void MEIOutput::WritePlica(pugi::xml_node currentNode, Plica *plica)
 {
     assert(plica);
 
-    WriteLayerElement(currentNode, plica);
+    this->WriteLayerElement(currentNode, plica);
     plica->WritePlicaVis(currentNode);
 }
 
@@ -2430,22 +2430,22 @@ void MEIOutput::WriteProport(pugi::xml_node currentNode, Proport *proport)
 {
     assert(proport);
 
-    WriteLayerElement(currentNode, proport);
+    this->WriteLayerElement(currentNode, proport);
 }
 
 void MEIOutput::WriteSpace(pugi::xml_node currentNode, Space *space)
 {
     assert(space);
 
-    WriteLayerElement(currentNode, space);
-    WriteDurationInterface(currentNode, space);
+    this->WriteLayerElement(currentNode, space);
+    this->WriteDurationInterface(currentNode, space);
 }
 
 void MEIOutput::WriteTabDurSym(pugi::xml_node currentNode, TabDurSym *tabDurSym)
 {
     assert(tabDurSym);
 
-    WriteLayerElement(currentNode, tabDurSym);
+    this->WriteLayerElement(currentNode, tabDurSym);
     tabDurSym->WriteNNumberLike(currentNode);
 }
 
@@ -2453,15 +2453,15 @@ void MEIOutput::WriteTabGrp(pugi::xml_node currentNode, TabGrp *tabGrp)
 {
     assert(tabGrp);
 
-    WriteLayerElement(currentNode, tabGrp);
-    WriteDurationInterface(currentNode, tabGrp);
+    this->WriteLayerElement(currentNode, tabGrp);
+    this->WriteDurationInterface(currentNode, tabGrp);
 }
 
 void MEIOutput::WriteTuplet(pugi::xml_node currentNode, Tuplet *tuplet)
 {
     assert(tuplet);
 
-    WriteLayerElement(currentNode, tuplet);
+    this->WriteLayerElement(currentNode, tuplet);
     tuplet->WriteColor(currentNode);
     tuplet->WriteDurationRatio(currentNode);
     tuplet->WriteNumberPlacement(currentNode);
@@ -2472,7 +2472,7 @@ void MEIOutput::WriteVerse(pugi::xml_node currentNode, Verse *verse)
 {
     assert(verse);
 
-    WriteLayerElement(currentNode, verse);
+    this->WriteLayerElement(currentNode, verse);
     verse->WriteColor(currentNode);
     verse->WriteLang(currentNode);
     verse->WriteNInteger(currentNode);
@@ -2483,8 +2483,8 @@ void MEIOutput::WriteSyl(pugi::xml_node currentNode, Syl *syl)
 {
     assert(syl);
 
-    WriteLayerElement(currentNode, syl);
-    WriteFacsimileInterface(currentNode, syl);
+    this->WriteLayerElement(currentNode, syl);
+    this->WriteFacsimileInterface(currentNode, syl);
     syl->WriteLang(currentNode);
     syl->WriteTypography(currentNode);
     syl->WriteSylLog(currentNode);
@@ -2494,7 +2494,7 @@ void MEIOutput::WriteSyllable(pugi::xml_node currentNode, Syllable *syllable)
 {
     assert(syllable);
 
-    WriteLayerElement(currentNode, syllable);
+    this->WriteLayerElement(currentNode, syllable);
     syllable->WriteColor(currentNode);
     syllable->WriteSlashCount(currentNode);
 }
@@ -2502,13 +2502,13 @@ void MEIOutput::WriteSyllable(pugi::xml_node currentNode, Syllable *syllable)
 void MEIOutput::WriteFacsimile(pugi::xml_node currentNode, Facsimile *facsimile)
 {
     assert(facsimile);
-    WriteXmlId(currentNode, facsimile);
+    this->WriteXmlId(currentNode, facsimile);
 
     // Write Surface(s)
     for (Object *child = facsimile->GetFirst(); child != NULL; child = facsimile->GetNext()) {
         if (child->GetClassId() == SURFACE) {
             pugi::xml_node childNode = currentNode.append_child("surface");
-            WriteSurface(childNode, dynamic_cast<Surface *>(child));
+            this->WriteSurface(childNode, dynamic_cast<Surface *>(child));
         }
         else {
             LogWarning("Unable to write child '%s' of facsimile", child->GetClassName().c_str());
@@ -2519,14 +2519,14 @@ void MEIOutput::WriteFacsimile(pugi::xml_node currentNode, Facsimile *facsimile)
 void MEIOutput::WriteSurface(pugi::xml_node currentNode, Surface *surface)
 {
     assert(surface);
-    WriteXmlId(currentNode, surface);
+    this->WriteXmlId(currentNode, surface);
     surface->WriteCoordinated(currentNode);
     surface->WriteTyped(currentNode);
 
     for (Object *child = surface->GetFirst(); child != NULL; child = surface->GetNext()) {
         if (child->GetClassId() == ZONE) {
             pugi::xml_node childNode = currentNode.append_child("zone");
-            WriteZone(childNode, dynamic_cast<Zone *>(child));
+            this->WriteZone(childNode, dynamic_cast<Zone *>(child));
         }
         else {
             LogWarning("Unable to write child '%s' of surface", child->GetClassName().c_str());
@@ -2537,7 +2537,7 @@ void MEIOutput::WriteSurface(pugi::xml_node currentNode, Surface *surface)
 void MEIOutput::WriteZone(pugi::xml_node currentNode, Zone *zone)
 {
     assert(zone);
-    WriteXmlId(currentNode, zone);
+    this->WriteXmlId(currentNode, zone);
     zone->WriteCoordinated(currentNode);
     zone->WriteTyped(currentNode);
 }
@@ -2546,7 +2546,7 @@ void MEIOutput::WriteTextElement(pugi::xml_node currentNode, TextElement *textEl
 {
     assert(textElement);
 
-    WriteXmlId(currentNode, textElement);
+    this->WriteXmlId(currentNode, textElement);
     textElement->WriteLabelled(currentNode);
     textElement->WriteTyped(currentNode);
 }
@@ -2555,8 +2555,8 @@ void MEIOutput::WriteF(pugi::xml_node currentNode, F *f)
 {
     assert(f);
 
-    WriteTextElement(currentNode, f);
-    WriteTimeSpanningInterface(currentNode, f);
+    this->WriteTextElement(currentNode, f);
+    this->WriteTimeSpanningInterface(currentNode, f);
     f->WriteExtender(currentNode);
 }
 
@@ -2564,30 +2564,30 @@ void MEIOutput::WriteFig(pugi::xml_node currentNode, Fig *fig)
 {
     assert(fig);
 
-    WriteTextElement(currentNode, fig);
-    WriteAreaPosInterface(currentNode, fig);
+    this->WriteTextElement(currentNode, fig);
+    this->WriteAreaPosInterface(currentNode, fig);
 }
 
 void MEIOutput::WriteLb(pugi::xml_node currentNode, Lb *lb)
 {
     assert(lb);
 
-    WriteTextElement(currentNode, lb);
+    this->WriteTextElement(currentNode, lb);
 }
 
 void MEIOutput::WriteNum(pugi::xml_node currentNode, Num *num)
 {
     assert(num);
 
-    WriteTextElement(currentNode, num);
+    this->WriteTextElement(currentNode, num);
 }
 
 void MEIOutput::WriteRend(pugi::xml_node currentNode, Rend *rend)
 {
     assert(rend);
 
-    WriteTextElement(currentNode, rend);
-    WriteAreaPosInterface(currentNode, rend);
+    this->WriteTextElement(currentNode, rend);
+    this->WriteAreaPosInterface(currentNode, rend);
     rend->WriteColor(currentNode);
     rend->WriteLang(currentNode);
     rend->WriteTextRendition(currentNode);
@@ -2599,7 +2599,7 @@ void MEIOutput::WriteSvg(pugi::xml_node currentNode, Svg *svg)
 {
     assert(svg);
 
-    WriteXmlId(currentNode, svg);
+    this->WriteXmlId(currentNode, svg);
 
     pugi::xml_node svgNode = svg->Get();
     for (pugi::xml_attribute attr : svgNode.attributes()) {
@@ -2715,7 +2715,7 @@ void MEIOutput::WriteTimeSpanningInterface(pugi::xml_node element, TimeSpanningI
 {
     assert(interface);
 
-    WriteTimePointInterface(element, interface);
+    this->WriteTimePointInterface(element, interface);
     interface->WriteStartEndId(element);
     interface->WriteTimestamp2Logical(element);
 }
@@ -2736,7 +2736,7 @@ void MEIOutput::WriteEditorialElement(pugi::xml_node currentNode, EditorialEleme
 {
     assert(element);
 
-    WriteXmlId(currentNode, element);
+    this->WriteXmlId(currentNode, element);
     element->WriteLabelled(currentNode);
     element->WriteTyped(currentNode);
 }
@@ -2745,7 +2745,7 @@ void MEIOutput::WriteAbbr(pugi::xml_node currentNode, Abbr *abbr)
 {
     assert(abbr);
 
-    WriteEditorialElement(currentNode, abbr);
+    this->WriteEditorialElement(currentNode, abbr);
     abbr->WriteSource(currentNode);
 }
 
@@ -2753,7 +2753,7 @@ void MEIOutput::WriteAdd(pugi::xml_node currentNode, Add *add)
 {
     assert(add);
 
-    WriteEditorialElement(currentNode, add);
+    this->WriteEditorialElement(currentNode, add);
     add->WriteSource(currentNode);
 }
 
@@ -2761,7 +2761,7 @@ void MEIOutput::WriteAnnot(pugi::xml_node currentNode, Annot *annot)
 {
     assert(annot);
 
-    WriteEditorialElement(currentNode, annot);
+    this->WriteEditorialElement(currentNode, annot);
     annot->WritePlist(currentNode);
     annot->WriteSource(currentNode);
     // special case where we keep the pugi::nodes
@@ -2774,21 +2774,21 @@ void MEIOutput::WriteApp(pugi::xml_node currentNode, App *app)
 {
     assert(app);
 
-    WriteEditorialElement(currentNode, app);
+    this->WriteEditorialElement(currentNode, app);
 }
 
 void MEIOutput::WriteChoice(pugi::xml_node currentNode, Choice *choice)
 {
     assert(choice);
 
-    WriteEditorialElement(currentNode, choice);
+    this->WriteEditorialElement(currentNode, choice);
 }
 
 void MEIOutput::WriteCorr(pugi::xml_node currentNode, Corr *corr)
 {
     assert(corr);
 
-    WriteEditorialElement(currentNode, corr);
+    this->WriteEditorialElement(currentNode, corr);
     corr->WriteSource(currentNode);
 }
 
@@ -2796,7 +2796,7 @@ void MEIOutput::WriteDamage(pugi::xml_node currentNode, Damage *damage)
 {
     assert(damage);
 
-    WriteEditorialElement(currentNode, damage);
+    this->WriteEditorialElement(currentNode, damage);
     damage->WriteSource(currentNode);
 }
 
@@ -2804,7 +2804,7 @@ void MEIOutput::WriteDel(pugi::xml_node currentNode, Del *del)
 {
     assert(del);
 
-    WriteEditorialElement(currentNode, del);
+    this->WriteEditorialElement(currentNode, del);
     del->WriteSource(currentNode);
 }
 
@@ -2812,7 +2812,7 @@ void MEIOutput::WriteExpan(pugi::xml_node currentNode, Expan *expan)
 {
     assert(expan);
 
-    WriteEditorialElement(currentNode, expan);
+    this->WriteEditorialElement(currentNode, expan);
     expan->WriteSource(currentNode);
 }
 
@@ -2820,7 +2820,7 @@ void MEIOutput::WriteLem(pugi::xml_node currentNode, Lem *lem)
 {
     assert(lem);
 
-    WriteEditorialElement(currentNode, lem);
+    this->WriteEditorialElement(currentNode, lem);
     lem->WriteSource(currentNode);
 }
 
@@ -2828,7 +2828,7 @@ void MEIOutput::WriteOrig(pugi::xml_node currentNode, Orig *orig)
 {
     assert(orig);
 
-    WriteEditorialElement(currentNode, orig);
+    this->WriteEditorialElement(currentNode, orig);
     orig->WriteSource(currentNode);
 }
 
@@ -2836,7 +2836,7 @@ void MEIOutput::WriteRdg(pugi::xml_node currentNode, Rdg *rdg)
 {
     assert(rdg);
 
-    WriteEditorialElement(currentNode, rdg);
+    this->WriteEditorialElement(currentNode, rdg);
     rdg->WriteSource(currentNode);
 }
 
@@ -2844,14 +2844,14 @@ void MEIOutput::WriteRef(pugi::xml_node currentNode, Ref *ref)
 {
     assert(ref);
 
-    WriteEditorialElement(currentNode, ref);
+    this->WriteEditorialElement(currentNode, ref);
 }
 
 void MEIOutput::WriteReg(pugi::xml_node currentNode, Reg *reg)
 {
     assert(reg);
 
-    WriteEditorialElement(currentNode, reg);
+    this->WriteEditorialElement(currentNode, reg);
     reg->WriteSource(currentNode);
 }
 
@@ -2859,7 +2859,7 @@ void MEIOutput::WriteRestore(pugi::xml_node currentNode, Restore *restore)
 {
     assert(restore);
 
-    WriteEditorialElement(currentNode, restore);
+    this->WriteEditorialElement(currentNode, restore);
     restore->WriteSource(currentNode);
 
     return;
@@ -2869,7 +2869,7 @@ void MEIOutput::WriteSic(pugi::xml_node currentNode, Sic *sic)
 {
     assert(sic);
 
-    WriteEditorialElement(currentNode, sic);
+    this->WriteEditorialElement(currentNode, sic);
     sic->WriteSource(currentNode);
 }
 
@@ -2877,14 +2877,14 @@ void MEIOutput::WriteSubst(pugi::xml_node currentNode, Subst *subst)
 {
     assert(subst);
 
-    WriteEditorialElement(currentNode, subst);
+    this->WriteEditorialElement(currentNode, subst);
 }
 
 void MEIOutput::WriteSupplied(pugi::xml_node currentNode, Supplied *supplied)
 {
     assert(supplied);
 
-    WriteEditorialElement(currentNode, supplied);
+    this->WriteEditorialElement(currentNode, supplied);
     supplied->WriteSource(currentNode);
 }
 
@@ -2892,7 +2892,7 @@ void MEIOutput::WriteUnclear(pugi::xml_node currentNode, Unclear *unclear)
 {
     assert(unclear);
 
-    WriteEditorialElement(currentNode, unclear);
+    this->WriteEditorialElement(currentNode, unclear);
     unclear->WriteSource(currentNode);
 }
 
@@ -2967,7 +2967,7 @@ bool MEIInput::Import(const std::string &mei)
         pugi::xml_document doc;
         doc.load_string(mei.c_str(), (pugi::parse_comments | pugi::parse_default) & ~pugi::parse_eol);
         pugi::xml_node root = doc.first_child();
-        return ReadDoc(root);
+        return this->ReadDoc(root);
     }
     catch (char *str) {
         LogError("%s", str);
@@ -2982,7 +2982,7 @@ bool MEIInput::IsAllowed(std::string element, Object *filterParent)
     }
 
     // editorial
-    if (IsEditorialElementName(element)) {
+    if (this->IsEditorialElementName(element)) {
         // Because of the Clone issue on annot do not support it in label and labelAbbr
         if (filterParent->Is(LABEL) && (element == "annot")) {
             return false;
@@ -3459,7 +3459,7 @@ bool MEIInput::ReadDoc(pugi::xml_node root)
 
     facsimile = music.child("facsimile");
     if ((!facsimile.empty()) && (m_doc->GetOptions()->m_useFacsimile.GetValue())) {
-        ReadFacsimile(m_doc, facsimile);
+        this->ReadFacsimile(m_doc, facsimile);
         m_doc->SetType(Facs);
         m_doc->m_drawingPageHeight = m_doc->GetFacsimile()->GetMaxY();
         m_doc->m_drawingPageWidth = m_doc->GetFacsimile()->GetMaxX();
@@ -3538,7 +3538,7 @@ bool MEIInput::ReadDoc(pugi::xml_node root)
         }
 
         const bool allMdivVisible = m_doc->GetOptions()->m_mdivAll.GetValue();
-        success = ReadMdivChildren(m_doc, body, allMdivVisible);
+        success = this->ReadMdivChildren(m_doc, body, allMdivVisible);
 
         if (success) {
             m_doc->ExpandExpansions();
@@ -3570,7 +3570,7 @@ bool MEIInput::ReadDoc(pugi::xml_node root)
 bool MEIInput::ReadPages(Object *parent, pugi::xml_node pages)
 {
     Pages *vrvPages = new Pages();
-    SetMeiUuid(pages, vrvPages);
+    this->SetMeiUuid(pages, vrvPages);
 
     vrvPages->ReadLabelled(pages);
     vrvPages->ReadNNumberLike(pages);
@@ -3597,7 +3597,7 @@ bool MEIInput::ReadPages(Object *parent, pugi::xml_node pages)
     }
     else {
         // This actually sets the Doc::m_scoreDef
-        success = ReadScoreDef(vrvPages, scoreDef);
+        success = this->ReadScoreDef(vrvPages, scoreDef);
     }
 
     if (!success) return false;
@@ -3609,25 +3609,25 @@ bool MEIInput::ReadPages(Object *parent, pugi::xml_node pages)
         if (!success) break;
         // page
         if (std::string(current.name()) == "page") {
-            success = ReadPage(vrvPages, current);
+            success = this->ReadPage(vrvPages, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <pages>", current.name());
         }
     }
 
-    ReadUnsupportedAttr(pages, vrvPages);
+    this->ReadUnsupportedAttr(pages, vrvPages);
     return success;
 }
 
 bool MEIInput::ReadPage(Object *parent, pugi::xml_node page)
 {
     Page *vrvPage = new Page();
-    SetMeiUuid(page, vrvPage);
+    this->SetMeiUuid(page, vrvPage);
 
     if ((m_doc->GetType() == Transcription) && (m_version == MEI_2013)) {
         UpgradePageTo_3_0_0(vrvPage, m_doc);
@@ -3666,7 +3666,7 @@ bool MEIInput::ReadPage(Object *parent, pugi::xml_node page)
     }
 
     parent->AddChild(vrvPage);
-    bool success = ReadPageChildren(vrvPage, page);
+    bool success = this->ReadPageChildren(vrvPage, page);
 
     if (success && (m_doc->GetType() == Transcription) && (vrvPage->GetPPUFactor() != 1.0)) {
         ApplyPPUFactorParams applyPPUFactorParams;
@@ -3678,7 +3678,7 @@ bool MEIInput::ReadPage(Object *parent, pugi::xml_node page)
         UpgradePageTo_5_0_0(vrvPage);
     }
 
-    ReadUnsupportedAttr(page, vrvPage);
+    this->ReadUnsupportedAttr(page, vrvPage);
     return success;
 }
 
@@ -3691,24 +3691,24 @@ bool MEIInput::ReadPageChildren(Object *parent, pugi::xml_node parentNode)
     pugi::xml_node current;
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (std::string(current.name()) == "mdiv") {
-            ReadMdiv(parent, current, true);
+            this->ReadMdiv(parent, current, true);
         }
         else if (std::string(current.name()) == "score") {
-            ReadScore(parent, current);
+            this->ReadScore(parent, current);
         }
         else if (std::string(current.name()) == "system") {
-            ReadSystem(parent, current);
+            this->ReadSystem(parent, current);
         }
         // mdiv in page-based MEI
         else if (std::string(current.name()) == "mdivb") {
-            ReadMdiv(parent, current, true);
+            this->ReadMdiv(parent, current, true);
         }
         else if (std::string(current.name()) == "milestoneEnd") {
-            ReadPageMilestoneEnd(parent, current);
+            this->ReadPageMilestoneEnd(parent, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            ReadXMLComment(parent, current);
+            this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <page>", current.name());
@@ -3744,7 +3744,7 @@ bool MEIInput::ReadPageMilestoneEnd(Object *parent, pugi::xml_node milestoneEnd)
     }
 
     PageMilestoneEnd *vrvElementEnd = new PageMilestoneEnd(start);
-    SetMeiUuid(milestoneEnd, vrvElementEnd);
+    this->SetMeiUuid(milestoneEnd, vrvElementEnd);
     interface->SetEnd(vrvElementEnd);
 
     parent->AddChild(vrvElementEnd);
@@ -3754,7 +3754,7 @@ bool MEIInput::ReadPageMilestoneEnd(Object *parent, pugi::xml_node milestoneEnd)
 bool MEIInput::ReadMdiv(Object *parent, pugi::xml_node mdiv, bool isVisible)
 {
     Mdiv *vrvMdiv = new Mdiv();
-    SetMeiUuid(mdiv, vrvMdiv);
+    this->SetMeiUuid(mdiv, vrvMdiv);
 
     vrvMdiv->ReadLabelled(mdiv);
     vrvMdiv->ReadNNumberLike(mdiv);
@@ -3765,8 +3765,8 @@ bool MEIInput::ReadMdiv(Object *parent, pugi::xml_node mdiv, bool isVisible)
         vrvMdiv->MakeVisible();
     }
 
-    ReadUnsupportedAttr(mdiv, vrvMdiv);
-    return ReadMdivChildren(vrvMdiv, mdiv, isVisible);
+    this->ReadUnsupportedAttr(mdiv, vrvMdiv);
+    return this->ReadMdivChildren(vrvMdiv, mdiv, isVisible);
 }
 
 bool MEIInput::ReadMdivChildren(Object *parent, pugi::xml_node parentNode, bool isVisible)
@@ -3787,10 +3787,10 @@ bool MEIInput::ReadMdivChildren(Object *parent, pugi::xml_node parentNode, bool
         bool makeVisible = (isVisible || (m_selectedMdiv == current));
         if (!success) break;
         if (std::string(current.name()) == "mdiv") {
-            success = ReadMdiv(parent, current, makeVisible);
+            success = this->ReadMdiv(parent, current, makeVisible);
         }
         else if (std::string(current.name()) == "score") {
-            success = ReadScore(parent, current);
+            success = this->ReadScore(parent, current);
             if (parentNode.last_child() != current) {
                 LogWarning("Skipping nodes after <score> element");
             }
@@ -3798,7 +3798,7 @@ bool MEIInput::ReadMdivChildren(Object *parent, pugi::xml_node parentNode, bool
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <mdiv>", current.name());
@@ -3811,7 +3811,7 @@ bool MEIInput::ReadMdivChildren(Object *parent, pugi::xml_node parentNode, bool
 bool MEIInput::ReadScore(Object *parent, pugi::xml_node score)
 {
     Score *vrvScore = new Score();
-    SetMeiUuid(score, vrvScore);
+    this->SetMeiUuid(score, vrvScore);
 
     vrvScore->ReadLabelled(score);
     vrvScore->ReadNNumberLike(score);
@@ -3829,7 +3829,7 @@ bool MEIInput::ReadScore(Object *parent, pugi::xml_node score)
     }
 
     // This actually sets the Doc::m_scoreDef
-    bool success = ReadScoreDef(vrvScore, scoreDef);
+    bool success = this->ReadScoreDef(vrvScore, scoreDef);
 
     if (!success) return false;
 
@@ -3838,47 +3838,47 @@ bool MEIInput::ReadScore(Object *parent, pugi::xml_node score)
         if (!success) break;
         std::string elementName = std::string(current.name());
         // editorial
-        if (IsEditorialElementName(current.name())) {
-            success = ReadEditorialElement(vrvScore, current, EDITORIAL_TOPLEVEL);
+        if (this->IsEditorialElementName(current.name())) {
+            success = this->ReadEditorialElement(vrvScore, current, EDITORIAL_TOPLEVEL);
         }
         // content
         else if (elementName == "ending") {
-            success = ReadEnding(vrvScore, current);
+            success = this->ReadEnding(vrvScore, current);
         }
         else if (elementName == "section") {
-            success = ReadSection(vrvScore, current);
+            success = this->ReadSection(vrvScore, current);
         }
         else if (elementName == "sb") {
-            success = ReadSb(vrvScore, current);
+            success = this->ReadSb(vrvScore, current);
         }
         else if (elementName == "pb") {
-            success = ReadPb(vrvScore, current);
+            success = this->ReadPb(vrvScore, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Element <%s> within <score> is not supported and will be ignored ", elementName.c_str());
         }
     }
 
-    ReadUnsupportedAttr(score, vrvScore);
+    this->ReadUnsupportedAttr(score, vrvScore);
     return success;
 }
 
 bool MEIInput::ReadSection(Object *parent, pugi::xml_node section)
 {
     Section *vrvSection = new Section();
-    SetMeiUuid(section, vrvSection);
+    this->SetMeiUuid(section, vrvSection);
 
     vrvSection->ReadNNumberLike(section);
     vrvSection->ReadSectionVis(section);
 
     parent->AddChild(vrvSection);
-    ReadUnsupportedAttr(section, vrvSection);
+    this->ReadUnsupportedAttr(section, vrvSection);
     if (m_readingScoreBased) {
-        return ReadSectionChildren(vrvSection, section);
+        return this->ReadSectionChildren(vrvSection, section);
     }
     else if (section.first_child()) {
         LogWarning("Unexpected <section> content in page-based MEI");
@@ -3897,30 +3897,30 @@ bool MEIInput::ReadSectionChildren(Object *parent, pugi::xml_node parentNode)
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         // editorial
-        else if (IsEditorialElementName(current.name())) {
-            success = ReadEditorialElement(parent, current, EDITORIAL_TOPLEVEL);
+        else if (this->IsEditorialElementName(current.name())) {
+            success = this->ReadEditorialElement(parent, current, EDITORIAL_TOPLEVEL);
         }
         // content
         else if (std::string(current.name()) == "ending") {
             // we should not endings with unmeasured music ... (?)
             assert(!unmeasured);
-            success = ReadEnding(parent, current);
+            success = this->ReadEnding(parent, current);
         }
         else if (std::string(current.name()) == "expansion") {
-            success = ReadExpansion(parent, current);
+            success = this->ReadExpansion(parent, current);
         }
         else if (std::string(current.name()) == "scoreDef") {
-            success = ReadScoreDef(parent, current);
+            success = this->ReadScoreDef(parent, current);
         }
         else if (std::string(current.name()) == "section") {
-            success = ReadSection(parent, current);
+            success = this->ReadSection(parent, current);
         }
         // pb and sb
         else if (std::string(current.name()) == "pb") {
-            success = ReadPb(parent, current);
+            success = this->ReadPb(parent, current);
         }
         else if (std::string(current.name()) == "sb") {
-            success = ReadSb(parent, current);
+            success = this->ReadSb(parent, current);
         }
         // unmeasured music
         else if (std::string(current.name()) == "staff") {
@@ -3935,7 +3935,7 @@ bool MEIInput::ReadSectionChildren(Object *parent, pugi::xml_node parentNode)
                     return false;
                 }
             }
-            success = ReadStaff(unmeasured, current);
+            success = this->ReadStaff(unmeasured, current);
         }
         else if (std::string(current.name()) == "measure") {
             // we should not mix measured and unmeasured music within a system...
@@ -3943,11 +3943,11 @@ bool MEIInput::ReadSectionChildren(Object *parent, pugi::xml_node parentNode)
             // if (parent->IsEditorialElement()) {
             //    m_hasMeasureWithinEditMarkup = true;
             //}
-            success = ReadMeasure(parent, current);
+            success = this->ReadMeasure(parent, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <section>", current.name());
@@ -3958,7 +3958,7 @@ bool MEIInput::ReadSectionChildren(Object *parent, pugi::xml_node parentNode)
 
 bool MEIInput::ReadSystemElement(pugi::xml_node element, SystemElement *object)
 {
-    SetMeiUuid(element, object);
+    this->SetMeiUuid(element, object);
     object->ReadTyped(element);
 
     return true;
@@ -3967,15 +3967,15 @@ bool MEIInput::ReadSystemElement(pugi::xml_node element, SystemElement *object)
 bool MEIInput::ReadEnding(Object *parent, pugi::xml_node ending)
 {
     Ending *vrvEnding = new Ending();
-    ReadSystemElement(ending, vrvEnding);
+    this->ReadSystemElement(ending, vrvEnding);
 
     vrvEnding->ReadLineRend(ending);
     vrvEnding->ReadNNumberLike(ending);
 
     parent->AddChild(vrvEnding);
-    ReadUnsupportedAttr(ending, vrvEnding);
+    this->ReadUnsupportedAttr(ending, vrvEnding);
     if (m_readingScoreBased) {
-        return ReadSectionChildren(vrvEnding, ending);
+        return this->ReadSectionChildren(vrvEnding, ending);
     }
     return true;
 }
@@ -3983,13 +3983,13 @@ bool MEIInput::ReadEnding(Object *parent, pugi::xml_node ending)
 bool MEIInput::ReadExpansion(Object *parent, pugi::xml_node expansion)
 {
     Expansion *vrvExpansion = new Expansion();
-    ReadSystemElement(expansion, vrvExpansion);
-    ReadPlistInterface(expansion, vrvExpansion);
+    this->ReadSystemElement(expansion, vrvExpansion);
+    this->ReadPlistInterface(expansion, vrvExpansion);
 
     parent->AddChild(vrvExpansion);
-    ReadUnsupportedAttr(expansion, vrvExpansion);
+    this->ReadUnsupportedAttr(expansion, vrvExpansion);
     if (m_readingScoreBased) {
-        return ReadSectionChildren(vrvExpansion, expansion);
+        return this->ReadSectionChildren(vrvExpansion, expansion);
     }
     return true;
 }
@@ -3999,12 +3999,12 @@ bool MEIInput::ReadPb(Object *parent, pugi::xml_node pb)
     m_layoutInformation = LAYOUT_ENCODED;
 
     Pb *vrvPb = new Pb();
-    ReadSystemElement(pb, vrvPb);
+    this->ReadSystemElement(pb, vrvPb);
 
     vrvPb->ReadNNumberLike(pb);
 
     parent->AddChild(vrvPb);
-    ReadUnsupportedAttr(pb, vrvPb);
+    this->ReadUnsupportedAttr(pb, vrvPb);
     return true;
 }
 
@@ -4015,12 +4015,12 @@ bool MEIInput::ReadSb(Object *parent, pugi::xml_node sb)
     m_layoutInformation = LAYOUT_ENCODED;
 
     Sb *vrvSb = new Sb();
-    ReadSystemElement(sb, vrvSb);
+    this->ReadSystemElement(sb, vrvSb);
 
     vrvSb->ReadNNumberLike(sb);
 
     parent->AddChild(vrvSb);
-    ReadUnsupportedAttr(sb, vrvSb);
+    this->ReadUnsupportedAttr(sb, vrvSb);
     return true;
 }
 
@@ -4031,7 +4031,7 @@ bool MEIInput::ReadSystem(Object *parent, pugi::xml_node system)
     assert(dynamic_cast<Page *>(parent));
 
     System *vrvSystem = new System();
-    SetMeiUuid(system, vrvSystem);
+    this->SetMeiUuid(system, vrvSystem);
     vrvSystem->ReadTyped(system);
 
     if (system.attribute("system.leftmar")) {
@@ -4048,8 +4048,8 @@ bool MEIInput::ReadSystem(Object *parent, pugi::xml_node system)
     }
 
     parent->AddChild(vrvSystem);
-    ReadUnsupportedAttr(system, vrvSystem);
-    return ReadSystemChildren(vrvSystem, system);
+    this->ReadUnsupportedAttr(system, vrvSystem);
+    return this->ReadSystemChildren(vrvSystem, system);
 }
 
 bool MEIInput::ReadSystemChildren(Object *parent, pugi::xml_node parentNode)
@@ -4062,25 +4062,25 @@ bool MEIInput::ReadSystemChildren(Object *parent, pugi::xml_node parentNode)
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         // editorial
-        else if (IsEditorialElementName(current.name())) {
-            success = ReadEditorialElement(parent, current, EDITORIAL_TOPLEVEL);
+        else if (this->IsEditorialElementName(current.name())) {
+            success = this->ReadEditorialElement(parent, current, EDITORIAL_TOPLEVEL);
         }
         // section
         else if (std::string(current.name()) == "section") {
-            success = ReadSection(parent, current);
+            success = this->ReadSection(parent, current);
         }
         // section in page-based MEI
         else if (std::string(current.name()) == "secb") {
-            success = ReadSection(parent, current);
+            success = this->ReadSection(parent, current);
         }
         else if (std::string(current.name()) == "milestoneEnd") {
-            success = ReadSystemMilestoneEnd(parent, current);
+            success = this->ReadSystemMilestoneEnd(parent, current);
         }
         // content
         else if (std::string(current.name()) == "scoreDef") {
             // we should not have scoredef with unmeasured music within a system... (?)
             assert(!unmeasured);
-            ReadScoreDef(parent, current);
+            this->ReadScoreDef(parent, current);
         }
         // unmeasured music
         else if (std::string(current.name()) == "staff") {
@@ -4100,16 +4100,16 @@ bool MEIInput::ReadSystemChildren(Object *parent, pugi::xml_node parentNode)
                     return false;
                 }
             }
-            success = ReadStaff(unmeasured, current);
+            success = this->ReadStaff(unmeasured, current);
         }
         else if (std::string(current.name()) == "measure") {
             // we should not mix measured and unmeasured music within a system...
             assert(!unmeasured);
-            success = ReadMeasure(parent, current);
+            success = this->ReadMeasure(parent, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <system>", current.name());
@@ -4144,7 +4144,7 @@ bool MEIInput::ReadSystemMilestoneEnd(Object *parent, pugi::xml_node milestoneEn
     }
 
     SystemMilestoneEnd *vrvElementEnd = new SystemMilestoneEnd(start);
-    SetMeiUuid(milestoneEnd, vrvElementEnd);
+    this->SetMeiUuid(milestoneEnd, vrvElementEnd);
     interface->SetEnd(vrvElementEnd);
 
     parent->AddChild(vrvElementEnd);
@@ -4153,7 +4153,7 @@ bool MEIInput::ReadSystemMilestoneEnd(Object *parent, pugi::xml_node milestoneEn
 
 bool MEIInput::ReadScoreDefElement(pugi::xml_node element, ScoreDefElement *object)
 {
-    SetMeiUuid(element, object);
+    this->SetMeiUuid(element, object);
     object->ReadMeasureNumbers(element);
     object->ReadSpacing(element);
     object->ReadSystems(element);
@@ -4263,20 +4263,20 @@ bool MEIInput::ReadScoreDef(Object *parent, pugi::xml_node scoreDef)
         vrvScoreDef = new ScoreDef();
         parent->AddChild(vrvScoreDef);
     }
-    ReadScoreDefElement(scoreDef, vrvScoreDef);
+    this->ReadScoreDefElement(scoreDef, vrvScoreDef);
 
     if (m_version < MEI_4_0_0) {
         UpgradeScoreDefElementTo_4_0_0(scoreDef, vrvScoreDef);
     }
 
-    ReadScoreDefInterface(scoreDef, vrvScoreDef);
+    this->ReadScoreDefInterface(scoreDef, vrvScoreDef);
     vrvScoreDef->ReadDistances(scoreDef);
     vrvScoreDef->ReadEndings(scoreDef);
     vrvScoreDef->ReadOptimization(scoreDef);
     vrvScoreDef->ReadTimeBase(scoreDef);
 
-    ReadUnsupportedAttr(scoreDef, vrvScoreDef);
-    return ReadScoreDefChildren(vrvScoreDef, scoreDef);
+    this->ReadUnsupportedAttr(scoreDef, vrvScoreDef);
+    return this->ReadScoreDefChildren(vrvScoreDef, scoreDef);
 }
 
 bool MEIInput::ReadScoreDefChildren(Object *parent, pugi::xml_node parentNode)
@@ -4288,48 +4288,48 @@ bool MEIInput::ReadScoreDefChildren(Object *parent, pugi::xml_node parentNode)
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         // editorial
-        else if (IsEditorialElementName(current.name())) {
-            success = ReadEditorialElement(parent, current, EDITORIAL_SCOREDEF);
+        else if (this->IsEditorialElementName(current.name())) {
+            success = this->ReadEditorialElement(parent, current, EDITORIAL_SCOREDEF);
         }
         // clef, keySig, etc.
         else if (std::string(current.name()) == "clef") {
-            success = ReadClef(parent, current);
+            success = this->ReadClef(parent, current);
         }
         else if (std::string(current.name()) == "grpSym") {
-            success = ReadGrpSym(parent, current);
+            success = this->ReadGrpSym(parent, current);
         }
         else if (std::string(current.name()) == "keySig") {
-            success = ReadKeySig(parent, current);
+            success = this->ReadKeySig(parent, current);
         }
         else if (std::string(current.name()) == "mensur") {
-            success = ReadMensur(parent, current);
+            success = this->ReadMensur(parent, current);
         }
         else if (std::string(current.name()) == "meterSig") {
-            success = ReadMeterSig(parent, current);
+            success = this->ReadMeterSig(parent, current);
         }
         else if (std::string(current.name()) == "meterSigGrp") {
-            success = ReadMeterSigGrp(parent, current);
+            success = this->ReadMeterSigGrp(parent, current);
         }
         // headers and footers
         else if (std::string(current.name()) == "pgFoot") {
-            success = ReadPgFoot(parent, current);
+            success = this->ReadPgFoot(parent, current);
         }
         else if (std::string(current.name()) == "pgFoot2") {
-            success = ReadPgFoot2(parent, current);
+            success = this->ReadPgFoot2(parent, current);
         }
         else if (std::string(current.name()) == "pgHead") {
-            success = ReadPgHead(parent, current);
+            success = this->ReadPgHead(parent, current);
         }
         else if (std::string(current.name()) == "pgHead2") {
-            success = ReadPgHead2(parent, current);
+            success = this->ReadPgHead2(parent, current);
         }
         // content
         else if (std::string(current.name()) == "staffGrp") {
-            success = ReadStaffGrp(parent, current);
+            success = this->ReadStaffGrp(parent, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <scoreDef>", current.name());
@@ -4343,7 +4343,7 @@ bool MEIInput::ReadStaffGrp(Object *parent, pugi::xml_node staffGrp)
     assert(dynamic_cast<ScoreDef *>(parent) || dynamic_cast<StaffGrp *>(parent));
 
     StaffGrp *vrvStaffGrp = new StaffGrp();
-    SetMeiUuid(staffGrp, vrvStaffGrp);
+    this->SetMeiUuid(staffGrp, vrvStaffGrp);
 
     if (m_version < MEI_4_0_0) {
         UpgradeStaffGrpTo_4_0_0(staffGrp, vrvStaffGrp);
@@ -4364,8 +4364,8 @@ bool MEIInput::ReadStaffGrp(Object *parent, pugi::xml_node staffGrp)
     vrvStaffGrp->ReadTyped(staffGrp);
 
     parent->AddChild(vrvStaffGrp);
-    ReadUnsupportedAttr(staffGrp, vrvStaffGrp);
-    return ReadStaffGrpChildren(vrvStaffGrp, staffGrp);
+    this->ReadUnsupportedAttr(staffGrp, vrvStaffGrp);
+    return this->ReadStaffGrpChildren(vrvStaffGrp, staffGrp);
 }
 
 bool MEIInput::ReadStaffGrpChildren(Object *parent, pugi::xml_node parentNode)
@@ -4378,33 +4378,33 @@ bool MEIInput::ReadStaffGrpChildren(Object *parent, pugi::xml_node parentNode)
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         // editorial
-        else if (IsEditorialElementName(current.name())) {
-            success = ReadEditorialElement(parent, current, EDITORIAL_STAFFGRP);
+        else if (this->IsEditorialElementName(current.name())) {
+            success = this->ReadEditorialElement(parent, current, EDITORIAL_STAFFGRP);
         }
         // content
         else if (std::string(current.name()) == "grpSym") {
-            success = ReadGrpSym(parent, current);
+            success = this->ReadGrpSym(parent, current);
         }
         else if (std::string(current.name()) == "instrDef") {
-            success = ReadInstrDef(parent, current);
+            success = this->ReadInstrDef(parent, current);
         }
         else if (std::string(current.name()) == "label") {
-            success = ReadLabel(parent, current);
+            success = this->ReadLabel(parent, current);
         }
         else if (std::string(current.name()) == "labelAbbr") {
-            success = ReadLabelAbbr(parent, current);
+            success = this->ReadLabelAbbr(parent, current);
         }
         else if (std::string(current.name()) == "staffGrp") {
-            success = ReadStaffGrp(parent, current);
+            success = this->ReadStaffGrp(parent, current);
             missingStaffDef = false; // innermost staffGrp child will report missing staffDef
         }
         else if (std::string(current.name()) == "staffDef") {
-            success = ReadStaffDef(parent, current);
+            success = this->ReadStaffDef(parent, current);
             missingStaffDef = false;
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <staffGrp>", current.name());
@@ -4422,7 +4422,7 @@ bool MEIInput::ReadStaffGrpChildren(Object *parent, pugi::xml_node parentNode)
 
 bool MEIInput::ReadRunningElement(pugi::xml_node element, RunningElement *object)
 {
-    SetMeiUuid(element, object);
+    this->SetMeiUuid(element, object);
     object->ReadHorizontalAlign(element);
     object->ReadTyped(element);
 
@@ -4432,7 +4432,7 @@ bool MEIInput::ReadRunningElement(pugi::xml_node element, RunningElement *object
 bool MEIInput::ReadGrpSym(Object *parent, pugi::xml_node grpSym)
 {
     GrpSym *vrvGrpSym = new GrpSym();
-    SetMeiUuid(grpSym, vrvGrpSym);
+    this->SetMeiUuid(grpSym, vrvGrpSym);
 
     vrvGrpSym->ReadColor(grpSym);
     vrvGrpSym->ReadGrpSymLog(grpSym);
@@ -4449,48 +4449,48 @@ bool MEIInput::ReadGrpSym(Object *parent, pugi::xml_node grpSym)
     }
 
     parent->AddChild(vrvGrpSym);
-    ReadUnsupportedAttr(grpSym, vrvGrpSym);
+    this->ReadUnsupportedAttr(grpSym, vrvGrpSym);
     return true;
 }
 
 bool MEIInput::ReadPgFoot(Object *parent, pugi::xml_node pgFoot)
 {
     PgFoot *vrvPgFoot = new PgFoot();
-    ReadRunningElement(pgFoot, vrvPgFoot);
+    this->ReadRunningElement(pgFoot, vrvPgFoot);
 
     parent->AddChild(vrvPgFoot);
-    ReadUnsupportedAttr(pgFoot, vrvPgFoot);
-    return ReadRunningChildren(vrvPgFoot, pgFoot, vrvPgFoot);
+    this->ReadUnsupportedAttr(pgFoot, vrvPgFoot);
+    return this->ReadRunningChildren(vrvPgFoot, pgFoot, vrvPgFoot);
 }
 
 bool MEIInput::ReadPgFoot2(Object *parent, pugi::xml_node pgFoot2)
 {
     PgFoot2 *vrvPgFoot2 = new PgFoot2();
-    ReadRunningElement(pgFoot2, vrvPgFoot2);
+    this->ReadRunningElement(pgFoot2, vrvPgFoot2);
 
     parent->AddChild(vrvPgFoot2);
-    ReadUnsupportedAttr(pgFoot2, vrvPgFoot2);
-    return ReadRunningChildren(vrvPgFoot2, pgFoot2, vrvPgFoot2);
+    this->ReadUnsupportedAttr(pgFoot2, vrvPgFoot2);
+    return this->ReadRunningChildren(vrvPgFoot2, pgFoot2, vrvPgFoot2);
 }
 
 bool MEIInput::ReadPgHead(Object *parent, pugi::xml_node pgHead)
 {
     PgHead *vrvPgHead = new PgHead();
-    ReadRunningElement(pgHead, vrvPgHead);
+    this->ReadRunningElement(pgHead, vrvPgHead);
 
     parent->AddChild(vrvPgHead);
-    ReadUnsupportedAttr(pgHead, vrvPgHead);
-    return ReadRunningChildren(vrvPgHead, pgHead, vrvPgHead);
+    this->ReadUnsupportedAttr(pgHead, vrvPgHead);
+    return this->ReadRunningChildren(vrvPgHead, pgHead, vrvPgHead);
 }
 
 bool MEIInput::ReadPgHead2(Object *parent, pugi::xml_node pgHead2)
 {
     PgHead2 *vrvPgHead2 = new PgHead2();
-    ReadRunningElement(pgHead2, vrvPgHead2);
+    this->ReadRunningElement(pgHead2, vrvPgHead2);
 
     parent->AddChild(vrvPgHead2);
-    ReadUnsupportedAttr(pgHead2, vrvPgHead2);
-    return ReadRunningChildren(vrvPgHead2, pgHead2, vrvPgHead2);
+    this->ReadUnsupportedAttr(pgHead2, vrvPgHead2);
+    return this->ReadRunningChildren(vrvPgHead2, pgHead2, vrvPgHead2);
 }
 
 bool MEIInput::ReadRunningChildren(Object *parent, pugi::xml_node parentNode, Object *filter)
@@ -4504,7 +4504,7 @@ bool MEIInput::ReadRunningChildren(Object *parent, pugi::xml_node parentNode, Ob
             break;
         }
         elementName = std::string(xmlElement.name());
-        if (filter && !IsAllowed(elementName, filter)) {
+        if (filter && !this->IsAllowed(elementName, filter)) {
             std::string meiElementName = filter->GetClassName();
             std::transform(meiElementName.begin(), meiElementName.begin() + 1, meiElementName.begin(), ::tolower);
             LogWarning("Element <%s> within <%s> is not supported and will be ignored ", xmlElement.name(),
@@ -4512,19 +4512,19 @@ bool MEIInput::ReadRunningChildren(Object *parent, pugi::xml_node parentNode, Ob
             continue;
         }
         // editorial
-        if (IsEditorialElementName(xmlElement.name())) {
-            success = ReadEditorialElement(parent, xmlElement, EDITORIAL_RUNNING, filter);
+        if (this->IsEditorialElementName(xmlElement.name())) {
+            success = this->ReadEditorialElement(parent, xmlElement, EDITORIAL_RUNNING, filter);
         }
         // content
         else if (elementName == "fig") {
-            success = ReadFig(parent, xmlElement);
+            success = this->ReadFig(parent, xmlElement);
         }
         else if (elementName == "rend") {
-            success = ReadRend(parent, xmlElement);
+            success = this->ReadRend(parent, xmlElement);
         }
         // xml comment
         else if (elementName == "") {
-            success = ReadXMLComment(parent, xmlElement);
+            success = this->ReadXMLComment(parent, xmlElement);
         }
         // unknown
         else {
@@ -4540,7 +4540,7 @@ bool MEIInput::ReadStaffDef(Object *parent, pugi::xml_node staffDef)
     assert(dynamic_cast<StaffGrp *>(parent) || dynamic_cast<EditorialElement *>(parent));
 
     StaffDef *vrvStaffDef = new StaffDef();
-    ReadScoreDefElement(staffDef, vrvStaffDef);
+    this->ReadScoreDefElement(staffDef, vrvStaffDef);
 
     if (m_version < MEI_4_0_0) {
         UpgradeScoreDefElementTo_4_0_0(staffDef, vrvStaffDef);
@@ -4561,13 +4561,13 @@ bool MEIInput::ReadStaffDef(Object *parent, pugi::xml_node staffDef)
         LogWarning("No @n on <staffDef> might yield unpredictable results");
     }
 
-    ReadScoreDefInterface(staffDef, vrvStaffDef);
+    this->ReadScoreDefInterface(staffDef, vrvStaffDef);
 
     m_doc->m_notationType = vrvStaffDef->GetNotationtype();
 
     parent->AddChild(vrvStaffDef);
-    ReadUnsupportedAttr(staffDef, vrvStaffDef);
-    return ReadStaffDefChildren(vrvStaffDef, staffDef);
+    this->ReadUnsupportedAttr(staffDef, vrvStaffDef);
+    return this->ReadStaffDefChildren(vrvStaffDef, staffDef);
 }
 
 bool MEIInput::ReadStaffDefChildren(Object *parent, pugi::xml_node parentNode)
@@ -4580,36 +4580,36 @@ bool MEIInput::ReadStaffDefChildren(Object *parent, pugi::xml_node parentNode)
         if (!success) break;
         // clef, keySig, etc.
         else if (std::string(current.name()) == "clef") {
-            success = ReadClef(parent, current);
+            success = this->ReadClef(parent, current);
         }
         else if (std::string(current.name()) == "keySig") {
-            success = ReadKeySig(parent, current);
+            success = this->ReadKeySig(parent, current);
         }
         else if (std::string(current.name()) == "mensur") {
-            success = ReadMensur(parent, current);
+            success = this->ReadMensur(parent, current);
         }
         else if (std::string(current.name()) == "meterSig") {
-            success = ReadMeterSig(parent, current);
+            success = this->ReadMeterSig(parent, current);
         }
         else if (std::string(current.name()) == "meterSigGrp") {
-            success = ReadMeterSigGrp(parent, current);
+            success = this->ReadMeterSigGrp(parent, current);
         }
         // content
         else if (std::string(current.name()) == "instrDef") {
-            success = ReadInstrDef(parent, current);
+            success = this->ReadInstrDef(parent, current);
         }
         else if (std::string(current.name()) == "label") {
-            success = ReadLabel(parent, current);
+            success = this->ReadLabel(parent, current);
         }
         else if (std::string(current.name()) == "labelAbbr") {
-            success = ReadLabelAbbr(parent, current);
+            success = this->ReadLabelAbbr(parent, current);
         }
         else if (std::string(current.name()) == "tuning") {
-            success = ReadTuning(parent, current);
+            success = this->ReadTuning(parent, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <staffGrp>", current.name());
@@ -4623,13 +4623,13 @@ bool MEIInput::ReadTuning(Object *parent, pugi::xml_node tuning)
     assert(dynamic_cast<StaffDef *>(parent) || dynamic_cast<EditorialElement *>(parent));
 
     Tuning *vrvTuning = new Tuning();
-    SetMeiUuid(tuning, vrvTuning);
+    this->SetMeiUuid(tuning, vrvTuning);
 
     parent->AddChild(vrvTuning);
     vrvTuning->ReadCourseLog(tuning);
 
-    ReadUnsupportedAttr(tuning, vrvTuning);
-    return ReadTuningChildren(vrvTuning, tuning);
+    this->ReadUnsupportedAttr(tuning, vrvTuning);
+    return this->ReadTuningChildren(vrvTuning, tuning);
 }
 
 bool MEIInput::ReadTuningChildren(Object *parent, pugi::xml_node parentNode)
@@ -4642,7 +4642,7 @@ bool MEIInput::ReadTuningChildren(Object *parent, pugi::xml_node parentNode)
         if (!success) break;
         // content
         else if (std::string(current.name()) == "course") {
-            success = ReadCourse(parent, current);
+            success = this->ReadCourse(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <staffGrp>", current.name());
@@ -4656,7 +4656,7 @@ bool MEIInput::ReadCourse(Object *parent, pugi::xml_node course)
     assert(dynamic_cast<Tuning *>(parent) || dynamic_cast<EditorialElement *>(parent));
 
     Course *vrvCourse = new Course();
-    SetMeiUuid(course, vrvCourse);
+    this->SetMeiUuid(course, vrvCourse);
 
     parent->AddChild(vrvCourse);
     vrvCourse->ReadAccidental(course);
@@ -4664,7 +4664,7 @@ bool MEIInput::ReadCourse(Object *parent, pugi::xml_node course)
     vrvCourse->ReadOctave(course);
     vrvCourse->ReadPitch(course);
 
-    ReadUnsupportedAttr(course, vrvCourse);
+    this->ReadUnsupportedAttr(course, vrvCourse);
 
     return true;
 }
@@ -4672,7 +4672,7 @@ bool MEIInput::ReadCourse(Object *parent, pugi::xml_node course)
 bool MEIInput::ReadInstrDef(Object *parent, pugi::xml_node instrDef)
 {
     InstrDef *vrvInstrDef = new InstrDef();
-    SetMeiUuid(instrDef, vrvInstrDef);
+    this->SetMeiUuid(instrDef, vrvInstrDef);
 
     if (m_version < MEI_4_0_0) {
         if (instrDef.attribute("midi.volume")) {
@@ -4693,21 +4693,21 @@ bool MEIInput::ReadInstrDef(Object *parent, pugi::xml_node instrDef)
 bool MEIInput::ReadLabel(Object *parent, pugi::xml_node label)
 {
     Label *vrvLabel = new Label();
-    SetMeiUuid(label, vrvLabel);
+    this->SetMeiUuid(label, vrvLabel);
 
     parent->AddChild(vrvLabel);
-    ReadUnsupportedAttr(label, vrvLabel);
-    return ReadTextChildren(vrvLabel, label, vrvLabel);
+    this->ReadUnsupportedAttr(label, vrvLabel);
+    return this->ReadTextChildren(vrvLabel, label, vrvLabel);
 }
 
 bool MEIInput::ReadLabelAbbr(Object *parent, pugi::xml_node labelAbbr)
 {
     LabelAbbr *vrvLabelAbbr = new LabelAbbr();
-    SetMeiUuid(labelAbbr, vrvLabelAbbr);
+    this->SetMeiUuid(labelAbbr, vrvLabelAbbr);
 
     parent->AddChild(vrvLabelAbbr);
-    ReadUnsupportedAttr(labelAbbr, vrvLabelAbbr);
-    return ReadTextChildren(vrvLabelAbbr, labelAbbr, vrvLabelAbbr);
+    this->ReadUnsupportedAttr(labelAbbr, vrvLabelAbbr);
+    return this->ReadTextChildren(vrvLabelAbbr, labelAbbr, vrvLabelAbbr);
 }
 
 bool MEIInput::ReadMeasure(Object *parent, pugi::xml_node measure)
@@ -4717,7 +4717,7 @@ bool MEIInput::ReadMeasure(Object *parent, pugi::xml_node measure)
         LogWarning("Mixing mensural and non mensural music is not supported. Trying to go ahead...");
         m_doc->SetMensuralMusicOnly(false);
     }
-    SetMeiUuid(measure, vrvMeasure);
+    this->SetMeiUuid(measure, vrvMeasure);
 
     vrvMeasure->ReadBarring(measure);
     vrvMeasure->ReadMeasureLog(measure);
@@ -4738,8 +4738,8 @@ bool MEIInput::ReadMeasure(Object *parent, pugi::xml_node measure)
     }
 
     parent->AddChild(vrvMeasure);
-    ReadUnsupportedAttr(measure, vrvMeasure);
-    return ReadMeasureChildren(vrvMeasure, measure);
+    this->ReadUnsupportedAttr(measure, vrvMeasure);
+    return this->ReadMeasureChildren(vrvMeasure, measure);
 }
 
 bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
@@ -4751,15 +4751,15 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         // editorial
-        else if (IsEditorialElementName(current.name())) {
-            success = ReadEditorialElement(parent, current, EDITORIAL_MEASURE);
+        else if (this->IsEditorialElementName(current.name())) {
+            success = this->ReadEditorialElement(parent, current, EDITORIAL_MEASURE);
         }
         // content
         else if (std::string(current.name()) == "anchoredText") {
-            success = ReadAnchoredText(parent, current);
+            success = this->ReadAnchoredText(parent, current);
         }
         else if (std::string(current.name()) == "arpeg") {
-            success = ReadArpeg(parent, current);
+            success = this->ReadArpeg(parent, current);
         }
         else if (std::string(current.name()) == "beamSpan") {
             if (!ReadBeamSpanAsBeam(dynamic_cast<Measure *>(parent), current)) {
@@ -4767,76 +4767,76 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
             }
         }
         else if (std::string(current.name()) == "bracketSpan") {
-            success = ReadBracketSpan(parent, current);
+            success = this->ReadBracketSpan(parent, current);
         }
         else if (std::string(current.name()) == "breath") {
-            success = ReadBreath(parent, current);
+            success = this->ReadBreath(parent, current);
         }
         else if (std::string(current.name()) == "caesura") {
-            success = ReadCaesura(parent, current);
+            success = this->ReadCaesura(parent, current);
         }
         else if (std::string(current.name()) == "dir") {
-            success = ReadDir(parent, current);
+            success = this->ReadDir(parent, current);
         }
         else if (std::string(current.name()) == "dynam") {
-            success = ReadDynam(parent, current);
+            success = this->ReadDynam(parent, current);
         }
         else if (std::string(current.name()) == "fermata") {
-            success = ReadFermata(parent, current);
+            success = this->ReadFermata(parent, current);
         }
         else if (std::string(current.name()) == "fing") {
-            success = ReadFing(parent, current);
+            success = this->ReadFing(parent, current);
         }
         else if (std::string(current.name()) == "gliss") {
-            success = ReadGliss(parent, current);
+            success = this->ReadGliss(parent, current);
         }
         else if (std::string(current.name()) == "hairpin") {
-            success = ReadHairpin(parent, current);
+            success = this->ReadHairpin(parent, current);
         }
         else if (std::string(current.name()) == "harm") {
-            success = ReadHarm(parent, current);
+            success = this->ReadHarm(parent, current);
         }
         else if (std::string(current.name()) == "lv") {
-            success = ReadLv(parent, current);
+            success = this->ReadLv(parent, current);
         }
         else if (std::string(current.name()) == "mNum") {
-            success = ReadMNum(parent, current);
+            success = this->ReadMNum(parent, current);
         }
         else if (std::string(current.name()) == "mordent") {
-            success = ReadMordent(parent, current);
+            success = this->ReadMordent(parent, current);
         }
         else if (std::string(current.name()) == "octave") {
-            success = ReadOctave(parent, current);
+            success = this->ReadOctave(parent, current);
         }
         else if (std::string(current.name()) == "pedal") {
-            success = ReadPedal(parent, current);
+            success = this->ReadPedal(parent, current);
         }
         else if (std::string(current.name()) == "phrase") {
-            success = ReadPhrase(parent, current);
+            success = this->ReadPhrase(parent, current);
         }
         else if (std::string(current.name()) == "pitchInflection") {
-            success = ReadPitchInflection(parent, current);
+            success = this->ReadPitchInflection(parent, current);
         }
         else if (std::string(current.name()) == "reh") {
-            success = ReadReh(parent, current);
+            success = this->ReadReh(parent, current);
         }
         else if (std::string(current.name()) == "slur") {
-            success = ReadSlur(parent, current);
+            success = this->ReadSlur(parent, current);
         }
         else if (std::string(current.name()) == "staff") {
-            success = ReadStaff(parent, current);
+            success = this->ReadStaff(parent, current);
         }
         else if (std::string(current.name()) == "tempo") {
-            success = ReadTempo(parent, current);
+            success = this->ReadTempo(parent, current);
         }
         else if (std::string(current.name()) == "tie") {
-            success = ReadTie(parent, current);
+            success = this->ReadTie(parent, current);
         }
         else if (std::string(current.name()) == "trill") {
-            success = ReadTrill(parent, current);
+            success = this->ReadTrill(parent, current);
         }
         else if (std::string(current.name()) == "turn") {
-            success = ReadTurn(parent, current);
+            success = this->ReadTurn(parent, current);
         }
         else if (std::string(current.name()) == "tupletSpan") {
             if (!ReadTupletSpanAsTuplet(dynamic_cast<Measure *>(parent), current)) {
@@ -4845,7 +4845,7 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <measure>", current.name());
@@ -4859,16 +4859,16 @@ bool MEIInput::ReadMeterSigGrp(Object *parent, pugi::xml_node meterSigGrp)
     assert(dynamic_cast<ScoreDef *>(parent) || dynamic_cast<StaffDef *>(parent) || dynamic_cast<Layer *>(parent));
 
     MeterSigGrp *vrvMeterSigGrp = new MeterSigGrp();
-    SetMeiUuid(meterSigGrp, vrvMeterSigGrp);
-    ReadLinkingInterface(meterSigGrp, vrvMeterSigGrp);
+    this->SetMeiUuid(meterSigGrp, vrvMeterSigGrp);
+    this->ReadLinkingInterface(meterSigGrp, vrvMeterSigGrp);
     vrvMeterSigGrp->ReadBasic(meterSigGrp);
     vrvMeterSigGrp->ReadLabelled(meterSigGrp);
     vrvMeterSigGrp->ReadMeterSigGrpLog(meterSigGrp);
     vrvMeterSigGrp->ReadTyped(meterSigGrp);
 
     parent->AddChild(vrvMeterSigGrp);
-    ReadUnsupportedAttr(meterSigGrp, vrvMeterSigGrp);
-    return ReadMeterSigGrpChildren(vrvMeterSigGrp, meterSigGrp);
+    this->ReadUnsupportedAttr(meterSigGrp, vrvMeterSigGrp);
+    return this->ReadMeterSigGrpChildren(vrvMeterSigGrp, meterSigGrp);
 }
 
 bool MEIInput::ReadMeterSigGrpChildren(Object *parent, pugi::xml_node parentNode)
@@ -4881,11 +4881,11 @@ bool MEIInput::ReadMeterSigGrpChildren(Object *parent, pugi::xml_node parentNode
         if (!success) break;
         // content
         else if (std::string(current.name()) == "meterSig") {
-            success = ReadMeterSig(parent, current);
+            success = this->ReadMeterSig(parent, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <meterSigGrp>", current.name());
@@ -4896,8 +4896,8 @@ bool MEIInput::ReadMeterSigGrpChildren(Object *parent, pugi::xml_node parentNode
 
 bool MEIInput::ReadControlElement(pugi::xml_node element, ControlElement *object)
 {
-    SetMeiUuid(element, object);
-    ReadLinkingInterface(element, object);
+    this->SetMeiUuid(element, object);
+    this->ReadLinkingInterface(element, object);
     object->ReadLabelled(element);
     object->ReadTyped(element);
 
@@ -4907,100 +4907,100 @@ bool MEIInput::ReadControlElement(pugi::xml_node element, ControlElement *object
 bool MEIInput::ReadAnchoredText(Object *parent, pugi::xml_node anchoredText)
 {
     AnchoredText *vrvAnchoredText = new AnchoredText();
-    ReadControlElement(anchoredText, vrvAnchoredText);
+    this->ReadControlElement(anchoredText, vrvAnchoredText);
 
-    ReadTextDirInterface(anchoredText, vrvAnchoredText);
+    this->ReadTextDirInterface(anchoredText, vrvAnchoredText);
 
-    ReadUnsupportedAttr(anchoredText, vrvAnchoredText);
+    this->ReadUnsupportedAttr(anchoredText, vrvAnchoredText);
     parent->AddChild(vrvAnchoredText);
-    return ReadTextChildren(vrvAnchoredText, anchoredText, vrvAnchoredText);
+    return this->ReadTextChildren(vrvAnchoredText, anchoredText, vrvAnchoredText);
 }
 
 bool MEIInput::ReadArpeg(Object *parent, pugi::xml_node arpeg)
 {
     Arpeg *vrvArpeg = new Arpeg();
-    ReadControlElement(arpeg, vrvArpeg);
+    this->ReadControlElement(arpeg, vrvArpeg);
 
-    ReadPlistInterface(arpeg, vrvArpeg);
-    ReadTimePointInterface(arpeg, vrvArpeg);
+    this->ReadPlistInterface(arpeg, vrvArpeg);
+    this->ReadTimePointInterface(arpeg, vrvArpeg);
     vrvArpeg->ReadArpegLog(arpeg);
     vrvArpeg->ReadArpegVis(arpeg);
     vrvArpeg->ReadColor(arpeg);
     vrvArpeg->ReadEnclosingChars(arpeg);
 
     parent->AddChild(vrvArpeg);
-    ReadUnsupportedAttr(arpeg, vrvArpeg);
+    this->ReadUnsupportedAttr(arpeg, vrvArpeg);
     return true;
 }
 
 bool MEIInput::ReadBracketSpan(Object *parent, pugi::xml_node bracketSpan)
 {
     BracketSpan *vrvBracketSpan = new BracketSpan();
-    ReadControlElement(bracketSpan, vrvBracketSpan);
+    this->ReadControlElement(bracketSpan, vrvBracketSpan);
 
-    ReadTimeSpanningInterface(bracketSpan, vrvBracketSpan);
+    this->ReadTimeSpanningInterface(bracketSpan, vrvBracketSpan);
     vrvBracketSpan->ReadBracketSpanLog(bracketSpan);
     vrvBracketSpan->ReadColor(bracketSpan);
     vrvBracketSpan->ReadLineRend(bracketSpan);
     vrvBracketSpan->ReadLineRendBase(bracketSpan);
 
     parent->AddChild(vrvBracketSpan);
-    ReadUnsupportedAttr(bracketSpan, vrvBracketSpan);
+    this->ReadUnsupportedAttr(bracketSpan, vrvBracketSpan);
     return true;
 }
 
 bool MEIInput::ReadBreath(Object *parent, pugi::xml_node breath)
 {
     Breath *vrvBreath = new Breath();
-    ReadControlElement(breath, vrvBreath);
+    this->ReadControlElement(breath, vrvBreath);
 
-    ReadTimePointInterface(breath, vrvBreath);
+    this->ReadTimePointInterface(breath, vrvBreath);
     vrvBreath->ReadColor(breath);
     vrvBreath->ReadPlacementRelStaff(breath);
 
     parent->AddChild(vrvBreath);
-    ReadUnsupportedAttr(breath, vrvBreath);
+    this->ReadUnsupportedAttr(breath, vrvBreath);
     return true;
 }
 
 bool MEIInput::ReadCaesura(Object *parent, pugi::xml_node caesura)
 {
     Caesura *vrvCaesura = new Caesura();
-    ReadControlElement(caesura, vrvCaesura);
+    this->ReadControlElement(caesura, vrvCaesura);
 
-    ReadTimePointInterface(caesura, vrvCaesura);
+    this->ReadTimePointInterface(caesura, vrvCaesura);
     vrvCaesura->ReadColor(caesura);
     vrvCaesura->ReadPlacementRelStaff(caesura);
 
     parent->AddChild(vrvCaesura);
-    ReadUnsupportedAttr(caesura, vrvCaesura);
+    this->ReadUnsupportedAttr(caesura, vrvCaesura);
     return true;
 }
 
 bool MEIInput::ReadDir(Object *parent, pugi::xml_node dir)
 {
     Dir *vrvDir = new Dir();
-    ReadControlElement(dir, vrvDir);
+    this->ReadControlElement(dir, vrvDir);
 
-    ReadTextDirInterface(dir, vrvDir);
-    ReadTimeSpanningInterface(dir, vrvDir);
+    this->ReadTextDirInterface(dir, vrvDir);
+    this->ReadTimeSpanningInterface(dir, vrvDir);
     vrvDir->ReadLang(dir);
     vrvDir->ReadLineRendBase(dir);
     vrvDir->ReadExtender(dir);
     vrvDir->ReadVerticalGroup(dir);
 
     parent->AddChild(vrvDir);
-    ReadUnsupportedAttr(dir, vrvDir);
-    return ReadTextChildren(vrvDir, dir, vrvDir);
+    this->ReadUnsupportedAttr(dir, vrvDir);
+    return this->ReadTextChildren(vrvDir, dir, vrvDir);
 }
 
 bool MEIInput::ReadDynam(Object *parent, pugi::xml_node dynam)
 {
     Dynam *vrvDynam = new Dynam();
-    ReadControlElement(dynam, vrvDynam);
+    this->ReadControlElement(dynam, vrvDynam);
 
-    ReadTextDirInterface(dynam, vrvDynam);
-    ReadTimeSpanningInterface(dynam, vrvDynam);
+    this->ReadTextDirInterface(dynam, vrvDynam);
+    this->ReadTimeSpanningInterface(dynam, vrvDynam);
     vrvDynam->ReadEnclosingChars(dynam);
     vrvDynam->ReadExtender(dynam);
     vrvDynam->ReadLineRendBase(dynam);
@@ -5009,16 +5009,16 @@ bool MEIInput::ReadDynam(Object *parent, pugi::xml_node dynam)
     vrvDynam->ReadVerticalGroup(dynam);
 
     parent->AddChild(vrvDynam);
-    ReadUnsupportedAttr(dynam, vrvDynam);
-    return ReadTextChildren(vrvDynam, dynam, vrvDynam);
+    this->ReadUnsupportedAttr(dynam, vrvDynam);
+    return this->ReadTextChildren(vrvDynam, dynam, vrvDynam);
 }
 
 bool MEIInput::ReadFermata(Object *parent, pugi::xml_node fermata)
 {
     Fermata *vrvFermata = new Fermata();
-    ReadControlElement(fermata, vrvFermata);
+    this->ReadControlElement(fermata, vrvFermata);
 
-    ReadTimePointInterface(fermata, vrvFermata);
+    this->ReadTimePointInterface(fermata, vrvFermata);
     vrvFermata->ReadColor(fermata);
     vrvFermata->ReadEnclosingChars(fermata);
     vrvFermata->ReadExtSym(fermata);
@@ -5026,46 +5026,46 @@ bool MEIInput::ReadFermata(Object *parent, pugi::xml_node fermata)
     vrvFermata->ReadPlacementRelStaff(fermata);
 
     parent->AddChild(vrvFermata);
-    ReadUnsupportedAttr(fermata, vrvFermata);
+    this->ReadUnsupportedAttr(fermata, vrvFermata);
     return true;
 }
 
 bool MEIInput::ReadFing(Object *parent, pugi::xml_node fing)
 {
     Fing *vrvFing = new Fing();
-    ReadControlElement(fing, vrvFing);
+    this->ReadControlElement(fing, vrvFing);
 
-    ReadTextDirInterface(fing, vrvFing);
-    ReadTimePointInterface(fing, vrvFing);
+    this->ReadTextDirInterface(fing, vrvFing);
+    this->ReadTimePointInterface(fing, vrvFing);
     vrvFing->ReadNNumberLike(fing);
 
     parent->AddChild(vrvFing);
-    ReadUnsupportedAttr(fing, vrvFing);
-    return ReadTextChildren(vrvFing, fing, vrvFing);
+    this->ReadUnsupportedAttr(fing, vrvFing);
+    return this->ReadTextChildren(vrvFing, fing, vrvFing);
 }
 
 bool MEIInput::ReadGliss(Object *parent, pugi::xml_node gliss)
 {
     Gliss *vrvGliss = new Gliss();
-    ReadControlElement(gliss, vrvGliss);
+    this->ReadControlElement(gliss, vrvGliss);
 
-    ReadTimeSpanningInterface(gliss, vrvGliss);
+    this->ReadTimeSpanningInterface(gliss, vrvGliss);
     vrvGliss->ReadColor(gliss);
     vrvGliss->ReadLineRend(gliss);
     vrvGliss->ReadLineRendBase(gliss);
     vrvGliss->ReadNNumberLike(gliss);
 
     parent->AddChild(vrvGliss);
-    ReadUnsupportedAttr(gliss, vrvGliss);
+    this->ReadUnsupportedAttr(gliss, vrvGliss);
     return true;
 }
 
 bool MEIInput::ReadHairpin(Object *parent, pugi::xml_node hairpin)
 {
     Hairpin *vrvHairpin = new Hairpin();
-    ReadControlElement(hairpin, vrvHairpin);
+    this->ReadControlElement(hairpin, vrvHairpin);
 
-    ReadTimeSpanningInterface(hairpin, vrvHairpin);
+    this->ReadTimeSpanningInterface(hairpin, vrvHairpin);
     vrvHairpin->ReadColor(hairpin);
     vrvHairpin->ReadHairpinLog(hairpin);
     vrvHairpin->ReadHairpinVis(hairpin);
@@ -5073,65 +5073,65 @@ bool MEIInput::ReadHairpin(Object *parent, pugi::xml_node hairpin)
     vrvHairpin->ReadVerticalGroup(hairpin);
 
     parent->AddChild(vrvHairpin);
-    ReadUnsupportedAttr(hairpin, vrvHairpin);
+    this->ReadUnsupportedAttr(hairpin, vrvHairpin);
     return true;
 }
 
 bool MEIInput::ReadHarm(Object *parent, pugi::xml_node harm)
 {
     Harm *vrvHarm = new Harm();
-    ReadControlElement(harm, vrvHarm);
+    this->ReadControlElement(harm, vrvHarm);
 
-    ReadTextDirInterface(harm, vrvHarm);
-    ReadTimeSpanningInterface(harm, vrvHarm);
+    this->ReadTextDirInterface(harm, vrvHarm);
+    this->ReadTimeSpanningInterface(harm, vrvHarm);
     vrvHarm->ReadLang(harm);
     vrvHarm->ReadNNumberLike(harm);
 
     parent->AddChild(vrvHarm);
-    ReadUnsupportedAttr(harm, vrvHarm);
-    return ReadTextChildren(vrvHarm, harm, vrvHarm);
+    this->ReadUnsupportedAttr(harm, vrvHarm);
+    return this->ReadTextChildren(vrvHarm, harm, vrvHarm);
 }
 
 bool MEIInput::ReadLv(Object *parent, pugi::xml_node lv)
 {
     Lv *vrvLv = new Lv();
-    ReadControlElement(lv, vrvLv);
+    this->ReadControlElement(lv, vrvLv);
 
-    ReadTimeSpanningInterface(lv, vrvLv);
+    this->ReadTimeSpanningInterface(lv, vrvLv);
     vrvLv->ReadColor(lv);
     vrvLv->ReadCurvature(lv);
     vrvLv->ReadCurveRend(lv);
 
     parent->AddChild(vrvLv);
-    ReadUnsupportedAttr(lv, vrvLv);
+    this->ReadUnsupportedAttr(lv, vrvLv);
     return true;
 }
 
 bool MEIInput::ReadMNum(Object *parent, pugi::xml_node mNum)
 {
     MNum *vrvMNum = new MNum();
-    ReadControlElement(mNum, vrvMNum);
+    this->ReadControlElement(mNum, vrvMNum);
 
-    ReadTextDirInterface(mNum, vrvMNum);
-    ReadTimePointInterface(mNum, vrvMNum);
+    this->ReadTextDirInterface(mNum, vrvMNum);
+    this->ReadTimePointInterface(mNum, vrvMNum);
     vrvMNum->ReadColor(mNum);
     vrvMNum->ReadLang(mNum);
     vrvMNum->ReadTypography(mNum);
 
     parent->AddChild(vrvMNum);
-    return ReadTextChildren(vrvMNum, mNum, vrvMNum);
+    return this->ReadTextChildren(vrvMNum, mNum, vrvMNum);
 }
 
 bool MEIInput::ReadMordent(Object *parent, pugi::xml_node mordent)
 {
     Mordent *vrvMordent = new Mordent();
-    ReadControlElement(mordent, vrvMordent);
+    this->ReadControlElement(mordent, vrvMordent);
 
     if (m_version < MEI_4_0_0) {
         UpgradeMordentTo_4_0_0(mordent, vrvMordent);
     }
 
-    ReadTimePointInterface(mordent, vrvMordent);
+    this->ReadTimePointInterface(mordent, vrvMordent);
     vrvMordent->ReadColor(mordent);
     vrvMordent->ReadExtSym(mordent);
     vrvMordent->ReadOrnamentAccid(mordent);
@@ -5139,16 +5139,16 @@ bool MEIInput::ReadMordent(Object *parent, pugi::xml_node mordent)
     vrvMordent->ReadMordentLog(mordent);
 
     parent->AddChild(vrvMordent);
-    ReadUnsupportedAttr(mordent, vrvMordent);
+    this->ReadUnsupportedAttr(mordent, vrvMordent);
     return true;
 }
 
 bool MEIInput::ReadOctave(Object *parent, pugi::xml_node octave)
 {
     Octave *vrvOctave = new Octave();
-    ReadControlElement(octave, vrvOctave);
+    this->ReadControlElement(octave, vrvOctave);
 
-    ReadTimeSpanningInterface(octave, vrvOctave);
+    this->ReadTimeSpanningInterface(octave, vrvOctave);
     vrvOctave->ReadColor(octave);
     vrvOctave->ReadExtender(octave);
     vrvOctave->ReadLineRend(octave);
@@ -5157,16 +5157,16 @@ bool MEIInput::ReadOctave(Object *parent, pugi::xml_node octave)
     vrvOctave->ReadOctaveDisplacement(octave);
 
     parent->AddChild(vrvOctave);
-    ReadUnsupportedAttr(octave, vrvOctave);
+    this->ReadUnsupportedAttr(octave, vrvOctave);
     return true;
 }
 
 bool MEIInput::ReadPedal(Object *parent, pugi::xml_node pedal)
 {
     Pedal *vrvPedal = new Pedal();
-    ReadControlElement(pedal, vrvPedal);
+    this->ReadControlElement(pedal, vrvPedal);
 
-    ReadTimeSpanningInterface(pedal, vrvPedal);
+    this->ReadTimeSpanningInterface(pedal, vrvPedal);
     vrvPedal->ReadColor(pedal);
     vrvPedal->ReadExtSym(pedal);
     vrvPedal->ReadPedalLog(pedal);
@@ -5175,107 +5175,107 @@ bool MEIInput::ReadPedal(Object *parent, pugi::xml_node pedal)
     vrvPedal->ReadVerticalGroup(pedal);
 
     parent->AddChild(vrvPedal);
-    ReadUnsupportedAttr(pedal, vrvPedal);
+    this->ReadUnsupportedAttr(pedal, vrvPedal);
     return true;
 }
 
 bool MEIInput::ReadPhrase(Object *parent, pugi::xml_node phrase)
 {
     Phrase *vrvPhrase = new Phrase();
-    ReadControlElement(phrase, vrvPhrase);
+    this->ReadControlElement(phrase, vrvPhrase);
 
-    ReadTimeSpanningInterface(phrase, vrvPhrase);
+    this->ReadTimeSpanningInterface(phrase, vrvPhrase);
     vrvPhrase->ReadColor(phrase);
     vrvPhrase->ReadCurvature(phrase);
     vrvPhrase->ReadCurveRend(phrase);
     vrvPhrase->ReadLayerIdent(phrase);
 
     parent->AddChild(vrvPhrase);
-    ReadUnsupportedAttr(phrase, vrvPhrase);
+    this->ReadUnsupportedAttr(phrase, vrvPhrase);
     return true;
 }
 
 bool MEIInput::ReadPitchInflection(Object *parent, pugi::xml_node pitchInflection)
 {
     PitchInflection *vrvPitchInflection = new PitchInflection();
-    ReadControlElement(pitchInflection, vrvPitchInflection);
+    this->ReadControlElement(pitchInflection, vrvPitchInflection);
 
-    ReadTimeSpanningInterface(pitchInflection, vrvPitchInflection);
+    this->ReadTimeSpanningInterface(pitchInflection, vrvPitchInflection);
 
     parent->AddChild(vrvPitchInflection);
-    ReadUnsupportedAttr(pitchInflection, vrvPitchInflection);
+    this->ReadUnsupportedAttr(pitchInflection, vrvPitchInflection);
     return true;
 }
 
 bool MEIInput::ReadReh(Object *parent, pugi::xml_node reh)
 {
     Reh *vrvReh = new Reh();
-    ReadControlElement(reh, vrvReh);
+    this->ReadControlElement(reh, vrvReh);
 
-    ReadTextDirInterface(reh, vrvReh);
-    ReadTimePointInterface(reh, vrvReh);
+    this->ReadTextDirInterface(reh, vrvReh);
+    this->ReadTimePointInterface(reh, vrvReh);
     vrvReh->ReadColor(reh);
     vrvReh->ReadLang(reh);
     vrvReh->ReadVerticalGroup(reh);
 
     parent->AddChild(vrvReh);
-    ReadUnsupportedAttr(reh, vrvReh);
-    return ReadTextChildren(vrvReh, reh, vrvReh);
+    this->ReadUnsupportedAttr(reh, vrvReh);
+    return this->ReadTextChildren(vrvReh, reh, vrvReh);
 }
 
 bool MEIInput::ReadSlur(Object *parent, pugi::xml_node slur)
 {
     Slur *vrvSlur = new Slur();
-    ReadControlElement(slur, vrvSlur);
+    this->ReadControlElement(slur, vrvSlur);
 
-    ReadTimeSpanningInterface(slur, vrvSlur);
+    this->ReadTimeSpanningInterface(slur, vrvSlur);
     vrvSlur->ReadColor(slur);
     vrvSlur->ReadCurvature(slur);
     vrvSlur->ReadCurveRend(slur);
     vrvSlur->ReadLayerIdent(slur);
 
     parent->AddChild(vrvSlur);
-    ReadUnsupportedAttr(slur, vrvSlur);
+    this->ReadUnsupportedAttr(slur, vrvSlur);
     return true;
 }
 
 bool MEIInput::ReadTempo(Object *parent, pugi::xml_node tempo)
 {
     Tempo *vrvTempo = new Tempo();
-    ReadControlElement(tempo, vrvTempo);
+    this->ReadControlElement(tempo, vrvTempo);
 
-    ReadTextDirInterface(tempo, vrvTempo);
-    ReadTimePointInterface(tempo, vrvTempo);
+    this->ReadTextDirInterface(tempo, vrvTempo);
+    this->ReadTimePointInterface(tempo, vrvTempo);
     vrvTempo->ReadLang(tempo);
     vrvTempo->ReadMidiTempo(tempo);
     vrvTempo->ReadMmTempo(tempo);
 
     parent->AddChild(vrvTempo);
-    ReadUnsupportedAttr(tempo, vrvTempo);
-    return ReadTextChildren(vrvTempo, tempo, vrvTempo);
+    this->ReadUnsupportedAttr(tempo, vrvTempo);
+    return this->ReadTextChildren(vrvTempo, tempo, vrvTempo);
 }
 
 bool MEIInput::ReadTie(Object *parent, pugi::xml_node tie)
 {
     Tie *vrvTie = new Tie();
-    ReadControlElement(tie, vrvTie);
+    this->ReadControlElement(tie, vrvTie);
 
-    ReadTimeSpanningInterface(tie, vrvTie);
+    this->ReadTimeSpanningInterface(tie, vrvTie);
     vrvTie->ReadColor(tie);
     vrvTie->ReadCurvature(tie);
     vrvTie->ReadCurveRend(tie);
 
     parent->AddChild(vrvTie);
-    ReadUnsupportedAttr(tie, vrvTie);
+    this->ReadUnsupportedAttr(tie, vrvTie);
     return true;
 }
 
 bool MEIInput::ReadTrill(Object *parent, pugi::xml_node trill)
 {
     Trill *vrvTrill = new Trill();
-    ReadControlElement(trill, vrvTrill);
+    this->ReadControlElement(trill, vrvTrill);
 
-    ReadTimeSpanningInterface(trill, vrvTrill);
+    this->ReadTimeSpanningInterface(trill, vrvTrill);
     vrvTrill->ReadColor(trill);
     vrvTrill->ReadExtender(trill);
     vrvTrill->ReadExtSym(trill);
@@ -5285,20 +5285,20 @@ bool MEIInput::ReadTrill(Object *parent, pugi::xml_node trill)
     vrvTrill->ReadPlacementRelStaff(trill);
 
     parent->AddChild(vrvTrill);
-    ReadUnsupportedAttr(trill, vrvTrill);
+    this->ReadUnsupportedAttr(trill, vrvTrill);
     return true;
 }
 
 bool MEIInput::ReadTurn(Object *parent, pugi::xml_node turn)
 {
     Turn *vrvTurn = new Turn();
-    ReadControlElement(turn, vrvTurn);
+    this->ReadControlElement(turn, vrvTurn);
 
     if (m_version < MEI_4_0_0) {
         UpgradeTurnTo_4_0_0(turn, vrvTurn);
     }
 
-    ReadTimePointInterface(turn, vrvTurn);
+    this->ReadTimePointInterface(turn, vrvTurn);
     vrvTurn->ReadColor(turn);
     vrvTurn->ReadExtSym(turn);
     vrvTurn->ReadOrnamentAccid(turn);
@@ -5306,18 +5306,18 @@ bool MEIInput::ReadTurn(Object *parent, pugi::xml_node turn)
     vrvTurn->ReadTurnLog(turn);
 
     parent->AddChild(vrvTurn);
-    ReadUnsupportedAttr(turn, vrvTurn);
+    this->ReadUnsupportedAttr(turn, vrvTurn);
     return true;
 }
 
 bool MEIInput::ReadFb(Object *parent, pugi::xml_node fb)
 {
     Fb *vrvFb = new Fb();
-    SetMeiUuid(fb, vrvFb);
+    this->SetMeiUuid(fb, vrvFb);
 
     parent->AddChild(vrvFb);
-    ReadUnsupportedAttr(fb, vrvFb);
-    return ReadFbChildren(vrvFb, fb);
+    this->ReadUnsupportedAttr(fb, vrvFb);
+    return this->ReadFbChildren(vrvFb, fb);
 }
 
 bool MEIInput::ReadFbChildren(Object *parent, pugi::xml_node parentNode)
@@ -5329,16 +5329,16 @@ bool MEIInput::ReadFbChildren(Object *parent, pugi::xml_node parentNode)
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         // editorial
-        else if (IsEditorialElementName(current.name())) {
-            success = ReadEditorialElement(parent, current, EDITORIAL_FB);
+        else if (this->IsEditorialElementName(current.name())) {
+            success = this->ReadEditorialElement(parent, current, EDITORIAL_FB);
         }
         // content
         else if (std::string(current.name()) == "f") {
-            success = ReadF(parent, current);
+            success = this->ReadF(parent, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <staff>", current.name());
@@ -5350,7 +5350,7 @@ bool MEIInput::ReadFbChildren(Object *parent, pugi::xml_node parentNode)
 bool MEIInput::ReadStaff(Object *parent, pugi::xml_node staff)
 {
     Staff *vrvStaff = new Staff();
-    SetMeiUuid(staff, vrvStaff);
+    this->SetMeiUuid(staff, vrvStaff);
 
     vrvStaff->ReadFacsimile(staff);
     vrvStaff->ReadNInteger(staff);
@@ -5371,8 +5371,8 @@ bool MEIInput::ReadStaff(Object *parent, pugi::xml_node staff)
     }
 
     parent->AddChild(vrvStaff);
-    ReadUnsupportedAttr(staff, vrvStaff);
-    return ReadStaffChildren(vrvStaff, staff);
+    this->ReadUnsupportedAttr(staff, vrvStaff);
+    return this->ReadStaffChildren(vrvStaff, staff);
 }
 
 bool MEIInput::ReadStaffChildren(Object *parent, pugi::xml_node parentNode)
@@ -5384,16 +5384,16 @@ bool MEIInput::ReadStaffChildren(Object *parent, pugi::xml_node parentNode)
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         // editorial
-        else if (IsEditorialElementName(current.name())) {
-            success = ReadEditorialElement(parent, current, EDITORIAL_STAFF);
+        else if (this->IsEditorialElementName(current.name())) {
+            success = this->ReadEditorialElement(parent, current, EDITORIAL_STAFF);
         }
         // content
         else if (std::string(current.name()) == "layer") {
-            success = ReadLayer(parent, current);
+            success = this->ReadLayer(parent, current);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <staff>", current.name());
@@ -5405,7 +5405,7 @@ bool MEIInput::ReadStaffChildren(Object *parent, pugi::xml_node parentNode)
 bool MEIInput::ReadLayer(Object *parent, pugi::xml_node layer)
 {
     Layer *vrvLayer = new Layer();
-    SetMeiUuid(layer, vrvLayer);
+    this->SetMeiUuid(layer, vrvLayer);
 
     vrvLayer->ReadNInteger(layer);
     vrvLayer->ReadTyped(layer);
@@ -5419,8 +5419,8 @@ bool MEIInput::ReadLayer(Object *parent, pugi::xml_node layer)
     }
 
     parent->AddChild(vrvLayer);
-    ReadUnsupportedAttr(layer, vrvLayer);
-    return ReadLayerChildren(vrvLayer, layer);
+    this->ReadUnsupportedAttr(layer, vrvLayer);
+    return this->ReadLayerChildren(vrvLayer, layer);
 }
 
 bool MEIInput::ReadLayerChildren(Object *parent, pugi::xml_node parentNode, Object *filter)
@@ -5434,7 +5434,7 @@ bool MEIInput::ReadLayerChildren(Object *parent, pugi::xml_node parentNode, Obje
         }
         elementName = std::string(xmlElement.name());
         // LogDebug("ReadLayerChildren: element <%s>", xmlElement.name());
-        if (!IsAllowed(elementName, filter)) {
+        if (!this->IsAllowed(elementName, filter)) {
             std::string meiElementName = filter->GetClassName();
             std::transform(meiElementName.begin(), meiElementName.begin() + 1, meiElementName.begin(), ::tolower);
             LogWarning("Element <%s> within <%s> is not supported and will be ignored ", xmlElement.name(),
@@ -5442,133 +5442,133 @@ bool MEIInput::ReadLayerChildren(Object *parent, pugi::xml_node parentNode, Obje
             continue;
         }
         // editorial
-        else if (IsEditorialElementName(xmlElement.name())) {
-            success = ReadEditorialElement(parent, xmlElement, EDITORIAL_LAYER, filter);
+        else if (this->IsEditorialElementName(xmlElement.name())) {
+            success = this->ReadEditorialElement(parent, xmlElement, EDITORIAL_LAYER, filter);
         }
         // content
         else if (elementName == "accid") {
-            success = ReadAccid(parent, xmlElement);
+            success = this->ReadAccid(parent, xmlElement);
         }
         else if (elementName == "artic") {
-            success = ReadArtic(parent, xmlElement);
+            success = this->ReadArtic(parent, xmlElement);
         }
         else if (elementName == "barLine") {
-            success = ReadBarLine(parent, xmlElement);
+            success = this->ReadBarLine(parent, xmlElement);
         }
         else if (elementName == "beam") {
-            success = ReadBeam(parent, xmlElement);
+            success = this->ReadBeam(parent, xmlElement);
         }
         else if (elementName == "beatRpt") {
-            success = ReadBeatRpt(parent, xmlElement);
+            success = this->ReadBeatRpt(parent, xmlElement);
         }
         else if (elementName == "bTrem") {
-            success = ReadBTrem(parent, xmlElement);
+            success = this->ReadBTrem(parent, xmlElement);
         }
         else if (elementName == "chord") {
-            success = ReadChord(parent, xmlElement);
+            success = this->ReadChord(parent, xmlElement);
         }
         else if (elementName == "clef") {
-            success = ReadClef(parent, xmlElement);
+            success = this->ReadClef(parent, xmlElement);
         }
         else if (elementName == "custos") {
-            success = ReadCustos(parent, xmlElement);
+            success = this->ReadCustos(parent, xmlElement);
         }
         else if (elementName == "dot") {
-            success = ReadDot(parent, xmlElement);
+            success = this->ReadDot(parent, xmlElement);
         }
         else if (elementName == "fTrem") {
-            success = ReadFTrem(parent, xmlElement);
+            success = this->ReadFTrem(parent, xmlElement);
         }
         else if (elementName == "graceGrp") {
-            success = ReadGraceGrp(parent, xmlElement);
+            success = this->ReadGraceGrp(parent, xmlElement);
         }
         else if (elementName == "halfmRpt") {
-            success = ReadHalfmRpt(parent, xmlElement);
+            success = this->ReadHalfmRpt(parent, xmlElement);
         }
         else if (elementName == "keyAccid") {
-            success = ReadKeyAccid(parent, xmlElement);
+            success = this->ReadKeyAccid(parent, xmlElement);
         }
         else if (elementName == "keySig") {
-            success = ReadKeySig(parent, xmlElement);
+            success = this->ReadKeySig(parent, xmlElement);
         }
         else if (elementName == "label") {
-            success = ReadLabel(parent, xmlElement);
+            success = this->ReadLabel(parent, xmlElement);
         }
         else if (elementName == "labelAbbr") {
-            success = ReadLabelAbbr(parent, xmlElement);
+            success = this->ReadLabelAbbr(parent, xmlElement);
         }
         else if (elementName == "ligature") {
-            success = ReadLigature(parent, xmlElement);
+            success = this->ReadLigature(parent, xmlElement);
         }
         else if (elementName == "mensur") {
-            success = ReadMensur(parent, xmlElement);
+            success = this->ReadMensur(parent, xmlElement);
         }
         else if (elementName == "meterSig") {
-            success = ReadMeterSig(parent, xmlElement);
+            success = this->ReadMeterSig(parent, xmlElement);
         }
         else if (elementName == "meterSigGrp") {
-            success = ReadMeterSigGrp(parent, xmlElement);
+            success = this->ReadMeterSigGrp(parent, xmlElement);
         }
         else if (elementName == "nc") {
-            success = ReadNc(parent, xmlElement);
+            success = this->ReadNc(parent, xmlElement);
         }
         else if (elementName == "neume") {
-            success = ReadNeume(parent, xmlElement);
+            success = this->ReadNeume(parent, xmlElement);
         }
         else if (elementName == "note") {
-            success = ReadNote(parent, xmlElement);
+            success = this->ReadNote(parent, xmlElement);
         }
         else if (elementName == "rest") {
-            success = ReadRest(parent, xmlElement);
+            success = this->ReadRest(parent, xmlElement);
         }
         else if (elementName == "mRest") {
-            success = ReadMRest(parent, xmlElement);
+            success = this->ReadMRest(parent, xmlElement);
         }
         else if (elementName == "mRpt") {
-            success = ReadMRpt(parent, xmlElement);
+            success = this->ReadMRpt(parent, xmlElement);
         }
         else if (elementName == "mRpt2") {
-            success = ReadMRpt2(parent, xmlElement);
+            success = this->ReadMRpt2(parent, xmlElement);
         }
         else if (elementName == "mSpace") {
-            success = ReadMSpace(parent, xmlElement);
+            success = this->ReadMSpace(parent, xmlElement);
         }
         else if (elementName == "multiRest") {
-            success = ReadMultiRest(parent, xmlElement);
+            success = this->ReadMultiRest(parent, xmlElement);
         }
         else if (elementName == "multiRpt") {
-            success = ReadMultiRpt(parent, xmlElement);
+            success = this->ReadMultiRpt(parent, xmlElement);
         }
         else if (elementName == "plica") {
-            success = ReadPlica(parent, xmlElement);
+            success = this->ReadPlica(parent, xmlElement);
         }
         else if (elementName == "proport") {
-            success = ReadProport(parent, xmlElement);
+            success = this->ReadProport(parent, xmlElement);
         }
         else if (elementName == "space") {
-            success = ReadSpace(parent, xmlElement);
+            success = this->ReadSpace(parent, xmlElement);
         }
         else if (elementName == "syl") {
-            success = ReadSyl(parent, xmlElement);
+            success = this->ReadSyl(parent, xmlElement);
         }
         else if (elementName == "syllable") {
-            success = ReadSyllable(parent, xmlElement);
+            success = this->ReadSyllable(parent, xmlElement);
         }
         else if (elementName == "tabDurSym") {
-            success = ReadTabDurSym(parent, xmlElement);
+            success = this->ReadTabDurSym(parent, xmlElement);
         }
         else if (elementName == "tabGrp") {
-            success = ReadTabGrp(parent, xmlElement);
+            success = this->ReadTabGrp(parent, xmlElement);
         }
         else if (elementName == "tuplet") {
-            success = ReadTuplet(parent, xmlElement);
+            success = this->ReadTuplet(parent, xmlElement);
         }
         else if (elementName == "verse") {
-            success = ReadVerse(parent, xmlElement);
+            success = this->ReadVerse(parent, xmlElement);
         }
         // xml comment
         else if (elementName == "") {
-            success = ReadXMLComment(parent, xmlElement);
+            success = this->ReadXMLComment(parent, xmlElement);
         }
         // unknown
         else {
@@ -5580,8 +5580,8 @@ bool MEIInput::ReadLayerChildren(Object *parent, pugi::xml_node parentNode, Obje
 
 bool MEIInput::ReadLayerElement(pugi::xml_node element, LayerElement *object)
 {
-    SetMeiUuid(element, object);
-    ReadLinkingInterface(element, object);
+    this->SetMeiUuid(element, object);
+    this->ReadLinkingInterface(element, object);
     object->ReadLabelled(element);
     object->ReadTyped(element);
 
@@ -5600,9 +5600,9 @@ bool MEIInput::ReadLayerElement(pugi::xml_node element, LayerElement *object)
 bool MEIInput::ReadAccid(Object *parent, pugi::xml_node accid)
 {
     Accid *vrvAccid = new Accid();
-    ReadLayerElement(accid, vrvAccid);
+    this->ReadLayerElement(accid, vrvAccid);
 
-    ReadPositionInterface(accid, vrvAccid);
+    this->ReadPositionInterface(accid, vrvAccid);
     vrvAccid->ReadAccidental(accid);
     vrvAccid->ReadAccidentalGestural(accid);
     vrvAccid->ReadAccidLog(accid);
@@ -5611,14 +5611,14 @@ bool MEIInput::ReadAccid(Object *parent, pugi::xml_node accid)
     vrvAccid->ReadExtSym(accid);
 
     parent->AddChild(vrvAccid);
-    ReadUnsupportedAttr(accid, vrvAccid);
+    this->ReadUnsupportedAttr(accid, vrvAccid);
     return true;
 }
 
 bool MEIInput::ReadArtic(Object *parent, pugi::xml_node artic)
 {
     Artic *vrvArtic = new Artic();
-    ReadLayerElement(artic, vrvArtic);
+    this->ReadLayerElement(artic, vrvArtic);
 
     vrvArtic->ReadArticulation(artic);
     vrvArtic->ReadColor(artic);
@@ -5631,14 +5631,14 @@ bool MEIInput::ReadArtic(Object *parent, pugi::xml_node artic)
     }
 
     parent->AddChild(vrvArtic);
-    ReadUnsupportedAttr(artic, vrvArtic);
+    this->ReadUnsupportedAttr(artic, vrvArtic);
     return true;
 }
 
 bool MEIInput::ReadBarLine(Object *parent, pugi::xml_node barLine)
 {
     BarLine *vrvBarLine = new BarLine();
-    ReadLayerElement(barLine, vrvBarLine);
+    this->ReadLayerElement(barLine, vrvBarLine);
 
     vrvBarLine->ReadBarLineLog(barLine);
     vrvBarLine->ReadColor(barLine);
@@ -5646,14 +5646,14 @@ bool MEIInput::ReadBarLine(Object *parent, pugi::xml_node barLine)
     vrvBarLine->ReadVisibility(barLine);
 
     parent->AddChild(vrvBarLine);
-    ReadUnsupportedAttr(barLine, vrvBarLine);
+    this->ReadUnsupportedAttr(barLine, vrvBarLine);
     return true;
 }
 
 bool MEIInput::ReadBeam(Object *parent, pugi::xml_node beam)
 {
     Beam *vrvBeam = new Beam();
-    ReadLayerElement(beam, vrvBeam);
+    this->ReadLayerElement(beam, vrvBeam);
 
     vrvBeam->ReadBeamedWith(beam);
     vrvBeam->ReadBeamRend(beam);
@@ -5661,14 +5661,14 @@ bool MEIInput::ReadBeam(Object *parent, pugi::xml_node beam)
     vrvBeam->ReadCue(beam);
 
     parent->AddChild(vrvBeam);
-    ReadUnsupportedAttr(beam, vrvBeam);
-    return ReadLayerChildren(vrvBeam, beam, vrvBeam);
+    this->ReadUnsupportedAttr(beam, vrvBeam);
+    return this->ReadLayerChildren(vrvBeam, beam, vrvBeam);
 }
 
 bool MEIInput::ReadBeatRpt(Object *parent, pugi::xml_node beatRpt)
 {
     BeatRpt *vrvBeatRpt = new BeatRpt();
-    ReadLayerElement(beatRpt, vrvBeatRpt);
+    this->ReadLayerElement(beatRpt, vrvBeatRpt);
 
     vrvBeatRpt->ReadColor(beatRpt);
     vrvBeatRpt->ReadBeatRptLog(beatRpt);
@@ -5679,27 +5679,27 @@ bool MEIInput::ReadBeatRpt(Object *parent, pugi::xml_node beatRpt)
     }
 
     parent->AddChild(vrvBeatRpt);
-    ReadUnsupportedAttr(beatRpt, vrvBeatRpt);
+    this->ReadUnsupportedAttr(beatRpt, vrvBeatRpt);
     return true;
 }
 
 bool MEIInput::ReadBTrem(Object *parent, pugi::xml_node bTrem)
 {
     BTrem *vrvBTrem = new BTrem();
-    ReadLayerElement(bTrem, vrvBTrem);
+    this->ReadLayerElement(bTrem, vrvBTrem);
 
     vrvBTrem->ReadBTremLog(bTrem);
     vrvBTrem->ReadTremMeasured(bTrem);
 
     parent->AddChild(vrvBTrem);
-    ReadUnsupportedAttr(bTrem, vrvBTrem);
-    return ReadLayerChildren(vrvBTrem, bTrem, vrvBTrem);
+    this->ReadUnsupportedAttr(bTrem, vrvBTrem);
+    return this->ReadLayerChildren(vrvBTrem, bTrem, vrvBTrem);
 }
 
 bool MEIInput::ReadChord(Object *parent, pugi::xml_node chord)
 {
     Chord *vrvChord = new Chord();
-    ReadLayerElement(chord, vrvChord);
+    this->ReadLayerElement(chord, vrvChord);
 
     if (m_version < MEI_4_0_0) {
         if (chord.attribute("size")) {
@@ -5708,7 +5708,7 @@ bool MEIInput::ReadChord(Object *parent, pugi::xml_node chord)
         }
     }
 
-    ReadDurationInterface(chord, vrvChord);
+    this->ReadDurationInterface(chord, vrvChord);
     vrvChord->ReadColor(chord);
     vrvChord->ReadCue(chord);
     vrvChord->ReadGraced(chord);
@@ -5731,15 +5731,15 @@ bool MEIInput::ReadChord(Object *parent, pugi::xml_node chord)
     }
 
     parent->AddChild(vrvChord);
-    ReadUnsupportedAttr(chord, vrvChord);
-    return ReadLayerChildren(vrvChord, chord, vrvChord);
+    this->ReadUnsupportedAttr(chord, vrvChord);
+    return this->ReadLayerChildren(vrvChord, chord, vrvChord);
 }
 
 bool MEIInput::ReadClef(Object *parent, pugi::xml_node clef)
 {
     Clef *vrvClef = new Clef();
-    ReadLayerElement(clef, vrvClef);
-    ReadFacsimileInterface(clef, vrvClef);
+    this->ReadLayerElement(clef, vrvClef);
+    this->ReadFacsimileInterface(clef, vrvClef);
 
     vrvClef->ReadClefShape(clef);
     vrvClef->ReadColor(clef);
@@ -5750,7 +5750,7 @@ bool MEIInput::ReadClef(Object *parent, pugi::xml_node clef)
     vrvClef->ReadVisibility(clef);
 
     parent->AddChild(vrvClef);
-    ReadUnsupportedAttr(clef, vrvClef);
+    this->ReadUnsupportedAttr(clef, vrvClef);
     return true;
 }
 
@@ -5772,39 +5772,39 @@ void MEIInput::ReadAccidAttr(pugi::xml_node node, Object *object)
 bool MEIInput::ReadCustos(Object *parent, pugi::xml_node custos)
 {
     Custos *vrvCustos = new Custos();
-    ReadLayerElement(custos, vrvCustos);
+    this->ReadLayerElement(custos, vrvCustos);
 
-    ReadFacsimileInterface(custos, vrvCustos);
-    ReadPitchInterface(custos, vrvCustos);
-    ReadPositionInterface(custos, vrvCustos);
+    this->ReadFacsimileInterface(custos, vrvCustos);
+    this->ReadPitchInterface(custos, vrvCustos);
+    this->ReadPositionInterface(custos, vrvCustos);
     vrvCustos->ReadColor(custos);
     vrvCustos->ReadExtSym(custos);
 
-    ReadAccidAttr(custos, vrvCustos);
+    this->ReadAccidAttr(custos, vrvCustos);
 
     parent->AddChild(vrvCustos);
-    ReadUnsupportedAttr(custos, vrvCustos);
-    return ReadLayerChildren(vrvCustos, custos, vrvCustos);
+    this->ReadUnsupportedAttr(custos, vrvCustos);
+    return this->ReadLayerChildren(vrvCustos, custos, vrvCustos);
 }
 
 bool MEIInput::ReadDot(Object *parent, pugi::xml_node dot)
 {
     Dot *vrvDot = new Dot();
-    ReadLayerElement(dot, vrvDot);
+    this->ReadLayerElement(dot, vrvDot);
 
-    ReadPositionInterface(dot, vrvDot);
+    this->ReadPositionInterface(dot, vrvDot);
     vrvDot->ReadColor(dot);
     vrvDot->ReadDotLog(dot);
 
     parent->AddChild(vrvDot);
-    ReadUnsupportedAttr(dot, vrvDot);
+    this->ReadUnsupportedAttr(dot, vrvDot);
     return true;
 }
 
 bool MEIInput::ReadFTrem(Object *parent, pugi::xml_node fTrem)
 {
     FTrem *vrvFTrem = new FTrem();
-    ReadLayerElement(fTrem, vrvFTrem);
+    this->ReadLayerElement(fTrem, vrvFTrem);
 
     if (m_version < MEI_4_0_0) {
         UpgradeFTremTo_4_0_0(fTrem, vrvFTrem);
@@ -5814,55 +5814,55 @@ bool MEIInput::ReadFTrem(Object *parent, pugi::xml_node fTrem)
     vrvFTrem->ReadTremMeasured(fTrem);
 
     parent->AddChild(vrvFTrem);
-    ReadUnsupportedAttr(fTrem, vrvFTrem);
-    return ReadLayerChildren(vrvFTrem, fTrem, vrvFTrem);
+    this->ReadUnsupportedAttr(fTrem, vrvFTrem);
+    return this->ReadLayerChildren(vrvFTrem, fTrem, vrvFTrem);
 }
 
 bool MEIInput::ReadGraceGrp(Object *parent, pugi::xml_node graceGrp)
 {
     GraceGrp *vrvGraceGrp = new GraceGrp();
-    ReadLayerElement(graceGrp, vrvGraceGrp);
+    this->ReadLayerElement(graceGrp, vrvGraceGrp);
 
     vrvGraceGrp->ReadColor(graceGrp);
     vrvGraceGrp->ReadGraced(graceGrp);
     vrvGraceGrp->ReadGraceGrpLog(graceGrp);
 
     parent->AddChild(vrvGraceGrp);
-    ReadUnsupportedAttr(graceGrp, vrvGraceGrp);
-    return ReadLayerChildren(vrvGraceGrp, graceGrp, vrvGraceGrp);
+    this->ReadUnsupportedAttr(graceGrp, vrvGraceGrp);
+    return this->ReadLayerChildren(vrvGraceGrp, graceGrp, vrvGraceGrp);
 }
 
 bool MEIInput::ReadHalfmRpt(Object *parent, pugi::xml_node halfmRpt)
 {
     HalfmRpt *vrvHalfmRpt = new HalfmRpt();
-    ReadLayerElement(halfmRpt, vrvHalfmRpt);
+    this->ReadLayerElement(halfmRpt, vrvHalfmRpt);
 
     vrvHalfmRpt->ReadColor(halfmRpt);
 
     parent->AddChild(vrvHalfmRpt);
-    ReadUnsupportedAttr(halfmRpt, vrvHalfmRpt);
+    this->ReadUnsupportedAttr(halfmRpt, vrvHalfmRpt);
     return true;
 }
 
 bool MEIInput::ReadKeyAccid(Object *parent, pugi::xml_node keyAccid)
 {
     KeyAccid *vrvKeyAccid = new KeyAccid();
-    ReadLayerElement(keyAccid, vrvKeyAccid);
+    this->ReadLayerElement(keyAccid, vrvKeyAccid);
 
-    ReadPitchInterface(keyAccid, vrvKeyAccid);
+    this->ReadPitchInterface(keyAccid, vrvKeyAccid);
     vrvKeyAccid->ReadAccidental(keyAccid);
     vrvKeyAccid->ReadColor(keyAccid);
     vrvKeyAccid->ReadEnclosingChars(keyAccid);
 
     parent->AddChild(vrvKeyAccid);
-    ReadUnsupportedAttr(keyAccid, vrvKeyAccid);
+    this->ReadUnsupportedAttr(keyAccid, vrvKeyAccid);
     return true;
 }
 
 bool MEIInput::ReadKeySig(Object *parent, pugi::xml_node keySig)
 {
     KeySig *vrvKeySig = new KeySig();
-    ReadLayerElement(keySig, vrvKeySig);
+    this->ReadLayerElement(keySig, vrvKeySig);
 
     vrvKeySig->ReadAccidental(keySig);
     vrvKeySig->ReadPitch(keySig);
@@ -5872,26 +5872,26 @@ bool MEIInput::ReadKeySig(Object *parent, pugi::xml_node keySig)
     vrvKeySig->ReadVisibility(keySig);
 
     parent->AddChild(vrvKeySig);
-    ReadUnsupportedAttr(keySig, vrvKeySig);
-    return ReadLayerChildren(vrvKeySig, keySig, vrvKeySig);
+    this->ReadUnsupportedAttr(keySig, vrvKeySig);
+    return this->ReadLayerChildren(vrvKeySig, keySig, vrvKeySig);
 }
 
 bool MEIInput::ReadLigature(Object *parent, pugi::xml_node ligature)
 {
     Ligature *vrvLigature = new Ligature();
-    SetMeiUuid(ligature, vrvLigature);
+    this->SetMeiUuid(ligature, vrvLigature);
 
     vrvLigature->ReadLigatureVis(ligature);
 
     parent->AddChild(vrvLigature);
-    ReadUnsupportedAttr(ligature, vrvLigature);
-    return ReadLayerChildren(vrvLigature, ligature, vrvLigature);
+    this->ReadUnsupportedAttr(ligature, vrvLigature);
+    return this->ReadLayerChildren(vrvLigature, ligature, vrvLigature);
 }
 
 bool MEIInput::ReadMensur(Object *parent, pugi::xml_node mensur)
 {
     Mensur *vrvMensur = new Mensur();
-    ReadLayerElement(mensur, vrvMensur);
+    this->ReadLayerElement(mensur, vrvMensur);
 
     if (m_version < MEI_4_0_0) {
         if (mensur.attribute("size")) {
@@ -5913,29 +5913,29 @@ bool MEIInput::ReadMensur(Object *parent, pugi::xml_node mensur)
     }
 
     parent->AddChild(vrvMensur);
-    ReadUnsupportedAttr(mensur, vrvMensur);
+    this->ReadUnsupportedAttr(mensur, vrvMensur);
     return true;
 }
 
 bool MEIInput::ReadMeterSig(Object *parent, pugi::xml_node meterSig)
 {
     MeterSig *vrvMeterSig = new MeterSig();
-    ReadLayerElement(meterSig, vrvMeterSig);
+    this->ReadLayerElement(meterSig, vrvMeterSig);
 
     vrvMeterSig->ReadEnclosingChars(meterSig);
     vrvMeterSig->ReadMeterSigLog(meterSig);
     vrvMeterSig->ReadMeterSigVis(meterSig);
 
     parent->AddChild(vrvMeterSig);
-    ReadUnsupportedAttr(meterSig, vrvMeterSig);
+    this->ReadUnsupportedAttr(meterSig, vrvMeterSig);
     return true;
 }
 
 bool MEIInput::ReadMRest(Object *parent, pugi::xml_node mRest)
 {
     MRest *vrvMRest = new MRest();
-    ReadLayerElement(mRest, vrvMRest);
-    ReadPositionInterface(mRest, vrvMRest);
+    this->ReadLayerElement(mRest, vrvMRest);
+    this->ReadPositionInterface(mRest, vrvMRest);
 
     if (m_version < MEI_4_0_0) {
         if (mRest.attribute("size")) {
@@ -5959,50 +5959,50 @@ bool MEIInput::ReadMRest(Object *parent, pugi::xml_node mRest)
     }
 
     parent->AddChild(vrvMRest);
-    ReadUnsupportedAttr(mRest, vrvMRest);
+    this->ReadUnsupportedAttr(mRest, vrvMRest);
     return true;
 }
 
 bool MEIInput::ReadMRpt(Object *parent, pugi::xml_node mRpt)
 {
     MRpt *vrvMRpt = new MRpt();
-    ReadLayerElement(mRpt, vrvMRpt);
+    this->ReadLayerElement(mRpt, vrvMRpt);
 
     vrvMRpt->ReadColor(mRpt);
 
     parent->AddChild(vrvMRpt);
-    ReadUnsupportedAttr(mRpt, vrvMRpt);
+    this->ReadUnsupportedAttr(mRpt, vrvMRpt);
     return true;
 }
 
 bool MEIInput::ReadMRpt2(Object *parent, pugi::xml_node mRpt2)
 {
     MRpt2 *vrvMRpt2 = new MRpt2();
-    ReadLayerElement(mRpt2, vrvMRpt2);
+    this->ReadLayerElement(mRpt2, vrvMRpt2);
 
     vrvMRpt2->ReadColor(mRpt2);
 
     parent->AddChild(vrvMRpt2);
-    ReadUnsupportedAttr(mRpt2, vrvMRpt2);
+    this->ReadUnsupportedAttr(mRpt2, vrvMRpt2);
     return true;
 }
 
 bool MEIInput::ReadMSpace(Object *parent, pugi::xml_node mSpace)
 {
     MSpace *vrvMSpace = new MSpace();
-    ReadLayerElement(mSpace, vrvMSpace);
+    this->ReadLayerElement(mSpace, vrvMSpace);
 
     parent->AddChild(vrvMSpace);
-    ReadUnsupportedAttr(mSpace, vrvMSpace);
+    this->ReadUnsupportedAttr(mSpace, vrvMSpace);
     return true;
 }
 
 bool MEIInput::ReadMultiRest(Object *parent, pugi::xml_node multiRest)
 {
     MultiRest *vrvMultiRest = new MultiRest();
-    ReadLayerElement(multiRest, vrvMultiRest);
+    this->ReadLayerElement(multiRest, vrvMultiRest);
 
-    ReadPositionInterface(multiRest, vrvMultiRest);
+    this->ReadPositionInterface(multiRest, vrvMultiRest);
     vrvMultiRest->ReadColor(multiRest);
     vrvMultiRest->ReadMultiRestVis(multiRest);
     vrvMultiRest->ReadNumbered(multiRest);
@@ -6010,55 +6010,55 @@ bool MEIInput::ReadMultiRest(Object *parent, pugi::xml_node multiRest)
     vrvMultiRest->ReadWidth(multiRest);
 
     parent->AddChild(vrvMultiRest);
-    ReadUnsupportedAttr(multiRest, vrvMultiRest);
+    this->ReadUnsupportedAttr(multiRest, vrvMultiRest);
     return true;
 }
 
 bool MEIInput::ReadMultiRpt(Object *parent, pugi::xml_node multiRpt)
 {
     MultiRpt *vrvMultiRpt = new MultiRpt();
-    ReadLayerElement(multiRpt, vrvMultiRpt);
+    this->ReadLayerElement(multiRpt, vrvMultiRpt);
 
     vrvMultiRpt->ReadNumbered(multiRpt);
 
     parent->AddChild(vrvMultiRpt);
-    ReadUnsupportedAttr(multiRpt, vrvMultiRpt);
+    this->ReadUnsupportedAttr(multiRpt, vrvMultiRpt);
     return true;
 }
 
 bool MEIInput::ReadNc(Object *parent, pugi::xml_node nc)
 {
     Nc *vrvNc = new Nc();
-    ReadLayerElement(nc, vrvNc);
+    this->ReadLayerElement(nc, vrvNc);
 
-    ReadDurationInterface(nc, vrvNc);
-    ReadFacsimileInterface(nc, vrvNc);
-    ReadPitchInterface(nc, vrvNc);
-    ReadPositionInterface(nc, vrvNc);
+    this->ReadDurationInterface(nc, vrvNc);
+    this->ReadFacsimileInterface(nc, vrvNc);
+    this->ReadPitchInterface(nc, vrvNc);
+    this->ReadPositionInterface(nc, vrvNc);
     vrvNc->ReadColor(nc);
     vrvNc->ReadIntervalMelodic(nc);
     vrvNc->ReadNcForm(nc);
 
     parent->AddChild(vrvNc);
-    return ReadLayerChildren(vrvNc, nc, vrvNc);
+    return this->ReadLayerChildren(vrvNc, nc, vrvNc);
 }
 
 bool MEIInput::ReadNeume(Object *parent, pugi::xml_node neume)
 {
     Neume *vrvNeume = new Neume();
-    ReadLayerElement(neume, vrvNeume);
-    ReadFacsimileInterface(neume, vrvNeume);
+    this->ReadLayerElement(neume, vrvNeume);
+    this->ReadFacsimileInterface(neume, vrvNeume);
 
     vrvNeume->ReadColor(neume);
 
     parent->AddChild(vrvNeume);
-    return ReadLayerChildren(vrvNeume, neume, vrvNeume);
+    return this->ReadLayerChildren(vrvNeume, neume, vrvNeume);
 }
 
 bool MEIInput::ReadNote(Object *parent, pugi::xml_node note)
 {
     Note *vrvNote = new Note();
-    ReadLayerElement(note, vrvNote);
+    this->ReadLayerElement(note, vrvNote);
 
     if (m_version < MEI_4_0_0) {
         if (note.attribute("size")) {
@@ -6067,9 +6067,9 @@ bool MEIInput::ReadNote(Object *parent, pugi::xml_node note)
         }
     }
 
-    ReadDurationInterface(note, vrvNote);
-    ReadPitchInterface(note, vrvNote);
-    ReadPositionInterface(note, vrvNote);
+    this->ReadDurationInterface(note, vrvNote);
+    this->ReadPitchInterface(note, vrvNote);
+    this->ReadPositionInterface(note, vrvNote);
     vrvNote->ReadColor(note);
     vrvNote->ReadColoration(note);
     vrvNote->ReadCue(note);
@@ -6096,21 +6096,21 @@ bool MEIInput::ReadNote(Object *parent, pugi::xml_node note)
         vrvNote->AddChild(vrvArtic);
     }
 
-    ReadAccidAttr(note, vrvNote);
+    this->ReadAccidAttr(note, vrvNote);
 
     if (vrvNote->HasTie()) {
         m_doc->SetMarkup(MARKUP_ANALYTICAL_TIE);
     }
 
     parent->AddChild(vrvNote);
-    ReadUnsupportedAttr(note, vrvNote);
-    return ReadLayerChildren(vrvNote, note, vrvNote);
+    this->ReadUnsupportedAttr(note, vrvNote);
+    return this->ReadLayerChildren(vrvNote, note, vrvNote);
 }
 
 bool MEIInput::ReadRest(Object *parent, pugi::xml_node rest)
 {
     Rest *vrvRest = new Rest();
-    ReadLayerElement(rest, vrvRest);
+    this->ReadLayerElement(rest, vrvRest);
 
     if (m_version < MEI_4_0_0) {
         if (rest.attribute("size")) {
@@ -6119,110 +6119,110 @@ bool MEIInput::ReadRest(Object *parent, pugi::xml_node rest)
         }
     }
 
-    ReadDurationInterface(rest, vrvRest);
-    ReadPositionInterface(rest, vrvRest);
+    this->ReadDurationInterface(rest, vrvRest);
+    this->ReadPositionInterface(rest, vrvRest);
     vrvRest->ReadColor(rest);
     vrvRest->ReadCue(rest);
     vrvRest->ReadExtSym(rest);
     vrvRest->ReadRestVisMensural(rest);
 
     parent->AddChild(vrvRest);
-    ReadUnsupportedAttr(rest, vrvRest);
-    return ReadLayerChildren(vrvRest, rest, vrvRest);
+    this->ReadUnsupportedAttr(rest, vrvRest);
+    return this->ReadLayerChildren(vrvRest, rest, vrvRest);
 }
 
 bool MEIInput::ReadPlica(Object *parent, pugi::xml_node plica)
 {
     Plica *vrvPlica = new Plica();
-    ReadLayerElement(plica, vrvPlica);
+    this->ReadLayerElement(plica, vrvPlica);
 
     vrvPlica->ReadPlicaVis(plica);
 
     parent->AddChild(vrvPlica);
-    ReadUnsupportedAttr(plica, vrvPlica);
+    this->ReadUnsupportedAttr(plica, vrvPlica);
     return true;
 }
 
 bool MEIInput::ReadProport(Object *parent, pugi::xml_node proport)
 {
     Proport *vrvProport = new Proport();
-    ReadLayerElement(proport, vrvProport);
+    this->ReadLayerElement(proport, vrvProport);
 
     vrvProport->ReadDurationRatio(proport);
 
     parent->AddChild(vrvProport);
-    ReadUnsupportedAttr(proport, vrvProport);
+    this->ReadUnsupportedAttr(proport, vrvProport);
     return true;
 }
 
 bool MEIInput::ReadSpace(Object *parent, pugi::xml_node space)
 {
     Space *vrvSpace = new Space();
-    ReadLayerElement(space, vrvSpace);
+    this->ReadLayerElement(space, vrvSpace);
 
-    ReadDurationInterface(space, vrvSpace);
+    this->ReadDurationInterface(space, vrvSpace);
 
     parent->AddChild(vrvSpace);
-    ReadUnsupportedAttr(space, vrvSpace);
+    this->ReadUnsupportedAttr(space, vrvSpace);
     return true;
 }
 
 bool MEIInput::ReadSyl(Object *parent, pugi::xml_node syl)
 {
     Syl *vrvSyl = new Syl();
-    ReadLayerElement(syl, vrvSyl);
+    this->ReadLayerElement(syl, vrvSyl);
 
     vrvSyl->ReadLang(syl);
     vrvSyl->ReadTypography(syl);
     vrvSyl->ReadSylLog(syl);
 
-    ReadFacsimileInterface(syl, vrvSyl);
+    this->ReadFacsimileInterface(syl, vrvSyl);
 
     parent->AddChild(vrvSyl);
-    ReadUnsupportedAttr(syl, vrvSyl);
-    return ReadTextChildren(vrvSyl, syl, vrvSyl);
+    this->ReadUnsupportedAttr(syl, vrvSyl);
+    return this->ReadTextChildren(vrvSyl, syl, vrvSyl);
 }
 
 bool MEIInput::ReadSyllable(Object *parent, pugi::xml_node syllable)
 {
     Syllable *vrvSyllable = new Syllable();
-    ReadLayerElement(syllable, vrvSyllable);
+    this->ReadLayerElement(syllable, vrvSyllable);
 
     vrvSyllable->ReadColor(syllable);
     vrvSyllable->ReadSlashCount(syllable);
 
     parent->AddChild(vrvSyllable);
-    return ReadLayerChildren(vrvSyllable, syllable, vrvSyllable);
+    return this->ReadLayerChildren(vrvSyllable, syllable, vrvSyllable);
 }
 
 bool MEIInput::ReadTabDurSym(Object *parent, pugi::xml_node tabRhyhtm)
 {
     TabDurSym *vrvTabDurSym = new TabDurSym();
-    ReadLayerElement(tabRhyhtm, vrvTabDurSym);
+    this->ReadLayerElement(tabRhyhtm, vrvTabDurSym);
 
     vrvTabDurSym->ReadNNumberLike(tabRhyhtm);
 
     parent->AddChild(vrvTabDurSym);
-    ReadUnsupportedAttr(tabRhyhtm, vrvTabDurSym);
+    this->ReadUnsupportedAttr(tabRhyhtm, vrvTabDurSym);
     return true;
 }
 
 bool MEIInput::ReadTabGrp(Object *parent, pugi::xml_node tabGrp)
 {
     TabGrp *vrvTabGrp = new TabGrp();
-    ReadLayerElement(tabGrp, vrvTabGrp);
+    this->ReadLayerElement(tabGrp, vrvTabGrp);
 
-    ReadDurationInterface(tabGrp, vrvTabGrp);
+    this->ReadDurationInterface(tabGrp, vrvTabGrp);
 
     parent->AddChild(vrvTabGrp);
-    ReadUnsupportedAttr(tabGrp, vrvTabGrp);
-    return ReadLayerChildren(vrvTabGrp, tabGrp, vrvTabGrp);
+    this->ReadUnsupportedAttr(tabGrp, vrvTabGrp);
+    return this->ReadLayerChildren(vrvTabGrp, tabGrp, vrvTabGrp);
 }
 
 bool MEIInput::ReadTuplet(Object *parent, pugi::xml_node tuplet)
 {
     Tuplet *vrvTuplet = new Tuplet();
-    ReadLayerElement(tuplet, vrvTuplet);
+    this->ReadLayerElement(tuplet, vrvTuplet);
 
     vrvTuplet->ReadColor(tuplet);
     vrvTuplet->ReadDurationRatio(tuplet);
@@ -6230,14 +6230,14 @@ bool MEIInput::ReadTuplet(Object *parent, pugi::xml_node tuplet)
     vrvTuplet->ReadTupletVis(tuplet);
 
     parent->AddChild(vrvTuplet);
-    ReadUnsupportedAttr(tuplet, vrvTuplet);
-    return ReadLayerChildren(vrvTuplet, tuplet, vrvTuplet);
+    this->ReadUnsupportedAttr(tuplet, vrvTuplet);
+    return this->ReadLayerChildren(vrvTuplet, tuplet, vrvTuplet);
 }
 
 bool MEIInput::ReadVerse(Object *parent, pugi::xml_node verse)
 {
     Verse *vrvVerse = new Verse();
-    ReadLayerElement(verse, vrvVerse);
+    this->ReadLayerElement(verse, vrvVerse);
 
     vrvVerse->ReadColor(verse);
     vrvVerse->ReadLang(verse);
@@ -6245,8 +6245,8 @@ bool MEIInput::ReadVerse(Object *parent, pugi::xml_node verse)
     vrvVerse->ReadTypography(verse);
 
     parent->AddChild(vrvVerse);
-    ReadUnsupportedAttr(verse, vrvVerse);
-    return ReadLayerChildren(vrvVerse, verse, vrvVerse);
+    this->ReadUnsupportedAttr(verse, vrvVerse);
+    return this->ReadLayerChildren(vrvVerse, verse, vrvVerse);
 }
 
 bool MEIInput::ReadTextChildren(Object *parent, pugi::xml_node parentNode, Object *filter)
@@ -6260,7 +6260,7 @@ bool MEIInput::ReadTextChildren(Object *parent, pugi::xml_node parentNode, Objec
             break;
         }
         elementName = std::string(xmlElement.name());
-        if (filter && !IsAllowed(elementName, filter)) {
+        if (filter && !this->IsAllowed(elementName, filter)) {
             std::string meiElementName = filter->GetClassName();
             std::transform(meiElementName.begin(), meiElementName.begin() + 1, meiElementName.begin(), ::tolower);
             LogWarning("Element <%s> within <%s> is not supported and will be ignored ", xmlElement.name(),
@@ -6268,37 +6268,37 @@ bool MEIInput::ReadTextChildren(Object *parent, pugi::xml_node parentNode, Objec
             continue;
         }
         // editorial
-        else if (IsEditorialElementName(xmlElement.name())) {
-            success = ReadEditorialElement(parent, xmlElement, EDITORIAL_TEXT, filter);
+        else if (this->IsEditorialElementName(xmlElement.name())) {
+            success = this->ReadEditorialElement(parent, xmlElement, EDITORIAL_TEXT, filter);
         }
         // content
         else if (elementName == "fig") {
-            success = ReadFig(parent, xmlElement);
+            success = this->ReadFig(parent, xmlElement);
         }
         else if (elementName == "lb") {
-            success = ReadLb(parent, xmlElement);
+            success = this->ReadLb(parent, xmlElement);
         }
         else if (elementName == "num") {
-            success = ReadNum(parent, xmlElement);
+            success = this->ReadNum(parent, xmlElement);
         }
         else if (elementName == "rend") {
-            success = ReadRend(parent, xmlElement);
+            success = this->ReadRend(parent, xmlElement);
         }
         else if (elementName == "svg") {
-            success = ReadSvg(parent, xmlElement);
+            success = this->ReadSvg(parent, xmlElement);
         }
         else if (xmlElement.text()) {
             bool trimLeft = (i == 0);
             bool trimRight = (!xmlElement.next_sibling());
-            success = ReadText(parent, xmlElement, trimLeft, trimRight);
+            success = this->ReadText(parent, xmlElement, trimLeft, trimRight);
         }
         // figured bass
         else if (elementName == "fb") {
-            success = ReadFb(parent, xmlElement);
+            success = this->ReadFb(parent, xmlElement);
         }
         // xml comment
         else if (elementName == "") {
-            success = ReadXMLComment(parent, xmlElement);
+            success = this->ReadXMLComment(parent, xmlElement);
         }
         // unknown
         else {
@@ -6311,7 +6311,7 @@ bool MEIInput::ReadTextChildren(Object *parent, pugi::xml_node parentNode, Objec
 
 bool MEIInput::ReadTextElement(pugi::xml_node element, TextElement *object)
 {
-    SetMeiUuid(element, object);
+    this->SetMeiUuid(element, object);
     object->ReadLabelled(element);
     object->ReadTyped(element);
 
@@ -6321,54 +6321,54 @@ bool MEIInput::ReadTextElement(pugi::xml_node element, TextElement *object)
 bool MEIInput::ReadF(Object *parent, pugi::xml_node f)
 {
     F *vrvF = new F();
-    ReadTextElement(f, vrvF);
+    this->ReadTextElement(f, vrvF);
 
-    ReadTimeSpanningInterface(f, vrvF);
+    this->ReadTimeSpanningInterface(f, vrvF);
     vrvF->ReadExtender(f);
 
     parent->AddChild(vrvF);
-    ReadUnsupportedAttr(f, vrvF);
-    return ReadTextChildren(vrvF, f, vrvF);
+    this->ReadUnsupportedAttr(f, vrvF);
+    return this->ReadTextChildren(vrvF, f, vrvF);
 }
 
 bool MEIInput::ReadFig(Object *parent, pugi::xml_node fig)
 {
     Fig *vrvFig = new Fig();
-    ReadTextElement(fig, vrvFig);
+    this->ReadTextElement(fig, vrvFig);
 
-    ReadAreaPosInterface(fig, vrvFig);
+    this->ReadAreaPosInterface(fig, vrvFig);
 
     parent->AddChild(vrvFig);
-    ReadUnsupportedAttr(fig, vrvFig);
-    return ReadTextChildren(vrvFig, fig, vrvFig);
+    this->ReadUnsupportedAttr(fig, vrvFig);
+    return this->ReadTextChildren(vrvFig, fig, vrvFig);
 }
 
 bool MEIInput::ReadLb(Object *parent, pugi::xml_node lb)
 {
     Lb *vrvLb = new Lb();
-    ReadTextElement(lb, vrvLb);
+    this->ReadTextElement(lb, vrvLb);
 
     parent->AddChild(vrvLb);
-    ReadUnsupportedAttr(lb, vrvLb);
+    this->ReadUnsupportedAttr(lb, vrvLb);
     return true;
 }
 
 bool MEIInput::ReadNum(Object *parent, pugi::xml_node num)
 {
     Num *vrvNum = new Num();
-    ReadTextElement(num, vrvNum);
+    this->ReadTextElement(num, vrvNum);
 
     parent->AddChild(vrvNum);
-    ReadUnsupportedAttr(num, vrvNum);
-    return ReadTextChildren(vrvNum, num, vrvNum);
+    this->ReadUnsupportedAttr(num, vrvNum);
+    return this->ReadTextChildren(vrvNum, num, vrvNum);
 }
 
 bool MEIInput::ReadRend(Object *parent, pugi::xml_node rend)
 {
     Rend *vrvRend = new Rend();
-    ReadTextElement(rend, vrvRend);
+    this->ReadTextElement(rend, vrvRend);
 
-    ReadAreaPosInterface(rend, vrvRend);
+    this->ReadAreaPosInterface(rend, vrvRend);
 
     vrvRend->ReadColor(rend);
     vrvRend->ReadLang(rend);
@@ -6384,14 +6384,14 @@ bool MEIInput::ReadRend(Object *parent, pugi::xml_node rend)
     }
 
     parent->AddChild(vrvRend);
-    ReadUnsupportedAttr(rend, vrvRend);
-    return ReadTextChildren(vrvRend, rend, vrvRend);
+    this->ReadUnsupportedAttr(rend, vrvRend);
+    return this->ReadTextChildren(vrvRend, rend, vrvRend);
 }
 
 bool MEIInput::ReadSvg(Object *parent, pugi::xml_node svg)
 {
     Svg *vrvSvg = new Svg();
-    SetMeiUuid(svg, vrvSvg);
+    this->SetMeiUuid(svg, vrvSvg);
 
     if (std::string(svg.name()) == "svg") {
         vrvSvg->Set(svg);
@@ -6401,7 +6401,7 @@ bool MEIInput::ReadSvg(Object *parent, pugi::xml_node svg)
     }
 
     parent->AddChild(vrvSvg);
-    ReadUnsupportedAttr(svg, vrvSvg);
+    this->ReadUnsupportedAttr(svg, vrvSvg);
     return true;
 }
 
@@ -6508,7 +6508,7 @@ bool MEIInput::ReadTimePointInterface(pugi::xml_node element, TimePointInterface
 
 bool MEIInput::ReadTimeSpanningInterface(pugi::xml_node element, TimeSpanningInterface *interface)
 {
-    ReadTimePointInterface(element, interface);
+    this->ReadTimePointInterface(element, interface);
     interface->ReadStartEndId(element);
     interface->ReadTimestamp2Logical(element);
     return true;
@@ -6524,55 +6524,55 @@ void MEIInput::ReadUnsupportedAttr(pugi::xml_node element, Object *object)
 bool MEIInput::ReadEditorialElement(Object *parent, pugi::xml_node current, EditorialLevel level, Object *filter)
 {
     if (std::string(current.name()) == "abbr") {
-        return ReadAbbr(parent, current, level, filter);
+        return this->ReadAbbr(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "add") {
-        return ReadAdd(parent, current, level, filter);
+        return this->ReadAdd(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "app") {
-        return ReadApp(parent, current, level, filter);
+        return this->ReadApp(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "annot") {
-        return ReadAnnot(parent, current);
+        return this->ReadAnnot(parent, current);
     }
     else if (std::string(current.name()) == "choice") {
-        return ReadChoice(parent, current, level, filter);
+        return this->ReadChoice(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "corr") {
-        return ReadCorr(parent, current, level, filter);
+        return this->ReadCorr(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "damage") {
-        return ReadDamage(parent, current, level, filter);
+        return this->ReadDamage(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "del") {
-        return ReadDel(parent, current, level, filter);
+        return this->ReadDel(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "expan") {
-        return ReadExpan(parent, current, level, filter);
+        return this->ReadExpan(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "orig") {
-        return ReadOrig(parent, current, level, filter);
+        return this->ReadOrig(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "ref") {
-        return ReadRef(parent, current, level, filter);
+        return this->ReadRef(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "reg") {
-        return ReadReg(parent, current, level, filter);
+        return this->ReadReg(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "restore") {
-        return ReadRestore(parent, current, level, filter);
+        return this->ReadRestore(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "sic") {
-        return ReadSic(parent, current, level, filter);
+        return this->ReadSic(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "subst") {
-        return ReadSubst(parent, current, level, filter);
+        return this->ReadSubst(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "supplied") {
-        return ReadSupplied(parent, current, level, filter);
+        return this->ReadSupplied(parent, current, level, filter);
     }
     else if (std::string(current.name()) == "unclear") {
-        return ReadUnclear(parent, current, level, filter);
+        return this->ReadUnclear(parent, current, level, filter);
     }
     else {
         assert(false); // this should never happen, MEIInput::s_editorialElementNames should be updated
@@ -6582,7 +6582,7 @@ bool MEIInput::ReadEditorialElement(Object *parent, pugi::xml_node current, Edit
 
 bool MEIInput::ReadEditorialElement(pugi::xml_node element, EditorialElement *object)
 {
-    SetMeiUuid(element, object);
+    this->SetMeiUuid(element, object);
 
     object->ReadLabelled(element);
     object->ReadTyped(element);
@@ -6593,31 +6593,31 @@ bool MEIInput::ReadEditorialElement(pugi::xml_node element, EditorialElement *ob
 bool MEIInput::ReadAbbr(Object *parent, pugi::xml_node abbr, EditorialLevel level, Object *filter)
 {
     Abbr *vrvAbbr = new Abbr();
-    ReadEditorialElement(abbr, vrvAbbr);
+    this->ReadEditorialElement(abbr, vrvAbbr);
 
     vrvAbbr->ReadSource(abbr);
 
     parent->AddChild(vrvAbbr);
-    ReadUnsupportedAttr(abbr, vrvAbbr);
-    return ReadEditorialChildren(vrvAbbr, abbr, level, filter);
+    this->ReadUnsupportedAttr(abbr, vrvAbbr);
+    return this->ReadEditorialChildren(vrvAbbr, abbr, level, filter);
 }
 
 bool MEIInput::ReadAdd(Object *parent, pugi::xml_node add, EditorialLevel level, Object *filter)
 {
     Add *vrvAdd = new Add();
-    ReadEditorialElement(add, vrvAdd);
+    this->ReadEditorialElement(add, vrvAdd);
 
     vrvAdd->ReadSource(add);
 
     parent->AddChild(vrvAdd);
-    ReadUnsupportedAttr(add, vrvAdd);
-    return ReadEditorialChildren(vrvAdd, add, level, filter);
+    this->ReadUnsupportedAttr(add, vrvAdd);
+    return this->ReadEditorialChildren(vrvAdd, add, level, filter);
 }
 
 bool MEIInput::ReadAnnot(Object *parent, pugi::xml_node annot)
 {
     Annot *vrvAnnot = new Annot();
-    ReadEditorialElement(annot, vrvAnnot);
+    this->ReadEditorialElement(annot, vrvAnnot);
 
     vrvAnnot->ReadPlist(annot);
     vrvAnnot->ReadSource(annot);
@@ -6629,7 +6629,7 @@ bool MEIInput::ReadAnnot(Object *parent, pugi::xml_node annot)
     }
 
     parent->AddChild(vrvAnnot);
-    ReadUnsupportedAttr(annot, vrvAnnot);
+    this->ReadUnsupportedAttr(annot, vrvAnnot);
     // for Annot we do not load children because they preserved in Annot::m_content
     return true;
 }
@@ -6641,11 +6641,11 @@ bool MEIInput::ReadApp(Object *parent, pugi::xml_node app, EditorialLevel level,
         return false;
     }
     App *vrvApp = new App(level);
-    ReadEditorialElement(app, vrvApp);
+    this->ReadEditorialElement(app, vrvApp);
 
     parent->AddChild(vrvApp);
-    ReadUnsupportedAttr(app, vrvApp);
-    return ReadAppChildren(vrvApp, app, level, filter);
+    this->ReadUnsupportedAttr(app, vrvApp);
+    return this->ReadAppChildren(vrvApp, app, level, filter);
 }
 
 bool MEIInput::ReadAppChildren(Object *parent, pugi::xml_node parentNode, EditorialLevel level, Object *filter)
@@ -6667,14 +6667,14 @@ bool MEIInput::ReadAppChildren(Object *parent, pugi::xml_node parentNode, Editor
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         if (std::string(current.name()) == "lem") {
-            success = ReadLem(parent, current, level, filter);
+            success = this->ReadLem(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "rdg") {
-            success = ReadRdg(parent, current, level, filter);
+            success = this->ReadRdg(parent, current, level, filter);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <app>", current.name());
@@ -6710,11 +6710,11 @@ bool MEIInput::ReadChoice(Object *parent, pugi::xml_node choice, EditorialLevel
         return false;
     }
     Choice *vrvChoice = new Choice(level);
-    ReadEditorialElement(choice, vrvChoice);
+    this->ReadEditorialElement(choice, vrvChoice);
 
     parent->AddChild(vrvChoice);
-    ReadUnsupportedAttr(choice, vrvChoice);
-    return ReadChoiceChildren(vrvChoice, choice, level, filter);
+    this->ReadUnsupportedAttr(choice, vrvChoice);
+    return this->ReadChoiceChildren(vrvChoice, choice, level, filter);
 }
 
 bool MEIInput::ReadChoiceChildren(Object *parent, pugi::xml_node parentNode, EditorialLevel level, Object *filter)
@@ -6738,35 +6738,35 @@ bool MEIInput::ReadChoiceChildren(Object *parent, pugi::xml_node parentNode, Edi
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         if (std::string(current.name()) == "abbr") {
-            success = ReadAbbr(parent, current, level, filter);
+            success = this->ReadAbbr(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "choice") {
-            success = ReadChoice(parent, current, level, filter);
+            success = this->ReadChoice(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "corr") {
-            success = ReadCorr(parent, current, level, filter);
+            success = this->ReadCorr(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "expan") {
-            success = ReadExpan(parent, current, level, filter);
+            success = this->ReadExpan(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "orig") {
-            success = ReadOrig(parent, current, level, filter);
+            success = this->ReadOrig(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "ref") {
-            success = ReadRef(parent, current, level, filter);
+            success = this->ReadRef(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "reg") {
-            success = ReadReg(parent, current, level, filter);
+            success = this->ReadReg(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "sic") {
-            success = ReadSic(parent, current, level, filter);
+            success = this->ReadSic(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "unclear") {
-            success = ReadUnclear(parent, current, level, filter);
+            success = this->ReadUnclear(parent, current, level, filter);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <choice>", current.name());
@@ -6801,49 +6801,49 @@ bool MEIInput::ReadChoiceChildren(Object *parent, pugi::xml_node parentNode, Edi
 bool MEIInput::ReadCorr(Object *parent, pugi::xml_node corr, EditorialLevel level, Object *filter)
 {
     Corr *vrvCorr = new Corr();
-    ReadEditorialElement(corr, vrvCorr);
+    this->ReadEditorialElement(corr, vrvCorr);
 
     vrvCorr->ReadSource(corr);
 
     parent->AddChild(vrvCorr);
-    ReadUnsupportedAttr(corr, vrvCorr);
-    return ReadEditorialChildren(vrvCorr, corr, level, filter);
+    this->ReadUnsupportedAttr(corr, vrvCorr);
+    return this->ReadEditorialChildren(vrvCorr, corr, level, filter);
 }
 
 bool MEIInput::ReadDamage(Object *parent, pugi::xml_node damage, EditorialLevel level, Object *filter)
 {
     Damage *vrvDamage = new Damage();
-    ReadEditorialElement(damage, vrvDamage);
+    this->ReadEditorialElement(damage, vrvDamage);
 
     vrvDamage->ReadSource(damage);
 
     parent->AddChild(vrvDamage);
-    ReadUnsupportedAttr(damage, vrvDamage);
-    return ReadEditorialChildren(vrvDamage, damage, level, filter);
+    this->ReadUnsupportedAttr(damage, vrvDamage);
+    return this->ReadEditorialChildren(vrvDamage, damage, level, filter);
 }
 
 bool MEIInput::ReadDel(Object *parent, pugi::xml_node del, EditorialLevel level, Object *filter)
 {
     Del *vrvDel = new Del();
-    ReadEditorialElement(del, vrvDel);
+    this->ReadEditorialElement(del, vrvDel);
 
     vrvDel->ReadSource(del);
 
     parent->AddChild(vrvDel);
-    ReadUnsupportedAttr(del, vrvDel);
-    return ReadEditorialChildren(vrvDel, del, level, filter);
+    this->ReadUnsupportedAttr(del, vrvDel);
+    return this->ReadEditorialChildren(vrvDel, del, level, filter);
 }
 
 bool MEIInput::ReadExpan(Object *parent, pugi::xml_node expan, EditorialLevel level, Object *filter)
 {
     Expan *vrvExpan = new Expan();
-    ReadEditorialElement(expan, vrvExpan);
+    this->ReadEditorialElement(expan, vrvExpan);
 
     vrvExpan->ReadSource(expan);
 
     parent->AddChild(vrvExpan);
-    ReadUnsupportedAttr(expan, vrvExpan);
-    return ReadEditorialChildren(vrvExpan, expan, level, filter);
+    this->ReadUnsupportedAttr(expan, vrvExpan);
+    return this->ReadEditorialChildren(vrvExpan, expan, level, filter);
 }
 
 bool MEIInput::ReadLem(Object *parent, pugi::xml_node lem, EditorialLevel level, Object *filter)
@@ -6853,25 +6853,25 @@ bool MEIInput::ReadLem(Object *parent, pugi::xml_node lem, EditorialLevel level,
     Lem *vrvLem = new Lem();
     // By default make them all hidden. MEIInput::ReadAppChildren will make one visible.
     vrvLem->m_visibility = Hidden;
-    ReadEditorialElement(lem, vrvLem);
+    this->ReadEditorialElement(lem, vrvLem);
 
     vrvLem->ReadSource(lem);
 
     parent->AddChild(vrvLem);
-    ReadUnsupportedAttr(lem, vrvLem);
-    return ReadEditorialChildren(vrvLem, lem, level, filter);
+    this->ReadUnsupportedAttr(lem, vrvLem);
+    return this->ReadEditorialChildren(vrvLem, lem, level, filter);
 }
 
 bool MEIInput::ReadOrig(Object *parent, pugi::xml_node orig, EditorialLevel level, Object *filter)
 {
     Orig *vrvOrig = new Orig();
-    ReadEditorialElement(orig, vrvOrig);
+    this->ReadEditorialElement(orig, vrvOrig);
 
     vrvOrig->ReadSource(orig);
 
     parent->AddChild(vrvOrig);
-    ReadUnsupportedAttr(orig, vrvOrig);
-    return ReadEditorialChildren(vrvOrig, orig, level, filter);
+    this->ReadUnsupportedAttr(orig, vrvOrig);
+    return this->ReadEditorialChildren(vrvOrig, orig, level, filter);
 }
 
 bool MEIInput::ReadRdg(Object *parent, pugi::xml_node rdg, EditorialLevel level, Object *filter)
@@ -6881,59 +6881,59 @@ bool MEIInput::ReadRdg(Object *parent, pugi::xml_node rdg, EditorialLevel level,
     Rdg *vrvRdg = new Rdg();
     // By default make them all hidden. MEIInput::ReadAppChildren will make one visible.
     vrvRdg->m_visibility = Hidden;
-    ReadEditorialElement(rdg, vrvRdg);
+    this->ReadEditorialElement(rdg, vrvRdg);
 
     vrvRdg->ReadSource(rdg);
 
     parent->AddChild(vrvRdg);
-    ReadUnsupportedAttr(rdg, vrvRdg);
-    return ReadEditorialChildren(vrvRdg, rdg, level, filter);
+    this->ReadUnsupportedAttr(rdg, vrvRdg);
+    return this->ReadEditorialChildren(vrvRdg, rdg, level, filter);
 }
 
 bool MEIInput::ReadRef(Object *parent, pugi::xml_node ref, EditorialLevel level, Object *filter)
 {
     Ref *vrvRef = new Ref();
-    ReadEditorialElement(ref, vrvRef);
+    this->ReadEditorialElement(ref, vrvRef);
 
     parent->AddChild(vrvRef);
-    ReadUnsupportedAttr(ref, vrvRef);
-    return ReadEditorialChildren(vrvRef, ref, level, filter);
+    this->ReadUnsupportedAttr(ref, vrvRef);
+    return this->ReadEditorialChildren(vrvRef, ref, level, filter);
 }
 
 bool MEIInput::ReadReg(Object *parent, pugi::xml_node reg, EditorialLevel level, Object *filter)
 {
     Reg *vrvReg = new Reg();
-    ReadEditorialElement(reg, vrvReg);
+    this->ReadEditorialElement(reg, vrvReg);
 
     vrvReg->ReadSource(reg);
 
     parent->AddChild(vrvReg);
-    ReadUnsupportedAttr(reg, vrvReg);
-    return ReadEditorialChildren(vrvReg, reg, level, filter);
+    this->ReadUnsupportedAttr(reg, vrvReg);
+    return this->ReadEditorialChildren(vrvReg, reg, level, filter);
 }
 
 bool MEIInput::ReadRestore(Object *parent, pugi::xml_node restore, EditorialLevel level, Object *filter)
 {
     Restore *vrvRestore = new Restore();
-    ReadEditorialElement(restore, vrvRestore);
+    this->ReadEditorialElement(restore, vrvRestore);
 
     vrvRestore->ReadSource(restore);
 
     parent->AddChild(vrvRestore);
-    ReadUnsupportedAttr(restore, vrvRestore);
-    return ReadEditorialChildren(vrvRestore, restore, level, filter);
+    this->ReadUnsupportedAttr(restore, vrvRestore);
+    return this->ReadEditorialChildren(vrvRestore, restore, level, filter);
 }
 
 bool MEIInput::ReadSic(Object *parent, pugi::xml_node sic, EditorialLevel level, Object *filter)
 {
     Sic *vrvSic = new Sic();
-    ReadEditorialElement(sic, vrvSic);
+    this->ReadEditorialElement(sic, vrvSic);
 
     vrvSic->ReadSource(sic);
 
     parent->AddChild(vrvSic);
-    ReadUnsupportedAttr(sic, vrvSic);
-    return ReadEditorialChildren(vrvSic, sic, level, filter);
+    this->ReadUnsupportedAttr(sic, vrvSic);
+    return this->ReadEditorialChildren(vrvSic, sic, level, filter);
 }
 
 bool MEIInput::ReadSubst(Object *parent, pugi::xml_node subst, EditorialLevel level, Object *filter)
@@ -6943,11 +6943,11 @@ bool MEIInput::ReadSubst(Object *parent, pugi::xml_node subst, EditorialLevel le
         return false;
     }
     Subst *vrvSubst = new Subst(level);
-    ReadEditorialElement(subst, vrvSubst);
+    this->ReadEditorialElement(subst, vrvSubst);
 
     parent->AddChild(vrvSubst);
-    ReadUnsupportedAttr(subst, vrvSubst);
-    return ReadSubstChildren(vrvSubst, subst, level, filter);
+    this->ReadUnsupportedAttr(subst, vrvSubst);
+    return this->ReadSubstChildren(vrvSubst, subst, level, filter);
 }
 
 bool MEIInput::ReadSubstChildren(Object *parent, pugi::xml_node parentNode, EditorialLevel level, Object *filter)
@@ -6971,17 +6971,17 @@ bool MEIInput::ReadSubstChildren(Object *parent, pugi::xml_node parentNode, Edit
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
         if (!success) break;
         if (std::string(current.name()) == "add") {
-            success = ReadAdd(parent, current, level, filter);
+            success = this->ReadAdd(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "del") {
-            success = ReadDel(parent, current, level, filter);
+            success = this->ReadDel(parent, current, level, filter);
         }
         else if (std::string(current.name()) == "subst") {
-            success = ReadSubst(parent, current, level, filter);
+            success = this->ReadSubst(parent, current, level, filter);
         }
         // xml comment
         else if (std::string(current.name()) == "") {
-            success = ReadXMLComment(parent, current);
+            success = this->ReadXMLComment(parent, current);
         }
         else {
             LogWarning("Unsupported '<%s>' within <subst>", current.name());
@@ -7016,25 +7016,25 @@ bool MEIInput::ReadSubstChildren(Object *parent, pugi::xml_node parentNode, Edit
 bool MEIInput::ReadSupplied(Object *parent, pugi::xml_node supplied, EditorialLevel level, Object *filter)
 {
     Supplied *vrvSupplied = new Supplied();
-    ReadEditorialElement(supplied, vrvSupplied);
+    this->ReadEditorialElement(supplied, vrvSupplied);
 
     vrvSupplied->ReadSource(supplied);
 
     parent->AddChild(vrvSupplied);
-    ReadUnsupportedAttr(supplied, vrvSupplied);
-    return ReadEditorialChildren(vrvSupplied, supplied, level, filter);
+    this->ReadUnsupportedAttr(supplied, vrvSupplied);
+    return this->ReadEditorialChildren(vrvSupplied, supplied, level, filter);
 }
 
 bool MEIInput::ReadUnclear(Object *parent, pugi::xml_node unclear, EditorialLevel level, Object *filter)
 {
     Unclear *vrvUnclear = new Unclear();
-    ReadEditorialElement(unclear, vrvUnclear);
+    this->ReadEditorialElement(unclear, vrvUnclear);
 
     vrvUnclear->ReadSource(unclear);
 
     parent->AddChild(vrvUnclear);
-    ReadUnsupportedAttr(unclear, vrvUnclear);
-    return ReadEditorialChildren(vrvUnclear, unclear, level, filter);
+    this->ReadUnsupportedAttr(unclear, vrvUnclear);
+    return this->ReadEditorialChildren(vrvUnclear, unclear, level, filter);
 }
 
 bool MEIInput::ReadEditorialChildren(Object *parent, pugi::xml_node parentNode, EditorialLevel level, Object *filter)
@@ -7043,33 +7043,33 @@ bool MEIInput::ReadEditorialChildren(Object *parent, pugi::xml_node parentNode,
 
     if (level == EDITORIAL_TOPLEVEL) {
         if (m_readingScoreBased)
-            return ReadSectionChildren(parent, parentNode);
+            return this->ReadSectionChildren(parent, parentNode);
         else
-            return ReadSystemChildren(parent, parentNode);
+            return this->ReadSystemChildren(parent, parentNode);
     }
     else if (level == EDITORIAL_SCOREDEF) {
-        return ReadScoreDefChildren(parent, parentNode);
+        return this->ReadScoreDefChildren(parent, parentNode);
     }
     else if (level == EDITORIAL_STAFFGRP) {
-        return ReadStaffGrpChildren(parent, parentNode);
+        return this->ReadStaffGrpChildren(parent, parentNode);
     }
     else if (level == EDITORIAL_MEASURE) {
-        return ReadMeasureChildren(parent, parentNode);
+        return this->ReadMeasureChildren(parent, parentNode);
     }
     else if (level == EDITORIAL_STAFF) {
-        return ReadStaffChildren(parent, parentNode);
+        return this->ReadStaffChildren(parent, parentNode);
     }
     else if (level == EDITORIAL_LAYER) {
-        return ReadLayerChildren(parent, parentNode, filter);
+        return this->ReadLayerChildren(parent, parentNode, filter);
     }
     else if (level == EDITORIAL_TEXT) {
-        return ReadTextChildren(parent, parentNode, filter);
+        return this->ReadTextChildren(parent, parentNode, filter);
     }
     else if (level == EDITORIAL_FB) {
-        return ReadFbChildren(parent, parentNode);
+        return this->ReadFbChildren(parent, parentNode);
     }
     else if (level == EDITORIAL_RUNNING) {
-        return ReadRunningChildren(parent, parentNode, filter);
+        return this->ReadRunningChildren(parent, parentNode, filter);
     }
     else {
         return false;
@@ -7084,7 +7084,7 @@ bool MEIInput::ReadBeamSpanAsBeam(Measure *measure, pugi::xml_node beamSpan)
     }
 
     Beam *beam = new Beam();
-    SetMeiUuid(beamSpan, beam);
+    this->SetMeiUuid(beamSpan, beam);
 
     LayerElement *start = NULL;
     LayerElement *end = NULL;
@@ -7161,7 +7161,7 @@ bool MEIInput::ReadTupletSpanAsTuplet(Measure *measure, pugi::xml_node tupletSpa
     }
 
     Tuplet *tuplet = new Tuplet();
-    SetMeiUuid(tupletSpan, tuplet);
+    this->SetMeiUuid(tupletSpan, tuplet);
 
     LayerElement *start = NULL;
     LayerElement *end = NULL;
@@ -7574,13 +7574,13 @@ bool MEIInput::ReadSurface(Facsimile *parent, pugi::xml_node surface)
 {
     assert(parent);
     Surface *vrvSurface = new Surface();
-    SetMeiUuid(surface, vrvSurface);
+    this->SetMeiUuid(surface, vrvSurface);
     vrvSurface->ReadCoordinated(surface);
     vrvSurface->ReadTyped(surface);
 
     for (pugi::xml_node child = surface.first_child(); child; child = child.next_sibling()) {
         if (strcmp(child.name(), "zone") == 0) {
-            ReadZone(vrvSurface, child);
+            this->ReadZone(vrvSurface, child);
         }
         else {
             LogWarning("Unsupported element <%s> in <surface>", child.name());
@@ -7594,7 +7594,7 @@ bool MEIInput::ReadZone(Surface *parent, pugi::xml_node zone)
 {
     assert(parent);
     Zone *vrvZone = new Zone();
-    SetMeiUuid(zone, vrvZone);
+    this->SetMeiUuid(zone, vrvZone);
     vrvZone->ReadCoordinated(zone);
     vrvZone->ReadTyped(zone);
     parent->AddChild(vrvZone);
@@ -7606,11 +7606,11 @@ bool MEIInput::ReadFacsimile(Doc *doc, pugi::xml_node facsimile)
     assert(doc);
     Facsimile *vrvFacsimile = new Facsimile();
     // Read xmlId (if present)
-    SetMeiUuid(facsimile, vrvFacsimile);
+    this->SetMeiUuid(facsimile, vrvFacsimile);
     // Read children
     for (pugi::xml_node child = facsimile.first_child(); child; child = child.next_sibling()) {
         if (strcmp(child.name(), "surface") == 0) {
-            ReadSurface(vrvFacsimile, child);
+            this->ReadSurface(vrvFacsimile, child);
         }
         else {
             LogWarning("Unsupported element <%s> in <facsimile>", child.name());
diff --git a/src/iopae.cpp b/src/iopae.cpp
index d143b2e8ccd..16c2aa02434 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -86,71 +86,71 @@ bool PAEOutput::Export(std::string &output)
 bool PAEOutput::WriteObject(Object *object)
 {
     if (object->Is(MDIV)) {
-        WriteMdiv(dynamic_cast<Mdiv *>(object));
+        this->WriteMdiv(dynamic_cast<Mdiv *>(object));
     }
     if (object->Is(SCOREDEF)) {
-        WriteScoreDef(dynamic_cast<ScoreDef *>(object));
+        this->WriteScoreDef(dynamic_cast<ScoreDef *>(object));
     }
     else if (object->Is(STAFFDEF)) {
-        WriteStaffDef(dynamic_cast<StaffDef *>(object));
+        this->WriteStaffDef(dynamic_cast<StaffDef *>(object));
     }
     else if (object->Is(MEASURE)) {
-        WriteMeasure(dynamic_cast<Measure *>(object));
+        this->WriteMeasure(dynamic_cast<Measure *>(object));
     }
     else if (object->Is(STAFF)) {
-        WriteStaff(dynamic_cast<Staff *>(object));
+        this->WriteStaff(dynamic_cast<Staff *>(object));
     }
     else if (object->Is(LAYER)) {
-        WriteLayer(dynamic_cast<Layer *>(object));
+        this->WriteLayer(dynamic_cast<Layer *>(object));
     }
 
     // Measure elements
 
     // Layer elements
     else if (object->Is(BARLINE)) {
-        WriteBarLine(dynamic_cast<BarLine *>(object));
+        this->WriteBarLine(dynamic_cast<BarLine *>(object));
     }
     else if (object->Is(BEAM)) {
-        WriteBeam(dynamic_cast<Beam *>(object));
+        this->WriteBeam(dynamic_cast<Beam *>(object));
     }
     else if (object->Is(CHORD)) {
-        WriteChord(dynamic_cast<Chord *>(object));
+        this->WriteChord(dynamic_cast<Chord *>(object));
     }
     else if (object->Is(CLEF)) {
-        WriteClef(dynamic_cast<Clef *>(object));
+        this->WriteClef(dynamic_cast<Clef *>(object));
     }
     else if (object->Is(GRACEGRP)) {
-        WriteGraceGrp(dynamic_cast<GraceGrp *>(object));
+        this->WriteGraceGrp(dynamic_cast<GraceGrp *>(object));
     }
     else if (object->Is(KEYACCID)) {
-        WriteKeyAccid(dynamic_cast<KeyAccid *>(object));
+        this->WriteKeyAccid(dynamic_cast<KeyAccid *>(object));
     }
     else if (object->Is(KEYSIG)) {
-        WriteKeySig(dynamic_cast<KeySig *>(object));
+        this->WriteKeySig(dynamic_cast<KeySig *>(object));
     }
     else if (object->Is(MENSUR)) {
-        WriteMensur(dynamic_cast<Mensur *>(object));
+        this->WriteMensur(dynamic_cast<Mensur *>(object));
     }
     else if (object->Is(METERSIG)) {
-        WriteMeterSig(dynamic_cast<MeterSig *>(object));
+        this->WriteMeterSig(dynamic_cast<MeterSig *>(object));
     }
     else if (object->Is(MREST)) {
-        WriteMRest(dynamic_cast<MRest *>(object));
+        this->WriteMRest(dynamic_cast<MRest *>(object));
     }
     else if (object->Is(MULTIREST)) {
-        WriteMultiRest(dynamic_cast<MultiRest *>(object));
+        this->WriteMultiRest(dynamic_cast<MultiRest *>(object));
     }
     else if (object->Is(NOTE)) {
-        WriteNote(dynamic_cast<Note *>(object));
+        this->WriteNote(dynamic_cast<Note *>(object));
     }
     else if (object->Is(REST)) {
-        WriteRest(dynamic_cast<Rest *>(object));
+        this->WriteRest(dynamic_cast<Rest *>(object));
     }
     else if (object->Is(SPACE)) {
-        WriteSpace(dynamic_cast<Space *>(object));
+        this->WriteSpace(dynamic_cast<Space *>(object));
     }
     else if (object->Is(TUPLET)) {
-        WriteTuplet(dynamic_cast<Tuplet *>(object));
+        this->WriteTuplet(dynamic_cast<Tuplet *>(object));
     }
     else {
         // Log something?
@@ -162,13 +162,13 @@ bool PAEOutput::WriteObject(Object *object)
 bool PAEOutput::WriteObjectEnd(Object *object)
 {
     if (object->Is(MEASURE)) {
-        WriteMeasureEnd(dynamic_cast<Measure *>(object));
+        this->WriteMeasureEnd(dynamic_cast<Measure *>(object));
     }
     else if (object->Is(BEAM)) {
-        WriteBeamEnd(dynamic_cast<Beam *>(object));
+        this->WriteBeamEnd(dynamic_cast<Beam *>(object));
     }
     else if (object->Is(TUPLET)) {
-        WriteTupletEnd(dynamic_cast<Tuplet *>(object));
+        this->WriteTupletEnd(dynamic_cast<Tuplet *>(object));
     }
 
     return true;
@@ -300,8 +300,8 @@ void PAEOutput::WriteChord(Chord *chord)
 
     std::string oct;
 
-    WriteDur(chord);
-    WriteGrace(chord);
+    this->WriteDur(chord);
+    this->WriteGrace(chord);
 }
 
 void PAEOutput::WriteClef(Clef *clef)
@@ -427,8 +427,8 @@ void PAEOutput::WriteNote(Note *note)
         if (note != chord->GetTopNote()) return;
     }
     else {
-        WriteDur(note);
-        WriteGrace(note);
+        this->WriteDur(note);
+        this->WriteGrace(note);
     }
 
     if (note->GetOct() != m_currentOct) {
@@ -479,7 +479,7 @@ void PAEOutput::WriteRest(Rest *rest)
 
     if (m_skip) return;
 
-    WriteDur(rest);
+    this->WriteDur(rest);
     m_streamStringOutput << "-";
 }
 
@@ -489,7 +489,7 @@ void PAEOutput::WriteSpace(Space *space)
 
     if (m_skip) return;
 
-    WriteDur(space);
+    this->WriteDur(space);
     // Simply make it a rest - no other option in PAE
     m_streamStringOutput << "-";
 }
@@ -3368,7 +3368,7 @@ bool PAEInput::ConvertPitch()
     for (auto &token : m_pae) {
         if (token.IsVoid()) continue;
 
-        if (Is(token, pae::NOTENAME)) {
+        if (this->Is(token, pae::NOTENAME)) {
             Note *note = new Note();
             data_PITCHNAME pitch = PITCHNAME_c;
             switch (token.m_char) {
@@ -3544,7 +3544,7 @@ bool PAEInput::ConvertAccidental()
     for (auto &token : m_pae) {
         if (token.IsVoid()) continue;
 
-        if (Is(token, pae::ACCIDENTAL_INTERNAL)) {
+        if (this->Is(token, pae::ACCIDENTAL_INTERNAL)) {
             switch (token.m_char) {
                 case 'x': accidental = ACCIDENTAL_WRITTEN_s; break;
                 case 'b': accidental = ACCIDENTAL_WRITTEN_f; break;
diff --git a/src/keyaccid.cpp b/src/keyaccid.cpp
index 7159b84e375..0d16ca5f373 100644
--- a/src/keyaccid.cpp
+++ b/src/keyaccid.cpp
@@ -34,12 +34,12 @@ KeyAccid::KeyAccid()
     : LayerElement(KEYACCID, "keyaccid-"), PitchInterface(), AttAccidental(), AttColor(), AttEnclosingChars()
 {
 
-    RegisterInterface(PitchInterface::GetAttClasses(), PitchInterface::IsInterface());
-    RegisterAttClass(ATT_ACCIDENTAL);
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_ENCLOSINGCHARS);
+    this->RegisterInterface(PitchInterface::GetAttClasses(), PitchInterface::IsInterface());
+    this->RegisterAttClass(ATT_ACCIDENTAL);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_ENCLOSINGCHARS);
 
-    Reset();
+    this->Reset();
 }
 
 KeyAccid::~KeyAccid() {}
@@ -48,9 +48,9 @@ void KeyAccid::Reset()
 {
     LayerElement::Reset();
     PitchInterface::Reset();
-    ResetAccidental();
-    ResetColor();
-    ResetEnclosingChars();
+    this->ResetAccidental();
+    this->ResetColor();
+    this->ResetEnclosingChars();
 }
 
 bool KeySig::IsSupportedChild(Object *child)
diff --git a/src/keysig.cpp b/src/keysig.cpp
index 260a54d6c9a..419c55eaecd 100644
--- a/src/keysig.cpp
+++ b/src/keysig.cpp
@@ -78,14 +78,14 @@ KeySig::KeySig()
     , AttKeySigVis()
     , AttVisibility()
 {
-    RegisterAttClass(ATT_ACCIDENTAL);
-    RegisterAttClass(ATT_PITCH);
-    RegisterAttClass(ATT_KEYSIGANL);
-    RegisterAttClass(ATT_KEYSIGLOG);
-    RegisterAttClass(ATT_KEYSIGVIS);
-    RegisterAttClass(ATT_VISIBILITY);
-
-    Reset();
+    this->RegisterAttClass(ATT_ACCIDENTAL);
+    this->RegisterAttClass(ATT_PITCH);
+    this->RegisterAttClass(ATT_KEYSIGANL);
+    this->RegisterAttClass(ATT_KEYSIGLOG);
+    this->RegisterAttClass(ATT_KEYSIGVIS);
+    this->RegisterAttClass(ATT_VISIBILITY);
+
+    this->Reset();
 }
 
 KeySig::~KeySig() {}
@@ -93,12 +93,12 @@ KeySig::~KeySig() {}
 void KeySig::Reset()
 {
     LayerElement::Reset();
-    ResetAccidental();
-    ResetPitch();
-    ResetKeySigAnl();
-    ResetKeySigLog();
-    ResetKeySigVis();
-    ResetVisibility();
+    this->ResetAccidental();
+    this->ResetPitch();
+    this->ResetKeySigAnl();
+    this->ResetKeySigLog();
+    this->ResetKeySigVis();
+    this->ResetVisibility();
 
     m_mixedChildrenAccidType = false;
 
diff --git a/src/label.cpp b/src/label.cpp
index f03180e3d3e..1008ff814d0 100644
--- a/src/label.cpp
+++ b/src/label.cpp
@@ -27,7 +27,7 @@ static const ClassRegistrar<Label> s_factory("label", LABEL);
 
 Label::Label() : Object(LABEL, "label-"), TextListInterface()
 {
-    Reset();
+    this->Reset();
 }
 
 Label::~Label() {}
diff --git a/src/labelabbr.cpp b/src/labelabbr.cpp
index 961b88b133b..17d0a169739 100644
--- a/src/labelabbr.cpp
+++ b/src/labelabbr.cpp
@@ -27,7 +27,7 @@ static const ClassRegistrar<LabelAbbr> s_factory("labelAbbr", LABELABBR);
 
 LabelAbbr::LabelAbbr() : Object(LABELABBR, "labelAbbr-"), TextListInterface()
 {
-    Reset();
+    this->Reset();
 }
 
 LabelAbbr::~LabelAbbr() {}
diff --git a/src/layer.cpp b/src/layer.cpp
index f0cf7dd5da3..751db4f3e46 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -46,9 +46,9 @@ static const ClassRegistrar<Layer> s_factory("layer", LAYER);
 Layer::Layer()
     : Object(LAYER, "layer-"), DrawingListInterface(), ObjectListInterface(), AttNInteger(), AttTyped(), AttVisibility()
 {
-    RegisterAttClass(ATT_NINTEGER);
-    RegisterAttClass(ATT_TYPED);
-    RegisterAttClass(ATT_VISIBILITY);
+    this->RegisterAttClass(ATT_NINTEGER);
+    this->RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_VISIBILITY);
 
     // owned pointers need to be set to NULL;
     m_staffDefClef = NULL;
@@ -61,24 +61,24 @@ Layer::Layer()
     m_cautionStaffDefMensur = NULL;
     m_cautionStaffDefMeterSig = NULL;
 
-    Reset();
+    this->Reset();
 }
 
 Layer::~Layer()
 {
     // We need to delete own objects
-    Reset();
+    this->Reset();
 }
 
 void Layer::Reset()
 {
     Object::Reset();
     DrawingListInterface::Reset();
-    ResetNInteger();
-    ResetTyped();
-    ResetVisibility();
+    this->ResetNInteger();
+    this->ResetTyped();
+    this->ResetVisibility();
 
-    ResetStaffDefObjects();
+    this->ResetStaffDefObjects();
 
     m_drawingStemDir = STEMDIRECTION_NONE;
     m_crossStaffFromAbove = false;
@@ -171,7 +171,7 @@ LayerElement *Layer::GetPrevious(LayerElement *element)
     this->ResetList(this);
     if (!element || this->GetList(this)->empty()) return NULL;
 
-    return dynamic_cast<LayerElement *>(GetListPrevious(element));
+    return dynamic_cast<LayerElement *>(this->GetListPrevious(element));
 }
 
 LayerElement *Layer::GetAtPos(int x)
@@ -200,13 +200,13 @@ Clef *Layer::GetClef(LayerElement *test)
     Object *testObject = test;
 
     if (!test) {
-        return GetCurrentClef();
+        return this->GetCurrentClef();
     }
 
     // make sure list is set
-    ResetList(this);
+    this->ResetList(this);
     if (!test->Is(CLEF)) {
-        testObject = GetListFirstBackward(testObject, CLEF);
+        testObject = this->GetListFirstBackward(testObject, CLEF);
     }
 
     if (testObject && testObject->Is(CLEF)) {
@@ -218,7 +218,7 @@ Clef *Layer::GetClef(LayerElement *test)
     if (facsClef != NULL) {
         return facsClef;
     }
-    return GetCurrentClef();
+    return this->GetCurrentClef();
 }
 
 Clef *Layer::GetClefFacs(LayerElement *test)
@@ -238,7 +238,7 @@ Clef *Layer::GetClefFacs(LayerElement *test)
 
 int Layer::GetClefLocOffset(LayerElement *test)
 {
-    Clef *clef = GetClef(test);
+    Clef *clef = this->GetClef(test);
     if (!clef) return 0;
     return clef->GetClefLocOffset();
 }
@@ -324,7 +324,7 @@ std::set<int> Layer::GetLayersNInTimeSpan(double time, double duration, Measure
 
     Functor layerCountInTimeSpan(&Object::LayerCountInTimeSpan);
     LayerCountInTimeSpanParams layerCountInTimeSpanParams(
-        GetCurrentMeterSig(), GetCurrentMensur(), &layerCountInTimeSpan);
+        this->GetCurrentMeterSig(), this->GetCurrentMensur(), &layerCountInTimeSpan);
     layerCountInTimeSpanParams.m_time = time;
     layerCountInTimeSpanParams.m_duration = duration;
 
@@ -378,7 +378,7 @@ ListOfObjects Layer::GetLayerElementsForTimeSpanOf(LayerElement *element, bool e
 
     Staff *staff = element->GetAncestorStaff(RESOLVE_CROSS_STAFF);
 
-    return GetLayerElementsInTimeSpan(time, duration, measure, staff->GetN(), excludeCurrent);
+    return this->GetLayerElementsInTimeSpan(time, duration, measure, staff->GetN(), excludeCurrent);
 }
 
 ListOfObjects Layer::GetLayerElementsInTimeSpan(
@@ -387,7 +387,8 @@ ListOfObjects Layer::GetLayerElementsInTimeSpan(
     assert(measure);
 
     Functor layerElementsInTimeSpan(&Object::LayerElementsInTimeSpan);
-    LayerElementsInTimeSpanParams layerElementsInTimeSpanParams(GetCurrentMeterSig(), GetCurrentMensur(), this);
+    LayerElementsInTimeSpanParams layerElementsInTimeSpanParams(
+        this->GetCurrentMeterSig(), this->GetCurrentMensur(), this);
     layerElementsInTimeSpanParams.m_time = time;
     layerElementsInTimeSpanParams.m_duration = duration;
     layerElementsInTimeSpanParams.m_allLayersButCurrent = excludeCurrent;
@@ -552,7 +553,7 @@ int Layer::ConvertToUnCastOffMensural(FunctorParams *functorParams)
 
 int Layer::ScoreDefUnsetCurrent(FunctorParams *functorParams)
 {
-    ResetStaffDefObjects();
+    this->ResetStaffDefObjects();
 
     return FUNCTOR_CONTINUE;
 }
@@ -560,29 +561,29 @@ int Layer::ScoreDefUnsetCurrent(FunctorParams *functorParams)
 int Layer::ResetHorizontalAlignment(FunctorParams *functorParams)
 {
     if (this->GetStaffDefClef()) {
-        GetStaffDefClef()->ResetHorizontalAlignment(functorParams);
+        this->GetStaffDefClef()->ResetHorizontalAlignment(functorParams);
     }
     if (this->GetStaffDefKeySig()) {
-        GetStaffDefKeySig()->ResetHorizontalAlignment(functorParams);
+        this->GetStaffDefKeySig()->ResetHorizontalAlignment(functorParams);
     }
     if (this->GetStaffDefMensur()) {
-        GetStaffDefMensur()->ResetHorizontalAlignment(functorParams);
+        this->GetStaffDefMensur()->ResetHorizontalAlignment(functorParams);
     }
     if (this->GetStaffDefMeterSig()) {
-        GetStaffDefMeterSig()->ResetHorizontalAlignment(functorParams);
+        this->GetStaffDefMeterSig()->ResetHorizontalAlignment(functorParams);
     }
 
     if (this->GetCautionStaffDefClef()) {
-        GetCautionStaffDefClef()->ResetHorizontalAlignment(functorParams);
+        this->GetCautionStaffDefClef()->ResetHorizontalAlignment(functorParams);
     }
     if (this->GetCautionStaffDefKeySig()) {
-        GetCautionStaffDefKeySig()->ResetHorizontalAlignment(functorParams);
+        this->GetCautionStaffDefKeySig()->ResetHorizontalAlignment(functorParams);
     }
     if (this->GetCautionStaffDefMensur()) {
-        GetCautionStaffDefMensur()->ResetHorizontalAlignment(functorParams);
+        this->GetCautionStaffDefMensur()->ResetHorizontalAlignment(functorParams);
     }
     if (this->GetCautionStaffDefMeterSig()) {
-        GetCautionStaffDefMeterSig()->ResetHorizontalAlignment(functorParams);
+        this->GetCautionStaffDefMeterSig()->ResetHorizontalAlignment(functorParams);
     }
 
     return FUNCTOR_CONTINUE;
@@ -593,8 +594,8 @@ int Layer::AlignHorizontally(FunctorParams *functorParams)
     AlignHorizontallyParams *params = vrv_params_cast<AlignHorizontallyParams *>(functorParams);
     assert(params);
 
-    params->m_currentMensur = GetCurrentMensur();
-    params->m_currentMeterSig = GetCurrentMeterSig();
+    params->m_currentMensur = this->GetCurrentMensur();
+    params->m_currentMeterSig = this->GetCurrentMeterSig();
 
     // We are starting a new layer, reset the time;
     // We set it to -1.0 for the scoreDef attributes since they have to be aligned before any timestamp event (-1.0)
@@ -606,25 +607,25 @@ int Layer::AlignHorizontally(FunctorParams *functorParams)
         params->m_scoreDefRole = SCOREDEF_INTERMEDIATE;
 
     if (this->GetStaffDefClef()) {
-        if (GetStaffDefClef()->GetVisible() != BOOLEAN_false) {
-            GetStaffDefClef()->AlignHorizontally(params);
+        if (this->GetStaffDefClef()->GetVisible() != BOOLEAN_false) {
+            this->GetStaffDefClef()->AlignHorizontally(params);
         }
     }
     if (this->GetStaffDefKeySig()) {
-        if (GetStaffDefKeySig()->GetVisible() != BOOLEAN_false) {
-            GetStaffDefKeySig()->AlignHorizontally(params);
+        if (this->GetStaffDefKeySig()->GetVisible() != BOOLEAN_false) {
+            this->GetStaffDefKeySig()->AlignHorizontally(params);
         }
     }
     if (this->GetStaffDefMensur()) {
-        GetStaffDefMensur()->AlignHorizontally(params);
+        this->GetStaffDefMensur()->AlignHorizontally(params);
     }
     if (this->GetStaffDefMeterSigGrp()) {
         Functor alignHorizontally(&Object::AlignHorizontally);
-        GetStaffDefMeterSigGrp()->Process(&alignHorizontally, params);
+        this->GetStaffDefMeterSigGrp()->Process(&alignHorizontally, params);
     }
     else if (this->GetStaffDefMeterSig()) {
-        if (GetStaffDefMeterSig()->GetForm() != METERFORM_invis) {
-            GetStaffDefMeterSig()->AlignHorizontally(params);
+        if (this->GetStaffDefMeterSig()->GetForm() != METERFORM_invis) {
+            this->GetStaffDefMeterSig()->AlignHorizontally(params);
         }
     }
 
@@ -645,16 +646,16 @@ int Layer::AlignHorizontallyEnd(FunctorParams *functorParams)
     params->m_time = params->m_measureAligner->GetMaxTime();
 
     if (this->GetCautionStaffDefClef()) {
-        GetCautionStaffDefClef()->AlignHorizontally(params);
+        this->GetCautionStaffDefClef()->AlignHorizontally(params);
     }
     if (this->GetCautionStaffDefKeySig()) {
-        GetCautionStaffDefKeySig()->AlignHorizontally(params);
+        this->GetCautionStaffDefKeySig()->AlignHorizontally(params);
     }
     if (this->GetCautionStaffDefMensur()) {
-        GetCautionStaffDefMensur()->AlignHorizontally(params);
+        this->GetCautionStaffDefMensur()->AlignHorizontally(params);
     }
     if (this->GetCautionStaffDefMeterSig()) {
-        GetCautionStaffDefMeterSig()->AlignHorizontally(params);
+        this->GetCautionStaffDefMeterSig()->AlignHorizontally(params);
     }
 
     params->m_scoreDefRole = SCOREDEF_NONE;
@@ -710,8 +711,8 @@ int Layer::CalcOnsetOffset(FunctorParams *functorParams)
     params->m_currentScoreTime = 0.0;
     params->m_currentRealTimeSeconds = 0.0;
 
-    params->m_currentMensur = GetCurrentMensur();
-    params->m_currentMeterSig = GetCurrentMeterSig();
+    params->m_currentMensur = this->GetCurrentMensur();
+    params->m_currentMeterSig = this->GetCurrentMeterSig();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index f382e12047b..1772df52755 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -72,37 +72,37 @@ namespace vrv {
 LayerElement::LayerElement()
     : Object(LAYER_ELEMENT, "le-"), FacsimileInterface(), LinkingInterface(), AttCoordX1(), AttLabelled(), AttTyped()
 {
-    RegisterInterface(FacsimileInterface::GetAttClasses(), FacsimileInterface::IsInterface());
-    RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
-    RegisterAttClass(ATT_COORDX1);
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(FacsimileInterface::GetAttClasses(), FacsimileInterface::IsInterface());
+    this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_COORDX1);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 LayerElement::LayerElement(ClassId classId)
     : Object(classId, "le-"), FacsimileInterface(), LinkingInterface(), AttCoordX1(), AttLabelled(), AttTyped()
 {
-    RegisterInterface(FacsimileInterface::GetAttClasses(), FacsimileInterface::IsInterface());
-    RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
-    RegisterAttClass(ATT_COORDX1);
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(FacsimileInterface::GetAttClasses(), FacsimileInterface::IsInterface());
+    this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_COORDX1);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 LayerElement::LayerElement(ClassId classId, const std::string &classIdStr)
     : Object(classId, classIdStr), FacsimileInterface(), LinkingInterface(), AttCoordX1(), AttLabelled(), AttTyped()
 {
-    RegisterInterface(FacsimileInterface::GetAttClasses(), FacsimileInterface::IsInterface());
-    RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
-    RegisterAttClass(ATT_COORDX1);
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(FacsimileInterface::GetAttClasses(), FacsimileInterface::IsInterface());
+    this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_COORDX1);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 void LayerElement::Reset()
@@ -110,9 +110,9 @@ void LayerElement::Reset()
     Object::Reset();
     FacsimileInterface::Reset();
     LinkingInterface::Reset();
-    ResetCoordX1();
-    ResetLabelled();
-    ResetTyped();
+    this->ResetCoordX1();
+    this->ResetLabelled();
+    this->ResetTyped();
 
     m_xAbs = VRV_UNSET;
     m_drawingYRel = 0;
@@ -471,13 +471,13 @@ int LayerElement::GetDrawingArticulationTopOrBottom(data_STAFFREL place, ArticTy
 
 void LayerElement::SetDrawingXRel(int drawingXRel)
 {
-    ResetCachedDrawingX();
+    this->ResetCachedDrawingX();
     m_drawingXRel = drawingXRel;
 }
 
 void LayerElement::SetDrawingYRel(int drawingYRel)
 {
-    ResetCachedDrawingY();
+    this->ResetCachedDrawingY();
     m_drawingYRel = drawingYRel;
 }
 
@@ -485,12 +485,12 @@ void LayerElement::CenterDrawingX()
 {
     if (m_xAbs != VRV_UNSET) return;
 
-    SetDrawingXRel(0);
+    this->SetDrawingXRel(0);
 
     Measure *measure = vrv_cast<Measure *>(this->GetFirstAncestor(MEASURE));
     assert(measure);
 
-    SetDrawingXRel(measure->GetInnerCenterX() - this->GetDrawingX());
+    this->SetDrawingXRel(measure->GetInnerCenterX() - this->GetDrawingX());
 }
 
 int LayerElement::GetDrawingTop(Doc *doc, int staffSize, bool withArtic, ArticType type)
@@ -879,10 +879,10 @@ MapOfDotLocs LayerElement::CalcOptimalDotLocations()
             }
 
             // Count collisions between each pair of dot choices
-            const int collisions11 = GetCollisionCount(dotLocs1, otherDotLocs1);
-            const int collisions12 = GetCollisionCount(dotLocs1, otherDotLocs2);
-            const int collisions21 = GetCollisionCount(dotLocs2, otherDotLocs1);
-            const int collisions22 = GetCollisionCount(dotLocs2, otherDotLocs2);
+            const int collisions11 = this->GetCollisionCount(dotLocs1, otherDotLocs1);
+            const int collisions12 = this->GetCollisionCount(dotLocs1, otherDotLocs2);
+            const int collisions21 = this->GetCollisionCount(dotLocs2, otherDotLocs1);
+            const int collisions22 = this->GetCollisionCount(dotLocs2, otherDotLocs2);
             const int maxCollisions = std::max({ collisions11, collisions12, collisions21, collisions22 });
 
             if (maxCollisions > 0) {
@@ -902,7 +902,7 @@ MapOfDotLocs LayerElement::CalcOptimalDotLocations()
     }
 
     // Count dots to decide which set is used
-    const bool usePrimary = (GetDotCount(dotLocs1) >= GetDotCount(dotLocs2));
+    const bool usePrimary = (this->GetDotCount(dotLocs1) >= this->GetDotCount(dotLocs2));
     return usePrimary ? dotLocs1 : dotLocs2;
 }
 
@@ -937,10 +937,10 @@ int LayerElement::GetCollisionCount(const MapOfDotLocs &dotLocs1, const MapOfDot
 
 int LayerElement::ResetHorizontalAlignment(FunctorParams *functorParams)
 {
-    SetDrawingXRel(0);
+    this->SetDrawingXRel(0);
     // Exception here: the LayerElement::m_drawingYRel position is already set for horizontal alignment
     // See Object::SetAlignmentPitchPos - for this reason we need to reset it here and not in ResetVerticalAlignment
-    SetDrawingYRel(0);
+    this->SetDrawingYRel(0);
 
     m_alignment = NULL;
     m_graceAlignment = NULL;
@@ -1454,7 +1454,8 @@ int LayerElement::AdjustBeams(FunctorParams *functorParams)
 
     // ignore elements that are not in the beam or are direct children of the beam
     if (!params->m_beam) return FUNCTOR_CONTINUE;
-    if (!params->m_isOtherLayer && !Is(ACCID) && (GetFirstAncestor(BEAM) == params->m_beam) && !IsGraceNote())
+    if (!params->m_isOtherLayer && !this->Is(ACCID) && (this->GetFirstAncestor(BEAM) == params->m_beam)
+        && !this->IsGraceNote())
         return FUNCTOR_CONTINUE;
     // ignore elements that are both on other layer and cross-staff
     if (params->m_isOtherLayer && m_crossStaff) return FUNCTOR_CONTINUE;
@@ -1477,16 +1478,19 @@ int LayerElement::AdjustBeams(FunctorParams *functorParams)
     // check if top/bottom of the element overlaps with beam coordinates
     int leftMargin = 0, rightMargin = 0;
     Beam *beam = vrv_cast<Beam *>(params->m_beam);
-    const int beamCount = beam->m_beamSegment.GetAdjacentElementsDuration(GetDrawingX()) - DUR_8;
+    const int beamCount = beam->m_beamSegment.GetAdjacentElementsDuration(this->GetDrawingX()) - DUR_8;
     const int currentBeamYLeft = params->m_y1 + params->m_beamSlope * (this->GetContentLeft() - params->m_x1);
     const int currentBeamYRight = params->m_y1 + params->m_beamSlope * (this->GetContentRight() - params->m_x1);
     if (params->m_directionBias > 0) {
-        leftMargin = GetContentTop() - currentBeamYLeft + beamCount * beam->m_beamWidth + beam->m_beamWidthBlack;
-        rightMargin = GetContentTop() - currentBeamYRight + beamCount * beam->m_beamWidth + beam->m_beamWidthBlack;
+        leftMargin = this->GetContentTop() - currentBeamYLeft + beamCount * beam->m_beamWidth + beam->m_beamWidthBlack;
+        rightMargin
+            = this->GetContentTop() - currentBeamYRight + beamCount * beam->m_beamWidth + beam->m_beamWidthBlack;
     }
     else {
-        leftMargin = GetContentBottom() - currentBeamYLeft - beamCount * beam->m_beamWidth - beam->m_beamWidthBlack;
-        rightMargin = GetContentBottom() - currentBeamYRight - beamCount * beam->m_beamWidth - beam->m_beamWidthBlack;
+        leftMargin
+            = this->GetContentBottom() - currentBeamYLeft - beamCount * beam->m_beamWidth - beam->m_beamWidthBlack;
+        rightMargin
+            = this->GetContentBottom() - currentBeamYRight - beamCount * beam->m_beamWidth - beam->m_beamWidthBlack;
     }
 
     const int overlapMargin = std::max(leftMargin * params->m_directionBias, rightMargin * params->m_directionBias);
@@ -1504,8 +1508,8 @@ int LayerElement::AdjustDots(FunctorParams *functorParams)
     AdjustDotsParams *params = vrv_params_cast<AdjustDotsParams *>(functorParams);
     assert(params);
 
-    if (Is(NOTE) && GetParent()->Is(CHORD)) return FUNCTOR_SIBLINGS;
-    if (Is(DOTS)) {
+    if (this->Is(NOTE) && this->GetParent()->Is(CHORD)) return FUNCTOR_SIBLINGS;
+    if (this->Is(DOTS)) {
         params->m_dots.push_back(this);
     }
     else {
@@ -1555,19 +1559,19 @@ int LayerElement::AdjustLayers(FunctorParams *functorParams)
 int LayerElement::AdjustOverlappingLayers(
     Doc *doc, const std::vector<LayerElement *> &otherElements, bool areDotsAdjusted, bool &isUnison, bool &stemSameas)
 {
-    if (Is(NOTE) && GetParent()->Is(CHORD))
+    if (this->Is(NOTE) && this->GetParent()->Is(CHORD))
         return 0;
-    else if (Is(STEM) && isUnison) {
+    else if (this->Is(STEM) && isUnison) {
         isUnison = false;
         return 0;
     }
-    else if (Is(STEM) && stemSameas) {
+    else if (this->Is(STEM) && stemSameas) {
         stemSameas = false;
         return 0;
     }
 
     auto [margin, isInUnison] = CalcElementHorizontalOverlap(doc, otherElements, areDotsAdjusted, false);
-    if (Is(NOTE)) {
+    if (this->Is(NOTE)) {
         isUnison = isInUnison;
         if (isUnison) return 0;
         Note *note = vrv_cast<Note *>(this);
@@ -1575,13 +1579,13 @@ int LayerElement::AdjustOverlappingLayers(
         stemSameas = note->HasStemSameasNote();
     }
 
-    if (Is({ DOTS, STEM })) {
-        LayerElement *parent = vrv_cast<LayerElement *>(GetParent());
+    if (this->Is({ DOTS, STEM })) {
+        LayerElement *parent = vrv_cast<LayerElement *>(this->GetParent());
         assert(parent);
         parent->SetDrawingXRel(parent->GetDrawingXRel() + margin);
     }
     else {
-        SetDrawingXRel(GetDrawingXRel() + margin);
+        this->SetDrawingXRel(this->GetDrawingXRel() + margin);
     }
     return margin;
 }
@@ -1600,7 +1604,7 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
         int horizontalMargin = 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
         bool isUnisonElement = false;
         // Handle stem collisions
-        if (Is(STEM)) {
+        if (this->Is(STEM)) {
             Stem *stem = vrv_cast<Stem *>(this);
             if (otherElements.at(i)->Is(NOTE)) {
                 shift += stem->CompareToElementPosition(doc, otherElements.at(i), -shift);
@@ -1611,7 +1615,7 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
             if (shift) break;
         }
         // handle note collisions
-        else if (Is(NOTE) && otherElements.at(i)->Is(NOTE)) {
+        else if (this->Is(NOTE) && otherElements.at(i)->Is(NOTE)) {
             Note *currentNote = vrv_cast<Note *>(this);
             Note *previousNote = vrv_cast<Note *>(otherElements.at(i));
             assert(previousNote);
@@ -1682,7 +1686,7 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
             }
         }
         // handle dot collisions
-        else if (Is(DOTS) && !otherElements.at(i)->Is(DOTS) && areDotsAdjusted) {
+        else if (this->Is(DOTS) && !otherElements.at(i)->Is(DOTS) && areDotsAdjusted) {
             // No need for shift if dot is adjusted
             Dots *dot = vrv_cast<Dots *>(this);
             if (dot->IsAdjusted() || !HorizontalSelfOverlap(otherElements.at(i), horizontalMargin)) continue;
@@ -1695,7 +1699,7 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
             }
         }
 
-        if (Is(NOTE) && !otherElements.at(i)->Is(STEM)) {
+        if (this->Is(NOTE) && !otherElements.at(i)->Is(STEM)) {
             // Nothing to do if we have no vertical overlap
             if (!VerticalSelfOverlap(otherElements.at(i), verticalMargin)) continue;
 
@@ -1738,7 +1742,7 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
 
     // If note is not in unison, has accidental and were to be shifted to the right - shift it to the left
     // That way accidental will be near note that actually has accidental and not near lowest-layer note
-    if (Is(NOTE) && isChordElement && unison && (shift > 0)) {
+    if (this->Is(NOTE) && isChordElement && unison && (shift > 0)) {
         Note *currentNote = vrv_cast<Note *>(this);
         if (currentNote->GetDrawingAccid()) shift *= -1;
     }
@@ -1801,11 +1805,11 @@ int LayerElement::AdjustTupletNumOverlap(FunctorParams *functorParams)
     }
 
     if (params->m_drawingNumPos == STAFFREL_basic_above) {
-        int dist = GetSelfTop();
+        int dist = this->GetSelfTop();
         if (params->m_yRel < dist) params->m_yRel = dist;
     }
     else {
-        int dist = GetSelfBottom();
+        int dist = this->GetSelfBottom();
         if (params->m_yRel > dist) params->m_yRel = dist;
     }
 
@@ -1876,7 +1880,7 @@ int LayerElement::AdjustXPos(FunctorParams *functorParams)
     else {
         // We add it to the upcoming bouding boxes
         params->m_upcomingBoundingBoxes.push_back(this);
-        params->m_currentAlignment.m_alignment = GetAlignment();
+        params->m_currentAlignment.m_alignment = this->GetAlignment();
         // Here we look how bounding boxes overlap and adjust the position only when necessary
         if (performBoundingBoxAlignment) {
             selfLeft = this->GetAlignment()->GetXRel();
@@ -1947,10 +1951,11 @@ int LayerElement::AdjustXPos(FunctorParams *functorParams)
 
     // In case of dots/flags we need to hold off of adjusting upcoming min position right away - if it happens that
     // these elements do not overlap with other elements we can draw them as is and save space
-    AlignmentReference *currentReference = GetAlignment()->GetReferenceWithElement(this, params->m_staffN);
-    Alignment *nextAlignment = vrv_cast<Alignment *>(GetAlignment()->GetParent()->GetNext(GetAlignment(), ALIGNMENT));
+    AlignmentReference *currentReference = this->GetAlignment()->GetReferenceWithElement(this, params->m_staffN);
+    Alignment *nextAlignment
+        = vrv_cast<Alignment *>(this->GetAlignment()->GetParent()->GetNext(this->GetAlignment(), ALIGNMENT));
     AlignmentType next = nextAlignment ? nextAlignment->GetType() : ALIGNMENT_DEFAULT;
-    if (Is({ DOTS, FLAG }) && currentReference->HasMultipleLayer() && (next != ALIGNMENT_MEASURE_RIGHT_BARLINE)) {
+    if (this->Is({ DOTS, FLAG }) && currentReference->HasMultipleLayer() && (next != ALIGNMENT_MEASURE_RIGHT_BARLINE)) {
         const int additionalOffset = selfRight - params->m_upcomingMinPos;
         if (additionalOffset > params->m_currentAlignment.m_offset) {
             params->m_currentAlignment.m_offset = additionalOffset;
@@ -2309,18 +2314,18 @@ int LayerElement::LayerElementsInTimeSpan(FunctorParams *functorParams)
     LayerElementsInTimeSpanParams *params = vrv_params_cast<LayerElementsInTimeSpanParams *>(functorParams);
     assert(params);
 
-    Layer *currentLayer = vrv_cast<Layer *>(GetFirstAncestor(LAYER));
+    Layer *currentLayer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     // Either get layer refernced by @m_layer or all layers but it, depending on the @m_allLayersButCurrent flag
     if ((!params->m_allLayersButCurrent && (currentLayer != params->m_layer))
         || (params->m_allLayersButCurrent && (currentLayer == params->m_layer))) {
         return FUNCTOR_SIBLINGS;
     }
-    if (!currentLayer || IsScoreDefElement() || Is(MREST)) return FUNCTOR_SIBLINGS;
-    if (!GetDurationInterface() || Is(MSPACE) || Is(SPACE) || HasSameasLink()) return FUNCTOR_CONTINUE;
+    if (!currentLayer || this->IsScoreDefElement() || this->Is(MREST)) return FUNCTOR_SIBLINGS;
+    if (!this->GetDurationInterface() || this->Is({ MSPACE, SPACE }) || this->HasSameasLink()) return FUNCTOR_CONTINUE;
 
-    const double duration = !GetParent()->Is(CHORD)
-        ? GetAlignmentDuration(params->m_mensur, params->m_meterSig)
-        : vrv_cast<Chord *>(GetParent())->GetAlignmentDuration(params->m_mensur, params->m_meterSig);
+    const double duration = !this->GetParent()->Is(CHORD)
+        ? this->GetAlignmentDuration(params->m_mensur, params->m_meterSig)
+        : vrv_cast<Chord *>(this->GetParent())->GetAlignmentDuration(params->m_mensur, params->m_meterSig);
 
     const double time = m_alignment->GetTime();
 
@@ -2332,7 +2337,7 @@ int LayerElement::LayerElementsInTimeSpan(FunctorParams *functorParams)
     params->m_elements.push_back(this);
 
     // Not need to recurse for chords
-    return Is(CHORD) ? FUNCTOR_SIBLINGS : FUNCTOR_CONTINUE;
+    return this->Is(CHORD) ? FUNCTOR_SIBLINGS : FUNCTOR_CONTINUE;
 }
 
 int LayerElement::FindSpannedLayerElements(FunctorParams *functorParams)
@@ -2569,17 +2574,19 @@ int LayerElement::GetRelativeLayerElement(FunctorParams *functorParams)
     // Do not check for index of the element if we're looking into neighboring layer or if nested element is being
     // processed (e.g. ignore index children of beams, since they have their own indices irrelevant to the one that
     // has been passed inside this functor)
-    if (!params->m_isInNeighboringLayer && GetParent()->Is(LAYER)) {
-        if (params->m_searchDirection == FORWARD && (GetIdx() < params->m_initialElementId)) return FUNCTOR_SIBLINGS;
-        if (params->m_searchDirection == BACKWARD && (GetIdx() > params->m_initialElementId)) return FUNCTOR_SIBLINGS;
+    if (!params->m_isInNeighboringLayer && this->GetParent()->Is(LAYER)) {
+        if (params->m_searchDirection == FORWARD && (this->GetIdx() < params->m_initialElementId))
+            return FUNCTOR_SIBLINGS;
+        if (params->m_searchDirection == BACKWARD && (this->GetIdx() > params->m_initialElementId))
+            return FUNCTOR_SIBLINGS;
     }
 
-    if (Is({ NOTE, CHORD, FTREM })) {
+    if (this->Is({ NOTE, CHORD, FTREM })) {
         params->m_relativeElement = this;
         return FUNCTOR_STOP;
     }
 
-    if (Is(REST)) return params->m_isInNeighboringLayer ? FUNCTOR_STOP : FUNCTOR_SIBLINGS;
+    if (this->Is(REST)) return params->m_isInNeighboringLayer ? FUNCTOR_STOP : FUNCTOR_SIBLINGS;
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/lb.cpp b/src/lb.cpp
index f1f8368e4b9..992c1e58390 100644
--- a/src/lb.cpp
+++ b/src/lb.cpp
@@ -27,7 +27,7 @@ static const ClassRegistrar<Lb> s_factory("lb", LB);
 
 Lb::Lb() : TextElement(LB, "lb-")
 {
-    Reset();
+    this->Reset();
 }
 
 Lb::~Lb() {}
diff --git a/src/lem.cpp b/src/lem.cpp
index 21c8600a23d..66082aa78a3 100644
--- a/src/lem.cpp
+++ b/src/lem.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Lem> s_factory("lem", LEM);
 
 Lem::Lem() : EditorialElement(LEM, "lem-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Lem::~Lem() {}
@@ -35,7 +35,7 @@ Lem::~Lem() {}
 void Lem::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/ligature.cpp b/src/ligature.cpp
index 0fa19aee46c..e67123d371a 100644
--- a/src/ligature.cpp
+++ b/src/ligature.cpp
@@ -32,9 +32,9 @@ static const ClassRegistrar<Ligature> s_factory("ligature", LIGATURE);
 
 Ligature::Ligature() : LayerElement(LIGATURE, "ligature-"), ObjectListInterface(), AttLigatureVis()
 {
-    RegisterAttClass(ATT_LIGATUREVIS);
+    this->RegisterAttClass(ATT_LIGATUREVIS);
 
-    Reset();
+    this->Reset();
 }
 
 Ligature::~Ligature()
@@ -45,7 +45,7 @@ Ligature::~Ligature()
 void Ligature::Reset()
 {
     LayerElement::Reset();
-    ResetLigatureVis();
+    this->ResetLigatureVis();
 
     ClearClusters();
 }
diff --git a/src/linkinginterface.cpp b/src/linkinginterface.cpp
index 35e78148295..9e62dcdc345 100644
--- a/src/linkinginterface.cpp
+++ b/src/linkinginterface.cpp
@@ -25,16 +25,16 @@ namespace vrv {
 
 LinkingInterface::LinkingInterface() : Interface(), AttLinking()
 {
-    RegisterInterfaceAttClass(ATT_LINKING);
+    this->RegisterInterfaceAttClass(ATT_LINKING);
 
-    Reset();
+    this->Reset();
 }
 
 LinkingInterface::~LinkingInterface() {}
 
 void LinkingInterface::Reset()
 {
-    ResetLinking();
+    this->ResetLinking();
 
     m_next = NULL;
     m_nextUuid = "";
diff --git a/src/lv.cpp b/src/lv.cpp
index 5894a472907..af094097677 100644
--- a/src/lv.cpp
+++ b/src/lv.cpp
@@ -25,7 +25,7 @@ static const ClassRegistrar<Lv> s_factory("lv", LV);
 
 Lv::Lv() : Tie(LV, "lv-")
 {
-    Reset();
+    this->Reset();
 }
 
 Lv::~Lv() {}
@@ -43,8 +43,8 @@ bool Lv::CalculatePosition(Doc *doc, Staff *staff, int x1, int x2, int spanningT
         return false;
     }
 
-    LayerElement *start = GetStart();
-    LayerElement *end = GetEnd();
+    LayerElement *start = this->GetStart();
+    LayerElement *end = this->GetEnd();
     if (start->GetFirstAncestor(MEASURE) != end->GetFirstAncestor(MEASURE)) {
         //  this makes no sense
         LogWarning("Lv across measures is not supported. Use <tie> instead.");
diff --git a/src/mdiv.cpp b/src/mdiv.cpp
index 2b809f79534..19f478d54e9 100644
--- a/src/mdiv.cpp
+++ b/src/mdiv.cpp
@@ -30,10 +30,10 @@ static const ClassRegistrar<Mdiv> s_factory("mdiv", MDIV);
 
 Mdiv::Mdiv() : PageElement(MDIV, "mdiv-"), PageMilestoneInterface(), AttLabelled(), AttNNumberLike()
 {
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 Mdiv::~Mdiv() {}
@@ -41,8 +41,8 @@ Mdiv::~Mdiv() {}
 void Mdiv::Reset()
 {
     Object::Reset();
-    ResetLabelled();
-    ResetNNumberLike();
+    this->ResetLabelled();
+    this->ResetNNumberLike();
 
     m_visibility = Hidden;
 }
@@ -64,8 +64,8 @@ bool Mdiv::IsSupportedChild(Object *child)
 void Mdiv::MakeVisible()
 {
     m_visibility = Visible;
-    if (GetParent() && GetParent()->Is(MDIV)) {
-        Mdiv *parent = vrv_cast<Mdiv *>(GetParent());
+    if (this->GetParent() && this->GetParent()->Is(MDIV)) {
+        Mdiv *parent = vrv_cast<Mdiv *>(this->GetParent());
         assert(parent);
         parent->MakeVisible();
     }
diff --git a/src/measure.cpp b/src/measure.cpp
index e7e603eca17..63cdb8604ba 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -63,14 +63,14 @@ Measure::Measure(bool measureMusic, int logMeasureNb)
     , AttPointing()
     , AttTyped()
 {
-    RegisterAttClass(ATT_BARRING);
-    RegisterAttClass(ATT_COORDX1);
-    RegisterAttClass(ATT_COORDX2);
-    RegisterAttClass(ATT_MEASURELOG);
-    RegisterAttClass(ATT_METERCONFORMANCEBAR);
-    RegisterAttClass(ATT_NNUMBERLIKE);
-    RegisterAttClass(ATT_POINTING);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_BARRING);
+    this->RegisterAttClass(ATT_COORDX1);
+    this->RegisterAttClass(ATT_COORDX2);
+    this->RegisterAttClass(ATT_MEASURELOG);
+    this->RegisterAttClass(ATT_METERCONFORMANCEBAR);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_POINTING);
+    this->RegisterAttClass(ATT_TYPED);
 
     m_measuredMusic = measureMusic;
     // We set parent to it because we want to access the parent doc from the aligners
@@ -88,7 +88,7 @@ Measure::Measure(bool measureMusic, int logMeasureNb)
     m_leftBarLine.SetPosition(BarLinePosition::Left);
     m_rightBarLine.SetPosition(BarLinePosition::Right);
 
-    Reset();
+    this->Reset();
 
     if (!measureMusic) this->SetRight(BARRENDITION_invis);
 }
@@ -96,7 +96,7 @@ Measure::Measure(bool measureMusic, int logMeasureNb)
 Measure::~Measure()
 {
     // We need to delete own objects
-    Reset();
+    this->Reset();
 }
 
 void Measure::CloneReset()
@@ -118,13 +118,13 @@ void Measure::CloneReset()
 void Measure::Reset()
 {
     Object::Reset();
-    ResetCoordX1();
-    ResetCoordX2();
-    ResetMeasureLog();
-    ResetMeterConformanceBar();
-    ResetNNumberLike();
-    ResetPointing();
-    ResetTyped();
+    this->ResetCoordX1();
+    this->ResetCoordX2();
+    this->ResetMeasureLog();
+    this->ResetMeterConformanceBar();
+    this->ResetNNumberLike();
+    this->ResetPointing();
+    this->ResetTyped();
 
     if (m_drawingScoreDef) {
         delete m_drawingScoreDef;
@@ -234,7 +234,7 @@ void Measure::ResetCachedDrawingX() const
 
 void Measure::SetDrawingXRel(int drawingXRel)
 {
-    ResetCachedDrawingX();
+    this->ResetCachedDrawingX();
     m_drawingXRel = drawingXRel;
 }
 
@@ -248,7 +248,7 @@ int Measure::GetLeftBarLineXRel() const
 
 int Measure::GetLeftBarLineLeft() const
 {
-    int x = GetLeftBarLineXRel();
+    int x = this->GetLeftBarLineXRel();
     if (m_leftBarLine.HasSelfBB()) {
         x += m_leftBarLine.GetContentX1();
     }
@@ -257,7 +257,7 @@ int Measure::GetLeftBarLineLeft() const
 
 int Measure::GetLeftBarLineRight() const
 {
-    int x = GetLeftBarLineXRel();
+    int x = this->GetLeftBarLineXRel();
     if (m_leftBarLine.HasSelfBB()) {
         x += m_leftBarLine.GetContentX2();
     }
@@ -274,7 +274,7 @@ int Measure::GetRightBarLineXRel() const
 
 int Measure::GetRightBarLineWidth(Doc *doc)
 {
-    const BarLine *barline = GetRightBarLine();
+    const BarLine *barline = this->GetRightBarLine();
     if (!barline) return 0;
 
     const int staffSize = 100;
@@ -306,7 +306,7 @@ int Measure::GetRightBarLineWidth(Doc *doc)
 
 int Measure::GetRightBarLineLeft() const
 {
-    int x = GetRightBarLineXRel();
+    int x = this->GetRightBarLineXRel();
     if (m_rightBarLine.HasSelfBB()) {
         x += m_rightBarLine.GetContentX1();
     }
@@ -315,7 +315,7 @@ int Measure::GetRightBarLineLeft() const
 
 int Measure::GetRightBarLineRight() const
 {
-    int x = GetRightBarLineXRel();
+    int x = this->GetRightBarLineXRel();
     if (m_rightBarLine.HasSelfBB()) {
         x += m_rightBarLine.GetContentX2();
     }
@@ -464,14 +464,14 @@ data_BARRENDITION Measure::GetDrawingLeftBarLineByStaffN(int staffN) const
 {
     auto elementIter = m_invisibleStaffBarlines.find(staffN);
     if (elementIter != m_invisibleStaffBarlines.end()) return elementIter->second.first;
-    return GetDrawingLeftBarLine();
+    return this->GetDrawingLeftBarLine();
 }
 
 data_BARRENDITION Measure::GetDrawingRightBarLineByStaffN(int staffN) const
 {
     auto elementIter = m_invisibleStaffBarlines.find(staffN);
     if (elementIter != m_invisibleStaffBarlines.end()) return elementIter->second.second;
-    return GetDrawingRightBarLine();
+    return this->GetDrawingRightBarLine();
 }
 
 Measure::BarlineRenditionPair Measure::SelectDrawingBarLines(Measure *previous)
@@ -529,11 +529,11 @@ Measure::BarlineRenditionPair Measure::SelectDrawingBarLines(Measure *previous)
                 { BARRENDITION_dbl, { BARRENDITION_dbl, BARRENDITION_NONE } } } },
     };
 
-    const BarlineRenditionPair defaultValue = { previous->GetRight(), GetLeft() };
+    const BarlineRenditionPair defaultValue = { previous->GetRight(), this->GetLeft() };
     auto previousRight = drawingLines.find(previous->GetRight());
     if (previousRight == drawingLines.end()) return defaultValue;
 
-    auto currentLeft = previousRight->second.find(GetLeft());
+    auto currentLeft = previousRight->second.find(this->GetLeft());
     if (currentLeft == previousRight->second.end()) return defaultValue;
 
     return currentLeft->second;
@@ -627,7 +627,7 @@ void Measure::SetInvisibleStaffBarlines(
     for (const auto object : previousInvisible) {
         Staff *staff = vrv_cast<Staff *>(object);
         assert(staff);
-        data_BARRENDITION left = GetLeft();
+        data_BARRENDITION left = this->GetLeft();
         if ((left == BARRENDITION_NONE) && !(barlineDrawingFlags & BarlineDrawingFlags::SCORE_DEF_INSERT))
             left = BARRENDITION_single;
         auto [iter, result] = m_invisibleStaffBarlines.insert({ staff->GetN(), { left, BARRENDITION_NONE } });
@@ -829,7 +829,7 @@ int Measure::ScoreDefOptimize(FunctorParams *functorParams)
 
 int Measure::ResetHorizontalAlignment(FunctorParams *functorParams)
 {
-    SetDrawingXRel(0);
+    this->SetDrawingXRel(0);
     if (m_measureAligner.GetLeftAlignment()) {
         m_measureAligner.GetLeftAlignment()->SetXRel(0);
     }
@@ -1171,7 +1171,7 @@ int Measure::JustifyX(FunctorParams *functorParams)
         this->SetDrawingXRel(params->m_measureXRel);
     }
     else {
-        params->m_measureXRel = GetDrawingXRel();
+        params->m_measureXRel = this->GetDrawingXRel();
     }
 
     m_measureAligner.Process(params->m_functor, params);
diff --git a/src/mensur.cpp b/src/mensur.cpp
index 2298a43a3f0..dc9d88e28d3 100644
--- a/src/mensur.cpp
+++ b/src/mensur.cpp
@@ -39,15 +39,15 @@ Mensur::Mensur()
     , AttSlashCount()
     , AttStaffLoc()
 {
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CUE);
-    RegisterAttClass(ATT_DURATIONRATIO);
-    RegisterAttClass(ATT_MENSURALSHARED);
-    RegisterAttClass(ATT_MENSURVIS);
-    RegisterAttClass(ATT_SLASHCOUNT);
-    RegisterAttClass(ATT_STAFFLOC);
-
-    Reset();
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CUE);
+    this->RegisterAttClass(ATT_DURATIONRATIO);
+    this->RegisterAttClass(ATT_MENSURALSHARED);
+    this->RegisterAttClass(ATT_MENSURVIS);
+    this->RegisterAttClass(ATT_SLASHCOUNT);
+    this->RegisterAttClass(ATT_STAFFLOC);
+
+    this->Reset();
 }
 
 Mensur::~Mensur() {}
@@ -55,13 +55,13 @@ Mensur::~Mensur() {}
 void Mensur::Reset()
 {
     LayerElement::Reset();
-    ResetColor();
-    ResetCue();
-    ResetDurationRatio();
-    ResetMensuralShared();
-    ResetMensurVis();
-    ResetSlashCount();
-    ResetStaffLoc();
+    this->ResetColor();
+    this->ResetCue();
+    this->ResetDurationRatio();
+    this->ResetMensuralShared();
+    this->ResetMensurVis();
+    this->ResetSlashCount();
+    this->ResetStaffLoc();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/metersig.cpp b/src/metersig.cpp
index fa52e0dec9b..add4b4a1199 100644
--- a/src/metersig.cpp
+++ b/src/metersig.cpp
@@ -29,11 +29,11 @@ static const ClassRegistrar<MeterSig> s_factory("meterSig", METERSIG);
 
 MeterSig::MeterSig() : LayerElement(METERSIG, "msig-"), AttEnclosingChars(), AttMeterSigLog(), AttMeterSigVis()
 {
-    RegisterAttClass(ATT_ENCLOSINGCHARS);
-    RegisterAttClass(ATT_METERSIGLOG);
-    RegisterAttClass(ATT_METERSIGVIS);
+    this->RegisterAttClass(ATT_ENCLOSINGCHARS);
+    this->RegisterAttClass(ATT_METERSIGLOG);
+    this->RegisterAttClass(ATT_METERSIGVIS);
 
-    Reset();
+    this->Reset();
 }
 
 MeterSig::~MeterSig() {}
@@ -41,9 +41,9 @@ MeterSig::~MeterSig() {}
 void MeterSig::Reset()
 {
     LayerElement::Reset();
-    ResetEnclosingChars();
-    ResetMeterSigLog();
-    ResetMeterSigVis();
+    this->ResetEnclosingChars();
+    this->ResetMeterSigLog();
+    this->ResetMeterSigVis();
 }
 
 int MeterSig::GetTotalCount() const
diff --git a/src/metersiggrp.cpp b/src/metersiggrp.cpp
index 860254b0800..3e0ff3159aa 100644
--- a/src/metersiggrp.cpp
+++ b/src/metersiggrp.cpp
@@ -33,13 +33,13 @@ MeterSigGrp::MeterSigGrp()
     , AttMeterSigGrpLog()
     , AttTyped()
 {
-    RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
-    RegisterAttClass(ATT_BASIC);
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_METERSIGGRPLOG);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_BASIC);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_METERSIGGRPLOG);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 MeterSigGrp::~MeterSigGrp() {}
@@ -48,10 +48,10 @@ void MeterSigGrp::Reset()
 {
     Object::Reset();
     LinkingInterface::Reset();
-    ResetBasic();
-    ResetLabelled();
-    ResetTyped();
-    ResetMeterSigGrpLog();
+    this->ResetBasic();
+    this->ResetLabelled();
+    this->ResetTyped();
+    this->ResetMeterSigGrpLog();
 }
 
 bool MeterSigGrp::IsSupportedChild(Object *child)
@@ -82,7 +82,7 @@ MeterSig *MeterSigGrp::GetSimplifiedMeterSig()
 {
     MeterSig *newMeterSig = NULL;
     const ArrayOfObjects *childList = this->GetList(this);
-    switch (GetFunc()) {
+    switch (this->GetFunc()) {
         // For alternating meterSig group alternate between children sequentially
         case meterSigGrpLog_FUNC_alternating: {
             const int index = m_count % childList->size();
diff --git a/src/mnum.cpp b/src/mnum.cpp
index ff1582e86ce..2dc8aff0daf 100644
--- a/src/mnum.cpp
+++ b/src/mnum.cpp
@@ -33,13 +33,13 @@ MNum::MNum()
     , AttLang()
     , AttTypography()
 {
-    RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_LANG);
-    RegisterAttClass(ATT_TYPOGRAPHY);
+    this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_LANG);
+    this->RegisterAttClass(ATT_TYPOGRAPHY);
 
-    Reset();
+    this->Reset();
 }
 
 MNum::~MNum() {}
@@ -49,9 +49,9 @@ void MNum::Reset()
     ControlElement::Reset();
     TextDirInterface::Reset();
     TimePointInterface::Reset();
-    ResetColor();
-    ResetLang();
-    ResetTypography();
+    this->ResetColor();
+    this->ResetLang();
+    this->ResetTypography();
 
     m_isGenerated = false;
 }
diff --git a/src/mordent.cpp b/src/mordent.cpp
index 306ca104aa2..f365b77b58a 100644
--- a/src/mordent.cpp
+++ b/src/mordent.cpp
@@ -33,14 +33,14 @@ Mordent::Mordent()
     , AttPlacementRelStaff()
     , AttMordentLog()
 {
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_EXTSYM);
-    RegisterAttClass(ATT_ORNAMENTACCID);
-    RegisterAttClass(ATT_PLACEMENTRELSTAFF);
-    RegisterAttClass(ATT_MORDENTLOG);
-
-    Reset();
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_EXTSYM);
+    this->RegisterAttClass(ATT_ORNAMENTACCID);
+    this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
+    this->RegisterAttClass(ATT_MORDENTLOG);
+
+    this->Reset();
 }
 
 Mordent::~Mordent() {}
@@ -49,32 +49,32 @@ void Mordent::Reset()
 {
     ControlElement::Reset();
     TimePointInterface::Reset();
-    ResetColor();
-    ResetExtSym();
-    ResetOrnamentAccid();
-    ResetPlacementRelStaff();
-    ResetMordentLog();
+    this->ResetColor();
+    this->ResetExtSym();
+    this->ResetOrnamentAccid();
+    this->ResetPlacementRelStaff();
+    this->ResetMordentLog();
 }
 
 wchar_t Mordent::GetMordentGlyph() const
 {
     // If there is glyph.num, prioritize it
-    if (HasGlyphNum()) {
-        wchar_t code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        wchar_t code = this->GetGlyphNum();
         if (NULL != Resources::GetGlyph(code)) return code;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
     // Handle glyph based on other attributes
-    if (GetLong() == BOOLEAN_true) {
-        return GetForm() == mordentLog_FORM_upper ? SMUFL_E56E_ornamentTremblement
-                                                  : SMUFL_E5BD_ornamentPrecompTrillWithMordent;
+    if (this->GetLong() == BOOLEAN_true) {
+        return this->GetForm() == mordentLog_FORM_upper ? SMUFL_E56E_ornamentTremblement
+                                                        : SMUFL_E5BD_ornamentPrecompTrillWithMordent;
     }
-    return GetForm() == mordentLog_FORM_upper ? SMUFL_E56C_ornamentShortTrill : SMUFL_E56D_ornamentMordent;
+    return this->GetForm() == mordentLog_FORM_upper ? SMUFL_E56C_ornamentShortTrill : SMUFL_E56D_ornamentMordent;
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/mrest.cpp b/src/mrest.cpp
index 5e3129ee2a7..10b5d50c08b 100644
--- a/src/mrest.cpp
+++ b/src/mrest.cpp
@@ -32,13 +32,13 @@ static const ClassRegistrar<MRest> s_factory("mRest", MREST);
 MRest::MRest()
     : LayerElement(MREST, "mrest-"), PositionInterface(), AttColor(), AttCue(), AttFermataPresent(), AttVisibility()
 {
-    RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CUE);
-    RegisterAttClass(ATT_FERMATAPRESENT);
-    RegisterAttClass(ATT_VISIBILITY);
+    this->RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CUE);
+    this->RegisterAttClass(ATT_FERMATAPRESENT);
+    this->RegisterAttClass(ATT_VISIBILITY);
 
-    Reset();
+    this->Reset();
 }
 
 MRest::~MRest() {}
@@ -47,10 +47,10 @@ void MRest::Reset()
 {
     LayerElement::Reset();
     PositionInterface::Reset();
-    ResetColor();
-    ResetCue();
-    ResetFermataPresent();
-    ResetVisibility();
+    this->ResetColor();
+    this->ResetCue();
+    this->ResetFermataPresent();
+    this->ResetVisibility();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/mrpt.cpp b/src/mrpt.cpp
index 56dba021ed4..b2b2e05d8de 100644
--- a/src/mrpt.cpp
+++ b/src/mrpt.cpp
@@ -32,9 +32,9 @@ static const ClassRegistrar<MRpt> s_factory("mRpt", MRPT);
 
 MRpt::MRpt() : LayerElement(MRPT, "mrpt-"), AttColor()
 {
-    RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_COLOR);
 
-    Reset();
+    this->Reset();
 }
 
 MRpt::~MRpt() {}
@@ -42,7 +42,7 @@ MRpt::~MRpt() {}
 void MRpt::Reset()
 {
     LayerElement::Reset();
-    ResetColor();
+    this->ResetColor();
 
     m_drawingMeasureCount = 0;
 }
diff --git a/src/mrpt2.cpp b/src/mrpt2.cpp
index 3904ebad303..a6e5ae6377a 100644
--- a/src/mrpt2.cpp
+++ b/src/mrpt2.cpp
@@ -32,9 +32,9 @@ static const ClassRegistrar<MRpt2> s_factory("mRpt2", MRPT2);
 
 MRpt2::MRpt2() : LayerElement(MRPT2, "mrpt2-"), AttColor()
 {
-    RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_COLOR);
 
-    Reset();
+    this->Reset();
 }
 
 MRpt2::~MRpt2() {}
@@ -42,7 +42,7 @@ MRpt2::~MRpt2() {}
 void MRpt2::Reset()
 {
     LayerElement::Reset();
-    ResetColor();
+    this->ResetColor();
 }
 
 } // namespace vrv
diff --git a/src/mspace.cpp b/src/mspace.cpp
index fc9e9b3d839..b8b0c0ec28a 100644
--- a/src/mspace.cpp
+++ b/src/mspace.cpp
@@ -24,7 +24,7 @@ static const ClassRegistrar<MSpace> s_factory("mSpace", MSPACE);
 
 MSpace::MSpace() : LayerElement(MSPACE, "mSpace-")
 {
-    Reset();
+    this->Reset();
 }
 
 MSpace::~MSpace() {}
diff --git a/src/multirest.cpp b/src/multirest.cpp
index 884f8f2fa6e..5a8a2766254 100644
--- a/src/multirest.cpp
+++ b/src/multirest.cpp
@@ -28,13 +28,13 @@ MultiRest::MultiRest()
     , AttNumberPlacement()
     , AttWidth()
 {
-    RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_MULTIRESTVIS);
-    RegisterAttClass(ATT_NUMBERED);
-    RegisterAttClass(ATT_NUMBERPLACEMENT);
-    RegisterAttClass(ATT_WIDTH);
-    Reset();
+    this->RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_MULTIRESTVIS);
+    this->RegisterAttClass(ATT_NUMBERED);
+    this->RegisterAttClass(ATT_NUMBERPLACEMENT);
+    this->RegisterAttClass(ATT_WIDTH);
+    this->Reset();
 }
 
 MultiRest::~MultiRest() {}
@@ -43,11 +43,11 @@ void MultiRest::Reset()
 {
     LayerElement::Reset();
     PositionInterface::Reset();
-    ResetColor();
-    ResetMultiRestVis();
-    ResetNumbered();
-    ResetNumberPlacement();
-    ResetWidth();
+    this->ResetColor();
+    this->ResetMultiRestVis();
+    this->ResetNumbered();
+    this->ResetNumberPlacement();
+    this->ResetWidth();
 }
 
 bool MultiRest::UseBlockStyle(Doc *doc) const
@@ -55,19 +55,19 @@ bool MultiRest::UseBlockStyle(Doc *doc) const
     bool useBlock = false;
     switch (doc->GetOptions()->m_multiRestStyle.GetValue()) {
         case MULTIRESTSTYLE_auto:
-            if (GetNum() > 15) {
+            if (this->GetNum() > 15) {
                 useBlock = true;
             }
-            else if (GetNum() > 4) {
-                useBlock = (GetBlock() != BOOLEAN_false);
+            else if (this->GetNum() > 4) {
+                useBlock = (this->GetBlock() != BOOLEAN_false);
             }
             else {
-                useBlock = (GetBlock() == BOOLEAN_true);
+                useBlock = (this->GetBlock() == BOOLEAN_true);
             }
             break;
-        case MULTIRESTSTYLE_default: useBlock = (GetNum() > 4); break;
-        case MULTIRESTSTYLE_block: useBlock = (GetNum() > 1); break;
-        case MULTIRESTSTYLE_symbols: useBlock = (GetNum() > 30); break;
+        case MULTIRESTSTYLE_default: useBlock = (this->GetNum() > 4); break;
+        case MULTIRESTSTYLE_block: useBlock = (this->GetNum() > 1); break;
+        case MULTIRESTSTYLE_symbols: useBlock = (this->GetNum() > 30); break;
         default: // should not arrive here
             break;
     }
diff --git a/src/multirpt.cpp b/src/multirpt.cpp
index 670440e30ed..e6891d46a8f 100644
--- a/src/multirpt.cpp
+++ b/src/multirpt.cpp
@@ -32,8 +32,8 @@ static const ClassRegistrar<MultiRpt> s_factory("multiRpt", MULTIRPT);
 
 MultiRpt::MultiRpt() : LayerElement(MULTIRPT, "multirpt-"), AttNumbered()
 {
-    RegisterAttClass(ATT_NUMBERED);
-    Reset();
+    this->RegisterAttClass(ATT_NUMBERED);
+    this->Reset();
 }
 
 MultiRpt::~MultiRpt() {}
@@ -41,7 +41,7 @@ MultiRpt::~MultiRpt() {}
 void MultiRpt::Reset()
 {
     LayerElement::Reset();
-    ResetNumbered();
+    this->ResetNumbered();
 }
 
 } // namespace vrv
diff --git a/src/nc.cpp b/src/nc.cpp
index 991b1693b0a..8b0482511df 100644
--- a/src/nc.cpp
+++ b/src/nc.cpp
@@ -37,14 +37,14 @@ Nc::Nc()
     , AttNcForm()
 
 {
-    RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
-    RegisterInterface(PitchInterface::GetAttClasses(), PitchInterface::IsInterface());
-    RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_INTERVALMELODIC);
-    RegisterAttClass(ATT_NCFORM);
-
-    Reset();
+    this->RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
+    this->RegisterInterface(PitchInterface::GetAttClasses(), PitchInterface::IsInterface());
+    this->RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_INTERVALMELODIC);
+    this->RegisterAttClass(ATT_NCFORM);
+
+    this->Reset();
 }
 
 Nc::~Nc() {}
@@ -55,9 +55,9 @@ void Nc::Reset()
     DurationInterface::Reset();
     PitchInterface::Reset();
     PositionInterface::Reset();
-    ResetColor();
-    ResetIntervalMelodic();
-    ResetNcForm();
+    this->ResetColor();
+    this->ResetIntervalMelodic();
+    this->ResetNcForm();
 }
 
 } // namespace vrv
diff --git a/src/neume.cpp b/src/neume.cpp
index d4199dfd9d4..b5168df8a12 100644
--- a/src/neume.cpp
+++ b/src/neume.cpp
@@ -46,8 +46,8 @@ static const ClassRegistrar<Neume> s_factory("neume", NEUME);
 
 Neume::Neume() : LayerElement(NEUME, "neume-"), ObjectListInterface(), AttColor()
 {
-    RegisterAttClass(ATT_COLOR);
-    Reset();
+    this->RegisterAttClass(ATT_COLOR);
+    this->Reset();
 }
 
 Neume::~Neume() {}
@@ -55,7 +55,7 @@ Neume::~Neume() {}
 void Neume::Reset()
 {
     LayerElement::Reset();
-    ResetColor();
+    this->ResetColor();
 }
 
 bool Neume::IsSupportedChild(Object *child)
diff --git a/src/note.cpp b/src/note.cpp
index 3847ca35d96..fe5cf10a7ed 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -70,24 +70,24 @@ Note::Note()
     , AttTiePresent()
     , AttVisibility()
 {
-    RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
-    RegisterInterface(PitchInterface::GetAttClasses(), PitchInterface::IsInterface());
-    RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_COLORATION);
-    RegisterAttClass(ATT_CUE);
-    RegisterAttClass(ATT_EXTSYM);
-    RegisterAttClass(ATT_GRACED);
-    RegisterAttClass(ATT_NOTEGESTAB);
-    RegisterAttClass(ATT_NOTEHEADS);
-    RegisterAttClass(ATT_NOTEVISMENSURAL);
-    RegisterAttClass(ATT_MIDIVELOCITY);
-    RegisterAttClass(ATT_STEMS);
-    RegisterAttClass(ATT_STEMSCMN);
-    RegisterAttClass(ATT_TIEPRESENT);
-    RegisterAttClass(ATT_VISIBILITY);
-
-    Reset();
+    this->RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
+    this->RegisterInterface(PitchInterface::GetAttClasses(), PitchInterface::IsInterface());
+    this->RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_COLORATION);
+    this->RegisterAttClass(ATT_CUE);
+    this->RegisterAttClass(ATT_EXTSYM);
+    this->RegisterAttClass(ATT_GRACED);
+    this->RegisterAttClass(ATT_NOTEGESTAB);
+    this->RegisterAttClass(ATT_NOTEHEADS);
+    this->RegisterAttClass(ATT_NOTEVISMENSURAL);
+    this->RegisterAttClass(ATT_MIDIVELOCITY);
+    this->RegisterAttClass(ATT_STEMS);
+    this->RegisterAttClass(ATT_STEMSCMN);
+    this->RegisterAttClass(ATT_TIEPRESENT);
+    this->RegisterAttClass(ATT_VISIBILITY);
+
+    this->Reset();
 }
 
 Note::~Note() {}
@@ -99,19 +99,19 @@ void Note::Reset()
     DurationInterface::Reset();
     PitchInterface::Reset();
     PositionInterface::Reset();
-    ResetColor();
-    ResetColoration();
-    ResetCue();
-    ResetExtSym();
-    ResetGraced();
-    ResetNoteGesTab();
-    ResetNoteHeads();
-    ResetNoteVisMensural();
-    ResetMidiVelocity();
-    ResetStems();
-    ResetStemsCmn();
-    ResetTiePresent();
-    ResetVisibility();
+    this->ResetColor();
+    this->ResetColoration();
+    this->ResetCue();
+    this->ResetExtSym();
+    this->ResetGraced();
+    this->ResetNoteGesTab();
+    this->ResetNoteHeads();
+    this->ResetNoteVisMensural();
+    this->ResetMidiVelocity();
+    this->ResetStems();
+    this->ResetStemsCmn();
+    this->ResetTiePresent();
+    this->ResetVisibility();
 
     m_clusterPosition = 0;
     m_cluster = NULL;
@@ -232,7 +232,7 @@ int Note::GetDrawingDur() const
         return chordParent->GetActualDur();
     }
     else {
-        return GetActualDur();
+        return this->GetActualDur();
     }
 }
 
@@ -275,8 +275,8 @@ std::wstring Note::GetTabFretString(data_NOTATIONTYPE notationType) const
     }
     else if (notationType == NOTATIONTYPE_tab_lute_french) {
         std::wstring fretStr;
-        const int fret = GetTabFret();
-        const int course = GetTabCourse();
+        const int fret = this->GetTabFret();
+        const int course = this->GetTabCourse();
         if (course >= 11) {
             // french tab uses number 4 ... for courses 11 ..., always open fret a.
             // TODO need Baroque font SMUFL_xxxx_luteDiapason4, 5, 6 ... or somesuch.
@@ -347,7 +347,7 @@ Point Note::GetStemUpSE(Doc *doc, int staffSize, bool isCueSize)
     Point p(defaultXShift, defaultYShift);
 
     // Here we should get the notehead value
-    wchar_t code = GetNoteheadGlyph(GetDrawingDur());
+    wchar_t code = this->GetNoteheadGlyph(this->GetDrawingDur());
 
     // This is never called for now because mensural notes do not have stem/flag children
     // For changing this, change Note::CalcStem and Note::PrepareLayerElementParts
@@ -378,7 +378,7 @@ Point Note::GetStemDownNW(Doc *doc, int staffSize, bool isCueSize)
     Point p(0, -defaultYShift);
 
     // Here we should get the notehead value
-    wchar_t code = GetNoteheadGlyph(GetDrawingDur());
+    wchar_t code = this->GetNoteheadGlyph(this->GetDrawingDur());
 
     // This is never called for now because mensural notes do not have stem/flag children
     // See comment above
@@ -487,15 +487,15 @@ wchar_t Note::GetNoteheadGlyph(const int duration) const
               { "noteheadDiamondWhiteWide", SMUFL_E0DE_noteheadDiamondWhiteWide },
               { "noteheadNull", SMUFL_E0A5_noteheadNull } };
 
-    if (HasGlyphName()) {
-        const std::string glyph = GetGlyphName();
+    if (this->HasGlyphName()) {
+        const std::string glyph = this->GetGlyphName();
         if (additionalNoteheadSymbols.end() == additionalNoteheadSymbols.find(glyph)) {
             return SMUFL_E0A4_noteheadBlack;
         }
         return additionalNoteheadSymbols[glyph];
     }
 
-    switch (GetHeadShape()) {
+    switch (this->GetHeadShape()) {
         case HEADSHAPE_quarter: return SMUFL_E0A4_noteheadBlack;
         case HEADSHAPE_half: return SMUFL_E0A3_noteheadHalf;
         case HEADSHAPE_whole: return SMUFL_E0A2_noteheadWhole;
@@ -504,7 +504,7 @@ wchar_t Note::GetNoteheadGlyph(const int duration) const
         case HEADSHAPE_plus: return SMUFL_E0AF_noteheadPlusBlack;
         case HEADSHAPE_diamond: {
             if (DUR_1 == duration) return SMUFL_E0D9_noteheadDiamondHalf;
-            return GetHeadFill() == FILL_void ? SMUFL_E0DD_noteheadDiamondWhite : SMUFL_E0DB_noteheadDiamondBlack;
+            return this->GetHeadFill() == FILL_void ? SMUFL_E0DD_noteheadDiamondWhite : SMUFL_E0DB_noteheadDiamondBlack;
         }
         // case HEADSHAPE_isotriangle: return SMUFL_E0BC_noteheadTriangleUpHalf;
         // case HEADSHAPE_oval: return SMUFL_noteheadOval;
@@ -522,7 +522,7 @@ wchar_t Note::GetNoteheadGlyph(const int duration) const
         default: break;
     }
 
-    switch (GetHeadMod()) {
+    switch (this->GetHeadMod()) {
         case NOTEHEADMODIFIER_dblwhole: return SMUFL_E0A0_noteheadDoubleWhole;
         default: break;
     }
@@ -1135,7 +1135,7 @@ MapOfNoteLocs Note::CalcNoteLocations(NotePredicate predicate)
 
 MapOfDotLocs Note::CalcDotLocations(int layerCount, bool primary)
 {
-    const bool isUpwardDirection = (GetDrawingStemDir() == STEMDIRECTION_up) || (layerCount == 1);
+    const bool isUpwardDirection = (this->GetDrawingStemDir() == STEMDIRECTION_up) || (layerCount == 1);
     const bool shiftUpwards = (isUpwardDirection == primary);
     MapOfNoteLocs noteLocs = this->CalcNoteLocations();
     assert(noteLocs.size() == 1);
@@ -1201,8 +1201,8 @@ int Note::CalcDots(FunctorParams *functorParams)
         if (const int shift = dots->GetFlagShift(); shift) {
             flagShift += shift;
         }
-        else if ((GetDrawingStemDir() == STEMDIRECTION_up) && (!this->IsInBeam()) && (GetDrawingStemLen() < 3)
-            && (IsDotOverlappingWithFlag(params->m_doc, staffSize, isDotShifted))) {
+        else if ((this->GetDrawingStemDir() == STEMDIRECTION_up) && (!this->IsInBeam())
+            && (this->GetDrawingStemLen() < 3) && (IsDotOverlappingWithFlag(params->m_doc, staffSize, isDotShifted))) {
             // HARDCODED
             const int shift = params->m_doc->GetGlyphWidth(SMUFL_E240_flag8thUp, staffSize, drawingCueSize) * 0.8;
             flagShift += shift;
@@ -1299,7 +1299,7 @@ int Note::PrepareLayerElementParts(FunctorParams *functorParams)
         if (currentStem->DeleteChild(currentFlag)) currentFlag = NULL;
     }
 
-    if (!chord) SetDrawingStem(currentStem);
+    if (!chord) this->SetDrawingStem(currentStem);
 
     /************ dots ***********/
 
diff --git a/src/num.cpp b/src/num.cpp
index 0b328873bed..91c702bfe2f 100644
--- a/src/num.cpp
+++ b/src/num.cpp
@@ -27,7 +27,7 @@ static const ClassRegistrar<Num> s_factory("num", NUM);
 
 Num::Num() : TextElement(NUM, "num-")
 {
-    Reset();
+    this->Reset();
 }
 
 Num::~Num() {}
diff --git a/src/object.cpp b/src/object.cpp
index 2e724060b5e..79d5b533561 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -94,7 +94,7 @@ Object *Object::Clone() const
 
 Object::Object(const Object &object) : BoundingBox(object)
 {
-    ResetBoundingBox(); // It does not make sense to keep the values of the BBox
+    this->ResetBoundingBox(); // It does not make sense to keep the values of the BBox
 
     m_classId = object.m_classId;
     m_classIdStr = object.m_classIdStr;
@@ -141,7 +141,7 @@ Object &Object::operator=(const Object &object)
     // not self assignement
     if (this != &object) {
         ClearChildren();
-        ResetBoundingBox(); // It does not make sense to keep the values of the BBox
+        this->ResetBoundingBox(); // It does not make sense to keep the values of the BBox
 
         m_classId = object.m_classId;
         m_classIdStr = object.m_classIdStr;
@@ -197,7 +197,7 @@ void Object::Init(ClassId classId, const std::string &classIdStr)
 
     this->GenerateUuid();
 
-    Reset();
+    this->Reset();
 }
 
 void Object::SetAsReferenceObject()
@@ -210,7 +210,7 @@ void Object::SetAsReferenceObject()
 void Object::Reset()
 {
     ClearChildren();
-    ResetBoundingBox();
+    this->ResetBoundingBox();
 }
 
 void Object::RegisterInterface(std::vector<AttClassId> *attClasses, InterfaceId interfaceId)
@@ -1115,7 +1115,7 @@ void ObjectListInterface::ResetList(Object *node)
 
 const ArrayOfObjects *ObjectListInterface::GetList(Object *node)
 {
-    ResetList(node);
+    this->ResetList(node);
     return &m_list;
 }
 
@@ -1134,7 +1134,7 @@ int ObjectListInterface::GetListIndex(const Object *listElement)
 Object *ObjectListInterface::GetListFirst(const Object *startFrom, const ClassId classId)
 {
     ArrayOfObjects::iterator it = m_list.begin();
-    int idx = GetListIndex(startFrom);
+    int idx = this->GetListIndex(startFrom);
     if (idx == -1) return NULL;
     std::advance(it, idx);
     it = std::find_if(it, m_list.end(), ObjectComparison(classId));
@@ -1144,7 +1144,7 @@ Object *ObjectListInterface::GetListFirst(const Object *startFrom, const ClassId
 Object *ObjectListInterface::GetListFirstBackward(Object *startFrom, const ClassId classId)
 {
     ArrayOfObjects::iterator it = m_list.begin();
-    int idx = GetListIndex(startFrom);
+    int idx = this->GetListIndex(startFrom);
     if (idx == -1) return NULL;
     std::advance(it, idx);
     ArrayOfObjects::reverse_iterator rit(it);
diff --git a/src/octave.cpp b/src/octave.cpp
index baf158ca64b..454c8d98000 100644
--- a/src/octave.cpp
+++ b/src/octave.cpp
@@ -33,15 +33,15 @@ Octave::Octave()
     , AttNNumberLike()
     , AttOctaveDisplacement()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_EXTENDER);
-    RegisterAttClass(ATT_LINEREND);
-    RegisterAttClass(ATT_LINERENDBASE);
-    RegisterAttClass(ATT_NNUMBERLIKE);
-    RegisterAttClass(ATT_OCTAVEDISPLACEMENT);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_EXTENDER);
+    this->RegisterAttClass(ATT_LINEREND);
+    this->RegisterAttClass(ATT_LINERENDBASE);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_OCTAVEDISPLACEMENT);
 
-    Reset();
+    this->Reset();
 }
 
 Octave::~Octave() {}
@@ -50,12 +50,12 @@ void Octave::Reset()
 {
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetColor();
-    ResetExtender();
-    ResetLineRend();
-    ResetLineRendBase();
-    ResetNNumberLike();
-    ResetOctaveDisplacement();
+    this->ResetColor();
+    this->ResetExtender();
+    this->ResetLineRend();
+    this->ResetLineRendBase();
+    this->ResetNNumberLike();
+    this->ResetOctaveDisplacement();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/options.cpp b/src/options.cpp
index caa33e8fec9..12b8d16d2c7 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -183,17 +183,17 @@ void OptionBool::Init(bool defaultValue)
 bool OptionBool::SetValue(const std::string &value)
 {
     bool b = (value == "true") ? true : false;
-    return SetValue(b);
+    return this->SetValue(b);
 }
 
 bool OptionBool::SetValueDbl(double value)
 {
-    return SetValue((bool)value);
+    return this->SetValue((bool)value);
 }
 
 bool OptionBool::SetValueBool(bool value)
 {
-    return SetValue(value);
+    return this->SetValue(value);
 }
 
 std::string OptionBool::GetStrValue() const
@@ -240,7 +240,7 @@ void OptionDbl::Init(double defaultValue, double minValue, double maxValue)
 
 bool OptionDbl::SetValue(const std::string &value)
 {
-    return SetValue(std::stod(value));
+    return this->SetValue(std::stod(value));
 }
 
 std::string OptionDbl::GetStrValue() const
@@ -255,14 +255,14 @@ std::string OptionDbl::GetDefaultStrValue() const
 
 bool OptionDbl::SetValueDbl(double value)
 {
-    return SetValue(value);
+    return this->SetValue(value);
 }
 
 bool OptionDbl::SetValue(double value)
 {
     if ((value < m_minValue) || (value > m_maxValue)) {
         LogError("Parameter value %f for '%s' out of bounds; default is %f, minimum %f, and maximum %f", value,
-            GetKey().c_str(), m_defaultValue, m_minValue, m_maxValue);
+            this->GetKey().c_str(), m_defaultValue, m_minValue, m_maxValue);
         return false;
     }
     m_value = value;
@@ -298,12 +298,12 @@ void OptionInt::Init(int defaultValue, int minValue, int maxValue, bool definiti
 
 bool OptionInt::SetValueDbl(double value)
 {
-    return SetValue((int)value);
+    return this->SetValue((int)value);
 }
 
 bool OptionInt::SetValue(const std::string &value)
 {
-    return SetValue(std::stoi(value));
+    return this->SetValue(std::stoi(value));
 }
 
 std::string OptionInt::GetStrValue() const
@@ -330,7 +330,7 @@ bool OptionInt::SetValue(int value)
 {
     if ((value < m_minValue) || (value > m_maxValue)) {
         LogError("Parameter value %d for '%s' out of bounds; default is %d, minimum %d, and maximum %d", value,
-            GetKey().c_str(), m_defaultValue, m_minValue, m_maxValue);
+            this->GetKey().c_str(), m_defaultValue, m_minValue, m_maxValue);
         return false;
     }
     m_value = value;
@@ -490,7 +490,7 @@ bool OptionIntMap::SetValue(const std::string &value)
             m_isSet = true;
             return true;
         }
-    LogError("Parameter '%s' not valid for '%s'", value.c_str(), GetKey().c_str());
+    LogError("Parameter '%s' not valid for '%s'", value.c_str(), this->GetKey().c_str());
     return false;
 }
 
@@ -540,7 +540,7 @@ std::vector<std::string> OptionIntMap::GetStrValues(bool withoutDefault) const
 
 std::string OptionIntMap::GetStrValuesAsStr(bool withoutDefault) const
 {
-    std::vector<std::string> strValues = GetStrValues(withoutDefault);
+    std::vector<std::string> strValues = this->GetStrValues(withoutDefault);
     std::stringstream ss;
     int i;
     for (i = 0; i < (int)strValues.size(); ++i) {
@@ -620,7 +620,7 @@ void OptionJson::CopyTo(Option *option)
 void OptionJson::Init(JsonSource source, const std::string &defaultValue)
 {
     m_source = source;
-    ReadJson(m_defaultValues, defaultValue);
+    this->ReadJson(m_defaultValues, defaultValue);
     m_isSet = false;
 }
 
@@ -636,7 +636,7 @@ jsonxx::Object OptionJson::GetValue(bool getDefault) const
 
 bool OptionJson::SetValue(const std::string &value)
 {
-    bool ok = ReadJson(m_values, value);
+    bool ok = this->ReadJson(m_values, value);
     if (ok) {
         m_isSet = true;
     }
@@ -706,7 +706,7 @@ bool OptionJson::HasValue(const std::vector<std::string> &jsonNodePath) const
 
 int OptionJson::GetIntValue(const std::vector<std::string> &jsonNodePath, bool getDefault) const
 {
-    return static_cast<int>(GetDoubleValue(jsonNodePath, getDefault));
+    return static_cast<int>(this->GetDoubleValue(jsonNodePath, getDefault));
 }
 
 double OptionJson::GetDoubleValue(const std::vector<std::string> &jsonNodePath, bool getDefault) const
diff --git a/src/orig.cpp b/src/orig.cpp
index 28def8fbd22..5ba52b2bed1 100644
--- a/src/orig.cpp
+++ b/src/orig.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Orig> s_factory("orig", ORIG);
 
 Orig::Orig() : EditorialElement(ORIG, "orig-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Orig::~Orig() {}
@@ -35,7 +35,7 @@ Orig::~Orig() {}
 void Orig::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/page.cpp b/src/page.cpp
index 6e745582217..33387732e7b 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -37,7 +37,7 @@ namespace vrv {
 
 Page::Page() : Object(PAGE, "page-")
 {
-    Reset();
+    this->Reset();
 }
 
 Page::~Page() {}
@@ -135,7 +135,7 @@ void Page::LayOut(bool force)
     this->LayOutVertically();
     this->JustifyVertically();
 
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
     if (doc->GetOptions()->m_svgBoundingBoxes.GetValue()) {
         View view;
@@ -155,7 +155,7 @@ void Page::LayOutTranscription(bool force)
         return;
     }
 
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
 
     // Doc::SetDrawingPage should have been called before
@@ -224,7 +224,7 @@ void Page::LayOutTranscription(bool force)
 
 void Page::LayOutHorizontally()
 {
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
 
     // Doc::SetDrawingPage should have been called before
@@ -428,7 +428,7 @@ void Page::LayOutHorizontally()
 
 void Page::HorizontalLayoutCachePage(bool restore)
 {
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
 
     HorizontalLayoutCacheParams horizontalLayoutCacheParams(doc);
@@ -439,7 +439,7 @@ void Page::HorizontalLayoutCachePage(bool restore)
 
 void Page::LayOutVertically()
 {
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
 
     // Doc::SetDrawingPage should have been called before
@@ -558,7 +558,7 @@ void Page::LayOutVertically()
 
 void Page::JustifyHorizontally()
 {
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
 
     if ((doc->GetOptions()->m_breaks.GetValue() == BREAKS_none) || doc->GetOptions()->m_noJustification.GetValue()) {
@@ -585,7 +585,7 @@ void Page::JustifyHorizontally()
 
 void Page::JustifyVertically()
 {
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
 
     // Doc::SetDrawingPage should have been called before
@@ -607,7 +607,7 @@ void Page::JustifyVertically()
     assert(pages);
     if (pages->GetLast() == this) {
         int idx = this->GetIdx();
-        const int childSystems = GetChildCount(SYSTEM);
+        const int childSystems = this->GetChildCount(SYSTEM);
         if (idx > 0) {
             Page *penultimatePage = dynamic_cast<Page *>(pages->GetPrevious(this));
             assert(penultimatePage);
@@ -645,7 +645,7 @@ void Page::JustifyVertically()
 
 void Page::LayOutPitchPos()
 {
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
 
     // Doc::SetDrawingPage should have been called before
@@ -664,14 +664,14 @@ void Page::LayOutPitchPos()
 
 int Page::GetContentHeight() const
 {
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
 
     // Doc::SetDrawingPage should have been called before
     // Make sure we have the correct page
     assert(this == doc->GetDrawingPage());
 
-    if (!GetChildCount()) {
+    if (!this->GetChildCount()) {
         return 0;
     }
 
@@ -688,7 +688,7 @@ int Page::GetContentHeight() const
 
 int Page::GetContentWidth() const
 {
-    Doc *doc = vrv_cast<Doc *>(GetFirstAncestor(DOC));
+    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
     assert(doc);
     // in non debug
     if (!doc) return 0;
@@ -864,7 +864,7 @@ int Page::AlignSystemsEnd(FunctorParams *functorParams)
 
         // Move it up below the last system
         if (params->m_doc->GetOptions()->m_adjustPageHeight.GetValue()) {
-            if (GetChildCount()) {
+            if (this->GetChildCount()) {
                 System *last = dynamic_cast<System *>(this->GetLast(SYSTEM));
                 assert(last);
                 footer->SetDrawingYRel(last->GetDrawingYRel() - last->GetHeight());
diff --git a/src/pageelement.cpp b/src/pageelement.cpp
index b704ff42aa1..c611f20a092 100644
--- a/src/pageelement.cpp
+++ b/src/pageelement.cpp
@@ -24,23 +24,23 @@ namespace vrv {
 
 PageElement::PageElement() : Object(PAGE_ELEMENT, "pe"), AttTyped()
 {
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 PageElement::PageElement(ClassId classId) : Object(classId, "pe"), AttTyped()
 {
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 PageElement::PageElement(ClassId classId, const std::string &classIdStr) : Object(classId, classIdStr), AttTyped()
 {
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 PageElement::~PageElement() {}
@@ -48,7 +48,7 @@ PageElement::~PageElement() {}
 void PageElement::Reset()
 {
     Object::Reset();
-    ResetTyped();
+    this->ResetTyped();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/pagemilestone.cpp b/src/pagemilestone.cpp
index ccfa1e9f959..81cfaef7ab2 100644
--- a/src/pagemilestone.cpp
+++ b/src/pagemilestone.cpp
@@ -27,7 +27,7 @@ namespace vrv {
 
 PageMilestoneEnd::PageMilestoneEnd(Object *start) : PageElement(PAGE_MILESTONE_END, "page-milestone-end-")
 {
-    Reset();
+    this->Reset();
     m_start = start;
     m_startClassName = start->GetClassName();
 }
@@ -45,7 +45,7 @@ void PageMilestoneEnd::Reset()
 
 PageMilestoneInterface::PageMilestoneInterface()
 {
-    Reset();
+    this->Reset();
 }
 
 PageMilestoneInterface::~PageMilestoneInterface() {}
diff --git a/src/pages.cpp b/src/pages.cpp
index dce2ebde0fd..da704828344 100644
--- a/src/pages.cpp
+++ b/src/pages.cpp
@@ -25,10 +25,10 @@ namespace vrv {
 
 Pages::Pages() : Object(PAGES, "pages-"), AttLabelled(), AttNNumberLike()
 {
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 Pages::~Pages() {}
@@ -36,8 +36,8 @@ Pages::~Pages() {}
 void Pages::Reset()
 {
     Object::Reset();
-    ResetLabelled();
-    ResetNNumberLike();
+    this->ResetLabelled();
+    this->ResetNNumberLike();
 }
 
 bool Pages::IsSupportedChild(Object *child)
diff --git a/src/pb.cpp b/src/pb.cpp
index 1eb9bf6dad1..4979124d47e 100644
--- a/src/pb.cpp
+++ b/src/pb.cpp
@@ -31,9 +31,9 @@ static const ClassRegistrar<Pb> s_factory("pb", PB);
 
 Pb::Pb() : SystemElement(PB, "pb-"), AttNNumberLike()
 {
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 Pb::~Pb() {}
@@ -41,7 +41,7 @@ Pb::~Pb() {}
 void Pb::Reset()
 {
     SystemElement::Reset();
-    ResetNNumberLike();
+    this->ResetNNumberLike();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/pedal.cpp b/src/pedal.cpp
index 870c6f4d611..eb91bd5d473 100644
--- a/src/pedal.cpp
+++ b/src/pedal.cpp
@@ -42,15 +42,15 @@ Pedal::Pedal()
     , AttPlacementRelStaff()
     , AttVerticalGroup()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_EXTSYM);
-    RegisterAttClass(ATT_PEDALLOG);
-    RegisterAttClass(ATT_PEDALVIS);
-    RegisterAttClass(ATT_PLACEMENTRELSTAFF);
-    RegisterAttClass(ATT_VERTICALGROUP);
-
-    Reset();
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_EXTSYM);
+    this->RegisterAttClass(ATT_PEDALLOG);
+    this->RegisterAttClass(ATT_PEDALVIS);
+    this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
+    this->RegisterAttClass(ATT_VERTICALGROUP);
+
+    this->Reset();
 }
 
 Pedal::~Pedal() {}
@@ -59,12 +59,12 @@ void Pedal::Reset()
 {
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetColor();
-    ResetExtSym();
-    ResetPedalLog();
-    ResetPedalVis();
-    ResetPlacementRelStaff();
-    ResetVerticalGroup();
+    this->ResetColor();
+    this->ResetExtSym();
+    this->ResetPedalLog();
+    this->ResetPedalVis();
+    this->ResetPlacementRelStaff();
+    this->ResetVerticalGroup();
 
     m_endsWithBounce = false;
 }
@@ -72,17 +72,17 @@ void Pedal::Reset()
 wchar_t Pedal::GetPedalGlyph() const
 {
     // If there is glyph.num, prioritize it
-    if (HasGlyphNum()) {
-        wchar_t code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        wchar_t code = this->GetGlyphNum();
         if (NULL != Resources::GetGlyph(code)) return code;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
-    return (GetFunc() == "sostenuto") ? SMUFL_E659_keyboardPedalSost : SMUFL_E650_keyboardPedalPed;
+    return (this->GetFunc() == "sostenuto") ? SMUFL_E659_keyboardPedalSost : SMUFL_E650_keyboardPedalPed;
 }
 
 pedalVis_FORM Pedal::GetPedalForm(Doc *doc, System *system) const
@@ -120,14 +120,14 @@ int Pedal::GenerateMIDI(FunctorParams *functorParams)
     assert(params);
 
     // Sameas not taken into account for now
-    if (!HasDir()) return FUNCTOR_CONTINUE;
+    if (!this->HasDir()) return FUNCTOR_CONTINUE;
 
-    double pedalTime = GetStart()->GetAlignment()->GetTime() * DURATION_4 / DUR_MAX;
+    double pedalTime = this->GetStart()->GetAlignment()->GetTime() * DURATION_4 / DUR_MAX;
     double starttime = params->m_totalTime + pedalTime;
     int tpq = params->m_midiFile->getTPQ();
 
     // todo: check pedal @func to switch between sustain/soften/damper pedals?
-    switch (GetDir()) {
+    switch (this->GetDir()) {
         case pedalLog_DIR_down:
             params->m_midiFile->addSustainPedalOn(params->m_midiTrack, (starttime * tpq), params->m_midiChannel);
             break;
diff --git a/src/pgfoot.cpp b/src/pgfoot.cpp
index a03d922b033..ed3fb089e99 100644
--- a/src/pgfoot.cpp
+++ b/src/pgfoot.cpp
@@ -25,7 +25,7 @@ static const ClassRegistrar<PgFoot> s_factory("pgFoot", PGFOOT);
 
 PgFoot::PgFoot() : RunningElement(PGFOOT, "pgfoot-")
 {
-    Reset();
+    this->Reset();
 }
 
 PgFoot::~PgFoot() {}
diff --git a/src/pgfoot2.cpp b/src/pgfoot2.cpp
index 6b3069c60d0..a8de40b7003 100644
--- a/src/pgfoot2.cpp
+++ b/src/pgfoot2.cpp
@@ -23,7 +23,7 @@ static const ClassRegistrar<PgFoot2> s_factory("pgFoot2", PGFOOT2);
 
 PgFoot2::PgFoot2() : RunningElement(PGFOOT2, "pgfoot2-")
 {
-    Reset();
+    this->Reset();
 }
 
 PgFoot2::~PgFoot2() {}
diff --git a/src/pghead.cpp b/src/pghead.cpp
index 40f1b21c6f7..89560d16bf6 100644
--- a/src/pghead.cpp
+++ b/src/pghead.cpp
@@ -28,7 +28,7 @@ static const ClassRegistrar<PgHead> s_factory("pgHead", PGHEAD);
 
 PgHead::PgHead() : RunningElement(PGHEAD, "pghead-")
 {
-    Reset();
+    this->Reset();
 }
 
 PgHead::~PgHead() {}
diff --git a/src/pghead2.cpp b/src/pghead2.cpp
index d97d1f6a2fe..5e06e3fadcc 100644
--- a/src/pghead2.cpp
+++ b/src/pghead2.cpp
@@ -23,7 +23,7 @@ static const ClassRegistrar<PgHead2> s_factory("pgHead2", PGHEAD2);
 
 PgHead2::PgHead2() : RunningElement(PGHEAD2, "pghead2-")
 {
-    Reset();
+    this->Reset();
 }
 
 PgHead2::~PgHead2() {}
diff --git a/src/phrase.cpp b/src/phrase.cpp
index 1a665d1f952..91f06c69bb2 100644
--- a/src/phrase.cpp
+++ b/src/phrase.cpp
@@ -25,7 +25,7 @@ static const ClassRegistrar<Phrase> s_factory("phrase", PHRASE);
 
 Phrase::Phrase() : Slur(PHRASE, "phrase-")
 {
-    Reset();
+    this->Reset();
 }
 
 Phrase::~Phrase() {}
diff --git a/src/pitchinflection.cpp b/src/pitchinflection.cpp
index 1ee352cdf0d..ac2ee8ce6dd 100644
--- a/src/pitchinflection.cpp
+++ b/src/pitchinflection.cpp
@@ -26,9 +26,9 @@ static const ClassRegistrar<PitchInflection> s_factory("pitchInflection", PITCHI
 
 PitchInflection::PitchInflection() : ControlElement(PITCHINFLECTION, "pinflexion-"), TimeSpanningInterface()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
 
-    Reset();
+    this->Reset();
 }
 
 PitchInflection::~PitchInflection() {}
diff --git a/src/pitchinterface.cpp b/src/pitchinterface.cpp
index b5ea1de7fc2..462dae28c5f 100644
--- a/src/pitchinterface.cpp
+++ b/src/pitchinterface.cpp
@@ -29,20 +29,20 @@ namespace vrv {
 
 PitchInterface::PitchInterface() : Interface(), AttNoteGes(), AttOctave(), AttPitch()
 {
-    RegisterInterfaceAttClass(ATT_NOTEGES);
-    RegisterInterfaceAttClass(ATT_OCTAVE);
-    RegisterInterfaceAttClass(ATT_PITCH);
+    this->RegisterInterfaceAttClass(ATT_NOTEGES);
+    this->RegisterInterfaceAttClass(ATT_OCTAVE);
+    this->RegisterInterfaceAttClass(ATT_PITCH);
 
-    Reset();
+    this->Reset();
 }
 
 PitchInterface::~PitchInterface() {}
 
 void PitchInterface::Reset()
 {
-    ResetNoteGes();
-    ResetOctave();
-    ResetPitch();
+    this->ResetNoteGes();
+    this->ResetOctave();
+    this->ResetPitch();
 }
 
 bool PitchInterface::HasIdenticalPitchInterface(PitchInterface *otherPitchInterface)
diff --git a/src/plica.cpp b/src/plica.cpp
index 149ff569996..c5bd3c57530 100644
--- a/src/plica.cpp
+++ b/src/plica.cpp
@@ -27,9 +27,9 @@ static const ClassRegistrar<Plica> s_factory("plica", PLICA);
 
 Plica::Plica() : LayerElement(PLICA, "plica-"), AttPlicaVis()
 {
-    RegisterAttClass(ATT_PLICAVIS);
+    this->RegisterAttClass(ATT_PLICAVIS);
 
-    Reset();
+    this->Reset();
 }
 
 Plica::~Plica() {}
@@ -37,7 +37,7 @@ Plica::~Plica() {}
 void Plica::Reset()
 {
     LayerElement::Reset();
-    ResetPlicaVis();
+    this->ResetPlicaVis();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/plistinterface.cpp b/src/plistinterface.cpp
index c2e1a74fc21..32c673c3f9b 100644
--- a/src/plistinterface.cpp
+++ b/src/plistinterface.cpp
@@ -28,16 +28,16 @@ namespace vrv {
 
 PlistInterface::PlistInterface() : Interface(), AttPlist()
 {
-    RegisterInterfaceAttClass(ATT_PLIST);
+    this->RegisterInterfaceAttClass(ATT_PLIST);
 
-    Reset();
+    this->Reset();
 }
 
 PlistInterface::~PlistInterface() {}
 
 void PlistInterface::Reset()
 {
-    ResetPlist();
+    this->ResetPlist();
 }
 
 void PlistInterface::AddRef(std::string ref)
diff --git a/src/positioninterface.cpp b/src/positioninterface.cpp
index 5e37541c945..5a3689f663d 100644
--- a/src/positioninterface.cpp
+++ b/src/positioninterface.cpp
@@ -24,18 +24,18 @@ namespace vrv {
 
 PositionInterface::PositionInterface() : Interface(), AttStaffLoc(), AttStaffLocPitched()
 {
-    RegisterInterfaceAttClass(ATT_STAFFLOC);
-    RegisterInterfaceAttClass(ATT_STAFFLOCPITCHED);
+    this->RegisterInterfaceAttClass(ATT_STAFFLOC);
+    this->RegisterInterfaceAttClass(ATT_STAFFLOCPITCHED);
 
-    Reset();
+    this->Reset();
 }
 
 PositionInterface::~PositionInterface() {}
 
 void PositionInterface::Reset()
 {
-    ResetStaffLoc();
-    ResetStaffLocPitched();
+    this->ResetStaffLoc();
+    this->ResetStaffLocPitched();
 
     m_drawingLoc = 0;
 }
diff --git a/src/proport.cpp b/src/proport.cpp
index eff3d9df299..65f160e1608 100644
--- a/src/proport.cpp
+++ b/src/proport.cpp
@@ -17,9 +17,9 @@ static const ClassRegistrar<Proport> s_factory("proport", PROPORT);
 
 Proport::Proport() : LayerElement(PROPORT, "prop-"), AttDurationRatio()
 {
-    RegisterAttClass(ATT_DURATIONRATIO);
+    this->RegisterAttClass(ATT_DURATIONRATIO);
 
-    Reset();
+    this->Reset();
 }
 
 Proport::~Proport() {}
@@ -27,7 +27,7 @@ Proport::~Proport() {}
 void Proport::Reset()
 {
     LayerElement::Reset();
-    ResetDurationRatio();
+    this->ResetDurationRatio();
 }
 
 } // namespace vrv
diff --git a/src/rdg.cpp b/src/rdg.cpp
index c34a829ff6f..4d5a45ff73c 100644
--- a/src/rdg.cpp
+++ b/src/rdg.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Rdg> s_factory("rdg", RDG);
 
 Rdg::Rdg() : EditorialElement(RDG, "rdg-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Rdg::~Rdg() {}
@@ -35,7 +35,7 @@ Rdg::~Rdg() {}
 void Rdg::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/ref.cpp b/src/ref.cpp
index 6c26909593e..116e93f8cab 100644
--- a/src/ref.cpp
+++ b/src/ref.cpp
@@ -25,7 +25,7 @@ static const ClassRegistrar<Ref> s_factory("ref", REF);
 
 Ref::Ref() : EditorialElement(REF, "ref-")
 {
-    Reset();
+    this->Reset();
 }
 
 Ref::~Ref() {}
diff --git a/src/reg.cpp b/src/reg.cpp
index 91167a0b516..fec4849315a 100644
--- a/src/reg.cpp
+++ b/src/reg.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Reg> s_factory("reg", REG);
 
 Reg::Reg() : EditorialElement(REG, "reg-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Reg::~Reg() {}
@@ -35,7 +35,7 @@ Reg::~Reg() {}
 void Reg::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/reh.cpp b/src/reh.cpp
index 1451b42847f..355a3e229c5 100644
--- a/src/reh.cpp
+++ b/src/reh.cpp
@@ -30,13 +30,13 @@ static const ClassRegistrar<Reh> s_factory("reh", REH);
 Reh::Reh()
     : ControlElement(REH, "reh-"), TextDirInterface(), TimePointInterface(), AttColor(), AttLang(), AttVerticalGroup()
 {
-    RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_LANG);
-    RegisterAttClass(ATT_VERTICALGROUP);
+    this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_LANG);
+    this->RegisterAttClass(ATT_VERTICALGROUP);
 
-    Reset();
+    this->Reset();
 }
 
 Reh::~Reh() {}
@@ -46,9 +46,9 @@ void Reh::Reset()
     ControlElement::Reset();
     TextDirInterface::Reset();
     TimePointInterface::Reset();
-    ResetColor();
-    ResetLang();
-    ResetVerticalGroup();
+    this->ResetColor();
+    this->ResetLang();
+    this->ResetVerticalGroup();
 }
 
 bool Reh::IsSupportedChild(Object *child)
diff --git a/src/rend.cpp b/src/rend.cpp
index ef71f6e8a2a..d68e0b41aef 100644
--- a/src/rend.cpp
+++ b/src/rend.cpp
@@ -37,14 +37,14 @@ Rend::Rend()
     , AttTypography()
     , AttWhitespace()
 {
-    RegisterInterface(AreaPosInterface::GetAttClasses(), AreaPosInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_LANG);
-    RegisterAttClass(ATT_TEXTRENDITION);
-    RegisterAttClass(ATT_TYPOGRAPHY);
-    RegisterAttClass(ATT_WHITESPACE);
-
-    Reset();
+    this->RegisterInterface(AreaPosInterface::GetAttClasses(), AreaPosInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_LANG);
+    this->RegisterAttClass(ATT_TEXTRENDITION);
+    this->RegisterAttClass(ATT_TYPOGRAPHY);
+    this->RegisterAttClass(ATT_WHITESPACE);
+
+    this->Reset();
 }
 
 Rend::~Rend() {}
@@ -53,11 +53,11 @@ void Rend::Reset()
 {
     TextElement::Reset();
     AreaPosInterface::Reset();
-    ResetColor();
-    ResetLang();
-    ResetTextRendition();
-    ResetTypography();
-    ResetWhitespace();
+    this->ResetColor();
+    this->ResetLang();
+    this->ResetTextRendition();
+    this->ResetTypography();
+    this->ResetWhitespace();
 }
 
 bool Rend::IsSupportedChild(Object *child)
diff --git a/src/rest.cpp b/src/rest.cpp
index 71868875d6b..2e979f6caa1 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -161,13 +161,13 @@ Rest::Rest()
     , AttExtSym()
     , AttRestVisMensural()
 {
-    RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
-    RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CUE);
-    RegisterAttClass(ATT_EXTSYM);
-    RegisterAttClass(ATT_RESTVISMENSURAL);
-    Reset();
+    this->RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
+    this->RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CUE);
+    this->RegisterAttClass(ATT_EXTSYM);
+    this->RegisterAttClass(ATT_RESTVISMENSURAL);
+    this->Reset();
 }
 
 Rest::~Rest() {}
@@ -177,10 +177,10 @@ void Rest::Reset()
     LayerElement::Reset();
     DurationInterface::Reset();
     PositionInterface::Reset();
-    ResetColor();
-    ResetCue();
-    ResetExtSym();
-    ResetRestVisMensural();
+    this->ResetColor();
+    this->ResetCue();
+    this->ResetExtSym();
+    this->ResetRestVisMensural();
 }
 
 bool Rest::IsSupportedChild(Object *child)
@@ -227,13 +227,13 @@ wchar_t Rest::GetRestGlyph() const
 wchar_t Rest::GetRestGlyph(const int duration) const
 {
     // If there is glyph.num, prioritize it
-    if (HasGlyphNum()) {
-        wchar_t code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        wchar_t code = this->GetGlyphNum();
         if (NULL != Resources::GetGlyph(code)) return code;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
@@ -257,11 +257,11 @@ wchar_t Rest::GetRestGlyph(const int duration) const
 
 void Rest::UpdateFromTransLoc(const TransPitch &tp)
 {
-    if (HasOloc() && HasPloc()) {
-        SetPloc(tp.GetPitchName());
+    if (this->HasOloc() && this->HasPloc()) {
+        this->SetPloc(tp.GetPitchName());
 
-        if (GetOloc() != tp.m_oct) {
-            SetOloc(tp.m_oct);
+        if (this->GetOloc() != tp.m_oct) {
+            this->SetOloc(tp.m_oct);
         }
     }
 }
@@ -280,17 +280,17 @@ int Rest::GetOptimalLayerLocation(Staff *staff, Layer *layer, int defaultLocatio
     // find best rest location relative to elements on other layers
     Staff *realStaff = m_crossStaff ? m_crossStaff : staff;
     ListOfObjects layers = realStaff->FindAllDescendantsByType(LAYER, false);
-    const auto otherLayerRelativeLocationInfo = GetLocationRelativeToOtherLayers(layers, layer, isTopLayer);
-    int currentLayerRelativeLocation = GetLocationRelativeToCurrentLayer(staff, layer, isTopLayer);
+    const auto otherLayerRelativeLocationInfo = this->GetLocationRelativeToOtherLayers(layers, layer, isTopLayer);
+    int currentLayerRelativeLocation = this->GetLocationRelativeToCurrentLayer(staff, layer, isTopLayer);
     int otherLayerRelativeLocation = otherLayerRelativeLocationInfo.first
-        + GetRestOffsetFromOptions(RL_otherLayer, otherLayerRelativeLocationInfo, isTopLayer);
+        + this->GetRestOffsetFromOptions(RL_otherLayer, otherLayerRelativeLocationInfo, isTopLayer);
     if (currentLayerRelativeLocation == VRV_UNSET) {
         currentLayerRelativeLocation = defaultLocation;
     }
     else {
         std::pair<int, RestAccidental> currentLayerRelativeLocationInfo(currentLayerRelativeLocation, RA_none);
         currentLayerRelativeLocation
-            += GetRestOffsetFromOptions(RL_sameLayer, currentLayerRelativeLocationInfo, isTopLayer);
+            += this->GetRestOffsetFromOptions(RL_sameLayer, currentLayerRelativeLocationInfo, isTopLayer);
     }
     if (m_crossStaff) {
         if (isTopLayer) {
@@ -332,10 +332,10 @@ std::pair<int, RestAccidental> Rest::GetLocationRelativeToOtherLayers(
     std::pair<int, RestAccidental> finalElementInfo = { VRV_UNSET, RA_none };
     // Go through each colliding element and figure out optimal location for the rest
     for (Object *object : collidingElementsList) {
-        auto currentElementInfo = GetElementLocation(object, vrv_cast<Layer *>(*layerIter), isTopLayer);
+        auto currentElementInfo = this->GetElementLocation(object, vrv_cast<Layer *>(*layerIter), isTopLayer);
         if (currentElementInfo.first == VRV_UNSET) continue;
         //  If note on other layer is not on the same x position as rest - ignore its accidental
-        if (GetAlignment()->GetTime() != vrv_cast<LayerElement *>(object)->GetAlignment()->GetTime()) {
+        if (this->GetAlignment()->GetTime() != vrv_cast<LayerElement *>(object)->GetAlignment()->GetTime()) {
             currentElementInfo.second = RA_none;
             // limit how much rest can be offset when there is duration overlap, but no x position overlap
             if ((isTopLayer && (currentElementInfo.first > 12)) || (!isTopLayer && (currentElementInfo.first < -4))) {
@@ -357,7 +357,7 @@ int Rest::GetLocationRelativeToCurrentLayer(Staff *currentStaff, Layer *currentL
     if (!currentStaff || !currentLayer) return VRV_UNSET;
 
     Functor getRelativeLayerElement(&Object::GetRelativeLayerElement);
-    GetRelativeLayerElementParams getRelativeLayerElementParams(GetIdx(), BACKWARD, false);
+    GetRelativeLayerElementParams getRelativeLayerElementParams(this->GetIdx(), BACKWARD, false);
 
     Object *previousElement = NULL;
     Object *nextElement = NULL;
@@ -378,11 +378,11 @@ int Rest::GetLocationRelativeToCurrentLayer(Staff *currentStaff, Layer *currentL
     // For chords we want to get the closest element to opposite layer, hence we pass negative 'isTopLayer' value
     // That way we'll get bottom chord note for top layer and top chord note for bottom layer
     const int previousElementLoc = previousElement
-        ? GetElementLocation(previousElement, currentLayer, !isTopLayer).first
-        : GetFirstRelativeElementLocation(currentStaff, currentLayer, true, isTopLayer);
+        ? this->GetElementLocation(previousElement, currentLayer, !isTopLayer).first
+        : this->GetFirstRelativeElementLocation(currentStaff, currentLayer, true, isTopLayer);
     const int nextElementLoc = nextElement
-        ? GetElementLocation(nextElement, currentLayer, !isTopLayer).first
-        : GetFirstRelativeElementLocation(currentStaff, currentLayer, false, isTopLayer);
+        ? this->GetElementLocation(nextElement, currentLayer, !isTopLayer).first
+        : this->GetFirstRelativeElementLocation(currentStaff, currentLayer, false, isTopLayer);
 
     // Calculate optimal location depending on existence of values for previous and next element location
     int currentOptimalLocation = 0;
@@ -413,10 +413,10 @@ int Rest::GetLocationRelativeToCurrentLayer(Staff *currentStaff, Layer *currentL
 int Rest::GetFirstRelativeElementLocation(Staff *currentStaff, Layer *currentLayer, bool isPrevious, bool isTopLayer)
 {
     // current system
-    System *system = vrv_cast<System *>(GetFirstAncestor(SYSTEM));
+    System *system = vrv_cast<System *>(this->GetFirstAncestor(SYSTEM));
     assert(system);
     // current measure
-    Measure *measure = vrv_cast<Measure *>(GetFirstAncestor(MEASURE));
+    Measure *measure = vrv_cast<Measure *>(this->GetFirstAncestor(MEASURE));
     assert(measure);
 
     const int index = system->GetChildIndex(measure);
@@ -436,13 +436,13 @@ int Rest::GetFirstRelativeElementLocation(Staff *currentStaff, Layer *currentLay
 
     // Get last element if it's previous layer, get first one otherwise
     Functor getRelativeLayerElement(&Object::GetRelativeLayerElement);
-    GetRelativeLayerElementParams getRelativeLayerElementParams(GetIdx(), !isPrevious, true);
+    GetRelativeLayerElementParams getRelativeLayerElementParams(this->GetIdx(), !isPrevious, true);
     (*layerIter)
         ->Process(&getRelativeLayerElement, &getRelativeLayerElementParams, NULL, NULL, UNLIMITED_DEPTH, !isPrevious);
 
     Object *lastLayerElement = getRelativeLayerElementParams.m_relativeElement;
     if (lastLayerElement && lastLayerElement->Is({ NOTE, CHORD, FTREM })) {
-        return GetElementLocation(lastLayerElement, vrv_cast<Layer *>(*layerIter), !isTopLayer).first;
+        return this->GetElementLocation(lastLayerElement, vrv_cast<Layer *>(*layerIter), !isTopLayer).first;
     }
 
     return VRV_UNSET;
@@ -468,7 +468,7 @@ std::pair<int, RestAccidental> Rest::GetElementLocation(Object *object, Layer *l
     if (object->Is(FTREM)) {
         std::vector<std::pair<int, RestAccidental>> btremElements;
         for (int i = 0; i < object->GetChildCount(); ++i) {
-            btremElements.emplace_back(GetElementLocation(object->GetChild(i), layer, isTopLayer));
+            btremElements.emplace_back(this->GetElementLocation(object->GetChild(i), layer, isTopLayer));
         }
         return isTopLayer ? *std::max_element(btremElements.begin(), btremElements.end())
                           : *std::min_element(btremElements.begin(), btremElements.end());
@@ -485,7 +485,7 @@ std::pair<int, RestAccidental> Rest::GetElementLocation(Object *object, Layer *l
 int Rest::GetRestOffsetFromOptions(
     RestLayer layer, const std::pair<int, RestAccidental> &location, bool isTopLayer) const
 {
-    int duration = GetActualDur();
+    int duration = this->GetActualDur();
     if (duration > DURATION_128) duration = DURATION_128;
     return g_defaultRests.at(layer)
         .at(RL_sameLayer == layer ? location.second : RA_none)
@@ -510,12 +510,12 @@ int Rest::AdjustBeams(FunctorParams *functorParams)
     const int beams = vrv_cast<Beam *>(params->m_beam)->m_shortestDur - DUR_4;
     const int beamWidth = vrv_cast<Beam *>(params->m_beam)->m_beamWidth;
     if (params->m_directionBias > 0) {
-        leftMargin = params->m_y1 - beams * beamWidth - GetSelfTop();
-        rightMargin = params->m_y2 - beams * beamWidth - GetSelfTop();
+        leftMargin = params->m_y1 - beams * beamWidth - this->GetSelfTop();
+        rightMargin = params->m_y2 - beams * beamWidth - this->GetSelfTop();
     }
     else {
-        leftMargin = GetSelfBottom() - params->m_y1 - beams * beamWidth;
-        rightMargin = GetSelfBottom() - params->m_y2 - beams * beamWidth;
+        leftMargin = this->GetSelfBottom() - params->m_y1 - beams * beamWidth;
+        rightMargin = this->GetSelfBottom() - params->m_y2 - beams * beamWidth;
     }
 
     // Adjust drawing location for the rest based on the overlap with beams.
@@ -523,16 +523,16 @@ int Rest::AdjustBeams(FunctorParams *functorParams)
     const int overlapMargin = std::min(leftMargin, rightMargin);
     if (overlapMargin < 0) {
         Staff *staff = this->GetAncestorStaff();
-        if ((!HasOloc() || !HasPloc()) && !HasLoc()) {
+        if ((!this->HasOloc() || !HasPloc()) && !this->HasLoc()) {
             const int unit = params->m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
             const int locAdjust = (params->m_directionBias * (overlapMargin - 2 * unit + 1) / unit);
-            const int oldLoc = GetDrawingLoc();
+            const int oldLoc = this->GetDrawingLoc();
             const int newLoc = oldLoc + locAdjust - locAdjust % 2;
-            SetDrawingLoc(newLoc);
-            SetDrawingYRel(staff->CalcPitchPosYRel(params->m_doc, newLoc));
+            this->SetDrawingLoc(newLoc);
+            this->SetDrawingYRel(staff->CalcPitchPosYRel(params->m_doc, newLoc));
             // If there are dots, adjust their location as well
-            if (GetDots() > 0) {
-                Dots *dots = vrv_cast<Dots *>(FindDescendantByType(DOTS, 1));
+            if (this->GetDots() > 0) {
+                Dots *dots = vrv_cast<Dots *>(this->FindDescendantByType(DOTS, 1));
                 if (dots) {
                     std::set<int> &dotLocs = dots->ModifyDotLocsForStaff(staff);
                     const int dotLoc = (oldLoc % 2) ? oldLoc : oldLoc + 1;
@@ -669,11 +669,11 @@ int Rest::Transpose(FunctorParams *functorParams)
     TransposeParams *params = vrv_params_cast<TransposeParams *>(functorParams);
     assert(params);
 
-    if ((!HasOloc() || !HasPloc()) && !HasLoc()) return FUNCTOR_SIBLINGS;
+    if ((!this->HasOloc() || !this->HasPloc()) && !this->HasLoc()) return FUNCTOR_SIBLINGS;
 
     // Find whether current layer is top, middle (either one if multiple) or bottom
     Staff *parentStaff = this->GetAncestorStaff();
-    Layer *parentLayer = vrv_cast<Layer *>(GetFirstAncestor(LAYER));
+    Layer *parentLayer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
     assert(parentLayer);
 
     ListOfObjects objects = parentStaff->FindAllDescendantsByType(LAYER, false);
@@ -686,9 +686,9 @@ int Rest::Transpose(FunctorParams *functorParams)
     const bool isBottomLayer = (lastLayer->GetN() == parentLayer->GetN());
 
     // transpose based on @oloc and @ploc
-    if (HasOloc() && HasPloc()) {
+    if (this->HasOloc() && this->HasPloc()) {
         const TransPitch centralLocation(6, 0, 4); // middle location of the staff
-        TransPitch restLoc(GetPloc() - PITCHNAME_c, 0, GetOloc());
+        TransPitch restLoc(this->GetPloc() - PITCHNAME_c, 0, this->GetOloc());
         params->m_transposer->Transpose(restLoc);
         const bool isRestOnSpace = static_cast<bool>((restLoc.m_oct * 7 + restLoc.m_pname) % 2);
         // on outer layers move rest on odd locations one line further
@@ -705,16 +705,16 @@ int Rest::Transpose(FunctorParams *functorParams)
             }
         }
 
-        UpdateFromTransLoc(restLoc);
+        this->UpdateFromTransLoc(restLoc);
     }
     // transpose based on @loc
-    else if (HasLoc()) {
+    else if (this->HasLoc()) {
         constexpr int centralLocation(4);
         int transval = params->m_transposer->GetTranspositionIntervalClass();
         int diatonic;
         int chromatic;
         params->m_transposer->IntervalToDiatonicChromatic(diatonic, chromatic, transval);
-        int transposedLoc = GetLoc() + diatonic;
+        int transposedLoc = this->GetLoc() + diatonic;
         // on outer layers move rest on odd locations one line further
         // in middle layers tolerate even locations to not risk collisions
         if (layerCount > 1) {
@@ -727,7 +727,7 @@ int Rest::Transpose(FunctorParams *functorParams)
                 transposedLoc = centralLocation;
             }
         }
-        SetLoc(transposedLoc);
+        this->SetLoc(transposedLoc);
     }
 
     return FUNCTOR_SIBLINGS;
diff --git a/src/restore.cpp b/src/restore.cpp
index 6ce286f5839..1afc39b85bd 100644
--- a/src/restore.cpp
+++ b/src/restore.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Restore> s_factory("restore", RESTORE);
 
 Restore::Restore() : EditorialElement(RESTORE, "restore-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Restore::~Restore() {}
@@ -35,7 +35,7 @@ Restore::~Restore() {}
 void Restore::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/runningelement.cpp b/src/runningelement.cpp
index 6570aeebbb4..326e587c3be 100644
--- a/src/runningelement.cpp
+++ b/src/runningelement.cpp
@@ -34,28 +34,28 @@ namespace vrv {
 RunningElement::RunningElement()
     : Object(RUNNING_ELEMENT, "re"), ObjectListInterface(), AttHorizontalAlign(), AttTyped()
 {
-    RegisterAttClass(ATT_HORIZONTALALIGN);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_HORIZONTALALIGN);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 RunningElement::RunningElement(ClassId classId)
     : Object(classId, "re"), ObjectListInterface(), AttHorizontalAlign(), AttTyped()
 {
-    RegisterAttClass(ATT_HORIZONTALALIGN);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_HORIZONTALALIGN);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 RunningElement::RunningElement(ClassId classId, const std::string &classIdStr)
     : Object(classId, classIdStr), AttHorizontalAlign(), AttTyped()
 {
-    RegisterAttClass(ATT_HORIZONTALALIGN);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_HORIZONTALALIGN);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 RunningElement::~RunningElement() {}
@@ -63,8 +63,8 @@ RunningElement::~RunningElement() {}
 void RunningElement::Reset()
 {
     Object::Reset();
-    ResetHorizontalAlign();
-    ResetTyped();
+    this->ResetHorizontalAlign();
+    this->ResetTyped();
 
     m_isGenerated = false;
 
@@ -157,7 +157,7 @@ int RunningElement::GetDrawingY() const
 
 void RunningElement::SetDrawingYRel(int drawingYRel)
 {
-    ResetCachedDrawingY();
+    this->ResetCachedDrawingY();
     m_drawingYRel = drawingYRel;
 }
 
@@ -175,9 +175,9 @@ int RunningElement::GetWidth() const
 void RunningElement::SetDrawingPage(Page *page)
 {
 
-    ResetList(this);
+    this->ResetList(this);
 
-    ResetCachedDrawingX();
+    this->ResetCachedDrawingX();
     m_drawingPage = page;
 
     if (page) {
diff --git a/src/sb.cpp b/src/sb.cpp
index 41c9148b7c0..a03e12bbd0e 100644
--- a/src/sb.cpp
+++ b/src/sb.cpp
@@ -31,9 +31,9 @@ static const ClassRegistrar<Sb> s_factory("sb", SB);
 
 Sb::Sb() : SystemElement(SB, "sb-"), AttNNumberLike()
 {
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 Sb::~Sb() {}
@@ -41,7 +41,7 @@ Sb::~Sb() {}
 void Sb::Reset()
 {
     SystemElement::Reset();
-    ResetNNumberLike();
+    this->ResetNNumberLike();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/score.cpp b/src/score.cpp
index e648ceddc3a..e77ae9a74af 100644
--- a/src/score.cpp
+++ b/src/score.cpp
@@ -38,10 +38,10 @@ static const ClassRegistrar<Score> s_factory("score", SCORE);
 
 Score::Score() : PageElement(SCORE, "score-"), PageMilestoneInterface(), AttLabelled(), AttNNumberLike()
 {
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 Score::~Score() {}
@@ -49,8 +49,8 @@ Score::~Score() {}
 void Score::Reset()
 {
     Object::Reset();
-    ResetLabelled();
-    ResetNNumberLike();
+    this->ResetLabelled();
+    this->ResetNNumberLike();
 
     m_scoreDef.Reset();
 
diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index b56d3dfae68..eefd43ab19e 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -42,27 +42,27 @@ namespace vrv {
 
 ScoreDefElement::ScoreDefElement() : Object(SCOREDEF_ELEMENT, "scoredefelement-"), ScoreDefInterface(), AttTyped()
 {
-    RegisterInterface(ScoreDefInterface::GetAttClasses(), ScoreDefInterface::IsInterface());
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(ScoreDefInterface::GetAttClasses(), ScoreDefInterface::IsInterface());
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 ScoreDefElement::ScoreDefElement(ClassId classId) : Object(classId, "scoredefelement-"), ScoreDefInterface(), AttTyped()
 {
-    RegisterInterface(ScoreDefInterface::GetAttClasses(), ScoreDefInterface::IsInterface());
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(ScoreDefInterface::GetAttClasses(), ScoreDefInterface::IsInterface());
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 ScoreDefElement::ScoreDefElement(ClassId classId, const std::string &classIdStr)
     : Object(classId, classIdStr), ScoreDefInterface(), AttTyped()
 {
-    RegisterInterface(ScoreDefInterface::GetAttClasses(), ScoreDefInterface::IsInterface());
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterInterface(ScoreDefInterface::GetAttClasses(), ScoreDefInterface::IsInterface());
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 ScoreDefElement::~ScoreDefElement() {}
@@ -71,7 +71,7 @@ void ScoreDefElement::Reset()
 {
     Object::Reset();
     ScoreDefInterface::Reset();
-    ResetTyped();
+    this->ResetTyped();
 }
 
 bool ScoreDefElement::HasClefInfo(int depth)
@@ -198,12 +198,12 @@ ScoreDef::ScoreDef()
     , AttOptimization()
     , AttTimeBase()
 {
-    RegisterAttClass(ATT_DISTANCES);
-    RegisterAttClass(ATT_ENDINGS);
-    RegisterAttClass(ATT_OPTIMIZATION);
-    RegisterAttClass(ATT_TIMEBASE);
+    this->RegisterAttClass(ATT_DISTANCES);
+    this->RegisterAttClass(ATT_ENDINGS);
+    this->RegisterAttClass(ATT_OPTIMIZATION);
+    this->RegisterAttClass(ATT_TIMEBASE);
 
-    Reset();
+    this->Reset();
 }
 
 ScoreDef::~ScoreDef() {}
@@ -211,9 +211,9 @@ ScoreDef::~ScoreDef() {}
 void ScoreDef::Reset()
 {
     ScoreDefElement::Reset();
-    ResetDistances();
-    ResetEndings();
-    ResetOptimization();
+    this->ResetDistances();
+    this->ResetEndings();
+    this->ResetOptimization();
 
     m_drawLabels = false;
     m_drawingWidth = 0;
diff --git a/src/scoredefinterface.cpp b/src/scoredefinterface.cpp
index 6dc79e4ed18..a3de13fc1e0 100644
--- a/src/scoredefinterface.cpp
+++ b/src/scoredefinterface.cpp
@@ -34,32 +34,32 @@ ScoreDefInterface::ScoreDefInterface()
     , AttSpacing()
     , AttSystems()
 {
-    RegisterInterfaceAttClass(ATT_DURATIONDEFAULT);
-    RegisterInterfaceAttClass(ATT_LYRICSTYLE);
-    RegisterInterfaceAttClass(ATT_MEASURENUMBERS);
-    RegisterInterfaceAttClass(ATT_METERSIGDEFAULTLOG);
-    RegisterInterfaceAttClass(ATT_METERSIGDEFAULTVIS);
-    RegisterInterfaceAttClass(ATT_MIDITEMPO);
-    RegisterInterfaceAttClass(ATT_MULTINUMMEASURES);
-    RegisterInterfaceAttClass(ATT_PIANOPEDALS);
-    RegisterInterfaceAttClass(ATT_SPACING);
-    RegisterInterfaceAttClass(ATT_SYSTEMS);
+    this->RegisterInterfaceAttClass(ATT_DURATIONDEFAULT);
+    this->RegisterInterfaceAttClass(ATT_LYRICSTYLE);
+    this->RegisterInterfaceAttClass(ATT_MEASURENUMBERS);
+    this->RegisterInterfaceAttClass(ATT_METERSIGDEFAULTLOG);
+    this->RegisterInterfaceAttClass(ATT_METERSIGDEFAULTVIS);
+    this->RegisterInterfaceAttClass(ATT_MIDITEMPO);
+    this->RegisterInterfaceAttClass(ATT_MULTINUMMEASURES);
+    this->RegisterInterfaceAttClass(ATT_PIANOPEDALS);
+    this->RegisterInterfaceAttClass(ATT_SPACING);
+    this->RegisterInterfaceAttClass(ATT_SYSTEMS);
 
-    Reset();
+    this->Reset();
 }
 
 ScoreDefInterface::~ScoreDefInterface() {}
 
 void ScoreDefInterface::Reset()
 {
-    ResetDurationDefault();
-    ResetLyricStyle();
-    ResetMeasureNumbers();
-    ResetMidiTempo();
-    ResetMultinumMeasures();
-    ResetPianoPedals();
-    ResetSpacing();
-    ResetSystems();
+    this->ResetDurationDefault();
+    this->ResetLyricStyle();
+    this->ResetMeasureNumbers();
+    this->ResetMidiTempo();
+    this->ResetMultinumMeasures();
+    this->ResetPianoPedals();
+    this->ResetSpacing();
+    this->ResetSystems();
 }
 
 } // namespace vrv
diff --git a/src/section.cpp b/src/section.cpp
index 1c858716568..a45a50f7e30 100644
--- a/src/section.cpp
+++ b/src/section.cpp
@@ -34,10 +34,10 @@ static const ClassRegistrar<Section> s_factory("section", SECTION);
 
 Section::Section() : SystemElement(SECTION, "section-"), SystemMilestoneInterface(), AttNNumberLike(), AttSectionVis()
 {
-    RegisterAttClass(ATT_NNUMBERLIKE);
-    RegisterAttClass(ATT_SECTIONVIS);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_SECTIONVIS);
 
-    Reset();
+    this->Reset();
 }
 
 Section::~Section() {}
@@ -46,8 +46,8 @@ void Section::Reset()
 {
     SystemElement::Reset();
     SystemMilestoneInterface::Reset();
-    ResetNNumberLike();
-    ResetSectionVis();
+    this->ResetNNumberLike();
+    this->ResetSectionVis();
 }
 
 bool Section::IsSupportedChild(Object *child)
diff --git a/src/sic.cpp b/src/sic.cpp
index db95cbd2890..21e0e5162ab 100644
--- a/src/sic.cpp
+++ b/src/sic.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Sic> s_factory("sic", SIC);
 
 Sic::Sic() : EditorialElement(SIC, "sic-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Sic::~Sic() {}
@@ -35,7 +35,7 @@ Sic::~Sic() {}
 void Sic::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/slur.cpp b/src/slur.cpp
index 0c0235715d4..93c0b18dad7 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -45,13 +45,13 @@ Slur::Slur()
     , AttCurveRend()
     , AttLayerIdent()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CURVATURE);
-    RegisterAttClass(ATT_CURVEREND);
-    RegisterAttClass(ATT_LAYERIDENT);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CURVATURE);
+    this->RegisterAttClass(ATT_CURVEREND);
+    this->RegisterAttClass(ATT_LAYERIDENT);
 
-    Reset();
+    this->Reset();
 }
 
 Slur::Slur(ClassId classId)
@@ -62,13 +62,13 @@ Slur::Slur(ClassId classId)
     , AttCurveRend()
     , AttLayerIdent()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CURVATURE);
-    RegisterAttClass(ATT_CURVEREND);
-    RegisterAttClass(ATT_LAYERIDENT);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CURVATURE);
+    this->RegisterAttClass(ATT_CURVEREND);
+    this->RegisterAttClass(ATT_LAYERIDENT);
 
-    Reset();
+    this->Reset();
 }
 
 Slur::Slur(ClassId classId, const std::string &classIdStr)
@@ -79,13 +79,13 @@ Slur::Slur(ClassId classId, const std::string &classIdStr)
     , AttCurveRend()
     , AttLayerIdent()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CURVATURE);
-    RegisterAttClass(ATT_CURVEREND);
-    RegisterAttClass(ATT_LAYERIDENT);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CURVATURE);
+    this->RegisterAttClass(ATT_CURVEREND);
+    this->RegisterAttClass(ATT_LAYERIDENT);
 
-    Reset();
+    this->Reset();
 }
 
 Slur::~Slur() {}
@@ -94,10 +94,10 @@ void Slur::Reset()
 {
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetColor();
-    ResetCurvature();
-    ResetCurveRend();
-    ResetLayerIdent();
+    this->ResetColor();
+    this->ResetCurvature();
+    this->ResetCurveRend();
+    this->ResetLayerIdent();
 
     m_drawingCurvedir = curvature_CURVEDIR_NONE;
 }
diff --git a/src/space.cpp b/src/space.cpp
index 49e7a3b18b3..42a1f321dca 100644
--- a/src/space.cpp
+++ b/src/space.cpp
@@ -27,9 +27,9 @@ static const ClassRegistrar<Space> s_factory("space", SPACE);
 
 Space::Space() : LayerElement(SPACE, "space-"), DurationInterface()
 {
-    RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
+    this->RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
 
-    Reset();
+    this->Reset();
 }
 
 Space::~Space() {}
diff --git a/src/staff.cpp b/src/staff.cpp
index 7ddeb69176b..8aad8981e79 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -44,14 +44,14 @@ static const ClassRegistrar<Staff> s_factory("staff", STAFF);
 Staff::Staff(int n)
     : Object(STAFF, "staff-"), FacsimileInterface(), AttCoordY1(), AttNInteger(), AttTyped(), AttVisibility()
 {
-    RegisterAttClass(ATT_COORDY1);
-    RegisterAttClass(ATT_NINTEGER);
-    RegisterAttClass(ATT_TYPED);
-    RegisterAttClass(ATT_VISIBILITY);
-    RegisterInterface(FacsimileInterface::GetAttClasses(), FacsimileInterface::IsInterface());
+    this->RegisterAttClass(ATT_COORDY1);
+    this->RegisterAttClass(ATT_NINTEGER);
+    this->RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_VISIBILITY);
+    this->RegisterInterface(FacsimileInterface::GetAttClasses(), FacsimileInterface::IsInterface());
 
-    Reset();
-    SetN(n);
+    this->Reset();
+    this->SetN(n);
 }
 
 Staff::~Staff() {}
@@ -60,10 +60,10 @@ void Staff::Reset()
 {
     Object::Reset();
     FacsimileInterface::Reset();
-    ResetCoordY1();
-    ResetNInteger();
-    ResetTyped();
-    ResetVisibility();
+    this->ResetCoordY1();
+    this->ResetNInteger();
+    this->ResetTyped();
+    this->ResetVisibility();
 
     m_yAbs = VRV_UNSET;
 
@@ -383,7 +383,7 @@ int Staff::GetNearestInterStaffPosition(int y, Doc *doc, data_STAFFREL place)
 
 LedgerLine::LedgerLine()
 {
-    Reset();
+    this->Reset();
 }
 
 LedgerLine::~LedgerLine() {}
@@ -525,7 +525,7 @@ int Staff::AlignHorizontally(FunctorParams *functorParams)
     else {
         params->m_notationType = NOTATIONTYPE_cmn;
     }
-    Measure *parentMeasure = vrv_cast<Measure *>(GetFirstAncestor(MEASURE));
+    Measure *parentMeasure = vrv_cast<Measure *>(this->GetFirstAncestor(MEASURE));
     if (parentMeasure) m_drawingStaffDef->AlternateCurrentMeterSig(parentMeasure);
 
     return FUNCTOR_CONTINUE;
diff --git a/src/staffdef.cpp b/src/staffdef.cpp
index d0609cf871f..50b547b910c 100644
--- a/src/staffdef.cpp
+++ b/src/staffdef.cpp
@@ -42,17 +42,17 @@ StaffDef::StaffDef()
     , AttTimeBase()
     , AttTransposition()
 {
-    RegisterAttClass(ATT_DISTANCES);
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_NINTEGER);
-    RegisterAttClass(ATT_NOTATIONTYPE);
-    RegisterAttClass(ATT_SCALABLE);
-    RegisterAttClass(ATT_STAFFDEFLOG);
-    RegisterAttClass(ATT_STAFFDEFVIS);
-    RegisterAttClass(ATT_TIMEBASE);
-    RegisterAttClass(ATT_TRANSPOSITION);
-
-    Reset();
+    this->RegisterAttClass(ATT_DISTANCES);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_NINTEGER);
+    this->RegisterAttClass(ATT_NOTATIONTYPE);
+    this->RegisterAttClass(ATT_SCALABLE);
+    this->RegisterAttClass(ATT_STAFFDEFLOG);
+    this->RegisterAttClass(ATT_STAFFDEFVIS);
+    this->RegisterAttClass(ATT_TIMEBASE);
+    this->RegisterAttClass(ATT_TRANSPOSITION);
+
+    this->Reset();
 }
 
 StaffDef::~StaffDef() {}
@@ -61,15 +61,15 @@ void StaffDef::Reset()
 {
     ScoreDefElement::Reset();
     StaffDefDrawingInterface::Reset();
-    ResetDistances();
-    ResetLabelled();
-    ResetNInteger();
-    ResetNotationType();
-    ResetScalable();
-    ResetStaffDefLog();
-    ResetStaffDefVis();
-    ResetTimeBase();
-    ResetTransposition();
+    this->ResetDistances();
+    this->ResetLabelled();
+    this->ResetNInteger();
+    this->ResetNotationType();
+    this->ResetScalable();
+    this->ResetStaffDefLog();
+    this->ResetStaffDefVis();
+    this->ResetTimeBase();
+    this->ResetTransposition();
 
     m_drawingVisibility = OPTIMIZATION_NONE;
 }
diff --git a/src/staffgrp.cpp b/src/staffgrp.cpp
index 3856a8e92e0..262e8779e7b 100644
--- a/src/staffgrp.cpp
+++ b/src/staffgrp.cpp
@@ -39,14 +39,14 @@ StaffGrp::StaffGrp()
     , AttStaffGrpVis()
     , AttTyped()
 {
-    RegisterAttClass(ATT_BASIC);
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_NNUMBERLIKE);
-    RegisterAttClass(ATT_STAFFGROUPINGSYM);
-    RegisterAttClass(ATT_STAFFGRPVIS);
-    RegisterAttClass(ATT_TYPED);
-
-    Reset();
+    this->RegisterAttClass(ATT_BASIC);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_STAFFGROUPINGSYM);
+    this->RegisterAttClass(ATT_STAFFGRPVIS);
+    this->RegisterAttClass(ATT_TYPED);
+
+    this->Reset();
 }
 
 StaffGrp::~StaffGrp() {}
@@ -54,12 +54,12 @@ StaffGrp::~StaffGrp() {}
 void StaffGrp::Reset()
 {
     Object::Reset();
-    ResetBasic();
-    ResetLabelled();
-    ResetNNumberLike();
-    ResetStaffGroupingSym();
-    ResetStaffGrpVis();
-    ResetTyped();
+    this->ResetBasic();
+    this->ResetLabelled();
+    this->ResetNNumberLike();
+    this->ResetStaffGroupingSym();
+    this->ResetStaffGrpVis();
+    this->ResetTyped();
 
     m_drawingVisibility = OPTIMIZATION_NONE;
     m_groupSymbol = NULL;
@@ -135,7 +135,7 @@ int StaffGrp::GetMaxStaffSize()
 
 std::pair<StaffDef *, StaffDef *> StaffGrp::GetFirstLastStaffDef()
 {
-    const ArrayOfObjects *staffDefs = GetList(this);
+    const ArrayOfObjects *staffDefs = this->GetList(this);
     if (staffDefs->empty()) {
         return { NULL, NULL };
     }
diff --git a/src/subst.cpp b/src/subst.cpp
index e5e729ebae8..b372fe0c1c6 100644
--- a/src/subst.cpp
+++ b/src/subst.cpp
@@ -29,14 +29,14 @@ Subst::Subst() : EditorialElement(SUBST, "subst-")
 {
     m_level = EDITORIAL_UNDEFINED;
 
-    Reset();
+    this->Reset();
 }
 
 Subst::Subst(EditorialLevel level) : EditorialElement(SUBST, "subst-")
 {
     m_level = level;
 
-    Reset();
+    this->Reset();
 }
 
 void Subst::Reset()
diff --git a/src/supplied.cpp b/src/supplied.cpp
index 82ec63674ee..606483427fb 100644
--- a/src/supplied.cpp
+++ b/src/supplied.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Supplied> s_factory("supplied", SUPPLIED);
 
 Supplied::Supplied() : EditorialElement(SUPPLIED, "supplied-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Supplied::~Supplied() {}
@@ -35,7 +35,7 @@ Supplied::~Supplied() {}
 void Supplied::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/surface.cpp b/src/surface.cpp
index 537d96f2999..8afaa6ae41d 100644
--- a/src/surface.cpp
+++ b/src/surface.cpp
@@ -29,17 +29,17 @@ static const ClassRegistrar<Surface> s_factory("surface", SURFACE);
 
 Surface::Surface() : Object(SURFACE, "surface-"), AttTyped(), AttCoordinated()
 {
-    RegisterAttClass(ATT_TYPED);
-    RegisterAttClass(ATT_COORDINATED);
-    Reset();
+    this->RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_COORDINATED);
+    this->Reset();
 }
 
 Surface::~Surface() {}
 
 void Surface::Reset()
 {
-    ResetTyped();
-    ResetCoordinated();
+    this->ResetTyped();
+    this->ResetCoordinated();
 }
 
 bool Surface::IsSupportedChild(Object *object)
@@ -57,7 +57,7 @@ bool Surface::IsSupportedChild(Object *object)
 
 int Surface::GetMaxX()
 {
-    if (HasLrx()) return GetLrx();
+    if (this->HasLrx()) return this->GetLrx();
     int max = 0;
     ListOfObjects zones = this->FindAllDescendantsByType(ZONE);
     for (auto iter = zones.begin(); iter != zones.end(); ++iter) {
@@ -70,7 +70,7 @@ int Surface::GetMaxX()
 
 int Surface::GetMaxY()
 {
-    if (HasLry()) return GetLry();
+    if (this->HasLry()) return this->GetLry();
     int max = 0;
     ListOfObjects zones = this->FindAllDescendantsByType(ZONE);
     for (auto iter = zones.begin(); iter != zones.end(); ++iter) {
diff --git a/src/svg.cpp b/src/svg.cpp
index c6e4df5ecef..f3bf7f8ae4f 100644
--- a/src/svg.cpp
+++ b/src/svg.cpp
@@ -26,7 +26,7 @@ static const ClassRegistrar<Svg> s_factory("svg", SVG);
 
 Svg::Svg() : Object(SVG, "svg-")
 {
-    Reset();
+    this->Reset();
 }
 
 Svg::~Svg() {}
diff --git a/src/svgdevicecontext.cpp b/src/svgdevicecontext.cpp
index eac1343fc0f..9d71f1bf6d1 100644
--- a/src/svgdevicecontext.cpp
+++ b/src/svgdevicecontext.cpp
@@ -38,8 +38,8 @@ SvgDeviceContext::SvgDeviceContext() : DeviceContext(SVG_DEVICE_CONTEXT)
     m_originX = 0;
     m_originY = 0;
 
-    SetBrush(AxNONE, AxSOLID);
-    SetPen(AxNONE, 1, AxSOLID);
+    this->SetBrush(AxNONE, AxSOLID);
+    this->SetPen(AxNONE, 1, AxSOLID);
 
     m_smuflGlyphs.clear();
 
@@ -91,8 +91,8 @@ void SvgDeviceContext::Commit(bool xml_declaration)
     }
 
     // take care of width/height once userScale is updated
-    double height = (double)GetHeight() * GetUserScaleY();
-    double width = (double)GetWidth() * GetUserScaleX();
+    double height = (double)this->GetHeight() * this->GetUserScaleY();
+    double width = (double)this->GetWidth() * this->GetUserScaleX();
     const char *format = "%gpx";
 
     if (m_mmOutput) {
@@ -277,8 +277,8 @@ void SvgDeviceContext::StartGraphic(Object *object, std::string gClass, std::str
 
     // m_currentNode.append_attribute("style") = StringFormat("stroke: #%s; stroke-opacity: %f; fill: #%s; fill-opacity:
     // %f;",
-    // GetColour(currentPen.GetColour()).c_str(), currentPen.GetOpacity(), GetColour(currentBrush.GetColour()).c_str(),
-    // currentBrush.GetOpacity()).c_str();
+    // this->GetColour(currentPen.GetColour()).c_str(), currentPen.GetOpacity(),
+    // this->GetColour(currentBrush.GetColour()).c_str(), currentBrush.GetOpacity()).c_str();
 }
 
 void SvgDeviceContext::StartCustomGraphic(std::string name, std::string gClass, std::string gId)
@@ -354,7 +354,7 @@ void SvgDeviceContext::ResumeGraphic(Object *object, std::string gId)
 
 void SvgDeviceContext::EndGraphic(Object *object, View *view)
 {
-    DrawSvgBoundingBox(object, view);
+    this->DrawSvgBoundingBox(object, view);
     m_svgNodeStack.pop_back();
     m_currentNode = m_svgNodeStack.back();
 }
@@ -373,7 +373,7 @@ void SvgDeviceContext::EndResumedGraphic(Object *object, View *view)
 
 void SvgDeviceContext::EndTextGraphic(Object *object, View *view)
 {
-    DrawSvgBoundingBox(object, view);
+    this->DrawSvgBoundingBox(object, view);
     m_svgNodeStack.pop_back();
     m_currentNode = m_svgNodeStack.back();
 }
@@ -412,11 +412,13 @@ void SvgDeviceContext::StartPage()
     m_currentNode.append_attribute("class") = "definition-scale";
     m_currentNode.append_attribute("color") = "black";
     if (this->GetFacsimile()) {
-        m_currentNode.append_attribute("viewBox") = StringFormat("0 0 %d %d", GetWidth(), GetHeight()).c_str();
+        m_currentNode.append_attribute("viewBox")
+            = StringFormat("0 0 %d %d", this->GetWidth(), this->GetHeight()).c_str();
     }
     else {
-        m_currentNode.append_attribute("viewBox")
-            = StringFormat("0 0 %d %d", GetWidth() * DEFINITION_FACTOR, GetContentHeight() * DEFINITION_FACTOR).c_str();
+        m_currentNode.append_attribute("viewBox") = StringFormat(
+            "0 0 %d %d", this->GetWidth() * DEFINITION_FACTOR, this->GetContentHeight() * DEFINITION_FACTOR)
+                                                        .c_str();
     }
 
     // a graphic for the origin
@@ -429,8 +431,9 @@ void SvgDeviceContext::StartPage()
     // margin rectangle for debugging
     // pugi::xml_node rect = m_currentNode.append_child("rect");
     // rect.append_attribute("fill") = "pink";
-    // rect.append_attribute("height") = StringFormat("%d", GetHeight() * DEFINITION_FACTOR - 2 * m_originY).c_str();
-    // rect.append_attribute("width") = StringFormat("%d", GetWidth() * DEFINITION_FACTOR - 2 * m_originX).c_str();
+    // rect.append_attribute("height") = StringFormat("%d", this->GetHeight() * DEFINITION_FACTOR - 2 *
+    // m_originY).c_str(); rect.append_attribute("width") = StringFormat("%d", this->GetWidth() * DEFINITION_FACTOR - 2
+    // * m_originX).c_str();
 
     m_pageNode = m_currentNode;
 }
@@ -497,7 +500,7 @@ void SvgDeviceContext::DrawQuadBezierPath(Point bezier[3])
         bezier[1].x, bezier[1].y, bezier[2].x, bezier[2].y)
                                           .c_str();
     pathChild.append_attribute("fill") = "none";
-    pathChild.append_attribute("stroke") = GetColour(m_penStack.top().GetColour()).c_str();
+    pathChild.append_attribute("stroke") = this->GetColour(m_penStack.top().GetColour()).c_str();
     pathChild.append_attribute("stroke-linecap") = "round";
     pathChild.append_attribute("stroke-linejoin") = "round";
     pathChild.append_attribute("stroke-width") = m_penStack.top().GetWidth();
@@ -518,7 +521,7 @@ void SvgDeviceContext::DrawCubicBezierPath(Point bezier[4])
         )
                                           .c_str();
     pathChild.append_attribute("fill") = "none";
-    pathChild.append_attribute("stroke") = GetColour(m_penStack.top().GetColour()).c_str();
+    pathChild.append_attribute("stroke") = this->GetColour(m_penStack.top().GetColour()).c_str();
     pathChild.append_attribute("stroke-linecap") = "round";
     pathChild.append_attribute("stroke-linejoin") = "round";
     pathChild.append_attribute("stroke-width") = m_penStack.top().GetWidth();
@@ -541,7 +544,7 @@ void SvgDeviceContext::DrawCubicBezierPathFilled(Point bezier1[4], Point bezier2
               .c_str();
     // pathChild.append_attribute("fill") = "currentColor";
     // pathChild.append_attribute("fill-opacity") = "1";
-    pathChild.append_attribute("stroke") = GetColour(m_penStack.top().GetColour()).c_str();
+    pathChild.append_attribute("stroke") = this->GetColour(m_penStack.top().GetColour()).c_str();
     pathChild.append_attribute("stroke-linecap") = "round";
     pathChild.append_attribute("stroke-linejoin") = "round";
     // pathChild.append_attribute("stroke-opacity") = "1";
@@ -550,7 +553,7 @@ void SvgDeviceContext::DrawCubicBezierPathFilled(Point bezier1[4], Point bezier2
 
 void SvgDeviceContext::DrawCircle(int x, int y, int radius)
 {
-    DrawEllipse(x - radius, y - radius, 2 * radius, 2 * radius);
+    this->DrawEllipse(x - radius, y - radius, 2 * radius, 2 * radius);
 }
 
 void SvgDeviceContext::DrawEllipse(int x, int y, int width, int height)
@@ -573,7 +576,7 @@ void SvgDeviceContext::DrawEllipse(int x, int y, int width, int height)
     if (currentPen.GetOpacity() != 1.0) ellipseChild.append_attribute("stroke-opacity") = currentPen.GetOpacity();
     if (currentPen.GetWidth() > 0) {
         ellipseChild.append_attribute("stroke-width") = currentPen.GetWidth();
-        ellipseChild.append_attribute("stroke") = GetColour(m_penStack.top().GetColour()).c_str();
+        ellipseChild.append_attribute("stroke") = this->GetColour(m_penStack.top().GetColour()).c_str();
     }
 }
 
@@ -644,7 +647,7 @@ void SvgDeviceContext::DrawEllipticArc(int x, int y, int width, int height, doub
     if (currentPen.GetOpacity() != 1.0) pathChild.append_attribute("stroke-opacity") = currentPen.GetOpacity();
     if (currentPen.GetWidth() > 0) {
         pathChild.append_attribute("stroke-width") = currentPen.GetWidth();
-        pathChild.append_attribute("stroke") = GetColour(m_penStack.top().GetColour()).c_str();
+        pathChild.append_attribute("stroke") = this->GetColour(m_penStack.top().GetColour()).c_str();
     }
 }
 
@@ -652,7 +655,7 @@ void SvgDeviceContext::DrawLine(int x1, int y1, int x2, int y2)
 {
     pugi::xml_node pathChild = AppendChild("path");
     pathChild.append_attribute("d") = StringFormat("M%d %d L%d %d", x1, y1, x2, y2).c_str();
-    pathChild.append_attribute("stroke") = GetColour(m_penStack.top().GetColour()).c_str();
+    pathChild.append_attribute("stroke") = this->GetColour(m_penStack.top().GetColour()).c_str();
     if (m_penStack.top().GetLineCap() > 0) {
         pathChild.append_attribute("stroke-linecap") = "round";
         pathChild.append_attribute("stroke-dasharray")
@@ -676,13 +679,14 @@ void SvgDeviceContext::DrawPolygon(int n, Point points[], int xoffset, int yoffs
     // if (fillStyle == wxODDEVEN_RULE)
     //    polygonChild.append_attribute("fill-rule") = "evenodd;";
     // else
-    if (currentPen.GetWidth() > 0) polygonChild.append_attribute("stroke") = GetColour(currentPen.GetColour()).c_str();
+    if (currentPen.GetWidth() > 0)
+        polygonChild.append_attribute("stroke") = this->GetColour(currentPen.GetColour()).c_str();
     if (currentPen.GetWidth() > 1)
         polygonChild.append_attribute("stroke-width") = StringFormat("%d", currentPen.GetWidth()).c_str();
     if (currentPen.GetOpacity() != 1.0)
         polygonChild.append_attribute("stroke-opacity") = StringFormat("%f", currentPen.GetOpacity()).c_str();
     if (currentBrush.GetColour() != AxNONE)
-        polygonChild.append_attribute("fill") = GetColour(currentBrush.GetColour()).c_str();
+        polygonChild.append_attribute("fill") = this->GetColour(currentBrush.GetColour()).c_str();
     if (currentBrush.GetOpacity() != 1.0)
         polygonChild.append_attribute("fill-opacity") = StringFormat("%f", currentBrush.GetOpacity()).c_str();
 
@@ -695,7 +699,7 @@ void SvgDeviceContext::DrawPolygon(int n, Point points[], int xoffset, int yoffs
 
 void SvgDeviceContext::DrawRectangle(int x, int y, int width, int height)
 {
-    DrawRoundedRectangle(x, y, width, height, 0);
+    this->DrawRoundedRectangle(x, y, width, height, 0);
 }
 
 void SvgDeviceContext::DrawRoundedRectangle(int x, int y, int width, int height, int radius)
@@ -704,7 +708,8 @@ void SvgDeviceContext::DrawRoundedRectangle(int x, int y, int width, int height,
 
     if (m_penStack.size()) {
         Pen currentPen = m_penStack.top();
-        if (currentPen.GetWidth() > 0) rectChild.append_attribute("stroke") = GetColour(currentPen.GetColour()).c_str();
+        if (currentPen.GetWidth() > 0)
+            rectChild.append_attribute("stroke") = this->GetColour(currentPen.GetColour()).c_str();
         if (currentPen.GetWidth() > 1)
             rectChild.append_attribute("stroke-width") = StringFormat("%d", currentPen.GetWidth()).c_str();
         if (currentPen.GetOpacity() != 1.0)
@@ -714,7 +719,7 @@ void SvgDeviceContext::DrawRoundedRectangle(int x, int y, int width, int height,
     if (m_brushStack.size()) {
         Brush currentBrush = m_brushStack.top();
         if (currentBrush.GetColour() != AxNONE)
-            rectChild.append_attribute("fill") = GetColour(currentBrush.GetColour()).c_str();
+            rectChild.append_attribute("fill") = this->GetColour(currentBrush.GetColour()).c_str();
         if (currentBrush.GetOpacity() != 1.0)
             rectChild.append_attribute("fill-opacity") = StringFormat("%f", currentBrush.GetOpacity()).c_str();
     }
@@ -1101,11 +1106,11 @@ void SvgDeviceContext::DrawSvgBoundingBox(Object *object, View *view)
                         p.y = object->GetSelfBottom() - y * smuflGlyphFontSize / glyph->GetUnitsPerEm();
                         p.y += (fontPoint->y * smuflGlyphFontSize / glyph->GetUnitsPerEm());
 
-                        SetPen(AxGREEN, 10, AxSOLID);
-                        SetBrush(AxGREEN, AxSOLID);
+                        this->SetPen(AxGREEN, 10, AxSOLID);
+                        this->SetBrush(AxGREEN, AxSOLID);
                         this->DrawCircle(view->ToDeviceContextX(p.x), view->ToDeviceContextY(p.y), 5);
-                        SetPen(AxNONE, 1, AxSOLID);
-                        SetBrush(AxNONE, AxSOLID);
+                        this->SetPen(AxNONE, 1, AxSOLID);
+                        this->SetBrush(AxNONE, AxSOLID);
                     }
                 }
             }
diff --git a/src/syl.cpp b/src/syl.cpp
index 7ec4c26d194..5cc03d5e8ec 100644
--- a/src/syl.cpp
+++ b/src/syl.cpp
@@ -35,12 +35,12 @@ static const ClassRegistrar<Syl> s_factory("syl", SYL);
 Syl::Syl()
     : LayerElement(SYL, "syl-"), TextListInterface(), TimeSpanningInterface(), AttLang(), AttTypography(), AttSylLog()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_LANG);
-    RegisterAttClass(ATT_TYPOGRAPHY);
-    RegisterAttClass(ATT_SYLLOG);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_LANG);
+    this->RegisterAttClass(ATT_TYPOGRAPHY);
+    this->RegisterAttClass(ATT_SYLLOG);
 
-    Reset();
+    this->Reset();
 }
 
 Syl::~Syl() {}
@@ -49,9 +49,9 @@ void Syl::Reset()
 {
     LayerElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetLang();
-    ResetTypography();
-    ResetSylLog();
+    this->ResetLang();
+    this->ResetTypography();
+    this->ResetSylLog();
 
     m_drawingVerse = 1;
     m_nextWordSyl = NULL;
diff --git a/src/syllable.cpp b/src/syllable.cpp
index b3454ed8fe6..984bb2b3d65 100644
--- a/src/syllable.cpp
+++ b/src/syllable.cpp
@@ -36,10 +36,10 @@ Syllable::Syllable() : LayerElement(SYLLABLE, "syllable-"), ObjectListInterface(
 
 void Syllable::Init()
 {
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_SLASHCOUNT);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_SLASHCOUNT);
 
-    Reset();
+    this->Reset();
 }
 
 bool Syllable::IsSupportedChild(Object *child)
@@ -61,8 +61,8 @@ Syllable::~Syllable() {}
 void Syllable::Reset()
 {
     LayerElement::Reset();
-    ResetColor();
-    ResetSlashCount();
+    this->ResetColor();
+    this->ResetSlashCount();
 }
 
 bool Syllable::MarkupAddSyl()
diff --git a/src/system.cpp b/src/system.cpp
index 24889e0339a..79f417b36b3 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -42,7 +42,7 @@ namespace vrv {
 
 System::System() : Object(SYSTEM, "system-"), DrawingListInterface(), AttTyped()
 {
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_TYPED);
 
     // We set parent to it because we want to access the parent doc from the aligners
     m_systemAligner.SetParent(this);
@@ -50,20 +50,20 @@ System::System() : Object(SYSTEM, "system-"), DrawingListInterface(), AttTyped()
     // owned pointers need to be set to NULL;
     m_drawingScoreDef = NULL;
 
-    Reset();
+    this->Reset();
 }
 
 System::~System()
 {
     // We need to delete own objects
-    Reset();
+    this->Reset();
 }
 
 void System::Reset()
 {
     Object::Reset();
     DrawingListInterface::Reset();
-    ResetTyped();
+    this->ResetTyped();
 
     if (m_drawingScoreDef) {
         delete m_drawingScoreDef;
@@ -120,13 +120,13 @@ int System::GetDrawingY() const
 
 void System::SetDrawingXRel(int drawingXRel)
 {
-    ResetCachedDrawingX();
+    this->ResetCachedDrawingX();
     m_drawingXRel = drawingXRel;
 }
 
 void System::SetDrawingYRel(int drawingYRel)
 {
-    ResetCachedDrawingY();
+    this->ResetCachedDrawingY();
     m_drawingYRel = drawingYRel;
 }
 
@@ -489,7 +489,7 @@ int System::ScoreDefSetGrpSym(FunctorParams *functorParams)
 
 int System::ResetHorizontalAlignment(FunctorParams *functorParams)
 {
-    SetDrawingXRel(0);
+    this->SetDrawingXRel(0);
     m_drawingAbbrLabelsWidth = 0;
 
     return FUNCTOR_CONTINUE;
@@ -497,7 +497,7 @@ int System::ResetHorizontalAlignment(FunctorParams *functorParams)
 
 int System::ResetVerticalAlignment(FunctorParams *functorParams)
 {
-    SetDrawingYRel(0);
+    this->SetDrawingYRel(0);
 
     m_systemAligner.Reset();
 
@@ -729,7 +729,7 @@ int System::AlignMeasures(FunctorParams *functorParams)
     AlignMeasuresParams *params = vrv_params_cast<AlignMeasuresParams *>(functorParams);
     assert(params);
 
-    SetDrawingXRel(m_systemLeftMar + this->GetDrawingLabelsWidth());
+    this->SetDrawingXRel(m_systemLeftMar + this->GetDrawingLabelsWidth());
     params->m_shift = 0;
     params->m_justifiableWidth = 0;
 
@@ -762,7 +762,7 @@ int System::AlignSystems(FunctorParams *functorParams)
         params->m_shift -= std::max(margin, 2 * unit);
     }
 
-    SetDrawingYRel(params->m_shift);
+    this->SetDrawingYRel(params->m_shift);
 
     params->m_shift += m_systemAligner.GetBottomAlignment()->GetYRel();
 
diff --git a/src/systemelement.cpp b/src/systemelement.cpp
index 9841f43c2af..6dd7b5d017c 100644
--- a/src/systemelement.cpp
+++ b/src/systemelement.cpp
@@ -24,24 +24,24 @@ namespace vrv {
 
 SystemElement::SystemElement() : FloatingObject(SYSTEM_ELEMENT, "se"), AttTyped()
 {
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 SystemElement::SystemElement(ClassId classId) : FloatingObject(classId, "se"), AttTyped()
 {
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 SystemElement::SystemElement(ClassId classId, const std::string &classIdStr)
     : FloatingObject(classId, classIdStr), AttTyped()
 {
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 SystemElement::~SystemElement() {}
@@ -49,7 +49,7 @@ SystemElement::~SystemElement() {}
 void SystemElement::Reset()
 {
     FloatingObject::Reset();
-    ResetTyped();
+    this->ResetTyped();
 
     m_visibility = Visible;
 }
diff --git a/src/systemmilestone.cpp b/src/systemmilestone.cpp
index 4130a1372fa..45720e1f610 100644
--- a/src/systemmilestone.cpp
+++ b/src/systemmilestone.cpp
@@ -26,7 +26,7 @@ namespace vrv {
 
 SystemMilestoneEnd::SystemMilestoneEnd(Object *start) : SystemElement(SYSTEM_MILESTONE_END, "system-milestone-end-")
 {
-    Reset();
+    this->Reset();
     m_start = start;
     m_startClassName = start->GetClassName();
 }
@@ -45,7 +45,7 @@ void SystemMilestoneEnd::Reset()
 
 SystemMilestoneInterface::SystemMilestoneInterface()
 {
-    Reset();
+    this->Reset();
 }
 
 SystemMilestoneInterface::~SystemMilestoneInterface() {}
diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index 793ac0f4b9b..d4bdfabaf69 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<TabDurSym> s_factory("tabDurSym", TABDURSYM);
 
 TabDurSym::TabDurSym() : LayerElement(TABDURSYM, "tabdursym-"), AttNNumberLike()
 {
-    RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
-    Reset();
+    this->Reset();
 }
 
 TabDurSym::~TabDurSym() {}
@@ -35,7 +35,7 @@ TabDurSym::~TabDurSym() {}
 void TabDurSym::Reset()
 {
     LayerElement::Reset();
-    ResetNNumberLike();
+    this->ResetNNumberLike();
 }
 
 bool TabDurSym::IsSupportedChild(Object *child)
diff --git a/src/tabgrp.cpp b/src/tabgrp.cpp
index bf0d6fdf633..16b4d32d365 100644
--- a/src/tabgrp.cpp
+++ b/src/tabgrp.cpp
@@ -28,9 +28,9 @@ static const ClassRegistrar<TabGrp> s_factory("tabGrp", TABGRP);
 
 TabGrp::TabGrp() : LayerElement(TABGRP, "tabgrp-"), DurationInterface()
 {
-    RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
+    this->RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
 
-    Reset();
+    this->Reset();
 }
 
 TabGrp::~TabGrp() {}
diff --git a/src/tempo.cpp b/src/tempo.cpp
index 890e3f25183..e0f7556a7cd 100644
--- a/src/tempo.cpp
+++ b/src/tempo.cpp
@@ -34,13 +34,13 @@ static const ClassRegistrar<Tempo> s_factory("tempo", TEMPO);
 Tempo::Tempo()
     : ControlElement(TEMPO, "tempo-"), TextDirInterface(), TimePointInterface(), AttLang(), AttMidiTempo(), AttMmTempo()
 {
-    RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterAttClass(ATT_LANG);
-    RegisterAttClass(ATT_MIDITEMPO);
-    RegisterAttClass(ATT_MMTEMPO);
+    this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterAttClass(ATT_LANG);
+    this->RegisterAttClass(ATT_MIDITEMPO);
+    this->RegisterAttClass(ATT_MMTEMPO);
 
-    Reset();
+    this->Reset();
 }
 
 Tempo::~Tempo() {}
@@ -50,9 +50,9 @@ void Tempo::Reset()
     ControlElement::Reset();
     TextDirInterface::Reset();
     TimePointInterface::Reset();
-    ResetLang();
-    ResetMidiTempo();
-    ResetMmTempo();
+    this->ResetLang();
+    this->ResetMidiTempo();
+    this->ResetMmTempo();
 }
 
 bool Tempo::IsSupportedChild(Object *child)
@@ -76,7 +76,7 @@ int Tempo::GetDrawingXRelativeToStaff(int staffN)
         m_relativeX = m_drawingXRels.at(staffN);
     }
 
-    return GetStart()->GetDrawingX() + m_relativeX;
+    return this->GetStart()->GetDrawingX() + m_relativeX;
 }
 
 int Tempo::AdjustTempo(FunctorParams *functorParams)
@@ -92,20 +92,20 @@ int Tempo::AdjustTempo(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    Measure *measure = vrv_cast<Measure *>(GetFirstAncestor(MEASURE));
+    Measure *measure = vrv_cast<Measure *>(this->GetFirstAncestor(MEASURE));
     MeasureAlignerTypeComparison alignmentComparison(ALIGNMENT_SCOREDEF_METERSIG);
     Alignment *pos
         = dynamic_cast<Alignment *>(measure->m_measureAligner.FindDescendantByComparison(&alignmentComparison, 1));
 
     for (auto positioner : positioners) {
         int left, right;
-        int start = GetStart()->GetDrawingX();
+        int start = this->GetStart()->GetDrawingX();
         const int staffN = positioner->GetAlignment()->GetStaff()->GetN();
-        if (!HasStartid() && (GetTstamp() <= 1) && pos) {
+        if (!this->HasStartid() && (this->GetTstamp() <= 1) && pos) {
             left = measure->GetDrawingX() + pos->GetXRel();
         }
         else {
-            Alignment *align = GetStart()->GetAlignment();
+            Alignment *align = this->GetStart()->GetAlignment();
             align->GetLeftRight(staffN, left, right);
         }
 
diff --git a/src/text.cpp b/src/text.cpp
index d161307c282..feee35b8b7b 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -24,7 +24,7 @@ namespace vrv {
 
 Text::Text() : TextElement(TEXT, "text-")
 {
-    Reset();
+    this->Reset();
 }
 
 Text::~Text() {}
diff --git a/src/textdirinterface.cpp b/src/textdirinterface.cpp
index 1a36aeceeea..ba9e25fd07d 100644
--- a/src/textdirinterface.cpp
+++ b/src/textdirinterface.cpp
@@ -24,16 +24,16 @@ namespace vrv {
 
 TextDirInterface::TextDirInterface() : Interface(), AttPlacementRelStaff()
 {
-    RegisterInterfaceAttClass(ATT_PLACEMENTRELSTAFF);
+    this->RegisterInterfaceAttClass(ATT_PLACEMENTRELSTAFF);
 
-    Reset();
+    this->Reset();
 }
 
 TextDirInterface::~TextDirInterface() {}
 
 void TextDirInterface::Reset()
 {
-    ResetPlacementRelStaff();
+    this->ResetPlacementRelStaff();
 }
 
 int TextDirInterface::GetNumberOfLines(Object *object)
diff --git a/src/textelement.cpp b/src/textelement.cpp
index d9df7233556..4cf60183d04 100644
--- a/src/textelement.cpp
+++ b/src/textelement.cpp
@@ -21,27 +21,27 @@ namespace vrv {
 
 TextElement::TextElement() : Object(TEXT_ELEMENT, "te-"), AttLabelled(), AttTyped()
 {
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 TextElement::TextElement(ClassId classId) : Object(classId, "te-"), AttLabelled(), AttTyped()
 {
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 TextElement::TextElement(ClassId classId, const std::string &classIdStr)
     : Object(classId, classIdStr), AttLabelled(), AttTyped()
 {
-    RegisterAttClass(ATT_LABELLED);
-    RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_LABELLED);
+    this->RegisterAttClass(ATT_TYPED);
 
-    Reset();
+    this->Reset();
 }
 
 TextElement::~TextElement() {}
@@ -49,8 +49,8 @@ TextElement::~TextElement() {}
 void TextElement::Reset()
 {
     Object::Reset();
-    ResetLabelled();
-    ResetTyped();
+    this->ResetLabelled();
+    this->ResetTyped();
 
     m_drawingYRel = 0;
     m_drawingXRel = 0;
@@ -97,13 +97,13 @@ int TextElement::GetDrawingY() const
 
 void TextElement::SetDrawingXRel(int drawingXRel)
 {
-    ResetCachedDrawingX();
+    this->ResetCachedDrawingX();
     m_drawingXRel = drawingXRel;
 }
 
 void TextElement::SetDrawingYRel(int drawingYRel)
 {
-    ResetCachedDrawingY();
+    this->ResetCachedDrawingY();
     m_drawingYRel = drawingYRel;
 }
 
@@ -113,8 +113,8 @@ void TextElement::SetDrawingYRel(int drawingYRel)
 
 int TextElement::ResetVerticalAlignment(FunctorParams *functorParams)
 {
-    SetDrawingXRel(0);
-    SetDrawingYRel(0);
+    this->SetDrawingXRel(0);
+    this->SetDrawingYRel(0);
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/tie.cpp b/src/tie.cpp
index 99d9a0fb713..65456c884ff 100644
--- a/src/tie.cpp
+++ b/src/tie.cpp
@@ -34,34 +34,34 @@ static const ClassRegistrar<Tie> s_factory("tie", TIE);
 
 Tie::Tie() : ControlElement(TIE, "tie-"), TimeSpanningInterface(), AttColor(), AttCurvature(), AttCurveRend()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CURVATURE);
-    RegisterAttClass(ATT_CURVEREND);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CURVATURE);
+    this->RegisterAttClass(ATT_CURVEREND);
 
-    Reset();
+    this->Reset();
 }
 
 Tie::Tie(ClassId classId)
     : ControlElement(classId, "tie-"), TimeSpanningInterface(), AttColor(), AttCurvature(), AttCurveRend()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CURVATURE);
-    RegisterAttClass(ATT_CURVEREND);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CURVATURE);
+    this->RegisterAttClass(ATT_CURVEREND);
 
-    Reset();
+    this->Reset();
 }
 
 Tie::Tie(ClassId classId, const std::string &classIdStr)
     : ControlElement(classId, classIdStr), TimeSpanningInterface(), AttColor(), AttCurvature(), AttCurveRend()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_CURVATURE);
-    RegisterAttClass(ATT_CURVEREND);
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CURVATURE);
+    this->RegisterAttClass(ATT_CURVEREND);
 
-    Reset();
+    this->Reset();
 }
 
 Tie::~Tie() {}
@@ -70,9 +70,9 @@ void Tie::Reset()
 {
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetColor();
-    ResetCurvature();
-    ResetCurveRend();
+    this->ResetColor();
+    this->ResetCurvature();
+    this->ResetCurveRend();
 }
 
 bool Tie::AdjustEnharmonicTies(Doc *doc, FloatingCurvePositioner *curve, Point bezier[4], Note *startNote,
@@ -151,8 +151,8 @@ bool Tie::CalculatePosition(Doc *doc, Staff *staff, int x1, int x2, int spanning
         return false;
     }
 
-    Note *note1 = dynamic_cast<Note *>(GetStart());
-    Note *note2 = dynamic_cast<Note *>(GetEnd());
+    Note *note1 = dynamic_cast<Note *>(this->GetStart());
+    Note *note2 = dynamic_cast<Note *>(this->GetEnd());
 
     if (!note1 && !note2) {
         // no note, obviously nothing to do...
@@ -201,7 +201,7 @@ bool Tie::CalculatePosition(Doc *doc, Staff *staff, int x1, int x2, int spanning
 
     bool isAboveStaffCenter = startPoint.y > (staff->GetDrawingY() - 4 * drawingUnit);
     curvature_CURVEDIR drawingCurveDir
-        = GetPreferredCurveDirection(layer1, note1, startParentChord, noteStemDir, isAboveStaffCenter);
+        = this->GetPreferredCurveDirection(layer1, note1, startParentChord, noteStemDir, isAboveStaffCenter);
     if (startParentChord) {
         if (((curvature_CURVEDIR_above == drawingCurveDir) && (note1 == startParentChord->GetTopNote()))
             || ((curvature_CURVEDIR_below == drawingCurveDir) && (note1 == startParentChord->GetBottomNote()))) {
@@ -254,8 +254,8 @@ bool Tie::CalculatePosition(Doc *doc, Staff *staff, int x1, int x2, int spanning
     bezier[2] = c2;
     bezier[3] = endPoint;
 
-    assert(GetCurrentFloatingPositioner());
-    FloatingPositioner *positioner = GetCurrentFloatingPositioner();
+    assert(this->GetCurrentFloatingPositioner());
+    FloatingPositioner *positioner = this->GetCurrentFloatingPositioner();
     assert(positioner && positioner->Is(FLOATING_CURVE_POSITIONER));
     FloatingCurvePositioner *curve = vrv_cast<FloatingCurvePositioner *>(positioner);
     assert(curve);
@@ -358,8 +358,8 @@ int Tie::CalculateAdjacentChordXOffset(Doc *doc, Staff *staff, Chord *parentChor
 void Tie::CalculateXPosition(Doc *doc, Staff *staff, Chord *startParentChord, Chord *endParentChord, int spanningType,
     bool isOuterChordNote, Point &startPoint, Point &endPoint, curvature_CURVEDIR drawingCurveDir)
 {
-    Note *startNote = dynamic_cast<Note *>(GetStart());
-    Note *endNote = dynamic_cast<Note *>(GetEnd());
+    Note *startNote = dynamic_cast<Note *>(this->GetStart());
+    Note *endNote = dynamic_cast<Note *>(this->GetEnd());
 
     const int drawingUnit = doc->GetDrawingUnit(staff->m_drawingStaffSize);
     bool isShortTie = false;
@@ -472,9 +472,9 @@ curvature_CURVEDIR Tie::GetPreferredCurveDirection(
     data_STEMDIRECTION layerStemDir;
     curvature_CURVEDIR drawingCurveDir = curvature_CURVEDIR_above;
     // first should be the tie @curvedir
-    if (HasCurvedir()) {
+    if (this->HasCurvedir()) {
         drawingCurveDir
-            = (GetCurvedir() == curvature_CURVEDIR_above) ? curvature_CURVEDIR_above : curvature_CURVEDIR_below;
+            = (this->GetCurvedir() == curvature_CURVEDIR_above) ? curvature_CURVEDIR_above : curvature_CURVEDIR_below;
     }
     // then layer direction trumps note direction
     else if (layer && ((layerStemDir = layer->GetDrawingStemDir(note)) != STEMDIRECTION_NONE)) {
diff --git a/src/timeinterface.cpp b/src/timeinterface.cpp
index 490b4370f9d..0a45443076c 100644
--- a/src/timeinterface.cpp
+++ b/src/timeinterface.cpp
@@ -29,20 +29,20 @@ namespace vrv {
 
 TimePointInterface::TimePointInterface() : Interface(), AttStaffIdent(), AttStartId(), AttTimestampLogical()
 {
-    RegisterInterfaceAttClass(ATT_STAFFIDENT);
-    RegisterInterfaceAttClass(ATT_STARTID);
-    RegisterInterfaceAttClass(ATT_TIMESTAMPLOGICAL);
+    this->RegisterInterfaceAttClass(ATT_STAFFIDENT);
+    this->RegisterInterfaceAttClass(ATT_STARTID);
+    this->RegisterInterfaceAttClass(ATT_TIMESTAMPLOGICAL);
 
-    Reset();
+    this->Reset();
 }
 
 TimePointInterface::~TimePointInterface() {}
 
 void TimePointInterface::Reset()
 {
-    ResetStaffIdent();
-    ResetStartId();
-    ResetTimestampLogical();
+    this->ResetStaffIdent();
+    this->ResetStartId();
+    this->ResetTimestampLogical();
 
     m_start = NULL;
     m_startUuid = "";
@@ -157,10 +157,10 @@ std::vector<Staff *> TimePointInterface::GetTstampStaves(Measure *measure, Objec
 
 TimeSpanningInterface::TimeSpanningInterface() : TimePointInterface(), AttStartEndId(), AttTimestamp2Logical()
 {
-    RegisterInterfaceAttClass(ATT_STARTENDID);
-    RegisterInterfaceAttClass(ATT_TIMESTAMP2LOGICAL);
+    this->RegisterInterfaceAttClass(ATT_STARTENDID);
+    this->RegisterInterfaceAttClass(ATT_TIMESTAMP2LOGICAL);
 
-    Reset();
+    this->Reset();
 }
 
 TimeSpanningInterface::~TimeSpanningInterface() {}
@@ -168,8 +168,8 @@ TimeSpanningInterface::~TimeSpanningInterface() {}
 void TimeSpanningInterface::Reset()
 {
     TimePointInterface::Reset();
-    ResetStartEndId();
-    ResetTimestamp2Logical();
+    this->ResetStartEndId();
+    this->ResetTimestamp2Logical();
 
     m_end = NULL;
     m_endUuid = "";
@@ -323,7 +323,7 @@ int TimePointInterface::InterfacePrepareTimestamps(FunctorParams *functorParams,
                 object->GetClassName().c_str(), object->GetUuid().c_str());
         return FUNCTOR_CONTINUE;
     }
-    else if (!HasTstamp()) {
+    else if (!this->HasTstamp()) {
         return FUNCTOR_CONTINUE; // This file is quite likely invalid?
     }
 
@@ -388,7 +388,7 @@ int TimeSpanningInterface::InterfacePrepareTimestamps(FunctorParams *functorPara
         }
         return TimePointInterface::InterfacePrepareTimestamps(functorParams, object);
     }
-    else if (!HasTstamp2()) {
+    else if (!this->HasTstamp2()) {
         // We won't be able to do anything, just try to prepare the tstamp (start)
         return TimePointInterface::InterfacePrepareTimestamps(functorParams, object);
     }
diff --git a/src/timestamp.cpp b/src/timestamp.cpp
index 1136d1eeaac..b14adfbb326 100644
--- a/src/timestamp.cpp
+++ b/src/timestamp.cpp
@@ -21,7 +21,7 @@ namespace vrv {
 
 TimestampAttr::TimestampAttr() : LayerElement(TIMESTAMP_ATTR, "tstp-")
 {
-    Reset();
+    this->Reset();
 }
 
 TimestampAttr::~TimestampAttr() {}
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index e99df13574d..c7969421804 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -475,7 +475,7 @@ bool Toolkit::LoadData(const std::string &data)
 
         // HumdrumInput *input = new HumdrumInput(&m_doc);
         input = new HumdrumInput(&m_doc);
-        if (GetOutputTo() == HUMDRUM) {
+        if (this->GetOutputTo() == HUMDRUM) {
             input->SetOutputFormat("humdrum");
         }
 
@@ -484,8 +484,8 @@ bool Toolkit::LoadData(const std::string &data)
             delete input;
             return false;
         }
-        SetHumdrumBuffer(((HumdrumInput *)input)->GetHumdrumString().c_str());
-        if (GetOutputTo() == HUMDRUM) {
+        this->SetHumdrumBuffer(((HumdrumInput *)input)->GetHumdrumString().c_str());
+        if (this->GetOutputTo() == HUMDRUM) {
             // Humdrum data will be output (post-filtering data),
             // So not continuing converting to SVG.
             return true;
@@ -501,7 +501,7 @@ bool Toolkit::LoadData(const std::string &data)
         Doc tempdoc;
         tempdoc.SetOptions(m_doc.GetOptions());
         HumdrumInput *tempinput = new HumdrumInput(&tempdoc);
-        if (GetOutputTo() == HUMDRUM) {
+        if (this->GetOutputTo() == HUMDRUM) {
             tempinput->SetOutputFormat("humdrum");
         }
 
@@ -511,9 +511,9 @@ bool Toolkit::LoadData(const std::string &data)
             return false;
         }
 
-        SetHumdrumBuffer(tempinput->GetHumdrumString().c_str());
+        this->SetHumdrumBuffer(tempinput->GetHumdrumString().c_str());
 
-        if (GetOutputTo() == HUMDRUM) {
+        if (this->GetOutputTo() == HUMDRUM) {
             return true;
         }
 
@@ -548,7 +548,7 @@ bool Toolkit::LoadData(const std::string &data)
             return false;
         }
         std::string buffer = conversion.str();
-        SetHumdrumBuffer(buffer.c_str());
+        this->SetHumdrumBuffer(buffer.c_str());
 
         // Now convert Humdrum into MEI:
         Doc tempdoc;
@@ -570,7 +570,7 @@ bool Toolkit::LoadData(const std::string &data)
         ConvertMEIToHumdrum(data);
 
         // Now convert Humdrum into MEI:
-        std::string conversion = GetHumdrumBuffer();
+        std::string conversion = this->GetHumdrumBuffer();
         Doc tempdoc;
         tempdoc.SetOptions(m_doc.GetOptions());
         Input *tempinput = new HumdrumInput(&tempdoc);
@@ -596,7 +596,7 @@ bool Toolkit::LoadData(const std::string &data)
             return false;
         }
         std::string buffer = conversion.str();
-        SetHumdrumBuffer(buffer.c_str());
+        this->SetHumdrumBuffer(buffer.c_str());
 
         // Now convert Humdrum into MEI:
         Doc tempdoc;
@@ -624,7 +624,7 @@ bool Toolkit::LoadData(const std::string &data)
             return false;
         }
         std::string buffer = conversion.str();
-        SetHumdrumBuffer(buffer.c_str());
+        this->SetHumdrumBuffer(buffer.c_str());
 
         // Now convert Humdrum into MEI:
         Doc tempdoc;
@@ -841,7 +841,7 @@ std::string Toolkit::ValidatePAE(const std::string &data)
 
 bool Toolkit::SaveFile(const std::string &filename, const std::string &jsonOptions)
 {
-    std::string output = GetMEI(jsonOptions);
+    std::string output = this->GetMEI(jsonOptions);
     if (output.empty()) {
         return false;
     }
@@ -962,17 +962,17 @@ bool Toolkit::SetOptions(const std::string &jsonOptions)
             // Base options
             if (iter->first == "inputFrom") {
                 if (json.has<jsonxx::String>("inputFrom")) {
-                    SetInputFrom(json.get<jsonxx::String>("inputFrom"));
+                    this->SetInputFrom(json.get<jsonxx::String>("inputFrom"));
                 }
             }
             else if (iter->first == "outputTo") {
                 if (json.has<jsonxx::String>("outputTo")) {
-                    SetOutputTo(json.get<jsonxx::String>("outputTo"));
+                    this->SetOutputTo(json.get<jsonxx::String>("outputTo"));
                 }
             }
             else if (iter->first == "scale") {
                 if (json.has<jsonxx::Number>("scale")) {
-                    SetScale(json.get<jsonxx::Number>("scale"));
+                    this->SetScale(json.get<jsonxx::Number>("scale"));
                 }
             }
             else if (iter->first == "xmlIdSeed") {
@@ -1192,7 +1192,7 @@ void Toolkit::RedoLayout(const std::string &jsonOptions)
 
     this->ResetLogBuffer();
 
-    if ((GetPageCount() == 0) || (m_doc.GetType() == Transcription) || (m_doc.GetType() == Facs)) {
+    if ((this->GetPageCount() == 0) || (m_doc.GetType() == Transcription) || (m_doc.GetType() == Facs)) {
         LogWarning("No data to re-layout");
         return;
     }
@@ -1228,7 +1228,7 @@ void Toolkit::RedoPagePitchPosLayout()
 
 bool Toolkit::RenderToDeviceContext(int pageNo, DeviceContext *deviceContext)
 {
-    if (pageNo > GetPageCount()) {
+    if (pageNo > this->GetPageCount()) {
         LogWarning("Page %d does not exist", pageNo);
         return false;
     }
@@ -1341,7 +1341,7 @@ bool Toolkit::RenderToSVGFile(const std::string &filename, int pageNo)
 
 std::string Toolkit::GetHumdrum()
 {
-    return GetHumdrumBuffer();
+    return this->GetHumdrumBuffer();
 }
 
 bool Toolkit::GetHumdrumFile(const std::string &filename)
@@ -1354,14 +1354,14 @@ bool Toolkit::GetHumdrumFile(const std::string &filename)
         return false;
     }
 
-    GetHumdrum(output);
+    this->GetHumdrum(output);
     output.close();
     return true;
 }
 
 void Toolkit::GetHumdrum(std::ostream &output)
 {
-    output << GetHumdrumBuffer();
+    output << this->GetHumdrumBuffer();
 }
 
 std::string Toolkit::RenderToMIDI()
@@ -1385,7 +1385,7 @@ std::string Toolkit::RenderToPAE()
 {
     this->ResetLogBuffer();
 
-    if (GetPageCount() == 0) {
+    if (this->GetPageCount() == 0) {
         LogWarning("No data loaded");
         return "";
     }
@@ -1717,7 +1717,7 @@ const char *Toolkit::GetHumdrumBuffer()
         stringstream out;
         hum::Tool_mei2hum converter;
         converter.convert(out, infile);
-        SetHumdrumBuffer(out.str().c_str());
+        this->SetHumdrumBuffer(out.str().c_str());
 #endif
         if (m_humdrumBuffer) {
             return m_humdrumBuffer;
@@ -1775,7 +1775,7 @@ std::string Toolkit::ConvertMEIToHumdrum(const std::string &meiData)
     if (!status) {
         LogError("Error converting MEI data to Humdrum: %s", conversion.str().c_str());
     }
-    SetHumdrumBuffer(conversion.str().c_str());
+    this->SetHumdrumBuffer(conversion.str().c_str());
     return conversion.str();
 #else
     return "";
@@ -1790,11 +1790,11 @@ std::string Toolkit::ConvertHumdrumToHumdrum(const std::string &humdrumData)
     // bool result = infiles.readString(humdrumData);
     bool result = infiles.readString(humdrumData);
     if (!result) {
-        SetHumdrumBuffer("");
+        this->SetHumdrumBuffer("");
         return "";
     }
     if (infiles.getCount() == 0) {
-        SetHumdrumBuffer("");
+        this->SetHumdrumBuffer("");
         return "";
     }
 
@@ -1824,7 +1824,7 @@ std::string Toolkit::ConvertHumdrumToHumdrum(const std::string &humdrumData)
     hum::HumdrumFile &infile = infiles[0];
     std::stringstream humout;
     humout << infile;
-    SetHumdrumBuffer(humout.str().c_str());
+    this->SetHumdrumBuffer(humout.str().c_str());
     return humout.str();
 #else
     return "";
diff --git a/src/transposition.cpp b/src/transposition.cpp
index d4b6adf5192..98bc43b3940 100644
--- a/src/transposition.cpp
+++ b/src/transposition.cpp
@@ -74,12 +74,12 @@ namespace vrv {
 
 TransPitch::TransPitch(int aPname, int anAccid, int anOct)
 {
-    SetPitch(aPname, anAccid, anOct);
+    this->SetPitch(aPname, anAccid, anOct);
 }
 
 TransPitch::TransPitch(data_PITCHNAME pname, data_ACCIDENTAL_GESTURAL accidG, data_ACCIDENTAL_WRITTEN accidW, int oct)
 {
-    SetPitch(pname - PITCHNAME_c, GetChromaticAlteration(accidG, accidW), oct);
+    this->SetPitch(pname - PITCHNAME_c, this->GetChromaticAlteration(accidG, accidW), oct);
 }
 
 TransPitch::TransPitch(const TransPitch &pitch)
@@ -339,7 +339,7 @@ std::ostream &operator<<(std::ostream &out, const TransPitch &pitch)
 Transposer::Transposer()
 {
     // Initialize with base-40 system by default:
-    SetMaxAccid(2);
+    this->SetMaxAccid(2);
 }
 
 //////////////////////////////
@@ -375,7 +375,7 @@ bool Transposer::SetTransposition(int transVal)
 
 bool Transposer::SetTransposition(const std::string &transString)
 {
-    m_transpose = GetInterval(transString);
+    m_transpose = this->GetInterval(transString);
     return m_transpose != INVALID_INTERVAL_CLASS;
 }
 
@@ -385,23 +385,23 @@ bool Transposer::SetTransposition(const std::string &transString)
 bool Transposer::SetTransposition(const TransPitch &fromPitch, const std::string &toString)
 {
     TransPitch toPitch;
-    if (GetKeyTonic(toString, toPitch)) {
+    if (this->GetKeyTonic(toString, toPitch)) {
         // Determine proper octave offset.
         int numSigns = toPitch.m_oct;
-        m_transpose = GetInterval(fromPitch, toPitch);
+        m_transpose = this->GetInterval(fromPitch, toPitch);
         // A transposition with n plus or minus signs should never be more than n octaves away.
-        if (numSigns > 0 && m_transpose > PerfectOctaveClass() * numSigns) {
-            m_transpose -= PerfectOctaveClass();
+        if (numSigns > 0 && m_transpose > this->PerfectOctaveClass() * numSigns) {
+            m_transpose -= this->PerfectOctaveClass();
         }
-        else if (numSigns < 0 && m_transpose < PerfectOctaveClass() * numSigns) {
-            m_transpose += PerfectOctaveClass();
+        else if (numSigns < 0 && m_transpose < this->PerfectOctaveClass() * numSigns) {
+            m_transpose += this->PerfectOctaveClass();
         }
         // A transposition with 0 plus or minus signs should never be more than 1/2 an octave away.
-        else if (numSigns == 0 && m_transpose > PerfectOctaveClass() / 2) {
-            m_transpose -= PerfectOctaveClass();
+        else if (numSigns == 0 && m_transpose > this->PerfectOctaveClass() / 2) {
+            m_transpose -= this->PerfectOctaveClass();
         }
-        else if (numSigns == 0 && m_transpose < -1 * PerfectOctaveClass() / 2) {
-            m_transpose += PerfectOctaveClass();
+        else if (numSigns == 0 && m_transpose < -1 * this->PerfectOctaveClass() / 2) {
+            m_transpose += this->PerfectOctaveClass();
         }
         return true;
     }
@@ -414,11 +414,11 @@ bool Transposer::SetTransposition(const TransPitch &fromPitch, const std::string
 
 bool Transposer::SetTransposition(int keyFifths, const std::string &semitones)
 {
-    if (!IsValidSemitones(semitones)) {
+    if (!this->IsValidSemitones(semitones)) {
         return false;
     }
     int semis = stoi(semitones);
-    return SetTransposition(keyFifths, semis);
+    return this->SetTransposition(keyFifths, semis);
 }
 
 // Note the order of the variables (key signature information is first in all
@@ -426,8 +426,8 @@ bool Transposer::SetTransposition(int keyFifths, const std::string &semitones)
 
 bool Transposer::SetTransposition(int keyFifths, int semitones)
 {
-    int intervalClass = SemitonesToIntervalClass(keyFifths, semitones);
-    return SetTransposition(intervalClass);
+    int intervalClass = this->SemitonesToIntervalClass(keyFifths, semitones);
+    return this->SetTransposition(intervalClass);
 }
 
 //////////////////////////////
@@ -515,7 +515,7 @@ int Transposer::SemitonesToIntervalClass(int keyFifths, int semitones)
     }
 
     interval = sign < 0 ? "-" + interval : "+" + interval;
-    int intint = GetInterval(interval);
+    int intint = this->GetInterval(interval);
     intint += sign * octave * m_base;
     return intint;
 }
@@ -528,8 +528,8 @@ int Transposer::SemitonesToIntervalClass(int keyFifths, int semitones)
 
 std::string Transposer::SemitonesToIntervalName(int keyFifths, int semitones)
 {
-    int intervalClass = SemitonesToIntervalClass(keyFifths, semitones);
-    return GetIntervalName(intervalClass);
+    int intervalClass = this->SemitonesToIntervalClass(keyFifths, semitones);
+    return this->GetIntervalName(intervalClass);
 }
 
 //////////////////////////////
@@ -549,7 +549,7 @@ int Transposer::IntervalToSemitones(int interval)
     int intervalClass = interval - octave * m_base;
     int diatonic = 0;
     int chromatic = 0;
-    IntervalToDiatonicChromatic(diatonic, chromatic, intervalClass);
+    this->IntervalToDiatonicChromatic(diatonic, chromatic, intervalClass);
     if ((diatonic != INVALID_INTERVAL_CLASS) && (chromatic != INVALID_INTERVAL_CLASS)) {
         return (m_diatonic2semitone.at(diatonic) + chromatic) * sign + 12 * octave;
     }
@@ -562,8 +562,8 @@ int Transposer::IntervalToSemitones(int interval)
 
 int Transposer::IntervalToSemitones(const std::string &intervalName)
 {
-    int interval = GetInterval(intervalName);
-    return IntervalToSemitones(interval);
+    int interval = this->GetInterval(intervalName);
+    return this->IntervalToSemitones(interval);
 }
 
 //////////////////////////////
@@ -584,7 +584,7 @@ int Transposer::GetTranspositionIntervalClass()
 //
 std::string Transposer::GetTranspositionIntervalName()
 {
-    return GetIntervalName(m_transpose);
+    return this->GetIntervalName(m_transpose);
 }
 
 //////////////////////////////
@@ -595,9 +595,9 @@ std::string Transposer::GetTranspositionIntervalName()
 
 void Transposer::Transpose(TransPitch &pitch)
 {
-    int ipitch = TransPitchToIntegerPitch(pitch);
+    int ipitch = this->TransPitchToIntegerPitch(pitch);
     ipitch += m_transpose;
-    pitch = IntegerPitchToTransPitch(ipitch);
+    pitch = this->IntegerPitchToTransPitch(ipitch);
 }
 
 int Transposer::Transpose(int ipitch)
@@ -612,17 +612,17 @@ int Transposer::Transpose(int ipitch)
 
 void Transposer::Transpose(TransPitch &pitch, int transVal)
 {
-    int ipitch = TransPitchToIntegerPitch(pitch);
+    int ipitch = this->TransPitchToIntegerPitch(pitch);
     ipitch += transVal;
-    pitch = IntegerPitchToTransPitch(ipitch);
+    pitch = this->IntegerPitchToTransPitch(ipitch);
 }
 
 void Transposer::Transpose(TransPitch &pitch, const std::string &transString)
 {
-    int transVal = GetInterval(transString);
-    int ipitch = TransPitchToIntegerPitch(pitch);
+    int transVal = this->GetInterval(transString);
+    int ipitch = this->TransPitchToIntegerPitch(pitch);
     ipitch += transVal;
-    pitch = IntegerPitchToTransPitch(ipitch);
+    pitch = this->IntegerPitchToTransPitch(ipitch);
 }
 
 //////////////////////////////
@@ -655,7 +655,7 @@ void Transposer::SetMaxAccid(int maxAccid)
 {
     m_maxAccid = abs(maxAccid);
     m_base = 7 * (2 * m_maxAccid + 1) + 5;
-    CalculateDiatonicMapping();
+    this->CalculateDiatonicMapping();
     m_transpose = 0;
 }
 
@@ -835,7 +835,7 @@ int Transposer::GetInterval(const std::string &intervalName)
 
     switch (dnum) {
         case 0: // unison
-            base = PerfectUnisonClass();
+            base = this->PerfectUnisonClass();
             if (quality[0] == 'A') {
                 adjust = (int)quality.size();
             }
@@ -849,17 +849,17 @@ int Transposer::GetInterval(const std::string &intervalName)
             break;
         case 1: // second
             if (quality == "M") {
-                base = MajorSecondClass();
+                base = this->MajorSecondClass();
             }
             else if (quality == "m") {
-                base = MinorSecondClass();
+                base = this->MinorSecondClass();
             }
             else if (quality[0] == 'A') {
-                base = MajorSecondClass();
+                base = this->MajorSecondClass();
                 adjust = (int)quality.size();
             }
             else if (quality[0] == 'd') {
-                base = MinorSecondClass();
+                base = this->MinorSecondClass();
                 adjust = -(int)quality.size();
             }
             else {
@@ -869,17 +869,17 @@ int Transposer::GetInterval(const std::string &intervalName)
             break;
         case 2: // third
             if (quality == "M") {
-                base = MajorThirdClass();
+                base = this->MajorThirdClass();
             }
             else if (quality == "m") {
-                base = MinorThirdClass();
+                base = this->MinorThirdClass();
             }
             else if (quality[0] == 'A') {
-                base = MajorThirdClass();
+                base = this->MajorThirdClass();
                 adjust = (int)quality.size();
             }
             else if (quality[0] == 'd') {
-                base = MinorThirdClass();
+                base = this->MinorThirdClass();
                 adjust = -(int)quality.size();
             }
             else {
@@ -888,7 +888,7 @@ int Transposer::GetInterval(const std::string &intervalName)
             }
             break;
         case 3: // fourth
-            base = PerfectFourthClass();
+            base = this->PerfectFourthClass();
             if (quality[0] == 'A') {
                 adjust = (int)quality.size();
             }
@@ -901,7 +901,7 @@ int Transposer::GetInterval(const std::string &intervalName)
             }
             break;
         case 4: // fifth
-            base = PerfectFifthClass();
+            base = this->PerfectFifthClass();
             if (quality[0] == 'A') {
                 adjust = (int)quality.size();
             }
@@ -915,17 +915,17 @@ int Transposer::GetInterval(const std::string &intervalName)
             break;
         case 5: // sixth
             if (quality == "M") {
-                base = MajorSixthClass();
+                base = this->MajorSixthClass();
             }
             else if (quality == "m") {
-                base = MinorSixthClass();
+                base = this->MinorSixthClass();
             }
             else if (quality[0] == 'A') {
-                base = MajorSixthClass();
+                base = this->MajorSixthClass();
                 adjust = (int)quality.size();
             }
             else if (quality[0] == 'd') {
-                base = MinorSixthClass();
+                base = this->MinorSixthClass();
                 adjust = -(int)quality.size();
             }
             else {
@@ -935,17 +935,17 @@ int Transposer::GetInterval(const std::string &intervalName)
             break;
         case 6: // seventh
             if (quality == "M") {
-                base = MajorSeventhClass();
+                base = this->MajorSeventhClass();
             }
             else if (quality == "m") {
-                base = MinorSeventhClass();
+                base = this->MinorSeventhClass();
             }
             else if (quality[0] == 'A') {
-                base = MajorSeventhClass();
+                base = this->MajorSeventhClass();
                 adjust = (int)quality.size();
             }
             else if (quality[0] == 'd') {
-                base = MinorSeventhClass();
+                base = this->MinorSeventhClass();
                 adjust = -(int)quality.size();
             }
             else {
@@ -1165,7 +1165,7 @@ TransPitch Transposer::IntegerPitchToTransPitch(int ipitch)
 
 void Transposer::SetBase40()
 {
-    SetMaxAccid(2);
+    this->SetMaxAccid(2);
 }
 
 //////////////////////////////
@@ -1175,7 +1175,7 @@ void Transposer::SetBase40()
 
 void Transposer::SetBase600()
 {
-    SetMaxAccid(42);
+    this->SetMaxAccid(42);
 }
 
 //////////////////////////////
@@ -1187,7 +1187,7 @@ void Transposer::SetBase600()
 
 int Transposer::GetInterval(const TransPitch &p1, const TransPitch &p2)
 {
-    return TransPitchToIntegerPitch(p2) - TransPitchToIntegerPitch(p1);
+    return this->TransPitchToIntegerPitch(p2) - this->TransPitchToIntegerPitch(p1);
 }
 
 // Similar function to GetInterval, but the integer interval class is converted
@@ -1195,8 +1195,8 @@ int Transposer::GetInterval(const TransPitch &p1, const TransPitch &p2)
 
 std::string Transposer::GetIntervalName(const TransPitch &p1, const TransPitch &p2)
 {
-    int iclass = GetInterval(p1, p2);
-    return GetIntervalName(iclass);
+    int iclass = this->GetInterval(p1, p2);
+    return this->GetIntervalName(iclass);
 }
 
 std::string Transposer::GetIntervalName(int intervalClass)
@@ -1373,8 +1373,8 @@ std::string Transposer::GetIntervalName(int intervalClass)
 
 int Transposer::IntervalToCircleOfFifths(const std::string &transstring)
 {
-    int intervalClass = GetInterval(transstring);
-    return IntervalToCircleOfFifths(intervalClass);
+    int intervalClass = this->GetInterval(transstring);
+    return this->IntervalToCircleOfFifths(intervalClass);
 }
 
 int Transposer::IntervalToCircleOfFifths(int transval)
@@ -1389,8 +1389,8 @@ int Transposer::IntervalToCircleOfFifths(int transval)
         transval %= m_base;
     }
 
-    int p5 = PerfectFifthClass();
-    int p4 = PerfectFourthClass();
+    int p5 = this->PerfectFifthClass();
+    int p4 = this->PerfectFourthClass();
     for (int i = 1; i < m_base; i++) {
         if ((p5 * i) % m_base == transval) {
             return i;
@@ -1414,10 +1414,10 @@ int Transposer::CircleOfFifthsToIntervalClass(int fifths)
         return 0;
     }
     else if (fifths > 0) {
-        return (PerfectFifthClass() * fifths) % m_base;
+        return (this->PerfectFifthClass() * fifths) % m_base;
     }
     else {
-        return (PerfectFourthClass() * (-fifths)) % m_base;
+        return (this->PerfectFourthClass() * (-fifths)) % m_base;
     }
 }
 
@@ -1429,8 +1429,8 @@ int Transposer::CircleOfFifthsToIntervalClass(int fifths)
 
 std::string Transposer::CircleOfFifthsToIntervalName(int fifths)
 {
-    int intervalClass = CircleOfFifthsToIntervalClass(fifths);
-    return GetIntervalName(intervalClass);
+    int intervalClass = this->CircleOfFifthsToIntervalClass(fifths);
+    return this->GetIntervalName(intervalClass);
 }
 
 //////////////////////////////
@@ -1442,8 +1442,8 @@ std::string Transposer::CircleOfFifthsToIntervalName(int fifths)
 
 TransPitch Transposer::CircleOfFifthsToMajorTonic(int fifths)
 {
-    int intervalClass = CircleOfFifthsToIntervalClass(fifths);
-    return IntegerPitchToTransPitch((GetCPitchClass() + intervalClass) % GetBase());
+    int intervalClass = this->CircleOfFifthsToIntervalClass(fifths);
+    return this->IntegerPitchToTransPitch((this->GetCPitchClass() + intervalClass) % this->GetBase());
 }
 
 //////////////////////////////
@@ -1455,8 +1455,8 @@ TransPitch Transposer::CircleOfFifthsToMajorTonic(int fifths)
 
 TransPitch Transposer::CircleOfFifthsToMinorTonic(int fifths)
 {
-    int intervalClass = CircleOfFifthsToIntervalClass(fifths);
-    return IntegerPitchToTransPitch((GetAPitchClass() + intervalClass) % GetBase());
+    int intervalClass = this->CircleOfFifthsToIntervalClass(fifths);
+    return this->IntegerPitchToTransPitch((this->GetAPitchClass() + intervalClass) % this->GetBase());
 }
 
 //////////////////////////////
@@ -1468,8 +1468,8 @@ TransPitch Transposer::CircleOfFifthsToMinorTonic(int fifths)
 
 TransPitch Transposer::CircleOfFifthsToDorianTonic(int fifths)
 {
-    int intervalClass = CircleOfFifthsToIntervalClass(fifths);
-    return IntegerPitchToTransPitch((GetDPitchClass() + intervalClass) % GetBase());
+    int intervalClass = this->CircleOfFifthsToIntervalClass(fifths);
+    return this->IntegerPitchToTransPitch((this->GetDPitchClass() + intervalClass) % this->GetBase());
 }
 
 //////////////////////////////
@@ -1481,8 +1481,8 @@ TransPitch Transposer::CircleOfFifthsToDorianTonic(int fifths)
 
 TransPitch Transposer::CircleOfFifthsToPhrygianTonic(int fifths)
 {
-    int intervalClass = CircleOfFifthsToIntervalClass(fifths);
-    return IntegerPitchToTransPitch((GetEPitchClass() + intervalClass) % GetBase());
+    int intervalClass = this->CircleOfFifthsToIntervalClass(fifths);
+    return this->IntegerPitchToTransPitch((this->GetEPitchClass() + intervalClass) % this->GetBase());
 }
 
 //////////////////////////////
@@ -1494,8 +1494,8 @@ TransPitch Transposer::CircleOfFifthsToPhrygianTonic(int fifths)
 
 TransPitch Transposer::CircleOfFifthsToLydianTonic(int fifths)
 {
-    int intervalClass = CircleOfFifthsToIntervalClass(fifths);
-    return IntegerPitchToTransPitch((GetFPitchClass() + intervalClass) % GetBase());
+    int intervalClass = this->CircleOfFifthsToIntervalClass(fifths);
+    return this->IntegerPitchToTransPitch((this->GetFPitchClass() + intervalClass) % this->GetBase());
 }
 
 //////////////////////////////
@@ -1507,8 +1507,8 @@ TransPitch Transposer::CircleOfFifthsToLydianTonic(int fifths)
 
 TransPitch Transposer::CircleOfFifthsToMixolydianTonic(int fifths)
 {
-    int intervalClass = CircleOfFifthsToIntervalClass(fifths);
-    return IntegerPitchToTransPitch((GetGPitchClass() + intervalClass) % GetBase());
+    int intervalClass = this->CircleOfFifthsToIntervalClass(fifths);
+    return this->IntegerPitchToTransPitch((this->GetGPitchClass() + intervalClass) % this->GetBase());
 }
 
 //////////////////////////////
@@ -1520,8 +1520,8 @@ TransPitch Transposer::CircleOfFifthsToMixolydianTonic(int fifths)
 
 TransPitch Transposer::CircleOfFifthsToLocrianTonic(int fifths)
 {
-    int intervalClass = CircleOfFifthsToIntervalClass(fifths);
-    return IntegerPitchToTransPitch((GetBPitchClass() + intervalClass) % GetBase());
+    int intervalClass = this->CircleOfFifthsToIntervalClass(fifths);
+    return this->IntegerPitchToTransPitch((this->GetBPitchClass() + intervalClass) % this->GetBase());
 }
 
 //////////////////////////////
@@ -1697,8 +1697,8 @@ std::string Transposer::DiatonicChromaticToIntervalName(int diatonic, int chroma
 
 int Transposer::DiatonicChromaticToIntervalClass(int diatonic, int chromatic)
 {
-    std::string intervalName = DiatonicChromaticToIntervalName(diatonic, chromatic);
-    return GetInterval(intervalName);
+    std::string intervalName = this->DiatonicChromaticToIntervalName(diatonic, chromatic);
+    return this->GetInterval(intervalName);
 }
 
 //////////////////////////////
@@ -1708,8 +1708,8 @@ int Transposer::DiatonicChromaticToIntervalClass(int diatonic, int chromatic)
 
 void Transposer::IntervalToDiatonicChromatic(int &diatonic, int &chromatic, int intervalClass)
 {
-    std::string intervalName = GetIntervalName(intervalClass);
-    IntervalToDiatonicChromatic(diatonic, chromatic, intervalName);
+    std::string intervalName = this->GetIntervalName(intervalClass);
+    this->IntervalToDiatonicChromatic(diatonic, chromatic, intervalName);
 }
 
 void Transposer::IntervalToDiatonicChromatic(int &diatonic, int &chromatic, const std::string &intervalName)
diff --git a/src/trill.cpp b/src/trill.cpp
index 82f65cd720c..bb0c0ea180f 100644
--- a/src/trill.cpp
+++ b/src/trill.cpp
@@ -35,16 +35,16 @@ Trill::Trill()
     , AttOrnamentAccid()
     , AttPlacementRelStaff()
 {
-    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_EXTENDER);
-    RegisterAttClass(ATT_EXTSYM);
-    RegisterAttClass(ATT_LINEREND);
-    RegisterAttClass(ATT_NNUMBERLIKE);
-    RegisterAttClass(ATT_ORNAMENTACCID);
-    RegisterAttClass(ATT_PLACEMENTRELSTAFF);
-
-    Reset();
+    this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_EXTENDER);
+    this->RegisterAttClass(ATT_EXTSYM);
+    this->RegisterAttClass(ATT_LINEREND);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
+    this->RegisterAttClass(ATT_ORNAMENTACCID);
+    this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
+
+    this->Reset();
 }
 
 Trill::~Trill() {}
@@ -53,25 +53,25 @@ void Trill::Reset()
 {
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
-    ResetColor();
-    ResetExtender();
-    ResetExtSym();
-    ResetLineRend();
-    ResetNNumberLike();
-    ResetOrnamentAccid();
-    ResetPlacementRelStaff();
+    this->ResetColor();
+    this->ResetExtender();
+    this->ResetExtSym();
+    this->ResetLineRend();
+    this->ResetNNumberLike();
+    this->ResetOrnamentAccid();
+    this->ResetPlacementRelStaff();
 }
 
 wchar_t Trill::GetTrillGlyph() const
 {
     // If there is glyph.num, return glyph based on it
-    if (HasGlyphNum()) {
-        wchar_t code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        wchar_t code = this->GetGlyphNum();
         if (NULL != Resources::GetGlyph(code)) return code;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
diff --git a/src/tuning.cpp b/src/tuning.cpp
index b84bbaf50c4..c493a238adc 100644
--- a/src/tuning.cpp
+++ b/src/tuning.cpp
@@ -28,9 +28,9 @@ static const ClassRegistrar<Tuning> s_factory("tuning", TUNING);
 
 Tuning::Tuning() : Object(TUNING, "tuning-"), AttCourseLog()
 {
-    RegisterAttClass(ATT_COURSELOG);
+    this->RegisterAttClass(ATT_COURSELOG);
 
-    Reset();
+    this->Reset();
 }
 
 Tuning::~Tuning() {}
@@ -38,7 +38,7 @@ Tuning::~Tuning() {}
 void Tuning::Reset()
 {
     Object::Reset();
-    ResetCourseLog();
+    this->ResetCourseLog();
 }
 
 bool Tuning::IsSupportedChild(Object *child)
@@ -136,7 +136,7 @@ int Tuning::CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType
     const int *pitch = nullptr;
     int pitchSize = 0;
 
-    switch (GetTuningStandard()) {
+    switch (this->GetTuningStandard()) {
         case COURSETUNING_guitar_standard:
             pitch = guitarStandardPitch;
             pitchSize = sizeof(guitarStandardPitch);
diff --git a/src/tuplet.cpp b/src/tuplet.cpp
index 74e32e3dde9..dedfdb6a165 100644
--- a/src/tuplet.cpp
+++ b/src/tuplet.cpp
@@ -44,12 +44,12 @@ Tuplet::Tuplet()
     , AttNumberPlacement()
     , AttTupletVis()
 {
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_DURATIONRATIO);
-    RegisterAttClass(ATT_NUMBERPLACEMENT);
-    RegisterAttClass(ATT_TUPLETVIS);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_DURATIONRATIO);
+    this->RegisterAttClass(ATT_NUMBERPLACEMENT);
+    this->RegisterAttClass(ATT_TUPLETVIS);
 
-    Reset();
+    this->Reset();
 }
 
 Tuplet::~Tuplet() {}
@@ -57,10 +57,10 @@ Tuplet::~Tuplet() {}
 void Tuplet::Reset()
 {
     LayerElement::Reset();
-    ResetColor();
-    ResetDurationRatio();
-    ResetNumberPlacement();
-    ResetTupletVis();
+    this->ResetColor();
+    this->ResetDurationRatio();
+    this->ResetNumberPlacement();
+    this->ResetTupletVis();
 
     m_drawingLeft = NULL;
     m_drawingRight = NULL;
@@ -237,7 +237,7 @@ void Tuplet::AdjustTupletBracketY(Doc *doc, Staff *staff, int staffSize)
 void Tuplet::AdjustTupletNumY(Doc *doc, Staff *staff, int staffSize)
 {
     TupletNum *tupletNum = dynamic_cast<TupletNum *>(FindDescendantByType(TUPLET_NUM));
-    if (!tupletNum || (GetNumVisible() == BOOLEAN_false)) return;
+    if (!tupletNum || (this->GetNumVisible() == BOOLEAN_false)) return;
 
     this->CalculateTupletNumCrossStaff(tupletNum);
 
diff --git a/src/turn.cpp b/src/turn.cpp
index b3f98125623..5c01e619821 100644
--- a/src/turn.cpp
+++ b/src/turn.cpp
@@ -35,14 +35,14 @@ Turn::Turn()
     , AttPlacementRelStaff()
     , AttTurnLog()
 {
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_EXTSYM);
-    RegisterAttClass(ATT_ORNAMENTACCID);
-    RegisterAttClass(ATT_PLACEMENTRELSTAFF);
-    RegisterAttClass(ATT_TURNLOG);
-
-    Reset();
+    this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_EXTSYM);
+    this->RegisterAttClass(ATT_ORNAMENTACCID);
+    this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
+    this->RegisterAttClass(ATT_TURNLOG);
+
+    this->Reset();
 }
 
 Turn::~Turn() {}
@@ -51,11 +51,11 @@ void Turn::Reset()
 {
     ControlElement::Reset();
     TimePointInterface::Reset();
-    ResetColor();
-    ResetExtSym();
-    ResetOrnamentAccid();
-    ResetPlacementRelStaff();
-    ResetTurnLog();
+    this->ResetColor();
+    this->ResetExtSym();
+    this->ResetOrnamentAccid();
+    this->ResetPlacementRelStaff();
+    this->ResetTurnLog();
 
     m_drawingEndElement = NULL;
 }
@@ -63,17 +63,17 @@ void Turn::Reset()
 wchar_t Turn::GetTurnGlyph() const
 {
     // If there is glyph.num, prioritize it
-    if (HasGlyphNum()) {
-        wchar_t code = GetGlyphNum();
+    if (this->HasGlyphNum()) {
+        wchar_t code = this->GetGlyphNum();
         if (NULL != Resources::GetGlyph(code)) return code;
     }
     // If there is glyph.name (second priority)
-    else if (HasGlyphName()) {
-        wchar_t code = Resources::GetGlyphCode(GetGlyphName());
+    else if (this->HasGlyphName()) {
+        wchar_t code = Resources::GetGlyphCode(this->GetGlyphName());
         if (NULL != Resources::GetGlyph(code)) return code;
     }
 
-    return (GetForm() == turnLog_FORM_lower) ? SMUFL_E568_ornamentTurnInverted : SMUFL_E567_ornamentTurn;
+    return (this->GetForm() == turnLog_FORM_lower) ? SMUFL_E568_ornamentTurnInverted : SMUFL_E567_ornamentTurn;
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/unclear.cpp b/src/unclear.cpp
index afa05562b21..26f56be64d2 100644
--- a/src/unclear.cpp
+++ b/src/unclear.cpp
@@ -25,9 +25,9 @@ static const ClassRegistrar<Unclear> s_factory("unclear", UNCLEAR);
 
 Unclear::Unclear() : EditorialElement(UNCLEAR, "unclear-"), AttSource()
 {
-    RegisterAttClass(ATT_SOURCE);
+    this->RegisterAttClass(ATT_SOURCE);
 
-    Reset();
+    this->Reset();
 }
 
 Unclear::~Unclear() {}
@@ -35,7 +35,7 @@ Unclear::~Unclear() {}
 void Unclear::Reset()
 {
     EditorialElement::Reset();
-    ResetSource();
+    this->ResetSource();
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/verse.cpp b/src/verse.cpp
index d69e6032f2d..d6355ca9a60 100644
--- a/src/verse.cpp
+++ b/src/verse.cpp
@@ -35,12 +35,12 @@ static const ClassRegistrar<Verse> s_factory("verse", VERSE);
 
 Verse::Verse() : LayerElement(VERSE, "verse-"), AttColor(), AttLang(), AttNInteger(), AttTypography()
 {
-    RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_LANG);
-    RegisterAttClass(ATT_NINTEGER);
-    RegisterAttClass(ATT_TYPOGRAPHY);
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_LANG);
+    this->RegisterAttClass(ATT_NINTEGER);
+    this->RegisterAttClass(ATT_TYPOGRAPHY);
 
-    Reset();
+    this->Reset();
 }
 
 Verse::~Verse() {}
@@ -48,10 +48,10 @@ Verse::~Verse() {}
 void Verse::Reset()
 {
     LayerElement::Reset();
-    ResetColor();
-    ResetLang();
-    ResetNInteger();
-    ResetTypography();
+    this->ResetColor();
+    this->ResetLang();
+    this->ResetNInteger();
+    this->ResetTypography();
 
     m_drawingLabelAbbr = NULL;
 }
diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index beccb8230ea..06506486bb5 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -36,7 +36,7 @@ namespace vrv {
 
 SystemAligner::SystemAligner() : Object(SYSTEM_ALIGNER), m_bottomAlignment(NULL), m_system(NULL)
 {
-    Reset();
+    this->Reset();
 }
 
 SystemAligner::~SystemAligner() {}
@@ -47,7 +47,7 @@ void SystemAligner::Reset()
     m_spacingTypes.clear();
     m_system = NULL;
     m_bottomAlignment = NULL;
-    m_bottomAlignment = GetStaffAlignment(0, NULL, NULL);
+    m_bottomAlignment = this->GetStaffAlignment(0, NULL, NULL);
 }
 
 StaffAlignment *SystemAligner::GetStaffAlignment(int idx, Staff *staff, Doc *doc)
@@ -60,20 +60,20 @@ StaffAlignment *SystemAligner::GetStaffAlignment(int idx, Staff *staff, Doc *doc
         children->pop_back();
     }
 
-    if (idx < GetChildCount()) {
+    if (idx < this->GetChildCount()) {
         children->push_back(m_bottomAlignment);
-        return dynamic_cast<StaffAlignment *>(GetChildren()->at(idx));
+        return dynamic_cast<StaffAlignment *>(this->GetChildren()->at(idx));
     }
     // check that we are searching for the next one (not a gap)
-    assert(idx == GetChildCount());
+    assert(idx == this->GetChildCount());
     // LogDebug("Creating staff alignment");
 
     // This is the first time we are looking for it (e.g., first staff)
     // We create the StaffAlignment
     StaffAlignment *alignment = new StaffAlignment();
-    alignment->SetStaff(staff, doc, GetAboveSpacingType(staff));
+    alignment->SetStaff(staff, doc, this->GetAboveSpacingType(staff));
     alignment->SetParent(this);
-    alignment->SetParentSystem(GetSystem());
+    alignment->SetParentSystem(this->GetSystem());
     children->push_back(alignment);
 
     if (m_bottomAlignment) {
@@ -87,7 +87,7 @@ StaffAlignment *SystemAligner::GetStaffAlignmentForStaffN(int staffN) const
 {
     StaffAlignment *alignment = NULL;
     for (int i = 0; i < this->GetChildCount(); ++i) {
-        alignment = vrv_cast<StaffAlignment *>(GetChildren()->at(i));
+        alignment = vrv_cast<StaffAlignment *>(this->GetChildren()->at(i));
         assert(alignment);
 
         if ((alignment->GetStaff()) && (alignment->GetStaff()->GetN() == staffN)) return alignment;
@@ -99,7 +99,7 @@ StaffAlignment *SystemAligner::GetStaffAlignmentForStaffN(int staffN) const
 System *SystemAligner::GetSystem()
 {
     if (m_system == NULL) {
-        m_system = dynamic_cast<System *>(GetFirstAncestor(SYSTEM));
+        m_system = dynamic_cast<System *>(this->GetFirstAncestor(SYSTEM));
     }
     return m_system;
 }
@@ -134,18 +134,18 @@ void SystemAligner::FindAllIntersectionPoints(
 
 int SystemAligner::GetOverflowAbove(const Doc *) const
 {
-    if (!GetChildCount() || GetChild(0) == m_bottomAlignment) return 0;
+    if (!this->GetChildCount() || this->GetChild(0) == m_bottomAlignment) return 0;
 
-    StaffAlignment *alignment = vrv_cast<StaffAlignment *>(GetChild(0));
+    StaffAlignment *alignment = vrv_cast<StaffAlignment *>(this->GetChild(0));
     assert(alignment);
     return alignment->GetOverflowAbove();
 }
 
 int SystemAligner::GetOverflowBelow(const Doc *doc) const
 {
-    if (!GetChildCount() || GetChild(0) == m_bottomAlignment) return 0;
+    if (!this->GetChildCount() || this->GetChild(0) == m_bottomAlignment) return 0;
 
-    StaffAlignment *alignment = vrv_cast<StaffAlignment *>(GetChild(GetChildCount() - 2));
+    StaffAlignment *alignment = vrv_cast<StaffAlignment *>(this->GetChild(this->GetChildCount() - 2));
     assert(alignment);
     return alignment->GetOverflowBelow() + doc->GetBottomMargin(STAFF) * doc->GetDrawingUnit(alignment->GetStaffSize());
 }
@@ -186,7 +186,7 @@ SystemAligner::SpacingType SystemAligner::GetAboveSpacingType(Staff *staff)
     if (m_spacingTypes.empty()) {
         System *system = dynamic_cast<System *>(staff->GetFirstAncestor(SYSTEM));
         ScoreDef *scoreDef = system ? system->GetDrawingScoreDef() : NULL;
-        SetSpacing(scoreDef);
+        this->SetSpacing(scoreDef);
     }
 
     auto iter = m_spacingTypes.find(staff->GetN());
@@ -295,7 +295,7 @@ int StaffAlignment::GetStaffSize() const
 
 const AttSpacing *StaffAlignment::GetAttSpacing() const
 {
-    System *system = GetParentSystem();
+    System *system = this->GetParentSystem();
     assert(system);
 
     return system->GetDrawingScoreDef();
@@ -400,7 +400,7 @@ double StaffAlignment::GetJustificationFactor(const Doc *doc) const
             case SystemAligner::SpacingType::None: break;
             default: assert(false);
         }
-        if (m_spacingType != SystemAligner::SpacingType::System) justificationFactor *= GetStaffSize() / 100.0;
+        if (m_spacingType != SystemAligner::SpacingType::System) justificationFactor *= this->GetStaffSize() / 100.0;
     }
 
     return justificationFactor;
@@ -429,7 +429,7 @@ int StaffAlignment::CalcOverflowBelow(BoundingBox *box)
 int StaffAlignment::GetMinimumStaffSpacing(const Doc *doc, const AttSpacing *attSpacing) const
 {
     const auto &option = doc->GetOptions()->m_spacingStaff;
-    int spacing = option.GetValue() * doc->GetDrawingUnit(GetStaffSize());
+    int spacing = option.GetValue() * doc->GetDrawingUnit(this->GetStaffSize());
 
     if (!option.IsSet() && attSpacing->HasSpacingStaff()) {
         spacing = attSpacing->GetSpacingStaff() * doc->GetDrawingUnit(100);
@@ -448,26 +448,26 @@ int StaffAlignment::GetMinimumSpacing(const Doc *doc) const
             spacing = m_staff->m_drawingStaffDef->GetSpacing() * doc->GetDrawingUnit(100);
         }
         else {
-            const AttSpacing *scoreDefSpacing = GetAttSpacing();
+            const AttSpacing *scoreDefSpacing = this->GetAttSpacing();
             switch (m_spacingType) {
                 case SystemAligner::SpacingType::System: {
-                    spacing = GetParentSystem()->GetMinimumSystemSpacing(doc);
+                    spacing = this->GetParentSystem()->GetMinimumSystemSpacing(doc);
                     break;
                 }
                 case SystemAligner::SpacingType::Staff: {
-                    spacing = GetMinimumStaffSpacing(doc, scoreDefSpacing);
+                    spacing = this->GetMinimumStaffSpacing(doc, scoreDefSpacing);
                     break;
                 }
                 case SystemAligner::SpacingType::Brace: {
                     const auto &option = doc->GetOptions()->m_spacingBraceGroup;
-                    spacing = option.IsSet() ? option.GetValue() * doc->GetDrawingUnit(GetStaffSize())
-                                             : GetMinimumStaffSpacing(doc, scoreDefSpacing);
+                    spacing = option.IsSet() ? option.GetValue() * doc->GetDrawingUnit(this->GetStaffSize())
+                                             : this->GetMinimumStaffSpacing(doc, scoreDefSpacing);
                     break;
                 }
                 case SystemAligner::SpacingType::Bracket: {
                     const auto &option = doc->GetOptions()->m_spacingBracketGroup;
-                    spacing = option.IsSet() ? option.GetValue() * doc->GetDrawingUnit(GetStaffSize())
-                                             : GetMinimumStaffSpacing(doc, scoreDefSpacing);
+                    spacing = option.IsSet() ? option.GetValue() * doc->GetDrawingUnit(this->GetStaffSize())
+                                             : this->GetMinimumStaffSpacing(doc, scoreDefSpacing);
                     break;
                 }
                 case SystemAligner::SpacingType::None: break;
@@ -483,36 +483,36 @@ int StaffAlignment::CalcMinimumRequiredSpacing(const Doc *doc) const
 {
     assert(doc);
 
-    Object *parent = GetParent();
+    Object *parent = this->GetParent();
     assert(parent);
 
     StaffAlignment *prevAlignment = dynamic_cast<StaffAlignment *>(parent->GetPrevious(this));
 
     if (!prevAlignment) {
-        return GetOverflowAbove() + GetOverlap();
+        return this->GetOverflowAbove() + this->GetOverlap();
     }
 
     int overflowSum = 0;
     const bool verseCollapse = doc->GetOptions()->m_lyricVerseCollapse.GetValue();
     if (prevAlignment->GetVerseCount(verseCollapse) > 0) {
-        overflowSum = prevAlignment->GetOverflowBelow() + GetOverflowAbove();
+        overflowSum = prevAlignment->GetOverflowBelow() + this->GetOverflowAbove();
     }
     else {
         // The maximum between the overflow below of the previous staff and the overflow above of the current
-        overflowSum = std::max(prevAlignment->GetOverflowBelow(), GetOverflowAbove());
+        overflowSum = std::max(prevAlignment->GetOverflowBelow(), this->GetOverflowAbove());
         // add overlap if there any
-        overflowSum += GetOverlap();
+        overflowSum += this->GetOverlap();
     }
 
     // Add a margin
-    overflowSum += doc->GetBottomMargin(STAFF) * doc->GetDrawingUnit(GetStaffSize());
+    overflowSum += doc->GetBottomMargin(STAFF) * doc->GetDrawingUnit(this->GetStaffSize());
 
     BoundingBox *previous = prevAlignment->GetOverflowBBoxBelow();
-    BoundingBox *current = GetOverflowBBoxAbove();
+    BoundingBox *current = this->GetOverflowBBoxAbove();
     if (previous && current) {
         if ((current->Is(ARTIC) && previous->Is(ARTIC)) || (previous->Is(ARTIC) && current->Is(NOTE))
             || (current->Is(ARTIC) && previous->Is(NOTE))) {
-            if (current->HorizontalContentOverlap(previous)) overflowSum += doc->GetDrawingUnit(GetStaffSize());
+            if (current->HorizontalContentOverlap(previous)) overflowSum += doc->GetDrawingUnit(this->GetStaffSize());
         }
     }
 
@@ -935,7 +935,7 @@ int StaffAlignment::AdjustSlurs(FunctorParams *functorParams)
     }
 
     // Adjust positioning of slurs with common start/end
-    Staff *staff = GetStaff();
+    Staff *staff = this->GetStaff();
     if (staff) {
         const int unit = params->m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
         for (size_t i = 0; i + 1 < positioners.size(); ++i) {
@@ -1031,10 +1031,10 @@ int StaffAlignment::AlignVerticallyEnd(FunctorParams *functorParams)
     assert(params);
 
     if (m_spacingType != SystemAligner::SpacingType::System) {
-        params->m_cumulatedShift += GetMinimumSpacing(params->m_doc);
+        params->m_cumulatedShift += this->GetMinimumSpacing(params->m_doc);
     }
 
-    SetYRel(-params->m_cumulatedShift);
+    this->SetYRel(-params->m_cumulatedShift);
 
     params->m_cumulatedShift += m_staffHeight;
     params->m_staffIdx++;
@@ -1047,8 +1047,8 @@ int StaffAlignment::AdjustYPos(FunctorParams *functorParams)
     AdjustYPosParams *params = vrv_params_cast<AdjustYPosParams *>(functorParams);
     assert(params);
 
-    const int defaultSpacing = GetMinimumSpacing(params->m_doc);
-    const int minSpacing = CalcMinimumRequiredSpacing(params->m_doc);
+    const int defaultSpacing = this->GetMinimumSpacing(params->m_doc);
+    const int minSpacing = this->CalcMinimumRequiredSpacing(params->m_doc);
 
     if (m_spacingType == SystemAligner::SpacingType::System) {
         params->m_cumulatedShift += minSpacing;
@@ -1057,7 +1057,7 @@ int StaffAlignment::AdjustYPos(FunctorParams *functorParams)
         params->m_cumulatedShift += minSpacing - defaultSpacing;
     }
 
-    SetYRel(GetYRel() - params->m_cumulatedShift);
+    this->SetYRel(this->GetYRel() - params->m_cumulatedShift);
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/view.cpp b/src/view.cpp
index 941551ce7da..fb8fc10722a 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -108,7 +108,7 @@ void View::Next(bool forward)
     else if (!forward && this->HasNext(false)) {
         m_pageIdx--;
     }
-    SetPage(m_pageIdx);
+    this->SetPage(m_pageIdx);
 }
 
 int View::ToDeviceContextX(int i)
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 8439f63b122..a008760a0b3 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -76,13 +76,13 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     /******************************************************************/
     // Draw the children
 
-    DrawLayerChildren(dc, beam, layer, staff, measure);
+    this->DrawLayerChildren(dc, beam, layer, staff, measure);
 
     /******************************************************************/
     // Draw the beamSegment - but not if it is a secondary beam in a stem.sameas
 
     if (!beam->m_beamSegment.StemSameasIsSecondary())
-        DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
+        this->DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
 
     dc->EndGraphic(element, this);
 }
@@ -137,7 +137,7 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     /******************************************************************/
     // Draw the children
 
-    DrawLayerChildren(dc, fTrem, layer, staff, measure);
+    this->DrawLayerChildren(dc, fTrem, layer, staff, measure);
 
     /******************************************************************/
     // Draw the stems and the bars
@@ -187,7 +187,7 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     }
 
     for (int j = 0; j < fullBars; ++j) {
-        DrawObliquePolygon(dc, x1, y1, x2, y2, polygonHeight);
+        this->DrawObliquePolygon(dc, x1, y1, x2, y2, polygonHeight);
         y1 += polygonHeight;
         y2 += polygonHeight;
         y1 += dy1 * fTrem->m_beamWidthWhite;
@@ -207,7 +207,7 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     y2 -= space * fTrem->m_beamSegment.m_beamSlope;
 
     for (int j = 0; j < floatingBars; ++j) {
-        DrawObliquePolygon(dc, x1, y1, x2, y2, polygonHeight);
+        this->DrawObliquePolygon(dc, x1, y1, x2, y2, polygonHeight);
         y1 += polygonHeight;
         y2 += polygonHeight;
         y1 += dy1 * fTrem->m_beamWidthWhite;
@@ -261,7 +261,7 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
     // s_y = 0 and s_y2 = 0 respectively
 
     const int polygonHeight = beamInterface->m_beamWidthBlack * shiftY;
-    DrawObliquePolygon(dc, x1, y1, x2, y2, polygonHeight);
+    this->DrawObliquePolygon(dc, x1, y1, x2, y2, polygonHeight);
 
     /******************************************************************/
     // Draw the beam for partial bars (if any)
@@ -398,7 +398,7 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
                     if (i >= noteCount - 1) continue; // assert for debug and skip otherwise
                     y1 = beamElementCoords->at(idx)->m_yBeam + barYPos;
                     y2 = beamElementCoords->at(noteIndexes.at(i + 1))->m_yBeam + barYPos;
-                    DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1,
+                    this->DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1,
                         beamElementCoords->at(noteIndexes.at(i + 1))->m_x, y2, polygonHeight);
                 }
                 else if (beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] == PARTIAL_RIGHT) {
@@ -406,14 +406,14 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
                     int x2 = beamElementCoords->at(idx)->m_x + fractBeamWidth;
                     y2 = beamSegment->m_firstNoteOrChord->m_yBeam + barYPos
                         + beamSegment->m_beamSlope * (x2 - beamSegment->m_firstNoteOrChord->m_x);
-                    DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1, x2, y2, polygonHeight);
+                    this->DrawObliquePolygon(dc, beamElementCoords->at(idx)->m_x, y1, x2, y2, polygonHeight);
                 }
                 else if (beamElementCoords->at(idx)->m_partialFlags[testDur - durRef] == PARTIAL_LEFT) {
                     y2 = beamElementCoords->at(idx)->m_yBeam + barYPos;
                     int x1 = beamElementCoords->at(idx)->m_x - fractBeamWidth;
                     y1 = beamSegment->m_firstNoteOrChord->m_yBeam + barYPos
                         + beamSegment->m_beamSlope * (x1 - beamSegment->m_firstNoteOrChord->m_x);
-                    DrawObliquePolygon(dc, x1, y1, beamElementCoords->at(idx)->m_x, y2, polygonHeight);
+                    this->DrawObliquePolygon(dc, x1, y1, beamElementCoords->at(idx)->m_x, y2, polygonHeight);
                 }
             }
 
diff --git a/src/view_control.cpp b/src/view_control.cpp
index e0ee53ec535..b7459a12e58 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -84,71 +84,71 @@ void View::DrawControlElement(DeviceContext *dc, ControlElement *element, Measur
     else if (element->Is(ARPEG)) {
         Arpeg *arpeg = vrv_cast<Arpeg *>(element);
         assert(arpeg);
-        DrawArpeg(dc, arpeg, measure, system);
+        this->DrawArpeg(dc, arpeg, measure, system);
     }
     else if (element->Is(BREATH)) {
         Breath *breath = vrv_cast<Breath *>(element);
         assert(breath);
-        DrawBreath(dc, breath, measure, system);
+        this->DrawBreath(dc, breath, measure, system);
     }
     else if (element->Is(DIR)) {
         Dir *dir = vrv_cast<Dir *>(element);
         assert(dir);
-        DrawDir(dc, dir, measure, system);
+        this->DrawDir(dc, dir, measure, system);
         system->AddToDrawingListIfNeccessary(dir);
     }
     else if (element->Is(DYNAM)) {
         Dynam *dynam = vrv_cast<Dynam *>(element);
         assert(dynam);
-        DrawDynam(dc, dynam, measure, system);
+        this->DrawDynam(dc, dynam, measure, system);
         system->AddToDrawingListIfNeccessary(dynam);
     }
     else if (element->Is(FERMATA)) {
         Fermata *fermata = vrv_cast<Fermata *>(element);
         assert(fermata);
-        DrawFermata(dc, fermata, measure, system);
+        this->DrawFermata(dc, fermata, measure, system);
     }
     else if (element->Is(FING)) {
         Fing *fing = vrv_cast<Fing *>(element);
         assert(fing);
-        DrawFing(dc, fing, measure, system);
+        this->DrawFing(dc, fing, measure, system);
     }
     else if (element->Is(HARM)) {
         Harm *harm = vrv_cast<Harm *>(element);
         assert(harm);
-        DrawHarm(dc, harm, measure, system);
+        this->DrawHarm(dc, harm, measure, system);
     }
     else if (element->Is(MORDENT)) {
         Mordent *mordent = vrv_cast<Mordent *>(element);
         assert(mordent);
-        DrawMordent(dc, mordent, measure, system);
+        this->DrawMordent(dc, mordent, measure, system);
     }
     else if (element->Is(PEDAL)) {
         Pedal *pedal = vrv_cast<Pedal *>(element);
         assert(pedal);
-        DrawPedal(dc, pedal, measure, system);
+        this->DrawPedal(dc, pedal, measure, system);
         system->AddToDrawingListIfNeccessary(pedal);
     }
     else if (element->Is(REH)) {
         Reh *reh = vrv_cast<Reh *>(element);
         assert(reh);
-        DrawReh(dc, reh, measure, system);
+        this->DrawReh(dc, reh, measure, system);
     }
     else if (element->Is(TEMPO)) {
         Tempo *tempo = vrv_cast<Tempo *>(element);
         assert(tempo);
-        DrawTempo(dc, tempo, measure, system);
+        this->DrawTempo(dc, tempo, measure, system);
     }
     else if (element->Is(TRILL)) {
         Trill *trill = vrv_cast<Trill *>(element);
         assert(trill);
-        DrawTrill(dc, trill, measure, system);
+        this->DrawTrill(dc, trill, measure, system);
         system->AddToDrawingListIfNeccessary(trill);
     }
     else if (element->Is(TURN)) {
         Turn *turn = vrv_cast<Turn *>(element);
         assert(turn);
-        DrawTurn(dc, turn, measure, system);
+        this->DrawTurn(dc, turn, measure, system);
     }
 }
 
@@ -303,35 +303,37 @@ void View::DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *s
 
         if (element->Is(DIR)) {
             // cast to Dir check in DrawControlElementConnector
-            DrawControlElementConnector(dc, dynamic_cast<Dir *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawControlElementConnector(
+                dc, dynamic_cast<Dir *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(DYNAM)) {
             // cast to Dynam check in DrawControlElementConnector
-            DrawControlElementConnector(dc, dynamic_cast<Dynam *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawControlElementConnector(
+                dc, dynamic_cast<Dynam *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(FIGURE)) {
             // cast to F check in DrawFConnector
-            DrawFConnector(dc, dynamic_cast<F *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawFConnector(dc, dynamic_cast<F *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(BRACKETSPAN)) {
             // cast to BracketSpan check in DrawBracketSpan
-            DrawBracketSpan(dc, dynamic_cast<BracketSpan *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawBracketSpan(dc, dynamic_cast<BracketSpan *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(GLISS)) {
             // For gliss we limit support to one value in @staff
             if (staffIter != staffList.begin()) continue;
             // cast to Gliss check in DrawGliss
-            DrawGliss(dc, dynamic_cast<Gliss *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawGliss(dc, dynamic_cast<Gliss *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(HAIRPIN)) {
             // cast to Hairpin check in DrawHairpin
-            DrawHairpin(dc, dynamic_cast<Hairpin *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawHairpin(dc, dynamic_cast<Hairpin *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(LV)) {
             // For ties we limit support to one value in @staff
             if (staffIter != staffList.begin()) continue;
             // cast to Tie check in DrawTie
-            DrawTie(dc, dynamic_cast<Tie *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawTie(dc, dynamic_cast<Tie *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(PHRASE)) {
             // Check if slurs should be ignored
@@ -339,18 +341,18 @@ void View::DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *s
             // For phrases (slurs) we limit support to one value in @staff
             if (staffIter != staffList.begin()) continue;
             // cast to Slur check in DrawSlur
-            DrawSlur(dc, dynamic_cast<Slur *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawSlur(dc, dynamic_cast<Slur *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(OCTAVE)) {
             // cast to Slur check in DrawOctave
-            DrawOctave(dc, dynamic_cast<Octave *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawOctave(dc, dynamic_cast<Octave *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(PEDAL)) {
-            DrawPedalLine(dc, dynamic_cast<Pedal *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawPedalLine(dc, dynamic_cast<Pedal *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(PITCHINFLECTION)) {
             // cast to PitchInflection check in DrawPitchInflection
-            DrawPitchInflection(
+            this->DrawPitchInflection(
                 dc, dynamic_cast<PitchInflection *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(SLUR)) {
@@ -359,23 +361,23 @@ void View::DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *s
             // For slurs we limit support to one value in @staff
             if (staffIter != staffList.begin()) continue;
             // cast to Slur check in DrawSlur
-            DrawSlur(dc, dynamic_cast<Slur *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawSlur(dc, dynamic_cast<Slur *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(SYL)) {
             // prolong to the end of the notehead
             x2 += endRadius;
             // cast to Syl check in DrawSylConnector
-            DrawSylConnector(dc, dynamic_cast<Syl *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawSylConnector(dc, dynamic_cast<Syl *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(TIE)) {
             // For ties we limit support to one value in @staff
             if (staffIter != staffList.begin()) continue;
             // cast to Slur check in DrawTie
-            DrawTie(dc, dynamic_cast<Tie *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawTie(dc, dynamic_cast<Tie *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
         else if (element->Is(TRILL)) {
             // cast to Trill check in DrawTrill
-            DrawTrillExtension(dc, dynamic_cast<Trill *>(element), x1, x2, *staffIter, spanningType, graphic);
+            this->DrawTrillExtension(dc, dynamic_cast<Trill *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
     }
 }
@@ -488,22 +490,22 @@ void View::DrawBracketSpan(
         // Do not draw the horizontal line if the lines is dashed or solid as a full line will be drawn below
         // (Do draw the horizontal line for dotted lines as it looks better)
         if ((bracketSpan->GetLform() != LINEFORM_dashed) && (bracketSpan->GetLform() != LINEFORM_solid)) {
-            DrawFilledRectangle(dc, x1, y, x1 + bracketSize, y + lineWidth);
+            this->DrawFilledRectangle(dc, x1, y, x1 + bracketSize, y + lineWidth);
         }
-        DrawFilledRectangle(dc, x1, y, x1 + lineWidth, y - bracketSize);
+        this->DrawFilledRectangle(dc, x1, y, x1 + lineWidth, y - bracketSize);
     }
     // Closing bracket
     if ((spanningType == SPANNING_START_END) || (spanningType == SPANNING_END)) {
         // Ditto
         if ((bracketSpan->GetLform() != LINEFORM_dashed) && (bracketSpan->GetLform() != LINEFORM_solid)) {
-            DrawFilledRectangle(dc, x2 - bracketSize, y, x2, y + lineWidth);
+            this->DrawFilledRectangle(dc, x2 - bracketSize, y, x2, y + lineWidth);
         }
-        DrawFilledRectangle(dc, x2 - lineWidth, y, x2, y - bracketSize);
+        this->DrawFilledRectangle(dc, x2 - lineWidth, y, x2, y - bracketSize);
     }
     // We have a @lform - draw a full line
     if (bracketSpan->HasLform()) {
         if (bracketSpan->GetLform() == LINEFORM_solid) {
-            DrawFilledRectangle(dc, x1, y, x2, y - lineWidth);
+            this->DrawFilledRectangle(dc, x1, y, x2, y - lineWidth);
         }
         else if (bracketSpan->GetLform() == LINEFORM_dashed) {
             dc->SetPen(m_currentColour, lineWidth, AxSOLID, bracketSize);
@@ -655,8 +657,8 @@ void View::DrawHairpin(
 
     const double hairpinThickness
         = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * m_options->m_hairpinThickness.GetValue();
-    DrawObliquePolygon(dc, x1, y1 - startY / 2, x2, y2 - endY / 2, hairpinThickness);
-    DrawObliquePolygon(dc, x1, y1 + startY / 2, x2, y2 + endY / 2, hairpinThickness);
+    this->DrawObliquePolygon(dc, x1, y1 - startY / 2, x2, y2 - endY / 2, hairpinThickness);
+    this->DrawObliquePolygon(dc, x1, y1 + startY / 2, x2, y2 + endY / 2, hairpinThickness);
 
     // dc->ReactivateGraphic();
     if (graphic)
@@ -750,7 +752,7 @@ void View::DrawOctave(
     dc->GetSmuflTextExtent(str, &extend);
     const int yCode = (disPlace == STAFFREL_basic_above) ? y1 - extend.m_height : y1;
     const int octaveX = altSymbols ? x1 - extend.m_width / 2 : x1 - extend.m_width;
-    DrawSmuflCode(dc, octaveX, yCode, code, staff->m_drawingStaffSize, false);
+    this->DrawSmuflCode(dc, octaveX, yCode, code, staff->m_drawingStaffSize, false);
     dc->ResetFont();
 
     if (octave->GetExtender() != BOOLEAN_false) {
@@ -951,7 +953,7 @@ void View::DrawTie(DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff, ch
     if (m_tieThicknessCoefficient <= 0) {
         m_tieThicknessCoefficient = BoundingBox::GetBezierThicknessCoefficient(bezier, thickness, 0, penWidth);
     }
-    DrawThickBezierCurve(
+    this->DrawThickBezierCurve(
         dc, bezier, m_tieThicknessCoefficient * thickness, staff->m_drawingStaffSize, penWidth, 0, penStyle);
     if (graphic)
         dc->EndResumedGraphic(graphic, this);
@@ -1010,15 +1012,15 @@ void View::DrawPedalLine(
 
     // Opening bracket
     if ((spanningType == SPANNING_START_END) || (spanningType == SPANNING_START)) {
-        DrawFilledRectangle(dc, x1, y, x1 + bracketSize / 2, y + lineWidth);
-        DrawFilledRectangle(dc, x1, y, x1 + lineWidth, y + bracketSize);
+        this->DrawFilledRectangle(dc, x1, y, x1 + bracketSize / 2, y + lineWidth);
+        this->DrawFilledRectangle(dc, x1, y, x1 + lineWidth, y + bracketSize);
     }
     // Closing bracket
     if ((spanningType == SPANNING_START_END) || (spanningType == SPANNING_END)) {
-        DrawFilledRectangle(dc, x2 - bracketSize / 2, y, x2, y + lineWidth);
-        DrawFilledRectangle(dc, x2 - lineWidth, y, x2, y + bracketSize);
+        this->DrawFilledRectangle(dc, x2 - bracketSize / 2, y, x2, y + lineWidth);
+        this->DrawFilledRectangle(dc, x2 - lineWidth, y, x2, y + bracketSize);
     }
-    DrawFilledRectangle(dc, x1 + bracketSize / 2, y, x2 - bracketSize / 2, y + lineWidth);
+    this->DrawFilledRectangle(dc, x1 + bracketSize / 2, y, x2 - bracketSize / 2, y + lineWidth);
 
     if (graphic) {
         dc->EndResumedGraphic(graphic, this);
@@ -1062,7 +1064,7 @@ void View::DrawTrillExtension(
     else
         dc->StartGraphic(trill, "", trill->GetUuid(), false);
 
-    DrawSmuflLine(dc, orig, length, staff->m_drawingStaffSize, false, SMUFL_E59D_ornamentZigZagLineNoRightEnd, 0,
+    this->DrawSmuflLine(dc, orig, length, staff->m_drawingStaffSize, false, SMUFL_E59D_ornamentZigZagLineNoRightEnd, 0,
         SMUFL_E59E_ornamentZigZagLineWithRightEnd);
 
     if (graphic)
@@ -1149,7 +1151,7 @@ void View::DrawControlElementConnector(
         int x = x1 + margin + (i * dashSpace);
         x = std::max(x, x1);
 
-        DrawFilledRectangle(dc, x - halfDashLength, y, x + halfDashLength, y + width);
+        this->DrawFilledRectangle(dc, x - halfDashLength, y, x + halfDashLength, y + width);
     }
 
     if (deactivate) {
@@ -1171,7 +1173,7 @@ void View::DrawFConnector(DeviceContext *dc, F *f, int x1, int x2, Staff *staff,
     assert(f->GetStart() && f->GetEnd());
     if (!f->GetStart() || !f->GetEnd()) return;
 
-    const int y = GetFYRel(f, staff);
+    const int y = this->GetFYRel(f, staff);
     TextExtend extend;
 
     // The both correspond to the current system, which means no system break in-between (simple case)
@@ -1204,7 +1206,7 @@ void View::DrawFConnector(DeviceContext *dc, F *f, int x1, int x2, Staff *staff,
     int width = m_options->m_lyricLineThickness.GetValue() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
     // Adjust it proportionally to the lyric size
     width *= m_options->m_lyricSize.GetValue() / m_options->m_lyricSize.GetDefault();
-    DrawFilledRectangle(dc, x1, y, x2, y + width);
+    this->DrawFilledRectangle(dc, x1, y, x2, y + width);
 
     dc->ReactivateGraphic();
 
@@ -1222,7 +1224,7 @@ void View::DrawSylConnector(
     assert(syl->GetStart() && syl->GetEnd());
     if (!syl->GetStart() || !syl->GetEnd()) return;
 
-    const int y = staff->GetDrawingY() + GetSylYRel(syl->m_drawingVerse, staff);
+    const int y = staff->GetDrawingY() + this->GetSylYRel(syl->m_drawingVerse, staff);
 
     // Invalid bounding boxes might occur for empty syllables without text child
     if (!syl->HasContentHorizontalBB()) return;
@@ -1275,7 +1277,7 @@ void View::DrawSylConnector(
 
     dc->DeactivateGraphic();
 
-    DrawSylConnectorLines(dc, x1, x2, y, syl, staff);
+    this->DrawSylConnectorLines(dc, x1, x2, y, syl, staff);
 
     dc->ReactivateGraphic();
 
@@ -1328,14 +1330,14 @@ void View::DrawSylConnectorLines(DeviceContext *dc, int x1, int x2, int y, Syl *
             int x = x1 + margin + (i * dashSpace);
             x = std::max(x, x1);
 
-            DrawFilledRectangle(dc, x - halfDashLength, y, x + halfDashLength, y + thickness);
+            this->DrawFilledRectangle(dc, x - halfDashLength, y, x + halfDashLength, y + thickness);
         }
-        // DrawFilledRectangle(dc, x1, y, x2, y + width);
+        // this->DrawFilledRectangle(dc, x1, y, x2, y + width);
     }
     else if (syl->GetCon() == sylLog_CON_u) {
         x1 += (int)m_doc->GetDrawingUnit(staff->m_drawingStaffSize) / 2;
         if (x2 > x1) {
-            DrawFilledRectangle(dc, x1, y, x2, y + thickness);
+            this->DrawFilledRectangle(dc, x1, y, x2, y + thickness);
         }
     }
 }
@@ -1482,7 +1484,7 @@ void View::DrawBreath(DeviceContext *dc, Breath *breath, Measure *measure, Syste
         int y = breath->GetDrawingY();
 
         dc->SetFont(m_doc->GetDrawingSmuflFont((*staffIter)->m_drawingStaffSize, false));
-        DrawSmuflString(dc, x, y, str, alignment, (*staffIter)->m_drawingStaffSize);
+        this->DrawSmuflString(dc, x, y, str, alignment, (*staffIter)->m_drawingStaffSize);
         dc->ResetFont();
     }
 
@@ -1559,7 +1561,7 @@ void View::DrawDir(DeviceContext *dc, Dir *dir, Measure *measure, System *system
         dc->ResetFont();
         dc->ResetBrush();
 
-        DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
+        this->DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
     }
 
     dc->EndGraphic(dir, this);
@@ -1627,7 +1629,7 @@ void View::DrawDynam(DeviceContext *dc, Dynam *dynam, Measure *measure, System *
         // editorial element within the dynam as it would with text. Also, it is center only if it is a symbol.
         if (isSymbolOnly) {
             dc->SetFont(m_doc->GetDrawingSmuflFont((*staffIter)->m_drawingStaffSize, false));
-            DrawSmuflString(dc, params.m_x, params.m_y, dynamSymbol, alignment, (*staffIter)->m_drawingStaffSize);
+            this->DrawSmuflString(dc, params.m_x, params.m_y, dynamSymbol, alignment, (*staffIter)->m_drawingStaffSize);
             dc->ResetFont();
         }
         else {
@@ -1635,13 +1637,13 @@ void View::DrawDynam(DeviceContext *dc, Dynam *dynam, Measure *measure, System *
             dc->SetFont(&dynamTxt);
 
             dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), alignment);
-            DrawTextChildren(dc, dynam, params);
+            this->DrawTextChildren(dc, dynam, params);
             dc->EndText();
 
             dc->ResetFont();
             dc->ResetBrush();
         }
-        DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
+        this->DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
     }
 
     dc->EndGraphic(dynam, this);
@@ -1667,11 +1669,11 @@ void View::DrawFb(DeviceContext *dc, Staff *staff, Fb *fb, TextDrawingParams &pa
         dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), HORIZONTALALIGNMENT_left);
         if (current->Is(FIGURE)) {
             // dynamic_cast assert in DrawF
-            DrawF(dc, dynamic_cast<F *>(current), params);
+            this->DrawF(dc, dynamic_cast<F *>(current), params);
         }
         else if (current->IsEditorialElement()) {
             // cast to EditorialElement check in DrawLayerEditorialElement
-            DrawFbEditorialElement(dc, dynamic_cast<EditorialElement *>(current), params);
+            this->DrawFbEditorialElement(dc, dynamic_cast<EditorialElement *>(current), params);
         }
         else {
             assert(false);
@@ -1744,15 +1746,15 @@ void View::DrawFermata(DeviceContext *dc, Fermata *fermata, Measure *measure, Sy
         if (enclosingFront) {
             const int xCorrEncl = xCorr + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) / 3
                 + m_doc->GetGlyphWidth(enclosingFront, staff->m_drawingStaffSize, drawingCueSize);
-            DrawSmuflCode(dc, x - xCorrEncl, y + enclosureYCorr + yCorr, enclosingFront, staff->m_drawingStaffSize,
-                drawingCueSize);
+            this->DrawSmuflCode(dc, x - xCorrEncl, y + enclosureYCorr + yCorr, enclosingFront,
+                staff->m_drawingStaffSize, drawingCueSize);
         }
 
-        DrawSmuflCode(dc, x - xCorr, y, code, staff->m_drawingStaffSize, drawingCueSize);
+        this->DrawSmuflCode(dc, x - xCorr, y, code, staff->m_drawingStaffSize, drawingCueSize);
 
         if (enclosingBack) {
             const int xCorrEncl = xCorr + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) / 3;
-            DrawSmuflCode(dc, x + xCorrEncl, y + enclosureYCorr + yCorr, enclosingBack, staff->m_drawingStaffSize,
+            this->DrawSmuflCode(dc, x + xCorrEncl, y + enclosureYCorr + yCorr, enclosingBack, staff->m_drawingStaffSize,
                 drawingCueSize);
         }
 
@@ -1801,13 +1803,13 @@ void View::DrawFing(DeviceContext *dc, Fing *fing, Measure *measure, System *sys
         dc->SetFont(&fingTxt);
 
         dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), alignment);
-        DrawTextChildren(dc, fing, params);
+        this->DrawTextChildren(dc, fing, params);
         dc->EndText();
 
         dc->ResetFont();
         dc->ResetBrush();
 
-        DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
+        this->DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
     }
 
     dc->EndGraphic(fing, this);
@@ -1924,7 +1926,7 @@ void View::DrawGliss(DeviceContext *dc, Gliss *gliss, int x1, int x2, Staff *sta
         case LINEFORM_solid:
         default: {
             // only solid lines for now
-            DrawRoundedLine(dc, x1, y1, x2, y2, lineWidth);
+            this->DrawRoundedLine(dc, x1, y1, x2, y2, lineWidth);
             break;
         }
     }
@@ -1977,7 +1979,7 @@ void View::DrawHarm(DeviceContext *dc, Harm *harm, Measure *measure, System *sys
         params.m_y = harm->GetDrawingY();
 
         if (harm->GetFirst() && harm->GetFirst()->Is(FB)) {
-            DrawFb(dc, *staffIter, dynamic_cast<Fb *>(harm->GetFirst()), params);
+            this->DrawFb(dc, *staffIter, dynamic_cast<Fb *>(harm->GetFirst()), params);
         }
         else {
             params.m_pointSize = m_doc->GetDrawingLyricFont((*staffIter)->m_drawingStaffSize)->GetPointSize();
@@ -1988,13 +1990,13 @@ void View::DrawHarm(DeviceContext *dc, Harm *harm, Measure *measure, System *sys
             dc->SetFont(&harmTxt);
 
             dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), alignment);
-            DrawTextChildren(dc, harm, params);
+            this->DrawTextChildren(dc, harm, params);
             dc->EndText();
 
             dc->ResetFont();
             dc->ResetBrush();
 
-            DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
+            this->DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
         }
     }
 
@@ -2035,7 +2037,7 @@ void View::DrawMordent(DeviceContext *dc, Mordent *mordent, Measure *measure, Sy
             std::wstring accidStr;
             accidStr.push_back(accid);
             dc->SetFont(m_doc->GetDrawingSmuflFont((*staffIter)->m_drawingStaffSize, false));
-            DrawSmuflString(
+            this->DrawSmuflString(
                 dc, x, y, accidStr, HORIZONTALALIGNMENT_center, (*staffIter)->m_drawingStaffSize / 2, false);
             // Adjust the y position
             double factor = 1.0;
@@ -2067,7 +2069,7 @@ void View::DrawMordent(DeviceContext *dc, Mordent *mordent, Measure *measure, Sy
             std::wstring accidStr;
             accidStr.push_back(accid);
             dc->SetFont(m_doc->GetDrawingSmuflFont((*staffIter)->m_drawingStaffSize, false));
-            DrawSmuflString(
+            this->DrawSmuflString(
                 dc, x, y, accidStr, HORIZONTALALIGNMENT_center, (*staffIter)->m_drawingStaffSize / 2, false);
             // Adjust the y position
             double factor = 1.75;
@@ -2098,7 +2100,7 @@ void View::DrawMordent(DeviceContext *dc, Mordent *mordent, Measure *measure, Sy
         int drawingX = x - (1 + xShift) * m_doc->GetGlyphWidth(code, (*staffIter)->m_drawingStaffSize, false) / 2;
 
         dc->SetFont(m_doc->GetDrawingSmuflFont((*staffIter)->m_drawingStaffSize, false));
-        DrawSmuflString(dc, drawingX, y, str, HORIZONTALALIGNMENT_left, (*staffIter)->m_drawingStaffSize);
+        this->DrawSmuflString(dc, drawingX, y, str, HORIZONTALALIGNMENT_left, (*staffIter)->m_drawingStaffSize);
         dc->ResetFont();
     }
 
@@ -2167,7 +2169,7 @@ void View::DrawPedal(DeviceContext *dc, Pedal *pedal, Measure *measure, System *
             const int y = pedal->GetDrawingY();
 
             dc->SetFont(m_doc->GetDrawingSmuflFont((*staffIter)->m_drawingStaffSize, false));
-            DrawSmuflString(dc, x, y, str, alignment, (*staffIter)->m_drawingStaffSize);
+            this->DrawSmuflString(dc, x, y, str, alignment, (*staffIter)->m_drawingStaffSize);
             dc->ResetFont();
         }
     }
@@ -2236,13 +2238,13 @@ void View::DrawReh(DeviceContext *dc, Reh *reh, Measure *measure, System *system
         dc->SetFont(&rehTxt);
 
         dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), alignment);
-        DrawTextChildren(dc, reh, params);
+        this->DrawTextChildren(dc, reh, params);
         dc->EndText();
 
         dc->ResetFont();
         dc->ResetBrush();
 
-        DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
+        this->DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
     }
 
     dc->EndGraphic(reh, this);
@@ -2298,13 +2300,13 @@ void View::DrawTempo(DeviceContext *dc, Tempo *tempo, Measure *measure, System *
         dc->SetFont(&tempoTxt);
 
         dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), alignment);
-        DrawTextChildren(dc, tempo, params);
+        this->DrawTextChildren(dc, tempo, params);
         dc->EndText();
 
         dc->ResetFont();
         dc->ResetBrush();
 
-        DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
+        this->DrawTextEnclosure(dc, params, (*staffIter)->m_drawingStaffSize);
     }
 
     dc->EndGraphic(tempo, this);
@@ -2359,7 +2361,7 @@ void View::DrawTrill(DeviceContext *dc, Trill *trill, Measure *measure, System *
             accidStr.push_back(accid);
             dc->SetFont(m_doc->GetDrawingSmuflFont((*staffIter)->m_drawingStaffSize, false));
             int accidY = y - m_doc->GetGlyphHeight(accid, (*staffIter)->m_drawingStaffSize, true) / 2;
-            DrawSmuflString(dc, x + accidXShift, accidY, accidStr, HORIZONTALALIGNMENT_center,
+            this->DrawSmuflString(dc, x + accidXShift, accidY, accidStr, HORIZONTALALIGNMENT_center,
                 (*staffIter)->m_drawingStaffSize / 2, false);
         }
         else if (trill->HasAccidupper()) {
@@ -2372,12 +2374,12 @@ void View::DrawTrill(DeviceContext *dc, Trill *trill, Measure *measure, System *
             accidStr.push_back(accid);
             dc->SetFont(m_doc->GetDrawingSmuflFont((*staffIter)->m_drawingStaffSize, false));
             int accidY = y + trillHeight * 1.5;
-            DrawSmuflString(dc, x + accidXShift, accidY, accidStr, HORIZONTALALIGNMENT_center,
+            this->DrawSmuflString(dc, x + accidXShift, accidY, accidStr, HORIZONTALALIGNMENT_center,
                 (*staffIter)->m_drawingStaffSize / 2, false);
         }
 
         dc->SetFont(m_doc->GetDrawingSmuflFont((*staffIter)->m_drawingStaffSize, false));
-        DrawSmuflString(dc, x, y, str, alignment, (*staffIter)->m_drawingStaffSize);
+        this->DrawSmuflString(dc, x, y, str, alignment, (*staffIter)->m_drawingStaffSize);
         dc->ResetFont();
     }
 
@@ -2439,7 +2441,7 @@ void View::DrawTurn(DeviceContext *dc, Turn *turn, Measure *measure, System *sys
             std::wstring accidStr;
             accidStr.push_back(accid);
             int accidYShift = shift - m_doc->GetGlyphBottom(accid, (*staffIter)->m_drawingStaffSize, true);
-            DrawSmuflString(dc, x + accidXShift, y + accidYShift, accidStr, HORIZONTALALIGNMENT_center,
+            this->DrawSmuflString(dc, x + accidXShift, y + accidYShift, accidStr, HORIZONTALALIGNMENT_center,
                 (*staffIter)->m_drawingStaffSize / 2, false);
         }
         if (turn->HasAccidlower()) {
@@ -2450,11 +2452,11 @@ void View::DrawTurn(DeviceContext *dc, Turn *turn, Measure *measure, System *sys
             std::wstring accidStr;
             accidStr.push_back(accid);
             int accidYShift = -m_doc->GetGlyphHeight(accid, (*staffIter)->m_drawingStaffSize, true) / 2;
-            DrawSmuflString(dc, x + accidXShift, y + accidYShift, accidStr, HORIZONTALALIGNMENT_center,
+            this->DrawSmuflString(dc, x + accidXShift, y + accidYShift, accidStr, HORIZONTALALIGNMENT_center,
                 (*staffIter)->m_drawingStaffSize / 2, false);
         }
 
-        DrawSmuflString(dc, x, y, str, alignment, (*staffIter)->m_drawingStaffSize);
+        this->DrawSmuflString(dc, x, y, str, alignment, (*staffIter)->m_drawingStaffSize);
         dc->ResetFont();
     }
 
@@ -2641,7 +2643,7 @@ void View::DrawEnding(DeviceContext *dc, Ending *ending, System *system)
             params.m_pointSize = currentFont.GetPointSize();
 
             dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), HORIZONTALALIGNMENT_left);
-            DrawTextElement(dc, &text, params);
+            this->DrawTextElement(dc, &text, params);
             dc->EndText();
         }
 
@@ -2651,13 +2653,13 @@ void View::DrawEnding(DeviceContext *dc, Ending *ending, System *system)
         const int lineWidth = m_options->m_repeatEndingLineThickness.GetValue()
             * m_doc->GetDrawingUnit((*staffIter)->m_drawingStaffSize);
 
-        DrawFilledRectangle(dc, x1, y2, x2, y2 + lineWidth);
+        this->DrawFilledRectangle(dc, x1, y2, x2, y2 + lineWidth);
         if ((spanningType == SPANNING_START_END) || (spanningType == SPANNING_START)) {
-            DrawFilledRectangle(dc, x1, y1, x1 + lineWidth, y2);
+            this->DrawFilledRectangle(dc, x1, y1, x1 + lineWidth, y2);
         }
         if (((spanningType == SPANNING_START_END) || (spanningType == SPANNING_END))
             && (ending->GetLendsym() != LINESTARTENDSYMBOL_none)) {
-            DrawFilledRectangle(dc, x2 - lineWidth, y1, x2, y2);
+            this->DrawFilledRectangle(dc, x2 - lineWidth, y1, x2, y2);
         }
 
         dc->EndCustomGraphic();
@@ -2681,7 +2683,7 @@ void View::DrawTextEnclosure(DeviceContext *dc, const TextDrawingParams &params,
         int y2 = rend->GetContentTop() + staffSize;
 
         if (params.m_enclose == TEXTRENDITION_box) {
-            DrawNotFilledRectangle(dc, x1, y1, x2, y2, lineThickness, 0);
+            this->DrawNotFilledRectangle(dc, x1, y1, x2, y2, lineThickness, 0);
         }
         else if (params.m_enclose == TEXTRENDITION_circle) {
             const int width = std::abs(x2 - x1);
@@ -2694,7 +2696,7 @@ void View::DrawTextEnclosure(DeviceContext *dc, const TextDrawingParams &params,
                 x1 -= (height - width) / 2;
                 x2 += (height - width) / 2;
             }
-            DrawNotFilledEllipse(dc, x1, y1, x2, y2, lineThickness);
+            this->DrawNotFilledEllipse(dc, x1, y1, x2, y2, lineThickness);
         }
     }
 }
diff --git a/src/view_element.cpp b/src/view_element.cpp
index ef50e7ca2b5..ce582b26389 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -89,118 +89,118 @@ void View::DrawLayerElement(DeviceContext *dc, LayerElement *element, Layer *lay
     }
 
     if (element->Is(ACCID)) {
-        DrawAccid(dc, element, layer, staff, measure);
+        this->DrawAccid(dc, element, layer, staff, measure);
     }
     else if (element->Is(ARTIC)) {
-        DrawArtic(dc, element, layer, staff, measure);
+        this->DrawArtic(dc, element, layer, staff, measure);
     }
     else if (element->Is(BARLINE)) {
-        DrawBarLine(dc, element, layer, staff, measure);
+        this->DrawBarLine(dc, element, layer, staff, measure);
     }
     else if (element->Is(BEAM)) {
-        DrawBeam(dc, element, layer, staff, measure);
+        this->DrawBeam(dc, element, layer, staff, measure);
     }
     else if (element->Is(BEATRPT)) {
-        DrawBeatRpt(dc, element, layer, staff, measure);
+        this->DrawBeatRpt(dc, element, layer, staff, measure);
     }
     else if (element->Is(BTREM)) {
-        DrawBTrem(dc, element, layer, staff, measure);
+        this->DrawBTrem(dc, element, layer, staff, measure);
     }
     else if (element->Is(CHORD)) {
-        DrawDurationElement(dc, element, layer, staff, measure);
+        this->DrawDurationElement(dc, element, layer, staff, measure);
     }
     else if (element->Is(CLEF)) {
-        DrawClef(dc, element, layer, staff, measure);
+        this->DrawClef(dc, element, layer, staff, measure);
     }
     else if (element->Is(CUSTOS)) {
-        DrawCustos(dc, element, layer, staff, measure);
+        this->DrawCustos(dc, element, layer, staff, measure);
     }
     else if (element->Is(DOT)) {
-        DrawDot(dc, element, layer, staff, measure);
+        this->DrawDot(dc, element, layer, staff, measure);
     }
     else if (element->Is(DOTS)) {
-        DrawDots(dc, element, layer, staff, measure);
+        this->DrawDots(dc, element, layer, staff, measure);
     }
     else if (element->Is(FTREM)) {
-        DrawFTrem(dc, element, layer, staff, measure);
+        this->DrawFTrem(dc, element, layer, staff, measure);
     }
     else if (element->Is(FLAG)) {
-        DrawFlag(dc, element, layer, staff, measure);
+        this->DrawFlag(dc, element, layer, staff, measure);
     }
     else if (element->Is(GRACEGRP)) {
-        DrawGraceGrp(dc, element, layer, staff, measure);
+        this->DrawGraceGrp(dc, element, layer, staff, measure);
     }
     else if (element->Is(HALFMRPT)) {
-        DrawHalfmRpt(dc, element, layer, staff, measure);
+        this->DrawHalfmRpt(dc, element, layer, staff, measure);
     }
     else if (element->Is(KEYSIG)) {
-        DrawKeySig(dc, element, layer, staff, measure);
+        this->DrawKeySig(dc, element, layer, staff, measure);
     }
     else if (element->Is(LIGATURE)) {
-        DrawLigature(dc, element, layer, staff, measure);
+        this->DrawLigature(dc, element, layer, staff, measure);
     }
     else if (element->Is(MENSUR)) {
-        DrawMensur(dc, element, layer, staff, measure);
+        this->DrawMensur(dc, element, layer, staff, measure);
     }
     else if (element->Is(METERSIG)) {
-        DrawMeterSig(dc, element, layer, staff, measure);
+        this->DrawMeterSig(dc, element, layer, staff, measure);
     }
     else if (element->Is(MREST)) {
-        DrawMRest(dc, element, layer, staff, measure);
+        this->DrawMRest(dc, element, layer, staff, measure);
     }
     else if (element->Is(MRPT)) {
-        DrawMRpt(dc, element, layer, staff, measure);
+        this->DrawMRpt(dc, element, layer, staff, measure);
     }
     else if (element->Is(MRPT2)) {
-        DrawMRpt2(dc, element, layer, staff, measure);
+        this->DrawMRpt2(dc, element, layer, staff, measure);
     }
     else if (element->Is(MSPACE)) {
-        DrawMSpace(dc, element, layer, staff, measure);
+        this->DrawMSpace(dc, element, layer, staff, measure);
     }
     else if (element->Is(MULTIREST)) {
-        DrawMultiRest(dc, element, layer, staff, measure);
+        this->DrawMultiRest(dc, element, layer, staff, measure);
     }
     else if (element->Is(MULTIRPT)) {
-        DrawMultiRpt(dc, element, layer, staff, measure);
+        this->DrawMultiRpt(dc, element, layer, staff, measure);
     }
     else if (element->Is(NC)) {
-        DrawNc(dc, element, layer, staff, measure);
+        this->DrawNc(dc, element, layer, staff, measure);
     }
     else if (element->Is(NOTE)) {
-        DrawDurationElement(dc, element, layer, staff, measure);
+        this->DrawDurationElement(dc, element, layer, staff, measure);
     }
     else if (element->Is(NEUME)) {
-        DrawNeume(dc, element, layer, staff, measure);
+        this->DrawNeume(dc, element, layer, staff, measure);
     }
     else if (element->Is(PLICA)) {
-        DrawPlica(dc, element, layer, staff, measure);
+        this->DrawPlica(dc, element, layer, staff, measure);
     }
     else if (element->Is(PROPORT)) {
-        DrawProport(dc, element, layer, staff, measure);
+        this->DrawProport(dc, element, layer, staff, measure);
     }
     else if (element->Is(REST)) {
-        DrawDurationElement(dc, element, layer, staff, measure);
+        this->DrawDurationElement(dc, element, layer, staff, measure);
     }
     else if (element->Is(SPACE)) {
-        DrawSpace(dc, element, layer, staff, measure);
+        this->DrawSpace(dc, element, layer, staff, measure);
     }
     else if (element->Is(STEM)) {
-        DrawStem(dc, element, layer, staff, measure);
+        this->DrawStem(dc, element, layer, staff, measure);
     }
     else if (element->Is(SYL)) {
-        DrawSyl(dc, element, layer, staff, measure);
+        this->DrawSyl(dc, element, layer, staff, measure);
     }
     else if (element->Is(SYLLABLE)) {
-        DrawSyllable(dc, element, layer, staff, measure);
+        this->DrawSyllable(dc, element, layer, staff, measure);
     }
     else if (element->Is(TABDURSYM)) {
-        DrawTabDurSym(dc, element, layer, staff, measure);
+        this->DrawTabDurSym(dc, element, layer, staff, measure);
     }
     else if (element->Is(TABGRP)) {
-        DrawTabGrp(dc, element, layer, staff, measure);
+        this->DrawTabGrp(dc, element, layer, staff, measure);
     }
     else if (element->Is(TUPLET)) {
-        DrawTuplet(dc, element, layer, staff, measure);
+        this->DrawTuplet(dc, element, layer, staff, measure);
     }
     else if (element->Is(TUPLET_BRACKET)) {
         dc->StartGraphic(element, "", element->GetUuid());
@@ -213,7 +213,7 @@ void View::DrawLayerElement(DeviceContext *dc, LayerElement *element, Layer *lay
         layer->AddToDrawingList(element);
     }
     else if (element->Is(VERSE)) {
-        DrawVerse(dc, element, layer, staff, measure);
+        this->DrawVerse(dc, element, layer, staff, measure);
     }
     else {
         // This should never happen
@@ -275,7 +275,7 @@ void View::DrawAccid(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         y += extend.m_descent + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
     }
 
-    DrawSmuflString(
+    this->DrawSmuflString(
         dc, x, y, accidStr, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize, accid->GetDrawingCueSize(), true);
 
     dc->EndGraphic(element, this);
@@ -356,14 +356,15 @@ void View::DrawArtic(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     if (enclosingFront) {
         int xCorrEncl = std::max(xCorr, m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2 / 3);
         xCorrEncl += m_doc->GetGlyphWidth(enclosingFront, staff->m_drawingStaffSize, drawingCueSize);
-        DrawSmuflCode(dc, x - xCorrEncl, y - yCorrEncl, enclosingFront, staff->m_drawingStaffSize, drawingCueSize);
+        this->DrawSmuflCode(
+            dc, x - xCorrEncl, y - yCorrEncl, enclosingFront, staff->m_drawingStaffSize, drawingCueSize);
     }
 
-    DrawSmuflCode(dc, x - xCorr, y - yCorr, code, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflCode(dc, x - xCorr, y - yCorr, code, staff->m_drawingStaffSize, drawingCueSize);
 
     if (enclosingBack) {
         const int xCorrEncl = std::max(xCorr, m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2 / 3);
-        DrawSmuflCode(dc, x + xCorrEncl, y - yCorrEncl, enclosingBack, staff->m_drawingStaffSize, drawingCueSize);
+        this->DrawSmuflCode(dc, x + xCorrEncl, y - yCorrEncl, enclosingBack, staff->m_drawingStaffSize, drawingCueSize);
     }
 
     dc->EndGraphic(element, this);
@@ -394,9 +395,9 @@ void View::DrawBarLine(DeviceContext *dc, LayerElement *element, Layer *layer, S
 
     int offset = (yTop == yBottom) ? m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) : 0;
 
-    DrawBarLine(dc, yTop + offset, yBottom - offset, barLine, barLine->GetForm());
+    this->DrawBarLine(dc, yTop + offset, yBottom - offset, barLine, barLine->GetForm());
     if (barLine->HasRepetitionDots()) {
-        DrawBarLineDots(dc, staff, barLine);
+        this->DrawBarLineDots(dc, staff, barLine);
     }
 
     dc->EndGraphic(element, this);
@@ -421,16 +422,16 @@ void View::DrawBeatRpt(DeviceContext *dc, LayerElement *element, Layer *layer, S
     y -= staff->m_drawingLines / 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
 
     if (beatRpt->GetSlash() == BEATRPT_REND_mixed) {
-        DrawSmuflCode(dc, xSymbol, y, SMUFL_E501_repeat2Bars, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, xSymbol, y, SMUFL_E501_repeat2Bars, staff->m_drawingStaffSize, false);
     }
     else {
         wchar_t slash = SMUFL_E504_repeatBarSlash;
-        DrawSmuflCode(dc, xSymbol, y, slash, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, xSymbol, y, slash, staff->m_drawingStaffSize, false);
         const int slashNum = beatRpt->GetSlash();
         const int halfWidth = m_doc->GetGlyphWidth(slash, staff->m_drawingStaffSize, false) / 2;
         for (int i = 0; i < (slashNum - 1); ++i) {
             xSymbol += halfWidth;
-            DrawSmuflCode(dc, xSymbol, y, slash, staff->m_drawingStaffSize, false);
+            this->DrawSmuflCode(dc, xSymbol, y, slash, staff->m_drawingStaffSize, false);
         }
     }
 
@@ -478,7 +479,7 @@ void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 
     dc->StartGraphic(element, "", element->GetUuid());
 
-    DrawLayerChildren(dc, bTrem, layer, staff, measure);
+    this->DrawLayerChildren(dc, bTrem, layer, staff, measure);
 
     // Get stem values from the chord or note child
     if (childChord) {
@@ -566,11 +567,11 @@ void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     if ((stemMod == STEMMODIFIER_NONE) && (drawingDur < DUR_2)) stemMod = STEMMODIFIER_3slash;
     if (stemMod == STEMMODIFIER_z) {
         if (stemDir == STEMDIRECTION_down) y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-        DrawSmuflCode(dc, x, y, SMUFL_E22A_buzzRoll, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, x, y, SMUFL_E22A_buzzRoll, staff->m_drawingStaffSize, false);
     }
     else if (stemMod != STEMMODIFIER_sprech) {
         for (int s = 1; s < stemMod; ++s) {
-            DrawObliquePolygon(dc, x - width / 2, y - height / 2, x + width / 2, y + height / 2, beamWidthBlack);
+            this->DrawObliquePolygon(dc, x - width / 2, y - height / 2, x + width / 2, y + height / 2, beamWidthBlack);
             y += step;
         }
     }
@@ -595,7 +596,7 @@ void View::DrawChord(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 
     /************ Draw children (notes, accidentals, etc) ************/
 
-    DrawLayerChildren(dc, chord, layer, staff, measure);
+    this->DrawLayerChildren(dc, chord, layer, staff, measure);
 }
 
 void View::DrawClef(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
@@ -658,7 +659,7 @@ void View::DrawClef(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
     dc->StartGraphic(element, "", element->GetUuid());
 
-    DrawSmuflCode(dc, x, y, sym, clefSizeFactor * staff->m_drawingStaffSize, false);
+    this->DrawSmuflCode(dc, x, y, sym, clefSizeFactor * staff->m_drawingStaffSize, false);
 
     if ((m_doc->GetType() == Facs) && element->HasFacs()) {
         const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
@@ -752,7 +753,7 @@ void View::DrawCustos(DeviceContext *dc, LayerElement *element, Layer *layer, St
         y -= int(xDiff * tan(deg * M_PI / 180.0));
     }
 
-    DrawSmuflCode(dc, x, y, sym, staff->m_drawingStaffSize, false, true);
+    this->DrawSmuflCode(dc, x, y, sym, staff->m_drawingStaffSize, false, true);
 
     if ((m_doc->GetType() == Facs) && element->HasFacs()) {
         const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
@@ -767,7 +768,7 @@ void View::DrawCustos(DeviceContext *dc, LayerElement *element, Layer *layer, St
 
     /************ Draw children (accidentals, etc) ************/
     // Drawing the children should be done before ending the graphic. Otherwise the SVG tree will not match the MEI one
-    DrawLayerChildren(dc, custos, layer, staff, measure);
+    this->DrawLayerChildren(dc, custos, layer, staff, measure);
 
     dc->EndGraphic(element, this);
 }
@@ -805,7 +806,7 @@ void View::DrawDot(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
             }
         }
 
-        DrawDotsPart(dc, x, y, 1, staff);
+        this->DrawDotsPart(dc, x, y, 1, staff);
     }
 
     dc->EndGraphic(element, this);
@@ -830,7 +831,8 @@ void View::DrawDots(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
             - m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * (dotStaff->m_drawingLines - 1);
         int x = dots->GetDrawingX() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
         for (int loc : mapEntry.second) {
-            DrawDotsPart(dc, x, y + loc * m_doc->GetDrawingUnit(staff->m_drawingStaffSize), dots->GetDots(), dotStaff);
+            this->DrawDotsPart(
+                dc, x, y + loc * m_doc->GetDrawingUnit(staff->m_drawingStaffSize), dots->GetDots(), dotStaff);
         }
     }
 
@@ -847,17 +849,17 @@ void View::DrawDurationElement(DeviceContext *dc, LayerElement *element, Layer *
 
     if (dynamic_cast<Chord *>(element)) {
         dc->StartGraphic(element, "", element->GetUuid());
-        DrawChord(dc, element, layer, staff, measure);
+        this->DrawChord(dc, element, layer, staff, measure);
         dc->EndGraphic(element, this);
     }
     else if (dynamic_cast<Note *>(element)) {
         dc->StartGraphic(element, "", element->GetUuid());
-        DrawNote(dc, element, layer, staff, measure);
+        this->DrawNote(dc, element, layer, staff, measure);
         dc->EndGraphic(element, this);
     }
     else if (dynamic_cast<Rest *>(element)) {
         dc->StartGraphic(element, "", element->GetUuid());
-        DrawRest(dc, element, layer, staff, measure);
+        this->DrawRest(dc, element, layer, staff, measure);
         dc->EndGraphic(element, this);
     }
 }
@@ -882,7 +884,7 @@ void View::DrawFlag(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     dc->StartGraphic(element, "", element->GetUuid());
 
     wchar_t code = flag->GetFlagGlyph(stem->GetDrawingStemDir());
-    DrawSmuflCode(dc, x, y, code, staff->m_drawingStaffSize, flag->GetDrawingCueSize());
+    this->DrawSmuflCode(dc, x, y, code, staff->m_drawingStaffSize, flag->GetDrawingCueSize());
 
     dc->EndGraphic(element, this);
 }
@@ -898,7 +900,7 @@ void View::DrawGraceGrp(DeviceContext *dc, LayerElement *element, Layer *layer,
     dc->StartGraphic(element, "", element->GetUuid());
 
     // basically nothing to do here
-    DrawLayerChildren(dc, element, layer, staff, measure);
+    this->DrawLayerChildren(dc, element, layer, staff, measure);
 
     dc->EndGraphic(element, this);
 }
@@ -919,7 +921,7 @@ void View::DrawHalfmRpt(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     dc->StartGraphic(element, "", element->GetUuid());
 
-    DrawMRptPart(dc, x, SMUFL_E500_repeat1Bar, 0, false, staff);
+    this->DrawMRptPart(dc, x, SMUFL_E500_repeat1Bar, 0, false, staff);
 
     dc->EndGraphic(element, this);
 }
@@ -982,7 +984,7 @@ void View::DrawKeySig(DeviceContext *dc, LayerElement *element, Layer *layer, St
                 pitch, KeySig::GetOctave(keySig->m_drawingCancelAccidType, pitch, c), clefLocOffset);
             y = staff->GetDrawingY() + staff->CalcPitchPosYRel(m_doc, loc);
 
-            DrawSmuflCode(dc, x, y, SMUFL_E261_accidentalNatural, staff->m_drawingStaffSize, false);
+            this->DrawSmuflCode(dc, x, y, SMUFL_E261_accidentalNatural, staff->m_drawingStaffSize, false);
             x += naturalGlyphWidth + naturalStep;
         }
 
@@ -1003,7 +1005,7 @@ void View::DrawKeySig(DeviceContext *dc, LayerElement *element, Layer *layer, St
                 pitch, KeySig::GetOctave(keySig->m_drawingCancelAccidType, pitch, c), clefLocOffset);
             y = staff->GetDrawingY() + staff->CalcPitchPosYRel(m_doc, loc);
 
-            DrawSmuflCode(dc, x, y, SMUFL_E261_accidentalNatural, staff->m_drawingStaffSize, false);
+            this->DrawSmuflCode(dc, x, y, SMUFL_E261_accidentalNatural, staff->m_drawingStaffSize, false);
 
             x += naturalGlyphWidth + naturalStep;
             if ((keySig->GetAccidCount() > 0) && (i + 1 == keySig->m_drawingCancelAccidCount)) {
@@ -1024,7 +1026,7 @@ void View::DrawKeySig(DeviceContext *dc, LayerElement *element, Layer *layer, St
         loc = PitchInterface::CalcLoc(pname, KeySig::GetOctave(accid, pname, c), clefLocOffset);
         y = staff->GetDrawingY() + staff->CalcPitchPosYRel(m_doc, loc);
 
-        DrawSmuflString(dc, x, y, accidStr, HORIZONTALALIGNMENT_left, staff->m_drawingStaffSize, false);
+        this->DrawSmuflString(dc, x, y, accidStr, HORIZONTALALIGNMENT_left, staff->m_drawingStaffSize, false);
         TextExtend extend;
         dc->GetSmuflTextExtent(accidStr, &extend);
         x += extend.m_width + step;
@@ -1046,7 +1048,7 @@ void View::DrawMeterSig(DeviceContext *dc, LayerElement *element, Layer *layer,
     MeterSig *meterSig = vrv_cast<MeterSig *>(element);
     assert(meterSig);
 
-    DrawMeterSig(dc, meterSig, staff, 0);
+    this->DrawMeterSig(dc, meterSig, staff, 0);
 }
 
 void View::DrawMeterSig(DeviceContext *dc, MeterSig *meterSig, Staff *staff, int horizOffset)
@@ -1067,24 +1069,24 @@ void View::DrawMeterSig(DeviceContext *dc, MeterSig *meterSig, Staff *staff, int
     int x = meterSig->GetDrawingX() + horizOffset;
 
     if (enclosingFront) {
-        DrawSmuflCode(dc, x, y, enclosingFront, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, x, y, enclosingFront, staff->m_drawingStaffSize, false);
         x += m_doc->GetGlyphWidth(enclosingFront, staff->m_drawingStaffSize, false);
     }
 
     if (meterSig->HasSym()) {
         const wchar_t code = meterSig->GetSymbolGlyph();
-        DrawSmuflCode(dc, x, y, code, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, x, y, code, staff->m_drawingStaffSize, false);
         x += m_doc->GetGlyphWidth(code, staff->m_drawingStaffSize, false);
     }
     else if (meterSig->GetForm() == METERFORM_num) {
-        x += DrawMeterSigFigures(dc, x, y, meterSig->GetCount(), 0, staff);
+        x += this->DrawMeterSigFigures(dc, x, y, meterSig->GetCount(), 0, staff);
     }
     else if (meterSig->HasCount()) {
-        x += DrawMeterSigFigures(dc, x, y, meterSig->GetCount(), meterSig->GetUnit(), staff);
+        x += this->DrawMeterSigFigures(dc, x, y, meterSig->GetCount(), meterSig->GetUnit(), staff);
     }
 
     if (enclosingBack) {
-        DrawSmuflCode(dc, x, y, enclosingBack, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, x, y, enclosingBack, staff->m_drawingStaffSize, false);
     }
 
     dc->EndGraphic(meterSig, this);
@@ -1115,7 +1117,7 @@ void View::DrawMRest(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 
     x -= m_doc->GetGlyphWidth(rest, staff->m_drawingStaffSize, drawingCueSize) / 2;
 
-    DrawSmuflCode(dc, x, y, rest, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflCode(dc, x, y, rest, staff->m_drawingStaffSize, drawingCueSize);
 
     // single legder line for whole rest glyphs
     if ((measure->m_measureAligner.GetMaxTime() < (DUR_MAX * 2))
@@ -1133,7 +1135,7 @@ void View::DrawMRest(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         }
 
         dc->StartCustomGraphic("ledgerLines");
-        DrawHorizontalLine(dc, x - ledgerLineExtension, x + width + ledgerLineExtension, y, ledgerLineThickness);
+        this->DrawHorizontalLine(dc, x - ledgerLineExtension, x + width + ledgerLineExtension, y, ledgerLineThickness);
         dc->EndCustomGraphic();
     }
 
@@ -1155,7 +1157,7 @@ void View::DrawMRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
     dc->StartGraphic(element, "", element->GetUuid());
 
-    DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E500_repeat1Bar, mRpt->m_drawingMeasureCount, false, staff);
+    this->DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E500_repeat1Bar, mRpt->m_drawingMeasureCount, false, staff);
 
     dc->EndGraphic(element, this);
 }
@@ -1175,7 +1177,7 @@ void View::DrawMRpt2(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 
     dc->StartGraphic(element, "", element->GetUuid());
 
-    DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E501_repeat2Bars, 2, true, staff);
+    this->DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E501_repeat2Bars, 2, true, staff);
 
     dc->EndGraphic(element, this);
 }
@@ -1243,13 +1245,13 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
             dc->DeactivateGraphicX();
 
             // Draw the base rect
-            DrawFilledRectangle(dc, x1, y1, x2, y2);
+            this->DrawFilledRectangle(dc, x1, y1, x2, y2);
 
             // Draw two lines at beginning and end
             int border = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-            DrawFilledRectangle(
+            this->DrawFilledRectangle(
                 dc, x1, y1 + border, x1 + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) * 2, y2 - border);
-            DrawFilledRectangle(
+            this->DrawFilledRectangle(
                 dc, x2 - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) * 2, y1 + border, x2, y2 - border);
 
             dc->ReactivateGraphic();
@@ -1273,16 +1275,16 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
 
         int count = num;
         while ((count / 4)) {
-            DrawSmuflCode(dc, x1, y2, SMUFL_E4E1_restLonga, staff->m_drawingStaffSize, false);
+            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E1_restLonga, staff->m_drawingStaffSize, false);
             x1 += lgWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
             count -= 4;
         }
         while ((count / 2)) {
-            DrawSmuflCode(dc, x1, y2, SMUFL_E4E2_restDoubleWhole, staff->m_drawingStaffSize, false);
+            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E2_restDoubleWhole, staff->m_drawingStaffSize, false);
             x1 += brWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
             count -= 2;
         }
-        if (count) DrawSmuflCode(dc, x1, y1, SMUFL_E4E3_restWhole, staff->m_drawingStaffSize, false);
+        if (count) this->DrawSmuflCode(dc, x1, y1, SMUFL_E4E3_restWhole, staff->m_drawingStaffSize, false);
     }
 
     // Draw the number
@@ -1296,7 +1298,7 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
             ? std::min(staff->GetDrawingY() - staffHeight, y2) - offset
             : std::max(staff->GetDrawingY(), y1) + offset;
 
-        DrawSmuflString(dc, xCentered, y, IntToTimeSigFigures(num), HORIZONTALALIGNMENT_center);
+        this->DrawSmuflString(dc, xCentered, y, IntToTimeSigFigures(num), HORIZONTALALIGNMENT_center);
         dc->ResetFont();
     }
 
@@ -1318,7 +1320,7 @@ void View::DrawMultiRpt(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     dc->StartGraphic(element, "", element->GetUuid());
 
-    DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E501_repeat2Bars, multiRpt->GetNum(), true, staff);
+    this->DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E501_repeat2Bars, multiRpt->GetNum(), true, staff);
 
     dc->EndGraphic(element, this);
 
@@ -1337,11 +1339,11 @@ void View::DrawNote(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     assert(note);
 
     if (note->IsMensuralDur()) {
-        DrawMensuralNote(dc, element, layer, staff, measure);
+        this->DrawMensuralNote(dc, element, layer, staff, measure);
         return;
     }
     if (note->IsTabGrpNote()) {
-        DrawTabNote(dc, element, layer, staff, measure);
+        this->DrawTabNote(dc, element, layer, staff, measure);
         return;
     }
 
@@ -1363,7 +1365,7 @@ void View::DrawNote(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
         drawingDur = ((note->GetColored() == BOOLEAN_true) && drawingDur > DUR_1) ? (drawingDur + 1) : drawingDur;
 
         if (drawingDur < DUR_BR) {
-            DrawMaximaToBrevis(dc, noteY, element, layer, staff);
+            this->DrawMaximaToBrevis(dc, noteY, element, layer, staff);
         }
         else {
             // Whole notes
@@ -1377,15 +1379,15 @@ void View::DrawNote(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
             dc->StartCustomGraphic("notehead");
 
-            DrawSmuflCode(dc, noteX, noteY, fontNo, staff->m_drawingStaffSize, drawingCueSize, true);
+            this->DrawSmuflCode(dc, noteX, noteY, fontNo, staff->m_drawingStaffSize, drawingCueSize, true);
 
             // handle notehead enclosure
             if (note->HasHeadMod()) {
                 switch (note->GetHeadMod()) {
                     case NOTEHEADMODIFIER_paren: {
-                        DrawSmuflCode(dc, noteX - note->GetDrawingRadius(m_doc), noteY, SMUFL_E26A_accidentalParensLeft,
-                            staff->m_drawingStaffSize, drawingCueSize, true);
-                        DrawSmuflCode(dc, noteX + note->GetDrawingRadius(m_doc) * 2, noteY,
+                        this->DrawSmuflCode(dc, noteX - note->GetDrawingRadius(m_doc), noteY,
+                            SMUFL_E26A_accidentalParensLeft, staff->m_drawingStaffSize, drawingCueSize, true);
+                        this->DrawSmuflCode(dc, noteX + note->GetDrawingRadius(m_doc) * 2, noteY,
                             SMUFL_E26B_accidentalParensRight, staff->m_drawingStaffSize, drawingCueSize, true);
                         break;
                     }
@@ -1410,7 +1412,7 @@ void View::DrawNote(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
     /************ Draw children (accidentals, etc) ************/
 
-    DrawLayerChildren(dc, note, layer, staff, measure);
+    this->DrawLayerChildren(dc, note, layer, staff, measure);
 }
 
 void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
@@ -1425,7 +1427,7 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     assert(rest);
 
     if (rest->IsMensuralDur()) {
-        DrawMensuralRest(dc, element, layer, staff, measure);
+        this->DrawMensuralRest(dc, element, layer, staff, measure);
         return;
     }
 
@@ -1444,7 +1446,7 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     const int x = element->GetDrawingX();
     const int y = element->GetDrawingY();
 
-    DrawSmuflCode(dc, x, y, drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflCode(dc, x, y, drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
 
     if ((drawingDur == DUR_1 || drawingDur == DUR_2 || drawingDur == DUR_BR)) {
         const int width = m_doc->GetGlyphWidth(drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
@@ -1464,7 +1466,8 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
         // single legder line for half and whole rests
         if ((drawingDur == DUR_1 || drawingDur == DUR_2) && (y > topMargin || y < bottomMargin)) {
             dc->DeactivateGraphicX();
-            DrawHorizontalLine(dc, x - ledgerLineExtension, x + width + ledgerLineExtension, y, ledgerLineThickness);
+            this->DrawHorizontalLine(
+                dc, x - ledgerLineExtension, x + width + ledgerLineExtension, y, ledgerLineThickness);
             dc->ReactivateGraphic();
         }
         // double ledger line for breve rests
@@ -1472,11 +1475,11 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
             const int height = m_doc->GetGlyphHeight(drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
             dc->DeactivateGraphicX();
             if (y != topMargin) {
-                DrawHorizontalLine(
+                this->DrawHorizontalLine(
                     dc, x - ledgerLineExtension, x + width + ledgerLineExtension, y, ledgerLineThickness);
             }
             if (y != bottomMargin - height) {
-                DrawHorizontalLine(
+                this->DrawHorizontalLine(
                     dc, x - ledgerLineExtension, x + width + ledgerLineExtension, y + height, ledgerLineThickness);
             }
             dc->ReactivateGraphic();
@@ -1485,7 +1488,7 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     }
 
     /************ Draw children (dots) ************/
-    DrawLayerChildren(dc, rest, layer, staff, measure);
+    this->DrawLayerChildren(dc, rest, layer, staff, measure);
 }
 
 void View::DrawSpace(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
@@ -1517,7 +1520,7 @@ void View::DrawStem(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
     dc->StartGraphic(element, "", element->GetUuid());
 
-    DrawFilledRectangle(dc, stem->GetDrawingX() - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2,
+    this->DrawFilledRectangle(dc, stem->GetDrawingX() - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2,
         stem->GetDrawingY(), stem->GetDrawingX() + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2,
         stem->GetDrawingY() - stem->GetDrawingStemLen());
 
@@ -1541,17 +1544,17 @@ void View::DrawStem(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
             }
             yShift *= (stem->GetDrawingStemLen() > 0) ? -1 : 1;
             yShift -= m_doc->GetGlyphHeight(SMUFL_E645_vocalSprechgesang, staff->m_drawingStaffSize, false) / 2;
-            DrawSmuflCode(dc, stem->GetDrawingX(), note->GetDrawingY() + yShift, SMUFL_E645_vocalSprechgesang,
+            this->DrawSmuflCode(dc, stem->GetDrawingX(), note->GetDrawingY() + yShift, SMUFL_E645_vocalSprechgesang,
                 staff->m_drawingStaffSize, false);
         }
     }
 
-    DrawLayerChildren(dc, stem, layer, staff, measure);
+    this->DrawLayerChildren(dc, stem, layer, staff, measure);
 
     /************ Draw slash ************/
 
     if ((stem->GetGrace() == GRACE_unacc) && !stem->IsInBeam()) {
-        DrawAcciaccaturaSlash(dc, stem, staff);
+        this->DrawAcciaccaturaSlash(dc, stem, staff);
     }
 
     dc->EndGraphic(element, this);
@@ -1569,7 +1572,7 @@ void View::DrawSyl(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
         return;
     }
 
-    syl->SetDrawingYRel(GetSylYRel(syl->m_drawingVerse, staff));
+    syl->SetDrawingYRel(this->GetSylYRel(syl->m_drawingVerse, staff));
 
     dc->StartGraphic(syl, "", syl->GetUuid());
     dc->DeactivateGraphicY();
@@ -1596,7 +1599,7 @@ void View::DrawSyl(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
     params.m_pointSize = dc->GetFont()->GetPointSize();
 
     dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y));
-    DrawTextChildren(dc, syl, params);
+    this->DrawTextChildren(dc, syl, params);
 
     if (syl->GetCon() == sylLog_CON_b) {
         dc->ReactivateGraphic();
@@ -1671,7 +1674,7 @@ void View::DrawVerse(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         dc->StartGraphic(graphic, "", graphic->GetUuid());
 
         dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), HORIZONTALALIGNMENT_right);
-        DrawTextChildren(dc, graphic, params);
+        this->DrawTextChildren(dc, graphic, params);
         dc->EndText();
 
         dc->EndGraphic(graphic, this);
@@ -1682,7 +1685,7 @@ void View::DrawVerse(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 
     dc->StartGraphic(verse, "", verse->GetUuid());
 
-    DrawLayerChildren(dc, verse, layer, staff, measure);
+    this->DrawLayerChildren(dc, verse, layer, staff, measure);
 
     dc->EndGraphic(verse, this);
 }
@@ -1746,7 +1749,7 @@ void View::DrawDotsPart(DeviceContext *dc, int x, int y, unsigned char dots, Sta
         y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
     }
     for (i = 0; i < dots; ++i) {
-        DrawDot(dc, x, y, staff->m_drawingStaffSize);
+        this->DrawDot(dc, x, y, staff->m_drawingStaffSize);
         // HARDCODED
         x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 1.5;
     }
@@ -1792,11 +1795,12 @@ int View::DrawMeterSigFigures(
             dc->GetSmuflTextExtent(timeSigCombDenominator, &denExtend);
             yDen = y - denExtend.m_height / 2;
         }
-        DrawSmuflString(dc, x, yNum, timeSigCombNumerator, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
-        DrawSmuflString(dc, x, yDen, timeSigCombDenominator, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
+        this->DrawSmuflString(dc, x, yNum, timeSigCombNumerator, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
+        this->DrawSmuflString(
+            dc, x, yDen, timeSigCombDenominator, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
     }
     else {
-        DrawSmuflString(dc, x, y, timeSigCombNumerator, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
+        this->DrawSmuflString(dc, x, y, timeSigCombNumerator, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
     }
 
     dc->ResetFont();
@@ -1810,10 +1814,10 @@ void View::DrawMRptPart(DeviceContext *dc, int xCentered, wchar_t smuflCode, int
     int y = staff->GetDrawingY();
     int ySymbol = y - staff->m_drawingLines / 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
 
-    DrawSmuflCode(dc, xSymbol, ySymbol, smuflCode, staff->m_drawingStaffSize, false);
+    this->DrawSmuflCode(dc, xSymbol, ySymbol, smuflCode, staff->m_drawingStaffSize, false);
 
     if (line) {
-        DrawVerticalLine(dc, y, y - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize), xCentered,
+        this->DrawVerticalLine(dc, y, y - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize), xCentered,
             m_doc->GetDrawingBarLineWidth(staff->m_drawingStaffSize));
     }
 
diff --git a/src/view_graph.cpp b/src/view_graph.cpp
index 64866f56bf1..f2c74ed3a7d 100644
--- a/src/view_graph.cpp
+++ b/src/view_graph.cpp
@@ -68,7 +68,7 @@ void View::DrawVerticalSegmentedLine(DeviceContext *dc, int x1, SegmentedLine &l
     int i, start, end;
     for (i = 0; i < line.GetSegmentCount(); i++) {
         line.GetStartEnd(start, end, i);
-        DrawVerticalLine(dc, start, end, x1, width, dashLength);
+        this->DrawVerticalLine(dc, start, end, x1, width, dashLength);
     }
 }
 
@@ -77,7 +77,7 @@ void View::DrawHorizontalSegmentedLine(DeviceContext *dc, int y1, SegmentedLine
     int i, start, end;
     for (i = 0; i < line.GetSegmentCount(); i++) {
         line.GetStartEnd(start, end, i);
-        DrawHorizontalLine(dc, start, end, y1, width, dashLength);
+        this->DrawHorizontalLine(dc, start, end, y1, width, dashLength);
     }
 }
 
@@ -243,11 +243,11 @@ void View::DrawSquareBracket(DeviceContext *dc, bool leftBracket, int x, int y,
 
     const int sign = leftBracket ? 1 : -1;
 
-    DrawFilledRectangle(dc, x, y - horizontalThickness / 2, x + sign * verticalThickness,
+    this->DrawFilledRectangle(dc, x, y - horizontalThickness / 2, x + sign * verticalThickness,
         y + height + horizontalThickness / 2); // vertical
-    DrawFilledRectangle(
+    this->DrawFilledRectangle(
         dc, x, y - horizontalThickness / 2, x + sign * width, y + horizontalThickness / 2); // horizontal bottom
-    DrawFilledRectangle(dc, x, y + height - horizontalThickness / 2, x + sign * width,
+    this->DrawFilledRectangle(dc, x, y + height - horizontalThickness / 2, x + sign * width,
         y + height + horizontalThickness / 2); // horizontal top
 }
 
diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index 0e45f92b2e6..9027b765a18 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -81,27 +81,27 @@ void View::DrawMensuralNote(DeviceContext *dc, LayerElement *element, Layer *lay
 
     // Ligature, maxima,longa, and brevis
     if (note->IsInLigature() && !m_options->m_ligatureAsBracket.GetValue()) {
-        DrawLigatureNote(dc, element, layer, staff);
+        this->DrawLigatureNote(dc, element, layer, staff);
     }
     else if (drawingDur < DUR_1) {
-        DrawMaximaToBrevis(dc, yNote, element, layer, staff);
+        this->DrawMaximaToBrevis(dc, yNote, element, layer, staff);
     }
     // Semibrevis and shorter
     else {
         wchar_t code = note->GetMensuralNoteheadGlyph();
         dc->StartCustomGraphic("notehead");
-        DrawSmuflCode(dc, xNote, yNote, code, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, xNote, yNote, code, staff->m_drawingStaffSize, false);
         dc->EndCustomGraphic();
         // For semibrevis with stem in black notation, encoded with an explicit stem direction
         if (((drawingDur > DUR_1) || ((note->GetStemDir() != STEMDIRECTION_NONE) && mensural_black))
             && note->GetStemVisible() != BOOLEAN_false) {
-            DrawMensuralStem(dc, note, staff, stemDir, radius, xNote, yNote);
+            this->DrawMensuralStem(dc, note, staff, stemDir, radius, xNote, yNote);
         }
     }
 
     /************ Draw children (verse / syl) ************/
 
-    DrawLayerChildren(dc, note, layer, staff, measure);
+    this->DrawLayerChildren(dc, note, layer, staff, measure);
 }
 
 void View::DrawMensuralRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
@@ -133,7 +133,7 @@ void View::DrawMensuralRest(DeviceContext *dc, LayerElement *element, Layer *lay
         case DUR_16: charCode = SMUFL_E9F8_mensuralRestSemifusa; break;
         default: charCode = 0; // This should never happen
     }
-    DrawSmuflCode(dc, x, y, charCode, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflCode(dc, x, y, charCode, staff->m_drawingStaffSize, drawingCueSize);
 }
 
 void View::DrawMensur(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
@@ -179,17 +179,17 @@ void View::DrawMensur(DeviceContext *dc, LayerElement *element, Layer *layer, St
 
     dc->StartGraphic(element, "", element->GetUuid());
 
-    DrawSmuflCode(dc, x, y, code, staff->m_drawingStaffSize, false);
+    this->DrawSmuflCode(dc, x, y, code, staff->m_drawingStaffSize, false);
 
     x += perfectRadius;
     // only one slash supported
     if (mensur->HasSlash()) {
-        DrawSmuflCode(dc,
+        this->DrawSmuflCode(dc,
             x - m_doc->GetGlyphWidth(SMUFL_E925_mensuralProlationCombiningStroke, staff->m_drawingStaffSize, false) / 2,
             y, SMUFL_E925_mensuralProlationCombiningStroke, staff->m_drawingStaffSize, false);
     }
     if (mensur->GetDot() == BOOLEAN_true) {
-        DrawSmuflCode(dc,
+        this->DrawSmuflCode(dc,
             x - m_doc->GetGlyphWidth(SMUFL_E920_mensuralProlationCombiningDot, staff->m_drawingStaffSize, false) / 2, y,
             SMUFL_E920_mensuralProlationCombiningDot, staff->m_drawingStaffSize, false);
     }
@@ -201,7 +201,7 @@ void View::DrawMensur(DeviceContext *dc, LayerElement *element, Layer *layer, St
                 * 6; // step forward because we have a sign or a meter symbol
         }
         int numbase = mensur->HasNumbase() ? mensur->GetNumbase() : 0;
-        DrawProportFigures(dc, x, y, mensur->GetNum(), numbase, staff);
+        this->DrawProportFigures(dc, x, y, mensur->GetNum(), numbase, staff);
     }
 
     dc->EndGraphic(element, this);
@@ -282,23 +282,23 @@ void View::DrawMensuralStem(
 
         if (nbFlags > 0) {
             for (int i = 0; i < nbFlags; ++i) {
-                DrawSmuflCode(dc, x2 - halfStemWidth, stemY1 - i * flagStemHeight,
+                this->DrawSmuflCode(dc, x2 - halfStemWidth, stemY1 - i * flagStemHeight,
                     SMUFL_E949_mensuralCombStemUpFlagSemiminima, staff->m_drawingStaffSize, drawingCueSize);
             }
         }
         else {
-            DrawFilledRectangle(dc, x2 - halfStemWidth, stemY1, x2 + halfStemWidth, stemY2);
+            this->DrawFilledRectangle(dc, x2 - halfStemWidth, stemY1, x2 + halfStemWidth, stemY2);
         }
     }
     else {
         if (nbFlags > 0) {
             for (int i = 0; i < nbFlags; ++i) {
-                DrawSmuflCode(dc, x2 - halfStemWidth, stemY1 + i * flagStemHeight,
+                this->DrawSmuflCode(dc, x2 - halfStemWidth, stemY1 + i * flagStemHeight,
                     SMUFL_E94A_mensuralCombStemDownFlagSemiminima, staff->m_drawingStaffSize, drawingCueSize);
             }
         }
         else {
-            DrawFilledRectangle(dc, x2 - halfStemWidth, stemY1, x2 + halfStemWidth, stemY2);
+            this->DrawFilledRectangle(dc, x2 - halfStemWidth, stemY1, x2 + halfStemWidth, stemY2);
         }
     }
     dc->EndCustomGraphic();
@@ -345,12 +345,13 @@ void View::DrawMaximaToBrevis(DeviceContext *dc, int y, LayerElement *element, L
 
     if (!fillNotehead) {
         // double the bases of rectangles
-        DrawObliquePolygon(dc, topLeft.x + stemWidth, topLeft.y, bottomRight.x - stemWidth, topLeft.y, -strokeWidth);
-        DrawObliquePolygon(
+        this->DrawObliquePolygon(
+            dc, topLeft.x + stemWidth, topLeft.y, bottomRight.x - stemWidth, topLeft.y, -strokeWidth);
+        this->DrawObliquePolygon(
             dc, topLeft.x + stemWidth, bottomRight.y, bottomRight.x - stemWidth, bottomRight.y, strokeWidth);
     }
     else {
-        DrawFilledRectangle(dc, topLeft.x + stemWidth, topLeft.y, bottomRight.x - stemWidth, bottomRight.y);
+        this->DrawFilledRectangle(dc, topLeft.x + stemWidth, topLeft.y, bottomRight.x - stemWidth, bottomRight.y);
     }
 
     if (note->FindDescendantByType(PLICA)) {
@@ -360,18 +361,18 @@ void View::DrawMaximaToBrevis(DeviceContext *dc, int y, LayerElement *element, L
     }
 
     // serifs and / or stem
-    DrawFilledRectangle(dc, topLeft.x, sides[0], topLeft.x + stemWidth, sides[1]);
+    this->DrawFilledRectangle(dc, topLeft.x, sides[0], topLeft.x + stemWidth, sides[1]);
 
     if (note->GetActualDur() != DUR_BR) {
         // Right side is a stem - end the notehead first
         dc->EndCustomGraphic();
         dc->StartCustomGraphic("stem");
-        DrawFilledRectangle(dc, bottomRight.x - stemWidth, sides[2], bottomRight.x, sides[3]);
+        this->DrawFilledRectangle(dc, bottomRight.x - stemWidth, sides[2], bottomRight.x, sides[3]);
         dc->EndCustomGraphic();
     }
     else {
         // Right side is a serif
-        DrawFilledRectangle(dc, bottomRight.x - stemWidth, sides[2], bottomRight.x, sides[3]);
+        this->DrawFilledRectangle(dc, bottomRight.x - stemWidth, sides[2], bottomRight.x, sides[3]);
         dc->EndCustomGraphic();
     }
 
@@ -391,7 +392,7 @@ void View::DrawLigature(DeviceContext *dc, LayerElement *element, Layer *layer,
     dc->StartGraphic(ligature, "", ligature->GetUuid());
 
     // Draw children (notes)
-    DrawLayerChildren(dc, ligature, layer, staff, measure);
+    this->DrawLayerChildren(dc, ligature, layer, staff, measure);
 
     // Render a bracket for the ligature
     if (m_options->m_ligatureAsBracket.GetValue()) {
@@ -414,9 +415,9 @@ void View::DrawLigature(DeviceContext *dc, LayerElement *element, Layer *layer,
             // move the bracket up
             y += bracketSize + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
             int lineWidth = m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-            DrawFilledRectangle(dc, x1, y, x1 + lineWidth, y - bracketSize);
-            DrawFilledRectangle(dc, x1, y, x2, y - lineWidth);
-            DrawFilledRectangle(dc, x2 - lineWidth, y, x2, y - bracketSize);
+            this->DrawFilledRectangle(dc, x1, y, x1 + lineWidth, y - bracketSize);
+            this->DrawFilledRectangle(dc, x1, y, x2, y - lineWidth);
+            this->DrawFilledRectangle(dc, x2 - lineWidth, y, x2, y - bracketSize);
         }
     }
 
@@ -485,11 +486,11 @@ void View::DrawLigatureNote(DeviceContext *dc, LayerElement *element, Layer *lay
 
     if (!fillNotehead) {
         // double the bases of rectangles
-        DrawObliquePolygon(dc, topLeft->x, topLeft->y, topRight->x, topRight->y, -strokeWidth);
-        DrawObliquePolygon(dc, bottomLeft->x, bottomLeft->y, bottomRight->x, bottomRight->y, strokeWidth);
+        this->DrawObliquePolygon(dc, topLeft->x, topLeft->y, topRight->x, topRight->y, -strokeWidth);
+        this->DrawObliquePolygon(dc, bottomLeft->x, bottomLeft->y, bottomRight->x, bottomRight->y, strokeWidth);
     }
     else {
-        DrawObliquePolygon(dc, topLeft->x, topLeft->y, topRight->x, topRight->y, bottomLeft->y - topLeft->y);
+        this->DrawObliquePolygon(dc, topLeft->x, topLeft->y, topRight->x, topRight->y, bottomLeft->y - topLeft->y);
     }
 
     // Do not draw a left connector with obliques
@@ -511,11 +512,12 @@ void View::DrawLigatureNote(DeviceContext *dc, LayerElement *element, Layer *lay
                 sides[3] = prevSides[3];
             }
         }
-        DrawFilledRoundedRectangle(dc, topLeft->x, sideTop, topLeft->x + stemWidth, sideBottom, stemWidth / 3);
+        this->DrawFilledRoundedRectangle(dc, topLeft->x, sideTop, topLeft->x + stemWidth, sideBottom, stemWidth / 3);
     }
 
     if (!nextNote) {
-        DrawFilledRoundedRectangle(dc, bottomRight->x - stemWidth, sides[2], bottomRight->x, sides[3], stemWidth / 3);
+        this->DrawFilledRoundedRectangle(
+            dc, bottomRight->x - stemWidth, sides[2], bottomRight->x, sides[3], stemWidth / 3);
     }
 
     return;
@@ -562,7 +564,7 @@ void View::DrawDotInLigature(DeviceContext *dc, LayerElement *element, Layer *la
         y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
     }
 
-    DrawDotsPart(dc, x, y, 1, staff);
+    this->DrawDotsPart(dc, x, y, 1, staff);
 
     return;
 }
@@ -600,23 +602,23 @@ void View::DrawPlica(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 
     if (isLonga) {
         if (up) {
-            DrawFilledRectangle(dc, topLeft.x, sides[1], topLeft.x + stemWidth, sides[1] + shortStem);
-            DrawFilledRectangle(dc, bottomRight.x, sides[1], bottomRight.x - stemWidth, sides[1] + stem);
+            this->DrawFilledRectangle(dc, topLeft.x, sides[1], topLeft.x + stemWidth, sides[1] + shortStem);
+            this->DrawFilledRectangle(dc, bottomRight.x, sides[1], bottomRight.x - stemWidth, sides[1] + stem);
         }
         else {
-            DrawFilledRectangle(dc, topLeft.x, sides[0], topLeft.x + stemWidth, sides[0] - shortStem);
-            DrawFilledRectangle(dc, bottomRight.x, sides[0], bottomRight.x - stemWidth, sides[0] - stem);
+            this->DrawFilledRectangle(dc, topLeft.x, sides[0], topLeft.x + stemWidth, sides[0] - shortStem);
+            this->DrawFilledRectangle(dc, bottomRight.x, sides[0], bottomRight.x - stemWidth, sides[0] - stem);
         }
     }
     // brevis
     else {
         if (up) {
-            DrawFilledRectangle(dc, topLeft.x, sides[1], topLeft.x + stemWidth, sides[1] + stem);
-            DrawFilledRectangle(dc, bottomRight.x, sides[1], bottomRight.x - stemWidth, sides[1] + shortStem);
+            this->DrawFilledRectangle(dc, topLeft.x, sides[1], topLeft.x + stemWidth, sides[1] + stem);
+            this->DrawFilledRectangle(dc, bottomRight.x, sides[1], bottomRight.x - stemWidth, sides[1] + shortStem);
         }
         else {
-            DrawFilledRectangle(dc, topLeft.x, sides[0], topLeft.x + stemWidth, sides[0] - stem);
-            DrawFilledRectangle(dc, bottomRight.x, sides[0], bottomRight.x - stemWidth, sides[0] - shortStem);
+            this->DrawFilledRectangle(dc, topLeft.x, sides[0], topLeft.x + stemWidth, sides[0] - stem);
+            this->DrawFilledRectangle(dc, bottomRight.x, sides[0], bottomRight.x - stemWidth, sides[0] - shortStem);
         }
     }
 
@@ -646,11 +648,11 @@ void View::DrawProportFigures(DeviceContext *dc, int x, int y, int num, int numB
     dc->SetFont(m_doc->GetDrawingSmuflFont(textSize, false));
 
     wtext = IntToTimeSigFigures(num);
-    DrawSmuflString(dc, x, ynum, wtext, HORIZONTALALIGNMENT_center, textSize); // true = center
+    this->DrawSmuflString(dc, x, ynum, wtext, HORIZONTALALIGNMENT_center, textSize); // true = center
 
     if (numBase) {
         wtext = IntToTimeSigFigures(numBase);
-        DrawSmuflString(dc, x, yden, wtext, HORIZONTALALIGNMENT_center, textSize); // true = center
+        this->DrawSmuflString(dc, x, yden, wtext, HORIZONTALALIGNMENT_center, textSize); // true = center
     }
 
     dc->ResetFont();
@@ -678,7 +680,7 @@ void View::DrawProport(DeviceContext *dc, LayerElement *element, Layer *layer, S
     y1 = y;
     y2 = y + 50 + (50 * proport->GetNum());
     // DrawFilledRectangle(dc,x1,y1,x2,y2);
-    DrawPartFilledRectangle(dc, x1, y1, x2, y2, 0);
+    this->DrawPartFilledRectangle(dc, x1, y1, x2, y2, 0);
 
     if (proport->HasNum()) {
         x = element->GetDrawingX();
@@ -688,7 +690,7 @@ void View::DrawProport(DeviceContext *dc, LayerElement *element, Layer *layer, S
                 * 5; // step forward because we have a sign or a meter symbol
         }
         int numbase = proport->HasNumbase() ? proport->GetNumbase() : 0;
-        DrawProportFigures(dc, x,
+        this->DrawProportFigures(dc, x,
             staff->GetDrawingY() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - 1),
             proport->GetNum(), numbase, staff);
     }
diff --git a/src/view_neume.cpp b/src/view_neume.cpp
index 26f4a615763..dd99ae26f09 100644
--- a/src/view_neume.cpp
+++ b/src/view_neume.cpp
@@ -49,7 +49,7 @@ void View::DrawSyllable(DeviceContext *dc, LayerElement *element, Layer *layer,
     /******************************************************************/
     // Draw the children
 
-    DrawLayerChildren(dc, syllable, layer, staff, measure);
+    this->DrawLayerChildren(dc, syllable, layer, staff, measure);
 
     dc->EndGraphic(element, this);
 }
@@ -183,7 +183,7 @@ void View::DrawNc(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
     yValue = clefYPosition + pitchOffset + octaveOffset - rotateOffset;
 
     for (auto it = params.begin(); it != params.end(); it++) {
-        DrawSmuflCode(dc, noteX + it->xOffset * noteWidth, yValue + it->yOffset * noteHeight, it->fontNo,
+        this->DrawSmuflCode(dc, noteX + it->xOffset * noteWidth, yValue + it->yOffset * noteHeight, it->fontNo,
             staff->m_drawingStaffSize, false, true);
     }
 
@@ -197,7 +197,7 @@ void View::DrawNc(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
     }
 
     // Draw the children
-    DrawLayerChildren(dc, nc, layer, staff, measure);
+    this->DrawLayerChildren(dc, nc, layer, staff, measure);
 
     dc->EndGraphic(element, this);
 }
@@ -216,7 +216,7 @@ void View::DrawNeume(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     // Start the Neume graphic and draw the children
 
     dc->StartGraphic(element, "", element->GetUuid());
-    DrawLayerChildren(dc, neume, layer, staff, measure);
+    this->DrawLayerChildren(dc, neume, layer, staff, measure);
     dc->EndGraphic(element, this);
 }
 
diff --git a/src/view_page.cpp b/src/view_page.cpp
index ef25aa641c9..11092f6d229 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -92,18 +92,18 @@ void View::DrawCurrentPage(DeviceContext *dc, bool background)
     for (auto child : *m_currentPage->GetChildren()) {
         if (child->IsPageElement()) {
             // cast to PageElement check in DrawSystemEditorial element
-            DrawPageElement(dc, dynamic_cast<PageElement *>(child));
+            this->DrawPageElement(dc, dynamic_cast<PageElement *>(child));
         }
         else if (child->Is(SYSTEM)) {
             System *system = dynamic_cast<System *>(child);
-            DrawSystem(dc, system);
+            this->DrawSystem(dc, system);
         }
         else {
             assert(false);
         }
     }
 
-    DrawRunningElements(dc, m_currentPage);
+    this->DrawRunningElements(dc, m_currentPage);
 
     dc->EndPage();
 }
@@ -190,33 +190,33 @@ void View::DrawSystem(DeviceContext *dc, System *system)
 
     Measure *firstMeasure = dynamic_cast<Measure *>(system->FindDescendantByType(MEASURE, 1));
 
-    DrawSystemDivider(dc, system, firstMeasure);
+    this->DrawSystemDivider(dc, system, firstMeasure);
 
     // first we need to clear the drawing list of postponed elements
     system->ResetDrawingList();
 
     if (firstMeasure) {
-        DrawScoreDef(dc, system->GetDrawingScoreDef(), firstMeasure, system->GetDrawingX(), NULL);
-    }
-
-    DrawSystemChildren(dc, system, system);
-
-    DrawSystemList(dc, system, SYL);
-    DrawSystemList(dc, system, BRACKETSPAN);
-    DrawSystemList(dc, system, DYNAM);
-    DrawSystemList(dc, system, DIR);
-    DrawSystemList(dc, system, GLISS);
-    DrawSystemList(dc, system, HAIRPIN);
-    DrawSystemList(dc, system, TRILL);
-    DrawSystemList(dc, system, FIGURE);
-    DrawSystemList(dc, system, LV);
-    DrawSystemList(dc, system, PHRASE);
-    DrawSystemList(dc, system, OCTAVE);
-    DrawSystemList(dc, system, PEDAL);
-    DrawSystemList(dc, system, PITCHINFLECTION);
-    DrawSystemList(dc, system, TIE);
-    DrawSystemList(dc, system, SLUR);
-    DrawSystemList(dc, system, ENDING);
+        this->DrawScoreDef(dc, system->GetDrawingScoreDef(), firstMeasure, system->GetDrawingX(), NULL);
+    }
+
+    this->DrawSystemChildren(dc, system, system);
+
+    this->DrawSystemList(dc, system, SYL);
+    this->DrawSystemList(dc, system, BRACKETSPAN);
+    this->DrawSystemList(dc, system, DYNAM);
+    this->DrawSystemList(dc, system, DIR);
+    this->DrawSystemList(dc, system, GLISS);
+    this->DrawSystemList(dc, system, HAIRPIN);
+    this->DrawSystemList(dc, system, TRILL);
+    this->DrawSystemList(dc, system, FIGURE);
+    this->DrawSystemList(dc, system, LV);
+    this->DrawSystemList(dc, system, PHRASE);
+    this->DrawSystemList(dc, system, OCTAVE);
+    this->DrawSystemList(dc, system, PEDAL);
+    this->DrawSystemList(dc, system, PITCHINFLECTION);
+    this->DrawSystemList(dc, system, TIE);
+    this->DrawSystemList(dc, system, SLUR);
+    this->DrawSystemList(dc, system, ENDING);
 
     dc->EndGraphic(system, this);
 }
@@ -231,53 +231,53 @@ void View::DrawSystemList(DeviceContext *dc, System *system, const ClassId class
 
     for (iter = drawingList->begin(); iter != drawingList->end(); ++iter) {
         if ((*iter)->Is(classId) && (classId == BRACKETSPAN)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == DIR)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == DYNAM)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == FIGURE)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == GLISS)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == HAIRPIN)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == LV)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == PHRASE)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == OCTAVE)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == PEDAL)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == PITCHINFLECTION)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == SYL)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == TIE)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == TRILL)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == SLUR)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == ENDING)) {
             // cast to Ending check in DrawEnding
-            DrawEnding(dc, dynamic_cast<Ending *>(*iter), system);
+            this->DrawEnding(dc, dynamic_cast<Ending *>(*iter), system);
         }
     }
 }
@@ -297,11 +297,11 @@ void View::DrawScoreDef(
 
     if (barLine == NULL) {
         // Draw the first staffGrp and from there its children recursively
-        DrawStaffGrp(dc, measure, staffGrp, x, true, !scoreDef->DrawLabels());
+        this->DrawStaffGrp(dc, measure, staffGrp, x, true, !scoreDef->DrawLabels());
     }
     else {
         dc->StartGraphic(barLine, "", barLine->GetUuid());
-        DrawBarLines(dc, measure, staffGrp, barLine, isLastMeasure);
+        this->DrawBarLines(dc, measure, staffGrp, barLine, isLastMeasure);
         dc->EndGraphic(barLine, this);
     }
 
@@ -355,11 +355,11 @@ void View::DrawStaffGrp(
             || (m_doc->GetCurrentScoreDef()->GetSystemLeftline() == BOOLEAN_true))) {
         // int barLineWidth = m_doc->GetDrawingElementDefaultSize("bracketThickness", staffSize);
         const int barLineWidth = m_doc->GetDrawingBarLineWidth(staffSize);
-        DrawVerticalLine(dc, yTop, yBottom, x + barLineWidth / 2, barLineWidth);
+        this->DrawVerticalLine(dc, yTop, yBottom, x + barLineWidth / 2, barLineWidth);
     }
     // draw the group symbol
     int staffGrpX = x;
-    DrawGrpSym(dc, measure, staffGrp, x);
+    this->DrawGrpSym(dc, measure, staffGrp, x);
     int grpSymSpace = staffGrpX - x;
 
     // recursively draw the children
@@ -367,7 +367,7 @@ void View::DrawStaffGrp(
     for (int i = 0; i < staffGrp->GetChildCount(); ++i) {
         childStaffGrp = dynamic_cast<StaffGrp *>(staffGrp->GetChild(i));
         if (childStaffGrp) {
-            DrawStaffGrp(dc, measure, childStaffGrp, x, false, abbreviations);
+            this->DrawStaffGrp(dc, measure, childStaffGrp, x, false, abbreviations);
         }
     }
 
@@ -378,7 +378,7 @@ void View::DrawStaffGrp(
     int yLabel = yBottom - (yBottom - yTop) / 2 - m_doc->GetDrawingUnit(100);
     this->DrawLabels(dc, scoreDef, staffGrp, xLabel, yLabel, abbreviations, 100, 2 * space + grpSymSpace);
 
-    DrawStaffDefLabels(dc, measure, staffGrp, x, abbreviations);
+    this->DrawStaffDefLabels(dc, measure, staffGrp, x, abbreviations);
 }
 
 void View::DrawStaffDefLabels(DeviceContext *dc, Measure *measure, StaffGrp *staffGrp, int x, bool abbreviations)
@@ -450,22 +450,22 @@ void View::DrawGrpSym(DeviceContext *dc, Measure *measure, StaffGrp *staffGrp, i
     switch (groupSymbol->GetSymbol()) {
         case staffGroupingSym_SYMBOL_line: {
             const int lineWidth = m_doc->GetDrawingUnit(staffSize) * m_options->m_bracketThickness.GetValue();
-            DrawVerticalLine(dc, yTop, yBottom, x - 1.5 * lineWidth, lineWidth);
+            this->DrawVerticalLine(dc, yTop, yBottom, x - 1.5 * lineWidth, lineWidth);
             x -= 2 * lineWidth;
             break;
         }
         case staffGroupingSym_SYMBOL_brace: {
-            DrawBrace(dc, x, yTop, yBottom, staffSize);
+            this->DrawBrace(dc, x, yTop, yBottom, staffSize);
             x -= 2.5 * m_doc->GetDrawingUnit(staffSize);
             break;
         }
         case staffGroupingSym_SYMBOL_bracket: {
-            DrawBracket(dc, x, yTop, yBottom, staffSize);
+            this->DrawBracket(dc, x, yTop, yBottom, staffSize);
             x -= m_doc->GetDrawingUnit(staffSize) * (1.0 + m_options->m_bracketThickness.GetValue());
             break;
         }
         case staffGroupingSym_SYMBOL_bracketsq: {
-            DrawBracketSq(dc, x, yTop, yBottom, staffSize);
+            this->DrawBracketSq(dc, x, yTop, yBottom, staffSize);
             x -= m_doc->GetDrawingUnit(staffSize);
             break;
         }
@@ -520,7 +520,7 @@ void View::DrawLabels(
     dc->StartGraphic(graphic, "", graphic->GetUuid());
 
     dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), HORIZONTALALIGNMENT_right);
-    DrawTextChildren(dc, graphic, params);
+    this->DrawTextChildren(dc, graphic, params);
     dc->EndText();
 
     dc->EndGraphic(graphic, this);
@@ -558,10 +558,11 @@ void View::DrawBracket(DeviceContext *dc, int x, int y1, int y2, int staffSize)
     const int x2 = x - basicDist;
     const int x1 = x2 - bracketThickness;
 
-    DrawSmuflCode(dc, x1, y1 + offset + bracketThickness / 2, SMUFL_E003_bracketTop, staffSize, false);
-    DrawSmuflCode(dc, x1, y2 - offset - bracketThickness / 2, SMUFL_E004_bracketBottom, staffSize, false);
+    this->DrawSmuflCode(dc, x1, y1 + offset + bracketThickness / 2, SMUFL_E003_bracketTop, staffSize, false);
+    this->DrawSmuflCode(dc, x1, y2 - offset - bracketThickness / 2, SMUFL_E004_bracketBottom, staffSize, false);
 
-    DrawFilledRectangle(dc, x1, y1 + 2 * offset + bracketThickness / 2, x2, y2 - 2 * offset - bracketThickness / 2);
+    this->DrawFilledRectangle(
+        dc, x1, y1 + 2 * offset + bracketThickness / 2, x2, y2 - 2 * offset - bracketThickness / 2);
 }
 
 void View::DrawBracketSq(DeviceContext *dc, int x, int y1, int y2, int staffSize)
@@ -574,7 +575,7 @@ void View::DrawBracketSq(DeviceContext *dc, int x, int y1, int y2, int staffSize
     const int verticalThickness = m_doc->GetDrawingUnit(staffSize) * m_options->m_subBracketThickness.GetValue();
     const int width = m_doc->GetDrawingUnit(staffSize);
 
-    DrawSquareBracket(dc, true, x - width, y, height, width, horizontalThickness, verticalThickness);
+    this->DrawSquareBracket(dc, true, x - width, y, height, width, horizontalThickness, verticalThickness);
 }
 
 void View::DrawBrace(DeviceContext *dc, int x, int y1, int y2, int staffSize)
@@ -597,7 +598,7 @@ void View::DrawBrace(DeviceContext *dc, int x, int y1, int y2, int staffSize)
         const float widthAfterScalling = width * scale;
         font->SetWidthToHeightRatio(static_cast<float>(braceWidth) / widthAfterScalling);
         dc->StartCustomGraphic("grpSym");
-        DrawSmuflCode(dc, x, y2, SMUFL_E000_brace, staffSize * scale, false);
+        this->DrawSmuflCode(dc, x, y2, SMUFL_E000_brace, staffSize * scale, false);
         dc->EndCustomGraphic();
         font->SetWidthToHeightRatio(currentWidthToHeightRatio);
         return;
@@ -694,7 +695,7 @@ void View::DrawBarLines(DeviceContext *dc, Measure *measure, StaffGrp *staffGrp,
                 if (childStaffGrp->GetDrawingVisibility() == OPTIMIZATION_HIDDEN) {
                     continue;
                 }
-                DrawBarLines(dc, measure, childStaffGrp, barLine, isLastMeasure);
+                this->DrawBarLines(dc, measure, childStaffGrp, barLine, isLastMeasure);
             }
             else if (childStaffDef) {
                 if (childStaffDef->GetDrawingVisibility() == OPTIMIZATION_HIDDEN) {
@@ -736,9 +737,9 @@ void View::DrawBarLines(DeviceContext *dc, Measure *measure, StaffGrp *staffGrp,
                     yTop = yBottom + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
                     yBottom -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
                 }
-                DrawBarLine(dc, yTop, yBottom, barLine, form);
+                this->DrawBarLine(dc, yTop, yBottom, barLine, form);
                 if (barLine->HasRepetitionDots()) {
-                    DrawBarLineDots(dc, staff, barLine);
+                    this->DrawBarLineDots(dc, staff, barLine);
                 }
             }
         }
@@ -806,7 +807,7 @@ void View::DrawBarLines(DeviceContext *dc, Measure *measure, StaffGrp *staffGrp,
         if (isLastMeasure && (barLine->GetPosition() == BarLinePosition::Right)) {
             eraseIntersections = false;
         }
-        DrawBarLine(dc, yTop, yBottom, barLine, barLine->GetForm(), eraseIntersections);
+        this->DrawBarLine(dc, yTop, yBottom, barLine, barLine->GetForm(), eraseIntersections);
 
         // Now we have a barthru barLine, but we have dots so we still need to go through each staff
         if (barLine->HasRepetitionDots()) {
@@ -822,7 +823,7 @@ void View::DrawBarLines(DeviceContext *dc, Measure *measure, StaffGrp *staffGrp,
                             "Could not get staff (%d) while drawing staffGrp - DrawBarLines", childStaffDef->GetN());
                         continue;
                     }
-                    DrawBarLineDots(dc, staff, barLine);
+                    this->DrawBarLineDots(dc, staff, barLine);
                 }
             }
         }
@@ -881,52 +882,52 @@ void View::DrawBarLine(
 
     switch (form) {
         case BARRENDITION_single: //
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
             break;
         case BARRENDITION_dashed: //
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth, dashLength);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth, dashLength);
             break;
         case BARRENDITION_dotted: //
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth, dotLength);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth, dotLength);
             break;
         case BARRENDITION_rptend:
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
-            DrawVerticalSegmentedLine(dc, x2 + barLinesSum / 2, line, barLineThickWidth);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
+            this->DrawVerticalSegmentedLine(dc, x2 + barLinesSum / 2, line, barLineThickWidth);
             break;
         case BARRENDITION_rptboth:
             x2 = x + barLinesSum + barLineSeparation * 2;
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
-            DrawVerticalSegmentedLine(dc, (x + x2) / 2, line, barLineThickWidth);
-            DrawVerticalSegmentedLine(dc, x2, line, barLineWidth);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
+            this->DrawVerticalSegmentedLine(dc, (x + x2) / 2, line, barLineThickWidth);
+            this->DrawVerticalSegmentedLine(dc, x2, line, barLineWidth);
             break;
         case BARRENDITION_rptstart:
-            DrawVerticalSegmentedLine(dc, x, line, barLineThickWidth);
-            DrawVerticalSegmentedLine(dc, x2 + barLinesSum / 2, line, barLineWidth);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineThickWidth);
+            this->DrawVerticalSegmentedLine(dc, x2 + barLinesSum / 2, line, barLineWidth);
             break;
         case BARRENDITION_invis: //
             barLine->SetEmptyBB();
             break;
         case BARRENDITION_end:
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
-            DrawVerticalSegmentedLine(dc, x2 + barLinesSum / 2, line, barLineThickWidth);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
+            this->DrawVerticalSegmentedLine(dc, x2 + barLinesSum / 2, line, barLineThickWidth);
             break;
         case BARRENDITION_dbl:
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
-            DrawVerticalSegmentedLine(dc, x2 + barLineWidth, line, barLineWidth);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
+            this->DrawVerticalSegmentedLine(dc, x2 + barLineWidth, line, barLineWidth);
             break;
         case BARRENDITION_dbldashed:
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth, dashLength);
-            DrawVerticalSegmentedLine(dc, x2 + barLineWidth, line, barLineWidth, dashLength);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth, dashLength);
+            this->DrawVerticalSegmentedLine(dc, x2 + barLineWidth, line, barLineWidth, dashLength);
             break;
         case BARRENDITION_dbldotted:
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth, dotLength);
-            DrawVerticalSegmentedLine(dc, x2 + barLineWidth, line, barLineWidth, dotLength);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth, dotLength);
+            this->DrawVerticalSegmentedLine(dc, x2 + barLineWidth, line, barLineWidth, dotLength);
             break;
         default:
             // Use solid barline as fallback
             LogWarning(
                 "%s bar lines not supported", barLine->AttBarLineLog::BarrenditionToStr(barLine->GetForm()).c_str());
-            DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
+            this->DrawVerticalSegmentedLine(dc, x, line, barLineWidth);
             break;
     }
 }
@@ -953,16 +954,18 @@ void View::DrawBarLineDots(DeviceContext *dc, Staff *staff, BarLine *barLine)
     const int yTop = yBottom + m_doc->GetDrawingDoubleUnit(staffSize);
 
     if (barLine->GetForm() == BARRENDITION_rptstart) {
-        DrawSmuflCode(dc, x2 - thickBarLineWidth / 2, yTop, SMUFL_E044_repeatDot, staffSize, false);
-        DrawSmuflCode(dc, x2 - thickBarLineWidth / 2, yBottom, SMUFL_E044_repeatDot, staffSize, false);
+        this->DrawSmuflCode(dc, x2 - thickBarLineWidth / 2, yTop, SMUFL_E044_repeatDot, staffSize, false);
+        this->DrawSmuflCode(dc, x2 - thickBarLineWidth / 2, yBottom, SMUFL_E044_repeatDot, staffSize, false);
     }
     if (barLine->GetForm() == BARRENDITION_rptboth) {
-        DrawSmuflCode(dc, x2 + barLineSeparation + barLineWidth / 2, yTop, SMUFL_E044_repeatDot, staffSize, false);
-        DrawSmuflCode(dc, x2 + barLineSeparation + barLineWidth / 2, yBottom, SMUFL_E044_repeatDot, staffSize, false);
+        this->DrawSmuflCode(
+            dc, x2 + barLineSeparation + barLineWidth / 2, yTop, SMUFL_E044_repeatDot, staffSize, false);
+        this->DrawSmuflCode(
+            dc, x2 + barLineSeparation + barLineWidth / 2, yBottom, SMUFL_E044_repeatDot, staffSize, false);
     }
     if ((barLine->GetForm() == BARRENDITION_rptend) || (barLine->GetForm() == BARRENDITION_rptboth)) {
-        DrawSmuflCode(dc, x1, yTop, SMUFL_E044_repeatDot, staffSize, false);
-        DrawSmuflCode(dc, x1, yBottom, SMUFL_E044_repeatDot, staffSize, false);
+        this->DrawSmuflCode(dc, x1, yTop, SMUFL_E044_repeatDot, staffSize, false);
+        this->DrawSmuflCode(dc, x1, yBottom, SMUFL_E044_repeatDot, staffSize, false);
     }
 
     return;
@@ -1010,24 +1013,24 @@ void View::DrawMeasure(DeviceContext *dc, Measure *measure, System *system)
                 }
                 // hardcoded offset for the mNum based on the lyric font size
                 const int yOffset = m_doc->GetDrawingLyricFont(60)->GetPointSize();
-                DrawMNum(dc, mnum, measure, std::max(symbolOffset, yOffset));
+                this->DrawMNum(dc, mnum, measure, std::max(symbolOffset, yOffset));
             }
         }
     }
 
-    DrawMeasureChildren(dc, measure, measure, system);
+    this->DrawMeasureChildren(dc, measure, measure, system);
 
     // Draw the barlines only with measured music
     if (measure->IsMeasuredMusic()) {
         System *system = vrv_cast<System *>(measure->GetFirstAncestor(SYSTEM));
         assert(system);
         if ((measure->GetDrawingLeftBarLine() != BARRENDITION_NONE) || measure->HasInvisibleStaffBarlines()) {
-            DrawScoreDef(dc, system->GetDrawingScoreDef(), measure, measure->GetLeftBarLine()->GetDrawingX(),
+            this->DrawScoreDef(dc, system->GetDrawingScoreDef(), measure, measure->GetLeftBarLine()->GetDrawingX(),
                 measure->GetLeftBarLine());
         }
         if ((measure->GetDrawingRightBarLine() != BARRENDITION_NONE) || measure->HasInvisibleStaffBarlines()) {
             bool isLast = (measure == system->FindDescendantByType(MEASURE, 1, BACKWARD)) ? true : false;
-            DrawScoreDef(dc, system->GetDrawingScoreDef(), measure, measure->GetRightBarLine()->GetDrawingX(),
+            this->DrawScoreDef(dc, system->GetDrawingScoreDef(), measure, measure->GetRightBarLine()->GetDrawingX(),
                 measure->GetRightBarLine(), isLast);
         }
     }
@@ -1058,7 +1061,7 @@ void View::DrawMeterSigGrp(DeviceContext *dc, Layer *layer, Staff *staff)
         assert(meterSig);
 
         if (meterSig->HasCount()) {
-            DrawMeterSig(dc, meterSig, staff, offset);
+            this->DrawMeterSig(dc, meterSig, staff, offset);
         }
 
         const int y = staff->GetDrawingY() - unit * (staff->m_drawingLines - 1);
@@ -1067,7 +1070,7 @@ void View::DrawMeterSigGrp(DeviceContext *dc, Layer *layer, Staff *staff)
         if ((meterSigGrp->GetFunc() == meterSigGrpLog_FUNC_mixed) && (iter != std::prev(childList->end()))) {
             // draw plus sign here
             const int plusX = x + width + unit / 2;
-            DrawSmuflCode(dc, plusX, y, SMUFL_E08C_timeSigPlus, staff->m_drawingStaffSize, false);
+            this->DrawSmuflCode(dc, plusX, y, SMUFL_E08C_timeSigPlus, staff->m_drawingStaffSize, false);
             offset += width + unit + m_doc->GetGlyphWidth(SMUFL_E08C_timeSigPlus, staff->m_drawingStaffSize, false);
         }
         else {
@@ -1126,7 +1129,7 @@ void View::DrawMNum(DeviceContext *dc, MNum *mnum, Measure *measure, int yOffset
         dc->SetFont(&mnumTxt);
 
         dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), alignment);
-        DrawTextChildren(dc, mnum, params);
+        this->DrawTextChildren(dc, mnum, params);
         dc->EndText();
 
         dc->ResetFont();
@@ -1159,27 +1162,27 @@ void View::DrawStaff(DeviceContext *dc, Staff *staff, Measure *measure, System *
     }
 
     if (staffDef && (staffDef->GetLinesVisible() != BOOLEAN_false)) {
-        DrawStaffLines(dc, staff, measure, system);
+        this->DrawStaffLines(dc, staff, measure, system);
     }
 
-    DrawStaffDef(dc, staff, measure);
+    this->DrawStaffDef(dc, staff, measure);
 
     if (!staff->GetLedgerLinesAbove().empty()) {
-        DrawLedgerLines(dc, staff, staff->GetLedgerLinesAbove(), false, false);
+        this->DrawLedgerLines(dc, staff, staff->GetLedgerLinesAbove(), false, false);
     }
     if (!staff->GetLedgerLinesBelow().empty()) {
-        DrawLedgerLines(dc, staff, staff->GetLedgerLinesBelow(), true, false);
+        this->DrawLedgerLines(dc, staff, staff->GetLedgerLinesBelow(), true, false);
     }
     if (!staff->GetLedgerLinesAboveCue().empty()) {
-        DrawLedgerLines(dc, staff, staff->GetLedgerLinesAboveCue(), false, true);
+        this->DrawLedgerLines(dc, staff, staff->GetLedgerLinesAboveCue(), false, true);
     }
     if (!staff->GetLedgerLinesBelowCue().empty()) {
-        DrawLedgerLines(dc, staff, staff->GetLedgerLinesBelowCue(), true, true);
+        this->DrawLedgerLines(dc, staff, staff->GetLedgerLinesBelowCue(), true, true);
     }
 
-    DrawStaffChildren(dc, staff, staff, measure);
+    this->DrawStaffChildren(dc, staff, staff, measure);
 
-    DrawStaffDefCautionary(dc, staff, measure);
+    this->DrawStaffDefCautionary(dc, staff, measure);
 
     for (auto &spanningElement : staff->m_timeSpanningElements) {
         system->AddToDrawingListIfNeccessary(spanningElement);
@@ -1242,7 +1245,7 @@ void View::DrawStaffLines(DeviceContext *dc, Staff *staff, Measure *measure, Sys
                     }
                 }
             }
-            DrawHorizontalSegmentedLine(dc, y1, line, lineWidth);
+            this->DrawHorizontalSegmentedLine(dc, y1, line, lineWidth);
             y1 -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
             y2 = y1;
         }
@@ -1313,19 +1316,19 @@ void View::DrawStaffDef(DeviceContext *dc, Staff *staff, Measure *measure)
 
     // draw the scoreDef if required
     if (layer->GetStaffDefClef()) {
-        DrawLayerElement(dc, layer->GetStaffDefClef(), layer, staff, measure);
+        this->DrawLayerElement(dc, layer->GetStaffDefClef(), layer, staff, measure);
     }
     if (layer->GetStaffDefKeySig()) {
-        DrawLayerElement(dc, layer->GetStaffDefKeySig(), layer, staff, measure);
+        this->DrawLayerElement(dc, layer->GetStaffDefKeySig(), layer, staff, measure);
     }
     if (layer->GetStaffDefMensur()) {
-        DrawLayerElement(dc, layer->GetStaffDefMensur(), layer, staff, measure);
+        this->DrawLayerElement(dc, layer->GetStaffDefMensur(), layer, staff, measure);
     }
     if (layer->GetStaffDefMeterSigGrp()) {
-        DrawMeterSigGrp(dc, layer, staff);
+        this->DrawMeterSigGrp(dc, layer, staff);
     }
     else if (layer->GetStaffDefMeterSig()) {
-        DrawLayerElement(dc, layer->GetStaffDefMeterSig(), layer, staff, measure);
+        this->DrawLayerElement(dc, layer->GetStaffDefMeterSig(), layer, staff, measure);
     }
 
     // dc->EndGraphic(&staffDef, this);
@@ -1346,16 +1349,16 @@ void View::DrawStaffDefCautionary(DeviceContext *dc, Staff *staff, Measure *meas
 
     // draw the scoreDef if required
     if (layer->GetCautionStaffDefClef()) {
-        DrawLayerElement(dc, layer->GetCautionStaffDefClef(), layer, staff, measure);
+        this->DrawLayerElement(dc, layer->GetCautionStaffDefClef(), layer, staff, measure);
     }
     if (layer->GetCautionStaffDefKeySig()) {
-        DrawLayerElement(dc, layer->GetCautionStaffDefKeySig(), layer, staff, measure);
+        this->DrawLayerElement(dc, layer->GetCautionStaffDefKeySig(), layer, staff, measure);
     }
     if (layer->GetCautionStaffDefMensur()) {
-        DrawLayerElement(dc, layer->GetCautionStaffDefMensur(), layer, staff, measure);
+        this->DrawLayerElement(dc, layer->GetCautionStaffDefMensur(), layer, staff, measure);
     }
     if (layer->GetCautionStaffDefMeterSig()) {
-        DrawLayerElement(dc, layer->GetCautionStaffDefMeterSig(), layer, staff, measure);
+        this->DrawLayerElement(dc, layer->GetCautionStaffDefMeterSig(), layer, staff, measure);
     }
 
     // dc->EndGraphic(&staffDef, this);
@@ -1427,13 +1430,13 @@ void View::DrawLayer(DeviceContext *dc, Layer *layer, Staff *staff, Measure *mea
 
     dc->StartGraphic(layer, "", layer->GetUuid());
 
-    DrawLayerChildren(dc, layer, layer, staff, measure);
+    this->DrawLayerChildren(dc, layer, layer, staff, measure);
 
     dc->EndGraphic(layer, this);
 
     // first draw the postponed tuplets
-    DrawLayerList(dc, layer, staff, measure, TUPLET_BRACKET);
-    DrawLayerList(dc, layer, staff, measure, TUPLET_NUM);
+    this->DrawLayerList(dc, layer, staff, measure, TUPLET_BRACKET);
+    this->DrawLayerList(dc, layer, staff, measure, TUPLET_NUM);
 }
 
 void View::DrawLayerList(DeviceContext *dc, Layer *layer, Staff *staff, Measure *measure, const ClassId classId)
@@ -1448,10 +1451,10 @@ void View::DrawLayerList(DeviceContext *dc, Layer *layer, Staff *staff, Measure
 
     for (iter = drawingList->begin(); iter != drawingList->end(); ++iter) {
         if ((*iter)->Is(classId) && (classId == TUPLET_BRACKET)) {
-            DrawTupletBracket(dc, dynamic_cast<LayerElement *>(*iter), layer, staff, measure);
+            this->DrawTupletBracket(dc, dynamic_cast<LayerElement *>(*iter), layer, staff, measure);
         }
         if ((*iter)->Is(classId) && (classId == TUPLET_NUM)) {
-            DrawTupletNum(dc, dynamic_cast<LayerElement *>(*iter), layer, staff, measure);
+            this->DrawTupletNum(dc, dynamic_cast<LayerElement *>(*iter), layer, staff, measure);
         }
     }
 }
@@ -1504,8 +1507,8 @@ void View::DrawSystemDivider(DeviceContext *dc, System *system, Measure *firstMe
         // left and left-right
         dc->StartCustomGraphic("systemDivider");
 
-        DrawObliquePolygon(dc, x1, y1, x2, y2, m_doc->GetDrawingUnit(100) * 1.5);
-        DrawObliquePolygon(dc, x1, y3, x2, y4, m_doc->GetDrawingUnit(100) * 1.5);
+        this->DrawObliquePolygon(dc, x1, y1, x2, y2, m_doc->GetDrawingUnit(100) * 1.5);
+        this->DrawObliquePolygon(dc, x1, y3, x2, y4, m_doc->GetDrawingUnit(100) * 1.5);
         if (m_options->m_systemDivider.GetValue() == SYSTEMDIVIDER_left_right) {
             // Right divider is not taken into account in the layout calculation and can collision with the music
             // content
@@ -1513,8 +1516,8 @@ void View::DrawSystemDivider(DeviceContext *dc, System *system, Measure *firstMe
             assert(lastMeasure);
             int x4 = lastMeasure->GetDrawingX() + lastMeasure->GetRightBarLineRight();
             int x3 = x4 - m_doc->GetDrawingUnit(100) * 6;
-            DrawObliquePolygon(dc, x3, y1, x4, y2, m_doc->GetDrawingUnit(100) * 1.5);
-            DrawObliquePolygon(dc, x3, y3, x4, y4, m_doc->GetDrawingUnit(100) * 1.5);
+            this->DrawObliquePolygon(dc, x3, y1, x4, y2, m_doc->GetDrawingUnit(100) * 1.5);
+            this->DrawObliquePolygon(dc, x3, y3, x4, y4, m_doc->GetDrawingUnit(100) * 1.5);
         }
 
         dc->EndCustomGraphic();
@@ -1534,7 +1537,7 @@ void View::DrawSystemChildren(DeviceContext *dc, Object *parent, System *system)
     for (auto current : *parent->GetChildren()) {
         if (current->Is(MEASURE)) {
             // cast to Measure check in DrawMeasure
-            DrawMeasure(dc, dynamic_cast<Measure *>(current), system);
+            this->DrawMeasure(dc, dynamic_cast<Measure *>(current), system);
         }
         // scoreDef are not drawn directly, but anything else should not be possible
         else if (current->Is(SCOREDEF)) {
@@ -1544,18 +1547,18 @@ void View::DrawSystemChildren(DeviceContext *dc, Object *parent, System *system)
 
             Measure *nextMeasure = dynamic_cast<Measure *>(system->GetNext(scoreDef, MEASURE));
             if (nextMeasure && scoreDef->DrawLabels()) {
-                DrawScoreDef(dc, scoreDef, nextMeasure, nextMeasure->GetDrawingX());
+                this->DrawScoreDef(dc, scoreDef, nextMeasure, nextMeasure->GetDrawingX());
             }
 
-            SetScoreDefDrawingWidth(dc, scoreDef);
+            this->SetScoreDefDrawingWidth(dc, scoreDef);
         }
         else if (current->IsSystemElement()) {
             // cast to SystemElement check in DrawSystemEditorial element
-            DrawSystemElement(dc, dynamic_cast<SystemElement *>(current), system);
+            this->DrawSystemElement(dc, dynamic_cast<SystemElement *>(current), system);
         }
         else if (current->IsEditorialElement()) {
             // cast to EditorialElement check in DrawSystemEditorial element
-            DrawSystemEditorialElement(dc, dynamic_cast<EditorialElement *>(current), system);
+            this->DrawSystemEditorialElement(dc, dynamic_cast<EditorialElement *>(current), system);
         }
         else {
             assert(false);
@@ -1573,15 +1576,15 @@ void View::DrawMeasureChildren(DeviceContext *dc, Object *parent, Measure *measu
     for (auto current : *parent->GetChildren()) {
         if (current->Is(STAFF)) {
             // cast to Staff check in DrawStaff
-            DrawStaff(dc, dynamic_cast<Staff *>(current), measure, system);
+            this->DrawStaff(dc, dynamic_cast<Staff *>(current), measure, system);
         }
         else if (current->IsControlElement()) {
             // cast to ControlElement check in DrawControlElement
-            DrawControlElement(dc, dynamic_cast<ControlElement *>(current), measure, system);
+            this->DrawControlElement(dc, dynamic_cast<ControlElement *>(current), measure, system);
         }
         else if (current->IsEditorialElement()) {
             // cast to EditorialElement check in DrawMeasureEditorialElement
-            DrawMeasureEditorialElement(dc, dynamic_cast<EditorialElement *>(current), measure, system);
+            this->DrawMeasureEditorialElement(dc, dynamic_cast<EditorialElement *>(current), measure, system);
         }
         else {
             LogDebug("Current is %s", current->GetClassName().c_str());
@@ -1600,11 +1603,11 @@ void View::DrawStaffChildren(DeviceContext *dc, Object *parent, Staff *staff, Me
     for (auto current : *parent->GetChildren()) {
         if (current->Is(LAYER)) {
             // cast to Layer check in DrawLayer
-            DrawLayer(dc, dynamic_cast<Layer *>(current), staff, measure);
+            this->DrawLayer(dc, dynamic_cast<Layer *>(current), staff, measure);
         }
         else if (current->IsEditorialElement()) {
             // cast to EditorialElement check in DrawStaffEditorialElement
-            DrawStaffEditorialElement(dc, dynamic_cast<EditorialElement *>(current), staff, measure);
+            this->DrawStaffEditorialElement(dc, dynamic_cast<EditorialElement *>(current), staff, measure);
         }
         else {
             assert(false);
@@ -1622,11 +1625,11 @@ void View::DrawLayerChildren(DeviceContext *dc, Object *parent, Layer *layer, St
 
     for (auto current : *parent->GetChildren()) {
         if (current->IsLayerElement()) {
-            DrawLayerElement(dc, dynamic_cast<LayerElement *>(current), layer, staff, measure);
+            this->DrawLayerElement(dc, dynamic_cast<LayerElement *>(current), layer, staff, measure);
         }
         else if (current->IsEditorialElement()) {
             // cast to EditorialElement check in DrawLayerEditorialElement
-            DrawLayerEditorialElement(dc, dynamic_cast<EditorialElement *>(current), layer, staff, measure);
+            this->DrawLayerEditorialElement(dc, dynamic_cast<EditorialElement *>(current), layer, staff, measure);
         }
         else if (!current->Is({ LABEL, LABELABBR })) {
             assert(false);
@@ -1652,11 +1655,11 @@ void View::DrawTextChildren(DeviceContext *dc, Object *parent, TextDrawingParams
 
     for (auto current : *parent->GetChildren()) {
         if (current->IsTextElement()) {
-            DrawTextElement(dc, dynamic_cast<TextElement *>(current), params);
+            this->DrawTextElement(dc, dynamic_cast<TextElement *>(current), params);
         }
         else if (current->IsEditorialElement()) {
             // cast to EditorialElement check in DrawTextEditorialElement
-            DrawTextEditorialElement(dc, dynamic_cast<EditorialElement *>(current), params);
+            this->DrawTextEditorialElement(dc, dynamic_cast<EditorialElement *>(current), params);
         }
         else {
             assert(false);
@@ -1671,11 +1674,11 @@ void View::DrawFbChildren(DeviceContext *dc, Object *parent, TextDrawingParams &
 
     for (auto current : *parent->GetChildren()) {
         if (current->IsTextElement()) {
-            DrawTextElement(dc, dynamic_cast<TextElement *>(current), params);
+            this->DrawTextElement(dc, dynamic_cast<TextElement *>(current), params);
         }
         else if (current->IsEditorialElement()) {
             // cast to EditorialElement check in DrawLayerEditorialElement
-            DrawFbEditorialElement(dc, dynamic_cast<EditorialElement *>(current), params);
+            this->DrawFbEditorialElement(dc, dynamic_cast<EditorialElement *>(current), params);
         }
         else {
             assert(false);
@@ -1690,18 +1693,18 @@ void View::DrawRunningChildren(DeviceContext *dc, Object *parent, TextDrawingPar
 
     for (auto current : *parent->GetChildren()) {
         if (current->Is(FIG)) {
-            DrawFig(dc, dynamic_cast<Fig *>(current), params);
+            this->DrawFig(dc, dynamic_cast<Fig *>(current), params);
         }
         else if (current->IsTextElement()) {
             // We are now reaching a text element - start set only here because we can have a figure
             TextDrawingParams paramsChild = params;
             dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), HORIZONTALALIGNMENT_left);
-            DrawTextElement(dc, dynamic_cast<TextElement *>(current), paramsChild);
+            this->DrawTextElement(dc, dynamic_cast<TextElement *>(current), paramsChild);
             dc->EndText();
         }
         else if (current->IsEditorialElement()) {
             // cast to EditorialElement check in DrawLayerEditorialElement
-            DrawRunningEditorialElement(dc, dynamic_cast<EditorialElement *>(current), params);
+            this->DrawRunningEditorialElement(dc, dynamic_cast<EditorialElement *>(current), params);
         }
         else {
             assert(false);
@@ -1717,7 +1720,7 @@ void View::DrawSystemEditorialElement(DeviceContext *dc, EditorialElement *eleme
 {
     assert(element);
     if (element->Is(ANNOT)) {
-        DrawAnnot(dc, element);
+        this->DrawAnnot(dc, element);
         return;
     }
     if (element->Is(APP)) {
@@ -1741,7 +1744,7 @@ void View::DrawMeasureEditorialElement(DeviceContext *dc, EditorialElement *elem
 {
     assert(element);
     if (element->Is(ANNOT)) {
-        DrawAnnot(dc, element);
+        this->DrawAnnot(dc, element);
         return;
     }
     if (element->Is(APP)) {
@@ -1753,7 +1756,7 @@ void View::DrawMeasureEditorialElement(DeviceContext *dc, EditorialElement *elem
 
     dc->StartGraphic(element, "", element->GetUuid());
     if (element->m_visibility == Visible) {
-        DrawMeasureChildren(dc, element, measure, system);
+        this->DrawMeasureChildren(dc, element, measure, system);
     }
     dc->EndGraphic(element, this);
 }
@@ -1762,7 +1765,7 @@ void View::DrawStaffEditorialElement(DeviceContext *dc, EditorialElement *elemen
 {
     assert(element);
     if (element->Is(ANNOT)) {
-        DrawAnnot(dc, element);
+        this->DrawAnnot(dc, element);
         return;
     }
     if (element->Is(APP)) {
@@ -1774,7 +1777,7 @@ void View::DrawStaffEditorialElement(DeviceContext *dc, EditorialElement *elemen
 
     dc->StartGraphic(element, "", element->GetUuid());
     if (element->m_visibility == Visible) {
-        DrawStaffChildren(dc, element, staff, measure);
+        this->DrawStaffChildren(dc, element, staff, measure);
     }
     dc->EndGraphic(element, this);
 }
@@ -1784,7 +1787,7 @@ void View::DrawLayerEditorialElement(
 {
     assert(element);
     if (element->Is(ANNOT)) {
-        DrawAnnot(dc, element);
+        this->DrawAnnot(dc, element);
         return;
     }
     if (element->Is(APP)) {
@@ -1796,7 +1799,7 @@ void View::DrawLayerEditorialElement(
 
     dc->StartGraphic(element, "", element->GetUuid());
     if (element->m_visibility == Visible) {
-        DrawLayerChildren(dc, element, layer, staff, measure);
+        this->DrawLayerChildren(dc, element, layer, staff, measure);
     }
     dc->EndGraphic(element, this);
 }
@@ -1805,7 +1808,7 @@ void View::DrawTextEditorialElement(DeviceContext *dc, EditorialElement *element
 {
     assert(element);
     if (element->Is(ANNOT)) {
-        DrawAnnot(dc, element, true);
+        this->DrawAnnot(dc, element, true);
         return;
     }
     if (element->Is(APP)) {
@@ -1817,7 +1820,7 @@ void View::DrawTextEditorialElement(DeviceContext *dc, EditorialElement *element
 
     dc->StartTextGraphic(element, "", element->GetUuid());
     if (element->m_visibility == Visible) {
-        DrawTextChildren(dc, element, params);
+        this->DrawTextChildren(dc, element, params);
     }
     dc->EndTextGraphic(element, this);
 }
@@ -1826,7 +1829,7 @@ void View::DrawFbEditorialElement(DeviceContext *dc, EditorialElement *element,
 {
     assert(element);
     if (element->Is(ANNOT)) {
-        DrawAnnot(dc, element, true);
+        this->DrawAnnot(dc, element, true);
         return;
     }
     if (element->Is(APP)) {
@@ -1838,7 +1841,7 @@ void View::DrawFbEditorialElement(DeviceContext *dc, EditorialElement *element,
 
     dc->StartTextGraphic(element, "", element->GetUuid());
     if (element->m_visibility == Visible) {
-        DrawFbChildren(dc, element, params);
+        this->DrawFbChildren(dc, element, params);
     }
     dc->EndTextGraphic(element, this);
 }
@@ -1847,7 +1850,7 @@ void View::DrawRunningEditorialElement(DeviceContext *dc, EditorialElement *elem
 {
     assert(element);
     if (element->Is(ANNOT)) {
-        DrawAnnot(dc, element, true);
+        this->DrawAnnot(dc, element, true);
         return;
     }
     if (element->Is(APP)) {
@@ -1859,7 +1862,7 @@ void View::DrawRunningEditorialElement(DeviceContext *dc, EditorialElement *elem
 
     dc->StartGraphic(element, "", element->GetUuid());
     if (element->m_visibility == Visible) {
-        DrawRunningChildren(dc, element, params);
+        this->DrawRunningChildren(dc, element, params);
     }
     dc->EndGraphic(element, this);
 }
diff --git a/src/view_running.cpp b/src/view_running.cpp
index 4ba5f4abacf..d29209e670f 100644
--- a/src/view_running.cpp
+++ b/src/view_running.cpp
@@ -39,11 +39,11 @@ void View::DrawRunningElements(DeviceContext *dc, Page *page)
 
     RunningElement *header = page->GetHeader();
     if (header) {
-        DrawPgHeader(dc, header);
+        this->DrawPgHeader(dc, header);
     }
     RunningElement *footer = page->GetFooter();
     if (footer) {
-        DrawPgHeader(dc, footer);
+        this->DrawPgHeader(dc, footer);
     }
 }
 
@@ -71,7 +71,7 @@ void View::DrawPgHeader(DeviceContext *dc, RunningElement *pgHeader)
     dc->SetBrush(m_currentColour, AxSOLID);
     dc->SetFont(&pgHeadTxt);
 
-    DrawRunningChildren(dc, pgHeader, params);
+    this->DrawRunningChildren(dc, pgHeader, params);
 
     dc->ResetFont();
     dc->ResetBrush();
diff --git a/src/view_slur.cpp b/src/view_slur.cpp
index ecea84726d8..e6ce535255a 100644
--- a/src/view_slur.cpp
+++ b/src/view_slur.cpp
@@ -76,14 +76,14 @@ void View::DrawSlur(DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff,
         m_slurThicknessCoefficient
             = BoundingBox::GetBezierThicknessCoefficient(points, curve->GetThickness(), curve->GetAngle(), penWidth);
     }
-    DrawThickBezierCurve(dc, points, m_slurThicknessCoefficient * curve->GetThickness(), staff->m_drawingStaffSize,
-        penWidth, curve->GetAngle(), penStyle);
+    this->DrawThickBezierCurve(dc, points, m_slurThicknessCoefficient * curve->GetThickness(),
+        staff->m_drawingStaffSize, penWidth, curve->GetAngle(), penStyle);
 
     /*
     int i;
     for (i = 0; i <= 10; ++i) {
         Point p = BoundingBox::CalcDeCasteljau(points, (double)i / 10.0);
-        DrawDot(dc, p.x, p.y, staff->m_drawingStaffSize);
+        this->DrawDot(dc, p.x, p.y, staff->m_drawingStaffSize);
     }
     */
 
diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 2e36934f352..116349d2c8c 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -43,7 +43,7 @@ void View::DrawTabGrp(DeviceContext *dc, LayerElement *element, Layer *layer, St
     dc->StartGraphic(tabGrp, "", tabGrp->GetUuid());
 
     // Draw children (rhyhtm, notes)
-    DrawLayerChildren(dc, tabGrp, layer, staff, measure);
+    this->DrawLayerChildren(dc, tabGrp, layer, staff, measure);
 
     dc->EndGraphic(tabGrp, this);
 }
@@ -88,7 +88,7 @@ void View::DrawTabNote(DeviceContext *dc, LayerElement *element, Layer *layer, S
         params.m_y -= (m_doc->GetTextGlyphHeight(L'0', &fretTxt, drawingCueSize) / 2);
 
         dc->StartText(ToDeviceContextX(params.m_x), ToDeviceContextY(params.m_y), HORIZONTALALIGNMENT_center);
-        DrawTextString(dc, fret, params);
+        this->DrawTextString(dc, fret, params);
         dc->EndText();
 
         dc->ResetFont();
@@ -107,12 +107,12 @@ void View::DrawTabNote(DeviceContext *dc, LayerElement *element, Layer *layer, S
         }
 
         dc->SetFont(m_doc->GetDrawingSmuflFont(glyphSize, false));
-        DrawSmuflString(dc, x, y, fret, HORIZONTALALIGNMENT_center, glyphSize);
+        this->DrawSmuflString(dc, x, y, fret, HORIZONTALALIGNMENT_center, glyphSize);
         dc->ResetFont();
     }
 
     // Draw children (nothing yet)
-    DrawLayerChildren(dc, note, layer, staff, measure);
+    this->DrawLayerChildren(dc, note, layer, staff, measure);
 
     dc->EndGraphic(note, this);
 }
@@ -142,7 +142,7 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     // Do we also need to draw the dots?
     if (tabGrp->IsInBeam()) {
         const int height = m_doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
-        DrawFilledRectangle(dc, x - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2, y,
+        this->DrawFilledRectangle(dc, x - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2, y,
             x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2, y + height);
     }
     else {
@@ -156,13 +156,13 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
             default: symc = SMUFL_EBA9_luteDurationQuarter;
         }
 
-        DrawSmuflCode(dc, x, y, symc, glyphSize, true);
+        this->DrawSmuflCode(dc, x, y, symc, glyphSize, true);
 
         if (tabGrp->HasDots()) {
             y += m_doc->GetDrawingUnit(glyphSize) * 0.5;
             x += m_doc->GetDrawingUnit(glyphSize);
             for (int i = 0; i < tabGrp->GetDots(); ++i) {
-                DrawDot(dc, x, y, glyphSize * 2 / 3);
+                this->DrawDot(dc, x, y, glyphSize * 2 / 3);
                 // HARDCODED
                 x += m_doc->GetDrawingUnit(glyphSize) * 0.75;
             }
@@ -170,7 +170,7 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     }
 
     // Draw children (nothing yet)
-    DrawLayerChildren(dc, tabDurSym, layer, staff, measure);
+    this->DrawLayerChildren(dc, tabDurSym, layer, staff, measure);
 
     dc->EndGraphic(tabDurSym, this);
 }
diff --git a/src/view_text.cpp b/src/view_text.cpp
index f42bb0d198e..36f1f0678de 100644
--- a/src/view_text.cpp
+++ b/src/view_text.cpp
@@ -45,7 +45,7 @@ void View::DrawF(DeviceContext *dc, F *f, TextDrawingParams &params)
 
     dc->StartTextGraphic(f, "", f->GetUuid());
 
-    DrawTextChildren(dc, f, params);
+    this->DrawTextChildren(dc, f, params);
 
     if (f->GetStart() && f->GetEnd()) {
         System *currentSystem = dynamic_cast<System *>(f->GetFirstAncestor(SYSTEM));
@@ -70,7 +70,7 @@ void View::DrawDynamString(DeviceContext *dc, std::wstring str, TextDrawingParam
     assert(dc);
 
     if (rend && rend->HasFontfam()) {
-        DrawTextString(dc, str, params);
+        this->DrawTextString(dc, str, params);
         return;
     }
 
@@ -79,7 +79,7 @@ void View::DrawDynamString(DeviceContext *dc, std::wstring str, TextDrawingParam
         int first = true;
         for (auto &token : tokens) {
             if (!first) {
-                // DrawTextString(dc, L" ", params);
+                // this->DrawTextString(dc, L" ", params);
             }
             first = false;
 
@@ -89,16 +89,16 @@ void View::DrawDynamString(DeviceContext *dc, std::wstring str, TextDrawingParam
                 vrvTxt.SetFaceName("VerovioText");
                 vrvTxt.SetStyle(FONTSTYLE_normal);
                 dc->SetFont(&vrvTxt);
-                DrawTextString(dc, smuflStr, params);
+                this->DrawTextString(dc, smuflStr, params);
                 dc->ResetFont();
             }
             else {
-                DrawTextString(dc, token.first, params);
+                this->DrawTextString(dc, token.first, params);
             }
         }
     }
     else {
-        DrawTextString(dc, str, params);
+        this->DrawTextString(dc, str, params);
     }
 }
 
@@ -169,27 +169,27 @@ void View::DrawTextElement(DeviceContext *dc, TextElement *element, TextDrawingP
     if (element->Is(FIGURE)) {
         F *f = vrv_cast<F *>(element);
         assert(f);
-        DrawF(dc, f, params);
+        this->DrawF(dc, f, params);
     }
     else if (element->Is(LB)) {
         Lb *lb = vrv_cast<Lb *>(element);
         assert(lb);
-        DrawLb(dc, lb, params);
+        this->DrawLb(dc, lb, params);
     }
     else if (element->Is(NUM)) {
         Num *num = vrv_cast<Num *>(element);
         assert(num);
-        DrawNum(dc, num, params);
+        this->DrawNum(dc, num, params);
     }
     else if (element->Is(REND)) {
         Rend *rend = vrv_cast<Rend *>(element);
         assert(rend);
-        DrawRend(dc, rend, params);
+        this->DrawRend(dc, rend, params);
     }
     else if (element->Is(TEXT)) {
         Text *text = vrv_cast<Text *>(element);
         assert(text);
-        DrawText(dc, text, params);
+        this->DrawText(dc, text, params);
     }
     else {
         assert(false);
@@ -260,10 +260,10 @@ void View::DrawNum(DeviceContext *dc, Num *num, TextDrawingParams &params)
 
     Text *currentText = num->GetCurrentText();
     if (currentText && (currentText->GetText().length() > 0)) {
-        DrawText(dc, num->GetCurrentText(), params);
+        this->DrawText(dc, num->GetCurrentText(), params);
     }
     else {
-        DrawTextChildren(dc, num, params);
+        this->DrawTextChildren(dc, num, params);
     }
 
     dc->EndTextGraphic(num, this);
@@ -280,7 +280,7 @@ void View::DrawFig(DeviceContext *dc, Fig *fig, TextDrawingParams &params)
     if (svg) {
         params.m_x = fig->GetDrawingX();
         params.m_y = fig->GetDrawingY();
-        DrawSvg(dc, svg, params);
+        this->DrawSvg(dc, svg, params);
     }
 
     dc->EndGraphic(fig, this);
@@ -348,7 +348,7 @@ void View::DrawRend(DeviceContext *dc, Rend *rend, TextDrawingParams &params)
         params.m_explicitPosition = true;
     }
 
-    DrawTextChildren(dc, rend, params);
+    this->DrawTextChildren(dc, rend, params);
 
     if ((rend->GetRend() == TEXTRENDITION_sup) || (rend->GetRend() == TEXTRENDITION_sub)) {
         params.m_y -= yShift;
@@ -389,23 +389,23 @@ void View::DrawText(DeviceContext *dc, Text *text, TextDrawingParams &params)
 
     // special case where we want to replace the '#' or 'b' with a VerovioText glyphs
     if (text->GetFirstAncestor(DYNAM)) {
-        DrawDynamString(dc, text->GetText(), params, dynamic_cast<Rend *>(text->GetFirstAncestor(REND)));
+        this->DrawDynamString(dc, text->GetText(), params, dynamic_cast<Rend *>(text->GetFirstAncestor(REND)));
     }
     else if (text->GetFirstAncestor(HARM)) {
-        DrawHarmString(dc, text->GetText(), params);
+        this->DrawHarmString(dc, text->GetText(), params);
     }
     // special case where we want to replace the '_' with a lyric connector
     // '_' are produce with the SibMEI plugin
     else if (text->GetFirstAncestor(SYL)) {
         if (params.m_height != VRV_UNSET && params.m_height != 0) {
-            DrawLyricString(dc, text->GetText(), 100, params);
+            this->DrawLyricString(dc, text->GetText(), 100, params);
         }
         else {
-            DrawLyricString(dc, text->GetText());
+            this->DrawLyricString(dc, text->GetText());
         }
     }
     else {
-        DrawTextString(dc, text->GetText(), params);
+        this->DrawTextString(dc, text->GetText(), params);
     }
 
     params.m_actualWidth = text->GetContentRight();
diff --git a/src/view_tuplet.cpp b/src/view_tuplet.cpp
index 64ebc120939..70e01788c41 100644
--- a/src/view_tuplet.cpp
+++ b/src/view_tuplet.cpp
@@ -68,7 +68,7 @@ void View::DrawTuplet(DeviceContext *dc, LayerElement *element, Layer *layer, St
     dc->StartGraphic(element, "", element->GetUuid());
 
     // Draw the inner elements
-    DrawLayerChildren(dc, tuplet, layer, staff, measure);
+    this->DrawLayerChildren(dc, tuplet, layer, staff, measure);
 
     dc->EndGraphic(element, this);
 }
@@ -117,14 +117,14 @@ void View::DrawTupletBracket(DeviceContext *dc, LayerElement *element, Layer *la
             = tupletBracket->GetAlignedNum()->GetSelfRight() + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
         const double slope = (double)(yRight - yLeft) / (double)(xRight - xLeft);
         const int yNumLeft = yLeft + slope * (xNumLeft - xLeft);
-        DrawObliquePolygon(dc, xLeft, yLeft, xNumLeft, yNumLeft, lineWidth);
+        this->DrawObliquePolygon(dc, xLeft, yLeft, xNumLeft, yNumLeft, lineWidth);
         const int yNumRight = yRight - slope * (xRight - xNumRight);
-        DrawObliquePolygon(dc, xNumRight, yNumRight, xRight, yRight, lineWidth);
+        this->DrawObliquePolygon(dc, xNumRight, yNumRight, xRight, yRight, lineWidth);
         bracketHeight
             = abs(tupletBracket->GetAlignedNum()->GetSelfTop() - tupletBracket->GetAlignedNum()->GetSelfBottom()) / 2;
     }
     else {
-        DrawObliquePolygon(dc, xLeft, yLeft, xRight, yRight, lineWidth);
+        this->DrawObliquePolygon(dc, xLeft, yLeft, xRight, yRight, lineWidth);
         // HARDCODED
         bracketHeight = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6 / 5;
     }
@@ -133,8 +133,8 @@ void View::DrawTupletBracket(DeviceContext *dc, LayerElement *element, Layer *la
         bracketHeight *= -1;
     }
 
-    DrawFilledRectangle(dc, xLeft, yLeft, xLeft + lineWidth, yLeft + bracketHeight);
-    DrawFilledRectangle(dc, xRight, yRight, xRight - lineWidth, yRight + bracketHeight);
+    this->DrawFilledRectangle(dc, xLeft, yLeft, xLeft + lineWidth, yLeft + bracketHeight);
+    this->DrawFilledRectangle(dc, xRight, yRight, xRight - lineWidth, yRight + bracketHeight);
 
     dc->EndResumedGraphic(tupletBracket, this);
 
@@ -187,7 +187,7 @@ void View::DrawTupletNum(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     dc->ResumeGraphic(tupletNum, tupletNum->GetUuid());
 
-    DrawSmuflString(dc, x, y, notes, HORIZONTALALIGNMENT_left, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflString(dc, x, y, notes, HORIZONTALALIGNMENT_left, staff->m_drawingStaffSize, drawingCueSize);
 
     dc->EndResumedGraphic(tupletNum, this);
 
diff --git a/src/zone.cpp b/src/zone.cpp
index 8671f379777..ecdcca926fe 100644
--- a/src/zone.cpp
+++ b/src/zone.cpp
@@ -27,17 +27,17 @@ static const ClassRegistrar<Zone> s_factory("zone", ZONE);
 
 Zone::Zone() : Object(ZONE, "zone-"), AttTyped(), AttCoordinated()
 {
-    RegisterAttClass(ATT_TYPED);
-    RegisterAttClass(ATT_COORDINATED);
-    Reset();
+    this->RegisterAttClass(ATT_TYPED);
+    this->RegisterAttClass(ATT_COORDINATED);
+    this->Reset();
 }
 
 Zone::~Zone() {}
 
 void Zone::Reset()
 {
-    ResetTyped();
-    ResetCoordinated();
+    this->ResetTyped();
+    this->ResetCoordinated();
 }
 
 void Zone::ShiftByXY(int xDiff, int yDiff)

From 5fa9a1922391df51928428c46a32b50ccf77dc88 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 30 Jan 2022 16:22:51 +0100
Subject: [PATCH 179/403] Adjust style to coding guidelines for calls to this
 methods [skip-ci]

---
 src/object.cpp | 2 +-
 src/tuning.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/object.cpp b/src/object.cpp
index 79d5b533561..8fa9fddf9a9 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -541,7 +541,7 @@ Object *Object::FindDescendantByUuid(std::string uuid, int deepness, bool direct
 Object *Object::FindDescendantByType(ClassId classId, int deepness, bool direction)
 {
     ClassIdComparison comparison(classId);
-    return FindDescendantByComparison(&comparison, deepness, direction);
+    return this->FindDescendantByComparison(&comparison, deepness, direction);
 }
 
 Object *Object::FindDescendantByComparison(Comparison *comparison, int deepness, bool direction)
diff --git a/src/tuning.cpp b/src/tuning.cpp
index c493a238adc..269afdedb93 100644
--- a/src/tuning.cpp
+++ b/src/tuning.cpp
@@ -75,7 +75,7 @@ int Tuning::CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType
 
     // Do we have the tuning for this course?
     AttNNumberLikeComparison cnc(COURSE, std::to_string(course));
-    Course *courseTuning = vrv_cast<Course *>(FindDescendantByComparison(&cnc));
+    Course *courseTuning = vrv_cast<Course *>(this->FindDescendantByComparison(&cnc));
 
     if (courseTuning && courseTuning->HasPname() && courseTuning->HasOct()) {
 

From 9a183aea3a87a4a6324aa3a7abade37038fb4ba2 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 30 Jan 2022 16:41:23 +0100
Subject: [PATCH 180/403] Add SMuFL tab clefs 6stringTabClef and 4stringTabClef

---
 data/Bravura.xml        | 2 ++
 data/Bravura/E06D.xml   | 1 +
 data/Bravura/E06E.xml   | 1 +
 data/Gootville.xml      | 1 +
 data/Gootville/E06D.xml | 1 +
 data/Leipzig.xml        | 2 ++
 data/Leipzig/E06D.xml   | 1 +
 data/Leipzig/E06E.xml   | 1 +
 data/Leland.xml         | 2 ++
 data/Leland/E06D.xml    | 1 +
 data/Leland/E06E.xml    | 1 +
 data/Petaluma.xml       | 2 ++
 data/Petaluma/E06D.xml  | 1 +
 data/Petaluma/E06E.xml  | 1 +
 fonts/supported.xsl     | 2 ++
 include/vrv/smufl.h     | 4 +++-
 src/smufl.cpp           | 4 +++-
 17 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 data/Bravura/E06D.xml
 create mode 100644 data/Bravura/E06E.xml
 create mode 100644 data/Gootville/E06D.xml
 create mode 100644 data/Leipzig/E06D.xml
 create mode 100644 data/Leipzig/E06E.xml
 create mode 100644 data/Leland/E06D.xml
 create mode 100644 data/Leland/E06E.xml
 create mode 100644 data/Petaluma/E06D.xml
 create mode 100644 data/Petaluma/E06E.xml

diff --git a/data/Bravura.xml b/data/Bravura.xml
index 3eda0822bcc..d1b0627bc16 100644
--- a/data/Bravura.xml
+++ b/data/Bravura.xml
@@ -27,6 +27,8 @@
   <g c="E066" x="-5.0" y="-635.0" w="689.0" h="1131.0" h-a-x="684" n="fClef15ma"/>
   <g c="E069" x="0.0" y="-250.0" w="382.0" h="500.0" h-a-x="382" n="unpitchedPercussionClef1"/>
   <g c="E06A" x="0.0" y="-465.0" w="312.0" h="926.0" h-a-x="312" n="unpitchedPercussionClef2"/>
+  <g c="E06D" x="-3.0" y="-748.0" w="411.0" h="1512.0" h-a-x="409" n="6stringTabClef"/>
+  <g c="E06E" x="-3.0" y="-508.0" w="275.0" h="1012.0" h-a-x="271" n="4stringTabClef"/>
   <g c="E073" x="6.0" y="-658.0" w="671.0" h="1756.0" h-a-x="674" n="gClefReversed"/>
   <g c="E074" x="6.0" y="-602.0" w="671.0" h="1756.0" h-a-x="674" n="gClefTurned"/>
   <g c="E075" x="0.0" y="-506.0" w="699.0" h="1012.0" h-a-x="699" n="cClefReversed"/>
diff --git a/data/Bravura/E06D.xml b/data/Bravura/E06D.xml
new file mode 100644
index 00000000000..86e6fddfc7a
--- /dev/null
+++ b/data/Bravura/E06D.xml
@@ -0,0 +1 @@
+<symbol id="E06D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 -277h191c89 0 139 -51 139 -120c0 -47 -22 -82 -65 -102c60 -23 86 -58 86 -114c0 -78 -54 -135 -139 -135h-212v471zM61 -228h-64l168 470h78l165 -470h-67l-49 141h-181zM18 764h369v-53h-154v-418h-60v418h-155v53zM87 -533v-162h147c56 0 84 36 84 81 c0 46 -28 81 -84 81h-147zM203 -330h-116v-150h116c67 0 94 27 94 75s-27 75 -94 75zM203 178l-77 -214h150z"/></symbol>
\ No newline at end of file
diff --git a/data/Bravura/E06E.xml b/data/Bravura/E06E.xml
new file mode 100644
index 00000000000..544747096b6
--- /dev/null
+++ b/data/Bravura/E06E.xml
@@ -0,0 +1 @@
+<symbol id="E06E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M17 -193h128c60 0 93 -34 93 -80c0 -32 -15 -55 -43 -69c40 -15 57 -38 57 -76c0 -52 -36 -90 -93 -90h-142v315zM40 -160h-43l113 315h52l110 -315h-45l-32 95h-122zM11 504h247v-35h-103v-280h-40v280h-104v35zM57 -364v-108h99c38 0 56 23 56 54c0 30 -18 54 -56 54 h-99zM135 -228h-78v-101h78c45 0 63 18 63 50s-18 51 -63 51zM135 112l-52 -144h101z"/></symbol>
\ No newline at end of file
diff --git a/data/Gootville.xml b/data/Gootville.xml
index e3c4bce50ea..d96f83deba1 100644
--- a/data/Gootville.xml
+++ b/data/Gootville.xml
@@ -90,6 +90,7 @@
   <g c="E066" x="0.0" y="-546.0" w="664.0" h="1044.0" h-a-x="664" n="fClef15ma"/>
   <g c="E069" x="0.0" y="-250.0" w="340.0" h="500.0" h-a-x="340" n="unpitchedPercussionClef1"/>
   <g c="E06A" x="0.0" y="-420.0" w="270.0" h="840.0" h-a-x="270" n="unpitchedPercussionClef2"/>
+  <g c="E06D" x="0.0" y="-750.0" w="410.0" h="1500.0" h-a-x="410" n="6stringTabClef"/>
   <g c="E080" x="0.0" y="-243.0" w="424.0" h="486.0" h-a-x="424" n="timeSig0"/>
   <g c="E081" x="0.0" y="-243.0" w="284.0" h="486.0" h-a-x="284" n="timeSig1"/>
   <g c="E082" x="0.0" y="-243.0" w="376.0" h="486.0" h-a-x="376" n="timeSig2"/>
diff --git a/data/Gootville/E06D.xml b/data/Gootville/E06D.xml
new file mode 100644
index 00000000000..001c641adb8
--- /dev/null
+++ b/data/Gootville/E06D.xml
@@ -0,0 +1 @@
+<symbol id="E06D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -240l165 480h80l165 -480h-60l-48 140h-194l-48 -140h-60zM20 690v60h370v-60h-155v-420h-60v420h-155zM25 -270h200c85 0 140 -30 140 -135c0 -85 -70 -105 -70 -105s90 -20 90 -105c0 -105 -75 -135 -160 -135h-200v480zM85 -330v-150h140c55 0 80 20 80 75 s-25 75 -80 75h-140zM85 -540v-150h140c55 0 100 10 100 75s-45 75 -100 75h-140zM129 -40h152l-71 208h-10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig.xml b/data/Leipzig.xml
index 8ba34e638fe..a6d9653ce81 100644
--- a/data/Leipzig.xml
+++ b/data/Leipzig.xml
@@ -509,6 +509,8 @@
   <g c="E076" x="4.0" y="-581.0" w="694.0" h="832.0" h-a-x="698" n="fClefReversed"/>
   <g c="E077" x="4.0" y="-581.0" w="694.0" h="832.0" h-a-x="698" n="fClefTurned"/>
   <g c="E075" x="0.0" y="-502.0" w="606.0" h="1004.0" h-a-x="656" n="cClefReversed"/>
+  <g c="E06D" x="-3.0" y="-750.0" w="411.0" h="1500.0" h-a-x="409" n="6stringTabClef"/>
+  <g c="E06E" x="-3.0" y="-500.0" w="275.0" h="1000.0" h-a-x="271" n="4stringTabClef"/>
   <g c="E055" x="-1.0" y="-655.0" w="1039.0" h="1738.0" h-a-x="646" n="gClef8vbOld"/>
   <g c="E056" x="-1.0" y="-655.0" w="764.0" h="1738.0" h-a-x="750" n="gClef8vbCClef"/>
   <g c="E51A" x="0.0" y="-25.0" w="115.0" h="350.44" h-a-x="115" n="octaveParensLeft"/>
diff --git a/data/Leipzig/E06D.xml b/data/Leipzig/E06D.xml
new file mode 100644
index 00000000000..39d9e680d6f
--- /dev/null
+++ b/data/Leipzig/E06D.xml
@@ -0,0 +1 @@
+<symbol id="E06D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 697v53h369v-53h-154v-418h-60v418h-155zM111 -94l-50 -141h-64l168 470h78l165 -470h-67l-49 141h-181zM276 -43l-73 214l-77 -214h150zM27 -750v471h191c89 0 139 -51 139 -120c0 -47 -22 -82 -65 -102c60 -23 86 -58 86 -114c0 -78 -54 -135 -139 -135h-212z M203 -332h-116v-150h116c67 0 94 27 94 75s-27 75 -94 75zM234 -535h-147v-162h147c56 0 84 36 84 81c0 46 -28 81 -84 81z"/></symbol>
\ No newline at end of file
diff --git a/data/Leipzig/E06E.xml b/data/Leipzig/E06E.xml
new file mode 100644
index 00000000000..4e61f9560de
--- /dev/null
+++ b/data/Leipzig/E06E.xml
@@ -0,0 +1 @@
+<symbol id="E06E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 465v35h247v-35h-103v-280h-40v280h-104zM73 -62l-33 -96h-43l113 316h52l110 -316h-45l-32 96h-122zM184 -29l-49 144l-52 -144h101zM17 -500v315h128c60 0 93 -34 93 -80c0 -32 -15 -55 -43 -69c40 -15 57 -38 57 -76c0 -52 -36 -90 -93 -90h-142zM135 -220h-78 v-101h78c45 0 63 18 63 50s-18 51 -63 51zM156 -356h-99v-108h99c38 0 56 23 56 54c0 30 -18 54 -56 54z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland.xml b/data/Leland.xml
index cc89b379277..c216c2104e1 100644
--- a/data/Leland.xml
+++ b/data/Leland.xml
@@ -92,6 +92,8 @@
   <g c="E065" x="0.0" y="-616.0" w="665.0" h="1104.0" h-a-x="664" n="fClef8va"/>
   <g c="E066" x="0.0" y="-616.0" w="665.0" h="1108.0" h-a-x="664" n="fClef15ma"/>
   <g c="E069" x="0.0" y="-252.0" w="352.0" h="504.0" h-a-x="352" n="unpitchedPercussionClef1"/>
+  <g c="E06D" x="0.0" y="-743.0" w="439.0" h="1489.0" h-a-x="439" n="6stringTabClef"/>
+  <g c="E06E" x="0.0" y="-497.0" w="294.0" h="997.0" h-a-x="294" n="4stringTabClef"/>
   <g c="E080" x="15.0" y="-254.0" w="374.0" h="509.0" h-a-x="404" n="timeSig0"/>
   <g c="E081" x="15.0" y="-243.0" w="321.0" h="488.0" h-a-x="351" n="timeSig1"/>
   <g c="E082" x="15.0" y="-243.0" w="362.0" h="488.0" h-a-x="392" n="timeSig2"/>
diff --git a/data/Leland/E06D.xml b/data/Leland/E06D.xml
new file mode 100644
index 00000000000..66282d9fad6
--- /dev/null
+++ b/data/Leland/E06D.xml
@@ -0,0 +1 @@
+<symbol id="E06D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 746h369v-81h-136v-374h-96v374h-137v81zM0 -231l165 463h110l164 -463h-105l-31 95h-170l-32 -95h-101zM219 126l-60 -182h119zM273 -279c79 -1 141 -37 141 -121c0 -47 -16 -74 -57 -94c50 -19 72 -57 72 -109c0 -27 -7 -52 -21 -74c-35 -54 -85 -66 -148 -66h-211 v464h224zM242 -360h-101v-102h113c37 0 68 10 68 52c0 49 -42 50 -80 50zM255 -539h-114v-123h113c46 0 77 14 77 66c0 47 -37 57 -76 57z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E06E.xml b/data/Leland/E06E.xml
new file mode 100644
index 00000000000..a413619e975
--- /dev/null
+++ b/data/Leland/E06E.xml
@@ -0,0 +1 @@
+<symbol id="E06E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 500h247v-54h-91v-250h-64v250h-92v54zM0 -154l111 310h73l110 -310h-70l-21 63h-114l-21 -63h-68zM147 85l-40 -122h79zM183 -186c53 -1 94 -26 94 -82c0 -18 -4 -34 -14 -45c-5 -7 -13 -12 -24 -18c34 -13 48 -37 48 -73c0 -26 -13 -58 -35 -73 c-10 -8 -22 -14 -36 -16c-14 -3 -28 -4 -42 -4h-141v311h150zM162 -241h-67v-68h75c14 0 24 2 33 7c9 6 13 14 13 28s-6 24 -17 29c-9 3 -22 4 -37 4zM171 -361h-76v-82h75c14 0 24 2 32 5c13 7 20 20 20 39c0 32 -25 38 -51 38z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma.xml b/data/Petaluma.xml
index 8d2987dfe0d..13b5a02d3c8 100644
--- a/data/Petaluma.xml
+++ b/data/Petaluma.xml
@@ -97,6 +97,8 @@
   <g c="E066" x="0.0" y="-496.0" w="776.0" h="1060.65" h-a-x="776" n="fClef15ma"/>
   <g c="E069" x="0.0" y="-250.0" w="379.14" h="500.0" h-a-x="379" n="unpitchedPercussionClef1"/>
   <g c="E06A" x="0.0" y="-447.0" w="298.34" h="894.0" h-a-x="298" n="unpitchedPercussionClef2"/>
+  <g c="E06D" x="0.0" y="-768.0" w="438.0" h="1535.0" h-a-x="438" n="6stringTabClef"/>
+  <g c="E06E" x="0.0" y="-496.0" w="287.0" h="991.15" h-a-x="287" n="4stringTabClef"/>
   <g c="E073" x="0.0" y="-559.0" w="664.0" h="1568.0" h-a-x="664" n="gClefReversed"/>
   <g c="E074" x="0.0" y="-560.0" w="664.0" h="1568.0" h-a-x="664" n="gClefTurned"/>
   <g c="E075" x="0.0" y="-543.0" w="731.0" h="1086.0" h-a-x="731" n="cClefReversed"/>
diff --git a/data/Petaluma/E06D.xml b/data/Petaluma/E06D.xml
new file mode 100644
index 00000000000..468eab6378a
--- /dev/null
+++ b/data/Petaluma/E06D.xml
@@ -0,0 +1 @@
+<symbol id="E06D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M256 304c-8 0 -12 7 -18 12l-19 13c-30 21 -43 46 -40 85c5 85 4 171 10 256v7c0 15 -6 21 -18 21c-2 0 -6 -1 -9 -1c-7 -1 -14 -2 -21 -2c-36 0 -68 15 -99 31c-9 4 -16 11 -16 19c0 11 6 14 12 14c4 -1 8 -2 12 -2c57 6 115 10 175 10c51 0 103 -2 147 -34 c2 -2 5 -2 7 -4c9 -8 23 -17 19 -30c-1 -3 -4 -4 -9 -4c-6 0 -13 2 -19 1h-111c12 -70 12 -141 12 -212c0 -52 -3 -104 -4 -155v-8c0 -7 -1 -13 -7 -16c-2 -1 -3 -1 -4 -1zM79 -222c-2 0 -5 1 -8 4c-19 14 -40 24 -58 39c-8 6 -13 12 -13 21c0 4 1 9 3 13 c49 133 105 264 171 389c7 14 12 20 19 20c7 -1 14 -6 25 -16c26 -27 49 -58 65 -92c38 -82 74 -166 112 -249c14 -31 33 -60 41 -94c1 -5 2 -8 2 -13c0 -2 0 -5 -2 -9c-37 26 -74 52 -90 95c-11 26 -25 31 -50 29c-47 -4 -95 -6 -142 -9c-18 -1 -30 -8 -35 -27 c-9 -31 -21 -60 -31 -90c-2 -8 -5 -11 -9 -11zM295 4c-21 48 -39 91 -59 139l-65 -133h19c20 0 40 4 60 4c15 0 30 -2 45 -10zM170 -768c-17 1 -33 1 -50 1c-62 -1 -62 -1 -74 62c-1 5 -2 11 -2 16c0 10 2 19 6 29c3 7 4 14 4 22c0 14 -3 28 -3 42c-2 98 11 196 16 294 c0 15 0 30 -2 45v3c0 12 6 21 15 25c37 16 75 30 116 30h9c6 0 13 0 20 -1c78 -14 122 -66 125 -145c2 -43 -1 -85 -35 -118c-3 -3 -4 -6 -4 -8s1 -5 4 -7c35 -39 40 -87 40 -139c0 -102 -77 -143 -160 -150c-8 -1 -17 -1 -25 -1zM112 -432c11 0 25 9 37 9c1 0 2 1 3 1 c47 12 96 20 136 52c6 4 10 8 10 12s-2 8 -8 13c-29 25 -62 36 -97 36c-13 1 -27 -1 -40 -4c-54 -10 -53 -11 -54 -66v-6c1 -2 1 -4 1 -7c0 -7 -3 -17 -3 -25c0 -4 1 -8 5 -12c3 -2 6 -3 10 -3zM107 -662c38 0 76 2 114 8c31 5 58 19 82 40c5 4 9 7 9 12c0 3 -2 6 -6 10 c-38 33 -77 63 -126 63c-12 0 -25 -2 -39 -5c-16 -5 -40 0 -47 -13c-8 -14 -4 -35 -5 -54h1v-47c0 -10 4 -14 17 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Petaluma/E06E.xml b/data/Petaluma/E06E.xml
new file mode 100644
index 00000000000..563e126d7a1
--- /dev/null
+++ b/data/Petaluma/E06E.xml
@@ -0,0 +1 @@
+<symbol id="E06E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 193c-15 18 -16 36 -16 54c-1 54 -1 108 -2 163c0 33 0 33 -32 33c-19 0 -38 -1 -57 0c-17 0 -34 23 -30 40c2 8 9 9 15 9c33 0 64 0 95 1h50c25 0 50 0 75 2c17 2 31 -16 31 -32c0 -3 -1 -6 -2 -8c-3 -8 -10 -7 -16 -8c-29 -5 -58 -4 -88 -4c-15 0 -19 -6 -19 -23 c1 -33 1 -66 1 -99c0 -32 0 -65 -1 -98v-10c0 -6 0 -12 -4 -20zM21 -166h-1c-6 0 -7 5 -10 10c-4 8 -9 15 -10 26c0 3 1 6 3 10c40 81 72 165 109 248c1 2 1 4 2 6c4 7 5 18 14 18h1c9 0 10 -10 14 -16l114 -243c6 -12 11 -25 13 -38c0 -3 1 -5 1 -7c0 -3 -1 -6 -5 -7h-2 c-5 0 -6 5 -8 8c-10 20 -20 40 -29 61c-16 34 -16 31 -53 30c-26 -2 -51 -7 -77 -7c-5 0 -11 1 -16 1h-3c-9 0 -12 -4 -16 -12l-33 -77c-2 -4 -2 -11 -8 -11zM188 -7c-17 37 -32 69 -50 106c-14 -35 -27 -64 -39 -93c-1 -3 -2 -5 -2 -7c0 -5 5 -6 12 -5c24 -1 49 -1 79 -1z M68 -495c-5 -1 -10 -1 -13 -1c-13 0 -16 5 -22 23c-2 6 -3 13 -3 21c1 55 -7 110 -5 165v88c0 13 3 18 18 21c25 4 50 11 76 11c7 0 15 0 23 -2c11 -3 22 -4 33 -7c40 -11 64 -44 64 -80c0 -15 -5 -32 -15 -48c-3 -5 -5 -9 -5 -12c0 -5 5 -8 12 -13c35 -20 46 -52 46 -89 s-32 -63 -78 -71c-28 -5 -56 -4 -83 -5c-16 0 -32 0 -48 -1zM68 -305c3 0 6 0 9 1c24 5 48 9 72 14c19 4 37 12 52 24c7 6 11 11 11 15c0 5 -5 8 -14 13c-26 12 -52 18 -79 18c-16 0 -31 -2 -47 -6c-11 -3 -16 -9 -15 -21c1 -6 0 -13 0 -19c0 -7 1 -15 0 -22v-5 c0 -9 4 -12 11 -12zM104 -443c25 1 51 2 76 5c19 2 38 7 54 18c11 7 16 12 16 17s-5 11 -14 18c-5 4 -12 9 -18 11c-28 12 -56 20 -85 20c-12 0 -24 -1 -36 -4c-6 -1 -13 0 -19 0c-7 0 -13 -1 -17 -6c-3 -5 -3 -9 -3 -13c0 -8 2 -17 3 -25c0 -41 1 -41 43 -41z"/></symbol>
\ No newline at end of file
diff --git a/fonts/supported.xsl b/fonts/supported.xsl
index db3075ef785..c3a1348d818 100644
--- a/fonts/supported.xsl
+++ b/fonts/supported.xsl
@@ -111,6 +111,8 @@
             <glyph glyph-code="E06A" smufl-name="unpitchedPercussionClef2" />
             <!--<glyph glyph-code="E06B" smufl-name="semipitchedPercussionClef1" />-->
             <!--<glyph glyph-code="E06C" smufl-name="semipitchedPercussionClef2" />-->
+            <glyph glyph-code="E06D" smufl-name="6stringTabClef" />
+            <glyph glyph-code="E06E" smufl-name="4stringTabClef" />
             <!--<glyph glyph-code="E06F" smufl-name="cClefTriangular" />-->
             <!--<glyph glyph-code="E070" smufl-name="fClefTriangular" />-->
             <!--<glyph glyph-code="E071" smufl-name="cClefTriangularToFClef" />-->
diff --git a/include/vrv/smufl.h b/include/vrv/smufl.h
index 26d2a4a3227..5ea9479cf3a 100644
--- a/include/vrv/smufl.h
+++ b/include/vrv/smufl.h
@@ -49,6 +49,8 @@ enum {
     SMUFL_E066_fClef15ma = 0xE066,
     SMUFL_E069_unpitchedPercussionClef1 = 0xE069,
     SMUFL_E06A_unpitchedPercussionClef2 = 0xE06A,
+    SMUFL_E06D_6stringTabClef = 0xE06D,
+    SMUFL_E06E_4stringTabClef = 0xE06E,
     SMUFL_E073_gClefReversed = 0xE073,
     SMUFL_E074_gClefTurned = 0xE074,
     SMUFL_E075_cClefReversed = 0xE075,
@@ -440,7 +442,7 @@ enum {
 };
 
 /** The number of glyphs for verification **/
-#define SMUFL_COUNT 415
+#define SMUFL_COUNT 417
 
 } // namespace vrv
 
diff --git a/src/smufl.cpp b/src/smufl.cpp
index 8a1a8efd2ce..5abd3319515 100644
--- a/src/smufl.cpp
+++ b/src/smufl.cpp
@@ -50,6 +50,8 @@ const std::map<std::string, wchar_t> Resources::s_smuflNames = {
     { "fClef15ma", SMUFL_E066_fClef15ma },
     { "unpitchedPercussionClef1", SMUFL_E069_unpitchedPercussionClef1 },
     { "unpitchedPercussionClef2", SMUFL_E06A_unpitchedPercussionClef2 },
+    { "6stringTabClef", SMUFL_E06D_6stringTabClef },
+    { "4stringTabClef", SMUFL_E06E_4stringTabClef },
     { "gClefReversed", SMUFL_E073_gClefReversed },
     { "gClefTurned", SMUFL_E074_gClefTurned },
     { "cClefReversed", SMUFL_E075_cClefReversed },
@@ -441,6 +443,6 @@ const std::map<std::string, wchar_t> Resources::s_smuflNames = {
 };
 
 /** The number of glyphs for verification **/
-// 415
+// 417
 
 } // namespace vrv

From b8db96ef248e76f205e2ac7cdc698df69cc2a803 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 30 Jan 2022 18:40:45 +0100
Subject: [PATCH 181/403] Add clef for guitar tablature

---
 include/vrv/view.h   |  1 +
 src/clef.cpp         |  2 ++
 src/view_element.cpp | 16 +++++++++++-----
 src/view_tab.cpp     | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index f70a64785ae..6f547fe0051 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -508,6 +508,7 @@ class View {
      * Defined in view_tab.cpp
      */
     ///@{
+    void DrawTabClef(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
     void DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
     void DrawTabGrp(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
     void DrawTabNote(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
diff --git a/src/clef.cpp b/src/clef.cpp
index 8daecb5f291..7b864c8f76d 100644
--- a/src/clef.cpp
+++ b/src/clef.cpp
@@ -108,6 +108,8 @@ wchar_t Clef::GetClefGlyph(const data_NOTATIONTYPE notationtype) const
     }
 
     switch (notationtype) {
+        case NOTATIONTYPE_tab:
+        case NOTATIONTYPE_tab_guitar: return SMUFL_E06D_6stringTabClef; break;
         case NOTATIONTYPE_neume:
             // neume clefs
             return (this->GetShape() == CLEFSHAPE_F) ? SMUFL_E902_chantFclef : SMUFL_E906_chantCclef;
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 889f00f7669..22b1b382328 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -616,6 +616,11 @@ void View::DrawClef(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
         return;
     }
 
+    if (staff->IsTablature()) {
+        this->DrawTabClef(dc, element, layer, staff, measure);
+        return;
+    }
+
     int x, y;
     if (m_doc->GetType() == Facs && clef->HasFacs()) {
         y = ToLogicalY(staff->GetDrawingY());
@@ -683,14 +688,15 @@ void View::DrawClefEnclosing(
 {
     if ((clef->GetEnclose() == ENCLOSURE_brack) || (clef->GetEnclose() == ENCLOSURE_box)) {
         const int unit = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-        x += sizeFactor * m_doc->GetGlyphLeft(glyph, staff->m_drawingStaffSize, false);
-        y += sizeFactor * m_doc->GetGlyphBottom(glyph, staff->m_drawingStaffSize, false);
-        const int height = sizeFactor * m_doc->GetGlyphHeight(glyph, staff->m_drawingStaffSize, false);
-        const int width = sizeFactor * m_doc->GetGlyphWidth(glyph, staff->m_drawingStaffSize, false);
+        const int glyphSize = staff->GetDrawingStaffNotationSize();
+        x += sizeFactor * m_doc->GetGlyphLeft(glyph, glyphSize, false);
+        y += sizeFactor * m_doc->GetGlyphBottom(glyph, glyphSize, false);
+        const int height = sizeFactor * m_doc->GetGlyphHeight(glyph, glyphSize, false);
+        const int width = sizeFactor * m_doc->GetGlyphWidth(glyph, glyphSize, false);
         const int offset = 3 * unit / 4;
         // We use overlapping brackets to draw boxes :)
         const int bracketWidth = (clef->GetEnclose() == ENCLOSURE_brack) ? unit : (width + offset);
-        const int verticalThickness = m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+        const int verticalThickness = m_doc->GetDrawingStemWidth(glyphSize);
         const int horizontalThickness = ((clef->GetEnclose() == ENCLOSURE_brack) ? 2 : 1) * verticalThickness;
 
         this->DrawEnclosingBrackets(
diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 8436197d8f1..f74e3b2e774 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -30,6 +30,42 @@
 
 namespace vrv {
 
+void View::DrawTabClef(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+{
+    assert(dc);
+    assert(element);
+    assert(layer);
+    assert(staff);
+    assert(measure);
+
+    Clef *clef = vrv_cast<Clef *>(element);
+    assert(clef);
+
+    const int glyphSize = staff->GetDrawingStaffNotationSize();
+
+    int x, y;
+    y = staff->GetDrawingY();
+    x = element->GetDrawingX();
+
+    wchar_t sym = clef->GetClefGlyph(staff->m_drawingNotationType);
+
+    if (sym == 0) {
+        clef->SetEmptyBB();
+        return;
+    }
+
+    y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - 1);
+
+    dc->StartGraphic(element, "", element->GetUuid());
+
+    this->DrawSmuflCode(dc, x, y, sym, glyphSize, false);
+
+    // Possibly draw enclosing brackets
+    this->DrawClefEnclosing(dc, clef, staff, sym, x, y, 1.0);
+
+    dc->EndGraphic(element, this);
+}
+
 void View::DrawTabGrp(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
 {
     assert(dc);

From 561128e85f5b85a1522b3eb2731722f1eb8d2199 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 31 Jan 2022 10:24:02 +0100
Subject: [PATCH 182/403] Get notes of arpeggio

Simplify getting top and bottom note
---
 include/vrv/arpeg.h |   7 ++-
 src/arpeg.cpp       | 107 +++++++++++++++-----------------------------
 2 files changed, 42 insertions(+), 72 deletions(-)

diff --git a/include/vrv/arpeg.h b/include/vrv/arpeg.h
index acc61817003..c7797ed82a6 100644
--- a/include/vrv/arpeg.h
+++ b/include/vrv/arpeg.h
@@ -50,9 +50,14 @@ class Arpeg : public ControlElement,
     int GetDrawingX() const override;
     ///@}
 
+    /**
+     * Get all notes of the arpeggio
+     */
+    std::set<Note *> GetNotes();
+
     /**
      * Set the top and bottom note of the arpeg.
-     * Pointers will be NULL if resovling fails (e.g., pointing to one single note)
+     * Pointers will be NULL if resolving fails (e.g., pointing to one single note)
      */
     void GetDrawingTopBottomNotes(Note *&top, Note *&bottom);
 
diff --git a/src/arpeg.cpp b/src/arpeg.cpp
index 5c38a90f08a..59758afecaf 100644
--- a/src/arpeg.cpp
+++ b/src/arpeg.cpp
@@ -100,82 +100,47 @@ void Arpeg::SetDrawingXRel(int drawingXRel)
     }
 }
 
-void Arpeg::GetDrawingTopBottomNotes(Note *&top, Note *&bottom)
+std::set<Note *> Arpeg::GetNotes()
 {
-    top = NULL;
-    bottom = NULL;
-
-    Object *front = NULL;
-    Object *back = NULL;
-
-    if (this->GetStart()) {
-        front = this->GetStart();
-        back = this->GetStart();
-    }
-    else if (!this->GetRefs()->empty()) {
-        front = this->GetRefs()->front();
-        back = this->GetRefs()->back();
-    }
-
-    // Cannot draw an arpeg that has no target
-    if (!front || !back) return;
-
-    // Cannot draw an arpeg not pointing to a chord or a note
-    if (!front->Is({ CHORD, NOTE }) || !back->Is({ CHORD, NOTE })) return;
-
-    // Pointing to a single element
-    if (front == back) {
-        // It has to be a chord in this case
-        if (front->Is(NOTE)) return;
-        Chord *chord = vrv_cast<Chord *>(front);
-        assert(chord);
-        top = chord->GetTopNote();
-        bottom = chord->GetBottomNote();
-        return;
-    }
-
-    Chord *chord1 = NULL;
-    Chord *chord2 = NULL;
-    Note *note1 = NULL;
-    Note *note2 = NULL;
+    std::set<Note *> notes;
+    auto extractNotes = [&notes](Object *object) {
+        if (!object) return;
+        if (object->Is(NOTE)) {
+            Note *note = vrv_cast<Note *>(object);
+            assert(note);
+            notes.insert(note);
+        }
+        else if (object->Is(CHORD)) {
+            Chord *chord = vrv_cast<Chord *>(object);
+            const ArrayOfObjects *childList = chord->GetList(chord);
+            for (Object *child : *childList) {
+                Note *note = vrv_cast<Note *>(child);
+                assert(note);
+                notes.insert(note);
+            }
+        }
+    };
+    extractNotes(this->GetStart());
+    std::for_each(this->GetRefs()->begin(), this->GetRefs()->end(), extractNotes);
+    return notes;
+}
 
-    // Get the first and second chord or note
-    if (front->Is(CHORD)) {
-        chord1 = vrv_cast<Chord *>(front);
-        assert(chord1);
-    }
-    else {
-        note1 = vrv_cast<Note *>(front);
-        assert(note1);
-    }
-    if (back->Is(CHORD)) {
-        chord2 = vrv_cast<Chord *>(back);
-        assert(chord2);
-    }
-    else {
-        note2 = vrv_cast<Note *>(back);
-        assert(note2);
-    }
+void Arpeg::GetDrawingTopBottomNotes(Note *&top, Note *&bottom)
+{
+    std::set<Note *> notes = this->GetNotes();
+    if (notes.size() > 1) {
+        // Sort the involved notes by drawing Y position
+        std::vector<Note *> sortedNotes;
+        std::copy(notes.begin(), notes.end(), std::back_inserter(sortedNotes));
+        std::sort(sortedNotes.begin(), sortedNotes.end(),
+            [](Note *note1, Note *note2) { return (note1->GetDrawingY() > note2->GetDrawingY()); });
 
-    // Note get the top and bottom note accordingly
-    if (chord1 && chord2) {
-        top = (chord1->GetTopNote()->GetDrawingY() > chord2->GetTopNote()->GetDrawingY()) ? chord1->GetTopNote()
-                                                                                          : chord2->GetTopNote();
-        bottom = (chord1->GetBottomNote()->GetDrawingY() < chord2->GetBottomNote()->GetDrawingY())
-            ? chord1->GetBottomNote()
-            : chord2->GetBottomNote();
-    }
-    else if (chord1 && note2) {
-        top = (chord1->GetTopNote()->GetDrawingY() > note2->GetDrawingY()) ? chord1->GetTopNote() : note2;
-        bottom = (chord1->GetBottomNote()->GetDrawingY() < note2->GetDrawingY()) ? chord1->GetBottomNote() : note2;
-    }
-    else if (note1 && chord2) {
-        top = (note1->GetDrawingY() > chord2->GetTopNote()->GetDrawingY()) ? note1 : chord2->GetTopNote();
-        bottom = (note1->GetDrawingY() < chord2->GetBottomNote()->GetDrawingY()) ? note1 : chord2->GetBottomNote();
+        top = sortedNotes.front();
+        bottom = sortedNotes.back();
     }
     else {
-        top = (note1->GetDrawingY() > note2->GetDrawingY()) ? note1 : note2;
-        bottom = (note1->GetDrawingY() < note2->GetDrawingY()) ? note1 : note2;
+        top = NULL;
+        bottom = NULL;
     }
 }
 

From a9bdf723f3a006e2fc7981bd8a705be7d95ed048 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 31 Jan 2022 10:53:05 +0100
Subject: [PATCH 183/403] PrepareMIDI functor skeleton

---
 include/vrv/functorparams.h | 16 ++++++++++++++++
 include/vrv/object.h        |  8 ++++++++
 src/doc.cpp                 |  6 ++++++
 3 files changed, 30 insertions(+)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index eb070734212..688d03df9bb 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -2019,6 +2019,22 @@ class PrepareLinkingParams : public FunctorParams {
     bool m_fillList;
 };
 
+//----------------------------------------------------------------------------
+// PrepareMIDIParams
+//----------------------------------------------------------------------------
+
+/**
+ * member 0: the semi tone transposition
+ * member 1: deferred notes which start slightly later
+ **/
+
+class PrepareMIDIParams : public FunctorParams {
+public:
+    PrepareMIDIParams() { m_transSemi = 0; }
+    int m_transSemi;
+    std::map<Note *, double> m_deferredNotes;
+};
+
 //----------------------------------------------------------------------------
 // PrepareMilestonesParams
 //----------------------------------------------------------------------------
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 806496db311..24da47c3050 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -1262,6 +1262,7 @@ class Object : public BoundingBox {
      */
     ///@{
     virtual int HorizontalLayoutCache(FunctorParams *) { return FUNCTOR_CONTINUE; }
+    ///@}
 
     /**
      * Adjust note timings based on ties
@@ -1270,6 +1271,13 @@ class Object : public BoundingBox {
     virtual int ResolveMIDITies(FunctorParams *) { return FUNCTOR_CONTINUE; }
     ///@}
 
+    /**
+     * Prepare the MIDI export
+     */
+    ///@{
+    virtual int PrepareMIDI(FunctorParams *) { return FUNCTOR_CONTINUE; }
+    ///@}
+
     /**
      * Export the object to a MidiFile
      */
diff --git a/src/doc.cpp b/src/doc.cpp
index 6e511316910..e8c167ef537 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -383,6 +383,11 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
             filters.push_back(&matchStaff);
             filters.push_back(&matchLayer);
 
+            Functor prepareMIDI(&Object::PrepareMIDI);
+            PrepareMIDIParams prepareMIDIParams;
+            prepareMIDIParams.m_transSemi = transSemi;
+            this->Process(&prepareMIDI, &prepareMIDIParams, NULL, &filters);
+
             Functor generateMIDI(&Object::GenerateMIDI);
             Functor generateMIDIEnd(&Object::GenerateMIDIEnd);
             GenerateMIDIParams generateMIDIParams(midiFile, &generateMIDI);
@@ -390,6 +395,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
             generateMIDIParams.m_midiTrack = midiTrack;
             generateMIDIParams.m_transSemi = transSemi;
             generateMIDIParams.m_currentTempo = tempo;
+            generateMIDIParams.m_deferredNotes = prepareMIDIParams.m_deferredNotes;
 
             // LogDebug("Exporting track %d ----------------", midiTrack);
             this->Process(&generateMIDI, &generateMIDIParams, &generateMIDIEnd, &filters);

From 2130de4baeaca734800a327061f3a173c3e6c9fd Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 31 Jan 2022 15:02:24 +0100
Subject: [PATCH 184/403] Defer arpeggio notes

---
 include/vrv/arpeg.h         |  5 +++++
 include/vrv/functorparams.h | 10 ++++++++--
 include/vrv/measure.h       | 15 +++++++--------
 src/arpeg.cpp               | 27 +++++++++++++++++++++++++++
 src/doc.cpp                 |  1 +
 src/measure.cpp             | 10 ++++++++++
 6 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/include/vrv/arpeg.h b/include/vrv/arpeg.h
index c7797ed82a6..3ef078d055a 100644
--- a/include/vrv/arpeg.h
+++ b/include/vrv/arpeg.h
@@ -113,6 +113,11 @@ class Arpeg : public ControlElement,
      */
     int HorizontalLayoutCache(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::PrepareMIDI
+     */
+    int PrepareMIDI(FunctorParams *functorParams) override;
+
 protected:
     //
 private:
diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 688d03df9bb..83f0b49cb27 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -2025,13 +2025,19 @@ class PrepareLinkingParams : public FunctorParams {
 
 /**
  * member 0: the semi tone transposition
- * member 1: deferred notes which start slightly later
+ * member 1: the current tempo
+ * member 2: deferred notes which start slightly later
  **/
 
 class PrepareMIDIParams : public FunctorParams {
 public:
-    PrepareMIDIParams() { m_transSemi = 0; }
+    PrepareMIDIParams()
+    {
+        m_transSemi = 0;
+        m_currentTempo = 120.0;
+    }
     int m_transSemi;
+    double m_currentTempo;
     std::map<Note *, double> m_deferredNotes;
 };
 
diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index 62a8ac7cd08..01ca6022338 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -447,18 +447,19 @@ class Measure : public Object,
     int PrepareMilestones(FunctorParams *functorParams) override;
 
     /**
-     * @name See Object::GenerateMIDI
+     * See Object::PrepareMIDI
+     */
+    int PrepareMIDI(FunctorParams *functorParams) override;
+
+    /**
+     * See Object::GenerateMIDI
      */
-    ///@{
     int GenerateMIDI(FunctorParams *functorParams) override;
-    ///@}
 
     /**
-     * @name See Object::GenerateTimemap
+     * See Object::GenerateTimemap
      */
-    ///@{
     int GenerateTimemap(FunctorParams *functorParams) override;
-    ///@}
 
     /**
      * See Object::CalcMaxMeasureDuration
@@ -471,9 +472,7 @@ class Measure : public Object,
     /**
      * See Object::CalcOnsetOffset
      */
-    ///@{
     int CalcOnsetOffset(FunctorParams *functorParams) override;
-    ///@}
 
     /**
      * See Object::PrepareTimestamps
diff --git a/src/arpeg.cpp b/src/arpeg.cpp
index 59758afecaf..5a0605f4f1d 100644
--- a/src/arpeg.cpp
+++ b/src/arpeg.cpp
@@ -250,4 +250,31 @@ int Arpeg::HorizontalLayoutCache(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Arpeg::PrepareMIDI(FunctorParams *functorParams)
+{
+    PrepareMIDIParams *params = vrv_params_cast<PrepareMIDIParams *>(functorParams);
+    assert(params);
+
+    // Sort the involved notes by playing order
+    const bool playTopDown = (this->GetOrder() == arpegLog_ORDER_down);
+    std::set<Note *> notes = this->GetNotes();
+    std::vector<Note *> sortedNotes;
+    std::copy(notes.begin(), notes.end(), std::back_inserter(sortedNotes));
+    std::sort(sortedNotes.begin(), sortedNotes.end(), [params, playTopDown](Note *note1, Note *note2) {
+        const int pitch1 = note1->GetMIDIPitch(params->m_transSemi);
+        const int pitch2 = note2->GetMIDIPitch(params->m_transSemi);
+        return playTopDown ? (pitch1 > pitch2) : (pitch1 < pitch2);
+    });
+
+    // Defer the notes in playing order
+    double shift = 0.0;
+    const double increment = UNACC_GRACENOTE_DUR * params->m_currentTempo / 60000.0;
+    for (Note *note : sortedNotes) {
+        if (shift > 0.0) params->m_deferredNotes[note] = shift;
+        shift += increment;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/doc.cpp b/src/doc.cpp
index e8c167ef537..38464410398 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -386,6 +386,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
             Functor prepareMIDI(&Object::PrepareMIDI);
             PrepareMIDIParams prepareMIDIParams;
             prepareMIDIParams.m_transSemi = transSemi;
+            prepareMIDIParams.m_currentTempo = tempo;
             this->Process(&prepareMIDI, &prepareMIDIParams, NULL, &filters);
 
             Functor generateMIDI(&Object::GenerateMIDI);
diff --git a/src/measure.cpp b/src/measure.cpp
index 63cdb8604ba..847bd2e9097 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -1533,6 +1533,16 @@ int Measure::PrepareTimestampsEnd(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int Measure::PrepareMIDI(FunctorParams *functorParams)
+{
+    PrepareMIDIParams *params = vrv_params_cast<PrepareMIDIParams *>(functorParams);
+    assert(params);
+
+    params->m_currentTempo = m_currentTempo;
+
+    return FUNCTOR_CONTINUE;
+}
+
 int Measure::GenerateMIDI(FunctorParams *functorParams)
 {
     GenerateMIDIParams *params = vrv_params_cast<GenerateMIDIParams *>(functorParams);

From 3e9d4cb262ccd6e4509d2e101b4795b29d4da684 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 31 Jan 2022 17:07:01 +0200
Subject: [PATCH 185/403] Add support for improting tuplets via ABC format

- Added method to parse tuplets
- replaced AddBeams method with more generic one
---
 include/vrv/ioabc.h |  11 ++++-
 src/ioabc.cpp       | 113 +++++++++++++++++++++++++++++++-------------
 2 files changed, 88 insertions(+), 36 deletions(-)

diff --git a/include/vrv/ioabc.h b/include/vrv/ioabc.h
index 19e738e5283..89f78e66ec0 100644
--- a/include/vrv/ioabc.h
+++ b/include/vrv/ioabc.h
@@ -59,8 +59,8 @@ class ABCInput : public Input {
     int SetBarLine(const std::string &musicCode, int index);
     void CalcUnitNoteLength();
     void AddAnnot(const std::string &remark);
-    void AddBeam();
-    void AddTuplet();
+    void AddLayerElement();
+    int AddTuplet(const std::string &musicCode, int i);
     void AddTie();
     void StartSlur();
     void EndSlur();
@@ -95,6 +95,11 @@ class ABCInput : public Input {
 public:
     //
 private:
+    enum class ElementType {
+        Default,
+        Tuplet
+    };
+
     std::string m_filename;
     Mdiv *m_mdiv = NULL;
     Clef *m_clef = NULL;
@@ -117,6 +122,8 @@ class ABCInput : public Input {
     int m_gracecount = 0;
     int m_stafflines = 5;
     int m_transpose = 0;
+    ElementType m_type = ElementType::Default;
+    std::pair<ElementType, LayerElement *> m_containerPair = { ElementType::Default, NULL };
     /*
      * ABC metadata stacks
      */
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 52d65c43554..4c4722e1578 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -13,6 +13,7 @@
 #include <fstream>
 #include <sstream>
 #include <string>
+#include <unordered_set>
 
 //----------------------------------------------------------------------------
 
@@ -304,44 +305,89 @@ void ABCInput::CalcUnitNoteLength()
     }
 }
 
-void ABCInput::AddBeam()
+void ABCInput::AddLayerElement() 
 {
-    if (!m_noteStack.size()) {
-        return;
-    }
-    else if (m_noteStack.size() == 1) {
+    // exit if there is nothing to add
+    if (!m_noteStack.size()) return;
+    // if just one note in the stack - add it do the layer directly
+    if (m_noteStack.size() == 1) {
         m_layer->AddChild(m_noteStack.back());
+        m_noteStack.clear();
+    }
+    // otherwise we can have beam or tuplet (for now)
+    LayerElement *element = NULL;
+    // if container pair key is set to Tuplet - proceed with it
+    if (m_containerPair.second && (ElementType::Tuplet == m_containerPair.first)) {
+        element = m_containerPair.second;
+    }
+    // otherwise default to it being beam
+    else {
+        element = new Beam();
+    }
+    // add stacked notes to the current element
+    for (auto iter = m_noteStack.begin(); iter != m_noteStack.end(); ++iter) {
+        element->AddChild(*iter);
+    }
+    if (element->FindDescendantByType(NOTE)) {
+        m_layer->AddChild(element);
     }
     else {
-        Beam *beam = new Beam();
         for (auto iter = m_noteStack.begin(); iter != m_noteStack.end(); ++iter) {
-            beam->AddChild(*iter);
-        }
-        if (beam->FindDescendantByType(NOTE)) {
-            m_layer->AddChild(beam);
-        }
-        else {
-            for (auto iter = m_noteStack.begin(); iter != m_noteStack.end(); ++iter) {
-                m_layer->AddChild(*iter);
-            }
+            m_layer->AddChild(*iter);
         }
     }
+    m_containerPair = { ElementType::Default, NULL };
     m_noteStack.clear();
 }
 
-void ABCInput::AddTuplet()
+int ABCInput::AddTuplet(const std::string &musicCode, int i)
 {
-    if (!m_noteStack.size()) {
-        return;
+    constexpr std::string_view tupletElements = "(:0123456789 ";
+    const size_t tupletEnd = musicCode.find_first_not_of(tupletElements, ++i);
+    const std::string tupletStr = musicCode.substr(i, tupletEnd - i);
+
+    Tuplet *tuplet = new Tuplet();    
+    size_t separator = tupletStr.find_first_of(":");
+    // Get tuplet number first 9:_:_
+    int tupletNum = 0;
+    if (separator != std::string::npos) {
+        const std::string tupletNumStr = tupletStr.substr(0, separator);
+        tupletNum = atoi(tupletNumStr.data());
+        ++separator;
     }
     else {
-        Tuplet *tuplet = new Tuplet();
-        for (auto iter = m_noteStack.begin(); iter != m_noteStack.end(); ++iter) {
-            tuplet->AddChild(*iter);
+        tupletNum = atoi(tupletStr.c_str());
+    }
+    // Get tuplet number base _:3:_
+    int tupletNumbase = 0;
+    if (separator != std::string::npos) {
+        size_t secondSeparator = tupletStr.find_first_of(":", separator);
+        if (secondSeparator != std::string::npos) {
+            if (secondSeparator != separator) {
+                std::string tupletNumbaseStr = tupletStr.substr(separator, secondSeparator - separator);
+                tupletNumbase = atoi(tupletNumbaseStr.data());
+                separator = secondSeparator + 1;
+            }
+        }
+        else {
+            std::string tupletNumbaseStr = tupletStr.substr(separator);
+            tupletNumbase = atoi(tupletNumbaseStr.data());
+            separator = secondSeparator + 1;
         }
-        m_layer->AddChild(tuplet);
     }
-    m_noteStack.clear();
+    // List of tuplets with default base of 3
+    const std::unordered_set<int> threeBase = { 2, 4, 8, 9 };
+    if (!tupletNumbase) {
+        tupletNumbase = threeBase.count(tupletNum) ? 3 : 2;
+    }
+    // Get number of elements supposed to be in the tuplet _:_:9
+    // Ignore this for the time being
+    tuplet->SetNum(tupletNum);
+    tuplet->SetNumbase(tupletNumbase);
+    m_containerPair = { ElementType::Tuplet, tuplet };
+
+    // return index of the last element in tuplet, so that we point to the actual notes when incrementing 'i'
+    return tupletEnd - 1;
 }
 
 void ABCInput::AddAnnot(const std::string &remark)
@@ -1032,7 +1078,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
         }
         if (isspace(musicCode.at(i))) {
             // always ends a beam
-            AddBeam();
+            AddLayerElement();
         }
 
         // comments
@@ -1067,7 +1113,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
 
         // linebreaks
         else if (musicCode.at(i) == m_linebreak) {
-            AddBeam();
+            AddLayerElement();
             Sb *sb = new Sb();
             section->AddChild(sb);
         }
@@ -1092,8 +1138,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
 
         // tuplets
         else if ((i + 2 < (int)musicCode.length()) && musicCode.at(i) == '(' && isdigit(musicCode.at(i + 1))) {
-            LogWarning("ABC import: Tuplets not supported yet");
-            // AddTuplet();
+            i = AddTuplet(musicCode, i);
         }
 
         // slurs and ties
@@ -1136,7 +1181,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
             // end chord
             if (chord->GetDur() < DURATION_8) {
                 // if chord cannot be beamed, write it directly to the layer
-                if (m_noteStack.size() > 0) AddBeam();
+                if (m_noteStack.size() > 0) AddLayerElement();
                 m_layer->AddChild(chord);
             }
             else
@@ -1157,7 +1202,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
             }
             // end grace group
             else {
-                if ((m_gracecount > 1) || (grace == GRACE_unacc)) AddBeam();
+                if ((m_gracecount > 1) || (grace == GRACE_unacc)) AddLayerElement();
                 grace = GRACE_NONE;
                 m_gracecount = 0;
             }
@@ -1315,7 +1360,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
                 note->SetDur(meiDur);
                 if (note->GetDur() < DURATION_8) {
                     // if note cannot be beamed, write it directly to the layer
-                    if (m_noteStack.size() > 0) AddBeam();
+                    if (m_noteStack.size() > 0) AddLayerElement();
                     m_layer->AddChild(note);
                 }
                 else
@@ -1395,7 +1440,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
             space->SetDur(meiDur);
 
             // spaces cannot be beamed
-            AddBeam();
+            AddLayerElement();
             m_layer->AddChild(space);
         }
 
@@ -1472,7 +1517,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
             rest->SetDur(meiDur);
 
             // rests cannot be beamed
-            AddBeam();
+            AddLayerElement();
             m_layer->AddChild(rest);
         }
 
@@ -1517,7 +1562,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
         // barLine
         else if (musicCode.at(i) == '|') {
             // add stacked elements to layer
-            AddBeam();
+            AddLayerElement();
             i = SetBarLine(musicCode, i);
 
             if (m_barLines.second != BARRENDITION_NONE) {
@@ -1569,7 +1614,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
     // Verovio does not support line-breaks within a layer
     // has to be refined later
     if (sysBreak && (m_linebreak != '\0') && !(section->GetLast())->Is(SB)) {
-        AddBeam();
+        AddLayerElement();
         Sb *sb = new Sb();
         sb->SetUuid(StringFormat("abcLine%02d", m_lineNum + 1));
         section->AddChild(sb);

From 35db6486e1c357ed544a7d11b66da8608c2770a6 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 1 Feb 2022 08:43:40 +0100
Subject: [PATCH 186/403] Use MIDI_TEMPO

---
 include/vrv/functorparams.h | 10 +++++-----
 src/measure.cpp             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 83f0b49cb27..66fad0bbd58 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1005,7 +1005,7 @@ class CalcMaxMeasureDurationParams : public FunctorParams {
     {
         m_currentScoreTime = 0.0;
         m_currentRealTimeSeconds = 0.0;
-        m_currentTempo = 120.0;
+        m_currentTempo = MIDI_TEMPO;
         m_tempoAdjustment = 1.0;
         m_multiRestFactor = 1;
     }
@@ -1038,7 +1038,7 @@ class CalcOnsetOffsetParams : public FunctorParams {
         m_currentMensur = NULL;
         m_currentMeterSig = NULL;
         m_notationType = NOTATIONTYPE_cmn;
-        m_currentTempo = 120.0;
+        m_currentTempo = MIDI_TEMPO;
     }
     double m_currentScoreTime;
     double m_currentRealTimeSeconds;
@@ -1628,7 +1628,7 @@ class GenerateMIDIParams : public FunctorParams {
         m_midiTrack = 1;
         m_totalTime = 0.0;
         m_transSemi = 0;
-        m_currentTempo = 120.0;
+        m_currentTempo = MIDI_TEMPO;
         m_lastNote = NULL;
         m_accentedGraceNote = false;
         m_functor = functor;
@@ -1666,7 +1666,7 @@ class GenerateTimemapParams : public FunctorParams {
     {
         m_scoreTimeOffset = 0.0;
         m_realTimeOffsetMilliseconds = 0;
-        m_currentTempo = 120.0;
+        m_currentTempo = MIDI_TEMPO;
         m_timemap = timemap;
         m_functor = functor;
     }
@@ -2034,7 +2034,7 @@ class PrepareMIDIParams : public FunctorParams {
     PrepareMIDIParams()
     {
         m_transSemi = 0;
-        m_currentTempo = 120.0;
+        m_currentTempo = MIDI_TEMPO;
     }
     int m_transSemi;
     double m_currentTempo;
diff --git a/src/measure.cpp b/src/measure.cpp
index 847bd2e9097..2f474246dbd 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -154,7 +154,7 @@ void Measure::Reset()
 
     m_scoreTimeOffset.clear();
     m_realTimeOffsetMilliseconds.clear();
-    m_currentTempo = 120.0;
+    m_currentTempo = MIDI_TEMPO;
 }
 
 bool Measure::IsSupportedChild(Object *child)

From 0fed4614081c5e34ab55e4f09e9ba93945e724b8 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 10:48:07 +0100
Subject: [PATCH 187/403] Convert PAE 7. (dotted 128th notes) to stemless
 quarter notes. Fixes #2593

---
 src/iopae.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/iopae.cpp b/src/iopae.cpp
index 16c2aa02434..cedbabcfc4e 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -3995,7 +3995,16 @@ bool PAEInput::ConvertDuration()
             assert(interface);
             interface->SetDur(currentDur->first);
             if (currentDur->second) {
-                interface->SetDots(currentDur->second);
+                if (interface->GetDur() == DURATION_128 && token.Is(NOTE)) {
+                    Note *note = vrv_cast<Note *>(token.m_object);
+                    assert(note);
+                    note->SetDur(DURATION_4);
+                    note->SetStemLen(0);
+                    note->SetStemVisible(BOOLEAN_false);
+                }
+                else {
+                    interface->SetDots(currentDur->second);
+                }
             }
             // Move to the next on the stack - but this is meanless if we have a single value
             if (durations.size() > 1) {

From eca5de47bf287ec5ac7715442ee9a1a0a0f3d85b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 10:58:09 +0100
Subject: [PATCH 188/403] Use an iterator in PAEInput::ConvertDuration() for
 allowing mensural dot insertion

---
 src/iopae.cpp | 45 +++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/iopae.cpp b/src/iopae.cpp
index cedbabcfc4e..9d389b3742d 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -3956,17 +3956,23 @@ bool PAEInput::ConvertDuration()
     std::string paeStr;
     bool isChord = false;
 
-    for (auto &token : m_pae) {
-        if (token.IsVoid()) continue;
+    // Here we need an iterator because we might have to add a mensural dots
+    std::list<pae::Token>::iterator token = m_pae.begin();
+    while (token != m_pae.end()) {
+        if (token->IsVoid()) {
+            ++token;
+            continue;
+        }
 
         // Extract duration string we can then convert in one go
-        if (this->Is(token, pae::DURATION)) {
+        if (this->Is(*token, pae::DURATION)) {
             if (!durationToken) {
-                durationToken = &token;
+                durationToken = &(*token);
                 paeStr.clear();
             }
-            paeStr.push_back(token.m_char);
-            token.m_char = 0;
+            paeStr.push_back(token->m_char);
+            token->m_char = 0;
+            ++token;
             continue;
         }
         // We have reach the end of a duration string - convert it, including patterns
@@ -3978,25 +3984,31 @@ bool PAEInput::ConvertDuration()
             currentDur = durations.begin();
         }
         // For chords we don't want to set the duration on the child notes so we need to keep a flag
-        if (token.Is(CHORD)) {
-            isChord = !token.IsContainerEnd();
-            if (token.IsContainerEnd()) continue;
+        if (token->Is(CHORD)) {
+            isChord = !token->IsContainerEnd();
+            if (token->IsContainerEnd()) {
+                ++token;
+                continue;
+            }
         }
         // Apply the current duration
-        if ((token.Is(NOTE) && !isChord) || token.Is(CHORD) || token.Is(REST)) {
+        if ((token->Is(NOTE) && !isChord) || token->Is(CHORD) || token->Is(REST)) {
             // We should also skip acciaccature
-            if (token.Is(NOTE)) {
-                Note *note = vrv_cast<Note *>(token.m_object);
+            if (token->Is(NOTE)) {
+                Note *note = vrv_cast<Note *>(token->m_object);
                 assert(note);
-                if (note->GetGrace() == GRACE_unacc) continue;
+                if (note->GetGrace() == GRACE_unacc) {
+                    ++token;
+                    continue;
+                }
             }
             // Set the duration to the note, chord or rest
-            DurationInterface *interface = dynamic_cast<DurationInterface *>(token.m_object);
+            DurationInterface *interface = dynamic_cast<DurationInterface *>(token->m_object);
             assert(interface);
             interface->SetDur(currentDur->first);
             if (currentDur->second) {
-                if (interface->GetDur() == DURATION_128 && token.Is(NOTE)) {
-                    Note *note = vrv_cast<Note *>(token.m_object);
+                if (interface->GetDur() == DURATION_128 && token->Is(NOTE)) {
+                    Note *note = vrv_cast<Note *>(token->m_object);
                     assert(note);
                     note->SetDur(DURATION_4);
                     note->SetStemLen(0);
@@ -4013,6 +4025,7 @@ bool PAEInput::ConvertDuration()
                 if (currentDur == durations.end()) currentDur = durations.begin();
             }
         }
+        ++token;
     }
 
     return true;

From d62781906c87e11daaa32e195852f9883496d3cd Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 14 Jan 2021 18:17:05 +0200
Subject: [PATCH 189/403] Fix for beamed chords in the cross-staff context

- fixed logic of drawing chords in the cross-staff beams to allow correct rendering of the beams without any overaps with notes
---
 src/beam.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index a1c313ffc03..847bda44a8e 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -156,12 +156,11 @@ void BeamSegment::CalcBeam(
     // place This occurs when mixed makes no sense and the beam is placed above or below instead.
     this->CalcBeamPlace(layer, beamInterface, place);
 
-    CalcBeamStemLength(staff, beamInterface->m_drawingPlace, horizontal);
-
     if (BEAMPLACE_mixed == beamInterface->m_drawingPlace) {
         CalcMixedBeamPlace(staff);
         CalcPartialFlagPlace();
     }
+    CalcBeamStemLength(staff, beamInterface->m_drawingPlace, horizontal);
 
     // Set drawing stem positions
     CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
@@ -244,7 +243,7 @@ void BeamSegment::CalcBeam(
                 int yMax, yMin;
                 chord->GetYExtremes(yMax, yMin);
                 if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) {
-                    if (coord->m_beamRelativePlace == BEAMPLACE_above) y2 += (yMin - yMax);
+                    y2 += (coord->m_beamRelativePlace == BEAMPLACE_above) ? (yMin - yMax) : (yMax - yMin);
                 }
                 else {
                     y2 += (beamInterface->m_drawingPlace == BEAMPLACE_above) ? (yMin - yMax) : (yMax - yMin);
@@ -1099,9 +1098,16 @@ void BeamSegment::CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterfac
 
 void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal)
 {
-    const data_STEMDIRECTION stemDir = (place == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
     int relevantNoteLoc = VRV_UNSET;
     for (auto coord : m_beamElementCoordRefs) {
+        data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
+        if (place != BEAMPLACE_mixed) {
+            stemDir = (place == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
+        }
+        else {
+            stemDir = (coord->m_beamRelativePlace == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
+        }
+        const int stemDirBias = (stemDir == STEMDIRECTION_up) ? 1 : -1;
         coord->SetClosestNote(stemDir);
         if (!coord->m_closestNote) continue;
         if (relevantNoteLoc == VRV_UNSET) {

From d7477536992b890deeea0e497b30bd02c4a68080 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 18 Jan 2021 14:41:37 +0200
Subject: [PATCH 190/403] Add logic for proper calculation of cross-staff beam
 positioning

- changed approach to how beam postion of cross-staff beams has been calculated - now beams should be centered better with regards of additional beams
- fixed problem of drawing cross-staff fTrems
- added handling of centering for  the cross-staff fTrems (this can be improved further by moving implentation outised of the beamSegement class)
---
 include/vrv/beam.h |  5 +++
 src/beam.cpp       | 87 +++++++++++++++++++++++++++++++++++++---------
 2 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 3ffd24a57ef..5f556055696 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -108,6 +108,8 @@ class BeamSegment {
     bool CalcBeamSlope(
         Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, bool &shorten, int &step);
 
+    void CalcMixedBeamStem(BeamDrawingInterface *beamInterface, int step);
+
     void CalcBeamPosition(Doc *doc, Staff *staff, Layer *layer, BeamDrawingInterface *beamInterface, bool isHorizontal);
 
     void CalcAdjustSlope(Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, bool shorten, int &step);
@@ -132,6 +134,9 @@ class BeamSegment {
     // Helper to check wheter beam fits within certain bounds
     bool DoesBeamOverlap(int staffTop, int topOffset, int staffBottom, int bottomOffset);
 
+    // Helper to find number of additional beams. Return { additional beams below main beam, additional beams above }
+    std::pair<int, int> GetAdditionalBeamCount(BeamDrawingInterface *beamInterface);
+
     // Helper to check mixed beam positioning compared to other elements (ledger lines, staff) and adjust it accordingly
     bool NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface);
 
diff --git a/src/beam.cpp b/src/beam.cpp
index 847bda44a8e..3c34a2b35e4 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -20,6 +20,7 @@
 #include "editorial.h"
 #include "elementpart.h"
 #include "functorparams.h"
+#include "ftrem.h"
 #include "gracegrp.h"
 #include "layer.h"
 #include "measure.h"
@@ -227,6 +228,13 @@ void BeamSegment::CalcBeam(
                 if (coord->m_partialFlagPlace == coord->m_beamRelativePlace) {
                     stemOffset = (coord->m_dur - DUR_8) * beamInterface->m_beamWidth;
                 }
+                // handle cross-staff fTrem cases
+                if (FTrem *fTrem = vrv_cast<FTrem *>(beamInterface);
+                    fTrem->Is(FTREM) && (coord->GetStemDir() == STEMDIRECTION_down)) {
+                    const int beamsCount = fTrem->GetBeams();
+                    stemOffset = (beamsCount - 1) * beamInterface->m_beamWidth;
+                }
+
                 if (coord->m_beamRelativePlace == BEAMPLACE_below) {
                     y1 -= doc->GetDrawingStemWidth(staff->m_drawingStaffSize) + stemOffset;
                     y2 += stemmedInterface->GetStemDownNW(doc, staff->m_drawingStaffSize, beamInterface->m_cueSize).y;
@@ -291,10 +299,14 @@ bool BeamSegment::DoesBeamOverlap(int staffTop, int topOffset, int staffBottom,
     return true;
 }
 
-bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface)
+std::pair<int, int> BeamSegment::GetAdditionalBeamCount(BeamDrawingInterface *beamInterface)
 {
-    const int unit = doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-    // find shortest duration for above/below beams for the sake of calculating overlap with additional beams
+    // In case we're dealing with fTrem - take @beams attribute into consideration
+    FTrem *fTrem = vrv_cast<FTrem *>(beamInterface);
+    if (fTrem->Is(FTREM)) {
+        return { fTrem->GetBeams() - 1, 0 };
+    }
+
     int topShortestDur = DUR_8;
     int bottomShortestDur = DUR_8;
     std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
@@ -305,8 +317,16 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
             bottomShortestDur = std::max(bottomShortestDur, coord->m_dur);
         }
     });
-    const int topOffset = (topShortestDur - DUR_8) * beamInterface->m_beamWidth + unit / 2;
-    const int bottomOffset = (bottomShortestDur - DUR_8) * beamInterface->m_beamWidth + unit / 2;
+
+    return { topShortestDur - DUR_8, bottomShortestDur - DUR_8 };
+}
+
+bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface)
+{
+    const int unit = doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+    const auto [topBeams, bottomBeams] = GetAdditionalBeamCount(beamInterface);
+    const int topOffset = topBeams * beamInterface->m_beamWidth + unit / 2;
+    const int bottomOffset = bottomBeams * beamInterface->m_beamWidth + unit / 2;
 
     // find top and bottom of the staff
     const int staffTop = staff->GetDrawingY();
@@ -552,6 +572,7 @@ bool BeamSegment::CalcBeamSlope(
     m_beamSlope = BoundingBox::CalcSlope(Point(m_firstNoteOrChord->m_x, m_firstNoteOrChord->m_yBeam),
         Point(m_lastNoteOrChord->m_x, m_lastNoteOrChord->m_yBeam));
 
+
     int noteStep = 0;
     double noteSlope = 0.0;
     if (m_firstNoteOrChord->m_closestNote && m_lastNoteOrChord->m_closestNote) {
@@ -736,18 +757,7 @@ bool BeamSegment::CalcBeamSlope(
         }
     }
     else if (place == BEAMPLACE_mixed) {
-        int heightDiff = m_lastNoteOrChord->m_yBeam - m_firstNoteOrChord->m_yBeam;
-        if (curStep < step) {
-            std::swap(m_firstNoteOrChord->m_yBeam, m_lastNoteOrChord->m_yBeam);
-        }
-        if (m_beamSlope > 0.0) {
-            m_firstNoteOrChord->m_yBeam += (heightDiff - step) / 2;
-            m_lastNoteOrChord->m_yBeam -= (heightDiff - step) / 2;
-        }
-        else {
-            m_firstNoteOrChord->m_yBeam += (heightDiff + step) / 2;
-            m_lastNoteOrChord->m_yBeam -= (heightDiff + step) / 2;
-        }
+        CalcMixedBeamStem(beamInterface, step);
     }
 
     m_beamSlope = BoundingBox::CalcSlope(Point(m_firstNoteOrChord->m_x, m_firstNoteOrChord->m_yBeam),
@@ -764,6 +774,48 @@ bool BeamSegment::CalcBeamSlope(
     return true;
 }
 
+
+void BeamSegment::CalcMixedBeamStem(BeamDrawingInterface *beamInterface, int step)
+{
+    // In cases, when both first and last notes/chords of the beam have same relative places (i.e. they have same stem
+    // direction and/or same staff), - we don't need additional calculations
+    if (m_firstNoteOrChord->m_beamRelativePlace == m_lastNoteOrChord->m_beamRelativePlace) {
+        if (m_beamSlope < 0.0) {
+            m_firstNoteOrChord->m_yBeam = m_lastNoteOrChord->m_yBeam + step;
+        }
+        else {
+            m_lastNoteOrChord->m_yBeam = m_firstNoteOrChord->m_yBeam + step;
+        }
+        return;
+    }
+
+    int highestPoint = m_firstNoteOrChord->m_yBeam;
+    int lowestPoint = m_lastNoteOrChord->m_yBeam;
+    if (m_nbNotesOrChords > 2) {
+        std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
+            if ((coord->m_beamRelativePlace == BEAMPLACE_above) && (coord->m_yBeam > highestPoint)) {
+                highestPoint = coord->m_yBeam;
+            };
+            if ((coord->m_beamRelativePlace == BEAMPLACE_below) && (coord->m_yBeam < lowestPoint)) {
+                lowestPoint = coord->m_yBeam;
+            };
+        });
+    }
+
+    // This helps with general beams but breaks trems
+    auto [up, down] = GetAdditionalBeamCount(beamInterface);
+
+    // Calculate midpoint for the beam, taking into account highest and lowest points, as well as number of additional
+    // beams above and below main beam. Start position of the beam is then further adjusted based on the step size to
+    // make sure that beam is truly centered
+    int midPoint = (highestPoint + lowestPoint + (up - down) * beamInterface->m_beamWidth) / 2;
+    m_firstNoteOrChord->m_yBeam
+        = (m_lastNoteOrChord->m_beamRelativePlace == BEAMPLACE_below) ? midPoint - step / 2 : midPoint + step / 2;
+    m_lastNoteOrChord->m_yBeam = (m_lastNoteOrChord->m_beamRelativePlace == BEAMPLACE_below)
+        ? m_firstNoteOrChord->m_yBeam + step
+        : m_firstNoteOrChord->m_yBeam - step;
+}
+
 void BeamSegment::CalcBeamPosition(
     Doc *doc, Staff *staff, Layer *layer, BeamDrawingInterface *beamInterface, bool isHorizontal)
 {
@@ -1099,6 +1151,7 @@ void BeamSegment::CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterfac
 void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal)
 {
     int relevantNoteLoc = VRV_UNSET;
+    //data_STEMDIRECTION stemDir = (place == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
     for (auto coord : m_beamElementCoordRefs) {
         data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
         if (place != BEAMPLACE_mixed) {

From 84c91ac72a2495bee9e59942ab6054f1c1ade016 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 20 Jan 2021 13:53:20 +0200
Subject: [PATCH 191/403] Additional improvements for the beam positioning

- extended beam reset logic to apply to cross-staff beams as well
- changed mixed beam placement to reverse endpoint Y coordinates, if either of them collide with notes
- minor code improvements
---
 include/vrv/beam.h |  2 +-
 src/beam.cpp       | 92 +++++++++++++++++++++++++---------------------
 2 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 5f556055696..6aef3ccc7ca 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -132,7 +132,7 @@ class BeamSegment {
     void CalcSetValues();
 
     // Helper to check wheter beam fits within certain bounds
-    bool DoesBeamOverlap(int staffTop, int topOffset, int staffBottom, int bottomOffset);
+    bool DoesBeamOverlap(int staffTop, int topOffset, int staffBottom, int bottomOffset, bool isCrossStaff = false);
 
     // Helper to find number of additional beams. Return { additional beams below main beam, additional beams above }
     std::pair<int, int> GetAdditionalBeamCount(BeamDrawingInterface *beamInterface);
diff --git a/src/beam.cpp b/src/beam.cpp
index 3c34a2b35e4..4eeb7740700 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -166,7 +166,7 @@ void BeamSegment::CalcBeam(
     // Set drawing stem positions
     CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
     if (BEAMPLACE_mixed == beamInterface->m_drawingPlace) {
-        if (!beamInterface->m_crossStaffContent && NeedToResetPosition(staff, doc, beamInterface)) {
+        if (NeedToResetPosition(staff, doc, beamInterface)) {
             CalcBeamInit(layer, staff, doc, beamInterface, place);
             CalcBeamStemLength(staff, beamInterface->m_drawingPlace, horizontal);
             CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
@@ -271,7 +271,7 @@ void BeamSegment::CalcBeam(
     }
 }
 
-bool BeamSegment::DoesBeamOverlap(int staffTop, int topOffset, int staffBottom, int bottomOffset)
+bool BeamSegment::DoesBeamOverlap(int staffTop, int topOffset, int staffBottom, int bottomOffset, bool isCrossStaff)
 {
     // find if current beam fits within the staff
     auto withinBounds
@@ -281,7 +281,7 @@ bool BeamSegment::DoesBeamOverlap(int staffTop, int topOffset, int staffBottom,
               }
               return false;
           });
-    if (withinBounds != m_beamElementCoordRefs.end()) return false;
+    if (!isCrossStaff && (withinBounds != m_beamElementCoordRefs.end())) return true;
     auto overlapping
         = std::find_if(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
               assert(coord->m_element);
@@ -295,8 +295,7 @@ bool BeamSegment::DoesBeamOverlap(int staffTop, int topOffset, int staffBottom,
               }
               return false;
           });
-    if (overlapping != m_beamElementCoordRefs.end()) return false;
-    return true;
+    return (overlapping != m_beamElementCoordRefs.end());
 }
 
 std::pair<int, int> BeamSegment::GetAdditionalBeamCount(BeamDrawingInterface *beamInterface)
@@ -304,7 +303,7 @@ std::pair<int, int> BeamSegment::GetAdditionalBeamCount(BeamDrawingInterface *be
     // In case we're dealing with fTrem - take @beams attribute into consideration
     FTrem *fTrem = vrv_cast<FTrem *>(beamInterface);
     if (fTrem->Is(FTREM)) {
-        return { fTrem->GetBeams() - 1, 0 };
+        return { fTrem->GetBeams() / 2, 0 };
     }
 
     int topShortestDur = DUR_8;
@@ -333,43 +332,47 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
     const int staffBottom
         = staffTop - doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - 1);
 
-    if (DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
-
-    // Calculate midpoint for the beam with mixed placement
-    int min = m_beamElementCoordRefs.at(0)->m_element->GetDrawingY();
-    int max = m_beamElementCoordRefs.at(0)->m_element->GetDrawingY();
-    for (auto coord : m_beamElementCoordRefs) {
-        max = std::max(max, coord->m_element->GetDrawingY());
-        min = std::min(min, coord->m_element->GetDrawingY());
-    }
-    const int midpoint = (max + min) / 2;
-    bool isMidpointWithinBounds = (midpoint < staffTop - topOffset) && (midpoint > staffBottom + bottomOffset);
-
-    // If midpoint fits within bounds of the staff, try to place beam there
-    if (isMidpointWithinBounds) {
-        const int midpointOffset
-            = (m_beamElementCoordRefs.front()->m_yBeam + m_beamElementCoordRefs.back()->m_yBeam - 2 * midpoint) / 2;
-        std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
-            [midpointOffset](BeamElementCoord *coord) { coord->m_yBeam += midpointOffset; });
-        if (DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
-    }
-    // If midpoint if above the staff, try to place beam at the top edge of the staff
-    if (!isMidpointWithinBounds && (midpoint > staffBottom)) {
-        const int offset = (m_beamElementCoordRefs.front()->m_yBeam + m_beamElementCoordRefs.back()->m_yBeam
-                               - 2 * (staffTop - topOffset))
-            / 2;
-        std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
-            [offset](BeamElementCoord *coord) { coord->m_yBeam -= offset; });
+    if (!DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset, beamInterface->m_crossStaffContent)) {
+        return false;
     }
-    // otherwise try placing it on the bottom edge
-    else if (!isMidpointWithinBounds && (midpoint < staffTop)) {
-        const int offset = (m_beamElementCoordRefs.front()->m_yBeam + m_beamElementCoordRefs.back()->m_yBeam
-                               - 2 * (staffBottom + bottomOffset))
-            / 2;
-        std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
-            [offset](BeamElementCoord *coord) { coord->m_yBeam += offset; });
+        
+    if (!beamInterface->m_crossStaffContent) {
+        // Calculate midpoint for the beam with mixed placement
+        int min = m_beamElementCoordRefs.at(0)->m_element->GetDrawingY();
+        int max = m_beamElementCoordRefs.at(0)->m_element->GetDrawingY();
+        for (auto coord : m_beamElementCoordRefs) {
+            max = std::max(max, coord->m_element->GetDrawingY());
+            min = std::min(min, coord->m_element->GetDrawingY());
+        }
+        const int midpoint = (max + min) / 2;
+        bool isMidpointWithinBounds = (midpoint < staffTop - topOffset) && (midpoint > staffBottom + bottomOffset);
+
+        // If midpoint fits within bounds of the staff, try to place beam there
+        if (isMidpointWithinBounds) {
+            const int midpointOffset
+                = (m_beamElementCoordRefs.front()->m_yBeam + m_beamElementCoordRefs.back()->m_yBeam - 2 * midpoint) / 2;
+            std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
+                [midpointOffset](BeamElementCoord *coord) { coord->m_yBeam += midpointOffset; });
+            if (!DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
+        }
+        // If midpoint if above the staff, try to place beam at the top edge of the staff
+        if (!isMidpointWithinBounds && (midpoint > staffBottom)) {
+            const int offset = (m_beamElementCoordRefs.front()->m_yBeam + m_beamElementCoordRefs.back()->m_yBeam
+                                   - 2 * (staffTop - topOffset))
+                / 2;
+            std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
+                [offset](BeamElementCoord *coord) { coord->m_yBeam -= offset; });
+        }
+        // otherwise try placing it on the bottom edge
+        else if (!isMidpointWithinBounds && (midpoint < staffTop)) {
+            const int offset = (m_beamElementCoordRefs.front()->m_yBeam + m_beamElementCoordRefs.back()->m_yBeam
+                                   - 2 * (staffBottom + bottomOffset))
+                / 2;
+            std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
+                [offset](BeamElementCoord *coord) { coord->m_yBeam += offset; });
+        }
+        if (!DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
     }
-    if (DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
 
     // If none of the positions work - there's no space for us to draw a mixed beam (or there is space but it would
     // overlap with ledger line). Adjust beam placement based on the most frequent stem direction
@@ -779,7 +782,7 @@ void BeamSegment::CalcMixedBeamStem(BeamDrawingInterface *beamInterface, int ste
 {
     // In cases, when both first and last notes/chords of the beam have same relative places (i.e. they have same stem
     // direction and/or same staff), - we don't need additional calculations
-    if (m_firstNoteOrChord->m_beamRelativePlace == m_lastNoteOrChord->m_beamRelativePlace) {
+    if ((m_firstNoteOrChord->m_beamRelativePlace == m_lastNoteOrChord->m_beamRelativePlace) && (!beamInterface->m_crossStaffContent)) {
         if (m_beamSlope < 0.0) {
             m_firstNoteOrChord->m_yBeam = m_lastNoteOrChord->m_yBeam + step;
         }
@@ -814,6 +817,11 @@ void BeamSegment::CalcMixedBeamStem(BeamDrawingInterface *beamInterface, int ste
     m_lastNoteOrChord->m_yBeam = (m_lastNoteOrChord->m_beamRelativePlace == BEAMPLACE_below)
         ? m_firstNoteOrChord->m_yBeam + step
         : m_firstNoteOrChord->m_yBeam - step;
+    if ((abs(m_firstNoteOrChord->m_yBeam - m_firstNoteOrChord->m_element->GetDrawingY()) < beamInterface->m_beamWidth)
+        || (abs(m_lastNoteOrChord->m_yBeam - m_lastNoteOrChord->m_element->GetDrawingY())
+            < beamInterface->m_beamWidth)) {
+        std::swap(m_lastNoteOrChord->m_yBeam, m_firstNoteOrChord->m_yBeam);
+    }
 }
 
 void BeamSegment::CalcBeamPosition(

From cc33b8f07882e49c923b30a57b901cb4a868d346 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 25 Jan 2021 17:57:15 +0200
Subject: [PATCH 192/403] Extend rule for horizontal beams

- changed condition for horizontal beams to include cases when internal notes are on the same position as start and end notes
---
 src/drawinginterface.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index e1f48e1f3ac..ee35d5a68ec 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -290,10 +290,10 @@ bool BeamDrawingInterface::IsHorizontal()
     // Detect concave shapes
     for (i = 1; i < itemCount - 1; ++i) {
         if (m_drawingPlace == BEAMPLACE_above) {
-            if ((items.at(i) > first) && (items.at(i) > last)) return true;
+            if ((items.at(i) >= first) && (items.at(i) >= last)) return true;
         }
         else {
-            if ((items.at(i) < first) && (items.at(i) < last)) return true;
+            if ((items.at(i) <= first) && (items.at(i) <= last)) return true;
         }
     }
 

From ec78d6df3799ff4dca85ec3a395c922802a72113 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 27 Jan 2021 14:43:25 +0200
Subject: [PATCH 193/403] Add logic for handling beam slope for mixed beams

- added separate logic for determining whether mixed beam should be drawn horizontal
---
 src/drawinginterface.cpp | 69 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index ee35d5a68ec..1ef88e8a43a 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -21,6 +21,19 @@
 
 namespace vrv {
 
+enum class NoteDirection {
+    none,
+    upward,
+    downward
+};
+
+// helper for determining note direction
+NoteDirection GetNoteDirection(int leftNoteX, int rightNoteX)
+{
+    if (leftNoteX == rightNoteX) return NoteDirection::none;
+    return (leftNoteX < rightNoteX) ? NoteDirection::upward : NoteDirection::downward;
+}
+
 //----------------------------------------------------------------------------
 // DrawingListInterface
 //----------------------------------------------------------------------------
@@ -268,14 +281,16 @@ bool BeamDrawingInterface::IsHorizontal()
     int elementCount = (int)m_beamElementCoords.size();
 
     std::vector<int> items;
+    std::vector<data_BEAMPLACE> directions;
     items.reserve(m_beamElementCoords.size());
+    directions.reserve(m_beamElementCoords.size());
 
-    int i;
-    for (i = 0; i < elementCount; ++i) {
+    for (int i = 0; i < elementCount; ++i) {
         BeamElementCoord *coord = m_beamElementCoords.at(i);
         if (!coord->m_stem || !coord->m_closestNote) continue;
 
         items.push_back(coord->m_closestNote->GetDrawingY());
+        directions.push_back(coord->m_beamRelativePlace);
     }
     int itemCount = (int)items.size();
 
@@ -288,14 +303,60 @@ bool BeamDrawingInterface::IsHorizontal()
     if (first == last) return true;
 
     // Detect concave shapes
-    for (i = 1; i < itemCount - 1; ++i) {
+    for (int i = 1; i < itemCount - 1; ++i) {
         if (m_drawingPlace == BEAMPLACE_above) {
             if ((items.at(i) >= first) && (items.at(i) >= last)) return true;
         }
-        else {
+        else if (m_drawingPlace == BEAMPLACE_below) {
             if ((items.at(i) <= first) && (items.at(i) <= last)) return true;
         }
     }
+    if (m_drawingPlace == BEAMPLACE_mixed) {
+        if ((itemCount == 3) && (directions.front() == directions.back())) return true;
+        int directionChanges = 0;
+        data_BEAMPLACE previous = directions.front();
+        std::for_each(directions.begin(), directions.end(), [&previous, &directionChanges](data_BEAMPLACE current) {
+            if (current != previous) {
+                ++directionChanges;
+                previous = current;
+            }
+        });
+        // if we have a mix of cross-staff elements, going from one staff to another repeatedly, we need to check note
+        // directions. Otherwise we can use direction of the outside pitches for beam
+        if (directionChanges > 1) {
+            int previousTop = VRV_UNSET;
+            int previousBottom = VRV_UNSET;
+            NoteDirection outsidePitchDirection = GetNoteDirection(first, last);
+            std::map<NoteDirection, int> beamDirections{ { NoteDirection::none, 0 }, { NoteDirection::upward, 0 },
+                { NoteDirection::downward, 0 } };
+            for (int i = 0; i < itemCount; ++i) {
+                if (directions[i] == BEAMPLACE_above) {
+                    if (previousTop == VRV_UNSET) {
+                        previousTop = items[i];
+                    }
+                    else {
+                        ++beamDirections[GetNoteDirection(previousTop, items[i])];
+                    }
+                }
+                else if (directions[i] == BEAMPLACE_below) {
+                    if (previousBottom == VRV_UNSET) {
+                        previousBottom = items[i];
+                    }
+                    else {
+                        ++beamDirections[GetNoteDirection(previousBottom, items[i])];
+                    }
+                }
+            }
+            // if direction of beam outside pitches corresponds to majority of the note directions within the beam, beam
+            // can be drawn in that direction. Otherwise horizontal beam should be used
+            bool result = std::all_of(beamDirections.begin(), beamDirections.end(),
+                [&beamDirections, &outsidePitchDirection](const auto &pair) {
+                    return (pair.first == outsidePitchDirection) ? true
+                                                                 : pair.second <= beamDirections[outsidePitchDirection];
+                });
+            if (!result) return true;
+        }
+    }
 
     // Detect beam with two pitches only and as step at the beginning or at the end
     const bool firstStep = (first != items.at(1));

From 9ecad7e7cdadd51be2522e34079ff87a6d8a1d60 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 28 Jan 2021 15:29:07 +0200
Subject: [PATCH 194/403] Beam calculation fixes and horizontal positioning
 adjustment

- fixed a bug where lowest point was set incorrectly (when first and last point of beam were on the same side of the mixed beam)
- changed position calculation for the mixed beam - it now follows the same logic, as sloped beams, but with 0 step - that make first and last element on the same position
- if mixed beam were to be drawn as sloped, but slope is too small to consider - adjust beam to be drawn as horizontal
---
 include/vrv/beam.h |  3 ++
 src/beam.cpp       | 75 +++++++++++++++++++++++++---------------------
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 6aef3ccc7ca..8ee97e9b7db 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -122,6 +122,9 @@ class BeamSegment {
     // Helper to calculate the longest stem length of the beam (which will be used uniformely)
     void CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal);
 
+    // Calculate positioning for the horizontal beams
+    void CalcHorizontalBeam(BeamDrawingInterface *beamInterface);
+
     // Helper to calculate relative position of the beam to for each of the coordinates
     void CalcMixedBeamPlace(Staff *staff);
 
diff --git a/src/beam.cpp b/src/beam.cpp
index 4eeb7740700..b1dffdcee7f 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -760,6 +760,12 @@ bool BeamSegment::CalcBeamSlope(
         }
     }
     else if (place == BEAMPLACE_mixed) {
+        if (step <= unit) {
+            step = 0;
+        }            
+        else if (step > unit * 2) {
+            step = unit * 2;
+        } 
         CalcMixedBeamStem(beamInterface, step);
     }
 
@@ -792,15 +798,15 @@ void BeamSegment::CalcMixedBeamStem(BeamDrawingInterface *beamInterface, int ste
         return;
     }
 
-    int highestPoint = m_firstNoteOrChord->m_yBeam;
-    int lowestPoint = m_lastNoteOrChord->m_yBeam;
+    int highestPoint = VRV_UNSET;
+    int lowestPoint = VRV_UNSET;
     if (m_nbNotesOrChords > 2) {
         std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
-            if ((coord->m_beamRelativePlace == BEAMPLACE_above) && (coord->m_yBeam > highestPoint)) {
-                highestPoint = coord->m_yBeam;
+            if (coord->m_beamRelativePlace == BEAMPLACE_above) {
+                if ((highestPoint == VRV_UNSET) || (coord->m_yBeam > highestPoint)) highestPoint = coord->m_yBeam;
             };
-            if ((coord->m_beamRelativePlace == BEAMPLACE_below) && (coord->m_yBeam < lowestPoint)) {
-                lowestPoint = coord->m_yBeam;
+            if (coord->m_beamRelativePlace == BEAMPLACE_below) {
+                if ((lowestPoint == VRV_UNSET) || (coord->m_yBeam < lowestPoint)) lowestPoint = coord->m_yBeam;
             };
         });
     }
@@ -865,34 +871,7 @@ void BeamSegment::CalcBeamPosition(
         }
     }
     else {
-
-        // Find the longest stem length
-        int maxLength = (beamInterface->m_drawingPlace == BEAMPLACE_above) ? VRV_UNSET : -VRV_UNSET;
-
-        for (auto coord : m_beamElementCoordRefs) {
-            if (!coord->m_stem) continue;
-
-            if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
-                if (maxLength < coord->m_yBeam) maxLength = coord->m_yBeam;
-            }
-            else if (beamInterface->m_drawingPlace == BEAMPLACE_below) {
-                if (maxLength > coord->m_yBeam) maxLength = coord->m_yBeam;
-            }
-            else if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) {
-                if (coord->m_beamRelativePlace == BEAMPLACE_above) {
-                    if (maxLength < coord->m_yBeam) maxLength = coord->m_yBeam;
-                }
-                else if (coord->m_beamRelativePlace == BEAMPLACE_below) {
-                    if (maxLength > coord->m_yBeam) maxLength = coord->m_yBeam;
-                }
-            }
-        }
-
-        if (-VRV_UNSET != abs(maxLength)) {
-            m_beamElementCoordRefs.at(0)->m_yBeam = maxLength;
-        }
-
-        this->CalcAdjustPosition(staff, doc, beamInterface);
+        CalcHorizontalBeam(beamInterface);
     }
 
     if (!beamInterface->m_crossStaffContent) this->AdjustBeamToLedgerLines(doc, staff, beamInterface);
@@ -1204,6 +1183,34 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
     }
 }
 
+void BeamSegment::CalcHorizontalBeam(BeamDrawingInterface* beamInterface) {
+    
+    if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) {
+        CalcMixedBeamStem(beamInterface, 0);
+    }
+    else {
+        int maxLength = (beamInterface->m_drawingPlace == BEAMPLACE_above) ? VRV_UNSET : -VRV_UNSET;
+
+        // Find the longest stem length
+        for (auto coord : m_beamElementCoordRefs) {
+            if (!coord->m_stem) continue;
+
+            if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
+                if (maxLength < coord->m_yBeam) maxLength = coord->m_yBeam;
+            }
+            else if (beamInterface->m_drawingPlace == BEAMPLACE_below) {
+                if (maxLength > coord->m_yBeam) maxLength = coord->m_yBeam;
+            }
+        }
+
+        if (-VRV_UNSET != abs(maxLength)) {
+            m_beamElementCoordRefs.at(0)->m_yBeam = maxLength;
+        }
+    }
+
+    CalcSetValues();
+}
+
 void BeamSegment::CalcMixedBeamPlace(Staff *staff)
 {
     const int currentStaffN = staff->GetN();

From 7af6962a9db9143aafce735a5b5e0d2dcd47843c Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 28 Jan 2021 17:35:04 +0200
Subject: [PATCH 195/403] Code cleanup + concave shape re-fix

- separated logic for mixed horizontal beams into new method to make code cleaner
- moved concave shape detection to happen later in the execution, and to happen only when there are no repeated notes at the start/end
---
 include/vrv/drawinginterface.h |   8 +++
 src/drawinginterface.cpp       | 118 +++++++++++++++++----------------
 2 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index 2e8ad957ba8..7d343fdf7b5 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -139,6 +139,14 @@ class BeamDrawingInterface : public ObjectListInterface {
      */
     int GetPosition(Object *object, LayerElement *element);
 
+    //
+private:
+    /**
+     * Determines whether beam should be horizontal based on item positions and relative beam place. Should be used with
+     * mixed beams, where beam place can be different for separate elements
+     */
+    bool IsHorizontal(const std::vector<int> &items, const std::vector<data_BEAMPLACE> &directions) const;
+
 public:
     // values to be set before calling CalcBeam
     bool m_changingDur;
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 1ef88e8a43a..8f52119dc30 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -302,70 +302,25 @@ bool BeamDrawingInterface::IsHorizontal()
     // First note and last note have the same postion
     if (first == last) return true;
 
-    // Detect concave shapes
-    for (int i = 1; i < itemCount - 1; ++i) {
-        if (m_drawingPlace == BEAMPLACE_above) {
-            if ((items.at(i) >= first) && (items.at(i) >= last)) return true;
-        }
-        else if (m_drawingPlace == BEAMPLACE_below) {
-            if ((items.at(i) <= first) && (items.at(i) <= last)) return true;
-        }
-    }
-    if (m_drawingPlace == BEAMPLACE_mixed) {
-        if ((itemCount == 3) && (directions.front() == directions.back())) return true;
-        int directionChanges = 0;
-        data_BEAMPLACE previous = directions.front();
-        std::for_each(directions.begin(), directions.end(), [&previous, &directionChanges](data_BEAMPLACE current) {
-            if (current != previous) {
-                ++directionChanges;
-                previous = current;
-            }
-        });
-        // if we have a mix of cross-staff elements, going from one staff to another repeatedly, we need to check note
-        // directions. Otherwise we can use direction of the outside pitches for beam
-        if (directionChanges > 1) {
-            int previousTop = VRV_UNSET;
-            int previousBottom = VRV_UNSET;
-            NoteDirection outsidePitchDirection = GetNoteDirection(first, last);
-            std::map<NoteDirection, int> beamDirections{ { NoteDirection::none, 0 }, { NoteDirection::upward, 0 },
-                { NoteDirection::downward, 0 } };
-            for (int i = 0; i < itemCount; ++i) {
-                if (directions[i] == BEAMPLACE_above) {
-                    if (previousTop == VRV_UNSET) {
-                        previousTop = items[i];
-                    }
-                    else {
-                        ++beamDirections[GetNoteDirection(previousTop, items[i])];
-                    }
-                }
-                else if (directions[i] == BEAMPLACE_below) {
-                    if (previousBottom == VRV_UNSET) {
-                        previousBottom = items[i];
-                    }
-                    else {
-                        ++beamDirections[GetNoteDirection(previousBottom, items[i])];
-                    }
-                }
-            }
-            // if direction of beam outside pitches corresponds to majority of the note directions within the beam, beam
-            // can be drawn in that direction. Otherwise horizontal beam should be used
-            bool result = std::all_of(beamDirections.begin(), beamDirections.end(),
-                [&beamDirections, &outsidePitchDirection](const auto &pair) {
-                    return (pair.first == outsidePitchDirection) ? true
-                                                                 : pair.second <= beamDirections[outsidePitchDirection];
-                });
-            if (!result) return true;
-        }
-    }
+    // If drawing place is mixed and is should be drawn horizontal based on mixed rules
+    if ((m_drawingPlace == BEAMPLACE_mixed) && (IsHorizontal(items, directions))) return true;
 
     // Detect beam with two pitches only and as step at the beginning or at the end
     const bool firstStep = (first != items.at(1));
     const bool lastStep = (last != items.at(items.size() - 2));
     if ((items.size() > 2) && (firstStep || lastStep)) {
+        // Detect concave shapes
+        for (int i = 1; i < itemCount - 1; ++i) {
+            if (m_drawingPlace == BEAMPLACE_above) {
+                if ((items.at(i) >= first) && (items.at(i) >= last)) return true;
+            }
+            else if (m_drawingPlace == BEAMPLACE_below) {
+                if ((items.at(i) <= first) && (items.at(i) <= last)) return true;
+            }
+        }
         std::vector<int> pitches;
         std::unique_copy(items.begin(), items.end(), std::back_inserter(pitches));
         if (pitches.size() == 2) {
-            // if (firstStep)
             if (m_drawingPlace == BEAMPLACE_above) {
                 // Single note at the beginning as lower first
                 if (firstStep && (std::is_sorted(items.begin(), items.end()))) return true;
@@ -384,6 +339,57 @@ bool BeamDrawingInterface::IsHorizontal()
     return false;
 }
 
+bool BeamDrawingInterface::IsHorizontal(const std::vector<int>& items, const std::vector<data_BEAMPLACE>& directions) const
+{
+    // items and directions should be of the same size, otherwise something is not wrong
+    if (items.size() != directions.size()) return false;
+    if ((items.size() == 3) && (directions.front() == directions.back())) return true;
+
+    // calculate how many times stem direction is changed withing the beam
+    int directionChanges = 0;
+    data_BEAMPLACE previous = directions.front();
+    std::for_each(directions.begin(), directions.end(), [&previous, &directionChanges](data_BEAMPLACE current) {
+        if (current != previous) {
+            ++directionChanges;
+            previous = current;
+        }
+    });
+    // if we have a mix of cross-staff elements, going from one staff to another repeatedly, we need to check note
+    // directions. Otherwise we can use direction of the outside pitches for beam
+    if (directionChanges <= 1) return false;
+
+    int previousTop = VRV_UNSET;
+    int previousBottom = VRV_UNSET;
+    NoteDirection outsidePitchDirection = GetNoteDirection(items.front(), items.back());
+    std::map<NoteDirection, int> beamDirections{ { NoteDirection::none, 0 }, { NoteDirection::upward, 0 },
+        { NoteDirection::downward, 0 } };
+    for (int i = 0; i < items.size(); ++i) {
+        if (directions[i] == BEAMPLACE_above) {
+            if (previousTop == VRV_UNSET) {
+                previousTop = items[i];
+            }
+            else {
+                ++beamDirections[GetNoteDirection(previousTop, items[i])];
+            }
+        }
+        else if (directions[i] == BEAMPLACE_below) {
+            if (previousBottom == VRV_UNSET) {
+                previousBottom = items[i];
+            }
+            else {
+                ++beamDirections[GetNoteDirection(previousBottom, items[i])];
+            }
+        }
+    }
+    // if direction of beam outside pitches corresponds to majority of the note directions within the beam, beam
+    // can be drawn in that direction. Otherwise horizontal beam should be used
+    bool result = std::any_of(
+        beamDirections.begin(), beamDirections.end(), [&beamDirections, &outsidePitchDirection](const auto &pair) {
+            return (pair.first == outsidePitchDirection) ? false : pair.second > beamDirections[outsidePitchDirection];
+        });
+    return result;
+}
+
 bool BeamDrawingInterface::IsRepeatedPattern()
 {
     if (m_drawingPlace == BEAMPLACE_mixed) return false;

From 0b050dfa4f512ff4fdd8882aa0029e97ee2d116d Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 28 Jan 2021 18:25:38 +0200
Subject: [PATCH 196/403] Minor positioning fix

---
 src/drawinginterface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 8f52119dc30..ac5eafa5b65 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -343,7 +343,7 @@ bool BeamDrawingInterface::IsHorizontal(const std::vector<int>& items, const std
 {
     // items and directions should be of the same size, otherwise something is not wrong
     if (items.size() != directions.size()) return false;
-    if ((items.size() == 3) && (directions.front() == directions.back())) return true;
+    if ((items.size() == 3) && (directions.front() == directions.back()) && m_crossStaffContent) return true;
 
     // calculate how many times stem direction is changed withing the beam
     int directionChanges = 0;

From 566a8092453b219ba30cd0efca2b3e44b5fce475 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 29 Apr 2021 13:38:01 +0300
Subject: [PATCH 197/403] Fixes for cross-staff beams

- fixed cross-staff beams with all cross-staff notes - beam position should be calculated properly now and should be treated as if it were ordinary beam
- fixed cross-staff beams with only two notes having invalid rendering - such beams should be properly drawn as cross-staff now
---
 include/vrv/beam.h       |  3 +++
 src/beam.cpp             | 42 ++++++++++++++++++++++++++++------------
 src/drawinginterface.cpp |  6 ++++--
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 8ee97e9b7db..262322059fe 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -122,6 +122,9 @@ class BeamSegment {
     // Helper to calculate the longest stem length of the beam (which will be used uniformely)
     void CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal);
 
+    // Helper to calculate max/min beam points for the relative beam place
+    std::pair<int, int> CalcBeamRelativeMinMax(data_BEAMPLACE place) const;
+
     // Calculate positioning for the horizontal beams
     void CalcHorizontalBeam(BeamDrawingInterface *beamInterface);
 
diff --git a/src/beam.cpp b/src/beam.cpp
index b1dffdcee7f..5c77e827e4e 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -332,6 +332,15 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
     const int staffBottom
         = staffTop - doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - 1);
 
+    if (beamInterface->m_crossStaffContent) {
+        data_BEAMPLACE place = m_beamElementCoordRefs.at(0)->m_beamRelativePlace;
+        auto iter = std::find_if(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
+            [&place](BeamElementCoord *coord) { return coord->m_beamRelativePlace != place; });
+        if (iter == m_beamElementCoordRefs.end()) {
+            beamInterface->m_drawingPlace = place;
+            return true;
+        }
+    }
     if (!DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset, beamInterface->m_crossStaffContent)) {
         return false;
     }
@@ -798,18 +807,10 @@ void BeamSegment::CalcMixedBeamStem(BeamDrawingInterface *beamInterface, int ste
         return;
     }
 
-    int highestPoint = VRV_UNSET;
-    int lowestPoint = VRV_UNSET;
-    if (m_nbNotesOrChords > 2) {
-        std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
-            if (coord->m_beamRelativePlace == BEAMPLACE_above) {
-                if ((highestPoint == VRV_UNSET) || (coord->m_yBeam > highestPoint)) highestPoint = coord->m_yBeam;
-            };
-            if (coord->m_beamRelativePlace == BEAMPLACE_below) {
-                if ((lowestPoint == VRV_UNSET) || (coord->m_yBeam < lowestPoint)) lowestPoint = coord->m_yBeam;
-            };
-        });
-    }
+    auto [aboveMax, aboveMin] = CalcBeamRelativeMinMax(BEAMPLACE_above);
+    auto [belowMax, belowMin] = CalcBeamRelativeMinMax(BEAMPLACE_below);
+    const int highestPoint = (aboveMax != VRV_UNSET) ? aboveMax : belowMax;
+    const int lowestPoint = (belowMin != VRV_UNSET) ? belowMin : aboveMin;
 
     // This helps with general beams but breaks trems
     auto [up, down] = GetAdditionalBeamCount(beamInterface);
@@ -1183,6 +1184,23 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
     }
 }
 
+std::pair<int, int> BeamSegment::CalcBeamRelativeMinMax(data_BEAMPLACE place) const
+{
+    int highestPoint = VRV_UNSET;
+    int lowestPoint = VRV_UNSET;
+    std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
+        if (coord->m_beamRelativePlace == place) {
+            if ((highestPoint == VRV_UNSET) || (coord->m_yBeam > highestPoint))
+                highestPoint = coord->m_yBeam;
+            if ((lowestPoint == VRV_UNSET) || (coord->m_yBeam < lowestPoint)) {
+                lowestPoint = coord->m_yBeam;
+            }
+        }
+    });
+
+    return { highestPoint, lowestPoint };
+}
+
 void BeamSegment::CalcHorizontalBeam(BeamDrawingInterface* beamInterface) {
     
     if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) {
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index ac5eafa5b65..ef4ad2c71b9 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -341,9 +341,11 @@ bool BeamDrawingInterface::IsHorizontal()
 
 bool BeamDrawingInterface::IsHorizontal(const std::vector<int>& items, const std::vector<data_BEAMPLACE>& directions) const
 {
-    // items and directions should be of the same size, otherwise something is not wrong
+    // items and directions should be of the same size, otherwise something is wrong
     if (items.size() != directions.size()) return false;
-    if ((items.size() == 3) && (directions.front() == directions.back()) && m_crossStaffContent) return true;
+    if ((items.size() == 3) && m_crossStaffContent) {
+        if ((directions.at(0) == directions.at(2)) && (directions.at(0) != directions.at(1))) return true;        
+    }
 
     // calculate how many times stem direction is changed withing the beam
     int directionChanges = 0;

From 8703dfe104e399a892acbdea3785376948eea348 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 12 May 2021 15:12:05 +0300
Subject: [PATCH 198/403] Minor changes

- fix comments (typo + mismatch of comment/return values)
- used dynamic_cast for fTrems to ensure that valid object is acquired
---
 include/vrv/beam.h |  2 +-
 src/beam.cpp       | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 262322059fe..0419c01c92c 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -140,7 +140,7 @@ class BeamSegment {
     // Helper to check wheter beam fits within certain bounds
     bool DoesBeamOverlap(int staffTop, int topOffset, int staffBottom, int bottomOffset, bool isCrossStaff = false);
 
-    // Helper to find number of additional beams. Return { additional beams below main beam, additional beams above }
+    // Helper to find number of additional beams. Return { additional beams above main beam, additional beams below }
     std::pair<int, int> GetAdditionalBeamCount(BeamDrawingInterface *beamInterface);
 
     // Helper to check mixed beam positioning compared to other elements (ledger lines, staff) and adjust it accordingly
diff --git a/src/beam.cpp b/src/beam.cpp
index 5c77e827e4e..4a928a8715b 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -229,8 +229,8 @@ void BeamSegment::CalcBeam(
                     stemOffset = (coord->m_dur - DUR_8) * beamInterface->m_beamWidth;
                 }
                 // handle cross-staff fTrem cases
-                if (FTrem *fTrem = vrv_cast<FTrem *>(beamInterface);
-                    fTrem->Is(FTREM) && (coord->GetStemDir() == STEMDIRECTION_down)) {
+                if (FTrem *fTrem = dynamic_cast<FTrem *>(beamInterface);
+                    fTrem && (coord->GetStemDir() == STEMDIRECTION_down)) {
                     const int beamsCount = fTrem->GetBeams();
                     stemOffset = (beamsCount - 1) * beamInterface->m_beamWidth;
                 }
@@ -274,14 +274,14 @@ void BeamSegment::CalcBeam(
 bool BeamSegment::DoesBeamOverlap(int staffTop, int topOffset, int staffBottom, int bottomOffset, bool isCrossStaff)
 {
     // find if current beam fits within the staff
-    auto withinBounds
+    auto outsideBounds
         = std::find_if(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
               if ((coord->m_yBeam > staffTop - topOffset) || (coord->m_yBeam < staffBottom + bottomOffset)) {
                   return true;
               }
               return false;
           });
-    if (!isCrossStaff && (withinBounds != m_beamElementCoordRefs.end())) return true;
+    if (!isCrossStaff && (outsideBounds != m_beamElementCoordRefs.end())) return true;
     auto overlapping
         = std::find_if(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
               assert(coord->m_element);
@@ -301,8 +301,7 @@ bool BeamSegment::DoesBeamOverlap(int staffTop, int topOffset, int staffBottom,
 std::pair<int, int> BeamSegment::GetAdditionalBeamCount(BeamDrawingInterface *beamInterface)
 {
     // In case we're dealing with fTrem - take @beams attribute into consideration
-    FTrem *fTrem = vrv_cast<FTrem *>(beamInterface);
-    if (fTrem->Is(FTREM)) {
+    if (FTrem *fTrem = dynamic_cast<FTrem *>(beamInterface); fTrem) {
         return { fTrem->GetBeams() / 2, 0 };
     }
 

From 6f8a3474b2bb2e4feaced48aaa53958c56ef3b47 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Jun 2021 14:06:07 +0300
Subject: [PATCH 199/403] Change how cross-staff beams with too little space
 are handled

- adjusted code to increase distance between staves if cross-staff beam do not fit (as opposed to shifting beam below/above)
---
 include/vrv/staff.h           |  5 ++++
 include/vrv/verticalaligner.h | 11 ++++++++
 src/beam.cpp                  | 52 ++++++++++++++++++++++++++---------
 src/staff.cpp                 |  5 ++++
 src/verticalaligner.cpp       |  4 +++
 5 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index 54929b42275..952c3848aa7 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -167,6 +167,11 @@ class Staff : public Object,
      */
     virtual void SetFromFacsimile(Doc *doc);
 
+    /**
+     * Set beam adjustment for the corresponding staff alignment
+     */
+    void SetAlignmentBeamAdjustment(int adjust);
+
     //----------//
     // Functors //
     //----------//
diff --git a/include/vrv/verticalaligner.h b/include/vrv/verticalaligner.h
index 6c8cc2ba6cc..f072ddc2116 100644
--- a/include/vrv/verticalaligner.h
+++ b/include/vrv/verticalaligner.h
@@ -281,6 +281,14 @@ class StaffAlignment : public Object {
     void ReAdjustFloatingPositionersGrps(AdjustFloatingPositionerGrpsParams *params,
         const ArrayOfFloatingPositioners &positioners, ArrayOfIntPairs &grpIdYRel);
 
+    /**
+     * @name Set/get for the beam adjust
+     */
+    ///@{
+    void SetBeamAdjust(int beamAdjust) { m_beamAdjust = beamAdjust; }
+    int GetBeamAdjust() const { return m_beamAdjust; }
+    ///@}
+
     //----------//
     // Functors //
     //----------//
@@ -374,6 +382,9 @@ class StaffAlignment : public Object {
     BoundingBox *m_overflowBBoxBelow;
     ///@}
 
+    // Value to store required beam adjustment for cross-staff beams
+    int m_beamAdjust;
+
     /**
      * The list of overflowing bounding boxes (e.g, LayerElement or FloatingPositioner)
      */
diff --git a/src/beam.cpp b/src/beam.cpp
index 4a928a8715b..6836d47e7f8 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -380,21 +380,47 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
                 [offset](BeamElementCoord *coord) { coord->m_yBeam += offset; });
         }
         if (!DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
-    }
 
-    // If none of the positions work - there's no space for us to draw a mixed beam (or there is space but it would
-    // overlap with ledger line). Adjust beam placement based on the most frequent stem direction
-    const int stemUpCount = (int)std::count_if(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
-        [](BeamElementCoord *coord) { return coord->GetStemDir() == STEMDIRECTION_up; });
-    const int stemDownCount = (int)std::count_if(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
-        [](BeamElementCoord *coord) { return coord->GetStemDir() == STEMDIRECTION_down; });
-    data_STEMDIRECTION newDirection = (stemUpCount >= stemDownCount) ? STEMDIRECTION_up : STEMDIRECTION_down;
-    beamInterface->m_drawingPlace = (newDirection == STEMDIRECTION_up) ? BEAMPLACE_above : BEAMPLACE_below;
-    if ((newDirection == STEMDIRECTION_down) && (m_uniformStemLength > 0)) m_uniformStemLength *= -1;
+        // If none of the positions work - there's no space for us to draw a mixed beam (or there is space but it would
+        // overlap with ledger line). Adjust beam placement based on the most frequent stem direction
+        const int stemUpCount = (int)std::count_if(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
+            [](BeamElementCoord *coord) { return coord->GetStemDir() == STEMDIRECTION_up; });
+        const int stemDownCount = (int)std::count_if(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
+            [](BeamElementCoord *coord) { return coord->GetStemDir() == STEMDIRECTION_down; });
+        data_STEMDIRECTION newDirection = (stemUpCount >= stemDownCount) ? STEMDIRECTION_up : STEMDIRECTION_down;
+        beamInterface->m_drawingPlace = (newDirection == STEMDIRECTION_up) ? BEAMPLACE_above : BEAMPLACE_below;
+        if ((newDirection == STEMDIRECTION_down) && (m_uniformStemLength > 0)) m_uniformStemLength *= -1;
 
-    LogWarning("Insufficient space to draw mixed beam, starting at '%s'. Drawing '%s' instead.",
-        m_beamElementCoordRefs.at(0)->m_element->GetUuid().c_str(),
-        (beamInterface->m_drawingPlace == BEAMPLACE_above) ? "above" : "below");
+        LogWarning("Insufficient space to draw mixed beam, starting at '%s'. Drawing '%s' instead.",
+            m_beamElementCoordRefs.at(0)->m_element->GetUuid().c_str(),
+            (beamInterface->m_drawingPlace == BEAMPLACE_above) ? "above" : "below");
+    }
+    else {
+        int adjust = 0;
+        std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
+            if (!coord->m_element && !coord->m_element->Is({ NOTE, CHORD })) return;
+            int elemY = coord->m_element->GetDrawingY();
+            const int diff = std::abs(elemY - coord->m_yBeam);
+            if (coord->m_stem->GetDrawingStemDir() == STEMDIRECTION_down) {
+                if (elemY <= coord->m_yBeam + topOffset) {
+                    if (diff > adjust) adjust = diff + topOffset;
+                }
+            }
+            else if (coord->m_stem->GetDrawingStemDir() == STEMDIRECTION_up) {
+                if (elemY >= coord->m_yBeam - bottomOffset) {
+                    if (diff > adjust) adjust = diff + bottomOffset;
+                }
+            }
+        });
+        // Set adjustment for the staf here
+        if (beamInterface->m_crossStaffContent->GetN() < staff->GetN()) {
+            beamInterface->m_crossStaffContent->SetAlignmentBeamAdjustment(adjust);
+        }
+        else {
+            staff->SetAlignmentBeamAdjustment(adjust);
+        }
+        return false;
+    }
 
     return true;
 }
diff --git a/src/staff.cpp b/src/staff.cpp
index 8aad8981e79..1be1f3f74e0 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -377,6 +377,11 @@ int Staff::GetNearestInterStaffPosition(int y, Doc *doc, data_STAFFREL place)
     }
 }
 
+void Staff::SetAlignmentBeamAdjustment(int adjust)
+{
+    m_staffAlignment->SetBeamAdjust(adjust);
+}
+
 //----------------------------------------------------------------------------
 // LedgerLine
 //----------------------------------------------------------------------------
diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index 06506486bb5..8fd9596c49f 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -506,6 +506,10 @@ int StaffAlignment::CalcMinimumRequiredSpacing(const Doc *doc) const
 
     // Add a margin
     overflowSum += doc->GetBottomMargin(STAFF) * doc->GetDrawingUnit(this->GetStaffSize());
+    if (const int adjust = prevAlignment->GetBeamAdjust()) {
+        overflowSum += adjust;
+    }
+
 
     BoundingBox *previous = prevAlignment->GetOverflowBBoxBelow();
     BoundingBox *current = this->GetOverflowBBoxAbove();

From 451d1c14d3441951e0a6213d004b4c17e22a7c2a Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 1 Dec 2021 17:28:02 +0200
Subject: [PATCH 200/403] Rebase fixes for the beams

---
 include/vrv/beam.h |  2 +-
 src/beam.cpp       | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 0419c01c92c..07414fbb757 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -126,7 +126,7 @@ class BeamSegment {
     std::pair<int, int> CalcBeamRelativeMinMax(data_BEAMPLACE place) const;
 
     // Calculate positioning for the horizontal beams
-    void CalcHorizontalBeam(BeamDrawingInterface *beamInterface);
+    void CalcHorizontalBeam(Doc *doc, Staff *staff, BeamDrawingInterface *beamInterface);
 
     // Helper to calculate relative position of the beam to for each of the coordinates
     void CalcMixedBeamPlace(Staff *staff);
diff --git a/src/beam.cpp b/src/beam.cpp
index 6836d47e7f8..7bd81b1ddb4 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -889,15 +889,15 @@ void BeamSegment::CalcBeamPosition(
     if (!isHorizontal) {
         bool shorten;
         int step;
-        if (CalcBeamSlope(layer, staff, doc, beamInterface, shorten, step)) {
-            CalcAdjustSlope(staff, doc, beamInterface, shorten, step);
+        if (this->CalcBeamSlope(layer, staff, doc, beamInterface, shorten, step)) {
+            this->CalcAdjustSlope(staff, doc, beamInterface, shorten, step);
         }
         else {
             this->CalcAdjustPosition(staff, doc, beamInterface);
         }
     }
     else {
-        CalcHorizontalBeam(beamInterface);
+        this->CalcHorizontalBeam(doc, staff, beamInterface);
     }
 
     if (!beamInterface->m_crossStaffContent) this->AdjustBeamToLedgerLines(doc, staff, beamInterface);
@@ -1164,15 +1164,11 @@ void BeamSegment::CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterfac
 void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal)
 {
     int relevantNoteLoc = VRV_UNSET;
-    //data_STEMDIRECTION stemDir = (place == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
+    const data_STEMDIRECTION globalStemDir = (place == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
     for (auto coord : m_beamElementCoordRefs) {
-        data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
-        if (place != BEAMPLACE_mixed) {
-            stemDir = (place == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
-        }
-        else {
-            stemDir = (coord->m_beamRelativePlace == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
-        }
+        const data_STEMDIRECTION stemDir = (place != BEAMPLACE_mixed) ? globalStemDir
+            : (coord->m_beamRelativePlace == BEAMPLACE_below)         ? STEMDIRECTION_down
+                                                                      : STEMDIRECTION_up;
         const int stemDirBias = (stemDir == STEMDIRECTION_up) ? 1 : -1;
         coord->SetClosestNote(stemDir);
         if (!coord->m_closestNote) continue;
@@ -1188,6 +1184,10 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
 
     int minDuration = DUR_4;
     for (auto coord : m_beamElementCoordRefs) {
+        const data_STEMDIRECTION stemDir = (place != BEAMPLACE_mixed) ? globalStemDir
+            : (coord->m_beamRelativePlace == BEAMPLACE_below)         ? STEMDIRECTION_down
+                                                                      : STEMDIRECTION_up;
+        const int coordStemLength = coord->CalculateStemLength(staff, stemDir, isHorizontal);
         if (!coord->m_closestNote) continue;
         // if location matches, or if current elements duration is shorter than 8th. This ensures that beams with
         // partial beams will not be shorted when lowest/highest note is 8th and can be shortened
@@ -1226,10 +1226,10 @@ std::pair<int, int> BeamSegment::CalcBeamRelativeMinMax(data_BEAMPLACE place) co
     return { highestPoint, lowestPoint };
 }
 
-void BeamSegment::CalcHorizontalBeam(BeamDrawingInterface* beamInterface) {
+void BeamSegment::CalcHorizontalBeam(Doc *doc, Staff *staff, BeamDrawingInterface* beamInterface) {
     
     if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) {
-        CalcMixedBeamStem(beamInterface, 0);
+        this->CalcMixedBeamStem(beamInterface, 0);
     }
     else {
         int maxLength = (beamInterface->m_drawingPlace == BEAMPLACE_above) ? VRV_UNSET : -VRV_UNSET;
@@ -1251,7 +1251,7 @@ void BeamSegment::CalcHorizontalBeam(BeamDrawingInterface* beamInterface) {
         }
     }
 
-    CalcSetValues();
+    this->CalcAdjustPosition(staff, doc, beamInterface);
 }
 
 void BeamSegment::CalcMixedBeamPlace(Staff *staff)

From 4d46c233cf6aedc3632eb92005cd81ff8e60584e Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 9 Dec 2021 15:33:24 +0200
Subject: [PATCH 201/403] Adjust stem length for the cross-staff fTrem

---
 src/beam.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 7bd81b1ddb4..5bae9b245ca 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -232,7 +232,7 @@ void BeamSegment::CalcBeam(
                 if (FTrem *fTrem = dynamic_cast<FTrem *>(beamInterface);
                     fTrem && (coord->GetStemDir() == STEMDIRECTION_down)) {
                     const int beamsCount = fTrem->GetBeams();
-                    stemOffset = (beamsCount - 1) * beamInterface->m_beamWidth;
+                    stemOffset = beamsCount * beamInterface->m_beamWidth;
                 }
 
                 if (coord->m_beamRelativePlace == BEAMPLACE_below) {

From 047810fdd27ba0160ed0f176e7ce2ac4078d4da2 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 13 Dec 2021 20:31:51 +0200
Subject: [PATCH 202/403] Initialize missed variable

---
 include/vrv/verticalaligner.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/vrv/verticalaligner.h b/include/vrv/verticalaligner.h
index f072ddc2116..8f4481938b8 100644
--- a/include/vrv/verticalaligner.h
+++ b/include/vrv/verticalaligner.h
@@ -383,7 +383,7 @@ class StaffAlignment : public Object {
     ///@}
 
     // Value to store required beam adjustment for cross-staff beams
-    int m_beamAdjust;
+    int m_beamAdjust = 0;
 
     /**
      * The list of overflowing bounding boxes (e.g, LayerElement or FloatingPositioner)

From b885d810ef604660329d87ad32ba53c5b767204a Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 15 Dec 2021 11:42:43 +0200
Subject: [PATCH 203/403] Remove redundant variable

---
 src/beam.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 5bae9b245ca..b73506b7ddb 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1169,7 +1169,6 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
         const data_STEMDIRECTION stemDir = (place != BEAMPLACE_mixed) ? globalStemDir
             : (coord->m_beamRelativePlace == BEAMPLACE_below)         ? STEMDIRECTION_down
                                                                       : STEMDIRECTION_up;
-        const int stemDirBias = (stemDir == STEMDIRECTION_up) ? 1 : -1;
         coord->SetClosestNote(stemDir);
         if (!coord->m_closestNote) continue;
         if (relevantNoteLoc == VRV_UNSET) {

From 87fd900b884c902c6e7da4ac8f2e5cc02c43f743 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 15 Dec 2021 19:21:35 +0200
Subject: [PATCH 204/403] Extend cross-staff overflow to FTREM elements

- split GetOverflowStaffAlignments into three parts to make sure that Beam and FTrem are treated in similar fashion in cross-staff cases
- added two templates for the Beam/Ftrem handling of staff alignment overflow
- changed stemOffset for FTrem to take into account floating beams
---
 include/vrv/layerelement.h |  16 +++++
 src/beam.cpp               |   3 +-
 src/layerelement.cpp       | 126 +++++++++++++++++++++++--------------
 3 files changed, 96 insertions(+), 49 deletions(-)

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index ee6426da2c4..adb2065151c 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -467,6 +467,22 @@ class LayerElement : public Object,
 private:
     int GetDrawingArticulationTopOrBottom(data_STAFFREL place, ArticType type);
 
+    /**
+     * Template for getting above/below overflow for BeamType elements (BEAM or FTREM)
+     */
+    template <class BeamType> void GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below);
+
+    /**
+     * Template for getting above/below overflow for children of BeamType elements (BEAM or FTREM)
+     */
+    template <class BeamType>
+    void GetBeamChildOverflow(StaffAlignment *&above, StaffAlignment *&below, BeamType *parent);
+
+    /**
+     * Get above/below overflow for the chord elements
+     */
+    void GetChordOverflow(StaffAlignment *&above, StaffAlignment *&below, int staffN);
+
 public:
     /** Absolute position X. This is used for facsimile (transcription) encoding */
     int m_xAbs;
diff --git a/src/beam.cpp b/src/beam.cpp
index b73506b7ddb..4194bbeef17 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -231,7 +231,8 @@ void BeamSegment::CalcBeam(
                 // handle cross-staff fTrem cases
                 if (FTrem *fTrem = dynamic_cast<FTrem *>(beamInterface);
                     fTrem && (coord->GetStemDir() == STEMDIRECTION_down)) {
-                    const int beamsCount = fTrem->GetBeams();
+                    int beamsCount = std::max(fTrem->GetBeams(), fTrem->GetBeamsFloat());
+                    if (!fTrem->HasBeamsFloat()) beamsCount--;
                     stemOffset = beamsCount * beamInterface->m_beamWidth;
                 }
 
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 1772df52755..86b4d810825 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -290,65 +290,95 @@ void LayerElement::GetOverflowStaffAlignments(StaffAlignment *&above, StaffAlign
     above = staff->GetAlignment();
     below = above;
 
-    // Chord and beam parent (if any)
-    Chord *chord = vrv_cast<Chord *>(this->GetFirstAncestor(CHORD));
-    Beam *beam = vrv_cast<Beam *>(this->GetFirstAncestor(BEAM));
-
     // Dots, flags and stems with cross-staff chords need special treatment
-    if (this->Is({ DOTS, FLAG, STEM }) && chord && chord->HasCrossStaff()) {
-        Staff *staffAbove = NULL;
-        Staff *staffBelow = NULL;
-        chord->GetCrossStaffExtremes(staffAbove, staffBelow);
-        if (staffAbove && (staffAbove->GetN() < staff->GetN())) {
-            above = staffAbove->GetAlignment();
+    this->GetChordOverflow(above, below, staff->GetN());
+
+    // Stems cross-staff beam need special treatment but only if the beam itself is not cross-staff
+    if (this->Is({ ARTIC, STEM })) {
+        if (this->GetFirstAncestor(BEAM)) {
+            Beam *beam = vrv_cast<Beam *>(this->GetFirstAncestor(BEAM));
+            this->GetBeamChildOverflow<Beam>(above, below, beam);
         }
-        if (staffBelow && (staffBelow->GetN() > staff->GetN())) {
-            below = staffBelow->GetAlignment();
+        else if (this->GetFirstAncestor(FTREM)) {
+            FTrem *fTrem = vrv_cast<FTrem *>(this->GetFirstAncestor(BEAM));
+            this->GetBeamChildOverflow<FTrem>(above, below, fTrem);
         }
     }
-    // Stems cross-staff beam need special treatment but only if the beam itself is not cross-staff
-    if (this->Is({ ARTIC, STEM }) && beam && beam->m_crossStaffContent && !beam->m_crossStaff) {
-        data_STAFFREL_basic direction = beam->m_crossStaffRel;
+    // Beams in cross-staff situation need special treatment
+    else if (this->Is(BEAM)) {
+        this->GetBeamOverflow<Beam>(above, below);
+    }
+    else if (this->Is(FTREM)) {
+        this->GetBeamOverflow<FTrem>(above, below);
+    }
+}
+
+template <class BeamType>
+void LayerElement::GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below)
+{
+    if (!this->Is({ BEAM, FTREM })) return;
+
+    BeamType *beam = vrv_cast<BeamType *>(this);
+    assert(beam);
+    // Beam between the staves - ignore both above and below
+    if (!beam->m_crossStaffContent || beam->m_crossStaff) return;
+
+    data_STAFFREL_basic direction = beam->m_crossStaffRel;
+    if (beam->m_drawingPlace == BEAMPLACE_mixed) {
+        above = NULL;
+        below = NULL;
+    }
+    // Beam below - ignore above and find the appropriate below staff
+    else if (beam->m_drawingPlace == BEAMPLACE_below) {
+        above = NULL;
         if (direction == STAFFREL_basic_above) {
-            above = beam->m_crossStaffContent->GetAlignment();
             below = beam->m_beamStaff->GetAlignment();
         }
         else {
-            above = beam->m_beamStaff->GetAlignment();
             below = beam->m_crossStaffContent->GetAlignment();
         }
     }
-    // Beams in cross-staff situation need special treatment
-    if (this->Is(BEAM)) {
-        beam = vrv_cast<Beam *>(this);
-        assert(beam);
-        // Beam between the staves - ignore both above and below
-        if (beam->m_crossStaffContent && !beam->m_crossStaff) {
-            data_STAFFREL_basic direction = beam->m_crossStaffRel;
-            if (beam->m_drawingPlace == BEAMPLACE_mixed) {
-                above = NULL;
-                below = NULL;
-            }
-            // Beam below - ignore above and find the appropriate below staff
-            else if (beam->m_drawingPlace == BEAMPLACE_below) {
-                above = NULL;
-                if (direction == STAFFREL_basic_above) {
-                    below = beam->m_beamStaff->GetAlignment();
-                }
-                else {
-                    below = beam->m_crossStaffContent->GetAlignment();
-                }
-            }
-            // Beam above - ignore below and find the appropriate above staff
-            else if (beam->m_drawingPlace == BEAMPLACE_above) {
-                below = NULL;
-                if (direction == STAFFREL_basic_below) {
-                    above = beam->m_beamStaff->GetAlignment();
-                }
-                else {
-                    above = beam->m_crossStaffContent->GetAlignment();
-                }
-            }
+    // Beam above - ignore below and find the appropriate above staff
+    else if (beam->m_drawingPlace == BEAMPLACE_above) {
+        below = NULL;
+        if (direction == STAFFREL_basic_below) {
+            above = beam->m_beamStaff->GetAlignment();
+        }
+        else {
+            above = beam->m_crossStaffContent->GetAlignment();
+        }
+    }
+}
+
+template <class BeamType>
+void LayerElement::GetBeamChildOverflow(StaffAlignment *&above, StaffAlignment *&below, BeamType *parent)
+{
+    if (parent && parent->m_crossStaffContent && !parent->m_crossStaff) {
+        data_STAFFREL_basic direction = parent->m_crossStaffRel;
+        if (direction == STAFFREL_basic_above) {
+            above = parent->m_crossStaffContent->GetAlignment();
+            below = parent->m_beamStaff->GetAlignment();
+        }
+        else {
+            above = parent->m_beamStaff->GetAlignment();
+            below = parent->m_crossStaffContent->GetAlignment();
+        }
+    }
+}
+
+void LayerElement::GetChordOverflow(StaffAlignment *&above, StaffAlignment *&below, int staffN)
+{
+    Chord *chord = vrv_cast<Chord *>(this->GetFirstAncestor(CHORD));
+    // Dots, flags and stems with cross-staff chords need special treatment
+    if (this->Is({ DOTS, FLAG, STEM }) && chord && chord->HasCrossStaff()) {
+        Staff *staffAbove = NULL;
+        Staff *staffBelow = NULL;
+        chord->GetCrossStaffExtremes(staffAbove, staffBelow);
+        if (staffAbove && (staffAbove->GetN() < staffN)) {
+            above = staffAbove->GetAlignment();
+        }
+        if (staffBelow && (staffBelow->GetN() > staffN)) {
+            below = staffBelow->GetAlignment();
         }
     }
 }

From 916772b816b106d44f1091687c6f71f64e76887d Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 16 Dec 2021 17:32:09 +0200
Subject: [PATCH 205/403] Add this keyword + center cross-staff fTrems

---
 src/beam.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 4194bbeef17..d0c3d544d19 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -263,7 +263,6 @@ void BeamSegment::CalcBeam(
             // This is the case with fTrem on whole notes
             if (!stem) continue;
 
-            // stem->SetDrawingStemDir(beamInterface->m_stemDir);
             // Since the value were calculated relatively to the element position, adjust them
             stem->SetDrawingXRel(coord->m_x - el->GetDrawingX());
             stem->SetDrawingYRel(y2 - el->GetDrawingY());
@@ -303,7 +302,7 @@ std::pair<int, int> BeamSegment::GetAdditionalBeamCount(BeamDrawingInterface *be
 {
     // In case we're dealing with fTrem - take @beams attribute into consideration
     if (FTrem *fTrem = dynamic_cast<FTrem *>(beamInterface); fTrem) {
-        return { fTrem->GetBeams() / 2, 0 };
+        return { fTrem->GetBeams(), 0 };
     }
 
     int topShortestDur = DUR_8;
@@ -323,7 +322,7 @@ std::pair<int, int> BeamSegment::GetAdditionalBeamCount(BeamDrawingInterface *be
 bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface)
 {
     const int unit = doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-    const auto [topBeams, bottomBeams] = GetAdditionalBeamCount(beamInterface);
+    const auto [topBeams, bottomBeams] = this->GetAdditionalBeamCount(beamInterface);
     const int topOffset = topBeams * beamInterface->m_beamWidth + unit / 2;
     const int bottomOffset = bottomBeams * beamInterface->m_beamWidth + unit / 2;
 
@@ -341,7 +340,7 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
             return true;
         }
     }
-    if (!DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset, beamInterface->m_crossStaffContent)) {
+    if (!this->DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset, beamInterface->m_crossStaffContent)) {
         return false;
     }
         
@@ -362,7 +361,7 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
                 = (m_beamElementCoordRefs.front()->m_yBeam + m_beamElementCoordRefs.back()->m_yBeam - 2 * midpoint) / 2;
             std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
                 [midpointOffset](BeamElementCoord *coord) { coord->m_yBeam += midpointOffset; });
-            if (!DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
+            if (!this->DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
         }
         // If midpoint if above the staff, try to place beam at the top edge of the staff
         if (!isMidpointWithinBounds && (midpoint > staffBottom)) {
@@ -380,7 +379,7 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
             std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(),
                 [offset](BeamElementCoord *coord) { coord->m_yBeam += offset; });
         }
-        if (!DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
+        if (!this->DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
 
         // If none of the positions work - there's no space for us to draw a mixed beam (or there is space but it would
         // overlap with ledger line). Adjust beam placement based on the most frequent stem direction
@@ -801,7 +800,7 @@ bool BeamSegment::CalcBeamSlope(
         else if (step > unit * 2) {
             step = unit * 2;
         } 
-        CalcMixedBeamStem(beamInterface, step);
+        this->CalcMixedBeamStem(beamInterface, step);
     }
 
     m_beamSlope = BoundingBox::CalcSlope(Point(m_firstNoteOrChord->m_x, m_firstNoteOrChord->m_yBeam),
@@ -833,18 +832,18 @@ void BeamSegment::CalcMixedBeamStem(BeamDrawingInterface *beamInterface, int ste
         return;
     }
 
-    auto [aboveMax, aboveMin] = CalcBeamRelativeMinMax(BEAMPLACE_above);
-    auto [belowMax, belowMin] = CalcBeamRelativeMinMax(BEAMPLACE_below);
+    const auto [aboveMax, aboveMin] = this->CalcBeamRelativeMinMax(BEAMPLACE_above);
+    const auto [belowMax, belowMin] = this->CalcBeamRelativeMinMax(BEAMPLACE_below);
     const int highestPoint = (aboveMax != VRV_UNSET) ? aboveMax : belowMax;
     const int lowestPoint = (belowMin != VRV_UNSET) ? belowMin : aboveMin;
 
     // This helps with general beams but breaks trems
-    auto [up, down] = GetAdditionalBeamCount(beamInterface);
+    const auto [up, down] = this->GetAdditionalBeamCount(beamInterface);
 
     // Calculate midpoint for the beam, taking into account highest and lowest points, as well as number of additional
     // beams above and below main beam. Start position of the beam is then further adjusted based on the step size to
     // make sure that beam is truly centered
-    int midPoint = (highestPoint + lowestPoint + (up - down) * beamInterface->m_beamWidth) / 2;
+    const int midPoint = (highestPoint + lowestPoint + (up - down) * beamInterface->m_beamWidth) / 2;
     m_firstNoteOrChord->m_yBeam
         = (m_lastNoteOrChord->m_beamRelativePlace == BEAMPLACE_below) ? midPoint - step / 2 : midPoint + step / 2;
     m_lastNoteOrChord->m_yBeam = (m_lastNoteOrChord->m_beamRelativePlace == BEAMPLACE_below)

From 1cfea22d668b953ee33e00e66f9e6361e3ec4f9b Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 16 Dec 2021 18:30:05 +0200
Subject: [PATCH 206/403] Improve fTrem cross-staff posiitoning code

- removed explicit casting to fTrem, replaced by polymorphic calls to corresponing funcitons of DrawingInterface
- adjusted code for centering of cross-staff fTrems
---
 include/vrv/beam.h             | 10 +++++--
 include/vrv/drawinginterface.h | 10 +++++++
 include/vrv/ftrem.h            | 10 +++++++
 src/beam.cpp                   | 54 ++++++++++++++++------------------
 src/ftrem.cpp                  | 10 +++++++
 5 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 07414fbb757..b9cd5515e03 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -140,9 +140,6 @@ class BeamSegment {
     // Helper to check wheter beam fits within certain bounds
     bool DoesBeamOverlap(int staffTop, int topOffset, int staffBottom, int bottomOffset, bool isCrossStaff = false);
 
-    // Helper to find number of additional beams. Return { additional beams above main beam, additional beams below }
-    std::pair<int, int> GetAdditionalBeamCount(BeamDrawingInterface *beamInterface);
-
     // Helper to check mixed beam positioning compared to other elements (ledger lines, staff) and adjust it accordingly
     bool NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface);
 
@@ -216,6 +213,7 @@ class Beam : public LayerElement,
     const ArrayOfBeamElementCoords *GetElementCoords();
 
     /**
+
      * Return true if the beam has a tabGrp child.
      * In that case, the ObjectList will only have tabGrp elements. See Beam::FilterList
      */
@@ -229,6 +227,12 @@ class Beam : public LayerElement,
     Beam *GetStemSameasBeam() const { return m_stemSameas; }
     void SetStemSameasBeam(Beam *stemSameas) { m_stemSameas = stemSameas; }
     ///@}
+	
+    /**
+     * See DrawingInterface::GetAdditionalBeamCount
+     */
+    std::pair<int, int> GetAdditionalBeamCount() const override;
+
 
     //----------//
     // Functors //
diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index 7d343fdf7b5..ee2bb913d06 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -132,6 +132,16 @@ class BeamDrawingInterface : public ObjectListInterface {
      */
     void ClearCoords();
 
+    /**
+     * Helper to find number of additional beams. Return { additional beams above main beam, additional beams below }
+     */
+    virtual std::pair<int, int> GetAdditionalBeamCount() const { return { 0, 0 }; }
+
+    /**
+     * Helper to get number of beams represented by attributes @beam and @beam.float
+     */
+    virtual std::pair<int, int> GetFloatingBeamCount() const { return { 0, 0 }; }
+
 protected:
     /**
      * Return the position of the element in the beam.
diff --git a/include/vrv/ftrem.h b/include/vrv/ftrem.h
index 8d165437e16..09afc584362 100644
--- a/include/vrv/ftrem.h
+++ b/include/vrv/ftrem.h
@@ -47,6 +47,16 @@ class FTrem : public LayerElement, public BeamDrawingInterface, public AttFTremV
      */
     const ArrayOfBeamElementCoords *GetElementCoords();
 
+    /**
+     * See DrawingInterface::GetAdditionalBeamCount
+     */
+    std::pair<int, int> GetAdditionalBeamCount() const override;
+
+    /**
+     * See DrawingInterface::GetFloatingBeamCount
+     */
+    std::pair<int, int> GetFloatingBeamCount() const override;
+
     //----------//
     // Functors //
     //----------//
diff --git a/src/beam.cpp b/src/beam.cpp
index d0c3d544d19..072660c830d 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -20,7 +20,6 @@
 #include "editorial.h"
 #include "elementpart.h"
 #include "functorparams.h"
-#include "ftrem.h"
 #include "gracegrp.h"
 #include "layer.h"
 #include "measure.h"
@@ -229,10 +228,10 @@ void BeamSegment::CalcBeam(
                     stemOffset = (coord->m_dur - DUR_8) * beamInterface->m_beamWidth;
                 }
                 // handle cross-staff fTrem cases
-                if (FTrem *fTrem = dynamic_cast<FTrem *>(beamInterface);
-                    fTrem && (coord->GetStemDir() == STEMDIRECTION_down)) {
-                    int beamsCount = std::max(fTrem->GetBeams(), fTrem->GetBeamsFloat());
-                    if (!fTrem->HasBeamsFloat()) beamsCount--;
+                const auto [beams, beamsFloat] = beamInterface->GetFloatingBeamCount();
+                if ((coord->GetStemDir() == STEMDIRECTION_down) && ((beams > 0) || (beamsFloat > 0))) {
+                    int beamsCount = std::max(beams, beamsFloat);
+                    if (beamsFloat <= 0) beamsCount--;
                     stemOffset = beamsCount * beamInterface->m_beamWidth;
                 }
 
@@ -298,32 +297,13 @@ bool BeamSegment::DoesBeamOverlap(int staffTop, int topOffset, int staffBottom,
     return (overlapping != m_beamElementCoordRefs.end());
 }
 
-std::pair<int, int> BeamSegment::GetAdditionalBeamCount(BeamDrawingInterface *beamInterface)
-{
-    // In case we're dealing with fTrem - take @beams attribute into consideration
-    if (FTrem *fTrem = dynamic_cast<FTrem *>(beamInterface); fTrem) {
-        return { fTrem->GetBeams(), 0 };
-    }
-
-    int topShortestDur = DUR_8;
-    int bottomShortestDur = DUR_8;
-    std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
-        if (coord->m_partialFlagPlace == BEAMPLACE_above) {
-            topShortestDur = std::max(topShortestDur, coord->m_dur);
-        }
-        else if (coord->m_partialFlagPlace == BEAMPLACE_below) {
-            bottomShortestDur = std::max(bottomShortestDur, coord->m_dur);
-        }
-    });
-
-    return { topShortestDur - DUR_8, bottomShortestDur - DUR_8 };
-}
-
 bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface)
 {
     const int unit = doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-    const auto [topBeams, bottomBeams] = this->GetAdditionalBeamCount(beamInterface);
-    const int topOffset = topBeams * beamInterface->m_beamWidth + unit / 2;
+    const auto [topBeams, bottomBeams] = beamInterface->GetAdditionalBeamCount();
+    double multiplier = 1;
+    if (Object *obj = dynamic_cast<Object *>(beamInterface); obj && obj->Is(FTREM)) multiplier = 0.5;
+    const int topOffset = multiplier * topBeams * beamInterface->m_beamWidth + unit / 2;
     const int bottomOffset = bottomBeams * beamInterface->m_beamWidth + unit / 2;
 
     // find top and bottom of the staff
@@ -838,7 +818,7 @@ void BeamSegment::CalcMixedBeamStem(BeamDrawingInterface *beamInterface, int ste
     const int lowestPoint = (belowMin != VRV_UNSET) ? belowMin : aboveMin;
 
     // This helps with general beams but breaks trems
-    const auto [up, down] = this->GetAdditionalBeamCount(beamInterface);
+    const auto [up, down] = beamInterface->GetAdditionalBeamCount();
 
     // Calculate midpoint for the beam, taking into account highest and lowest points, as well as number of additional
     // beams above and below main beam. Start position of the beam is then further adjusted based on the step size to
@@ -1796,6 +1776,22 @@ int Beam::CalcLayerOverlap(Doc *doc, Object *beam, int directionBias, int y1, in
     return overlap;
 }
 
+std::pair<int, int> Beam::GetAdditionalBeamCount() const 
+{
+    int topShortestDur = DUR_8;
+    int bottomShortestDur = DUR_8;
+    std::for_each(m_beamElementCoords.begin(), m_beamElementCoords.end(), [&](BeamElementCoord *coord) {
+        if (coord->m_partialFlagPlace == BEAMPLACE_above) {
+            topShortestDur = std::max(topShortestDur, coord->m_dur);
+        }
+        else if (coord->m_partialFlagPlace == BEAMPLACE_below) {
+            bottomShortestDur = std::max(bottomShortestDur, coord->m_dur);
+        }
+    });
+
+    return { topShortestDur - DUR_8, bottomShortestDur - DUR_8 };
+}
+
 //----------------------------------------------------------------------------
 // Functors methods
 //----------------------------------------------------------------------------
diff --git a/src/ftrem.cpp b/src/ftrem.cpp
index 994490d82ee..12a2a35dd1f 100644
--- a/src/ftrem.cpp
+++ b/src/ftrem.cpp
@@ -107,6 +107,16 @@ void FTrem::FilterList(ArrayOfObjects *childList)
     this->InitCue(false);
 }
 
+std::pair<int, int> FTrem::GetAdditionalBeamCount() const
+{
+    return { std::max(this->GetBeams(), this->GetBeamsFloat()), 0 };
+}
+
+std::pair<int, int> FTrem::GetFloatingBeamCount() const
+{
+    return { this->GetBeams(), this->GetBeamsFloat() };
+}
+
 //----------------------------------------------------------------------------
 // Functors methods
 //----------------------------------------------------------------------------

From 4304e8b2db2efe6bad00768e73a422d03d8e7fa5 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 16 Dec 2021 18:33:07 +0200
Subject: [PATCH 207/403] Formatting

---
 src/beam.cpp         | 21 ++++++++++-----------
 src/layerelement.cpp |  3 +--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 072660c830d..270de29f02f 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -323,7 +323,7 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
     if (!this->DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset, beamInterface->m_crossStaffContent)) {
         return false;
     }
-        
+
     if (!beamInterface->m_crossStaffContent) {
         // Calculate midpoint for the beam with mixed placement
         int min = m_beamElementCoordRefs.at(0)->m_element->GetDrawingY();
@@ -589,7 +589,6 @@ bool BeamSegment::CalcBeamSlope(
     m_beamSlope = BoundingBox::CalcSlope(Point(m_firstNoteOrChord->m_x, m_firstNoteOrChord->m_yBeam),
         Point(m_lastNoteOrChord->m_x, m_lastNoteOrChord->m_yBeam));
 
-
     int noteStep = 0;
     double noteSlope = 0.0;
     if (m_firstNoteOrChord->m_closestNote && m_lastNoteOrChord->m_closestNote) {
@@ -776,10 +775,10 @@ bool BeamSegment::CalcBeamSlope(
     else if (place == BEAMPLACE_mixed) {
         if (step <= unit) {
             step = 0;
-        }            
+        }
         else if (step > unit * 2) {
             step = unit * 2;
-        } 
+        }
         this->CalcMixedBeamStem(beamInterface, step);
     }
 
@@ -797,12 +796,12 @@ bool BeamSegment::CalcBeamSlope(
     return true;
 }
 
-
 void BeamSegment::CalcMixedBeamStem(BeamDrawingInterface *beamInterface, int step)
 {
     // In cases, when both first and last notes/chords of the beam have same relative places (i.e. they have same stem
     // direction and/or same staff), - we don't need additional calculations
-    if ((m_firstNoteOrChord->m_beamRelativePlace == m_lastNoteOrChord->m_beamRelativePlace) && (!beamInterface->m_crossStaffContent)) {
+    if ((m_firstNoteOrChord->m_beamRelativePlace == m_lastNoteOrChord->m_beamRelativePlace)
+        && (!beamInterface->m_crossStaffContent)) {
         if (m_beamSlope < 0.0) {
             m_firstNoteOrChord->m_yBeam = m_lastNoteOrChord->m_yBeam + step;
         }
@@ -1194,8 +1193,7 @@ std::pair<int, int> BeamSegment::CalcBeamRelativeMinMax(data_BEAMPLACE place) co
     int lowestPoint = VRV_UNSET;
     std::for_each(m_beamElementCoordRefs.begin(), m_beamElementCoordRefs.end(), [&](BeamElementCoord *coord) {
         if (coord->m_beamRelativePlace == place) {
-            if ((highestPoint == VRV_UNSET) || (coord->m_yBeam > highestPoint))
-                highestPoint = coord->m_yBeam;
+            if ((highestPoint == VRV_UNSET) || (coord->m_yBeam > highestPoint)) highestPoint = coord->m_yBeam;
             if ((lowestPoint == VRV_UNSET) || (coord->m_yBeam < lowestPoint)) {
                 lowestPoint = coord->m_yBeam;
             }
@@ -1205,8 +1203,9 @@ std::pair<int, int> BeamSegment::CalcBeamRelativeMinMax(data_BEAMPLACE place) co
     return { highestPoint, lowestPoint };
 }
 
-void BeamSegment::CalcHorizontalBeam(Doc *doc, Staff *staff, BeamDrawingInterface* beamInterface) {
-    
+void BeamSegment::CalcHorizontalBeam(Doc *doc, Staff *staff, BeamDrawingInterface *beamInterface)
+{
+
     if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) {
         this->CalcMixedBeamStem(beamInterface, 0);
     }
@@ -1776,7 +1775,7 @@ int Beam::CalcLayerOverlap(Doc *doc, Object *beam, int directionBias, int y1, in
     return overlap;
 }
 
-std::pair<int, int> Beam::GetAdditionalBeamCount() const 
+std::pair<int, int> Beam::GetAdditionalBeamCount() const
 {
     int topShortestDur = DUR_8;
     int bottomShortestDur = DUR_8;
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 86b4d810825..86bffc024e6 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -313,8 +313,7 @@ void LayerElement::GetOverflowStaffAlignments(StaffAlignment *&above, StaffAlign
     }
 }
 
-template <class BeamType>
-void LayerElement::GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below)
+template <class BeamType> void LayerElement::GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below)
 {
     if (!this->Is({ BEAM, FTREM })) return;
 

From 47aa0768494b55cf98334f3505c329f85426eebf Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 21 Dec 2021 14:29:41 +0200
Subject: [PATCH 208/403] Minor fix

---
 src/layerelement.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 86bffc024e6..2efeddcb82a 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -300,7 +300,7 @@ void LayerElement::GetOverflowStaffAlignments(StaffAlignment *&above, StaffAlign
             this->GetBeamChildOverflow<Beam>(above, below, beam);
         }
         else if (this->GetFirstAncestor(FTREM)) {
-            FTrem *fTrem = vrv_cast<FTrem *>(this->GetFirstAncestor(BEAM));
+            FTrem *fTrem = vrv_cast<FTrem *>(this->GetFirstAncestor(FTREM));
             this->GetBeamChildOverflow<FTrem>(above, below, fTrem);
         }
     }

From 4827c88ef63f277087160be04f3ea2d01f872b48 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 21 Dec 2021 15:26:54 +0200
Subject: [PATCH 209/403] Formatting

---
 src/drawinginterface.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index ef4ad2c71b9..abbde4c5cd5 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -21,11 +21,7 @@
 
 namespace vrv {
 
-enum class NoteDirection {
-    none,
-    upward,
-    downward
-};
+enum class NoteDirection { none, upward, downward };
 
 // helper for determining note direction
 NoteDirection GetNoteDirection(int leftNoteX, int rightNoteX)
@@ -339,12 +335,13 @@ bool BeamDrawingInterface::IsHorizontal()
     return false;
 }
 
-bool BeamDrawingInterface::IsHorizontal(const std::vector<int>& items, const std::vector<data_BEAMPLACE>& directions) const
+bool BeamDrawingInterface::IsHorizontal(
+    const std::vector<int> &items, const std::vector<data_BEAMPLACE> &directions) const
 {
     // items and directions should be of the same size, otherwise something is wrong
     if (items.size() != directions.size()) return false;
     if ((items.size() == 3) && m_crossStaffContent) {
-        if ((directions.at(0) == directions.at(2)) && (directions.at(0) != directions.at(1))) return true;        
+        if ((directions.at(0) == directions.at(2)) && (directions.at(0) != directions.at(1))) return true;
     }
 
     // calculate how many times stem direction is changed withing the beam

From a4e2274289adbff65891525a3fa036085d9e798e Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 11:42:45 +0100
Subject: [PATCH 210/403] Add dot in PAE mensural notation import. Fixes #2599

---
 src/iopae.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/iopae.cpp b/src/iopae.cpp
index 9d389b3742d..6be994ec4b5 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -2256,7 +2256,8 @@ enum {
     ERR_055_KEYSIG_CHANGE,
     ERR_056_TIMESIG_CHANGE,
     ERR_057_MENSUR_CHANGE,
-    ERR_058_FERMATA_MREST
+    ERR_058_FERMATA_MREST,
+    ERR_059_DOUBLE_DOTS_MENS
 };
 
 // clang-format off
@@ -2318,7 +2319,8 @@ const std::map<int, std::string> PAEInput::s_errCodes{
     { ERR_055_KEYSIG_CHANGE, "The key signature cannot be changed more than once in a measure." },
     { ERR_056_TIMESIG_CHANGE, "The time signature cannot be changed more than once in a measure." },
     { ERR_057_MENSUR_CHANGE, "The mensur sign cannot be changed more than once in a measure." },
-    { ERR_058_FERMATA_MREST, "A fermata on measure with extra '%s' is invalid." }
+    { ERR_058_FERMATA_MREST, "A fermata on measure with extra '%s' is invalid." },
+    { ERR_059_DOUBLE_DOTS_MENS, "Double-dotted notes are invalid with mensural notation." }
 };
 // clang-format on
 
@@ -4014,6 +4016,16 @@ bool PAEInput::ConvertDuration()
                     note->SetStemLen(0);
                     note->SetStemVisible(BOOLEAN_false);
                 }
+                else if (m_isMensural) {
+                    if (currentDur->second > 1) {
+                        LogPAE(ERR_059_DOUBLE_DOTS_MENS, *token);
+                        if (m_pedanticMode) return false;
+                    }
+                    Dot *dot = new Dot();
+                    // We need to insert it before the next one
+                    ++token;
+                    token = m_pae.insert(token, pae::Token(0, pae::UNKOWN_POS, dot));
+                }
                 else {
                     interface->SetDots(currentDur->second);
                 }

From 5f3dda31ab9709117de8158c9a853e30c0df3a11 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 12:10:19 +0100
Subject: [PATCH 211/403] Add PAE support for nested beam when within a grace
 group. Fixes #2601

---
 src/iopae.cpp | 61 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/iopae.cpp b/src/iopae.cpp
index 6be994ec4b5..e3300bf89cd 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -3670,6 +3670,8 @@ bool PAEInput::ConvertChord()
 bool PAEInput::ConvertBeam()
 {
     Beam *beam = NULL;
+    Beam *graceBeam = NULL;
+    bool withinGrace = false;
 
     // Here we need an iterator because we might have to add a missing closing tag
     std::list<pae::Token>::iterator token = m_pae.begin();
@@ -3688,13 +3690,29 @@ bool PAEInput::ConvertBeam()
                 continue;
             }
             if (beam) {
-                LogPAE(ERR_023_BEAM_NESTED, *token);
-                if (m_pedanticMode) return false;
-                ++token;
-                continue;
+                // Nested beams only allowed if the second one is in a grace group
+                if (!withinGrace) {
+                    LogPAE(ERR_023_BEAM_NESTED, *token);
+                    if (m_pedanticMode) return false;
+                    ++token;
+                    continue;
+                }
+                // No nested beams within a grace group
+                else if (graceBeam) {
+                    LogPAE(ERR_023_BEAM_NESTED, *token);
+                    if (m_pedanticMode) return false;
+                    ++token;
+                    continue;
+                }
+                // Create a grace beam
+                graceBeam = new Beam();
+                token->m_object = graceBeam;
+            }
+            else {
+                // Create a beam
+                beam = new Beam();
+                token->m_object = beam;
             }
-            beam = new Beam();
-            token->m_object = beam;
         }
         else if (token->m_char == '}') {
             token->m_char = 0;
@@ -3703,17 +3721,40 @@ bool PAEInput::ConvertBeam()
                 ++token;
                 continue;
             }
-            if (!beam) {
+            // Closing while no beam or grace beam have been open
+            if (!beam && !graceBeam) {
                 LogPAE(ERR_024_BEAM_CLOSING, *token);
                 if (m_pedanticMode) return false;
                 ++token;
                 continue;
             }
-            token->m_object = beam;
-            token->m_char = pae::CONTAINER_END;
-            beam = NULL;
+            if (graceBeam) {
+                token->m_object = graceBeam;
+                token->m_char = pae::CONTAINER_END;
+                graceBeam = NULL;
+            }
+            else {
+                token->m_object = beam;
+                token->m_char = pae::CONTAINER_END;
+                beam = NULL;
+            }
         }
+        // Flag the beginning of a grace group
+        else if (token->m_char == 'Q') {
+            withinGrace = true;
+        }
+        // Flag the end
+        else if (token->m_char == 'r') {
+            withinGrace = false;
+        }
+        // Close beams left open
         else if (token->IsEnd() || token->Is(MEASURE)) {
+            if (graceBeam) {
+                LogPAE(ERR_025_BEAM_OPEN, *token);
+                if (m_pedanticMode) return false;
+                token = m_pae.insert(token, pae::Token(pae::CONTAINER_END, pae::UNKOWN_POS, graceBeam));
+                graceBeam = NULL;
+            }
             if (beam) {
                 LogPAE(ERR_025_BEAM_OPEN, *token);
                 if (m_pedanticMode) return false;

From 25bc9af5b5768f2b5585290554987e0a2487f646 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 13:17:30 +0100
Subject: [PATCH 212/403] Set not duration for PAE pseudo neumatic notation

---
 src/iopae.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/iopae.cpp b/src/iopae.cpp
index e3300bf89cd..ea07212f3a5 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -4053,9 +4053,7 @@ bool PAEInput::ConvertDuration()
                 if (interface->GetDur() == DURATION_128 && token->Is(NOTE)) {
                     Note *note = vrv_cast<Note *>(token->m_object);
                     assert(note);
-                    note->SetDur(DURATION_4);
-                    note->SetStemLen(0);
-                    note->SetStemVisible(BOOLEAN_false);
+                    note->SetDur(DURATION_NONE);
                 }
                 else if (m_isMensural) {
                     if (currentDur->second > 1) {

From 8d7aadb370d6f2b63d13120f022a7401e7d8da00 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 13:50:52 +0100
Subject: [PATCH 213/403] Add missing "rest" in error message

---
 src/iopae.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/iopae.cpp b/src/iopae.cpp
index ea07212f3a5..72dbfaefa2d 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -2319,7 +2319,7 @@ const std::map<int, std::string> PAEInput::s_errCodes{
     { ERR_055_KEYSIG_CHANGE, "The key signature cannot be changed more than once in a measure." },
     { ERR_056_TIMESIG_CHANGE, "The time signature cannot be changed more than once in a measure." },
     { ERR_057_MENSUR_CHANGE, "The mensur sign cannot be changed more than once in a measure." },
-    { ERR_058_FERMATA_MREST, "A fermata on measure with extra '%s' is invalid." },
+    { ERR_058_FERMATA_MREST, "A fermata on measure rest with extra '%s' is invalid." },
     { ERR_059_DOUBLE_DOTS_MENS, "Double-dotted notes are invalid with mensural notation." }
 };
 // clang-format on

From 1e3eb8b269dc4c661406db1ad56096a4d611b021 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 1 Feb 2022 19:48:23 +0200
Subject: [PATCH 214/403] Refactor code for splitting tunes in ABC importer

- changed code for splitting tunes into mdivs
- clened up code for parcing ABC, added a couple of helper functions
---
 include/vrv/ioabc.h |   7 +-
 src/ioabc.cpp       | 238 +++++++++++++++++++++-----------------------
 2 files changed, 118 insertions(+), 127 deletions(-)

diff --git a/include/vrv/ioabc.h b/include/vrv/ioabc.h
index 19e738e5283..d8877cf3a09 100644
--- a/include/vrv/ioabc.h
+++ b/include/vrv/ioabc.h
@@ -31,6 +31,7 @@ class Mdiv;
 class Measure;
 class MeterSig;
 class Note;
+class Score;
 class Section;
 class Slur;
 class Staff;
@@ -53,7 +54,7 @@ class ABCInput : public Input {
 private:
     // function declarations:
 
-    void parseABC(std::istream &infile);
+    void ParseABC(std::istream &infile);
 
     // parsing functions
     int SetBarLine(const std::string &musicCode, int index);
@@ -86,9 +87,11 @@ class ABCInput : public Input {
     void AddOrnaments(LayerElement *element);
 
     // additional functions
-    void PrintInformationFields();
+    void PrintInformationFields(Score *score);
     void CreateHeader();
     void CreateWorkEntry();
+    void FlushControlElements(Score *score, Section *section);
+    void InitScoreAndSection(Score *&score, Section *&section);
 
 #endif // NO_ABC_SUPPORT
 
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 52d65c43554..264065de85c 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -90,7 +90,7 @@ ABCInput::~ABCInput() {}
 bool ABCInput::Import(const std::string &abc)
 {
     std::istringstream in_stream(abc);
-    parseABC(in_stream);
+    ParseABC(in_stream);
     return true;
 }
 
@@ -99,143 +99,57 @@ bool ABCInput::Import(const std::string &abc)
 // parseABC --
 //
 
-void ABCInput::parseABC(std::istream &infile)
+void ABCInput::ParseABC(std::istream &infile) 
 {
     // initialize doc
     m_doc->Reset();
     m_doc->SetType(Raw);
 
-    // read file header
-    std::getline(infile, abcLine);
-    while (abcLine[0] != 'X') {
-        if (infile.eof()) {
-            LogError("ABC import: No tune found");
-            exit(0);
-        }
-        if ((abcLine[0] == '%') && (abcLine[1] == '%'))
-            LogWarning("ABC import: Stylesheet directives are ignored");
-        else if (abcLine[1] == ':')
-            readInformationField(abcLine[0], &abcLine[2]);
+    Score *score = NULL;
+    Section *section = NULL;
+    while (!infile.eof()) {
         std::getline(infile, abcLine);
         ++m_lineNum;
-    }
-    CreateHeader();
-
-    while (!infile.eof()) {
-        while (!(abcLine[0] == 'X' && abcLine[1] == ':') && !infile.eof()) {
-            std::getline(infile, abcLine);
-            ++m_lineNum;
+        if (abcLine[0] == 'X') {
+            this->readInformationField('X', &abcLine[2]);
+            while (abcLine[0] != 'K' && !infile.eof()) {
+                std::getline(infile, abcLine);
+                ++m_lineNum;
+                this->readInformationField(abcLine[0], &abcLine[2]);
+            }
+            if (infile.eof()) break;
+            if (m_title.empty()) {
+                LogWarning("ABC import: Title field missing, creating empty title");
+                m_title.push_back(std::make_pair("", 0));
+            }
+            // add work entry to meiHead
+            this->CreateWorkEntry();
+
+            this->InitScoreAndSection(score, section);
         }
-        if (infile.eof()) break;
-
-        // read tune header
-        readInformationField('X', &abcLine[2]);
-        while (abcLine[0] != 'K' && !infile.eof()) {
-            std::getline(infile, abcLine);
-            ++m_lineNum;
-            readInformationField(abcLine[0], &abcLine[2]);
+        else if (!m_mdiv || !score || !section) {
+            // if m_div is not initialized - we didn't read X element, so continue until we do
+            continue;
         }
-        if (infile.eof()) break;
-        if (m_title.empty()) {
-            LogWarning("ABC import: Title field missing, creating empty title");
-            m_title.push_back(std::make_pair("", 0));
+        if (std::string(abcLine).find_first_not_of(' ') == std::string::npos) {
+            // abc tunes are separated from each other by empty lines
+            this->FlushControlElements(score, section);
+            continue;
         }
-        // add work entry to meiHead
-        CreateWorkEntry();
-
-        // create score
-        assert(m_mdiv != NULL);
-        Score *score = new Score();
-        if (!m_doc->HasCurrentScore() || !m_doc->GetCurrentScoreDef()->GetFirst(STAFFGRP)) {
-            m_mdiv->AddChild(score);
-
-            // create page head
-            PrintInformationFields();
-            StaffGrp *staffGrp = new StaffGrp();
-            // create staff
-            StaffDef *staffDef = new StaffDef();
-            staffDef->SetN(1);
-            staffDef->SetLines(m_stafflines);
-            staffDef->SetTransSemi(m_transpose);
-            if (m_clef) {
-                staffDef->AddChild(m_clef);
-                m_clef = NULL;
-            }
-            if (m_meter) {
-                staffDef->AddChild(m_meter);
-                m_meter = NULL;
-            }
-            staffGrp->AddChild(staffDef);
-            m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
-            if (m_key) {
-                m_doc->GetCurrentScoreDef()->AddChild(m_key);
-                m_key = NULL;
-            }
-        }
-
-        // create section
-        Section *section = new Section();
-        // start with a new page
-        if (m_linebreak != '\0') {
-            Pb *pb = new Pb();
-            pb->SetUuid(StringFormat("abcLine%02d", m_lineNum + 1));
-            section->AddChild(pb);
-        }
-        // calculate default unit note length
-        if (m_durDefault == DURATION_NONE) {
-            CalcUnitNoteLength();
-        }
-        m_doc->GetCurrentScoreDef()->SetDurDefault(m_durDefault);
-        m_durDefault = DURATION_NONE;
-
-        // read music code
-        m_layer = new Layer();
-        m_layer->SetN(1);
-        while (!infile.eof()) {
-            std::getline(infile, abcLine);
-            ++m_lineNum;
-            if (std::string(abcLine).find_first_not_of(' ') == std::string::npos) {
-                // abc tunes are separated from each other by empty lines
-                break;
-            }
-            else if (abcLine[0] == '%')
-                // skipping comments and stylesheet directives
-                continue;
-            else if (abcLine[1] == ':' && abcLine[0] != '|') {
-                if (abcLine[0] != 'K') {
-                    readInformationField(abcLine[0], &abcLine[2]);
-                }
-                else {
-                    LogWarning("ABC import: Key changes not supported", abcLine[0]);
-                }
+        else if (abcLine[0] == '%')
+            // skipping comments and stylesheet directives
+            continue;
+        else if (abcLine[1] == ':' && abcLine[0] != '|') {
+            if (abcLine[0] != 'K') {
+                this->readInformationField(abcLine[0], &abcLine[2]);
             }
             else {
-                readMusicCode(abcLine, section);
+                LogWarning("ABC import: Key changes not supported", abcLine[0]);
             }
         }
-
-        // add ornaments, ties, and slur
-        Layer *layer = NULL;
-        Measure *measure = NULL;
-        for (auto iter = m_controlElements.begin(); iter != m_controlElements.end(); ++iter) {
-            if (!measure || (layer && layer->GetUuid() != iter->first)) {
-                layer = dynamic_cast<Layer *>(section->FindDescendantByUuid(iter->first));
-            }
-            if (!layer) {
-                LogWarning("ABC import: Element '%s' could not be assigned to layer '%s'",
-                    iter->second->GetClassName().c_str(), iter->first.c_str());
-                delete iter->second;
-                continue;
-            }
-            measure = vrv_cast<Measure *>(layer->GetFirstAncestor(MEASURE));
-            assert(measure);
-            measure->AddChild(iter->second);
+        else {
+            this->readMusicCode(abcLine, section);
         }
-
-        score->AddChild(section);
-
-        // only append first tune in file
-        if (!score->GetFirstAncestor(MDIV)) delete score;
     }
 
     m_controlElements.clear();
@@ -817,7 +731,7 @@ void ABCInput::parseReferenceNumber(const std::string &referenceNumberString)
     m_title.clear();
 }
 
-void ABCInput::PrintInformationFields()
+void ABCInput::PrintInformationFields(Score *score)
 {
     PgHead *pgHead = new PgHead();
     for (auto it = m_title.begin(); it != m_title.end(); ++it) {
@@ -857,7 +771,7 @@ void ABCInput::PrintInformationFields()
         originRend->AddChild(origin);
         pgHead->AddChild(originRend);
     }
-    m_doc->GetCurrentScoreDef()->AddChild(pgHead);
+    score->GetScoreDef()->AddChild(pgHead);
 }
 
 void ABCInput::CreateHeader()
@@ -959,6 +873,80 @@ void ABCInput::CreateWorkEntry()
     }
 }
 
+void ABCInput::FlushControlElements(Score *score, Section *section)
+{
+    Layer *layer = NULL;
+    Measure *measure = NULL;
+    for (auto iter = m_controlElements.begin(); iter != m_controlElements.end(); ++iter) {
+        if (!measure || (layer && layer->GetUuid() != iter->first)) {
+            layer = dynamic_cast<Layer *>(section->FindDescendantByUuid(iter->first));
+        }
+        if (!layer) {
+            LogWarning("ABC import: Element '%s' could not be assigned to layer '%s'",
+                iter->second->GetClassName().c_str(), iter->first.c_str());
+            delete iter->second;
+            continue;
+        }
+        measure = vrv_cast<Measure *>(layer->GetFirstAncestor(MEASURE));
+        assert(measure);
+        measure->AddChild(iter->second);
+    }
+
+    score->AddChild(section);
+    m_controlElements.clear();
+}
+
+
+void ABCInput::InitScoreAndSection(Score *&score, Section *&section)
+{
+    // create score
+    assert(m_mdiv != NULL);
+    score = new Score();
+    m_mdiv->AddChild(score);
+
+    StaffGrp *staffGrp = new StaffGrp();
+    // create staff
+    StaffDef *staffDef = new StaffDef();
+    staffDef->SetN(1);
+    staffDef->SetLines(m_stafflines);
+    staffDef->SetTransSemi(m_transpose);
+    if (m_clef) {
+        staffDef->AddChild(m_clef);
+        m_clef = NULL;
+    }
+    if (m_meter) {
+        staffDef->AddChild(m_meter);
+        m_meter = NULL;
+    }
+    staffGrp->AddChild(staffDef);
+    score->GetScoreDef()->AddChild(staffGrp);
+    if (m_key) {
+        score->GetScoreDef()->AddChild(m_key);
+        m_key = NULL;
+    }
+    // create page head
+    this->PrintInformationFields(score);
+
+    // create section
+    section = new Section();
+    // start with a new page
+    if (m_linebreak != '\0') {
+        Pb *pb = new Pb();
+        pb->SetUuid(StringFormat("abcLine%02d", m_lineNum + 1));
+        section->AddChild(pb);
+    }
+    // calculate default unit note length
+    if (m_durDefault == DURATION_NONE) {
+        CalcUnitNoteLength();
+    }
+    score->GetScoreDef()->SetDurDefault(m_durDefault);
+    m_durDefault = DURATION_NONE;
+
+    // read music code
+    m_layer = new Layer();
+    m_layer->SetN(1);
+}
+
 //////////////////////////////
 //
 // readInformationField --

From 1dc266fc29cf811a6cc6e053c141ecd9f8e6cdd6 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 2 Feb 2022 11:07:18 +0200
Subject: [PATCH 215/403] Change method and parameter names

---
 include/vrv/ioabc.h | 2 +-
 src/ioabc.cpp       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/vrv/ioabc.h b/include/vrv/ioabc.h
index 89f78e66ec0..be0f5806881 100644
--- a/include/vrv/ioabc.h
+++ b/include/vrv/ioabc.h
@@ -60,10 +60,10 @@ class ABCInput : public Input {
     void CalcUnitNoteLength();
     void AddAnnot(const std::string &remark);
     void AddLayerElement();
-    int AddTuplet(const std::string &musicCode, int i);
     void AddTie();
     void StartSlur();
     void EndSlur();
+    int ParseTuplet(const std::string &musicCode, int index);
 
     // parse information fields
     void parseInstruction(const std::string &keyString); // I:
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 4c4722e1578..328fd4b958c 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -340,11 +340,11 @@ void ABCInput::AddLayerElement()
     m_noteStack.clear();
 }
 
-int ABCInput::AddTuplet(const std::string &musicCode, int i)
+int ABCInput::ParseTuplet(const std::string &musicCode, int index)
 {
     constexpr std::string_view tupletElements = "(:0123456789 ";
-    const size_t tupletEnd = musicCode.find_first_not_of(tupletElements, ++i);
-    const std::string tupletStr = musicCode.substr(i, tupletEnd - i);
+    const size_t tupletEnd = musicCode.find_first_not_of(tupletElements, ++index);
+    const std::string tupletStr = musicCode.substr(index, tupletEnd - index);
 
     Tuplet *tuplet = new Tuplet();    
     size_t separator = tupletStr.find_first_of(":");
@@ -1138,7 +1138,7 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
 
         // tuplets
         else if ((i + 2 < (int)musicCode.length()) && musicCode.at(i) == '(' && isdigit(musicCode.at(i + 1))) {
-            i = AddTuplet(musicCode, i);
+            i = ParseTuplet(musicCode, i);
         }
 
         // slurs and ties

From de868cfc90aafde774cf9f0c5750ac5d8452c656 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 2 Feb 2022 11:10:49 +0200
Subject: [PATCH 216/403] Formatting

---
 include/vrv/ioabc.h | 5 +----
 src/ioabc.cpp       | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/vrv/ioabc.h b/include/vrv/ioabc.h
index be0f5806881..506ec42fddc 100644
--- a/include/vrv/ioabc.h
+++ b/include/vrv/ioabc.h
@@ -95,10 +95,7 @@ class ABCInput : public Input {
 public:
     //
 private:
-    enum class ElementType {
-        Default,
-        Tuplet
-    };
+    enum class ElementType { Default, Tuplet };
 
     std::string m_filename;
     Mdiv *m_mdiv = NULL;
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 328fd4b958c..18aeaff271b 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -305,7 +305,7 @@ void ABCInput::CalcUnitNoteLength()
     }
 }
 
-void ABCInput::AddLayerElement() 
+void ABCInput::AddLayerElement()
 {
     // exit if there is nothing to add
     if (!m_noteStack.size()) return;
@@ -346,7 +346,7 @@ int ABCInput::ParseTuplet(const std::string &musicCode, int index)
     const size_t tupletEnd = musicCode.find_first_not_of(tupletElements, ++index);
     const std::string tupletStr = musicCode.substr(index, tupletEnd - index);
 
-    Tuplet *tuplet = new Tuplet();    
+    Tuplet *tuplet = new Tuplet();
     size_t separator = tupletStr.find_first_of(":");
     // Get tuplet number first 9:_:_
     int tupletNum = 0;

From fd53145ecf667b1eb5a58c029ce7dcb5d50dc36d Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Wed, 2 Feb 2022 11:11:21 +0100
Subject: [PATCH 217/403] allow more than 6 accidentals in keySig

---
 src/att.cpp           |  4 ++--
 src/keysig.cpp        | 12 ++++++------
 src/object.cpp        |  2 +-
 src/transposition.cpp | 28 ++++++++++++++--------------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/att.cpp b/src/att.cpp
index 0f38151f60c..f790405558b 100644
--- a/src/att.cpp
+++ b/src/att.cpp
@@ -312,7 +312,7 @@ data_KEYSIGNATURE Att::StrToKeysignature(const std::string &value, bool logWarni
     int alterationNumber = 0;
     data_ACCIDENTAL_WRITTEN alterationType = ACCIDENTAL_WRITTEN_NONE;
 
-    std::regex test("mixed|0|[1-7][s|f]");
+    std::regex test("mixed|0|([1-9]|1[0-2])[f|s]");
     if (!std::regex_match(value, test)) {
         if (logWarning) LogWarning("Unsupported data.KEYSIGNATURE '%s'", value.c_str());
         return { -1, ACCIDENTAL_WRITTEN_NONE };
@@ -322,7 +322,7 @@ data_KEYSIGNATURE Att::StrToKeysignature(const std::string &value, bool logWarni
         return { VRV_UNSET, ACCIDENTAL_WRITTEN_NONE };
     }
     else if (value != "0") {
-        alterationNumber = atoi(value.substr(0, 1).c_str());
+        alterationNumber = std::stoi(value);
         alterationType = (value.at(1) == 's') ? ACCIDENTAL_WRITTEN_s : ACCIDENTAL_WRITTEN_f;
     }
     else {
diff --git a/src/keysig.cpp b/src/keysig.cpp
index 419c55eaecd..d933a4fee6f 100644
--- a/src/keysig.cpp
+++ b/src/keysig.cpp
@@ -179,7 +179,7 @@ void KeySig::FillMap(MapOfPitchAccid &mapOfPitchAccid)
 
     int i;
     data_ACCIDENTAL_WRITTEN accidType = this->GetAccidType();
-    for (i = 0; i < this->GetAccidCount(); i++) {
+    for (i = 0; i < this->GetAccidCount(); ++i) {
         mapOfPitchAccid[KeySig::GetAccidPnameAt(accidType, i)] = accidType;
     }
 }
@@ -200,17 +200,17 @@ std::wstring KeySig::GetKeyAccidStrAt(int pos, data_ACCIDENTAL_WRITTEN &accid, d
         return keyAccid->GetSymbolStr();
     }
 
-    if (pos > 6) return symbolStr;
+    if (pos > 12) return symbolStr;
 
     int symb;
     accid = this->GetAccidType();
     if (accid == ACCIDENTAL_WRITTEN_f) {
-        symb = SMUFL_E260_accidentalFlat;
-        pname = s_pnameForFlats[pos];
+        symb = (pos < 7) ? SMUFL_E260_accidentalFlat : SMUFL_E264_accidentalDoubleFlat;
+        pname = s_pnameForFlats[pos % 7];
     }
     else {
-        symb = SMUFL_E262_accidentalSharp;
-        pname = s_pnameForSharps[pos];
+        symb = (pos < 7) ? SMUFL_E262_accidentalSharp : SMUFL_E263_accidentalDoubleSharp;
+        pname = s_pnameForSharps[pos % 7];
     }
 
     symbolStr.push_back(symb);
diff --git a/src/object.cpp b/src/object.cpp
index 8fa9fddf9a9..15876428792 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -719,7 +719,7 @@ int Object::GetDescendantIndex(const Object *child, const ClassId classId, int d
     int i = 0;
     for (auto &object : objects) {
         if (child == object) return i;
-        i++;
+        ++i;
     }
     return -1;
 }
diff --git a/src/transposition.cpp b/src/transposition.cpp
index 98bc43b3940..280eedd18f7 100644
--- a/src/transposition.cpp
+++ b/src/transposition.cpp
@@ -316,12 +316,12 @@ std::ostream &operator<<(std::ostream &out, const TransPitch &pitch)
         default: out << "X";
     }
     if (pitch.m_accid > 0) {
-        for (int i = 0; i < pitch.m_accid; i++) {
+        for (int i = 0; i < pitch.m_accid; ++i) {
             out << "#";
         }
     }
     else if (pitch.m_accid < 0) {
-        for (int i = 0; i < abs(pitch.m_accid); i++) {
+        for (int i = 0; i < abs(pitch.m_accid); ++i) {
             out << "b";
         }
     }
@@ -693,7 +693,7 @@ bool Transposer::GetKeyTonic(const std::string &keyTonic, TransPitch &tonic)
     int pitch = 0;
     int accid = 0;
     int state = 0;
-    for (unsigned int i = 0; i < (unsigned int)keyTonic.size(); i++) {
+    for (unsigned int i = 0; i < (unsigned int)keyTonic.size(); ++i) {
         switch (state) {
             case 0:
                 switch (keyTonic[i]) {
@@ -760,7 +760,7 @@ int Transposer::GetInterval(const std::string &intervalName)
     std::string number;
     int state = 0;
 
-    for (int i = 0; i < (int)intervalName.size(); i++) {
+    for (int i = 0; i < (int)intervalName.size(); ++i) {
         switch (state) {
             case 0: // direction or quality expected
                 switch (intervalName[i]) {
@@ -1142,7 +1142,7 @@ TransPitch Transposer::IntegerPitchToTransPitch(int ipitch)
         // search from C upwards
         mindiff = chroma - m_diatonicMapping[0];
         mini = 0;
-        for (int i = 1; i < (int)m_diatonicMapping.size(); i++) {
+        for (int i = 1; i < (int)m_diatonicMapping.size(); ++i) {
             int diff = chroma - m_diatonicMapping[i];
             if (abs(diff) < abs(mindiff)) {
                 mindiff = diff;
@@ -1212,7 +1212,7 @@ std::string Transposer::GetIntervalName(int intervalClass)
 
     int mindiff = chroma;
     int mini = 0;
-    for (int i = 1; i < (int)m_diatonicMapping.size(); i++) {
+    for (int i = 1; i < (int)m_diatonicMapping.size(); ++i) {
         int diff = chroma - (m_diatonicMapping[i] - m_diatonicMapping[0]);
         if (abs(diff) < abs(mindiff)) {
             mindiff = diff;
@@ -1329,12 +1329,12 @@ std::string Transposer::GetIntervalName(int intervalClass)
 
     if (quality.empty()) {
         if (augmented) {
-            for (int i = 0; i < augmented; i++) {
+            for (int i = 0; i < augmented; ++i) {
                 quality += "A";
             }
         }
         else if (diminished) {
-            for (int i = 0; i < diminished; i++) {
+            for (int i = 0; i < diminished; ++i) {
                 quality += "d";
             }
         }
@@ -1391,7 +1391,7 @@ int Transposer::IntervalToCircleOfFifths(int transval)
 
     int p5 = this->PerfectFifthClass();
     int p4 = this->PerfectFourthClass();
-    for (int i = 1; i < m_base; i++) {
+    for (int i = 1; i < m_base; ++i) {
         if ((p5 * i) % m_base == transval) {
             return i;
         }
@@ -1549,12 +1549,12 @@ std::string Transposer::DiatonicChromaticToIntervalName(int diatonic, int chroma
             output += "P";
         }
         else if (chromatic > 0) {
-            for (int i = 0; i < chromatic; i++) {
+            for (int i = 0; i < chromatic; ++i) {
                 output += "A";
             }
         }
         else {
-            for (int i = 0; i < -chromatic; i++) {
+            for (int i = 0; i < -chromatic; ++i) {
                 output += "d";
             }
         }
@@ -1676,12 +1676,12 @@ std::string Transposer::DiatonicChromaticToIntervalName(int diatonic, int chroma
 
     if (quality.empty()) {
         if (augmented) {
-            for (int i = 0; i < augmented; i++) {
+            for (int i = 0; i < augmented; ++i) {
                 quality += "A";
             }
         }
         else if (diminished) {
-            for (int i = 0; i < diminished; i++) {
+            for (int i = 0; i < diminished; ++i) {
                 quality += "d";
             }
         }
@@ -1719,7 +1719,7 @@ void Transposer::IntervalToDiatonicChromatic(int &diatonic, int &chromatic, cons
     std::string number;
     int state = 0;
 
-    for (int i = 0; i < (int)intervalName.size(); i++) {
+    for (int i = 0; i < (int)intervalName.size(); ++i) {
         switch (state) {
             case 0: // direction or quality expected
                 switch (intervalName[i]) {

From 7f47ff3558551ea07c47c8b62a0d32a6f30f56b1 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 2 Feb 2022 11:25:29 +0100
Subject: [PATCH 218/403] Run PrepareMIDI once

add comments
---
 include/vrv/functorparams.h |  7 +------
 include/vrv/object.h        |  2 ++
 src/arpeg.cpp               |  6 +++---
 src/doc.cpp                 | 12 ++++++------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 66fad0bbd58..c06bdd1fe03 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -2031,12 +2031,7 @@ class PrepareLinkingParams : public FunctorParams {
 
 class PrepareMIDIParams : public FunctorParams {
 public:
-    PrepareMIDIParams()
-    {
-        m_transSemi = 0;
-        m_currentTempo = MIDI_TEMPO;
-    }
-    int m_transSemi;
+    PrepareMIDIParams() { m_currentTempo = MIDI_TEMPO; }
     double m_currentTempo;
     std::map<Note *, double> m_deferredNotes;
 };
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 24da47c3050..eb4c6a656b1 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -1273,6 +1273,8 @@ class Object : public BoundingBox {
 
     /**
      * Prepare the MIDI export
+     * Captures information (i.e. from control elements) for MIDI interpretation
+     * This information is usually required beforehand in GenerateMIDI
      */
     ///@{
     virtual int PrepareMIDI(FunctorParams *) { return FUNCTOR_CONTINUE; }
diff --git a/src/arpeg.cpp b/src/arpeg.cpp
index 5a0605f4f1d..84d78b3eabb 100644
--- a/src/arpeg.cpp
+++ b/src/arpeg.cpp
@@ -260,9 +260,9 @@ int Arpeg::PrepareMIDI(FunctorParams *functorParams)
     std::set<Note *> notes = this->GetNotes();
     std::vector<Note *> sortedNotes;
     std::copy(notes.begin(), notes.end(), std::back_inserter(sortedNotes));
-    std::sort(sortedNotes.begin(), sortedNotes.end(), [params, playTopDown](Note *note1, Note *note2) {
-        const int pitch1 = note1->GetMIDIPitch(params->m_transSemi);
-        const int pitch2 = note2->GetMIDIPitch(params->m_transSemi);
+    std::sort(sortedNotes.begin(), sortedNotes.end(), [playTopDown](Note *note1, Note *note2) {
+        const int pitch1 = note1->GetMIDIPitch();
+        const int pitch2 = note2->GetMIDIPitch();
         return playTopDown ? (pitch1 > pitch2) : (pitch1 < pitch2);
     });
 
diff --git a/src/doc.cpp b/src/doc.cpp
index 38464410398..97c4b24e8bc 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -310,6 +310,12 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     }
     midiFile->addTempo(0, 0, tempo);
 
+    // Capture information for MIDI generation, i.e. from control elements
+    Functor prepareMIDI(&Object::PrepareMIDI);
+    PrepareMIDIParams prepareMIDIParams;
+    prepareMIDIParams.m_currentTempo = tempo;
+    this->Process(&prepareMIDI, &prepareMIDIParams);
+
     // We need to populate processing lists for processing the document by Layer (by Verse will not be used)
     PrepareProcessingListsParams prepareProcessingListsParams;
     // Alternate solution with StaffN_LayerN_VerseN_t (see also Verse::PrepareDrawing)
@@ -383,12 +389,6 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
             filters.push_back(&matchStaff);
             filters.push_back(&matchLayer);
 
-            Functor prepareMIDI(&Object::PrepareMIDI);
-            PrepareMIDIParams prepareMIDIParams;
-            prepareMIDIParams.m_transSemi = transSemi;
-            prepareMIDIParams.m_currentTempo = tempo;
-            this->Process(&prepareMIDI, &prepareMIDIParams, NULL, &filters);
-
             Functor generateMIDI(&Object::GenerateMIDI);
             Functor generateMIDIEnd(&Object::GenerateMIDIEnd);
             GenerateMIDIParams generateMIDIParams(midiFile, &generateMIDI);

From 9a8ca56cedb7b5011b1599bd0ca5897a0c0c13dc Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Wed, 2 Feb 2022 11:38:25 +0100
Subject: [PATCH 219/403] Adjust comment

---
 include/vrv/functorparams.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index c06bdd1fe03..5bdf7922a0a 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -2024,9 +2024,8 @@ class PrepareLinkingParams : public FunctorParams {
 //----------------------------------------------------------------------------
 
 /**
- * member 0: the semi tone transposition
- * member 1: the current tempo
- * member 2: deferred notes which start slightly later
+ * member 0: the current tempo
+ * member 1: deferred notes which start slightly later
  **/
 
 class PrepareMIDIParams : public FunctorParams {

From 7ce96c04e8af21184dc75e399174f7596d2b2511 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 2 Feb 2022 14:53:47 +0200
Subject: [PATCH 220/403] Fix code to allow for beamed and unbeamed tuplets

---
 include/vrv/ioabc.h |  8 ++++++--
 src/ioabc.cpp       | 39 +++++++++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/include/vrv/ioabc.h b/include/vrv/ioabc.h
index 506ec42fddc..70887793116 100644
--- a/include/vrv/ioabc.h
+++ b/include/vrv/ioabc.h
@@ -96,6 +96,11 @@ class ABCInput : public Input {
     //
 private:
     enum class ElementType { Default, Tuplet };
+    struct ContainerElement {
+        ElementType m_type = ElementType::Default;
+        LayerElement *m_element = NULL;
+        int m_count = 0;
+    };
 
     std::string m_filename;
     Mdiv *m_mdiv = NULL;
@@ -119,8 +124,7 @@ class ABCInput : public Input {
     int m_gracecount = 0;
     int m_stafflines = 5;
     int m_transpose = 0;
-    ElementType m_type = ElementType::Default;
-    std::pair<ElementType, LayerElement *> m_containerPair = { ElementType::Default, NULL };
+    ContainerElement m_containerElement;
     /*
      * ABC metadata stacks
      */
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 18aeaff271b..c7235902ac1 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -311,24 +311,35 @@ void ABCInput::AddLayerElement()
     if (!m_noteStack.size()) return;
     // if just one note in the stack - add it do the layer directly
     if (m_noteStack.size() == 1) {
-        m_layer->AddChild(m_noteStack.back());
+        if (m_containerElement.m_element && (ElementType::Tuplet == m_containerElement.m_type)) {
+            m_containerElement.m_element->AddChild(m_noteStack.back());
+            if (!--m_containerElement.m_count) {
+                m_layer->AddChild(m_containerElement.m_element);
+                m_containerElement = {};
+            }
+        }
+        else {
+            m_layer->AddChild(m_noteStack.back());
+        }
         m_noteStack.clear();
+        return;
     }
     // otherwise we can have beam or tuplet (for now)
-    LayerElement *element = NULL;
-    // if container pair key is set to Tuplet - proceed with it
-    if (m_containerPair.second && (ElementType::Tuplet == m_containerPair.first)) {
-        element = m_containerPair.second;
-    }
-    // otherwise default to it being beam
-    else {
-        element = new Beam();
-    }
+    Beam *beam = new Beam();
     // add stacked notes to the current element
     for (auto iter = m_noteStack.begin(); iter != m_noteStack.end(); ++iter) {
-        element->AddChild(*iter);
+        beam->AddChild(*iter);
     }
-    if (element->FindDescendantByType(NOTE)) {
+    if (beam->FindDescendantByType(NOTE)) {
+        LayerElement *element = NULL;
+        if (m_containerElement.m_element && (ElementType::Tuplet == m_containerElement.m_type)) {
+            element = m_containerElement.m_element;
+            element->AddChild(beam);
+        }
+        // otherwise default to it being beam
+        else {
+            element = beam;
+        }
         m_layer->AddChild(element);
     }
     else {
@@ -336,7 +347,7 @@ void ABCInput::AddLayerElement()
             m_layer->AddChild(*iter);
         }
     }
-    m_containerPair = { ElementType::Default, NULL };
+    m_containerElement = {};
     m_noteStack.clear();
 }
 
@@ -384,7 +395,7 @@ int ABCInput::ParseTuplet(const std::string &musicCode, int index)
     // Ignore this for the time being
     tuplet->SetNum(tupletNum);
     tuplet->SetNumbase(tupletNumbase);
-    m_containerPair = { ElementType::Tuplet, tuplet };
+    m_containerElement = { ElementType::Tuplet, tuplet, tupletNum };
 
     // return index of the last element in tuplet, so that we point to the actual notes when incrementing 'i'
     return tupletEnd - 1;

From 8fa002b8d2e584aec88d8ee61e4103d1ee2c6b80 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 2 Feb 2022 17:06:20 +0200
Subject: [PATCH 221/403] Add data clean up

---
 src/ioabc.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index c7235902ac1..50caf3b0662 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -347,6 +347,11 @@ void ABCInput::AddLayerElement()
             m_layer->AddChild(*iter);
         }
     }
+    // clean-up leftover data, if any
+    if (beam && !beam->GetChildCount()) delete beam;
+    if (m_containerElement.m_element && !m_containerElement.m_element->GetChildCount())
+        delete m_containerElement.m_element;
+
     m_containerElement = {};
     m_noteStack.clear();
 }

From faf3f88f1e6de83f9461bb9c486583e6b23fe65c Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Wed, 2 Feb 2022 16:09:51 +0100
Subject: [PATCH 222/403] update supported.xsl

---
 fonts/supported.xsl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fonts/supported.xsl b/fonts/supported.xsl
index c3a1348d818..7c46e2f37c1 100644
--- a/fonts/supported.xsl
+++ b/fonts/supported.xsl
@@ -113,15 +113,15 @@
             <!--<glyph glyph-code="E06C" smufl-name="semipitchedPercussionClef2" />-->
             <glyph glyph-code="E06D" smufl-name="6stringTabClef" />
             <glyph glyph-code="E06E" smufl-name="4stringTabClef" />
-            <!--<glyph glyph-code="E06F" smufl-name="cClefTriangular" />-->
-            <!--<glyph glyph-code="E070" smufl-name="fClefTriangular" />-->
-            <!--<glyph glyph-code="E071" smufl-name="cClefTriangularToFClef" />-->
-            <!--<glyph glyph-code="E072" smufl-name="fClefTriangularToCClef" />-->
-            <glyph glyph-code="E073" smufl-name="gClefReversed" />
-            <glyph glyph-code="E074" smufl-name="gClefTurned" />
-            <glyph glyph-code="E075" smufl-name="cClefReversed" />
-            <glyph glyph-code="E076" smufl-name="fClefReversed" />
-            <glyph glyph-code="E077" smufl-name="fClefTurned" />
+            <!--<glyph glyph-code="E06F" smufl-name="schaefferClef" />-->
+            <!--<glyph glyph-code="E070" smufl-name="schaefferPreviousClef" />-->
+            <!--<glyph glyph-code="E071" smufl-name="schaefferGClefToFClef" />-->
+            <!--<glyph glyph-code="E072" smufl-name="schaefferFClefToGClef" />-->
+            <!--<glyph glyph-code="E073" smufl-name="gClefReversed" />-->
+            <!--<glyph glyph-code="E074" smufl-name="gClefTurned" />-->
+            <!--<glyph glyph-code="E075" smufl-name="cClefReversed" />-->
+            <!--<glyph glyph-code="E076" smufl-name="fClefReversed" />-->
+            <!--<glyph glyph-code="E077" smufl-name="fClefTurned" />-->
             <!--<glyph glyph-code="E078" smufl-name="bridgeClef" />-->
             <!--<glyph glyph-code="E079" smufl-name="accdnDiatonicClef" />-->
             <!--<glyph glyph-code="E07A" smufl-name="gClefChange" />-->

From 83a245e414d922e5777f1a1c08560b4e51822e9d Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 17 Jan 2022 12:01:56 +0200
Subject: [PATCH 223/403] Use all of the glyphs inside of the font xml

- adjusted code to parse all of the glyphs that are available
- changed container for glyphs from map to unordered_map
---
 include/vrv/glyph.h      |  14 ++++-
 include/vrv/vrv.h        |  15 +++--
 src/svgdevicecontext.cpp |   7 +--
 src/vrv.cpp              | 126 ++++++++++++++-------------------------
 4 files changed, 69 insertions(+), 93 deletions(-)

diff --git a/include/vrv/glyph.h b/include/vrv/glyph.h
index d0205d28136..0d54a0919fa 100644
--- a/include/vrv/glyph.h
+++ b/include/vrv/glyph.h
@@ -50,14 +50,24 @@ class Glyph {
      */
     void SetBoundingBox(double x, double y, double w, double h);
 
-    /** Get the units per EM */
+    /**
+     * @name Setter and getter for the units per EM
+     */
+    ///@{
     int GetUnitsPerEm() const { return m_unitsPerEm; }
+    void SetUnitsPerEm(int units) { m_unitsPerEm = units; }
+    ///@}
 
     /** Get the path */
     std::string GetPath() { return m_path; }
 
-    /** Get the code string */
+    /**
+     * @name Setter and getter for the code string
+     */
+    ///@{
     std::string GetCodeStr() { return m_codeStr; }
+    void SetCodeStr(const std::string &codeStr) { m_codeStr = codeStr; }
+    ///@}
 
     /**
      * @name Setter and getter for the horizAdvX
diff --git a/include/vrv/vrv.h b/include/vrv/vrv.h
index 79f5c182199..66bd82a2e8b 100644
--- a/include/vrv/vrv.h
+++ b/include/vrv/vrv.h
@@ -13,6 +13,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #ifndef _WIN32
@@ -135,8 +136,9 @@ bool Check(Object *object);
 class Resources {
 public:
     using StyleAttributes = std::pair<data_FONTWEIGHT, data_FONTSTYLE>;
-    using GlyphMap = std::map<wchar_t, Glyph>;
-    using GlyphTextMap = std::map<StyleAttributes, GlyphMap>;
+    using GlyphTable = std::unordered_map<wchar_t, Glyph>;
+    using GlyphNameTable = std::unordered_map<std::string, wchar_t>;
+    using GlyphTextMap = std::map<StyleAttributes, GlyphTable>;
 
     //----------------//
     // Static methods //
@@ -149,6 +151,8 @@ class Resources {
     /** Resource path */
     static std::string GetPath() { return s_path; }
     static void SetPath(const std::string &path) { s_path = path; }
+    /** Font name */
+    static std::string GetSmuflFontName() { return m_smuflFontName; }
     /** Init the SMufL music and text fonts */
     static bool InitFonts();
     /** Init the text font (bounding boxes and ASCII only) */
@@ -177,17 +181,18 @@ class Resources {
 
     /** The path to the resources directory (e.g., for the svg/ subdirectory with fonts as XML */
     static thread_local std::string s_path;
+    /** Name of the font used for SMUFL glyphs*/
+    static thread_local std::string m_smuflFontName;
     /** The loaded SMuFL font */
-    static thread_local GlyphMap s_font;
+    static thread_local GlyphTable m_fontGlyphTable;
     /** A text font used for bounding box calculations */
     static thread_local GlyphTextMap s_textFont;
     static thread_local StyleAttributes s_currentStyle;
     static const StyleAttributes k_defaultStyle;
     /**
      * A map of glyph name / code
-     * The map in generated by ./fonts/generate_all.sh into ./src/smufl.cpp
      */
-    static const std::map<std::string, wchar_t> s_smuflNames;
+    static thread_local GlyphNameTable m_glyphNameTable;
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/svgdevicecontext.cpp b/src/svgdevicecontext.cpp
index 9d71f1bf6d1..c5715f3225a 100644
--- a/src/svgdevicecontext.cpp
+++ b/src/svgdevicecontext.cpp
@@ -127,7 +127,8 @@ void SvgDeviceContext::Commit(bool xml_declaration)
         std::set<std::string>::const_iterator it;
         for (it = m_smuflGlyphs.begin(); it != m_smuflGlyphs.end(); ++it) {
             // load the XML file that contains it as a pugi::xml_document
-            std::ifstream source((*it).c_str());
+            const std::string path = Resources::GetPath() + "/" + Resources::GetSmuflFontName() + "/" + *it + ".xml";
+            std::ifstream source(path);
             sourceDoc.load(source);
 
             // copy all the nodes inside into the master document
@@ -904,10 +905,8 @@ void SvgDeviceContext::DrawMusicText(const std::wstring &text, int x, int y, boo
             continue;
         }
 
-        std::string path = glyph->GetPath();
-
         // Add the glyph to the array for the <defs>
-        m_smuflGlyphs.insert(path);
+        m_smuflGlyphs.insert(glyph->GetCodeStr());
 
         // Write the char in the SVG
         pugi::xml_node useChild = AppendChild("use");
diff --git a/src/vrv.cpp b/src/vrv.cpp
index 78e1e1b4322..cdaeabd6abb 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -66,8 +66,10 @@ namespace vrv {
 //----------------------------------------------------------------------------
 
 thread_local std::string Resources::s_path = "/usr/local/share/verovio";
+thread_local std::string Resources::m_smuflFontName = "";
 thread_local Resources::GlyphTextMap Resources::s_textFont;
-thread_local Resources::GlyphMap Resources::s_font;
+thread_local Resources::GlyphTable Resources::m_fontGlyphTable;
+thread_local Resources::GlyphNameTable Resources::m_glyphNameTable;
 thread_local Resources::StyleAttributes Resources::s_currentStyle;
 const Resources::StyleAttributes Resources::k_defaultStyle{ data_FONTWEIGHT::FONTWEIGHT_normal,
     data_FONTSTYLE::FONTSTYLE_normal };
@@ -84,11 +86,6 @@ bool Resources::InitFonts()
     // The Leipzig as the default font
     if (!LoadFont("Leipzig")) LogError("Leipzig font could not be loaded.");
 
-    if (s_font.size() < SMUFL_COUNT) {
-        LogError("Expected %d default SMuFL glyphs but could load only %d.", SMUFL_COUNT, s_font.size());
-        return false;
-    }
-
     struct TextFontInfo_type {
         const StyleAttributes m_style;
         const std::string m_fileName;
@@ -122,21 +119,17 @@ bool Resources::SetFont(const std::string &fontName)
 
 Glyph *Resources::GetGlyph(wchar_t smuflCode)
 {
-    if (!s_font.count(smuflCode)) return NULL;
-    return &s_font[smuflCode];
+    return m_fontGlyphTable.count(smuflCode) ? &m_fontGlyphTable.at(smuflCode) : NULL;
 }
 
 Glyph *Resources::GetGlyph(const std::string &smuflName)
 {
-    wchar_t code = GetGlyphCode(smuflName);
-    if (code == 0) return NULL;
-    return GetGlyph(code);
+    return m_glyphNameTable.count(smuflName) ? &m_fontGlyphTable.at(m_glyphNameTable.at(smuflName)) : NULL;
 }
 
 wchar_t Resources::GetGlyphCode(const std::string &smuflName)
 {
-    if (!s_smuflNames.count(smuflName)) return 0;
-    return s_smuflNames.at(smuflName);
+    return m_glyphNameTable.count(smuflName) ? m_glyphNameTable.at(smuflName) : 0;
 }
 
 void Resources::SelectTextFont(data_FONTWEIGHT fontWeight, data_FONTSTYLE fontStyle)
@@ -158,88 +151,51 @@ void Resources::SelectTextFont(data_FONTWEIGHT fontWeight, data_FONTSTYLE fontSt
 
 Glyph *Resources::GetTextGlyph(wchar_t code)
 {
-    GlyphMap *currentMap = &s_textFont[s_textFont.count(s_currentStyle) != 0 ? s_currentStyle : k_defaultStyle];
+    GlyphTable *currentTable = &s_textFont[s_textFont.count(s_currentStyle) != 0 ? s_currentStyle : k_defaultStyle];
 
-    if (currentMap->count(code) == 0) {
+    if (currentTable->count(code) == 0) {
         return NULL;
     }
 
-    return &currentMap->at(code);
+    return &currentTable->at(code);
 }
 
 bool Resources::LoadFont(const std::string &fontName)
 {
-    ::DIR *dir;
-    dirent *pdir;
-    std::string dirname = Resources::GetPath() + "/" + fontName;
-    dir = opendir(dirname.c_str());
+    // set font name
+    m_smuflFontName = fontName;
 
-    if (!dir) {
-        LogError("Font directory '%s' cannot be read", dirname.c_str());
-        return false;
-    }
-
-    // First loop through the fontName directory and load each glyph
-    // Since the filename starts with the Unicode code, it is used
-    // to assign the glyph to the corresponding position in m_fonts
-    while ((pdir = readdir(dir))) {
-        if (strstr(pdir->d_name, ".xml")) {
-            // E.g, : E053-gClef8va.xml => strtol extracts E053 as hex
-            wchar_t smuflCode = (wchar_t)strtol(pdir->d_name, NULL, 16);
-            if (smuflCode == 0) {
-                LogError("Invalid SMUFL code (0)");
-                continue;
-            }
-            std::string codeStr = pdir->d_name;
-            codeStr = codeStr.substr(0, 4);
-            Glyph glyph(Resources::GetPath() + "/" + fontName + "/" + pdir->d_name, codeStr);
-            s_font[smuflCode] = glyph;
-        }
-    }
-
-    closedir(dir);
-
-    // Then load the bounding boxes (if bounding box file is provided)
     pugi::xml_document doc;
-    std::string filename = Resources::GetPath() + "/" + fontName + ".xml";
-    pugi::xml_parse_result result = doc.load_file(filename.c_str());
-    if (!result) {
+    const std::string filename = Resources::GetPath() + "/" + fontName + ".xml";
+    pugi::xml_parse_result parseResult = doc.load_file(filename.c_str());
+    if (!parseResult) {
         // File not found, default bounding boxes will be used
         LogMessage("Font loaded without bounding boxes");
-        return true;
+        return false;
     }
     pugi::xml_node root = doc.first_child();
     if (!root.attribute("units-per-em")) {
         LogWarning("No units-per-em attribute in bouding box file");
-        return true;
+        return false;
     }
-    const int unitsPerEm = root.attribute("units-per-em").as_int();
-    pugi::xml_node current;
-    for (current = root.child("g"); current; current = current.next_sibling("g")) {
-        Glyph *glyph = NULL;
-        if (current.attribute("c")) {
-            const wchar_t smuflCode = (wchar_t)strtol(current.attribute("c").value(), NULL, 16);
-            if (!s_font.count(smuflCode)) {
-                LogWarning("Glyph with code point U+%X not found.", smuflCode);
-                continue;
-            }
-            glyph = &s_font[smuflCode];
-            if (glyph->GetUnitsPerEm() != unitsPerEm * 10) {
-                LogWarning("Glyph and bounding box units-per-em for code point U+%X miss-match (bounding box: %d)",
-                    smuflCode, unitsPerEm);
-                continue;
-            }
-            float x = 0.0, y = 0.0, width = 0.0, height = 0.0;
-            // Not check for missing values...
-            if (current.attribute("x")) x = current.attribute("x").as_float();
-            if (current.attribute("y")) y = current.attribute("y").as_float();
-            if (current.attribute("w")) width = current.attribute("w").as_float();
-            if (current.attribute("h")) height = current.attribute("h").as_float();
-            glyph->SetBoundingBox(x, y, width, height);
-            if (current.attribute("h-a-x")) glyph->SetHorizAdvX(current.attribute("h-a-x").as_float());
-        }
 
-        if (!glyph) continue;
+    const int unitsPerEm = atoi(root.attribute("units-per-em").value());
+
+    for (pugi::xml_node current = root.child("g"); current; current = current.next_sibling("g")) {
+        pugi::xml_attribute c_attribute = current.attribute("c");
+        pugi::xml_attribute n_attribute = current.attribute("n");
+        if (!c_attribute || !n_attribute) continue;
+
+        Glyph glyph;
+        glyph.SetUnitsPerEm(unitsPerEm * 10);
+        glyph.SetCodeStr(c_attribute.value());
+        float x = 0.0, y = 0.0, width = 0.0, height = 0.0;
+        if (current.attribute("x")) x = atof(current.attribute("x").value());
+        if (current.attribute("y")) y = atof(current.attribute("y").value());
+        if (current.attribute("w")) width = atof(current.attribute("w").value());
+        if (current.attribute("h")) height = atof(current.attribute("h").value());
+        glyph.SetBoundingBox(x, y, width, height);
+        if (current.attribute("h-a-x")) glyph.SetHorizAdvX(atof(current.attribute("h-a-x").value()));
 
         // load anchors
         pugi::xml_node anchor;
@@ -247,9 +203,14 @@ bool Resources::LoadFont(const std::string &fontName)
             if (anchor.attribute("n")) {
                 std::string name = std::string(anchor.attribute("n").value());
                 // No check for possible x and y missing attributes - not very safe.
-                glyph->SetAnchor(name, anchor.attribute("x").as_float(), anchor.attribute("y").as_float());
+
+                glyph.SetAnchor(name, atof(anchor.attribute("x").value()), atof(anchor.attribute("y").value()));
             }
         }
+
+        wchar_t smuflCode = (wchar_t)strtol(c_attribute.value(), NULL, 16);
+        m_fontGlyphTable[smuflCode] = glyph;
+        m_glyphNameTable[n_attribute.value()] = smuflCode;
     }
 
     return true;
@@ -276,9 +237,9 @@ bool Resources::InitTextFont(const std::string &fontName, const StyleAttributes
     const int unitsPerEm = root.attribute("units-per-em").as_int();
     pugi::xml_node current;
     if (s_textFont.count(style) == 0) {
-        s_textFont[style] = GlyphMap{};
+        s_textFont[style] = {};
     }
-    GlyphMap &currentMap = s_textFont.at(style);
+    GlyphTable &currentTable = s_textFont.at(style);
     for (current = root.child("g"); current; current = current.next_sibling("g")) {
         if (current.attribute("c")) {
             wchar_t code = (wchar_t)strtol(current.attribute("c").value(), NULL, 16);
@@ -292,11 +253,12 @@ bool Resources::InitTextFont(const std::string &fontName, const StyleAttributes
             if (current.attribute("w")) width = current.attribute("w").as_float();
             if (current.attribute("h")) height = current.attribute("h").as_float();
             glyph.SetBoundingBox(x, y, width, height);
+
             if (current.attribute("h-a-x")) glyph.SetHorizAdvX(current.attribute("h-a-x").as_float());
-            if (currentMap.count(code) > 0) {
+            if (currentTable.count(code) > 0) {
                 LogDebug("Redefining %d with %s", code, fontName.c_str());
             }
-            currentMap[code] = glyph;
+            currentTable[code] = glyph;
         }
     }
     return true;

From b1a736f5cf30db783de1f0e322f43293e2e27b02 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 18 Jan 2022 12:23:40 +0200
Subject: [PATCH 224/403] Add method to limit range of parsed glyphs

- added method to allow to parse input file (fontmetadata.json), to allow and specify which ranges of glyphs should be parsed from the font. If file is not found or empty, no limitation will be applied and all glyphs will be read
---
 include/vrv/glyph.h |  5 -----
 include/vrv/vrv.h   |  4 ++++
 src/glyph.cpp       |  3 ---
 src/vrv.cpp         | 51 ++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/include/vrv/glyph.h b/include/vrv/glyph.h
index 0d54a0919fa..780e8941932 100644
--- a/include/vrv/glyph.h
+++ b/include/vrv/glyph.h
@@ -58,9 +58,6 @@ class Glyph {
     void SetUnitsPerEm(int units) { m_unitsPerEm = units; }
     ///@}
 
-    /** Get the path */
-    std::string GetPath() { return m_path; }
-
     /**
      * @name Setter and getter for the code string
      */
@@ -107,8 +104,6 @@ class Glyph {
     int m_horizAdvX;
     /** Units per EM for the glyph */
     int m_unitsPerEm;
-    /** Path to the file */
-    std::string m_path;
     /** The Unicode code in hexa as string */
     std::string m_codeStr;
     /** A map of the available anchors */
diff --git a/include/vrv/vrv.h b/include/vrv/vrv.h
index 66bd82a2e8b..f8a306ee836 100644
--- a/include/vrv/vrv.h
+++ b/include/vrv/vrv.h
@@ -173,6 +173,10 @@ class Resources {
 
 private:
     static bool LoadFont(const std::string &fontName);
+    /**
+     * Returns ranges of the glyphs to be parsed
+     */
+    static std::map<wchar_t, wchar_t> GetGlyphRanges();
 
 private:
     //----------------//
diff --git a/src/glyph.cpp b/src/glyph.cpp
index 190cc1cfc33..baad7aac223 100644
--- a/src/glyph.cpp
+++ b/src/glyph.cpp
@@ -34,7 +34,6 @@ Glyph::Glyph()
     m_height = 0;
     m_horizAdvX = 0;
     m_unitsPerEm = 20480;
-    m_path = "[unset]";
     m_codeStr = "[unset]";
 }
 
@@ -46,7 +45,6 @@ Glyph::Glyph(std::string path, std::string codeStr)
     m_height = 0;
     m_horizAdvX = 0;
     m_unitsPerEm = 20480;
-    m_path = path;
     m_codeStr = codeStr;
 
     pugi::xml_document doc;
@@ -82,7 +80,6 @@ Glyph::Glyph(int unitsPerEm)
     m_height = 0;
     m_horizAdvX = 0;
     m_unitsPerEm = unitsPerEm * 10;
-    m_path = "[unset]";
     m_codeStr = "[unset]";
 }
 
diff --git a/src/vrv.cpp b/src/vrv.cpp
index cdaeabd6abb..a5a0555eff1 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -16,6 +16,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <fstream>
 #include <vector>
 
 #ifndef _WIN32
@@ -45,6 +46,7 @@
 //----------------------------------------------------------------------------
 
 #include "checked.h"
+#include "jsonxx.h"
 #include "pugixml.hpp"
 #include "unchecked.h"
 
@@ -132,6 +134,45 @@ wchar_t Resources::GetGlyphCode(const std::string &smuflName)
     return m_glyphNameTable.count(smuflName) ? m_glyphNameTable.at(smuflName) : 0;
 }
 
+std::map<wchar_t, wchar_t> Resources::GetGlyphRanges()
+{
+    constexpr std::string_view input = "fontmetadata.json";
+    constexpr std::string_view glyphRanges = "glyphRanges";
+    constexpr std::string_view rangeStart = "rangeStart";
+    constexpr std::string_view rangeEnd = "rangeEnd";
+
+    jsonxx::Object content;
+    // Input is file path
+    std::ifstream in(Resources::GetPath() + "/" + input.data());
+    if (!in.is_open()) {
+        return {};
+    }
+    const bool parseResult = content.parse(in);
+    in.close();
+    if (!parseResult) return {};
+
+    if (content.kv_map().empty() || !content.kv_map().count(glyphRanges.data())
+        || !content.kv_map().at(glyphRanges.data())->is<jsonxx::Array>())
+        return {};
+
+    const jsonxx::Array jsonRanges = content.kv_map().at(glyphRanges.data())->get<jsonxx::Array>();
+    std::map<wchar_t, wchar_t> result;
+    for (const auto element : jsonRanges.values()) {
+        if (!element->is<jsonxx::Object>()) continue;
+
+        auto range = element->get<jsonxx::Object>().kv_map();
+        if (!range.count(rangeStart.data()) || !range.at(rangeStart.data())->is<jsonxx::String>()) continue;
+        if (!range.count(rangeEnd.data()) || !range.at(rangeEnd.data())->is<jsonxx::String>()) continue;
+
+        const wchar_t start = (wchar_t)strtol(range.at(rangeStart.data())->get<jsonxx::String>().c_str(), NULL, 16);
+        const wchar_t end = (wchar_t)strtol(range.at(rangeEnd.data())->get<jsonxx::String>().c_str(), NULL, 16);
+
+        result[start] = end;
+    }
+
+    return result;
+}
+
 void Resources::SelectTextFont(data_FONTWEIGHT fontWeight, data_FONTSTYLE fontStyle)
 {
     if (fontWeight == FONTWEIGHT_NONE) {
@@ -181,11 +222,20 @@ bool Resources::LoadFont(const std::string &fontName)
 
     const int unitsPerEm = atoi(root.attribute("units-per-em").value());
 
+    const std::map<wchar_t, wchar_t> ranges = GetGlyphRanges();
+
     for (pugi::xml_node current = root.child("g"); current; current = current.next_sibling("g")) {
         pugi::xml_attribute c_attribute = current.attribute("c");
         pugi::xml_attribute n_attribute = current.attribute("n");
         if (!c_attribute || !n_attribute) continue;
 
+        const wchar_t smuflCode = (wchar_t)strtol(c_attribute.value(), NULL, 16);
+        const auto it
+            = std::find_if(ranges.begin(), ranges.end(), [smuflCode](const std::pair<wchar_t, wchar_t> &keyValue) {
+                  return (smuflCode >= keyValue.first) && (smuflCode <= keyValue.second);
+              });
+        if (it == ranges.end()) continue;
+
         Glyph glyph;
         glyph.SetUnitsPerEm(unitsPerEm * 10);
         glyph.SetCodeStr(c_attribute.value());
@@ -208,7 +258,6 @@ bool Resources::LoadFont(const std::string &fontName)
             }
         }
 
-        wchar_t smuflCode = (wchar_t)strtol(c_attribute.value(), NULL, 16);
         m_fontGlyphTable[smuflCode] = glyph;
         m_glyphNameTable[n_attribute.value()] = smuflCode;
     }

From e889851a88c71724751948a8ba24d9c4cee2eb77 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 18 Jan 2022 12:51:01 +0200
Subject: [PATCH 225/403] Minor fix

---
 src/vrv.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/vrv.cpp b/src/vrv.cpp
index a5a0555eff1..a9c6d7d6327 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -230,11 +230,13 @@ bool Resources::LoadFont(const std::string &fontName)
         if (!c_attribute || !n_attribute) continue;
 
         const wchar_t smuflCode = (wchar_t)strtol(c_attribute.value(), NULL, 16);
-        const auto it
-            = std::find_if(ranges.begin(), ranges.end(), [smuflCode](const std::pair<wchar_t, wchar_t> &keyValue) {
-                  return (smuflCode >= keyValue.first) && (smuflCode <= keyValue.second);
-              });
-        if (it == ranges.end()) continue;
+        if (!ranges.empty()) {
+            const auto it
+                = std::find_if(ranges.begin(), ranges.end(), [smuflCode](const std::pair<wchar_t, wchar_t> &keyValue) {
+                      return (smuflCode >= keyValue.first) && (smuflCode <= keyValue.second);
+                  });
+            if (it == ranges.end()) continue;
+        }
 
         Glyph glyph;
         glyph.SetUnitsPerEm(unitsPerEm * 10);

From 6ecc1dc872a0a0ec31e85049237083faa4b76991 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 18 Jan 2022 12:51:59 +0200
Subject: [PATCH 226/403] Add font ranges json file

---
 data/fontmetadata.json | 209 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 209 insertions(+)
 create mode 100644 data/fontmetadata.json

diff --git a/data/fontmetadata.json b/data/fontmetadata.json
new file mode 100644
index 00000000000..5fc29d1920d
--- /dev/null
+++ b/data/fontmetadata.json
@@ -0,0 +1,209 @@
+{
+	"glyphRanges" : [
+	{
+		"rangeName" : "Staff brackets and dividers",
+		"rangeStart" : "E000",
+		"rangeEnd" : "E004"
+	},
+	{
+		"rangeName" : "Repeats",
+		"rangeStart" : "E043",
+		"rangeEnd" : "E04B"
+	},
+	{
+		"rangeName" : "Clefs",
+		"rangeStart" : "E050",
+		"rangeEnd" : "E077"
+	},
+	{
+		"rangeName" : "Time signatures",
+		"rangeStart" : "E080",
+		"rangeEnd" : "E095"
+	},
+	{
+		"rangeName" : "Noteheads",
+		"rangeStart" : "E0A0",
+		"rangeEnd" : "E0FA"
+	},
+	{
+		"rangeName" : "Slash noteheads",
+		"rangeStart" : "E101",
+		"rangeEnd" : "E103"
+	},
+	{
+		"rangeName" : "Tremolos",
+		"rangeStart" : "E220",
+		"rangeEnd" : "E22A"
+	},
+	{
+		"rangeName" : "Flags",
+		"rangeStart" : "E240",
+		"rangeEnd" : "E24F"
+	},
+	{
+		"rangeName" : "Standard accidentals (12-EDO)",
+		"rangeStart" : "E260",
+		"rangeEnd" : "E26D"
+	},
+	{
+		"rangeName" : "Gould arrow quartertone accidentals (24-EDO)",
+		"rangeStart" : "E270",
+		"rangeEnd" : "E275"
+	},
+	{
+		"rangeName" : "Stein-Zimmermann accidentals (24-EDO)",
+		"rangeStart" : "E280",
+		"rangeEnd" : "E283"
+	},
+	{
+		"rangeName" : "Arel-Ezgi-Uzdilek (AEU) accidentals",
+		"rangeStart" : "E440",
+		"rangeEnd" : "E447"
+	},
+	{
+		"rangeName" : "Articulation",
+		"rangeStart" : "E4A0",
+		"rangeEnd" : "E4BD"
+	},
+	{
+		"rangeName" : "Holds and pauses",
+		"rangeStart" : "E4C0",
+		"rangeEnd" : "E4CE"
+	},
+	{
+		"rangeName" : "Rests",
+		"rangeStart" : "E4E0",
+		"rangeEnd" : "E4F6"
+	},
+	{
+		"rangeName" : "Bar repeats",
+		"rangeStart" : "E500",
+		"rangeEnd" : "E505"
+	},
+	{
+		"rangeName" : "Octaves",
+		"rangeStart" : "E510",
+		"rangeEnd" : "E51E"
+	},
+	{
+		"rangeName" : "Dynamics",
+		"rangeStart" : "E520",
+		"rangeEnd" : "E53D"
+	},
+	{
+		"rangeName" : "Common ornaments",
+		"rangeStart" : "E566",
+		"rangeEnd" : "E56F"
+	},
+	{
+		"rangeName" : "Other baroque ornaments",
+		"rangeStart" : "E583",
+		"rangeEnd" : "E587"
+	},
+	{
+		"rangeName" : "Combining strokes for trills and mordents",
+		"rangeStart" : "E59D",
+		"rangeEnd" : "E59E"
+	},
+	{
+		"rangeName" : "Precomposed trills and mordents",
+		"rangeStart" : "E5B0",
+		"rangeEnd" : "E5C8"
+	},
+	{
+		"rangeName" : "Brass techniques",
+		"rangeStart" : "E5E5",
+		"rangeEnd" : "E5E7"
+	},
+	{
+		"rangeName" : "String techniques",
+		"rangeStart" : "E610",
+		"rangeEnd" : "E614"
+	},
+	{
+		"rangeName" : "Plucked techniques",
+		"rangeStart" : "E630",
+		"rangeEnd" : "E638"
+	},
+	{
+		"rangeName" : "Vocal techniques",
+		"rangeStart" : "E645",
+		"rangeEnd" : "E645"
+	},
+	{
+		"rangeName" : "Keyboard techniques",
+		"rangeStart" : "E650",
+		"rangeEnd" : "E65A"
+	},
+	{
+		"rangeName" : "Tuplets",
+		"rangeStart" : "E880",
+		"rangeEnd" : "E88A"
+	},
+	{
+		"rangeName" : "Medieval and Renaissance clefs",
+		"rangeStart" : "E901",
+		"rangeEnd" : "E909"
+	},
+	{
+		"rangeName" : "Medieval and Renaissance prolations",
+		"rangeStart" : "E910",
+		"rangeEnd" : "E925"
+	},
+	{
+		"rangeName" : "Medieval and Renaissance noteheads and stems",
+		"rangeStart" : "E938",
+		"rangeEnd" : "E94C"
+	},
+	{
+		"rangeName" : "Medieval and Renaissance plainchant single-note forms",
+		"rangeStart" : "E990",
+		"rangeEnd" : "E99F"
+	},
+	{
+		"rangeName" : "Medieval and Renaissance plainchant multiple-note forms",
+		"rangeStart" : "E9B4",
+		"rangeEnd" : "E9BC"
+	},
+	{
+		"rangeName" : "Medieval and Renaissance accidentals",
+		"rangeStart" : "E9E0",
+		"rangeEnd" : "E9E3"
+	},
+	{
+		"rangeName" : "Medieval and Renaissance rests",
+		"rangeStart" : "E9F0",
+		"rangeEnd" : "E9F8"
+	},
+	{
+		"rangeName" : "Medieval and Renaissance miscellany",
+		"rangeStart" : "EA02",
+		"rangeEnd" : "EA06"
+	},
+	{
+		"rangeName" : "Multi-segment lines",
+		"rangeStart" : "EAA4",
+		"rangeEnd" : "EAAF"
+	},
+	{
+		"rangeName" : "Renaissance lute tablature",
+		"rangeStart" : "EBA7",
+		"rangeEnd" : "EBAC"
+	},
+	{
+		"rangeName" : "French and English Renaissance lute tablature",
+		"rangeStart" : "EBC0",
+		"rangeEnd" : "EBCC"
+	},
+	{
+		"rangeName" : "Italian and Spanish Renaissance lute tablature",
+		"rangeStart" : "EBE0",
+		"rangeEnd" : "EBE9"
+	},
+	{
+		"rangeName" : "Articulation supplement",
+		"rangeStart" : "ED40",
+		"rangeEnd" : "ED41"
+	}
+	]
+}
\ No newline at end of file

From 63eb0456588eeca859c9aba42bddadc96d46d766 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 27 Jan 2022 11:28:51 +0200
Subject: [PATCH 227/403] Remove smufl.cpp and its generation

- removed smufl.cpp file
- removed generation of smufl.cpp
- renamed fontmetadata.json to *.template, so it's not parsed automatically
- fixed parts of the code to use as_float() instead of atof(*.value())
---
 Verovio.xcodeproj/project.pbxproj             |  10 -
 ...tadata.json => fontmetadata.json.template} |   0
 fonts/generate-smufl-code.py                  |  16 +-
 src/smufl.cpp                                 | 448 ------------------
 src/vrv.cpp                                   |  13 +-
 5 files changed, 7 insertions(+), 480 deletions(-)
 rename data/{fontmetadata.json => fontmetadata.json.template} (100%)
 delete mode 100644 src/smufl.cpp

diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
index e905a8ea6d3..dfab23f16f6 100644
--- a/Verovio.xcodeproj/project.pbxproj
+++ b/Verovio.xcodeproj/project.pbxproj
@@ -414,10 +414,6 @@
 		4D95D4F91D718D4A00B2B856 /* systemelement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D95D4F81D718D4A00B2B856 /* systemelement.cpp */; };
 		4D95D4FC1D74551100B2B856 /* score.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D95D4FB1D74551100B2B856 /* score.cpp */; };
 		4D983005192E959E00320037 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D983004192E959E00320037 /* main.cpp */; };
-		4D98CCDB25D26E3C00DC7A2C /* smufl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D98CCDA25D26E3C00DC7A2C /* smufl.cpp */; };
-		4D98CCDC25D26E3C00DC7A2C /* smufl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D98CCDA25D26E3C00DC7A2C /* smufl.cpp */; };
-		4D98CCE125D26E8F00DC7A2C /* smufl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D98CCDA25D26E3C00DC7A2C /* smufl.cpp */; };
-		4D98CCE625D26E8F00DC7A2C /* smufl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D98CCDA25D26E3C00DC7A2C /* smufl.cpp */; };
 		4D9A9C17199F560200028D93 /* verse.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D9A9C16199F560200028D93 /* verse.h */; };
 		4D9A9C19199F561200028D93 /* verse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D9A9C18199F561200028D93 /* verse.cpp */; };
 		4D9A9C1A199F561200028D93 /* verse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D9A9C18199F561200028D93 /* verse.cpp */; };
@@ -1473,7 +1469,6 @@
 		4D95D4FA1D74549700B2B856 /* score.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = score.h; path = include/vrv/score.h; sourceTree = "<group>"; };
 		4D95D4FB1D74551100B2B856 /* score.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = score.cpp; path = src/score.cpp; sourceTree = "<group>"; };
 		4D983004192E959E00320037 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = tools/main.cpp; sourceTree = SOURCE_ROOT; };
-		4D98CCDA25D26E3C00DC7A2C /* smufl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = smufl.cpp; path = src/smufl.cpp; sourceTree = "<group>"; };
 		4D9A9C16199F560200028D93 /* verse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = verse.h; path = include/vrv/verse.h; sourceTree = "<group>"; };
 		4D9A9C18199F561200028D93 /* verse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = verse.cpp; path = src/verse.cpp; sourceTree = "<group>"; };
 		4D9A9C1B199F576100028D93 /* syl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = syl.h; path = include/vrv/syl.h; sourceTree = "<group>"; };
@@ -2216,7 +2211,6 @@
 				4DA80D941A6940120089802D /* options.h */,
 				E79ADDC626BD645B00527E4B /* runtimeclock.cpp */,
 				E79ADDC326BD1AE900527E4B /* runtimeclock.h */,
-				4D98CCDA25D26E3C00DC7A2C /* smufl.cpp */,
 				4D1D733B1A1D0390001E08F6 /* smufl.h */,
 				4DD7C0FB27A55CEA00B9C017 /* timemap.cpp */,
 				4DD7C0FE27A55CFD00B9C017 /* timemap.h */,
@@ -3215,7 +3209,6 @@
 				4D16944F1E3A44F300569BF4 /* timeinterface.cpp in Sources */,
 				4D6331F61F46D2CB00A0D6BF /* arpeg.cpp in Sources */,
 				4D1694501E3A44F300569BF4 /* attconverter.cpp in Sources */,
-				4D98CCE125D26E8F00DC7A2C /* smufl.cpp in Sources */,
 				4D674B47255F40B7008AEF4C /* plica.cpp in Sources */,
 				4D1694511E3A44F300569BF4 /* glyph.cpp in Sources */,
 				4D1694521E3A44F300569BF4 /* syl.cpp in Sources */,
@@ -3351,7 +3344,6 @@
 				4D6413782035F58200BB630E /* pages.cpp in Sources */,
 				8F086EFE188539540037FD8E /* scoredef.cpp in Sources */,
 				4D5572401CF3F32A008D06A0 /* octave.cpp in Sources */,
-				4D98CCE625D26E8F00DC7A2C /* smufl.cpp in Sources */,
 				8F086EFF188539540037FD8E /* slur.cpp in Sources */,
 				4DEC4DAA21C81EEC00D1D273 /* restore.cpp in Sources */,
 				36E0442C2347A9150054F141 /* expansionmap.cpp in Sources */,
@@ -3646,7 +3638,6 @@
 				4D1BE76C1C688F5A0086DC0E /* Binasc.cpp in Sources */,
 				4D9A9C1A199F561200028D93 /* verse.cpp in Sources */,
 				4DB3D8DC1F83D14900B5FC2B /* artic.cpp in Sources */,
-				4D98CCDB25D26E3C00DC7A2C /* smufl.cpp in Sources */,
 				4D674B48255F40B7008AEF4C /* plica.cpp in Sources */,
 				4D9A9C1F19A1DE2000028D93 /* syl.cpp in Sources */,
 				4D4335CB1ED00A33003BE1A9 /* atts_gestural.cpp in Sources */,
@@ -3864,7 +3855,6 @@
 				BB4C4AF922A932BC001F6AF0 /* restore.cpp in Sources */,
 				BB4C4AFD22A932BC001F6AF0 /* subst.cpp in Sources */,
 				BB4C4BBE22A932FC001F6AF0 /* MidiFile.cpp in Sources */,
-				4D98CCDC25D26E3C00DC7A2C /* smufl.cpp in Sources */,
 				4D674B49255F40B7008AEF4C /* plica.cpp in Sources */,
 				BB4C4A9C22A9328F001F6AF0 /* options.cpp in Sources */,
 				BB4C4A6222A9321F001F6AF0 /* atts_cmn.cpp in Sources */,
diff --git a/data/fontmetadata.json b/data/fontmetadata.json.template
similarity index 100%
rename from data/fontmetadata.json
rename to data/fontmetadata.json.template
diff --git a/fonts/generate-smufl-code.py b/fonts/generate-smufl-code.py
index f26f212fae3..6f2af233ca4 100644
--- a/fonts/generate-smufl-code.py
+++ b/fonts/generate-smufl-code.py
@@ -5,7 +5,6 @@
 
 # Define file output paths
 SMUFL_HEADER = "../include/vrv/smufl.h"
-SMUFL_SOURCE = "../src/smufl.cpp"
 
 ######################
 #  Helper Functions  #
@@ -67,17 +66,4 @@ def get_supported_glyph_codes() -> dict:
     smufl_h_content += f"#define SMUFL_COUNT {len(smufl_names)}" + "\n\n"
     smufl_h_content += "} // namespace vrv\n\n"
     smufl_h_content += "#endif\n"
-    write_file_content(SMUFL_HEADER, smufl_h_content)
-
-    # (2) Create cpp file
-    smufl_cpp_content = get_file_content("smufl.cpp.inc") + "\n"
-    smufl_cpp_content += "const std::map<std::string, wchar_t> Resources::s_smuflNames = {\n"
-    for glyph_code in smufl_names:
-        # { "brace", SMUFL_E000_brace },
-        smufl_cpp_content += " " * 4 + \
-            f"{{ \"{smufl_names[glyph_code]}\", SMUFL_{glyph_code}_{smufl_names[glyph_code]} }}," + "\n"
-    smufl_cpp_content += "};\n\n"
-    smufl_cpp_content += "/** The number of glyphs for verification **/\n"
-    smufl_cpp_content += f"// {len(smufl_names)}" + "\n\n"
-    smufl_cpp_content += "} // namespace vrv\n"
-    write_file_content(SMUFL_SOURCE, smufl_cpp_content)
+    write_file_content(SMUFL_HEADER, smufl_h_content)
\ No newline at end of file
diff --git a/src/smufl.cpp b/src/smufl.cpp
deleted file mode 100644
index 5abd3319515..00000000000
--- a/src/smufl.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        smufl.cpp
-// Author:      Laurent Pugin
-// Created:     2021
-// Copyright (c) Authors and others. All rights reserved.
-/////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////
-// NOTE: this file was generated by the ./fonts/generate-smufl-code.py script
-// and should not be edited because changes will be lost.
-/////////////////////////////////////////////////////////////////////////////
-
-#include "smufl.h"
-
-//----------------------------------------------------------------------------
-
-#include "vrv.h"
-
-namespace vrv {
-
-//----------------------------------------------------------------------------
-// A map for the SMUFL names and the glyphs available in Verovio
-//----------------------------------------------------------------------------
-
-const std::map<std::string, wchar_t> Resources::s_smuflNames = {
-    { "brace", SMUFL_E000_brace },
-    { "bracketTop", SMUFL_E003_bracketTop },
-    { "bracketBottom", SMUFL_E004_bracketBottom },
-    { "repeatDots", SMUFL_E043_repeatDots },
-    { "repeatDot", SMUFL_E044_repeatDot },
-    { "dalSegno", SMUFL_E045_dalSegno },
-    { "daCapo", SMUFL_E046_daCapo },
-    { "segno", SMUFL_E047_segno },
-    { "coda", SMUFL_E048_coda },
-    { "codaSquare", SMUFL_E049_codaSquare },
-    { "segnoSerpent2", SMUFL_E04B_segnoSerpent2 },
-    { "gClef", SMUFL_E050_gClef },
-    { "gClef15mb", SMUFL_E051_gClef15mb },
-    { "gClef8vb", SMUFL_E052_gClef8vb },
-    { "gClef8va", SMUFL_E053_gClef8va },
-    { "gClef15ma", SMUFL_E054_gClef15ma },
-    { "gClef8vbOld", SMUFL_E055_gClef8vbOld },
-    { "gClef8vbCClef", SMUFL_E056_gClef8vbCClef },
-    { "cClef", SMUFL_E05C_cClef },
-    { "cClef8vb", SMUFL_E05D_cClef8vb },
-    { "fClef", SMUFL_E062_fClef },
-    { "fClef15mb", SMUFL_E063_fClef15mb },
-    { "fClef8vb", SMUFL_E064_fClef8vb },
-    { "fClef8va", SMUFL_E065_fClef8va },
-    { "fClef15ma", SMUFL_E066_fClef15ma },
-    { "unpitchedPercussionClef1", SMUFL_E069_unpitchedPercussionClef1 },
-    { "unpitchedPercussionClef2", SMUFL_E06A_unpitchedPercussionClef2 },
-    { "6stringTabClef", SMUFL_E06D_6stringTabClef },
-    { "4stringTabClef", SMUFL_E06E_4stringTabClef },
-    { "gClefReversed", SMUFL_E073_gClefReversed },
-    { "gClefTurned", SMUFL_E074_gClefTurned },
-    { "cClefReversed", SMUFL_E075_cClefReversed },
-    { "fClefReversed", SMUFL_E076_fClefReversed },
-    { "fClefTurned", SMUFL_E077_fClefTurned },
-    { "timeSig0", SMUFL_E080_timeSig0 },
-    { "timeSig1", SMUFL_E081_timeSig1 },
-    { "timeSig2", SMUFL_E082_timeSig2 },
-    { "timeSig3", SMUFL_E083_timeSig3 },
-    { "timeSig4", SMUFL_E084_timeSig4 },
-    { "timeSig5", SMUFL_E085_timeSig5 },
-    { "timeSig6", SMUFL_E086_timeSig6 },
-    { "timeSig7", SMUFL_E087_timeSig7 },
-    { "timeSig8", SMUFL_E088_timeSig8 },
-    { "timeSig9", SMUFL_E089_timeSig9 },
-    { "timeSigCommon", SMUFL_E08A_timeSigCommon },
-    { "timeSigCutCommon", SMUFL_E08B_timeSigCutCommon },
-    { "timeSigPlus", SMUFL_E08C_timeSigPlus },
-    { "timeSigPlusSmall", SMUFL_E08D_timeSigPlusSmall },
-    { "timeSigFractionalSlash", SMUFL_E08E_timeSigFractionalSlash },
-    { "timeSigEquals", SMUFL_E08F_timeSigEquals },
-    { "timeSigMinus", SMUFL_E090_timeSigMinus },
-    { "timeSigMultiply", SMUFL_E091_timeSigMultiply },
-    { "timeSigParensLeftSmall", SMUFL_E092_timeSigParensLeftSmall },
-    { "timeSigParensRightSmall", SMUFL_E093_timeSigParensRightSmall },
-    { "timeSigParensLeft", SMUFL_E094_timeSigParensLeft },
-    { "timeSigParensRight", SMUFL_E095_timeSigParensRight },
-    { "noteheadDoubleWhole", SMUFL_E0A0_noteheadDoubleWhole },
-    { "noteheadDoubleWholeSquare", SMUFL_E0A1_noteheadDoubleWholeSquare },
-    { "noteheadWhole", SMUFL_E0A2_noteheadWhole },
-    { "noteheadHalf", SMUFL_E0A3_noteheadHalf },
-    { "noteheadBlack", SMUFL_E0A4_noteheadBlack },
-    { "noteheadNull", SMUFL_E0A5_noteheadNull },
-    { "noteheadXBlack", SMUFL_E0A9_noteheadXBlack },
-    { "noteheadPlusBlack", SMUFL_E0AF_noteheadPlusBlack },
-    { "noteheadWholeWithX", SMUFL_E0B5_noteheadWholeWithX },
-    { "noteheadHalfWithX", SMUFL_E0B6_noteheadHalfWithX },
-    { "noteheadVoidWithX", SMUFL_E0B7_noteheadVoidWithX },
-    { "noteheadDiamondHalf", SMUFL_E0D9_noteheadDiamondHalf },
-    { "noteheadDiamondHalfWide", SMUFL_E0DA_noteheadDiamondHalfWide },
-    { "noteheadDiamondBlack", SMUFL_E0DB_noteheadDiamondBlack },
-    { "noteheadDiamondBlackWide", SMUFL_E0DC_noteheadDiamondBlackWide },
-    { "noteheadDiamondWhite", SMUFL_E0DD_noteheadDiamondWhite },
-    { "noteheadDiamondWhiteWide", SMUFL_E0DE_noteheadDiamondWhiteWide },
-    { "noteheadParenthesisLeft", SMUFL_E0F5_noteheadParenthesisLeft },
-    { "noteheadParenthesisRight", SMUFL_E0F6_noteheadParenthesisRight },
-    { "noteheadWholeFilled", SMUFL_E0FA_noteheadWholeFilled },
-    { "noteheadSlashHorizontalEnds", SMUFL_E101_noteheadSlashHorizontalEnds },
-    { "noteheadSlashWhiteWhole", SMUFL_E102_noteheadSlashWhiteWhole },
-    { "noteheadSlashWhiteHalf", SMUFL_E103_noteheadSlashWhiteHalf },
-    { "tremolo1", SMUFL_E220_tremolo1 },
-    { "tremolo2", SMUFL_E221_tremolo2 },
-    { "tremolo3", SMUFL_E222_tremolo3 },
-    { "tremolo4", SMUFL_E223_tremolo4 },
-    { "tremolo5", SMUFL_E224_tremolo5 },
-    { "buzzRoll", SMUFL_E22A_buzzRoll },
-    { "flag8thUp", SMUFL_E240_flag8thUp },
-    { "flag8thDown", SMUFL_E241_flag8thDown },
-    { "flag16thUp", SMUFL_E242_flag16thUp },
-    { "flag16thDown", SMUFL_E243_flag16thDown },
-    { "flag32ndUp", SMUFL_E244_flag32ndUp },
-    { "flag32ndDown", SMUFL_E245_flag32ndDown },
-    { "flag64thUp", SMUFL_E246_flag64thUp },
-    { "flag64thDown", SMUFL_E247_flag64thDown },
-    { "flag128thUp", SMUFL_E248_flag128thUp },
-    { "flag128thDown", SMUFL_E249_flag128thDown },
-    { "flag256thUp", SMUFL_E24A_flag256thUp },
-    { "flag256thDown", SMUFL_E24B_flag256thDown },
-    { "flag512thUp", SMUFL_E24C_flag512thUp },
-    { "flag512thDown", SMUFL_E24D_flag512thDown },
-    { "flag1024thUp", SMUFL_E24E_flag1024thUp },
-    { "flag1024thDown", SMUFL_E24F_flag1024thDown },
-    { "accidentalFlat", SMUFL_E260_accidentalFlat },
-    { "accidentalNatural", SMUFL_E261_accidentalNatural },
-    { "accidentalSharp", SMUFL_E262_accidentalSharp },
-    { "accidentalDoubleSharp", SMUFL_E263_accidentalDoubleSharp },
-    { "accidentalDoubleFlat", SMUFL_E264_accidentalDoubleFlat },
-    { "accidentalTripleSharp", SMUFL_E265_accidentalTripleSharp },
-    { "accidentalTripleFlat", SMUFL_E266_accidentalTripleFlat },
-    { "accidentalNaturalFlat", SMUFL_E267_accidentalNaturalFlat },
-    { "accidentalNaturalSharp", SMUFL_E268_accidentalNaturalSharp },
-    { "accidentalSharpSharp", SMUFL_E269_accidentalSharpSharp },
-    { "accidentalParensLeft", SMUFL_E26A_accidentalParensLeft },
-    { "accidentalParensRight", SMUFL_E26B_accidentalParensRight },
-    { "accidentalBracketLeft", SMUFL_E26C_accidentalBracketLeft },
-    { "accidentalBracketRight", SMUFL_E26D_accidentalBracketRight },
-    { "accidentalQuarterToneFlatArrowUp", SMUFL_E270_accidentalQuarterToneFlatArrowUp },
-    { "accidentalThreeQuarterTonesFlatArrowDown", SMUFL_E271_accidentalThreeQuarterTonesFlatArrowDown },
-    { "accidentalQuarterToneSharpNaturalArrowUp", SMUFL_E272_accidentalQuarterToneSharpNaturalArrowUp },
-    { "accidentalQuarterToneFlatNaturalArrowDown", SMUFL_E273_accidentalQuarterToneFlatNaturalArrowDown },
-    { "accidentalThreeQuarterTonesSharpArrowUp", SMUFL_E274_accidentalThreeQuarterTonesSharpArrowUp },
-    { "accidentalQuarterToneSharpArrowDown", SMUFL_E275_accidentalQuarterToneSharpArrowDown },
-    { "accidentalQuarterToneFlatStein", SMUFL_E280_accidentalQuarterToneFlatStein },
-    { "accidentalThreeQuarterTonesFlatZimmermann", SMUFL_E281_accidentalThreeQuarterTonesFlatZimmermann },
-    { "accidentalQuarterToneSharpStein", SMUFL_E282_accidentalQuarterToneSharpStein },
-    { "accidentalThreeQuarterTonesSharpStein", SMUFL_E283_accidentalThreeQuarterTonesSharpStein },
-    { "accidentalBuyukMucennebFlat", SMUFL_E440_accidentalBuyukMucennebFlat },
-    { "accidentalKucukMucennebFlat", SMUFL_E441_accidentalKucukMucennebFlat },
-    { "accidentalBakiyeFlat", SMUFL_E442_accidentalBakiyeFlat },
-    { "accidentalKomaFlat", SMUFL_E443_accidentalKomaFlat },
-    { "accidentalKomaSharp", SMUFL_E444_accidentalKomaSharp },
-    { "accidentalBakiyeSharp", SMUFL_E445_accidentalBakiyeSharp },
-    { "accidentalKucukMucennebSharp", SMUFL_E446_accidentalKucukMucennebSharp },
-    { "accidentalBuyukMucennebSharp", SMUFL_E447_accidentalBuyukMucennebSharp },
-    { "articAccentAbove", SMUFL_E4A0_articAccentAbove },
-    { "articAccentBelow", SMUFL_E4A1_articAccentBelow },
-    { "articStaccatoAbove", SMUFL_E4A2_articStaccatoAbove },
-    { "articStaccatoBelow", SMUFL_E4A3_articStaccatoBelow },
-    { "articTenutoAbove", SMUFL_E4A4_articTenutoAbove },
-    { "articTenutoBelow", SMUFL_E4A5_articTenutoBelow },
-    { "articStaccatissimoAbove", SMUFL_E4A6_articStaccatissimoAbove },
-    { "articStaccatissimoBelow", SMUFL_E4A7_articStaccatissimoBelow },
-    { "articStaccatissimoWedgeAbove", SMUFL_E4A8_articStaccatissimoWedgeAbove },
-    { "articStaccatissimoWedgeBelow", SMUFL_E4A9_articStaccatissimoWedgeBelow },
-    { "articStaccatissimoStrokeAbove", SMUFL_E4AA_articStaccatissimoStrokeAbove },
-    { "articStaccatissimoStrokeBelow", SMUFL_E4AB_articStaccatissimoStrokeBelow },
-    { "articMarcatoAbove", SMUFL_E4AC_articMarcatoAbove },
-    { "articMarcatoBelow", SMUFL_E4AD_articMarcatoBelow },
-    { "articMarcatoStaccatoAbove", SMUFL_E4AE_articMarcatoStaccatoAbove },
-    { "articMarcatoStaccatoBelow", SMUFL_E4AF_articMarcatoStaccatoBelow },
-    { "articAccentStaccatoAbove", SMUFL_E4B0_articAccentStaccatoAbove },
-    { "articAccentStaccatoBelow", SMUFL_E4B1_articAccentStaccatoBelow },
-    { "articTenutoStaccatoAbove", SMUFL_E4B2_articTenutoStaccatoAbove },
-    { "articTenutoStaccatoBelow", SMUFL_E4B3_articTenutoStaccatoBelow },
-    { "articTenutoAccentAbove", SMUFL_E4B4_articTenutoAccentAbove },
-    { "articTenutoAccentBelow", SMUFL_E4B5_articTenutoAccentBelow },
-    { "articStressAbove", SMUFL_E4B6_articStressAbove },
-    { "articStressBelow", SMUFL_E4B7_articStressBelow },
-    { "articUnstressAbove", SMUFL_E4B8_articUnstressAbove },
-    { "articUnstressBelow", SMUFL_E4B9_articUnstressBelow },
-    { "articLaissezVibrerAbove", SMUFL_E4BA_articLaissezVibrerAbove },
-    { "articLaissezVibrerBelow", SMUFL_E4BB_articLaissezVibrerBelow },
-    { "articMarcatoTenutoAbove", SMUFL_E4BC_articMarcatoTenutoAbove },
-    { "articMarcatoTenutoBelow", SMUFL_E4BD_articMarcatoTenutoBelow },
-    { "fermataAbove", SMUFL_E4C0_fermataAbove },
-    { "fermataBelow", SMUFL_E4C1_fermataBelow },
-    { "fermataVeryShortAbove", SMUFL_E4C2_fermataVeryShortAbove },
-    { "fermataVeryShortBelow", SMUFL_E4C3_fermataVeryShortBelow },
-    { "fermataShortAbove", SMUFL_E4C4_fermataShortAbove },
-    { "fermataShortBelow", SMUFL_E4C5_fermataShortBelow },
-    { "fermataLongAbove", SMUFL_E4C6_fermataLongAbove },
-    { "fermataLongBelow", SMUFL_E4C7_fermataLongBelow },
-    { "fermataVeryLongAbove", SMUFL_E4C8_fermataVeryLongAbove },
-    { "fermataVeryLongBelow", SMUFL_E4C9_fermataVeryLongBelow },
-    { "breathMarkComma", SMUFL_E4CE_breathMarkComma },
-    { "restMaxima", SMUFL_E4E0_restMaxima },
-    { "restLonga", SMUFL_E4E1_restLonga },
-    { "restDoubleWhole", SMUFL_E4E2_restDoubleWhole },
-    { "restWhole", SMUFL_E4E3_restWhole },
-    { "restHalf", SMUFL_E4E4_restHalf },
-    { "restQuarter", SMUFL_E4E5_restQuarter },
-    { "rest8th", SMUFL_E4E6_rest8th },
-    { "rest16th", SMUFL_E4E7_rest16th },
-    { "rest32nd", SMUFL_E4E8_rest32nd },
-    { "rest64th", SMUFL_E4E9_rest64th },
-    { "rest128th", SMUFL_E4EA_rest128th },
-    { "rest256th", SMUFL_E4EB_rest256th },
-    { "rest512th", SMUFL_E4EC_rest512th },
-    { "rest1024th", SMUFL_E4ED_rest1024th },
-    { "restQuarterOld", SMUFL_E4F2_restQuarterOld },
-    { "restQuarterZ", SMUFL_E4F6_restQuarterZ },
-    { "repeat1Bar", SMUFL_E500_repeat1Bar },
-    { "repeat2Bars", SMUFL_E501_repeat2Bars },
-    { "repeat4Bars", SMUFL_E502_repeat4Bars },
-    { "repeatBarUpperDot", SMUFL_E503_repeatBarUpperDot },
-    { "repeatBarSlash", SMUFL_E504_repeatBarSlash },
-    { "repeatBarLowerDot", SMUFL_E505_repeatBarLowerDot },
-    { "ottava", SMUFL_E510_ottava },
-    { "ottavaAlta", SMUFL_E511_ottavaAlta },
-    { "ottavaBassa", SMUFL_E512_ottavaBassa },
-    { "ottavaBassaBa", SMUFL_E513_ottavaBassaBa },
-    { "quindicesima", SMUFL_E514_quindicesima },
-    { "quindicesimaAlta", SMUFL_E515_quindicesimaAlta },
-    { "quindicesimaBassa", SMUFL_E516_quindicesimaBassa },
-    { "ventiduesima", SMUFL_E517_ventiduesima },
-    { "ventiduesimaAlta", SMUFL_E518_ventiduesimaAlta },
-    { "ventiduesimaBassa", SMUFL_E519_ventiduesimaBassa },
-    { "octaveParensLeft", SMUFL_E51A_octaveParensLeft },
-    { "octaveParensRight", SMUFL_E51B_octaveParensRight },
-    { "ottavaBassaVb", SMUFL_E51C_ottavaBassaVb },
-    { "quindicesimaBassaMb", SMUFL_E51D_quindicesimaBassaMb },
-    { "ventiduesimaBassaMb", SMUFL_E51E_ventiduesimaBassaMb },
-    { "dynamicPiano", SMUFL_E520_dynamicPiano },
-    { "dynamicMezzo", SMUFL_E521_dynamicMezzo },
-    { "dynamicForte", SMUFL_E522_dynamicForte },
-    { "dynamicRinforzando", SMUFL_E523_dynamicRinforzando },
-    { "dynamicSforzando", SMUFL_E524_dynamicSforzando },
-    { "dynamicZ", SMUFL_E525_dynamicZ },
-    { "dynamicNiente", SMUFL_E526_dynamicNiente },
-    { "dynamicPPPPPP", SMUFL_E527_dynamicPPPPPP },
-    { "dynamicPPPPP", SMUFL_E528_dynamicPPPPP },
-    { "dynamicPPPP", SMUFL_E529_dynamicPPPP },
-    { "dynamicPPP", SMUFL_E52A_dynamicPPP },
-    { "dynamicPP", SMUFL_E52B_dynamicPP },
-    { "dynamicMP", SMUFL_E52C_dynamicMP },
-    { "dynamicMF", SMUFL_E52D_dynamicMF },
-    { "dynamicPF", SMUFL_E52E_dynamicPF },
-    { "dynamicFF", SMUFL_E52F_dynamicFF },
-    { "dynamicFFF", SMUFL_E530_dynamicFFF },
-    { "dynamicFFFF", SMUFL_E531_dynamicFFFF },
-    { "dynamicFFFFF", SMUFL_E532_dynamicFFFFF },
-    { "dynamicFFFFFF", SMUFL_E533_dynamicFFFFFF },
-    { "dynamicFortePiano", SMUFL_E534_dynamicFortePiano },
-    { "dynamicForzando", SMUFL_E535_dynamicForzando },
-    { "dynamicSforzando1", SMUFL_E536_dynamicSforzando1 },
-    { "dynamicSforzandoPiano", SMUFL_E537_dynamicSforzandoPiano },
-    { "dynamicSforzandoPianissimo", SMUFL_E538_dynamicSforzandoPianissimo },
-    { "dynamicSforzato", SMUFL_E539_dynamicSforzato },
-    { "dynamicSforzatoPiano", SMUFL_E53A_dynamicSforzatoPiano },
-    { "dynamicSforzatoFF", SMUFL_E53B_dynamicSforzatoFF },
-    { "dynamicRinforzando1", SMUFL_E53C_dynamicRinforzando1 },
-    { "dynamicRinforzando2", SMUFL_E53D_dynamicRinforzando2 },
-    { "ornamentTrill", SMUFL_E566_ornamentTrill },
-    { "ornamentTurn", SMUFL_E567_ornamentTurn },
-    { "ornamentTurnInverted", SMUFL_E568_ornamentTurnInverted },
-    { "ornamentTurnSlash", SMUFL_E569_ornamentTurnSlash },
-    { "ornamentTurnUp", SMUFL_E56A_ornamentTurnUp },
-    { "ornamentTurnUpS", SMUFL_E56B_ornamentTurnUpS },
-    { "ornamentShortTrill", SMUFL_E56C_ornamentShortTrill },
-    { "ornamentMordent", SMUFL_E56D_ornamentMordent },
-    { "ornamentTremblement", SMUFL_E56E_ornamentTremblement },
-    { "ornamentHaydn", SMUFL_E56F_ornamentHaydn },
-    { "ornamentVerticalLine", SMUFL_E583_ornamentVerticalLine },
-    { "ornamentSchleifer", SMUFL_E587_ornamentSchleifer },
-    { "ornamentZigZagLineNoRightEnd", SMUFL_E59D_ornamentZigZagLineNoRightEnd },
-    { "ornamentZigZagLineWithRightEnd", SMUFL_E59E_ornamentZigZagLineWithRightEnd },
-    { "ornamentPrecompSlide", SMUFL_E5B0_ornamentPrecompSlide },
-    { "ornamentPrecompDescendingSlide", SMUFL_E5B1_ornamentPrecompDescendingSlide },
-    { "ornamentPrecompAppoggTrill", SMUFL_E5B2_ornamentPrecompAppoggTrill },
-    { "ornamentPrecompAppoggTrillSuffix", SMUFL_E5B3_ornamentPrecompAppoggTrillSuffix },
-    { "ornamentPrecompTurnTrillDAnglebert", SMUFL_E5B4_ornamentPrecompTurnTrillDAnglebert },
-    { "ornamentPrecompSlideTrillDAnglebert", SMUFL_E5B5_ornamentPrecompSlideTrillDAnglebert },
-    { "ornamentPrecompSlideTrillMarpurg", SMUFL_E5B6_ornamentPrecompSlideTrillMarpurg },
-    { "ornamentPrecompTurnTrillBach", SMUFL_E5B7_ornamentPrecompTurnTrillBach },
-    { "ornamentPrecompSlideTrillBach", SMUFL_E5B8_ornamentPrecompSlideTrillBach },
-    { "ornamentPrecompSlideTrillMuffat", SMUFL_E5B9_ornamentPrecompSlideTrillMuffat },
-    { "ornamentPrecompSlideTrillSuffixMuffat", SMUFL_E5BA_ornamentPrecompSlideTrillSuffixMuffat },
-    { "ornamentPrecompTrillSuffixDandrieu", SMUFL_E5BB_ornamentPrecompTrillSuffixDandrieu },
-    { "ornamentPrecompPortDeVoixMordent", SMUFL_E5BC_ornamentPrecompPortDeVoixMordent },
-    { "ornamentPrecompTrillWithMordent", SMUFL_E5BD_ornamentPrecompTrillWithMordent },
-    { "ornamentPrecompCadence", SMUFL_E5BE_ornamentPrecompCadence },
-    { "ornamentPrecompCadenceWithTurn", SMUFL_E5BF_ornamentPrecompCadenceWithTurn },
-    { "ornamentPrecompDoubleCadenceLowerPrefix", SMUFL_E5C0_ornamentPrecompDoubleCadenceLowerPrefix },
-    { "ornamentPrecompCadenceUpperPrefix", SMUFL_E5C1_ornamentPrecompCadenceUpperPrefix },
-    { "ornamentPrecompCadenceUpperPrefixTurn", SMUFL_E5C2_ornamentPrecompCadenceUpperPrefixTurn },
-    { "ornamentPrecompDoubleCadenceUpperPrefix", SMUFL_E5C3_ornamentPrecompDoubleCadenceUpperPrefix },
-    { "ornamentPrecompDoubleCadenceUpperPrefixTurn", SMUFL_E5C4_ornamentPrecompDoubleCadenceUpperPrefixTurn },
-    { "ornamentPrecompMordentRelease", SMUFL_E5C5_ornamentPrecompMordentRelease },
-    { "ornamentPrecompMordentUpperPrefix", SMUFL_E5C6_ornamentPrecompMordentUpperPrefix },
-    { "ornamentPrecompInvertedMordentUpperPrefix", SMUFL_E5C7_ornamentPrecompInvertedMordentUpperPrefix },
-    { "ornamentPrecompTrillLowerSuffix", SMUFL_E5C8_ornamentPrecompTrillLowerSuffix },
-    { "brassMuteClosed", SMUFL_E5E5_brassMuteClosed },
-    { "brassMuteHalfClosed", SMUFL_E5E6_brassMuteHalfClosed },
-    { "brassMuteOpen", SMUFL_E5E7_brassMuteOpen },
-    { "stringsDownBow", SMUFL_E610_stringsDownBow },
-    { "stringsDownBowTurned", SMUFL_E611_stringsDownBowTurned },
-    { "stringsUpBow", SMUFL_E612_stringsUpBow },
-    { "stringsUpBowTurned", SMUFL_E613_stringsUpBowTurned },
-    { "stringsHarmonic", SMUFL_E614_stringsHarmonic },
-    { "pluckedSnapPizzicatoBelow", SMUFL_E630_pluckedSnapPizzicatoBelow },
-    { "pluckedSnapPizzicatoAbove", SMUFL_E631_pluckedSnapPizzicatoAbove },
-    { "pluckedBuzzPizzicato", SMUFL_E632_pluckedBuzzPizzicato },
-    { "pluckedLeftHandPizzicato", SMUFL_E633_pluckedLeftHandPizzicato },
-    { "pluckedDamp", SMUFL_E638_pluckedDamp },
-    { "vocalSprechgesang", SMUFL_E645_vocalSprechgesang },
-    { "keyboardPedalPed", SMUFL_E650_keyboardPedalPed },
-    { "keyboardPedalP", SMUFL_E651_keyboardPedalP },
-    { "keyboardPedalUp", SMUFL_E655_keyboardPedalUp },
-    { "keyboardPedalSost", SMUFL_E659_keyboardPedalSost },
-    { "keyboardPedalS", SMUFL_E65A_keyboardPedalS },
-    { "tuplet0", SMUFL_E880_tuplet0 },
-    { "tuplet1", SMUFL_E881_tuplet1 },
-    { "tuplet2", SMUFL_E882_tuplet2 },
-    { "tuplet3", SMUFL_E883_tuplet3 },
-    { "tuplet4", SMUFL_E884_tuplet4 },
-    { "tuplet5", SMUFL_E885_tuplet5 },
-    { "tuplet6", SMUFL_E886_tuplet6 },
-    { "tuplet7", SMUFL_E887_tuplet7 },
-    { "tuplet8", SMUFL_E888_tuplet8 },
-    { "tuplet9", SMUFL_E889_tuplet9 },
-    { "tupletColon", SMUFL_E88A_tupletColon },
-    { "mensuralGclefPetrucci", SMUFL_E901_mensuralGclefPetrucci },
-    { "chantFclef", SMUFL_E902_chantFclef },
-    { "mensuralFclefPetrucci", SMUFL_E904_mensuralFclefPetrucci },
-    { "chantCclef", SMUFL_E906_chantCclef },
-    { "mensuralCclefPetrucciPosLowest", SMUFL_E907_mensuralCclefPetrucciPosLowest },
-    { "mensuralCclefPetrucciPosLow", SMUFL_E908_mensuralCclefPetrucciPosLow },
-    { "mensuralCclefPetrucciPosMiddle", SMUFL_E909_mensuralCclefPetrucciPosMiddle },
-    { "mensuralCclefPetrucciPosHigh", SMUFL_E90A_mensuralCclefPetrucciPosHigh },
-    { "mensuralCclefPetrucciPosHighest", SMUFL_E90B_mensuralCclefPetrucciPosHighest },
-    { "mensuralProlation1", SMUFL_E910_mensuralProlation1 },
-    { "mensuralProlation2", SMUFL_E911_mensuralProlation2 },
-    { "mensuralProlation3", SMUFL_E912_mensuralProlation3 },
-    { "mensuralProlation4", SMUFL_E913_mensuralProlation4 },
-    { "mensuralProlation5", SMUFL_E914_mensuralProlation5 },
-    { "mensuralProlation6", SMUFL_E915_mensuralProlation6 },
-    { "mensuralProlation7", SMUFL_E916_mensuralProlation7 },
-    { "mensuralProlation8", SMUFL_E917_mensuralProlation8 },
-    { "mensuralProlation9", SMUFL_E918_mensuralProlation9 },
-    { "mensuralProlation10", SMUFL_E919_mensuralProlation10 },
-    { "mensuralProlation11", SMUFL_E91A_mensuralProlation11 },
-    { "mensuralProportionTempusPerfectum", SMUFL_E91B_mensuralProportionTempusPerfectum },
-    { "mensuralProportionProportioDupla1", SMUFL_E91C_mensuralProportionProportioDupla1 },
-    { "mensuralProportionProportioDupla2", SMUFL_E91D_mensuralProportionProportioDupla2 },
-    { "mensuralProportionProportioTripla", SMUFL_E91E_mensuralProportionProportioTripla },
-    { "mensuralProportionProportioQuadrupla", SMUFL_E91F_mensuralProportionProportioQuadrupla },
-    { "mensuralProlationCombiningDot", SMUFL_E920_mensuralProlationCombiningDot },
-    { "mensuralProlationCombiningTwoDots", SMUFL_E921_mensuralProlationCombiningTwoDots },
-    { "mensuralProlationCombiningThreeDots", SMUFL_E922_mensuralProlationCombiningThreeDots },
-    { "mensuralProlationCombiningThreeDotsTri", SMUFL_E923_mensuralProlationCombiningThreeDotsTri },
-    { "mensuralProlationCombiningDotVoid", SMUFL_E924_mensuralProlationCombiningDotVoid },
-    { "mensuralProlationCombiningStroke", SMUFL_E925_mensuralProlationCombiningStroke },
-    { "mensuralNoteheadSemibrevisBlack", SMUFL_E938_mensuralNoteheadSemibrevisBlack },
-    { "mensuralNoteheadSemibrevisVoid", SMUFL_E939_mensuralNoteheadSemibrevisVoid },
-    { "mensuralNoteheadMinimaWhite", SMUFL_E93C_mensuralNoteheadMinimaWhite },
-    { "mensuralNoteheadSemiminimaWhite", SMUFL_E93D_mensuralNoteheadSemiminimaWhite },
-    { "mensuralCombStemUp", SMUFL_E93E_mensuralCombStemUp },
-    { "mensuralCombStemDown", SMUFL_E93F_mensuralCombStemDown },
-    { "mensuralCombStemUpFlagSemiminima", SMUFL_E949_mensuralCombStemUpFlagSemiminima },
-    { "mensuralCombStemDownFlagSemiminima", SMUFL_E94A_mensuralCombStemDownFlagSemiminima },
-    { "mensuralCombStemUpFlagFusa", SMUFL_E94B_mensuralCombStemUpFlagFusa },
-    { "mensuralCombStemDownFlagFusa", SMUFL_E94C_mensuralCombStemDownFlagFusa },
-    { "chantPunctum", SMUFL_E990_chantPunctum },
-    { "chantPunctumInclinatum", SMUFL_E991_chantPunctumInclinatum },
-    { "chantPunctumVirga", SMUFL_E996_chantPunctumVirga },
-    { "chantQuilisma", SMUFL_E99B_chantQuilisma },
-    { "chantOriscusLiquescens", SMUFL_E99E_chantOriscusLiquescens },
-    { "chantStrophicus", SMUFL_E99F_chantStrophicus },
-    { "chantEntryLineAsc2nd", SMUFL_E9B4_chantEntryLineAsc2nd },
-    { "chantEntryLineAsc3rd", SMUFL_E9B5_chantEntryLineAsc3rd },
-    { "chantEntryLineAsc4th", SMUFL_E9B6_chantEntryLineAsc4th },
-    { "chantEntryLineAsc5th", SMUFL_E9B7_chantEntryLineAsc5th },
-    { "chantLigaturaDesc2nd", SMUFL_E9B9_chantLigaturaDesc2nd },
-    { "chantLigaturaDesc3rd", SMUFL_E9BA_chantLigaturaDesc3rd },
-    { "chantLigaturaDesc4th", SMUFL_E9BB_chantLigaturaDesc4th },
-    { "chantLigaturaDesc5th", SMUFL_E9BC_chantLigaturaDesc5th },
-    { "medRenFlatSoftB", SMUFL_E9E0_medRenFlatSoftB },
-    { "medRenFlatHardB", SMUFL_E9E1_medRenFlatHardB },
-    { "medRenNatural", SMUFL_E9E2_medRenNatural },
-    { "medRenSharpCroix", SMUFL_E9E3_medRenSharpCroix },
-    { "mensuralRestMaxima", SMUFL_E9F0_mensuralRestMaxima },
-    { "mensuralRestLongaPerfecta", SMUFL_E9F1_mensuralRestLongaPerfecta },
-    { "mensuralRestLongaImperfecta", SMUFL_E9F2_mensuralRestLongaImperfecta },
-    { "mensuralRestBrevis", SMUFL_E9F3_mensuralRestBrevis },
-    { "mensuralRestSemibrevis", SMUFL_E9F4_mensuralRestSemibrevis },
-    { "mensuralRestMinima", SMUFL_E9F5_mensuralRestMinima },
-    { "mensuralRestSemiminima", SMUFL_E9F6_mensuralRestSemiminima },
-    { "mensuralRestFusa", SMUFL_E9F7_mensuralRestFusa },
-    { "mensuralRestSemifusa", SMUFL_E9F8_mensuralRestSemifusa },
-    { "mensuralCustosUp", SMUFL_EA02_mensuralCustosUp },
-    { "chantCustosStemUpPosMiddle", SMUFL_EA06_chantCustosStemUpPosMiddle },
-    { "wiggleTrill", SMUFL_EAA4_wiggleTrill },
-    { "wiggleArpeggiatoUp", SMUFL_EAA9_wiggleArpeggiatoUp },
-    { "wiggleArpeggiatoDown", SMUFL_EAAA_wiggleArpeggiatoDown },
-    { "wiggleArpeggiatoUpArrow", SMUFL_EAAD_wiggleArpeggiatoUpArrow },
-    { "wiggleArpeggiatoDownArrow", SMUFL_EAAE_wiggleArpeggiatoDownArrow },
-    { "wiggleGlissando", SMUFL_EAAF_wiggleGlissando },
-    { "luteDurationWhole", SMUFL_EBA7_luteDurationWhole },
-    { "luteDurationHalf", SMUFL_EBA8_luteDurationHalf },
-    { "luteDurationQuarter", SMUFL_EBA9_luteDurationQuarter },
-    { "luteDuration8th", SMUFL_EBAA_luteDuration8th },
-    { "luteDuration16th", SMUFL_EBAB_luteDuration16th },
-    { "luteDuration32nd", SMUFL_EBAC_luteDuration32nd },
-    { "luteFrenchFretA", SMUFL_EBC0_luteFrenchFretA },
-    { "luteFrenchFretB", SMUFL_EBC1_luteFrenchFretB },
-    { "luteFrenchFretC", SMUFL_EBC2_luteFrenchFretC },
-    { "luteFrenchFretD", SMUFL_EBC3_luteFrenchFretD },
-    { "luteFrenchFretE", SMUFL_EBC4_luteFrenchFretE },
-    { "luteFrenchFretF", SMUFL_EBC5_luteFrenchFretF },
-    { "luteFrenchFretG", SMUFL_EBC6_luteFrenchFretG },
-    { "luteFrenchFretH", SMUFL_EBC7_luteFrenchFretH },
-    { "luteFrenchFretI", SMUFL_EBC8_luteFrenchFretI },
-    { "luteFrenchFretK", SMUFL_EBC9_luteFrenchFretK },
-    { "luteFrenchFretL", SMUFL_EBCA_luteFrenchFretL },
-    { "luteFrenchFretM", SMUFL_EBCB_luteFrenchFretM },
-    { "luteFrenchFretN", SMUFL_EBCC_luteFrenchFretN },
-    { "luteItalianFret0", SMUFL_EBE0_luteItalianFret0 },
-    { "luteItalianFret1", SMUFL_EBE1_luteItalianFret1 },
-    { "luteItalianFret2", SMUFL_EBE2_luteItalianFret2 },
-    { "luteItalianFret3", SMUFL_EBE3_luteItalianFret3 },
-    { "luteItalianFret4", SMUFL_EBE4_luteItalianFret4 },
-    { "luteItalianFret5", SMUFL_EBE5_luteItalianFret5 },
-    { "luteItalianFret6", SMUFL_EBE6_luteItalianFret6 },
-    { "luteItalianFret7", SMUFL_EBE7_luteItalianFret7 },
-    { "luteItalianFret8", SMUFL_EBE8_luteItalianFret8 },
-    { "luteItalianFret9", SMUFL_EBE9_luteItalianFret9 },
-    { "articSoftAccentAbove", SMUFL_ED40_articSoftAccentAbove },
-    { "articSoftAccentBelow", SMUFL_ED41_articSoftAccentBelow },
-};
-
-/** The number of glyphs for verification **/
-// 417
-
-} // namespace vrv
diff --git a/src/vrv.cpp b/src/vrv.cpp
index a9c6d7d6327..5361c160f6a 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -223,7 +223,6 @@ bool Resources::LoadFont(const std::string &fontName)
     const int unitsPerEm = atoi(root.attribute("units-per-em").value());
 
     const std::map<wchar_t, wchar_t> ranges = GetGlyphRanges();
-
     for (pugi::xml_node current = root.child("g"); current; current = current.next_sibling("g")) {
         pugi::xml_attribute c_attribute = current.attribute("c");
         pugi::xml_attribute n_attribute = current.attribute("n");
@@ -242,12 +241,12 @@ bool Resources::LoadFont(const std::string &fontName)
         glyph.SetUnitsPerEm(unitsPerEm * 10);
         glyph.SetCodeStr(c_attribute.value());
         float x = 0.0, y = 0.0, width = 0.0, height = 0.0;
-        if (current.attribute("x")) x = atof(current.attribute("x").value());
-        if (current.attribute("y")) y = atof(current.attribute("y").value());
-        if (current.attribute("w")) width = atof(current.attribute("w").value());
-        if (current.attribute("h")) height = atof(current.attribute("h").value());
+        if (current.attribute("x")) x = current.attribute("x").as_float();
+        if (current.attribute("y")) y = current.attribute("y").as_float();
+        if (current.attribute("w")) width = current.attribute("w").as_float();
+        if (current.attribute("h")) height = current.attribute("h").as_float();
         glyph.SetBoundingBox(x, y, width, height);
-        if (current.attribute("h-a-x")) glyph.SetHorizAdvX(atof(current.attribute("h-a-x").value()));
+        if (current.attribute("h-a-x")) glyph.SetHorizAdvX(current.attribute("h-a-x").as_float());
 
         // load anchors
         pugi::xml_node anchor;
@@ -256,7 +255,7 @@ bool Resources::LoadFont(const std::string &fontName)
                 std::string name = std::string(anchor.attribute("n").value());
                 // No check for possible x and y missing attributes - not very safe.
 
-                glyph.SetAnchor(name, atof(anchor.attribute("x").value()), atof(anchor.attribute("y").value()));
+                glyph.SetAnchor(name, anchor.attribute("x").as_float(), anchor.attribute("y").as_float());
             }
         }
 

From b3620e3ca34c445a2f5daf4831eb95b0d2555aed Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 31 Jan 2022 17:21:02 +0200
Subject: [PATCH 228/403] Rename static variables and change log messages to
 errors

---
 include/vrv/vrv.h |  8 ++++----
 src/vrv.cpp       | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/vrv/vrv.h b/include/vrv/vrv.h
index f8a306ee836..19095dab146 100644
--- a/include/vrv/vrv.h
+++ b/include/vrv/vrv.h
@@ -152,7 +152,7 @@ class Resources {
     static std::string GetPath() { return s_path; }
     static void SetPath(const std::string &path) { s_path = path; }
     /** Font name */
-    static std::string GetSmuflFontName() { return m_smuflFontName; }
+    static std::string GetSmuflFontName() { return s_smuflFontName; }
     /** Init the SMufL music and text fonts */
     static bool InitFonts();
     /** Init the text font (bounding boxes and ASCII only) */
@@ -186,9 +186,9 @@ class Resources {
     /** The path to the resources directory (e.g., for the svg/ subdirectory with fonts as XML */
     static thread_local std::string s_path;
     /** Name of the font used for SMUFL glyphs*/
-    static thread_local std::string m_smuflFontName;
+    static thread_local std::string s_smuflFontName;
     /** The loaded SMuFL font */
-    static thread_local GlyphTable m_fontGlyphTable;
+    static thread_local GlyphTable s_fontGlyphTable;
     /** A text font used for bounding box calculations */
     static thread_local GlyphTextMap s_textFont;
     static thread_local StyleAttributes s_currentStyle;
@@ -196,7 +196,7 @@ class Resources {
     /**
      * A map of glyph name / code
      */
-    static thread_local GlyphNameTable m_glyphNameTable;
+    static thread_local GlyphNameTable s_glyphNameTable;
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/vrv.cpp b/src/vrv.cpp
index 5361c160f6a..0fb5a46f35e 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -68,10 +68,10 @@ namespace vrv {
 //----------------------------------------------------------------------------
 
 thread_local std::string Resources::s_path = "/usr/local/share/verovio";
-thread_local std::string Resources::m_smuflFontName = "";
+thread_local std::string Resources::s_smuflFontName = "";
 thread_local Resources::GlyphTextMap Resources::s_textFont;
-thread_local Resources::GlyphTable Resources::m_fontGlyphTable;
-thread_local Resources::GlyphNameTable Resources::m_glyphNameTable;
+thread_local Resources::GlyphTable Resources::s_fontGlyphTable;
+thread_local Resources::GlyphNameTable Resources::s_glyphNameTable;
 thread_local Resources::StyleAttributes Resources::s_currentStyle;
 const Resources::StyleAttributes Resources::k_defaultStyle{ data_FONTWEIGHT::FONTWEIGHT_normal,
     data_FONTSTYLE::FONTSTYLE_normal };
@@ -121,17 +121,17 @@ bool Resources::SetFont(const std::string &fontName)
 
 Glyph *Resources::GetGlyph(wchar_t smuflCode)
 {
-    return m_fontGlyphTable.count(smuflCode) ? &m_fontGlyphTable.at(smuflCode) : NULL;
+    return s_fontGlyphTable.count(smuflCode) ? &s_fontGlyphTable.at(smuflCode) : NULL;
 }
 
 Glyph *Resources::GetGlyph(const std::string &smuflName)
 {
-    return m_glyphNameTable.count(smuflName) ? &m_fontGlyphTable.at(m_glyphNameTable.at(smuflName)) : NULL;
+    return s_glyphNameTable.count(smuflName) ? &s_fontGlyphTable.at(s_glyphNameTable.at(smuflName)) : NULL;
 }
 
 wchar_t Resources::GetGlyphCode(const std::string &smuflName)
 {
-    return m_glyphNameTable.count(smuflName) ? m_glyphNameTable.at(smuflName) : 0;
+    return s_glyphNameTable.count(smuflName) ? s_glyphNameTable.at(smuflName) : 0;
 }
 
 std::map<wchar_t, wchar_t> Resources::GetGlyphRanges()
@@ -204,19 +204,19 @@ Glyph *Resources::GetTextGlyph(wchar_t code)
 bool Resources::LoadFont(const std::string &fontName)
 {
     // set font name
-    m_smuflFontName = fontName;
+    s_smuflFontName = fontName;
 
     pugi::xml_document doc;
     const std::string filename = Resources::GetPath() + "/" + fontName + ".xml";
     pugi::xml_parse_result parseResult = doc.load_file(filename.c_str());
     if (!parseResult) {
         // File not found, default bounding boxes will be used
-        LogMessage("Font loaded without bounding boxes");
+        LogError("Failed to load font and glyph bounding boxes");
         return false;
     }
     pugi::xml_node root = doc.first_child();
     if (!root.attribute("units-per-em")) {
-        LogWarning("No units-per-em attribute in bouding box file");
+        LogError("No units-per-em attribute in bouding box file");
         return false;
     }
 
@@ -259,8 +259,8 @@ bool Resources::LoadFont(const std::string &fontName)
             }
         }
 
-        m_fontGlyphTable[smuflCode] = glyph;
-        m_glyphNameTable[n_attribute.value()] = smuflCode;
+        s_fontGlyphTable[smuflCode] = glyph;
+        s_glyphNameTable[n_attribute.value()] = smuflCode;
     }
 
     return true;

From 267fc78a8acd29b3fa449d4848a76f6aa1d51792 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Wed, 2 Feb 2022 17:37:42 +0100
Subject: [PATCH 229/403] turn turned clefs on

---
 fonts/supported.xsl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fonts/supported.xsl b/fonts/supported.xsl
index 7c46e2f37c1..b61b7324995 100644
--- a/fonts/supported.xsl
+++ b/fonts/supported.xsl
@@ -117,11 +117,11 @@
             <!--<glyph glyph-code="E070" smufl-name="schaefferPreviousClef" />-->
             <!--<glyph glyph-code="E071" smufl-name="schaefferGClefToFClef" />-->
             <!--<glyph glyph-code="E072" smufl-name="schaefferFClefToGClef" />-->
-            <!--<glyph glyph-code="E073" smufl-name="gClefReversed" />-->
-            <!--<glyph glyph-code="E074" smufl-name="gClefTurned" />-->
-            <!--<glyph glyph-code="E075" smufl-name="cClefReversed" />-->
-            <!--<glyph glyph-code="E076" smufl-name="fClefReversed" />-->
-            <!--<glyph glyph-code="E077" smufl-name="fClefTurned" />-->
+            <glyph glyph-code="E073" smufl-name="gClefReversed" />
+            <glyph glyph-code="E074" smufl-name="gClefTurned" />
+            <glyph glyph-code="E075" smufl-name="cClefReversed" />
+            <glyph glyph-code="E076" smufl-name="fClefReversed" />
+            <glyph glyph-code="E077" smufl-name="fClefTurned" />
             <!--<glyph glyph-code="E078" smufl-name="bridgeClef" />-->
             <!--<glyph glyph-code="E079" smufl-name="accdnDiatonicClef" />-->
             <!--<glyph glyph-code="E07A" smufl-name="gClefChange" />-->

From d36ec4dc4947ef73bbe22d73bc7bc53115485599 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:02:00 +0100
Subject: [PATCH 230/403] Make TabDurSym inherit from StemmedDrawingInterface

---
 include/vrv/tabdursym.h | 38 +++++++++++++++++++++++++++++++++++++-
 src/tabdursym.cpp       | 41 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/include/vrv/tabdursym.h b/include/vrv/tabdursym.h
index 584fc01572a..eff657e8df4 100644
--- a/include/vrv/tabdursym.h
+++ b/include/vrv/tabdursym.h
@@ -9,6 +9,7 @@
 #define __VRV_TABDURSYM_H__
 
 #include "atts_shared.h"
+#include "drawinginterface.h"
 #include "layerelement.h"
 
 namespace vrv {
@@ -20,7 +21,7 @@ namespace vrv {
 /**
  * This class models the MEI <tabDurSym> element.
  */
-class TabDurSym : public LayerElement, public AttNNumberLike {
+class TabDurSym : public LayerElement, public StemmedDrawingInterface, public AttNNumberLike {
 public:
     /**
      * @name Constructors, destructors, and other standard methods
@@ -33,6 +34,16 @@ class TabDurSym : public LayerElement, public AttNNumberLike {
     std::string GetClassName() const override { return "TabDurSym"; }
     ///@}
 
+    /**
+     * @name Getter to interfaces
+     */
+    ///@{
+    StemmedDrawingInterface *GetStemmedDrawingInterface() override
+    {
+        return dynamic_cast<StemmedDrawingInterface *>(this);
+    }
+    ///@}
+
     /** Override the method since alignment is required */
     bool HasToBeAligned() const override { return true; }
 
@@ -41,10 +52,35 @@ class TabDurSym : public LayerElement, public AttNNumberLike {
      */
     bool IsSupportedChild(Object *object) override;
 
+    /**
+     * Overwritten method for note
+     */
+    void AddChild(Object *object) override;
+
+    /**
+     * Get the stem up / stem down attachment point.
+     * If necessary look at the glyph anchor (if any).
+     */
+    ///@{
+    Point GetStemUpSE(Doc *doc, int staffSize, bool isCueSize) override;
+    Point GetStemDownNW(Doc *doc, int staffSize, bool isCueSize) override;
+    int CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir) override;
+    ///@}
+
     //----------//
     // Functors //
     //----------//
 
+    /**
+     * See Object::PrepareLayerElementParts
+     */
+    int PrepareLayerElementParts(FunctorParams *functorParams) override;
+
+    /**
+     * See Object::CalcStem
+     */
+    int CalcStem(FunctorParams *functorParams) override;
+
 protected:
     //
 private:
diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index d4bdfabaf69..706fa7c8c3b 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -13,7 +13,10 @@
 
 //----------------------------------------------------------------------------
 
+#include "elementpart.h"
 #include "functorparams.h"
+#include "layer.h"
+#include "staff.h"
 
 namespace vrv {
 
@@ -23,7 +26,7 @@ namespace vrv {
 
 static const ClassRegistrar<TabDurSym> s_factory("tabDurSym", TABDURSYM);
 
-TabDurSym::TabDurSym() : LayerElement(TABDURSYM, "tabdursym-"), AttNNumberLike()
+TabDurSym::TabDurSym() : LayerElement(TABDURSYM, "tabdursym-"), StemmedDrawingInterface(), AttNNumberLike()
 {
     this->RegisterAttClass(ATT_NNUMBERLIKE);
 
@@ -35,12 +38,48 @@ TabDurSym::~TabDurSym() {}
 void TabDurSym::Reset()
 {
     LayerElement::Reset();
+    StemmedDrawingInterface::Reset();
     this->ResetNNumberLike();
 }
 
 bool TabDurSym::IsSupportedChild(Object *child)
 {
     return false;
+Point TabDurSym::GetStemUpSE(Doc *doc, int staffSize, bool isCueSize)
+{
+    Point p(0, 0);
+    return p;
+}
+
+Point TabDurSym::GetStemDownNW(Doc *doc, int staffSize, bool isCueSize)
+{
+    Point p(0, 0);
+    return p;
+}
+
+int TabDurSym::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
+{
+    assert(staff);
+
+    if ((stemDir != STEMDIRECTION_down) && (stemDir != STEMDIRECTION_up)) {
+        return 0;
+    }
+
+    int baseStem = STANDARD_STEMLENGTH * 3;
+
+    return baseStem;
+}
+
+//----------------------------------------------------------------------------
+// Functors methods
+//----------------------------------------------------------------------------
+
+int TabDurSym::PrepareLayerElementParts(FunctorParams *functorParams)
+{
+}
+
+int TabDurSym::CalcStem(FunctorParams *functorParams)
+{
 }
 
 } // namespace vrv

From 7cd1d6e018d77319214a37265f1ab9e31b787cbb Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:03:19 +0100
Subject: [PATCH 231/403] Allow Stem as child of TabDurSym

---
 src/tabdursym.cpp | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index 706fa7c8c3b..32b8716316f 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -44,7 +44,37 @@ void TabDurSym::Reset()
 
 bool TabDurSym::IsSupportedChild(Object *child)
 {
-    return false;
+    if (child->Is(STEM)) {
+        assert(dynamic_cast<Stem *>(child));
+    }
+    else {
+        return false;
+    }
+    return true;
+}
+
+void TabDurSym::AddChild(Object *child)
+{
+    if (!this->IsSupportedChild(child)) {
+        LogError("Adding '%s' to a '%s'", child->GetClassName().c_str(), this->GetClassName().c_str());
+        return;
+    }
+
+    child->SetParent(this);
+
+    ArrayOfObjects *children = this->GetChildrenForModification();
+
+    // Stem are always added by PrepareLayerElementParts (for now) and we want them to be in the front
+    // for the drawing order in the SVG output
+    if (child->Is(STEM)) {
+        children->insert(children->begin(), child);
+    }
+    else {
+        children->push_back(child);
+    }
+    Modify();
+}
+
 Point TabDurSym::GetStemUpSE(Doc *doc, int staffSize, bool isCueSize)
 {
     Point p(0, 0);

From f40ddbd31cfb076da47b7d9b97f7a1fcd10130c2 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:04:19 +0100
Subject: [PATCH 232/403] Implement TabDurSym::PrepareLayerElementParts to add
 Stem

---
 src/tabdursym.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index 32b8716316f..1d737a3728f 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -106,6 +106,15 @@ int TabDurSym::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
 
 int TabDurSym::PrepareLayerElementParts(FunctorParams *functorParams)
 {
+    Stem *currentStem = dynamic_cast<Stem *>(this->FindDescendantByType(STEM, 1));
+
+    if (!currentStem) {
+        currentStem = new Stem();
+        this->AddChild(currentStem);
+    }
+    this->SetDrawingStem(currentStem);
+
+    return FUNCTOR_SIBLINGS;
 }
 
 int TabDurSym::CalcStem(FunctorParams *functorParams)

From 340e998ea6fd919eaf81d5a2a4fae8b276538181 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:05:00 +0100
Subject: [PATCH 233/403] Add Layer::GetDrawingStemDirection to get global stem
 direction of the layer

---
 include/vrv/layer.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/vrv/layer.h b/include/vrv/layer.h
index 29f23dd87a9..5fcea1178c1 100644
--- a/include/vrv/layer.h
+++ b/include/vrv/layer.h
@@ -100,6 +100,7 @@ class Layer : public Object,
     void SetDrawingStemDir(data_STEMDIRECTION stemDirection) { m_drawingStemDir = stemDirection; }
     data_STEMDIRECTION GetDrawingStemDir(LayerElement *element);
     data_STEMDIRECTION GetDrawingStemDir(const ArrayOfBeamElementCoords *coords);
+    data_STEMDIRECTION GetDrawingStemDir() const { return m_drawingStemDir; }
     ///@}
 
     /**

From 9894b57e94a20230d42f412ef10a7faaec48e370 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:05:46 +0100
Subject: [PATCH 234/403] Set the Beam position for Tab according to encoding
 or number of layers

---
 src/beam.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index a1c313ffc03..cdb884ab13f 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -122,7 +122,16 @@ void BeamSegment::CalcTabBeam(
 
     beamInterface->m_beamWidth = beamInterface->m_beamWidthBlack + beamInterface->m_beamWidthWhite;
 
-    beamInterface->m_drawingPlace = (place == BEAMPLACE_below) ? BEAMPLACE_below : BEAMPLACE_above;
+    if (place != BEAMPLACE_NONE) {
+        beamInterface->m_drawingPlace = (place == BEAMPLACE_below) ? BEAMPLACE_below : BEAMPLACE_above;
+    }
+    // Do we have more that one layer?
+    else {
+        data_STEMDIRECTION layerStemDir = layer->GetDrawingStemDir();
+        // The layerStemDir can be none (single layer), up (1st layer), or down (2n layer)
+        // Is is put above by default with tablature with a single layer
+        beamInterface->m_drawingPlace = (layerStemDir == STEMDIRECTION_down) ? BEAMPLACE_below : BEAMPLACE_above;
+    }
 
     for (auto coord : m_beamElementCoordRefs) {
         // All notes and chords get their stem value stored

From 4ecbb657d02946d21f047b6b42e47dc255de3e2b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:06:35 +0100
Subject: [PATCH 235/403] Add TabGrp::CalcStem to pass the actual duration to
 TabDurSym

---
 include/vrv/tabgrp.h |  5 +++++
 src/tabgrp.cpp       | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/include/vrv/tabgrp.h b/include/vrv/tabgrp.h
index ee4534d0d0a..0ab26013c8b 100644
--- a/include/vrv/tabgrp.h
+++ b/include/vrv/tabgrp.h
@@ -54,6 +54,11 @@ class TabGrp : public LayerElement, public DurationInterface {
      */
     virtual int CalcOnsetOffsetEnd(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::CalcStem
+     */
+    int CalcStem(FunctorParams *functorParams) override;
+
 protected:
     //
 private:
diff --git a/src/tabgrp.cpp b/src/tabgrp.cpp
index 16b4d32d365..0809ad7d483 100644
--- a/src/tabgrp.cpp
+++ b/src/tabgrp.cpp
@@ -80,4 +80,14 @@ int TabGrp::CalcOnsetOffsetEnd(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int TabGrp::CalcStem(FunctorParams *functorParams)
+{
+    CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
+    assert(params);
+
+    params->m_dur = this->GetActualDur();
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv

From 9ba14e64ed62fe1e1da21d10bf5167087b07666a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:08:25 +0100
Subject: [PATCH 236/403] Implement TabDurSym::CalcStem (WIP)

* Set the stem direction according to encoding or number of layers
* Set and arbitrary stem length for now
---
 src/tabdursym.cpp | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index 1d737a3728f..d617c361b2a 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -119,6 +119,54 @@ int TabDurSym::PrepareLayerElementParts(FunctorParams *functorParams)
 
 int TabDurSym::CalcStem(FunctorParams *functorParams)
 {
+    CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
+    assert(params);
+
+    // Stems have been calculated previously in Beam
+    if (this->IsInBeam()) {
+        return FUNCTOR_SIBLINGS;
+    }
+
+    // This now need should be NULL and the chord stem length will be 0
+    params->m_interface = NULL;
+    params->m_chordStemLength = 0;
+
+    Stem *stem = this->GetDrawingStem();
+    assert(stem);
+
+    // Cache the in params to avoid further lookup
+    params->m_staff = this->GetAncestorStaff();
+    assert(params->m_staff);
+    params->m_layer = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER));
+    assert(params->m_layer);
+    params->m_interface = this;
+    // Grace an stem sameas not supported in tablature
+    params->m_isGraceNote = false;
+    params->m_stemSameas = false;
+
+    int staffSize = params->m_staff->m_drawingStaffSize;
+
+    /************ Set the direction ************/
+
+    data_STEMDIRECTION layerStemDir;
+    // Up by default with tablature
+    data_STEMDIRECTION stemDir = STEMDIRECTION_up;
+
+    if (stem->HasStemDir()) {
+        stemDir = stem->GetStemDir();
+    }
+    else if ((layerStemDir = params->m_layer->GetDrawingStemDir()) != STEMDIRECTION_NONE) {
+        stemDir = layerStemDir;
+    }
+
+    this->SetDrawingStemDir(stemDir);
+
+    // Make sure the relative position of the stem is the same
+    stem->SetDrawingYRel(0);
+    // WIP for now set a default stem length
+    stem->SetDrawingStemLen(4 * params->m_doc->GetDrawingUnit(staffSize));
+
+    return FUNCTOR_SIBLINGS;
 }
 
 } // namespace vrv

From 7bda20d56a9d288c74834f4e38923cce5fc977f9 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:09:13 +0100
Subject: [PATCH 237/403] Avoid adding a Stem to Note in tablature (Stem
 belongs to TabDurSym)

---
 src/note.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/note.cpp b/src/note.cpp
index fe5cf10a7ed..2ccea3f317f 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1263,7 +1263,7 @@ int Note::PrepareLayerElementParts(FunctorParams *functorParams)
     Chord *chord = this->IsChordTone();
     if (currentStem) currentFlag = dynamic_cast<Flag *>(currentStem->GetFirst(FLAG));
 
-    if (!this->IsChordTone() && !this->IsMensuralDur()) {
+    if (!this->IsChordTone() && !this->IsMensuralDur() && !this->IsTabGrpNote()) {
         if (!currentStem) {
             currentStem = new Stem();
             this->AddChild(currentStem);
@@ -1285,7 +1285,7 @@ int Note::PrepareLayerElementParts(FunctorParams *functorParams)
     }
 
     if ((this->GetActualDur() > DUR_4) && !this->IsInBeam() && !this->IsInFTrem() && !this->IsChordTone()
-        && !this->IsMensuralDur() && !this->HasStemSameasNote()) {
+        && !this->IsMensuralDur() && !this->HasStemSameasNote() && !this->IsTabGrpNote()) {
         // We should have a stem at this stage
         assert(currentStem);
         if (!currentFlag) {

From 523f7591f9ff30bb5066b2d169e0599669234c24 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:09:40 +0100
Subject: [PATCH 238/403] Adjust comment

---
 src/view_tab.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index f74e3b2e774..998380e6000 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -207,7 +207,7 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
         }
     }
 
-    // Draw children (nothing yet)
+    // Draw children (stems)
     this->DrawLayerChildren(dc, tabDurSym, layer, staff, measure);
 
     dc->EndGraphic(tabDurSym, this);

From 51d65074b779cba9d83d83cb8092b8b03b8779c5 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 31 Jan 2022 08:10:25 +0100
Subject: [PATCH 239/403] Adjust tuplet number size for tablature

---
 src/view_tuplet.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/view_tuplet.cpp b/src/view_tuplet.cpp
index 70e01788c41..b83cb5a330c 100644
--- a/src/view_tuplet.cpp
+++ b/src/view_tuplet.cpp
@@ -169,7 +169,8 @@ void View::DrawTupletNum(DeviceContext *dc, LayerElement *element, Layer *layer,
     std::wstring notes;
 
     const bool drawingCueSize = tuplet->GetDrawingCueSize();
-    dc->SetFont(m_doc->GetDrawingSmuflFont(staff->m_drawingStaffSize, drawingCueSize));
+    const int glyphSize = staff->GetDrawingStaffNotationSize();
+    dc->SetFont(m_doc->GetDrawingSmuflFont(glyphSize, drawingCueSize));
     notes = IntToTupletFigures((short int)tuplet->GetNum());
     if (tuplet->GetNumFormat() == tupletVis_NUMFORMAT_ratio) {
         notes.push_back(SMUFL_E88A_tupletColon);
@@ -183,11 +184,11 @@ void View::DrawTupletNum(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     int y = tupletNum->GetDrawingYMid();
     // adjust the baseline (to be improved with slanted brackets
-    y -= m_doc->GetGlyphHeight(notes.back(), staff->m_drawingStaffSize, drawingCueSize) / 2;
+    y -= m_doc->GetGlyphHeight(notes.back(), glyphSize, drawingCueSize) / 2;
 
     dc->ResumeGraphic(tupletNum, tupletNum->GetUuid());
 
-    this->DrawSmuflString(dc, x, y, notes, HORIZONTALALIGNMENT_left, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflString(dc, x, y, notes, HORIZONTALALIGNMENT_left, glyphSize, drawingCueSize);
 
     dc->EndResumedGraphic(tupletNum, this);
 

From b4af5f99b97aeef56b169fd1c2b004309ad230d9 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 20:13:16 +0100
Subject: [PATCH 240/403] Avoid Note::CalcStem in tablature (single notes) and
 adjust comment

---
 src/note.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/note.cpp b/src/note.cpp
index 2ccea3f317f..ba9aebe1de2 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -970,14 +970,15 @@ int Note::CalcStem(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    // Stems have been calculated previously in Beam or fTrem - siblings because flags do not need to
-    // be processed either - except when there is a stemSameasNote
+    // Stems have been calculated previously in Beam or fTrem
+    // Return to siblings because flags do not need to be processed either in that case
     if ((this->IsInBeam() || this->IsInFTrem())) {
         return FUNCTOR_SIBLINGS;
     }
 
     // We currently have no stem object with mensural notes
-    if (this->IsMensuralDur()) {
+    // We also have no stem  with tab because it belongs to tabDurSym in this case
+    if (this->IsMensuralDur() || this->IsTabGrpNote()) {
         return FUNCTOR_SIBLINGS;
     }
 

From aafa087bc4d08a74153a317abe00d87d4c8f3d75 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 21:58:26 +0100
Subject: [PATCH 241/403] Make TabGrp inherit from ObjectListInterface

* Add TabFretSort unary class
* Implement TabGrp::FilterList
---
 include/vrv/note.h   | 25 ++++++++++++++++++++++---
 include/vrv/tabgrp.h |  8 ++++++--
 src/tabgrp.cpp       | 14 +++++++++++++-
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index 7ac6704a632..f992441fff4 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -410,9 +410,7 @@ class Note : public LayerElement,
 //----------------------------------------------------------------------------
 
 /**
- * Unary predicate for comparing object types.
- * This is used for example in std::find_if.
- * See Object::GetFirst or Object::GetNext
+ * Unary predicate for sorting notes by diatonic pitch
  */
 class DiatonicSort {
 
@@ -428,6 +426,27 @@ class DiatonicSort {
     }
 };
 
+//----------------------------------------------------------------------------
+// TabFretSort
+//----------------------------------------------------------------------------
+
+/**
+ * Unary predicate for sorting notes by fret number
+ */
+class TabFretSort {
+
+public:
+    TabFretSort() {}
+
+    bool operator()(const Object *first, const Object *second) const
+    {
+        const Note *n1 = dynamic_cast<const Note *>(first);
+        const Note *n2 = dynamic_cast<const Note *>(second);
+        assert(n1 && n2);
+        return (n1->GetTabFret() < n2->GetTabFret());
+    }
+};
+
 } // namespace vrv
 
 #endif
diff --git a/include/vrv/tabgrp.h b/include/vrv/tabgrp.h
index 0ab26013c8b..a341f06c03e 100644
--- a/include/vrv/tabgrp.h
+++ b/include/vrv/tabgrp.h
@@ -20,7 +20,7 @@ namespace vrv {
 /**
  * This class models the MEI <tabGrp> element.
  */
-class TabGrp : public LayerElement, public DurationInterface {
+class TabGrp : public LayerElement, public ObjectListInterface, public DurationInterface {
 public:
     /**
      * @name Constructors, destructors, and other standard methods
@@ -60,7 +60,11 @@ class TabGrp : public LayerElement, public DurationInterface {
     int CalcStem(FunctorParams *functorParams) override;
 
 protected:
-    //
+    /**
+     * Filter the flat list and keep only Note elements.
+     */
+    void FilterList(ArrayOfObjects *childList) override;
+
 private:
     //
 public:
diff --git a/src/tabgrp.cpp b/src/tabgrp.cpp
index 0809ad7d483..1a8750e84d2 100644
--- a/src/tabgrp.cpp
+++ b/src/tabgrp.cpp
@@ -26,7 +26,7 @@ namespace vrv {
 
 static const ClassRegistrar<TabGrp> s_factory("tabGrp", TABGRP);
 
-TabGrp::TabGrp() : LayerElement(TABGRP, "tabgrp-"), DurationInterface()
+TabGrp::TabGrp() : LayerElement(TABGRP, "tabgrp-"), ObjectListInterface(), DurationInterface()
 {
     this->RegisterInterface(DurationInterface::GetAttClasses(), DurationInterface::IsInterface());
 
@@ -58,6 +58,18 @@ bool TabGrp::IsSupportedChild(Object *child)
     return true;
 }
 
+void TabGrp::FilterList(ArrayOfObjects *childList)
+{
+    // Retain only note children of chords
+    ArrayOfObjects::iterator iter = childList->begin();
+
+    while (iter != childList->end()) {
+        iter = ((*iter)->Is(NOTE)) ? iter + 1 : childList->erase(iter);
+    }
+
+    std::sort(childList->begin(), childList->end(), TabFretSort());
+}
+
 //----------------------------------------------------------------------------
 // Functor methods
 //----------------------------------------------------------------------------

From 32c5f1807eaaf6339a95c36eea4624a708080090 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 21:58:59 +0100
Subject: [PATCH 242/403] Add helper to get top and bottom note / y of a TabGrp

---
 include/vrv/tabgrp.h | 10 ++++++++++
 src/tabgrp.cpp       | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/include/vrv/tabgrp.h b/include/vrv/tabgrp.h
index a341f06c03e..9b12407316b 100644
--- a/include/vrv/tabgrp.h
+++ b/include/vrv/tabgrp.h
@@ -45,6 +45,16 @@ class TabGrp : public LayerElement, public ObjectListInterface, public DurationI
      */
     bool IsSupportedChild(Object *object) override;
 
+    /**
+     * Return the top or bottom note or their Y position
+     */
+    ///@{
+    Note *GetTopNote();
+    Note *GetBottomNote();
+    int GetYTop();
+    int GetYBottom();
+    ///@}
+
     //----------//
     // Functors //
     //----------//
diff --git a/src/tabgrp.cpp b/src/tabgrp.cpp
index 1a8750e84d2..125a3861265 100644
--- a/src/tabgrp.cpp
+++ b/src/tabgrp.cpp
@@ -70,6 +70,45 @@ void TabGrp::FilterList(ArrayOfObjects *childList)
     std::sort(childList->begin(), childList->end(), TabFretSort());
 }
 
+int TabGrp::GetYTop()
+{
+    const ArrayOfObjects *childList = this->GetList(this); // make sure it's initialized
+    assert(childList->size() > 0);
+
+    // The last note is the top
+    return childList->back()->GetDrawingY();
+}
+
+int TabGrp::GetYBottom()
+{
+    const ArrayOfObjects *childList = this->GetList(this); // make sure it's initialized
+    assert(childList->size() > 0);
+
+    // The first note is the bottom
+    return childList->front()->GetDrawingY();
+}
+
+Note *TabGrp::GetTopNote()
+{
+    const ArrayOfObjects *childList = this->GetList(this); // make sure it's initialized
+    assert(childList->size() > 0);
+
+    Note *topNote = vrv_cast<Note *>(childList->back());
+    assert(topNote);
+    return topNote;
+}
+
+Note *TabGrp::GetBottomNote()
+{
+    const ArrayOfObjects *childList = this->GetList(this); // make sure it's initialized
+    assert(childList->size() > 0);
+
+    // The first note is the bottom
+    Note *bottomNote = vrv_cast<Note *>(childList->front());
+    assert(bottomNote);
+    return bottomNote;
+}
+
 //----------------------------------------------------------------------------
 // Functor methods
 //----------------------------------------------------------------------------

From b783ab3d78da1401384c9b083505092bc1fafc84 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 22:00:09 +0100
Subject: [PATCH 243/403] Adjust BeamElementCoord::SetClosestNote to also
 consider tabGrp notes

---
 src/beam.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/beam.cpp b/src/beam.cpp
index cdb884ab13f..c596c667c39 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -28,6 +28,7 @@
 #include "smufl.h"
 #include "space.h"
 #include "staff.h"
+#include "tabdursym.h"
 #include "tabgrp.h"
 #include "tuplet.h"
 #include "verticalaligner.h"
@@ -1635,6 +1636,11 @@ void BeamElementCoord::SetClosestNote(data_STEMDIRECTION stemDir)
         assert(chord);
         m_closestNote = (STEMDIRECTION_up == stemDir) ? chord->GetTopNote() : chord->GetBottomNote();
     }
+    else if (m_element->Is(TABGRP)) {
+        TabGrp *tabGrp = vrv_cast<TabGrp *>(m_element);
+        assert(tabGrp);
+        m_closestNote = (STEMDIRECTION_up == stemDir) ? tabGrp->GetTopNote() : tabGrp->GetBottomNote();
+    }
 }
 
 int Beam::CalcLayerOverlap(Doc *doc, Object *beam, int directionBias, int y1, int y2)

From ff9e719f1a8d3421d169752c7a10acf3288103d5 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 22:01:10 +0100
Subject: [PATCH 244/403] Add calls to set stem length and calculate beam slope

---
 src/beam.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/beam.cpp b/src/beam.cpp
index c596c667c39..60139dcfa77 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -134,6 +134,10 @@ void BeamSegment::CalcTabBeam(
         beamInterface->m_drawingPlace = (layerStemDir == STEMDIRECTION_down) ? BEAMPLACE_below : BEAMPLACE_above;
     }
 
+    bool horizontal = false;
+    CalcBeamStemLength(staff, beamInterface->m_drawingPlace, horizontal);
+
+    CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
     for (auto coord : m_beamElementCoordRefs) {
         // All notes and chords get their stem value stored
         LayerElement *el = coord->m_element;

From 98366cdc832f5b1e1042d14bdc61d6222523f357 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 1 Feb 2022 22:01:47 +0100
Subject: [PATCH 245/403] Set tabDurSym stem direction and length within beams

---
 src/beam.cpp | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 60139dcfa77..6cdeb914c8b 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -138,11 +138,46 @@ void BeamSegment::CalcTabBeam(
     CalcBeamStemLength(staff, beamInterface->m_drawingPlace, horizontal);
 
     CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
+
+    data_STEMDIRECTION stemDir
+        = (beamInterface->m_drawingPlace == BEAMPLACE_above) ? STEMDIRECTION_up : STEMDIRECTION_down;
     for (auto coord : m_beamElementCoordRefs) {
         // All notes and chords get their stem value stored
         LayerElement *el = coord->m_element;
         if (el->Is(TABGRP)) {
-            coord->m_yBeam = y;
+            TabGrp *tabGrp = vrv_cast<TabGrp *>(el);
+            assert(tabGrp);
+            TabDurSym *tabDurSym = vrv_cast<TabDurSym *>(tabGrp->FindDescendantByType(TABDURSYM));
+
+            if (!tabDurSym) continue;
+
+            tabDurSym->CalcDrawingYRel(stemDir);
+            // coord->m_yBeam = y;
+
+            StemmedDrawingInterface *stemmedInterface = tabDurSym->GetStemmedDrawingInterface();
+            assert(beamInterface);
+
+            assert(coord->m_closestNote);
+
+            int y1 = coord->m_yBeam;
+
+            int y2 = coord->m_closestNote->GetDrawingY();
+            if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
+                // Move down to ensure the stem is slightly shorter than the top-beam
+                y1 -= doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+            }
+            else {
+                y1 += doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+            }
+
+            Stem *stem = stemmedInterface->GetDrawingStem();
+            // This is the case with fTrem on whole notes
+            if (!stem) continue;
+
+            stem->SetDrawingStemDir(stemDir);
+            stem->SetDrawingXRel(coord->m_x - el->GetDrawingX());
+            stem->SetDrawingYRel(y2 - el->GetDrawingY());
+            stem->SetDrawingStemLen(y2 - y1);
         }
     }
 }

From 9d3ed0864cf31e63e7cbecc127284bfecb1f9233 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 08:44:07 +0100
Subject: [PATCH 246/403] Remove tab specific Beam::CalcTabBeam

---
 include/vrv/beam.h |  2 -
 src/beam.cpp       | 98 ----------------------------------------------
 src/view_beam.cpp  |  5 +--
 3 files changed, 1 insertion(+), 104 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 3ffd24a57ef..1cbb89e19c3 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -46,8 +46,6 @@ class BeamSegment {
     void CalcBeam(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface,
         data_BEAMPLACE place = BEAMPLACE_NONE, bool init = true);
 
-    void CalcTabBeam(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
-
     /**
      *
      */
diff --git a/src/beam.cpp b/src/beam.cpp
index 6cdeb914c8b..d942691c30c 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -84,104 +84,6 @@ void BeamSegment::InitCoordRefs(const ArrayOfBeamElementCoords *beamElementCoord
     m_beamElementCoordRefs = *beamElementCoords;
 }
 
-void BeamSegment::CalcTabBeam(
-    Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place)
-{
-    assert(layer);
-    assert(staff);
-    assert(doc);
-
-    // Calculate the y position of the beam - this currently need to be inline with the code in View::DrawTabGrp that
-    // draws the stems.
-    int glyphSize = staff->GetDrawingStaffNotationSize();
-    beamInterface->m_fractionSize = glyphSize * 2 / 3;
-
-    assert(m_beamElementCoordRefs.size() > 0);
-
-    int y = staff->GetDrawingY();
-
-    // Get the y position of the first tabDurSym
-    assert(m_beamElementCoordRefs.at(0)->m_element);
-    LayerElement *tabDurSym
-        = vrv_cast<LayerElement *>(m_beamElementCoordRefs.at(0)->m_element->FindDescendantByType(TABDURSYM));
-    if (tabDurSym) y = tabDurSym->GetDrawingY();
-
-    const int height = doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
-    y += height;
-
-    this->CalcBeamInit(layer, staff, doc, beamInterface, place);
-
-    // Adjust the height and spacing of the beams
-    beamInterface->m_beamWidthBlack /= 2;
-    beamInterface->m_beamWidthWhite /= 2;
-
-    // Adjust it further for tab.lute.french and tab.lute.italian
-    if (staff->IsTabLuteFrench() || staff->IsTabLuteItalian()) {
-        beamInterface->m_beamWidthBlack = beamInterface->m_beamWidthBlack * 2 / 5;
-        beamInterface->m_beamWidthWhite = beamInterface->m_beamWidthWhite * 3 / 5;
-    }
-
-    beamInterface->m_beamWidth = beamInterface->m_beamWidthBlack + beamInterface->m_beamWidthWhite;
-
-    if (place != BEAMPLACE_NONE) {
-        beamInterface->m_drawingPlace = (place == BEAMPLACE_below) ? BEAMPLACE_below : BEAMPLACE_above;
-    }
-    // Do we have more that one layer?
-    else {
-        data_STEMDIRECTION layerStemDir = layer->GetDrawingStemDir();
-        // The layerStemDir can be none (single layer), up (1st layer), or down (2n layer)
-        // Is is put above by default with tablature with a single layer
-        beamInterface->m_drawingPlace = (layerStemDir == STEMDIRECTION_down) ? BEAMPLACE_below : BEAMPLACE_above;
-    }
-
-    bool horizontal = false;
-    CalcBeamStemLength(staff, beamInterface->m_drawingPlace, horizontal);
-
-    CalcBeamPosition(doc, staff, layer, beamInterface, horizontal);
-
-    data_STEMDIRECTION stemDir
-        = (beamInterface->m_drawingPlace == BEAMPLACE_above) ? STEMDIRECTION_up : STEMDIRECTION_down;
-    for (auto coord : m_beamElementCoordRefs) {
-        // All notes and chords get their stem value stored
-        LayerElement *el = coord->m_element;
-        if (el->Is(TABGRP)) {
-            TabGrp *tabGrp = vrv_cast<TabGrp *>(el);
-            assert(tabGrp);
-            TabDurSym *tabDurSym = vrv_cast<TabDurSym *>(tabGrp->FindDescendantByType(TABDURSYM));
-
-            if (!tabDurSym) continue;
-
-            tabDurSym->CalcDrawingYRel(stemDir);
-            // coord->m_yBeam = y;
-
-            StemmedDrawingInterface *stemmedInterface = tabDurSym->GetStemmedDrawingInterface();
-            assert(beamInterface);
-
-            assert(coord->m_closestNote);
-
-            int y1 = coord->m_yBeam;
-
-            int y2 = coord->m_closestNote->GetDrawingY();
-            if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
-                // Move down to ensure the stem is slightly shorter than the top-beam
-                y1 -= doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-            }
-            else {
-                y1 += doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-            }
-
-            Stem *stem = stemmedInterface->GetDrawingStem();
-            // This is the case with fTrem on whole notes
-            if (!stem) continue;
-
-            stem->SetDrawingStemDir(stemDir);
-            stem->SetDrawingXRel(coord->m_x - el->GetDrawingX());
-            stem->SetDrawingYRel(y2 - el->GetDrawingY());
-            stem->SetDrawingStemLen(y2 - y1);
-        }
-    }
-}
-
 void BeamSegment::CalcBeam(
     Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place, bool init)
 {
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index a008760a0b3..a1a40525446 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -61,10 +61,7 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     /******************************************************************/
     // Calculate the beam slope and position
 
-    if (isTabBeam) {
-        beam->m_beamSegment.CalcTabBeam(layer, beam->m_beamStaff, m_doc, beam, initialPlace);
-    }
-    else if (!beam->m_beamSegment.StemSameasIsSecondary()) {
+    if (!beam->m_beamSegment.StemSameasIsSecondary()) {
         beam->m_beamSegment.CalcBeam(layer, beam->m_beamStaff, m_doc, beam, initialPlace);
     }
 

From 343fa04fd7e9b1fb87d3b369576e03ff7c3e7a42 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 08:47:17 +0100
Subject: [PATCH 247/403] Add helper to BeamCoord to get the associated
 StemmedDrawingInterface

---
 include/vrv/beam.h |  8 ++++++++
 src/beam.cpp       | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 1cbb89e19c3..89313e47635 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -311,6 +311,14 @@ class BeamElementCoord {
      */
     int CalculateStemModAdjustment(int stemLength, int directionBias);
 
+    /**
+     * Helper to get the StemmedDrawingInterface associated with the m_element (if any)
+     * Return the Chord or Note interface if the element if of that type.
+     * Return the TabDurSym interface if the element is TabDurGrp and has a TabDurSym descendant.
+     * Return NULL otherwise.
+     */
+    StemmedDrawingInterface *GetStemHolderInterface();
+
     int m_x;
     int m_yBeam; // y value of stem top position
     int m_dur; // drawing duration
diff --git a/src/beam.cpp b/src/beam.cpp
index d942691c30c..1dcac24c3ea 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1566,6 +1566,20 @@ int BeamElementCoord::CalculateStemModAdjustment(int stemLength, int directionBi
     return 0;
 }
 
+StemmedDrawingInterface *BeamElementCoord::GetStemHolderInterface()
+{
+    if (!m_element || !m_element->Is({ CHORD, NOTE, TABGRP })) return NULL;
+
+    if (m_element->Is({ CHORD, NOTE })) return m_element->GetStemmedDrawingInterface();
+
+    TabGrp *tabGrp = vrv_cast<TabGrp *>(m_element);
+    assert(tabGrp);
+    TabDurSym *tabDurSym = vrv_cast<TabDurSym *>(tabGrp->FindDescendantByType(TABDURSYM));
+    if (tabDurSym) return tabDurSym->GetStemmedDrawingInterface();
+
+    return NULL;
+}
+
 void BeamElementCoord::SetClosestNote(data_STEMDIRECTION stemDir)
 {
     m_closestNote = NULL;

From 5e77170e7ea9ac961cad93a9080be405ac7b8682 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 08:48:36 +0100
Subject: [PATCH 248/403] Add tab dedicated method for calculating beam place

---
 include/vrv/beam.h |  2 ++
 src/beam.cpp       | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 89313e47635..1cfcd00ca60 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -115,6 +115,8 @@ class BeamSegment {
 
     void CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
 
+    void CalcBeamPlaceTab(Layer *layer, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
+
     // Helper to calculate the longest stem length of the beam (which will be used uniformely)
     void CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal);
 
diff --git a/src/beam.cpp b/src/beam.cpp
index 1dcac24c3ea..2c95bc194df 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1048,6 +1048,23 @@ void BeamSegment::CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterfac
     // if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) beamInterface->m_drawingPlace = BEAMPLACE_above;
 }
 
+void BeamSegment::CalcBeamPlaceTab(Layer *layer, BeamDrawingInterface *beamInterface, data_BEAMPLACE place)
+{
+    assert(layer);
+    assert(beamInterface);
+
+    if (place != BEAMPLACE_NONE) {
+        beamInterface->m_drawingPlace = (place == BEAMPLACE_below) ? BEAMPLACE_below : BEAMPLACE_above;
+    }
+    // Do we have more that one layer?
+    else {
+        data_STEMDIRECTION layerStemDir = layer->GetDrawingStemDir();
+        // The layerStemDir can be none (single layer), up (1st layer), or down (2n layer)
+        // Is is put above by default with tablature with a single layer
+        beamInterface->m_drawingPlace = (layerStemDir == STEMDIRECTION_down) ? BEAMPLACE_below : BEAMPLACE_above;
+    }
+}
+
 void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal)
 {
     const data_STEMDIRECTION stemDir = (place == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;

From 3cf7a0588a1358ffe9637391077af5dc51fc5b61 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 08:52:47 +0100
Subject: [PATCH 249/403] Add distinct  (staff notation / tab) helpers to set
 stem values

---
 include/vrv/beam.h |  6 ++++
 src/beam.cpp       | 71 +++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 1cfcd00ca60..79955d4d436 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -120,6 +120,12 @@ class BeamSegment {
     // Helper to calculate the longest stem length of the beam (which will be used uniformely)
     void CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal);
 
+    // Helper to set the stem values
+    void CalcSetStemValues(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface);
+
+    // Helper to set the stem values for tablature
+    void CalcSetStemValuesTab(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface);
+
     // Helper to calculate relative position of the beam to for each of the coordinates
     void CalcMixedBeamPlace(Staff *staff);
 
diff --git a/src/beam.cpp b/src/beam.cpp
index 2c95bc194df..1d678880f58 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -91,7 +91,6 @@ void BeamSegment::CalcBeam(
     assert(staff);
     assert(doc);
 
-    int y1, y2;
     assert(m_beamElementCoordRefs.size() > 0);
 
     // For recursive calls, avoid to re-init values
@@ -124,18 +123,34 @@ void BeamSegment::CalcBeam(
         }
     }
 
-    // ArrayOfBeamElementCoords stemUps;
-    // ArrayOfBeamElementCoords stemDowns;
-
     /******************************************************************/
     // Set the stem lengths to stem objects
 
+    if (staff->IsTablature()) {
+        this->CalcSetStemValuesTab(layer, staff, doc, beamInterface);
+    }
+    else {
+        this->CalcSetStemValues(layer, staff, doc, beamInterface);
+    }
+}
+
+void BeamSegment::CalcSetStemValues(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface)
+{
+    assert(layer);
+    assert(staff);
+    assert(doc);
+    assert(beamInterface);
+    
+    int y1, y2;
+
     for (auto coord : m_beamElementCoordRefs) {
         // All notes and chords get their stem value stored
         LayerElement *el = coord->m_element;
-        if ((el->Is(NOTE)) || (el->Is(CHORD))) {
-            StemmedDrawingInterface *stemmedInterface = el->GetStemmedDrawingInterface();
-            assert(beamInterface);
+        if (el->Is({ CHORD, NOTE })) {
+
+            // Get the interface for the chord or note
+            StemmedDrawingInterface *stemmedInterface = coord->GetStemHolderInterface();
+            if (!stemmedInterface) continue;
 
             assert(coord->m_closestNote);
 
@@ -215,6 +230,48 @@ void BeamSegment::CalcBeam(
     }
 }
 
+void BeamSegment::CalcSetStemValuesTab(Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface)
+{
+    assert(layer);
+    assert(staff);
+    assert(doc);
+    assert(beamInterface);
+    
+    int y1, y2;
+
+    for (auto coord : m_beamElementCoordRefs) {
+        // All notes and chords get their stem value stored
+        LayerElement *el = coord->m_element;
+        if (el->Is(TABGRP)) {
+            // Get the interface from child tabDurSym
+            StemmedDrawingInterface *stemmedInterface = coord->GetStemHolderInterface();
+            if (!stemmedInterface) continue;
+
+            assert(coord->m_closestNote);
+
+            y1 = coord->m_yBeam;
+
+            y2 = coord->m_closestNote->GetDrawingY();
+            if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
+                // Move down to ensure the stem is slightly shorter than the top-beam
+                y1 -= doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+            }
+            else {
+                y1 += doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+            }
+
+            Stem *stem = stemmedInterface->GetDrawingStem();
+            // This is the case with fTrem on whole notes
+            if (!stem) continue;
+
+            // stem->SetDrawingStemDir(stemDir);
+            stem->SetDrawingXRel(coord->m_x - el->GetDrawingX());
+            stem->SetDrawingYRel(y2 - el->GetDrawingY());
+            stem->SetDrawingStemLen(y2 - y1);
+        }
+    }
+}
+
 bool BeamSegment::DoesBeamOverlap(int staffTop, int topOffset, int staffBottom, int bottomOffset)
 {
     // find if current beam fits within the staff

From d469f9299e5bf04da25ccab3e99e7c5921aec708 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 08:54:21 +0100
Subject: [PATCH 250/403] Adjust Beam::CalcBeamInit to deal with tablature
 notation

* We do this here because we removed Beam::CalcTabBeam
---
 src/beam.cpp | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 1d678880f58..9005a2583e6 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -441,13 +441,31 @@ void BeamSegment::CalcBeamInit(
     }
     beamInterface->m_beamWidth = beamInterface->m_beamWidthBlack + beamInterface->m_beamWidthWhite;
 
-    // x-offset values for stem bases, dx[y] where y = element->m_cueSize
-    beamInterface->m_stemXAbove[0] = doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, staff->m_drawingStaffSize, false)
-        - (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
-    beamInterface->m_stemXAbove[1] = doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, staff->m_drawingStaffSize, true)
-        - (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
-    beamInterface->m_stemXBelow[0] = (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
-    beamInterface->m_stemXBelow[1] = (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+    if (staff->IsTablature()) {
+        // Adjust the height and spacing of the beams
+        beamInterface->m_beamWidthBlack /= 2;
+        beamInterface->m_beamWidthWhite /= 2;
+
+        // Adjust it further for tab.lute.french and tab.lute.italian
+        if (staff->IsTabLuteFrench() || staff->IsTabLuteItalian()) {
+            beamInterface->m_beamWidthBlack = beamInterface->m_beamWidthBlack * 2 / 5;
+            beamInterface->m_beamWidthWhite = beamInterface->m_beamWidthWhite * 3 / 5;
+        }
+
+        beamInterface->m_stemXAbove[0] = 0;
+        beamInterface->m_stemXAbove[1] = 0;
+        beamInterface->m_stemXBelow[0] = 0;
+        beamInterface->m_stemXBelow[1] = 0;
+    }
+    else {
+        // x-offset values for stem bases, dx[y] where y = element->m_cueSize
+        beamInterface->m_stemXAbove[0] = doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, staff->m_drawingStaffSize, false)
+            - (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+        beamInterface->m_stemXAbove[1] = doc->GetGlyphWidth(SMUFL_E0A4_noteheadBlack, staff->m_drawingStaffSize, true)
+            - (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+        beamInterface->m_stemXBelow[0] = (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+        beamInterface->m_stemXBelow[1] = (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+    }
 
     /******************************************************************/
     // Calculate the extreme values

From 32d865726314b7db748d8a44b89124145e80ead1 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 08:54:34 +0100
Subject: [PATCH 251/403] Remove unused code

---
 src/beam.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 9005a2583e6..e0ee96eafc4 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1065,17 +1065,6 @@ void BeamSegment::CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterfac
     assert(beamInterface);
 
     if (place != BEAMPLACE_NONE) {
-        /*
-        if (beamInterface->m_hasMultipleStemDir && (place != BEAMPLACE_mixed)) {
-            LogDebug("Stem directions (mixed) contradict beam placement (below or above)");
-        }
-        else if ((beamInterface->m_notesStemDir == STEMDIRECTION_up) && (place == BEAMPLACE_below)) {
-            LogDebug("Stem directions (up) contradict beam placement (below)");
-        }
-        else if ((beamInterface->m_notesStemDir == STEMDIRECTION_down) && (place == BEAMPLACE_above)) {
-            LogDebug("Stem directions (down) contradict beam placement (above)");
-        }
-        */
         beamInterface->m_drawingPlace = place;
     }
     // Default with cross-staff

From 13ed93cc3512f4ab4ad1f9c521140664f12fc58a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 08:55:11 +0100
Subject: [PATCH 252/403] Use the GetStemHolderInterface helper

---
 src/beam.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index e0ee96eafc4..c8fb12abb27 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1540,10 +1540,11 @@ void BeamElementCoord::SetDrawingStemDir(
         return;
     }
 
-    if (!m_element->Is({ CHORD, NOTE })) return;
+    // Get the interface from the chord (if any)
+    StemmedDrawingInterface *stemInterface = this->GetStemHolderInterface();
+    // Not a Chord or a Note or no TabDurSym in TabGrp
+    if (!stemInterface) return;
 
-    StemmedDrawingInterface *stemInterface = m_element->GetStemmedDrawingInterface();
-    assert(stemInterface);
     m_stem = stemInterface->GetDrawingStem();
     assert(m_stem);
 

From 905ae20dd6ae481f58bfe5cf617a4ab6a993c357 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 09:05:28 +0100
Subject: [PATCH 253/403] Remove unused variable

---
 src/view_beam.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index a1a40525446..2b74f9d8520 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -41,8 +41,6 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     Beam *beam = dynamic_cast<Beam *>(element);
     assert(beam);
 
-    const bool isTabBeam = beam->IsTabBeam();
-
     /******************************************************************/
     // initialization
 

From d43cd1cd3fa893670829ee342d71fb130edb1586 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 09:25:50 +0100
Subject: [PATCH 254/403] Set m_beamWidth only once m_beamWidthBlack and
 m_beamWidthWhite have been adjusted

---
 src/beam.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index c8fb12abb27..1efc4aa64cb 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -439,7 +439,6 @@ void BeamSegment::CalcBeamInit(
         beamInterface->m_beamWidthWhite *= 4;
         beamInterface->m_beamWidthWhite /= 3;
     }
-    beamInterface->m_beamWidth = beamInterface->m_beamWidthBlack + beamInterface->m_beamWidthWhite;
 
     if (staff->IsTablature()) {
         // Adjust the height and spacing of the beams
@@ -466,6 +465,8 @@ void BeamSegment::CalcBeamInit(
         beamInterface->m_stemXBelow[0] = (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
         beamInterface->m_stemXBelow[1] = (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
     }
+    
+    beamInterface->m_beamWidth = beamInterface->m_beamWidthBlack + beamInterface->m_beamWidthWhite;
 
     /******************************************************************/
     // Calculate the extreme values

From 848cd452dcc701564e58b456add1f27675f44d37 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 09:33:11 +0100
Subject: [PATCH 255/403] Filter TabGrp list by course (and not fret)

---
 include/vrv/note.h | 10 +++++-----
 src/tabgrp.cpp     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index f992441fff4..6a1df110ace 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -427,23 +427,23 @@ class DiatonicSort {
 };
 
 //----------------------------------------------------------------------------
-// TabFretSort
+// TabCourseSort
 //----------------------------------------------------------------------------
 
 /**
- * Unary predicate for sorting notes by fret number
+ * Unary predicate for sorting notes by course number
  */
-class TabFretSort {
+class TabCourseSort {
 
 public:
-    TabFretSort() {}
+    TabCourseSort() {}
 
     bool operator()(const Object *first, const Object *second) const
     {
         const Note *n1 = dynamic_cast<const Note *>(first);
         const Note *n2 = dynamic_cast<const Note *>(second);
         assert(n1 && n2);
-        return (n1->GetTabFret() < n2->GetTabFret());
+        return (n1->GetTabCourse() > n2->GetTabCourse());
     }
 };
 
diff --git a/src/tabgrp.cpp b/src/tabgrp.cpp
index 125a3861265..f1d79fc759c 100644
--- a/src/tabgrp.cpp
+++ b/src/tabgrp.cpp
@@ -67,7 +67,7 @@ void TabGrp::FilterList(ArrayOfObjects *childList)
         iter = ((*iter)->Is(NOTE)) ? iter + 1 : childList->erase(iter);
     }
 
-    std::sort(childList->begin(), childList->end(), TabFretSort());
+    std::sort(childList->begin(), childList->end(), TabCourseSort());
 }
 
 int TabGrp::GetYTop()

From 16a60f06ec84a64e20f24421f16f67524ec146be Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 14:29:23 +0100
Subject: [PATCH 256/403] Add a m_tabDurSym to BeamCoord

* The member is used only for beam placed outside the staff
---
 include/vrv/beam.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 79955d4d436..4bc570fc3bc 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -16,6 +16,7 @@
 namespace vrv {
 
 class BeamElementCoord;
+class TabDurSym;
 class StaffAlignment;
 
 // the maximum allowed number of partials
@@ -294,6 +295,7 @@ class BeamElementCoord {
     {
         m_element = NULL;
         m_closestNote = NULL;
+        m_tabDurSym = NULL;
         m_stem = NULL;
         m_overlapMargin = 0;
         m_maxShortening = -1;
@@ -339,6 +341,7 @@ class BeamElementCoord {
     data_BEAMPLACE m_partialFlagPlace;
     LayerElement *m_element;
     Note *m_closestNote;
+    TabDurSym *m_tabDurSym;
     Stem *m_stem; // a pointer to the stem in order to avoid to have to re-cast it
 };
 

From 2934f3a80065915d3ef5917d2b91444fac336c56 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 14:30:19 +0100
Subject: [PATCH 257/403] Helper to calculate the stem length for tab beam
 outside the staff

---
 include/vrv/beam.h | 2 ++
 src/beam.cpp       | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 4bc570fc3bc..97ab3cef58b 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -316,6 +316,8 @@ class BeamElementCoord {
 
     int CalculateStemLength(Staff *staff, data_STEMDIRECTION stemDir, bool isHorizontal);
 
+    /** Helper for calculating the stem length for tablature beam placed outside the staff */
+    int CalculateStemLengthTab(Staff *staff, data_STEMDIRECTION stemDir);
     /**
      * Return stem length adjustment in half units, depending on the @stem.mode attribute
      */
diff --git a/src/beam.cpp b/src/beam.cpp
index 1efc4aa64cb..64cc5702b91 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1628,6 +1628,14 @@ int BeamElementCoord::CalculateStemLength(Staff *staff, data_STEMDIRECTION stemD
     return stemLen + CalculateStemModAdjustment(stemLen, directionBias);
 }
 
+int BeamElementCoord::CalculateStemLengthTab(Staff *staff, data_STEMDIRECTION stemDir)
+{
+    if (!m_tabDurSym) return 0;
+    
+    const int directionBias = (stemDir == STEMDIRECTION_up) ? 1 : -1;
+    return m_tabDurSym->CalcStemLenInThirdUnits(staff, stemDir) * 2 / 3 * directionBias;
+}
+
 int BeamElementCoord::CalculateStemModAdjustment(int stemLength, int directionBias)
 {
     // handle @stem.mod attribute to properly draw beams with tremolos

From 0f433d1aaa13e437839b28c053f7ac5ada36a536 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 14:32:06 +0100
Subject: [PATCH 258/403] Set the tabDurSym in BeamCoord for beam outside the
 staff

---
 include/vrv/beam.h |  3 ++-
 src/beam.cpp       | 12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 97ab3cef58b..9ce34a53b55 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -312,8 +312,9 @@ class BeamElementCoord {
 
     void SetDrawingStemDir(
         data_STEMDIRECTION stemDir, Staff *staff, Doc *doc, BeamSegment *segment, BeamDrawingInterface *interface);
-    void SetClosestNote(data_STEMDIRECTION stemDir);
 
+    /** Set the note or closest note for chord or tabdursym for tablature beams placed outside the staff */
+    void SetClosestNoteOrTabDurSym(data_STEMDIRECTION stemDir, bool outsideStaff);
     int CalculateStemLength(Staff *staff, data_STEMDIRECTION stemDir, bool isHorizontal);
 
     /** Helper for calculating the stem length for tablature beam placed outside the staff */
diff --git a/src/beam.cpp b/src/beam.cpp
index 64cc5702b91..f6e9cb509e9 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1135,7 +1135,8 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
     const data_STEMDIRECTION stemDir = (place == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
     int relevantNoteLoc = VRV_UNSET;
     for (auto coord : m_beamElementCoordRefs) {
-        coord->SetClosestNote(stemDir);
+        coord->SetClosestNoteOrTabDurSym(stemDir, staff->IsTabWithBeamOutside());
+        // Nothing else to do if we have no closest note (that includes tab beams outside the staff)
         if (!coord->m_closestNote) continue;
         if (relevantNoteLoc == VRV_UNSET) {
             relevantNoteLoc = coord->m_closestNote->GetDrawingLoc();
@@ -1671,7 +1672,7 @@ StemmedDrawingInterface *BeamElementCoord::GetStemHolderInterface()
     return NULL;
 }
 
-void BeamElementCoord::SetClosestNote(data_STEMDIRECTION stemDir)
+void BeamElementCoord::SetClosestNoteOrTabDurSym(data_STEMDIRECTION stemDir, bool outsideStaff)
 {
     m_closestNote = NULL;
     if (m_element->Is(NOTE)) {
@@ -1685,7 +1686,12 @@ void BeamElementCoord::SetClosestNote(data_STEMDIRECTION stemDir)
     else if (m_element->Is(TABGRP)) {
         TabGrp *tabGrp = vrv_cast<TabGrp *>(m_element);
         assert(tabGrp);
-        m_closestNote = (STEMDIRECTION_up == stemDir) ? tabGrp->GetTopNote() : tabGrp->GetBottomNote();
+        if (outsideStaff) {
+            m_tabDurSym = vrv_cast<TabDurSym *>(tabGrp->FindDescendantByType(TABDURSYM));
+        }
+        else {
+            m_closestNote = (STEMDIRECTION_up == stemDir) ? tabGrp->GetTopNote() : tabGrp->GetBottomNote();
+        }
     }
 }
 

From c865bd1dea90e83772b88f082deadbdb2a796341 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 14:33:57 +0100
Subject: [PATCH 259/403] Add a distinct helper Beam::CalcBeamPlaceTab

* Also ajdust the TabDurSym drawingYRel for beam placed outside the staff
---
 include/vrv/beam.h |  7 ++++++-
 src/beam.cpp       | 34 ++++++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 9ce34a53b55..89e55f49575 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -116,7 +116,12 @@ class BeamSegment {
 
     void CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
 
-    void CalcBeamPlaceTab(Layer *layer, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
+    /**
+     * Helper to calculate the beam position for a beam in tablature.
+     * Also adjust the drawingYRel of the TabDurSym if necessary.
+     */
+    void CalcBeamPlaceTab(
+        Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place);
 
     // Helper to calculate the longest stem length of the beam (which will be used uniformely)
     void CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal);
diff --git a/src/beam.cpp b/src/beam.cpp
index f6e9cb509e9..be3d748f103 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -100,11 +100,20 @@ void BeamSegment::CalcBeam(
 
     beamInterface->m_fractionSize = staff->m_drawingStaffSize;
 
-    bool horizontal = beamInterface->IsHorizontal();
-
-    // Beam@place has precedence - however, in some cases, CalcBeam is called recursively because we need to change the
-    // place This occurs when mixed makes no sense and the beam is placed above or below instead.
-    this->CalcBeamPlace(layer, beamInterface, place);
+    // Always horizontal when placed outside a tablature staff
+    bool horizontal = true;
+    if (staff->IsTablature()) {
+        // Alwyas not horizontal when inside the staff
+        // Eventually we will need to look at the content to pre-determine if horizontal
+        horizontal = staff->IsTabWithBeamOutside();
+        this->CalcBeamPlaceTab(layer, staff, doc, beamInterface, place);
+    }
+    else {
+        horizontal = beamInterface->IsHorizontal();
+        // Beam@place has precedence - however, in some cases, CalcBeam is called recursively because we need to change
+        // the place This occurs when mixed makes no sense and the beam is placed above or below instead.
+        this->CalcBeamPlace(layer, beamInterface, place);
+    }
 
     CalcBeamStemLength(staff, beamInterface->m_drawingPlace, horizontal);
 
@@ -1113,9 +1122,12 @@ void BeamSegment::CalcBeamPlace(Layer *layer, BeamDrawingInterface *beamInterfac
     // if (beamInterface->m_drawingPlace == BEAMPLACE_mixed) beamInterface->m_drawingPlace = BEAMPLACE_above;
 }
 
-void BeamSegment::CalcBeamPlaceTab(Layer *layer, BeamDrawingInterface *beamInterface, data_BEAMPLACE place)
+void BeamSegment::CalcBeamPlaceTab(
+    Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place)
 {
     assert(layer);
+    assert(staff);
+    assert(doc);
     assert(beamInterface);
 
     if (place != BEAMPLACE_NONE) {
@@ -1128,6 +1140,16 @@ void BeamSegment::CalcBeamPlaceTab(Layer *layer, BeamDrawingInterface *beamInter
         // Is is put above by default with tablature with a single layer
         beamInterface->m_drawingPlace = (layerStemDir == STEMDIRECTION_down) ? BEAMPLACE_below : BEAMPLACE_above;
     }
+
+    if (beamInterface->m_drawingPlace == BEAMPLACE_below && staff->IsTabWithBeamOutside()) {
+        for (auto coord : m_beamElementCoordRefs) {
+            if (!coord->m_element || !coord->m_element->Is(TABGRP)) continue;
+            TabGrp *tabGrp = vrv_cast<TabGrp *>(coord->m_element);
+            assert(tabGrp);
+            TabDurSym *tabDurSym = vrv_cast<TabDurSym *>(tabGrp->FindDescendantByType(TABDURSYM));
+            if (tabDurSym) tabDurSym->AdjustDrawingYRel(staff, doc);
+        }
+    }
 }
 
 void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool isHorizontal)

From 62afe41f9fdd98bd7e856a62a3b729a75b476837 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 14:35:46 +0100
Subject: [PATCH 260/403] Add define for default stem length for tablature

---
 include/vrv/beam.h   |  3 +++
 include/vrv/vrvdef.h |  1 +
 src/beam.cpp         | 14 ++++++++------
 src/note.cpp         |  3 ++-
 src/tabdursym.cpp    |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 89e55f49575..934d2bdbf0c 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -320,10 +320,13 @@ class BeamElementCoord {
 
     /** Set the note or closest note for chord or tabdursym for tablature beams placed outside the staff */
     void SetClosestNoteOrTabDurSym(data_STEMDIRECTION stemDir, bool outsideStaff);
+
+    /** Heleper for calculating the stem length for staff notation and tablature beams within the staff */
     int CalculateStemLength(Staff *staff, data_STEMDIRECTION stemDir, bool isHorizontal);
 
     /** Helper for calculating the stem length for tablature beam placed outside the staff */
     int CalculateStemLengthTab(Staff *staff, data_STEMDIRECTION stemDir);
+
     /**
      * Return stem length adjustment in half units, depending on the @stem.mode attribute
      */
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 3a2499ab921..599092f3c4b 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -617,6 +617,7 @@ enum StemSameasDrawingRole { SAMEAS_NONE = 0, SAMEAS_UNSET, SAMEAS_PRIMARY, SAME
 
 // in half staff spaces (but should be 6 in two-voice notation)
 #define STANDARD_STEMLENGTH 7
+#define STANDARD_STEMLENGTH_TAB 5
 
 //----------------------------------------------------------------------------
 // Temporary - to be made an option?
diff --git a/src/beam.cpp b/src/beam.cpp
index be3d748f103..4e4d600da70 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -149,7 +149,7 @@ void BeamSegment::CalcSetStemValues(Layer *layer, Staff *staff, Doc *doc, BeamDr
     assert(staff);
     assert(doc);
     assert(beamInterface);
-    
+
     int y1, y2;
 
     for (auto coord : m_beamElementCoordRefs) {
@@ -245,22 +245,24 @@ void BeamSegment::CalcSetStemValuesTab(Layer *layer, Staff *staff, Doc *doc, Bea
     assert(staff);
     assert(doc);
     assert(beamInterface);
-    
+
     int y1, y2;
 
     for (auto coord : m_beamElementCoordRefs) {
         // All notes and chords get their stem value stored
         LayerElement *el = coord->m_element;
         if (el->Is(TABGRP)) {
+            // Just in case
+            if (!coord->m_closestNote && !coord->m_tabDurSym) continue;
+
             // Get the interface from child tabDurSym
             StemmedDrawingInterface *stemmedInterface = coord->GetStemHolderInterface();
             if (!stemmedInterface) continue;
 
-            assert(coord->m_closestNote);
-
             y1 = coord->m_yBeam;
 
-            y2 = coord->m_closestNote->GetDrawingY();
+            y2 = (coord->m_closestNote) ? coord->m_closestNote->GetDrawingY() : coord->m_tabDurSym->GetDrawingY();
+
             if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
                 // Move down to ensure the stem is slightly shorter than the top-beam
                 y1 -= doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
@@ -1654,7 +1656,7 @@ int BeamElementCoord::CalculateStemLength(Staff *staff, data_STEMDIRECTION stemD
 int BeamElementCoord::CalculateStemLengthTab(Staff *staff, data_STEMDIRECTION stemDir)
 {
     if (!m_tabDurSym) return 0;
-    
+
     const int directionBias = (stemDir == STEMDIRECTION_up) ? 1 : -1;
     return m_tabDurSym->CalcStemLenInThirdUnits(staff, stemDir) * 2 / 3 * directionBias;
 }
diff --git a/src/note.cpp b/src/note.cpp
index ba9aebe1de2..a1b9af61bd5 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -409,7 +409,8 @@ int Note::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
         return 0;
     }
 
-    int baseStem = STANDARD_STEMLENGTH * 3;
+    int baseStem = (staff->IsTablature()) ? STANDARD_STEMLENGTH_TAB : STANDARD_STEMLENGTH;
+    baseStem *= 3;
 
     int shortening = 0;
 
diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index d617c361b2a..738045413c9 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -95,7 +95,7 @@ int TabDurSym::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
         return 0;
     }
 
-    int baseStem = STANDARD_STEMLENGTH * 3;
+    int baseStem = STANDARD_STEMLENGTH_TAB * 3;
 
     return baseStem;
 }

From ba284fe87cf1a4bffd24a3b443d1c6548bd5875b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 14:37:13 +0100
Subject: [PATCH 261/403] Helper for checking if the tab beams have to be put
 inside or outside the staff

* Eventually this could come from a staffDef attribute
---
 include/vrv/staff.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index 54929b42275..4ed8bbab713 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -112,6 +112,7 @@ class Staff : public Object,
     bool IsTabLuteFrench() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_french; }
     bool IsTabLuteGerman() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_german; }
     bool IsTabLuteItalian() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_italian; }
+    bool IsTabWithBeamOutside() { return false; }
     ///@}
 
     /**

From 42abc621e4e2b864bb1800de35b4622b739f9096 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 14:37:45 +0100
Subject: [PATCH 262/403] Implement method to adjust the TabDurSym drawingYRel
 for beam placed below the staff

---
 include/vrv/tabdursym.h |  9 +++++++++
 src/tabdursym.cpp       | 13 +++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/include/vrv/tabdursym.h b/include/vrv/tabdursym.h
index eff657e8df4..1fde69315e9 100644
--- a/include/vrv/tabdursym.h
+++ b/include/vrv/tabdursym.h
@@ -67,6 +67,15 @@ class TabDurSym : public LayerElement, public StemmedDrawingInterface, public At
     int CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir) override;
     ///@}
 
+    /**
+     * Adjust the drawing y relative value for TabDurSym placed below the staff.
+     * The value is originally set in LayerElement::SetAlignmentPosPitch.
+     * However, setting it below the staff for a TabDurSym can be done only once the stem
+     * direction has been determined. This is why we have this method called from
+     * Beam::CalcTabBeamPlace
+     */
+    void AdjustDrawingYRel(Staff *staff, Doc *doc);
+
     //----------//
     // Functors //
     //----------//
diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index 738045413c9..a6726df5319 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -75,6 +75,19 @@ void TabDurSym::AddChild(Object *child)
     Modify();
 }
 
+void TabDurSym::AdjustDrawingYRel(Staff *staff, Doc *doc)
+{
+    assert(staff);
+    assert(doc);
+
+    int yRel = (staff->m_drawingLines - 1) * doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+
+    double spacingRatio = (staff->IsTabLuteFrench()) ? 2.0 : 1.0;
+    yRel += doc->GetDrawingUnit(staff->m_drawingStaffSize) * spacingRatio;
+
+    this->SetDrawingYRel(-yRel);
+}
+
 Point TabDurSym::GetStemUpSE(Doc *doc, int staffSize, bool isCueSize)
 {
     Point p(0, 0);

From 9c8d8b5165bd05f3323abd79474baf38dae20521 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 14:38:14 +0100
Subject: [PATCH 263/403] Adjustments for beams placed outside the staff

---
 src/beam.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 4e4d600da70..1f46d873922 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -277,7 +277,7 @@ void BeamSegment::CalcSetStemValuesTab(Layer *layer, Staff *staff, Doc *doc, Bea
 
             // stem->SetDrawingStemDir(stemDir);
             stem->SetDrawingXRel(coord->m_x - el->GetDrawingX());
-            stem->SetDrawingYRel(y2 - el->GetDrawingY());
+            if (coord->m_closestNote) stem->SetDrawingYRel(y2 - el->GetDrawingY());
             stem->SetDrawingStemLen(y2 - y1);
         }
     }
@@ -476,7 +476,7 @@ void BeamSegment::CalcBeamInit(
         beamInterface->m_stemXBelow[0] = (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
         beamInterface->m_stemXBelow[1] = (doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
     }
-    
+
     beamInterface->m_beamWidth = beamInterface->m_beamWidthBlack + beamInterface->m_beamWidthWhite;
 
     /******************************************************************/
@@ -829,6 +829,9 @@ void BeamSegment::CalcBeamPosition(
         }
     }
 
+    // Nothing else to do with tab beams outside the staff
+    if (staff->IsTabWithBeamOutside()) return;
+
     /******************************************************************/
     // Calculate the slope is necessary
 
@@ -1174,7 +1177,11 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
 
     int minDuration = DUR_4;
     for (auto coord : m_beamElementCoordRefs) {
-        if (!coord->m_closestNote) continue;
+        // Get the tabDurSym stem length (if any)
+        if (!coord->m_closestNote) {
+            m_uniformStemLength = coord->CalculateStemLengthTab(staff, stemDir);
+            continue;
+        }
         // if location matches, or if current elements duration is shorter than 8th. This ensures that beams with
         // partial beams will not be shorted when lowest/highest note is 8th and can be shortened
         if ((coord->m_dur > minDuration)
@@ -1578,6 +1585,13 @@ void BeamElementCoord::SetDrawingStemDir(
     m_yBeam = m_element->GetDrawingY();
     m_x += (STEMDIRECTION_up == stemDir) ? interface->m_stemXAbove[interface->m_cueSize]
                                          : interface->m_stemXBelow[interface->m_cueSize];
+
+    if (m_tabDurSym) {
+        m_yBeam = m_tabDurSym->GetDrawingY();
+        m_yBeam += (stemLen * doc->GetDrawingUnit(staff->m_drawingStaffSize) / 2);
+        return;
+    }
+
     if (!m_closestNote) return;
 
     if (!interface->m_cueSize && (m_element->IsGraceNote() || m_element->GetDrawingCueSize())

From 4fbafede930ecfab48856fc800da991d280f3ba0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 14:38:56 +0100
Subject: [PATCH 264/403] Avoid changing the TabDurSym drawingYRel when beams
 are inside the staff

---
 src/layerelement.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 1772df52755..f6fc9a3df6b 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1436,11 +1436,10 @@ int LayerElement::SetAlignmentPitchPos(FunctorParams *functorParams)
     }
     else if (this->Is(TABDURSYM)) {
         int yRel = 0;
-        double spacingRatio = 1.0;
-        if (staffY->IsTabLuteFrench()) {
-            spacingRatio = 2.0;
+        if (staffY->IsTabWithBeamOutside()) {
+            double spacingRatio = (staffY->IsTabLuteFrench()) ? 2.0 : 1.0;
+            yRel += params->m_doc->GetDrawingUnit(staffY->m_drawingStaffSize) * spacingRatio;
         }
-        yRel += params->m_doc->GetDrawingUnit(staffY->m_drawingStaffSize) * spacingRatio;
         this->SetDrawingYRel(yRel);
     }
 

From 4feb862a467fd0928acc0a79b403dfd265d98e70 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 15:19:39 +0100
Subject: [PATCH 265/403] Do not overwrite uniformStemLength with 0 with rests

---
 src/beam.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 1f46d873922..1a85b920f44 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1178,10 +1178,11 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
     int minDuration = DUR_4;
     for (auto coord : m_beamElementCoordRefs) {
         // Get the tabDurSym stem length (if any)
-        if (!coord->m_closestNote) {
+        if (coord->m_tabDurSym) {
             m_uniformStemLength = coord->CalculateStemLengthTab(staff, stemDir);
             continue;
         }
+        if (!coord->m_closestNote) continue;
         // if location matches, or if current elements duration is shorter than 8th. This ensures that beams with
         // partial beams will not be shorted when lowest/highest note is 8th and can be shortened
         if ((coord->m_dur > minDuration)

From 5ddfb5ab0c274ccbd755496092bf49fa39e52b02 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 17:04:52 +0100
Subject: [PATCH 266/403] Change default stem length for tablature

---
 include/vrv/vrvdef.h | 2 +-
 src/tabdursym.cpp    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 599092f3c4b..67d2590e072 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -617,7 +617,7 @@ enum StemSameasDrawingRole { SAMEAS_NONE = 0, SAMEAS_UNSET, SAMEAS_PRIMARY, SAME
 
 // in half staff spaces (but should be 6 in two-voice notation)
 #define STANDARD_STEMLENGTH 7
-#define STANDARD_STEMLENGTH_TAB 5
+#define STANDARD_STEMLENGTH_TAB 3
 
 //----------------------------------------------------------------------------
 // Temporary - to be made an option?
diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index a6726df5319..7ca3731536f 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -110,6 +110,8 @@ int TabDurSym::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
 
     int baseStem = STANDARD_STEMLENGTH_TAB * 3;
 
+    if (!staff->IsTabWithBeamOutside()) baseStem += 6;
+
     return baseStem;
 }
 

From 0f42869e8eaf2b3cb0fca52797d920f1a27c340d Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 17:06:11 +0100
Subject: [PATCH 267/403] Skip adjustment only for staves in tablature

---
 src/beam.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 1a85b920f44..7202c8a486e 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -830,7 +830,7 @@ void BeamSegment::CalcBeamPosition(
     }
 
     // Nothing else to do with tab beams outside the staff
-    if (staff->IsTabWithBeamOutside()) return;
+    if (staff->IsTablature() && staff->IsTabWithBeamOutside()) return;
 
     /******************************************************************/
     // Calculate the slope is necessary

From 8d5f43463b6ca77c9bb15534e9485b3f1451af2e Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 17:07:06 +0100
Subject: [PATCH 268/403] Always set m_tabDurSym for tablature beam and drawing
 adjustments

---
 src/beam.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 7202c8a486e..583fb46bb51 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -266,9 +266,11 @@ void BeamSegment::CalcSetStemValuesTab(Layer *layer, Staff *staff, Doc *doc, Bea
             if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
                 // Move down to ensure the stem is slightly shorter than the top-beam
                 y1 -= doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                if (coord->m_closestNote) y2 += doc->GetDrawingUnit(staff->m_drawingStaffSize);
             }
             else {
                 y1 += doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+                if (coord->m_closestNote) y2 -= doc->GetDrawingUnit(staff->m_drawingStaffSize);
             }
 
             Stem *stem = stemmedInterface->GetDrawingStem();
@@ -277,7 +279,9 @@ void BeamSegment::CalcSetStemValuesTab(Layer *layer, Staff *staff, Doc *doc, Bea
 
             // stem->SetDrawingStemDir(stemDir);
             stem->SetDrawingXRel(coord->m_x - el->GetDrawingX());
-            if (coord->m_closestNote) stem->SetDrawingYRel(y2 - el->GetDrawingY());
+            if (coord->m_closestNote) {
+                stem->SetDrawingYRel(y2 - el->GetDrawingY());
+            }
             stem->SetDrawingStemLen(y2 - y1);
         }
     }
@@ -1587,7 +1591,7 @@ void BeamElementCoord::SetDrawingStemDir(
     m_x += (STEMDIRECTION_up == stemDir) ? interface->m_stemXAbove[interface->m_cueSize]
                                          : interface->m_stemXBelow[interface->m_cueSize];
 
-    if (m_tabDurSym) {
+    if (m_tabDurSym && !m_closestNote) {
         m_yBeam = m_tabDurSym->GetDrawingY();
         m_yBeam += (stemLen * doc->GetDrawingUnit(staff->m_drawingStaffSize) / 2);
         return;
@@ -1725,10 +1729,8 @@ void BeamElementCoord::SetClosestNoteOrTabDurSym(data_STEMDIRECTION stemDir, boo
     else if (m_element->Is(TABGRP)) {
         TabGrp *tabGrp = vrv_cast<TabGrp *>(m_element);
         assert(tabGrp);
-        if (outsideStaff) {
-            m_tabDurSym = vrv_cast<TabDurSym *>(tabGrp->FindDescendantByType(TABDURSYM));
-        }
-        else {
+        m_tabDurSym = vrv_cast<TabDurSym *>(tabGrp->FindDescendantByType(TABDURSYM));
+        if (!outsideStaff) {
             m_closestNote = (STEMDIRECTION_up == stemDir) ? tabGrp->GetTopNote() : tabGrp->GetBottomNote();
         }
     }

From f81c068a7eece8007daecd8b0016f43040e00601 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 22:27:55 +0100
Subject: [PATCH 269/403] Add member to CalcStemParams to flag tabGrp with no
 notes

---
 include/vrv/functorparams.h | 11 +++++++----
 src/tabgrp.cpp              |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 5bdf7922a0a..66211eb4a32 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1058,10 +1058,11 @@ class CalcOnsetOffsetParams : public FunctorParams {
  * member 2: the actual duration of the chord / note
  * member 3: the flag for grace notes (stem is not extended)
  * member 4: the flag for stem.sameas notes
- * member 5: the current staff (to avoid additional lookup)
- * member 6: the current layer (ditto)
- * member 7: the chord or note to which the stem belongs
- * member 8: the doc
+ * member 5: the flag indicating that we have no note in tabGrp
+ * member 6: the current staff (to avoid additional lookup)
+ * member 7: the current layer (ditto)
+ * member 8: the chord or note to which the stem belongs
+ * member 9: the doc
  **/
 
 class CalcStemParams : public FunctorParams {
@@ -1073,6 +1074,7 @@ class CalcStemParams : public FunctorParams {
         m_dur = DUR_1;
         m_isGraceNote = false;
         m_stemSameas = false;
+        m_tabGrpWithNoNote = false;
         m_staff = NULL;
         m_layer = NULL;
         m_interface = NULL;
@@ -1083,6 +1085,7 @@ class CalcStemParams : public FunctorParams {
     int m_dur;
     bool m_isGraceNote;
     bool m_stemSameas;
+    bool m_tabGrpWithNoNote;
     Staff *m_staff;
     Layer *m_layer;
     StemmedDrawingInterface *m_interface;
diff --git a/src/tabgrp.cpp b/src/tabgrp.cpp
index f1d79fc759c..c972b0d833d 100644
--- a/src/tabgrp.cpp
+++ b/src/tabgrp.cpp
@@ -137,6 +137,7 @@ int TabGrp::CalcStem(FunctorParams *functorParams)
     assert(params);
 
     params->m_dur = this->GetActualDur();
+    params->m_tabGrpWithNoNote = (!this->FindDescendantByType(NOTE));
 
     return FUNCTOR_CONTINUE;
 }

From eadcadc1e3e6cdaf92ef65f44ee7b8d1ff4828ce Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 22:28:38 +0100
Subject: [PATCH 270/403] Skip tabDurSym with no stem (empty or no notes) and
 set stem length

---
 src/tabdursym.cpp | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index 7ca3731536f..ee627cfa658 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -149,6 +149,12 @@ int TabDurSym::CalcStem(FunctorParams *functorParams)
     Stem *stem = this->GetDrawingStem();
     assert(stem);
 
+    // Do not draw virtual (e.g., whole note) stems
+    if (params->m_dur < DUR_2 || params->m_tabGrpWithNoNote) {
+        stem->IsVirtual(true);
+        return FUNCTOR_SIBLINGS;
+    }
+
     // Cache the in params to avoid further lookup
     params->m_staff = this->GetAncestorStaff();
     assert(params->m_staff);
@@ -176,10 +182,22 @@ int TabDurSym::CalcStem(FunctorParams *functorParams)
 
     this->SetDrawingStemDir(stemDir);
 
+    int stemDirFactor = -1;
+    if (stemDir == STEMDIRECTION_down) {
+        this->AdjustDrawingYRel(params->m_staff, params->m_doc);
+        stemDirFactor = 1;
+    }
+
     // Make sure the relative position of the stem is the same
     stem->SetDrawingYRel(0);
-    // WIP for now set a default stem length
-    stem->SetDrawingStemLen(4 * params->m_doc->GetDrawingUnit(staffSize));
+    int stemSize = this->CalcStemLenInThirdUnits(params->m_staff, stemDir) * params->m_doc->GetDrawingUnit(staffSize);
+    stemSize /= (3 * stemDirFactor);
+
+    if (params->m_dur == DUR_2) {
+        stemSize /= 2;
+    }
+
+    stem->SetDrawingStemLen(stemSize);
 
     return FUNCTOR_SIBLINGS;
 }

From 4c8f2a2c094ae62ab3e6ae2de990d8258a8ba945 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 22:29:07 +0100
Subject: [PATCH 271/403] Helper adjustments

---
 include/vrv/staff.h  | 3 ++-
 src/layerelement.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index 4ed8bbab713..23e189d5623 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -109,10 +109,11 @@ class Staff : public Object,
     bool IsMensural();
     bool IsNeume();
     bool IsTablature();
+    bool IsTabGuitar() { return m_drawingNotationType == NOTATIONTYPE_tab_guitar; }
     bool IsTabLuteFrench() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_french; }
     bool IsTabLuteGerman() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_german; }
     bool IsTabLuteItalian() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_italian; }
-    bool IsTabWithBeamOutside() { return false; }
+    bool IsTabWithBeamOutside() { return true; }
     ///@}
 
     /**
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index f6fc9a3df6b..eb1a6b4571b 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -213,7 +213,7 @@ FTrem *LayerElement::IsInFTrem()
 
 Beam *LayerElement::IsInBeam()
 {
-    if (!this->Is({ CHORD, NOTE, TABGRP, STEM })) return NULL;
+    if (!this->Is({ CHORD, NOTE, TABGRP, TABDURSYM, STEM })) return NULL;
     Beam *beamParent = vrv_cast<Beam *>(this->GetFirstAncestor(BEAM));
     if (beamParent != NULL) {
         if (!this->IsGraceNote()) return beamParent;

From 40a5c426e59bb59a9efbeb2e7a060402b440d63a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 22:29:22 +0100
Subject: [PATCH 272/403] Adjust beam fractions for tab beam

---
 src/beam.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 583fb46bb51..5a31cc70f06 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -98,17 +98,19 @@ void BeamSegment::CalcBeam(
         this->CalcBeamInit(layer, staff, doc, beamInterface, place);
     }
 
-    beamInterface->m_fractionSize = staff->m_drawingStaffSize;
-
-    // Always horizontal when placed outside a tablature staff
     bool horizontal = true;
     if (staff->IsTablature()) {
-        // Alwyas not horizontal when inside the staff
-        // Eventually we will need to look at the content to pre-determine if horizontal
+        int glyphSize = staff->GetDrawingStaffNotationSize();
+        beamInterface->m_fractionSize = glyphSize * 2 / 3;
+
+        // Alwyas horizontal when outside the staff and not when inside the staff
+        // Eventually we will need to look at the content to pre-determine if horizontal for inside beams
         horizontal = staff->IsTabWithBeamOutside();
         this->CalcBeamPlaceTab(layer, staff, doc, beamInterface, place);
     }
     else {
+        beamInterface->m_fractionSize = staff->m_drawingStaffSize;
+
         horizontal = beamInterface->IsHorizontal();
         // Beam@place has precedence - however, in some cases, CalcBeam is called recursively because we need to change
         // the place This occurs when mixed makes no sense and the beam is placed above or below instead.

From e10ded0e8080cee89d3bbe06c62e3f5ea67678a5 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 2 Feb 2022 22:30:12 +0100
Subject: [PATCH 273/403] Adjust drawing of tabDurSym

* Stem (except for lute) are drawn in child stem
---
 src/view_tab.cpp | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 998380e6000..4fae4ad8e42 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -171,19 +171,13 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     int x = element->GetDrawingX();
     int y = element->GetDrawingY();
 
-    const int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
     const int glyphSize = staff->GetDrawingStaffNotationSize();
-    const int halfStemWidth = m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2;
 
-    // We only need to draw the stems
-    // Do we also need to draw the dots?
-    if (tabGrp->IsInBeam()) {
-        const int height = m_doc->GetGlyphHeight(SMUFL_EBA8_luteDurationHalf, glyphSize, true);
-        this->DrawFilledRectangle(dc, x - halfStemWidth, y, x + halfStemWidth, y + height);
-    }
-    else if (staff->m_drawingNotationType == NOTATIONTYPE_tab_guitar) {
-    }
-    else {
+    // For beam and guitar notation, stem are drawn through the child Stem
+    if (!tabGrp->IsInBeam() && !staff->IsTabGuitar()) {
+        const int drawingDur
+            = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
+
         int symc = 0;
         switch (drawingDur) {
             case DUR_2: symc = SMUFL_EBA7_luteDurationWhole; break;
@@ -195,15 +189,15 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
         }
 
         this->DrawSmuflCode(dc, x, y, symc, glyphSize, true);
+    }
 
-        if (tabGrp->HasDots()) {
-            y += m_doc->GetDrawingUnit(glyphSize) * 0.5;
-            x += m_doc->GetDrawingUnit(glyphSize);
-            for (int i = 0; i < tabGrp->GetDots(); ++i) {
-                this->DrawDot(dc, x, y, glyphSize * 2 / 3);
-                // HARDCODED
-                x += m_doc->GetDrawingUnit(glyphSize) * 0.75;
-            }
+    if (tabGrp->HasDots()) {
+        y += m_doc->GetDrawingUnit(glyphSize) * 0.5;
+        x += m_doc->GetDrawingUnit(glyphSize);
+        for (int i = 0; i < tabGrp->GetDots(); ++i) {
+            this->DrawDot(dc, x, y, glyphSize * 2 / 3);
+            // HARDCODED
+            x += m_doc->GetDrawingUnit(glyphSize) * 0.75;
         }
     }
 

From e3cbf6b3f8de25d23b0e0933c972d2adf01fb36b Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 3 Feb 2022 10:31:08 +0100
Subject: [PATCH 274/403] Store cast off system widths

---
 include/vrv/functorparams.h |  5 ++++-
 include/vrv/system.h        |  9 +++++++++
 src/doc.cpp                 |  8 ++++++++
 src/system.cpp              | 12 ++++++++++--
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 5bdf7922a0a..fb662d3a329 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -809,7 +809,8 @@ class AlignHorizontallyParams : public FunctorParams {
  * member 0: the cumulated shift
  * member 1: the cumulated justifiable width
  * member 2: shift next measure due to section restart
- * member 3: the doc
+ * member 3: store castoff system widths if true
+ * member 4: the doc
  **/
 
 class AlignMeasuresParams : public FunctorParams {
@@ -819,12 +820,14 @@ class AlignMeasuresParams : public FunctorParams {
         m_shift = 0;
         m_justifiableWidth = 0;
         m_applySectionRestartShift = false;
+        m_storeCastOffSystemWidths = false;
         m_doc = doc;
     }
 
     int m_shift;
     int m_justifiableWidth;
     bool m_applySectionRestartShift;
+    bool m_storeCastOffSystemWidths;
     Doc *m_doc;
 };
 
diff --git a/include/vrv/system.h b/include/vrv/system.h
index e965c0d4006..b52146f881e 100644
--- a/include/vrv/system.h
+++ b/include/vrv/system.h
@@ -334,6 +334,15 @@ class System : public Object, public DrawingListInterface, public AttTyped {
     int m_drawingTotalWidth;
     int m_drawingJustifiableWidth;
     ///@}
+    /**
+     * @name The cast off width of the system.
+     * It is computed during castoff and used for adjusting the horizontal spacing for a given duration.
+     * This technique prevents large justification ratios and improves the horizontal layout.
+     */
+    ///@{
+    int m_castOffTotalWidth;
+    int m_castOffJustifiableWidth;
+    ///@}
 
 protected:
     /**
diff --git a/src/doc.cpp b/src/doc.cpp
index 97c4b24e8bc..03ee4caa8bf 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -907,6 +907,14 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
     delete unCastOffPage;
     unCastOffPage = NULL;
 
+    // Store the cast off system widths => these are used to adjust the horizontal spacing
+    // for a given duration during page layout
+    AlignMeasuresParams alignMeasuresParams(this);
+    alignMeasuresParams.m_storeCastOffSystemWidths = true;
+    Functor alignMeasures(&Object::AlignMeasures);
+    Functor alignMeasuresEnd(&Object::AlignMeasuresEnd);
+    castOffSinglePage->Process(&alignMeasures, &alignMeasuresParams, &alignMeasuresEnd);
+
     // Replace it with the castOffSinglePage
     pages->AddChild(castOffSinglePage);
     this->ResetDrawingPage();
diff --git a/src/system.cpp b/src/system.cpp
index 79f417b36b3..bb1c77482a4 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -78,6 +78,8 @@ void System::Reset()
     m_drawingYRel = 0;
     m_drawingTotalWidth = 0;
     m_drawingJustifiableWidth = 0;
+    m_castOffTotalWidth = 0;
+    m_castOffJustifiableWidth = 0;
     m_drawingAbbrLabelsWidth = 0;
     m_drawingIsOptimized = false;
 }
@@ -741,8 +743,14 @@ int System::AlignMeasuresEnd(FunctorParams *functorParams)
     AlignMeasuresParams *params = vrv_params_cast<AlignMeasuresParams *>(functorParams);
     assert(params);
 
-    m_drawingTotalWidth = params->m_shift + this->GetDrawingLabelsWidth();
-    m_drawingJustifiableWidth = params->m_justifiableWidth;
+    if (params->m_storeCastOffSystemWidths) {
+        m_castOffTotalWidth = params->m_shift + this->GetDrawingLabelsWidth();
+        m_castOffJustifiableWidth = params->m_justifiableWidth;
+    }
+    else {
+        m_drawingTotalWidth = params->m_shift + this->GetDrawingLabelsWidth();
+        m_drawingJustifiableWidth = params->m_justifiableWidth;
+    }
 
     return FUNCTOR_CONTINUE;
 }

From 4b654f2d840783da45f4e09155a528916fac7f7e Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 3 Feb 2022 11:40:40 +0100
Subject: [PATCH 275/403] Estimate justification ratio

and use it to adjust the alignment X position
---
 include/vrv/functorparams.h | 13 ++++++++-----
 include/vrv/system.h        | 10 ++++++++++
 src/horizontalaligner.cpp   |  2 +-
 src/system.cpp              | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index fb662d3a329..fe59d73d535 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -2271,11 +2271,12 @@ class SetAlignmentPitchPosParams : public FunctorParams {
  * member 0: the previous time position
  * member 1: the previous x rel position
  * member 2: duration of the longest note
- * member 3: the last alignment that was not timestamp-only
- * member 4: the list of timestamp-only alignment that needs to be adjusted
- * member 5: the MeasureAligner
- * member 6: the Doc
- * member 7: the functor to be redirected to Aligner
+ * member 3: the estimated justification ratio of the system
+ * member 4: the last alignment that was not timestamp-only
+ * member 5: the list of timestamp-only alignment that needs to be adjusted
+ * member 6: the MeasureAligner
+ * member 7: the Doc
+ * member 8: the functor to be redirected to Aligner
  **/
 
 class SetAlignmentXPosParams : public FunctorParams {
@@ -2285,6 +2286,7 @@ class SetAlignmentXPosParams : public FunctorParams {
         m_previousTime = 0.0;
         m_previousXRel = 0;
         m_longestActualDur = 0;
+        m_estimatedJustificationRatio = 1.0;
         m_lastNonTimestamp = NULL;
         m_measureAligner = NULL;
         m_doc = doc;
@@ -2293,6 +2295,7 @@ class SetAlignmentXPosParams : public FunctorParams {
     double m_previousTime;
     int m_previousXRel;
     int m_longestActualDur;
+    double m_estimatedJustificationRatio;
     Alignment *m_lastNonTimestamp;
     std::list<Alignment *> m_timestamps;
     MeasureAligner *m_measureAligner;
diff --git a/include/vrv/system.h b/include/vrv/system.h
index b52146f881e..d212144871a 100644
--- a/include/vrv/system.h
+++ b/include/vrv/system.h
@@ -142,6 +142,11 @@ class System : public Object, public DrawingListInterface, public AttTyped {
     bool IsLastOfMdiv();
     ///@}
 
+    /**
+     * Estimate the justification ratio from the castoff system widths and the desired page width
+     */
+    double EstimateJustificationRatio(Doc *doc);
+
     /**
      * Convert mensural MEI into cast-off (measure) segments looking at the barLine objects.
      * Segment positions occur where a barLine is set on all staves.
@@ -195,6 +200,11 @@ class System : public Object, public DrawingListInterface, public AttTyped {
      */
     int AlignHorizontally(FunctorParams *functorParams) override;
 
+    /**
+     * See Object::SetAlignmentXPos
+     */
+    int SetAlignmentXPos(FunctorParams *functorParams) override;
+
     /**
      * @name See Object::AdjustXOverflow
      */
diff --git a/src/horizontalaligner.cpp b/src/horizontalaligner.cpp
index b9b7847dfb1..97b48b2f1c4 100644
--- a/src/horizontalaligner.cpp
+++ b/src/horizontalaligner.cpp
@@ -1252,7 +1252,7 @@ int Alignment::SetAlignmentXPos(FunctorParams *functorParams)
         iter->second->SetGraceAligmentXPos(params->m_doc);
     }
 
-    this->SetXRel(params->m_previousXRel + intervalXRel * DEFINITION_FACTOR);
+    this->SetXRel(params->m_previousXRel + intervalXRel * DEFINITION_FACTOR * params->m_estimatedJustificationRatio);
     params->m_previousTime = m_time;
     params->m_previousXRel = m_xRel;
 
diff --git a/src/system.cpp b/src/system.cpp
index bb1c77482a4..ab93ab43717 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -371,6 +371,26 @@ bool System::IsLastOfMdiv()
     return (nextSibling && nextSibling->IsPageElement());
 }
 
+double System::EstimateJustificationRatio(Doc *doc)
+{
+    assert(doc);
+
+    // We can only estimate if cast off system widths are available
+    if ((m_castOffTotalWidth == 0) || (m_castOffJustifiableWidth == 0)) {
+        return 1.0;
+    }
+
+    const double nonJustifiableWidth
+        = m_systemLeftMar + m_systemRightMar + m_castOffTotalWidth - m_castOffJustifiableWidth;
+    double estimatedRatio
+        = (double)(doc->m_drawingPageContentWidth - nonJustifiableWidth) / ((double)m_castOffJustifiableWidth);
+
+    // Bounded compression
+    estimatedRatio = std::max(estimatedRatio, 0.8);
+
+    return estimatedRatio;
+}
+
 void System::ConvertToCastOffMensuralSystem(Doc *doc, System *targetSystem)
 {
     assert(doc);
@@ -553,6 +573,19 @@ int System::AlignVerticallyEnd(FunctorParams *functorParams)
     return FUNCTOR_SIBLINGS;
 }
 
+int System::SetAlignmentXPos(FunctorParams *functorParams)
+{
+    SetAlignmentXPosParams *params = vrv_params_cast<SetAlignmentXPosParams *>(functorParams);
+    assert(params);
+
+    const double ratio = this->EstimateJustificationRatio(params->m_doc);
+    if (!this->IsLastOfMdiv() || (ratio < params->m_estimatedJustificationRatio)) {
+        params->m_estimatedJustificationRatio = ratio;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 int System::AdjustXOverflow(FunctorParams *functorParams)
 {
     AdjustXOverflowParams *params = vrv_params_cast<AdjustXOverflowParams *>(functorParams);

From 2f4fbd62e9ae9368f3e4b1e1727c0ba0dd384fbc Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 3 Feb 2022 13:16:17 +0200
Subject: [PATCH 276/403] Minor fix

- set pointer to null after adding them to layer
- clean up pointers at exit, if they were not nulled
---
 src/ioabc.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 50caf3b0662..d079e8117a0 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -335,12 +335,14 @@ void ABCInput::AddLayerElement()
         if (m_containerElement.m_element && (ElementType::Tuplet == m_containerElement.m_type)) {
             element = m_containerElement.m_element;
             element->AddChild(beam);
+            m_containerElement.m_element = NULL;
         }
         // otherwise default to it being beam
         else {
             element = beam;
         }
         m_layer->AddChild(element);
+        beam = NULL;
     }
     else {
         for (auto iter = m_noteStack.begin(); iter != m_noteStack.end(); ++iter) {
@@ -348,9 +350,8 @@ void ABCInput::AddLayerElement()
         }
     }
     // clean-up leftover data, if any
-    if (beam && !beam->GetChildCount()) delete beam;
-    if (m_containerElement.m_element && !m_containerElement.m_element->GetChildCount())
-        delete m_containerElement.m_element;
+    if (beam) delete beam;
+    if (m_containerElement.m_element) delete m_containerElement.m_element;
 
     m_containerElement = {};
     m_noteStack.clear();

From 217710ffe08a958f0d2f386a424a2c30fb6a0c91 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 3 Feb 2022 12:40:55 +0100
Subject: [PATCH 277/403] Add dampening

---
 src/system.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/system.cpp b/src/system.cpp
index ab93ab43717..c3f81c844a0 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -385,7 +385,8 @@ double System::EstimateJustificationRatio(Doc *doc)
     double estimatedRatio
         = (double)(doc->m_drawingPageContentWidth - nonJustifiableWidth) / ((double)m_castOffJustifiableWidth);
 
-    // Bounded compression
+    // Apply dampening and bound compression
+    estimatedRatio *= 0.95;
     estimatedRatio = std::max(estimatedRatio, 0.8);
 
     return estimatedRatio;

From 45a29005cc8259eb147833538c3cc3e41b7b9d39 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 3 Feb 2022 14:51:32 +0100
Subject: [PATCH 278/403] Update changelog [skip-ci]

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdd8b33a82b..63f706f0510 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,13 @@
 * Support for `scoreDef` and `staffDef` `@dur.default` (@eNote-GmBH)
 * Support for MIDI output of grace notes and multi-measure rests (@eNote-GmBH)
 * Support for `@stem.sameas` on notes for orchestra scores
+* Support for MIDI output of arpeggios (@eNote-GmBH)
+* Support for tuplets in ABC importer (@eNote-GmBH)
 * Improved tablature MIDI output (@paul-bayleaf)
 * Additional parameters to the redoLayout method for faster cached layout redoing
 * Additional parameters to the renderToTimemap method for including rests and measure
 * Additional ids for rests and measure added to the getElementsAtTime methods
+* Preliminary support for stems and beam for guitar tablature
 * Preliminary support for tablature MusicXML import (@paul-bayleaf)
 
 ## [3.8.1] - 2022-01-10

From 4bbe2b7062e66cc87d2b36382b99a1e12f89d38a Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 3 Feb 2022 15:55:43 +0200
Subject: [PATCH 279/403] Minor fix

- add section to the score only if it already doesn't have a parent
---
 src/ioabc.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 264065de85c..4bfd2a1e269 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -131,7 +131,7 @@ void ABCInput::ParseABC(std::istream &infile)
             // if m_div is not initialized - we didn't read X element, so continue until we do
             continue;
         }
-        if (std::string(abcLine).find_first_not_of(' ') == std::string::npos) {
+        if (abcLine.empty() || (abcLine.find_first_not_of(' ') == std::string::npos)) {
             // abc tunes are separated from each other by empty lines
             this->FlushControlElements(score, section);
             continue;
@@ -152,6 +152,10 @@ void ABCInput::ParseABC(std::istream &infile)
         }
     }
 
+    if (!section->GetParent()) {
+        score->AddChild(section);
+    }
+
     m_controlElements.clear();
     m_composer.clear();
     m_info.clear();
@@ -891,8 +895,10 @@ void ABCInput::FlushControlElements(Score *score, Section *section)
         assert(measure);
         measure->AddChild(iter->second);
     }
+    if (!section->GetParent()) {
+        score->AddChild(section);
+    }
 
-    score->AddChild(section);
     m_controlElements.clear();
 }
 

From 98798fcbdb40bd3fd64fe3e17493ae60cee2de11 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Fri, 4 Feb 2022 08:10:12 +0100
Subject: [PATCH 280/403] Fix conversion warning

and disable debug message
---
 src/doc.cpp   | 2 +-
 src/ioabc.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/doc.cpp b/src/doc.cpp
index 97c4b24e8bc..1eaff835253 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -876,7 +876,7 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
     // The cache is not set the first time, or can be reset by Doc::UnCastOffDoc
     Measure *firstMeasure = vrv_cast<Measure *>(unCastOffPage->FindDescendantByType(MEASURE));
     if (!firstMeasure || !firstMeasure->HasCachedHorizontalLayout()) {
-        LogDebug("Performing the horizontal layout");
+        // LogDebug("Performing the horizontal layout");
         unCastOffPage->LayOutHorizontally();
         unCastOffPage->HorizontalLayoutCachePage();
     }
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index d079e8117a0..ea172ada4de 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -404,7 +404,7 @@ int ABCInput::ParseTuplet(const std::string &musicCode, int index)
     m_containerElement = { ElementType::Tuplet, tuplet, tupletNum };
 
     // return index of the last element in tuplet, so that we point to the actual notes when incrementing 'i'
-    return tupletEnd - 1;
+    return static_cast<int>(tupletEnd) - 1;
 }
 
 void ABCInput::AddAnnot(const std::string &remark)

From 8f9e9454bee0a091dbad7fe45bf0fc9ea7e3316c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 09:13:16 +0100
Subject: [PATCH 281/403] Use staffDef@type for determining beam placement in
 guitar tablature

---
 include/vrv/staff.h | 2 +-
 src/staff.cpp       | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index 23e189d5623..97cc7edcc33 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -113,7 +113,7 @@ class Staff : public Object,
     bool IsTabLuteFrench() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_french; }
     bool IsTabLuteGerman() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_german; }
     bool IsTabLuteItalian() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_italian; }
-    bool IsTabWithBeamOutside() { return true; }
+    bool IsTabWithBeamOutside();
     ///@}
 
     /**
diff --git a/src/staff.cpp b/src/staff.cpp
index 8aad8981e79..3210cad6cdb 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -226,6 +226,13 @@ bool Staff::IsTablature()
     return isTablature;
 }
 
+bool Staff::IsTabWithBeamOutside()
+{
+    if (!m_drawingStaffDef) return false;
+    // Temporary implementation looking at staffDef@type
+    return (!this->IsTabGuitar() || !m_drawingStaffDef->HasType() || m_drawingStaffDef->GetType() != "within");
+}
+
 int Staff::CalcPitchPosYRel(Doc *doc, int loc)
 {
     assert(doc);

From 8636264adbf87eb658244c19dff3d485cdf66de1 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 10:26:13 +0100
Subject: [PATCH 282/403] Adjust dots position for stems below

---
 src/view_tab.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 4fae4ad8e42..dd79a68d7f2 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -192,7 +192,8 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     }
 
     if (tabGrp->HasDots()) {
-        y += m_doc->GetDrawingUnit(glyphSize) * 0.5;
+        const int stemDirFactor = (tabDurSym->GetDrawingStemDir() == STEMDIRECTION_down) ? -1 : 1;
+        y += m_doc->GetDrawingUnit(glyphSize) * 0.5 * stemDirFactor;
         x += m_doc->GetDrawingUnit(glyphSize);
         for (int i = 0; i < tabGrp->GetDots(); ++i) {
             this->DrawDot(dc, x, y, glyphSize * 2 / 3);

From 846d29d361472610c84ec05b10122619c284c477 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 10:26:56 +0100
Subject: [PATCH 283/403] Properly position stems (not beamed) when within the
 staff

---
 src/tabdursym.cpp | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index ee627cfa658..0cc5a754bf6 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -16,7 +16,9 @@
 #include "elementpart.h"
 #include "functorparams.h"
 #include "layer.h"
+#include "note.h"
 #include "staff.h"
+#include "tabgrp.h"
 
 namespace vrv {
 
@@ -82,8 +84,11 @@ void TabDurSym::AdjustDrawingYRel(Staff *staff, Doc *doc)
 
     int yRel = (staff->m_drawingLines - 1) * doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
 
-    double spacingRatio = (staff->IsTabLuteFrench()) ? 2.0 : 1.0;
-    yRel += doc->GetDrawingUnit(staff->m_drawingStaffSize) * spacingRatio;
+    // For stems outside add a margin to the tabDurSym - otherwise attached to the staff line
+    if (staff->IsTabWithBeamOutside()) {
+        double spacingRatio = (staff->IsTabLuteFrench()) ? 2.0 : 1.0;
+        yRel += doc->GetDrawingUnit(staff->m_drawingStaffSize) * spacingRatio;
+    }
 
     this->SetDrawingYRel(-yRel);
 }
@@ -110,7 +115,11 @@ int TabDurSym::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
 
     int baseStem = STANDARD_STEMLENGTH_TAB * 3;
 
-    if (!staff->IsTabWithBeamOutside()) baseStem += 6;
+    // One unit longer for guitar tablature
+    if (staff->IsTabGuitar()) baseStem += 3;
+
+    // One unit longer for stems inside the staff
+    if (!staff->IsTabWithBeamOutside()) baseStem += 3;
 
     return baseStem;
 }
@@ -188,17 +197,34 @@ int TabDurSym::CalcStem(FunctorParams *functorParams)
         stemDirFactor = 1;
     }
 
-    // Make sure the relative position of the stem is the same
-    stem->SetDrawingYRel(0);
+    if (params->m_staff->IsTabWithBeamOutside()) {
+        // Make sure the relative position of the stem is the same
+        stem->SetDrawingYRel(0);
+    }
+    else {
+        // Other wise attach it to the closest note
+        TabGrp *tabGrp = vrv_cast<TabGrp *>(this->GetFirstAncestor(TABGRP));
+        assert(tabGrp);
+        Note *note = (stemDir == STEMDIRECTION_down) ? tabGrp->GetBottomNote() : tabGrp->GetTopNote();
+        int yRel = (note) ? note->GetDrawingY() : 0;
+        // Because the tabDurSym is relative to the top or bottom staff line, remove its relative value
+        yRel -= this->GetDrawingYRel();
+        // Remove a unit for the stem not to go to the center of the note
+        yRel -= params->m_doc->GetDrawingUnit(params->m_staff->m_drawingStaffSize) * stemDirFactor;
+        stem->SetDrawingYRel(yRel);
+    }
+
     int stemSize = this->CalcStemLenInThirdUnits(params->m_staff, stemDir) * params->m_doc->GetDrawingUnit(staffSize);
     stemSize /= (3 * stemDirFactor);
 
     if (params->m_dur == DUR_2) {
+        // Stems for half notes twice shorter
         stemSize /= 2;
     }
 
     stem->SetDrawingStemLen(stemSize);
 
+    // Do not call Stem::CalcStem with TabDurSym because everything is done here
     return FUNCTOR_SIBLINGS;
 }
 

From 59ab77e18f529a66c069ee92d71c2a00014628e6 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 10:28:11 +0100
Subject: [PATCH 284/403] Rename Staff::IsTabWithBeamOutside to
 IsTabWithStemsOutside

---
 include/vrv/staff.h  | 2 +-
 src/beam.cpp         | 8 ++++----
 src/layerelement.cpp | 2 +-
 src/staff.cpp        | 2 +-
 src/tabdursym.cpp    | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index 97cc7edcc33..9f99c8c980d 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -113,7 +113,7 @@ class Staff : public Object,
     bool IsTabLuteFrench() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_french; }
     bool IsTabLuteGerman() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_german; }
     bool IsTabLuteItalian() { return m_drawingNotationType == NOTATIONTYPE_tab_lute_italian; }
-    bool IsTabWithBeamOutside();
+    bool IsTabWithStemsOutside();
     ///@}
 
     /**
diff --git a/src/beam.cpp b/src/beam.cpp
index 5a31cc70f06..01d2ca5ff60 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -105,7 +105,7 @@ void BeamSegment::CalcBeam(
 
         // Alwyas horizontal when outside the staff and not when inside the staff
         // Eventually we will need to look at the content to pre-determine if horizontal for inside beams
-        horizontal = staff->IsTabWithBeamOutside();
+        horizontal = staff->IsTabWithStemsOutside();
         this->CalcBeamPlaceTab(layer, staff, doc, beamInterface, place);
     }
     else {
@@ -836,7 +836,7 @@ void BeamSegment::CalcBeamPosition(
     }
 
     // Nothing else to do with tab beams outside the staff
-    if (staff->IsTablature() && staff->IsTabWithBeamOutside()) return;
+    if (staff->IsTablature() && staff->IsTabWithStemsOutside()) return;
 
     /******************************************************************/
     // Calculate the slope is necessary
@@ -1152,7 +1152,7 @@ void BeamSegment::CalcBeamPlaceTab(
         beamInterface->m_drawingPlace = (layerStemDir == STEMDIRECTION_down) ? BEAMPLACE_below : BEAMPLACE_above;
     }
 
-    if (beamInterface->m_drawingPlace == BEAMPLACE_below && staff->IsTabWithBeamOutside()) {
+    if (beamInterface->m_drawingPlace == BEAMPLACE_below && staff->IsTabWithStemsOutside()) {
         for (auto coord : m_beamElementCoordRefs) {
             if (!coord->m_element || !coord->m_element->Is(TABGRP)) continue;
             TabGrp *tabGrp = vrv_cast<TabGrp *>(coord->m_element);
@@ -1168,7 +1168,7 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
     const data_STEMDIRECTION stemDir = (place == BEAMPLACE_below) ? STEMDIRECTION_down : STEMDIRECTION_up;
     int relevantNoteLoc = VRV_UNSET;
     for (auto coord : m_beamElementCoordRefs) {
-        coord->SetClosestNoteOrTabDurSym(stemDir, staff->IsTabWithBeamOutside());
+        coord->SetClosestNoteOrTabDurSym(stemDir, staff->IsTabWithStemsOutside());
         // Nothing else to do if we have no closest note (that includes tab beams outside the staff)
         if (!coord->m_closestNote) continue;
         if (relevantNoteLoc == VRV_UNSET) {
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index eb1a6b4571b..4ec6b3f0e1a 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1436,7 +1436,7 @@ int LayerElement::SetAlignmentPitchPos(FunctorParams *functorParams)
     }
     else if (this->Is(TABDURSYM)) {
         int yRel = 0;
-        if (staffY->IsTabWithBeamOutside()) {
+        if (staffY->IsTabWithStemsOutside()) {
             double spacingRatio = (staffY->IsTabLuteFrench()) ? 2.0 : 1.0;
             yRel += params->m_doc->GetDrawingUnit(staffY->m_drawingStaffSize) * spacingRatio;
         }
diff --git a/src/staff.cpp b/src/staff.cpp
index 3210cad6cdb..0dda004e327 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -226,7 +226,7 @@ bool Staff::IsTablature()
     return isTablature;
 }
 
-bool Staff::IsTabWithBeamOutside()
+bool Staff::IsTabWithStemsOutside()
 {
     if (!m_drawingStaffDef) return false;
     // Temporary implementation looking at staffDef@type
diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index 0cc5a754bf6..7187e1700e5 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -85,7 +85,7 @@ void TabDurSym::AdjustDrawingYRel(Staff *staff, Doc *doc)
     int yRel = (staff->m_drawingLines - 1) * doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
 
     // For stems outside add a margin to the tabDurSym - otherwise attached to the staff line
-    if (staff->IsTabWithBeamOutside()) {
+    if (staff->IsTabWithStemsOutside()) {
         double spacingRatio = (staff->IsTabLuteFrench()) ? 2.0 : 1.0;
         yRel += doc->GetDrawingUnit(staff->m_drawingStaffSize) * spacingRatio;
     }
@@ -119,7 +119,7 @@ int TabDurSym::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
     if (staff->IsTabGuitar()) baseStem += 3;
 
     // One unit longer for stems inside the staff
-    if (!staff->IsTabWithBeamOutside()) baseStem += 3;
+    if (!staff->IsTabWithStemsOutside()) baseStem += 3;
 
     return baseStem;
 }
@@ -197,7 +197,7 @@ int TabDurSym::CalcStem(FunctorParams *functorParams)
         stemDirFactor = 1;
     }
 
-    if (params->m_staff->IsTabWithBeamOutside()) {
+    if (params->m_staff->IsTabWithStemsOutside()) {
         // Make sure the relative position of the stem is the same
         stem->SetDrawingYRel(0);
     }

From 251e60ea740e486bd0c64dcb5c9914c5e9f17c52 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 10:31:50 +0100
Subject: [PATCH 285/403] Rename temporary implementation of staffDef@type
 content from "within" to "stems.within"

---
 src/staff.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/staff.cpp b/src/staff.cpp
index 0dda004e327..bd259c4f08f 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -230,7 +230,7 @@ bool Staff::IsTabWithStemsOutside()
 {
     if (!m_drawingStaffDef) return false;
     // Temporary implementation looking at staffDef@type
-    return (!this->IsTabGuitar() || !m_drawingStaffDef->HasType() || m_drawingStaffDef->GetType() != "within");
+    return (!this->IsTabGuitar() || !m_drawingStaffDef->HasType() || m_drawingStaffDef->GetType() != "stems.within");
 }
 
 int Staff::CalcPitchPosYRel(Doc *doc, int loc)

From 2859c01de299e73dd37ce03a2abfd4b6365cb1f9 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 11:19:17 +0100
Subject: [PATCH 286/403] Add flag to guitar tablature tabDurSym

---
 src/tabdursym.cpp    | 31 +++++++++++++++++++++++++++++++
 src/view_element.cpp |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index 7187e1700e5..ba7e8ce2316 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -131,12 +131,34 @@ int TabDurSym::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
 int TabDurSym::PrepareLayerElementParts(FunctorParams *functorParams)
 {
     Stem *currentStem = dynamic_cast<Stem *>(this->FindDescendantByType(STEM, 1));
+    Flag *currentFlag = NULL;
+    if (currentStem) currentFlag = dynamic_cast<Flag *>(currentStem->GetFirst(FLAG));
 
     if (!currentStem) {
         currentStem = new Stem();
         this->AddChild(currentStem);
     }
     this->SetDrawingStem(currentStem);
+    
+    /************ flags ***********/
+
+    TabGrp *tabGrp = vrv_cast<TabGrp *>(this->GetFirstAncestor(TABGRP));
+    assert(tabGrp);
+
+    // No flag within beam of for durations longer than 8th notes
+    if (!this->IsInBeam() && tabGrp->GetActualDur() > DUR_4) {
+        // We must have a stem at this stage
+        assert(currentStem);
+        if (!currentFlag) {
+            currentFlag = new Flag();
+            currentStem->AddChild(currentFlag);
+        }
+    }
+    // This will happen only if the duration has changed (no flag required anymore)
+    else if (currentFlag) {
+        assert(currentStem);
+        if (currentStem->DeleteChild(currentFlag)) currentFlag = NULL;
+    }
 
     return FUNCTOR_SIBLINGS;
 }
@@ -224,6 +246,15 @@ int TabDurSym::CalcStem(FunctorParams *functorParams)
 
     stem->SetDrawingStemLen(stemSize);
 
+    // Flag currently used only for gitar tablature because it is included in the glyphs for lute tab
+    if (params->m_staff->IsTabGuitar()) {
+        Flag *flag = vrv_cast<Flag *>(stem->GetFirst(FLAG));
+        if (flag) {
+            flag->m_drawingNbFlags = params->m_dur - DUR_4;
+            flag->SetDrawingYRel(-stemSize);
+        }
+    }
+
     // Do not call Stem::CalcStem with TabDurSym because everything is done here
     return FUNCTOR_SIBLINGS;
 }
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 22b1b382328..f8e35a9ca38 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -890,7 +890,7 @@ void View::DrawFlag(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     dc->StartGraphic(element, "", element->GetUuid());
 
     wchar_t code = flag->GetFlagGlyph(stem->GetDrawingStemDir());
-    this->DrawSmuflCode(dc, x, y, code, staff->m_drawingStaffSize, flag->GetDrawingCueSize());
+    this->DrawSmuflCode(dc, x, y, code, staff->GetDrawingStaffNotationSize(), flag->GetDrawingCueSize());
 
     dc->EndGraphic(element, this);
 }

From 33ec6f9eb3967c2475e6bfeef22d0b02b17d3490 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 12:12:26 +0100
Subject: [PATCH 287/403] Adjust dots position relatively to stem (if any)

---
 src/tabdursym.cpp | 4 ++--
 src/view_tab.cpp  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index ba7e8ce2316..311fc599ccf 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -139,7 +139,7 @@ int TabDurSym::PrepareLayerElementParts(FunctorParams *functorParams)
         this->AddChild(currentStem);
     }
     this->SetDrawingStem(currentStem);
-    
+
     /************ flags ***********/
 
     TabGrp *tabGrp = vrv_cast<TabGrp *>(this->GetFirstAncestor(TABGRP));
@@ -228,7 +228,7 @@ int TabDurSym::CalcStem(FunctorParams *functorParams)
         TabGrp *tabGrp = vrv_cast<TabGrp *>(this->GetFirstAncestor(TABGRP));
         assert(tabGrp);
         Note *note = (stemDir == STEMDIRECTION_down) ? tabGrp->GetBottomNote() : tabGrp->GetTopNote();
-        int yRel = (note) ? note->GetDrawingY() : 0;
+        int yRel = (note) ? note->GetDrawingYRel() : 0;
         // Because the tabDurSym is relative to the top or bottom staff line, remove its relative value
         yRel -= this->GetDrawingYRel();
         // Remove a unit for the stem not to go to the center of the note
diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index dd79a68d7f2..0fa638de630 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -17,6 +17,7 @@
 
 #include "devicecontext.h"
 #include "doc.h"
+#include "elementpart.h"
 #include "note.h"
 #include "options.h"
 #include "rend.h"
@@ -193,6 +194,9 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     if (tabGrp->HasDots()) {
         const int stemDirFactor = (tabDurSym->GetDrawingStemDir() == STEMDIRECTION_down) ? -1 : 1;
+        if (tabDurSym->GetDrawingStem()) {
+            y = tabDurSym->GetDrawingStem()->GetDrawingY();
+        }
         y += m_doc->GetDrawingUnit(glyphSize) * 0.5 * stemDirFactor;
         x += m_doc->GetDrawingUnit(glyphSize);
         for (int i = 0; i < tabGrp->GetDots(); ++i) {

From b5d60cf5db56899aefa5839cf0a4af125ffaeec8 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 13:20:20 +0100
Subject: [PATCH 288/403] Changing dynamic_cast to vrv_cast

---
 src/tabdursym.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index 311fc599ccf..a9df42f779b 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -130,9 +130,9 @@ int TabDurSym::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
 
 int TabDurSym::PrepareLayerElementParts(FunctorParams *functorParams)
 {
-    Stem *currentStem = dynamic_cast<Stem *>(this->FindDescendantByType(STEM, 1));
+    Stem *currentStem = vrv_cast<Stem *>(this->FindDescendantByType(STEM, 1));
     Flag *currentFlag = NULL;
-    if (currentStem) currentFlag = dynamic_cast<Flag *>(currentStem->GetFirst(FLAG));
+    if (currentStem) currentFlag = vrv_cast<Flag *>(currentStem->GetFirst(FLAG));
 
     if (!currentStem) {
         currentStem = new Stem();

From 82a3b1151b94e67ddaf619dcf7ed349b6f9362cf Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 4 Feb 2022 16:35:56 +0200
Subject: [PATCH 289/403] Remove option to exclude ranges of SMUFL glyphs based
 on the JSON file

---
 data/fontmetadata.json.template | 209 --------------------------------
 src/vrv.cpp                     |  51 +-------
 2 files changed, 1 insertion(+), 259 deletions(-)
 delete mode 100644 data/fontmetadata.json.template

diff --git a/data/fontmetadata.json.template b/data/fontmetadata.json.template
deleted file mode 100644
index 5fc29d1920d..00000000000
--- a/data/fontmetadata.json.template
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-	"glyphRanges" : [
-	{
-		"rangeName" : "Staff brackets and dividers",
-		"rangeStart" : "E000",
-		"rangeEnd" : "E004"
-	},
-	{
-		"rangeName" : "Repeats",
-		"rangeStart" : "E043",
-		"rangeEnd" : "E04B"
-	},
-	{
-		"rangeName" : "Clefs",
-		"rangeStart" : "E050",
-		"rangeEnd" : "E077"
-	},
-	{
-		"rangeName" : "Time signatures",
-		"rangeStart" : "E080",
-		"rangeEnd" : "E095"
-	},
-	{
-		"rangeName" : "Noteheads",
-		"rangeStart" : "E0A0",
-		"rangeEnd" : "E0FA"
-	},
-	{
-		"rangeName" : "Slash noteheads",
-		"rangeStart" : "E101",
-		"rangeEnd" : "E103"
-	},
-	{
-		"rangeName" : "Tremolos",
-		"rangeStart" : "E220",
-		"rangeEnd" : "E22A"
-	},
-	{
-		"rangeName" : "Flags",
-		"rangeStart" : "E240",
-		"rangeEnd" : "E24F"
-	},
-	{
-		"rangeName" : "Standard accidentals (12-EDO)",
-		"rangeStart" : "E260",
-		"rangeEnd" : "E26D"
-	},
-	{
-		"rangeName" : "Gould arrow quartertone accidentals (24-EDO)",
-		"rangeStart" : "E270",
-		"rangeEnd" : "E275"
-	},
-	{
-		"rangeName" : "Stein-Zimmermann accidentals (24-EDO)",
-		"rangeStart" : "E280",
-		"rangeEnd" : "E283"
-	},
-	{
-		"rangeName" : "Arel-Ezgi-Uzdilek (AEU) accidentals",
-		"rangeStart" : "E440",
-		"rangeEnd" : "E447"
-	},
-	{
-		"rangeName" : "Articulation",
-		"rangeStart" : "E4A0",
-		"rangeEnd" : "E4BD"
-	},
-	{
-		"rangeName" : "Holds and pauses",
-		"rangeStart" : "E4C0",
-		"rangeEnd" : "E4CE"
-	},
-	{
-		"rangeName" : "Rests",
-		"rangeStart" : "E4E0",
-		"rangeEnd" : "E4F6"
-	},
-	{
-		"rangeName" : "Bar repeats",
-		"rangeStart" : "E500",
-		"rangeEnd" : "E505"
-	},
-	{
-		"rangeName" : "Octaves",
-		"rangeStart" : "E510",
-		"rangeEnd" : "E51E"
-	},
-	{
-		"rangeName" : "Dynamics",
-		"rangeStart" : "E520",
-		"rangeEnd" : "E53D"
-	},
-	{
-		"rangeName" : "Common ornaments",
-		"rangeStart" : "E566",
-		"rangeEnd" : "E56F"
-	},
-	{
-		"rangeName" : "Other baroque ornaments",
-		"rangeStart" : "E583",
-		"rangeEnd" : "E587"
-	},
-	{
-		"rangeName" : "Combining strokes for trills and mordents",
-		"rangeStart" : "E59D",
-		"rangeEnd" : "E59E"
-	},
-	{
-		"rangeName" : "Precomposed trills and mordents",
-		"rangeStart" : "E5B0",
-		"rangeEnd" : "E5C8"
-	},
-	{
-		"rangeName" : "Brass techniques",
-		"rangeStart" : "E5E5",
-		"rangeEnd" : "E5E7"
-	},
-	{
-		"rangeName" : "String techniques",
-		"rangeStart" : "E610",
-		"rangeEnd" : "E614"
-	},
-	{
-		"rangeName" : "Plucked techniques",
-		"rangeStart" : "E630",
-		"rangeEnd" : "E638"
-	},
-	{
-		"rangeName" : "Vocal techniques",
-		"rangeStart" : "E645",
-		"rangeEnd" : "E645"
-	},
-	{
-		"rangeName" : "Keyboard techniques",
-		"rangeStart" : "E650",
-		"rangeEnd" : "E65A"
-	},
-	{
-		"rangeName" : "Tuplets",
-		"rangeStart" : "E880",
-		"rangeEnd" : "E88A"
-	},
-	{
-		"rangeName" : "Medieval and Renaissance clefs",
-		"rangeStart" : "E901",
-		"rangeEnd" : "E909"
-	},
-	{
-		"rangeName" : "Medieval and Renaissance prolations",
-		"rangeStart" : "E910",
-		"rangeEnd" : "E925"
-	},
-	{
-		"rangeName" : "Medieval and Renaissance noteheads and stems",
-		"rangeStart" : "E938",
-		"rangeEnd" : "E94C"
-	},
-	{
-		"rangeName" : "Medieval and Renaissance plainchant single-note forms",
-		"rangeStart" : "E990",
-		"rangeEnd" : "E99F"
-	},
-	{
-		"rangeName" : "Medieval and Renaissance plainchant multiple-note forms",
-		"rangeStart" : "E9B4",
-		"rangeEnd" : "E9BC"
-	},
-	{
-		"rangeName" : "Medieval and Renaissance accidentals",
-		"rangeStart" : "E9E0",
-		"rangeEnd" : "E9E3"
-	},
-	{
-		"rangeName" : "Medieval and Renaissance rests",
-		"rangeStart" : "E9F0",
-		"rangeEnd" : "E9F8"
-	},
-	{
-		"rangeName" : "Medieval and Renaissance miscellany",
-		"rangeStart" : "EA02",
-		"rangeEnd" : "EA06"
-	},
-	{
-		"rangeName" : "Multi-segment lines",
-		"rangeStart" : "EAA4",
-		"rangeEnd" : "EAAF"
-	},
-	{
-		"rangeName" : "Renaissance lute tablature",
-		"rangeStart" : "EBA7",
-		"rangeEnd" : "EBAC"
-	},
-	{
-		"rangeName" : "French and English Renaissance lute tablature",
-		"rangeStart" : "EBC0",
-		"rangeEnd" : "EBCC"
-	},
-	{
-		"rangeName" : "Italian and Spanish Renaissance lute tablature",
-		"rangeStart" : "EBE0",
-		"rangeEnd" : "EBE9"
-	},
-	{
-		"rangeName" : "Articulation supplement",
-		"rangeStart" : "ED40",
-		"rangeEnd" : "ED41"
-	}
-	]
-}
\ No newline at end of file
diff --git a/src/vrv.cpp b/src/vrv.cpp
index 0fb5a46f35e..ac08f47a969 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -46,7 +46,6 @@
 //----------------------------------------------------------------------------
 
 #include "checked.h"
-#include "jsonxx.h"
 #include "pugixml.hpp"
 #include "unchecked.h"
 
@@ -134,45 +133,6 @@ wchar_t Resources::GetGlyphCode(const std::string &smuflName)
     return s_glyphNameTable.count(smuflName) ? s_glyphNameTable.at(smuflName) : 0;
 }
 
-std::map<wchar_t, wchar_t> Resources::GetGlyphRanges()
-{
-    constexpr std::string_view input = "fontmetadata.json";
-    constexpr std::string_view glyphRanges = "glyphRanges";
-    constexpr std::string_view rangeStart = "rangeStart";
-    constexpr std::string_view rangeEnd = "rangeEnd";
-
-    jsonxx::Object content;
-    // Input is file path
-    std::ifstream in(Resources::GetPath() + "/" + input.data());
-    if (!in.is_open()) {
-        return {};
-    }
-    const bool parseResult = content.parse(in);
-    in.close();
-    if (!parseResult) return {};
-
-    if (content.kv_map().empty() || !content.kv_map().count(glyphRanges.data())
-        || !content.kv_map().at(glyphRanges.data())->is<jsonxx::Array>())
-        return {};
-
-    const jsonxx::Array jsonRanges = content.kv_map().at(glyphRanges.data())->get<jsonxx::Array>();
-    std::map<wchar_t, wchar_t> result;
-    for (const auto element : jsonRanges.values()) {
-        if (!element->is<jsonxx::Object>()) continue;
-
-        auto range = element->get<jsonxx::Object>().kv_map();
-        if (!range.count(rangeStart.data()) || !range.at(rangeStart.data())->is<jsonxx::String>()) continue;
-        if (!range.count(rangeEnd.data()) || !range.at(rangeEnd.data())->is<jsonxx::String>()) continue;
-
-        const wchar_t start = (wchar_t)strtol(range.at(rangeStart.data())->get<jsonxx::String>().c_str(), NULL, 16);
-        const wchar_t end = (wchar_t)strtol(range.at(rangeEnd.data())->get<jsonxx::String>().c_str(), NULL, 16);
-
-        result[start] = end;
-    }
-
-    return result;
-}
-
 void Resources::SelectTextFont(data_FONTWEIGHT fontWeight, data_FONTSTYLE fontStyle)
 {
     if (fontWeight == FONTWEIGHT_NONE) {
@@ -222,21 +182,11 @@ bool Resources::LoadFont(const std::string &fontName)
 
     const int unitsPerEm = atoi(root.attribute("units-per-em").value());
 
-    const std::map<wchar_t, wchar_t> ranges = GetGlyphRanges();
     for (pugi::xml_node current = root.child("g"); current; current = current.next_sibling("g")) {
         pugi::xml_attribute c_attribute = current.attribute("c");
         pugi::xml_attribute n_attribute = current.attribute("n");
         if (!c_attribute || !n_attribute) continue;
 
-        const wchar_t smuflCode = (wchar_t)strtol(c_attribute.value(), NULL, 16);
-        if (!ranges.empty()) {
-            const auto it
-                = std::find_if(ranges.begin(), ranges.end(), [smuflCode](const std::pair<wchar_t, wchar_t> &keyValue) {
-                      return (smuflCode >= keyValue.first) && (smuflCode <= keyValue.second);
-                  });
-            if (it == ranges.end()) continue;
-        }
-
         Glyph glyph;
         glyph.SetUnitsPerEm(unitsPerEm * 10);
         glyph.SetCodeStr(c_attribute.value());
@@ -259,6 +209,7 @@ bool Resources::LoadFont(const std::string &fontName)
             }
         }
 
+        const wchar_t smuflCode = (wchar_t)strtol(c_attribute.value(), NULL, 16);
         s_fontGlyphTable[smuflCode] = glyph;
         s_glyphNameTable[n_attribute.value()] = smuflCode;
     }

From 980e2a4c2d011cb6495160689935149d2859571b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 16:04:54 +0100
Subject: [PATCH 290/403] Adjust meter sig rendering for tablature to use staff
 notation size (smaller)

---
 src/view_element.cpp | 26 +++++++++++++++-----------
 src/view_page.cpp    |  9 ++++++---
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/view_element.cpp b/src/view_element.cpp
index f8e35a9ca38..9590344d0fb 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -1073,16 +1073,18 @@ void View::DrawMeterSig(DeviceContext *dc, MeterSig *meterSig, Staff *staff, int
 
     int y = staff->GetDrawingY() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - 1);
     int x = meterSig->GetDrawingX() + horizOffset;
+    
+    const int glyphSize = staff->GetDrawingStaffNotationSize();
 
     if (enclosingFront) {
-        this->DrawSmuflCode(dc, x, y, enclosingFront, staff->m_drawingStaffSize, false);
-        x += m_doc->GetGlyphWidth(enclosingFront, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, x, y, enclosingFront, glyphSize, false);
+        x += m_doc->GetGlyphWidth(enclosingFront, glyphSize, false);
     }
 
     if (meterSig->HasSym()) {
         const wchar_t code = meterSig->GetSymbolGlyph();
-        this->DrawSmuflCode(dc, x, y, code, staff->m_drawingStaffSize, false);
-        x += m_doc->GetGlyphWidth(code, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, x, y, code, glyphSize, false);
+        x += m_doc->GetGlyphWidth(code, glyphSize, false);
     }
     else if (meterSig->GetForm() == METERFORM_num) {
         x += this->DrawMeterSigFigures(dc, x, y, meterSig->GetCount(), 0, staff);
@@ -1092,7 +1094,7 @@ void View::DrawMeterSig(DeviceContext *dc, MeterSig *meterSig, Staff *staff, int
     }
 
     if (enclosingBack) {
-        this->DrawSmuflCode(dc, x, y, enclosingBack, staff->m_drawingStaffSize, false);
+        this->DrawSmuflCode(dc, x, y, enclosingBack, glyphSize, false);
     }
 
     dc->EndGraphic(meterSig, this);
@@ -1773,8 +1775,10 @@ int View::DrawMeterSigFigures(
         timeSigCombNumerator += IntToTimeSigFigures(summand);
     }
     if (den) timeSigCombDenominator = IntToTimeSigFigures(den);
+    
+    const int glyphSize = staff->GetDrawingStaffNotationSize();
 
-    dc->SetFont(m_doc->GetDrawingSmuflFont(staff->m_drawingStaffSize, false));
+    dc->SetFont(m_doc->GetDrawingSmuflFont(glyphSize, false));
 
     std::wstring widthText = (timeSigCombNumerator.length() > timeSigCombDenominator.length()) ? timeSigCombNumerator
                                                                                                : timeSigCombDenominator;
@@ -1785,8 +1789,8 @@ int View::DrawMeterSigFigures(
     x += width / 2;
 
     if (den) {
-        int yNum = y + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-        int yDen = y - m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+        int yNum = y + m_doc->GetDrawingDoubleUnit(glyphSize);
+        int yDen = y - m_doc->GetDrawingDoubleUnit(glyphSize);
         // In case when one of the handwritten fonts is used, we need to make sure that meterSig is displayed properly
         // for it, based on the height of corresponding glyphs
         FontInfo *fontInfo = dc->GetFont();
@@ -1801,12 +1805,12 @@ int View::DrawMeterSigFigures(
             dc->GetSmuflTextExtent(timeSigCombDenominator, &denExtend);
             yDen = y - denExtend.m_height / 2;
         }
-        this->DrawSmuflString(dc, x, yNum, timeSigCombNumerator, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
+        this->DrawSmuflString(dc, x, yNum, timeSigCombNumerator, HORIZONTALALIGNMENT_center, glyphSize);
         this->DrawSmuflString(
-            dc, x, yDen, timeSigCombDenominator, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
+            dc, x, yDen, timeSigCombDenominator, HORIZONTALALIGNMENT_center, glyphSize);
     }
     else {
-        this->DrawSmuflString(dc, x, y, timeSigCombNumerator, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
+        this->DrawSmuflString(dc, x, y, timeSigCombNumerator, HORIZONTALALIGNMENT_center, glyphSize);
     }
 
     dc->ResetFont();
diff --git a/src/view_page.cpp b/src/view_page.cpp
index 11092f6d229..e31e1c8c8f8 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -1052,7 +1052,10 @@ void View::DrawMeterSigGrp(DeviceContext *dc, Layer *layer, Staff *staff)
 
     MeterSigGrp *meterSigGrp = layer->GetStaffDefMeterSigGrp();
     const ArrayOfObjects *childList = meterSigGrp->GetList(meterSigGrp);
-    const int unit = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+    
+    const int glyphSize = staff->GetDrawingStaffNotationSize();
+    
+    const int unit = m_doc->GetDrawingUnit(glyphSize);
     int offset = 0;
     dc->StartGraphic(meterSigGrp, "", meterSigGrp->GetUuid());
     // Draw meterSigGrp by alternating meterSig and plus sign (when required)
@@ -1070,8 +1073,8 @@ void View::DrawMeterSigGrp(DeviceContext *dc, Layer *layer, Staff *staff)
         if ((meterSigGrp->GetFunc() == meterSigGrpLog_FUNC_mixed) && (iter != std::prev(childList->end()))) {
             // draw plus sign here
             const int plusX = x + width + unit / 2;
-            this->DrawSmuflCode(dc, plusX, y, SMUFL_E08C_timeSigPlus, staff->m_drawingStaffSize, false);
-            offset += width + unit + m_doc->GetGlyphWidth(SMUFL_E08C_timeSigPlus, staff->m_drawingStaffSize, false);
+            this->DrawSmuflCode(dc, plusX, y, SMUFL_E08C_timeSigPlus, glyphSize, false);
+            offset += width + unit + m_doc->GetGlyphWidth(SMUFL_E08C_timeSigPlus, glyphSize, false);
         }
         else {
             offset += width + unit;

From 4d4c44e4640f13f28446fd505c9d90bff29e4dfa Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 4 Feb 2022 17:14:24 +0200
Subject: [PATCH 291/403] Minor fixes

- added missed call to CreateHeader()
- move creation of phHead element before scoreDef gets populated
- add F: element as annot to work list
---
 src/ioabc.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 4bfd2a1e269..327e5a94587 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -99,7 +99,7 @@ bool ABCInput::Import(const std::string &abc)
 // parseABC --
 //
 
-void ABCInput::ParseABC(std::istream &infile) 
+void ABCInput::ParseABC(std::istream &infile)
 {
     // initialize doc
     m_doc->Reset();
@@ -107,6 +107,7 @@ void ABCInput::ParseABC(std::istream &infile)
 
     Score *score = NULL;
     Section *section = NULL;
+    CreateHeader();
     while (!infile.eof()) {
         std::getline(infile, abcLine);
         ++m_lineNum;
@@ -902,7 +903,6 @@ void ABCInput::FlushControlElements(Score *score, Section *section)
     m_controlElements.clear();
 }
 
-
 void ABCInput::InitScoreAndSection(Score *&score, Section *&section)
 {
     // create score
@@ -925,13 +925,13 @@ void ABCInput::InitScoreAndSection(Score *&score, Section *&section)
         m_meter = NULL;
     }
     staffGrp->AddChild(staffDef);
+    // create page head
+    this->PrintInformationFields(score);
     score->GetScoreDef()->AddChild(staffGrp);
     if (m_key) {
         score->GetScoreDef()->AddChild(m_key);
         m_key = NULL;
     }
-    // create page head
-    this->PrintInformationFields(score);
 
     // create section
     section = new Section();
@@ -982,7 +982,7 @@ void ABCInput::readInformationField(const char &dataKey, std::string value)
         case 'B': m_info.push_back(std::make_pair(std::make_pair(value, m_lineNum), dataKey)); break;
         case 'C': m_composer.push_back(std::make_pair(value, m_lineNum)); break;
         case 'D': m_info.push_back(std::make_pair(std::make_pair(value, m_lineNum), dataKey)); break;
-        case 'F': m_filename = value; break;
+        case 'F': m_info.push_back(std::make_pair(std::make_pair(value, m_lineNum), dataKey)); break;
         case 'H': m_history.push_back(std::make_pair(value, m_lineNum)); break;
         case 'I': parseInstruction(value); break;
         case 'K': parseKey(value); break;

From b0508de907a02b03a9ca4f853cd8c78116985851 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 16:38:36 +0100
Subject: [PATCH 292/403] Rename method for clarification

---
 include/vrv/drawinginterface.h | 2 +-
 src/drawinginterface.cpp       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index ee2bb913d06..c47eaf991df 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -155,7 +155,7 @@ class BeamDrawingInterface : public ObjectListInterface {
      * Determines whether beam should be horizontal based on item positions and relative beam place. Should be used with
      * mixed beams, where beam place can be different for separate elements
      */
-    bool IsHorizontal(const std::vector<int> &items, const std::vector<data_BEAMPLACE> &directions) const;
+    bool IsHorizontalMixedBeam(const std::vector<int> &items, const std::vector<data_BEAMPLACE> &directions) const;
 
 public:
     // values to be set before calling CalcBeam
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index abbde4c5cd5..253d29c722c 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -299,7 +299,7 @@ bool BeamDrawingInterface::IsHorizontal()
     if (first == last) return true;
 
     // If drawing place is mixed and is should be drawn horizontal based on mixed rules
-    if ((m_drawingPlace == BEAMPLACE_mixed) && (IsHorizontal(items, directions))) return true;
+    if ((m_drawingPlace == BEAMPLACE_mixed) && (this->IsHorizontalMixedBeam(items, directions))) return true;
 
     // Detect beam with two pitches only and as step at the beginning or at the end
     const bool firstStep = (first != items.at(1));
@@ -335,7 +335,7 @@ bool BeamDrawingInterface::IsHorizontal()
     return false;
 }
 
-bool BeamDrawingInterface::IsHorizontal(
+bool BeamDrawingInterface::IsHorizontalMixedBeam(
     const std::vector<int> &items, const std::vector<data_BEAMPLACE> &directions) const
 {
     // items and directions should be of the same size, otherwise something is wrong

From bd0190c1068ee00a773ceb1b5350d43f093f9627 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 16:39:07 +0100
Subject: [PATCH 293/403] Remove enum and use data_STEMDIRECTION instead

---
 src/drawinginterface.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 253d29c722c..5bc3c1bf8ff 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -21,13 +21,11 @@
 
 namespace vrv {
 
-enum class NoteDirection { none, upward, downward };
-
 // helper for determining note direction
-NoteDirection GetNoteDirection(int leftNoteX, int rightNoteX)
+data_STEMDIRECTION GetNoteDirection(int leftNoteY, int rightNoteY)
 {
-    if (leftNoteX == rightNoteX) return NoteDirection::none;
-    return (leftNoteX < rightNoteX) ? NoteDirection::upward : NoteDirection::downward;
+    if (leftNoteY == rightNoteY) return STEMDIRECTION_NONE;
+    return (leftNoteY < rightNoteY) ? STEMDIRECTION_up : STEMDIRECTION_down;
 }
 
 //----------------------------------------------------------------------------
@@ -359,10 +357,10 @@ bool BeamDrawingInterface::IsHorizontalMixedBeam(
 
     int previousTop = VRV_UNSET;
     int previousBottom = VRV_UNSET;
-    NoteDirection outsidePitchDirection = GetNoteDirection(items.front(), items.back());
-    std::map<NoteDirection, int> beamDirections{ { NoteDirection::none, 0 }, { NoteDirection::upward, 0 },
-        { NoteDirection::downward, 0 } };
-    for (int i = 0; i < items.size(); ++i) {
+    data_STEMDIRECTION outsidePitchDirection = GetNoteDirection(items.front(), items.back());
+    std::map<data_STEMDIRECTION, int> beamDirections{ { STEMDIRECTION_NONE, 0 }, { STEMDIRECTION_up, 0 },
+        { STEMDIRECTION_down, 0 } };
+    for (int i = 0; i < (int)items.size(); ++i) {
         if (directions[i] == BEAMPLACE_above) {
             if (previousTop == VRV_UNSET) {
                 previousTop = items[i];

From bf00a933b6fcf73b795eadd241f21a47236ce291 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 16:39:24 +0100
Subject: [PATCH 294/403] Use unused variable

---
 src/beam.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 270de29f02f..140e6d585a8 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1172,7 +1172,7 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
         if ((coord->m_dur > minDuration)
             && ((coord->m_closestNote->GetDrawingLoc() == relevantNoteLoc)
                 || (!isHorizontal && (std::abs(m_uniformStemLength) < 13)))) {
-            m_uniformStemLength = coord->CalculateStemLength(staff, stemDir, isHorizontal);
+            m_uniformStemLength = coordStemLength;
             minDuration = coord->m_dur;
         }
     }

From 4c296eaef772305b1f4c532007e924f96bb1da7b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 16:39:50 +0100
Subject: [PATCH 295/403] Formatting

---
 include/vrv/beam.h      | 3 +--
 src/verticalaligner.cpp | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index b9cd5515e03..d3b37f224b5 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -227,13 +227,12 @@ class Beam : public LayerElement,
     Beam *GetStemSameasBeam() const { return m_stemSameas; }
     void SetStemSameasBeam(Beam *stemSameas) { m_stemSameas = stemSameas; }
     ///@}
-	
+
     /**
      * See DrawingInterface::GetAdditionalBeamCount
      */
     std::pair<int, int> GetAdditionalBeamCount() const override;
 
-
     //----------//
     // Functors //
     //----------//
diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index 8fd9596c49f..776c9d962dd 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -510,7 +510,6 @@ int StaffAlignment::CalcMinimumRequiredSpacing(const Doc *doc) const
         overflowSum += adjust;
     }
 
-
     BoundingBox *previous = prevAlignment->GetOverflowBBoxBelow();
     BoundingBox *current = this->GetOverflowBBoxAbove();
     if (previous && current) {

From 57bfee0e5cc3f5d07f0fbfac1c2f9408caa6e6d2 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 17:46:56 +0100
Subject: [PATCH 296/403] Add missing getter for the BeamDrawingInterface

---
 include/vrv/beam.h   | 7 +++++++
 include/vrv/ftrem.h  | 7 +++++++
 include/vrv/object.h | 1 +
 3 files changed, 15 insertions(+)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index d3b37f224b5..8d7414466c5 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -199,6 +199,13 @@ class Beam : public LayerElement,
     std::string GetClassName() const override { return "Beam"; }
     ///@}
 
+    /**
+     * @name Getter to interfaces
+     */
+    ///@{
+    BeamDrawingInterface *GetBeamDrawingInterface() override { return dynamic_cast<BeamDrawingInterface *>(this); }
+    ///@}
+
     int GetNoteCount() const { return this->GetChildCount(NOTE); }
 
     /**
diff --git a/include/vrv/ftrem.h b/include/vrv/ftrem.h
index 09afc584362..262b11b637a 100644
--- a/include/vrv/ftrem.h
+++ b/include/vrv/ftrem.h
@@ -36,6 +36,13 @@ class FTrem : public LayerElement, public BeamDrawingInterface, public AttFTremV
     std::string GetClassName() const override { return "FTrem"; }
     ///@}
 
+    /**
+     * @name Getter to interfaces
+     */
+    ///@{
+    BeamDrawingInterface *GetBeamDrawingInterface() override { return dynamic_cast<BeamDrawingInterface *>(this); }
+    ///@}
+
     /**
      * Add an element (a note or a chord) to a fTrem.
      * Only Note or Chord elements will be actually added to the fTrem.
diff --git a/include/vrv/object.h b/include/vrv/object.h
index eb4c6a656b1..54df51fbb22 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -120,6 +120,7 @@ class Object : public BoundingBox {
     }
     ///@}
 
+    virtual BeamDrawingInterface *GetBeamDrawingInterface() { return NULL; }
     virtual DurationInterface *GetDurationInterface() { return NULL; }
     virtual LinkingInterface *GetLinkingInterface() { return NULL; }
     virtual FacsimileInterface *GetFacsimileInterface() { return NULL; }

From ecd0336c6f2c6a92de54d046167b427717403068 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 17:52:35 +0100
Subject: [PATCH 297/403] Move LayerElement::GetBeamChildOverflow to
 BeamInterface

---
 include/vrv/drawinginterface.h |  6 ++++++
 include/vrv/layerelement.h     |  6 ------
 src/drawinginterface.cpp       | 15 +++++++++++++++
 src/layerelement.cpp           | 18 ++----------------
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index c47eaf991df..5d90372c423 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -141,6 +141,11 @@ class BeamDrawingInterface : public ObjectListInterface {
      * Helper to get number of beams represented by attributes @beam and @beam.float
      */
     virtual std::pair<int, int> GetFloatingBeamCount() const { return { 0, 0 }; }
+    
+    /**
+     * Get above/below overflow for the children
+     */
+    void GetBeamChildOverflow(StaffAlignment *&above, StaffAlignment *&below);
 
 protected:
     /**
@@ -149,6 +154,7 @@ class BeamDrawingInterface : public ObjectListInterface {
      */
     int GetPosition(Object *object, LayerElement *element);
 
+    
     //
 private:
     /**
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index adb2065151c..3f3dddf7318 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -472,12 +472,6 @@ class LayerElement : public Object,
      */
     template <class BeamType> void GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below);
 
-    /**
-     * Template for getting above/below overflow for children of BeamType elements (BEAM or FTREM)
-     */
-    template <class BeamType>
-    void GetBeamChildOverflow(StaffAlignment *&above, StaffAlignment *&below, BeamType *parent);
-
     /**
      * Get above/below overflow for the chord elements
      */
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 5bc3c1bf8ff..dbdce16c27a 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -18,6 +18,7 @@
 #include "layerelement.h"
 #include "note.h"
 #include "object.h"
+#include "staff.h"
 
 namespace vrv {
 
@@ -500,6 +501,20 @@ int BeamDrawingInterface::GetPosition(Object *object, LayerElement *element)
     return position;
 }
 
+void BeamDrawingInterface::GetBeamChildOverflow(StaffAlignment *&above, StaffAlignment *&below)
+{
+    if (m_beamStaff && m_crossStaffContent) {
+        if (m_crossStaffRel == STAFFREL_basic_above) {
+            above = m_crossStaffContent->GetAlignment();
+            below = m_beamStaff->GetAlignment();
+        }
+        else {
+            above = m_beamStaff->GetAlignment();
+            below = m_crossStaffContent->GetAlignment();
+        }
+    }
+}
+
 //----------------------------------------------------------------------------
 // StaffDefDrawingInterface
 //----------------------------------------------------------------------------
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 2efeddcb82a..44e852e8113 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -297,11 +297,11 @@ void LayerElement::GetOverflowStaffAlignments(StaffAlignment *&above, StaffAlign
     if (this->Is({ ARTIC, STEM })) {
         if (this->GetFirstAncestor(BEAM)) {
             Beam *beam = vrv_cast<Beam *>(this->GetFirstAncestor(BEAM));
-            this->GetBeamChildOverflow<Beam>(above, below, beam);
+            if (!beam->m_crossStaff) beam->GetBeamChildOverflow(above, below);
         }
         else if (this->GetFirstAncestor(FTREM)) {
             FTrem *fTrem = vrv_cast<FTrem *>(this->GetFirstAncestor(FTREM));
-            this->GetBeamChildOverflow<FTrem>(above, below, fTrem);
+            if (!fTrem->m_crossStaff) fTrem->GetBeamChildOverflow(above, below);
         }
     }
     // Beams in cross-staff situation need special treatment
@@ -348,20 +348,6 @@ template <class BeamType> void LayerElement::GetBeamOverflow(StaffAlignment *&ab
         }
     }
 }
-
-template <class BeamType>
-void LayerElement::GetBeamChildOverflow(StaffAlignment *&above, StaffAlignment *&below, BeamType *parent)
-{
-    if (parent && parent->m_crossStaffContent && !parent->m_crossStaff) {
-        data_STAFFREL_basic direction = parent->m_crossStaffRel;
-        if (direction == STAFFREL_basic_above) {
-            above = parent->m_crossStaffContent->GetAlignment();
-            below = parent->m_beamStaff->GetAlignment();
-        }
-        else {
-            above = parent->m_beamStaff->GetAlignment();
-            below = parent->m_crossStaffContent->GetAlignment();
-        }
     }
 }
 

From e70670fc1a17da99f5e148fec9c75f1154e5d841 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 17:53:10 +0100
Subject: [PATCH 298/403] Move LayerElement::GetBeamOverflow to
 BeamDrawingInterface

---
 include/vrv/drawinginterface.h |  5 ++++
 include/vrv/layerelement.h     |  5 ----
 src/drawinginterface.cpp       | 31 ++++++++++++++++++++++
 src/layerelement.cpp           | 47 +++-------------------------------
 4 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index 5d90372c423..7693e5a7a9c 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -142,6 +142,11 @@ class BeamDrawingInterface : public ObjectListInterface {
      */
     virtual std::pair<int, int> GetFloatingBeamCount() const { return { 0, 0 }; }
     
+    /**
+     * Get above/below overflow
+     */
+    void GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below);
+    
     /**
      * Get above/below overflow for the children
      */
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 3f3dddf7318..a25ac42d67e 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -467,11 +467,6 @@ class LayerElement : public Object,
 private:
     int GetDrawingArticulationTopOrBottom(data_STAFFREL place, ArticType type);
 
-    /**
-     * Template for getting above/below overflow for BeamType elements (BEAM or FTREM)
-     */
-    template <class BeamType> void GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below);
-
     /**
      * Get above/below overflow for the chord elements
      */
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index dbdce16c27a..12e4029ee34 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -501,6 +501,37 @@ int BeamDrawingInterface::GetPosition(Object *object, LayerElement *element)
     return position;
 }
 
+void BeamDrawingInterface::GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below)
+{
+
+    if (!m_beamStaff || !m_crossStaffContent) return;
+
+    if (m_drawingPlace == BEAMPLACE_mixed) {
+        above = NULL;
+        below = NULL;
+    }
+    // Beam below - ignore above and find the appropriate below staff
+    else if (m_drawingPlace == BEAMPLACE_below) {
+        above = NULL;
+        if (m_crossStaffRel == STAFFREL_basic_above) {
+            below = m_beamStaff->GetAlignment();
+        }
+        else {
+            below = m_crossStaffContent->GetAlignment();
+        }
+    }
+    // Beam above - ignore below and find the appropriate above staff
+    else if (m_drawingPlace == BEAMPLACE_above) {
+        below = NULL;
+        if (m_crossStaffRel == STAFFREL_basic_below) {
+            above = m_beamStaff->GetAlignment();
+        }
+        else {
+            above = m_crossStaffContent->GetAlignment();
+        }
+    }
+}
+
 void BeamDrawingInterface::GetBeamChildOverflow(StaffAlignment *&above, StaffAlignment *&below)
 {
     if (m_beamStaff && m_crossStaffContent) {
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 44e852e8113..2b990f54fd2 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -305,49 +305,10 @@ void LayerElement::GetOverflowStaffAlignments(StaffAlignment *&above, StaffAlign
         }
     }
     // Beams in cross-staff situation need special treatment
-    else if (this->Is(BEAM)) {
-        this->GetBeamOverflow<Beam>(above, below);
-    }
-    else if (this->Is(FTREM)) {
-        this->GetBeamOverflow<FTrem>(above, below);
-    }
-}
-
-template <class BeamType> void LayerElement::GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below)
-{
-    if (!this->Is({ BEAM, FTREM })) return;
-
-    BeamType *beam = vrv_cast<BeamType *>(this);
-    assert(beam);
-    // Beam between the staves - ignore both above and below
-    if (!beam->m_crossStaffContent || beam->m_crossStaff) return;
-
-    data_STAFFREL_basic direction = beam->m_crossStaffRel;
-    if (beam->m_drawingPlace == BEAMPLACE_mixed) {
-        above = NULL;
-        below = NULL;
-    }
-    // Beam below - ignore above and find the appropriate below staff
-    else if (beam->m_drawingPlace == BEAMPLACE_below) {
-        above = NULL;
-        if (direction == STAFFREL_basic_above) {
-            below = beam->m_beamStaff->GetAlignment();
-        }
-        else {
-            below = beam->m_crossStaffContent->GetAlignment();
-        }
-    }
-    // Beam above - ignore below and find the appropriate above staff
-    else if (beam->m_drawingPlace == BEAMPLACE_above) {
-        below = NULL;
-        if (direction == STAFFREL_basic_below) {
-            above = beam->m_beamStaff->GetAlignment();
-        }
-        else {
-            above = beam->m_crossStaffContent->GetAlignment();
-        }
-    }
-}
+    else if (this->Is({ BEAM, FTREM }) && !m_crossStaff) {
+        BeamDrawingInterface *interface = this->GetBeamDrawingInterface();
+        assert(interface);
+        interface->GetBeamOverflow(above, below);
     }
 }
 

From f6219986102824a4871ee7bc8d88ee309bdc0d34 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 17:53:51 +0100
Subject: [PATCH 299/403] Formatting

---
 include/vrv/drawinginterface.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index 7693e5a7a9c..b591f65e725 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -141,12 +141,12 @@ class BeamDrawingInterface : public ObjectListInterface {
      * Helper to get number of beams represented by attributes @beam and @beam.float
      */
     virtual std::pair<int, int> GetFloatingBeamCount() const { return { 0, 0 }; }
-    
+
     /**
      * Get above/below overflow
      */
     void GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below);
-    
+
     /**
      * Get above/below overflow for the children
      */
@@ -159,7 +159,6 @@ class BeamDrawingInterface : public ObjectListInterface {
      */
     int GetPosition(Object *object, LayerElement *element);
 
-    
     //
 private:
     /**

From f945c71c9c2e66fb696e111b0cf306f6f3d4476c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 4 Feb 2022 17:56:02 +0100
Subject: [PATCH 300/403] Remove empty line

---
 src/drawinginterface.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 12e4029ee34..e3e1108117c 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -503,7 +503,6 @@ int BeamDrawingInterface::GetPosition(Object *object, LayerElement *element)
 
 void BeamDrawingInterface::GetBeamOverflow(StaffAlignment *&above, StaffAlignment *&below)
 {
-
     if (!m_beamStaff || !m_crossStaffContent) return;
 
     if (m_drawingPlace == BEAMPLACE_mixed) {

From 654fb5fa74d6652bae2bd30f36a7b1e98cb4082c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 7 Feb 2022 15:40:27 +0100
Subject: [PATCH 301/403] Update changelog [skip-ci]

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63f706f0510..17afede4864 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,9 @@
 * Support for `@stem.sameas` on notes for orchestra scores
 * Support for MIDI output of arpeggios (@eNote-GmBH)
 * Support for tuplets in ABC importer (@eNote-GmBH)
+* Improved double stemmed beams (@eNote-GmBH)
 * Improved tablature MIDI output (@paul-bayleaf)
+* Improved PAE importer (nested beams, mensural dots, stemless notes)
 * Additional parameters to the redoLayout method for faster cached layout redoing
 * Additional parameters to the renderToTimemap method for including rests and measure
 * Additional ids for rests and measure added to the getElementsAtTime methods

From da709db6f5fad4d40d179d942658501ff803a3a9 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 7 Feb 2022 16:47:16 +0200
Subject: [PATCH 302/403] Fix regression for the fTrem stem length

- cleaned up code a bit
- fixed a problem with fTrems having zero stem length
---
 src/beam.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 140e6d585a8..60e7fc863cb 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1167,11 +1167,11 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
                                                                       : STEMDIRECTION_up;
         const int coordStemLength = coord->CalculateStemLength(staff, stemDir, isHorizontal);
         if (!coord->m_closestNote) continue;
-        // if location matches, or if current elements duration is shorter than 8th. This ensures that beams with
-        // partial beams will not be shorted when lowest/highest note is 8th and can be shortened
-        if ((coord->m_dur > minDuration)
-            && ((coord->m_closestNote->GetDrawingLoc() == relevantNoteLoc)
-                || (!isHorizontal && (std::abs(m_uniformStemLength) < 13)))) {
+        // skip current element if it's longer that minDuration and is not a part of fTrem
+        if ((coord->m_dur <= minDuration) && !(coord->m_element && coord->m_element->GetFirstAncestor(FTREM))) continue;
+        // if location matches or if current stem length is too short - adjust stem length 
+        if ((coord->m_closestNote->GetDrawingLoc() == relevantNoteLoc)
+            || (!isHorizontal && (std::abs(m_uniformStemLength) < 13))) {
             m_uniformStemLength = coordStemLength;
             minDuration = coord->m_dur;
         }

From 470935786e0a4289ab968ed03d50e393b9392d9c Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 7 Feb 2022 16:49:39 +0200
Subject: [PATCH 303/403] Calculate stemLength only when needed

---
 src/beam.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 60e7fc863cb..01ed1333f85 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1165,11 +1165,11 @@ void BeamSegment::CalcBeamStemLength(Staff *staff, data_BEAMPLACE place, bool is
         const data_STEMDIRECTION stemDir = (place != BEAMPLACE_mixed) ? globalStemDir
             : (coord->m_beamRelativePlace == BEAMPLACE_below)         ? STEMDIRECTION_down
                                                                       : STEMDIRECTION_up;
-        const int coordStemLength = coord->CalculateStemLength(staff, stemDir, isHorizontal);
         if (!coord->m_closestNote) continue;
         // skip current element if it's longer that minDuration and is not a part of fTrem
         if ((coord->m_dur <= minDuration) && !(coord->m_element && coord->m_element->GetFirstAncestor(FTREM))) continue;
-        // if location matches or if current stem length is too short - adjust stem length 
+        // if location matches or if current stem length is too short - adjust stem length
+        const int coordStemLength = coord->CalculateStemLength(staff, stemDir, isHorizontal);
         if ((coord->m_closestNote->GetDrawingLoc() == relevantNoteLoc)
             || (!isHorizontal && (std::abs(m_uniformStemLength) < 13))) {
             m_uniformStemLength = coordStemLength;

From 99d40596b2b7987ec9f5d9f2205b5b0373440165 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Feb 2022 12:15:44 +0200
Subject: [PATCH 304/403] Add several checks for the parsed line in ABC
 improter

- added empty() and length() checks to the ParseABC() method to make sure there is no out-of-bounds indexing
- changed usage of indexing operator[] to method .at() where applicable
---
 src/ioabc.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 327e5a94587..fdbcaa719a7 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -111,12 +111,14 @@ void ABCInput::ParseABC(std::istream &infile)
     while (!infile.eof()) {
         std::getline(infile, abcLine);
         ++m_lineNum;
-        if (abcLine[0] == 'X') {
-            this->readInformationField('X', &abcLine[2]);
-            while (abcLine[0] != 'K' && !infile.eof()) {
+        if (!abcLine.empty() && (abcLine.at(0) == 'X')) {
+            while (!infile.eof()) {
+                if (abcLine.length() >= 3) {
+                    this->readInformationField(abcLine.at(0), &abcLine.at(2));
+                    if (abcLine.at(0) == 'K') break;
+                }
                 std::getline(infile, abcLine);
                 ++m_lineNum;
-                this->readInformationField(abcLine[0], &abcLine[2]);
             }
             if (infile.eof()) break;
             if (m_title.empty()) {
@@ -127,6 +129,8 @@ void ABCInput::ParseABC(std::istream &infile)
             this->CreateWorkEntry();
 
             this->InitScoreAndSection(score, section);
+
+            continue;
         }
         else if (!m_mdiv || !score || !section) {
             // if m_div is not initialized - we didn't read X element, so continue until we do
@@ -137,15 +141,15 @@ void ABCInput::ParseABC(std::istream &infile)
             this->FlushControlElements(score, section);
             continue;
         }
-        else if (abcLine[0] == '%')
+        else if (abcLine.at(0)  == '%')
             // skipping comments and stylesheet directives
             continue;
-        else if (abcLine[1] == ':' && abcLine[0] != '|') {
-            if (abcLine[0] != 'K') {
-                this->readInformationField(abcLine[0], &abcLine[2]);
+        else if ((abcLine.length() >= 3) && (abcLine.at(1) == ':') && (abcLine.at(0) != '|')) {
+            if (abcLine.at(0) != 'K') {
+                this->readInformationField(abcLine.at(0), &abcLine.at(2));
             }
             else {
-                LogWarning("ABC import: Key changes not supported", abcLine[0]);
+                LogWarning("ABC import: Key changes not supported");
             }
         }
         else {
@@ -153,7 +157,7 @@ void ABCInput::ParseABC(std::istream &infile)
         }
     }
 
-    if (!section->GetParent()) {
+    if (section && score && !section->GetParent()) {
         score->AddChild(section);
     }
 
@@ -890,6 +894,7 @@ void ABCInput::FlushControlElements(Score *score, Section *section)
             LogWarning("ABC import: Element '%s' could not be assigned to layer '%s'",
                 iter->second->GetClassName().c_str(), iter->first.c_str());
             delete iter->second;
+            iter->second = NULL;
             continue;
         }
         measure = vrv_cast<Measure *>(layer->GetFirstAncestor(MEASURE));

From e46634af626b5130a913e863ae173ba9f030839b Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Feb 2022 12:30:11 +0200
Subject: [PATCH 305/403] Remove redundant method

---
 include/vrv/vrv.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/vrv/vrv.h b/include/vrv/vrv.h
index 19095dab146..5e508a54309 100644
--- a/include/vrv/vrv.h
+++ b/include/vrv/vrv.h
@@ -173,10 +173,6 @@ class Resources {
 
 private:
     static bool LoadFont(const std::string &fontName);
-    /**
-     * Returns ranges of the glyphs to be parsed
-     */
-    static std::map<wchar_t, wchar_t> GetGlyphRanges();
 
 private:
     //----------------//

From 5d575cab4752c8659977dec4cf131af0e4098a02 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Feb 2022 12:33:31 +0200
Subject: [PATCH 306/403] Remove redundant include

---
 src/vrv.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vrv.cpp b/src/vrv.cpp
index ac08f47a969..55c164af14a 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -16,7 +16,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <fstream>
 #include <vector>
 
 #ifndef _WIN32

From 421957bc965ad06f581742f43000423df08bb7f5 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Feb 2022 12:39:16 +0200
Subject: [PATCH 307/403] Formatting

---
 src/ioabc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index fdbcaa719a7..bce5f214328 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -141,7 +141,7 @@ void ABCInput::ParseABC(std::istream &infile)
             this->FlushControlElements(score, section);
             continue;
         }
-        else if (abcLine.at(0)  == '%')
+        else if (abcLine.at(0) == '%')
             // skipping comments and stylesheet directives
             continue;
         else if ((abcLine.length() >= 3) && (abcLine.at(1) == ':') && (abcLine.at(0) != '|')) {

From 60eef4162a236664449d3b76371f93c4dc5f2805 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Feb 2022 14:51:03 +0200
Subject: [PATCH 308/403] Use substr()

---
 src/ioabc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index bce5f214328..bbdd313fb10 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -114,7 +114,7 @@ void ABCInput::ParseABC(std::istream &infile)
         if (!abcLine.empty() && (abcLine.at(0) == 'X')) {
             while (!infile.eof()) {
                 if (abcLine.length() >= 3) {
-                    this->readInformationField(abcLine.at(0), &abcLine.at(2));
+                    this->readInformationField(abcLine.at(0), abcLine.substr(2));
                     if (abcLine.at(0) == 'K') break;
                 }
                 std::getline(infile, abcLine);
@@ -146,7 +146,7 @@ void ABCInput::ParseABC(std::istream &infile)
             continue;
         else if ((abcLine.length() >= 3) && (abcLine.at(1) == ':') && (abcLine.at(0) != '|')) {
             if (abcLine.at(0) != 'K') {
-                this->readInformationField(abcLine.at(0), &abcLine.at(2));
+                this->readInformationField(abcLine.at(0), abcLine.substr(2));
             }
             else {
                 LogWarning("ABC import: Key changes not supported");

From cc6722fbe84acc0c15a0f829cf7b5361cb96ea38 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Feb 2022 15:00:26 +0200
Subject: [PATCH 309/403] Revert removal of check for SMUFL_COUNT

---
 src/vrv.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vrv.cpp b/src/vrv.cpp
index 55c164af14a..7de46456acd 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -85,6 +85,11 @@ bool Resources::InitFonts()
     if (!LoadFont("Bravura")) LogError("Bravura font could not be loaded.");
     // The Leipzig as the default font
     if (!LoadFont("Leipzig")) LogError("Leipzig font could not be loaded.");
+    
+    if (s_fontGlyphTable.size() < SMUFL_COUNT) {
+        LogError("Expected %d default SMuFL glyphs but could load only %d.", SMUFL_COUNT, s_fontGlyphTable.size());
+        return false;
+    }
 
     struct TextFontInfo_type {
         const StyleAttributes m_style;

From 2c5f6e1b622b95b36fa5ba2633abd2b919eeeec3 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Feb 2022 15:08:45 +0200
Subject: [PATCH 310/403] Formatting

---
 src/vrv.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vrv.cpp b/src/vrv.cpp
index 7de46456acd..9cdf187b800 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -85,7 +85,7 @@ bool Resources::InitFonts()
     if (!LoadFont("Bravura")) LogError("Bravura font could not be loaded.");
     // The Leipzig as the default font
     if (!LoadFont("Leipzig")) LogError("Leipzig font could not be loaded.");
-    
+
     if (s_fontGlyphTable.size() < SMUFL_COUNT) {
         LogError("Expected %d default SMuFL glyphs but could load only %d.", SMUFL_COUNT, s_fontGlyphTable.size());
         return false;

From e78b49ce684953bd844e5e80f661e481af90aade Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 07:34:55 +0100
Subject: [PATCH 311/403] Add clef overflow members to StatfAlignment

---
 include/vrv/verticalaligner.h | 2 ++
 src/verticalaligner.cpp       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/include/vrv/verticalaligner.h b/include/vrv/verticalaligner.h
index 8f4481938b8..f51d2158206 100644
--- a/include/vrv/verticalaligner.h
+++ b/include/vrv/verticalaligner.h
@@ -380,6 +380,8 @@ class StaffAlignment : public Object {
     int m_staffHeight;
     BoundingBox *m_overflowBBoxAbove;
     BoundingBox *m_overflowBBoxBelow;
+    int m_scoreDefClefOverflowAbove;
+    int m_scoreDefClefOverflowBelow;
     ///@}
 
     // Value to store required beam adjustment for cross-staff beams
diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index 776c9d962dd..59d8f8eb06c 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -258,6 +258,8 @@ StaffAlignment::StaffAlignment() : Object(STAFF_ALIGNMENT)
     m_overlap = 0;
     m_overflowBBoxAbove = NULL;
     m_overflowBBoxBelow = NULL;
+    m_scoreDefClefOverflowAbove = 0;
+    m_scoreDefClefOverflowBelow = 0;
 }
 
 StaffAlignment::~StaffAlignment()

From 4c8d01400c5e25bd2e88774c5ee858ff98c2ba53 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 07:36:00 +0100
Subject: [PATCH 312/403] Set the clef overflow values in
 Object::SetOverflowBBoxes

---
 src/object.cpp | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/object.cpp b/src/object.cpp
index 15876428792..3f0b17054d3 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1892,10 +1892,8 @@ int Object::SetOverflowBBoxes(FunctorParams *functorParams)
         assert(currentLayer);
         // set scoreDef attr
         if (currentLayer->GetStaffDefClef()) {
-            // Ignore system scoreDef clefs - clefs changes withing a staff are still taken into account
-            if (currentLayer->GetStaffDefClef()->GetScoreDefRole() != SCOREDEF_SYSTEM) {
-                currentLayer->GetStaffDefClef()->SetOverflowBBoxes(params);
-            }
+            // System scoreDef clefs are taken into account but treated separately (see below)
+            currentLayer->GetStaffDefClef()->SetOverflowBBoxes(params);
         }
         if (currentLayer->GetStaffDefKeySig()) {
             currentLayer->GetStaffDefKeySig()->SetOverflowBBoxes(params);
@@ -1944,14 +1942,26 @@ int Object::SetOverflowBBoxes(FunctorParams *functorParams)
     StaffAlignment *below = NULL;
     current->GetOverflowStaffAlignments(above, below);
 
+    bool isScoreDefClef = false;
+    // Exception for the scoreDef clef where we do not want to take into account the general overflow
+    // We have instead distinct members in StaffAlignment to store them
+    if (current->Is(CLEF) && current->GetScoreDefRole() == SCOREDEF_SYSTEM) {
+        isScoreDefClef = true;
+    }
+
     if (above) {
         int overflowAbove = above->CalcOverflowAbove(current);
         int staffSize = above->GetStaffSize();
         if (overflowAbove > params->m_doc->GetDrawingStaffLineWidth(staffSize) / 2) {
             // LogMessage("%s top overflow: %d", current->GetUuid().c_str(), overflowAbove);
-            above->SetOverflowBBoxAbove(current, overflowAbove);
-            above->SetOverflowAbove(overflowAbove);
-            above->AddBBoxAbove(current);
+            if (isScoreDefClef) {
+                above->SetScoreDefClefOverflowAbove(overflowAbove);
+            }
+            else {
+                above->SetOverflowBBoxAbove(current, overflowAbove);
+                above->SetOverflowAbove(overflowAbove);
+                above->AddBBoxAbove(current);
+            }
         }
     }
 
@@ -1960,9 +1970,14 @@ int Object::SetOverflowBBoxes(FunctorParams *functorParams)
         int staffSize = below->GetStaffSize();
         if (overflowBelow > params->m_doc->GetDrawingStaffLineWidth(staffSize) / 2) {
             // LogMessage("%s bottom overflow: %d", current->GetUuid().c_str(), overflowBelow);
-            below->SetOverflowBBoxBelow(current, overflowBelow);
-            below->SetOverflowBelow(overflowBelow);
-            below->AddBBoxBelow(current);
+            if (isScoreDefClef) {
+                below->SetScoreDefClefOverflowBelow(overflowBelow);
+            }
+            else {
+                below->SetOverflowBBoxBelow(current, overflowBelow);
+                below->SetOverflowBelow(overflowBelow);
+                below->AddBBoxBelow(current);
+            }
         }
     }
 

From 49be6dc7e150dd824726f21746c4536a901a8a19 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 08:18:40 +0100
Subject: [PATCH 313/403] Add methods to set clef overflows

---
 include/vrv/verticalaligner.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/vrv/verticalaligner.h b/include/vrv/verticalaligner.h
index f51d2158206..b5c1c69ac1c 100644
--- a/include/vrv/verticalaligner.h
+++ b/include/vrv/verticalaligner.h
@@ -90,8 +90,8 @@ class SystemAligner : public Object {
     /**
      * Get System Overflows
      */
-    int GetOverflowAbove(const Doc *doc) const;
-    int GetOverflowBelow(const Doc *doc) const;
+    int GetOverflowAbove(const Doc *doc, bool scoreDefClef = false) const;
+    int GetOverflowBelow(const Doc *doc, bool scoreDefClef = false) const;
 
     /**
      * Get justification sum
@@ -250,6 +250,10 @@ class StaffAlignment : public Object {
     BoundingBox *GetOverflowBBoxAbove() const { return m_overflowBBoxAbove; }
     void SetOverflowBBoxBelow(BoundingBox *bboxBelow, int overflowBottom);
     BoundingBox *GetOverflowBBoxBelow() const { return m_overflowBBoxBelow; }
+    void SetScoreDefClefOverflowAbove(int overflowAbove) { m_scoreDefClefOverflowAbove = overflowAbove; }
+    int GetScoreDefClefOverflowAbove() const { return m_scoreDefClefOverflowAbove; }
+    void SetScoreDefClefOverflowBelow(int overflowBelow) { m_scoreDefClefOverflowBelow = overflowBelow; }
+    int GetScoreDefClefOverflowBelow() const { return m_scoreDefClefOverflowBelow; }
     ///@}
 
     /**

From 5d9396955d6936ba4e19e939db973cf2340072fc Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 08:19:56 +0100
Subject: [PATCH 314/403] Adjust the overlap calculation for taking into
 account clef, including for the bottom alignment

---
 src/verticalaligner.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index 59d8f8eb06c..6cfe2e28991 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -982,14 +982,26 @@ int StaffAlignment::AdjustStaffOverlap(FunctorParams *functorParams)
     AdjustStaffOverlapParams *params = vrv_params_cast<AdjustStaffOverlapParams *>(functorParams);
     assert(params);
 
-    // This is the bottom alignment (or something is wrong)
-    if (!m_staff) return FUNCTOR_STOP;
-
+    // This is the first alignment
     if (params->m_previous == NULL) {
         params->m_previous = this;
         return FUNCTOR_SIBLINGS;
     }
 
+    const int spacing = std::max(params->m_previous->m_overflowBelow, m_overflowAbove);
+
+    // Calculate the overlap for scoreDef clefs
+    int overflowBelow = params->m_previous->GetScoreDefClefOverflowBelow();
+    int overflowAbove = this->GetScoreDefClefOverflowAbove();
+    if (spacing < (overflowBelow + overflowAbove)) {
+        this->SetOverlap((overflowBelow + overflowAbove) - spacing);
+    }
+
+    // This is the bottom alignment (or something is wrong) - this is all we need to do
+    if (!m_staff) {
+        return FUNCTOR_STOP;
+    }
+
     const int staffSize = this->GetStaffSize();
     const int drawingUnit = params->m_doc->GetDrawingUnit(staffSize);
 
@@ -1015,7 +1027,6 @@ int StaffAlignment::AdjustStaffOverlap(FunctorParams *functorParams)
                 // calculate the vertical overlap and see if this is more than the expected space
                 int overflowBelow = params->m_previous->CalcOverflowBelow(*iter);
                 int overflowAbove = this->CalcOverflowAbove(*i);
-                int spacing = std::max(params->m_previous->m_overflowBelow, m_overflowAbove);
                 if (spacing < (overflowBelow + overflowAbove)) {
                     // LogDebug("Overlap %d", (overflowBelow + overflowAbove) - spacing);
                     this->SetOverlap((overflowBelow + overflowAbove) - spacing);

From fbd8b746d0d3b99a72e7456e6987c33f38fe3d67 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 09:08:23 +0100
Subject: [PATCH 315/403] Revert changes to GetOverflowAbove/Below

---
 include/vrv/verticalaligner.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vrv/verticalaligner.h b/include/vrv/verticalaligner.h
index b5c1c69ac1c..912c91c84d7 100644
--- a/include/vrv/verticalaligner.h
+++ b/include/vrv/verticalaligner.h
@@ -90,8 +90,8 @@ class SystemAligner : public Object {
     /**
      * Get System Overflows
      */
-    int GetOverflowAbove(const Doc *doc, bool scoreDefClef = false) const;
-    int GetOverflowBelow(const Doc *doc, bool scoreDefClef = false) const;
+    int GetOverflowAbove(const Doc *doc) const;
+    int GetOverflowBelow(const Doc *doc) const;
 
     /**
      * Get justification sum

From bcc42f3ce9963eb8bc217797a211d72f0dc9b219 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 09:29:34 +0100
Subject: [PATCH 316/403] Add option to control the first system spacing and
 adjust pgHead default bottom margin

---
 include/vrv/options.h | 1 +
 src/options.cpp       | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/vrv/options.h b/include/vrv/options.h
index b0f004a5d95..930dc8d0572 100644
--- a/include/vrv/options.h
+++ b/include/vrv/options.h
@@ -686,6 +686,7 @@ class Options {
     OptionDbl m_spacingNonLinear;
     OptionInt m_spacingStaff;
     OptionInt m_spacingSystem;
+    OptionInt m_spacingSystemFirst;
     OptionDbl m_staffLineWidth;
     OptionDbl m_stemWidth;
     OptionDbl m_subBracketThickness;
diff --git a/src/options.cpp b/src/options.cpp
index 12b8d16d2c7..a1bbfb417e3 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1343,6 +1343,10 @@ Options::Options()
     m_spacingSystem.SetInfo("Spacing system", "The system minimal spacing in MEI units");
     m_spacingSystem.Init(12, 0, 48);
     this->Register(&m_spacingSystem, "spacingSystem", &m_generalLayout);
+    
+    m_spacingSystemFirst.SetInfo("Spacing system first", "The first system minimal spacing in MEI units");
+    m_spacingSystemFirst.Init(6, 0, 48);
+    this->Register(&m_spacingSystemFirst, "spacingSystemFirst", &m_generalLayout);
 
     m_staffLineWidth.SetInfo("Staff line width", "The staff line width in unit");
     m_staffLineWidth.Init(0.15, 0.10, 0.30);
@@ -1466,7 +1470,7 @@ Options::Options()
     this->Register(&m_bottomMarginHarm, "bottomMarginHarm", &m_elementMargins);
 
     m_bottomMarginPgHead.SetInfo("Bottom margin header", "The margin for header in MEI units");
-    m_bottomMarginPgHead.Init(8.0, 0.0, 24.0);
+    m_bottomMarginPgHead.Init(2.0, 0.0, 24.0);
     this->Register(&m_bottomMarginPgHead, "bottomMarginHeader", &m_elementMargins);
 
     /// custom left

From 8e4c6eab73ab64fc431dd0b8f817450617bb9797 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 09:30:13 +0100
Subject: [PATCH 317/403] Add member to functor for storing previous clef
 bottom overflow

---
 include/vrv/functorparams.h | 2 ++
 src/system.cpp              | 1 +
 2 files changed, 3 insertions(+)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 5bdf7922a0a..8a9686c9d18 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -847,12 +847,14 @@ class AlignSystemsParams : public FunctorParams {
         m_shift = 0;
         m_systemMargin = 0;
         m_prevBottomOverflow = 0;
+        m_prevBottomClefOverflow = 0;
         m_justificationSum = 0.;
         m_doc = doc;
     }
     int m_shift;
     int m_systemMargin;
     int m_prevBottomOverflow;
+    int m_prevBottomClefOverflow;
     double m_justificationSum;
     Doc *m_doc;
 };
diff --git a/src/system.cpp b/src/system.cpp
index 79f417b36b3..b69c463d119 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -773,6 +773,7 @@ int System::AlignSystems(FunctorParams *functorParams)
     }
 
     params->m_prevBottomOverflow = m_systemAligner.GetOverflowBelow(params->m_doc);
+    params->m_prevBottomClefOverflow = m_systemAligner.GetOverflowBelow(params->m_doc, true);
 
     return FUNCTOR_SIBLINGS;
 }

From 7d48a12dd93dcc46cab1770803948d6c39fa1b41 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 09:30:58 +0100
Subject: [PATCH 318/403] Adjust method for getting system overflows (WIP)

---
 include/vrv/verticalaligner.h | 4 ++--
 src/verticalaligner.cpp       | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/vrv/verticalaligner.h b/include/vrv/verticalaligner.h
index 912c91c84d7..b5c1c69ac1c 100644
--- a/include/vrv/verticalaligner.h
+++ b/include/vrv/verticalaligner.h
@@ -90,8 +90,8 @@ class SystemAligner : public Object {
     /**
      * Get System Overflows
      */
-    int GetOverflowAbove(const Doc *doc) const;
-    int GetOverflowBelow(const Doc *doc) const;
+    int GetOverflowAbove(const Doc *doc, bool scoreDefClef = false) const;
+    int GetOverflowBelow(const Doc *doc, bool scoreDefClef = false) const;
 
     /**
      * Get justification sum
diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index 6cfe2e28991..b3d9b6c4809 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -132,22 +132,26 @@ void SystemAligner::FindAllIntersectionPoints(
     }
 }
 
-int SystemAligner::GetOverflowAbove(const Doc *) const
+int SystemAligner::GetOverflowAbove(const Doc *, bool scoreDefClef) const
 {
     if (!this->GetChildCount() || this->GetChild(0) == m_bottomAlignment) return 0;
 
     StaffAlignment *alignment = vrv_cast<StaffAlignment *>(this->GetChild(0));
     assert(alignment);
     return alignment->GetOverflowAbove();
+    int overflowAbove = scoreDefClef ? alignment->GetScoreDefClefOverflowAbove() : alignment->GetOverflowAbove();
+    return overflowAbove;
 }
 
-int SystemAligner::GetOverflowBelow(const Doc *doc) const
+int SystemAligner::GetOverflowBelow(const Doc *doc, bool scoreDefClef) const
 {
     if (!this->GetChildCount() || this->GetChild(0) == m_bottomAlignment) return 0;
 
     StaffAlignment *alignment = vrv_cast<StaffAlignment *>(this->GetChild(this->GetChildCount() - 2));
     assert(alignment);
     return alignment->GetOverflowBelow() + doc->GetBottomMargin(STAFF) * doc->GetDrawingUnit(alignment->GetStaffSize());
+    int overflowBelow = scoreDefClef ? alignment->GetScoreDefClefOverflowBelow() : alignment->GetOverflowBelow();
+    return overflowBelow;
 }
 
 double SystemAligner::GetJustificationSum(const Doc *doc) const

From 646cd627a07659420bf0b7ae1f84e81f6ebcf200 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 09:31:54 +0100
Subject: [PATCH 319/403] Do not add pgHead bottom margin if pgHead is empty

---
 src/page.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/page.cpp b/src/page.cpp
index 33387732e7b..a15e8a911c7 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -841,11 +841,13 @@ int Page::AlignSystems(FunctorParams *functorParams)
 
     RunningElement *header = this->GetHeader();
     if (header) {
-        const int bottomMarginPgHead
-            = params->m_doc->GetOptions()->m_bottomMarginPgHead.GetValue() * params->m_doc->GetDrawingUnit(100);
-
         header->SetDrawingYRel(params->m_shift);
-        params->m_shift -= header->GetTotalHeight() + bottomMarginPgHead;
+        const int headerHeight = header->GetTotalHeight();
+        if (headerHeight > 0) {
+            const int bottomMarginPgHead
+                = params->m_doc->GetOptions()->m_bottomMarginPgHead.GetValue() * params->m_doc->GetDrawingUnit(100);
+            params->m_shift -= header->GetTotalHeight() + bottomMarginPgHead;
+        }
     }
     return FUNCTOR_CONTINUE;
 }

From 0130ae712ab387410ca96191b79de843ff331bf2 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 3 Feb 2022 17:23:35 +0200
Subject: [PATCH 320/403] Add support of w: element in ABC format

- added code to parse lyrics
---
 include/vrv/ioabc.h |  4 +++
 src/ioabc.cpp       | 73 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/include/vrv/ioabc.h b/include/vrv/ioabc.h
index 8bf6076099c..4e830c11bba 100644
--- a/include/vrv/ioabc.h
+++ b/include/vrv/ioabc.h
@@ -73,6 +73,7 @@ class ABCInput : public Input {
     void parseMeter(const std::string &meterString); // M:
     void parseTempo(const std::string &tempoString); // Q:
     void parseReferenceNumber(const std::string &referenceNumberString); // X:
+    void parseLyrics(); // w:
 
     // input functions
     void readInformationField(const char &dataKey, std::string dataValue);
@@ -145,6 +146,9 @@ class ABCInput : public Input {
 
     std::vector<LayerElement *> m_layerElements;
     std::vector<LayerElement *> m_noteStack;
+    // Array of added notes in one line of ABC file. Used to track elements that might require adding verse to
+    std::vector<LayerElement *> m_lineNoteArray;
+    int m_verseNumber = 1;
     /*
      * ABC decoration stacks
      */
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 49dc2806cd1..27ded3849a3 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -47,12 +47,14 @@
 #include "staff.h"
 #include "staffdef.h"
 #include "staffgrp.h"
+#include "syl.h"
 #include "tempo.h"
 #include "text.h"
 #include "tie.h"
 #include "trill.h"
 #include "tuplet.h"
 #include "turn.h"
+#include "verse.h"
 #include "vrv.h"
 
 //----------------------------------------------------------------------------
@@ -154,6 +156,8 @@ void ABCInput::ParseABC(std::istream &infile)
             }
         }
         else {
+            m_verseNumber = 1;
+            m_lineNoteArray.clear();
             this->readMusicCode(abcLine, section);
         }
     }
@@ -1021,6 +1025,64 @@ void ABCInput::InitScoreAndSection(Score *&score, Section *&section)
     m_layer->SetN(1);
 }
 
+void ABCInput::parseLyrics()
+{
+    std::vector<std::pair<std::string, int>> syllables;
+    constexpr std::string_view delimeters = "-_ ";
+    // skipping w:, so start from third element 
+    std::size_t start = 2;
+    std::size_t found = abcLine.find_first_of(delimeters, 2);
+    while (found != std::string::npos) {
+        // Counter indicates for how many notes verse should be held. This defaults to 1, unless '_' is found
+        int counter = 1;
+        std::string syl = "";
+        if (abcLine.at(found) == '_') {
+            while ((found < abcLine.size()) && (abcLine[found] == '_')) {
+                ++counter;
+                ++found;
+            }
+        }
+        // separate syllable from delimeters to form syl that we want to add
+        syl = abcLine.substr(start, found - start);
+        syl.erase(std::remove_if(syl.begin(), syl.end(), [](unsigned char x) { return x == '_'; }), syl.end());
+        std::replace(syl.begin(), syl.end(), '~', ' ');
+        syllables.push_back({ syl, counter });
+
+        // find next delimeter in the string
+        start = found + 1;
+        found = abcLine.find_first_of(delimeters, start);
+        // if none found, the rest of the string is going to server as last syl
+        if ((found == std::string::npos) && (start < abcLine.size())) {
+            std::string syl = abcLine.substr(start);
+            std::replace(syl.begin(), syl.end(), '~', ' ');
+            syllables.push_back({ syl, 1 });
+        }
+    }
+
+    // Iterate over notes and syllables simultaneously. Move through note array using counters for each syllable, moving
+    // for several notes if syllable needs to be held
+    for (int i = 0, j = 0; (i < m_lineNoteArray.size()) && (j < syllables.size()); ++j) {
+        if (m_lineNoteArray.at(i)->IsGraceNote()) {
+            ++i;
+            continue;
+        }
+        Text *sylText = new Text();
+        sylText->SetText(UTF8to16(syllables.at(j).first));
+        Syl *syl = new Syl();
+        syl->AddChild(sylText);
+        Verse *verse = new Verse();
+        verse->SetN(m_verseNumber);
+        verse->AddChild(syl);
+        m_lineNoteArray.at(i)->AddChild(verse);
+        if (syllables.at(j).second > 1) {
+            syl->SetCon(sylLog_CON_u);
+        }
+        i += syllables.at(j).second;
+    }
+    // increment verse number, in case next line in file is also w:
+    ++m_verseNumber;
+}
+
 //////////////////////////////
 //
 // readInformationField --
@@ -1063,6 +1125,7 @@ void ABCInput::readInformationField(const char &dataKey, std::string value)
         case 'T': m_title.push_back(std::make_pair(value, m_lineNum)); break;
         case 'U': LogWarning("ABC import: User defined sympols are not supported"); break;
         case 'V': LogWarning("ABC import: Multi-voice music is not supported"); break;
+        case 'w': parseLyrics(); break;
         case 'W': LogWarning("ABC import: Lyrics are not supported yet"); break;
         case 'X': parseReferenceNumber(value); break;
         case 'Z': m_info.push_back(std::make_pair(std::make_pair(value, m_lineNum), dataKey)); break;
@@ -1199,9 +1262,12 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
                 // if chord cannot be beamed, write it directly to the layer
                 if (m_noteStack.size() > 0) AddLayerElement();
                 m_layer->AddChild(chord);
+                m_lineNoteArray.push_back(chord);
             }
-            else
+            else {
                 m_noteStack.push_back(chord);
+                m_lineNoteArray.push_back(chord);
+            }
             chord = NULL;
         }
 
@@ -1378,9 +1444,12 @@ void ABCInput::readMusicCode(const std::string &musicCode, Section *section)
                     // if note cannot be beamed, write it directly to the layer
                     if (m_noteStack.size() > 0) AddLayerElement();
                     m_layer->AddChild(note);
+                    m_lineNoteArray.push_back(note);
                 }
-                else
+                else {
                     m_noteStack.push_back(note);
+                    m_lineNoteArray.push_back(note);
+                }
             }
 
             if (!m_tieStack.empty()) {

From d28990cf77eb07641de19332155bc7dad95539b1 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 3 Feb 2022 17:44:30 +0200
Subject: [PATCH 321/403] Fix for the some of the syllables being cut off
 52aa6a44c

---
 src/ioabc.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 27ded3849a3..93679a89349 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -1041,12 +1041,15 @@ void ABCInput::parseLyrics()
                 ++counter;
                 ++found;
             }
+            --found;
         }
         // separate syllable from delimeters to form syl that we want to add
         syl = abcLine.substr(start, found - start);
         syl.erase(std::remove_if(syl.begin(), syl.end(), [](unsigned char x) { return x == '_'; }), syl.end());
         std::replace(syl.begin(), syl.end(), '~', ' ');
-        syllables.push_back({ syl, counter });
+        if (!syl.empty()) {
+            syllables.push_back({ syl, counter });
+        }
 
         // find next delimeter in the string
         start = found + 1;
@@ -1062,10 +1065,10 @@ void ABCInput::parseLyrics()
     // Iterate over notes and syllables simultaneously. Move through note array using counters for each syllable, moving
     // for several notes if syllable needs to be held
     for (int i = 0, j = 0; (i < m_lineNoteArray.size()) && (j < syllables.size()); ++j) {
-        if (m_lineNoteArray.at(i)->IsGraceNote()) {
+        while (m_lineNoteArray.at(i)->IsGraceNote() && (i < m_lineNoteArray.size())) {
             ++i;
-            continue;
         }
+        if (i >= m_lineNoteArray.size()) break;
         Text *sylText = new Text();
         sylText->SetText(UTF8to16(syllables.at(j).first));
         Syl *syl = new Syl();

From edc8848b27875ac5671d64b1e0f8bf9298acf05b Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 7 Feb 2022 10:41:41 +0200
Subject: [PATCH 322/403] Improve parsing of syllables

---
 src/ioabc.cpp | 72 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 23 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 93679a89349..09517884cc5 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -1027,27 +1027,52 @@ void ABCInput::InitScoreAndSection(Score *&score, Section *&section)
 
 void ABCInput::parseLyrics()
 {
-    std::vector<std::pair<std::string, int>> syllables;
-    constexpr std::string_view delimeters = "-_ ";
-    // skipping w:, so start from third element 
+    std::vector<std::pair<Syl *, int>> syllables;
+    constexpr std::string_view delimeters = "~\\-_ ";
+    // skipping w:, so start from third element
     std::size_t start = 2;
     std::size_t found = abcLine.find_first_of(delimeters, 2);
     while (found != std::string::npos) {
         // Counter indicates for how many notes verse should be held. This defaults to 1, unless '_' is found
         int counter = 1;
-        std::string syl = "";
+        std::string syllable = "";
+        sylLog_CON sylType = sylLog_CON_NONE;
         if (abcLine.at(found) == '_') {
-            while ((found < abcLine.size()) && (abcLine[found] == '_')) {
+            while ((found < abcLine.size()) && (abcLine.at(found) == '_')) {
                 ++counter;
                 ++found;
             }
             --found;
+            sylType = sylLog_CON_u;
+        }
+        else if (abcLine.at(found) == '~') {
+            counter = 0;
+            sylType = sylLog_CON_s;
+        }
+        else if (abcLine.at(found) == '-') {
+            sylType = sylLog_CON_b;
+        }
+        else if (abcLine.at(found) == '\\') {
+            if ((found + 1 < abcLine.size()) && (abcLine.at(found + 1) == '-')) {
+                counter = 0;
+                ++found;
+                sylType = sylLog_CON_b;
+            }
         }
         // separate syllable from delimeters to form syl that we want to add
-        syl = abcLine.substr(start, found - start);
-        syl.erase(std::remove_if(syl.begin(), syl.end(), [](unsigned char x) { return x == '_'; }), syl.end());
-        std::replace(syl.begin(), syl.end(), '~', ' ');
-        if (!syl.empty()) {
+        syllable = abcLine.substr(start, found - start);
+        syllable.erase(
+            std::remove_if(syllable.begin(), syllable.end(), [](unsigned char x) { return (x == '_') || (x == '\\'); }),
+            syllable.end());
+        if (!syllable.empty()) {
+            Text *sylText = new Text();
+            sylText->SetText(UTF8to16(syllable));
+            Syl *syl = new Syl();
+            syl->AddChild(sylText);
+            syl->SetCon(sylType);
+            if (sylType == sylLog_CON_b) {
+                syl->SetWordpos(sylLog_WORDPOS_m);
+            }
             syllables.push_back({ syl, counter });
         }
 
@@ -1056,9 +1081,13 @@ void ABCInput::parseLyrics()
         found = abcLine.find_first_of(delimeters, start);
         // if none found, the rest of the string is going to server as last syl
         if ((found == std::string::npos) && (start < abcLine.size())) {
-            std::string syl = abcLine.substr(start);
-            std::replace(syl.begin(), syl.end(), '~', ' ');
-            syllables.push_back({ syl, 1 });
+            std::string syllable = abcLine.substr(start);
+            Text *sylText = new Text();
+            sylText->SetText(UTF8to16(syllable));
+            Syl *syl = new Syl();
+            syl->AddChild(sylText);
+            syl->SetCon(sylType);
+            syllables.push_back({ syl, counter });
         }
     }
 
@@ -1069,17 +1098,14 @@ void ABCInput::parseLyrics()
             ++i;
         }
         if (i >= m_lineNoteArray.size()) break;
-        Text *sylText = new Text();
-        sylText->SetText(UTF8to16(syllables.at(j).first));
-        Syl *syl = new Syl();
-        syl->AddChild(sylText);
-        Verse *verse = new Verse();
-        verse->SetN(m_verseNumber);
-        verse->AddChild(syl);
-        m_lineNoteArray.at(i)->AddChild(verse);
-        if (syllables.at(j).second > 1) {
-            syl->SetCon(sylLog_CON_u);
-        }
+        Verse *verse = NULL;
+        verse = vrv_cast<Verse *>(m_lineNoteArray.at(i)->GetChild(0, VERSE));
+        if (!verse) {
+            verse = new Verse();
+            verse->SetN(m_verseNumber);
+            m_lineNoteArray.at(i)->AddChild(verse);
+        }
+        verse->AddChild(syllables.at(j).first);
         i += syllables.at(j).second;
     }
     // increment verse number, in case next line in file is also w:

From 700b16a7d99bca782dfd5867cc8c925c56684748 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 7 Feb 2022 17:54:30 +0200
Subject: [PATCH 323/403] Use correct syl.log@con attribute for hyphens

---
 src/ioabc.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 09517884cc5..cdd9d196568 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -1050,13 +1050,13 @@ void ABCInput::parseLyrics()
             sylType = sylLog_CON_s;
         }
         else if (abcLine.at(found) == '-') {
-            sylType = sylLog_CON_b;
+            sylType = sylLog_CON_d;
         }
         else if (abcLine.at(found) == '\\') {
             if ((found + 1 < abcLine.size()) && (abcLine.at(found + 1) == '-')) {
                 counter = 0;
                 ++found;
-                sylType = sylLog_CON_b;
+                sylType = sylLog_CON_d;
             }
         }
         // separate syllable from delimeters to form syl that we want to add
@@ -1070,7 +1070,7 @@ void ABCInput::parseLyrics()
             Syl *syl = new Syl();
             syl->AddChild(sylText);
             syl->SetCon(sylType);
-            if (sylType == sylLog_CON_b) {
+            if (sylType == sylLog_CON_d) {
                 syl->SetWordpos(sylLog_WORDPOS_m);
             }
             syllables.push_back({ syl, counter });
@@ -1082,6 +1082,7 @@ void ABCInput::parseLyrics()
         // if none found, the rest of the string is going to server as last syl
         if ((found == std::string::npos) && (start < abcLine.size())) {
             std::string syllable = abcLine.substr(start);
+            if (!syllable.empty() && syllable[syllable.size() - 1] == '\r') syllable.erase(syllable.size() - 1);
             Text *sylText = new Text();
             sylText->SetText(UTF8to16(syllable));
             Syl *syl = new Syl();
@@ -1093,7 +1094,7 @@ void ABCInput::parseLyrics()
 
     // Iterate over notes and syllables simultaneously. Move through note array using counters for each syllable, moving
     // for several notes if syllable needs to be held
-    for (int i = 0, j = 0; (i < m_lineNoteArray.size()) && (j < syllables.size()); ++j) {
+    for (size_t i = 0, j = 0; (i < m_lineNoteArray.size()) && (j < syllables.size()); ++j) {
         while (m_lineNoteArray.at(i)->IsGraceNote() && (i < m_lineNoteArray.size())) {
             ++i;
         }

From 05958a321093ccfa8009a1d273b2be4776043908 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 12:52:27 +0100
Subject: [PATCH 324/403] Pass spacingSystemFirst option to functor (default
 changed to 0 for now)

---
 include/vrv/functorparams.h | 2 ++
 src/options.cpp             | 2 +-
 src/page.cpp                | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 8a9686c9d18..a95bfa70b17 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -846,6 +846,7 @@ class AlignSystemsParams : public FunctorParams {
     {
         m_shift = 0;
         m_systemMargin = 0;
+        m_systemFirstMargin = 0;
         m_prevBottomOverflow = 0;
         m_prevBottomClefOverflow = 0;
         m_justificationSum = 0.;
@@ -853,6 +854,7 @@ class AlignSystemsParams : public FunctorParams {
     }
     int m_shift;
     int m_systemMargin;
+    int m_systemFirstMargin;
     int m_prevBottomOverflow;
     int m_prevBottomClefOverflow;
     double m_justificationSum;
diff --git a/src/options.cpp b/src/options.cpp
index a1bbfb417e3..9ec3956ca09 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1345,7 +1345,7 @@ Options::Options()
     this->Register(&m_spacingSystem, "spacingSystem", &m_generalLayout);
     
     m_spacingSystemFirst.SetInfo("Spacing system first", "The first system minimal spacing in MEI units");
-    m_spacingSystemFirst.Init(6, 0, 48);
+    m_spacingSystemFirst.Init(0, 0, 48);
     this->Register(&m_spacingSystemFirst, "spacingSystemFirst", &m_generalLayout);
 
     m_staffLineWidth.SetInfo("Staff line width", "The staff line width in unit");
diff --git a/src/page.cpp b/src/page.cpp
index a15e8a911c7..8b74af84bcf 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -551,6 +551,7 @@ void Page::LayOutVertically()
     AlignSystemsParams alignSystemsParams(doc);
     alignSystemsParams.m_shift = doc->m_drawingPageContentHeight;
     alignSystemsParams.m_systemMargin = (doc->GetOptions()->m_spacingSystem.GetValue()) * doc->GetDrawingUnit(100);
+    alignSystemsParams.m_systemFirstMargin = (doc->GetOptions()->m_spacingSystemFirst.GetValue()) * doc->GetDrawingUnit(100);
     Functor alignSystems(&Object::AlignSystems);
     Functor alignSystemsEnd(&Object::AlignSystemsEnd);
     this->Process(&alignSystems, &alignSystemsParams, &alignSystemsEnd);

From 59265abbc41d3ad36b383a0772ecb84150be33a3 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 12:53:00 +0100
Subject: [PATCH 325/403] Enable implementation of clef parameter for overflow
 getters

---
 src/verticalaligner.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index b3d9b6c4809..954f326046a 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -138,7 +138,6 @@ int SystemAligner::GetOverflowAbove(const Doc *, bool scoreDefClef) const
 
     StaffAlignment *alignment = vrv_cast<StaffAlignment *>(this->GetChild(0));
     assert(alignment);
-    return alignment->GetOverflowAbove();
     int overflowAbove = scoreDefClef ? alignment->GetScoreDefClefOverflowAbove() : alignment->GetOverflowAbove();
     return overflowAbove;
 }
@@ -149,7 +148,6 @@ int SystemAligner::GetOverflowBelow(const Doc *doc, bool scoreDefClef) const
 
     StaffAlignment *alignment = vrv_cast<StaffAlignment *>(this->GetChild(this->GetChildCount() - 2));
     assert(alignment);
-    return alignment->GetOverflowBelow() + doc->GetBottomMargin(STAFF) * doc->GetDrawingUnit(alignment->GetStaffSize());
     int overflowBelow = scoreDefClef ? alignment->GetScoreDefClefOverflowBelow() : alignment->GetOverflowBelow();
     return overflowBelow;
 }

From e5d7b378b83bc195a901b85742ee70ef45a29356 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 12:53:33 +0100
Subject: [PATCH 326/403] Take into account clef overflows in system spacing

---
 src/system.cpp          | 9 ++++++---
 src/verticalaligner.cpp | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/system.cpp b/src/system.cpp
index b69c463d119..41e801d3de3 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -753,13 +753,16 @@ int System::AlignSystems(FunctorParams *functorParams)
     assert(params);
     assert(m_systemAligner.GetBottomAlignment());
 
-    int systemMargin = this->IsFirstInPage() ? 0 : params->m_systemMargin;
+    int systemMargin = this->IsFirstInPage() ? params->m_systemFirstMargin : params->m_systemMargin;
     if (systemMargin) {
+        const int contentOverflow = params->m_prevBottomOverflow + m_systemAligner.GetOverflowAbove(params->m_doc);
+        const int clefOverflow = params->m_prevBottomClefOverflow + m_systemAligner.GetOverflowAbove(params->m_doc, true);
         const int margin
-            = systemMargin - (params->m_prevBottomOverflow + m_systemAligner.GetOverflowAbove(params->m_doc));
+            = systemMargin - std::max(contentOverflow, clefOverflow);
         // Ensure minimal white space between consecutive systems by adding one staff space
         const int unit = params->m_doc->GetDrawingUnit(100);
-        params->m_shift -= std::max(margin, 2 * unit);
+        if (margin > 0) params->m_shift -= margin;
+        //params->m_shift -= std::max(margin, 2 * unit);
     }
 
     this->SetDrawingYRel(params->m_shift);
diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index 954f326046a..2315f6ea659 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -493,7 +493,8 @@ int StaffAlignment::CalcMinimumRequiredSpacing(const Doc *doc) const
     StaffAlignment *prevAlignment = dynamic_cast<StaffAlignment *>(parent->GetPrevious(this));
 
     if (!prevAlignment) {
-        return this->GetOverflowAbove() + this->GetOverlap();
+        const int maxOverflow = std::max(this->GetOverflowAbove(), this->GetScoreDefClefOverflowAbove());
+        return maxOverflow + this->GetOverlap();
     }
 
     int overflowSum = 0;

From 34eed8ae3111dda147774f34eec375db8cfaae71 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 12:59:07 +0100
Subject: [PATCH 327/403] Formatting and commenting

---
 src/options.cpp |  2 +-
 src/page.cpp    |  3 ++-
 src/system.cpp  | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/options.cpp b/src/options.cpp
index 9ec3956ca09..964784c0f46 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1343,7 +1343,7 @@ Options::Options()
     m_spacingSystem.SetInfo("Spacing system", "The system minimal spacing in MEI units");
     m_spacingSystem.Init(12, 0, 48);
     this->Register(&m_spacingSystem, "spacingSystem", &m_generalLayout);
-    
+
     m_spacingSystemFirst.SetInfo("Spacing system first", "The first system minimal spacing in MEI units");
     m_spacingSystemFirst.Init(0, 0, 48);
     this->Register(&m_spacingSystemFirst, "spacingSystemFirst", &m_generalLayout);
diff --git a/src/page.cpp b/src/page.cpp
index 8b74af84bcf..5fdb3282db9 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -551,7 +551,8 @@ void Page::LayOutVertically()
     AlignSystemsParams alignSystemsParams(doc);
     alignSystemsParams.m_shift = doc->m_drawingPageContentHeight;
     alignSystemsParams.m_systemMargin = (doc->GetOptions()->m_spacingSystem.GetValue()) * doc->GetDrawingUnit(100);
-    alignSystemsParams.m_systemFirstMargin = (doc->GetOptions()->m_spacingSystemFirst.GetValue()) * doc->GetDrawingUnit(100);
+    alignSystemsParams.m_systemFirstMargin
+        = (doc->GetOptions()->m_spacingSystemFirst.GetValue()) * doc->GetDrawingUnit(100);
     Functor alignSystems(&Object::AlignSystems);
     Functor alignSystemsEnd(&Object::AlignSystemsEnd);
     this->Process(&alignSystems, &alignSystemsParams, &alignSystemsEnd);
diff --git a/src/system.cpp b/src/system.cpp
index 41e801d3de3..f4f8c0479b3 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -756,13 +756,13 @@ int System::AlignSystems(FunctorParams *functorParams)
     int systemMargin = this->IsFirstInPage() ? params->m_systemFirstMargin : params->m_systemMargin;
     if (systemMargin) {
         const int contentOverflow = params->m_prevBottomOverflow + m_systemAligner.GetOverflowAbove(params->m_doc);
-        const int clefOverflow = params->m_prevBottomClefOverflow + m_systemAligner.GetOverflowAbove(params->m_doc, true);
-        const int margin
-            = systemMargin - std::max(contentOverflow, clefOverflow);
-        // Ensure minimal white space between consecutive systems by adding one staff space
-        const int unit = params->m_doc->GetDrawingUnit(100);
-        if (margin > 0) params->m_shift -= margin;
-        //params->m_shift -= std::max(margin, 2 * unit);
+        const int clefOverflow
+            = params->m_prevBottomClefOverflow + m_systemAligner.GetOverflowAbove(params->m_doc, true);
+        // Alignment is already pre-determined with staff alignment overflow
+        // We need to subtract them from the desired margin
+        const int actualMargin = systemMargin - std::max(contentOverflow, clefOverflow);
+        // Set the margin if it exsits (greater than 0)
+        if (actualMargin > 0) params->m_shift -= actualMargin;
     }
 
     this->SetDrawingYRel(params->m_shift);

From 100079f609101f173e5b4835a05285d74ac624e6 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 21:31:06 +0100
Subject: [PATCH 328/403] Remove spacingSystemFirst option (never used) and add
 topMarginPgFooter

---
 include/vrv/options.h | 2 +-
 src/options.cpp       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/vrv/options.h b/include/vrv/options.h
index 930dc8d0572..61dcdf1cc7b 100644
--- a/include/vrv/options.h
+++ b/include/vrv/options.h
@@ -686,7 +686,6 @@ class Options {
     OptionDbl m_spacingNonLinear;
     OptionInt m_spacingStaff;
     OptionInt m_spacingSystem;
-    OptionInt m_spacingSystemFirst;
     OptionDbl m_staffLineWidth;
     OptionDbl m_stemWidth;
     OptionDbl m_subBracketThickness;
@@ -765,6 +764,7 @@ class Options {
     //
     OptionDbl m_topMarginArtic;
     OptionDbl m_topMarginHarm;
+    OptionDbl m_topMarginPgFooter;
 
     /**
      * Deprecated options
diff --git a/src/options.cpp b/src/options.cpp
index 964784c0f46..65691da05a9 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1344,10 +1344,6 @@ Options::Options()
     m_spacingSystem.Init(12, 0, 48);
     this->Register(&m_spacingSystem, "spacingSystem", &m_generalLayout);
 
-    m_spacingSystemFirst.SetInfo("Spacing system first", "The first system minimal spacing in MEI units");
-    m_spacingSystemFirst.Init(0, 0, 48);
-    this->Register(&m_spacingSystemFirst, "spacingSystemFirst", &m_generalLayout);
-
     m_staffLineWidth.SetInfo("Staff line width", "The staff line width in unit");
     m_staffLineWidth.Init(0.15, 0.10, 0.30);
     this->Register(&m_staffLineWidth, "staffLineWidth", &m_generalLayout);
@@ -1623,6 +1619,10 @@ Options::Options()
     m_topMarginHarm.Init(1.0, 0.0, 10.0);
     this->Register(&m_topMarginHarm, "topMarginHarm", &m_elementMargins);
 
+    m_topMarginPgFooter.SetInfo("Top margin footer", "The margin for footer in MEI units");
+    m_topMarginPgFooter.Init(2.0, 0.0, 24.0);
+    this->Register(&m_topMarginPgFooter, "topMarginPgFooter", &m_elementMargins);
+
     /********* Deprecated options *********/
 
     /*

From 0eb25814f27103f0b605c21b2ea5bcb379bb09d0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 21:32:49 +0100
Subject: [PATCH 329/403] Include margin in value returned by
 RunningElement::GetTotalHeight

* now virtual and with a doc parameter
* overridden version add the appropriate margin
---
 include/vrv/pgfoot.h         |  5 +++++
 include/vrv/pgfoot2.h        |  5 +++++
 include/vrv/pghead.h         |  5 +++++
 include/vrv/pghead2.h        |  5 +++++
 include/vrv/runningelement.h |  5 ++++-
 src/pgfoot.cpp               | 13 +++++++++++++
 src/pghead.cpp               | 13 +++++++++++++
 src/pghead2.cpp              | 14 ++++++++++++++
 src/runningelement.cpp       |  2 +-
 9 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/include/vrv/pgfoot.h b/include/vrv/pgfoot.h
index 960a6f32f24..3ed92368664 100644
--- a/include/vrv/pgfoot.h
+++ b/include/vrv/pgfoot.h
@@ -32,6 +32,11 @@ class PgFoot : public RunningElement {
     std::string GetClassName() const override { return "PgFoot"; }
     ///@}
 
+    /**
+     * Overriden to get the appropriate margin
+     */
+    int GetTotalHeight(Doc *doc) override;
+
     //----------//
     // Functors //
     //----------//
diff --git a/include/vrv/pgfoot2.h b/include/vrv/pgfoot2.h
index 3b833f833cc..aa5b7527994 100644
--- a/include/vrv/pgfoot2.h
+++ b/include/vrv/pgfoot2.h
@@ -32,6 +32,11 @@ class PgFoot2 : public RunningElement {
     std::string GetClassName() const override { return "PgFoot2"; }
     ///@}
 
+    /**
+     * Overriden to get the appropriate margin
+     */
+    int GetTotalHeight(Doc *doc) override;
+
     //----------//
     // Functors //
     //----------//
diff --git a/include/vrv/pghead.h b/include/vrv/pghead.h
index 51077d42410..095645499ec 100644
--- a/include/vrv/pghead.h
+++ b/include/vrv/pghead.h
@@ -32,6 +32,11 @@ class PgHead : public RunningElement {
     std::string GetClassName() const override { return "PgHead"; }
     ///@}
 
+    /**
+     * Overriden to get the appropriate margin
+     */
+    int GetTotalHeight(Doc *doc) override;
+
     bool GenerateFromMEIHeader(pugi::xml_document &header);
 
     //----------//
diff --git a/include/vrv/pghead2.h b/include/vrv/pghead2.h
index 713b8d0e78c..e19d6350801 100644
--- a/include/vrv/pghead2.h
+++ b/include/vrv/pghead2.h
@@ -32,6 +32,11 @@ class PgHead2 : public RunningElement {
     std::string GetClassName() const override { return "PgHead2"; }
     ///@}
 
+    /**
+     * Overriden to get the appropriate margin
+     */
+    int GetTotalHeight(Doc *doc) override;
+
     //----------//
     // Functors //
     //----------//
diff --git a/include/vrv/runningelement.h b/include/vrv/runningelement.h
index 2792b81c6b2..030a47e47c6 100644
--- a/include/vrv/runningelement.h
+++ b/include/vrv/runningelement.h
@@ -90,7 +90,10 @@ class RunningElement : public Object, public ObjectListInterface, public AttHori
      * @name Get the size of row, cols or cells
      */
     ///@{
-    int GetTotalHeight();
+    /** Height including margins */
+    virtual int GetTotalHeight(Doc *doc) = 0;
+    /** Content height */
+    int GetContentHeight();
     /** Row from 0 to 2 */
     int GetRowHeight(int row);
     /** Col from 0 to 2 */
diff --git a/src/pgfoot.cpp b/src/pgfoot.cpp
index ed3fb089e99..ff495d86bfc 100644
--- a/src/pgfoot.cpp
+++ b/src/pgfoot.cpp
@@ -13,6 +13,7 @@
 
 //----------------------------------------------------------------------------
 
+#include "doc.h"
 #include "vrv.h"
 
 namespace vrv {
@@ -35,6 +36,18 @@ void PgFoot::Reset()
     RunningElement::Reset();
 }
 
+int PgFoot::GetTotalHeight(Doc *doc)
+{
+    assert(doc);
+
+    int height = this->GetContentHeight();
+    if (height > 0) {
+        const int unit = doc->GetDrawingUnit(100);
+        height += doc->GetOptions()->m_topMarginPgFooter.GetValue() * unit;
+    }
+    return height;
+}
+
 //----------------------------------------------------------------------------
 // Functor methods
 //----------------------------------------------------------------------------
diff --git a/src/pghead.cpp b/src/pghead.cpp
index 89560d16bf6..0deae850041 100644
--- a/src/pghead.cpp
+++ b/src/pghead.cpp
@@ -13,6 +13,7 @@
 
 //----------------------------------------------------------------------------
 
+#include "doc.h"
 #include "lb.h"
 #include "rend.h"
 #include "text.h"
@@ -38,6 +39,18 @@ void PgHead::Reset()
     RunningElement::Reset();
 }
 
+int PgHead::GetTotalHeight(Doc *doc)
+{
+    assert(doc);
+
+    int height = this->GetContentHeight();
+    if (height > 0) {
+        const int unit = doc->GetDrawingUnit(100);
+        height += doc->GetOptions()->m_bottomMarginPgHead.GetValue() * unit;
+    }
+    return height;
+}
+
 bool PgHead::GenerateFromMEIHeader(pugi::xml_document &header)
 {
     pugi::xpath_node node;
diff --git a/src/pghead2.cpp b/src/pghead2.cpp
index 5e06e3fadcc..c2ddac49835 100644
--- a/src/pghead2.cpp
+++ b/src/pghead2.cpp
@@ -13,6 +13,8 @@
 
 //----------------------------------------------------------------------------
 
+#include "doc.h"
+
 namespace vrv {
 
 //----------------------------------------------------------------------------
@@ -33,6 +35,18 @@ void PgHead2::Reset()
     RunningElement::Reset();
 }
 
+int PgHead2::GetTotalHeight(Doc *doc)
+{
+    assert(doc);
+
+    int height = this->GetContentHeight();
+    if (height > 0) {
+        const int unit = doc->GetDrawingUnit(100);
+        height += doc->GetOptions()->m_bottomMarginPgHead.GetValue() * unit;
+    }
+    return height;
+}
+
 //----------------------------------------------------------------------------
 // Functor methods
 //----------------------------------------------------------------------------
diff --git a/src/runningelement.cpp b/src/runningelement.cpp
index 326e587c3be..765d52e8eb0 100644
--- a/src/runningelement.cpp
+++ b/src/runningelement.cpp
@@ -185,7 +185,7 @@ void RunningElement::SetDrawingPage(Page *page)
     }
 }
 
-int RunningElement::GetTotalHeight()
+int RunningElement::GetContentHeight()
 {
     int height = 0;
     int i;

From acc51f943da6f05907d5a66c326854f5f11695e5 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 21:33:43 +0100
Subject: [PATCH 330/403] Rename functor member and remove unused one

---
 include/vrv/functorparams.h | 6 ++----
 src/page.cpp                | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index a95bfa70b17..275dbaa6419 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -845,16 +845,14 @@ class AlignSystemsParams : public FunctorParams {
     AlignSystemsParams(Doc *doc)
     {
         m_shift = 0;
-        m_systemMargin = 0;
-        m_systemFirstMargin = 0;
+        m_systemSpacing = 0;
         m_prevBottomOverflow = 0;
         m_prevBottomClefOverflow = 0;
         m_justificationSum = 0.;
         m_doc = doc;
     }
     int m_shift;
-    int m_systemMargin;
-    int m_systemFirstMargin;
+    int m_systemSpacing;
     int m_prevBottomOverflow;
     int m_prevBottomClefOverflow;
     double m_justificationSum;
diff --git a/src/page.cpp b/src/page.cpp
index 5fdb3282db9..e2c57ce3ec3 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -550,9 +550,7 @@ void Page::LayOutVertically()
     // Adjust system Y position
     AlignSystemsParams alignSystemsParams(doc);
     alignSystemsParams.m_shift = doc->m_drawingPageContentHeight;
-    alignSystemsParams.m_systemMargin = (doc->GetOptions()->m_spacingSystem.GetValue()) * doc->GetDrawingUnit(100);
-    alignSystemsParams.m_systemFirstMargin
-        = (doc->GetOptions()->m_spacingSystemFirst.GetValue()) * doc->GetDrawingUnit(100);
+    alignSystemsParams.m_systemSpacing = (doc->GetOptions()->m_spacingSystem.GetValue()) * doc->GetDrawingUnit(100);
     Functor alignSystems(&Object::AlignSystems);
     Functor alignSystemsEnd(&Object::AlignSystemsEnd);
     this->Process(&alignSystems, &alignSystemsParams, &alignSystemsEnd);

From 8f7c6137bd9e4d9960e99e93f2e4ac962dee5e56 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 21:34:47 +0100
Subject: [PATCH 331/403] Adjust Page methods for footer / header positioning

---
 src/page.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/page.cpp b/src/page.cpp
index e2c57ce3ec3..bd762af1a71 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -680,7 +680,7 @@ int Page::GetContentHeight() const
     int height = doc->m_drawingPageContentHeight - last->GetDrawingYRel() + last->GetHeight();
 
     if (this->GetFooter()) {
-        height += this->GetFooter()->GetTotalHeight();
+        height += this->GetFooter()->GetTotalHeight(doc);
     }
 
     return height;
@@ -842,11 +842,9 @@ int Page::AlignSystems(FunctorParams *functorParams)
     RunningElement *header = this->GetHeader();
     if (header) {
         header->SetDrawingYRel(params->m_shift);
-        const int headerHeight = header->GetTotalHeight();
+        const int headerHeight = header->GetTotalHeight(params->m_doc);
         if (headerHeight > 0) {
-            const int bottomMarginPgHead
-                = params->m_doc->GetOptions()->m_bottomMarginPgHead.GetValue() * params->m_doc->GetDrawingUnit(100);
-            params->m_shift -= header->GetTotalHeight() + bottomMarginPgHead;
+            params->m_shift -= headerHeight;
         }
     }
     return FUNCTOR_CONTINUE;
@@ -862,18 +860,20 @@ int Page::AlignSystemsEnd(FunctorParams *functorParams)
 
     RunningElement *footer = this->GetFooter();
     if (footer) {
-        m_drawingJustifiableHeight -= footer->GetTotalHeight();
+        m_drawingJustifiableHeight -= footer->GetTotalHeight(params->m_doc);
 
         // Move it up below the last system
         if (params->m_doc->GetOptions()->m_adjustPageHeight.GetValue()) {
             if (this->GetChildCount()) {
                 System *last = dynamic_cast<System *>(this->GetLast(SYSTEM));
                 assert(last);
-                footer->SetDrawingYRel(last->GetDrawingYRel() - last->GetHeight());
+                const int unit = params->m_doc->GetDrawingUnit(100);
+                const int topMargin = params->m_doc->GetOptions()->m_topMarginPgFooter.GetValue() * unit;
+                footer->SetDrawingYRel(last->GetDrawingYRel() - last->GetHeight() - topMargin);
             }
         }
         else {
-            footer->SetDrawingYRel(footer->GetTotalHeight());
+            footer->SetDrawingYRel(footer->GetContentHeight());
         }
     }
 

From 3a26f439919e7e7b9272c3007f1fd99c7b19e1d0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 21:35:21 +0100
Subject: [PATCH 332/403] Add PgFoot2 methods and adjustments missed in
 previous commit

---
 src/pgfoot2.cpp | 14 ++++++++++++++
 src/score.cpp   |  8 ++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/pgfoot2.cpp b/src/pgfoot2.cpp
index a8de40b7003..4b1d4c3aa9d 100644
--- a/src/pgfoot2.cpp
+++ b/src/pgfoot2.cpp
@@ -13,6 +13,8 @@
 
 //----------------------------------------------------------------------------
 
+#include "doc.h"
+
 namespace vrv {
 
 //----------------------------------------------------------------------------
@@ -33,6 +35,18 @@ void PgFoot2::Reset()
     RunningElement::Reset();
 }
 
+int PgFoot2::GetTotalHeight(Doc *doc)
+{
+    assert(doc);
+
+    int height = this->GetContentHeight();
+    if (height > 0) {
+        const int unit = doc->GetDrawingUnit(100);
+        height += doc->GetOptions()->m_topMarginPgFooter.GetValue() * unit;
+    }
+    return height;
+}
+
 //----------------------------------------------------------------------------
 // Functor methods
 //----------------------------------------------------------------------------
diff --git a/src/score.cpp b/src/score.cpp
index e77ae9a74af..4dfd0628a2c 100644
--- a/src/score.cpp
+++ b/src/score.cpp
@@ -114,8 +114,8 @@ void Score::CalcRunningElementHeight(Doc *doc)
     RunningElement *page1Header = page1->GetHeader();
     RunningElement *page1Footer = page1->GetFooter();
 
-    m_drawingPgHeadHeight = (page1Header) ? page1Header->GetTotalHeight() : 0;
-    m_drawingPgFootHeight = (page1Footer) ? page1Footer->GetTotalHeight() : 0;
+    m_drawingPgHeadHeight = (page1Header) ? page1Header->GetTotalHeight(doc) : 0;
+    m_drawingPgFootHeight = (page1Footer) ? page1Footer->GetTotalHeight(doc) : 0;
 
     Page *page2 = new Page();
     page2->m_score = this;
@@ -127,8 +127,8 @@ void Score::CalcRunningElementHeight(Doc *doc)
     RunningElement *page2Header = page2->GetHeader();
     RunningElement *page2Footer = page2->GetFooter();
 
-    m_drawingPgHead2Height = (page2Header) ? page2Header->GetTotalHeight() : 0;
-    m_drawingPgFoot2Height = (page2Footer) ? page2Footer->GetTotalHeight() : 0;
+    m_drawingPgHead2Height = (page2Header) ? page2Header->GetTotalHeight(doc) : 0;
+    m_drawingPgFoot2Height = (page2Footer) ? page2Footer->GetTotalHeight(doc) : 0;
 
     pages->DeleteChild(page1);
     pages->DeleteChild(page2);

From 2742cf3de52cee5a04601648dcbfd93aea4e7d05 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 21:37:05 +0100
Subject: [PATCH 333/403] Adjust StaffAlignment::GetMinimumSpacing to set half
 a staff space above and below the system

---
 src/verticalaligner.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index 2315f6ea659..38cddfb7557 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -445,6 +445,8 @@ int StaffAlignment::GetMinimumSpacing(const Doc *doc) const
 {
     assert(doc);
 
+    const AttSpacing *scoreDefSpacing = this->GetAttSpacing();
+
     int spacing = 0;
     if (m_staff && m_staff->m_drawingStaffDef) {
         // Default or staffDef spacing
@@ -452,10 +454,10 @@ int StaffAlignment::GetMinimumSpacing(const Doc *doc) const
             spacing = m_staff->m_drawingStaffDef->GetSpacing() * doc->GetDrawingUnit(100);
         }
         else {
-            const AttSpacing *scoreDefSpacing = this->GetAttSpacing();
             switch (m_spacingType) {
                 case SystemAligner::SpacingType::System: {
-                    spacing = this->GetParentSystem()->GetMinimumSystemSpacing(doc);
+                    // Top staff spacing (above) is half of a staff spacing
+                    spacing = this->GetMinimumStaffSpacing(doc, scoreDefSpacing) / 2;
                     break;
                 }
                 case SystemAligner::SpacingType::Staff: {
@@ -479,6 +481,10 @@ int StaffAlignment::GetMinimumSpacing(const Doc *doc) const
             }
         }
     }
+    // This is the bottom aligner - spacing is half of a staff spacing
+    else {
+        spacing = this->GetMinimumStaffSpacing(doc, scoreDefSpacing) / 2;
+    }
 
     return spacing;
 }

From 57e4fa4f00c7ac2f053aa50ef76d29b5058a5539 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 21:39:45 +0100
Subject: [PATCH 334/403] Adjust StaffAlignment::AlignVerticallyEnd and
 StaffAlignment::AdjustYPos

* Now first staves (SystemAligner::SpacingType::System) are treated as other staves
---
 src/verticalaligner.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index 38cddfb7557..d7b96c48f0e 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -1055,9 +1055,7 @@ int StaffAlignment::AlignVerticallyEnd(FunctorParams *functorParams)
     AlignVerticallyParams *params = vrv_params_cast<AlignVerticallyParams *>(functorParams);
     assert(params);
 
-    if (m_spacingType != SystemAligner::SpacingType::System) {
-        params->m_cumulatedShift += this->GetMinimumSpacing(params->m_doc);
-    }
+    params->m_cumulatedShift += this->GetMinimumSpacing(params->m_doc);
 
     this->SetYRel(-params->m_cumulatedShift);
 
@@ -1075,10 +1073,7 @@ int StaffAlignment::AdjustYPos(FunctorParams *functorParams)
     const int defaultSpacing = this->GetMinimumSpacing(params->m_doc);
     const int minSpacing = this->CalcMinimumRequiredSpacing(params->m_doc);
 
-    if (m_spacingType == SystemAligner::SpacingType::System) {
-        params->m_cumulatedShift += minSpacing;
-    }
-    else if (minSpacing > defaultSpacing) {
+    if (minSpacing > defaultSpacing) {
         params->m_cumulatedShift += minSpacing - defaultSpacing;
     }
 

From 79ab2f1c8a872c876aac48cd8f1c6999879e746c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 21:40:12 +0100
Subject: [PATCH 335/403] Do not add a margin below the last staff

---
 src/verticalaligner.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index d7b96c48f0e..4fcbc94aca9 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -515,8 +515,9 @@ int StaffAlignment::CalcMinimumRequiredSpacing(const Doc *doc) const
         overflowSum += this->GetOverlap();
     }
 
-    // Add a margin
-    overflowSum += doc->GetBottomMargin(STAFF) * doc->GetDrawingUnit(this->GetStaffSize());
+    // Add a margin but not for the bottom aligner
+    if (m_staff) overflowSum += doc->GetBottomMargin(STAFF) * doc->GetDrawingUnit(this->GetStaffSize());
+
     if (const int adjust = prevAlignment->GetBeamAdjust()) {
         overflowSum += adjust;
     }

From 65a7052c59fbe4ae1e6aa78e38bc4e26913d1dea Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Feb 2022 21:40:28 +0100
Subject: [PATCH 336/403] Adjust system spacing calculation

---
 src/system.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/system.cpp b/src/system.cpp
index f4f8c0479b3..a93396a1377 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -753,16 +753,17 @@ int System::AlignSystems(FunctorParams *functorParams)
     assert(params);
     assert(m_systemAligner.GetBottomAlignment());
 
-    int systemMargin = this->IsFirstInPage() ? params->m_systemFirstMargin : params->m_systemMargin;
-    if (systemMargin) {
+    // No spacing for the first system
+    int systemSpacing = this->IsFirstInPage() ? 0 : params->m_systemSpacing;
+    if (systemSpacing) {
         const int contentOverflow = params->m_prevBottomOverflow + m_systemAligner.GetOverflowAbove(params->m_doc);
         const int clefOverflow
             = params->m_prevBottomClefOverflow + m_systemAligner.GetOverflowAbove(params->m_doc, true);
         // Alignment is already pre-determined with staff alignment overflow
-        // We need to subtract them from the desired margin
-        const int actualMargin = systemMargin - std::max(contentOverflow, clefOverflow);
-        // Set the margin if it exsits (greater than 0)
-        if (actualMargin > 0) params->m_shift -= actualMargin;
+        // We need to subtract them from the desired spacing
+        const int actualSpacing = systemSpacing - std::max(contentOverflow, clefOverflow);
+        // Set the spacing if it exsits (greater than 0)
+        if (actualSpacing > 0) params->m_shift -= actualSpacing;
     }
 
     this->SetDrawingYRel(params->m_shift);

From 3eacc5151546c9b5af7403e89288f53a99328574 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 10 Feb 2022 13:51:06 +0100
Subject: [PATCH 337/403] Fix typo and make changes in logs of test-suite-diff 
 more visible with *****

---
 doc/test-suite-diff.py | 2 +-
 src/system.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/test-suite-diff.py b/doc/test-suite-diff.py
index d05dca7eb36..17db1b2944e 100644
--- a/doc/test-suite-diff.py
+++ b/doc/test-suite-diff.py
@@ -207,7 +207,7 @@ def end_webpage(html, body, htmlOutFile):
             span = etree.SubElement(link, 'span', attrib={'class': 'badge'})
             span.text = str(nbChanges)
 
-            log.append("* {}: {}".format(item1, nbChanges))
+            log.append("****** {}: {} ******".format(item1, nbChanges))
             categoryChanges += 1
             totalChanges += nbChanges
 
diff --git a/src/system.cpp b/src/system.cpp
index a93396a1377..037e7dbba83 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -762,7 +762,7 @@ int System::AlignSystems(FunctorParams *functorParams)
         // Alignment is already pre-determined with staff alignment overflow
         // We need to subtract them from the desired spacing
         const int actualSpacing = systemSpacing - std::max(contentOverflow, clefOverflow);
-        // Set the spacing if it exsits (greater than 0)
+        // Set the spacing if it exists (greater than 0)
         if (actualSpacing > 0) params->m_shift -= actualSpacing;
     }
 

From 7394fd51ba1e0b352c90a402da2c8cf6d436a026 Mon Sep 17 00:00:00 2001
From: Andrew Hankinson <andrew.hankinson@gmail.com>
Date: Fri, 11 Feb 2022 10:52:30 +0100
Subject: [PATCH 338/403] Fixed: Deprecate Python 3.6, add 3.10

Fixes #2635
---
 .github/workflows/python-ci-wheel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci-wheel.yml b/.github/workflows/python-ci-wheel.yml
index 7887ec8b097..7e82189867a 100644
--- a/.github/workflows/python-ci-wheel.yml
+++ b/.github/workflows/python-ci-wheel.yml
@@ -24,7 +24,7 @@ jobs:
       # Build the wheels for Linux, Windows and macOS for Python 3.9
       matrix:
         os: [macos-latest, windows-latest, ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, 3.10]
         architecture: [x86, x64]
         include:
           - os: macos-latest

From 420058007226e49700351ec81a78ed9f6960f78b Mon Sep 17 00:00:00 2001
From: Andrew Hankinson <andrew.hankinson@gmail.com>
Date: Fri, 11 Feb 2022 11:38:42 +0100
Subject: [PATCH 339/403] Put 3.10 in quotes to avoid interpretation as 3.1

---
 .github/workflows/python-ci-wheel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci-wheel.yml b/.github/workflows/python-ci-wheel.yml
index 7e82189867a..028edfaab63 100644
--- a/.github/workflows/python-ci-wheel.yml
+++ b/.github/workflows/python-ci-wheel.yml
@@ -24,7 +24,7 @@ jobs:
       # Build the wheels for Linux, Windows and macOS for Python 3.9
       matrix:
         os: [macos-latest, windows-latest, ubuntu-20.04]
-        python-version: [3.7, 3.8, 3.9, 3.10]
+        python-version: [3.7, 3.8, 3.9, '3.10']
         architecture: [x86, x64]
         include:
           - os: macos-latest

From da905eba1394bcdc9bd909e6becd8daeeac2168c Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 11 Feb 2022 13:31:36 +0200
Subject: [PATCH 340/403] Fix possible memory leak

---
 src/ioabc.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index cdd9d196568..1622328c2e1 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -1028,10 +1028,10 @@ void ABCInput::InitScoreAndSection(Score *&score, Section *&section)
 void ABCInput::parseLyrics()
 {
     std::vector<std::pair<Syl *, int>> syllables;
-    constexpr std::string_view delimeters = "~\\-_ ";
+    constexpr std::string_view delimiters = "~\\-_ ";
     // skipping w:, so start from third element
     std::size_t start = 2;
-    std::size_t found = abcLine.find_first_of(delimeters, 2);
+    std::size_t found = abcLine.find_first_of(delimiters, 2);
     while (found != std::string::npos) {
         // Counter indicates for how many notes verse should be held. This defaults to 1, unless '_' is found
         int counter = 1;
@@ -1059,7 +1059,7 @@ void ABCInput::parseLyrics()
                 sylType = sylLog_CON_d;
             }
         }
-        // separate syllable from delimeters to form syl that we want to add
+        // separate syllable from delimiters to form syl that we want to add
         syllable = abcLine.substr(start, found - start);
         syllable.erase(
             std::remove_if(syllable.begin(), syllable.end(), [](unsigned char x) { return (x == '_') || (x == '\\'); }),
@@ -1078,8 +1078,8 @@ void ABCInput::parseLyrics()
 
         // find next delimeter in the string
         start = found + 1;
-        found = abcLine.find_first_of(delimeters, start);
-        // if none found, the rest of the string is going to server as last syl
+        found = abcLine.find_first_of(delimiters, start);
+        // if none found, the rest of the string is going to serve as last syl
         if ((found == std::string::npos) && (start < abcLine.size())) {
             std::string syllable = abcLine.substr(start);
             if (!syllable.empty() && syllable[syllable.size() - 1] == '\r') syllable.erase(syllable.size() - 1);
@@ -1109,6 +1109,11 @@ void ABCInput::parseLyrics()
         verse->AddChild(syllables.at(j).first);
         i += syllables.at(j).second;
     }
+    // clean up syllables that were not added to any of the layer elements
+    for (const auto syl : syllables) {
+        if (!syl.first->GetParent()) delete syl.first;
+    }
+
     // increment verse number, in case next line in file is also w:
     ++m_verseNumber;
 }

From 8e6aa680e48ca09d8e1fe1300254be2a9c86a3a2 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Fri, 11 Feb 2022 12:33:14 +0100
Subject: [PATCH 341/403] add Python 3.10

use quotes
use pypa/cibuildwheel
---
 .github/workflows/python-ci-wheel.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/python-ci-wheel.yml b/.github/workflows/python-ci-wheel.yml
index 7887ec8b097..b3c9e6b0f99 100644
--- a/.github/workflows/python-ci-wheel.yml
+++ b/.github/workflows/python-ci-wheel.yml
@@ -21,10 +21,10 @@ jobs:
     strategy:
       # Ensure that a wheel builder finishes even if another fails
       fail-fast: false
-      # Build the wheels for Linux, Windows and macOS for Python 3.9
+      # Build the wheels for Linux, Windows and macOS for Python 3.10
       matrix:
         os: [macos-latest, windows-latest, ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         architecture: [x86, x64]
         include:
           - os: macos-latest
@@ -82,15 +82,14 @@ jobs:
       #===============================================#
       # wheels
       - name: Build wheels
-        uses: joerick/cibuildwheel@f3dae81e82da2a2a36338269e32f3adb7b42dc8c
+        uses: pypa/cibuildwheel@v2.3.1
         with:
           output-dir: wheelhouse
         env:
           CIBW_SKIP: cp27-* # manylinux2014 not compatible with python 2.7
           CIBW_BUILD: ${{ env.CIBW_BUILD_IDENTIFIER }}
-          # TODO: change back to "manylinux2014" when cibuildwheel releases new version
-          CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64:2021-02-17-8d1372a
-          CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2014_i686:2021-02-17-8d1372a
+          CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64
+          CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2014_i686
           CIBW_BEFORE_ALL_MACOS: brew update && brew install swig
           CIBW_BEFORE_ALL_WINDOWS: choco install swig -f -y
           CIBW_BEFORE_BUILD: swig -version && bash -c 'cd tools; ./get_git_commit.sh' && swig -c++ -python -py3 ./bindings/python/verovio.i

From a08dc765c0eb17f7ad82fec0f06c66991e3ef308 Mon Sep 17 00:00:00 2001
From: Andrew Hankinson <andrew.hankinson@gmail.com>
Date: Fri, 11 Feb 2022 13:16:13 +0100
Subject: [PATCH 342/403] Apply suggested change from @musicEnfanthen

---
 .github/workflows/python-ci-wheel.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-ci-wheel.yml b/.github/workflows/python-ci-wheel.yml
index b3c9e6b0f99..a16ddf1247c 100644
--- a/.github/workflows/python-ci-wheel.yml
+++ b/.github/workflows/python-ci-wheel.yml
@@ -88,8 +88,8 @@ jobs:
         env:
           CIBW_SKIP: cp27-* # manylinux2014 not compatible with python 2.7
           CIBW_BUILD: ${{ env.CIBW_BUILD_IDENTIFIER }}
-          CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64
-          CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2014_i686
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
           CIBW_BEFORE_ALL_MACOS: brew update && brew install swig
           CIBW_BEFORE_ALL_WINDOWS: choco install swig -f -y
           CIBW_BEFORE_BUILD: swig -version && bash -c 'cd tools; ./get_git_commit.sh' && swig -c++ -python -py3 ./bindings/python/verovio.i

From 04e63a99818ac423a135de9546940e3dd9cdcd52 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 11 Feb 2022 15:26:26 +0100
Subject: [PATCH 343/403] Add getter for Note::m_stemSameasRole

---
 include/vrv/note.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index 6a1df110ace..bd247e9f9d1 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -225,6 +225,11 @@ class Note : public LayerElement,
     void SetStemSameasNote(Note *stemSameas) { m_stemSameas = stemSameas; }
     ///@}
 
+    /**
+     * Getter for stem sameas role
+     */
+    StemSameasDrawingRole GetStemSameasRole() const { return m_stemSameasRole; }
+
     /**
      * Resovle @stem.sameas links by instanciating Note::m_stemSameas (*Note).
      * Called twice from Object::PrepareLinks. Once to fill uuid / note pairs,

From 49349a3d47dfcd852173cd9fcfc9145eb5f337b0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 11 Feb 2022 15:27:19 +0100
Subject: [PATCH 344/403] Skip stem.mod for notes with stem.sameas (including
 in btrem). Fixes #2639

---
 src/elementpart.cpp  | 4 ++--
 src/view_element.cpp | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/elementpart.cpp b/src/elementpart.cpp
index 51889c2f76a..660849159b8 100644
--- a/src/elementpart.cpp
+++ b/src/elementpart.cpp
@@ -531,11 +531,11 @@ int Stem::CalcStem(FunctorParams *functorParams)
 
     int slashFactor = 0;
     // In case there is explicitly specified stem mod for slashes
-    if (this->HasStemMod() && (this->GetStemMod() < 8)) {
+    if (!params->m_stemSameas && this->HasStemMod() && (this->GetStemMod() < 8)) {
         slashFactor = this->GetStemMod() - 1;
     }
     // otherwise check whether it's trem and its @unitdir attribute is shorter than duration
-    else if (this->GetFirstAncestor(BTREM)) {
+    else if (!params->m_stemSameas && this->GetFirstAncestor(BTREM)) {
         BTrem *bTrem = vrv_cast<BTrem *>(this->GetFirstAncestor(BTREM));
         assert(bTrem);
         if (bTrem->HasUnitdur() && (bTrem->GetUnitdur() > DURATION_4)) {
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 113f3e2ccd4..85fd9acdad5 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -481,6 +481,12 @@ void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 
     this->DrawLayerChildren(dc, bTrem, layer, staff, measure);
 
+    if (childNote && childNote->HasStemSameasNote() && childNote->GetStemSameasRole() == SAMEAS_SECONDARY) {
+        bTrem->SetEmptyBB();
+        dc->EndGraphic(element, this);
+        return;
+    }
+
     // Get stem values from the chord or note child
     if (childChord) {
         Stem *stem = childChord->GetDrawingStem();

From f06ba3aed5ea2b1aafad7685549be2ce01eb33a6 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 14 Feb 2022 07:32:52 +0100
Subject: [PATCH 345/403] Pass by reference

---
 src/ioabc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 1622328c2e1..9fe48d487ec 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -1110,7 +1110,7 @@ void ABCInput::parseLyrics()
         i += syllables.at(j).second;
     }
     // clean up syllables that were not added to any of the layer elements
-    for (const auto syl : syllables) {
+    for (const auto &syl : syllables) {
         if (!syl.first->GetParent()) delete syl.first;
     }
 

From 7e593407103cfdf5facf79f75fef0f76d7a73a78 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 14 Feb 2022 08:29:33 +0100
Subject: [PATCH 346/403] Fix wrong assertion

---
 src/elementpart.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/elementpart.cpp b/src/elementpart.cpp
index 660849159b8..7ffcca4c915 100644
--- a/src/elementpart.cpp
+++ b/src/elementpart.cpp
@@ -547,10 +547,11 @@ int Stem::CalcStem(FunctorParams *functorParams)
     // There is never a flag with stem sameas notes or with a duration longer than 8th notes
     if (!params->m_stemSameas && params->m_dur > DUR_4) {
         flag = vrv_cast<Flag *>(this->GetFirst(FLAG));
-        assert(flag);
-        flag->m_drawingNbFlags = params->m_dur - DUR_4;
-        if (!this->HasStemLen() && !this->IsGraceNote() && this->HasStemMod()) {
-            slashFactor += (params->m_dur > DUR_8) ? 2 : 1;
+        if (flag) {
+            flag->m_drawingNbFlags = params->m_dur - DUR_4;
+            if (!this->HasStemLen() && !this->IsGraceNote() && this->HasStemMod()) {
+                slashFactor += (params->m_dur > DUR_8) ? 2 : 1;
+            }
         }
     }
 

From 4bded7475058c75265be999c484c583b1dde2174 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 14 Feb 2022 10:29:47 +0100
Subject: [PATCH 347/403] Fix issue with stem flags with stem.sameas. Closes
 #2627

---
 src/elementpart.cpp | 16 +++++++++++-----
 src/note.cpp        |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/elementpart.cpp b/src/elementpart.cpp
index 660849159b8..87e86e4ad46 100644
--- a/src/elementpart.cpp
+++ b/src/elementpart.cpp
@@ -544,13 +544,19 @@ int Stem::CalcStem(FunctorParams *functorParams)
     }
 
     Flag *flag = NULL;
-    // There is never a flag with stem sameas notes or with a duration longer than 8th notes
-    if (!params->m_stemSameas && params->m_dur > DUR_4) {
+    // There is never a flag with a duration longer than 8th notes
+    if (params->m_dur > DUR_4) {
         flag = vrv_cast<Flag *>(this->GetFirst(FLAG));
         assert(flag);
-        flag->m_drawingNbFlags = params->m_dur - DUR_4;
-        if (!this->HasStemLen() && !this->IsGraceNote() && this->HasStemMod()) {
-            slashFactor += (params->m_dur > DUR_8) ? 2 : 1;
+        // There is never a flag with stem sameas notes
+        if (params->m_stemSameas) {
+            flag->m_drawingNbFlags = 0;
+        }
+        else {
+            flag->m_drawingNbFlags = params->m_dur - DUR_4;
+            if (!this->HasStemLen() && !this->IsGraceNote() && this->HasStemMod()) {
+                slashFactor += (params->m_dur > DUR_8) ? 2 : 1;
+            }
         }
     }
 
diff --git a/src/note.cpp b/src/note.cpp
index a1b9af61bd5..51f65f3171c 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1287,7 +1287,7 @@ int Note::PrepareLayerElementParts(FunctorParams *functorParams)
     }
 
     if ((this->GetActualDur() > DUR_4) && !this->IsInBeam() && !this->IsInFTrem() && !this->IsChordTone()
-        && !this->IsMensuralDur() && !this->HasStemSameasNote() && !this->IsTabGrpNote()) {
+        && !this->IsMensuralDur() && !this->IsTabGrpNote()) {
         // We should have a stem at this stage
         assert(currentStem);
         if (!currentFlag) {

From 1f738f429c23c742aa966b7ced1ad02931fe4232 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 14 Feb 2022 10:31:03 +0100
Subject: [PATCH 348/403] Rename functor member to m_isStemSameasSecondary

---
 include/vrv/functorparams.h |  4 ++--
 src/chord.cpp               |  2 +-
 src/elementpart.cpp         | 14 +++++++-------
 src/note.cpp                |  4 ++--
 src/tabdursym.cpp           |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index eb9f7e3af8b..1237590f832 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1078,7 +1078,7 @@ class CalcStemParams : public FunctorParams {
         m_verticalCenter = 0;
         m_dur = DUR_1;
         m_isGraceNote = false;
-        m_stemSameas = false;
+        m_isStemSameasSecondary = false;
         m_tabGrpWithNoNote = false;
         m_staff = NULL;
         m_layer = NULL;
@@ -1089,7 +1089,7 @@ class CalcStemParams : public FunctorParams {
     int m_verticalCenter;
     int m_dur;
     bool m_isGraceNote;
-    bool m_stemSameas;
+    bool m_isStemSameasSecondary;
     bool m_tabGrpWithNoNote;
     Staff *m_staff;
     Layer *m_layer;
diff --git a/src/chord.cpp b/src/chord.cpp
index 77b983a7fae..e5e31147f08 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -696,7 +696,7 @@ int Chord::CalcStem(FunctorParams *functorParams)
     params->m_interface = this;
     params->m_dur = this->GetActualDur();
     params->m_isGraceNote = this->IsGraceNote();
-    params->m_stemSameas = false;
+    params->m_isStemSameasSecondary = false;
 
     /************ Set the direction ************/
 
diff --git a/src/elementpart.cpp b/src/elementpart.cpp
index 87e86e4ad46..79361f54826 100644
--- a/src/elementpart.cpp
+++ b/src/elementpart.cpp
@@ -488,7 +488,7 @@ int Stem::CalcStem(FunctorParams *functorParams)
         baseStem = this->GetStemLen() * -params->m_doc->GetDrawingUnit(staffSize);
     }
     // Do not adjust the baseStem for stem sameas notes (its length is in m_chordStemLength)
-    else if (!params->m_stemSameas) {
+    else if (!params->m_isStemSameasSecondary) {
         int thirdUnit = params->m_doc->GetDrawingUnit(staffSize) / 3;
         const data_STEMDIRECTION stemDir = params->m_interface->GetDrawingStemDir();
         baseStem = -(params->m_interface->CalcStemLenInThirdUnits(params->m_staff, stemDir) * thirdUnit);
@@ -508,7 +508,7 @@ int Stem::CalcStem(FunctorParams *functorParams)
                 p = params->m_interface->GetStemUpSE(params->m_doc, staffSize, drawingCueSize);
                 p.x -= stemShift;
             }
-            const int stemShotening = (params->m_stemSameas) ? 0 : p.y;
+            const int stemShotening = (params->m_isStemSameasSecondary) ? 0 : p.y;
             this->SetDrawingStemLen(baseStem + params->m_chordStemLength + stemShotening);
         }
         else {
@@ -520,7 +520,7 @@ int Stem::CalcStem(FunctorParams *functorParams)
                 p = params->m_interface->GetStemDownNW(params->m_doc, staffSize, drawingCueSize);
                 p.x += stemShift;
             }
-            const int stemShotening = (params->m_stemSameas) ? 0 : p.y;
+            const int stemShotening = (params->m_isStemSameasSecondary) ? 0 : p.y;
             this->SetDrawingStemLen(-(baseStem + params->m_chordStemLength - stemShotening));
         }
         this->SetDrawingYRel(this->GetDrawingYRel() + p.y);
@@ -531,11 +531,11 @@ int Stem::CalcStem(FunctorParams *functorParams)
 
     int slashFactor = 0;
     // In case there is explicitly specified stem mod for slashes
-    if (!params->m_stemSameas && this->HasStemMod() && (this->GetStemMod() < 8)) {
+    if (!params->m_isStemSameasSecondary && this->HasStemMod() && (this->GetStemMod() < 8)) {
         slashFactor = this->GetStemMod() - 1;
     }
     // otherwise check whether it's trem and its @unitdir attribute is shorter than duration
-    else if (!params->m_stemSameas && this->GetFirstAncestor(BTREM)) {
+    else if (!params->m_isStemSameasSecondary && this->GetFirstAncestor(BTREM)) {
         BTrem *bTrem = vrv_cast<BTrem *>(this->GetFirstAncestor(BTREM));
         assert(bTrem);
         if (bTrem->HasUnitdur() && (bTrem->GetUnitdur() > DURATION_4)) {
@@ -549,7 +549,7 @@ int Stem::CalcStem(FunctorParams *functorParams)
         flag = vrv_cast<Flag *>(this->GetFirst(FLAG));
         assert(flag);
         // There is never a flag with stem sameas notes
-        if (params->m_stemSameas) {
+        if (params->m_isStemSameasSecondary) {
             flag->m_drawingNbFlags = 0;
         }
         else {
@@ -582,7 +582,7 @@ int Stem::CalcStem(FunctorParams *functorParams)
 
     // Do not adjust the length with stem sameas notes or if given in the encoding
     // however, the stem will be extend with the SMuFL extension from 32th - this can be improved
-    if (params->m_stemSameas || this->HasStemLen()) {
+    if (params->m_isStemSameasSecondary || this->HasStemLen()) {
         if ((this->GetStemLen() == 0) && flag) flag->m_drawingNbFlags = 0;
         return FUNCTOR_CONTINUE;
     }
diff --git a/src/note.cpp b/src/note.cpp
index 51f65f3171c..843b831b025 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1009,7 +1009,7 @@ int Note::CalcStem(FunctorParams *functorParams)
     params->m_interface = this;
     params->m_dur = this->GetActualDur();
     params->m_isGraceNote = this->IsGraceNote();
-    params->m_stemSameas = false;
+    params->m_isStemSameasSecondary = false;
 
     int staffSize = staff->m_drawingStaffSize;
 
@@ -1046,7 +1046,7 @@ int Note::CalcStem(FunctorParams *functorParams)
     // The value of m_stemSameasRole is set by Note::CalcStemDirForSameasNote
     if (this->HasStemSameasNote() && m_stemSameasRole == SAMEAS_SECONDARY) {
         params->m_chordStemLength = -std::abs(this->GetDrawingY() - this->GetStemSameasNote()->GetDrawingY());
-        params->m_stemSameas = true;
+        params->m_isStemSameasSecondary = true;
     }
 
     return FUNCTOR_CONTINUE;
diff --git a/src/tabdursym.cpp b/src/tabdursym.cpp
index a9df42f779b..a1d9284e395 100644
--- a/src/tabdursym.cpp
+++ b/src/tabdursym.cpp
@@ -194,7 +194,7 @@ int TabDurSym::CalcStem(FunctorParams *functorParams)
     params->m_interface = this;
     // Grace an stem sameas not supported in tablature
     params->m_isGraceNote = false;
-    params->m_stemSameas = false;
+    params->m_isStemSameasSecondary = false;
 
     int staffSize = params->m_staff->m_drawingStaffSize;
 

From 065de13aac25a8e0ea4fc3018ffd316d03f7ddf7 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 14 Feb 2022 08:29:33 +0100
Subject: [PATCH 349/403] Revert "Fix wrong assertion"

This reverts commit 7e593407103cfdf5facf79f75fef0f76d7a73a78.
---
 src/elementpart.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/elementpart.cpp b/src/elementpart.cpp
index 7ffcca4c915..660849159b8 100644
--- a/src/elementpart.cpp
+++ b/src/elementpart.cpp
@@ -547,11 +547,10 @@ int Stem::CalcStem(FunctorParams *functorParams)
     // There is never a flag with stem sameas notes or with a duration longer than 8th notes
     if (!params->m_stemSameas && params->m_dur > DUR_4) {
         flag = vrv_cast<Flag *>(this->GetFirst(FLAG));
-        if (flag) {
-            flag->m_drawingNbFlags = params->m_dur - DUR_4;
-            if (!this->HasStemLen() && !this->IsGraceNote() && this->HasStemMod()) {
-                slashFactor += (params->m_dur > DUR_8) ? 2 : 1;
-            }
+        assert(flag);
+        flag->m_drawingNbFlags = params->m_dur - DUR_4;
+        if (!this->HasStemLen() && !this->IsGraceNote() && this->HasStemMod()) {
+            slashFactor += (params->m_dur > DUR_8) ? 2 : 1;
         }
     }
 

From 4433ceb52196d2b999a4354e9d7b61d70cfa4744 Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Mon, 14 Feb 2022 11:19:01 +0000
Subject: [PATCH 350/403] Fix Tablature: Augmentation dots on rhythm-signs
 #2525

---
 src/view_tab.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 0fa638de630..63ed37470cd 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -197,10 +197,23 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
         if (tabDurSym->GetDrawingStem()) {
             y = tabDurSym->GetDrawingStem()->GetDrawingY();
         }
-        y += m_doc->GetDrawingUnit(glyphSize) * 0.5 * stemDirFactor;
-        x += m_doc->GetDrawingUnit(glyphSize);
+
+        int dotSize = 0;
+
+        if (staff->IsTabGuitar()) {
+            y += m_doc->GetDrawingUnit(glyphSize) * 0.5 * stemDirFactor;
+            x += m_doc->GetDrawingUnit(glyphSize);
+            dotSize = glyphSize * 2 / 3;
+        }
+        else {
+            // lute tablature
+            y += m_doc->GetDrawingUnit(glyphSize) * stemDirFactor * 3 / 2;
+            x += m_doc->GetDrawingUnit(glyphSize) * 3 / 2;
+            dotSize = glyphSize * 9 / 10;
+        }
+
         for (int i = 0; i < tabGrp->GetDots(); ++i) {
-            this->DrawDot(dc, x, y, glyphSize * 2 / 3);
+            this->DrawDot(dc, x, y, dotSize);
             // HARDCODED
             x += m_doc->GetDrawingUnit(glyphSize) * 0.75;
         }

From 667ab4af3b162ad5fb67545abe20f52d8088b9b1 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 14 Feb 2022 16:37:29 +0200
Subject: [PATCH 351/403] Adjust margins for the rests of multiple layers

---
 src/rest.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/rest.cpp b/src/rest.cpp
index 2e979f6caa1..13d450540ff 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -304,8 +304,15 @@ int Rest::GetOptimalLayerLocation(Staff *staff, Layer *layer, int defaultLocatio
     // for two layers, top layer shouldn't go below center and lower layer shouldn't go above it. Enforce this by adding
     // margin that will adjust rest position
     int marginLocation = isTopLayer ? 6 : 2;
-    if ((this->GetDur() == DURATION_2) || (this->GetDur() == DURATION_breve)) {
-        marginLocation = 4;
+    if ((this->GetDur() == DURATION_long) || (this->GetDur() == DURATION_4)) {
+        marginLocation = isTopLayer ? 8 : 0;
+    }
+    else if (this->GetDur() >= DURATION_8) {
+        marginLocation
+            = isTopLayer ? (6 + (this->GetDur() - DURATION_4) / 2 * 2) : (2 - (this->GetDur() - DURATION_8) / 2 * 2);
+    }
+    if (this->GetDur() >= DURATION_1024) {
+        marginLocation -= 2;
     }
     const int optimalLocation = isTopLayer
         ? std::max({ otherLayerRelativeLocation, currentLayerRelativeLocation, defaultLocation, marginLocation })

From d6ce860080156f4dc6400cff23b360169448f1a5 Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Mon, 14 Feb 2022 17:43:39 +0000
Subject: [PATCH 352/403] Augmentation dots, allow for font width and number of
 flags.  Add 5 flag glyph.

---
 src/view_tab.cpp | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/view_tab.cpp b/src/view_tab.cpp
index 63ed37470cd..2f43aa36c43 100644
--- a/src/view_tab.cpp
+++ b/src/view_tab.cpp
@@ -173,20 +173,21 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
     int y = element->GetDrawingY();
 
     const int glyphSize = staff->GetDrawingStaffNotationSize();
+    const int drawingDur = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
 
     // For beam and guitar notation, stem are drawn through the child Stem
     if (!tabGrp->IsInBeam() && !staff->IsTabGuitar()) {
-        const int drawingDur
-            = (tabGrp->GetDurGes() != DURATION_NONE) ? tabGrp->GetActualDurGes() : tabGrp->GetActualDur();
-
         int symc = 0;
         switch (drawingDur) {
-            case DUR_2: symc = SMUFL_EBA7_luteDurationWhole; break;
-            case DUR_4: symc = SMUFL_EBA8_luteDurationHalf; break;
-            case DUR_8: symc = SMUFL_EBA9_luteDurationQuarter; break;
-            case DUR_16: symc = SMUFL_EBAA_luteDuration8th; break;
-            case DUR_32: symc = SMUFL_EBAB_luteDuration16th; break;
-            default: symc = SMUFL_EBA9_luteDurationQuarter;
+                // TODO SMUFL_EBA6_luteDurationDoubleWhole is defined by SMUFL but not yet implemented in Verovio
+                /* case DUR_1: symc = SMUFL_EBA6_luteDurationDoubleWhole; break; // 1 back flag */
+            case DUR_2: symc = SMUFL_EBA7_luteDurationWhole; break; // 0 flags
+            case DUR_4: symc = SMUFL_EBA8_luteDurationHalf; break; // 1 flag
+            case DUR_8: symc = SMUFL_EBA9_luteDurationQuarter; break; // 2 flags
+            case DUR_16: symc = SMUFL_EBAA_luteDuration8th; break; // 3 flags
+            case DUR_32: symc = SMUFL_EBAB_luteDuration16th; break; // 4 flags
+            case DUR_64: symc = SMUFL_EBAC_luteDuration32nd; break; // 5 flags
+            default: symc = SMUFL_EBA9_luteDurationQuarter; // 2 flags
         }
 
         this->DrawSmuflCode(dc, x, y, symc, glyphSize, true);
@@ -200,15 +201,21 @@ void View::DrawTabDurSym(DeviceContext *dc, LayerElement *element, Layer *layer,
 
         int dotSize = 0;
 
-        if (staff->IsTabGuitar()) {
+        if (tabGrp->IsInBeam() || staff->IsTabGuitar()) {
             y += m_doc->GetDrawingUnit(glyphSize) * 0.5 * stemDirFactor;
             x += m_doc->GetDrawingUnit(glyphSize);
             dotSize = glyphSize * 2 / 3;
         }
         else {
-            // lute tablature
-            y += m_doc->GetDrawingUnit(glyphSize) * stemDirFactor * 3 / 2;
-            x += m_doc->GetDrawingUnit(glyphSize) * 3 / 2;
+            // Vertical: the more flags the lower the dots
+            const int durfactor = DUR_64 - std::min(std::max(drawingDur, DUR_2), DUR_64) + 1;
+            static_assert(DUR_64 - DUR_2 + 1 == 6);
+            static_assert(DUR_64 - DUR_64 + 1 == 1);
+
+            y += m_doc->GetDrawingUnit(glyphSize) * stemDirFactor * durfactor * 2 / 5;
+
+            // Horizontal: allow for font width
+            x += m_doc->GetGlyphWidth(SMUFL_EBA9_luteDurationQuarter, glyphSize, false) / 2;
             dotSize = glyphSize * 9 / 10;
         }
 

From 5f2ada5e0d240e66826595610cd331a4c6c334bd Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Tue, 15 Feb 2022 10:19:42 +0100
Subject: [PATCH 353/403] Unify grace slur handling

---
 src/slur.cpp | 53 ++++++++++++----------------------------------------
 1 file changed, 12 insertions(+), 41 deletions(-)

diff --git a/src/slur.cpp b/src/slur.cpp
index 93c0b18dad7..6a91e119fed 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -1013,26 +1013,12 @@ std::pair<Point, Point> Slur::AdjustCoordinates(
                 y2 = end->GetDrawingTop(doc, staff->m_drawingStaffSize);
             }
             else if (isGraceToNoteSlur) {
-                if (end->IsInBeam()) {
-                    x2 += 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-                }
-                else if (parentBeam || parentFTrem) {
-                    if (end->GetDrawingY() > y1) {
-                        y2 = end->GetDrawingY() + unit * 3;
-                    }
-                    else {
-                        y2 = y1;
-                        x2 += 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-                    }
-                }
-                else {
-                    const int yMin = y1 - unit * 4;
-                    const int yTop = end->GetDrawingTop(doc, staff->m_drawingStaffSize);
-                    y2 = std::max(end->GetDrawingY() + unit * 2, yMin);
-                    if (y2 > yTop - unit * 2) {
-                        y2 = yTop;
-                        x2 += endRadius - doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-                    }
+                const int yMin = y1 - unit * 4;
+                const int yTop = end->GetDrawingTop(doc, staff->m_drawingStaffSize);
+                y2 = std::max(end->GetDrawingY() + unit * 2, yMin);
+                if (y2 > yTop - unit * 2) {
+                    y2 = yTop;
+                    x2 += endRadius - doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
                 }
             }
             // portato slurs
@@ -1071,29 +1057,14 @@ std::pair<Point, Point> Slur::AdjustCoordinates(
                 y2 = end->GetDrawingBottom(doc, staff->m_drawingStaffSize);
             }
             else if (isGraceToNoteSlur) {
-                if (end->IsInBeam()) {
-                    x2 -= endRadius + 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-                }
-                else if (parentBeam || parentFTrem) {
-                    if (end->GetDrawingY() < y1) {
-                        y2 = end->GetDrawingY();
-                        x2 -= endRadius + doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-                    }
-                    else {
-                        y2 = y1;
-                        x2 -= endRadius + doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-                    }
+                const int yMax = y1 + unit;
+                const int yBottom = end->GetDrawingBottom(doc, staff->m_drawingStaffSize);
+                y2 = std::min(end->GetDrawingY(), yMax);
+                if (y2 < yBottom + unit) {
+                    y2 = yBottom + unit * 2;
                 }
                 else {
-                    const int yMax = y1 + unit;
-                    const int yBottom = end->GetDrawingBottom(doc, staff->m_drawingStaffSize);
-                    y2 = std::min(end->GetDrawingY(), yMax);
-                    if (y2 < yBottom + unit) {
-                        y2 = yBottom + unit * 2;
-                    }
-                    else {
-                        x2 -= endRadius + 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-                    }
+                    x2 -= endRadius + 2 * doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
                 }
             }
             // portato slurs

From 3fce6e615f36c19f8fd2ac8ebe9543f39b53eff3 Mon Sep 17 00:00:00 2001
From: Craig Stuart Sapp <craigsapp@gmail.com>
Date: Tue, 15 Feb 2022 20:49:48 -0800
Subject: [PATCH 354/403] Allow display of mensur when meterSig is invisible.

---
 src/scoredef.cpp | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index eefd43ab19e..88a2c4638ca 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -343,11 +343,29 @@ void ScoreDef::ReplaceDrawingValues(StaffDef *newStaffDef)
             delete meterSig;
         }
         else if (newStaffDef->HasMeterSigInfo()) {
-            staffDef->SetDrawMeterSig(true);
-            // Never draw a meterSig AND a mensur
-            staffDef->SetDrawMensur(false);
             MeterSig *meterSig = newStaffDef->GetMeterSigCopy();
-            staffDef->SetCurrentMeterSig(meterSig);
+            if (newStaffDef->HasMensurInfo()) {
+                // If there is a mensur and the meterSig
+                // is invisible, then print mensur instead
+                data_METERFORM meterForm = meterSig->GetForm();
+                if (meterForm == METERFORM_invis) {
+                    staffDef->SetDrawMeterSig(false);
+                    staffDef->SetDrawMensur(true);
+                    Mensur *mensur = newStaffDef->GetMensurCopy();
+                    staffDef->SetCurrentMensur(mensur);
+                    delete mensur;
+                }
+                else {
+                    staffDef->SetDrawMeterSig(true);
+                    staffDef->SetDrawMensur(false);
+                    staffDef->SetCurrentMeterSig(meterSig);
+                }
+            }
+            else {
+                staffDef->SetDrawMeterSig(true);
+                staffDef->SetDrawMensur(false);
+                staffDef->SetCurrentMeterSig(meterSig);
+            }
             delete meterSig;
         }
         // copy other attributes if present

From ebd34fa2c6174d59311f7c7ac4374a2eb81396a2 Mon Sep 17 00:00:00 2001
From: Craig Stuart Sapp <craigsapp@gmail.com>
Date: Tue, 15 Feb 2022 21:46:15 -0800
Subject: [PATCH 355/403] Invisible meterSig still needed to set duration of
 mRests.

---
 src/scoredef.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index 88a2c4638ca..f7eac5c8d32 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -353,6 +353,8 @@ void ScoreDef::ReplaceDrawingValues(StaffDef *newStaffDef)
                     staffDef->SetDrawMensur(true);
                     Mensur *mensur = newStaffDef->GetMensurCopy();
                     staffDef->SetCurrentMensur(mensur);
+                    // Invisible meterSig is still needed for mRest:
+                    staffDef->SetCurrentMeterSig(meterSig);
                     delete mensur;
                 }
                 else {

From bfef0656106df218023f04f1fa8df0493acef182 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 4 Sep 2020 16:39:54 +0300
Subject: [PATCH 356/403] Add files with basic class for beamSpan

- initial commit for beamSpan implementation
---
 include/vrv/beamspan.h | 55 ++++++++++++++++++++++++++++++++++++++++++
 include/vrv/vrvdef.h   |  1 +
 src/beamspan.cpp       | 52 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 include/vrv/beamspan.h
 create mode 100644 src/beamspan.cpp

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
new file mode 100644
index 00000000000..b3fdec5eb77
--- /dev/null
+++ b/include/vrv/beamspan.h
@@ -0,0 +1,55 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        beamspan.h
+// Author:      Andriy Makarchuk
+// Created:     2020
+// Copyright (c) Authors and others. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __VRV_BEAMSPAN_H__
+#define __VRV_BEAMSPAN_H__
+
+#include "atts_cmn.h"
+#include "controlelement.h"
+#include "drawinginterface.h"
+#include "timeinterface.h"
+
+namespace vrv {
+
+//----------------------------------------------------------------------------
+// BeamSpan
+//----------------------------------------------------------------------------
+
+/**
+ * This class models the MEI <beamSpan> element.
+ */
+class BeamSpan : public ControlElement,
+                 public TimeSpanningInterface,
+                 public BeamDrawingInterface,
+                 public AttColor,
+                 public AttBeamedWith,
+                 public AttBeamRend {
+public:
+    /**
+     * @name Constructors, destructors, and other standard methods
+     * Reset method reset all attribute classes
+     */
+    ///@{
+    BeamSpan();
+    virtual ~BeamSpan();
+    virtual Object *Clone() const { return new BeamSpan(*this); }
+    virtual void Reset();
+    virtual std::string GetClassName() const { return "BeamSpan"; }
+    virtual ClassId GetClassId() const { return BEAMSPAN; }
+    ///@}
+
+private:
+    //
+public:
+    //
+private:
+    //
+};
+
+} // namespace vrv
+
+#endif //__VRV_BEAMSPAN_H__
\ No newline at end of file
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 67d2590e072..e9da8164f14 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -166,6 +166,7 @@ enum ClassId : uint16_t {
     CONTROL_ELEMENT,
     ANCHOREDTEXT,
     ARPEG,
+    BEAMSPAN,
     BRACKETSPAN,
     BREATH,
     CAESURA,
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
new file mode 100644
index 00000000000..3e16177294d
--- /dev/null
+++ b/src/beamspan.cpp
@@ -0,0 +1,52 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        beamspan.cpp
+// Author:      Andriy Makarchuk
+// Created:     2020
+// Copyright (c) Authors and others. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+
+#include "beamspan.h"
+
+//----------------------------------------------------------------------------
+
+#include <assert.h>
+
+//----------------------------------------------------------------------------
+
+#include "vrv.h"
+
+namespace vrv {
+
+//----------------------------------------------------------------------------
+// BeamSpan
+//----------------------------------------------------------------------------
+
+BeamSpan::BeamSpan()
+    : ControlElement("beamspan-")
+    , TimeSpanningInterface()
+    , BeamDrawingInterface()
+    , AttColor()
+    , AttBeamedWith()
+    , AttBeamRend()
+{
+    RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    RegisterAttClass(ATT_COLOR);
+    RegisterAttClass(ATT_BEAMEDWITH);
+    RegisterAttClass(ATT_BEAMREND);
+
+    Reset();
+}
+
+BeamSpan::~BeamSpan() {}
+
+void BeamSpan::Reset()
+{
+    ControlElement::Reset();
+    TimeSpanningInterface::Reset();
+    BeamDrawingInterface::Reset();
+    ResetColor();
+    ResetBeamedWith();
+    ResetBeamRend();
+}
+
+} // namespace vrv
\ No newline at end of file

From dbefe9479ac191a695cd0f99b0422d9aad7eee9b Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 4 Sep 2020 18:10:28 +0300
Subject: [PATCH 357/403] Add MEI I/O for beamSpan

- added MEI read/write functions for beamSpan
- added TimePointingInterface to support startId
- other minor changes
---
 include/vrv/beamspan.h |  4 ++++
 include/vrv/iomei.h    |  3 +++
 include/vrv/view.h     |  1 +
 src/beamspan.cpp       |  2 ++
 src/iomei.cpp          | 29 +++++++++++++++++++++++++++++
 src/system.cpp         |  3 +++
 6 files changed, 42 insertions(+)

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index b3fdec5eb77..e229a97327b 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -9,6 +9,7 @@
 #define __VRV_BEAMSPAN_H__
 
 #include "atts_cmn.h"
+#include "beam.h"
 #include "controlelement.h"
 #include "drawinginterface.h"
 #include "timeinterface.h"
@@ -23,6 +24,7 @@ namespace vrv {
  * This class models the MEI <beamSpan> element.
  */
 class BeamSpan : public ControlElement,
+                 public TimePointInterface, 
                  public TimeSpanningInterface,
                  public BeamDrawingInterface,
                  public AttColor,
@@ -46,6 +48,8 @@ class BeamSpan : public ControlElement,
     //
 public:
     //
+    BeamSegment m_beamSegment;
+
 private:
     //
 };
diff --git a/include/vrv/iomei.h b/include/vrv/iomei.h
index 66b0ad57f7f..0687f70c719 100644
--- a/include/vrv/iomei.h
+++ b/include/vrv/iomei.h
@@ -33,6 +33,7 @@ class Arpeg;
 class Artic;
 class BarLine;
 class Beam;
+class BeamSpan;
 class BeatRpt;
 class BracketSpan;
 class Breath;
@@ -390,6 +391,7 @@ class MEIOutput : public Output {
     ///@{
     void WriteAnchoredText(pugi::xml_node currentNode, AnchoredText *anchoredText);
     void WriteArpeg(pugi::xml_node currentNode, Arpeg *arpeg);
+    void WriteBeamSpan(pugi::xml_node currentNode, BeamSpan *beamSpan);
     void WriteBracketSpan(pugi::xml_node currentNode, BracketSpan *bracketSpan);
     void WriteBreath(pugi::xml_node currentNode, Breath *breath);
     void WriteCaesura(pugi::xml_node currentNode, Caesura *caesura);
@@ -686,6 +688,7 @@ class MEIInput : public Input {
     ///@{
     bool ReadAnchoredText(Object *parent, pugi::xml_node anchoredText);
     bool ReadArpeg(Object *parent, pugi::xml_node arpeg);
+    bool ReadBeamSpan(Object *parent, pugi::xml_node beamSpan);
     bool ReadBracketSpan(Object *parent, pugi::xml_node bracketSpan);
     bool ReadBreath(Object *parent, pugi::xml_node breath);
     bool ReadCaesura(Object *parent, pugi::xml_node caesura);
diff --git a/include/vrv/view.h b/include/vrv/view.h
index 6f547fe0051..d409279f5a7 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -23,6 +23,7 @@ class Arpeg;
 class BarLine;
 class Beam;
 class BeamSegment;
+class BeamSpan;
 class BracketSpan;
 class Breath;
 class Chord;
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index 3e16177294d..ff74cceddb1 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -23,12 +23,14 @@ namespace vrv {
 
 BeamSpan::BeamSpan()
     : ControlElement("beamspan-")
+    , TimePointInterface()
     , TimeSpanningInterface()
     , BeamDrawingInterface()
     , AttColor()
     , AttBeamedWith()
     , AttBeamRend()
 {
+    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
     RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     RegisterAttClass(ATT_COLOR);
     RegisterAttClass(ATT_BEAMEDWITH);
diff --git a/src/iomei.cpp b/src/iomei.cpp
index f206f87322c..538f1217a70 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -23,6 +23,7 @@
 #include "arpeg.h"
 #include "artic.h"
 #include "beam.h"
+#include "beamspan.h"
 #include "beatrpt.h"
 #include "bracketspan.h"
 #include "breath.h"
@@ -1709,6 +1710,18 @@ void MEIOutput::WriteArpeg(pugi::xml_node currentNode, Arpeg *arpeg)
     arpeg->WriteEnclosingChars(currentNode);
 }
 
+void MEIOutput::WriteBeamSpan(pugi::xml_node currentNode, BeamSpan *beamSpan)
+{
+    assert(beamSpan);
+
+    WriteControlElement(currentNode, beamSpan);
+    WriteTimePointInterface(currentNode, beamSpan);
+    WriteTimeSpanningInterface(currentNode, beamSpan);
+    beamSpan->WriteColor(currentNode);
+    beamSpan->WriteBeamedWith(currentNode);
+    beamSpan->WriteBeamRend(currentNode);
+}
+
 void MEIOutput::WriteBracketSpan(pugi::xml_node currentNode, BracketSpan *bracketSpan)
 {
     assert(bracketSpan);
@@ -4936,6 +4949,22 @@ bool MEIInput::ReadArpeg(Object *parent, pugi::xml_node arpeg)
     return true;
 }
 
+bool MEIInput::ReadBeamSpan(Object *parent, pugi::xml_node beamSpan)
+{
+    BeamSpan *vrvBeamSpan = new BeamSpan();
+    ReadControlElement(beamSpan, vrvBeamSpan);
+
+    ReadTimePointInterface(beamSpan, vrvBeamSpan);
+    ReadTimeSpanningInterface(beamSpan, vrvBeamSpan);
+    vrvBeamSpan->ReadColor(beamSpan);
+    vrvBeamSpan->ReadBeamedWith(beamSpan);
+    vrvBeamSpan->ReadBeamRend(beamSpan);
+
+    parent->AddChild(vrvBeamSpan);
+    ReadUnsupportedAttr(beamSpan, vrvBeamSpan);
+    return true;
+}
+
 bool MEIInput::ReadBracketSpan(Object *parent, pugi::xml_node bracketSpan)
 {
     BracketSpan *vrvBracketSpan = new BracketSpan();
diff --git a/src/system.cpp b/src/system.cpp
index 3e992c6c005..1ccb5ca6916 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -940,6 +940,9 @@ int System::AdjustFloatingPositioners(FunctorParams *functorParams)
     adjustFloatingPositionerGrpsParams.m_place = STAFFREL_below;
     m_systemAligner.Process(&adjustFloatingPositionerGrps, &adjustFloatingPositionerGrpsParams);
 
+    params->m_classId = BEAMSPAN;
+    m_systemAligner.Process(params->m_functor, params);
+
     params->m_classId = BRACKETSPAN;
     m_systemAligner.Process(params->m_functor, params);
 

From 169e298c4c80b1bc98c24e22ddfc5bec091e6782 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 7 Sep 2020 18:40:47 +0300
Subject: [PATCH 358/403] Add calls to read/write MEI for beamSpan and remove
 rendant inheritance

- removed TimePointingInterface since it's redundant
- replaced previous ReadBeamSpanAsBeam call with proper ReadBeamSpan call; added call for writing as well
- added getters for interfaces
---
 include/vrv/beamspan.h | 9 ++++++++-
 src/beamspan.cpp       | 2 --
 src/iomei.cpp          | 9 +++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index e229a97327b..d6d92dae267 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -24,7 +24,6 @@ namespace vrv {
  * This class models the MEI <beamSpan> element.
  */
 class BeamSpan : public ControlElement,
-                 public TimePointInterface, 
                  public TimeSpanningInterface,
                  public BeamDrawingInterface,
                  public AttColor,
@@ -44,6 +43,14 @@ class BeamSpan : public ControlElement,
     virtual ClassId GetClassId() const { return BEAMSPAN; }
     ///@}
 
+    /**
+     * @name Getter to interfaces
+     */
+    ///@{
+    virtual TimePointInterface *GetTimePointInterface() { return dynamic_cast<TimePointInterface *>(this); }
+    virtual TimeSpanningInterface *GetTimeSpanningInterface() { return dynamic_cast<TimeSpanningInterface *>(this); }
+    ////@}
+
 private:
     //
 public:
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index ff74cceddb1..3e16177294d 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -23,14 +23,12 @@ namespace vrv {
 
 BeamSpan::BeamSpan()
     : ControlElement("beamspan-")
-    , TimePointInterface()
     , TimeSpanningInterface()
     , BeamDrawingInterface()
     , AttColor()
     , AttBeamedWith()
     , AttBeamRend()
 {
-    RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
     RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     RegisterAttClass(ATT_COLOR);
     RegisterAttClass(ATT_BEAMEDWITH);
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 538f1217a70..1bc95f732f2 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -432,6 +432,10 @@ bool MEIOutput::WriteObjectInternal(Object *object, bool useCustomScoreDef)
         m_currentNode = m_currentNode.append_child("arpeg");
         this->WriteArpeg(m_currentNode, vrv_cast<Arpeg *>(object));
     }
+    else if (object->Is(BEAMSPAN)) {
+        m_currentNode = m_currentNode.append_child("beamSpan");
+        WriteBeamSpan(m_currentNode, dynamic_cast<BeamSpan *>(object));
+    }
     else if (object->Is(BRACKETSPAN)) {
         m_currentNode = m_currentNode.append_child("bracketSpan");
         this->WriteBracketSpan(m_currentNode, vrv_cast<BracketSpan *>(object));
@@ -4778,9 +4782,7 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
             success = this->ReadArpeg(parent, current);
         }
         else if (std::string(current.name()) == "beamSpan") {
-            if (!ReadBeamSpanAsBeam(dynamic_cast<Measure *>(parent), current)) {
-                LogWarning("<beamSpan> is not readable as <beam> and will be ignored");
-            }
+            ReadBeamSpan(parent, current);
         }
         else if (std::string(current.name()) == "bracketSpan") {
             success = this->ReadBracketSpan(parent, current);
@@ -4954,7 +4956,6 @@ bool MEIInput::ReadBeamSpan(Object *parent, pugi::xml_node beamSpan)
     BeamSpan *vrvBeamSpan = new BeamSpan();
     ReadControlElement(beamSpan, vrvBeamSpan);
 
-    ReadTimePointInterface(beamSpan, vrvBeamSpan);
     ReadTimeSpanningInterface(beamSpan, vrvBeamSpan);
     vrvBeamSpan->ReadColor(beamSpan);
     vrvBeamSpan->ReadBeamedWith(beamSpan);

From e96b40fcdb2c2918b307a225a3afa8fd3c157d6d Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Sep 2020 12:00:10 +0300
Subject: [PATCH 359/403] Initial implementation of the beamSpan logic

- Added DrawBeamSpan method for drawing corresponding element
- Changed FindAllBetweenParams functor to allow find only top level children without looking to the lowest node available
- Added IsInBeamSpan method and added it alongside checks for the IsInBeam for the sake of drawing stems, flags and other possible conditions

Implementation leverages existing logic for the beamSegment - all elements between start and end of the beamSpan are collected and passed to the DrawingInterface for processing.
---
 include/vrv/functorparams.h |  3 +++
 include/vrv/layerelement.h  |  2 ++
 include/vrv/view.h          |  1 +
 src/chord.cpp               |  4 ++--
 src/layerelement.cpp        | 33 +++++++++++++++++++++++++++++++++
 src/note.cpp                | 21 +++++++++++----------
 src/object.cpp              |  1 +
 src/view_beam.cpp           | 30 ++++++++++++++++++++++++++++++
 src/view_control.cpp        |  7 ++++++-
 src/view_page.cpp           |  4 ++++
 10 files changed, 93 insertions(+), 13 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 1237590f832..33450baa8d7 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1363,6 +1363,7 @@ class FillStaffCurrentTimeSpanningParams : public FunctorParams {
  * member 1: an array of all matching objects
  * member 2: the start object range
  * member 3: the end object range
+ * member 4: flag to decide whether to add children of the found elements
  **/
 
 class FindAllBetweenParams : public FunctorParams {
@@ -1373,11 +1374,13 @@ class FindAllBetweenParams : public FunctorParams {
         m_elements = elements;
         m_start = start;
         m_end = end;
+        m_includeChildren = true;
     }
     Comparison *m_comparison;
     ListOfObjects *m_elements;
     Object *m_start;
     Object *m_end;
+    bool m_includeChildren;
 };
 
 //----------------------------------------------------------------------------
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index a25ac42d67e..f7529770a7d 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -126,6 +126,8 @@ class LayerElement : public Object,
     Beam *IsInBeam();
     ///@}
 
+    bool IsInBeamSpan() const;
+
     /**
      * @name Get and set the layerN drawing value
      */
diff --git a/include/vrv/view.h b/include/vrv/view.h
index d409279f5a7..56f8a6d6ccc 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -389,6 +389,7 @@ class View {
     ///@{
     void DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
     void DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
+    void DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure);
     ///@}
 
     /**
diff --git a/src/chord.cpp b/src/chord.cpp
index e5e31147f08..a8a40a9f925 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -670,7 +670,7 @@ int Chord::CalcStem(FunctorParams *functorParams)
 
     // Stems have been calculated previously in beam or fTrem - siblings because flags do not need to
     // be processed either
-    if (this->IsInBeam() || this->IsInFTrem()) {
+    if (IsInBeam() || IsInFTrem() || IsInBeamSpan()) {
         return FUNCTOR_SIBLINGS;
     }
 
@@ -814,7 +814,7 @@ int Chord::PrepareLayerElementParts(FunctorParams *functorParams)
         currentStem->IsVirtual(true);
     }
 
-    if ((this->GetActualDur() > DUR_4) && !this->IsInBeam() && !this->IsInFTrem()) {
+    if ((GetActualDur() > DUR_4) && !IsInBeam() && !IsInBeamSpan() && !IsInFTrem()) {
         // We should have a stem at this stage
         assert(currentStem);
         if (!currentFlag) {
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index e32485ea3bc..399ffd60a14 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -18,6 +18,7 @@
 #include "accid.h"
 #include "barline.h"
 #include "beam.h"
+#include "beamspan.h"
 #include "beatrpt.h"
 #include "btrem.h"
 #include "chord.h"
@@ -236,6 +237,7 @@ Beam *LayerElement::IsInBeam()
     return NULL;
 }
 
+
 int LayerElement::GetOriginalLayerN()
 {
     int layerN = this->GetAlignmentLayerN();
@@ -243,6 +245,37 @@ int LayerElement::GetOriginalLayerN()
         layerN = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER))->GetN();
     }
     return layerN;
+
+bool LayerElement::IsInBeamSpan() const
+{
+    if (!this->Is({ CHORD, NOTE })) return false;
+
+    Measure *parentMeasure = vrv_cast<Measure *>(GetFirstAncestor(MEASURE));
+    if (!parentMeasure) return false;
+
+    Layer *parentLayer = vrv_cast<Layer *>(GetFirstAncestor(LAYER));
+    if (!parentLayer) return false;
+
+    // find all beamspans within current measure, stop processing if there are none
+    ClassIdComparison beamSpanId(BEAMSPAN);
+    ListOfObjects beamSpanElements;
+    parentMeasure->FindAllDescendantByComparison(&beamSpanElements, &beamSpanId);
+
+    if (beamSpanElements.empty()) return false;
+
+    // try to figure whether current element belongs to any of the beamSpans
+    for (auto object : beamSpanElements) {
+        BeamSpan *beamSpan = vrv_cast<BeamSpan *>(object);
+        if (!beamSpan) continue;
+
+        ClassIdsComparison classIds({ NOTE, CHORD });
+        ListOfObjects elements;
+        parentLayer->FindAllDescendantBetween(
+            &elements, &classIds, beamSpan->GetStart(), beamSpan->GetEnd(), true, false);
+        if (std::find(elements.begin(), elements.end(), this) != elements.end()) return true;
+    }
+
+    return false;
 }
 
 Staff *LayerElement::GetAncestorStaff(const StaffSearch strategy, const bool assertExistence) const
diff --git a/src/note.cpp b/src/note.cpp
index 843b831b025..68f6cb7c665 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -428,8 +428,9 @@ int Note::CalcStemLenInThirdUnits(Staff *staff, data_STEMDIRECTION stemDir)
     }
 
     // Limit shortening with duration shorter than quarter not when not in a beam
-    if ((this->GetDrawingDur() > DUR_4) && !this->IsInBeam()) {
-        if (stemDir == STEMDIRECTION_up) {
+
+    if ((this->GetDrawingDur() > DUR_4) && !this->IsInBeam() && !this->IsInBeamSpan()) {
+        if (this->GetDrawingStemDir() == STEMDIRECTION_up) {
             shortening = std::min(4, shortening);
         }
         else {
@@ -971,9 +972,9 @@ int Note::CalcStem(FunctorParams *functorParams)
         return FUNCTOR_SIBLINGS;
     }
 
-    // Stems have been calculated previously in Beam or fTrem
-    // Return to siblings because flags do not need to be processed either in that case
-    if ((this->IsInBeam() || this->IsInFTrem())) {
+    // Stems have been calculated previously in Beam or fTrem - siblings because flags do not need to
+    // be processed either
+    if (IsInBeam() || IsInFTrem() || IsInBeamSpan()) {
         return FUNCTOR_SIBLINGS;
     }
 
@@ -1179,8 +1180,8 @@ int Note::CalcDots(FunctorParams *functorParams)
         assert(dots);
 
         // Stem up, shorter than 4th and not in beam
-        if ((this->GetDots() != 0) && (params->m_chordStemDir == STEMDIRECTION_up) && (this->GetDrawingDur() > DUR_4)
-            && !this->IsInBeam()) {
+        if ((GetDots() != 0) && (params->m_chordStemDir == STEMDIRECTION_up) && (GetDrawingDur() > DUR_4) && !IsInBeam()
+            && !IsInBeamSpan()) {
             // Shift according to the flag width if the top note is not flipped
             if ((this == chord->GetTopNote()) && !this->GetFlippedNotehead()) {
                 // HARDCODED
@@ -1203,8 +1204,8 @@ int Note::CalcDots(FunctorParams *functorParams)
         if (const int shift = dots->GetFlagShift(); shift) {
             flagShift += shift;
         }
-        else if ((this->GetDrawingStemDir() == STEMDIRECTION_up) && (!this->IsInBeam())
-            && (this->GetDrawingStemLen() < 3) && (IsDotOverlappingWithFlag(params->m_doc, staffSize, isDotShifted))) {
+        else if ((this->GetDrawingStemDir() == STEMDIRECTION_up) && !this->IsInBeam() && (this->GetDrawingStemLen() < 3)
+            && !this->IsInBeamSpan() && (this->IsDotOverlappingWithFlag(params->m_doc, staffSize, isDotShifted))) {
             // HARDCODED
             const int shift = params->m_doc->GetGlyphWidth(SMUFL_E240_flag8thUp, staffSize, drawingCueSize) * 0.8;
             flagShift += shift;
@@ -1287,7 +1288,7 @@ int Note::PrepareLayerElementParts(FunctorParams *functorParams)
     }
 
     if ((this->GetActualDur() > DUR_4) && !this->IsInBeam() && !this->IsInFTrem() && !this->IsChordTone()
-        && !this->IsMensuralDur() && !this->IsTabGrpNote()) {
+        && !this->IsMensuralDur() && !this->IsTabGrpNote() && !this->IsInBeamSpan()) {
         // We should have a stem at this stage
         assert(currentStem);
         if (!currentFlag) {
diff --git a/src/object.cpp b/src/object.cpp
index 3f0b17054d3..60dd0598e86 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1423,6 +1423,7 @@ int Object::FindAllBetween(FunctorParams *functorParams)
     // evaluate by applying the Comparison operator()
     if ((*params->m_comparison)(this)) {
         params->m_elements->push_back(this);
+        if ((params->m_end != this) && !params->m_includeChildren) return FUNCTOR_SIBLINGS;
     }
 
     // We have reached the end of the range
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 2b74f9d8520..a3549c46770 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -17,6 +17,8 @@
 //----------------------------------------------------------------------------
 
 #include "beam.h"
+#include "beamspan.h"
+#include "comparison.h"
 #include "devicecontext.h"
 #include "doc.h"
 #include "ftrem.h"
@@ -418,4 +420,32 @@ void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDraw
     } // end of drawing partial bars
 }
 
+void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
+{
+    assert(dc);
+    assert(beamSpan);
+    assert(measure);
+
+    Layer *layer = vrv_cast<Layer *>(beamSpan->GetStart()->GetFirstAncestor(LAYER));
+    Staff *staff = vrv_cast<Staff *>(beamSpan->GetStart()->GetFirstAncestor(STAFF));
+    if (!layer || !staff) return;
+
+    // find all elements between startId and endId of the beamSpan
+    ClassIdsComparison classIds({ NOTE, CHORD });
+    ListOfObjects objects;
+    layer->FindAllDescendantBetween(&objects, &classIds, beamSpan->GetStart(), beamSpan->GetEnd(), true, false);
+
+    // Initialize coordinates and caclculate beam segment based on the array of element for beamSpan
+    ArrayOfObjects beamSpanElements(objects.begin(), objects.end());
+    beamSpan->InitCoords(&beamSpanElements, staff, beamSpan->GetPlace());
+    beamSpan->m_beamSegment.InitCoordRefs(&beamSpan->m_beamElementCoords);
+    beamSpan->m_drawingPlace = beamSpan->GetPlace();
+    beamSpan->m_beamSegment.CalcBeam(layer, staff, m_doc, beamSpan, beamSpan->GetPlace());
+    
+    // Draw corresponding beam segment
+    dc->StartGraphic(beamSpan, "", beamSpan->GetUuid());
+    DrawBeamSegment(dc, &beamSpan->m_beamSegment, beamSpan, layer, staff, measure);
+    dc->EndGraphic(beamSpan, this);
+}
+
 } // namespace vrv
diff --git a/src/view_control.cpp b/src/view_control.cpp
index b7459a12e58..66317f53e94 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -17,6 +17,7 @@
 
 #include "arpeg.h"
 #include "bboxdevicecontext.h"
+#include "beamspan.h"
 #include "bracketspan.h"
 #include "breath.h"
 #include "clef.h"
@@ -75,7 +76,7 @@ void View::DrawControlElement(DeviceContext *dc, ControlElement *element, Measur
     assert(element);
 
     // For dir, dynam, fermata, and harm, we do not consider the @tstamp2 for rendering
-    if (element->Is({ BRACKETSPAN, FIGURE, GLISS, HAIRPIN, LV, OCTAVE, PHRASE, PITCHINFLECTION, SLUR, TIE })) {
+    if (element->Is({ BEAMSPAN, BRACKETSPAN, FIGURE, GLISS, HAIRPIN, LV, OCTAVE, PHRASE, PITCHINFLECTION, SLUR, TIE })) {
         // create placeholder
         dc->StartGraphic(element, "", element->GetUuid());
         dc->EndGraphic(element, this);
@@ -315,6 +316,10 @@ void View::DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *s
             // cast to F check in DrawFConnector
             this->DrawFConnector(dc, dynamic_cast<F *>(element), x1, x2, *staffIter, spanningType, graphic);
         }
+        else if (element->Is(BEAMSPAN)) {
+            // cast to BeamSpan check in DrawBeamSpan
+            DrawBeamSpan(dc, dynamic_cast<BeamSpan *>(element), measure);
+        }
         else if (element->Is(BRACKETSPAN)) {
             // cast to BracketSpan check in DrawBracketSpan
             this->DrawBracketSpan(dc, dynamic_cast<BracketSpan *>(element), x1, x2, *staffIter, spanningType, graphic);
diff --git a/src/view_page.cpp b/src/view_page.cpp
index eb4687dcb5d..3bf06045c1b 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -202,6 +202,7 @@ void View::DrawSystem(DeviceContext *dc, System *system)
     this->DrawSystemChildren(dc, system, system);
 
     this->DrawSystemList(dc, system, SYL);
+	this->DrawSystemList(dc, system, BEAMSPAN);
     this->DrawSystemList(dc, system, BRACKETSPAN);
     this->DrawSystemList(dc, system, DYNAM);
     this->DrawSystemList(dc, system, DIR);
@@ -230,6 +231,9 @@ void View::DrawSystemList(DeviceContext *dc, System *system, const ClassId class
     ArrayOfObjects::iterator iter;
 
     for (iter = drawingList->begin(); iter != drawingList->end(); ++iter) {
+        if ((*iter)->Is(classId) && (classId == BEAMSPAN)) {
+            DrawTimeSpanningElement(dc, *iter, system);
+        }
         if ((*iter)->Is(classId) && (classId == BRACKETSPAN)) {
             this->DrawTimeSpanningElement(dc, *iter, system);
         }

From cab469d51ede12699b7b171ad0cd9a23437fe09b Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Sep 2020 16:29:55 +0300
Subject: [PATCH 360/403] Update beamSpan logic

- fixed beamSpan to properly handle sloped beams by adding corresponding functor
- added call to reset metadata for beam segment
---
 include/vrv/beamspan.h |  9 +++++++++
 src/beamspan.cpp       | 28 ++++++++++++++++++++++++++++
 src/view_beam.cpp      | 10 +---------
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index d6d92dae267..54af8acd44f 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -51,6 +51,15 @@ class BeamSpan : public ControlElement,
     virtual TimeSpanningInterface *GetTimeSpanningInterface() { return dynamic_cast<TimeSpanningInterface *>(this); }
     ////@}
 
+    //----------//
+    // Functors //
+    //----------//
+
+    /**
+     * See Object::CalcStem
+     */
+    virtual int CalcStem(FunctorParams *functorParams);
+
 private:
     //
 public:
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index 3e16177294d..75c9207c63e 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -13,6 +13,10 @@
 
 //----------------------------------------------------------------------------
 
+#include "comparison.h"
+#include "functorparams.h"
+#include "layer.h"
+#include "staff.h"
 #include "vrv.h"
 
 namespace vrv {
@@ -49,4 +53,28 @@ void BeamSpan::Reset()
     ResetBeamRend();
 }
 
+int BeamSpan::CalcStem(FunctorParams *functorParams)
+{
+    CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
+    assert(params);
+
+    Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
+    Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
+    if (!layer || !staff) return FUNCTOR_SIBLINGS;
+
+    // find all elements between startId and endId of the beamSpan
+    ClassIdsComparison classIds({ NOTE, CHORD });
+    ListOfObjects objects;
+    layer->FindAllDescendantBetween(&objects, &classIds, GetStart(), GetEnd(), true, false);
+
+    // Initialize coordinates and caclculate beam segment based on the array of element for beamSpan
+    ArrayOfObjects beamSpanElements(objects.begin(), objects.end());
+    InitCoords(&beamSpanElements, staff, GetPlace());
+
+    m_beamSegment.InitCoordRefs(&m_beamElementCoords);
+    m_beamSegment.CalcBeam(layer, staff, params->m_doc, this, GetPlace());
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
\ No newline at end of file
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index a3549c46770..e7da408aa71 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -430,16 +430,8 @@ void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
     Staff *staff = vrv_cast<Staff *>(beamSpan->GetStart()->GetFirstAncestor(STAFF));
     if (!layer || !staff) return;
 
-    // find all elements between startId and endId of the beamSpan
-    ClassIdsComparison classIds({ NOTE, CHORD });
-    ListOfObjects objects;
-    layer->FindAllDescendantBetween(&objects, &classIds, beamSpan->GetStart(), beamSpan->GetEnd(), true, false);
-
-    // Initialize coordinates and caclculate beam segment based on the array of element for beamSpan
-    ArrayOfObjects beamSpanElements(objects.begin(), objects.end());
-    beamSpan->InitCoords(&beamSpanElements, staff, beamSpan->GetPlace());
+    beamSpan->m_beamSegment.Reset();
     beamSpan->m_beamSegment.InitCoordRefs(&beamSpan->m_beamElementCoords);
-    beamSpan->m_drawingPlace = beamSpan->GetPlace();
     beamSpan->m_beamSegment.CalcBeam(layer, staff, m_doc, beamSpan, beamSpan->GetPlace());
     
     // Draw corresponding beam segment

From 00b923ee900c12ec54a1a619295f12f42cee6180 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 10 Sep 2020 15:04:03 +0300
Subject: [PATCH 361/403] Implement cross-measure support for the beamSpans

- added logic for handling cross-measure beamSpans
- split PreparePlist into two parts - for preparation and processing; this way elements are going to be added in the correct order (as they are described in the Plist and as they are ordered in the MEI file)
- rearranged inheritance list of the beamSpan some more
---
 include/vrv/beamspan.h     |  20 ++++++--
 include/vrv/layerelement.h |   5 ++
 include/vrv/object.h       |   9 ++++
 src/beamspan.cpp           | 101 ++++++++++++++++++++++++++++++++-----
 src/doc.cpp                |  11 +++-
 src/iomei.cpp              |   7 +--
 src/layerelement.cpp       |  29 ++---------
 src/object.cpp             |  10 ++++
 8 files changed, 144 insertions(+), 48 deletions(-)

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index 54af8acd44f..bb3c9dbbfc8 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -12,10 +12,14 @@
 #include "beam.h"
 #include "controlelement.h"
 #include "drawinginterface.h"
+#include "plistinterface.h"
 #include "timeinterface.h"
 
 namespace vrv {
 
+class Layer;
+class Staff;
+
 //----------------------------------------------------------------------------
 // BeamSpan
 //----------------------------------------------------------------------------
@@ -24,11 +28,12 @@ namespace vrv {
  * This class models the MEI <beamSpan> element.
  */
 class BeamSpan : public ControlElement,
-                 public TimeSpanningInterface,
                  public BeamDrawingInterface,
-                 public AttColor,
+                 public PlistInterface,
+                 public TimeSpanningInterface,
                  public AttBeamedWith,
-                 public AttBeamRend {
+                 public AttBeamRend,
+                 public AttColor {
 public:
     /**
      * @name Constructors, destructors, and other standard methods
@@ -47,10 +52,13 @@ class BeamSpan : public ControlElement,
      * @name Getter to interfaces
      */
     ///@{
+    virtual PlistInterface *GetPlistInterface() { return dynamic_cast<PlistInterface *>(this); }
     virtual TimePointInterface *GetTimePointInterface() { return dynamic_cast<TimePointInterface *>(this); }
     virtual TimeSpanningInterface *GetTimeSpanningInterface() { return dynamic_cast<TimeSpanningInterface *>(this); }
     ////@}
 
+    ArrayOfObjects GetBeamSpanElementList(Layer* layer, Staff* staff);
+
     //----------//
     // Functors //
     //----------//
@@ -60,6 +68,11 @@ class BeamSpan : public ControlElement,
      */
     virtual int CalcStem(FunctorParams *functorParams);
 
+    /**
+     * See Object::ResolveBeamSpanElements
+     */
+    virtual int ResolveBeamSpanElements(FunctorParams *);
+
 private:
     //
 public:
@@ -68,6 +81,7 @@ class BeamSpan : public ControlElement,
 
 private:
     //
+    ArrayOfObjects m_beamedElements;
 };
 
 } // namespace vrv
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index f7529770a7d..88ba1714234 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -484,6 +484,11 @@ class LayerElement : public Object,
     Staff *m_crossStaff;
     Layer *m_crossLayer;
 
+    /**
+     * This stores a pointer to the beamSpan (if any) that covers this LayerElement
+     */
+    Object *m_referencedElement;
+
 protected:
     Alignment *m_alignment;
 
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 54df51fbb22..f3b2f573622 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -1070,6 +1070,7 @@ class Object : public BoundingBox {
      */
     ///@{
     virtual int PreparePlist(FunctorParams *functorParams);
+    virtual int ProcessPlist(FunctorParams *functorParams);
     ///@}
 
     /**
@@ -1281,6 +1282,14 @@ class Object : public BoundingBox {
     virtual int PrepareMIDI(FunctorParams *) { return FUNCTOR_CONTINUE; }
     ///@}
 
+    /**
+     * Get the list of referenced elements for the beamSpan as well as set referenced
+     * object for those elements to beamSpan containing them.
+     */
+    ///@{
+    virtual int ResolveBeamSpanElements(FunctorParams *) { return FUNCTOR_CONTINUE; }
+    ///@}
+
     /**
      * Export the object to a MidiFile
      */
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index 75c9207c63e..d628952cbbc 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -16,6 +16,7 @@
 #include "comparison.h"
 #include "functorparams.h"
 #include "layer.h"
+#include "measure.h"
 #include "staff.h"
 #include "vrv.h"
 
@@ -27,16 +28,19 @@ namespace vrv {
 
 BeamSpan::BeamSpan()
     : ControlElement("beamspan-")
-    , TimeSpanningInterface()
     , BeamDrawingInterface()
-    , AttColor()
+    , PlistInterface()
+    , TimeSpanningInterface()
     , AttBeamedWith()
     , AttBeamRend()
+    , AttColor()
 {
+    RegisterInterface(PlistInterface::GetAttClasses(), PlistInterface::IsInterface());
     RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
-    RegisterAttClass(ATT_COLOR);
     RegisterAttClass(ATT_BEAMEDWITH);
     RegisterAttClass(ATT_BEAMREND);
+    RegisterAttClass(ATT_COLOR);
+    RegisterAttClass(ATT_PLIST);
 
     Reset();
 }
@@ -46,13 +50,60 @@ BeamSpan::~BeamSpan() {}
 void BeamSpan::Reset()
 {
     ControlElement::Reset();
-    TimeSpanningInterface::Reset();
     BeamDrawingInterface::Reset();
-    ResetColor();
+    PlistInterface::Reset();
+    TimeSpanningInterface::Reset();
     ResetBeamedWith();
     ResetBeamRend();
+    ResetColor();
+    ResetPlist();
 }
 
+ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff) 
+{
+    // find all elements between startId and endId of the beamSpan
+    ClassIdsComparison classIds({ NOTE, CHORD });
+    ListOfObjects objects;
+    layer->FindAllDescendantBetween(&objects, &classIds, GetStart(), GetEnd(), true, false);
+
+    ArrayOfObjects beamSpanElements(objects.begin(), objects.end());
+    // If last element is not equal to the end, there is high chance that this beamSpan is cross-measure.
+    // Look for the same N-staff N-layer in next measure and try finding end there
+    if (beamSpanElements.back() != GetEnd()) {
+        Measure *measure = vrv_cast<Measure *>(GetStart()->GetFirstAncestor(MEASURE));
+        Object *parent = measure->GetParent();
+
+        const int index = parent->GetChildIndex(measure);
+        Measure *nextMeasure = vrv_cast<Measure *>(parent->GetChild(index + 1));
+        if (nextMeasure) {
+            AttNIntegerComparison snc(STAFF, staff->GetN());
+            Staff *nextStaff = vrv_cast<Staff *>(nextMeasure->FindDescendantByComparison(&snc));
+            if (nextStaff) {
+                AttNIntegerComparison lnc(LAYER, layer->GetN());
+                Layer *nextStaffLayer = vrv_cast<Layer *>(nextStaff->FindDescendantByComparison(&lnc));
+                if (nextStaffLayer) {
+                    // find all elements between startId and endId of the beamSpan
+                    ClassIdsComparison classIds({ NOTE, CHORD });
+                    ListOfObjects nextLayerObjects;
+                    // pass NULL as starting element to add all elements until end is reached
+                    nextStaffLayer->FindAllDescendantBetween(&nextLayerObjects, &classIds, NULL, GetEnd(), true, false);
+                    // Handle only next measure for the time being
+                    if (nextLayerObjects.back() == GetEnd()) {
+                        beamSpanElements.insert(
+                            beamSpanElements.end(), nextLayerObjects.begin(), nextLayerObjects.end());
+                    }
+                }
+            }
+        }
+    }
+
+    return beamSpanElements;
+}
+
+//----------//
+// Functors //
+//----------//
+
 int BeamSpan::CalcStem(FunctorParams *functorParams)
 {
     CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
@@ -60,16 +111,8 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
 
     Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
     Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
-    if (!layer || !staff) return FUNCTOR_SIBLINGS;
-
-    // find all elements between startId and endId of the beamSpan
-    ClassIdsComparison classIds({ NOTE, CHORD });
-    ListOfObjects objects;
-    layer->FindAllDescendantBetween(&objects, &classIds, GetStart(), GetEnd(), true, false);
 
-    // Initialize coordinates and caclculate beam segment based on the array of element for beamSpan
-    ArrayOfObjects beamSpanElements(objects.begin(), objects.end());
-    InitCoords(&beamSpanElements, staff, GetPlace());
+    InitCoords(&m_beamedElements, staff, GetPlace());
 
     m_beamSegment.InitCoordRefs(&m_beamElementCoords);
     m_beamSegment.CalcBeam(layer, staff, params->m_doc, this, GetPlace());
@@ -77,4 +120,34 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams) 
+{
+    FunctorDocParams *params = vrv_params_cast<FunctorDocParams *>(functorParams);
+    assert(params);
+
+    if (!m_beamedElements.empty()) return FUNCTOR_CONTINUE;
+
+    if (HasPlist()) {
+        m_beamedElements = *GetRefs();
+    }
+    else {
+        Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
+        Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
+        if (!layer || !staff) return FUNCTOR_SIBLINGS;
+        
+        m_beamedElements = GetBeamSpanElementList(layer, staff);
+    }
+
+    // set current beamSpan as referencedElement for all beamed elemenents (for the
+    // sake of figuring if corresponding element is in beamSpan)
+    for (auto element : m_beamedElements) {
+        LayerElement *layerElem = vrv_cast<LayerElement *>(element);
+        if (!layerElem) continue;
+
+        layerElem->m_referencedElement = this;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
\ No newline at end of file
diff --git a/src/doc.cpp b/src/doc.cpp
index ac1a3abf5ef..d4f1549f630 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -548,10 +548,11 @@ void Doc::PrepareDrawing()
     Functor preparePlist(&Object::PreparePlist);
     this->Process(&preparePlist, &preparePlistParams);
 
-    // If we have some left process again backward.
+    // Process plist after all pairs has been collected
     if (!preparePlistParams.m_interfaceUuidPairs.empty()) {
         preparePlistParams.m_fillList = false;
-        this->Process(&preparePlist, &preparePlistParams, NULL, NULL, UNLIMITED_DEPTH, BACKWARD);
+        Functor processPlist(&Object::ProcessPlist);
+        this->Process(&processPlist, &preparePlistParams);
     }
 
     // If some are still there, then it is probably an issue in the encoding
@@ -568,6 +569,12 @@ void Doc::PrepareDrawing()
     Functor prepareCrossStaffEnd(&Object::PrepareCrossStaffEnd);
     this->Process(&prepareCrossStaff, &prepareCrossStaffParams, &prepareCrossStaffEnd);
 
+    /************ Resolve beamspan elements ***********/
+
+    FunctorDocParams functorDocParams(this);
+    Functor resolveBeamSpanElements(&Object::ResolveBeamSpanElements);
+    this->Process(&resolveBeamSpanElements, &functorDocParams);
+
     /************ Prepare processing by staff/layer/verse ************/
 
     // We need to populate processing lists for processing the document by Layer (for matching @tie) and
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 1bc95f732f2..f0eb7f3fd45 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -1719,11 +1719,11 @@ void MEIOutput::WriteBeamSpan(pugi::xml_node currentNode, BeamSpan *beamSpan)
     assert(beamSpan);
 
     WriteControlElement(currentNode, beamSpan);
-    WriteTimePointInterface(currentNode, beamSpan);
+    WritePlistInterface(currentNode, beamSpan);
     WriteTimeSpanningInterface(currentNode, beamSpan);
-    beamSpan->WriteColor(currentNode);
     beamSpan->WriteBeamedWith(currentNode);
     beamSpan->WriteBeamRend(currentNode);
+    beamSpan->WriteColor(currentNode);
 }
 
 void MEIOutput::WriteBracketSpan(pugi::xml_node currentNode, BracketSpan *bracketSpan)
@@ -4956,10 +4956,11 @@ bool MEIInput::ReadBeamSpan(Object *parent, pugi::xml_node beamSpan)
     BeamSpan *vrvBeamSpan = new BeamSpan();
     ReadControlElement(beamSpan, vrvBeamSpan);
 
+    ReadPlistInterface(beamSpan, vrvBeamSpan);
     ReadTimeSpanningInterface(beamSpan, vrvBeamSpan);
-    vrvBeamSpan->ReadColor(beamSpan);
     vrvBeamSpan->ReadBeamedWith(beamSpan);
     vrvBeamSpan->ReadBeamRend(beamSpan);
+    vrvBeamSpan->ReadColor(beamSpan);
 
     parent->AddChild(vrvBeamSpan);
     ReadUnsupportedAttr(beamSpan, vrvBeamSpan);
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 399ffd60a14..28528a536b1 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -130,6 +130,7 @@ void LayerElement::Reset()
 
     m_crossStaff = NULL;
     m_crossLayer = NULL;
+    m_referencedElement = NULL;
 }
 
 LayerElement::~LayerElement() {}
@@ -145,6 +146,7 @@ void LayerElement::CloneReset()
 
     m_crossStaff = NULL;
     m_crossLayer = NULL;
+    m_referencedElement = NULL;
 }
 
 LayerElement *LayerElement::ThisOrSameasAsLink()
@@ -250,32 +252,7 @@ bool LayerElement::IsInBeamSpan() const
 {
     if (!this->Is({ CHORD, NOTE })) return false;
 
-    Measure *parentMeasure = vrv_cast<Measure *>(GetFirstAncestor(MEASURE));
-    if (!parentMeasure) return false;
-
-    Layer *parentLayer = vrv_cast<Layer *>(GetFirstAncestor(LAYER));
-    if (!parentLayer) return false;
-
-    // find all beamspans within current measure, stop processing if there are none
-    ClassIdComparison beamSpanId(BEAMSPAN);
-    ListOfObjects beamSpanElements;
-    parentMeasure->FindAllDescendantByComparison(&beamSpanElements, &beamSpanId);
-
-    if (beamSpanElements.empty()) return false;
-
-    // try to figure whether current element belongs to any of the beamSpans
-    for (auto object : beamSpanElements) {
-        BeamSpan *beamSpan = vrv_cast<BeamSpan *>(object);
-        if (!beamSpan) continue;
-
-        ClassIdsComparison classIds({ NOTE, CHORD });
-        ListOfObjects elements;
-        parentLayer->FindAllDescendantBetween(
-            &elements, &classIds, beamSpan->GetStart(), beamSpan->GetEnd(), true, false);
-        if (std::find(elements.begin(), elements.end(), this) != elements.end()) return true;
-    }
-
-    return false;
+    return m_referencedElement != NULL;
 }
 
 Staff *LayerElement::GetAncestorStaff(const StaffSearch strategy, const bool assertExistence) const
diff --git a/src/object.cpp b/src/object.cpp
index 60dd0598e86..e233249aea2 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1575,6 +1575,16 @@ int Object::PreparePlist(FunctorParams *functorParams)
         return interface->InterfacePreparePlist(functorParams, this);
     }
 
+    return FUNCTOR_CONTINUE;
+}
+
+int Object::ProcessPlist(FunctorParams* functorParams)
+{
+    PreparePlistParams *params = vrv_params_cast<PreparePlistParams *>(functorParams);
+    assert(params);
+
+    if (!IsLayerElement()) return FUNCTOR_CONTINUE;
+
     std::string uuid = this->GetUuid();
     auto i = std::find_if(params->m_interfaceUuidPairs.begin(), params->m_interfaceUuidPairs.end(),
         [uuid](std::pair<PlistInterface *, std::string> pair) { return (pair.second == uuid); });

From 8d856e933057e545896121b3390065a8251fd41d Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 14 Sep 2020 18:17:16 +0300
Subject: [PATCH 362/403] Implement cross-staff support for beamSpan

- changed how pList was being processed - all data is collected first now and only after that references are set. This ensures that elements are going to be added in the  order they are described in the MEI file
- changed how crossStaff was detected for beamSpans (for cases when beamSpan starts not in the top staff)
---
 include/vrv/functorparams.h |  2 +-
 include/vrv/vrvdef.h        |  3 ++-
 src/beamspan.cpp            | 32 ++++++++++++++++++++++++--------
 src/doc.cpp                 | 11 ++++++++---
 src/object.cpp              |  9 ++++-----
 src/plistinterface.cpp      |  2 +-
 src/system.cpp              |  3 ---
 7 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 33450baa8d7..dbbcdcea24f 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -2079,7 +2079,7 @@ class PrepareMilestonesParams : public FunctorParams {
 class PreparePlistParams : public FunctorParams {
 public:
     PreparePlistParams() { m_fillList = true; }
-    ArrayOfPlistInterfaceUuidPairs m_interfaceUuidPairs;
+    ArrayOfPlistInterfaceUuidTuples m_interfaceUuidTuples;
     bool m_fillList;
 };
 
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index e9da8164f14..2df134030ee 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -13,6 +13,7 @@
 #include <list>
 #include <map>
 #include <set>
+#include <tuple>
 #include <vector>
 
 //----------------------------------------------------------------------------
@@ -328,7 +329,7 @@ typedef std::multimap<std::string, LinkingInterface *> MapOfLinkingInterfaceUuid
 
 typedef std::map<std::string, Note *> MapOfNoteUuidPairs;
 
-typedef std::vector<std::pair<PlistInterface *, std::string>> ArrayOfPlistInterfaceUuidPairs;
+typedef std::vector<std::tuple<PlistInterface *, std::string, Object *> > ArrayOfPlistInterfaceUuidTuples;
 
 typedef std::vector<CurveSpannedElement *> ArrayOfCurveSpannedElements;
 
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index d628952cbbc..bb2e0554367 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -122,29 +122,45 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
 
 int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams) 
 {
-    FunctorDocParams *params = vrv_params_cast<FunctorDocParams *>(functorParams);
-    assert(params);
-
     if (!m_beamedElements.empty()) return FUNCTOR_CONTINUE;
 
+    Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
+    Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
+    if (!layer || !staff) return FUNCTOR_SIBLINGS;
+
     if (HasPlist()) {
         m_beamedElements = *GetRefs();
     }
     else {
-        Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
-        Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
-        if (!layer || !staff) return FUNCTOR_SIBLINGS;
-        
         m_beamedElements = GetBeamSpanElementList(layer, staff);
     }
 
+    // Find whether this beamSpan is crossStaff - if there are beamed elements that belong
+    // to differen staffs we can consider this beamSpan as such
+    bool isCrossStaff = false;
+    for (const auto element : m_beamedElements) {
+        if (element->GetFirstAncestor(STAFF) != staff) {
+            isCrossStaff = true;
+            break;
+        }
+    }
+
     // set current beamSpan as referencedElement for all beamed elemenents (for the
     // sake of figuring if corresponding element is in beamSpan)
-    for (auto element : m_beamedElements) {
+    for (const auto element : m_beamedElements) {
         LayerElement *layerElem = vrv_cast<LayerElement *>(element);
         if (!layerElem) continue;
 
         layerElem->m_referencedElement = this;
+
+        if (isCrossStaff) {
+            Layer *elementLayer = vrv_cast<Layer *>(layerElem->GetFirstAncestor(LAYER));
+            Staff *elementStaff = vrv_cast<Staff *>(layerElem->GetFirstAncestor(STAFF));
+            if (!layer || !staff || layerElem->m_crossStaff) continue;
+
+            layerElem->m_crossStaff = elementStaff;
+            layerElem->m_crossLayer = elementLayer;
+        }
     }
 
     return FUNCTOR_CONTINUE;
diff --git a/src/doc.cpp b/src/doc.cpp
index d4f1549f630..c77cc28f02c 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -549,16 +549,21 @@ void Doc::PrepareDrawing()
     this->Process(&preparePlist, &preparePlistParams);
 
     // Process plist after all pairs has been collected
-    if (!preparePlistParams.m_interfaceUuidPairs.empty()) {
+    if (!preparePlistParams.m_interfaceUuidTuples.empty()) {
         preparePlistParams.m_fillList = false;
         Functor processPlist(&Object::ProcessPlist);
         this->Process(&processPlist, &preparePlistParams);
+
+        for (const auto [plistInterface, uuid, objectReference] : preparePlistParams.m_interfaceUuidTuples) {
+            plistInterface->SetRef(objectReference);
+        }
+        preparePlistParams.m_interfaceUuidTuples.clear();
     }
 
     // If some are still there, then it is probably an issue in the encoding
-    if (!preparePlistParams.m_interfaceUuidPairs.empty()) {
+    if (!preparePlistParams.m_interfaceUuidTuples.empty()) {
         LogWarning(
-            "%d element(s) with a @plist could match the target", preparePlistParams.m_interfaceUuidPairs.size());
+            "%d element(s) with a @plist could match the target", preparePlistParams.m_interfaceUuidTuples.size());
     }
 
     /************ Resolve cross staff ************/
diff --git a/src/object.cpp b/src/object.cpp
index e233249aea2..8792dca6f12 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1586,11 +1586,10 @@ int Object::ProcessPlist(FunctorParams* functorParams)
     if (!IsLayerElement()) return FUNCTOR_CONTINUE;
 
     std::string uuid = this->GetUuid();
-    auto i = std::find_if(params->m_interfaceUuidPairs.begin(), params->m_interfaceUuidPairs.end(),
-        [uuid](std::pair<PlistInterface *, std::string> pair) { return (pair.second == uuid); });
-    if (i != params->m_interfaceUuidPairs.end()) {
-        i->first->SetRef(this);
-        params->m_interfaceUuidPairs.erase(i);
+    auto i = std::find_if(params->m_interfaceUuidTuples.begin(), params->m_interfaceUuidTuples.end(),
+        [uuid](std::tuple<PlistInterface *, std::string, Object *> tuple) { return (std::get<1>(tuple) == uuid); });
+    if (i != params->m_interfaceUuidTuples.end()) {
+        std::get<2>(*i) = this;
     }
 
     return FUNCTOR_CONTINUE;
diff --git a/src/plistinterface.cpp b/src/plistinterface.cpp
index 32c673c3f9b..540954ad5af 100644
--- a/src/plistinterface.cpp
+++ b/src/plistinterface.cpp
@@ -102,7 +102,7 @@ int PlistInterface::InterfacePreparePlist(FunctorParams *functorParams, Object *
 
     std::vector<std::string>::iterator iter;
     for (iter = m_uuids.begin(); iter != m_uuids.end(); ++iter) {
-        params->m_interfaceUuidPairs.push_back({ this, *iter });
+        params->m_interfaceUuidTuples.push_back(std::make_tuple(this, *iter, (Object *)NULL));
     }
 
     return FUNCTOR_CONTINUE;
diff --git a/src/system.cpp b/src/system.cpp
index 1ccb5ca6916..3e992c6c005 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -940,9 +940,6 @@ int System::AdjustFloatingPositioners(FunctorParams *functorParams)
     adjustFloatingPositionerGrpsParams.m_place = STAFFREL_below;
     m_systemAligner.Process(&adjustFloatingPositionerGrps, &adjustFloatingPositionerGrpsParams);
 
-    params->m_classId = BEAMSPAN;
-    m_systemAligner.Process(params->m_functor, params);
-
     params->m_classId = BRACKETSPAN;
     m_systemAligner.Process(params->m_functor, params);
 

From faee33ad3bbbf8c83e08c4c20201cbd7f4f25235 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 15 Sep 2020 12:07:24 +0300
Subject: [PATCH 363/403] Code improvements

- changed dynamic_cast to vrv_cast
- improved MEI parsing to avoid creating std::string object on each comparison
- some minor code cleanup
---
 src/beamspan.cpp     |  7 +-----
 src/iomei.cpp        | 51 ++++++++++++++++++++++----------------------
 src/view_control.cpp |  2 +-
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index bb2e0554367..1dd9510af81 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -128,12 +128,7 @@ int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
     Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
     if (!layer || !staff) return FUNCTOR_SIBLINGS;
 
-    if (HasPlist()) {
-        m_beamedElements = *GetRefs();
-    }
-    else {
-        m_beamedElements = GetBeamSpanElementList(layer, staff);
-    }
+    m_beamedElements = HasPlist() ? *GetRefs() : GetBeamSpanElementList(layer, staff);
 
     // Find whether this beamSpan is crossStaff - if there are beamed elements that belong
     // to differen staffs we can consider this beamSpan as such
diff --git a/src/iomei.cpp b/src/iomei.cpp
index f0eb7f3fd45..e93a64ab226 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -4769,25 +4769,26 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
     bool success = true;
     pugi::xml_node current;
     for (current = parentNode.first_child(); current; current = current.next_sibling()) {
+        const std::string currentName = current.name();
         if (!success) break;
         // editorial
-        else if (this->IsEditorialElementName(current.name())) {
+        else if (this->IsEditorialElementName(currentName)) {
             success = this->ReadEditorialElement(parent, current, EDITORIAL_MEASURE);
         }
         // content
-        else if (std::string(current.name()) == "anchoredText") {
+        else if (currentName == "anchoredText") {
             success = this->ReadAnchoredText(parent, current);
         }
-        else if (std::string(current.name()) == "arpeg") {
+        else if (currentName == "arpeg") {
             success = this->ReadArpeg(parent, current);
         }
-        else if (std::string(current.name()) == "beamSpan") {
-            ReadBeamSpan(parent, current);
+        else if (currentName == "beamSpan") {
+            success = this->ReadBeamSpan(parent, current);
         }
-        else if (std::string(current.name()) == "bracketSpan") {
+        else if (currentName == "bracketSpan") {
             success = this->ReadBracketSpan(parent, current);
         }
-        else if (std::string(current.name()) == "breath") {
+        else if (currentName == "breath") {
             success = this->ReadBreath(parent, current);
         }
         else if (std::string(current.name()) == "caesura") {
@@ -4796,22 +4797,22 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
         else if (std::string(current.name()) == "dir") {
             success = this->ReadDir(parent, current);
         }
-        else if (std::string(current.name()) == "dynam") {
+        else if (currentName == "dynam") {
             success = this->ReadDynam(parent, current);
         }
-        else if (std::string(current.name()) == "fermata") {
+        else if (currentName == "fermata") {
             success = this->ReadFermata(parent, current);
         }
-        else if (std::string(current.name()) == "fing") {
+        else if (currentName == "fing") {
             success = this->ReadFing(parent, current);
         }
-        else if (std::string(current.name()) == "gliss") {
+        else if (currentName == "gliss") {
             success = this->ReadGliss(parent, current);
         }
-        else if (std::string(current.name()) == "hairpin") {
+        else if (currentName == "hairpin") {
             success = this->ReadHairpin(parent, current);
         }
-        else if (std::string(current.name()) == "harm") {
+        else if (currentName == "harm") {
             success = this->ReadHarm(parent, current);
         }
         else if (std::string(current.name()) == "lv") {
@@ -4820,16 +4821,16 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
         else if (std::string(current.name()) == "mNum") {
             success = this->ReadMNum(parent, current);
         }
-        else if (std::string(current.name()) == "mordent") {
+        else if (currentName == "mordent") {
             success = this->ReadMordent(parent, current);
         }
-        else if (std::string(current.name()) == "octave") {
+        else if (currentName == "octave") {
             success = this->ReadOctave(parent, current);
         }
-        else if (std::string(current.name()) == "pedal") {
+        else if (currentName == "pedal") {
             success = this->ReadPedal(parent, current);
         }
-        else if (std::string(current.name()) == "phrase") {
+        else if (currentName == "phrase") {
             success = this->ReadPhrase(parent, current);
         }
         else if (std::string(current.name()) == "pitchInflection") {
@@ -4838,31 +4839,31 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
         else if (std::string(current.name()) == "reh") {
             success = this->ReadReh(parent, current);
         }
-        else if (std::string(current.name()) == "slur") {
+        else if (currentName == "slur") {
             success = this->ReadSlur(parent, current);
         }
-        else if (std::string(current.name()) == "staff") {
+        else if (currentName == "staff") {
             success = this->ReadStaff(parent, current);
         }
-        else if (std::string(current.name()) == "tempo") {
+        else if (currentName == "tempo") {
             success = this->ReadTempo(parent, current);
         }
-        else if (std::string(current.name()) == "tie") {
+        else if (currentName == "tie") {
             success = this->ReadTie(parent, current);
         }
-        else if (std::string(current.name()) == "trill") {
+        else if (currentName == "trill") {
             success = this->ReadTrill(parent, current);
         }
-        else if (std::string(current.name()) == "turn") {
+        else if (currentName == "turn") {
             success = this->ReadTurn(parent, current);
         }
-        else if (std::string(current.name()) == "tupletSpan") {
+        else if (currentName == "tupletSpan") {
             if (!ReadTupletSpanAsTuplet(dynamic_cast<Measure *>(parent), current)) {
                 LogWarning("<tupletSpan> is not readable as <tuplet> and will be ignored");
             }
         }
         // xml comment
-        else if (std::string(current.name()) == "") {
+        else if (currentName == "") {
             success = this->ReadXMLComment(parent, current);
         }
         else {
diff --git a/src/view_control.cpp b/src/view_control.cpp
index 66317f53e94..bbcad53ed5a 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -318,7 +318,7 @@ void View::DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *s
         }
         else if (element->Is(BEAMSPAN)) {
             // cast to BeamSpan check in DrawBeamSpan
-            DrawBeamSpan(dc, dynamic_cast<BeamSpan *>(element), measure);
+            DrawBeamSpan(dc, vrv_cast<BeamSpan *>(element), measure);
         }
         else if (element->Is(BRACKETSPAN)) {
             // cast to BracketSpan check in DrawBracketSpan

From d1d90f91b76bf22f507286bf007e1aeb0e28840b Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Mon, 21 Sep 2020 13:59:55 +0200
Subject: [PATCH 364/403] add new files to xcode project

---
 Verovio.xcodeproj/project.pbxproj | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
index dfab23f16f6..27299f1409d 100644
--- a/Verovio.xcodeproj/project.pbxproj
+++ b/Verovio.xcodeproj/project.pbxproj
@@ -1266,6 +1266,12 @@
 		E79C87C62694407B0098FE85 /* lv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E79C87C2269440570098FE85 /* lv.cpp */; };
 		E79C87C7269440800098FE85 /* lv.h in Headers */ = {isa = PBXBuildFile; fileRef = E79C87C1269440420098FE85 /* lv.h */; };
 		E79C87C8269440810098FE85 /* lv.h in Headers */ = {isa = PBXBuildFile; fileRef = E79C87C1269440420098FE85 /* lv.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BD05622F2518CD12004057EB /* beamspan.h in Headers */ = {isa = PBXBuildFile; fileRef = BD05622E2518CD12004057EB /* beamspan.h */; };
+		BD0562302518CD12004057EB /* beamspan.h in Headers */ = {isa = PBXBuildFile; fileRef = BD05622E2518CD12004057EB /* beamspan.h */; };
+		BD0562362518CD20004057EB /* beamspan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0562352518CD20004057EB /* beamspan.cpp */; };
+		BD0562372518CD20004057EB /* beamspan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0562352518CD20004057EB /* beamspan.cpp */; };
+		BD0562382518CD20004057EB /* beamspan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0562352518CD20004057EB /* beamspan.cpp */; };
+		BD0562392518CD20004057EB /* beamspan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0562352518CD20004057EB /* beamspan.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -1734,6 +1740,8 @@
 		E79ADDC626BD645B00527E4B /* runtimeclock.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = runtimeclock.cpp; path = src/runtimeclock.cpp; sourceTree = "<group>"; };
 		E79C87C1269440420098FE85 /* lv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lv.h; path = include/vrv/lv.h; sourceTree = "<group>"; };
 		E79C87C2269440570098FE85 /* lv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lv.cpp; path = src/lv.cpp; sourceTree = "<group>"; };
+		BD05622E2518CD12004057EB /* beamspan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = beamspan.h; path = include/vrv/beamspan.h; sourceTree = "<group>"; };
+		BD0562352518CD20004057EB /* beamspan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = beamspan.cpp; path = src/beamspan.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2093,6 +2101,8 @@
 				4DB3510D1C80409E002DD057 /* anchoredtext.h */,
 				4D6331F41F46D2CB00A0D6BF /* arpeg.cpp */,
 				4D6331F21F46D2B400A0D6BF /* arpeg.h */,
+				BD0562352518CD20004057EB /* beamspan.cpp */,
+				BD05622E2518CD12004057EB /* beamspan.h */,
 				4DE96E3A21C4373200CB85BE /* bracketspan.cpp */,
 				4DE96E3821C4370E00CB85BE /* bracketspan.h */,
 				4DE644F41EDBEA01002FBE6C /* breath.cpp */,
@@ -2563,6 +2573,7 @@
 				4D1BE7781C6942930086DC0E /* pugiconfig.hpp in Headers */,
 				4DC12A891F74111E000440E9 /* pgfoot.h in Headers */,
 				4DB3D8C91F83D10300B5FC2B /* dir.h in Headers */,
+				BD05622F2518CD12004057EB /* beamspan.h in Headers */,
 				4DEC4DDA21C8295700D1D273 /* damage.h in Headers */,
 				8F59294E18854BF800FE51AD /* positioninterface.h in Headers */,
 				8F59294F18854BF800FE51AD /* rest.h in Headers */,
@@ -2786,6 +2797,7 @@
 				BB4C4B2622A932CF001F6AF0 /* fermata.h in Headers */,
 				BB4C4B0022A932BC001F6AF0 /* supplied.h in Headers */,
 				BB4C4B8622A932DF001F6AF0 /* lb.h in Headers */,
+				BD0562302518CD12004057EB /* beamspan.h in Headers */,
 				BB4C4AFE22A932BC001F6AF0 /* subst.h in Headers */,
 				BB4C4AFC22A932BC001F6AF0 /* sic.h in Headers */,
 				BB4C4AEE22A932BC001F6AF0 /* expan.h in Headers */,
@@ -3097,6 +3109,7 @@
 				4D308105203DB6B500BC44F6 /* ref.cpp in Sources */,
 				4D1694161E3A44F300569BF4 /* pedal.cpp in Sources */,
 				4D1694171E3A44F300569BF4 /* mensur.cpp in Sources */,
+				BD0562372518CD20004057EB /* beamspan.cpp in Sources */,
 				4D1694181E3A44F300569BF4 /* text.cpp in Sources */,
 				4DC12A7D1F740FB9000440E9 /* view_running.cpp in Sources */,
 				4D15DE3B2411782300457C05 /* expansionmap.cpp in Sources */,
@@ -3281,6 +3294,7 @@
 				8F086EEE188539540037FD8E /* iomei.cpp in Sources */,
 				8F086EEF188539540037FD8E /* iomusxml.cpp in Sources */,
 				8F086EF0188539540037FD8E /* iopae.cpp in Sources */,
+				BD0562362518CD20004057EB /* beamspan.cpp in Sources */,
 				4D8CD8A61B4E922A00F0756F /* atts_critapp.cpp in Sources */,
 				4DEC4D7A21C8048700D1D273 /* abbr.cpp in Sources */,
 				4067E4C81DDDAF0000C6E059 /* fermata.cpp in Sources */,
@@ -3526,6 +3540,7 @@
 				4DDBBCC61C2EBAE7001AB50A /* view_text.cpp in Sources */,
 				8F3DD34618854B2E0051330C /* layerelement.cpp in Sources */,
 				4DB3D8CA1F83D10700B5FC2B /* fermata.cpp in Sources */,
+				BD0562382518CD20004057EB /* beamspan.cpp in Sources */,
 				4D798CBE1B8AEDBA007281CA /* drawinginterface.cpp in Sources */,
 				4D20740522A46BAA00E0765F /* atts_frettab.cpp in Sources */,
 				8F3DD34818854B2E0051330C /* mensur.cpp in Sources */,
@@ -3742,6 +3757,7 @@
 				BB4C4B7322A932D7001F6AF0 /* space.cpp in Sources */,
 				402492BF232E70000017BB75 /* gracegrp.cpp in Sources */,
 				BB4C4A6622A9321F001F6AF0 /* atts_critapp.cpp in Sources */,
+				BD0562392518CD20004057EB /* beamspan.cpp in Sources */,
 				BB4C4B3D22A932D7001F6AF0 /* artic.cpp in Sources */,
 				BB4C4A5D22A9321F001F6AF0 /* attconverter.cpp in Sources */,
 				BB4C4AF722A932BC001F6AF0 /* reg.cpp in Sources */,

From cdc5c05428fb55eebc0634a97c66f0daf928592e Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Mon, 21 Sep 2020 14:18:59 +0200
Subject: [PATCH 365/403] clang-format

---
 src/beamspan.cpp  | 4 ++--
 src/object.cpp    | 2 +-
 src/view_beam.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index 1dd9510af81..ee99b159c78 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -59,7 +59,7 @@ void BeamSpan::Reset()
     ResetPlist();
 }
 
-ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff) 
+ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
 {
     // find all elements between startId and endId of the beamSpan
     ClassIdsComparison classIds({ NOTE, CHORD });
@@ -120,7 +120,7 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
-int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams) 
+int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
 {
     if (!m_beamedElements.empty()) return FUNCTOR_CONTINUE;
 
diff --git a/src/object.cpp b/src/object.cpp
index 8792dca6f12..9611d1ef709 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1578,7 +1578,7 @@ int Object::PreparePlist(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
-int Object::ProcessPlist(FunctorParams* functorParams)
+int Object::ProcessPlist(FunctorParams *functorParams)
 {
     PreparePlistParams *params = vrv_params_cast<PreparePlistParams *>(functorParams);
     assert(params);
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index e7da408aa71..3c793bd9d95 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -433,7 +433,7 @@ void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
     beamSpan->m_beamSegment.Reset();
     beamSpan->m_beamSegment.InitCoordRefs(&beamSpan->m_beamElementCoords);
     beamSpan->m_beamSegment.CalcBeam(layer, staff, m_doc, beamSpan, beamSpan->GetPlace());
-    
+
     // Draw corresponding beam segment
     dc->StartGraphic(beamSpan, "", beamSpan->GetUuid());
     DrawBeamSegment(dc, &beamSpan->m_beamSegment, beamSpan, layer, staff, measure);

From de34bc0dc087bc21f587d643b7bce0986c5c110e Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 21 Sep 2020 15:35:02 +0300
Subject: [PATCH 366/403] Pass values by reference in the loop

---
 src/doc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/doc.cpp b/src/doc.cpp
index c77cc28f02c..f60d53f8d5d 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -554,7 +554,7 @@ void Doc::PrepareDrawing()
         Functor processPlist(&Object::ProcessPlist);
         this->Process(&processPlist, &preparePlistParams);
 
-        for (const auto [plistInterface, uuid, objectReference] : preparePlistParams.m_interfaceUuidTuples) {
+        for (const auto &[plistInterface, uuid, objectReference] : preparePlistParams.m_interfaceUuidTuples) {
             plistInterface->SetRef(objectReference);
         }
         preparePlistParams.m_interfaceUuidTuples.clear();

From 1ccdf1dc50baa402dfc01313b8aa0ce000cbed93 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 21 Sep 2020 16:18:18 +0300
Subject: [PATCH 367/403] Minor fixes

- change code to avoid segFault when start is missing
---
 src/beamspan.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index ee99b159c78..e219ad09a21 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -109,6 +109,8 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
     CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
     assert(params);
 
+    if (!GetStart()) return FUNCTOR_CONTINUE;
+
     Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
     Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
 
@@ -122,7 +124,7 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
 
 int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
 {
-    if (!m_beamedElements.empty()) return FUNCTOR_CONTINUE;
+    if (!m_beamedElements.empty() || !GetStart()) return FUNCTOR_CONTINUE;
 
     Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
     Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));

From 5243b8a75d0c82f662b678abab55df6d270e5fc0 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 4 Nov 2020 13:47:26 +0200
Subject: [PATCH 368/403] Small fix for the beamspan

---
 src/beamspan.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index e219ad09a21..921ea4af322 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -74,7 +74,7 @@ ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
         Object *parent = measure->GetParent();
 
         const int index = parent->GetChildIndex(measure);
-        Measure *nextMeasure = vrv_cast<Measure *>(parent->GetChild(index + 1));
+        Measure *nextMeasure = vrv_cast<Measure *>(parent->GetNext(measure, MEASURE));
         if (nextMeasure) {
             AttNIntegerComparison snc(STAFF, staff->GetN());
             Staff *nextStaff = vrv_cast<Staff *>(nextMeasure->FindDescendantByComparison(&snc));

From 7960b61d13864877a5b520d52b84583fd0e46f77 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 5 Nov 2020 15:28:23 +0200
Subject: [PATCH 369/403] Improve beamSpan rendering logic

- added handling of the beamSpans when drawn over the system breaks
- added additional beams spanning towards/from the barlines when spanning over the system
- fixed problem with rendering beamSpan for files with encoded breaks
---
 include/vrv/beamspan.h |  24 +++++++-
 include/vrv/object.h   |  10 ++++
 src/beamspan.cpp       | 122 +++++++++++++++++++++++++++++++++++++++++
 src/page.cpp           |   4 ++
 src/view_beam.cpp      |   1 +
 5 files changed, 160 insertions(+), 1 deletion(-)

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index bb3c9dbbfc8..d5cf8d89482 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -57,6 +57,11 @@ class BeamSpan : public ControlElement,
     virtual TimeSpanningInterface *GetTimeSpanningInterface() { return dynamic_cast<TimeSpanningInterface *>(this); }
     ////@}
 
+    // Helper to append coordinates for the beamSpans that are drawn over systems
+    void AppendSpanningCoordinates(Measure *measure);
+
+    // Helper to get element list for the beamSpan - elements are acquired from all layerElements that are located
+    // in between start and end of the beamSpan
     ArrayOfObjects GetBeamSpanElementList(Layer* layer, Staff* staff);
 
     //----------//
@@ -73,8 +78,23 @@ class BeamSpan : public ControlElement,
      */
     virtual int ResolveBeamSpanElements(FunctorParams *);
 
+    /**
+     * See Object::ResolveSpanningBeamSpans
+     */
+    virtual int ResolveSpanningBeamSpans(FunctorParams *);
+
+    /**
+     * @name Getter/setter for spanningType
+     */
+    ///@{
+    void SetSpanningType(int systemIndex, int systemCount);
+    int GetSpanningType() const { return m_spanningType; }
+    ////@}
+
 private:
-    //
+    // Helper for breaking one big spanning beamSpan into smaller beamSpans
+    bool SeparateSpanningElements(ArrayOfObjects &newElements, Object *first, Doc *doc, bool clearElements);
+
 public:
     //
     BeamSegment m_beamSegment;
@@ -82,6 +102,8 @@ class BeamSpan : public ControlElement,
 private:
     //
     ArrayOfObjects m_beamedElements;
+
+    int m_spanningType;
 };
 
 } // namespace vrv
diff --git a/include/vrv/object.h b/include/vrv/object.h
index f3b2f573622..3a1b8347dcd 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -1290,6 +1290,16 @@ class Object : public BoundingBox {
     virtual int ResolveBeamSpanElements(FunctorParams *) { return FUNCTOR_CONTINUE; }
     ///@}
 
+    /**
+     * Resolve spinning beamspans by breaking it into separate parts, each belonging to the corresponding
+     * system/measure. BeamSpans get elements reassigned, so that each beamSpan can be drawn as control
+     * element. This allows free placement of beamSpan in the MEI tree and ensures that beamSpan will be
+     * drawn properly
+     */
+    ///@{
+    virtual int ResolveSpinningBeamSpans(FunctorParams *) { return FUNCTOR_CONTINUE; }
+    ///@}
+
     /**
      * Export the object to a MidiFile
      */
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index 921ea4af322..c4e95294b67 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -13,6 +13,7 @@
 
 //----------------------------------------------------------------------------
 
+#include "barline.h"
 #include "comparison.h"
 #include "functorparams.h"
 #include "layer.h"
@@ -57,6 +58,36 @@ void BeamSpan::Reset()
     ResetBeamRend();
     ResetColor();
     ResetPlist();
+
+    m_spanningType = SPANNING_START_END;
+}
+
+void BeamSpan::AppendSpanningCoordinates(Measure *measure)
+{
+    const int spanningType = GetSpanningType();
+    if (SPANNING_START_END == spanningType) return;
+    
+    BarLine *bar = measure->GetRightBarLine();
+    const int rightSide = bar->GetDrawingX();
+    BeamElementCoord *front = m_beamSegment.m_beamElementCoordRefs.front();
+    BeamElementCoord *back = m_beamSegment.m_beamElementCoordRefs.back();
+    const double slope = (double)(back->m_yBeam - front->m_yBeam) / (double)(back->m_x - front->m_x);
+
+    if ((SPANNING_START == spanningType) || (SPANNING_MIDDLE == spanningType)) {
+        BeamElementCoord *right = new BeamElementCoord(*back);
+        const int distance = rightSide - back->m_x;
+        right->m_x = rightSide;
+        right->m_yBeam += distance * slope;
+        m_beamSegment.m_beamElementCoordRefs.push_back(right);
+    }
+    if ((SPANNING_END == spanningType) || (SPANNING_MIDDLE == spanningType)) {
+        BeamElementCoord *left = new BeamElementCoord(*front);
+        const int width = measure->GetInnerWidth();
+        const int offset = (back->m_x - front->m_x) / (m_beamSegment.m_beamElementCoordRefs.size() - 1) / 2;
+        left->m_x -= offset;
+        left->m_yBeam -= offset * slope;
+        m_beamSegment.m_beamElementCoordRefs.insert(m_beamSegment.m_beamElementCoordRefs.begin(), left);
+    }
 }
 
 ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
@@ -100,6 +131,43 @@ ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
     return beamSpanElements;
 }
 
+bool BeamSpan::SeparateSpanningElements(ArrayOfObjects &newElements, Object *first, Doc *doc, bool clearElements)
+{
+    Layer *layer = vrv_cast<Layer *>(first->GetFirstAncestor(LAYER));
+    Staff *staff = vrv_cast<Staff *>(first->GetFirstAncestor(STAFF));
+    if (!layer || !staff) return false;
+
+    m_beamedElements = newElements;
+    if (clearElements) m_beamElementCoords.clear();
+    InitCoords(&m_beamedElements, staff, GetPlace());
+
+    m_beamSegment.InitCoordRefs(&m_beamElementCoords);
+    m_beamSegment.CalcBeam(layer, staff, doc, this, GetPlace());
+    for (auto element : newElements) {
+        vrv_cast<LayerElement *>(element)->m_referencedElement = this;
+    }
+
+    // Reset Start and End based on the new elements of the beamSpan
+    TimePointInterface::Reset();
+    TimeSpanningInterface::Reset();
+    SetStart(vrv_cast<LayerElement *>(newElements.front()));
+    SetEnd(vrv_cast<LayerElement *>(newElements.back()));
+    return true;
+}
+
+void BeamSpan::SetSpanningType(int systemIndex, int systemCount)
+{
+    if (0 == systemIndex) {
+        m_spanningType = SPANNING_START;
+    }
+    else if ((systemCount - 1) == systemIndex) {
+        m_spanningType = SPANNING_END;
+    }
+    else {
+        m_spanningType = SPANNING_MIDDLE;
+    }
+}
+
 //----------//
 // Functors //
 //----------//
@@ -163,4 +231,58 @@ int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
+int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
+{
+    FunctorDocParams *params = vrv_params_cast<FunctorDocParams *>(functorParams);
+    assert(params);
+
+    if (m_beamedElements.empty() || !GetStart()) return FUNCTOR_CONTINUE;
+
+    Object *startSystem = GetStart()->GetFirstAncestor(SYSTEM);
+    Object *endSystem = GetEnd()->GetFirstAncestor(SYSTEM);
+    assert(startSystem && endSystem);
+    if (startSystem == endSystem) return FUNCTOR_CONTINUE;
+
+    // Find layerElements that belong to another system and store then in the vector alongside
+    // the system they belong to. This will allow us to break down beamSpan based on the systems
+    auto iter = m_beamedElements.begin();
+    std::vector<std::pair<vrv::ArrayOfObjects::iterator, Object *> > elements;
+    Object *firstSystem = startSystem;
+    while (iter != m_beamedElements.end()) {
+        elements.push_back({ iter, firstSystem });
+        iter = find_if(iter, m_beamedElements.end(), [&firstSystem](Object *element) {
+            Object *parentSystem = element->GetFirstAncestor(SYSTEM);
+            if (firstSystem == parentSystem) return false;
+            firstSystem = parentSystem;
+            return true;
+        });
+    }
+    elements.push_back({ m_beamedElements.end(), NULL });
+
+    // Iterator for the elements are based on the initial order of the elements, so skip current system when
+    // found and process it separatelly in the end
+    Object *currentSystemn = GetFirstAncestor(SYSTEM);
+    int currentSystemIndex = 0;
+    for (int i = 0; i < elements.size() - 1; ++i) {
+        if (elements.at(i).second == currentSystemn) {
+            currentSystemIndex = i;
+            continue;
+        }
+
+        BeamSpan *beamSpan = vrv_cast<BeamSpan *>(Clone());
+        ArrayOfObjects newElements(elements.at(i).first, elements.at(i + 1).first);
+        beamSpan->SeparateSpanningElements(newElements, *elements.at(i).first, params->m_doc, true);
+        beamSpan->SetSpanningType(i, elements.size() - 1);
+
+        Measure *measure = vrv_cast<Measure *>((*elements.at(i).first)->GetFirstAncestor(MEASURE));
+        measure->AddChild(beamSpan);
+    }
+
+    ArrayOfObjects newElements(elements.at(currentSystemIndex).first, elements.at(currentSystemIndex + 1).first);
+    SeparateSpanningElements(newElements, GetStart(), params->m_doc, false);
+    SetSpanningType(currentSystemIndex, elements.size() - 1);
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
\ No newline at end of file
diff --git a/src/page.cpp b/src/page.cpp
index bd762af1a71..7a89189d9a0 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -424,6 +424,10 @@ void Page::LayOutHorizontally()
     PrepareSlursParams prepareSlursParams(doc);
     Functor prepareSlurs(&Object::PrepareSlurs);
     this->Process(&prepareSlurs, &prepareSlursParams);
+
+    FunctorDocParams resolveSpanningBeamSpansParams(doc);
+    Functor resolveSpanningBeamSpans(&Object::ResolveSpanningBeamSpans);
+    this->Process(&resolveSpanningBeamSpans, &resolveSpanningBeamSpansParams);
 }
 
 void Page::HorizontalLayoutCachePage(bool restore)
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 3c793bd9d95..341464527cd 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -433,6 +433,7 @@ void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
     beamSpan->m_beamSegment.Reset();
     beamSpan->m_beamSegment.InitCoordRefs(&beamSpan->m_beamElementCoords);
     beamSpan->m_beamSegment.CalcBeam(layer, staff, m_doc, beamSpan, beamSpan->GetPlace());
+    beamSpan->AppendSpinningCoordinates(measure);
 
     // Draw corresponding beam segment
     dc->StartGraphic(beamSpan, "", beamSpan->GetUuid());

From e919bccd606b677984337cfec6570509068bf675 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 16 Nov 2020 17:09:14 +0200
Subject: [PATCH 370/403] Fix typo

---
 src/view_beam.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 341464527cd..e0d7a7be955 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -433,7 +433,7 @@ void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
     beamSpan->m_beamSegment.Reset();
     beamSpan->m_beamSegment.InitCoordRefs(&beamSpan->m_beamElementCoords);
     beamSpan->m_beamSegment.CalcBeam(layer, staff, m_doc, beamSpan, beamSpan->GetPlace());
-    beamSpan->AppendSpinningCoordinates(measure);
+    beamSpan->AppendSpanningCoordinates(measure);
 
     // Draw corresponding beam segment
     dc->StartGraphic(beamSpan, "", beamSpan->GetUuid());

From 7b0de8617dfc39bec99b1cac5eec41ce76dc1331 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 18 Nov 2020 12:58:24 +0200
Subject: [PATCH 371/403] Change implementation from multiple beamSpans to
 multiple segments

- changed how beamSpan crossing over system has been implemented - instead of creating copies of beamSpan for other system current implementation creates new segments instead;
- change beamSpan to have a container with segments instead of having one; beamSpan would draw beams for each segment it has and segments would be separated based on whether beamSpan is cross-system or not
- added BeamSegmentPlacementInfo to store additional information regarding segment positioning while not interfering with common beam implementation
- cleaned code up a bit and added comments
---
 include/vrv/beam.h     |  36 ++++++++++++
 include/vrv/beamspan.h |  27 ++++-----
 include/vrv/object.h   |   2 +-
 src/beam.cpp           |  60 +++++++++++++++++++
 src/beamspan.cpp       | 127 ++++++++++++++++++-----------------------
 src/view_beam.cpp      |  26 +++++----
 6 files changed, 181 insertions(+), 97 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 20a58de325c..b39f33a3d51 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -24,6 +24,28 @@ class StaffAlignment;
 
 enum { PARTIAL_NONE = 0, PARTIAL_THROUGH, PARTIAL_RIGHT, PARTIAL_LEFT };
 
+//----------------------------------------------------------------------------
+// BeamSegmentPlacementInfo
+//----------------------------------------------------------------------------
+
+// Structure for storing additional information regarding beamSegment placement (in case of beam/beamSpan spanning over
+// the systems
+struct BeamSegmentPlacementInfo {
+private:
+    using CoordIter = ArrayOfBeamElementCoords::iterator;
+public:
+    BeamSegmentPlacementInfo() : m_measure(NULL), m_staff(NULL), m_layer(NULL), m_spanningType(SPANNING_START_END) {}
+    Measure *m_measure;
+    Staff *m_staff;
+    Layer *m_layer;
+    int m_spanningType;
+    CoordIter m_begin;
+    CoordIter m_end;
+
+    // Set spanning type based on the positioning of the beam segment
+    void SetSpanningType(int systemIndex, int systemCount);
+};
+
 //----------------------------------------------------------------------------
 // BeamSegment
 //----------------------------------------------------------------------------
@@ -57,6 +79,12 @@ class BeamSegment {
      * This is called by Beam::FilterList
      */
     void InitCoordRefs(const ArrayOfBeamElementCoords *beamElementCoords);
+    
+    /**
+     * Initialize placement information for the segment. Should be used with beamSpan to specify which staff/layer it
+     * belongs to
+     */
+    void InitPlacementInformation(Measure *measure, Staff *staff, Layer *layer);
 
     /**
      * Clear the m_beamElementCoords vector and delete all the objects.
@@ -96,6 +124,9 @@ class BeamSegment {
     void UpdateSameasRoles(data_BEAMPLACE place);
     ///@}
 
+    // Helper to append coordinates for the beamSpans that are drawn over systems
+    void AppendSpanningCoordinates(Measure *measure);
+
 private:
     // Helper to adjust beam positioning with regards to ledger lines (top and bottom of the staff)
     void AdjustBeamToLedgerLines(Doc *doc, Staff *staff, BeamDrawingInterface *beamInterface);
@@ -186,6 +217,11 @@ class BeamSegment {
     StemSameasDrawingRole m_stemSameasRole;
     StemSameasDrawingRole *m_stemSameasReverseRole;
     ///@}
+
+    /**
+     * Additional information on the relevant measure/staff/layer. Optional for plain beams
+     */
+    BeamSegmentPlacementInfo *m_placementInfo;
 };
 
 //----------------------------------------------------------------------------
diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index d5cf8d89482..7fb1d9b3d07 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -34,6 +34,8 @@ class BeamSpan : public ControlElement,
                  public AttBeamedWith,
                  public AttBeamRend,
                  public AttColor {
+private:
+    using SpanIndexVector = std::vector<std::pair<vrv::ArrayOfObjects::iterator, Object *> >;
 public:
     /**
      * @name Constructors, destructors, and other standard methods
@@ -57,13 +59,18 @@ class BeamSpan : public ControlElement,
     virtual TimeSpanningInterface *GetTimeSpanningInterface() { return dynamic_cast<TimeSpanningInterface *>(this); }
     ////@}
 
-    // Helper to append coordinates for the beamSpans that are drawn over systems
-    void AppendSpanningCoordinates(Measure *measure);
-
     // Helper to get element list for the beamSpan - elements are acquired from all layerElements that are located
     // in between start and end of the beamSpan
     ArrayOfObjects GetBeamSpanElementList(Layer* layer, Staff* staff);
 
+    /**
+     * @name Initialize and cleam beam segments
+     */
+    ///@{
+    void InitBeamSegments();
+    void ClearBeamSegments();
+    ////@}
+
     //----------//
     // Functors //
     //----------//
@@ -83,27 +90,17 @@ class BeamSpan : public ControlElement,
      */
     virtual int ResolveSpanningBeamSpans(FunctorParams *);
 
-    /**
-     * @name Getter/setter for spanningType
-     */
-    ///@{
-    void SetSpanningType(int systemIndex, int systemCount);
-    int GetSpanningType() const { return m_spanningType; }
-    ////@}
-
 private:
     // Helper for breaking one big spanning beamSpan into smaller beamSpans
-    bool SeparateSpanningElements(ArrayOfObjects &newElements, Object *first, Doc *doc, bool clearElements);
+    bool AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int index, bool newSegment = true);
 
 public:
     //
-    BeamSegment m_beamSegment;
+    std::vector<BeamSegment *> m_beamSegments;
 
 private:
     //
     ArrayOfObjects m_beamedElements;
-
-    int m_spanningType;
 };
 
 } // namespace vrv
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 3a1b8347dcd..75f182a070a 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -1297,7 +1297,7 @@ class Object : public BoundingBox {
      * drawn properly
      */
     ///@{
-    virtual int ResolveSpinningBeamSpans(FunctorParams *) { return FUNCTOR_CONTINUE; }
+    virtual int ResolveSpanningBeamSpans(FunctorParams *) { return FUNCTOR_CONTINUE; }
     ///@}
 
     /**
diff --git a/src/beam.cpp b/src/beam.cpp
index 5e372515933..b93575e8757 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -36,18 +36,37 @@
 
 namespace vrv {
 
+
+void BeamSegmentPlacementInfo::SetSpanningType(int systemIndex, int systemCount)
+{
+    if (0 == systemIndex) {
+        m_spanningType = SPANNING_START;
+    }
+    else if ((systemCount - 1) == systemIndex) {
+        m_spanningType = SPANNING_END;
+    }
+    else {
+        m_spanningType = SPANNING_MIDDLE;
+    }
+}
+
 //----------------------------------------------------------------------------
 // BeamSegment
 //----------------------------------------------------------------------------
 
 BeamSegment::BeamSegment()
 {
+    m_placementInfo = NULL;
     this->Reset();
 }
 
 BeamSegment::~BeamSegment()
 {
     this->ClearCoordRefs();
+    if (m_placementInfo) {
+        delete m_placementInfo;
+        m_placementInfo = NULL;
+    }
 }
 
 void BeamSegment::Reset()
@@ -84,6 +103,47 @@ void BeamSegment::InitCoordRefs(const ArrayOfBeamElementCoords *beamElementCoord
     m_beamElementCoordRefs = *beamElementCoords;
 }
 
+void BeamSegment::InitPlacementInformation(Measure* measure, Staff* staff, Layer* layer)
+{
+    if (!m_placementInfo) {
+        m_placementInfo = new BeamSegmentPlacementInfo();
+    }
+    m_placementInfo->m_measure = measure;
+    m_placementInfo->m_staff = staff;
+    m_placementInfo->m_layer = layer;
+}
+
+void BeamSegment::AppendSpanningCoordinates(Measure *measure)
+{
+    if (NULL == m_placementInfo) return;
+    const int spanningType = m_placementInfo->m_spanningType;
+    if (SPANNING_START_END == spanningType) return;
+
+    BarLine *bar = measure->GetRightBarLine();
+    const int rightSide = bar->GetDrawingX();
+    BeamElementCoord *front = m_beamElementCoordRefs.front();
+    BeamElementCoord *back = m_beamElementCoordRefs.back();
+    const double slope = (double)(back->m_yBeam - front->m_yBeam) / (double)(back->m_x - front->m_x);
+
+    // in case if beamSpan starts in current system - stretch beam to the right barline
+    if ((SPANNING_START == spanningType) || (SPANNING_MIDDLE == spanningType)) {
+        BeamElementCoord *right = new BeamElementCoord(*back);
+        const int distance = rightSide - back->m_x;
+        right->m_x = rightSide;
+        right->m_yBeam += distance * slope;
+        m_beamElementCoordRefs.push_back(right);
+    }
+    // otherwise start beam closer to the start of the Measure, to indicate spanning
+    if ((SPANNING_END == spanningType) || (SPANNING_MIDDLE == spanningType)) {
+        BeamElementCoord *left = new BeamElementCoord(*front);
+        const int width = measure->GetInnerWidth();
+        const int offset = (back->m_x - front->m_x) / (m_beamElementCoordRefs.size() - 1) / 2;
+        left->m_x -= offset;
+        left->m_yBeam -= offset * slope;
+        m_beamElementCoordRefs.insert(m_beamElementCoordRefs.begin(), left);
+    }
+}
+
 void BeamSegment::CalcBeam(
     Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place, bool init)
 {
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index c4e95294b67..e8143583a0a 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -43,10 +43,15 @@ BeamSpan::BeamSpan()
     RegisterAttClass(ATT_COLOR);
     RegisterAttClass(ATT_PLIST);
 
+    InitBeamSegments();
+
     Reset();
 }
 
-BeamSpan::~BeamSpan() {}
+BeamSpan::~BeamSpan() 
+{
+    ClearBeamSegments();
+}
 
 void BeamSpan::Reset()
 {
@@ -58,36 +63,20 @@ void BeamSpan::Reset()
     ResetBeamRend();
     ResetColor();
     ResetPlist();
+}
 
-    m_spanningType = SPANNING_START_END;
+void BeamSpan::InitBeamSegments() 
+{
+    // BeamSpan should have at least one segment to begin with
+    m_beamSegments.emplace_back(new BeamSegment());
 }
 
-void BeamSpan::AppendSpanningCoordinates(Measure *measure)
+void BeamSpan::ClearBeamSegments()
 {
-    const int spanningType = GetSpanningType();
-    if (SPANNING_START_END == spanningType) return;
-    
-    BarLine *bar = measure->GetRightBarLine();
-    const int rightSide = bar->GetDrawingX();
-    BeamElementCoord *front = m_beamSegment.m_beamElementCoordRefs.front();
-    BeamElementCoord *back = m_beamSegment.m_beamElementCoordRefs.back();
-    const double slope = (double)(back->m_yBeam - front->m_yBeam) / (double)(back->m_x - front->m_x);
-
-    if ((SPANNING_START == spanningType) || (SPANNING_MIDDLE == spanningType)) {
-        BeamElementCoord *right = new BeamElementCoord(*back);
-        const int distance = rightSide - back->m_x;
-        right->m_x = rightSide;
-        right->m_yBeam += distance * slope;
-        m_beamSegment.m_beamElementCoordRefs.push_back(right);
-    }
-    if ((SPANNING_END == spanningType) || (SPANNING_MIDDLE == spanningType)) {
-        BeamElementCoord *left = new BeamElementCoord(*front);
-        const int width = measure->GetInnerWidth();
-        const int offset = (back->m_x - front->m_x) / (m_beamSegment.m_beamElementCoordRefs.size() - 1) / 2;
-        left->m_x -= offset;
-        left->m_yBeam -= offset * slope;
-        m_beamSegment.m_beamElementCoordRefs.insert(m_beamSegment.m_beamElementCoordRefs.begin(), left);
+    for (auto segment : m_beamSegments) {
+        delete segment;
     }
+    m_beamSegments.clear();
 }
 
 ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
@@ -131,43 +120,45 @@ ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
     return beamSpanElements;
 }
 
-bool BeamSpan::SeparateSpanningElements(ArrayOfObjects &newElements, Object *first, Doc *doc, bool clearElements)
+bool BeamSpan::AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int index, bool newSegment)
 {
-    Layer *layer = vrv_cast<Layer *>(first->GetFirstAncestor(LAYER));
-    Staff *staff = vrv_cast<Staff *>(first->GetFirstAncestor(STAFF));
-    if (!layer || !staff) return false;
+    Layer *layer = vrv_cast<Layer *>((*elements.at(index).first)->GetFirstAncestor(LAYER));
+    Staff *staff = vrv_cast<Staff *>((*elements.at(index).first)->GetFirstAncestor(STAFF));
+    Measure *measure = vrv_cast<Measure *>((*elements.at(index).first)->GetFirstAncestor(MEASURE));
+    if (!layer || !staff || !measure) return false;
+
+    // get iterators for first and last coordinates in the range for the segment
+    auto coordsFirst = std::find_if(m_beamElementCoords.begin(), m_beamElementCoords.end(),
+        [&](BeamElementCoord *coord) { return coord->m_element == (*elements.at(index).first); });
+    auto coordsLast = std::find_if(m_beamElementCoords.begin(), m_beamElementCoords.end(),
+        [&](BeamElementCoord *coord) { return coord->m_element == *(elements.at(index + 1).first - 1); });
+    if ((coordsFirst == m_beamElementCoords.end()) || (coordsLast == m_beamElementCoords.end())) return false;
 
-    m_beamedElements = newElements;
-    if (clearElements) m_beamElementCoords.clear();
-    InitCoords(&m_beamedElements, staff, GetPlace());
+    
+    BeamSegment *segment = NULL;
+    if (newSegment) {
+        segment = new BeamSegment();
+    }
+    else {
+        segment = m_beamSegments.at(0);
+    }
 
-    m_beamSegment.InitCoordRefs(&m_beamElementCoords);
-    m_beamSegment.CalcBeam(layer, staff, doc, this, GetPlace());
-    for (auto element : newElements) {
-        vrv_cast<LayerElement *>(element)->m_referencedElement = this;
+    // Init segment with placement information (measure, staff, etc.) as well as begin/end coordinates
+    ArrayOfBeamElementCoords coords(coordsFirst, coordsLast + 1);
+    segment->InitPlacementInformation(measure, staff, layer);
+    segment->m_placementInfo->m_begin = coordsFirst;
+    segment->m_placementInfo->m_end = coordsLast + 1;
+    segment->InitCoordRefs(&coords);
+    segment->CalcBeam(layer, staff, doc, this, GetPlace());
+    segment->m_placementInfo->SetSpanningType(index, elements.size() - 1);
+
+    if (newSegment) {
+        m_beamSegments.push_back(segment);
     }
 
-    // Reset Start and End based on the new elements of the beamSpan
-    TimePointInterface::Reset();
-    TimeSpanningInterface::Reset();
-    SetStart(vrv_cast<LayerElement *>(newElements.front()));
-    SetEnd(vrv_cast<LayerElement *>(newElements.back()));
     return true;
 }
 
-void BeamSpan::SetSpanningType(int systemIndex, int systemCount)
-{
-    if (0 == systemIndex) {
-        m_spanningType = SPANNING_START;
-    }
-    else if ((systemCount - 1) == systemIndex) {
-        m_spanningType = SPANNING_END;
-    }
-    else {
-        m_spanningType = SPANNING_MIDDLE;
-    }
-}
-
 //----------//
 // Functors //
 //----------//
@@ -181,11 +172,17 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
 
     Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
     Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
+    Measure *measure = vrv_cast<Measure *>(GetStart()->GetFirstAncestor(MEASURE));
 
     InitCoords(&m_beamedElements, staff, GetPlace());
 
-    m_beamSegment.InitCoordRefs(&m_beamElementCoords);
-    m_beamSegment.CalcBeam(layer, staff, params->m_doc, this, GetPlace());
+    m_beamSegments.at(0)->InitPlacementInformation(measure, staff, layer);
+    m_beamSegments.at(0)->m_placementInfo->m_begin = m_beamElementCoords.begin();
+    m_beamSegments.at(0)->m_placementInfo->m_end = m_beamElementCoords.end();
+    ArrayOfBeamElementCoords coord(
+        m_beamSegments.at(0)->m_placementInfo->m_begin, m_beamSegments.at(0)->m_placementInfo->m_end);
+    m_beamSegments.at(0)->InitCoordRefs(&coord);
+    m_beamSegments.at(0)->CalcBeam(layer, staff, params->m_doc, this, GetPlace());
 
     return FUNCTOR_CONTINUE;
 }
@@ -246,7 +243,7 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
     // Find layerElements that belong to another system and store then in the vector alongside
     // the system they belong to. This will allow us to break down beamSpan based on the systems
     auto iter = m_beamedElements.begin();
-    std::vector<std::pair<vrv::ArrayOfObjects::iterator, Object *> > elements;
+    SpanIndexVector elements;
     Object *firstSystem = startSystem;
     while (iter != m_beamedElements.end()) {
         elements.push_back({ iter, firstSystem });
@@ -268,19 +265,9 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
             currentSystemIndex = i;
             continue;
         }
-
-        BeamSpan *beamSpan = vrv_cast<BeamSpan *>(Clone());
-        ArrayOfObjects newElements(elements.at(i).first, elements.at(i + 1).first);
-        beamSpan->SeparateSpanningElements(newElements, *elements.at(i).first, params->m_doc, true);
-        beamSpan->SetSpanningType(i, elements.size() - 1);
-
-        Measure *measure = vrv_cast<Measure *>((*elements.at(i).first)->GetFirstAncestor(MEASURE));
-        measure->AddChild(beamSpan);
+        AddSpanningSegment(params->m_doc, elements, i);
     }
-
-    ArrayOfObjects newElements(elements.at(currentSystemIndex).first, elements.at(currentSystemIndex + 1).first);
-    SeparateSpanningElements(newElements, GetStart(), params->m_doc, false);
-    SetSpanningType(currentSystemIndex, elements.size() - 1);
+    AddSpanningSegment(params->m_doc, elements, currentSystemIndex, false);
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index e0d7a7be955..eeaf256852a 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -426,18 +426,22 @@ void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
     assert(beamSpan);
     assert(measure);
 
-    Layer *layer = vrv_cast<Layer *>(beamSpan->GetStart()->GetFirstAncestor(LAYER));
-    Staff *staff = vrv_cast<Staff *>(beamSpan->GetStart()->GetFirstAncestor(STAFF));
-    if (!layer || !staff) return;
-
-    beamSpan->m_beamSegment.Reset();
-    beamSpan->m_beamSegment.InitCoordRefs(&beamSpan->m_beamElementCoords);
-    beamSpan->m_beamSegment.CalcBeam(layer, staff, m_doc, beamSpan, beamSpan->GetPlace());
-    beamSpan->AppendSpanningCoordinates(measure);
-
-    // Draw corresponding beam segment
+    // Draw all segements for the beamSpan
     dc->StartGraphic(beamSpan, "", beamSpan->GetUuid());
-    DrawBeamSegment(dc, &beamSpan->m_beamSegment, beamSpan, layer, staff, measure);
+    for (auto segment : beamSpan->m_beamSegments) {
+        // Reset current segment and set coordinates based on stored begin/end iterators for the ElementCoords
+        segment->Reset();
+        ArrayOfBeamElementCoords coord(segment->m_placementInfo->m_begin, segment->m_placementInfo->m_end);
+        segment->InitCoordRefs(&coord);
+        segment->CalcBeam(segment->m_placementInfo->m_layer, segment->m_placementInfo->m_staff, m_doc, beamSpan,
+            beamSpan->GetPlace());
+        segment->AppendSpanningCoordinates(segment->m_placementInfo->m_measure);
+
+        // Draw corresponding beam segment
+        DrawBeamSegment(dc, segment, beamSpan, segment->m_placementInfo->m_layer, segment->m_placementInfo->m_staff,
+            segment->m_placementInfo->m_measure);
+    }
+
     dc->EndGraphic(beamSpan, this);
 }
 

From eb1607d9b39ff72186e54b3173467b3036dfbb54 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 29 Dec 2020 13:52:33 +0200
Subject: [PATCH 372/403] Fixes for beamSpan behavior

- fixed several errors after rebasing onto the latest develop branch to keep correct beamSpan behavior
---
 include/vrv/beam.h             |  2 ++
 include/vrv/drawinginterface.h |  3 ++-
 src/beam.cpp                   | 16 ++++++++++++++--
 src/beamspan.cpp               | 11 +++++++----
 src/drawinginterface.cpp       |  3 ++-
 src/view_beam.cpp              |  2 +-
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index b39f33a3d51..07d5c8e1e4e 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -186,6 +186,8 @@ class BeamSegment {
     // Helper to check mixed beam positioning compared to other elements (ledger lines, staff) and adjust it accordingly
     bool NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface);
 
+    std::vector<int> GetSegmentYPositions() const;
+
 public:
     // values set by CalcBeam
     int m_nbNotesOrChords;
diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index b591f65e725..0f670190931 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -112,7 +112,7 @@ class BeamDrawingInterface : public ObjectListInterface {
      */
     void InitCue(bool beamCue);
 
-    bool IsHorizontal();
+    bool IsHorizontal(const std::vector<int>& items);
 
     bool IsRepeatedPattern();
 
@@ -175,6 +175,7 @@ class BeamDrawingInterface : public ObjectListInterface {
     bool m_cueSize;
     Staff *m_crossStaffContent;
     data_STAFFREL_basic m_crossStaffRel;
+    bool m_isSpanningElement;
     int m_shortestDur;
     data_STEMDIRECTION m_notesStemDir;
     data_BEAMPLACE m_drawingPlace;
diff --git a/src/beam.cpp b/src/beam.cpp
index b93575e8757..98be0006c3d 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -144,6 +144,17 @@ void BeamSegment::AppendSpanningCoordinates(Measure *measure)
     }
 }
 
+std::vector<int> BeamSegment::GetSegmentYPositions() const
+{
+    std::vector<int> items;
+    for (auto coord : m_beamElementCoordRefs) {
+        if (!coord->m_stem || !coord->m_closestNote) continue;
+
+        items.push_back(coord->m_closestNote->GetDrawingY());
+    }
+    return items;
+}
+
 void BeamSegment::CalcBeam(
     Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place, bool init)
 {
@@ -171,7 +182,7 @@ void BeamSegment::CalcBeam(
     else {
         beamInterface->m_fractionSize = staff->m_drawingStaffSize;
 
-        horizontal = beamInterface->IsHorizontal();
+        horizontal = beamInterface->IsHorizontal(this->GetSegmentYPositions());
         // Beam@place has precedence - however, in some cases, CalcBeam is called recursively because we need to change
         // the place This occurs when mixed makes no sense and the beam is placed above or below instead.
         this->CalcBeamPlace(layer, beamInterface, place);
@@ -1771,7 +1782,8 @@ void BeamElementCoord::SetDrawingStemDir(
 
     // Make sure the stem reaches the center of the staff
     // Mark the segment as extendedToCenter since we then want a reduced slope
-    if (!interface->m_crossStaffContent && (BEAMPLACE_mixed != interface->m_drawingPlace)) {
+    if (!interface->m_isSpanningElement && !interface->m_crossStaffContent
+        && (BEAMPLACE_mixed != interface->m_drawingPlace)) {
         if (((stemDir == STEMDIRECTION_up) && (m_yBeam <= segment->m_verticalCenter))
             || ((stemDir == STEMDIRECTION_down) && (segment->m_verticalCenter <= m_yBeam))) {
             m_yBeam = segment->m_verticalCenter;
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index e8143583a0a..64a68e233e0 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -43,9 +43,8 @@ BeamSpan::BeamSpan()
     RegisterAttClass(ATT_COLOR);
     RegisterAttClass(ATT_PLIST);
 
-    InitBeamSegments();
-
     Reset();
+    InitBeamSegments();   
 }
 
 BeamSpan::~BeamSpan() 
@@ -63,12 +62,16 @@ void BeamSpan::Reset()
     ResetBeamRend();
     ResetColor();
     ResetPlist();
+
+    ClearBeamSegments();
 }
 
 void BeamSpan::InitBeamSegments() 
 {
     // BeamSpan should have at least one segment to begin with
     m_beamSegments.emplace_back(new BeamSegment());
+
+    m_isSpanningElement = true;
 }
 
 void BeamSpan::ClearBeamSegments()
@@ -149,7 +152,7 @@ bool BeamSpan::AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int
     segment->m_placementInfo->m_begin = coordsFirst;
     segment->m_placementInfo->m_end = coordsLast + 1;
     segment->InitCoordRefs(&coords);
-    segment->CalcBeam(layer, staff, doc, this, GetPlace());
+    segment->CalcBeam(layer, staff, doc, this, m_drawingPlace);
     segment->m_placementInfo->SetSpanningType(index, elements.size() - 1);
 
     if (newSegment) {
@@ -233,7 +236,7 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
     FunctorDocParams *params = vrv_params_cast<FunctorDocParams *>(functorParams);
     assert(params);
 
-    if (m_beamedElements.empty() || !GetStart()) return FUNCTOR_CONTINUE;
+    if (m_beamedElements.empty() || !GetStart() || !GetEnd()) return FUNCTOR_CONTINUE;
 
     Object *startSystem = GetStart()->GetFirstAncestor(SYSTEM);
     Object *endSystem = GetEnd()->GetFirstAncestor(SYSTEM);
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index e3e1108117c..4b34ac73aeb 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -92,6 +92,7 @@ void BeamDrawingInterface::Reset()
     m_fractionSize = 100;
     m_crossStaffContent = NULL;
     m_crossStaffRel = STAFFREL_basic_NONE;
+    m_isSpanningElement = false;
     m_shortestDur = 0;
     m_notesStemDir = STEMDIRECTION_NONE;
     m_drawingPlace = BEAMPLACE_NONE;
@@ -261,7 +262,7 @@ void BeamDrawingInterface::InitCue(bool beamCue)
     }
 }
 
-bool BeamDrawingInterface::IsHorizontal()
+bool BeamDrawingInterface::IsHorizontal(const std::vector<int> &items)
 {
     if (this->IsRepeatedPattern()) {
         return true;
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index eeaf256852a..e83d961fe63 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -434,7 +434,7 @@ void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
         ArrayOfBeamElementCoords coord(segment->m_placementInfo->m_begin, segment->m_placementInfo->m_end);
         segment->InitCoordRefs(&coord);
         segment->CalcBeam(segment->m_placementInfo->m_layer, segment->m_placementInfo->m_staff, m_doc, beamSpan,
-            beamSpan->GetPlace());
+            beamSpan->m_drawingPlace);
         segment->AppendSpanningCoordinates(segment->m_placementInfo->m_measure);
 
         // Draw corresponding beam segment

From 5b7ced1378bec559ac38667d819193f4c38c3077 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 11 Jan 2021 18:36:57 +0200
Subject: [PATCH 373/403] Fix beamspan positioning for the cross-staff

- fixed placement/overlaps/etc. for beamspans and their elements in the cross-staff cases
- improved beam overlap logic to work for cross-staff as well
---
 src/beamspan.cpp | 17 +++--------------
 src/object.cpp   | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index 64a68e233e0..f01f9c53085 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -200,16 +200,6 @@ int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
 
     m_beamedElements = HasPlist() ? *GetRefs() : GetBeamSpanElementList(layer, staff);
 
-    // Find whether this beamSpan is crossStaff - if there are beamed elements that belong
-    // to differen staffs we can consider this beamSpan as such
-    bool isCrossStaff = false;
-    for (const auto element : m_beamedElements) {
-        if (element->GetFirstAncestor(STAFF) != staff) {
-            isCrossStaff = true;
-            break;
-        }
-    }
-
     // set current beamSpan as referencedElement for all beamed elemenents (for the
     // sake of figuring if corresponding element is in beamSpan)
     for (const auto element : m_beamedElements) {
@@ -218,11 +208,10 @@ int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
 
         layerElem->m_referencedElement = this;
 
-        if (isCrossStaff) {
+        Staff *elementStaff = vrv_cast<Staff *>(layerElem->GetFirstAncestor(STAFF));
+        if (elementStaff->GetN() != staff->GetN()) {
             Layer *elementLayer = vrv_cast<Layer *>(layerElem->GetFirstAncestor(LAYER));
-            Staff *elementStaff = vrv_cast<Staff *>(layerElem->GetFirstAncestor(STAFF));
-            if (!layer || !staff || layerElem->m_crossStaff) continue;
-
+            if (!elementStaff || !elementLayer) continue;
             layerElem->m_crossStaff = elementStaff;
             layerElem->m_crossLayer = elementLayer;
         }
diff --git a/src/object.cpp b/src/object.cpp
index 9611d1ef709..2606ece7e3f 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1929,6 +1929,30 @@ int Object::SetOverflowBBoxes(FunctorParams *functorParams)
         return FUNCTOR_CONTINUE;
     }
 
+    // Take into account beam in cross-staff situation
+    if (this->Is(BEAM)) {
+        Beam *beam = vrv_cast<Beam *>(this);
+        assert(beam);
+        // Ignore it if it has cross-staff content but is not entirely cross-staff itself
+        if (beam->m_crossStaffContent && !beam->m_crossStaff) return FUNCTOR_CONTINUE;
+    }
+
+    // Take into account stem for notes in cross-staff situation and in beams
+    if (this->Is(STEM)) {
+        LayerElement *noteOrChord = dynamic_cast<LayerElement *>(this->GetParent());
+        if (noteOrChord && noteOrChord->m_crossStaff) {
+            if (noteOrChord->IsInBeam()) {
+                Beam *beam = vrv_cast<Beam *>(noteOrChord->GetFirstAncestor(BEAM));
+                assert(beam);
+                // Ignore it but only if the beam is not entirely cross-staff itself
+                if (!beam->m_crossStaff) return FUNCTOR_CONTINUE;
+            }
+            else if (noteOrChord->IsInBeamSpan()) {
+                return FUNCTOR_CONTINUE;
+            }
+        }
+    }
+
     if (this->Is(FB) || this->Is(FIGURE)) {
         return FUNCTOR_CONTINUE;
     }

From e67a13bb948dcd3bea439c41971944541ad0d7dd Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 2 Dec 2021 11:18:37 +0200
Subject: [PATCH 374/403] Fixes for the beamSpan after rebase

- changed virtual to override
- removed redundant variable usage
- added this-> to internal beamspan calls
- added lost includeChildren flag to FindAllDescendantsBetween
- other minor fixes
---
 include/vrv/beamspan.h | 19 +++++++++----------
 include/vrv/object.h   |  6 +++---
 src/beamspan.cpp       | 38 ++++++++++++++++++++------------------
 src/layerelement.cpp   |  1 +
 src/object.cpp         |  3 ++-
 5 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index 7fb1d9b3d07..985c01df066 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -44,19 +44,18 @@ class BeamSpan : public ControlElement,
     ///@{
     BeamSpan();
     virtual ~BeamSpan();
-    virtual Object *Clone() const { return new BeamSpan(*this); }
-    virtual void Reset();
-    virtual std::string GetClassName() const { return "BeamSpan"; }
-    virtual ClassId GetClassId() const { return BEAMSPAN; }
+    Object *Clone() const override { return new BeamSpan(*this); }
+    void Reset() override;
+    std::string GetClassName() const override { return "BeamSpan"; }
     ///@}
 
     /**
      * @name Getter to interfaces
      */
     ///@{
-    virtual PlistInterface *GetPlistInterface() { return dynamic_cast<PlistInterface *>(this); }
-    virtual TimePointInterface *GetTimePointInterface() { return dynamic_cast<TimePointInterface *>(this); }
-    virtual TimeSpanningInterface *GetTimeSpanningInterface() { return dynamic_cast<TimeSpanningInterface *>(this); }
+    PlistInterface *GetPlistInterface() override { return dynamic_cast<PlistInterface *>(this); }
+    TimePointInterface *GetTimePointInterface() override { return dynamic_cast<TimePointInterface *>(this); }
+    TimeSpanningInterface *GetTimeSpanningInterface() override { return dynamic_cast<TimeSpanningInterface *>(this); }
     ////@}
 
     // Helper to get element list for the beamSpan - elements are acquired from all layerElements that are located
@@ -78,17 +77,17 @@ class BeamSpan : public ControlElement,
     /**
      * See Object::CalcStem
      */
-    virtual int CalcStem(FunctorParams *functorParams);
+    int CalcStem(FunctorParams *functorParams) override;
 
     /**
      * See Object::ResolveBeamSpanElements
      */
-    virtual int ResolveBeamSpanElements(FunctorParams *);
+    int ResolveBeamSpanElements(FunctorParams *) override;
 
     /**
      * See Object::ResolveSpanningBeamSpans
      */
-    virtual int ResolveSpanningBeamSpans(FunctorParams *);
+    int ResolveSpanningBeamSpans(FunctorParams *) override;
 
 private:
     // Helper for breaking one big spanning beamSpan into smaller beamSpans
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 75f182a070a..ba8ebdbbb1a 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -411,8 +411,8 @@ class Object : public BoundingBox {
      * Return all the objects matching the Comparison functor and being between start and end in the tree.
      * The start and end objects are included in the result set.
      */
-    void FindAllDescendantsBetween(
-        ListOfObjects *objects, Comparison *comparison, Object *start, Object *end, bool clear = true);
+    void FindAllDescendantsBetween(ListOfObjects *objects, Comparison *comparison, Object *start, Object *end,
+        bool clear = true, bool includeChildren = true);
 
     /**
      * Give up ownership of the child at the idx position (NULL if not found)
@@ -1291,7 +1291,7 @@ class Object : public BoundingBox {
     ///@}
 
     /**
-     * Resolve spinning beamspans by breaking it into separate parts, each belonging to the corresponding
+     * Resolve spanning beamspans by breaking it into separate parts, each belonging to the corresponding
      * system/measure. BeamSpans get elements reassigned, so that each beamSpan can be drawn as control
      * element. This allows free placement of beamSpan in the MEI tree and ensures that beamSpan will be
      * drawn properly
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index f01f9c53085..92a0342b25b 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -26,9 +26,10 @@ namespace vrv {
 //----------------------------------------------------------------------------
 // BeamSpan
 //----------------------------------------------------------------------------
+static const ClassRegistrar<BeamSpan> s_factory("beamSpan", BEAMSPAN);
 
 BeamSpan::BeamSpan()
-    : ControlElement("beamspan-")
+    : ControlElement(BEAMSPAN, "beamspan-")
     , BeamDrawingInterface()
     , PlistInterface()
     , TimeSpanningInterface()
@@ -87,13 +88,13 @@ ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
     // find all elements between startId and endId of the beamSpan
     ClassIdsComparison classIds({ NOTE, CHORD });
     ListOfObjects objects;
-    layer->FindAllDescendantBetween(&objects, &classIds, GetStart(), GetEnd(), true, false);
+    layer->FindAllDescendantsBetween(&objects, &classIds, this->GetStart(), this->GetEnd(), true, false);
 
     ArrayOfObjects beamSpanElements(objects.begin(), objects.end());
     // If last element is not equal to the end, there is high chance that this beamSpan is cross-measure.
     // Look for the same N-staff N-layer in next measure and try finding end there
-    if (beamSpanElements.back() != GetEnd()) {
-        Measure *measure = vrv_cast<Measure *>(GetStart()->GetFirstAncestor(MEASURE));
+    if (beamSpanElements.back() != this->GetEnd()) {
+        Measure *measure = vrv_cast<Measure *>(this->GetStart()->GetFirstAncestor(MEASURE));
         Object *parent = measure->GetParent();
 
         const int index = parent->GetChildIndex(measure);
@@ -109,9 +110,10 @@ ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
                     ClassIdsComparison classIds({ NOTE, CHORD });
                     ListOfObjects nextLayerObjects;
                     // pass NULL as starting element to add all elements until end is reached
-                    nextStaffLayer->FindAllDescendantBetween(&nextLayerObjects, &classIds, NULL, GetEnd(), true, false);
+                    nextStaffLayer->FindAllDescendantsBetween(
+                        &nextLayerObjects, &classIds, NULL, this->GetEnd(), true, false);
                     // Handle only next measure for the time being
-                    if (nextLayerObjects.back() == GetEnd()) {
+                    if (nextLayerObjects.back() == this->GetEnd()) {
                         beamSpanElements.insert(
                             beamSpanElements.end(), nextLayerObjects.begin(), nextLayerObjects.end());
                     }
@@ -171,13 +173,13 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
     CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
     assert(params);
 
-    if (!GetStart()) return FUNCTOR_CONTINUE;
+    if (!this->GetStart()) return FUNCTOR_CONTINUE;
 
-    Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
-    Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
-    Measure *measure = vrv_cast<Measure *>(GetStart()->GetFirstAncestor(MEASURE));
+    Layer *layer = vrv_cast<Layer *>(this->GetStart()->GetFirstAncestor(LAYER));
+    Staff *staff = vrv_cast<Staff *>(this->GetStart()->GetFirstAncestor(STAFF));
+    Measure *measure = vrv_cast<Measure *>(this->GetStart()->GetFirstAncestor(MEASURE));
 
-    InitCoords(&m_beamedElements, staff, GetPlace());
+    this->InitCoords(&m_beamedElements, staff, this->GetPlace());
 
     m_beamSegments.at(0)->InitPlacementInformation(measure, staff, layer);
     m_beamSegments.at(0)->m_placementInfo->m_begin = m_beamElementCoords.begin();
@@ -192,13 +194,13 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
 
 int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
 {
-    if (!m_beamedElements.empty() || !GetStart()) return FUNCTOR_CONTINUE;
+    if (!m_beamedElements.empty() || !this->GetStart()) return FUNCTOR_CONTINUE;
 
     Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
     Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
     if (!layer || !staff) return FUNCTOR_SIBLINGS;
 
-    m_beamedElements = HasPlist() ? *GetRefs() : GetBeamSpanElementList(layer, staff);
+    m_beamedElements = this->HasPlist() ? *this->GetRefs() : this->GetBeamSpanElementList(layer, staff);
 
     // set current beamSpan as referencedElement for all beamed elemenents (for the
     // sake of figuring if corresponding element is in beamSpan)
@@ -227,8 +229,8 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
 
     if (m_beamedElements.empty() || !GetStart() || !GetEnd()) return FUNCTOR_CONTINUE;
 
-    Object *startSystem = GetStart()->GetFirstAncestor(SYSTEM);
-    Object *endSystem = GetEnd()->GetFirstAncestor(SYSTEM);
+    Object *startSystem = this->GetStart()->GetFirstAncestor(SYSTEM);
+    Object *endSystem = this->GetEnd()->GetFirstAncestor(SYSTEM);
     assert(startSystem && endSystem);
     if (startSystem == endSystem) return FUNCTOR_CONTINUE;
 
@@ -250,16 +252,16 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
 
     // Iterator for the elements are based on the initial order of the elements, so skip current system when
     // found and process it separatelly in the end
-    Object *currentSystemn = GetFirstAncestor(SYSTEM);
+    Object *currentSystemn = this->GetFirstAncestor(SYSTEM);
     int currentSystemIndex = 0;
     for (int i = 0; i < elements.size() - 1; ++i) {
         if (elements.at(i).second == currentSystemn) {
             currentSystemIndex = i;
             continue;
         }
-        AddSpanningSegment(params->m_doc, elements, i);
+        this->AddSpanningSegment(params->m_doc, elements, i);
     }
-    AddSpanningSegment(params->m_doc, elements, currentSystemIndex, false);
+    this->AddSpanningSegment(params->m_doc, elements, currentSystemIndex, false);
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 28528a536b1..050f634c7b5 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -247,6 +247,7 @@ int LayerElement::GetOriginalLayerN()
         layerN = vrv_cast<Layer *>(this->GetFirstAncestor(LAYER))->GetN();
     }
     return layerN;
+}
 
 bool LayerElement::IsInBeamSpan() const
 {
diff --git a/src/object.cpp b/src/object.cpp
index 2606ece7e3f..c7b2636af67 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -583,13 +583,14 @@ void Object::FindAllDescendantsByComparison(
 }
 
 void Object::FindAllDescendantsBetween(
-    ListOfObjects *objects, Comparison *comparison, Object *start, Object *end, bool clear)
+    ListOfObjects *objects, Comparison *comparison, Object *start, Object *end, bool clear, bool includeChildren)
 {
     assert(objects);
     if (clear) objects->clear();
 
     Functor findAllBetween(&Object::FindAllBetween);
     FindAllBetweenParams findAllBetweenParams(comparison, objects, start, end);
+    findAllBetweenParams.m_includeChildren = includeChildren;
     this->Process(&findAllBetween, &findAllBetweenParams, NULL, NULL, UNLIMITED_DEPTH, FORWARD, true);
 }
 

From 8518e7cb4c39f45f94f6c24d80c21e878a10d7ab Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 26 Jan 2022 14:52:06 +0200
Subject: [PATCH 375/403] Fix beamspan behavior

- adjusted code to support beamspans over multiple measures (for 3 or more measure)
- adjusted logic for beamspans to be rendered when sysem break separates beamspan with just 2 elements
---
 src/beam.cpp     | 15 +++++++++++--
 src/beamspan.cpp | 57 +++++++++++++++++++++++++++---------------------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index 98be0006c3d..13ac4d969aa 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -123,7 +123,10 @@ void BeamSegment::AppendSpanningCoordinates(Measure *measure)
     const int rightSide = bar->GetDrawingX();
     BeamElementCoord *front = m_beamElementCoordRefs.front();
     BeamElementCoord *back = m_beamElementCoordRefs.back();
-    const double slope = (double)(back->m_yBeam - front->m_yBeam) / (double)(back->m_x - front->m_x);
+    double slope = 0.0;
+    if (m_beamElementCoordRefs.size() > 1) {
+        slope = (double)(back->m_yBeam - front->m_yBeam) / (double)(back->m_x - front->m_x);
+    }
 
     // in case if beamSpan starts in current system - stretch beam to the right barline
     if ((SPANNING_START == spanningType) || (SPANNING_MIDDLE == spanningType)) {
@@ -137,7 +140,15 @@ void BeamSegment::AppendSpanningCoordinates(Measure *measure)
     if ((SPANNING_END == spanningType) || (SPANNING_MIDDLE == spanningType)) {
         BeamElementCoord *left = new BeamElementCoord(*front);
         const int width = measure->GetInnerWidth();
-        const int offset = (back->m_x - front->m_x) / (m_beamElementCoordRefs.size() - 1) / 2;
+        int offset = 0;
+        if (m_beamElementCoordRefs.size() > 1) {
+            const int divideBy = 2 * (m_beamElementCoordRefs.size() - 1);
+            offset = (back->m_x - front->m_x) / divideBy;
+        }
+        else {
+            // 1.5 * unit offset in this case (harcoded for the time being)
+            offset = 270;
+        }
         left->m_x -= offset;
         left->m_yBeam -= offset * slope;
         m_beamElementCoordRefs.insert(m_beamElementCoordRefs.begin(), left);
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index 92a0342b25b..a8a0f93b10f 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -93,33 +93,40 @@ ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
     ArrayOfObjects beamSpanElements(objects.begin(), objects.end());
     // If last element is not equal to the end, there is high chance that this beamSpan is cross-measure.
     // Look for the same N-staff N-layer in next measure and try finding end there
-    if (beamSpanElements.back() != this->GetEnd()) {
-        Measure *measure = vrv_cast<Measure *>(this->GetStart()->GetFirstAncestor(MEASURE));
-        Object *parent = measure->GetParent();
-
-        const int index = parent->GetChildIndex(measure);
-        Measure *nextMeasure = vrv_cast<Measure *>(parent->GetNext(measure, MEASURE));
-        if (nextMeasure) {
-            AttNIntegerComparison snc(STAFF, staff->GetN());
-            Staff *nextStaff = vrv_cast<Staff *>(nextMeasure->FindDescendantByComparison(&snc));
-            if (nextStaff) {
-                AttNIntegerComparison lnc(LAYER, layer->GetN());
-                Layer *nextStaffLayer = vrv_cast<Layer *>(nextStaff->FindDescendantByComparison(&lnc));
-                if (nextStaffLayer) {
-                    // find all elements between startId and endId of the beamSpan
-                    ClassIdsComparison classIds({ NOTE, CHORD });
-                    ListOfObjects nextLayerObjects;
-                    // pass NULL as starting element to add all elements until end is reached
-                    nextStaffLayer->FindAllDescendantsBetween(
-                        &nextLayerObjects, &classIds, NULL, this->GetEnd(), true, false);
-                    // Handle only next measure for the time being
-                    if (nextLayerObjects.back() == this->GetEnd()) {
-                        beamSpanElements.insert(
-                            beamSpanElements.end(), nextLayerObjects.begin(), nextLayerObjects.end());
-                    }
-                }
+    Measure *startMeasure = vrv_cast<Measure *>(this->GetStart()->GetFirstAncestor(MEASURE));
+    Measure *endMeasure = vrv_cast<Measure *>(this->GetEnd()->GetFirstAncestor(MEASURE));
+    Measure *nextMeasure = NULL;
+    while ((beamSpanElements.back() != this->GetEnd()) && (startMeasure != endMeasure)) {
+        Object *parent = startMeasure->GetParent();
+
+        nextMeasure = vrv_cast<Measure *>(parent->GetNext(startMeasure, MEASURE));
+        if (!nextMeasure) break;
+
+        AttNIntegerComparison snc(STAFF, staff->GetN());
+        Staff *nextStaff = vrv_cast<Staff *>(nextMeasure->FindDescendantByComparison(&snc));
+        if (!nextStaff) break;
+
+        AttNIntegerComparison lnc(LAYER, layer->GetN());
+        Layer *nextStaffLayer = vrv_cast<Layer *>(nextStaff->FindDescendantByComparison(&lnc));
+        if (!nextStaffLayer) break;
+
+        // find all elements between startId and endId of the beamSpan
+        ClassIdsComparison classIds({ NOTE, CHORD });
+        ListOfObjects nextLayerObjects;
+        // pass NULL as starting element to add all elements until end is reached
+        if (endMeasure == nextMeasure) {
+            nextStaffLayer->FindAllDescendantsBetween(&nextLayerObjects, &classIds, NULL, this->GetEnd(), true, false);
+            // Handle only next measure for the time being
+            if (nextLayerObjects.back() == this->GetEnd()) {
+                beamSpanElements.insert(beamSpanElements.end(), nextLayerObjects.begin(), nextLayerObjects.end());
             }
         }
+        else {
+            nextStaffLayer->FindAllDescendantsByComparison(&nextLayerObjects, &classIds);
+            beamSpanElements.insert(beamSpanElements.end(), nextLayerObjects.begin(), nextLayerObjects.end());
+        }        
+
+        startMeasure = nextMeasure;
     }
 
     return beamSpanElements;

From 4b204344488f426be0c617bbd8675efb0c468c93 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 27 Jan 2022 17:18:29 +0200
Subject: [PATCH 376/403] Add handling of the beamSpans when improting from
 MusicXML

---
 include/vrv/iomusxml.h | 11 +++++++-
 src/iomusxml.cpp       | 58 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 6f4d23c8dd1..184844269a9 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -26,6 +26,7 @@
 namespace vrv {
 
 class Arpeg;
+class BeamSpan;
 class BracketSpan;
 class Clef;
 class ControlElement;
@@ -218,7 +219,7 @@ class MusicXmlInput : public Input {
     void ReadMusicXmlNote(
         pugi::xml_node, Measure *measure, const std::string &measureNum, const short int staffOffset, Section *section);
     void ReadMusicXmlPrint(pugi::xml_node, Section *section);
-    void ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Layer *layer, bool isChord);
+    bool ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Layer *layer, bool isChord);
     void ReadMusicXmlTupletStart(const pugi::xml_node &node, const pugi::xml_node &tupletStart, Layer *layer);
     void ReadMusicXmlBeamStart(const pugi::xml_node &node, const pugi::xml_node &beamStart, Layer *layer);
     void ReadMusicXMLMeterSig(const pugi::xml_node &node, Object *parent);
@@ -292,6 +293,11 @@ class MusicXmlInput : public Input {
      */
     void RemoveLastFromStack(ClassId classId, Layer *layer);
 
+    /**
+     * Check if element of classId type is present on the specified layer
+     */
+    bool IsInStack(ClassId classId, Layer *layer);
+
     /*
      * @name Helper methods for checking presence of values of attributes or elements
      */
@@ -327,6 +333,7 @@ class MusicXmlInput : public Input {
     void CloseTie(Note *note);
     void OpenSlur(Measure *measure, short int number, Slur *slur);
     void CloseSlur(Measure *measure, short int number, LayerElement *element);
+    void CloseBeamSpan(Staff *staff, Layer *layer, LayerElement *element);
     ///@}
 
     /*
@@ -484,6 +491,8 @@ class MusicXmlInput : public Input {
     /* The stack for hairpin stops that might occur before a hairpin was started staffNumber, tStamp2, (hairpinNumber,
      * measureCount) */
     std::vector<std::tuple<int, double, musicxml::OpenSpanner>> m_hairpinStopStack;
+    /* The stack for the beamspans with numbers of staff/layer where starting element is located*/
+    std::vector<std::pair<BeamSpan *, std::pair<int, int>>> m_beamspanStack;
     std::vector<std::pair<BracketSpan *, musicxml::OpenSpanner>> m_bracketStack;
     std::vector<std::pair<Trill *, musicxml::OpenSpanner>> m_trillStack;
     /* The stack of endings to be inserted at the end of XML import */
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 0a0263992ca..8c9f008d3b8 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -18,6 +18,7 @@
 
 #include "arpeg.h"
 #include "beam.h"
+#include "beamspan.h"
 #include "beatrpt.h"
 #include "bracketspan.h"
 #include "breath.h"
@@ -480,6 +481,13 @@ void MusicXmlInput::RemoveLastFromStack(ClassId classId, Layer *layer)
     }
 }
 
+bool MusicXmlInput::IsInStack(ClassId classId, Layer *layer)
+{
+    return (m_elementStackMap.at(layer).end()
+        != std::find_if(m_elementStackMap.at(layer).begin(), m_elementStackMap.at(layer).end(),
+            [classId](LayerElement *element) { return element->Is(classId); }));
+}
+
 void MusicXmlInput::FillSpace(Layer *layer, int dur)
 {
     assert(layer);
@@ -561,6 +569,17 @@ void MusicXmlInput::CloseSlur(Measure *measure, short int number, LayerElement *
     m_slurStopStack.push_back({ element, closeSlur });
 }
 
+void MusicXmlInput::CloseBeamSpan(Staff* staff, Layer* layer, LayerElement* element) 
+{
+    for (auto riter = m_beamspanStack.rbegin(); riter != m_beamspanStack.rend(); ++riter) {
+        if ((riter->second.first == staff->GetN()) || (riter->second.second == layer->GetN())) {
+            riter->first->SetEndid("#" + element->GetUuid());
+            m_beamspanStack.erase(std::next(riter).base());
+            return;
+        }
+    }
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // Text rendering
 
@@ -1085,6 +1104,11 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
     m_doc->ConvertToPageBasedDoc();
 
     // clean up stacks
+    if (!m_beamspanStack.empty()) {
+        LogWarning("MusicXML import: There are %d beamspans left without ending", m_beamspanStack.size());
+        m_beamspanStack.clear();
+    }
+
     if (!m_tieStack.empty()) {
         LogWarning("MusicXML import: There are %d ties left open", m_tieStack.size());
         m_tieStack.clear();
@@ -2553,8 +2577,6 @@ void MusicXmlInput::ReadMusicXmlNote(
 
     short int tremSlashNum = -1;
 
-    ReadMusicXmlBeamsAndTuplets(node, layer, isChord);
-
     // beam start
     bool beamStart = node.select_node("beam[@number='1'][text()='begin']");
     // tremolos
@@ -2879,6 +2901,14 @@ void MusicXmlInput::ReadMusicXmlNote(
             }
         }
 
+        // beam / beamspan
+        if (!ReadMusicXmlBeamsAndTuplets(node, layer, isChord)) {
+            BeamSpan *meiBeamSpan = new BeamSpan();
+            meiBeamSpan->SetStartid("#" + element->GetUuid());
+            m_controlElements.push_back({ measureNum, meiBeamSpan });
+            m_beamspanStack.push_back({ meiBeamSpan, { staff->GetN(), layer->GetN() } });
+        }
+
         // verse / syl
         for (pugi::xml_node lyric : node.children("lyric")) {
             short int lyricNumber = lyric.attribute("number").as_int();
@@ -3482,7 +3512,12 @@ void MusicXmlInput::ReadMusicXmlNote(
             }
         }
         else {
-            RemoveLastFromStack(BEAM, layer);
+            if (IsInStack(BEAM, layer)) {
+                RemoveLastFromStack(BEAM, layer);
+            }
+            else {
+                CloseBeamSpan(staff, layer, element);
+            }
         }
     }
 
@@ -3552,7 +3587,7 @@ void MusicXmlInput::ReadMusicXmlPrint(pugi::xml_node node, Section *section)
     }
 }
 
-void MusicXmlInput::ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Layer *layer, bool isChord)
+bool MusicXmlInput::ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Layer *layer, bool isChord)
 {
     pugi::xpath_node beamStart = node.select_node("beam[@number='1' and text()='begin']");
     pugi::xpath_node tupletStart = node.select_node("notations/tuplet[@type='start']");
@@ -3591,12 +3626,19 @@ void MusicXmlInput::ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Laye
         const auto beamStartIterator = std::find(currentMeasureNodes.begin(), currentMeasureNodes.end(), node);
         const auto beamEndIterator = std::find(beamStartIterator, currentMeasureNodes.end(), beamEnd);
 
-        if (beamEndIterator == currentMeasureNodes.end()) {
+        // find staff number for the corresponding elements - we do not want to match beam start on one staff with beam
+        // end on another
+        pugi::xpath_node nodeStaff = node.select_node("staff");
+        pugi::xpath_node endBeamStaff = beamEnd.select_node("staff");
+
+        if (beamEndIterator == currentMeasureNodes.end()
+            || (nodeStaff && endBeamStaff
+                && (nodeStaff.node().text().as_int() != endBeamStaff.node().text().as_int()))) {
             std::string measureName = (currentMeasure.node().attribute("id"))
                 ? currentMeasure.node().attribute("id").as_string()
                 : currentMeasure.node().attribute("number").as_string();
-            LogError("MusicXML import: Beam without end in measure %s", measureName.c_str());
-            return;
+            LogWarning("MusicXML import: Beam without end in measure %s treated as <beamSpan>", measureName.c_str());
+            return false;
         }
         // form vector of the beam nodes and find whether there are tuplets that start or end within the beam
         std::vector<pugi::xml_node> beamNodes(beamStartIterator, beamEndIterator + 1);
@@ -3618,6 +3660,8 @@ void MusicXmlInput::ReadMusicXmlBeamsAndTuplets(const pugi::xml_node &node, Laye
     else if (tupletStart) {
         if (!isChord) ReadMusicXmlTupletStart(node, tupletStart.node(), layer);
     }
+
+    return true;
 }
 
 void MusicXmlInput::ReadMusicXmlTupletStart(const pugi::xml_node &node, const pugi::xml_node &tupletStart, Layer *layer)

From bbfe18d77a355057fe177d7526b1e97e94bc8d70 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Mon, 7 Feb 2022 18:25:19 +0200
Subject: [PATCH 377/403] Minor fixes

- added missing `this` keyword
- added check for GetEnd() being initialized in several places
- formatting
---
 include/vrv/beamspan.h |  5 +++--
 src/beamspan.cpp       | 23 +++++++++++------------
 src/view_beam.cpp      |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index 985c01df066..347a6ede0d3 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -35,7 +35,8 @@ class BeamSpan : public ControlElement,
                  public AttBeamRend,
                  public AttColor {
 private:
-    using SpanIndexVector = std::vector<std::pair<vrv::ArrayOfObjects::iterator, Object *> >;
+    using SpanIndexVector = std::vector<std::pair<vrv::ArrayOfObjects::iterator, Object *>>;
+
 public:
     /**
      * @name Constructors, destructors, and other standard methods
@@ -60,7 +61,7 @@ class BeamSpan : public ControlElement,
 
     // Helper to get element list for the beamSpan - elements are acquired from all layerElements that are located
     // in between start and end of the beamSpan
-    ArrayOfObjects GetBeamSpanElementList(Layer* layer, Staff* staff);
+    ArrayOfObjects GetBeamSpanElementList(Layer *layer, Staff *staff);
 
     /**
      * @name Initialize and cleam beam segments
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index a8a0f93b10f..aa1af57c1c6 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -45,10 +45,10 @@ BeamSpan::BeamSpan()
     RegisterAttClass(ATT_PLIST);
 
     Reset();
-    InitBeamSegments();   
+    InitBeamSegments();
 }
 
-BeamSpan::~BeamSpan() 
+BeamSpan::~BeamSpan()
 {
     ClearBeamSegments();
 }
@@ -67,7 +67,7 @@ void BeamSpan::Reset()
     ClearBeamSegments();
 }
 
-void BeamSpan::InitBeamSegments() 
+void BeamSpan::InitBeamSegments()
 {
     // BeamSpan should have at least one segment to begin with
     m_beamSegments.emplace_back(new BeamSegment());
@@ -124,7 +124,7 @@ ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
         else {
             nextStaffLayer->FindAllDescendantsByComparison(&nextLayerObjects, &classIds);
             beamSpanElements.insert(beamSpanElements.end(), nextLayerObjects.begin(), nextLayerObjects.end());
-        }        
+        }
 
         startMeasure = nextMeasure;
     }
@@ -146,7 +146,6 @@ bool BeamSpan::AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int
         [&](BeamElementCoord *coord) { return coord->m_element == *(elements.at(index + 1).first - 1); });
     if ((coordsFirst == m_beamElementCoords.end()) || (coordsLast == m_beamElementCoords.end())) return false;
 
-    
     BeamSegment *segment = NULL;
     if (newSegment) {
         segment = new BeamSegment();
@@ -180,7 +179,7 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
     CalcStemParams *params = vrv_params_cast<CalcStemParams *>(functorParams);
     assert(params);
 
-    if (!this->GetStart()) return FUNCTOR_CONTINUE;
+    if (!this->GetStart() || !this->GetEnd()) return FUNCTOR_CONTINUE;
 
     Layer *layer = vrv_cast<Layer *>(this->GetStart()->GetFirstAncestor(LAYER));
     Staff *staff = vrv_cast<Staff *>(this->GetStart()->GetFirstAncestor(STAFF));
@@ -194,17 +193,17 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
     ArrayOfBeamElementCoords coord(
         m_beamSegments.at(0)->m_placementInfo->m_begin, m_beamSegments.at(0)->m_placementInfo->m_end);
     m_beamSegments.at(0)->InitCoordRefs(&coord);
-    m_beamSegments.at(0)->CalcBeam(layer, staff, params->m_doc, this, GetPlace());
+    m_beamSegments.at(0)->CalcBeam(layer, staff, params->m_doc, this, this->GetPlace());
 
     return FUNCTOR_CONTINUE;
 }
 
 int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
 {
-    if (!m_beamedElements.empty() || !this->GetStart()) return FUNCTOR_CONTINUE;
+    if (!m_beamedElements.empty() || !this->GetStart() || !this->GetEnd()) return FUNCTOR_CONTINUE;
 
-    Layer *layer = vrv_cast<Layer *>(GetStart()->GetFirstAncestor(LAYER));
-    Staff *staff = vrv_cast<Staff *>(GetStart()->GetFirstAncestor(STAFF));
+    Layer *layer = vrv_cast<Layer *>(this->GetStart()->GetFirstAncestor(LAYER));
+    Staff *staff = vrv_cast<Staff *>(this->GetStart()->GetFirstAncestor(STAFF));
     if (!layer || !staff) return FUNCTOR_SIBLINGS;
 
     m_beamedElements = this->HasPlist() ? *this->GetRefs() : this->GetBeamSpanElementList(layer, staff);
@@ -234,7 +233,7 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
     FunctorDocParams *params = vrv_params_cast<FunctorDocParams *>(functorParams);
     assert(params);
 
-    if (m_beamedElements.empty() || !GetStart() || !GetEnd()) return FUNCTOR_CONTINUE;
+    if (m_beamedElements.empty() || !this->GetStart() || !this->GetEnd()) return FUNCTOR_CONTINUE;
 
     Object *startSystem = this->GetStart()->GetFirstAncestor(SYSTEM);
     Object *endSystem = this->GetEnd()->GetFirstAncestor(SYSTEM);
@@ -248,7 +247,7 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
     Object *firstSystem = startSystem;
     while (iter != m_beamedElements.end()) {
         elements.push_back({ iter, firstSystem });
-        iter = find_if(iter, m_beamedElements.end(), [&firstSystem](Object *element) {
+        iter = std::find_if(iter, m_beamedElements.end(), [&firstSystem](Object *element) {
             Object *parentSystem = element->GetFirstAncestor(SYSTEM);
             if (firstSystem == parentSystem) return false;
             firstSystem = parentSystem;
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index e83d961fe63..a0b4f5fd9e4 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -438,8 +438,8 @@ void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
         segment->AppendSpanningCoordinates(segment->m_placementInfo->m_measure);
 
         // Draw corresponding beam segment
-        DrawBeamSegment(dc, segment, beamSpan, segment->m_placementInfo->m_layer, segment->m_placementInfo->m_staff,
-            segment->m_placementInfo->m_measure);
+        this->DrawBeamSegment(dc, segment, beamSpan, segment->m_placementInfo->m_layer,
+            segment->m_placementInfo->m_staff, segment->m_placementInfo->m_measure);
     }
 
     dc->EndGraphic(beamSpan, this);

From cba209a4cda5ed2ab0ce836592b9a1f9352743f3 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Tue, 8 Feb 2022 18:44:31 +0200
Subject: [PATCH 378/403] Fix beamspans over several measures before system
 break

- change code to use correct measures to determine position of beam over the system break
- small fixes for redundant code
---
 include/vrv/beam.h |  2 +-
 include/vrv/view.h |  4 ++--
 src/beam.cpp       |  3 +--
 src/beamspan.cpp   | 24 ++++++++++++++++++------
 src/view_beam.cpp  | 11 +++++------
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 07d5c8e1e4e..753e8e9dd70 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -84,7 +84,7 @@ class BeamSegment {
      * Initialize placement information for the segment. Should be used with beamSpan to specify which staff/layer it
      * belongs to
      */
-    void InitPlacementInformation(Measure *measure, Staff *staff, Layer *layer);
+    void InitPlacementInformation(Staff *staff, Layer *layer);
 
     /**
      * Clear the m_beamElementCoords vector and delete all the objects.
diff --git a/include/vrv/view.h b/include/vrv/view.h
index 56f8a6d6ccc..2475fdc382c 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -602,8 +602,8 @@ class View {
     /**
      * Internal method for drawing a BeamSegment
      */
-    void DrawBeamSegment(DeviceContext *dc, BeamSegment *segment, BeamDrawingInterface *beamInterface, Layer *layer,
-        Staff *staff, Measure *measure);
+    void DrawBeamSegment(
+        DeviceContext *dc, BeamSegment *segment, BeamDrawingInterface *beamInterface, Layer *layer, Staff *staff);
 
     /**
      * Internal methods for drawing time spanning elements
diff --git a/src/beam.cpp b/src/beam.cpp
index 13ac4d969aa..e593070747a 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -103,12 +103,11 @@ void BeamSegment::InitCoordRefs(const ArrayOfBeamElementCoords *beamElementCoord
     m_beamElementCoordRefs = *beamElementCoords;
 }
 
-void BeamSegment::InitPlacementInformation(Measure* measure, Staff* staff, Layer* layer)
+void BeamSegment::InitPlacementInformation(Staff *staff, Layer *layer)
 {
     if (!m_placementInfo) {
         m_placementInfo = new BeamSegmentPlacementInfo();
     }
-    m_placementInfo->m_measure = measure;
     m_placementInfo->m_staff = staff;
     m_placementInfo->m_layer = layer;
 }
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index aa1af57c1c6..34e9ca4ca36 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -136,8 +136,7 @@ bool BeamSpan::AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int
 {
     Layer *layer = vrv_cast<Layer *>((*elements.at(index).first)->GetFirstAncestor(LAYER));
     Staff *staff = vrv_cast<Staff *>((*elements.at(index).first)->GetFirstAncestor(STAFF));
-    Measure *measure = vrv_cast<Measure *>((*elements.at(index).first)->GetFirstAncestor(MEASURE));
-    if (!layer || !staff || !measure) return false;
+    if (!layer || !staff) return false;
 
     // get iterators for first and last coordinates in the range for the segment
     auto coordsFirst = std::find_if(m_beamElementCoords.begin(), m_beamElementCoords.end(),
@@ -156,12 +155,24 @@ bool BeamSpan::AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int
 
     // Init segment with placement information (measure, staff, etc.) as well as begin/end coordinates
     ArrayOfBeamElementCoords coords(coordsFirst, coordsLast + 1);
-    segment->InitPlacementInformation(measure, staff, layer);
+    segment->InitPlacementInformation(staff, layer);
     segment->m_placementInfo->m_begin = coordsFirst;
     segment->m_placementInfo->m_end = coordsLast + 1;
     segment->InitCoordRefs(&coords);
     segment->CalcBeam(layer, staff, doc, this, m_drawingPlace);
     segment->m_placementInfo->SetSpanningType(index, elements.size() - 1);
+    Measure *measure = NULL;
+    Object *currentSystem = layer->GetFirstAncestor(SYSTEM);
+    if (segment->m_placementInfo->m_spanningType == SPANNING_START) {
+        segment->m_placementInfo->m_measure = vrv_cast<Measure *>(currentSystem->GetLast(MEASURE));
+    }
+    else if (segment->m_placementInfo->m_spanningType == SPANNING_END) {
+        segment->m_placementInfo->m_measure = vrv_cast<Measure *>(currentSystem->GetFirst(MEASURE));
+    }
+    else {
+        segment->m_placementInfo->m_measure
+            = vrv_cast<Measure *>((*elements.at(index).first)->GetFirstAncestor(MEASURE));
+    }
 
     if (newSegment) {
         m_beamSegments.push_back(segment);
@@ -187,7 +198,8 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
 
     this->InitCoords(&m_beamedElements, staff, this->GetPlace());
 
-    m_beamSegments.at(0)->InitPlacementInformation(measure, staff, layer);
+    m_beamSegments.at(0)->InitPlacementInformation(staff, layer);
+    m_beamSegments.at(0)->m_placementInfo->m_measure = measure;
     m_beamSegments.at(0)->m_placementInfo->m_begin = m_beamElementCoords.begin();
     m_beamSegments.at(0)->m_placementInfo->m_end = m_beamElementCoords.end();
     ArrayOfBeamElementCoords coord(
@@ -258,10 +270,10 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
 
     // Iterator for the elements are based on the initial order of the elements, so skip current system when
     // found and process it separatelly in the end
-    Object *currentSystemn = this->GetFirstAncestor(SYSTEM);
+    Object *currentSystem = this->GetFirstAncestor(SYSTEM);
     int currentSystemIndex = 0;
     for (int i = 0; i < elements.size() - 1; ++i) {
-        if (elements.at(i).second == currentSystemn) {
+        if (elements.at(i).second == currentSystem) {
             currentSystemIndex = i;
             continue;
         }
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index a0b4f5fd9e4..14407427896 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -79,7 +79,7 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     // Draw the beamSegment - but not if it is a secondary beam in a stem.sameas
 
     if (!beam->m_beamSegment.StemSameasIsSecondary())
-        this->DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff, measure);
+        this->DrawBeamSegment(dc, &beam->m_beamSegment, beam, layer, staff);
 
     dc->EndGraphic(element, this);
 }
@@ -214,15 +214,14 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     dc->EndGraphic(element, this);
 }
 
-void View::DrawBeamSegment(DeviceContext *dc, BeamSegment *beamSegment, BeamDrawingInterface *beamInterface,
-    Layer *layer, Staff *staff, Measure *measure)
+void View::DrawBeamSegment(
+    DeviceContext *dc, BeamSegment *beamSegment, BeamDrawingInterface *beamInterface, Layer *layer, Staff *staff)
 {
     assert(dc);
     assert(beamSegment);
     assert(beamInterface);
     assert(layer);
     assert(staff);
-    assert(measure);
 
     // temporary coordinates
     int x1, x2, y1, y2;
@@ -438,8 +437,8 @@ void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
         segment->AppendSpanningCoordinates(segment->m_placementInfo->m_measure);
 
         // Draw corresponding beam segment
-        this->DrawBeamSegment(dc, segment, beamSpan, segment->m_placementInfo->m_layer,
-            segment->m_placementInfo->m_staff, segment->m_placementInfo->m_measure);
+        this->DrawBeamSegment(
+            dc, segment, beamSpan, segment->m_placementInfo->m_layer, segment->m_placementInfo->m_staff);
     }
 
     dc->EndGraphic(beamSpan, this);

From 5b4ec5db08783c1c45329abd94538812384ea53f Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 9 Feb 2022 17:44:35 +0200
Subject: [PATCH 379/403] Change parts of implementation for beamspan

- replaced m_referencedElement variable (LayerElement.cpp) with vector of spanned elements (Measure.cpp) to reduce usage of memory for relatated elements
- replaced iterators in BeamSegmentPlacementInfo with pointers to coordinates - this should help avoiding cases with iterator invalidation
- removed redundant method from iomei (ReadBeamSpanAsBeam)
- added `this` keyword where appropriate
- variety of typo fixes and other small adjustments
---
 include/vrv/beam.h         | 12 +++--
 include/vrv/beamspan.h     | 10 ++---
 include/vrv/iomei.h        |  1 -
 include/vrv/layerelement.h |  5 ---
 include/vrv/measure.h      | 10 +++++
 src/beam.cpp               |  7 +--
 src/beamspan.cpp           | 27 +++++-------
 src/chord.cpp              |  4 +-
 src/doc.cpp                |  2 +-
 src/iomei.cpp              | 89 +++-----------------------------------
 src/layerelement.cpp       |  7 ++-
 src/measure.cpp            | 12 +++++
 src/note.cpp               |  2 +-
 src/object.cpp             |  2 +-
 src/view_beam.cpp          | 12 ++++-
 15 files changed, 70 insertions(+), 132 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 753e8e9dd70..f0e0be70437 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -31,16 +31,14 @@ enum { PARTIAL_NONE = 0, PARTIAL_THROUGH, PARTIAL_RIGHT, PARTIAL_LEFT };
 // Structure for storing additional information regarding beamSegment placement (in case of beam/beamSpan spanning over
 // the systems
 struct BeamSegmentPlacementInfo {
-private:
-    using CoordIter = ArrayOfBeamElementCoords::iterator;
 public:
-    BeamSegmentPlacementInfo() : m_measure(NULL), m_staff(NULL), m_layer(NULL), m_spanningType(SPANNING_START_END) {}
+    BeamSegmentPlacementInfo() = default;
     Measure *m_measure;
     Staff *m_staff;
     Layer *m_layer;
-    int m_spanningType;
-    CoordIter m_begin;
-    CoordIter m_end;
+    int m_spanningType = SPANNING_START_END;
+    BeamElementCoord *m_begin;
+    BeamElementCoord *m_end;
 
     // Set spanning type based on the positioning of the beam segment
     void SetSpanningType(int systemIndex, int systemCount);
@@ -79,7 +77,7 @@ class BeamSegment {
      * This is called by Beam::FilterList
      */
     void InitCoordRefs(const ArrayOfBeamElementCoords *beamElementCoords);
-    
+
     /**
      * Initialize placement information for the segment. Should be used with beamSpan to specify which staff/layer it
      * belongs to
diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index 347a6ede0d3..3747313ce47 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -59,12 +59,8 @@ class BeamSpan : public ControlElement,
     TimeSpanningInterface *GetTimeSpanningInterface() override { return dynamic_cast<TimeSpanningInterface *>(this); }
     ////@}
 
-    // Helper to get element list for the beamSpan - elements are acquired from all layerElements that are located
-    // in between start and end of the beamSpan
-    ArrayOfObjects GetBeamSpanElementList(Layer *layer, Staff *staff);
-
     /**
-     * @name Initialize and cleam beam segments
+     * @name Initialize and clear beam segments
      */
     ///@{
     void InitBeamSegments();
@@ -94,6 +90,10 @@ class BeamSpan : public ControlElement,
     // Helper for breaking one big spanning beamSpan into smaller beamSpans
     bool AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int index, bool newSegment = true);
 
+    // Helper to get element list for the beamSpan - elements are acquired from all layerElements that are located
+    // in between start and end of the beamSpan
+    ArrayOfObjects GetBeamSpanElementList(Layer *layer, Staff *staff);
+
 public:
     //
     std::vector<BeamSegment *> m_beamSegments;
diff --git a/include/vrv/iomei.h b/include/vrv/iomei.h
index 0687f70c719..d960060a2c5 100644
--- a/include/vrv/iomei.h
+++ b/include/vrv/iomei.h
@@ -788,7 +788,6 @@ class MEIInput : public Input {
     ///@{
     bool ReadFacsimile(Doc *doc, pugi::xml_node facsimile);
     bool ReadSurface(Facsimile *parent, pugi::xml_node surface);
-    bool ReadBeamSpanAsBeam(Measure *measure, pugi::xml_node beamSpan);
     bool ReadTupletSpanAsTuplet(Measure *measure, pugi::xml_node tupletSpan);
     bool ReadZone(Surface *parent, pugi::xml_node zone);
     ///@}
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 88ba1714234..f7529770a7d 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -484,11 +484,6 @@ class LayerElement : public Object,
     Staff *m_crossStaff;
     Layer *m_crossLayer;
 
-    /**
-     * This stores a pointer to the beamSpan (if any) that covers this LayerElement
-     */
-    Object *m_referencedElement;
-
 protected:
     Alignment *m_alignment;
 
diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index 01ca6022338..cd6931f0f4d 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -262,6 +262,14 @@ class Measure : public Object,
      */
     std::vector<std::pair<LayerElement *, LayerElement *>> GetInternalTieEndpoints();
 
+    /**
+     * Add element to the list of spanning objects or check if element is in the list
+     */
+    ///@{
+    bool IsInSpanningObjects(const Object *object) const;
+    void AddToSpanningObjects(Object *object);
+    ///@}
+
     //----------//
     // Functors //
     //----------//
@@ -571,6 +579,8 @@ class Measure : public Object,
     double m_currentTempo;
 
     std::map<int, BarlineRenditionPair> m_invisibleStaffBarlines;
+    // vector containing pointers to elements that belong to any of the beamspans in measure
+    std::vector<Object *> m_spanningObjects;
 };
 
 } // namespace vrv
diff --git a/src/beam.cpp b/src/beam.cpp
index e593070747a..4be93b33ae6 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -36,7 +36,6 @@
 
 namespace vrv {
 
-
 void BeamSegmentPlacementInfo::SetSpanningType(int systemIndex, int systemCount)
 {
     if (0 == systemIndex) {
@@ -65,7 +64,6 @@ BeamSegment::~BeamSegment()
     this->ClearCoordRefs();
     if (m_placementInfo) {
         delete m_placementInfo;
-        m_placementInfo = NULL;
     }
 }
 
@@ -138,10 +136,9 @@ void BeamSegment::AppendSpanningCoordinates(Measure *measure)
     // otherwise start beam closer to the start of the Measure, to indicate spanning
     if ((SPANNING_END == spanningType) || (SPANNING_MIDDLE == spanningType)) {
         BeamElementCoord *left = new BeamElementCoord(*front);
-        const int width = measure->GetInnerWidth();
         int offset = 0;
         if (m_beamElementCoordRefs.size() > 1) {
-            const int divideBy = 2 * (m_beamElementCoordRefs.size() - 1);
+            const int divideBy = 2 * ((int)m_beamElementCoordRefs.size() - 1);
             offset = (back->m_x - front->m_x) / divideBy;
         }
         else {
@@ -449,7 +446,7 @@ bool BeamSegment::NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterfa
                 [midpointOffset](BeamElementCoord *coord) { coord->m_yBeam += midpointOffset; });
             if (!this->DoesBeamOverlap(staffTop, topOffset, staffBottom, bottomOffset)) return false;
         }
-        // If midpoint if above the staff, try to place beam at the top edge of the staff
+        // If midpoint is above the staff, try to place beam at the top edge of the staff
         if (!isMidpointWithinBounds && (midpoint > staffBottom)) {
             const int offset = (m_beamElementCoordRefs.front()->m_yBeam + m_beamElementCoordRefs.back()->m_yBeam
                                    - 2 * (staffTop - topOffset))
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index 34e9ca4ca36..d2482f52c0c 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -42,7 +42,6 @@ BeamSpan::BeamSpan()
     RegisterAttClass(ATT_BEAMEDWITH);
     RegisterAttClass(ATT_BEAMREND);
     RegisterAttClass(ATT_COLOR);
-    RegisterAttClass(ATT_PLIST);
 
     Reset();
     InitBeamSegments();
@@ -62,7 +61,6 @@ void BeamSpan::Reset()
     ResetBeamedWith();
     ResetBeamRend();
     ResetColor();
-    ResetPlist();
 
     ClearBeamSegments();
 }
@@ -139,9 +137,9 @@ bool BeamSpan::AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int
     if (!layer || !staff) return false;
 
     // get iterators for first and last coordinates in the range for the segment
-    auto coordsFirst = std::find_if(m_beamElementCoords.begin(), m_beamElementCoords.end(),
+    const auto coordsFirst = std::find_if(m_beamElementCoords.begin(), m_beamElementCoords.end(),
         [&](BeamElementCoord *coord) { return coord->m_element == (*elements.at(index).first); });
-    auto coordsLast = std::find_if(m_beamElementCoords.begin(), m_beamElementCoords.end(),
+    const auto coordsLast = std::find_if(m_beamElementCoords.begin(), m_beamElementCoords.end(),
         [&](BeamElementCoord *coord) { return coord->m_element == *(elements.at(index + 1).first - 1); });
     if ((coordsFirst == m_beamElementCoords.end()) || (coordsLast == m_beamElementCoords.end())) return false;
 
@@ -156,12 +154,11 @@ bool BeamSpan::AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int
     // Init segment with placement information (measure, staff, etc.) as well as begin/end coordinates
     ArrayOfBeamElementCoords coords(coordsFirst, coordsLast + 1);
     segment->InitPlacementInformation(staff, layer);
-    segment->m_placementInfo->m_begin = coordsFirst;
-    segment->m_placementInfo->m_end = coordsLast + 1;
+    segment->m_placementInfo->m_begin = *coordsFirst;
+    segment->m_placementInfo->m_end = *coordsLast;
     segment->InitCoordRefs(&coords);
     segment->CalcBeam(layer, staff, doc, this, m_drawingPlace);
-    segment->m_placementInfo->SetSpanningType(index, elements.size() - 1);
-    Measure *measure = NULL;
+    segment->m_placementInfo->SetSpanningType(index, (int)elements.size() - 1);
     Object *currentSystem = layer->GetFirstAncestor(SYSTEM);
     if (segment->m_placementInfo->m_spanningType == SPANNING_START) {
         segment->m_placementInfo->m_measure = vrv_cast<Measure *>(currentSystem->GetLast(MEASURE));
@@ -200,10 +197,9 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
 
     m_beamSegments.at(0)->InitPlacementInformation(staff, layer);
     m_beamSegments.at(0)->m_placementInfo->m_measure = measure;
-    m_beamSegments.at(0)->m_placementInfo->m_begin = m_beamElementCoords.begin();
-    m_beamSegments.at(0)->m_placementInfo->m_end = m_beamElementCoords.end();
-    ArrayOfBeamElementCoords coord(
-        m_beamSegments.at(0)->m_placementInfo->m_begin, m_beamSegments.at(0)->m_placementInfo->m_end);
+    m_beamSegments.at(0)->m_placementInfo->m_begin = *m_beamElementCoords.begin();
+    m_beamSegments.at(0)->m_placementInfo->m_end = *m_beamElementCoords.rbegin();
+    ArrayOfBeamElementCoords coord(m_beamElementCoords.begin(), m_beamElementCoords.end());
     m_beamSegments.at(0)->InitCoordRefs(&coord);
     m_beamSegments.at(0)->CalcBeam(layer, staff, params->m_doc, this, this->GetPlace());
 
@@ -216,17 +212,18 @@ int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
 
     Layer *layer = vrv_cast<Layer *>(this->GetStart()->GetFirstAncestor(LAYER));
     Staff *staff = vrv_cast<Staff *>(this->GetStart()->GetFirstAncestor(STAFF));
+    Measure *measure = vrv_cast<Measure *>(this->GetStart()->GetFirstAncestor(MEASURE));
     if (!layer || !staff) return FUNCTOR_SIBLINGS;
 
     m_beamedElements = this->HasPlist() ? *this->GetRefs() : this->GetBeamSpanElementList(layer, staff);
 
-    // set current beamSpan as referencedElement for all beamed elemenents (for the
-    // sake of figuring if corresponding element is in beamSpan)
+    // set current beamSpan as referencedElement for all beamed elements (for thesake of figuring if corresponding
+    // element is in beamSpan)
     for (const auto element : m_beamedElements) {
         LayerElement *layerElem = vrv_cast<LayerElement *>(element);
         if (!layerElem) continue;
 
-        layerElem->m_referencedElement = this;
+        measure->AddToSpanningObjects(layerElem);
 
         Staff *elementStaff = vrv_cast<Staff *>(layerElem->GetFirstAncestor(STAFF));
         if (elementStaff->GetN() != staff->GetN()) {
diff --git a/src/chord.cpp b/src/chord.cpp
index a8a40a9f925..af0b84eba71 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -670,7 +670,7 @@ int Chord::CalcStem(FunctorParams *functorParams)
 
     // Stems have been calculated previously in beam or fTrem - siblings because flags do not need to
     // be processed either
-    if (IsInBeam() || IsInFTrem() || IsInBeamSpan()) {
+    if (this->IsInBeam() || this->IsInFTrem() || this->IsInBeamSpan()) {
         return FUNCTOR_SIBLINGS;
     }
 
@@ -814,7 +814,7 @@ int Chord::PrepareLayerElementParts(FunctorParams *functorParams)
         currentStem->IsVirtual(true);
     }
 
-    if ((GetActualDur() > DUR_4) && !IsInBeam() && !IsInBeamSpan() && !IsInFTrem()) {
+    if ((this->GetActualDur() > DUR_4) && !this->IsInBeam() && !this->IsInBeamSpan() && !this->IsInFTrem()) {
         // We should have a stem at this stage
         assert(currentStem);
         if (!currentFlag) {
diff --git a/src/doc.cpp b/src/doc.cpp
index f60d53f8d5d..d8cd22b1a85 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -563,7 +563,7 @@ void Doc::PrepareDrawing()
     // If some are still there, then it is probably an issue in the encoding
     if (!preparePlistParams.m_interfaceUuidTuples.empty()) {
         LogWarning(
-            "%d element(s) with a @plist could match the target", preparePlistParams.m_interfaceUuidTuples.size());
+            "%d element(s) with a @plist could not match the target", preparePlistParams.m_interfaceUuidTuples.size());
     }
 
     /************ Resolve cross staff ************/
diff --git a/src/iomei.cpp b/src/iomei.cpp
index e93a64ab226..1adb29fc51b 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -4791,10 +4791,10 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
         else if (currentName == "breath") {
             success = this->ReadBreath(parent, current);
         }
-        else if (std::string(current.name()) == "caesura") {
+        else if (currentName == "caesura") {
             success = this->ReadCaesura(parent, current);
         }
-        else if (std::string(current.name()) == "dir") {
+        else if (currentName == "dir") {
             success = this->ReadDir(parent, current);
         }
         else if (currentName == "dynam") {
@@ -4815,10 +4815,10 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
         else if (currentName == "harm") {
             success = this->ReadHarm(parent, current);
         }
-        else if (std::string(current.name()) == "lv") {
+        else if (currentName == "lv") {
             success = this->ReadLv(parent, current);
         }
-        else if (std::string(current.name()) == "mNum") {
+        else if (currentName == "mNum") {
             success = this->ReadMNum(parent, current);
         }
         else if (currentName == "mordent") {
@@ -4833,10 +4833,10 @@ bool MEIInput::ReadMeasureChildren(Object *parent, pugi::xml_node parentNode)
         else if (currentName == "phrase") {
             success = this->ReadPhrase(parent, current);
         }
-        else if (std::string(current.name()) == "pitchInflection") {
+        else if (currentName == "pitchInflection") {
             success = this->ReadPitchInflection(parent, current);
         }
-        else if (std::string(current.name()) == "reh") {
+        else if (currentName == "reh") {
             success = this->ReadReh(parent, current);
         }
         else if (currentName == "slur") {
@@ -7111,83 +7111,6 @@ bool MEIInput::ReadEditorialChildren(Object *parent, pugi::xml_node parentNode,
     }
 }
 
-bool MEIInput::ReadBeamSpanAsBeam(Measure *measure, pugi::xml_node beamSpan)
-{
-    if (!measure) {
-        LogWarning("Cannot read <beamSpan> within editorial markup");
-        return false;
-    }
-
-    Beam *beam = new Beam();
-    this->SetMeiUuid(beamSpan, beam);
-
-    LayerElement *start = NULL;
-    LayerElement *end = NULL;
-
-    // att.labelled
-    if (beamSpan.attribute("label")) {
-        beam->SetLabel(beamSpan.attribute("label").value());
-    }
-
-    // att.typed
-    if (beamSpan.attribute("type")) {
-        beam->SetType(beamSpan.attribute("type").value());
-    }
-    else {
-        beam->SetType("beamSpan");
-    }
-
-    // att.beam.vis
-    if (beamSpan.attribute("color")) {
-        beam->SetColor(beamSpan.attribute("color").value());
-    }
-
-    // position (pitch)
-    if (beamSpan.attribute("startid")) {
-        std::string refId = ExtractUuidFragment(beamSpan.attribute("startid").value());
-        start = dynamic_cast<LayerElement *>(measure->FindDescendantByUuid(refId));
-        if (!start) {
-            LogWarning("Element with @startid '%s' not found when trying to read the <beamSpan>", refId.c_str());
-        }
-    }
-    if (beamSpan.attribute("endid")) {
-        std::string refId = ExtractUuidFragment(beamSpan.attribute("endid").value());
-        end = dynamic_cast<LayerElement *>(measure->FindDescendantByUuid(refId));
-        if (!end) {
-            LogWarning("Element with @endid '%s' not found when trying to read the <beamSpan>", refId.c_str());
-        }
-    }
-    if (!start || !end) {
-        delete beam;
-        return false;
-    }
-
-    LayerElement *startChild = dynamic_cast<LayerElement *>(start->GetLastAncestorNot(LAYER));
-    LayerElement *endChild = dynamic_cast<LayerElement *>(end->GetLastAncestorNot(LAYER));
-
-    if (!startChild || !endChild || (startChild->GetParent() != endChild->GetParent())) {
-        LogWarning("Start and end elements for <beamSpan> '%s' not in the same layer", beam->GetUuid().c_str());
-        delete beam;
-        return false;
-    }
-
-    Layer *parentLayer = dynamic_cast<Layer *>(startChild->GetParent());
-    assert(parentLayer);
-
-    int startIdx = startChild->GetIdx();
-    int endIdx = endChild->GetIdx();
-    // LogDebug("%d %d %s!", startIdx, endIdx, start->GetUuid().c_str());
-    int i;
-    for (i = endIdx; i >= startIdx; i--) {
-        LayerElement *element = dynamic_cast<LayerElement *>(parentLayer->DetachChild(i));
-        if (element) beam->AddChild(element);
-    }
-    beam->SetParent(parentLayer);
-    parentLayer->InsertChild(beam, startIdx);
-
-    return true;
-}
-
 bool MEIInput::ReadTupletSpanAsTuplet(Measure *measure, pugi::xml_node tupletSpan)
 {
     if (!measure) {
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 050f634c7b5..e5cf30e5bc3 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -130,7 +130,6 @@ void LayerElement::Reset()
 
     m_crossStaff = NULL;
     m_crossLayer = NULL;
-    m_referencedElement = NULL;
 }
 
 LayerElement::~LayerElement() {}
@@ -146,7 +145,6 @@ void LayerElement::CloneReset()
 
     m_crossStaff = NULL;
     m_crossLayer = NULL;
-    m_referencedElement = NULL;
 }
 
 LayerElement *LayerElement::ThisOrSameasAsLink()
@@ -239,7 +237,6 @@ Beam *LayerElement::IsInBeam()
     return NULL;
 }
 
-
 int LayerElement::GetOriginalLayerN()
 {
     int layerN = this->GetAlignmentLayerN();
@@ -252,8 +249,10 @@ int LayerElement::GetOriginalLayerN()
 bool LayerElement::IsInBeamSpan() const
 {
     if (!this->Is({ CHORD, NOTE })) return false;
+    Measure *measure = vrv_cast<Measure *>(this->GetFirstAncestor(MEASURE));
+    if (measure) return measure->IsInSpanningObjects(this);
 
-    return m_referencedElement != NULL;
+    return false;
 }
 
 Staff *LayerElement::GetAncestorStaff(const StaffSearch strategy, const bool assertExistence) const
diff --git a/src/measure.cpp b/src/measure.cpp
index 2f474246dbd..c38ed0861e6 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -155,6 +155,8 @@ void Measure::Reset()
     m_scoreTimeOffset.clear();
     m_realTimeOffsetMilliseconds.clear();
     m_currentTempo = MIDI_TEMPO;
+
+    m_spanningObjects.clear();
 }
 
 bool Measure::IsSupportedChild(Object *child)
@@ -653,6 +655,16 @@ std::vector<std::pair<LayerElement *, LayerElement *>> Measure::GetInternalTieEn
     return endpoints;
 }
 
+bool Measure::IsInSpanningObjects(const Object *object) const
+{
+    return (std::find(m_spanningObjects.begin(), m_spanningObjects.end(), object) != m_spanningObjects.end());
+}
+
+void Measure::AddToSpanningObjects(Object *object)
+{
+    m_spanningObjects.push_back(object);
+}
+
 //----------------------------------------------------------------------------
 // Measure functor methods
 //----------------------------------------------------------------------------
diff --git a/src/note.cpp b/src/note.cpp
index 68f6cb7c665..4b1cccbeaaf 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -974,7 +974,7 @@ int Note::CalcStem(FunctorParams *functorParams)
 
     // Stems have been calculated previously in Beam or fTrem - siblings because flags do not need to
     // be processed either
-    if (IsInBeam() || IsInFTrem() || IsInBeamSpan()) {
+    if (this->IsInBeam() || this->IsInFTrem() || this->IsInBeamSpan()) {
         return FUNCTOR_SIBLINGS;
     }
 
diff --git a/src/object.cpp b/src/object.cpp
index c7b2636af67..92c7ce778e3 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1588,7 +1588,7 @@ int Object::ProcessPlist(FunctorParams *functorParams)
 
     std::string uuid = this->GetUuid();
     auto i = std::find_if(params->m_interfaceUuidTuples.begin(), params->m_interfaceUuidTuples.end(),
-        [uuid](std::tuple<PlistInterface *, std::string, Object *> tuple) { return (std::get<1>(tuple) == uuid); });
+        [&uuid](std::tuple<PlistInterface *, std::string, Object *> tuple) { return (std::get<1>(tuple) == uuid); });
     if (i != params->m_interfaceUuidTuples.end()) {
         std::get<2>(*i) = this;
     }
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 14407427896..9b8c9eda75b 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -425,12 +425,20 @@ void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
     assert(beamSpan);
     assert(measure);
 
-    // Draw all segements for the beamSpan
+    // Draw all segments for the beamSpan
     dc->StartGraphic(beamSpan, "", beamSpan->GetUuid());
     for (auto segment : beamSpan->m_beamSegments) {
         // Reset current segment and set coordinates based on stored begin/end iterators for the ElementCoords
         segment->Reset();
-        ArrayOfBeamElementCoords coord(segment->m_placementInfo->m_begin, segment->m_placementInfo->m_end);
+
+        const auto coordsFirst = std::find(beamSpan->m_beamElementCoords.begin(), beamSpan->m_beamElementCoords.end(),
+            segment->m_placementInfo->m_begin);
+        const auto coordsLast = std::find(beamSpan->m_beamElementCoords.begin(), beamSpan->m_beamElementCoords.end(),
+            segment->m_placementInfo->m_end);
+        if ((coordsFirst == beamSpan->m_beamElementCoords.end()) || (coordsLast == beamSpan->m_beamElementCoords.end()))
+            continue;
+
+        ArrayOfBeamElementCoords coord(coordsFirst, coordsLast + 1);
         segment->InitCoordRefs(&coord);
         segment->CalcBeam(segment->m_placementInfo->m_layer, segment->m_placementInfo->m_staff, m_doc, beamSpan,
             beamSpan->m_drawingPlace);

From 52a399b090b71e6ca73ec64bac9bf8807a746b1e Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 11 Feb 2022 13:58:15 +0200
Subject: [PATCH 380/403] Rebase fixes

---
 include/vrv/beam.h             |  2 --
 include/vrv/drawinginterface.h |  2 +-
 src/beam.cpp                   | 13 +------------
 src/beamspan.cpp               |  3 ++-
 src/drawinginterface.cpp       |  2 +-
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index f0e0be70437..80875f80476 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -184,8 +184,6 @@ class BeamSegment {
     // Helper to check mixed beam positioning compared to other elements (ledger lines, staff) and adjust it accordingly
     bool NeedToResetPosition(Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface);
 
-    std::vector<int> GetSegmentYPositions() const;
-
 public:
     // values set by CalcBeam
     int m_nbNotesOrChords;
diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index 0f670190931..fe2e2a91b12 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -112,7 +112,7 @@ class BeamDrawingInterface : public ObjectListInterface {
      */
     void InitCue(bool beamCue);
 
-    bool IsHorizontal(const std::vector<int>& items);
+    bool IsHorizontal();
 
     bool IsRepeatedPattern();
 
diff --git a/src/beam.cpp b/src/beam.cpp
index 4be93b33ae6..3ac393da7a2 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -151,17 +151,6 @@ void BeamSegment::AppendSpanningCoordinates(Measure *measure)
     }
 }
 
-std::vector<int> BeamSegment::GetSegmentYPositions() const
-{
-    std::vector<int> items;
-    for (auto coord : m_beamElementCoordRefs) {
-        if (!coord->m_stem || !coord->m_closestNote) continue;
-
-        items.push_back(coord->m_closestNote->GetDrawingY());
-    }
-    return items;
-}
-
 void BeamSegment::CalcBeam(
     Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place, bool init)
 {
@@ -189,7 +178,7 @@ void BeamSegment::CalcBeam(
     else {
         beamInterface->m_fractionSize = staff->m_drawingStaffSize;
 
-        horizontal = beamInterface->IsHorizontal(this->GetSegmentYPositions());
+        horizontal = beamInterface->IsHorizontal();
         // Beam@place has precedence - however, in some cases, CalcBeam is called recursively because we need to change
         // the place This occurs when mixed makes no sense and the beam is placed above or below instead.
         this->CalcBeamPlace(layer, beamInterface, place);
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index d2482f52c0c..a68b24c2ff8 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -212,7 +212,6 @@ int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
 
     Layer *layer = vrv_cast<Layer *>(this->GetStart()->GetFirstAncestor(LAYER));
     Staff *staff = vrv_cast<Staff *>(this->GetStart()->GetFirstAncestor(STAFF));
-    Measure *measure = vrv_cast<Measure *>(this->GetStart()->GetFirstAncestor(MEASURE));
     if (!layer || !staff) return FUNCTOR_SIBLINGS;
 
     m_beamedElements = this->HasPlist() ? *this->GetRefs() : this->GetBeamSpanElementList(layer, staff);
@@ -223,6 +222,8 @@ int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
         LayerElement *layerElem = vrv_cast<LayerElement *>(element);
         if (!layerElem) continue;
 
+        Measure *measure = vrv_cast<Measure *>(layerElem->GetFirstAncestor(MEASURE));
+        if (!measure) continue;
         measure->AddToSpanningObjects(layerElem);
 
         Staff *elementStaff = vrv_cast<Staff *>(layerElem->GetFirstAncestor(STAFF));
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 4b34ac73aeb..3f9071e0688 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -262,7 +262,7 @@ void BeamDrawingInterface::InitCue(bool beamCue)
     }
 }
 
-bool BeamDrawingInterface::IsHorizontal(const std::vector<int> &items)
+bool BeamDrawingInterface::IsHorizontal()
 {
     if (this->IsRepeatedPattern()) {
         return true;

From 348dad4af131d97f2bdbd861fe57233cc9be39a7 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 11 Feb 2022 14:03:24 +0200
Subject: [PATCH 381/403] Minor fix

---
 src/view_page.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/view_page.cpp b/src/view_page.cpp
index 3bf06045c1b..1365c40dc0f 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -202,7 +202,7 @@ void View::DrawSystem(DeviceContext *dc, System *system)
     this->DrawSystemChildren(dc, system, system);
 
     this->DrawSystemList(dc, system, SYL);
-	this->DrawSystemList(dc, system, BEAMSPAN);
+    this->DrawSystemList(dc, system, BEAMSPAN);
     this->DrawSystemList(dc, system, BRACKETSPAN);
     this->DrawSystemList(dc, system, DYNAM);
     this->DrawSystemList(dc, system, DIR);
@@ -232,7 +232,7 @@ void View::DrawSystemList(DeviceContext *dc, System *system, const ClassId class
 
     for (iter = drawingList->begin(); iter != drawingList->end(); ++iter) {
         if ((*iter)->Is(classId) && (classId == BEAMSPAN)) {
-            DrawTimeSpanningElement(dc, *iter, system);
+            this->DrawTimeSpanningElement(dc, *iter, system);
         }
         if ((*iter)->Is(classId) && (classId == BRACKETSPAN)) {
             this->DrawTimeSpanningElement(dc, *iter, system);

From ca549bfffcb8eaf8432c86e0e1a7eff17b2b5e24 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 11 Feb 2022 17:25:44 +0200
Subject: [PATCH 382/403] Formatting

---
 include/vrv/vrvdef.h | 2 +-
 src/iomusxml.cpp     | 2 +-
 src/view_control.cpp | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 2df134030ee..f5470ccf7d0 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -329,7 +329,7 @@ typedef std::multimap<std::string, LinkingInterface *> MapOfLinkingInterfaceUuid
 
 typedef std::map<std::string, Note *> MapOfNoteUuidPairs;
 
-typedef std::vector<std::tuple<PlistInterface *, std::string, Object *> > ArrayOfPlistInterfaceUuidTuples;
+typedef std::vector<std::tuple<PlistInterface *, std::string, Object *>> ArrayOfPlistInterfaceUuidTuples;
 
 typedef std::vector<CurveSpannedElement *> ArrayOfCurveSpannedElements;
 
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 8c9f008d3b8..6ab1fe9c23c 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -569,7 +569,7 @@ void MusicXmlInput::CloseSlur(Measure *measure, short int number, LayerElement *
     m_slurStopStack.push_back({ element, closeSlur });
 }
 
-void MusicXmlInput::CloseBeamSpan(Staff* staff, Layer* layer, LayerElement* element) 
+void MusicXmlInput::CloseBeamSpan(Staff *staff, Layer *layer, LayerElement *element)
 {
     for (auto riter = m_beamspanStack.rbegin(); riter != m_beamspanStack.rend(); ++riter) {
         if ((riter->second.first == staff->GetN()) || (riter->second.second == layer->GetN())) {
diff --git a/src/view_control.cpp b/src/view_control.cpp
index bbcad53ed5a..052634f3489 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -76,7 +76,8 @@ void View::DrawControlElement(DeviceContext *dc, ControlElement *element, Measur
     assert(element);
 
     // For dir, dynam, fermata, and harm, we do not consider the @tstamp2 for rendering
-    if (element->Is({ BEAMSPAN, BRACKETSPAN, FIGURE, GLISS, HAIRPIN, LV, OCTAVE, PHRASE, PITCHINFLECTION, SLUR, TIE })) {
+    if (element->Is(
+            { BEAMSPAN, BRACKETSPAN, FIGURE, GLISS, HAIRPIN, LV, OCTAVE, PHRASE, PITCHINFLECTION, SLUR, TIE })) {
         // create placeholder
         dc->StartGraphic(element, "", element->GetUuid());
         dc->EndGraphic(element, this);

From 1c866763c6d8f03f3e92ee02e44700b295ccbdd1 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Wed, 16 Feb 2022 10:46:45 +0200
Subject: [PATCH 383/403] Beamspan improvements

- changed BeamSegmentPlacementInfo to be inherited class of BeamSpan
- move related methods to BeamSpanSegment
- change FindAllDescendantsBetween method to use depth instead of bool argument
- replace usage of m_spanningObjects with bool member variables in LayerElement
- fix BeamSpan behavior on page breaks
- improve beamSpan rendering behavior, drawing beamSpans per system
---
 include/vrv/beam.h          |  79 ++++++++++++++---------
 include/vrv/beamspan.h      |   2 +-
 include/vrv/functorparams.h |   3 -
 include/vrv/layerelement.h  |   5 +-
 include/vrv/measure.h       |  10 ---
 include/vrv/object.h        |  10 ++-
 include/vrv/view.h          |   2 +-
 src/beam.cpp                | 124 +++++++++++++++++-------------------
 src/beamspan.cpp            |  41 ++++++------
 src/layerelement.cpp        |   6 +-
 src/measure.cpp             |  12 ----
 src/note.cpp                |   4 +-
 src/object.cpp              |   8 +--
 src/system.cpp              |   3 +-
 src/view_beam.cpp           |  41 ++++++++----
 src/view_control.cpp        |   2 +-
 16 files changed, 175 insertions(+), 177 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 80875f80476..8e0b2e1d9cb 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -24,26 +24,6 @@ class StaffAlignment;
 
 enum { PARTIAL_NONE = 0, PARTIAL_THROUGH, PARTIAL_RIGHT, PARTIAL_LEFT };
 
-//----------------------------------------------------------------------------
-// BeamSegmentPlacementInfo
-//----------------------------------------------------------------------------
-
-// Structure for storing additional information regarding beamSegment placement (in case of beam/beamSpan spanning over
-// the systems
-struct BeamSegmentPlacementInfo {
-public:
-    BeamSegmentPlacementInfo() = default;
-    Measure *m_measure;
-    Staff *m_staff;
-    Layer *m_layer;
-    int m_spanningType = SPANNING_START_END;
-    BeamElementCoord *m_begin;
-    BeamElementCoord *m_end;
-
-    // Set spanning type based on the positioning of the beam segment
-    void SetSpanningType(int systemIndex, int systemCount);
-};
-
 //----------------------------------------------------------------------------
 // BeamSegment
 //----------------------------------------------------------------------------
@@ -78,12 +58,6 @@ class BeamSegment {
      */
     void InitCoordRefs(const ArrayOfBeamElementCoords *beamElementCoords);
 
-    /**
-     * Initialize placement information for the segment. Should be used with beamSpan to specify which staff/layer it
-     * belongs to
-     */
-    void InitPlacementInformation(Staff *staff, Layer *layer);
-
     /**
      * Clear the m_beamElementCoords vector and delete all the objects.
      */
@@ -122,9 +96,6 @@ class BeamSegment {
     void UpdateSameasRoles(data_BEAMPLACE place);
     ///@}
 
-    // Helper to append coordinates for the beamSpans that are drawn over systems
-    void AppendSpanningCoordinates(Measure *measure);
-
 private:
     // Helper to adjust beam positioning with regards to ledger lines (top and bottom of the staff)
     void AdjustBeamToLedgerLines(Doc *doc, Staff *staff, BeamDrawingInterface *beamInterface);
@@ -215,11 +186,57 @@ class BeamSegment {
     StemSameasDrawingRole m_stemSameasRole;
     StemSameasDrawingRole *m_stemSameasReverseRole;
     ///@}
+};
+
+//----------------------------------------------------------------------------
+// BeamSpanSegment
+//----------------------------------------------------------------------------
+
+// Class for storing additional information regarding beamSegment placement (in case of beamSpan spanning over
+// the systems)
+class BeamSpanSegment : public BeamSegment {
+public:
+    BeamSpanSegment() = default;
+    virtual ~BeamSpanSegment(){};
+
+    /**
+     * Set/get methods for member variables
+     */
+    ///@{
+    Measure *GetMeasure() const { return m_measure; }
+    void SetMeasure(Measure *measure) { m_measure = measure; }
+    Staff *GetStaff() const { return m_staff; }
+    void SetStaff(Staff *staff) { m_staff = staff; }
+    Layer *GetLayer() const { return m_layer; }
+    void SetLayer(Layer *layer) { m_layer = layer; }
+    BeamElementCoord *GetBeginCoord() const { return m_begin; }
+    void SetBeginCoord(BeamElementCoord *begin) { m_begin = begin; }
+    BeamElementCoord *GetEndCoord() const { return m_end; }
+    void SetEndCoord(BeamElementCoord *end) { m_end = end; }
+    ///@}
 
     /**
-     * Additional information on the relevant measure/staff/layer. Optional for plain beams
+     * Set/get methods for spanning type of segment.
+     * Set spanning type based on the positioning of the beam segment
      */
-    BeamSegmentPlacementInfo *m_placementInfo;
+    ///@{
+    void SetSpanningType(int systemIndex, int systemCount);
+    int GetSpanningType() const { return m_spanningType; }
+    ///@}
+
+    // Helper to append coordinates for the beamSpans that are drawn over systems
+    void AppendSpanningCoordinates(Measure *measure);
+
+private:
+    // main values to track positioning of the segment
+    Measure *m_measure;
+    Staff *m_staff;
+    Layer *m_layer;
+    BeamElementCoord *m_begin;
+    BeamElementCoord *m_end;
+
+    // spanning type for purposes of adding additional coordinates to segment
+    int m_spanningType = SPANNING_START_END;
 };
 
 //----------------------------------------------------------------------------
diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index 3747313ce47..6aaf3057cf5 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -96,7 +96,7 @@ class BeamSpan : public ControlElement,
 
 public:
     //
-    std::vector<BeamSegment *> m_beamSegments;
+    std::vector<BeamSpanSegment *> m_beamSegments;
 
 private:
     //
diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index dbbcdcea24f..56d79197ea2 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -1363,7 +1363,6 @@ class FillStaffCurrentTimeSpanningParams : public FunctorParams {
  * member 1: an array of all matching objects
  * member 2: the start object range
  * member 3: the end object range
- * member 4: flag to decide whether to add children of the found elements
  **/
 
 class FindAllBetweenParams : public FunctorParams {
@@ -1374,13 +1373,11 @@ class FindAllBetweenParams : public FunctorParams {
         m_elements = elements;
         m_start = start;
         m_end = end;
-        m_includeChildren = true;
     }
     Comparison *m_comparison;
     ListOfObjects *m_elements;
     Object *m_start;
     Object *m_end;
-    bool m_includeChildren;
 };
 
 //----------------------------------------------------------------------------
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index f7529770a7d..7c433e8ece7 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -124,9 +124,8 @@ class LayerElement : public Object,
      * Looking in the content list is necessary for grace notes or imbricated beams.
      */
     Beam *IsInBeam();
-    ///@}
-
     bool IsInBeamSpan() const;
+    ///@}
 
     /**
      * @name Get and set the layerN drawing value
@@ -484,6 +483,8 @@ class LayerElement : public Object,
     Staff *m_crossStaff;
     Layer *m_crossLayer;
 
+    bool m_isInBeamspan = false;
+
 protected:
     Alignment *m_alignment;
 
diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index cd6931f0f4d..01ca6022338 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -262,14 +262,6 @@ class Measure : public Object,
      */
     std::vector<std::pair<LayerElement *, LayerElement *>> GetInternalTieEndpoints();
 
-    /**
-     * Add element to the list of spanning objects or check if element is in the list
-     */
-    ///@{
-    bool IsInSpanningObjects(const Object *object) const;
-    void AddToSpanningObjects(Object *object);
-    ///@}
-
     //----------//
     // Functors //
     //----------//
@@ -579,8 +571,6 @@ class Measure : public Object,
     double m_currentTempo;
 
     std::map<int, BarlineRenditionPair> m_invisibleStaffBarlines;
-    // vector containing pointers to elements that belong to any of the beamspans in measure
-    std::vector<Object *> m_spanningObjects;
 };
 
 } // namespace vrv
diff --git a/include/vrv/object.h b/include/vrv/object.h
index ba8ebdbbb1a..8461dbb018b 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -412,7 +412,7 @@ class Object : public BoundingBox {
      * The start and end objects are included in the result set.
      */
     void FindAllDescendantsBetween(ListOfObjects *objects, Comparison *comparison, Object *start, Object *end,
-        bool clear = true, bool includeChildren = true);
+        bool clear = true, int depth = UNLIMITED_DEPTH);
 
     /**
      * Give up ownership of the child at the idx position (NULL if not found)
@@ -1066,13 +1066,17 @@ class Object : public BoundingBox {
     virtual int PrepareProcessingLists(FunctorParams *) { return FUNCTOR_CONTINUE; }
 
     /**
-     * Match elements of @plist.
+     * Prepare list of elements in the @plist.
      */
     ///@{
     virtual int PreparePlist(FunctorParams *functorParams);
-    virtual int ProcessPlist(FunctorParams *functorParams);
     ///@}
 
+    /**
+     * Match elements of @plist
+     */
+    virtual int ProcessPlist(FunctorParams *functorParams);
+
     /**
      * Extract default duration from scoredef/staffdef
      */
diff --git a/include/vrv/view.h b/include/vrv/view.h
index 2475fdc382c..97c922d567d 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -389,7 +389,7 @@ class View {
     ///@{
     void DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
     void DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
-    void DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure);
+    void DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, System *system, Object *graphic = NULL);
     ///@}
 
     /**
diff --git a/src/beam.cpp b/src/beam.cpp
index 3ac393da7a2..6b2425f8650 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -36,35 +36,18 @@
 
 namespace vrv {
 
-void BeamSegmentPlacementInfo::SetSpanningType(int systemIndex, int systemCount)
-{
-    if (0 == systemIndex) {
-        m_spanningType = SPANNING_START;
-    }
-    else if ((systemCount - 1) == systemIndex) {
-        m_spanningType = SPANNING_END;
-    }
-    else {
-        m_spanningType = SPANNING_MIDDLE;
-    }
-}
-
 //----------------------------------------------------------------------------
 // BeamSegment
 //----------------------------------------------------------------------------
 
 BeamSegment::BeamSegment()
 {
-    m_placementInfo = NULL;
     this->Reset();
 }
 
 BeamSegment::~BeamSegment()
 {
     this->ClearCoordRefs();
-    if (m_placementInfo) {
-        delete m_placementInfo;
-    }
 }
 
 void BeamSegment::Reset()
@@ -101,56 +84,6 @@ void BeamSegment::InitCoordRefs(const ArrayOfBeamElementCoords *beamElementCoord
     m_beamElementCoordRefs = *beamElementCoords;
 }
 
-void BeamSegment::InitPlacementInformation(Staff *staff, Layer *layer)
-{
-    if (!m_placementInfo) {
-        m_placementInfo = new BeamSegmentPlacementInfo();
-    }
-    m_placementInfo->m_staff = staff;
-    m_placementInfo->m_layer = layer;
-}
-
-void BeamSegment::AppendSpanningCoordinates(Measure *measure)
-{
-    if (NULL == m_placementInfo) return;
-    const int spanningType = m_placementInfo->m_spanningType;
-    if (SPANNING_START_END == spanningType) return;
-
-    BarLine *bar = measure->GetRightBarLine();
-    const int rightSide = bar->GetDrawingX();
-    BeamElementCoord *front = m_beamElementCoordRefs.front();
-    BeamElementCoord *back = m_beamElementCoordRefs.back();
-    double slope = 0.0;
-    if (m_beamElementCoordRefs.size() > 1) {
-        slope = (double)(back->m_yBeam - front->m_yBeam) / (double)(back->m_x - front->m_x);
-    }
-
-    // in case if beamSpan starts in current system - stretch beam to the right barline
-    if ((SPANNING_START == spanningType) || (SPANNING_MIDDLE == spanningType)) {
-        BeamElementCoord *right = new BeamElementCoord(*back);
-        const int distance = rightSide - back->m_x;
-        right->m_x = rightSide;
-        right->m_yBeam += distance * slope;
-        m_beamElementCoordRefs.push_back(right);
-    }
-    // otherwise start beam closer to the start of the Measure, to indicate spanning
-    if ((SPANNING_END == spanningType) || (SPANNING_MIDDLE == spanningType)) {
-        BeamElementCoord *left = new BeamElementCoord(*front);
-        int offset = 0;
-        if (m_beamElementCoordRefs.size() > 1) {
-            const int divideBy = 2 * ((int)m_beamElementCoordRefs.size() - 1);
-            offset = (back->m_x - front->m_x) / divideBy;
-        }
-        else {
-            // 1.5 * unit offset in this case (harcoded for the time being)
-            offset = 270;
-        }
-        left->m_x -= offset;
-        left->m_yBeam -= offset * slope;
-        m_beamElementCoordRefs.insert(m_beamElementCoordRefs.begin(), left);
-    }
-}
-
 void BeamSegment::CalcBeam(
     Layer *layer, Staff *staff, Doc *doc, BeamDrawingInterface *beamInterface, data_BEAMPLACE place, bool init)
 {
@@ -1691,6 +1624,63 @@ bool Beam::IsTabBeam()
     return (this->FindDescendantByType(TABGRP));
 }
 
+//----------------------------------------------------------------------------
+// BeamSpanSegment
+//----------------------------------------------------------------------------
+
+void BeamSpanSegment::SetSpanningType(int systemIndex, int systemCount)
+{
+    if (0 == systemIndex) {
+        m_spanningType = SPANNING_START;
+    }
+    else if ((systemCount - 1) == systemIndex) {
+        m_spanningType = SPANNING_END;
+    }
+    else {
+        m_spanningType = SPANNING_MIDDLE;
+    }
+}
+
+void BeamSpanSegment::AppendSpanningCoordinates(Measure *measure)
+{
+    const int spanningType = m_spanningType;
+    if (SPANNING_START_END == spanningType) return;
+
+    BarLine *bar = measure->GetRightBarLine();
+    const int rightSide = bar->GetDrawingX();
+    BeamElementCoord *front = m_beamElementCoordRefs.front();
+    BeamElementCoord *back = m_beamElementCoordRefs.back();
+    double slope = 0.0;
+    if (m_beamElementCoordRefs.size() > 1) {
+        slope = (double)(back->m_yBeam - front->m_yBeam) / (double)(back->m_x - front->m_x);
+    }
+
+    // in case if beamSpan starts in current system - stretch beam to the right barline
+    if ((SPANNING_START == spanningType) || (SPANNING_MIDDLE == spanningType)) {
+        BeamElementCoord *right = new BeamElementCoord(*back);
+        const int distance = rightSide - back->m_x;
+        right->m_x = rightSide;
+        right->m_yBeam += distance * slope;
+        m_beamElementCoordRefs.push_back(right);
+    }
+    // otherwise start beam closer to the start of the Measure, to indicate spanning
+    if ((SPANNING_END == spanningType) || (SPANNING_MIDDLE == spanningType)) {
+        BeamElementCoord *left = new BeamElementCoord(*front);
+        int offset = 0;
+        if (m_beamElementCoordRefs.size() > 1) {
+            const int divideBy = 2 * ((int)m_beamElementCoordRefs.size() - 1);
+            offset = (back->m_x - front->m_x) / divideBy;
+        }
+        else {
+            // 1.5 * unit offset in this case (harcoded for the time being)
+            offset = 270;
+        }
+        left->m_x -= offset;
+        left->m_yBeam -= offset * slope;
+        m_beamElementCoordRefs.insert(m_beamElementCoordRefs.begin(), left);
+    }
+}
+
 //----------------------------------------------------------------------------
 // BeamElementCoord
 //----------------------------------------------------------------------------
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index a68b24c2ff8..5cd21ef3f53 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -68,7 +68,7 @@ void BeamSpan::Reset()
 void BeamSpan::InitBeamSegments()
 {
     // BeamSpan should have at least one segment to begin with
-    m_beamSegments.emplace_back(new BeamSegment());
+    m_beamSegments.emplace_back(new BeamSpanSegment());
 
     m_isSpanningElement = true;
 }
@@ -86,7 +86,7 @@ ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
     // find all elements between startId and endId of the beamSpan
     ClassIdsComparison classIds({ NOTE, CHORD });
     ListOfObjects objects;
-    layer->FindAllDescendantsBetween(&objects, &classIds, this->GetStart(), this->GetEnd(), true, false);
+    layer->FindAllDescendantsBetween(&objects, &classIds, this->GetStart(), this->GetEnd(), true, 1);
 
     ArrayOfObjects beamSpanElements(objects.begin(), objects.end());
     // If last element is not equal to the end, there is high chance that this beamSpan is cross-measure.
@@ -113,7 +113,7 @@ ArrayOfObjects BeamSpan::GetBeamSpanElementList(Layer *layer, Staff *staff)
         ListOfObjects nextLayerObjects;
         // pass NULL as starting element to add all elements until end is reached
         if (endMeasure == nextMeasure) {
-            nextStaffLayer->FindAllDescendantsBetween(&nextLayerObjects, &classIds, NULL, this->GetEnd(), true, false);
+            nextStaffLayer->FindAllDescendantsBetween(&nextLayerObjects, &classIds, NULL, this->GetEnd(), true, 1);
             // Handle only next measure for the time being
             if (nextLayerObjects.back() == this->GetEnd()) {
                 beamSpanElements.insert(beamSpanElements.end(), nextLayerObjects.begin(), nextLayerObjects.end());
@@ -143,9 +143,9 @@ bool BeamSpan::AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int
         [&](BeamElementCoord *coord) { return coord->m_element == *(elements.at(index + 1).first - 1); });
     if ((coordsFirst == m_beamElementCoords.end()) || (coordsLast == m_beamElementCoords.end())) return false;
 
-    BeamSegment *segment = NULL;
+    BeamSpanSegment *segment = NULL;
     if (newSegment) {
-        segment = new BeamSegment();
+        segment = new BeamSpanSegment();
     }
     else {
         segment = m_beamSegments.at(0);
@@ -153,22 +153,22 @@ bool BeamSpan::AddSpanningSegment(Doc *doc, const SpanIndexVector &elements, int
 
     // Init segment with placement information (measure, staff, etc.) as well as begin/end coordinates
     ArrayOfBeamElementCoords coords(coordsFirst, coordsLast + 1);
-    segment->InitPlacementInformation(staff, layer);
-    segment->m_placementInfo->m_begin = *coordsFirst;
-    segment->m_placementInfo->m_end = *coordsLast;
+    segment->SetStaff(staff);
+    segment->SetLayer(layer);
+    segment->SetBeginCoord(*coordsFirst);
+    segment->SetEndCoord(*coordsLast);
     segment->InitCoordRefs(&coords);
     segment->CalcBeam(layer, staff, doc, this, m_drawingPlace);
-    segment->m_placementInfo->SetSpanningType(index, (int)elements.size() - 1);
+    segment->SetSpanningType(index, (int)elements.size() - 1);
     Object *currentSystem = layer->GetFirstAncestor(SYSTEM);
-    if (segment->m_placementInfo->m_spanningType == SPANNING_START) {
-        segment->m_placementInfo->m_measure = vrv_cast<Measure *>(currentSystem->GetLast(MEASURE));
+    if (segment->GetSpanningType() == SPANNING_START) {
+        segment->SetMeasure(vrv_cast<Measure *>(currentSystem->GetLast(MEASURE)));
     }
-    else if (segment->m_placementInfo->m_spanningType == SPANNING_END) {
-        segment->m_placementInfo->m_measure = vrv_cast<Measure *>(currentSystem->GetFirst(MEASURE));
+    else if (segment->GetSpanningType() == SPANNING_END) {
+        segment->SetMeasure(vrv_cast<Measure *>(currentSystem->GetFirst(MEASURE)));
     }
     else {
-        segment->m_placementInfo->m_measure
-            = vrv_cast<Measure *>((*elements.at(index).first)->GetFirstAncestor(MEASURE));
+        segment->SetMeasure(vrv_cast<Measure *>((*elements.at(index).first)->GetFirstAncestor(MEASURE)));
     }
 
     if (newSegment) {
@@ -195,10 +195,11 @@ int BeamSpan::CalcStem(FunctorParams *functorParams)
 
     this->InitCoords(&m_beamedElements, staff, this->GetPlace());
 
-    m_beamSegments.at(0)->InitPlacementInformation(staff, layer);
-    m_beamSegments.at(0)->m_placementInfo->m_measure = measure;
-    m_beamSegments.at(0)->m_placementInfo->m_begin = *m_beamElementCoords.begin();
-    m_beamSegments.at(0)->m_placementInfo->m_end = *m_beamElementCoords.rbegin();
+    m_beamSegments.at(0)->SetMeasure(measure);
+    m_beamSegments.at(0)->SetStaff(staff);
+    m_beamSegments.at(0)->SetLayer(layer);
+    m_beamSegments.at(0)->SetBeginCoord(*m_beamElementCoords.begin());
+    m_beamSegments.at(0)->SetEndCoord(*m_beamElementCoords.rbegin());
     ArrayOfBeamElementCoords coord(m_beamElementCoords.begin(), m_beamElementCoords.end());
     m_beamSegments.at(0)->InitCoordRefs(&coord);
     m_beamSegments.at(0)->CalcBeam(layer, staff, params->m_doc, this, this->GetPlace());
@@ -224,7 +225,7 @@ int BeamSpan::ResolveBeamSpanElements(FunctorParams *functorParams)
 
         Measure *measure = vrv_cast<Measure *>(layerElem->GetFirstAncestor(MEASURE));
         if (!measure) continue;
-        measure->AddToSpanningObjects(layerElem);
+        layerElem->m_isInBeamspan = true;
 
         Staff *elementStaff = vrv_cast<Staff *>(layerElem->GetFirstAncestor(STAFF));
         if (elementStaff->GetN() != staff->GetN()) {
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index e5cf30e5bc3..da5ab61ac87 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -248,11 +248,9 @@ int LayerElement::GetOriginalLayerN()
 
 bool LayerElement::IsInBeamSpan() const
 {
-    if (!this->Is({ CHORD, NOTE })) return false;
-    Measure *measure = vrv_cast<Measure *>(this->GetFirstAncestor(MEASURE));
-    if (measure) return measure->IsInSpanningObjects(this);
+    if (!this->Is({ CHORD, NOTE, REST })) return false;
 
-    return false;
+    return m_isInBeamspan;
 }
 
 Staff *LayerElement::GetAncestorStaff(const StaffSearch strategy, const bool assertExistence) const
diff --git a/src/measure.cpp b/src/measure.cpp
index c38ed0861e6..2f474246dbd 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -155,8 +155,6 @@ void Measure::Reset()
     m_scoreTimeOffset.clear();
     m_realTimeOffsetMilliseconds.clear();
     m_currentTempo = MIDI_TEMPO;
-
-    m_spanningObjects.clear();
 }
 
 bool Measure::IsSupportedChild(Object *child)
@@ -655,16 +653,6 @@ std::vector<std::pair<LayerElement *, LayerElement *>> Measure::GetInternalTieEn
     return endpoints;
 }
 
-bool Measure::IsInSpanningObjects(const Object *object) const
-{
-    return (std::find(m_spanningObjects.begin(), m_spanningObjects.end(), object) != m_spanningObjects.end());
-}
-
-void Measure::AddToSpanningObjects(Object *object)
-{
-    m_spanningObjects.push_back(object);
-}
-
 //----------------------------------------------------------------------------
 // Measure functor methods
 //----------------------------------------------------------------------------
diff --git a/src/note.cpp b/src/note.cpp
index 4b1cccbeaaf..dba54fc31f8 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1180,8 +1180,8 @@ int Note::CalcDots(FunctorParams *functorParams)
         assert(dots);
 
         // Stem up, shorter than 4th and not in beam
-        if ((GetDots() != 0) && (params->m_chordStemDir == STEMDIRECTION_up) && (GetDrawingDur() > DUR_4) && !IsInBeam()
-            && !IsInBeamSpan()) {
+        if ((this->GetDots() != 0) && (params->m_chordStemDir == STEMDIRECTION_up) && (this->GetDrawingDur() > DUR_4)
+            && !this->IsInBeam() && !this->IsInBeamSpan()) {
             // Shift according to the flag width if the top note is not flipped
             if ((this == chord->GetTopNote()) && !this->GetFlippedNotehead()) {
                 // HARDCODED
diff --git a/src/object.cpp b/src/object.cpp
index 92c7ce778e3..1f194d4ec15 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -583,15 +583,14 @@ void Object::FindAllDescendantsByComparison(
 }
 
 void Object::FindAllDescendantsBetween(
-    ListOfObjects *objects, Comparison *comparison, Object *start, Object *end, bool clear, bool includeChildren)
+    ListOfObjects *objects, Comparison *comparison, Object *start, Object *end, bool clear, int depth)
 {
     assert(objects);
     if (clear) objects->clear();
 
     Functor findAllBetween(&Object::FindAllBetween);
     FindAllBetweenParams findAllBetweenParams(comparison, objects, start, end);
-    findAllBetweenParams.m_includeChildren = includeChildren;
-    this->Process(&findAllBetween, &findAllBetweenParams, NULL, NULL, UNLIMITED_DEPTH, FORWARD, true);
+    this->Process(&findAllBetween, &findAllBetweenParams, NULL, NULL, depth, FORWARD, true);
 }
 
 Object *Object::GetChild(int idx) const
@@ -1424,7 +1423,6 @@ int Object::FindAllBetween(FunctorParams *functorParams)
     // evaluate by applying the Comparison operator()
     if ((*params->m_comparison)(this)) {
         params->m_elements->push_back(this);
-        if ((params->m_end != this) && !params->m_includeChildren) return FUNCTOR_SIBLINGS;
     }
 
     // We have reached the end of the range
@@ -1584,7 +1582,7 @@ int Object::ProcessPlist(FunctorParams *functorParams)
     PreparePlistParams *params = vrv_params_cast<PreparePlistParams *>(functorParams);
     assert(params);
 
-    if (!IsLayerElement()) return FUNCTOR_CONTINUE;
+    if (!this->IsLayerElement()) return FUNCTOR_CONTINUE;
 
     std::string uuid = this->GetUuid();
     auto i = std::find_if(params->m_interfaceUuidTuples.begin(), params->m_interfaceUuidTuples.end(),
diff --git a/src/system.cpp b/src/system.cpp
index 3e992c6c005..6f2183fc0d9 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -312,7 +312,8 @@ void System::AddToDrawingListIfNeccessary(Object *object)
 
     if (!object->HasInterface(INTERFACE_TIME_SPANNING)) return;
 
-    if (object->Is({ BRACKETSPAN, FIGURE, GLISS, HAIRPIN, LV, OCTAVE, PHRASE, PITCHINFLECTION, SLUR, SYL, TIE })) {
+    if (object->Is(
+            { BEAMSPAN, BRACKETSPAN, FIGURE, GLISS, HAIRPIN, LV, OCTAVE, PHRASE, PITCHINFLECTION, SLUR, SYL, TIE })) {
         this->AddToDrawingList(object);
     }
     else if (object->Is(DIR)) {
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 9b8c9eda75b..20f383e4710 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -29,6 +29,7 @@
 #include "options.h"
 #include "smufl.h"
 #include "staff.h"
+#include "system.h"
 #include "vrv.h"
 
 namespace vrv {
@@ -419,37 +420,49 @@ void View::DrawBeamSegment(
     } // end of drawing partial bars
 }
 
-void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, Measure *measure)
+void View::DrawBeamSpan(DeviceContext *dc, BeamSpan *beamSpan, System *system, Object *graphic)
 {
     assert(dc);
     assert(beamSpan);
-    assert(measure);
+    assert(system);
+
+    // Draw segments for the beamSpan
+    if (graphic) {
+        dc->ResumeGraphic(graphic, graphic->GetUuid());
+    }
+    else {
+        dc->StartGraphic(beamSpan, "", beamSpan->GetUuid(), false);
+    }
 
-    // Draw all segments for the beamSpan
-    dc->StartGraphic(beamSpan, "", beamSpan->GetUuid());
     for (auto segment : beamSpan->m_beamSegments) {
+        // make sure to process only segments for current system
+        Measure *segmentSystem = segment->GetMeasure();
+        if (vrv_cast<System *>(segmentSystem->GetFirstAncestor(SYSTEM)) != system) continue;
         // Reset current segment and set coordinates based on stored begin/end iterators for the ElementCoords
         segment->Reset();
 
-        const auto coordsFirst = std::find(beamSpan->m_beamElementCoords.begin(), beamSpan->m_beamElementCoords.end(),
-            segment->m_placementInfo->m_begin);
-        const auto coordsLast = std::find(beamSpan->m_beamElementCoords.begin(), beamSpan->m_beamElementCoords.end(),
-            segment->m_placementInfo->m_end);
+        const auto coordsFirst = std::find(
+            beamSpan->m_beamElementCoords.begin(), beamSpan->m_beamElementCoords.end(), segment->GetBeginCoord());
+        const auto coordsLast = std::find(
+            beamSpan->m_beamElementCoords.begin(), beamSpan->m_beamElementCoords.end(), segment->GetEndCoord());
         if ((coordsFirst == beamSpan->m_beamElementCoords.end()) || (coordsLast == beamSpan->m_beamElementCoords.end()))
             continue;
 
         ArrayOfBeamElementCoords coord(coordsFirst, coordsLast + 1);
         segment->InitCoordRefs(&coord);
-        segment->CalcBeam(segment->m_placementInfo->m_layer, segment->m_placementInfo->m_staff, m_doc, beamSpan,
-            beamSpan->m_drawingPlace);
-        segment->AppendSpanningCoordinates(segment->m_placementInfo->m_measure);
+        segment->CalcBeam(segment->GetLayer(), segment->GetStaff(), m_doc, beamSpan, beamSpan->m_drawingPlace);
+        segment->AppendSpanningCoordinates(segment->GetMeasure());
 
         // Draw corresponding beam segment
-        this->DrawBeamSegment(
-            dc, segment, beamSpan, segment->m_placementInfo->m_layer, segment->m_placementInfo->m_staff);
+        this->DrawBeamSegment(dc, segment, beamSpan, segment->GetLayer(), segment->GetStaff());
     }
 
-    dc->EndGraphic(beamSpan, this);
+    if (graphic) {
+        dc->EndResumedGraphic(graphic, this);
+    }
+    else {
+        dc->EndGraphic(beamSpan, this);
+    }
 }
 
 } // namespace vrv
diff --git a/src/view_control.cpp b/src/view_control.cpp
index 052634f3489..9d6e953e712 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -319,7 +319,7 @@ void View::DrawTimeSpanningElement(DeviceContext *dc, Object *element, System *s
         }
         else if (element->Is(BEAMSPAN)) {
             // cast to BeamSpan check in DrawBeamSpan
-            DrawBeamSpan(dc, vrv_cast<BeamSpan *>(element), measure);
+            this->DrawBeamSpan(dc, vrv_cast<BeamSpan *>(element), system, graphic);
         }
         else if (element->Is(BRACKETSPAN)) {
             // cast to BracketSpan check in DrawBracketSpan

From a66f5248cf3063abfa12246cdfe9368df980ce0f Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 16 Feb 2022 14:06:03 +0100
Subject: [PATCH 384/403] Update VerovioText to 1.0.7

* Add repeat glyphs
---
 data/text/VerovioText-1.0.xml | 163 +++++-----
 data/woff.xml                 |   2 +-
 fonts/VerovioText-1.0.otf     | Bin 63580 -> 69016 bytes
 fonts/VerovioText-1.0.sfd     | 589 ++++++++++++++++++++++++----------
 fonts/VerovioText-1.0.svg     | 107 +++---
 fonts/VerovioText-1.0.ttf     | Bin 27932 -> 28360 bytes
 fonts/VerovioText-1.0.woff    | Bin 21052 -> 23748 bytes
 fonts/generate_woff.sh        |   2 +-
 fonts/vrv-ttf.js              |   2 +-
 9 files changed, 563 insertions(+), 302 deletions(-)

diff --git a/data/text/VerovioText-1.0.xml b/data/text/VerovioText-1.0.xml
index 580193a475e..d0df9ec77ea 100644
--- a/data/text/VerovioText-1.0.xml
+++ b/data/text/VerovioText-1.0.xml
@@ -1,86 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bounding-boxes font-family="VerovioText" units-per-em="2048">
-	<g c="E1D0" x="0.0" y="155.3" w="1341.3" h="691.3" h-a-x="1342" />
-	<g c="E1D1" x="0.0" y="12.5" w="1090.0" h="1023.8" h-a-x="1088" />
-	<g c="E1D2" x="0.0" y="267.5" w="940.0" h="558.8" h-a-x="940" />
-	<g c="E1D3" x="0.0" y="227.5" w="698.8" h="2186.3" h-a-x="699" />
-	<g c="E1D4" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="559" />
-	<g c="E1D5" x="0.0" y="235.0" w="681.3" h="2178.8" h-a-x="682" />
-	<g c="E1D6" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="544" />
-	<g c="E1D7" x="0.0" y="242.5" w="1131.3" h="2260.0" h-a-x="1132" />
-	<g c="E1D8" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="544" />
-	<g c="E1D9" x="0.0" y="242.5" w="1162.5" h="2252.5" h-a-x="1163" />
-	<g c="E1DA" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="544" />
-	<g c="E1DB" x="0.0" y="242.5" w="1152.5" h="2652.5" h-a-x="1153" />
-	<g c="E1DC" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="544" />
-	<g c="E1DD" x="0.0" y="242.5" w="1152.5" h="3058.8" h-a-x="1153" />
-	<g c="E1DF" x="0.0" y="242.5" w="1152.5" h="3440.0" h-a-x="1153" />
-	<g c="E1E0" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="544" />
-	<g c="E1E1" x="0.0" y="242.5" w="1160.0" h="3773.8" h-a-x="1180" />
-	<g c="E1E2" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="544" />
-	<g c="E1E3" x="0.0" y="242.5" w="1162.5" h="4136.3" h-a-x="1163" />
-	<g c="E1E4" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="544" />
-	<g c="E1E5" x="0.0" y="267.5" w="1162.5" h="4393.8" h-a-x="1163" />
-	<g c="E1E6" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="544" />
-	<g c="E1E7" x="125.0" y="372.5" w="291.3" h="295.0" h-a-x="417" />
-	<g c="E550" x="-125.0" y="-350.0" w="730.0" h="250.0" h-a-x="480" />
-	<g c="E551" x="-125.0" y="-350.0" w="1024.0" h="250.0" h-a-x="774" />
-	<g c="E552" x="-125.0" y="-350.0" w="1352.0" h="250.0" h-a-x="1102" />
-	<g c="E1E8" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="872" />
-	<g c="E1DE" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="921" />
-	<g c="E260" x="62.5" y="125.0" w="495.0" h="1610.0" h-a-x="611" />
-	<g c="E261" x="62.5" y="-315.0" w="392.5" h="1755.0" h-a-x="507" />
-	<g c="E262" x="62.5" y="-285.0" w="492.5" h="1735.0" h-a-x="612" />
-	<g c="EA5C" x="68.0" y="-22.0" w="890.0" h="1422.0" />
-	<g c="EA50" x="49.0" y="-19.0" w="927.0" h="1395.0" />
-	<g c="EA51" x="227.0" y="0.0" w="578.0" h="1374.0" />
-	<g c="EA52" x="61.0" y="0.0" w="910.0" h="1380.0" />
-	<g c="EA53" x="61.0" y="-276.0" w="910.0" h="1656.0" />
-	<g c="EA54" x="89.0" y="-15.0" w="797.0" h="1401.0" />
-	<g c="EA55" x="23.0" y="0.0" w="944.0" h="1374.0" />
-	<g c="EA56" x="23.0" y="0.0" w="1121.0" h="1374.0" h-a-x="1168" />
-	<g c="EA57" x="65.0" y="-22.0" w="830.0" h="1429.0" />
-	<g c="EA58" x="65.0" y="-22.0" w="830.0" h="1566.0" />
-	<g c="EA59" x="65.0" y="-22.0" w="893.0" h="1429.0" />
-	<g c="EA5A" x="65.0" y="-156.0" w="830.0" h="1696.0" />
-	<g c="EA5B" x="70.0" y="-22.0" w="888.0" h="1422.0" />
-	<g c="EA5D" x="40.0" y="-19.0" w="879.0" h="1374.0" />
-	<g c="EA5E" x="40.0" y="-19.0" w="879.0" h="1591.0" />
-	<g c="EA5F" x="40.0" y="-19.0" w="910.0" h="1374.0" />
-	<g c="EA60" x="117.0" y="-22.0" w="795.0" h="1401.0" />
-	<g c="EA61" x="61.0" y="-48.0" w="882.0" h="1427.0" />
-	<g c="EA62" x="61.0" y="-48.0" w="899.0" h="1427.0" />
-	<g c="ECC0" x="40.0" y="-19.0" w="918.0" h="1374.0" />
-	<g c="E263" x="45.8" y="220.6" w="695.4" h="649.4" h-a-x="790" />
-	<g c="E264" x="62.0" y="125.5" w="970.0" h="1610.0" h-a-x="1087" />
-	<g c="E520" x="-176.4" y="-601.2" w="1375.2" h="1548.0" h-a-x="1112" />
-	<g c="E521" x="-158.4" y="-64.8" w="1699.2" h="1008.0" h-a-x="1459" />
-	<g c="E522" x="-514.8" y="-802.8" w="1612.8" h="2394.0" h-a-x="840" />
-	<g c="E523" x="-72.0" y="-0.0" w="882.0" h="932.4" h-a-x="813" />
-	<g c="E524" x="0.0" y="0.0" w="698.4" h="972.0" h-a-x="700" />
-	<g c="E525" x="-129.6" y="-57.6" w="1065.6" h="954.0" h-a-x="937" />
-	<g c="E526" x="-140.4" y="-64.8" w="1267.2" h="1008.0" h-a-x="1042" />
-	<g c="E527" x="-176.4" y="-601.2" w="6775.2" h="1548.0" h-a-x="6530" />
-	<g c="E528" x="-176.4" y="-601.2" w="5695.2" h="1548.0" h-a-x="5444" />
-	<g c="E529" x="-176.4" y="-601.2" w="4615.2" h="1548.0" h-a-x="4369" />
-	<g c="E52A" x="-176.4" y="-601.2" w="3535.2" h="1548.0" h-a-x="3287" />
-	<g c="E52B" x="-176.4" y="-601.2" w="2455.2" h="1548.0" h-a-x="2233" />
-	<g c="E52C" x="-158.4" y="-601.2" w="2815.2" h="1548.0" h-a-x="2661" />
-	<g c="E52D" x="-158.4" y="-802.8" w="2714.4" h="2394.0" h-a-x="2301" />
-	<g c="E52E" x="-176.4" y="-802.8" w="2473.2" h="2394.0" h-a-x="2039" />
-	<g c="E52F" x="-514.8" y="-802.8" w="2512.8" h="2394.0" h-a-x="1733" />
-	<g c="E530" x="-518.4" y="-802.8" w="3268.8" h="2401.2" h-a-x="2487" />
-	<g c="E531" x="-518.4" y="-802.8" w="4104.0" h="2401.2" h-a-x="3326" />
-	<g c="E532" x="-518.4" y="-802.8" w="4946.4" h="2401.2" h-a-x="4169" />
-	<g c="E533" x="-514.8" y="-802.8" w="5778.0" h="2401.2" h-a-x="5009" />
-	<g c="E534" x="-514.8" y="-802.8" w="2548.8" h="2394.0" h-a-x="2032" />
-	<g c="E535" x="-514.8" y="-802.8" w="2286.0" h="2394.0" h-a-x="1774" />
-	<g c="E536" x="0.0" y="-802.8" w="1796.4" h="2394.0" h-a-x="1540" />
-	<g c="E537" x="0.0" y="-802.8" w="2739.6" h="2394.0" h-a-x="2740" />
-	<g c="E538" x="0.0" y="-802.8" w="3819.6" h="2394.0" h-a-x="3822" />
-	<g c="E539" x="0.0" y="-802.8" w="2476.8" h="2394.0" h-a-x="2480" />
-	<g c="E53A" x="0.0" y="-802.8" w="3675.6" h="2394.0" h-a-x="3672" />
-	<g c="E53B" x="0.0" y="-802.8" w="3312.0" h="2394.0" h-a-x="3310" />
-	<g c="E53C" x="-72.0" y="-802.8" w="1980.0" h="2394.0" h-a-x="1651" />
-	<g c="E53D" x="-72.0" y="-802.8" w="2653.2" h="2394.0" h-a-x="2582" />
+  <g c="E1D0" n="uniE1D0" x="0.0" y="155.25" w="1341.25" h="691.25" h-a-x="1342"/>
+  <g c="E1D1" n="uniE1D1" x="0.0" y="12.5" w="1090.0" h="1023.75" h-a-x="1088"/>
+  <g c="E1D2" n="uniE1D2" x="0.0" y="267.5" w="940.0" h="558.75" h-a-x="940"/>
+  <g c="E1D3" n="uniE1D3" x="0.0" y="227.5" w="698.75" h="2186.25" h-a-x="699"/>
+  <g c="E1D5" n="uniE1D5" x="0.0" y="235.0" w="681.25" h="2178.75" h-a-x="682"/>
+  <g c="E1D7" n="uniE1D7" x="0.0" y="242.5" w="1131.25" h="2260.0" h-a-x="1132"/>
+  <g c="E1D9" n="uniE1D9" x="0.0" y="242.5" w="1162.5" h="2252.5" h-a-x="1163"/>
+  <g c="E1DB" n="uniE1DB" x="0.0" y="242.5" w="1152.5" h="2652.5" h-a-x="1153"/>
+  <g c="E1DD" n="uniE1DD" x="0.0" y="242.5" w="1152.5" h="3058.75" h-a-x="1153"/>
+  <g c="E1DF" n="uniE1DF" x="0.0" y="242.5" w="1152.5" h="3440.0" h-a-x="1153"/>
+  <g c="E1E1" n="uniE1E1" x="0.0" y="242.5" w="1160.0" h="3773.75" h-a-x="1180"/>
+  <g c="E1E3" n="uniE1E3" x="0.0" y="242.5" w="1162.5" h="4136.26" h-a-x="1163"/>
+  <g c="E1E5" n="uniE1E5" x="0.0" y="267.5" w="1162.5" h="4393.75" h-a-x="1163"/>
+  <g c="E1E7" n="uniE1E7" x="125.0" y="372.5" w="291.25" h="295.0" h-a-x="417"/>
+  <g c="E550" n="uniE550" x="-125.0" y="-350.0" w="730.0" h="250.0" h-a-x="480"/>
+  <g c="E551" n="uniE551" x="-125.0" y="-350.0" w="1024.0" h="250.0" h-a-x="774"/>
+  <g c="E552" n="uniE552" x="-125.0" y="-350.0" w="1352.0" h="250.0" h-a-x="1102"/>
+  <g c="E260" n="uniE260" x="62.5" y="125.0" w="495.0" h="1610.0" h-a-x="611"/>
+  <g c="E261" n="uniE261" x="62.5" y="-315.0" w="392.5" h="1755.0" h-a-x="507"/>
+  <g c="E262" n="uniE262" x="62.5" y="-285.0" w="492.5" h="1735.0" h-a-x="612"/>
+  <g c="EA5C" n="uniEA5C" x="68.0" y="-22.0" w="890.0" h="1422.0"/>
+  <g c="EA50" n="uniEA50" x="49.0" y="-19.0" w="927.0" h="1395.0"/>
+  <g c="EA51" n="uniEA51" x="227.0" y="0.0" w="578.0" h="1374.0"/>
+  <g c="EA52" n="uniEA52" x="61.0" y="0.0" w="910.0" h="1380.0"/>
+  <g c="EA53" n="uniEA53" x="61.0" y="-276.0" w="910.0" h="1656.0"/>
+  <g c="EA54" n="uniEA54" x="89.0" y="-15.0" w="797.0" h="1401.0"/>
+  <g c="EA55" n="uniEA55" x="23.0" y="0.0" w="944.0" h="1374.0"/>
+  <g c="EA56" n="uniEA56" x="23.0" y="0.0" w="1121.0" h="1374.0" h-a-x="1168"/>
+  <g c="EA57" n="uniEA57" x="65.0" y="-22.0" w="830.0" h="1429.0"/>
+  <g c="EA58" n="uniEA58" x="65.0" y="-22.0" w="830.0" h="1566.0"/>
+  <g c="EA59" n="uniEA59" x="65.0" y="-22.0" w="893.0" h="1429.0"/>
+  <g c="EA5A" n="uniEA5A" x="65.0" y="-156.0" w="830.0" h="1696.0"/>
+  <g c="EA5B" n="uniEA5B" x="70.0" y="-22.0" w="888.0" h="1422.0"/>
+  <g c="EA5D" n="uniEA5D" x="40.0" y="-19.0" w="879.0" h="1374.0"/>
+  <g c="EA5E" n="uniEA5E" x="40.0" y="-19.0" w="879.0" h="1591.0"/>
+  <g c="EA5F" n="uniEA5F" x="40.0" y="-19.0" w="910.0" h="1374.0"/>
+  <g c="EA60" n="uniEA60" x="117.0" y="-22.0" w="795.0" h="1401.0"/>
+  <g c="EA61" n="uniEA61" x="61.0" y="-48.0" w="882.0" h="1427.0"/>
+  <g c="EA62" n="uniEA62" x="61.0" y="-48.0" w="899.0" h="1427.0"/>
+  <g c="ECC0" n="uniECC0" x="40.0" y="-19.0" w="918.0" h="1374.0"/>
+  <g c="E263" n="uniE263" x="45.76" y="220.56" w="695.44" h="649.44" h-a-x="790"/>
+  <g c="E264" n="uniE264" x="62.0" y="125.5" w="970.0" h="1610.0" h-a-x="1087"/>
+  <g c="E520" n="uniE520" x="-176.4" y="-601.2" w="1375.2" h="1548.0" h-a-x="1112"/>
+  <g c="E521" n="uniE521" x="-158.4" y="-64.8" w="1699.2" h="1008.0" h-a-x="1459"/>
+  <g c="E522" n="uniE522" x="-514.8" y="-802.8" w="1612.8" h="2394.0" h-a-x="840"/>
+  <g c="E523" n="uniE523" x="-72.0" y="-0.0" w="882.0" h="932.4" h-a-x="813"/>
+  <g c="E524" n="uniE524" x="0.0" y="0.0" w="698.4" h="972.0" h-a-x="700"/>
+  <g c="E525" n="uniE525" x="-129.6" y="-57.6" w="1065.6" h="954.0" h-a-x="937"/>
+  <g c="E526" n="uniE526" x="-140.4" y="-64.8" w="1267.2" h="1008.0" h-a-x="1042"/>
+  <g c="E527" n="uniE527" x="-176.41" y="-601.2" w="6775.2" h="1548.0" h-a-x="6530"/>
+  <g c="E528" n="uniE528" x="-176.41" y="-601.2" w="5695.2" h="1548.0" h-a-x="5444"/>
+  <g c="E529" n="uniE529" x="-176.41" y="-601.2" w="4615.2" h="1548.0" h-a-x="4369"/>
+  <g c="E52A" n="uniE52A" x="-176.4" y="-601.2" w="3535.2" h="1548.0" h-a-x="3287"/>
+  <g c="E52B" n="uniE52B" x="-176.4" y="-601.2" w="2455.2" h="1548.0" h-a-x="2233"/>
+  <g c="E52C" n="uniE52C" x="-158.4" y="-601.2" w="2815.2" h="1548.0" h-a-x="2661"/>
+  <g c="E52D" n="uniE52D" x="-158.4" y="-802.8" w="2714.4" h="2394.0" h-a-x="2301"/>
+  <g c="E52E" n="uniE52E" x="-176.4" y="-802.8" w="2473.2" h="2394.0" h-a-x="2039"/>
+  <g c="E52F" n="uniE52F" x="-514.8" y="-802.8" w="2512.8" h="2394.0" h-a-x="1733"/>
+  <g c="E530" n="uniE530" x="-518.4" y="-802.8" w="3268.8" h="2401.2" h-a-x="2487"/>
+  <g c="E531" n="uniE531" x="-518.4" y="-802.8" w="4104.0" h="2401.2" h-a-x="3326"/>
+  <g c="E532" n="uniE532" x="-518.4" y="-802.8" w="4946.4" h="2401.2" h-a-x="4169"/>
+  <g c="E533" n="uniE533" x="-514.8" y="-802.8" w="5778.0" h="2401.2" h-a-x="5009"/>
+  <g c="E534" n="uniE534" x="-514.8" y="-802.8" w="2548.8" h="2394.0" h-a-x="2032"/>
+  <g c="E535" n="uniE535" x="-514.8" y="-802.8" w="2286.0" h="2394.0" h-a-x="1774"/>
+  <g c="E536" n="uniE536" x="0.0" y="-802.8" w="1796.4" h="2394.0" h-a-x="1540"/>
+  <g c="E537" n="uniE537" x="0.0" y="-802.8" w="2739.6" h="2394.0" h-a-x="2740"/>
+  <g c="E538" n="uniE538" x="0.0" y="-802.8" w="3819.6" h="2394.0" h-a-x="3822"/>
+  <g c="E539" n="uniE539" x="0.0" y="-802.8" w="2253.8" h="2394.0" h-a-x="2254"/>
+  <g c="E53A" n="uniE53A" x="0.0" y="-802.8" w="3452.6" h="2394.0" h-a-x="3453"/>
+  <g c="E53B" n="uniE53B" x="0.0" y="-802.8" w="3096.0" h="2394.0" h-a-x="3096"/>
+  <g c="E53C" n="uniE53C" x="-72.0" y="-802.8" w="1980.0" h="2394.0" h-a-x="1651"/>
+  <g c="E53D" n="uniE53D" x="-72.0" y="-802.8" w="2437.2" h="2394.0" h-a-x="2365"/>
+  <g c="266E" n="uni266E" x="62.5" y="-315.0" w="392.5" h="1755.0" h-a-x="507"/>
+  <g c="266F" n="uni266F" x="62.5" y="-285.0" w="492.5" h="1735.0" h-a-x="612"/>
+  <g c="266D" n="uni266D" x="62.5" y="125.0" w="495.0" h="1610.0" h-a-x="611"/>
+  <g c="E045" n="uniE045" x="0.0" y="-31.57" w="1939.3" h="942.59" h-a-x="1938"/>
+  <g c="E046" n="uniE046" x="0.0" y="-49.61" w="2108.42" h="965.14" h-a-x="2107"/>
+  <g c="E047" n="uniE047" x="0.0" y="0.0" w="926.81" h="1156.82" h-a-x="926"/>
+  <g c="E048" n="uniE048" x="-0.0" y="-164.62" w="1210.93" h="1472.52" h-a-x="1210"/>
+  <g c="E049" n="uniE049" x="-0.0" y="-164.62" w="1210.93" h="1472.52" h-a-x="1210"/>
 </bounding-boxes>
diff --git a/data/woff.xml b/data/woff.xml
index 5f06c67d5e4..2b5daa1c7b1 100644
--- a/data/woff.xml
+++ b/data/woff.xml
@@ -1,7 +1,7 @@
 <style type="text/css">
 @font-face {
     font-family: 'VerovioText';
-    src: url(data:application/x-font-woff;charset=utf-8;base64,d09GRk9UVE8AAFI8AAsAAAAA+FAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRkYgAAADDAAATfwAAPHs/q+Lc0ZGVE0AAFIgAAAAHAAAABx/zkquR0RFRgAAUQgAAAAiAAAAJgAnAHpPUy8yAAABaAAAAEkAAABgStdmMmNtYXAAAAKgAAAAWAAAAXKyTrfqaGVhZAAAAQgAAAA2AAAANiEJwDFoaGVhAAABQAAAACAAAAAkH8MXKGhtdHgAAFEsAAAA8QAAATi/jusSbWF4cAAAAWAAAAAGAAAABgBUUABuYW1lAAABtAAAAOwAAAHUU3fPU3Bvc3QAAAL4AAAAEwAAACD/agBmAAEAAAABAAC6kbguXw889QALCAAAAAAA0GcxegAAAADZwzqn/fr83hnGEjUAAAAIAAIAAAAAAAB4nGNgZGBgS/uXxjhLsunvr3/fJY8xAEVQgAcAv40IHAAAUAAAVAAAeJxjYGF9zTiBgZWBg9WYdRYDA6M8hGa+zpDCJMDAwMrGgAQEkNgBaa4pDAceXnhzgC3tXxrjLE5upiVAYUa4AgUgZAQAgFcNrwAAAHicjZA9CsJAEIXfxqiIYJlCm+20SdgNQsDGzlpE7C2WEJAsxB+8hhfxAB7DA3gMa1/MCBYWBjL7ze6Xt0MADHCFwucJhBX6GAkH6CITbmGCi3BI5y7cJj+FO+irIU0V9iS1YYWI1HDAe8fCLSwxFw7p3ITb5IdwB5EK6qgNHCp4nFCwrtmdceC2q/yp8Gt3ZrPibo4jdtjSxcrlx92WsOAXJe16rWg4aKRIYLjO+P7Obs4sf0HMalhTVospA315WPgqdzpNjJ7prynY2Sy2Jk6Nnf43duPs30b5vrIerXb2hS+1TcxfOS+eY0a4eJxjYGBgZoBgGQZGBhDIAfIYwXwWhgAgLQCEIHmGhy8epTy1fRr0KunNgf//wSIXHiU8VXga8CoAIiJnKLtL6r/UW9EPwpOhpqEARjYGbMIjCgAA5BkakHicY2BmAIP/6QxpDFgAACoEAdAAeJztXQucTdX+X3uex2DCMaImo1KEhMn7tb2i6EEdJSp6DD2U9BCpth6T2rrcSu4oj1Ayk0dRKXXtUSQNEVJ66aHkVgq1Z5yZWf/f97fW3ufMk3C73f/1OZ/POmvv9fqt3/o912sbIi5OGIZRbeB1o2+58/pbLrnurtuFESMMMSD/ZpF/i5E/Kib/1tj8unGnVYv9tVpc/SQRN7Fxmm37kWqJhU8XvZZa793UWm3iTxIidsJxFApRg8K4xjURb0/B9lq1xKWoNyCOE3XESaKhaCpaifbCFL3FBSIkhohrxA3iVnGXuE9kisfEk+JpMUcsEEvEa+KfYrXIE5vFdvGV2CX2iN9FkRFnVDVqGfWMBkYjo7nR2uhk9DDOM/oblxlXGRnGSON2427jfuMRY4oxzZhpPGe8aCw13jByjbXGB8ZHxufGt8a/jL1GQYyISYxJjkmJSY05NaZJTMuYdjFdY86J6Uu/gTHD7rj5+l4te7ZQfy3VXyv1l67+zlZ/rdVfG/XXVv21U3/t1V839ddd/fVQfz3VXy/1dw7/9VLt9VLt9VLt9VLt9VLt9VLt9VLt9VLt9eL2WrVpof5aqr9W6i9d/XHx1q1aqL+W6q+V+ktXfzpLa/XXRv21VX/t1F979ddN/XVXfz3UX0/110v9cY9ap6v20lV76aq9dNVeumovXbWXrtpLV+2lq/bSVXvpqr101V66ai9dtddatdBatdCaW+imXnZTL7t5L9PV39nqr7X6a6P+2qq/duqvvfrrpv66q78e6q+n+uul/rib3RTmuynMd1OY79GjRcvmLZq3ieKvaFYTwnjYmEhk+qhhG5OMx4y/GZOJZP9uPG48YTxpTDWeIvL9h5FlTDeeNp4xZhApzzJmG88ac4y5xjwi6+eN+cYLxgIj28ghEl9oLDIWG0uMl4yXidyXGa8YrxqvGcuN14n0VxhvGm8Z/zRWGg6xwSrjbeMdY7WxxniXWOI9Y53xvpFnrDc2EHtsNDYZHxqbjS3GVmKVbcbHxifiEvBubEzf2JfjExPaJrRPeCZhZqBLwEwqriqSOyV3qdm1ZvfaMsU4YdUJ75zc/uSOjR9pbDf+vvHuMwqb9G9au1mD5tVb9Es/oV2t9o91KOrYpvPtPb/u2/CiDqHfB78/9J2Mu24afOuYuy6bMHBS0dMjZ86blTJr3uzCF5Zkt3/RXnLS0pNfvfrVqa+ufbVw+dWvj3jjizfH/fPDlcetzMid8vZHa3q9123d43nd8zatv3tD/00nfzhxy4itXaYnF0xwb5Ei3RT5g6Vo7YhathQ9HSFFBwR9LGG7D0pjrUkPey0KYiz1mjNLca4jgt/rEvMdkSJjnrJEohSJlEPmI1uAkuQ+S9SX8htTJHBcJUnXVLE0WXQ9SqkCVDRTimooIVIdKoE4v57CYVrQleIBU9RpkCSNr6iKmGtMarj4I1TZxxThmlJmoOaRAOo+S4RPdL+Qxo14usNSr6TIwuNMR4T/5laTsgWAkEF6bJAyT4p+6O7FjpjKPSOMTDMRjqO6zralHEPvxtP/XrRSZKn+TZDyXXT1C7z8BAE9jh+TKeVux8v2A6FzDBX8yVSYHDMlIOVHgIS6OGKWlDsQp06PV51WGWtpDEpR0xKB4B5dBPiXnzriI4KsN8NX0x8gFEFsekDGCooXN6axIXyh73WixmhCmfGZoAeo/LEhoDKnRo/LVD0myfkPSPGKKdxhUhRa9GcQPN1NceASKbo6IvbAchlXjYZpjMbaHrT6M2N9Lle/CS++JJQwGPVlYY4FYvkZsHwDLHSmLqZJMYxBp54SimqYQufggOv0KqYaunPFSELO8Ro/FEyfzn/1P6Ka0lA3BQukqEOvCr6ifp0M7J2IKvNopNPaeLVUp4GZpauhvutaZOxbHkx6mDy4CIb6FC2uB8ZAB6Q43asaHakvY3IIkTtWjZRyiynSmlFDq01xyeg29WXRlcwsc1HpOlMskqKFQ2h290ijKooTx2q2pBiQ/StevIckisUqzojtUIIzpHwIMWaOG1HUArLG0agRf9xMf4nqlc8cUsZ5XKNZ5HhE70CtQJfmlAGIVUVM0WGEW9oTsd9NRD+eGUCFE8pyyjoMD7iDuGUXXhSapbkl1lHc8qnmFim3o9UUZCSumTd+uhp7HupZjE+FJBAVyykl2OxZtmaPRI+jkn+T4hs8DCYpeAaPjKGlYEw7R5FerDuOM6VI40FHfOp+IMUFNB4yUQCUVZSrYLIJcmPWbIh2aSQJjuXUZEAWP02iJSY8n0cgXHMPv3frpCkuNp5gAmHhRDzzkRQnAPoWDHNTCueNmc69nKoJLEGzEEuhD/DwgRY4Ug5C8KTlBcvx+BpiOx1N0F74rUVoY14ORNhbcT4wZE+3FQZV0B3BXEfsDiRfn/xtgUZLgSiYlBLda8CgWOEt7rmMwdvWeNGTuj4kXI0RrBBQE+KiCCVWEvVdGoXOxOTLk/MXF2gKk0v1MEhjFGL9TRGcLWOWmyK1yrMpGnhwrU8rzH9ofp8VrXPsMWnBobLgPKvkUFUCdC/U1YEg9+AmXEbB/abDcMcPYBFwqSeLxBOWogD9rhpidTxSEcc7ohkNQJaFYXjJ1HJDvmh6XEH9zZxgK5An2KM1cHt82ucOQ9KzXoEMt/nZDmDQqvn8SLF5EUqX4gxTcTdlGkWUP92T65+gqrmQ20pGiBwTRDET0YkACECKyY7QDEh0EMAIbSg5QrAZjPs9kSDftJStEKwh486nt/ELic7tKbZWUjGeRtcQM3C3k+xwqwWCQ21GmM3IyuT4GCketDStK+03Go2StDmFuxOOUeJcadEPSJrMUuJEYWof0DMytaBLQiku1dh1zEMaeinWAdjo0Y/rA9YXN+qRcatdw/AoaSmamwq3upk5EI566N9F1xBOUISB0cyk9wU0Qpn26OlMTFP1ICf6w830DRGJdwQz0GezelLqPDLsUzl0Y+zdAcZvoq2H5gfUc4E/niS3A/YUXX0Ci28qF9Doe4/kfSZEDVkyE5QQJ7D3R9Eov7MzNZCM/xaOJ3uh8xTGPVTsl3KB/8wppGwCQQ+AGMsjZw4Dmkiqs0GmDMOaYGtITHu/EnSwMpppIUDibRaPrK1GVY19KXuN6fedcuj3YVPbtUNlnGWJ1Lg3UjI1rmg0PtXd663rAjUDYVNK03WMT9dNEIzi3gDgebqXdfR4ztM82NyTA+I0X4xQdwKzmNhn7bAZCF9/oegsPZDjUAAWlGhnKv0sxZPIk6WblvIJU2juoAEHm6viUApKie7z5eUEfk3Glru2rEo7cmahnIn7dZ/ZsmAKZCBTNR5a6laIVOxGtlZs7DIQBBM4VKAm2qOnstCfzukYglgnMjCKL2CmTmd8T5nKDLLb3hloI43fQNZKUYzPjCZr1oET7Ey7jKCNkHdTZPvW8jADqQ0GC0yYGh+c3ZL6N1+/iRC4Rx8wDwHNVNutA/LlQSLl5pHvBz6W32U9rQj5ZybhPbp34wNcWX67lMwxE5jPJihEKmOZWQ6mlaIlJg3S4o3cGClnwJpUAK+OUOZYQLpRP4cHaPJk0KnTI22umPDEXGSPPyTuOY9exM+B0eQNSKyjRYvm7ylTqp1WhlVudTxWiTAJq4FDYZdKuEUjlUuzdNqnpdMYHsSA1pGEp3lsC9o7lE9law6JVPED07ZCKysi5rhppuI4IJnZjUczwm668E6WTlHsNppY7XcC6OizGvTSQVgtWjXNZRKb6ammMiw3ntQH+l6C5SI6yS7FcrOm6FFllmNLKMBUkhglT6U43+epc9kS5egWopqTk4KzT0lS5GE8Ty9OJYd/miXiFOMB1fGa3huaXudK0Ls/HHP84fgCPqpHfUptudCKdzpikEZNT0schPy1AnE/K8MDbKM+6PwP8ABX0RSmi2jgN97Qo1rUMOtTm1HDAHilD6KyAoems8oy0P6lR9umj+IecoyVNIVsvON/iG9mOZXwjUefh8E60hjniLhMPXFD6Bg5QXs+JdTX0mhjn50RtrGno+4GWp65AzwVdrfzx1XYl2Bfxil7OMy+41Civ6lE76fBi9gMlIHL2FxQKNuvIRivJ5CY5HlClKcWLmV4+pnCd2LqwBvJ1D3j0mqWL1IabKBKX+aULk3MkzkrUGnjkeL9uSBZ+R7fwQ36WY3n+5bS0+EY8rFGMDjx2n7m8ZvsVcWYHRLQLfJUgzadmYQKtOioL/ddddT5rkeE76rpaR4M6H1sTrWcpVyokmah70IFgg00nMotKWSSU3GWO8RYmEzx/IyIA815p9jR/vPUeVOnao+KwCWjMVjDnqVLpHgzrpla/CvfgM0q8KOSufbUeI+ZYTAyocK7beCJdfbiTrS0h6vrZpHH8vVEy4vVscqO9PkemQVKawmiFikX0kNxqqlVj2dB/qQrHx/BkzZ6Keb5c5mMnMwpWqqQSBipjVkWgzB0g7ObaXZkS7e5L0meYTXiCbDp0+vzQ4JbzXfVYCgq8ckUs44nyiK2rgeZZ+t6IuNeFmEwfjPHaLgxpFEiY7uHaLiAjKlGUmRYnvBgQcaUOtdhdmB0WTo/XvS02A0tKTmY5j3poQHwYLrH1DAxeicofCnYvmEnhTnqXlPEs+3NYLCA5coXejShhRcLO2bErt6YR8mv0baWl9wcybBM8gKM+5wKIdjhHDYE4Ut18zzejISdTkkk8ABVhIiRpZHg1jyk9n3xXbZ96g2hILrt8ZE5KBbXixxPhN+HWGQOimIkF+IGmCI1/uEUu5RHx777FLvaaVOm60moiPU1z+bJWMWemZo1eYY01UMzUgLBi6brJTMYOix91aRzlLwoYz1FlEG50pxrGhiR5rp8eaZcOXrBM+U8oHxr8AgBUtopuqbyADrDB8jXc+UBVEm/ftaUcIlSWIlsMgb0lBL1N14ZKYlIYXpijaVrYHzwdE+xoyVfwB6piDVN/rrPOdo6q4UVrbM8Nws6q5StOM/xdVfmhSV1VqaN3+jopb9qmk6jpuai6LbExJ8/30taKmruT4qhJlTXu4lRikobj6ys+pnaeHRHpWSO8aYYKlYQmeUoBz0qp/kM25Sn85rtL6McMM8XUQ4MuqcgPHOSdMop3nwIj46azlP6YZWjTcgKdATMyvGsUuI1eETT10QrBc+W3N9I25AM8Fwk3ehLBdYJ60xPGmPtrLRO0OLI9kSRksSZWvxNUGpJ6SbWO6SblmoLuwVPVVLNBMLZfq0LoYJsFtUaVE8TzOMcU5TwHe3PBSkNkJ8Sx1NAO9gEijTKqCvVqBtzeC2Ot0tqvMwoXVNuT7UA8PwJ1XAJqV95wyOVuVaqqyVQ7DXO6q5Ej6Mb93t9KI2X4zGUBiIydVye2rnHFNGeQ43UuIkH8lLKtxDLaKEScwIlppIj9iMUU1n70VdQEftxQlkFFS1+2XysWEnNKu1qaKlRVh/srEwXRPk7CyI1lNYDvNOiMl2QWUoxVQhMZcppVsW1BMpUo/y3Q+lX+QBFulZxTbNKqLj2pCwS3ZqBkVxhebpNze+VVG+2r9oiLlla6i+/e8qN2fFdFp/lKbao1dhoreYOgEqLXciLWmw9R9QawXQf06I3RR/li7E+w3xHKR+M5wpK+WC8llSBH8bzZNPtqaXXML0Xyhcr64lR916wRP7AMv7OhPH2Ifs5rMqWRvs5Vlk/h3n4mQjlMFhwGMv6OhXoscr8HEjY8ZwxSoeV59xoa5qHiGfNSuizaAcnan6GzYOD+DdlTftSUzUs8XdoEhuxNHrmaCZmGipWMx9gm4lv3UdAiFJtJRwcUm9MNR21I3Mfc4c3F3SQdsqT6gfz5qJ6WkK/cW9pHEeU0m0lgKlYy1QGTGmvxnPq2Lt9GYHvw0XwW25TgyrEbZQqK8eB1A71yNKd9SwI3k3D88WVNh/x30p1dmrlNEb6NNxTGrdT3SsMt6Y0TsWOm5oyJgEbY9TMeg9L9FJTdSrobopNev8Rz9+RgNukN1Nw8CbyI1o/2c1JniFjOwIgsnsNKbpY4i1pGHixwhKxCuLYXpilj51giUGpBa8muqN4fSw+792lUpyFrO0RdEHQhzT5UrU7clNgAr+MZwQu12uCzIhsE7OQ3MiGDcs+GpDz9GTxJZy54zUBt8eEFLaeMVNHtcTPimRWYmyEPaGEUFNjmasJSHm5mNwjLtmKKKesYQy8rIkokD82cRX3ZOm8T+1AcmsGe7m7mlccYnXPhhAO3L3cV7vwOk6ybRkPJiueR5rKlsbnlrjSjl8uw/+gvHZ+b9RwFrL3i0+e6XbhMpiU5VqNx6lkXCzlDA9gCG2eimYwqeLiQYg/qbFlh8cxIy2ihCt1wggbE+43aqRSgo2oAst4AC2tii+sqlZN8JxIYk/lxHatcAwZccYzoNlF3psRdn5z1X58eEBRKAWwcnfbhQdcEp/skqz8bLIlxVs3WlS26rcOFXQamLWkODOXXq/tQkGDsQTEv26ioO7lDmnmfWbwTU4vOED02vVLevfMPqjPvu9YRISZDrZ8NKMevf4cDMYPKbhirkVdkJ2bCq6T4uLJLWZ8cAhRwtfURONpphQfj0PreJbbRjjx1Ii8salqkAGUcuhlJkmWNwfRy4HTCGCRsQXM8ryp2haz5juoetVWarJtLjdJNaAZ1EicvYwSmnQAOeFZNBfcjHg8zUpMzr+/YCPzTK333nL/4d44COH5wY8L/law8eAUW0LaHA7FBneVpFlFFYAnpRQHlWXbRTx5ukBvtuTZ0xNR5cesMd7dwabZgk0BoqhkIo8/j9kVqLJwMNHqyE16goqqaAbzbI3ueknkBnf9W9BbSiDkPy2Lns8jEhiRYUljf4bpChnzFMXFtHSTDL0MIqnb0okPYhfTsyCLA8gcQCWMf2ZYBHFzFB6WLhZvlqJRFsU7p5vx5J1kEOBnTscAIDitFaWkImvqeuHFEJwkKUhGK2npFnY1pWQRff+GtpLWi+HYfkTAFF9Mb8OXZZgYAyomf1xvqlxyD9Usf0WhX7O8hP3CSyiQnOoAzcuoFTmNcsbcDBjQYTkpz0lAIdijGSqrFNVbUcrv6EBdYRJISXkMI+HkPUqOaZfnxCuYGTZxXJZuTdTwGqcY7E5hzSBVJ+k5mC50ylmA6Hv0uhGA5nfoOrEvh2aeM4PILcNcjFBQ2I4AE63QUivgydRYpJQ6eZBKSKmhsRqIRMk2RSunEEwiEfhsjNyRWCw1L87MgqhB5bKIuiHuAA6/HQ6dkAFaShcMFzFlw6Tgx6clyZjVVIGRki5SgrtOT0ou+H32nTK2Zbrp1jJk3FuUBjohRr03wwQPAA0L0M8lGLVVCHhsL8TQfYzu9ETbyzIsO0T5N6V7w/qxQi/HrLGh4VKuQDUlahgeVZqH0lYEq6pZhqSZQImCYEqG93IcoOLqbsuyAlxVgsYj6hP1UD/heoZ+yWi/AugahpQF6SYcYOQC4dEQ568X9nASKkyHxbvznKKJUuQDKvEdlY2ZzCxBY5KrK2+ajsrrpYsZ+kWqT2LUItgAxEG84NH2l1lOGtcsC4uQQnzIlVte5cSGrsil+tvTiC6WspDAH0sQfYe+MuU3AOoWoMaGGWYPKU9KN+2xIAgxlnmN8jL9tM+yQvG53CQ/UKq5Hpq1M4iBqaY9khhu5v5SQf9lFFw8kTKftBN22l3wmAYCh1+jlYXpoIz16NVNzNDh2gTdvkIC7P0BFJvfxtKd/g4QF2LEONitAhOgWcMjoTOWLEyu9BsFocfH9fASMFH7X1NdMY+DRPCaENbXo0pF/UQYZDLasvBzdOvOPCc1/h23oYxpgjG5Ns8xZFERUXkfGXcXYXpZrCxeTilFd2dBBlZ5xuMsiA4WA6LGOktLwRofOF4sz9R449S6nqSgGD0GMhTjEognZwFyFiLouqgNZoTg4zJRsb15uhUWfCxclTQDQTEClaDakQeqgtwhNO0SDtMsnj1cfy89UvvXdMr/L8T2QGjtBDqBWLl2vamF7Bpm7re5sleyiJTlynSSV5RDsEiR8g3ILBIcUn6OMbksD/25goXNYEjKdAibywDy8HSwILNYe9BWSypEg+MoSanYrpNQWojlohQzkIXF4LuoHLJEuHjHFOpiCJrqdwF3DY0iGIc4vMp0CE0eBK6R8X+xdKJjta+joGuWFuaoZ7Fu4RR0juE+OcsrfDKgO55IVzRG7ipQdSzgw21UYT1WrNR+BBdhJHhgxtqKO8cGhmvsa0ybGvFfQB+xEvsCBOpS3fITsL3cgirjUA+KMOEpjVIFNbBOAiTMK0o7MZmwNAmna8KTLEeou5rQSP95pAtNyOUUTbNYIl0S0D1P9XqkSJk7naLElYf56miFMwNMhSuOHU8Ep+o/PQMtn70eEzi/aqESr+GL2ADQcIwOBTP3Mg1k9QPysVblXjIOuOeJePdthicIvkAzcsZ0YbfUyF0EblmTEYlRbS8B/wuR+sp0MwyqB/62pTOKoQdbeeNDhB7QA/RJlqei3gXLcBHihkB4ipRjAPxGNi6GUbGiIOpmmdeQZR5bKMRAJLpypwtNACu9gaSYAJtaGjx+x6U/BMgzUILb3AD0vJkHomDUsA2zd72lyaPIG0MvJjTyAx7OQDKBZHcUtPg5ecxvjlGQ5PaJlTFvQLuMZiOPhOXiXLIMldSE6vQ1b1q4lq1xNynP0ZiFwmX8axnMhBKrSQanbJCJpROpOyj+R1h+T0Gd07wmKHAUsZNCF8OH8wCHAlpgf+PpVK11OMbExzqbTNHFeBZKiefagRlsyI1lgyKNNJ9sRSWKemVZ7k12vJYn65Xmp/JbgCH0VqzKsAJa5d3GbTZN14gQzdkKo+a92pndx6ZpG2aLkt8mWzPxynhh6DgF7dRP/t1mbYMDmP9E+W6kZNooC4ZaJrOKyAjVPIT2lmRYwdnSOBVxKpTSKCm4tnFS8B9nJAWfXKxFTSutKskg0QKdcBmvNfwaZWGYWlV25sFgfNFgzdCGOPVjhjLEF/P7xfG2Hm4qlBvSXYBhoRiVq4KQUCZDEptcT6ermqjbA/OccEOmjnCfNEUGQMUMkLSPEIUaU8eAbYUDNhQ3sXb5zpekzOgYzEDwhRk6gbGvzAC2Y5SC84zGEBtB5O+4PyosGKlorFW6eaeMWYqGaOhr5X/Hbk9wCbkIeU5+q5QmScFRTZOCS5olJeeHoixdGI6U7JmOyrKDw0TVWscsu7+cZXd4/khL3wPRyoV9kRl2hKwC6KkVnkJ9/XE7+nUyBav7UiMP30dl3Nsp5j5uBZJTj295iH523Xc9P3uXiscMJRF8ZpIa5qK55Hk1J1fsrKTgrhZR/y3pv1XUf7r+ZybXnAavHcNTX0taxv0cj+kgblty11pqP+kRlGREXQeth/IJmqDb++qfY2CAQJT/v5jlae5OLnOoXv1YzjE24s37L9jlP4gXP1ZLFrYlkvyBrZdeoQfP/vcabd8rnQs6IDp6jnmQDc5r0cgANXD02PtOil02jmKN+lLQ5zoYNnUoy1OPU3DcKEixBxDrBYaPoccat1JQf6t1DD3H0HMMPZWj5w4fPRcJDz01LQ89t1oeeno4Hnpus46h538IPQFZOB8qcch6kXI2abjWScV5ddqUDpJTa+07RG1be3JE23K8cm17TMsek5PH0HMMPf/V6DmmRg6qRpJTk51D1CA1Lo1oEI6Xr0GOaY5jvH8MPcfQ81dHT2WiMTk1KfMQpWK1tIhU5J0jZaXiv38ggh//Vw/FMUo9bPTw+vEVCHi2vS9nXEBtEDmqFfX1Pr2+iFo7Y2ka6wx6eVX1ZQuWGFrq/SQ8bUzaOf6YEj8qcqYKVtyMjVhfRLNYIuIFLGqgh0YLT7zzCihQqx5nUl9Dtl70acp0MJB32jTyYFKjTzBhwZLRh+1pnE2vEBI9ECWolcHFM3j3gd6esLgH7yGy9Lod73vgEdzkreXzCjCJw/8E0CUhDjDIi3swwGkHgTg5NWHEIcruxO8jsjuhCLJ7M+9yCWLjBu944D1lNdQaJvpyluRNK1iR5rX6oNq/YOkdCXvOFnoZmnfJxflr+iqGd7xwvZv3cfE6OtarVV+wIaBkX6Jj+7FGzqvzvFNiGzaTqML5aiuMyYAM58V2vZyjdmAgmTfCcCtcOrL3YjvKuYD9wwxs2ng/HSHvtogePd5Hx7vszsOqel1BOA1gPw6h52psQeA9I5EhPC/DAumcniSLHsvCTrH14vB2UPKO1mObKJ3/0CbK+O8pOBlecezdlK/hYgqMmhQ02oXxr3o6RY9vbB3bEvtfMZpHtCVWd5j3JEW6vptXmyen6zrkvDwKPqQ6eGOcnI+ufzqHYpvQ4e0DKLZ2Fb37JJaClbvocd8nVFefmZT6fW+KdaqKfEuBrLtMfzducmqgdqVCfSaSWKhXGeYL9dTA/dxVEj1zf4Mwu3MW5bouQOn946jkCBxOOO8APV6xHJhpT4/9irFPYP4SqjP8Ab1c35HgmWtT7hdx1qFzVZhPSlZuhvx2/a07JE/LmlDUoQ8R7UFVX3wmYr+Y9Q+GsEgM27vk5+mONpwyMvja0jwnfC82HcSDhoDI94dRML+F+e/fdABxfNS2HRzbBm39f9gsc+FvFFzSloK0eVTi/LWUr1kDerypFwVNn6YKblpH786EK3fDLyJQSl00tKlU1zTK1paIWQxeCP7scsiG/l9BIZx+GWVfM45eZgykelemUfYLdvPAfulNMrQlH6oy2/KKnkB6wxDVtHw9CPzZLAFr9sXIVu2C0J0FL7oN2f52a8mYU9kjzHP0oRWjeYYZ/FHGXQUEJELuyUwSbHLtV/Q8mkZJPkb+shzUnUpdeYDe3f0rtT57lkiT4q1XQWCPDyDAtmVSeqgJBc8HKZj+JAncxhjAJ1aTzK32Kpj4Nmrt4ZedEruOaw1BykdUZc9BVM1Pv1NQ91t6NMW/YW9xgN2O4UQDzpX0fuuTRNDbOlLwdiJvhF1HJQJvU9kPsEs0uRvlWbcIVDgMEmW3Vdnm4Jbx0JYGBel9oHXfpaBqP0qtdwO9a9qCgoFDwRzPgDIvxuiN6eeU3N/746MEwKWPU2O5AKBlBwJterJ5OHt0Vz1H8WebQxUspWDWXRR8MN/BlxrKbMJ941ohi99qTYkrL6fY8q5U4St3mLJ4VUOzst24mxB7gB33ICV0RGzCG8D19rUwGF6nl7+AXKpcSf0K7qAGT5jglDwR4PgnAkxtBNbv4LAiJ7SjWJM0EFmfEeCjPoRZuaGISt/Sn2JLY6z6wc/UXEbc/Czn2Mma/2WV8hfcf0mC1TeG4kGplJRY/uma1PjnIzLbn60rz2wdRyhvqPQQT+/FpKFRSPQCFueW3iYMc/ZfQsYOyYiS7OLIJbvjSfZ3nAok+3rBkl38Iclu+ZLdPELJ7niSnQTJkUh205fs5uFKdqdyyS4qkeymL9mt8iT7mb5kHxst2YO7rX+DcDc94f66U45wv8oX7tZBhHsABBkt4K8S5Qp40xfwTn2Wlu6USvyxQHCvdXCfrIPl+WSrrYP6ZMHvxdF2y15BlkwYl9oti8xnn9iaAGz3PtV74kUEYLtF1MPU3vTY9nUzUNLsBRkpsxfLFsrs7Wr+vzB7eRR9y/dgs5y/xFIw6iRKzX+RyhlbKeH1Vyl4dDtY/zSKvQPZvuFkevxkIxgl8w9OVh5krrJiuxxzz70o3vASh+1yNsvTklPjbi9xglKKidANLbX4VocopdEEL4eQkO+T30CKh9LN2NTEDTL+XJbg+Q9R5vuOQxdfohZuJnqQ911NtFz8dDFU0fHtiLOf3kRvF7cgbt8SJiVY9FKWlcBTQCSdlYa3/CmiUeg4Wxoc48kinkBSq0jpr0IWVh9PffjlYspUFwPw+TloikeF6YRHhWnnd5AKnwz7cYNQulx+jQQ+S7mtpaMlzEbDo7bNvLZEKQE9C77UOx3HR8hEJ4HhuTOForW+IrC6PUixMbeCuR8+B7CNe4gaWv0avb2tNtX8yNeA7e98FPAZ8CI3Px80zZPcve6BpHyYEiaHCKROQOBykt7yuIediF28HqYZrL7wMuKcjWdQznqjoD1wP8QJLSjI20KPqautQAjHkoS2LO7NIDkht99D0WUHQIIPUGwa6Q858x/eGVM9h8cHWkk6puWqE19qOAasFziOlE3RlBDUTggKaQyG4gx0JLyAcNC/L/jhZYpddQJVt3AUuswHUJmLP/bOj6nWeEb/084UbHyLEuQpIB5yuuXvmyn1ZSi3OPKm5YZkaiquE73bRda8iMf02mZsfeJZyg9hl/KxSyZ7GEQ0Yo1JtLLiEB3QCpoS/daxG86UlMhS6/EMHDd7AKcbnwD1YdLQiAWeH/mIYsEFFJv6N5IvNVOhZIk2jEsSiXBjeoBw5aaV1Mhp1SnYWERwnrYRXfmcgtP20OOu+yn2JDGD/OFLguuJiym2cwbFpk11lNQtfpnPBYIWB4E0H2KSU7OQLDADUANKU/VDD4aDBE9HV8+XJp/DRBj6lSpYfwtluvx2qmXBO3x72Nw3Ca713Sjprc8Rww0p8vY0qP/L2hJe+m+gvDcTKOLp90ldqKFWaOEl2BMwd8rn5dgO4rVMBsKENGEriY/jDkXQFgKH+fQuTJP8tpqCmTeTuEjfQZnPvpeQeWEj3NoEGQLpEp6ToKoz7gR1XT+dKlmBOjN5+oDEnK1O9RIjW5FZ6ID2AcjUja+M01ccTwmfLKdg5Sv0uHg0UDptjoiw8mLNxibPBt6yhMA68UdK73khvbypN/D+SAaOACVmlCMb1amxARnWZk9CFhB+2MaNqYkD5wWpbp/U+BpKTMr4EwCeMnWn8LrWx+xysIIbx6biFk2V2gtMzoA3x4fssB7NRAtjy61VgoR3sqe0OVe7IDxcPJCsEfgduWi5ahkXq1XQeJZetvwJAVXlztHC9yGka2lcD/GZGTiKrbpc/HMGhDWawJhBC/GAPeQ5FTaPzdgZPDra91Pjwot6v/LLVWQC6IOyc5jOsWqr+g1trnr8sQLe3yaQorpFwS08y/8QL1yPyzBDUkwACh/KsuqH29hKRqra2bu911+qvw3AsLM3LAvHCi+Eo4tBq7hLTf0zsGomBEPidws94uA3Vtsr/DXjlXpjAOgty9EHm5dhEUR1y3cdZ2iNHVlBasrdaqA7rw0UddjT1Jsb3FqaPm5Bg9Q9O1xoK1e2eBZahj1evCmqc+yVTkJNZK3hXGortWIstFxnBJtq34Kj9iR4jmKKHsAZLI2iWa/M4FJ6/R6cpqck5vAUxEyfqKMwoHp0i/LnvYG9jV9O5NZ5SNewd8knjMPAME6mwhdpyQ201PMVbAGyD7IKYDzNx7wZgJl6Q4c+mcwK/xFOTsRzlDJVh37VPIqInnLhGFyd4u+5BSD5e2ThGDmTWsXGc8c8V4m3jxAJhrjR4cP56DJMLzX1gDaAkhlpegBKq1heQqynczE72t79EgNwIpYnXvSkAZM2n1dmc5RwNhak7gRmIE3wqWe4Zupk7gIQAMSHL+rdhouZ2rX6g4Ov1B/IiycIxJIMMz9fTaesIfkdzmLX7V1CyoqzoFvINi5e9iY1/vKXFHPGOWpOqfglAMSDcHkGqzbL9rYKsGqj5u0ZWmLx5p9GSoA5di71tPdGKvg1+ZOi5wbq4rrHKC1lmPD8CGyIUVtadvPskDfajua/9dwaEMHnmBlz4YYsz+qXMAB4/qqePhmeqzYEKd3mxXIZ4bkaJTwFAlcAu5hkzCCPjQyTJGX+JFu1X7yOrS2mPp5lYkpqmGF671gIjstzhmu65vRJfs6nFeF52VewWfAdy5QI7maok9dqAipR9cNcHFicGz8jMn0GXKZ659l5zkkpmgFandik4JIWHq6CkzG2funu1prO+BSwK013bFAOc1D++4wEGRODuTX5xjVOpXM6Vqk5Hcuf0xFlJ+xXoMtL+gGT+RR0OY6CJrjJue42ChrBK6jfkaA7a6yJKXl616R+9IyN8GdsLJ6xkTKTvDG59muz0mlGGMPeNKNZ0TSj8KcZgczbrPIWkMQhTDOaZRaQmr9HeU6GjT/pBnqsxd7zog0mTyRalU8kVh9MXXt1IoTltxTLG4auXW7CTzZLLgSJstOFAEhNF/LutgqmCyeb3nQh4PxD04WOP10oDroQJIv2HjM3j5mbfxFzU8qLMYV6TwPKMnYrxVoth4j7u4Pv0DvHbMr/CpvysvnUsc17Ib9WUj3Pb7dg/VTPj7J+Er49uM1jtKfoMkXYUaaPompsWnD7UDJuoMN9c0ky3SyclCLF6EcJqLaNCJ7HjiPkjcXNtP0K6LFlAgZ4MfXntddEferKa5Mp/iEE4da9BOdX/6TYxnvp3fddKOcntSB7P6Jgy3dUxYWvgScSHG/TXTtchMaXsfGWRZ4iPhPNDMUKQ7uB9Pj3GIodvwRdHi30vUziU2BqJtZmf6RuUMcdm0hwxSTC+l3nU7M3dTRl0b5zCYrrbiSW39aGIMvG1PagHykYuZCCxmMp6H4u2+NXDaX4s9A3D6K3z79FtY+G6mh7EjCQRLGxfSjWD/q5JVTzlEXAwHKRBgxMoxcfzqEmtmJJ8Kt3CICNmfTu+67AQG16l7uNgi3fUhUXvmpqDNzbC2Td8ydq8B0MSHODYuPTTX1Rn7cfUWA+3dKzV+c9SoPW+VMqbT4vpNHboYRez9DIdl8HJVSUDquGmWwYWIRYApvHP/ZXzUn+hudoP7QW7xnH2zZIn/MUPfZ/loIndxDs6b3oXbs99Oj0w6qgtyU6nm/iwpMyACHUWFxB7XrXQzViRcQCnHmZjTB6uZmzLvYEaVNPJqtF3wVsozIbkwANqWXhwPBQPBuuw/UysjpeQHIFq9/ebVhRV37ZWlYznfCC9rX+0vZtfNEePXs8z5m+BHSc/qlf8EsW6cwjrbOswkm2tsWLV6Kr4Oei59cLLX4a8NVPU6Bx1bZ+lsGRLRMcI5EQ0uLgO76PzseoHixYwg15ewIRFSklT/MwPMMUtErdk9RQ50sihyNaj6bKds+ijpx0Ob1b0QqycXlzxw5pzbvM3z4xrTTqUtiWGMfrN8M8v0Tp/QsAqTi/AUW7PkQp3atTrG9PaqZXO4r13EhYKo7LgA4hVRFeA9PBKczXBsZJ6CEwVFyIxsYhwE1GDXFrGBsFPkGtifYtXBEgAO8kXTBDI4I3L7f3vSe+HA00lOvp0oV6A4Gp9a6mIh/Z6xWGRcQdive2TWjywae/QbeLlVO0mI2RXG18sD4mf2JngN78k5UUnDtcUatjdRWEhBQs7aglO6YptKFjvhnDt8IpxzWf7UZzJHXyx47USGYavVzfncq82JVi9/8gdmpH8lptCrkQG3cyAxFGWP2r3Tps3vE8E7uBU/xNF0SE9nC975l725f5c5jvo5I+3cy2lbfYmKj0k2AzK01ff0jp8R7h7PYNU+VTKvyvLOl0TvI96klANNFhuJZeUeGdOzEJ3PkBShMprpPGUOpiIRs6lq10IlMTWvNlj7KwVnkCSJns3/hWzBZFAiZb1GPZFokgAOOhEDDC5zF2b3pqHRzQg5aYLkogQQm477zFWLRiM1Xb8A965nl6/xG/b7l8m57ePQN1pch3kjbWuY+aDojY3DaaDXO9EVUrLMw3K/w9UJM8/KPXtpbApceWtzvx0scVatVbLA5om7nk2I7VXsVuXpdSZ9Mq6lJ1tplbXEblJ4I4TzmfKhmKnUKdcVX9lR8KrOgKeAoXCK0gRH+9D4li0xUT79RMdTUvF123F2GXttTehjWUIQgv94WRZkBv9SdywtrJxKWmVgC/veiN8ILZVGg/bpn/biol5GFXzsp2lLAB/nF+MQXPXkrB3ruAseEEUTpWmfbOJ2DOvRZouho7BhqvpqBTPgVdSf2JJjdpM4OvJOzfiSq9bRkV+4lkn9xUl4IvHjD1zam8MPg51vHyMqChWNJ/nwo4kLLiecqd9BEKY6FwRRMsxtVmf/uEa0y9Rg6/QRlCfIcvr5f1rkfBInwq4E4yU8Tfgc27sWHj0s6Eov7POCUReQ203slPgV9OpDQ1U5PiU/vpdSi273yqLb0QoDWi1KQ3CKoPbFNThY/mbMpQeAWl/bYEJP4RPS54jmL7V4DXX6DHPGRZ2ZDefUAWiyzAKtaz8OT33g06ugJoxnaRvYuo6XNvxuhe3ZOgbIy15U5fAc2LgWacbMEWOlu5VDPs6AMOfG7Dmz8igbkRu5Pj3qO+bTvTVJsj5BfXU2wX9i98cb3ljQU24kePBRmC0hkEwXgvFak5ljL+tBBjMZQomuS3GW4YXkPqa8UrpKbGEnbljc8JWfQrbrK/7hMhiz8+jqrJqUnlLscep5GnUqxxHMW6T+NdHVddTTmfxRaaB8nWFc+/gR0KNc1Sk5QGusImhxE9XamcBNjomlF5Q7Hav9Ac5m3NdL0XzXgOMTNDK1OjkZq4dCJmvlBmfvQMp1AyoJSZH9xDOqZ4IcjjD29UNnmeyflj29lwmSi4rQbBeGI4h3FAGrTJd6j4E8jgQoL69OWEw5tOouD8jlCZ75n+xBI91iqCrFv0gYjaoXaVhYkl0ATmdd5O4Hmd96lEdRjZyx6nqo7HYvOGJVTB4F/psfqpzl9wh7Eouw8NjFbeDuOoCUvzD21CM8tuQnsD4G7HvJjahPaLVekmNKvMneP1MU56h7F18A1oxz0JK0DwXb/Kvzzd8fxL6ojo52JwAmZ5/iXEp/IvV1mefwnWVv4ldgwo/xKCWvmXbTBu7Yaann/5jOP5l/mO519eKsrzL03fv7R8/9Ji/3KK71+28/1Lopmy/qVVyr/EWtCf5V8K3780K/QvzVL+pVOpfyki/iUsfTbgtH9pHsy/RF7tX1pH6l9iFwQrtMPwL61S/qXzH/QvTd+/hHA+iH8pyvMvkVTGv0Qy+/OefykURoNuV0fdEH5oPmYg6MLUqMjRFOU6mgG0orxNq5S3yfWV9jjrV+xxwuE0fYfTOajDaSmH0zqow2mVcDitSh1Of873TgB0yA6nFXE4nfIczmh6Kutw8gkD9nWPxOEs6Xoqh/N0lCO1e797ItHDVY67zDsywR4Jx0ao+WcR7Rleq10K7v1Ono6u1B+1yvqjju+Pmp4/ul6U8UcDf6JDavkOqXVkDqmIdkidQ3NIWbxQkfI8cuWQ+hvWoh3S8pDwRx1SM8ohtQ7dITUrcEidP+6Q4lk7pObRc0jJvNcO6QWO55BeJjyH9Hpeujr/gPAcUtg0yiEt14+6bh/g7dLaLO2QBvd0dQ7VKX3Z9JxSeJzKKc0XnlM6WHhOKfqvnNJ5Tkmn9D3Hc0oBpeeUmlFOKbYKKqf0eMdzSuESle8Ikc2vndI5zuE6pZbnlI4T5TilVilkWn+6U3qaqZ3SfGmVdEqF75SaFTqlgp3SaN+/g4/mmoxmCr6YYB5tf5NG3vM3Tc/fDFqev1nf8fzN6cqWvJIqf5as5Gh/M37WER96ivI6E9dggHDuaZ8lE4LagPoPnuQP4iqMwzo1YvmnRqyKT41Y/qkRs/JTI4d0WJpMycipEedonhrxhhXaq9SpEcs/NWKWd2rE8k+NDBIHPSx9iEdGTP/IiOkfGTFxZMTyjoyQFaePjDyMkX6/FUYdN+8c0pER4R8ZMUsfGQFdVnqaG2K0YUhEn+aW7grqUCFRQ0q7pOC/rPZJyalxM6LYBl+hKfeLHYz+6M90RfNKwvWgD3zPY1tq/Mv5rVI6JAXnd0wKbuuUJPPDBF3R9cQ61OJkavBA76jz5F6zz8Imr+jTLGSfqKOIsFpKfaTla8stVFM4nZOCX4kuSfSma5IydI1b+AN5VE1CcJcwk4K/isZJwZ3ijKTgt1a3pOAPojsu9rjm8MTGYUArE7A6zULll4AM8NSeJ1QsFiqWL1QcX6iIf4dQcbRQ+TbQI6nkHQG/BHompbrLFJUEd11GeN3VmPC667Ly8PpVgPD6dWPC644XCK87/kF4/aox8Fptxp+H16otI3hNrf6jugNRWyX6ni6zDAtXeKuY5d8qZh3arWJ6NYWnciu9Ci36WjFLXStmedeK8U1nf3GIGWD/6rZAqTsmHVtvG1J3BKrzfebmnbpR3sXDG9Wm+1K5AX/EJ/rkuOkdHOd7Jb8NlHP3nlOulqng7j2n3Lv3LKVVrLJa5ajfnFg+VvSWl3JvTiTZUOLqRMu/OtGyD3p1YoSx/bsSrRJ3JfJElL4rkYIRvDP/JigUtMv0gvEBBbm1eMvckbY4pWSL+nZG65BuZ/QcfLUVSt3OuF7kRhPJfzWFBGT+E2QPT4GkZYEW4p1b2qHEHBjTCAvJNmksGW23oXuT5tPnPHbitRDevgWHUDGbMTGj5GcZmasxo8tetfq6GU94qG+s+ZMg7ArzjghMIUR2sa70ffmPvSkMvYMv2dteoZDP93NeobdE6pm1RH/3hunP0HgXSejexGapBDWXEr3YMFbPU630JhSx20817i80LPTnORaqXXCWHkBOoBgvNAD6OdiEraZlmYbHpJdZZCDKDH+sd6Ev92oqfhvHuXc11lsE1bo61/idnvjlD+hhPoVnBohhw7UwxxHLV1Cw1E3xiTkynUEJM9QtGgGQQdS39pp74ntzYLNmLJ4HVndeHZoyzh2u5u701IiaZPavD4n+ZFtq4lXl24In+e86+XKJ7cHDUdbxz4AIYC1urCED+vtuajp3k7/zksBKY+yE9Abbb3j6Pg9fW4eGG6txzoeECnlTPU983eZNseizC0p2ldrMuZu3v7tglvPyHL2HuOjSLJ5gKV4DnBO12WrfZK5miqbedLz67h7fisJSoOg4gqHofkwyz67RK4l61YzM3v0Z2uwNTlxCJtTEi8iEmrika1JwTo2ogWuUFJx3EY3XsxfReD3bgsZrzkXnwHhKLN94ei3drGRIGMVHy6byhyk17mZlW70TK6uNPySbFTduKJsV92xE26ybhWezPuwcrs2aG1vaZn0ntmeSDB8Peu7Mq7lHSE3EhrF/DYraGEsUtSu2JEWtOp4oalVVoqhVxxNFbexRkqI22kRRG5sSRW1sRBS1sS8oKqkCN69C1o5y9Q6DeozeWXofLjmHiiqDW6rJqq96X3ucV61pEr1pxh6iozp2FC6VCQQnVTt2scxf5WKZP+/KMLPSW2UO88qwq8TBF/QLX8my6gQnDSGOnNSMOHLSEOLI56qV5MjnmxFHznuROHLeM8SRzzUjjjzwajn36s3UiwP5q/QkC9t1PMkCmeH2Cf4sjW3Ru1aYX5w/8Xo9x+OV34THK4Y4dr3eEV+vV8ElTH/69XqHfgPTH71eT12eFnsD6ezeScEv+pBWSlz9RyYfD84eMn4qykDbbHZSA5+puci5Tsckei4xG3kUeCcQtJ1j/HOMf/4z/DPfIQYKx4f3/mTk/9oo5faEAY3CXS4NV7fDVe1wp5WX7wncnvBGuJVb+yy3j+32tN3Tf3DcFoFk91wUOXC8LjLv0nAHO9zEDr+EIndwkcfPcq+y3ets9ylVJP/vKJIa974qU1j90vAddnisXZgQKbP9LHeF7X5guxtVmbveTo2PzzXedC/Pn+9eHlsw3L2ceO7TEPXlyWxC3psI1oXMMwiFj2Y7dkcpLsGrrbipaAGy/YDY5Xi3P9txqxNmpoVASs+GzKfcOs9KcXW284oUryPb+ZRNDEFwK+dR4fkhq6UUZ4TMcJ/As0QYVFDKe6kxntY6G1X/hODabCsCWsBtdqAzgZqDemdnO+GqUlyEtAwU7GLDu8/JdtpLeSnevk21k0f3FWVsbIdBv6eh4Jn0upsG3wJc3LmJ1BEilHeQ4wEC0b3Edk+U4uaQ+YkUn2XDCTgDaXcgqE2Za1IvHswG972A8l/g/VQ0S+hz6wSS7QVGfh+3R6yMudoSMn6ghZUrmY3tpRTIYgssi2XVohC5PrGhUOA+uzA2fKF9S/xcXA1FGettpZSkJtlSnIjHKggisTqoIQ5ZaoZCBMYJ2Tk2x8lNy855gly0UEiFk4ldKPHGQHGrRPtCKfdl51xLr0LYY6bC90MDCc+LQ6GHAyPz185PJM4DVDHZOZeRLEKV32bnZHnhXqQ14ObSCe7UuGWJ9t8lCIQ6QoHfTcKC2+LAu+4ZxrpX8z91z4ldOyfl9oKliW6sm3PrNBI1X6Lqd4CPrxFsz86+lZg1O0eFV5L4DIX62oHCqxLcKdKIRbtzUfey0EAp+uLxOgSR2GlIvT40kEAbyVjJQL2fN6G3AwHZG6HQh144bytVciqGYDKyynnokczGi6+pgFzCwCGIxN5F6lQEX6Biqj3w6v24fTU7Z9sCKdoBhjQEDQFIOwTds3O2kqrAy8HUzlYCqivKfgegWqPSPKRFYicgddnWgRC4DNhkJG1BMIn6LV9A+iN4jMQuD4XCF4QnShkThfVaCuvhTm5ycBejvlb4BTfZfSHxZfugQyDl75knSXng+kH3kT67mRjp17HfkAs+GodMe7yyKZwc/qqwT2Il4xII/vK/OjSBisdm/EepcS+7NWoVnOKmd3KbBTdKo4Ul3CokHd7OznmJ9KMlZkLmofrvOfy5Sc4D1t3W3TQa6N4e9ZJQcgtpLLzZuTX0IvO4CkmR4+2+raHPbbcfdeoxcGYLdOAapA4lOCJR0vBIviU7m3Ley1x9I8D+FEmXoRevhUKbpPzEw53My87J6UuiCC/aAGbRGNFTQqHnSHFS5cEdr+fOkaIjD7PJVZ7LQgR4NVHF2lDobS98qUnO/NOoR7MpY1vIa9UkBHgoOrYhNLAD9RXR6dRI9oM0uKei4c4h6j7J9YHcuhQnUbW53NDz3LD9HgHQtknOXYyE67ywLihpLVMWNWKT2vgqFDqXjJbsnEEqJGg2A5qpaJP6H3js1ngtmw00XAWB2DrwCQohbBEqeSkEuhrgrj/BaBiBij4Mhd5jag7QuAOZlLMWKs/lMV1O+btBvdKbFRjCD7Nz+nnhG9nZZD7i7RzKFhhG+fO2hmYqsgkkz77T/cGtZ+T/4LaOzf8hNW5KStF5hfcl5uceqJtSVLu4rh2ul7/FtsM/uOm2TVmvo7BemMIDdeOT8zdHFXe7uNVjC5qmxl9ZbsEuFJ9GSt92p+1GHc0oeJKMm/jwk+EuB+omhluHr1ZtJ9+xLTXudre1UTDKbRRLzgA01p2sCFeFQq/SiAJJKZa4zh5JvfkBUiAfHfw1O2e8F+bj7c+WsMdQlnVAPfFrBvOulP8KhZYSoQPhZ+O5AOndGN+zGfcPgrRbhkL7YZPkBNQfZSaOO04PzXpWiFJ0QcvEcGu8kBmgdZOcwWQIhkIXM62zgIIpQEC9mJ0zn0x5PNfIziErqSZG6HGUqkVt7XB75B9vx2fZ/wCNhKaxRlQhLnzUuhI69u+BT9zz784iYfxTKDSGpC9JP1aycj+CfDQbie0BnIV43A06KOxmh28uHE2Fi5FayMYFcFZoiUc546M6O78NozTnPAA44kOhh8iK4CoxOrHZOY96YRWyPMhEorfJ1NA39u47fx3m9uv6PVnbzDQXE0MoQUguASMEcK9B3W/i0Yv1IYkMVlvKNP4Fl92IalPQLCgh4FFKrfwit/pDbiNIxf85aokP7nAnhS93q7uXz0g4VLKJD248XMoJ7rjC7R+uHu4fnp7wJ5IQib5SVPRHiShwECr635Q3pOKuIZ90dJU6MuYG8m1l8u+7H3FTZXHITXM7kIca+OpPkUZSflZ9Amn15slSxu29T4phm/Y+Fk6V4p0lrWn8hpACvPfC92XxN3Pb/v8QWh65tRidR/7haS1SpCg4ZRv5fVm3k7Vw569PUi0LyBLpeNc6cmNvxJmpO5pN++NAfBm3Cstbp/ckIKpdR3q/9xopmtR9n+zxAwmvyLiP0/dR0+dlEspfff5z3vu/7MEO4fNl8Wt3r/lzlASZ8lX3UTjkrd7ELD/GkpV58zNSbvs4gXg2cN5EWTT7uziC4uf6taVIaE9WzZ4tlD029XliPzv2UNly86yGUhxfuz+h5+e2UjRvPIfIr/N51Mabb1eXcnDrwS5WxtoeWC3FI6020CjUeZSKFX1xMll9L15PfdtTk4z5DX0q4NsjYFtyUBLPIxO0O/nQX5x0Ejnxo/qSV9WKXKGUmZOJSUfdHZZGcHGaFNWaLTpqDFnwek8anGTqfP7FTamnJ71G/ttPtainZ15FaOk6iAz4Ic9/TpJwzg7y6k58ezpVJ99pR23XPgOxloidgtgZiJ14EFWVfMfagvt25Y9/0djk9s//h9s3Vsb2IWzVJAq8IBT6SYpGTXLcGNslXzR1OFu/PdgWV2ErNn5P5n1w69CJ3xBA2kKMjCSP8zO8+AnBR+yRZec8LUUfbd0rd0I0IfctoP7I/M/OXkuWfXbOCjUOKmgNR7Ihgk7svyGIxHojoTaCi/F4HMmGzBfjw9cSVD3R6utofxCC0XjshdilCMgCD19JuWqzXGBgWoBRR7JPRf5ejP93w9aBl2DaCDriHg6v2zrwTYUlGpknLZF/T8q5SWURWnBr/gFKIG/MEoX3/AfwWqPadnLyPiJqrjF2IhGyvJxi37UhFmo8gmROwRMjpOxo7Gcdc0XTnVLMbXk2sZr4NUjBL9sRu4qCPVmIvUDBz4OOdGikPG/mNhsu9R7qVg8SLTdUJ0Z78uF2AVk8rzhdiodbN2Nl82NaVynnysFU5OqpW6UcmnoR6aTz/kUjK9pSDY2+PemIRi45NW6Z29Rwf3Prxh4gX6lvStGjCeybX0XMCRnxOYLfsnNGe+FOiMp/orEt2qkMLLob+w5CoQ/Ik0VfmwGKVACVgiASY1OGHU+404H8PnbhGanh9m5dO/+c1PjO8QqcWu4St/qlbt2go0AqfModSQbeyPBxRx20OqOuJWrY2YLMI4ippLPvIRbs0Juk1gPraCx+uPoRsmNfdH9LDM4uD1LjP4IzKUNvnSiLirZfKot3dSeKvfm0BUwtPzd4kZi605tSdvryEln08ts9CV4plvTeIWMaLPpOGg2WN5Dyb/1PALHLQF2SicOe+UyK7d+vljHzrmlI8vDt1Pgqb9dyq7gt8ge7p4XpP7ir4PyfSOJ+rCfP+4MJHWhzk6ccEL7TxHl+SO6QXCl3Ado+PKE8mKfIW4dMUg1tQ9ZzUrQPmSokUxBT1s0R0ONiKSZgznkenkNA3oqtKs+VAfUHJqIMq5s4qs2ATeroR5RZB1g82AI3FaxMuW0k0OxkYDrCvIoBBa9S3lVNqP5WlhhCYGU7KtQgd2iClZEuDHjbkDnrjaVSnJ7tqJAKIQiios7cqws57Ej1kaI3X8YEixMI/qIilBN9WIcqpZOtQYbZbZ4PgeVg7skJFF7bPyVn2LtSvpvtfAMpbWK6jRJXM6xYMliPx8+ynWEk6FaGzFGY0EalOYz1GYDndOBlCbqAJQr5NpqPxK5oQrV8BWTexF0by3AP3Wph5pvS+6CKbiH+mrr/QPIMiLqISvzL1gsL36OFcy1BwrNLyFShlItQ87nAwt+ynS8h5MzXIf6o+saonlcqTkX1v4B8nfeo2ZC5yf6Equ2HancgQw9URXha7YXZ2dYLvFRCnbS5q8+ija9CZncgxlEh2SxA8yuUIZ2yvIwG6+I1L9i0DJl9A8mDl+bf+13BhHeMtaSO7ncHx8oYm1SVm3IeaaQcKh5zETlWHd0q6AGxWAfUyPO68kFWitO3hq7odFans4jGLBGuYodPoZdT2J8CO8/GskZ36KHFeBeJDYJ1sw0y5VaWualsn6VlZ0+W4pTsnCcC7IplkWVXD9lbgtNPg1h4Lp7V3cUkNADLGwi2Zue080KeH14GM5LV+ps8y7cRUuWt7JxrpFyIt1+GQleMJQM8FBqHGbecuwNTryFxczPWPcTg7OxZrCyfc+u8rmZJxTkILgEkVyKgxM/BB7gFMhR6iRW0CmfutXki3HYbXiPF/ZYg3P3/QvPuWyZTdPkdZFWseoAqd/LIu0m5S8pP3mtIKiG23Z1SrOn8NASu8eyEZ6W8YsAieCQTyNgs/ltLCu6jssWTScIW37OBginxhz9CpKbrEQpPnEON9tq9jTjzBnLBOr85h9RUq4/IfBna9R4p73SSWaJXrb9Iiqtu6EIVxVx4AQX3E0vE9D2RgoeJJWLO+YECe9UfH9//qLK7cl2RLK7Xco0s/qp1rJT3b+jAyu77DcsJ0pYETLeWfWTRyg0HWNl9cPc0GTPh+K3SqPLg9VLctqspo6ZZTRqUuePJc1r0sy1jUh/4Mj75wJO183em1E+Kfeo0Wa3K89WS3KZJ2555fPLkqTOeeDy3WrW1VV954qlpj3+WlfXkO29Uq14/KUFWq5Uq2gdF0xhhiAvE00bAsIyvYzrE3h87M25M3ML42+NfTQgmvJ3YIfGRxLzAiYErAwurdKtyVVKNpKVJ+dVvSk5PviP5wxp/rxlb8+ya59VqWuuK4D+Dv9RuVfu62qNS3q5z6fG9ZcxTlkgk1wlY3e8QNgKOmFB/ZMIE9ShdU7BfmSaLrkdO9jFFVVNkTq2/IGEqR6dw+bSqmePt8ZnkdRZZIjNSfIKdaetiauXWogJyB9pqjsq/RUpDxL6gQJxhisCEqfFVW+JSGXo5Hy+boq6PUGSmg723qEjUMMWsqRx369j7TyE6RSVzkXQy8uchf01WjSY2NqzmEN4wEZSjIOHnQNXMMdTfLy1B4adI+cb0YPrEFEul3ISq0k3RyI0hPYjEBpYC2CW1PgpVirHIzpMdo5DWFTGsNiu4GcHUaXs04YhImWAZH6ga+Si4Oteqvu2k7jQ59JO0tjpvyXebq3P2uNWcT4xWPfyvjFf6dbaqlR3VPEtC95883WR49b1fX6DxKujInrOF3orM33mPA+icT8Xwjg/Aqlt1cbT0IGdXIzG+3f19nLblI7fb0rFtiAvzAQE+kfsF32vP37viD1fyJ6B4t/Qu4ehWuDRv2AFgcjvK8SCoQTl630mrqk46RJ1C0bdjryd+8m+XxM3ZSXxhsvqGeF99T89i3kFUX+8M/zXLUV/gHKsxVJhh4R6cm/S+d330agFfUjLAP6zB+7T01Si4ZqdnhpW72PsoES7xWJxoq5NKarsTjnDoxvn0fxLf3uydYdEHpb7Rx4f0xRE65qgzIVX1sax63vUq+jZodYpkvdisz4n09E728GXcVfXRlE3+JvVD3wVvlTpT4Rz+Dngrege8Fb0D3vR2wGOYK9wBX1Ufm7oly0rUh770gUR8ZRYX5jEH/5YucvW1M7i+ZbjeGEcUSzVEnQhDs+pwnaJEdf/OQH3djfflivb+fY2pGrE2D1Rgp979zoO2LMOsX1Wf1NRnNssyW4VnNk3/zKZzaGc28Vaf2TQP+cym+oBgluOdMq3KZ8b08Ogjiep0ialrL+dIYsnjiKZ/HNHxiaHCw4Fa5Fb1jwY6FR4NNP2jgTiR+FkterlxBQXbceXE2nVAGj7FtnKDAG1/exNBNLsfNBg+LTH2Cco0ZP+/FSJ847c0RLOtCET4+pqC6DPLg+gX88+BqI4P0bMRiP5ylFm1JGkysUWOE/8VIT4YwEd2S4Tj3xIhSt4ScTQV5hHfbAnr5VBO1PwHdjnzAI+F/vqOD2NWdB1moMRmZ9PyNjtf7fz3bXYW/xM3Zf6Z5ouImC/OHzdfog/wWb75YpU2X5wKzReztPliljFfLN98sUqZL1o6lDJfrMhZ+TLmi/DNFwtYznzNqeAYBMhNiYeZTlp5H1iy/ugRojNwZ82M85H8mJBGwz30eP19MDWGOGU/o1TittvSn1EqdZQh+rZby7/t1inntltRKQ9bh8PDWU4UD5tHmYcjBxYGOT4PW8zDkO5HeGThF6ccLnYq5GKogvodrD9wQK5q+b6a95UM9oPguQ7X2Ma5uXj9VYI1+koQpWH1Z4Ea6JsCZujLBYj1ZqjLpxbze761DK4QCuWGNM985529V1XxzWpfZnmcqzyxJP4OxUD+xB3uXwj3SdP3PKziTxyxYdbAu8JCAbZFOYJaULF6Qwx4aj2X3m6/jdKbToa2vx2o/2dds4LT91W92726O0f/m/BWObd7mZHbvazI7V5mObd7WYd6q0Y5t3t5wY/qc8CmniLQt3tVesvGkX8T3vJv91IIxsyKNwcj/DkY0O8VPSD0G4ac6OuySvueTpTwNivyPU3vugUtvCsig0DFdECG5+Jcl2c0+mqW0CQNmc17blic8B0hLGzgRKjrM+r53yRTd+34d/ZqW5gghl38iPfNQv2x1RUqcDS3kpYYPpyHOKQ/NwTxFh99NYX3QTLNkY1wD6eee2mADybCdOavfoL10+yx6oMfRb2yLPcm6FG+BQQupboeZIt/J84qvvGUXfDbuM2m+ruS1PB62JBQ+bp2dZdLmvf1Lu8LjTAH4pUBoRlWj3T9qvOpm6FQFkllHBKQ83mV4zk+n7Jk68DhvCNquLdDCgHvjVqSnWM3ooyvbg2tJOxk5+zzwl1Y3biBVzduokxfTn131uLAQt4uTmjHVDnvFh+OOfs4XprUW69Ec0y/PxYKgcw+0NskqFZMz2PvHzZk294JgBWYluf9edtR7wDkjMR+apKzk6oehjaSyILFBkTsqVc75jsiiMTORlUneVsKUa4n6t3ig7QAJwv8KClUJE9mbPE2BWyOf5TPVDwy9JGhJJuQ83tgCYeMZIEf/IwETFfL3dja4/UxUPX/AEFMCcd4nGNgZGBg4AFiMQY5BiYGRiAMBmIWoAgTEDNCMAAOcwCiAAB4nF3MMUsDQRAF4He3m0tyHGIUI3aWaYL4A7IqBDGNbBk7ORUs7NRSRFPaaCnYWCoWgQieaOtvsBXsg51wsvscZEGRx8ebHYaNN4GKAfQyoO6A+EksiFsxL/u90GehT35bXf55X/27Cx1d40jtyrwFE33BxNswqom2XoLRfdrKiLlac161WcTP8ucNj/UUD+ZOaWe6tI0GbfZKW3ukTXeY1xzz6idt8uJ8/cGVmXflZM+V0xfOVz+cT8ZCA+k9MDEG6kPpPpDJnOyzSJssojcOVMKBXhfAongXnWBDzOpzAayErKKL1k8O0ZG0vgG6WlD9AAAAAAAAAQAAAADVo96MAAAAANBnMXoAAAAA2cM6pw==
+    src: url(data:application/x-font-woff;charset=utf-8;base64,d09GRk9UVE8AAFzEAAsAAAABDZAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRkYgAAADRAAAWFAAAQbdB3wsRkZGVE0AAFyoAAAAHAAAAByKZo9eR0RFRgAAW5QAAAAiAAAAJgAnAHdPUy8yAAABaAAAAEgAAABgj3RmfmNtYXAAAAKcAAAAkQAAAcq8C4kRaGVhZAAAAQgAAAA1AAAANiV5JiBoaGVhAAABQAAAACAAAAAkH8MXJWhtdHgAAFu4AAAA7wAAASzHM+vMbWF4cAAAAWAAAAAGAAAABgBRUABuYW1lAAABsAAAAOwAAAHUU3fPU3Bvc3QAAAMwAAAAEwAAACD/0ABmeJxjYGRgYADie6rq5vH8Nl8ZuDkYQOBCumEViL5ntGDa319/7kkeEzIFcjkYmECiADVwDD8AAAB4nGNgZGBgS/uXxjhLsunvr3/fJY8xAEVQgCsAv4oIGQAAUAAAUQAAeJxjYGEzZ5zAwMrAwWrMOouBgVEeQjNfZ0hhEmBgYGVjQAICSOyANNcUhgNquW8OsKX9S2OcxcnNtAQozAhXoACEjAAb9AveeJyNkD0KwkAQhd/GqIhgmUKb7bRJ2A1CwMbOWkTsLZYQkCzEH7yGF/EAHsMDeAxrX8wIFhYGMvvN7pe3QwAMcIXC5wmEFfoYCQfoIhNuYYKLcEjnLtwmP4U76KshTRX2JLVhhYjUcMB7x8ItLDEXDunchNvkh3AHkQrqqA0cKnicULCu2Z1x4Lar/Knwa3dms+JujiN22NLFyuXH3Zaw4Bcl7XqtaDhopEhguM74/s5uzix/QcxqWFNWiykDfXlY+Cp3Ok2MnumvKdjZLLYmTo2d/jd24+zfRvm+sh6tdvaFL7VNzF85L55jRrh4nGNgYGBmgGAZBkYGEDgC5DGC+SwMK4C0GoMCkMWmlv/A8+Hlh1cfXn948+Hth3cf3n/48OHjh08fPn+U8tT2adCrpDcH/v8HKs994PrwAlZ1CU8Vnga8CgCpuzlFfr+cpZyFnLmcmZypnImcsZyRnKGcgZy+7HapP1KvRN8KT4C6hwjAyMZAvOJhCgD4+UctAAAAeJxjYGYAg/9nGdIYsAAAMy4CNgB4nO1dB3hUxfafm2STJYFQliBoTFBBEBCBSBXk0hQp+kAXRVDBElDBggpGUS+WiF588BTEoHQUSRRUUFFUblCKGBAEBEERC0UsVN2ETTL/8zszd3fTANGn7/0f337f7Ny5U86cOXXaNURMjDAMo3K/m0bcPvLm26+46d67hRElDNE3/1aRP8zIHx6Vf1t0fu2Y+pWjD1SOSYkXMWMbptp2KFI5rvD5oreT66xMrtHKc7oQ0elVKRSiGoUxcdURb0fBz7KGuAL1ekVVUUucLuqJxqKFaCtMcbG4VPjFQHGDuEXcKe4VD4lM8ZSYKJ4Xs8Q88Zp4W3wglos8sUFsFd+IPWKf+E0UGTFGglHDqGPUNRoYTY2WRnuji9HD6GNcZVxnpBvDjbuN+42HjSeMCcZkY5rxovGKsdB418g1VhmfGp8bXxnfGz8aB42CKBEVF5UYlRSVHHVWVKOo5lGt6Ncpqtc9t93colWrruqvm/q7iP66NTu/pfprpf5aq7826q8t/pp3bab+mqu/FuovTf21VH+t1Z8u0Fn9dVV/3FDzbqp4N1WumyrXjcu1aNVM/TVXfy3UX5r6Ox9/LVs0U3/N1V8L9Zem/nSWluqvlfprrf7aqL+26q+T+uus/rqov67qr5v6Y3Bbpqn20lR7aaq9NNVemmovTbWXptpLU+2lqfbSVHtpqr001V6aai9NtddStdBStdCSW+ikEjupxE5uYpr6O1/9tVR/rdRfa/XXRv21VX+d1F9n9ddF/XVVf93UH3ezk8J8J4X5TgrzXbo0a960WdPWEUwUyU9CGI8bY4kWnzRsY5zxlPFPYzzR5b+Mp41njInGJONZotHnjCxjivG88YIxleh1ujHDmGnMMmYbc4h2XzLmGi8b84xsI4fo+FVjvrHAeM143XiDaHqR8abxlvG2sdh4h+h7ifGe8b7xgbHUcIjWlxkfGh8Zy40Vxkqi+4+N1cYnRp6xxlhLPLDOWG98ZmwwNhqbjM9FH7DmmeIKcb+YGTsx4beqd/suqXlzrddrn1Jn2KlTTzOSZ6Rec+Zz9Z8754rzarYc235Th+YdbujwZIfXLnzPfLnzrm6LerzSq0Hv53qv/0filaOv+eD6jUMn3HbjXddk+B789dFqTx54Zt/0Z+fHvt7+jTvekIuufC/hfXvpVx/evuKu1feuzlm9/ZPqeaPWPLD20Lrxn+3eUG/DfZvmbN67tf9X/u0v7ei3Y+c347+9aWfLXS/sGf1DX/vAkcoHjAMH8gsPRB+oVbDqyJaiVbEHikckHamcX1hcOS6x0JLRF1hCit6WMKS40BLvS8NAwhJLREtxB0Wju1kiqW58oMuYpDPiEwv3cLbFgeVSNOI8FyL7QMpzZvxiGXyOImdRtocCF3KGQF+dz3ia8sVE0+t68cG+Rf6k+vGJBZul3HEbFW/+ginlz786UkxOcqQcuteU4mw/xb7IplitcY6M7nktvT23DqX9uIjSavZ0asjotldYUswaSIVfzKPX/6xmSSP5DHo96lGqNWewGzutqq5GxH5EjxM3mr4a+6XRmNqJbjHBSZKy6ANLysPvUBB8gNugWO+tjix64HLTI+W7tamNTQ0oMe9MCt7ebKZI+cNdZpyvEdVzTaYVK8W+OMuWYs35BNJNGRTcXEiNPv0MBe1mUnD57RSc/g+CYVDApIzDOlheKY5cKtBfAmp0rCWL12+0Uny19svieR0s7inV2+Ulih68l2psOFkAPiotP/6GSkdVucWUxcW/iCTfmVTmo14EeX/qvmz2JKWv+CeAdL4UlH17E2q3RryJ4lTRGRtMajvmYYrWXkttrz5kyqgt11geKao87mhUnbGB3kR1wlD0EzblX/U6pV55kGB4rhvV1LKyk+rz7pdRR5o50mg2jNAo7jJ0d+WbkwiYWxtbqVyb7fHF7JeiVQrlrHwV9efbBabtQQ8p1+4WAqPPvaTY/tboICGXQ6HGTO5uTo1XXeV4fWP3S/n9fnpKuIiKbL5ZoCcOo8TGSKG/K2cIroIGraEIjRyPoaMoDSihjNmXoRAGVVc31AFOTECosaPS6tW0VGkiVkpb96KpcEXgCh3jMeJaiJC8GGyuxgTmLQ0zKFGl1expRfZj24/o72e7AA4qV0Ay4Nt+tNQIcnZ6dBRMKovq9oen6+K6Yh7wRltMhV3VD4YUQyt/C3IaAQly0q8L2quY7dJH7IcO2NBycQWwij8FQZ9W1aIRrbZf0wcIi3JT25U8pg74BceYohIu4kdqturHaIHBOPwOI9YB+7ko/u0IDbFFNad9ZSo+VJIAvMnQeX216W2bQail0Ra3TYJYky0AZhxwfeoFsx1n5iyNtgiWIBAo4Nl2MxGeN0BgDE2Nt+/3W6GYCxzTSftvLU0dnLb2BhfTXJa6p8eBiN2rKTj1aRHqLXifGIrwe+lPlNDpJldA0GOKr9N+WfQssXDhtJpWkuJ4gl4jAQ2m2po+ebiIIfS4AgsKAmZzYiKFbxAJMa+iH4hTBp3GUqRyqEmS+0jiNUVGP/KBU4sBjcRqw8kUO+9qJ5KMmZeYEL/IdsmUYqmKFijKlVuaBKly25t4BBi7kR67N3QUh1Ys8nsTE/OoHUPkK3E79QtHRmXMZSqxNDlO6Ct8NXZwdTGuvN7hyutDT2IoPjqPqh7yLlV124MOl/j98npHCXnNdMQclvovhwk6LBVCMUexF0aMOOvn34gejqWDMOBKEfFYsiIiKUuDy0iJOvWgSKK6no3WOlK+nGhCPlLwXn8t2uT89SwyKG05KVS58AqHqdULvCiZnXcmBa9McJTIBZbtP0+LsBKxtRZ5NgaVtr5UeH2P7pBR7xNqi3YmiiQGSwtxRWlMSsTySiCqGEtbxbmDAqgZ1Kn0OxMrEwBTMaexMGCw+C0LCOJ+xZsMj6qg225LMyVaYY0lWqUKpAndmxvamFCHlMmGmLK0mIJUUdRLPdW6oka8YEzb6BPoh2jTVirEqLNDuGqO1RWPKiGaS3l8tWlA5n/GAtMdfcajIiOOEeODtUkFxko5vRKwOdvWWoXZQ+m8lxMFFIQD6qG3b3/ukgATCNMRZ+bxpgpstzJkV6qNwQIzMNmwXOAqlEnCA8U2HPWBB1MNEdNLx7McLY7IkLGZ3Sm0xjpKBigzidjOqy1AohqPJsAXVlIws4fQBHz92RZJ/047ZNGGGIW6JC3ueQz/MgkZ02Q7JGS4ZaZ+GvRUV7Exe/DYM6czCmHguDGX+4nvbWZWWytz5nFQNoOsAggQeiHc7CxN2eIhm0FpBwUcETZJ2GA3zV9G9OX0+qXt9Obh1ULFDKOGovYalGleXapz7GjBsk09ikXplsK7WPwDPc6ZakK88lhYXIXvN4tFJ2MhiUnB7TVzAcs3wqJXo57IyxNO1aYGY4AkO9gIvMBcpHDJjxDockompXU/x4S5qYbCNXHk/laOEgo0VBT7YIoDPWxpRnrzWaHkoK1eKWpwvjS1bCZbSTE2kRW97dOU0yylAQCwVxYvSyBbpxKJQnF1GjVrNG1MrsUm4kttj8MishHX4lhJNLYKIS0U97Mlxr2G+aPww+OuuJ7ITBmsIYnuMJ8Skf9quUYXq0hGGpMuixuWANwVtorZRKPCIGJYI8p+ZHUMVasUJfcSAp46JJS2FBnLTR1k9XNAvLBIlEfW4xZLowyyUBk+bJG9vVkPF0kKh2WmVxqXtCPSOni1Kz6KV31K2Gv+Dhh56F4LQpVeDbje5JjNbXq1mmW5DDRCgKT48jWURY+eQopAdZIxyCIn3DtGGGs0fmQjjM0xNswIvhQt3rl+ZlWqK9W3n1TUpQSdUf9skh7sHSjrjFUMkyGczAjm5jQWc4wYtvQI2SkhNJvqDeRhauJvtrIcjHdgABDtSOMDWNiEWUN7g7uiqML3b7W0AfjWXAe+oxMtY97dZ7JPl6RKytvnm3G2Hjom1fdvdbT3wGOBIVZjwTEGLSwTmHJg5SrpwEKPyzIzMtHW7Glq6R3VydLkS3qTxualr6nN130mHEoRp1VKQXtL2cXsNag0iDpllUDUKaOF2dMlQq9WNsyarI+oKx5dGt6bikHDMImr3Oy7oc+qASUiySyg2oYPczRNA53Qq7FaN5Gi82j/DG6wsjGnV6KY9YSpOE0JJaUZPja1+8NoKFoKm5zZWBllA65XQwQ+nzMVUgyDoqwaHjmOQe0p1cMBG4wcY7pxH73aFGHrwrU4PNoJAa8p36hVCjQkkSx1M+l+RUBEpV03WUxG1M9eOcjR/RyhnHClUDBOKqZH0IGcRB+Iqr2sTONk8ZFblUCgCjtPBM4w5uyvkDZRHbMZYi+TXJxrTD3raCNPmVURBpaje8XGFHeaHQbQoXoRTuMs0BVeTACYsmj3ZeTfKH03ZrEWjvLuZqAM2M6KfNiMZS4H4Sqm336u0MKNg5Av72Wei1PYKL7Ig35SDls5zIr8mei112bBk9P1QeFQ36990/Eq/tXuINjU9pwAUy9pRLG9j4nymRrPQhZfDb+uBKPJ4oFEG0UHnxXlkTmNYUcy+4zZkDYudTJtSuNFEntoJa5cwmGAYmXxr3scWdzpYUeRgH5FUMeWGBTiBEYglyfqR7c9JfDKhRkZKJwYeCRwOxG8KfIHSNHSYeOiq0Nv2yHobgk78Kg0Vpn0cBCzhVGWSubMUlziCN9uXWKuQ/VHPWuB/OIoh8xHNi+9kocsQUL3OxPG7iH3lQyYKpYqi25GKVWAimZKURklRLJDJRDn5AkcpvoCUjxiilpnx0vjG6oi6gaTGi7+HFV2N0WwupTpqHk4gHrIEsHTAtulcSue7rFUEmlNPE5zRPCfgcpSNgMQ0kePdZPmEKeiu5c7YhL3DIavifA+qut8IspRlDaa/g+ilSJL9W8MiUl0dTsSv0BAj6NHZUq513Gz/UDoHAV70VSYHDWBOPxzQEJdHDqdlBHi1OnRqtMqYw2NQSmqW+Rv7dNFgH+5zRGfE2QXM3zVQwOEIohNIQdTULy4IY0N4Qt9rxUxRmPKjM8YPUDljw0BlTkpclwm6TFJJIjfNEVgsBSFFv0ZBE5nUxy5gpwIR0QfWSxjKtMojdJI24dGf2Gkz+ba1yPha8IIQ5EiC3Ms0MovAOU7IKED9TBVisEMOXWU2qtmCp2DA67TrZhq6MwV4xVyjtbooWDKFP5L+ZxqSkXdFMwjGUpJBd9Qt84A8k5DlXk00Kmt3Fqq0LhM19VQ13UtMvp9FyY9Si5cBEMKRYvrgC/QARKqbtXoSIqMyiE87lg2XMqNpkhtQg0tN8UVI1qlyKJrmVdmo9LVppgvRTOHsBxsLY0EFCeG1VxJMSD7ABI+xiuKRSvGiG5XgjGkfAwx5o1bUdQCsu6jUSP2uI3+4lRSiDekjHGZRnPIKYjeg1qBLs0ofRFLQEyRYZhZ2hKt3080P5rpX4VjyjLKagwPmIOYZQ8SCs3SzBLtKGbZpplFyq1oNQkZiWnmjJ6ixp6HejrjUyEJRMViSsk1e7qtuSPOZajEwoZSfIenASQFz+GhMbQUjGrjKNqLDtzHmZKk8agjtgU+JQFOAyLjBGBZRrkKxpugN2bNemiYhpIAWezAzy9+nkRLVHAuD0Gw+j5OD9RKVVxsPMMUwsKJmOZzKU4F+M0Y6MYUzhk1hbs5SVNYrOYhlkKf4uFTLXBIFSGYaLnBYjy+jdhOR1O0G35vEd6Yl71h9lacDxTZU2yFQhV0RjDbEXsJYW0LNFYKRMG4pMhOAwTFCu9zx2UUUlsioSv1fGCwMuNX9b86xEURSiwl6rsyAptxiS8XaPKSC/UQSOMOxPqYwjdDRi02RXKlmUkacLBsiFCY+dD2IStS39ijUn2DZEEPq+QwHQXibqirHYHtAk14jAD6PYeB9vRl/r/SFUTiGUuNvk6rjFgtl0zEKY5oQsjPsjAEr5taaMhXTJclqL+ZY2wF8hh7hAZuX4jwucOQ8qxTIL9tfra9GLDKIWak2JwwmUtxjqlY2+a1Qe8UV6Z/gapmQ2grASFyTBDENETHAiAAKcY7QnMf0YA3cWXJ4YGxYDzsCgP5nqWMBF81GdObUj2vEoHbE2ytnaJcVa7BZcjuJqkRqOz1DbIZWzZjKpPjo6R41NJErtTeCDRKcuZM7kswSglypT4/JTkyXQkShaZDwM3w5IILY0uxp0atYx7XuEuxGsBGDn1Md/C8uFUPS6DyDWrdleWkaGoqxOpmZkEs6nFfia4hHKOoAkOZSekFNDyZ9ogpTEmT9AjHhcaaiRvCEWmYgKnMiKriaDsrPOaTOAxE2Xu9jF/4ojw0P6CeS0ODSRLba0/Q1cey4KZyXo2+j0nSZ0LGkAkzRolvAvtwBIFymp2pgWT8N3NcqQttpzDuouKwlPNCz/yG1IzX5wIQZbm0zKFXE0kVtsSURVgdPA1RaR9WEg72RRMtAUiuTeeRtdWoqrEvZah5E98vh3gfN7U1O0jGWJZIjnk3KVMjioZim+7bxboikDKwNaE0UUeFiLoRgju4K4B2ju5iLT2YczT3NXUlgKgfEiDUF+90pvTpO2wGIqS2UHS6HsX7UACGk2hjKrUsxUTkydJNS/mMKTRr0GiDwVVxqAKlOw+FJOUYTiYbK7CqrCL745xCOeMO6z6zQcHkx0Amazw0160QndgNbK3O2FEgCMZwqECNs0dMYnE/hd9jCKKd8MAopoBxOoXxPWESc8dee6e3lTR+BU0rFTE6M5KmWfONsTPtMiI2TNuNke17y8UM5DW4yztmksc3ozn1b65OCVO3Sx+wCgHNJDtQC7TLg0RqzaXdT0NYXsnaWVHxL0y/+3TvRnu5svw2SZmjxjCTjVGIVDYy8xssKkVLTBqkuxsEoqScCiNSAbw8TJkZgHSdfg721eTJoFOnh9tcMeGJWcgefWzW6UEJnlmwk9zRiHa0UNGcPWFC5fpl+OROx+WTMIewAjgeXjkKq2iMcmmWS4e0XBrFI+jVqpGQNIfNP3uHcqNszR7hKn5gwlY4ZRXE7DbZVOwGDDOv8VCGeU0X3slyKYLXRhCf/UYA/fl8Bo10DD6LVEqzmb6muUqpDL+NjrO57yX4LayN7FL8Nn2CHlXmNzaAvEwlcRHClLcsaYa6hI1Pjm4kqmkQ75vRMF6Rh/ESJZxDPv5kS8QorgOqPZrY65lu50oQe2g4ZoWGYzv8Upf6lMIKQB+OdER/jZquljgG7ZevOtgsfdT5H6B/rqIxDBZRN9R4PZdiUcP0bTajhgFwSx9DV3mPT1mVZZ7DC/9sMz6Cc8gRVmIUQvGe/yGeme4chWdc+jwBtpHGfY6IydQTNYSO4WO0s1NCby2MNPHZ/2DLegrqrqtlGTYlKt11v/M7ddcW8C4jlD0a5t37kL2PqWTuNt8/2PiT3qvYSFD4OqybH61ni5jeefKT5xGuZGB6mSLkt9SCA5Kpu8Wl1YxeuDR4QJW+yildmjgnc7r3qI2Hi/fhgmTYu0wHz+cXNZifWEpBB6PIrRrK4Hi0ycyDN96titE60Ktb5GkFbS0z/RRouZEiD133pzNdlzDTVdZzOhjNh9iIaj5deU0ljcGQ1+T11dVwKk+kkOlNxVnoEFdh4sR1LcIOM+edYEf6y5PmTJqknSgCl0xFXzV7ui6R5M6uZmrZrzwCNqbAjErg2pM8LifDTGQqhUNb15Xp7LidZmmnVtfN8o6F62mWG6tllR3p3i6ZeUurCKIWKV+lh+JkU+sd1278WVc+OownbepSzHXhMhk5mRO0SCF5MFybsCwDYd76ZjTRvMj2bdOQGHmBdYgrvaZMSeGH2EDlkHcGC1HJTqaY1TwpFrZwXchcC9eVFw+y/ILJmzlKw40hjZAXW11Ew+tjTDWQIt1yJQdLMabU2Q6zA6PL0vmR0NViz7Ok2GCad0WHBsCF6QFTw8ToHaPwpWD7jl0T5qgHTeFhi5vBYOnKlb/q0oSWXCzpmBE7umMeIbxG2FpYcnMkwDLJ9jceciqEYIdzwhAEr9TN83gzEnY6JZHAA1QRIoaXRkKg+nG1H5LdZdun3hAKItsereecWFbPd1z5/RBi4TknipFQiOlrimTP40l2KSeO3fUJduX6E6boSaew3TXH5llXxZuZmi95KjTZxTHeeH3/mKLXxmDisOhV08sRwqKM3RTWBOWKcq6pX1iU6/LlGXHlKAXXiHOBCtmBfxAgpZoiayoPoHNCAIWUXHkAHaVfv2gyuEJpqzg2Fr16Con661HmSRzeMDGxutI1MD54eqfY0WLPaw9XlJoqDxxy/myF1cyKVFiucwWFVcpKnOOEFFfmZSUVVqaN34jINb7Kmk4jpuIi6LbERF9ocpdUVMRcnxSDTOitlXERWkqbjaypepnabAzckZQ5yp1VqFg7ZJajGfSo1A9xa2OevmtyuIxmwLxeWDMw6K52cA1JUihnulMgPDpq+k4ph2WONh4rUBAwKEezPvFo8Iimb4jUCK4VebiBth4Z4Nl4dWtIKrBCWG26ohirZKUVgpZFtiuHlBjO1LJvjNJJSjGx0iHFtFDb1s14apJqJhDOD9X6KvSPzXJag+qqgTmcY4KSvCNC0z9K/OcnxfCszw62f8KNMupKNRqIOrEWR9sl1V1mhKIpt6daALiehGq4hMg/esPDla1WqqslUOw2zrquRI8jGw/1+ngaL8dXKA2E9vfL0zkPmCLSZ6iWHDP2SF5S+bZhGRVUYiqgxNRx2HKEViprOYa0U9hyHFNWO0XKXjYcK9ZQ00s7GVpklFUGO4+mCCI8nXnhGkorAd5PcTRFkFlKK1UIzNE00/SKa/GWqUZ5bsfTr/IBCnet4pqml9BvbUlTxAWqe4dzheUpNjWlV1K32SG9FnbGUpP3/+ZqNubFlSw7y9NqEYuukSot0Bf6LPpVXsFiuzms0wimh5gW3Sn5CC+MlRmmOUp5XzxFUMr74oWjCjwwnh6bYk8qvVrpJigvrKwPRt172RL5/cp4OmNG28ft4bAeWxjp4VhlPRzm4RfClMNgwVUs6+VUoMSO5uFAvI7mjBEKrDy3RtvRPEQ8WVZCmUW6NhHTMmwbHMOzKWvUl5qhYXG/Q5PY0IWRE0bTMMdQsY75FLtJQnZ9GIQIvVbCtSHdxlRzgXZhHmLucKeAjtFOeSL9WH5cRE9LKDfuLY3j0FKKrQQwFauYowFT2p9x3Tn2a99AEPLewvgtt6n+FeI2Qo+V4zpqV3p46c665gNvmuFp4qM2H/bcSnV20tFpLLGoszTuppqXGIHq0jgLu2qqy6hYh48NoZEuluimpuhU0NkU6/UmI563I/G2Xm+a4OA95Ec05e8+Dh1cI8WX4y2161QaCd9jP65T16whxbm5lLzqQgrqZlD9Pw6joDaOK60+ZPre4/cFRwgDHb+mtBcOQRz3/MiibmXiDEFWE+rnOy8KdaBIXjMbuzplh8aC68T+5okbTY9vIBnl31p6d++W+9A6nrEB10ONyFsbqwbVRlc56CrsNuV96f0mY/ts+kaht/KjbTF9Lm+dXraJmmydy01SDWhGbenduIheNGqHseYTtk0FNyOeTrXiEu8vWMfDUOPj9wPPBW7tj7C3b0vBPwvWJbHvgElKokOPuzgQ58rxofaYEsSriDlXc5Dy8TGvSWJiE6L8ZgUTwRuai7y+PfkZccukOI9Ies427L26VpNFkpq0v4Iru+AGr4weY4n+yQVvxQXu4FVRz3yehZunt+jxNNxpqHILC6CVO1jTz1vvtWVxIhGELpW3ciE3x/pdU1F3sgIXqv2z671jONHDnV6s149ZiLMzxQp2HVvELjZ62OWCKgsHkPc5fL2e7KAqmkDbr9BdL4lc355/C3pLIjdxoix6Cfuch6Zb0jicbgaEjHqW4mIy9kvPSieCuiuNuCB6Afbfk/4CLvtSCeODdBySbYrCg9PEgg1SNMiieIc000O2bjrBfe4U4B9B/Rb0JhlZk9cIN4bgdElBIlpJTeMTSUlZRN2/oq34NWIIdq4QMMWXU2rwqnScxcvHabmf1pgql9xHNcsDKHQgy31xWLgvCiS/5dM5i6gVOZlyRt0GGNBhOS7PiUUhWDfpKit5ui3ozW/oQG2BozLxeQwj4eRjeh3VJs/xKJgZNlE1S7cmqrmNUwxWjLCmkuCU9OxLE/rNeYBoN3rdAEBzGrpOzMuhmedMJWpLNxcgFBS2IcBEC7TUAngyNRbpTa08yCS8qaax6g1HydJBK2cSTCIO+GyI3OFYNDUvzs2CoEHlsoi6Ie4BDr8fAimaDlLCaSWCi3iyUbxvS+N4GbUcG/CT0kSSb0+T+MRA/oyRMrp5mhmoYciY9+kd6IT49MF0EywANMxDP1/DqC1DwGN7GYZuC7rTFW0vSrdsP+Vfn+YO6xaFXo5ZGf4hUi5BNSVqGBJRmofSVgSrquHDdNOAEgXBhHQ38T5AxdXdlYXjNlRVrMYj6hN1UD/heqpOZLRfA3QNxpt5aSbcKeQC4dEQ568R9hCSKUyHxXvznKKxUuQDKrGLykaNZ5agMcnVlTdOQ+V10sRUnZAcIjFqEWwA4iBecGn76ywnlWuWhUV4Q3zIlVtu5cSGAZFL9belEV1ADieBn0EQ7UJfmfLrAnXzUGO9dLOLlKenmXYGCEJkMK9RXqaftlmW35PLTfIDvTXXwHTvAGJgqmmLVww3c3+poM8iCi4fS5lP3wm9fy/s737A4bdo5VUc6ZNr0KthzNDBmgTdoUIC7JO+FJvbytKd3gWICzFiHOxVgQnQrCHh0Mkge4Ur/U5B6PJxHSQCJmr/W6or6mmQCJIJYT1dqlTUT4SRkhh8XhZ+hW6NzHOSPR8F6smoRhiTG/McQxYVEZV3lzH3EqYXRcvixfSm6P4syMBKL7icBdHBYkBUW21pKVjtU8eN5Zkab/y2tispKEaP3nTFuATiGVmAnIUIui5qghkh+LhMROxgnm6FBR8LVyXNQFCMQCWoduSBqiB3CE17hMM0i2cX17ulS2o/TqH8PyK2D0JrJ9AJxMpVa0wtZFcwc3/Ilb2ZRaQsl6aRvKIcgkWKlO9CZpHgkPIrjMlVeejPNSxsBkBSpkHYXAWQh6SBBZnF2oK2mlMhGhxHSUrFdu2F0kIsF6WYiiwsBleicsgSEUAaU2gAQ9BYp3kDK2gUwTjE4ZWmQGjyIHCNjP/LpRMZq3kTBR2ztDBHPQt0C2eicwz3GVlu4TMA3SlEuqIhcleCqmMBH2ylCuuxYqX2E7gII8EDk2Er7szwDtHY15g2NeK3Qx+xEtsOAg1Q3fILsL3ciCpjUA+KMOEpjVIJNbBOAiTMK0o7MZmwNAmmacKTLEeou5rQSP+5pAtNyOUUTbNYIl3i1T1PdnukSJk7naTElYv5KmiFMwNMhSuOnUIEp+o/Ox0tn78G0wEHtFDxaPjCNgA0HKNDwcy9TAVZ/YB8rFW5l4wD7nkc0r5PdwXBdjQjp04RdnON3PnglhXp4RjV9jrw/yrevjnFxAG4ncDf5jRGMfRgC3d8iNC9eoC+yHJV1EqwDBchbvAGJ0g5CsCvY+NiMBUr8qFulnn1WOaxhUIMRKIrd4rQBLDUHUiKCbCppcHjNC79GUCeihLc5lqg5708EAWjhm2Yg2ssTR5F7hi6MaGR73VxBpLxJgbfgha/KI/5zTEK4gPdo2XUu9AuI9jII2G5IJcsQyU1oTpDmjc1WMPWuBuX52jMQuEy/rUMZkKJ1iSDkxnIxNKJ1B0U/xMsvyegzsluExQ4ithJoYshQ3iA/V4tsL9zdarWOhxj4mOdTaboAjwLpcRzbe9UNuQy2KBIJc0nW1CJom5ZVmCY7dHyZI3S/FR+IzCE3opl6ZZXq7y7uM3GaRoRoilbYdS8Wzuze0aqtmE2KvltsjXjUcYLQ8dv0A55vQ1sVjc4tfcBKuhEWqaVMmGoabKriI5Qz2No8LV0yzeDHG/EqVDSufG+VU3jfc+dF++buEDLmhZaV5JFoiU6IdOjVfwKZWKYWld24NFghNFoTdWWOHVkqrLEF3D6Ao+tx5sK5fp1H2BZKE7lqiAllM0QzzbX82mqJup3vzwnWI/JI9g9VdEBcDEVNB3CiMKNqWNAt8IBW4rrWb3sColS5nSMptf38lT9gtGv7AA2ZJSGc61GP1tBuKGhncKCkYzGWqSZI2XUQjREY18jfxf7Pb7XyEfIc/JbJDWL993RPN73Wov4xEsjLF0YjvTWNR2VZQeHiWq1Tlp2/3GW3Yn5I81DHohWLuyLTLXDVOVFT63gBOrrT1vRrzMoWN6TGnn8ISoTuJtigactb2JyUtpx+tm1V7p+9h4VjxpEIjgtXg1z0WzyvM4nV6xlvG9Pq4j/1vTfJuK/rf5nHteMBq8dw5OiJS3jfpbLcxC3zblrzbWf9ARKMqJugtZD+VhN0G1D6p9jYABvhP+/gOVp7k4uc7xefQbnyAh786EEdvmP4cVnaMHCtkR8aGDrpFXowbP/vULb90rngg6Ijl5kHmSD80Y00lcNHD1ePJJiV91HsQY9KeiOq4pialGWZ3GtQNU7IMQeQawbGD6KHqvdSUHKJuskek6i5yR6jo6ee0Lo+Ydw0VPdctFzp+Wip4vjoucu6yR6/ofQ45WFc6ESB64RSe1Iw10QX5xXq33pIDG52q/HqW1rjg9rW44fXdue1LIn5eRJ9JxEz381ek6qkWOqkcTkysuOU4NUuzKsQThevgY5qTlO8v5J9JxEz386eo4mGhOTvWOPUypWTg1LRd45UlYq/vsHwrflv3ooTlLqCaOH14+vQcCz7T054zxqg8hRraivCdHrK6i1A5amscygl1dVXzZihaG53k/C08aknT0nlfifImcqYcXNWIf1RTSLFSJev6IGumi08MQ7r4ACtepxGvXVb+s1n8ZMB/14p00DFyY1+gQTFiwZfdiextn0CiHRA1GCWhlcMJV3H+jtCQu68B4iS6/b8b4HHsH17lo+rwCTOPw7gC4JsZdBXtCFAU49BsSJR4qPU3TH7Q6L7tgiiO4NvMnFh30bvOGBt5RVU0uY6Mp5kvesYEGal+p9avuCpTck7Dtf6FVo3iQXE1rSVzGk8br1Xt7GxcvoWK5WXcF+gJJdiYwdxhI5L87zRonN2EuiCuernTAmAzKE19r1ao7agIHXvA+GW+HS4a0XW1EuANg/S8eejU/SEPJmi8jB4210vMmuBxbVawvCqRfbcQg912MHAm8ZCY9gj3QLlNMkXhY9lYWNYmvEiW2g5P2sJ/dQOn/THkoP7pE+A05xNG77rbeAAqM6BQ32YPwTzqboKQ2tkzti/ytG8w/tiNUd5i1J4a7v5cXm8Wm6Djknj4LPqA7eFyfnouvbZlFsPTq8tS/FVi2jtC+iKVi6hx4PfUF1dZ9Gb3dfTLH2Cci3EMi61wxtxk1Mjq11VKE+Da9YqFcaHBLqyd6Huaskemb/CmE2cjrluslL7/vEUMmhOJnQ4wg9XrMYmGlLj72KsU1g7mtUZ/BTSlxzgaW+diJewUGHDgmwnpSs3AD5HQjt3CF5WtaCog59hmgXqvrycxHbj6+lHR1h4Rh2d8mv0hxtN6Wn822XeU7wQew58ICGgMhPBlMwt5n5799zAHH8p+06OLkL2vr/sFfmMnxl5YrWFKTOoRK9V1G+JnXpcVg3Cho/TxUMW01p58KTu2W/8JZSF/VsKtUxlbK1JmIWA14Ff1543Hb+f4JCOPsqyr7iPkpM70f1Lk2l7Jfu5YH92p1j6EAu1NFsy2u6Aun18G2yxWtA4DOzhDcxOWZ+eKd2gX9kwSuBemx+B2rIqLPYIcxz9JkVo2m66ftJxlwHBMRB7slMfPNg1Tf0PAIfMHiK3GXZvzOVuhZfSLv/ALU+Y7pIleL9t0BgT/clwDZn0nt/Iwpe8lEwBZfwN8QAPrOcZG7lt8DEd1Frj7/hlNh0XGMg3nxOVXbtT9X8jC/41P6eHk3xb9ha7GWvYwjRgHMtpW+aSAS9+QIKPozjfbCrqYT3Qyr7KTaJJuK7I6vngwoHQ6LgazEV7w1u7oG2NChI6w6tu5KChF70tg4+odG4GQX9BoE58FGO+MsxeqN6OSW39/70JAFw5dPUWC4AaN6OQJuSaJ7IFt1l+EbFTHyd5auFFEzH1ys/nevgcv8ye3DfvVHI4vdb0sulV1NscUeq8M17TFm8rJ55tM246xF7hP12H724ALEx7wLXW1fBYHiHEveDXCrhw1y+HdTgqWOckgcCnNCBAFMbgSntHFbkhHYUa5QKIus+FHzUnTAr1xZR6dv7UGxhlJXi+1JNZcTMzXJOHqz5X1YpPSZcTFbojuXkPFSiwt1SL6Bax1E5Izbd8pCMExcTsKtlcSHlLq7Be2+PTLiOxvXlBDKHPj9Dyhftlv9Gc8gDWqUXceUfrznSPiy0Q7N15dmt91E36ilFxNN7UaloESK9gOW5pXcJw579UcjogekRol38cdHuuKL9I6cC0b5GsGgXv0u0WyHRbv5B0e64op0kyR8R7WZItJsnKtqdo4t2cRTRboZEu1WeaD83JNozIkW7b6/1b5Dupivd33HKke7XhaS7dQzp7gVBRkr460S5Et4MSXh8zIzEZWDCURwyr++gdWynrJ3lOmXLrWM6Zb7d4s/2y95ElkxYl9ovC89nn9aSAGzzCdV7Gr671GY+9TD5Ynps/Y7pLWn3goyU3YtlC2X3djT/X9i9PIoh0/dY05z7oym443R6m/8KlTM20Yt33qLgya1g/foU+wh769eeQY9frAOjZP7O2cpjTFZWbJhj7rkbxevhE7ZkmLNdnppYEF/iAKUUY6EZmmvprc5QSqMREgeSjO+eX1eKx9LM6OS4tdJzCQvw/Mco80NV0cPXqYHbiBzkQ9cTKRc/Xww1dEobYuzn8SHdBc2I2TcGyfkvej0Ln1RLXiNIOCsNb4WmiO5Av9nS4BhPFvEEklpESnsLorDKaOrC/sspU23g/6uL0BQPCpMJDwqTzm+gFD4Y9hM+CwldLr/FCz5KuRkfcWUBs85wiW0DLy3RG6+eBV/oHo7jE2SivcDojEyiaI1vCKxOj1Js1J3g7ccvAmz3PUYNLX+bUu/C17qf+Baw/YtPAr4AVuTm54KkeZK7Gz5fPOpxejHeTyC1BwIXk/CWVR93wnbxGphmsPqCi4hx1p1DOevcAeWByyFObUZB3kZ6TF5uef04lCT0wY4HydIg+YjPAi7Cp1E/eoRik/Fx12nPuUdM9Rwen2cl4Ziaqw58qeHouwaf3ovPpmiSH1rHD300CkNxDjoSnEc46INvd65/g2LXnUrVvXoHusznT5mJt7jHx1RrPKO/Dd+AXvc+vZBngnjI6Za/baC3b0C3xZA3LdcmUlMx7SltD1nzwoPptQ3Y+cSzlJ/BLuVTl0z1MIZoxBqSZGW9IdqhFTQleq1mN5wpKY6F1tPpOG32CA43PgPqw6ShEQ08P/E5xXzzKDbpnyReqidDxxJtGFfEEeFGdQHhyvVLqZH6VShYV0Rw1l+HruDLkvX30eOehyk2kZhB/vA1wfXM5RTbOZVik/HFaAjd4jf4WCBosT9I8zEmOTULyfLSCy2gFFUv9GAISPBsdLW3NPkYJkL/AapgDb68ffXdVMu8j/gqqtnvEVxrOtGr979CDNejyLtTof2vwpd9+6ylvLfh26bPf0LaQg21QguvwJ6KuVM+LsdmEC9lMhAmhAkbSXwadxCC1pA3zKf3Yprk1+UUTLuNxEXaDsp8/oOEzMsa4AogyBBIl+CsWFWdMRLUdfMUqmQJ6szk6QOScrY61EuMbIVnob3aByAz13M0Tl9yCr34YjEFS9+kxwUjgNLJs0SYlRdoNjZ5NvD21wis036i910vo8RhFwPvT6TjBJBnaDmyUR0a65tubXAlZAHseZi4UdVx3rwgOdA92VNNiUnpORXgKUt3Aq9rbWGXg/XbfWwpbtRUqb3AxHR4c3zEDsvRTLSwtQI1SpDwTvaUNuRqF4SHiweSFQKnkYuWq1ZxsVoFhWfpVcufEVBVgVla+D6G91oa10F8WjpOYqsuF/+SDmGNJjBmUEI8YI+5DoXNY5MxlUdH+35qXHhR7wAnLiMLQJ+TncV0jkVb1W8oc9XjLQr40C6BJNUtCm7nWf7HeN36vnTTL8UYoPCxLCsl2MpWMlLVzt7tg6GV+rsADDt7g7NwqPAyOLoYtIq71Dh0BFbNhGBIQt1Cjzj4lbX2ktCS8VK9LwD0luXoc82LsAiiuhVyHadqhR1eQWrM3aqrO6/tE3XU09R7GwI1NH3cjgape3aw0FaubPF0tAxzvHh9ROfYKx2HmshYw6nUFmrFWGi5zgg21bYFR21JcJ3EJD2AU1kaRbJemcGl9yld+J2ekpjFUxDTQkQdgQHVo9uVP+8O7F2cOJZb5yFdwc4lHzAOAsM4lwpXpDk30FzPV7AByC7IMoDxPJ/yZgCm6f0c+mAyK/wn+HUcniOUqTrzq+ZRROSUC8fg6RTv5haA5N3IwjHyJbWK9XDHXE+Jd48QCfq50SFD+OQyLC819YA2gJKpqXoASqtYXkKso3MxO9ru9RJ9cR6WJ170mU0mbT6uzNYo4SwDpO54p+Kd4EPP8MzUudx5IACIj5CoD9RbwNSu1R/8e6X+QF48PSBeSzfz89V0ygqS38Es9txWElKWnAfdQqZx8aL3qPE3vqaYc5+j5pSKXwdAPAhXp7Nqs2x3qwCrNmrenqolFu/9aaAEmGPnUk8vXkcFv8V3ebviM+Srn6J3SYOF60ZgP4za0bKXZ4fc0XY0/63h1oAIPsXMmAvWY3mWUsIA4PmrOvpgeK7aD6R0mxvLZYTnapTwDAg8AWxiklH9XTYyTJKU+eNs1X7xara2mPp4lokpqV666aaxELwvzxmi6ZrfjwvlfF4Rnpt9CZsFu1imhHE3VZ27VhNQcaof5gLvglzP1PD0GXCZ7B5n5yO/StH01erEJgXnXXCiCk5G2ToxsFdrOmMbYFea7uSgnOCg/PcZCTIqClNr8t0bnKNO6VilpnSs0JSOKDthvwRdfq0XMJlPwYVVKWiEa4Frb6agAbyClAsIuvMyTEzJU1qjlMgJGxGasLF4wkbKTPLG5KpvzaPOMsIYdmcZzYpmGUVolhHIvMsqbwFJHMcso1lmAakpvi1+Bmz8cbfQYw32nuevNXke0Tr6PGKVAdS1t8ZCWH5PsbzB6NrVJvxks+RCkCg7WwiA1Gwhb26rYLZwvOnOFgLO3zVb6IRmC8UxF4Jk0cGT5uZJc/M/xNyU8nLMoD5Ql7JkbKJYi8UQcf9y8Oly56RN+V9hU141lzq24SDk11Kq56WtFqyfhCMR1k/s98e2eYy2FF2kCDvC9FFUjU0Lge70GhfQ4bq5eJlmFo5LkmLEkwRU6wYEz1NVCXkZuJa2VwE9No/FAC+g/rz9tkihrrw9nuKfQRBuOkhwfvMBxdY9SGm7L6ScX9SA7P2cgo27qIrL3gZPxDruprs2uAeN72LjLYs8Q3wumhmEBYY2/ejxX1EUO+U1dHmE0NcyiW3A1DSszf5E3aCOOzaR4JJxhPV7e1Ozwy4wZdGhSwiKm24llt/ciiDLxsx2/58oGP4qBQ0zKOh8Cdvj1w2i+Ezom0fR25fep9pHQHW0Ph0YiKdYRneK9YJ+bg7VPGE+MLBYpAIDkynhs1nUxCasCH7zEQGwLpPSdncEBmpSWu5mCjZ+T1Vc9papMfBgN5B115+pwY8wIE0Nio1OM/U9fe5+RIHpdEvPXvV4kgatwzYqbb4kpHGxQy+6vUAj23k1lFBRGqwaZrLBYBFiCewd3xJaNSf5G5yl/dAavGUcqa3wftaz9NhnJgUTdxDsad0orc0+enR6YVHQ3RLt4Yu48KQMQAg1FldQu+7lUA1YEbEAZ15mI4wSN3DWBa4gbezKZLXgO49tVGZjEqB+tSTsHeL3sOE6RC8hq9MFJFew+u1ehhVx45etZTXTCS9o3xha2r6L79mjZ5fnOdPXgI7fbwsV/JpFOvNIyyyrcJytbfHipegq+LnopTVCi5+6fPHTBGhctaufZXB4ywTHSCT4tTjYxdfRhTCqBwuWcD3enkBERUrJ1TwMz2AFrVL3JDXU8ZLw2YiWI6iyvdOpI6dfTWlLWkA2Lm7q2H6teReFtk9MLo26JLYl7uPlm8GuX6L0/qWAVPSuS9GOj9GbzlUo1rMrNdOtDcW6riMsFcekQ4eQqgiugOngFOZrA+N09BAY4q0CcFbURUb1cGcYGwUhgloR6VsEhJcAHEm6YKpGBG9ebhvynvhuNNBQrqtLX9WbB0ytdzUVhZC9RmFYhN0hj7ttQpMPPhoNul2gnKIFbIzkauOD9TH5Ezu9lPIBKyk4d7ihVsdqKwgJKVjaUSt2TFNoQ8dCZgxfCqcc13y2G83h1MmfLqBGMlMpcU1nKvNKR4o9/IPYqR3JG7UpFIDYGMkMRBhh9a9267B5x/NM7AZOCG24ICK0h+h9z9zbnsyfg0M+KunTDWxbuWuNcUo/CTazUvXth/Te4xLO3pBhqnxKhf+lJZ3OcSGPehwQTXQYrKFXVHjnTlQsd76v0kSK66QxiLpYyIaOZSudyNSE1kKyR1lYy1wBpEz270JWzEZFAiZb1Blsi4QRgPFQCBga4jF2b7pqHezVgxaXJkogQQm4Xe5aLFqxmapt+Add81y9/0Sob7l8l56+vAzqSpHvOG2scx81HRCxBVppNsx1R1StsDDfLAntgRrn4h+9trUELj22vN2Jlz6uUYveYoFX28wlxzZDexV7eV1KHU2rqEtV2GZudhWVHwviPLM3VTIIF7V1wD31134msKAr4ClcKrSCEH30PiSKTVFMvFMz1fW8XHTTQYQXtqb21q6gDD54uS8PN716qz+RE9ZOxi40tQL49RV3hOfNoEKHccX8rkn0Ig+bcpa2oRdr4R/nF1Mw80oKDt4LjA0hiNKwynRwLgFzyY1A0/XYMNBwOQXt8ynoSOpPNBqmzQy+kLBPe6r0rkVU7GeSfXJ9bQq2P2Lqi1N5YfArrOPlpUNDsaTfnQw48GbJS5Q7/nMUxkLhkkZYjKvJ/vapN5h6iRx+gzKE+ApfXi+7uA4F8/GdgJFkpoh/AZv3Y7/GlR0IRX1ecEoi8gZovTOeBb+cRu/UTE1SiNrPrkWxQ72ptrRCgNaA3sa/S1B9apuaKkJozqYMhdfQu19fA4l/To/zXqTY4SXg9ZfpMQ9ZltajtE/JYpEFWMWaCU/+4P2go2uAZuwWOTifmr7kNozu9V0JyoZYW27/DdC8AGjGyRZsobOVSzXVjjzgwOc23PkjEpjrsDs55mPq2+ZzTbU3Qm6/mWJ7sH1h+82WOxbYiB85FmQISqc/BOODVKR6BmX8+VWMxSCiaJLfZrBecAWpryVvkprKIOzKW18UsugA7rG/6Qshi7dUpWpyqlO5q7HFafhZFGsYQ7HOk3lTx3XXU86Z2EHzKNm64qV3RWpictXOpSYpDXSFTQ4jcrpSOQmw0TWj8oZitX+hKczb6ml6K5rxImJmulamRgM1cemEzXyhzPzIGU6hZEApM9+3j3RM8asgj9+9UdnkeSbn9+1mw1Wi4LZqBONpwRzGAWnQRrtQ8ReQwYUE9dmLCYfDTqeg9wVQmR+boYkleqxRBFk3/1MRsUHtOgsTS6AJzOt8GMvzOp9QiSowshc9TVWdgsXmta9RBQMO0GOVs5z/wB3Gouw2NDBaeTuMIyYszd+1B80suwftXYC7FfNiag/afuuoe9CsMleOp2Cc9A5j69j7z6pOhBUg+Kpf5V+e7bj+JXVE9ApgcLxmef4lxKfyL5dZrn8J1lb+JXYMKP8Sglr5l60wbm0Gma5/+YLj+pf5jutfXinK8y/NkH9phfxLi/3LCSH/sk3IvySaKetfWqX8S6wF/VX+pQj5l2aF/qVZyr90jupfirB/CUufDTjtX5rH8i+RV/uX1h/1L7ELghXaCfiXVin/0vkb/Usz5F9COB/DvxTl+Zd4Vca/xGv2513/UiiM+gIdHXVB+PH5mF5fAKZGRY6mKNfR9KIV5W1apbxNrq+0x5lSsccJh9MMOZzOMR1OSzmc1jEdTquEw2kd1eEMzfmOBEDH7XBaYYfTKc/hjKSnsg4nnzBgX/ePOJwlXU/lcJ6NcqR2Hw6cRvRwnRNY5B6ZYI+EY0PV/LOI9Axv1C4F934nT0cf1R+1yvqjTsgfNV1/dI0o4496/0KH1Ao5pNYfc0hFpEPqHJ9DyuKFipTnkSuHNLRhLdIhLQ8Jv9chNSMcUuv4HVKzAofU+f0OKZ61Q2r+eQ4pmffaIb3UcR3Sq4TrkN7MS1e9jwjXIYVNoxzScv2omw4B3gtbmqUdUt++js7xOqVvmK5TCo9TOaX5wnVKBwjXKUX/lVM6xynplH7suE4poHSdUjPCKcVWQeWUnuK4TilcovIdIbL5tVM6yzlRp9RyndL7RDlOqVUKmdZf7pTWN7VTmi+tkk6pCDmlZoVOqWCnNNL3bxdCc3VGMwXbx5h/tr9JI+/6m6brb/os199McVx/c4qyJa+lymeSlRzhbx5p+YePPEU4nXErMD449XTIkrE+bT/9jQf5fbgJ44TOjFihMyNWxWdGrNCZEfPoZ0aO66w0WZLhMyPOn3lmxB1WKK9SZ0as0JkRs7wzI1bozEh/ccyz0sd5YMQMHRgxQwdGTBwYsdwDI2TE6QMjj2OkP2mBUcfFO8d1YESEDoyYpQ+MgC6PepgbUrSeX0Qe5paBJdShQqKGpAvjfT9aHeMTC9IiuAafoCn3ax2M/chvdEWySuzNIA98y2NzsucNfKtD2QDrQ4vn9JjKKs6vd0t8x75YHr6biRnxDL1ex1ZDIe+QYivmLr2Ryd2IphRh5Mq8YCoj2Q3uierBBhh4uuhKKkDasngFKABIVovguXqzV2PXt1KfUOFTqOwgFVVF8DA8hrlmvG9zp3iZH0TSzcT9hLTxhLP8SyJOxLuomwmvoqJPy5CFpc5Swu4q9ZGZb61AoZqE6hzv+0Z0iaeUrvHKVDdu5y/8UTWxvj2iW7zvgGga79spzov3fW9dFO/7QVyMq0luOjHJdwLQylisr7Nc3O+VXp6cdOWixXLRCslFJyQXxb9DLjpaLn7v7R5f8paD/d5L4pMDixSh+/ZcRXjd05Dwuueq8vD6jZfw+m1DwuuOlwmvO54jvH7TEHiNn/7X4TWheRivyVV+Upc4artKXzRmlpFCFV6LZoWuRbOO71o0vR7Ek9FHvcst8l40S92LZrn3ovFVbf/hEDPAobvnvKUuyVTiQ7iXHKoDiuaGnbrRrq6UEFNCiqUuf4Uo8uy76R5954sxv/eWc3mgU66irODyQKfcywMtpRitsorxT7/6sXys6E075V79SLKhxN2PVujux7AYr/DuxzBjhy57tEpc9shTafqyRwqG8tmCYdCJaJfpBeMDCgrU4E1/f7TFCSVb1NdLWsd1vaQ7RaE2c6nrJdeI3Egi+a+mEK/Mf4Ys+gmQtCzQ/EpxK5cYs3hMIywkW6WyZLQD9QLDNJ++6LITr+bwBjS4tIrZjLHpJb8ryVyNOWmeF1BfZ+MpG/WRuNA0DjvzvKcDkyDhfbhLQ7MRW9xJGL0HMdHdIKKQzxeMsr+eGNqYF6fnBrUPH6+nsNx9uEo4qBdqNihyuSRDz7QtdadEsV9RNR5aKnk1NFPzqtrHZ+kB5BcU46USQD8LRpKaWGYaHpVWZpmEKDO4Re+jX+zWVPwhzqPvaag3OaqdAVzjLj11zVYVZoR4boMYNlgDszTRfIkGS92kEDGHJ2ToxVR1D4gXZBDxscCmrvje4N2gGYtnstWtXcenjHOHqNlHPbmjpslDF6BEfnIuOeah8u3Z00Np7UNyiW3aEzHZyJ6Pm6g+S6emodeHdowey9QNXBGydZ1IW7d4pjs3VKGta4ZtXauUretE2rpmpK1rlWfrmiFb19G27gzRI5661SJeFmxI19aub+wMspzGmmQ5jZ3RNd43S0SM17nxvjkmDdNMk4ZpZl0apllmT7KZKjUt32Z6O808ykgwZv8sUyrmfXSQakuOuU2ZVB9Fy4Spx2Wq4qYQZarifpBIU3WDcE3Vx50TNVVzo0ubqh9FXxIvg6eAjDvwMvTvJKeMUtRE3Bcd9p7+TopaF00UtSe6JEUtO4UoalkCUdSyU4ii1nUpSVHrbKKodY2JotY1IIpa1xMUFffx7+ToCC/1BKjHuDhLbyD2/EtTpW9jZRm/3f1I5ZzKzeMphTuG3t7851yG4/WNq3zyQpz/lAtx/rq7zsyj3oZzgnedXSeOvROh8M0sq5Zv3EDiyHFNiCPHDSSOfLFySY58qQlx5JxXiCPnvEAc+WIT4sj8xeVcCDhNr2rkL9PzQ2zO8fwQZEagu+8XaWyO3G7D/OL8hfcCOi6v/CpcXjHEyXsB//C9gBVcHvWX3wt4/DdH/d57AdVHd6NvIZ3dK963vTdppZhffs+86bHZg6wWlIG22eAke2P+/mnUkXoadewfnEad7Zjx1KdOrC+tUvryxPnf67OdkzLgpAz4e2TAXIeEQFF08ODPRv6BBkl3x/ZtELzwymAVO5hgB9svvXqf9+7Yd4MtAjXPC3S3A13twNk/OIFm3sTgVyhy5BRdZM6VwXZ2sJEdfB1F7uEiT58XuM4O3GQHnlVFnkSJ5JhPVJHCKlcG77GDGXZhbLjI1vMCS+zAp3ZgnSpy74fJHk+u8V7g6vy5gaujC4YEriaW2+anrkzMJty9h2C13zyHMPhktmNfIMUVSNqEW6LmIdsPiF2NtMPZTqAKIWayH5Q0028+G6g1U4rrs503pXgH2XpTNjEQwZ2cR4W9/VZzKc7xm8Hu3plEF1RQygepMZ6QOx9V/4zgxmwrDJo30ORIBwI1B/XOyHaCCVL8A+/SUfBCG/MSOdlOWymvROqHVHs1Kb+hjA3tIMi3PgqeS8mdNPgW4OLOjaWOEJ18hByPEIiBK+zAaVLc5je/kOLLbIivc/DuHgQ1KXN16sWj2WC+l1F+O9InoVlCX6CWN9GeZ+R3D3SJllHXW0J6+llYNpTZ2NpLgSy2wLFY0i7yk8CO9vu9D9mF0cHL7Ns9s3EtF2Wss4nexDfKluI0PFZCEI7VQg0xyFLd7ycwTs3OsTlOnmZ2zjPkZfr9KhxP3EIvb/UWt4izL5PyUHbOjZTkx/4+FX7i70d4XuD3P+4dnr9qbhwxHqCKys65ikQRqvw+OyfLDQ/iXV1uLo3gTo5ZFGf/S4JAqCMUhLpJWAg0O7IycI6x+q38bYGLolfNSrq7YGFcIDqQc+dkkjRfo+qPgI9vEWzNzr6TeDU7R4XXkvT0+3va3sLrYgMTpBGNdmej7kX+flL0xONNCMKx+nh7s78fgTacsZKOer9qRKn9ANm7fv9nbjhnE1VyFoZgPLLKOeiRzEbCt1RAvsbAIQjHVuLtJATbUTHV7n3rYdx8m52zeZ4UbQBDKoJ6AKQNgs7ZOZtIUyBxALWziYDqiLK7AFRLVJqHd+HYqXi7aFM/yFsGbDxebUQwjvotX8b7J/AYjl3t9wcvDY6VMioC6zUU1oPtA4m+PYz6GsGXA4mBl+PesI85BFL+lnm6lEdu7v8QqbPbiJEOZHxHhsMIHPDt8ub6YGLwm8LucUcZF69v///q0HgrHpvRnyfHvBGoVqPgzEBa+0AT3zppNLNEoBJJhw+zc14n9WiJaZB5qH43h780ynnEut+6n0YD3dunEgklt5PCQsrOTf5XmMdVSHocqYc2+b+yA72oU0+BM5uhAzfg7SCCIxwlBY/Xt2dnU84HmatvBdjb8Ooq9OJtv3+9lF+4uJN52Tk5PUkUIaEVYBYNET3T73+R9CZV7tvxTu4sKS7gYTa5yktYiACvJqpY5fd/6IavN8qZW596NIMytoa8Vk1CgPsjY2v9/dpRXxGdQo1kP0qDexYa7uCn7pNc78etS3E6VZvLDb3EDdsfEwCtG+Xcy0i4yQ1rg5JWMWVRIzapjW/8/kvIZsnO6a9CgmYDoJmENqn/3qfu9GjZbKDhSgjEpn7PUAhhi1DJSyHQVS93/RlGw1BU9Jnf/zFTs5fGHciknDVQeS6P6WLK3wnqlVKWYAg/y87p5YbvZmeT9YjUWZTNO5jy523yT1Nk402cMTLwQ6COkf9DoGV0/g/JMROSinoUPhSXn3ukdlJRzeLadrBO/kbbDv4QSLNtynoThXWCFB6p7UnMiygduDBQJbqgcbLn2nLLXUjxyaTz7cDkvaiiCQUTybTxBCcGLzxSOy7YMni9ajrxns3JMXcHWhoFdwQaRJM7A4U1kvXgMr//LRpQ4CjJEjfZw6kzP0AI5KN/B7JzRrthPlJ/sYQ9irKsBuaJXdOZdaX80e9fSHQOfJ+P5wK878TonsGofxSU3dzvPwyTJMer/igzMVxVPTJrWB9KcSFaJn5b4YZM/y0b5QwgM9Dvv5xJneUTLAEC6pXsnLlkyOO5WnYOGUnVMUBPo1QNamtHoEv+KbYny34OJOKfzApRhbhrU6tKqNh/eb8I9L4/i2Txz37/KBK+JPxYx8rDCPLRbDi2D3AW4nEvyKCwkx28rXAEFS7G20K2LYCzQks8yRmf1Nk5NYjSnPMI4PD4/Y+REcFVYnSis3OedMNKZHiQhUSpidTQd/bekQcGB3p13E22NvPM5cQPSg6SQ8AIAdwrUPd7eHRj3Ukgg9MWMolv57LrUG0SmgUleF1KqZFfFKjyWKABhOL/HLV4fDsC44JXB6oErp4ae7xk4/GtO1HK8e24JtAnWCXYJzgl9i8kIZJ8pajo9xKR9xhU9L8pb0jD3UAe6YhKtWTULeTZysTf9j4RSJbF/kBqoB35p95v/hJpJOWXVcaQUm+aKGXMwYekGLz+4FPBZCk+eq0ljd9A0n8PXvaJLP5uduv/H0LLJbdmI/LIPazfLEmKgjM3k9uXdTcZCyMPTKRa5pEhcsG9q8mLvRXH1e5pMvn3A/F1zDLMy53dlYCofBOp/YtXSNGo9idkjh+JfVPGbEk7RE33yCSUv/XSV3zsYtGj7YK9ZfHb96/4a5QEWfIJhygc+P7FxCw/RZORedsLUm7eEks86+0xVhbN2BVDUPySUlOK2LZk1OzbSNmjk18i9rOjj5ctN0yvJ8UpNfsQen5pLUXThrOI/Dr0oDbe+7CKlANaDghgba/1keVSPNFiLY1CrSepWNH2M8joe+Vm6tu+6mTLr+1eAd/+AbYl/ySuB1mgncmF3n766eTD39GTnKoW5AklTRtPTHrH/UFp+BakSlG5yfw/jSEL3ulKg5NInc+/vDH19PS3yX37uQb19NzrCC0d+5P9PvClr0gSztpBTt1pH06h6uRHbajtmucg1hyxMxE7B7HTjqGqEu9ZVfDQnvzRrxjrA33ynwv0jJbR3Qlb1YkCL/X7f5aiQaOcQJQdIFc0eQgbv13YFFdhC7Z9z+ANfKvRiV8RQNpCjAwnh/NLJPyM4HN2yLJznpeiuzbulTchGpH35lV/ZP1nZ68iwz47Z4kaBxW0hB9ZD0F7dt8QhGMX40VNBJfjsSrJhsxXPMEbCaquaPUdtN8fwQg8dkPsSgRkgAevpVw1WS4wMM3AqMPZpSJ3Lyr0d8umfldg1gg64gEOb9rU7z2FJRqZiZbIfyDp0viyCC24M/8IvSBnzBKFD/wNeK1WeSv5eJ8TNVfLGEuELK+m2K5WxEINh5LMKXhmqJQXGIdZx1zTeKcUs5ufT6wmDvgo2L8Vseso2JeF2MsU/NL/jw6NlD2mbbbhUe+jbnUh0XJLFWK0iY+38criOcVpUjzesgkrm59SO0o5Ww6gItdP2iTloOR/kE7q8SONrGhNNTT4/vQ/NHKJyTGLAo2NwK+B2tFHyFfqmVT0ZCy75tcRc0JGfIXg1+ycEW64E6LyAzS2UfuU3vn3Y8HE7/+UHFn0tQmgSAZQSQjCMTZl2O+EN+3N724XnpMcbBuobedflOzp4FHg1Ai8FqhyZaC2z1EgFT4bGE4G3vBg1T8dtFp33EjUsLMZmUcQU/HnP0As2O5iklqPrKax+OH6J8iOfSXwa5xvRnmQGn8LzqT0v3+aLCraeqUs3tOZKPa2+vOYWn6p+woxdfv3pGz/9RWy6I0PuxK8Urx28Q4ZVXf+LmnUXVxXyn/2ORXELr21SSYOfuFLKbbuXi6j5txQj+Thh8meSh/WCFQKNMsfEKgfpH/fnoLeP5PE3aLnzvuACR1oc5NnHBB+1Mh5aWDuwFwp9wDa7jyfPIBnyFv6TVINrf3Wi1K09ZsqJFMQM9ZNEdDjAinGYMp5Dp79QN6STSrPtV71ByaiDMsbOapNr03q6CeUWQ1YXNi8wwqWJt01HGh20jEbYV7HgIJXsbTYiOpvYYmBBFa2o0INcrtGWBe5kAFv7Tenv7tQirOzHRVSIQQ+VNSBe3UZhxdQfaTozTcwv+J4fftVhHKiD6tRpXSyNcgwu83eEFgOpp4cb+GNfZJyBq+UcmW28x2ktInZNnq5nGHFisEaPH6Z7QwmQbfUb96B+WxUmsNYnwp4zgZeXkMXsEIhP0Tz4dg1jaiWb4DMYdy1DIZ70CYLE9/0vjuq6OTn79iHHkieAVH/oBI/2npdYTdauMQSJDwv9JsqlHI+ar4EWPhntvM1hJz5DsQfVd8Q1fNCxVmofj/I1/mYmvWb6+0vqNpeqHYHMnRBVYSn5W6YnW29zCsl1EmbuzoTbXzjNzsDMY4KyWYBmt+kDGmU5Q00WBvJvF7T3G/29CYOWJj/4K6CMR8Zq0gdPRwYEC2jbFJVgaTLSCPlUPGof5BjdUGgEnpALNYONfK0rnyUleKUTf5r2p/X/jyiMUsEK9nBMylxAvtTYOcZWNXoDD20AGnhWH9YN5shU+5kmZvM9llqdvZ4Kc7MznnGy65YFll2dZC9OTi9PsTCix5Wd5eT0AAs7yLYlJ3Txg15engRzEhW6+/xJN86SJX3s3NukPJVpH7t91+TQQa4338fJtxy7vdOuoHEzW1Y9hADsrOns7J8MVDrHTVJKi5CcAUguRYBvfwKfIALOP3+11lBq3DaQZvnwe1AvRukeNgShLv/X2jee/t4ii6+h6yKZY9Q5U4eeTdJ90r5xcf1SCVEtxkpxYoOz0PgGjPHzJTymr7z4ZGMIWOz+J/NKXiIyhaPJwlb/MBaCiZ4TnyESE3XIRSeNosa7bZ3M3HmLeSCdXhvFqmpFp+T+TKo4wNSjnQSWaInpMyX4rpbLqSKoi67lIKHiSWiep5GwePEElEX/UCBvez3j+/fquyuXV0ki+s0XyGLv2kZLeXDa9uxstu9djFB2pyA6dS8uyxauvYIK7tP758so8acskkalR69WYq79jRm1DSpToMyezR5TvN/sWVU8iNfexKPTKx55LuklPjoZ+vLypVeqhwfaBy/OWvS+PGTpj7zdG7lyqsS3nzm2clPL1qYlTXxo3crV0mJj5WVaySLdj7RLEoYYpTYYyQapxtvGLlRiVEDolZFm9Gzoo94OnuujW0dOzzu/LiRcRu8j3iPVLqk0rhK2+JT4ocnGAmpCesq31V5cdUmVW+r+kn1J6sX1ji3RhdfPV+/mm/X/CGpcdK1STfXeu+Uf9Q2ZfQYS/RPLngrLnCHFMst4clbSfroPKAICyPswwlyV7Yt5D97vXcMJ3rY8Vws5ffIUBfj8zVi1REj738OKS08x1miB+F3GhW9gjNfcIM3gfjDEpnTuQrP9HBO5bYOtceQW+Y+8VsKc5GAxuR7CD6hmoiFEOU3KyzRjeQzohR48zPilnE3Fs7ZZnsTAge5O3bhTWSy078tPeSwkh1siStsaRB5XWt7Euz8iwPLuZRd2MuTEOzLzdD7ycy5XK64P+ITdX/t4H3sdMynF9fqF0Pt4D2cyGihFzaiqlXjEXL8+i7zFCZwCj/HBaJ0TvEdyaUocuyNFyhb1Hw3Zaid31S170kI9NU9aRPse4UnQUY9SzVo5B12qCGvI8akDI8dox5lwBSM5lRZdDNy8nSBSDBF5qSUebGTODqBy6cmZI62R2eOZtxnhouPsTNtXUytwVtUQO5AW01NPSaiHmLbKRDnmMI7ZpInoTmuZqLEuUhsjLo+R5FpDjqKikQ1U0yfxPFALfvwmSRyUMlsvDoD+fMcl55Wm6CA5RwqmtjniDCNeBMyR43h8aBwG958Z7owfWGKhVKuR1VppmhAuJZTTZdiCeAAWWh3MPIzTKHnre7Au46IYd+AgpsRTJ22RxCOSCoRLKOJkPHdOr59WB0PV19IUzcDHf+BdFsdW+YvBKjbKvBtAD54naAvdQhfZVcVLaivZP2BTxwmHO3E83kSZtwZU0yGV9+etx2NV0JH9p0v9HY4HC8XMQCd86kY0vgcubqbGie0j3EEPBzjbyR8gkPrfHJ9cxr2f3FhPqTCB9u389ch+Ktx/OlX/pAa79bbIxzdCpfmnVcATG5FOR4ENSh/3scGE9Rpm4iTUPqO+TXET6E7WnH/fDxfO64+Pcvfmf0OtzthK1iK3jd4IMtR37DN0BgqTLdwm9QwfQhDH/+bx1f99A0dGOINd/qCIVxW1TXdyl3gftoLV+EsiLPVaTm1bw3HiHTjfIdGPN+B7p6j0of1vtNH2PT1KzrmqHNJCfpoYB33kiJ9p7o6ybRGbNBnlbq6p8v4SvuEv3AXplnxcYzjOMyOYa7wOEaCPrp3e5YVpw8e6kOx+FYzrp1kDv41TeTqy5twCdIQvcORKJZqiDiViGbVAU9FieoWq3760ij3+y9tQ7eeJmvE2jxQ3p36KAYP2qJ0MyVBnxbW54bLMluF54bN0Llh5/jODSNVnxs2j/vcsPoKZ5bjnnRO4HOLenj0sVh11MnUtZdzLLbkkVgzdCTWCRFDhQdUtchNCB1PdSo8nmqGjqfiVOyXNShx3RIKtuLillWrgTR80HDpWgHa/n4YQTSjFzQYPtCS8QxlGnj43wpRTbMsRDOsMET4hqGC6EvLhWi/+ddAVCsE0cwwRP9xlJlQkjSZ2MJH2v8TIT4WwH/sshUndNmKKHnZyp+pMP/w/bCwXo7neNffsF2dBzgD+msXHwiu6FJZb4ld66bl7lq/3vnv27Uu/ifumw3rfadCvW+W1vtmGb1vhfS+VUrva7Yqpfet8EUHZfS+COl9C+Blvu1UcBAE46T4apqTWt73vazfexDsHNyZNLU3Xj9Fbmy9ffR480PQ0QOdsl/xKnHZcumveJU6zBF52bIVumzZKeeyZXFU4rdOhPiznAjiN/9k4g8f2ejvhIjfYuKHWPyDhzb2O+WQv1Mh+UOGprSzfscxx4TynRz3Iy3sQMDlG6KxjdOPHv1RjBX6PhelmvRXqerqax6m6pshSAlOVZefLeB0vjQPPgQK5fo1z+xyL05QVfHFfl/ruyK82oWJ58+g9OMvLOLyjGD3VH1JxzL+whZbNHXd+0cUYBuVB+Vog/oy7UgATy1nU+rWu+h94/FQk3cD9R/UNiu4OiHBvV2us/O7bpdzKnbXj367nBm+Xc4K3y5nlnO7nHW8V6KUc7ucG/ykvkZtat9a3y531CtSSt4u54RulxPl3S4Xuibl7Kuc0O1yVuh2OYVgTEm4kxciNHkB+r2mC9RlPb8TeV1baafNiRDeZkVOm+nelaGFd0Vk4K2YDshiW5Ab4KmAnpolNElDZvO+IxYnfMELCxtY3+rukzqhT+Kpi5JCV0ZrI5IghkH5hPvJTP2t3yUqcDS3kpYYMoSH2K+/dgXx5om8V8T9Hp7myAa4BlZPWtTF9zphc/JHZ8H6qXaG+t5MUbcsKzAM/jNf4QJfTN3tsjF0odEyvnCXfde7uM3G+rOm1PAaGF9w9XXt6iKeVPfjce4HQmE8e9TEgWZYPdIpCXOpm35/FkllnJOQc3ml50U+ovPapn5DeFfYEHeXGALeH/Zado7dgDK+tcm/lLCTnXPIDfdghecWXuEZRpm+nrRy+gLvq7xjntCO5QLeMD8E6xYxvDyrt5+JpliCeMrvB5l9qreKUK1YosD+R+xJt91DEEuwNMF7FLei3r7IGY793ChnJ1U9GG3Ek+mHTZg4VqAODVyAIBw7H1Wd7m6rRLmuqHdjCKR5OFwRipJCxevxjC3eqoHzAU/ysZInBj0xiGQTcu4GlnDOShaEgl/wgufe92J7k9tHb8L/AbFds/54nGNgZGBg4AFiMQY5BiYGRiAMAGIWoAgTEDNCMAAOOgCfAAB4nE3OvUsDQRAF8He3m7tLOMVE/PoP0qSwllsNBNFGttT21M5OLYNoShu1FsFSsYvg+dHa2toK9sFOONl9DnpFePwYZhiG0QDCbZjgBybcgYkvgGQJUFeAfvpXM1JXZHYnu8/iVvo9cSqOx1xWMxFcoz9+V82io5dh9CZtbchcrTmvOizCF7l7wyPd4sHCCe1Mj7bZpE3faZNH2sYu88Qxj79po1fn6w+uTL0rp9ZdOX3ufPzlfDQSGmjcA5Mj+f8NmOgD6TwQ7bOoZyyCDw5UxIHeEMCi+BRZZUvM6TMBdKusoof2Xw6RSdq/JtxTYgAAAAABAAAAANvMvU0AAAAA0GcxegAAAADeMqCW
 ) format('woff');
     font-weight: normal;
     font-style: normal;
diff --git a/fonts/VerovioText-1.0.otf b/fonts/VerovioText-1.0.otf
index 744c61291c6cf5b2ccd5c3f7f11bd6f16725b0be..6b4b63e51cdcaf53f02c692e782e444c376e7fc6 100644
GIT binary patch
delta 8129
zcmcIpd3;UR_TT5+AvY&iqPa<=BsZubMMV-46g?pcY9^gfHI!0<KHAb&@2U3nsrWtW
zs7fC#HFo%DIVfs4HKrO$@n{u^M+Mb}*GgpCzwciA=7+xa^Bdmh_s895pFOO#_FCUH
z>~p^_bu9XuGte(5rymPr26M1B-LkVAjym$p2F6@EQ`{G`vvc~)9y50sQ|i3L7>nzk
znU&3&v*(%OO~iY%euI)y=1v{+GGj_Zybm9hJ7V&-us7~v%#nk!17k;zc(UpAW@2s|
zeraPdkg&U6Q}lnqugTclsUxQCPrXtIg8i|fRqlvsli2`tnG%b}J#j?t=t0kaJqYgx
ze#a(HnlhCiW@8{=L(Dg13R?V{zOcB%6A_($Wnmr+Fn0K<<QK&AOv=)QZx*H3$zlvd
z2VlhMPB)t<oz!Nz)=0&r2KM0Gf=C>5vNd=%15qb)H=9({v-oK7@!}K3-xi-LK3#ma
zxVZQq#TSY%o_q2_=L-WbkNnZ*9LsZyvWgG??z-U@8eZssxxZNV?Sh1z{to{3{&atu
zzn#CWKh>Y&PxiO*Cwb#Pt6x?Ba`aW-Jf@gO9EsL0M}*=y$j0C$$}DllY2#V>1f@Jz
zEuUzHyY6c+CL$hUvbt!UA$N&>M>Ic$MzS39Vb_WW($q9HL+$<S#BnKUX_@koB_G*%
zWVLDAPCnA)BV9h)%SQ(@#NAk@70H=2m7Li@OeJS_l@CD@Z$v9OE1BN1QsqPL%SyL4
zx!+NgbaQ}bOMnefq2R_WhrP&_xfg`ph?wf@88t3uU2MI(C)8ikK#5zL@Oa}zO&8xg
zB&k8W`JK*ozQ1#B=LMa&cG;(|?^>F*<H1e6ll#2i=T!gLM_zxtVC0#x?@XLH<*DiM
zFZ0*x&#p9YzPEI3-F4aPU$8<qjMx^v{jHrBcTe9p<G{=V8xNFx)u315D+m8_sQPgJ
zH`k7~KKk16wI_c0Zq(@~&U{)lyy)lR{Bx5oJn+M+lGiT{&AV3Ny{25dR$g_@aV_R%
zLB+}H0{69=KSft~%d2X<A>mbqxh|!7prKaQ?Um?8T6k3nXI%`oxoj_IE#N-%#@SGV
zMK{(q^U6i&+=FF-vM#isY+!JmGT&g_>A-Xot#V-XL(xsO@S7(%FPg|WOJ1yVe)U(I
zv$vyxoUxa6&YC?WF!UjMF>?Yock~*D>HF@+;FS#+jOt}aaz}?8gR}RCV)x2IO#ij6
z!Iij1n122>#@R<BYI_YL(2JR4bLQTIi3P`WUt}p)T7r=yWu6_)dG!v1^Ix{0shmMP
z(ChP^&8ue&(p>@0x5nz6A8(G)!p3MmJE8kIzcfV;@wEV<$6q(xoc$bP<Z*Vet-;yo
z>1f7P>730s(R5sfX3!)w@%?SihL`DBIH9xQ;jE%B6DMYzz2r7{&5>h<-xpKLYd+`<
zHaIHib_=XR|N1n8v&6Ttx^f1#^Dm3BU9I!9&TDFZV$r_F*tDm&&G}<c0B<uJ<NN+9
zq_n?hSbnAz7)NTDs+<8rjgIPI?wpBk>><Y4fq&{;J^8rd;;hbJu#%M3=qP5?3_SpI
zJk0X2p<o^69=Q%77G;4{JFlJK^OSP6qK(a!HWQ#pHbv3pf%(R_Y|h8GG!lqhp3CPf
z<t)vQmEK1U&d+_K=efigvFc(969~ZQ^=aspri&9oz0@-B7k1+plfgZr!1nlNm2!T*
z6mMbK*mGhW6KAnWDcG_#R-AbMQfvVY*ewygpz*|Ob6dhqC<O~Y>}Q}Ab`6pn3&OF7
zu=3m|7>hj=!1fbjut}65w*#^mJG@et>Vm*5*dsHMR6r9n7T=%fU}2<&%_Ovdqd2~R
zaqSpwIdw&x_?sVuJc2km1wS4TxI1+Pjj$roz$<z}D7gk`z@FXl!TmwXWb_s%b*W&o
zv=mjCm*1#_(6NUgrGS(K0>9Zw_5e_c5%+Fe*#9AexCaHR`P#&?1`!6VS{GIYNF=(L
zd$++^s0**u&;<1eR$<vR!C=NO8CZ}UzihFEY9Uee4(fr`jS5)V0Oi!vIu8IOMld7@
z9~B45^Y~&h-F~<r)8Zrsi3?;7f>%gP`X#H0!vwvL78AZ(oMaS9L|}pX;HIKY8o~q&
zv79t_zSO|^gIzm_0Rl^>a}bmuLby0I3bVA1HsgR~N`gF8d}#`pCCtZQ@Vq*B!L5Li
zzCU7T#%MhlDDdj{Wt8&jh4AF6ccY8|+)8*pz+^}@h%+T%KcSRN2DcD?gGE9QQhsuG
z_>vd{Uqo2=u*8svtRy>d#u5bDu#<2}2t}avbH}SY>=<$204Us2Y~tH^O&Sb#x4=v;
zMQHr?LnDY)^b+8>zysnqQAbZWx(MTWp70919(oe5JrZr{sDBXtfj>tdI5U~~zX|^`
z@-F$-=IZp-2Ekj(z~&8PzQ`g1hm+VLbQjfz?tjh}*4UGzbN19$o3n{8qrnbok-+~Z
zb{E|dy9rF>XbErPlz??G$PkW$aROuTGBO(c>*@_);*Nxb{6`*eD<g68Q<;@0CQw#F
zz=eS+E2{OcvuF@o=%Bqi=WD{zoEV2@+hayBbgVsMi<pVAy~EJ6a?l|9c!XwT_%3XW
zp}@!U(2D3Q@+_$S`zeK>50xXKprwqm(8)kLy)X0lUMu42_P&f)UkGPN&H)I9DG|^m
zMhQ=FeHqn75D>~UYCU*(87L7%WxglGQebKlrOR9*g961QniYXqL;>ldB#<PKb<yAf
z>70TM<u8_&fL_LEG?XGowbw;*ga?Cd>S;q-3vh*4RKmc`gLxxTLl4TvajYDX9}s`B
zNu(3y?jp>|q(`}n3=36*KeoAiu|=G({RT`UzSNO8$?ZjarMiVeum}Lc#gP!*oWB<e
zHSpzmMlfZF8VP9*8`gv~ku31KHP%2i^LO+J1_Tnq5-lc^FV71=#2_`Xo+<=^0U1yU
zI}{&?hOAM@R#eyF6l73oCCW$-+yj0Tm%6PIr$^O?)|h3>SRe~0cppweRbc?p8V4p6
zF5Zv5%N}Gw7>{gbAQNO1@#>>aj6r*dl@$6#sHH0M-;b4n|3R>HwmKt%<t^4!R>ANh
zOp9zI>n^fCB>;gv9IsZLbWn-{@PDWqr5{=`%5MgclL_Ax;AJBs2_V2IUSK5!R;qze
zM954b<1^rmU|X35F@&2bjzO4Sb;jmw<^d*qiV}$)W+SoagNC3v>m>}JK$WinwqcCH
zxlldZd<iovmgu6!g#?TDV-2YJZs3V1%7q?a0;G%Db5ri7NC#g4;we)BV<<IiM=7HR
zjg9myoJn{D`4Vzw09|?)Wi@~2b+GDjuP$m(nYx6g5VnA+G>9aE15z7$JKjNaXp|AG
z1vf4fibX_3E2d=jw7=JbIUm)N^lwB+%noP`I=kZy&H^GGhyu~WYj%a9unt93WP?+|
zS83hS;L35hC+hT7-~@o@;pE*`=`z#G*hZD2h#FLU%Ce6lgD8k(bwjq7-jA9BBBF{7
zChGu2VfZVc4!{J<R;&%`jp_}GJCs!@=TNOoRU0;om>|j%SyWObDKf9THPJamt&S5h
z&P48H)AxclHTe(Q2>~2P)F|?{_TbYHfwU${7FjooDh-z+Y$q|6=Ya-F1P@nwcC@*2
zeK0m75ascjg0G>!<SoLV$6hu#%esiEAtS*KJ@5fjSf4ITqN*ZA24H>N?<;3ADOJB#
z4_QIhX{1C^o7{Fjikno7Pz_CW8C7Uht3g12Fw_$R@>r-W!B>haP+y3rG;M|`LbnE4
zumvdJh?CI`^fo7_F}jq|MV6{R=o_~#Vl7;elqMo$Lii1wPuv2PEu!)Uez>w@22Kv$
zD#4rL4=R{!ACHEL!cD7f+$#eiwu3vj{tWqW-^0<xRz7L19s+`7J_79a@wNay2$DI3
znWZ_XN3z|D4TK)tqJvc&m5Q{Ne3HU+R4;H5fjofZV#p(jdJgtkb(V3y&WHKO8nKXI
ze!1BRi%>4h>x8_fh|8udQ$)~{RSbD)P(L6hGY@4vN=`Tnz#(c&y4ax?Kv$$2s%qtO
zAwIb&h1FoRM413`xf8Hlq%XRAi!_Tnw77SRv<Ek(tDCqa%fj=$Q1py9Ku$QEj83wm
z{t{z!F$$0-s&_J+oJtiq92|7WNQ2BI{C&j|1Ehsr<kgw1C&IpfZZHptPa5(A0QCqv
z^gRHtpiH%iC^ranf)OYR3$cK3IjZ4Ne!z)DM#Dj)Uu47*Sj{|c5SDP#-XDn-J?>@l
zjxLk6FqQ04B%)aJ%@5)bfHp`WwTAGT3gAwZ<RI8}fzX;TJF1NU_&8^R0uBV)kQw3v
zcOk)ADsiD5{FWdqtvy&Dthq2j=c4+Gj!hQ{0Y*7-YmAnNyn(3UeN^Yw7yB8I1h&BU
zmsd8!7$TGKsci&2L`f}uOneTK7hwTkdAm7tA7&}cQA1f&1ZGf%>jAGqA2r!7aZ;>+
z8pL&4ejXv{Q@9YBgLOJ*<NhfKimL@qKWwAz!2^DbR)kvNu6eHigL8l00`xEc8DG(U
z&$orIGhQ<oSH8fV{>E#D&PQ#0eIX9{uV9BAA3#y4ET4$!T8I)rxw7&TgF*;2@H^n)
z3=+9{&95akugREcOBeuGJw%YgDcyG%2L3=gB=o@tglb`#+f)k>1!JAq9A5US`9<g!
zrJ41jmZT`n%#Xr`Dlb`~-qDI$nQl$4Ge}XZ60JSqNqBZJZ$yk#)>uR9zN;wvt(v>G
zsmgY1M^s0LvfbPfm0&f9?WRUH*L+J8HQ>}>Tv>&Wi}#w7>(9kPXM?x?V77yKKK_hy
z(%R?W=>p+5nmp&m!_l&Lh+5s%9F#IxmESxc{r~yqS$WX<zOAMxFIpw-t|-a^bLSJy
zmsh2$u`M*;$(9;d_acNS(W&^LSJFxgFDtjAIu@#G<=?Dxoo+bQ%1zdH8PgR{Rdayv
zxkB6Qw;|U2Q#Zf&KFwFqTJtSR(tHcd;?lF`i<v#t%8usV%vRnuns0Kl=KC~73-4>y
zWOi27=v2Yie6o8?TB^o*Lj=p}<>1*CLbTI-C26-k)A8OO@3qek;@$eR`)RkoBf9r%
zHH9&qe%pk{)%}%NeA73k^&hgRC0YBdCB5Ed7UX#E{$29nao$}-IqIR9X8%IDmQw9g
zQtbcGd(NoeQVWms%pyW92FEC=R>t7{YMnc`ecC-uv3d=AMo}wjtesEHQj}I!j}iMF
zN(-~@=od6;vG6!|49LV=>qakkIy*xn=8@t!bL!LeROedjKc4=lGyB1L-SLUMXfJ0?
zL#Lz8Nw^>3b51^d!#&1u`F`ZAd!b!+fY(&P4mFX5BED73dxG;{*MxEY)!!Q-o#nMN
z$95WGCQMFHD>_*jlZ#yHP0egH(`ThW7vfS~W6^JKO?z>*TlIWmHJVxFQNt>%guInu
zYD8CS-@@E*wW6JwF*(C}e&rQa>!SIt7!TkRe5#qdW}umQe!MyH>X10!YF+c4$k2Fs
zCB&;9mv2O4<y<T*?`fW1^Ki$mny;93(|qTQOyK5oafV5$Is(O!RNd_>VOg5*8Uqe5
zFaYtqk*)bIvF;jlG#b3qfY!F=i4PVG?g5`Y3!tk*53*?Jtkly}i!0l}t5y^69|fC|
zM6fA&^!L~ld%)&gBG?qI0h^*lU{jnZ*l6$7vaymr3Jt0I+jVA-^+~ETU`}5@((OCU
zc*p|t%KEgpvK-ETIEZk0Hs9vFYK;CAXCV-;W?8;r&O6`HEZCUQYbkqB!=4n4-#j`d
zs2ty{r4V(N4pC<<&D4DFgT{X;1unTlhmgy32)V2wgnVD`1tCLQL&z92cEk93&h29m
zS>I08<D3&Y<N1bfkAsITG2hwnXa8??w8zm?<CXQGa^4wY{k*=b8Q3_dCxj|-+$q$q
zdJt+?7=+qY4?-R8cBfE>^B~mWmJsT2a|m^~mk=uCODHADe05Wgdt7gVhY-ql%*(Yi
zg?4#LG(yM<FJj0sFR`+I+O$Va1(!Lkz-7)*a9QcSlgp}B;IiUla9Ob!TvoOMm-5Zl
zg)Nn;)?4$P=>w+DpMbtrX3X|`BAwfzZ(@4Xj`KLdG6>43(C08y{Ybts%Pc(K$o%+f
zd>!9%8#p~`1E@ETT7$RmBa*9a(5!ZtE$n2q^0fK5ovh5Z=Gj>urO-N2@N!uFzFPRR
z1vdjF<u84#94Q-6zNoC1<K{Ev714dINypxFEB!3x)EGtSXDX-GTlG(0RRR_Ni1ura
zg-y9Pbd^^tYpI>ce{1gCx0aamzwmks!Zw-<-=4q0%Fkc0XREi4UvqPBWE|`0V{OFW
zf6ucLC0vPD)+=AA;pz~zz@a<dcT~8#x`w&a-MJxcL!Jvc>Uq^u5!y3!PUtDkujPg*
zVF_V}y;HoKBU(jFjEMj0uGx20Mcx<L&DX^DaMWi}m!exn4~rfbv#nnLSlv9C@~jeO
z4oIDh_WRVPb;I(?yNf^Ok_?tt)!P+jrnFs9H%$Bm*FlW5uN;`;3bPiS&8=e<UX2P3
zh`)fn_{A_k69OyvzgS^TjHvjDS@DwtqgWTEl66s^WL-k$Gv>LUF~_@@+bVyqE_mt~
z`xu))$L~YDPrxq^zgKSiEe?)}ab+2sVNNca7U?;}Se+RV2LFG%r|`|8oz04}zEP(N
NxAzeO-2TV*e*&<TYS{n)

delta 2730
zcmZ`*3sh9c8J@X!_wF(*SJ=x!BrBpKpr9+P^76IHQ?P<cz^bjH5z&Hzk808w7SrU|
zYPC2RL_sv-vtT)n#TP~56B8t>Vog#S#S_lih>dtub`{O-zq^n|o9>>u-~2QGeBU>Z
zd+zMqt!VG&i_$VO(vUkcBOZ;3OH2%?N=wxtq_86Ns3$Qo;}=D(DaR19n-D_!r1*qH
z6pY?QsOK)kL20uM5h=HGA`rp>5HDPupIvZ##>x8#@fpyzDtAft+e6%%!lADLN@OlH
z48GtS0`(_Q0(0}%WUoKBwM&bTO$`I0^Rw3%pp10r!*9StSdpE-WcIo*W<zX-(pIo?
z^%{9O$^nDT&>w)XBNd@{W<@tF7%<@}at9jtS(b)_Nrb+-5PPWPZj?tdLO=?hkV4r-
z1Mvi|!@?F}C6|;3^LCKvk;0LJJmJp+q7Li5w>u|x&bq(oL6a;yTP*h$b_R5&-%oe7
z_=gWV<0t$5Th}d7+Rb}2Kg9sdFGV>NE4-;msV6IteI>RRaP~r)qa5{S@qj@N9#42G
zLcARH7<hcG*P<+XOj+#_%}wSKxm5UPa@n**7+N%T?TTdy;ql{K5b1&_7eu=t#syPc
zFx3TdE{JzQf(sIzkTAvt;Vy`9fzbsny#$wDLZs+wbqOX!v&X_Nj3en*_30vf8-Izv
zLKz&a9?zxn$CWA}N{A6Eggxp>Y7_av9f=dfNnUYYi8?{2_Pgr$`H;9F2_ZCON64d)
zCnJTC^FsZ@MvnF!lW7c$*2k2MSB*DKd_Vp{>ge?NOf>J-!q%LPc}oh5*Doqw_$Srw
zb$gCg4X!%2PdI$$Xk5*X=(=DQTAx>6Re$58a4PTgsx#Jx-#50O8+fkZ(_I(tUQWB3
z`dLNG^p<~K`>=K1_0SvJ+g9C5-X%UOrgQvH;{c`|Y`{2xP7RpP**{=a0ZTAvd&q>L
zvoU_k<_$Aoewp|!-4eJ+F;}$zl|2mHgB`V2wl%1MbJQ-f)Df|~vqn=#45mj6?W}mz
zQmh?9q`gClj5srr@j)}v4Wr=^G1O?tRNC4d<Nj#a!Tn4Y3y<)1YTRMdjOUatHMf}G
z3a*-Y@^lr{dgEzp;#`I8FJdM2BEi)9cr9;>E2gc<Lut{IG)^2x=O+!MUpyJ^drI!z
z3G$omNw!NeGMLfk7t@vE9=e?PQN`0zpWaz7-_qG;$tcFr72P{4Ln+#R$&Mru%-J`x
z6UkkGyV>59VD61TB7HfW$lN8PNya)O(n;1JB0lS3cc!;+oNY6!P3uu`wgPq_;~k89
zXh7x!O)!y~Lx{9<1d&S1Mhf^2P0C8<Y!7HjR+z^~A{B%ZsV<C&_P5y8tce`w8%{xs
z8s_>$jv}%g(9$Ho+z(QtLEAti>zJQlIK&YU_oLAfvySZJN@|%uh=nfTFg=#1@gEEA
z<H!#!K9R3KM7{R0Q?D}HXY~Ko>*w#sew{|;z@McS^<tBg_0CeCp#Nd*XX(d&HmY!#
z^?sdE)RT{#WKZ*a@F=FqzruOEJ~R?DpTa`S>xEoLDyv(Sjd2juuDQbFK>GE%cZqB3
zM7`P@5(cr~t>3S}QFQQzNKU9>SsNZJ=;w1NCq1AY8%OYZ<v}{LF_KOF;HZ+<E7q{@
zH~A?!RSxYcjb>A~9uhcG%eqQms5uWi`>yhUJLhF$e?F2ga(X3AZ;WE&PW5o^(M0Mp
z#}HAksHFLpFq(Zf$Ul}yhsG1>_5>o^d&|x8%Vp(e9VBjpyyr=DSwm**L?U&dNkqD5
zo(%hc7LxEvqe&;r*NrAYvLX|a9w9hUod}N9x8^BC`VLJ674>59yqqrndudo4ym)uu
zjB@j@Azc)ay4CSSZ#yBsIOIIDb3nox0ut6alL@W6<n0HX_d<a4?qT4(yAwD&LL8i$
zN;b1`waWALe%f})z^N9{+gA;A>}8{;tgOf}$*9a|k}RIGdNs|z97$yh5#XEgBF999
zs~@HA^-Lhp8wN9flG8VHX;U3|*^~}mHq}ig(kGrjnK8UM)#+erUpkoDHwH|7lAh==
zrGkn2(A`&l<NKqmUa>+(a=BT$$jh4d=%D5g{a;^%i+nthdwpR&<%#8HT6j6a;gG&)
z-aZYCS@~Cuo%aP}=iR~Bd0#MQiF?(UWiuGFgn}_kFc`C>I*gG@SdewY1lUv8TC{0o
z_xhG5dxQ>N^lA;f>1`T^OfM_^>>_6bg)L#Auw_0d9MHU~a4-xMs%t=@x&jmqgn`2I
zdX{^wmm^6;`X(6!RhQskr43Q;fW3Au{>>)6x*g=;nC)+Zb9S@IdC=It>zAFQ4mH8B
zUL`GT3+HUpXf=Sng#Du}LCx83GX1~aclVn{#I?=OimdkcYVdX2O#4n-D*vp|{#-YW
zov@Y&IEB`BAE)+*CvXa@?XKdA?43G)!hbwm*0>$i5L+m@U9o-JwjGsp`==UBv-{uZ
z$7S2w%gakIp3!*t6G7H!^(aO{p^i`H473}ou^HdvV)>2y9>qFEt#XaBUXX+fs#w(@
zR4wW^)xTEPx=nFgKs*T}c8@&KD6SQ6c$RqaUSqvdw4qw<ucSt)+dIO0iFbkSf=`xj
z5<C1f--B8#8>rBbbW+P>U$-LX?M4H44Iku>9MTxghN6HL4ocqz3W9|QDJQ|r#00mu
z8i>zAF+e#AB>>v<`fzg}7XKIda_H}mD_+U-LW;ftcpuup=OR>AqrvO7ZgmKWa}d&e
b57)fa@+sm|7U_X!c;DLp%@(lr$_?&6F`uXU

diff --git a/fonts/VerovioText-1.0.sfd b/fonts/VerovioText-1.0.sfd
index 45e482e9062..feb2c1a4ad2 100644
--- a/fonts/VerovioText-1.0.sfd
+++ b/fonts/VerovioText-1.0.sfd
@@ -5,7 +5,7 @@ FamilyName: VerovioText
 Weight: Regular
 Copyright: 
 UComments: "Version 1.0.2 - Adding accidentals+AAoA-Version 1.0.3 - Adding figured bass figures+AAoA-Version 1.0.4 - Fixing overlaps+AAoA-Version 1.0.5 - Adding accidentals+AAoA-Version 1.0.6 - Adding dynamics"
-Version: 1.0.6
+Version: 1.0.7
 ItalicAngle: 0
 UnderlinePosition: -102
 UnderlineWidth: 102
@@ -21,7 +21,7 @@ OS2Version: 3
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1413579002
-ModificationTime: 1598967752
+ModificationTime: 1645015062
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
@@ -63,25 +63,17 @@ NameList: Adobe Glyph List
 DisplaySize: -72
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 9747 19 9
+WinInfo: 57380 19 9
 BeginPrivate: 3
 BlueScale 8 0.039625
 BlueShift 2 27
 ExpansionFactor 4 0.06
 EndPrivate
 TeXData: 1 0 0 346030 173015 115343 0 -1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
-BeginChars: 65536 87
-
-StartChar: .notdef
-Encoding: 0 -1 0
-AltUni2: 000000.ffffffff.0
-Width: 608
-Flags: HW
-LayerCount: 2
-EndChar
+BeginChars: 65536 80
 
 StartChar: uniE1D0
-Encoding: 57808 57808 1
+Encoding: 57808 57808 0
 Width: 1342
 GlyphClass: 2
 Flags: HW
@@ -144,7 +136,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE1D1
-Encoding: 57809 57809 2
+Encoding: 57809 57809 1
 Width: 1088
 GlyphClass: 2
 Flags: HW
@@ -185,7 +177,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE1D2
-Encoding: 57810 57810 3
+Encoding: 57810 57810 2
 Width: 940
 GlyphClass: 2
 Flags: HW
@@ -212,7 +204,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE1D3
-Encoding: 57811 57811 4
+Encoding: 57811 57811 3
 Width: 699
 GlyphClass: 2
 Flags: HW
@@ -239,16 +231,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1D4
-Encoding: 57812 57812 5
-Width: 559
-GlyphClass: 2
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE1D5
-Encoding: 57813 57813 6
+Encoding: 57813 57813 4
 Width: 682
 GlyphClass: 2
 Flags: HW
@@ -266,16 +250,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1D6
-Encoding: 57814 57814 7
-Width: 544
-GlyphClass: 2
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE1D7
-Encoding: 57815 57815 8
+Encoding: 57815 57815 5
 Width: 1132
 GlyphClass: 2
 Flags: HW
@@ -306,16 +282,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1D8
-Encoding: 57816 57816 9
-Width: 544
-GlyphClass: 2
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE1D9
-Encoding: 57817 57817 10
+Encoding: 57817 57817 6
 Width: 1163
 GlyphClass: 2
 Flags: HW
@@ -362,16 +330,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1DA
-Encoding: 57818 57818 11
-Width: 544
-GlyphClass: 2
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE1DB
-Encoding: 57819 57819 12
+Encoding: 57819 57819 7
 Width: 1153
 GlyphClass: 2
 Flags: HW
@@ -427,16 +387,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1DC
-Encoding: 57820 57820 13
-Width: 544
-GlyphClass: 2
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE1DD
-Encoding: 57821 57821 14
+Encoding: 57821 57821 8
 Width: 1153
 GlyphClass: 2
 Flags: HW
@@ -504,7 +456,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE1DF
-Encoding: 57823 57823 15
+Encoding: 57823 57823 9
 Width: 1153
 GlyphClass: 2
 Flags: HW
@@ -581,16 +533,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1E0
-Encoding: 57824 57824 16
-Width: 544
-GlyphClass: 2
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE1E1
-Encoding: 57825 57825 17
+Encoding: 57825 57825 10
 Width: 1180
 GlyphClass: 2
 Flags: HW
@@ -677,16 +621,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1E2
-Encoding: 57826 57826 18
-Width: 544
-GlyphClass: 2
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE1E3
-Encoding: 57827 57827 19
+Encoding: 57827 57827 11
 Width: 1163
 GlyphClass: 2
 Flags: HW
@@ -783,16 +719,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1E4
-Encoding: 57828 57828 20
-Width: 544
-GlyphClass: 2
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE1E5
-Encoding: 57829 57829 21
+Encoding: 57829 57829 12
 Width: 1163
 GlyphClass: 2
 Flags: HW
@@ -899,16 +827,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1E6
-Encoding: 57830 57830 22
-Width: 544
-GlyphClass: 2
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE1E7
-Encoding: 57831 57831 23
+Encoding: 57831 57831 13
 Width: 417
 GlyphClass: 2
 Flags: HW
@@ -924,7 +844,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE550
-Encoding: 58704 58704 24
+Encoding: 58704 58704 14
 Width: 480
 GlyphClass: 2
 Flags: HW
@@ -942,7 +862,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE551
-Encoding: 58705 58705 25
+Encoding: 58705 58705 15
 Width: 774
 GlyphClass: 2
 Flags: HW
@@ -960,7 +880,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE552
-Encoding: 58706 58706 26
+Encoding: 58706 58706 16
 Width: 1102
 GlyphClass: 2
 Flags: HW
@@ -977,22 +897,8 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: uniE1E8
-Encoding: 57832 57832 27
-Width: 872
-Flags: HW
-LayerCount: 2
-EndChar
-
-StartChar: uniE1DE
-Encoding: 57822 57822 28
-Width: 921
-Flags: HW
-LayerCount: 2
-EndChar
-
 StartChar: uniE260
-Encoding: 57952 57952 29
+Encoding: 57952 57952 17
 Width: 611
 Flags: HW
 LayerCount: 2
@@ -1022,7 +928,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE261
-Encoding: 57953 57953 30
+Encoding: 57953 57953 18
 Width: 507
 Flags: HW
 LayerCount: 2
@@ -1046,7 +952,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE262
-Encoding: 57954 57954 31
+Encoding: 57954 57954 19
 Width: 612
 Flags: HW
 LayerCount: 2
@@ -1090,7 +996,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA5C
-Encoding: 59996 59996 32
+Encoding: 59996 59996 20
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1132,7 +1038,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA50
-Encoding: 59984 59984 33
+Encoding: 59984 59984 21
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1160,7 +1066,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA51
-Encoding: 59985 59985 34
+Encoding: 59985 59985 22
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1189,7 +1095,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA52
-Encoding: 59986 59986 35
+Encoding: 59986 59986 23
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1220,7 +1126,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA53
-Encoding: 59987 59987 36
+Encoding: 59987 59987 24
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1258,7 +1164,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA54
-Encoding: 59988 59988 37
+Encoding: 59988 59988 25
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1299,7 +1205,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA55
-Encoding: 59989 59989 38
+Encoding: 59989 59989 26
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1325,7 +1231,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA56
-Encoding: 59990 59990 39
+Encoding: 59990 59990 27
 Width: 1168
 Flags: HW
 LayerCount: 2
@@ -1359,7 +1265,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA57
-Encoding: 59991 59991 40
+Encoding: 59991 59991 28
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1400,7 +1306,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA58
-Encoding: 59992 59992 41
+Encoding: 59992 59992 29
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1449,7 +1355,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA59
-Encoding: 59993 59993 42
+Encoding: 59993 59993 30
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1497,7 +1403,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA5A
-Encoding: 59994 59994 43
+Encoding: 59994 59994 31
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1552,7 +1458,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA5B
-Encoding: 59995 59995 44
+Encoding: 59995 59995 32
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1587,7 +1493,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA5D
-Encoding: 59997 59997 45
+Encoding: 59997 59997 33
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1609,7 +1515,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA5E
-Encoding: 59998 59998 46
+Encoding: 59998 59998 34
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1638,7 +1544,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA5F
-Encoding: 59999 59999 47
+Encoding: 59999 59999 35
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1668,7 +1574,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA60
-Encoding: 60000 60000 48
+Encoding: 60000 60000 36
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1713,7 +1619,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA61
-Encoding: 60001 60001 49
+Encoding: 60001 60001 37
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1753,7 +1659,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniEA62
-Encoding: 60002 60002 50
+Encoding: 60002 60002 38
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1801,7 +1707,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniECC0
-Encoding: 60608 60608 51
+Encoding: 60608 60608 39
 Width: 1024
 Flags: HW
 LayerCount: 2
@@ -1831,7 +1737,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE263
-Encoding: 57955 57955 52
+Encoding: 57955 57955 40
 Width: 790
 Flags: HW
 LayerCount: 2
@@ -1870,7 +1776,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE264
-Encoding: 57956 57956 53
+Encoding: 57956 57956 41
 Width: 1087
 Flags: HW
 LayerCount: 2
@@ -1918,7 +1824,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE520
-Encoding: 58656 58656 54
+Encoding: 58656 58656 42
 Width: 1112
 Flags: HW
 LayerCount: 2
@@ -1979,7 +1885,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE521
-Encoding: 58657 58657 55
+Encoding: 58657 58657 43
 Width: 1459
 Flags: HW
 LayerCount: 2
@@ -2029,7 +1935,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE522
-Encoding: 58658 58658 56
+Encoding: 58658 58658 44
 Width: 840
 Flags: HW
 LayerCount: 2
@@ -2091,7 +1997,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE523
-Encoding: 58659 58659 57
+Encoding: 58659 58659 45
 Width: 813
 Flags: HW
 LayerCount: 2
@@ -2123,7 +2029,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE524
-Encoding: 58660 58660 58
+Encoding: 58660 58660 46
 Width: 700
 Flags: HW
 LayerCount: 2
@@ -2166,7 +2072,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE525
-Encoding: 58661 58661 59
+Encoding: 58661 58661 47
 Width: 937
 Flags: HW
 LayerCount: 2
@@ -2200,7 +2106,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE526
-Encoding: 58662 58662 60
+Encoding: 58662 58662 48
 Width: 1042
 Flags: HW
 LayerCount: 2
@@ -2242,7 +2148,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE527
-Encoding: 58663 58663 61
+Encoding: 58663 58663 49
 Width: 6530
 Flags: HW
 LayerCount: 2
@@ -2470,7 +2376,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE528
-Encoding: 58664 58664 62
+Encoding: 58664 58664 50
 Width: 5444
 Flags: HW
 LayerCount: 2
@@ -2662,7 +2568,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE529
-Encoding: 58665 58665 63
+Encoding: 58665 58665 51
 Width: 4369
 Flags: HW
 LayerCount: 2
@@ -2818,7 +2724,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE52A
-Encoding: 58666 58666 64
+Encoding: 58666 58666 52
 Width: 3287
 Flags: HW
 LayerCount: 2
@@ -2938,7 +2844,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE52B
-Encoding: 58667 58667 65
+Encoding: 58667 58667 53
 Width: 2233
 Flags: HW
 LayerCount: 2
@@ -3048,7 +2954,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE52C
-Encoding: 58668 58668 66
+Encoding: 58668 58668 54
 Width: 2661
 Flags: HW
 LayerCount: 2
@@ -3133,7 +3039,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE52D
-Encoding: 58669 58669 67
+Encoding: 58669 58669 55
 Width: 2301
 Flags: HW
 LayerCount: 2
@@ -3216,7 +3122,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE52E
-Encoding: 58670 58670 68
+Encoding: 58670 58670 56
 Width: 2039
 Flags: HW
 LayerCount: 2
@@ -3297,7 +3203,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE52F
-Encoding: 58671 58671 69
+Encoding: 58671 58671 57
 Width: 1733
 Flags: HW
 LayerCount: 2
@@ -3366,7 +3272,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE530
-Encoding: 58672 58672 70
+Encoding: 58672 58672 58
 Width: 2487
 Flags: HW
 LayerCount: 2
@@ -3462,7 +3368,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE531
-Encoding: 58673 58673 71
+Encoding: 58673 58673 59
 Width: 3326
 Flags: HW
 LayerCount: 2
@@ -3581,7 +3487,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE532
-Encoding: 58674 58674 72
+Encoding: 58674 58674 60
 Width: 4169
 Flags: HW
 LayerCount: 2
@@ -3728,7 +3634,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE533
-Encoding: 58675 58675 73
+Encoding: 58675 58675 61
 Width: 5009
 Flags: HW
 LayerCount: 2
@@ -3905,7 +3811,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE534
-Encoding: 58676 58676 74
+Encoding: 58676 58676 62
 Width: 2032
 Flags: HW
 LayerCount: 2
@@ -3986,7 +3892,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE535
-Encoding: 58677 58677 75
+Encoding: 58677 58677 63
 Width: 1774
 Flags: HW
 LayerCount: 2
@@ -4053,7 +3959,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE536
-Encoding: 58678 58678 76
+Encoding: 58678 58678 64
 Width: 1540
 Flags: HW
 LayerCount: 2
@@ -4125,7 +4031,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE537
-Encoding: 58679 58679 77
+Encoding: 58679 58679 65
 Width: 2740
 Flags: HW
 LayerCount: 2
@@ -4235,7 +4141,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE538
-Encoding: 58680 58680 78
+Encoding: 58680 58680 66
 Width: 3822
 Flags: HW
 LayerCount: 2
@@ -4380,7 +4286,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE539
-Encoding: 58681 58681 79
+Encoding: 58681 58681 67
 Width: 2254
 Flags: HW
 LayerCount: 2
@@ -4476,7 +4382,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE53A
-Encoding: 58682 58682 80
+Encoding: 58682 58682 68
 Width: 3453
 Flags: HW
 LayerCount: 2
@@ -4610,7 +4516,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE53B
-Encoding: 58683 58683 81
+Encoding: 58683 58683 69
 Width: 3096
 Flags: HW
 LayerCount: 2
@@ -4739,7 +4645,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE53C
-Encoding: 58684 58684 82
+Encoding: 58684 58684 70
 Width: 1651
 Flags: HW
 LayerCount: 2
@@ -4804,7 +4710,7 @@ EndSplineSet
 EndChar
 
 StartChar: uniE53D
-Encoding: 58685 58685 83
+Encoding: 58685 58685 71
 Width: 2365
 Flags: HW
 LayerCount: 2
@@ -4893,7 +4799,7 @@ EndSplineSet
 EndChar
 
 StartChar: uni266E
-Encoding: 9838 9838 84
+Encoding: 9838 9838 72
 Width: 507
 Flags: HW
 LayerCount: 2
@@ -4917,7 +4823,7 @@ EndSplineSet
 EndChar
 
 StartChar: uni266F
-Encoding: 9839 9839 85
+Encoding: 9839 9839 73
 Width: 612
 Flags: HW
 LayerCount: 2
@@ -4961,7 +4867,7 @@ EndSplineSet
 EndChar
 
 StartChar: uni266D
-Encoding: 9837 9837 86
+Encoding: 9837 9837 74
 Width: 611
 Flags: HW
 LayerCount: 2
@@ -4989,5 +4895,342 @@ SplineSet
  287.5 827.5 l 1
 EndSplineSet
 EndChar
+
+StartChar: uniE045
+Encoding: 57413 57413 75
+Width: 1938
+VWidth: 4617
+Flags: HW
+HStem: -31.57 49.61<1358.46 1529.45> 0 151.085<902.546 1034.86 1803.65 1930.96> 0 38.335<263.551 490.449> 0 22.55<0 51.0437> 865.92 45.1<451.649 676.852 1509.98 1679> 890.725 20.295<191.675 239.603>
+VStem: 825.33 162.36<318.072 742.012> 897.49 142.065<3.81377 146.399> 1323.68 119.515<604.187 826.354> 1614.58 119.515<88.8486 324.395> 1761.16 22.55<642.675 694.998> 1790.47 148.83<4.47478 131.284>
+LayerCount: 2
+Fore
+SplineSet
+299.915039062 818.565429688 m 1x12f0
+ 299.915039062 872.684570312 259.325195312 877.1953125 191.674804688 890.724609375 c 1
+ 191.674804688 911.020507812 l 5x16f0
+ 534.434570312 911.020507812 l 2
+ 836.604492188 911.020507812 987.690429688 786.995117188 987.690429688 536.690429688 c 0
+ 987.690429688 428.450195312 958.375 331.484375 899.745117188 248.049804688 c 1
+ 793.759765625 101.474609375 588.5546875 0 349.525390625 0 c 2x2af0
+ 0 0 l 1
+ 0 22.5498046875 l 1
+ 72.1591796875 22.5498046875 115.004882812 74.4150390625 115.004882812 144.3203125 c 1
+ 293.150390625 786.995117188 l 1
+ 297.659179688 807.290039062 l 1
+ 299.915039062 818.565429688 l 1x12f0
+825.330078125 561.495117188 m 0
+ 825.330078125 764.4453125 737.384765625 868.174804688 536.690429688 868.174804688 c 0
+ 498.354492188 868.174804688 464.530273438 865.919921875 451 843.370117188 c 1
+ 248.049804688 115.004882812 l 1
+ 243.540039062 90.2001953125 l 1
+ 248.049804688 56.375 281.875 38.3349609375 345.015625 38.3349609375 c 0x22f0
+ 658.459960938 38.3349609375 825.330078125 245.794921875 825.330078125 561.495117188 c 0
+1587.52050781 865.919921875 m 0x08f0
+ 1508.59570312 865.919921875 1443.20019531 807.290039062 1443.20019531 728.365234375 c 0
+ 1443.20019531 690.029296875 1454.47460938 653.950195312 1477.02539062 622.379882812 c 1
+ 1522.125 568.259765625 1535.65527344 552.474609375 1585.265625 509.629882812 c 1
+ 1614.58007812 473.549804688 1666.4453125 412.665039062 1693.50488281 376.584960938 c 1
+ 1720.56542969 333.740234375 1734.09570312 290.895507812 1734.09570312 243.540039062 c 0
+ 1734.09570312 184.909179688 1713.79980469 139.809570312 1691.25 96.9658203125 c 1
+ 1661.93457031 54.1201171875 1625.85449219 20.294921875 1587.52050781 0 c 1x18f0
+ 1553.6953125 -22.5498046875 1510.84960938 -31.5703125 1454.47460938 -31.5703125 c 0x80f0
+ 1429.66992188 -31.5703125 1391.33496094 -20.294921875 1339.47070312 0 c 1
+ 1303.390625 9.0205078125 1267.30957031 11.275390625 1244.75976562 22.5498046875 c 1
+ 1228.97460938 22.5498046875 1217.70019531 13.5302734375 1208.6796875 0 c 1x10f0
+ 1199.65917969 -2.2548828125 1192.89550781 -11.275390625 1190.640625 -29.3154296875 c 1
+ 1163.58007812 -29.3154296875 l 1
+ 1210.93457031 275.109375 l 1
+ 1244.75976562 275.109375 l 1
+ 1237.99511719 236.775390625 l 1
+ 1237.99511719 202.950195312 1244.75976562 178.145507812 1249.27050781 153.340820312 c 1
+ 1258.29003906 128.534179688 1274.07519531 105.984375 1298.87988281 81.1796875 c 1
+ 1332.70507812 38.3349609375 1377.8046875 18.0400390625 1438.69042969 18.0400390625 c 0
+ 1492.80957031 18.0400390625 1533.40039062 36.080078125 1560.45996094 72.1591796875 c 1
+ 1596.54003906 105.984375 1614.58007812 148.830078125 1614.58007812 196.184570312 c 0
+ 1614.58007812 241.284179688 1603.3046875 277.365234375 1583.00976562 304.424804688 c 1
+ 1555.95019531 333.740234375 1537.90917969 360.799804688 1508.59570312 390.115234375 c 0
+ 1497.3203125 401.390625 1483.79003906 414.919921875 1470.25976562 430.705078125 c 0
+ 1420.65039062 478.059570312 1384.5703125 520.904296875 1359.765625 561.495117188 c 1
+ 1334.95996094 590.809570312 1323.68457031 631.400390625 1323.68457031 683.265625 c 0
+ 1323.68457031 768.955078125 1341.72460938 802.780273438 1393.59082031 845.625 c 1
+ 1436.43457031 888.470703125 1492.80957031 911.020507812 1562.71582031 911.020507812 c 0x88f0
+ 1616.83496094 911.020507812 1657.42480469 906.509765625 1684.484375 895.234375 c 1
+ 1709.29003906 879.450195312 1731.84082031 872.684570312 1754.390625 872.684570312 c 0
+ 1770.17480469 872.684570312 1788.21582031 886.215820312 1808.50976562 911.020507812 c 1
+ 1837.82519531 911.020507812 l 1x04f0
+ 1783.70507812 642.674804688 l 1
+ 1761.15527344 642.674804688 l 1
+ 1761.15527344 791.504882812 1702.52539062 865.919921875 1587.52050781 865.919921875 c 0x08f0
+969.650390625 0 m 0x41f0
+ 924.549804688 0 897.490234375 27.0595703125 897.490234375 74.4150390625 c 0
+ 897.490234375 121.770507812 935.825195312 151.084960938 969.650390625 151.084960938 c 0
+ 987.690429688 151.084960938 1003.47460938 142.065429688 1017.00488281 124.025390625 c 1
+ 1032.79003906 115.004882812 1039.5546875 99.220703125 1039.5546875 74.4150390625 c 0
+ 1039.5546875 38.3349609375 1010.24023438 0 969.650390625 0 c 0x41f0
+1869.39550781 0 m 0
+ 1824.29492188 0 1797.234375 24.8046875 1790.47070312 63.140625 c 1
+ 1790.47070312 101.474609375 1828.8046875 137.5546875 1869.39550781 137.5546875 c 0
+ 1912.24023438 137.5546875 1939.29980469 110.495117188 1939.29980469 63.140625 c 0
+ 1939.29980469 22.5498046875 1905.47460938 0 1869.39550781 0 c 0
+EndSplineSet
+EndChar
+
+StartChar: uniE046
+Encoding: 57414 57414 76
+Width: 2107
+VWidth: 4617
+Flags: HW
+HStem: -49.61 72.16<1402.21 1665.75> 0 151.085<902.546 1034.54 1973.49 2091.79> 0 38.335<263.551 470.709> 0 22.55<0 50.9614> 868.175 42.845<453.771 665.011 1603.36 1814.15> 890.725 20.295<191.675 236.405>
+VStem: 825.33 162.36<322.224 741.514> 897.49 142.065<3.81377 146.399> 1141.03 157.85<134.794 552.527> 1932.54 24.805<629.145 698.87> 1964.11 144.32<3.94257 116.623>
+LayerCount: 2
+Fore
+SplineSet
+0 22.5498046875 m 1x12e0
+ 74.4150390625 22.5498046875 108.240234375 74.4150390625 115.004882812 144.3203125 c 1
+ 293.150390625 786.995117188 l 1
+ 297.659179688 807.290039062 l 1
+ 299.915039062 818.565429688 l 1
+ 299.915039062 836.604492188 293.150390625 850.134765625 281.875 861.409179688 c 0
+ 270.599609375 872.684570312 239.030273438 881.705078125 191.674804688 890.724609375 c 1
+ 191.674804688 911.020507812 l 1x16e0
+ 534.434570312 911.020507812 l 2
+ 836.604492188 911.020507812 987.690429688 786.995117188 987.690429688 536.690429688 c 0
+ 987.690429688 428.450195312 958.375 331.484375 899.745117188 248.049804688 c 0
+ 789.25 103.729492188 593.065429688 0 349.525390625 0 c 2x2ae0
+ 0 0 l 1
+ 0 22.5498046875 l 1x12e0
+825.330078125 561.495117188 m 0
+ 825.330078125 762.190429688 737.384765625 868.174804688 536.690429688 868.174804688 c 4
+ 498.354492188 868.174804688 464.530273438 865.919921875 451 843.370117188 c 1
+ 248.049804688 115.004882812 l 1
+ 243.540039062 90.2001953125 l 1
+ 248.049804688 56.375 281.875 38.3349609375 345.015625 38.3349609375 c 0x2ae0
+ 435.215820312 38.3349609375 518.650390625 63.140625 593.065429688 115.004882812 c 1
+ 669.734375 160.104492188 723.854492188 218.734375 764.4453125 299.915039062 c 1
+ 805.034179688 367.565429688 825.330078125 455.509765625 825.330078125 561.495117188 c 0
+1526.63476562 22.5498046875 m 0x84e0
+ 1684.484375 22.5498046875 1779.1953125 90.2001953125 1862.62988281 189.419921875 c 1
+ 1880.66992188 166.870117188 l 1
+ 1774.68457031 22.5498046875 1646.15039062 -49.609375 1495.06542969 -49.609375 c 0x84e0
+ 1427.41503906 -49.609375 1364.27539062 -33.8251953125 1307.90039062 0 c 1
+ 1258.29003906 33.8251953125 1217.70019531 90.2001953125 1183.875 144.3203125 c 1
+ 1154.55957031 202.950195312 1141.02929688 266.090820312 1141.02929688 335.995117188 c 0
+ 1141.02929688 432.959960938 1165.83496094 525.415039062 1217.70019531 615.615234375 c 1
+ 1271.8203125 703.559570312 1341.72460938 775.720703125 1429.66992188 836.604492188 c 1
+ 1519.87011719 888.470703125 1612.32519531 915.530273438 1709.29003906 915.530273438 c 2
+ 1749.87988281 915.530273438 l 2
+ 1765.66503906 915.530273438 1776.94042969 913.275390625 1783.70507812 911.020507812 c 2x18e0
+ 1864.88476562 895.234375 l 1
+ 1928.02539062 877.1953125 l 1
+ 1984.40039062 911.020507812 l 1
+ 2006.95019531 911.020507812 l 1
+ 1957.34082031 629.145507812 l 1
+ 1932.53417969 629.145507812 l 1
+ 1932.53417969 705.815429688 1914.49511719 764.4453125 1876.15917969 807.290039062 c 1
+ 1833.31542969 845.625 1781.45019531 865.919921875 1716.0546875 865.919921875 c 0
+ 1616.83496094 865.919921875 1551.44042969 832.095703125 1497.3203125 777.974609375 c 1
+ 1431.92480469 721.599609375 1384.5703125 651.6953125 1353 563.75 c 1
+ 1332.70507812 518.650390625 1319.17480469 478.059570312 1312.40917969 441.979492188 c 0
+ 1305.64550781 405.900390625 1298.87988281 365.309570312 1298.87988281 317.955078125 c 0
+ 1298.87988281 220.990234375 1312.40917969 162.359375 1355.25488281 105.984375 c 1
+ 1393.59082031 49.609375 1449.96582031 22.5498046875 1526.63476562 22.5498046875 c 0x84e0
+969.650390625 0 m 0x41e0
+ 924.549804688 0 897.490234375 27.0595703125 897.490234375 74.4150390625 c 0
+ 897.490234375 121.770507812 935.825195312 151.084960938 969.650390625 151.084960938 c 0
+ 987.690429688 151.084960938 1003.47460938 142.065429688 1017.00488281 124.025390625 c 1
+ 1032.79003906 115.004882812 1039.5546875 99.220703125 1039.5546875 74.4150390625 c 0
+ 1039.5546875 38.3349609375 1007.984375 0 969.650390625 0 c 0x41e0
+2038.52050781 0 m 0
+ 1997.9296875 0 1968.61523438 27.0595703125 1964.10449219 63.140625 c 1
+ 1964.10449219 87.9453125 1970.87011719 105.984375 1986.65527344 115.004882812 c 1
+ 2000.18457031 130.790039062 2018.22460938 137.5546875 2038.52050781 137.5546875 c 0
+ 2056.55957031 137.5546875 2074.59960938 130.790039062 2092.640625 117.259765625 c 1
+ 2103.91503906 103.729492188 2108.42480469 85.6904296875 2108.42480469 63.140625 c 0
+ 2108.42480469 24.8046875 2076.85449219 0 2038.52050781 0 c 0
+EndSplineSet
+EndChar
+
+StartChar: uniE047
+Encoding: 57415 57415 77
+Width: 926
+VWidth: 4617
+Flags: HW
+HStem: 0 87.945<547.137 732.458> 347.27 166.87<8.41246 161.165> 644.93 166.87<766.407 918.752> 1068.87 87.945<180.584 355.832>
+VStem: 0 169.125<354.026 506.182> 49.61 108.24<836.869 1035.81> 326.975 180.4<914.605 1010.24> 408.155 184.91<93.559 238.43> 757.68 101.475<118.712 320.034> 759.935 166.87<651.589 804.471>
+LayerCount: 2
+Fore
+SplineSet
+243.540039062 1068.87011719 m 0xf680
+ 193.9296875 1068.87011719 157.849609375 1001.22070312 157.849609375 942.590820312 c 0
+ 157.849609375 820.8203125 322.465820312 750.915039062 473.549804688 681.009765625 c 1
+ 784.740234375 1143.28417969 l 1
+ 877.1953125 1143.28417969 l 1
+ 547.965820312 644.9296875 l 1
+ 640.419921875 597.575195312 712.580078125 545.709960938 764.4453125 493.845703125 c 0
+ 827.584960938 428.450195312 859.155273438 354.034179688 859.155273438 275.109375 c 0
+ 859.155273438 121.770507812 737.384765625 0 579.534179688 0 c 0
+ 489.334960938 0 408.155273438 74.4150390625 408.155273438 164.615234375 c 0
+ 408.155273438 214.224609375 455.509765625 250.3046875 505.120117188 250.3046875 c 0
+ 556.984375 250.3046875 581.790039062 211.970703125 593.065429688 164.615234375 c 0xf580
+ 606.595703125 112.75 629.145507812 87.9453125 662.970703125 87.9453125 c 0
+ 723.854492188 87.9453125 757.6796875 139.809570312 757.6796875 209.715820312 c 0
+ 757.6796875 239.030273438 750.915039062 261.580078125 739.640625 281.875 c 0
+ 719.345703125 320.209960938 665.224609375 363.0546875 577.279296875 410.409179688 c 1
+ 509.629882812 444.234375 509.629882812 444.234375 441.979492188 478.059570312 c 1
+ 139.809570312 9.0205078125 l 1
+ 49.609375 9.0205078125 l 1
+ 367.565429688 511.884765625 l 1
+ 257.0703125 563.75 175.890625 624.634765625 121.770507812 692.284179688 c 0
+ 74.4150390625 753.169921875 49.609375 816.309570312 49.609375 881.705078125 c 0
+ 49.609375 987.690429688 105.984375 1062.10449219 171.379882812 1111.71582031 c 0
+ 209.715820312 1141.02929688 254.815429688 1156.81542969 302.169921875 1156.81542969 c 0
+ 405.900390625 1156.81542969 507.375 1084.65429688 507.375 983.1796875 c 0
+ 507.375 933.5703125 455.509765625 902 405.900390625 902 c 0
+ 363.0546875 902 338.25 920.040039062 326.974609375 958.375 c 2
+ 311.190429688 1010.24023438 l 2
+ 299.915039062 1048.57519531 277.365234375 1068.87011719 243.540039062 1068.87011719 c 0xf680
+169.125 432.959960938 m 1xf8
+ 169.125 385.604492188 133.044921875 347.270507812 87.9453125 347.270507812 c 1
+ 36.080078125 347.270507812 0 376.584960938 0 426.1953125 c 0
+ 0 473.549804688 33.8251953125 514.140625 81.1796875 514.140625 c 0
+ 130.790039062 514.140625 169.125 480.315429688 169.125 432.959960938 c 1xf8
+759.934570312 726.109375 m 0xf040
+ 759.934570312 780.229492188 796.015625 811.799804688 843.370117188 811.799804688 c 0
+ 895.234375 811.799804688 926.8046875 768.955078125 926.8046875 728.365234375 c 0
+ 926.8046875 676.5 888.470703125 644.9296875 843.370117188 644.9296875 c 0
+ 791.504882812 644.9296875 759.934570312 683.265625 759.934570312 726.109375 c 0xf040
+EndSplineSet
+EndChar
+
+StartChar: uniE048
+Encoding: 57416 57416 78
+Width: 1210
+VWidth: 4617
+Flags: HWO
+HStem: 0 83.435<478.06 566.005> 525.415 90.2<0 146.575 376.585 566.005 644.93 832.095 1066.62 1210.93> 1062.11 78.925<644.93 726.428>
+VStem: 146.575 230.01<448.745 525.415 615.615 848.162> 566.005 78.925<-164.615 0 83.435 525.415 615.615 1062.11 1136.34 1307.9> 827.585 239.03<399.135 525.415 615.615 823.154>
+LayerCount: 2
+Fore
+SplineSet
+1210.93457031 525.415039062 m 1
+ 1066.61523438 525.415039062 l 1
+ 1066.61523438 489.334960938 1057.59570312 435.215820312 1037.29980469 360.799804688 c 1
+ 1005.72949219 272.854492188 l 1
+ 969.650390625 202.950195312 l 1
+ 940.334960938 164.615234375 902 112.75 863.665039062 83.4345703125 c 0
+ 814.0546875 45.099609375 735.129882812 22.5498046875 644.9296875 0 c 1
+ 644.9296875 -164.615234375 l 1
+ 566.004882812 -164.615234375 l 1
+ 566.004882812 0 l 1
+ 478.059570312 13.5302734375 l 2
+ 457.765625 15.7841796875 441.979492188 20.294921875 426.1953125 27.0595703125 c 0
+ 297.659179688 96.9658203125 225.5 193.9296875 175.890625 360.799804688 c 1
+ 146.575195312 448.745117188 l 1
+ 146.575195312 525.415039062 l 1
+ 0 525.415039062 l 1
+ 0 615.615234375 l 1
+ 146.575195312 615.615234375 l 1
+ 146.575195312 692.284179688 151.084960938 712.580078125 173.634765625 780.229492188 c 1
+ 187.165039062 834.349609375 214.224609375 897.490234375 241.284179688 938.080078125 c 1
+ 293.150390625 1005.72949219 l 1
+ 347.270507812 1062.10449219 l 1
+ 394.625 1098.18457031 414.919921875 1113.97070312 484.825195312 1125.24511719 c 0
+ 511.884765625 1129.75488281 538.9453125 1134.265625 566.004882812 1141.02929688 c 5
+ 566.004882812 1307.90039062 l 1
+ 644.9296875 1307.90039062 l 1
+ 644.9296875 1141.02929688 l 1
+ 692.284179688 1134.265625 748.659179688 1132.00976562 782.484375 1111.71582031 c 1
+ 811.799804688 1100.44042969 838.859375 1082.40039062 861.409179688 1062.10449219 c 0
+ 897.490234375 1032.79003906 933.5703125 989.9453125 969.650390625 938.080078125 c 1
+ 998.965820312 886.215820312 1066.61523438 696.794921875 1066.61523438 615.615234375 c 1
+ 1210.93457031 615.615234375 l 1
+ 1210.93457031 525.415039062 l 1
+832.095703125 615.615234375 m 1
+ 827.584960938 665.224609375 l 1
+ 827.584960938 748.659179688 l 2
+ 827.584960938 786.995117188 820.8203125 832.095703125 807.290039062 879.450195312 c 1
+ 793.759765625 958.375 721.599609375 1062.10449219 644.9296875 1062.10449219 c 1
+ 644.9296875 615.615234375 l 1
+ 832.095703125 615.615234375 l 1
+566.004882812 615.615234375 m 1
+ 566.004882812 1062.10449219 l 1
+ 532.1796875 1062.10449219 498.354492188 1041.80957031 462.275390625 1003.47460938 c 1
+ 428.450195312 960.629882812 408.155273438 922.294921875 401.390625 886.215820312 c 0
+ 394.625 845.625 390.115234375 805.034179688 383.349609375 764.4453125 c 1
+ 383.349609375 683.265625 l 2
+ 383.349609375 653.950195312 378.840820312 631.400390625 376.584960938 615.615234375 c 1
+ 566.004882812 615.615234375 l 1
+834.349609375 525.415039062 m 1
+ 644.9296875 525.415039062 l 1
+ 644.9296875 83.4345703125 l 1
+ 678.754882812 83.4345703125 714.834960938 101.474609375 748.659179688 137.5546875 c 0
+ 777.974609375 171.379882812 798.270507812 211.970703125 807.290039062 259.325195312 c 2
+ 827.584960938 399.134765625 l 1
+ 834.349609375 525.415039062 l 1
+566.004882812 83.4345703125 m 1
+ 566.004882812 525.415039062 l 1
+ 376.584960938 525.415039062 l 1
+ 376.584960938 478.059570312 l 1
+ 376.584960938 394.625 l 1
+ 376.584960938 299.915039062 410.409179688 198.440429688 460.020507812 137.5546875 c 1
+ 493.845703125 101.474609375 529.924804688 83.4345703125 566.004882812 83.4345703125 c 1
+EndSplineSet
+EndChar
+
+StartChar: uniE049
+Encoding: 57417 57417 79
+Width: 1210
+VWidth: 4617
+Flags: HW
+HStem: 0 83.435<376.585 566.005 644.93 832.095> 525.415 90.2<0 146.575 376.585 566.005 644.93 832.095 1066.62 1210.93> 1062.11 78.925<376.585 566.005 644.93 832.095>
+VStem: 146.575 230.01<83.435 525.415 615.615 1062.11> 566.005 78.925<-164.615 0 83.435 525.415 615.615 1062.11 1141.03 1307.9> 832.095 234.52<83.435 525.415 615.615 1062.11>
+LayerCount: 2
+Fore
+SplineSet
+1210.93457031 525.415039062 m 1
+ 1066.61523438 525.415039062 l 1
+ 1066.61523438 0 l 1
+ 644.9296875 0 l 1
+ 644.9296875 -164.615234375 l 1
+ 566.004882812 -164.615234375 l 1
+ 566.004882812 0 l 1
+ 146.575195312 0 l 1
+ 146.575195312 448.745117188 l 1
+ 146.575195312 525.415039062 l 1
+ 0 525.415039062 l 1
+ 0 615.615234375 l 1
+ 146.575195312 615.615234375 l 1
+ 146.575195312 1141.02929688 l 1
+ 566.004882812 1141.02929688 l 1
+ 566.004882812 1307.90039062 l 1
+ 644.9296875 1307.90039062 l 1
+ 644.9296875 1141.02929688 l 1
+ 1066.61523438 1141.02929688 l 1
+ 1066.61523438 615.615234375 l 1
+ 1210.93457031 615.615234375 l 1
+ 1210.93457031 525.415039062 l 1
+832.095703125 615.615234375 m 1
+ 832.095703125 1062.10449219 l 1
+ 644.9296875 1062.10449219 l 1
+ 644.9296875 615.615234375 l 1
+ 832.095703125 615.615234375 l 1
+566.004882812 615.615234375 m 1
+ 566.004882812 1062.10449219 l 1
+ 376.584960938 1062.10449219 l 1
+ 376.584960938 615.615234375 l 1
+ 566.004882812 615.615234375 l 1
+834.349609375 525.415039062 m 1
+ 644.9296875 525.415039062 l 1
+ 644.9296875 83.4345703125 l 1
+ 832.095703125 83.4345703125 l 0
+ 834.349609375 525.415039062 l 1
+566.004882812 83.4345703125 m 1
+ 566.004882812 525.415039062 l 1
+ 376.584960938 525.415039062 l 1
+ 376.584960938 83.4345703125 l 1
+ 566.004882812 83.4345703125 l 1
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont
diff --git a/fonts/VerovioText-1.0.svg b/fonts/VerovioText-1.0.svg
index e32de364f94..1dbfa878375 100644
--- a/fonts/VerovioText-1.0.svg
+++ b/fonts/VerovioText-1.0.svg
@@ -9,7 +9,7 @@ Version 1.0.6 - Adding dynamics
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20170730 at Wed Oct  9 09:20:07 2019
+Created by FontForge 20201107 at Wed Feb 16 13:37:42 2022
  By Laurent Pugin
 
 </metadata>
@@ -26,14 +26,9 @@ Created by FontForge 20170730 at Wed Oct  9 09:20:07 2019
     bbox="-518.4 -802.8 6598.8 4661.25"
     underline-thickness="102"
     underline-position="-102"
-    unicode-range="U+E1D0-ECC0"
+    unicode-range="U+266D-ECC0"
   />
-<missing-glyph horiz-adv-x="608" 
- />
-    <glyph glyph-name=".notdef" horiz-adv-x="608" 
- />
-    <glyph glyph-name=".notdef" horiz-adv-x="608" 
- />
+    <missing-glyph />
     <glyph glyph-name="uniE1D0" unicode="&#xe1d0;" horiz-adv-x="1342" 
 d="M68.75 167.75c0 -7.5 -7.5 -12.5 -20 -12.5h-28.75c-12.5 0 -20 5 -20 12.5v662.5c0 7.5 7.5 16.25 20 16.25h28.75c12.5 0 20 -8.75 20 -16.25v-662.5zM200 167.75c0 -7.5 -11.25 -12.5 -21.25 -12.5h-30c-10 0 -21.25 5 -21.25 12.5v662.5
 c0 7.5 11.25 16.25 21.25 16.25h30c10 0 21.25 -8.75 21.25 -16.25v-662.5zM681.25 779c207.5 0 457.5 -120 457.5 -278.75c0 -153.75 -117.5 -281.25 -481.25 -281.25c-330 0 -457.5 135 -457.5 281.25c0 153.75 183.75 278.75 481.25 278.75zM445 639
@@ -50,26 +45,18 @@ c15 -20 31.25 -36.25 46.25 -51.25c31.25 -25 68.75 -46.25 105 -58.75c20 -5 38.75
     <glyph glyph-name="uniE1D3" unicode="&#xe1d3;" horiz-adv-x="699" 
 d="M230 227.5c-130 0 -230 71.25 -230 196.25c0 122.5 110 397.5 466.25 397.5c71.25 0 130 -20 171.25 -56.25v1648.75h61.25v-1792.5c0 -78.75 -80 -393.75 -468.75 -393.75zM283.75 631.25c-163.75 -95 -215 -161.25 -215 -212.5c0 -15 8.75 -33.75 16.25 -46.25
 c15 -28.75 42.5 -53.75 93.75 -53.75s123.75 26.25 231.25 97.5c166.25 107.5 215 163.75 215 212.5c0 15 -6.25 31.25 -16.25 43.75c-15 31.25 -40 51.25 -83.75 51.25c-48.75 0 -123.75 -26.25 -241.25 -92.5z" />
-    <glyph glyph-name="uniE1D4" unicode="&#xe1d4;" horiz-adv-x="559" 
- />
     <glyph glyph-name="uniE1D5" unicode="&#xe1d5;" horiz-adv-x="682" 
 d="M620 760v1653.75h61.25v-1792.5c0 -195 -253.75 -386.25 -458.75 -386.25c-125 0 -222.5 71.25 -222.5 191.25c0 200 202.5 387.5 456.25 387.5c66.25 0 122.5 -17.5 163.75 -53.75z" />
-    <glyph glyph-name="uniE1D6" unicode="&#xe1d6;" horiz-adv-x="544" 
- />
     <glyph glyph-name="uniE1D7" unicode="&#xe1d7;" horiz-adv-x="1132" 
 d="M696.25 2465c36.25 -163.75 115 -307.5 212.5 -443.75c122.5 -171.25 215 -376.25 222.5 -593.75v-15c0 -112.5 -41.25 -266.25 -48.75 -283.75c-12.5 -25 -25 -36.25 -40 -36.25c-2.5 0 -11.25 0 -13.75 2.5c-12.5 7.5 -30 23.75 -30 48.75c0 10 0 17.5 5 27.5
 c33.75 76.25 46.25 160 46.25 238.75c0 102.5 -23.75 197.5 -46.25 258.75c-87.5 243.75 -235 302.5 -322.5 320v-1362.5c0 -195 -253.75 -383.75 -458.75 -383.75c-125 0 -222.5 72.5 -222.5 192.5c0 197.5 202.5 383.75 456.25 383.75c66.25 0 122.5 -17.5 163.75 -53.75
 v1717.5c0 20 7.5 20 20 20h12.5c17.5 0 36.25 -3.75 43.75 -37.5z" />
-    <glyph glyph-name="uniE1D8" unicode="&#xe1d8;" horiz-adv-x="544" 
- />
     <glyph glyph-name="uniE1D9" unicode="&#xe1d9;" horiz-adv-x="1163" 
 d="M1101.25 1453.75c0 -7.5 2.5 -13.75 2.5 -18.75c36.25 -71.25 58.75 -150 58.75 -232.5v-41.25c0 -95 -7.5 -205 -15 -215c-12.5 -25 -26.25 -33.75 -38.75 -33.75c-7.5 0 -11.25 3.75 -18.75 6.25c-10 2.5 -25 20 -25 45c0 5 0 11.25 2.5 16.25
 c10 61.25 15 117.5 15 173.75c0 102.5 -17.5 196.25 -63.75 288.75c-112.5 232.5 -232.5 272.5 -340 280v-1096.25c0 -195 -253.75 -383.75 -456.25 -383.75c-125 0 -222.5 72.5 -222.5 192.5c0 197.5 202.5 383.75 456.25 383.75c63.75 0 122.5 -17.5 163.75 -53.75v1730
 h30c12.5 0 36.25 -2.5 41.25 -22.5c31.25 -207.5 141.25 -238.75 246.25 -351.25c141.25 -151.25 190 -205 210 -337.5c5 -22.5 5 -46.25 5 -68.75c0 -120 -41.25 -236.25 -48.75 -248.75c-2.5 -5 -2.5 -7.5 -2.5 -12.5zM1077.5 1655c2.5 12.5 2.5 26.25 2.5 38.75
 c0 63.75 -20 122.5 -53.75 173.75c-63.75 95 -168.75 202.5 -286.25 202.5h-17.5c-12.5 0 -26.25 -10 -26.25 -17.5c0 -2.5 0 -5 2.5 -7.5c41.25 -158.75 127.5 -205 220 -310c41.25 -46.25 73.75 -85 105 -133.75c5 -7.5 7.5 -7.5 15 -7.5c10 0 21.25 5 23.75 10
 c10 15 10 36.25 15 51.25z" />
-    <glyph glyph-name="uniE1DA" unicode="&#xe1da;" horiz-adv-x="544" 
- />
     <glyph glyph-name="uniE1DB" unicode="&#xe1db;" horiz-adv-x="1153" 
 d="M1152.5 1210v-56.25c0 -90 -8.75 -185 -13.75 -195c-15 -22.5 -27.5 -32.5 -40 -32.5c-5 0 -8.75 2.5 -13.75 2.5c-15 7.5 -25 26.25 -25 51.25v12.5c10 58.75 17.5 117.5 17.5 173.75c0 100 -17.5 192.5 -63.75 282.5c-112.5 227.5 -230 263.75 -335 271.25v-1093.75
 c0 -195 -253.75 -383.75 -456.25 -383.75c-125 0 -222.5 72.5 -222.5 192.5c0 197.5 202.5 383.75 456.25 383.75c63.75 0 122.5 -17.5 163.75 -53.75v2103.75s10 26.25 22.5 26.25s38.75 -21.25 41.25 -41.25c36.25 -205 145 -236.25 247.5 -348.75
@@ -77,8 +64,6 @@ c138.75 -148.75 185 -205 207.5 -327.5c2.5 -20 2.5 -38.75 2.5 -58.75c0 -78.75 -20
 c31.25 -71.25 48.75 -151.25 53.75 -230zM1067.5 1655c2.5 15 2.5 31.25 2.5 48.75c0 58.75 -17.5 115 -51.25 163.75c-61.25 95 -166.25 197.5 -296.25 197.5c-10 0 -26.25 -22.5 -26.25 -25c41.25 -158.75 130 -200 220 -305l10 -10
 c33.75 -41.25 61.25 -77.5 92.5 -121.25c2.5 -7.5 10 -10 15 -10c10 0 21.25 8.75 23.75 13.75c5 15 5 30 10 47.5zM1070 2075c0 15 5 28.75 5 43.75c0 28.75 -7.5 58.75 -30 100c-112.5 190 -233.75 237.5 -346.25 237.5c33.75 -197.5 132.5 -232.5 232.5 -342.5
 c46.25 -51.25 85 -88.75 113.75 -127.5c10 36.25 20 68.75 25 88.75z" />
-    <glyph glyph-name="uniE1DC" unicode="&#xe1dc;" horiz-adv-x="544" 
- />
     <glyph glyph-name="uniE1DD" unicode="&#xe1dd;" horiz-adv-x="1153" 
 d="M1098.75 1442.5c31.25 -73.75 48.75 -151.25 53.75 -230v-58.75c0 -87.5 -8.75 -182.5 -13.75 -195c-15 -20 -27.5 -30 -40 -30c-5 0 -8.75 0 -13.75 2.5c-15 7.5 -25 26.25 -25 48.75v15c10 58.75 17.5 117.5 17.5 173.75c0 97.5 -17.5 190 -63.75 282.5
 c-112.5 227.5 -230 263.75 -335 271.25v-1096.25c0 -195 -253.75 -383.75 -456.25 -383.75c-125 0 -222.5 72.5 -222.5 192.5c0 197.5 202.5 383.75 456.25 383.75c63.75 0 122.5 -17.5 163.75 -53.75v2511.25s10 25 22.5 25s38.75 -20 41.25 -37.5
@@ -96,8 +81,6 @@ M1067.5 1655c2.5 17.5 2.5 33.75 2.5 51.25c0 58.75 -17.5 112.5 -51.25 163.75c-61.
 c10 0 21.25 8.75 23.75 13.75c5 15 5 30 10 45zM1070 2077.5c0 15 5 28.75 5 43.75c0 25 -7.5 56.25 -30 97.5c-112.5 192.5 -233.75 240 -346.25 240c33.75 -200 132.5 -232.5 232.5 -342.5c46.25 -51.25 85 -91.25 113.75 -127.5c10 36.25 20 68.75 25 88.75zM1070 2485
 c0 12.5 5 26.25 5 41.25c0 28.75 -7.5 58.75 -30 100c-112.5 187.5 -231.25 237.5 -348.75 237.5c2.5 0 2.5 -5 2.5 -7.5c33.75 -205 130 -238.75 232.5 -348.75c46.25 -51.25 82.5 -88.75 111.25 -125zM1070 2863.75c0 15 5 28.75 5 43.75c0 28.75 -7.5 58.75 -30 100
 c-112.5 190 -236.25 237.5 -348.75 237.5c36.25 -190 137.5 -222.5 235 -330c48.75 -53.75 87.5 -93.75 116.25 -132.5c10 33.75 17.5 63.75 22.5 81.25z" />
-    <glyph glyph-name="uniE1E0" unicode="&#xe1e0;" horiz-adv-x="544" 
- />
     <glyph glyph-name="uniE1E1" unicode="&#xe1e1;" horiz-adv-x="1180" 
 d="M1152.5 2136.25c5 -20 7.5 -43.75 7.5 -66.25c0 -76.25 -18.75 -153.75 -36.25 -210c7.5 -22.5 15 -50 17.5 -81.25c5 -22.5 8.75 -50 8.75 -72.5c0 -120 -43.75 -232.5 -48.75 -245v-10v-18.75c33.75 -73.75 51.25 -153.75 56.25 -230c0 -17.5 2.5 -38.75 2.5 -58.75
 c0 -90 -8.75 -187.5 -18.75 -197.5c-10 -25 -22.5 -36.25 -37.5 -36.25c-5 0 -13.75 3.75 -16.25 6.25c-15 2.5 -27.5 22.5 -27.5 45c0 7.5 0 11.25 2.5 18.75c10 61.25 17.5 117.5 17.5 173.75c0 100 -20 193.75 -61.25 283.75c-112.5 235 -232.5 272.5 -337.5 280
@@ -108,8 +91,6 @@ c38.75 -41.25 68.75 -82.5 100 -133.75c5 -5 10 -7.5 17.5 -7.5c10 0 21.25 7.5 23.7
 c41.25 -163.75 138.75 -197.5 238.75 -300c51.25 -56.25 88.75 -100 117.5 -138.75c7.5 22.5 12.5 42.5 15 57.5zM1070 2416.25c5 15 7.5 28.75 7.5 46.25c0 25 -7.5 55 -30 96.25c-112.5 192.5 -236.25 241.25 -348.75 241.25c41.25 -173.75 138.75 -225 238.75 -335
 l112.5 -126.25c7.5 28.75 17.5 60 20 77.5zM1070 2800c5 12.5 7.5 28.75 7.5 43.75c0 28.75 -7.5 55 -30 93.75c-112.5 195 -236.25 243.75 -348.75 243.75c41.25 -173.75 138.75 -225 238.75 -335l112.5 -126.25c7.5 31.25 17.5 62.5 20 80zM1070 3181.25
 c5 15 7.5 31.25 7.5 46.25c0 25 -7.5 56.25 -30 95c-112.5 195 -236.25 242.5 -348.75 242.5c41.25 -173.75 138.75 -225 238.75 -335l112.5 -125c7.5 28.75 17.5 58.75 20 76.25z" />
-    <glyph glyph-name="uniE1E2" unicode="&#xe1e2;" horiz-adv-x="544" 
- />
     <glyph glyph-name="uniE1E3" unicode="&#xe1e3;" horiz-adv-x="1163" 
 d="M1106.25 1415c33.75 -76.25 51.25 -153.75 56.25 -230v-60c0 -90 -7.5 -186.25 -15 -196.25c-12.5 -25 -26.25 -36.25 -38.75 -36.25c-7.5 0 -13.75 2.5 -18.75 5c-12.5 2.5 -25 21.25 -25 46.25c0 5 0 10 2.5 15c10 61.25 15 121.25 15 177.5
 c0 100 -17.5 191.25 -63.75 283.75c-112.5 235 -232.5 271.25 -337.5 278.75v-1072.5c0 -195 -253.75 -383.75 -458.75 -383.75c-125 0 -222.5 72.5 -222.5 192.5c0 197.5 202.5 383.75 456.25 383.75c66.25 0 122.5 -17.5 163.75 -53.75v3596.25c0 12.5 30 17.5 30 17.5
@@ -122,8 +103,6 @@ c0 25 -5 53.75 -30 95c-112.5 192.5 -238.75 243.75 -348.75 243.75c41.25 -173.75 1
 c-112.5 192.5 -238.75 243.75 -348.75 243.75c41.25 -173.75 141.25 -226.25 236.25 -336.25c46.25 -48.75 83.75 -88.75 112.5 -125c10 28.75 20 60 25 80zM1075 3163.75c5 15 5 28.75 5 46.25c0 22.5 -5 52.5 -30 93.75c-112.5 192.5 -238.75 243.75 -348.75 243.75
 c41.25 -173.75 141.25 -225 236.25 -335c46.25 -51.25 83.75 -92.5 112.5 -126.25c10 28.75 20 60 25 77.5zM1075 3547.5c5 12.5 5 26.25 5 43.75c0 22.5 -7.5 52.5 -30 93.75c-112.5 192.5 -238.75 243.75 -348.75 243.75c41.25 -173.75 141.25 -225 236.25 -335
 c46.25 -48.75 83.75 -90 112.5 -126.25c10 31.25 20 62.5 25 80z" />
-    <glyph glyph-name="uniE1E4" unicode="&#xe1e4;" horiz-adv-x="544" 
- />
     <glyph glyph-name="uniE1E5" unicode="&#xe1e5;" horiz-adv-x="1163" 
 d="M1160 1080c0 -17.5 2.5 -38.75 2.5 -58.75c0 -90 -11.25 -187.5 -18.75 -197.5c-12.5 -25 -22.5 -36.25 -37.5 -36.25c-5 0 -13.75 2.5 -16.25 5c-15 2.5 -27.5 23.75 -27.5 46.25c0 7.5 0 10 2.5 17.5c10 58.75 15 118.75 15 175c0 100 -17.5 193.75 -61.25 283.75
 c-115 235 -235 271.25 -337.5 278.75v-941.25c0 -195 -253.75 -385 -458.75 -385c-125 0 -222.5 72.5 -222.5 192.5c0 200 202.5 386.25 456.25 386.25c66.25 0 122.5 -20 163.75 -53.75v3850c0 12.5 30 18.75 30 18.75c17.5 0 31.25 0 33.75 -36.25
@@ -137,8 +116,6 @@ c41.25 -173.75 141.25 -226.25 238.75 -336.25c46.25 -51.25 81.25 -91.25 112.5 -12
 c41.25 -173.75 141.25 -226.25 238.75 -333.75l112.5 -127.5zM1072.5 3058.75c5 15 7.5 31.25 7.5 46.25c0 25 -7.5 52.5 -30 93.75c-115 192.5 -241.25 243.75 -351.25 243.75c41.25 -173.75 141.25 -225 238.75 -332.5c46.25 -51.25 81.25 -92.5 112.5 -128.75
 c10 28.75 17.5 60 22.5 77.5zM1072.5 3442.5c5 15 7.5 28.75 7.5 46.25c0 22.5 -7.5 51.25 -30 92.5c-115 195 -241.25 245 -351.25 245c41.25 -173.75 141.25 -225 238.75 -335l112.5 -126.25zM1072.5 3826.25c5 12.5 7.5 28.75 7.5 43.75c0 28.75 -10 56.25 -32.5 97.5
 c-112.5 192.5 -238.75 240 -348.75 240c41.25 -173.75 141.25 -225 238.75 -335c43.75 -48.75 81.25 -88.75 112.5 -125c10 28.75 17.5 58.75 22.5 78.75z" />
-    <glyph glyph-name="uniE1E6" unicode="&#xe1e6;" horiz-adv-x="544" 
- />
     <glyph glyph-name="uniE1E7" unicode="&#xe1e7;" horiz-adv-x="417" 
 d="M125 518.75c0 78.75 67.5 148.75 146.25 148.75s145 -70 145 -148.75c0 -76.25 -66.25 -146.25 -145 -146.25s-146.25 70 -146.25 146.25z" />
     <glyph glyph-name="uniE550" unicode="&#xe550;" horiz-adv-x="480" 
@@ -147,10 +124,6 @@ d="M605 -100c-53 -156 -199 -250 -375 -250c-180 0 -308 92 -355 250h23c49 -100 217
 d="M899 -100c-53 -156 -311 -250 -520 -250c-203 0 -457 92 -504 250h22c49 -100 334 -152 484 -152c166 0 438 52 495 152h23z" />
     <glyph glyph-name="uniE552" unicode="&#xe552;" horiz-adv-x="1102" 
 d="M1227 -100c-53 -156 -369 -250 -684 -250c-295 0 -621 92 -668 250h22c49 -100 419 -152 648 -152c225 0 602 52 659 152h23z" />
-    <glyph glyph-name="uniE1E8" unicode="&#xe1e8;" horiz-adv-x="872" 
- />
-    <glyph glyph-name="uniE1DE" unicode="&#xe1de;" horiz-adv-x="921" 
- />
     <glyph glyph-name="uniE260" unicode="&#xe260;" horiz-adv-x="611" 
 d="M112.5 837.5c80 40 135 67.5 232.5 67.5c65 0 87.5 -7.5 135 -32.5c32.5 -17.5 60 -50 67.5 -95l10 -62.5c0 -70 -40 -142.5 -112.5 -222.5c-57.5 -62.5 -97.5 -110 -162.5 -170l-220 -197.5v1610h50v-897.5zM287.5 827.5c-80 0 -120 -25 -175 -72.5v-485
 c77.5 77.5 135 147.5 177.5 210c52.5 80 80 147.5 80 210c0 22.5 2.5 40 2.5 50c0 35 -7.5 52.5 -27.5 75l-20 7.5z" />
@@ -407,7 +380,7 @@ c24.001 64.7998 42.001 127.198 54 187.199c74.542 317.858 139.19 645.61 208.8 968
 c101.944 0 164.142 -49.2266 183.6 -136.8l14.4004 -57.6006c0 -119.3 -3.61035 -129.625 -46.7998 -216c-11.2969 -25.416 -62.5791 -90.1943 -111.601 -97.2002c-16.8008 -2.40039 -37.1982 -2.40039 -61.1992 0c-45.3818 10.084 -59.6377 63.4033 -68.4004 111.601
 c0 98.208 40.7695 159.178 104.4 201.6l50.3994 36c0 31.2012 -21.5996 50.4004 -64.7998 57.6006c-47.999 4.78809 -88.8008 -4.81348 -122.4 -28.8008c-33.5986 -24.001 -68.3994 -75.5996 -104.399 -154.8c-24.8906 -64.001 -93.2402 -301.964 -111.601 -370.8h277.2
 v-144h-306c-68.4502 -391.698 -216.22 -916.41 -370.8 -1213.2c-85.165 -166.075 -231.487 -381.6 -421.2 -381.6c-160.621 0 -255.6 132.059 -255.6 298.8c0 114.56 55.1191 255.6 176.399 255.6zM1213.2 943.2c75.5996 0 154.8 -50.4004 154.8 -126v-25.2002
-l-226.8 -658.8c0 -46.7998 14.3994 -72 43.2002 -75.6006c28.7998 0 61.1992 18 93.5996 54s54 57.6006 57.5996 61.2002c14.4004 25.2002 67.0791 113.987 72 126l50.4004 147.601h82.7998l-86.3994 -226.801c-29.8945 -78.4688 -111.601 -162 -158.4 -208.8
+l-226.8 -658.8c0 -46.7998 14.3994 -72 43.2002 -75.6006c28.7998 0 61.1992 18 93.5996 54s54 57.6006 57.5996 61.2002c14.4004 25.2002 66.564 115.656 72 126l259.2 493.2l-71.7998 -310l-140.6 -262.4c-37.037 -69.122 -111.601 -162 -158.4 -208.8
 s-104.4 -72 -165.6 -75.5996c-64.8008 0 -122.4 18 -176.4 50.3994l-57.5996 54c-10.8008 25.2002 -18 43.2002 -18 61.2002c72 226.8 158.399 446.4 234 669.601c0 25.1992 -18 43.1992 -54 46.7998c-57.6006 0 -111.601 -54 -158.4 -162l-230.4 -655.2h-255.6l277.2 770.4
 c0 32.3994 -21.6006 46.7998 -61.2002 46.7998c-32.4004 0 -61.2002 -14.4004 -79.2002 -39.6006c-18 -25.1992 -43.2002 -68.3994 -72 -122.399l-230.399 -655.2h-248.4l277.2 756v14.4004c0 36 -18 43.1992 -43.2002 57.5996c-90 0 -187.2 -169.2 -237.6 -262.8
 c-18 -32.4004 -43.2002 -82.7998 -75.6006 -151.2h-79.2002c68.4004 140.4 144 273.6 230.4 385.2c75.5996 97.2002 169.2 144 284.4 144c75.5996 0 111.6 -68.4004 122.399 -147.601c68.4004 61.2002 122.4 97.2002 162 115.2
@@ -575,10 +548,10 @@ c-79.2002 46.7998 -136.801 93.5996 -169.2 136.8c-32.4004 43.2002 -50.4004 93.599
 l-21.5996 -36c-10.7998 -18 -28.7998 -32.3994 -61.2002 -36c-61.2002 0 -93.5996 28.8008 -104.4 86.4004l14.4004 68.4004c0 36 -50.4004 57.5996 -86.4004 64.7998c-68.3994 10.7998 -115.199 -57.6006 -126 -129.601c0 -25.1992 14.4004 -54 39.6006 -79.1992
 c32.3994 -25.2002 64.7998 -50.4004 93.5996 -75.6006c100.8 -82.7998 154.8 -133.2 158.4 -144c28.7998 -36 43.2002 -82.7998 43.2002 -140.399v-36c0 -75.6006 -36 -140.4 -104.4 -194.4c-57.5996 -36 -136.8 -64.7998 -219.6 -72c-169.2 0 -320.4 93.5996 -320.4 241.2
 l3.59961 54l18 46.7998l36 32.4004l46.8008 14.3994c57.5996 0 86.3994 -36 86.3994 -111.6c0 -46.7998 -18 -57.6006 -28.7998 -100.8c0 -28.8008 39.5996 -57.6006 82.7998 -57.6006h46.7998z" />
-    <glyph glyph-name="uniE539" unicode="&#xe539;" horiz-adv-x="2480" 
-d="M2163.6 414c75.6006 0 122.4 -82.7998 122.4 -172.8c0 -82.7998 -28.7998 -151.2 -86.4004 -208.8c-54 -61.2002 -140.399 -90 -262.8 -90c-43.2002 0 -75.5996 3.59961 -97.2002 14.3994l-43.1992 21.6006l-61.2002 36c-54 25.1992 -86.4004 36 -104.4 36
+    <glyph glyph-name="uniE539" unicode="&#xe539;" horiz-adv-x="2254" 
+d="M1940.6 414c75.6006 0 122.4 -82.7998 122.4 -172.8c0 -82.7998 -28.7998 -151.2 -86.4004 -208.8c-54 -61.2002 -140.399 -90 -262.8 -90c-43.2002 0 -75.5996 3.59961 -97.2002 14.3994l-43.1992 21.6006l-61.2002 36c-54 25.1992 -86.4004 36 -104.4 36
 c-32.3994 0 -68.3994 -18 -108 -50.4004h-111.6v57.5996l752.399 637.2l-230.399 -3.59961c-82.7998 -10.7998 -115.2 -54 -158.4 -108h-86.3994l108 313.2h680.399v-115.2l-759.6 -586.8c46.7998 21.5996 93.5996 32.3994 140.399 32.3994
-c50.4004 0 190.801 -64.7998 226.801 -72c32.3994 3.60059 50.3994 28.7998 50.3994 68.4004c-46.7998 0 -72 28.7998 -79.2002 82.7998c0 61.2002 46.8008 108 108 108zM360 -248.4c76.9893 0 126 -111.317 126 -183.6c0 -72.4072 -45.3711 -114.53 -75.5996 -162
+c50.4004 0 400.801 -64.7998 436.801 -72c32.3994 3.60059 -159.601 28.7998 -159.601 68.4004c-46.7998 0 -72 28.7998 -79.2002 82.7998c0 61.2002 46.8008 108 108 108zM360 -248.4c76.9893 0 126 -111.317 126 -183.6c0 -72.4072 -45.3711 -114.53 -75.5996 -162
 c-16.791 -26.3984 -29.9883 -43.2002 -39.6006 -50.4004c-19.876 -26.5029 -4.81641 -35.877 32.4004 -39.5996c126.273 0 195.199 196.2 241.2 320.4c24.001 64.7998 42.001 127.198 54 187.199c74.541 317.858 139.19 645.61 208.8 968.4h-208.8v136.8h252
 c48.3438 136.249 82.6445 232.776 144 327.601c74.3975 108 152.398 190.8 234 248.399c81.6006 57.6006 171.601 86.4004 270 86.4004c101.944 0 164.142 -49.2266 183.6 -136.8l14.4004 -57.6006c0 -119.3 -3.61133 -129.625 -46.8008 -216
 c-11.2969 -25.416 -62.5781 -90.1943 -111.6 -97.2002c-91.9443 -13.1396 -115.888 36.1729 -129.6 111.601c0 98.208 40.7695 159.178 104.399 201.6l50.4004 36c0 81.1914 -140.415 62.2012 -187.2 28.7998c-105.498 -75.3623 -174.049 -368.298 -216 -525.6h277.2v-144
@@ -588,12 +561,12 @@ c54 -32.4004 82.8008 -86.4004 82.8008 -154.801l-3.60059 -36l-21.5996 -36c-10.799
 c-68.3994 10.7998 -115.199 -57.6006 -126 -129.601c0 -25.1992 14.4004 -54 39.6006 -79.1992c32.3994 -25.2002 64.7998 -50.4004 93.5996 -75.6006c100.8 -82.7998 154.8 -133.2 158.4 -144c28.7998 -36 43.2002 -82.7998 43.2002 -140.399v-36
 c0 -75.6006 -36 -140.4 -104.4 -194.4c-57.5996 -36 -136.8 -64.7998 -219.6 -72c-169.2 0 -320.4 93.5996 -320.4 241.2l3.59961 54l18 46.7998l36 32.4004l46.8008 14.3994c57.5996 0 86.3994 -36 86.3994 -111.6c0 -46.7998 -18 -57.6006 -28.7998 -100.8
 c0 -28.8008 39.5996 -57.6006 82.7998 -57.6006h46.7998z" />
-    <glyph glyph-name="uniE53A" unicode="&#xe53a;" horiz-adv-x="3672" 
-d="M3196.8 3.59961c-78.915 0 -181.253 64.8789 -219.6 122.4l-201.601 -568.8l-10.7998 -14.4004c9.60156 -24.001 24.001 -37.1982 43.2002 -39.5996h115.2v-104.4h-622.8v104.4h75.5996c14.4004 0 31.2012 6.00098 50.4004 18
+    <glyph glyph-name="uniE53A" unicode="&#xe53a;" horiz-adv-x="3453" 
+d="M2973.8 3.59961c-78.915 0 -181.253 64.8789 -219.6 122.4l-201.601 -568.8l-10.7998 -14.4004c9.60156 -24.001 24.001 -37.1982 43.2002 -39.5996h115.2v-104.4h-622.8v104.4h75.5996c14.4004 0 31.2012 6.00098 50.4004 18
 c14.3994 14.3994 25.1992 31.2012 32.3994 50.3994l428.4 1191.6v21.5996l-10.7998 36l-21.6006 10.7998c-81.2441 0 -136.256 -91.6768 -172.8 -154.8l-39.5996 -61.2002c-28.2783 -55.7236 -55.5918 -112.406 -82.8008 -169.199h-82.7998
 c79.2002 153.601 153.602 274.799 223.2 363.6s160.801 134.398 273.6 136.8c50.0615 0 100.801 -83.1777 100.801 -144l86.3994 50.4004l90 46.7998c43.2002 16.8008 87.5986 25.2002 133.2 25.2002c194.954 0 287.424 -172.768 291.6 -378
-c0 -167.688 -40.2119 -244.681 -115.199 -338.4c-81.0186 -104.168 -199.642 -205.2 -363.601 -205.2zM3420 608.4c0 94.4023 -36.335 165.6 -129.6 165.6c-50.4004 0 -85.2012 -16.8008 -104.4 -50.4004c-43.2002 -74.4004 -78.001 -160.801 -104.4 -259.199
-c-24.001 -108 -36 -182.401 -36 -223.2c0 -86.4004 26.3994 -129.601 79.2002 -129.601c96.4727 0 146.348 38.1875 187.2 97.2002c70.2861 117.147 77.6123 115.314 93.5996 259.2c7.2002 64.7998 11.999 111.6 14.4004 140.4zM2163.6 414
+c0 -167.688 -40.2119 -244.681 -115.199 -338.4c-81.0186 -104.168 -199.642 -205.2 -363.601 -205.2zM3197 608.4c0 94.4023 -36.335 165.6 -129.6 165.6c-50.4004 0 -85.2012 -16.8008 -104.4 -50.4004c-43.2002 -74.4004 -78.001 -160.801 -104.4 -259.199
+c-24.001 -108 -36 -182.401 -36 -223.2c0 -86.4004 26.3994 -129.601 79.2002 -129.601c96.4727 0 146.348 38.1875 187.2 97.2002c70.2861 117.147 77.6123 115.314 93.5996 259.2c7.2002 64.7998 11.999 111.6 14.4004 140.4zM1940.6 414
 c75.6006 0 122.4 -82.7998 122.4 -172.8c0 -82.7998 -28.7998 -151.2 -86.4004 -208.8c-54 -61.2002 -140.399 -90 -262.8 -90c-43.2002 0 -75.5996 3.59961 -97.2002 14.3994l-43.1992 21.6006l-61.2002 36c-54 25.1992 -86.4004 36 -104.4 36
 c-32.3994 0 -68.3994 -18 -108 -50.4004h-111.6v57.5996l752.399 637.2l-230.399 -3.59961c-82.7998 -10.7998 -115.2 -54 -158.4 -108h-86.3994l108 313.2h680.399v-115.2l-759.6 -586.8c46.7998 21.5996 93.5996 32.3994 140.399 32.3994
 c50.4004 0 190.801 -64.7998 226.801 -72c32.3994 3.60059 50.3994 28.7998 50.3994 68.4004c-46.7998 0 -72 28.7998 -79.2002 82.7998c0 61.2002 46.8008 108 108 108zM360 -248.4c76.9893 0 126 -111.317 126 -183.6c0 -72.4072 -45.3711 -114.53 -75.5996 -162
@@ -606,8 +579,8 @@ c54 -32.4004 82.8008 -86.4004 82.8008 -154.801l-3.60059 -36l-21.5996 -36c-10.799
 c-68.3994 10.7998 -115.199 -57.6006 -126 -129.601c0 -25.1992 14.4004 -54 39.6006 -79.1992c32.3994 -25.2002 64.7998 -50.4004 93.5996 -75.6006c100.8 -82.7998 154.8 -133.2 158.4 -144c28.7998 -36 43.2002 -82.7998 43.2002 -140.399v-36
 c0 -75.6006 -36 -140.4 -104.4 -194.4c-57.5996 -36 -136.8 -64.7998 -219.6 -72c-169.2 0 -320.4 93.5996 -320.4 241.2l3.59961 54l18 46.7998l36 32.4004l46.8008 14.3994c57.5996 0 86.3994 -36 86.3994 -111.6c0 -46.7998 -18 -57.6006 -28.7998 -100.8
 c0 -28.8008 39.5996 -57.6006 82.7998 -57.6006h46.7998z" />
-    <glyph glyph-name="uniE53B" unicode="&#xe53b;" horiz-adv-x="3310" 
-d="M2998.8 414c75.6006 0 122.4 -82.7998 122.4 -172.8c0 -82.7998 -28.7998 -151.2 -86.4004 -208.8c-54 -61.2002 -140.399 -90 -262.8 -90c-43.2002 0 -75.5996 3.59961 -97.2002 14.3994l-43.2002 21.6006l-61.1992 36c-54 25.1992 -86.4004 36 -104.4 36
+    <glyph glyph-name="uniE53B" unicode="&#xe53b;" horiz-adv-x="3096" 
+d="M2782.8 414c75.6006 0 122.4 -82.7998 122.4 -172.8c0 -82.7998 -28.7998 -151.2 -86.4004 -208.8c-54 -61.2002 -140.399 -90 -262.8 -90c-43.2002 0 -75.5996 3.59961 -97.2002 14.3994l-43.2002 21.6006l-61.1992 36c-54 25.1992 -86.4004 36 -104.4 36
 c-32.4004 0 -68.4004 -18 -108 -50.4004h-111.6v57.5996l752.399 637.2l-230.399 -3.59961c-82.8008 -10.7998 -115.2 -54 -158.4 -108h-86.4004l108 313.2h680.4v-115.2l-759.6 -586.8c46.7998 21.5996 93.5996 32.3994 140.399 32.3994
 c50.4004 0 190.8 -64.7998 226.8 -72c32.4004 3.60059 50.4004 28.7998 50.4004 68.4004c-46.7998 0 -72 28.7998 -79.2002 82.7998c0 61.2002 46.7998 108 108 108zM1202.4 -248.4c76.9893 0 126 -111.317 126 -183.6c0 -72.4072 -45.3711 -114.53 -75.6006 -162
 c-16.79 -26.3984 -29.9883 -43.2002 -39.5996 -50.4004c-19.876 -26.5068 -4.81738 -35.877 32.3994 -39.5996c126.274 0 195.199 196.2 241.2 320.4c24.001 64.7998 42.001 127.198 54 187.199c74.542 317.858 139.19 645.61 208.8 968.4h-208.8v136.8h252
@@ -633,9 +606,9 @@ v-144h-306c-68.4502 -391.698 -216.22 -916.41 -370.8 -1213.2c-85.165 -166.075 -23
 l3.60059 39.6006l10.7998 43.1992c0 18 -10.7998 25.2002 -28.7998 25.2002c-46.7998 0 -93.6006 -36 -136.8 -111.6l-57.6006 -115.2c-75.5996 -194.4 -126 -406.8 -190.8 -612h-216l205.2 698.4v18c0 39.5996 -10.7998 57.5996 -28.7998 57.5996
 c-54 0 -72 -32.4004 -108 -75.5996c-32.4004 -39.6006 -61.2002 -82.8008 -90 -129.601l-50.4004 28.7998c21.5996 54 57.5996 90 100.8 136.801c68.4004 68.3994 180 172.8 298.8 172.8c54 0 79.2002 -32.4004 79.2002 -100.8
 c-3.59961 -25.2002 -3.59961 -50.4004 -7.2002 -75.6006c57.6006 86.4004 140.4 201.601 266.4 201.601c75.5996 0 144 -68.4004 144 -144c0 -108 -36 -162 -111.6 -162z" />
-    <glyph glyph-name="uniE53D" unicode="&#xe53d;" horiz-adv-x="2582" 
-d="M2268 414c75.5996 0 122.4 -82.7998 122.4 -172.8c0 -82.7998 -28.8008 -151.2 -86.4004 -208.8c-54 -61.2002 -140.4 -90 -262.8 -90c-43.2002 0 -75.6006 3.59961 -97.2002 14.3994l-43.2002 21.6006l-61.2002 36c-54 25.1992 -86.3994 36 -104.399 36
-c-32.4004 0 -68.4004 -18 -108 -50.4004h-111.601v57.5996l752.4 637.2l-230.4 -3.59961c-82.7998 -10.7998 -115.199 -54 -158.399 -108h-86.4004l108 313.2h680.4v-115.2l-759.601 -586.8c46.8008 21.5996 93.6006 32.3994 140.4 32.3994
+    <glyph glyph-name="uniE53D" unicode="&#xe53d;" horiz-adv-x="2365" 
+d="M2052 414c75.5996 0 122.4 -82.7998 122.4 -172.8c0 -82.7998 -28.8008 -151.2 -86.4004 -208.8c-54 -61.2002 -140.4 -90 -262.8 -90c-43.2002 0 -75.6006 3.59961 -97.2002 14.3994l-43.2002 21.6006l-61.2002 36c-54 25.1992 -86.3994 36 -104.399 36
+c-32.4004 0 -68.4004 -18 -108 -50.4004h-111.601v57.5996l752.4 637.2l-230.4 -3.59961c-82.7998 -10.7998 -115.199 -54 -158.399 -108h-86.4004l108 313.2l680.4 3v-118.2l-759.601 -586.8c46.8008 21.5996 93.6006 32.3994 140.4 32.3994
 c50.4004 0 190.8 -64.7998 226.8 -72c32.4004 3.60059 50.4004 28.7998 50.4004 68.4004c-46.7998 0 -72 28.7998 -79.2002 82.7998c0 61.2002 46.7998 108 108 108zM471.6 -248.4c76.9902 0 126 -111.317 126 -183.6c0 -72.4072 -45.3701 -114.53 -75.5996 -162
 c-16.79 -26.3984 -29.9883 -43.2002 -39.5996 -50.4004c-19.876 -26.5029 -4.81738 -35.877 32.3994 -39.5996c126.273 0 195.199 196.2 241.2 320.4c24.001 64.7998 42.001 127.198 54 187.199c74.542 317.858 139.19 645.61 208.8 968.4h-208.8v136.8h252
 c48.3447 136.249 82.6455 232.776 144 327.601c74.3975 108 152.398 190.8 234 248.399c81.6016 57.6006 171.602 86.4004 270 86.4004c101.944 0 164.142 -49.2266 183.6 -136.8l14.4004 -57.6006c0 -119.3 -3.61035 -129.625 -46.7998 -216
@@ -645,5 +618,53 @@ c-85.165 -166.075 -231.487 -381.6 -421.2 -381.6c-160.621 0 -255.6 132.059 -255.6
 c-46.7998 0 -93.6006 -36 -136.8 -111.6l-57.6006 -115.2c-75.5996 -194.4 -126 -406.8 -190.8 -612h-216l205.2 698.4v18c0 39.5996 -10.7998 57.5996 -28.7998 57.5996c-54 0 -72 -32.4004 -108 -75.5996c-32.4004 -39.6006 -61.2002 -82.8008 -90 -129.601
 l-50.4004 28.7998c21.5996 54 57.5996 90 100.8 136.801c68.4004 68.3994 180 172.8 298.8 172.8c54 0 79.2002 -32.4004 79.2002 -100.8c-3.59961 -25.2002 -3.59961 -50.4004 -7.2002 -75.6006c57.6006 86.4004 140.4 201.601 266.4 201.601
 c75.5996 0 144 -68.4004 144 -144c0 -108 -36 -162 -111.6 -162z" />
+    <glyph glyph-name="uni266E" unicode="&#x266e;" horiz-adv-x="507" 
+d="M62.5 92.5v1347.5h45v-477.5l347.5 55v-1332.5h-42.5v465zM107.5 312.5l305 42.5v440l-305 -47.5v-435z" />
+    <glyph glyph-name="uni266F" unicode="&#x266f;" horiz-adv-x="612" 
+d="M402.5 1027.5v422.5h42.5v-410l110 35v-227.5l-110 -35v-412.5l110 30v-227.5l-110 -32.5v-387.5h-42.5v375l-190 -55v-387.5h-42.5v372.5l-107.5 -32.5v225l107.5 35v417.5l-107.5 -35v230l107.5 32.5v422.5h42.5v-407.5zM212.5 745v-417.5l190 55v420z" />
+    <glyph glyph-name="uni266D" unicode="&#x266d;" horiz-adv-x="611" 
+d="M112.5 837.5c80 40 135 67.5 232.5 67.5c65 0 87.5 -7.5 135 -32.5c32.5 -17.5 60 -50 67.5 -95l10 -62.5c0 -70 -40 -142.5 -112.5 -222.5c-57.5 -62.5 -97.5 -110 -162.5 -170l-220 -197.5v1610h50v-897.5zM287.5 827.5c-80 0 -120 -25 -175 -72.5v-485
+c77.5 77.5 135 147.5 177.5 210c52.5 80 80 147.5 80 210c0 22.5 2.5 40 2.5 50c0 35 -7.5 52.5 -27.5 75l-20 7.5z" />
+    <glyph glyph-name="uniE045" unicode="&#xe045;" horiz-adv-x="1938" 
+d="M299.915 818.565c0 54.1191 -40.5898 58.6299 -108.24 72.1592v20.2959h342.76c302.17 0 453.256 -124.025 453.256 -374.33c0 -108.24 -29.3154 -205.206 -87.9453 -288.641c-105.985 -146.575 -311.19 -248.05 -550.22 -248.05h-349.525v22.5498
+c72.1592 0 115.005 51.8652 115.005 121.771l178.146 642.675l4.50879 20.2949zM825.33 561.495c0 202.95 -87.9453 306.68 -288.64 306.68c-38.3359 0 -72.1602 -2.25488 -85.6904 -24.8047l-202.95 -728.365l-4.50977 -24.8047
+c4.50977 -33.8252 38.335 -51.8652 101.476 -51.8652c313.444 0 480.314 207.46 480.314 523.16zM1587.52 865.92c-78.9248 0 -144.32 -58.6299 -144.32 -137.555c0 -38.3359 11.2744 -74.415 33.8252 -105.985c45.0996 -54.1201 58.6299 -69.9053 108.24 -112.75
+c29.3145 -36.0801 81.1797 -96.9648 108.239 -133.045c27.0605 -42.8447 40.5908 -85.6895 40.5908 -133.045c0 -58.6309 -20.2959 -103.73 -42.8457 -146.574c-29.3154 -42.8457 -65.3955 -76.6709 -103.729 -96.9658
+c-33.8252 -22.5498 -76.6709 -31.5703 -133.046 -31.5703c-24.8047 0 -63.1396 11.2754 -115.004 31.5703c-36.0801 9.02051 -72.1611 11.2754 -94.7109 22.5498c-15.7852 0 -27.0596 -9.01953 -36.0801 -22.5498c-9.02051 -2.25488 -15.7842 -11.2754 -18.0391 -29.3154
+h-27.0605l47.3545 304.425h33.8252l-6.76465 -38.334c0 -33.8252 6.76465 -58.6299 11.2754 -83.4346c9.01953 -24.8066 24.8047 -47.3564 49.6094 -72.1611c33.8252 -42.8447 78.9248 -63.1396 139.811 -63.1396c54.1191 0 94.71 18.04 121.77 54.1191
+c36.0801 33.8252 54.1201 76.6709 54.1201 124.025c0 45.0996 -11.2754 81.1807 -31.5703 108.24c-27.0596 29.3154 -45.1006 56.375 -74.4141 85.6904c-11.2754 11.2754 -24.8057 24.8047 -38.3359 40.5898c-49.6094 47.3545 -85.6895 90.1992 -110.494 130.79
+c-24.8057 29.3145 -36.0811 69.9053 -36.0811 121.771c0 85.6895 18.04 119.515 69.9062 162.359c42.8438 42.8457 99.2188 65.3955 169.125 65.3955c54.1191 0 94.709 -4.51074 121.769 -15.7861c24.8057 -15.7842 47.3564 -22.5498 69.9062 -22.5498
+c15.7842 0 33.8252 13.5312 54.1191 38.3359h29.3154l-54.1201 -268.346h-22.5498c0 148.83 -58.6299 223.245 -173.635 223.245zM969.65 0c-45.1006 0 -72.1602 27.0596 -72.1602 74.415c0 47.3555 38.335 76.6699 72.1602 76.6699
+c18.04 0 33.8242 -9.01953 47.3545 -27.0596c15.7852 -9.02051 22.5498 -24.8047 22.5498 -49.6104c0 -36.0801 -29.3145 -74.415 -69.9043 -74.415zM1869.4 0c-45.1006 0 -72.1611 24.8047 -78.9248 63.1406c0 38.334 38.334 74.4141 78.9248 74.4141
+c42.8447 0 69.9043 -27.0596 69.9043 -74.4141c0 -40.5908 -33.8252 -63.1406 -69.9043 -63.1406z" />
+    <glyph glyph-name="uniE046" unicode="&#xe046;" horiz-adv-x="2107" 
+d="M0 22.5498c74.415 0 108.24 51.8652 115.005 121.771l178.146 642.675l4.50879 20.2949l2.25586 11.2754c0 18.0391 -6.76465 31.5693 -18.04 42.8438c-11.2754 11.2754 -42.8447 20.2959 -90.2002 29.3154v20.2959h342.76c302.17 0 453.256 -124.025 453.256 -374.33
+c0 -108.24 -29.3154 -205.206 -87.9453 -288.641c-110.495 -144.32 -306.68 -248.05 -550.22 -248.05h-349.525v22.5498zM825.33 561.495c0 200.695 -87.9453 306.68 -288.64 306.68c-38.3359 0 -72.1602 -2.25488 -85.6904 -24.8047l-202.95 -728.365l-4.50977 -24.8047
+c4.50977 -33.8252 38.335 -51.8652 101.476 -51.8652c90.2002 0 173.635 24.8057 248.05 76.6699c76.6689 45.0996 130.789 103.729 171.38 184.91c40.5889 67.6504 60.8848 155.595 60.8848 261.58zM1526.63 22.5498c157.85 0 252.561 67.6504 335.995 166.87
+l18.04 -22.5498c-105.985 -144.32 -234.52 -216.479 -385.604 -216.479c-67.6504 0 -130.79 15.7842 -187.165 49.6094c-49.6104 33.8252 -90.2002 90.2002 -124.025 144.32c-29.3154 58.6299 -42.8457 121.771 -42.8457 191.675c0 96.9648 24.8057 189.42 76.6709 279.62
+c54.1201 87.9443 124.024 160.105 211.97 220.989c90.2002 51.8662 182.655 78.9258 279.62 78.9258h40.5898c15.7852 0 27.0605 -2.25488 33.8252 -4.50977l81.1797 -15.7861l63.1406 -18.0391l56.375 33.8252h22.5498l-49.6094 -281.875h-24.8066
+c0 76.6699 -18.0391 135.3 -56.375 178.145c-42.8438 38.335 -94.709 58.6299 -160.104 58.6299c-99.2197 0 -164.614 -33.8242 -218.734 -87.9453c-65.3955 -56.375 -112.75 -126.279 -144.32 -214.225c-20.2949 -45.0996 -33.8252 -85.6904 -40.5908 -121.771
+c-6.76367 -36.0791 -13.5293 -76.6699 -13.5293 -124.024c0 -96.9648 13.5293 -155.596 56.375 -211.971c38.3359 -56.375 94.7109 -83.4346 171.38 -83.4346zM969.65 0c-45.1006 0 -72.1602 27.0596 -72.1602 74.415c0 47.3555 38.335 76.6699 72.1602 76.6699
+c18.04 0 33.8242 -9.01953 47.3545 -27.0596c15.7852 -9.02051 22.5498 -24.8047 22.5498 -49.6104c0 -36.0801 -31.5703 -74.415 -69.9043 -74.415zM2038.52 0c-40.5908 0 -69.9053 27.0596 -74.416 63.1406c0 24.8047 6.76562 42.8438 22.5508 51.8643
+c13.5293 15.7852 31.5693 22.5498 51.8652 22.5498c18.0391 0 36.0791 -6.76465 54.1201 -20.2949c11.2744 -13.5303 15.7842 -31.5693 15.7842 -54.1191c0 -38.3359 -31.5703 -63.1406 -69.9043 -63.1406z" />
+    <glyph glyph-name="uniE047" unicode="&#xe047;" horiz-adv-x="926" 
+d="M243.54 1068.87c-49.6104 0 -85.6904 -67.6494 -85.6904 -126.279c0 -121.771 164.616 -191.676 315.7 -261.581l311.19 462.274h92.4551l-329.229 -498.354c92.4541 -47.3545 164.614 -99.2197 216.479 -151.084c63.1396 -65.3955 94.71 -139.812 94.71 -218.736
+c0 -153.339 -121.771 -275.109 -279.621 -275.109c-90.1992 0 -171.379 74.415 -171.379 164.615c0 49.6094 47.3545 85.6895 96.9648 85.6895c51.8643 0 76.6699 -38.334 87.9453 -85.6895c13.5303 -51.8652 36.0801 -76.6699 69.9053 -76.6699
+c60.8838 0 94.709 51.8643 94.709 121.771c0 29.3145 -6.76465 51.8643 -18.0391 72.1592c-20.2949 38.335 -74.416 81.1797 -162.361 128.534c-67.6494 33.8252 -67.6494 33.8252 -135.3 67.6504l-302.17 -469.039h-90.2002l317.956 502.864
+c-110.495 51.8652 -191.675 112.75 -245.795 180.399c-47.3555 60.8857 -72.1611 124.025 -72.1611 189.421c0 105.985 56.375 180.399 121.771 230.011c38.3359 29.3135 83.4355 45.0996 130.79 45.0996c103.73 0 205.205 -72.1611 205.205 -173.636
+c0 -49.6094 -51.8652 -81.1797 -101.475 -81.1797c-42.8457 0 -67.6504 18.04 -78.9258 56.375l-15.7842 51.8652c-11.2754 38.335 -33.8252 58.6299 -67.6504 58.6299zM169.125 432.96c0 -47.3555 -36.0801 -85.6895 -81.1797 -85.6895
+c-51.8652 0 -87.9453 29.3145 -87.9453 78.9248c0 47.3545 33.8252 87.9453 81.1797 87.9453c49.6104 0 87.9453 -33.8252 87.9453 -81.1807zM759.935 726.109c0 54.1201 36.0811 85.6904 83.4355 85.6904c51.8643 0 83.4346 -42.8447 83.4346 -83.4346
+c0 -51.8652 -38.334 -83.4355 -83.4346 -83.4355c-51.8652 0 -83.4355 38.3359 -83.4355 81.1797z" />
+    <glyph glyph-name="uniE048" unicode="&#xe048;" horiz-adv-x="1210" 
+d="M1210.93 525.415h-144.319c0 -36.0801 -9.01953 -90.1992 -29.3154 -164.615l-31.5703 -87.9453l-36.0791 -69.9043c-29.3154 -38.335 -67.6504 -90.2002 -105.985 -119.516c-49.6104 -38.335 -128.535 -60.8848 -218.735 -83.4346v-164.615h-78.9248v164.615
+l-87.9453 13.5303c-20.2939 2.25391 -36.0801 6.76465 -51.8643 13.5293c-128.536 69.9062 -200.695 166.87 -250.305 333.74l-29.3154 87.9453v76.6699h-146.575v90.2002h146.575c0 76.6689 4.50977 96.9648 27.0596 164.614
+c13.5303 54.1201 40.5898 117.261 67.6494 157.851l51.8662 67.6494l54.1201 56.375c47.3545 36.0801 67.6494 51.8662 137.555 63.1406c27.0596 4.50977 54.1201 9.02051 81.1797 15.7842v166.871h78.9248v-166.871c47.3545 -6.76367 103.729 -9.01953 137.555 -29.3135
+c29.3154 -11.2754 56.375 -29.3154 78.9248 -49.6113c36.0811 -29.3145 72.1611 -72.1592 108.241 -124.024c29.3154 -51.8643 96.9648 -241.285 96.9648 -322.465h144.319v-90.2002zM832.096 615.615l-4.51074 49.6094v83.4346
+c0 38.3359 -6.76465 83.4365 -20.2949 130.791c-13.5303 78.9248 -85.6904 182.654 -162.36 182.654v-446.489h187.166zM566.005 615.615v446.489c-33.8252 0 -67.6504 -20.2949 -103.729 -58.6299c-33.8252 -42.8447 -54.1201 -81.1797 -60.8848 -117.259
+c-6.76562 -40.5908 -11.2754 -81.1816 -18.041 -121.771v-81.1797c0 -29.3154 -4.50879 -51.8652 -6.76465 -67.6504h189.42zM834.35 525.415h-189.42v-441.98c33.8252 0 69.9053 18.04 103.729 54.1201c29.3154 33.8252 49.6113 74.416 58.6309 121.771l20.2949 139.81z
+M566.005 83.4346v441.98h-189.42v-47.3555v-83.4346c0 -94.71 33.8242 -196.185 83.4355 -257.07c33.8252 -36.0801 69.9043 -54.1201 105.984 -54.1201z" />
+    <glyph glyph-name="uniE049" unicode="&#xe049;" horiz-adv-x="1210" 
+d="M1210.93 525.415h-144.319v-525.415h-421.686v-164.615h-78.9248v164.615h-419.43v448.745v76.6699h-146.575v90.2002h146.575v525.414h419.43v166.871h78.9248v-166.871h421.686v-525.414h144.319v-90.2002zM832.096 615.615v446.489h-187.166v-446.489h187.166z
+M566.005 615.615v446.489h-189.42v-446.489h189.42zM834.35 525.415h-189.42v-441.98h187.166zM566.005 83.4346v441.98h-189.42v-441.98h189.42z" />
   </font>
 </defs></svg>
diff --git a/fonts/VerovioText-1.0.ttf b/fonts/VerovioText-1.0.ttf
index 1160fd94df8eb78c7e5447873ecd8026db26519e..6b2ade9611959858ad36213e0865a0f828c391ab 100644
GIT binary patch
delta 12423
zcmcI~349dg-Tyo@vom|&_m#bObM0pD&9%8U8$uF7?hwv!1_~rL90FoQL50$aKD=tx
zBH}9^tw+(mwYAb(eXF&Kw$}HpT54%u+rJil|E<<nku2|Tb~i|pMbY*p%x7kvnVorl
z-{1FlK6A(G=(&?<f<Od8NQtWmiddFT_jc@CeZvxh*!Ue7HMgXi(?l_`4bFGNxu>%y
z5V~R0YPgO@;C$JN4Z~wUvh4E_1bG(5o?o$LlZ{C66a+y(2iNH}!{cM;&cTz3jaR@q
zf6e-BtKDz!?k5P|CW2UTdSun`#7g%zj}0!KhAlP%BSlZ^yznp=oV!LgY`XlpXHQGu
z93F@w>ql1%^J|J0!Lwh0>-TLKzI=@M7W)5iZ4R8<HV$uC)wA`b9)eiA490#vHafoP
zFXR6W_kSfq5Y(KkupsdLXvvwSvYNjWA|)SwM-VTs32x{1zY86{`6d*1w`A|^K|dyP
z*GagBvSamxpSzKunK)jAYDmupd>blSahgbRqvQjytss)<6Cz2jB$Dh+Aa*sp`Vjo$
zhq;ZHgnd1X0mkGLx!=(1VeD(L?YdyQBR>Y?=q_R>_K}w>`6mcMvXdahdV*la&pj@v
z#mC466VCw1oFdHxP22~24`G8N#xwf+)>E&XdiB(Qo_g)n8>dd5dh^t&Q-3`5)~P@L
zVdY!3Z*{-3{Pa&iL4;?+@0(A(T=2eSZ`t0O|IU2wzSnLpddgaDt+G~H6V|vjW{p}S
z*042X4T>#4FlLOWHUF);i9q;9%J=AMibWGyDiCGazY$_L@k6wo)RQ+;K58ZP0iB|+
zr=Ow!!1M6F!}PNrzEw~nOpEr34vAhDeJCyy_ll28e3Cn)O6f}JPh^B_x#Fj)pJ;}(
zH|bXDYYb&Zx$!yEuPxn0jrK<zH#_IMJnrRQvCmO_YpJdDowE1J`4i>7^10<#l^-qt
zjbH5_@?Y*h?Eh0B61X<-Ulopuv5Nf_$0~jsED3%!_(JeQg5)$vuH^Lrlq})@E+PUo
z$5@(pH}qYG_uHCd6bXmKcPVa|#|<B28FaSh7~;mm3cJE>SJ+deE#pGBW=42@XTI%B
z(JykGAd<vR($73gs0m=TDoKVzTAj8CsaYw7g<2a=95V%UxI$~BtF3-5?$m1W3hmJe
z9zmS@J$sNkK<GiC>%k89023m9%Ion)?KXv)WoV~88j3|#abCpZbTBN%YQv!<LJmf)
zvm%|9)M+(v8_PHyUO(w|z@bwWX4N{FKsXeSMI&B6g2%yMG!l!)!lCSVm~uwYgo7L7
zMl@>1?(lfI6Ydz53B^{8j!&b0^s~Y4%o`79jzp8kc%*FqL1&5J7c{f<w%6B_pVag@
zTyCc@;Fb7F%d0B-9bJ-Qt5748QKo={6-nHop)OzCCJM+6(pI<2>T4M3b-Nron<b_@
z`?h1kTW&U~b;Z<byN?N4?e1bKEYnCtJeox6%)Wo!Id;7+6(z4xe|Y<?0{NuR5V__Z
z^it>Mic+stTv;J+NHumf7TIhRpXKRj1FG<7lTLSCEZo{yBCe7f<msBy&blUhgIw#$
zeDLPkLtdw&)Fg46{SJ%8?{iLA90aF=6Z~50U{-hYiN(ZM2m%m~tLji>ni|jr3Wx)e
z2yW7GuxFv=MygS$h>Ua4dO=s5QdmZ#21W2@0i9LE1c!CBk_W&lWo=ok2QsG~$sD07
z&*Qvr<5+bqd3^MaX62oK9O<cUDDCLnv-catYH3$pLKo6kHY~kna5!KUNeo4mnY1GZ
zX$h^c7SlSF-DHyabPWl>P^?$VWLZ=%yN(Qg^ELo<0ub$J+`1}rZC{u6wUBS5f89;j
z?poBzlPevWKaJN_5B6T2ip`149WL(C<*_pbTqdtXr%^f0PVjKReuBD_-b2(8ZNva@
z-vJU^dB8ptMj$x|=sYic7>LYa>hU5cg55+k!r_p+DS$lGr#EZS6c^#=AGks)W5m~5
zS}bExd{O56*LE+xYfJN*YEMe74wZ$KMZ23)nO_Z|<lQ}UwpGvRx+3XKD&&ft0f(=`
z@AQPo&Vb7u2s+(<x_rLh;CB_9JZcp?L7@{FX><4TZR3ZRH@Sj+9jTbtUfJSsWJ=Nh
zw2v$v-n+Pb<y@yf5viWs?FyB;ToFGaeg3fB?XQ3s2i#dmKfyDD{kIT3#6n^vn6FbU
zBc%dXidc;^3bOi907aeAFlT*rWRe7?M8g^@rPEFTOje``+r3#Ubt;?+jy2pb)hy4c
z0Q0RwNa3^~jzshm2dqUdB&TJJj4u_6d5)2;&Owu5*=Dx|V}Vjz9*J4Z0Y}W#DTtcf
zq7rww%Gh!svxnA*hGU(<cvwh@Xa@cK$!NG-qRE_ja>DNplak7>45pEWr)HIWnLxxd
zy4CmGBc+6qJFXmTUzkWlhEl17R;lC(*n96qEG=Z^j^ZBw$#}50x}{-DrV$;lu8*p_
zG+pYz!c00IY2KfC2K_M5)3V<m=jib%N@{R(W{6whBau^K*GxF0b_EBG!VZYo6=6Fd
z!2N;j*<%nnGt`+`j4`^q6CDLvp6GlM1b8Cz;gh6f^8I`6K~J?WBqjIWJNZ63&P^rL
z2y;L`%%tJP3~aaal2j)lAuL1%F_#!3))GWqU5Xr0MI=^@lRPgLv08iu&y2MAHlB|x
zbKrmHc}Rf-zsK`Y;k9Mh$hciX27Ek(WV(@-K)RHG`2%YeS-RFDKk2kP7(Bw1h!ql<
ziW1pmXCGC%@L|R#l&IB`K1N~o=<o}S1rhlFF<7G`d@v2pERsC%zKXCyE#=_@thHEV
zDQjDDz41Tg=Eh!p`BJ%|y5qk_7MUC7&25epC78=TI;V=ax3^U~AAN&8jd-m<xE=Tf
zL6w5kfZge|RMy{<5Ge3gQ4x*_!)mEaPEr02GVJKynq<_nNT6GfCxm)h7PU+89m1ME
z-@@uJ;_*ei5mYC0ENF}LB(+pxDBNigR@MszJl2N3!&>;|@#bY=O=6(FyuqMIxRtUx
zfP{waZ}cwlpNM(HI${@bD?p>wfz{)H$b~1xYKb&EHE(ue6y79?lL8t)B(mCs?pUx@
zUt5_l2*?tPi1e96JZ`dPGHj@BTNuFaiE63ZD}*>8wu`D4H2Uj|jg8&S0bD0F(Vm7H
zCtfP`;|Ih_6EKXMgmeYbON<fM5r>F>n=uU!;$9ursUo>~IIXk}EHH`aHa`pV8I{!X
zre0c7x}Y~e2^^uaIXX$aNNna=ix&*__(jgJzgZ_L*P2B<Iq%5&?N!|5B+`xxCnKvs
ze*mn?5~*cjZLGJptkx(F>K#&b70i(%<lpG)W#1*15<7|g#O=hx#MAg!(#3oVD9M0N
zz;RiTnJz*x#rb&_p(Lp~e}=y*n<vp%wf2`vgc3=}KcL4i%Pd~8E9`I4jj8$8;-R6Q
z^86_!V9~S@tdp-2xtnTS3SnYlsNaP5$!!Cn`3-@T;mS62waQQuNw0`#gI(DXvD1L|
z==7!GmgNy`?yj9e2c)G0q)(hAUsITf)u8kn0PzQj9}&NpLY>P-@JoC%wka4ssk4Ga
zRvIIT7GI^3;4Vcg{<=a^1|Cosqq~EwfTvOmghCl5t+UUmZ>w_k@4lyf*_Cs)eS6WG
zS{ch1uwwkGVx2>l2oD(s^>P8v`i+;eCv9#u@45}!YMQpQZU&i@c%{-tF)|6hUb(Zb
zc6EG#W!U0Jhs8zS_y@JC5(~`p{g9h;DL)d?UsJ}2%V6@~A|8Utzd*cB`~}9<TsSHu
z0530q65py)AqGFFvLhP5q|&$3oFG{pd4O0&==>p<p~dLyNim~Ti+CahC98F`*3YeS
zP6_zH;^mE;fM9$`=t+dz^f;ytkbDVVr?xR-ci5lS;TzSOslx}=Muo6fDWns8pQwH(
z-$j#V1%5;AWU3amgwrO>(=?EBF>cei-J!0AiYB9cfm)1ys??Vx{u=744>TDj(2H8V
zH~xMQ&KeE)7LBz{yij8X$%&n46S|AMgAhO*kHoTZ+2Pqau%*9$^B~Dq4-HjUEm-iS
zvfW2lXzwG@JS;Y}QY`%>F19%F4ugeHN8}-6&>h5g8S4CGvDhiq3*qf(a`Nm+dM=Y7
zI^cxS>O%1(szWLW6%a(>7?K98GIo#+F1*s%L}~)~+s23poqHUzkrL`2q6(ijS_J%f
zk_v}3QiL@ohmvMRtejCXTFM^p9w_M~X`D9MN<y6$zCs~Z2{ep>v<ItgtHfckt-RK4
z9H>0Pp#uNNC#V;QB;IdI;GdadXaHwSam$#gR-$nc=-id(en#C#?SjCN4GWNs1N+a+
zH?fdUlcTW|-eLAIt6R1Y49W1Di?sN-nX#gC<L7=%uc00x8ez(ua7ijBmoCYMvCL3x
zr1sNuga<WNflOw-%onQ@Oo62X_`Di=uk@_SCK54nQ&0UAbojQA)33{Xn_$m%P98Np
zOFc>$P#krkub@5XPV@tqA(zGG5>rUW;z<@uN-g+xix|J>Re#RjGr^$`yr@H5+NS$*
zXHc?m1~zLVAijI%<YtVuW@kKO@UzDB&(<||m{TrSXR6=Mx3OwkL@^Z2KZ&KqM*Lfs
z0l(_9P1`;x)lDQSS3cxw=pU+S-F!g%g-=?>(rz-Ey!(^i6@K?8&wtK%?~KWQ?hj_%
zPcCa83SGYcw&q>I3Q1V%lou6wE%-#45g)hf@DJ?fY1{jD)x@H<YnWvfp@8A`FK}2h
za$V=vZ*;s!E-LUk$70E)j}Cm1n-@bI<;bnMAxmyPa-bS0oyNW#wZAN-{{a$D=c_kc
zBj!vIh^@Y%FgXen_DhlVALi#Yx&>(d#rS#YJp5uD{O1wx0^Y?wH5CU?49XUcWQqZf
zWW;O4`$&SgrsYfr^%>st(y8@NAd`GxHg9-^J>8{}=AX+GntuTugr9;v%P(C57ygL^
zfC`4wv!p1i=Ld*qh~E)}qL7*c>O$cTAMfx^Ma`CM>CT`eiqE8pyTBOr@NAV$X{^M0
zk+73j3jV!I!-cIbORUVS^eT$TSk>M9%K_v9&-~;Ug~u;Y$TWTU6tm(1*3Y+d(WA{A
zEiJ0G)vwz#=SB4L7jW{NMNu5m{67QIYRHvtz=zA%K^iUb?;-nr_-6kV<Uk5*15PF6
zTjz!+j|zw3&IzufbYn%S9uEg9LoB2n7DTBbAp~s%!C_vIkmSusH4S|HQeYr-K69#B
z`p44ppv^dEIG(Itdp{TC8&X+JW3`7>b&c(o25&Z3z>6yS7EWbVEpfx-hBPncGF<u2
zx~1)V=-~jw%9^#;c5b;LAOFS<9;t<JD~gHSGMm+B83uVlinAvLXCaI2Bklo*5`tcj
zT1s-smlkL0bhy5Y#!oL);)bA&heQbSRGT3xW9enC8mmI-WDGKi+=@4*4bt|-GO5%q
zO4*DqtCf#m3%XfE&H1`<i3hJXgtSxgeN@-uF@!7?LZ48rpzu@eYUNnjkq6UFm4nGf
zLyD$prrM8pgh~YH-OTfuGr{d1e1FJaG9_qUOJ`5=KhDnjTH?;nns<3PjNhFrPtV9G
z<1uQHyT&4)lE6^m@fz$hDTQ20d%9cy%d=Kn)H3?_gYAo@GEOSHAuH8S!_}dSYlO8k
zYD!EqlxUWeCed{9Ecoh(1+VWDOnjz(a%Bd40z|zETstJC4#?P{WzKbPDZ9olM4YZ<
z$l*uOsv)_|SIw%!AyrJJjB{5>xR&i_CfO_xb<p~Q>q)YXRGN@8+7^x}xeh0%`0Ud;
z)<*rv=^$Bqk`9O16T>~jqK<@8V|4v|97!{;7C%4OGd!@rxou-a8wh!mZR57bN2OJR
zQG8X@Fj3V)D?>4tBN;4$eO+Jei)Ry$UAO0GqT92)e@N(Z)hac1*VbD~$$5tE9XI`W
z%@N+*k$=&Q&)rfaV{OXGm-c4PP1b(z{;lIac5r`RxIN+4u5a$V-GDwwAOX7h<IKmC
z13%B~h_Op-&1)rmuh=TqOO=9vWkV|9>Yive*lQxrtB)fc`X;jN{SmUP7;0Wyx9&FS
zc<r2|S;ks4nTLL}_^}7C?gVr{K6_I5W2O#@YaqWCvVIw2IQ%#ilyQ}v$=bpN_;TIQ
zJi<!2gS&x)*iQyHryA0lG&z8wuB$^zRV<z_2)Swmzm^DB<W(5TVa(|eo<QZ42n!%d
z#4}YlQ7VZ`r+2MMxB77)Zq(TS?J`qMNuwgebG_Dm?DgjI)~H8;hvQbVZy|oOGElan
zw_nr_b)?t6>Tm)nGbc(SYpz?;KX^^Uy$P*o?nf)r+LR_{FE!lq*!}p=af=q<97D2a
zP)*m{lluEISHxLMWqmn*xyryEIdpJj=-M^-uT{k@s}IV@n<gw;qdxPe%-ef2XCKLQ
zXWo8f{pJ$(=~(^9XbwUt$<!ff7Q({d;O{4F(7puuCuYhIq|Fw~uoRUGPOwB2frSkZ
z^q2t^U}2W!QaanD=hm(AK1xbK(VgURnu^DaC_WQMP(}fL;)9i{i^8dAgHP?+b2Nu(
z^E6CJY2G8WEtcgxf+Jv-@kT=B$t3Vx(XK+8%!$~Ejh33;{`K+A`!pr#QgD)ZMU_K4
zrG~EQnmtryxVRpyWKIRC=_=^&o8~TgB8RVNciLsPBDvVLwKOx?d?54O<os9T%h$FA
zAJ|ns&=CNSi#JretEO~jx{wTG=!sDjo1Apt_3(!6ZgyaQf22L`=DcjyI27%m+2#0!
zYHu8t=%6gmYQ+vNBc3F+8dyBCa!mpFAB9x}ZuJkMhuz3^KXhuR6lt{BU!yP9a!rva
z{9a12b~p@&K;7BPVfbY(8j`G26UL|Oi+NG#C3^5(HR^EA{G5&`tTMoj@CJB4G?Byc
zBm+|b`vMcq`9N06IQ`Iw#BbO1RPh_k_RzuY%kGI7e3O6aaK=K)WU@Ro!jr-3gFPj(
zOJ%afZ3q88YKhvclYdJbUS;=6HKBG<Ki*ZVt`H3`EcHw79yxyFw)w`%Gp^3I9Zsu8
z8J{Ow+%vqe@93UgPX#}EQKU(Y#e^=94xgyC_1VYEJTg~tB%qCswKwcv(%0MnOCS2E
z!7yy_x2D&)^g5SBMKx7-%@t`A_cj!FRM(dzEG7zFw<c0TlDeK|yV6CHQn}6Gb5|I(
zYF46W@Vw;UI`@2ms6X|}RaK+NF}T$wmLsd#mEK+Cb;3Gi%Fvh`tZYg@c%*EsuOGag
zQE${*CYr|O2Uj<Yw*T~%%tzdy&ZM<%o;z-;>sj?~=T#3qy7cGY`;OA4)lbYBmw$8Z
znrnxaXa3`nz4*>l`2xe8ZHa|4nbsX|kM!>!VBOm{JbV}V#$@LC(M<E${g2&ZD7D8l
zDQ$YCX>_DM_B1Q;SF|OTMnVh;Z+hqvM6b_m$~^h?q2(0oE^aHYwCPB(T4@pBhwDNX
zg5)}9>I2|(2hs71#BT5s9MNF8H}46g49jD=cy`_oKo=Ck7zJ)xWslmqAXbQxUyie3
z9H`M5FHTzgMt#*k%+hjc=AoHcl=yrWRUZ@MUp8phn`?Rp*2lK&(-x;?Kl$3`*!qFq
z8uRE0SlZ3}McE;bg|oz7%Sg=ur;Q`FlwWVLh4GH1N3-0Y=K${4)%wF1a$mZ*{XF+8
z53l67AM60`k2R`I!2Obd6u5t2TUVC*?c4L*UxFWMtXyv2ROZdmJT}@<4>a%V`;`}c
zRByb1=4vWc-PI~SPxDHPkpg!HG^h04X`nfxq%ym~>!~p4R1DCZaVq7O8h2^BSi5fv
zUffiqEQ7<@S(G4`MZuyEKHj98xWLJsBX&IyY+JiL{%i6WiXUi3RB2&Lxxkq03ku(I
zsm7!(WKH;{RMr2f2?doDXF=@WAStXMT8YEC>cfDS^*}nyGSiC-XrFT50TjsVOL8{G
zeR~0G+;Ld-E);GVRpo9gwxn&6X;lbrPg|*c>aRFY+HC4SVl?14f(G2#=iyH!xA-*N
zp3C=5vI{cd-D#x~Ul}r*Al_vC0&^OqD$XXm*;JOv^{M5M^%fMue@Q~{j>Vh$J0DM3
z@LyYuD!nl!N`722)AkCB!AFNa?Tf2j)*gRya^1`trl3q#5Q!i_Q9KZ7h$|8cmRB?<
z0j_O>&kb<Hynu#F!@;$ok?i~&tU)S~!@S!pJc(W0WXJV`#bh{u8`{090V5T*%{CGy
z2QXf;poA)KwB!8?%FOwd0B$i9GTz7X)cIH94_}fzGiHr(TijXK)HYR{ve3t-#1umd
z|L5_~l>-(l+WJZga;1PMjZ>n)lIq!$QjRYMB23&ye2C!lx>;=z$V_In?4cu80iVu6
zLVmm>+D1Z5VVO@;NiMC2q&-`=L!!ccBb6iB1&OJY&8MZXj?Jx+lN7W}A!h*vCh`iD
zoUUtXpVil=1kj2sIDQg;GS6U=Cxks4z6!nl`T^+eZ#t+pnxnqj>W&guJ$`RqXh5N|
zv$TliGnA#)SmB1ERW6~BS7xd%ZczO4Y;kSL=FK~AY+EXoO6;O02bZHVYqL43%42b8
ziX<jFm#2<C`@1cBHN|OtqMM2MIXYEj=~S@eQn-r(eKETt+h;hmqolmGBw|*h;Q;hu
z%7zRfs~?tq1R{oXFuJ0uvUZ<`rB*E1h{R8$s;<3TZmhqzyT7F|U-UDO#o8c?wOAmF
zm4+j|HLHTFB?mIkPIkVMxf-(A!S(<eZ3&k*TRAp&<|zQ5_COziD~`)xN&VkJ`%^w6
zKytaNGYa_v1s|K)HQZ_tt&3$VVXlNO=uBpiTAtS=`!BIn|NQSaoAI}LbtW6?trtib
z^;HPG$Qksx?5@hfI^{()E?20E+)2|4m(GkT$0xsMua+Ph@oa{|o~3{VSf^QlWM|%(
z$B7e2e1SO^6^;c^=0c73d46>U6oNbyqC@zOHovu?rGH}n6ehFc(!j}?zI`f8gl6@q
zZn*^KTL2>W6ht|PC)NW-#n7pH9l^H&=UKw7fL=7RaBZ)m+2yCbP$->&mMD*w@XhSX
zs%yy^^d*{2BjJWQtFncqHgh8W;%K(8%w>XSPkk=!B-3ceE$Ut@cwM9cXOYZ`a-Rt_
zdG2wDb(;X_KH|VdVjYJm*H0ZPD>}dM&2mj9pd|WDR;JHvDVp%N78#3YuaYB;JswWG
zDhFl<!&!Z|(uKNJpR=G2ZD5c^kj#??KAApGnHi47opmf)9n_{5^(vnVZJZ@EpPrSN
zoFOj}hk2iY!$sT;wFUf5nj|ll#uNg}@|j>gx_j}vBI-qAHGFWbK|Ofi+N1UC=8bDZ
zu~;g<Z_e-2+`hRY63y>p`F%XUPvrNNIJVB)n!78Q%3TenDzjIEsmA<1`}F2uD)-c2
pb1*mF9M13azi*B|npyV>!mq5?qi%e9y;=Rn3s1rq8`HnG|6dS69|iyb

delta 13294
zcmd6O349#YnP<JK>aISk&#La~v#RfIN!?Pn`qI&otkaf!%93qiW6P&Ze25q@<HQJa
z#=~WJX4r%b7_$R`1w$|pemhwpAqz1Z8xz7zGKpEjZkS16H-x|p1WVrUb+-;*EXibc
zR_*@1uJ>MbzxTcG`+xuM`^rB&g}(U@Xo5l%MH#7UDTZ3o)3bcx#EAt*C~7-&Ql8$f
z?j9;meU+lN{S>Yviw9Hb1%JQUN>OMfT(8@(eRTY(<<EUgQS>L!_vJ04yT;F)fp4O=
zorH1CmTiBrdEQg`dWuqcC~E!HW1B`dD%uwtVC)z0&W(+2ni%!J<Ve8HcIXI=ZNK8`
z@8{k#!S!?SZr`?Z!{|S5f8$3K#cqS~Bil!>9;Xh`Jd73KTHZ0bebeCX*9IwS%R%V-
z$@tD)SA5N;|0jytIz~~<=JMuXgAe}TzaLs_YWbMbYv4ADI=Q7`4{3k)65aGLHluua
zL3!#ht*0t8Xc$H1zIHMZ{#ey}cpGY=e|Zu=iu@Dn%AFMbC~U3-qwVl}kAWcm7Tzg%
zLq9E7)?IFIsb24!ZJDpb`1JKRtNqjSsx5ke+RMOR=nYf}eMXh&jZ}#dsXE+3k6E=(
zQWOs-Vffz^rQUVsIh}}~rB}`01}8vH)kCq=5@^lvf-|A0U;fiO8-LaMt7X4g|Ne_`
zPNe7LJL`TW|7yu^mQ;Ft8Si)9$n{&{L)+aHI{G9dA^aqxnK($jixOxIUN^z(RrD&o
z1YW1<)67ZcBnvOqJF0g$nxi#K;57!X|EPIU^UqqJ_G{V?bz{1B^lANF`kxq@_;)Qn
z>$~<QffwEv-*Nn%^PAFtb}#d;mlKMtd=NMh62ostb+JQ<Wi@hbW9_2a9kmB)UoO?Y
zU+1eEsXJ8neBHar+T@<(k5Y-$SnAo-k5ix22kOV`pKGu-w7`bc@V-}7Vito=d#QS=
zpSpzl5?*G=&_0A^UcmPnJmlkZh8QCTMEs5+!l-p>tTV>gK!2MDXN}>wieuqxhzc0k
zd90DDp_)J&(xPCo^C%dIw4x*(R02H0*BBGL#;7&f7`<#deN-=5@zX}xpfzdj#v!%E
zWAU2sTShOQG~U%BQK0AfKqT8(Qf1N(O9sA;W7LA(A!gF~63RA4Bf-GCoA&Wa{lJ=i
z^S{*5%9*8Drf>O9Ek4G(wR|jBEEO^l;plt(`$)Bb+Du)8e_?L2GeY@Wm>hfstSq1w
zd@QcBI}w9BEjdwZH0l^8xsc8TmhCR7?S^2owpGNpS)3|9;`He7BbFAA(%Y1jX_ZE=
z8bfWSz^eYn!IH?-%`eurxbPW^6fnhIGH+@Foua4@*?oq0LASP3H&FM2XheqqlEJ^Q
zg^&s(yA8YS2E^hCYo22{+F{YE@M4QApz#OOHO)e6u^?&bgjY|;+<FynGBX}JW3O#)
z?T_GpwzjhIRn2OgvngD9NiG}8I`A5stny{E5hvbfYxh#B$_n@m)DZP$YCrWL^<U<$
zVL|zq;{i697JO=lk9OD^%aUP&KGxw=IZBA_Pm+b<%k8b|nIDd2l-|zyU15e3e7<<7
z-e%1E4IY&*zG`GJsSjq7-431GDw-{v%B(uPZBJ8qof=``%-WLO`N3?!s7dtZ5(&A^
zZfXu%&^w%0Q(Nd-ml1QzTWecgdaq5g3OYNeR7G7sWWQ$mHnkQY_zvoR>S^j2epy(f
zVQUaMM-{FS{T`Jc<t)>CfQu4so4LZ9#YJXYZK0(nXw(@s9)C?ZYscRcy$PLPNyUo7
zxLxCmkBkh~O<yxw4xQbFRgO)(H=m6<ExJfYG9Ai__)3SoCefG4g$s^r`q6bZDbd)o
zp;3gcYy`RtK?&XHaMomc*OxoVyuG@BlkAFv_lN8)7B@9UT~FOf9ipC~UZ7s99+H|<
z2Lqs|__q!}XsF4#3%~5*Ee_F<W0y5>T9wVN)u{~}KIC+=8kL^Kf9t#~YzSvkosN}G
zvsUH1{k6(ff7q_NdHY|qbnfB8YGe=$xL1-{hU0bkGHGvDdTD$8Jol(Ki4Gb3(fmi{
zYuAz_z%@a6q-Srj=BO*EyFr7Vp<beXLcK$M1pRhVuvZt!z#;>n(*v$HnrHB>E(I=*
zxSWj2A>wbl92U^79Q!reptjoeDz%PN;orKvoJJ03YFk8Xb*Cm6wTfkQaxyVbEX6cB
zj%Qh#*7$Dwv9XX{<>^WD8sCA}bpAjpRuK3lR@O?cVSmXU$GE8R-F3V=rYxr6Aj?Ck
zZZag_c9Mvp+hI-xc^zBO#PscZH6a#h4Q8#5Te;%CYq~Zy;pf~gu3=fRIo9OFKXrGg
zXcdSUyFKBF#QaPSj?%mejP?6gXQJ>skWi{qnn1@zXEgu&I63{i7+$SLuQ;6H{KpL-
z&`#Gi=(tUaw0uCs+3B)0#!Ma%D5CbFE6@Y<Hz_?ufx!V<R={%aimQgBozbS1G}k;b
z(j4hbtb*x)uI>`Gmrkl*p#&-nx0L8iT6BnhWCs!96CPP@j5-4W8#bw3sv37lv0{r?
zJR0{tM5D#{q<=orV3#~ktBzaaQcQ`(@kY5V!zxCv$zd=OjG)lu<mprF0(F5}3>RwA
zL14BG*@D?jE}w(X0K?!5UY8fLiaB7#veL=wRbB_)q%;x^at25UlVJXa%2O0JuXY<~
zau<_H3!onORV853`Xz~DmHe_5iN!Qc<0(asWEOcHNv~VOC=Jc>CWGWM$aSq@*NWod
zvR4L*!2F16$9;hU?Xcr(137va;qL_U-W>?JTa7}fy!12IoOzk~7PF5y4U~peJ}~IU
za!}8Nie6k7j4%z0lK6pszn`pg*O?dCEzFZtH>|frx1kbK-kj(tY4KgbS~nAnX$}fL
zt;yuOJeF(Iasg{l47tNf#D+a`&|`iU-N$q;(4V%+dcE509&A^+d5ISdCXEVjmV+&h
zss9A4;?69dd`NnQIZAoZN^~W<2R)1a9(@QaXavs%GU3z$2pMFgh2LiaktoB#${Pv-
zZjbAT+pT<5r;`YVL`OzYvSr_wN7)n#@U#i3IUW&!ICln4)<pr>r$UVrC2|a)Uu`Hy
zRE8WS2&i%i2!GZ!hyazxX&5I54jrm;2UG3vF%DwwXKw*+DslM|9d1mj&fXc9-&|s#
zn>n|eOa>`T3juzGd;?6K(+QH%fMlGnw9SiT`L0k1E$SLpG!C6vt!LGYie@#Zir34>
z^csQ3DB@!(t(1wZnr}a*H+gnV-qkPoU^;qCCwg<W9&6O%r*lmY9y@OaZcT<bdqj4-
zt$KWILjap=%oDa~*t+pZsAG7fW&V{1#6of75of)ZT*Z2uQbCEE(*xt)qI=^JYuIBQ
z9+5jj(4n)zpH;i@2=A9{hH`IlZCA>PvZV(<duw)AslJq;kvTi7XVeU%W<NW|>P&)b
zB4C@l@97D&ieWxGrnUKM-4_}z-`_TGp{Fb`A>{WsM2mLj>nnH9j1z&nwN{m$;TVS1
z(CY?9T+XX+{YLk-sKHrpjF{cL!zy_dM_|q5w+E7wukcnIgDtf#rqT+v;er=>1M0Cc
zt6nm(4~rqaCtKrhmD?}7vG4fVqj+gbQS*`~=CNZrRx=?tH#)CZud7d|q<be;_g}A0
zb^745EtF~Ni_c!)JCRx*x?b%`G>Ykz(QxmC+3)qZB*XP;t1le4lD=s7x}9yiZ(n$v
zUOl@5DegCB_@LSEk9yrLaf1*FcpN6}%mydwXNJY3?ALl55?;&9=<Fc5cVHx45eus|
zngzjl_MJ1M4fV!ali%pI1%pyx4Z$WgfdS!;G7QLQ9vVg0p}($xfNK^7rcLM^82I<J
zeE^4wsh@AuU(lx8E^gHJJ1(yNZ_P34|4)p$epy?CY^m67**5=Z)7(5`+cUQJudvN?
zG<)*NIi~sVVUq52_t4tLiv68yWwUnl1&nOsPq8u;F)_;uFfoPt0GUud>L&(vA-!eJ
zbCqX1Q~RIMo6h*kf0g?)ub887ebY{Gt}}S+Ja6{@z~9YrWPdJKwEA3M^!b`J`S{t+
z<=@2h%<(IKR__omy9bsiuF(&Q>!OZQKc;?PC5O|rh%g|m#J%{y5?l83cpPx!ixa`c
z>@-n?P&j`+84Cjep3A$+WQ=)Y2B*&92&eGv$wc<z+^BcFCro>i@r$sm4ONy^rDB?^
zfv}*9snBQtjqnvTvy^iolkk-)V$AitxFhAlPo((dMF>XA*v*TV?HSBmfS$Bh=t-5n
zpp(S+U+m<|cs8?uDlx#frCscuaFF=Lv>m^Y9^`<dn;12REq)p2Gox&c7`NkZWWK7a
z6$*jYK4){L6`#qtAyG`98J&DcHwyZ&kAf6u7%#1N;!TZ32;S~*6#O%^9gZ7FxUDe>
z`L(jH*fZ%8!Y3P7<Yodqp=Is=sHtm^U45hZQuEeF%FMN+t9&}S)<ZU_xo*JQ5e+R)
z^`=C;DmyeW6Akv}rOE9*s$59A<~NtE9k`LL(6W}TH!Z&E4nncgeYNTFgNIx9NikWU
z(}zv6FXkO3YzKC5`jqxG1d*3gkQrBzP{YpCWRX7PNSC7t2sx}dYaZgt>BtMhSRQFO
zp5fHdB#X_f+_*2t<G20AHVwNj)Z(*PgKEj7V{LY+AsltdW+Q__R##JPi}3nshcglu
z$3Hqau*Sr5W+yB9A{JN3DDZkUgD+q0M*AUbYwwwn%qMMw5h?Ah*Tr;3i-vZ{#k&4@
zm}AzD>_FPrk$-f5N5`6;z~RSxI*V=1$$Gul@1$9lG24BT1+U8|@a1wEg5c@cnK`rg
z^eN4!u;;ZDhUCq8yM_n~UM@6e%RV*PGbCSFvSp^c<wQYQKXb$t@&!i>8OrG+E(b(8
zW_7s5Ypw`{vD>#Uw+2F1rDvJ5Dv6yRAG8JhZimfeU`#Y?G@4kGL-O-d$m}$0So}bt
zd911oRa!&Tf%m5a6@4h1yT-~I7>;H1=LqZh*vR^k+fXOEb=$O*SS@c6C9kCzt&IeI
zK8-_in2ET=fL{P<dGXSscdVj86`D}dp>T7ZR8gXadPAL2G582)9<8JyxDz1FTfm4w
z&jZm$62oRmzL!x1MXf8VlL>(<hwLy*f?GQW7GTTSa`<FX*a(_tH_^l<m^Rw#MkIq_
z%|rO>qe-p`zL1<pmRJwXDI~wlofsV))r*mo%PP1+$95rp>P>t9$d;PH(G|CL_wQ)b
z39e|!RqEd*Kev-_N_5J&qe+^Gw)$ynIv4UZMxqWroogFvJ$}0I^vyRul<2Mz*AI{A
zLZMcxpoDhcQ$sHjI#%ww;qZ#Xss&?r3%eq{g<9Uk$=1o&_J4KiyHh`yIyLgh?p-l%
z<*h@(VqH*nn6`B<zE?sY6_ED(DF0VepH8kgHuaSpcd6XH)u@RYeE4`1H&|FylL{^C
zmYjiX!hPNI$br6&<o(}8-VGzs&Y|RG-{5z(_LV#)&MQnE`RT%Y?!IOe5;SP?)6=JP
zFR0t7V?<v?02JaRKxPofW2M<^gVcnrY^RDEDiuW9EMD5Iki5jk*34FLH_!t|gYxN$
zB+1#pOh7uoI~0gUvL&Q)H+M2NW60?UZRwFB5vw#RbxdhuuMaODy7bnLf$^-EYK(_W
zk=k9f|JlpkEs1%SDOKoa%bxm&ZeK1D@;UUlRB~$THjM1Q@uA|fFkVwi<!Y7}OisaU
z(4cTp7Wk;L=}-Y#r%ogqx7>W`aLtZ+9S;{o{en+6_K00VE*O{YX&u|$fv;`xHaQXc
zXdIb-fLfORdeZr=sjuca-lZf{-m7+Oly`L2ML?1{+q}YR$Mfhk>c6yR|Ka-%j*WC&
zHV?0Ci!YgX`GB4?+FX8H-Rdr@=yFcIJN4`RQ>UMtS~m6TC$}{%7P*&l?PEKu0_JIT
z8-ffK2pClK!V-0J71b<@wf{n5or97fTTuQ$l8H9v+8_x7(@6(tv7qSSGYj<=un9=I
z`Dpy}R*!4;D8Nk4J!HX)e%{ved6M@sRhbW6Nai#T&>M09;PkICnRtbh(++3QZRIr#
zB&zC4C95S6v|0viNSHd2JF&ytvV3@3{>r~Jdg9GNPlMlzUoQpvXU=Qs7tobYw)XYk
zf6+t4g*G2kJ*&YBp4BX}uPn_o#i9&tw)nmF-qAqF<3nbHp{6xjGd0<LVCsjHOWw?{
z-`d~s=)PcYXGRVepx*Ug+rrM7Lw291U!tL6Se5}e_iJ&eJ=)BaYfR-d9jCxaLz0WY
z5aj-RB<%>+mW>i1Dxa+4D(BqnL7o=C&W?0BGd@JJuUQg8fUi*Cb0!V0qcS5y>R=>e
z21*bVGHS3sk`8{gUEv~8sCgt2{$0Dhk*ElXYqFp-a0mPx=#3qcxtV-P4NI~@IytZK
zDl&`X)xjiPVsN2jaDo-RGOu@eEeH3k`<q57Hu>JdU@onde6rsy7}8@ZlP48Wy7W#n
zXELqnKlt%ZZ&vnAepooPNs01;TnwukYL;&Z4mSP%;iF3@{{a1ROm8hNROjk1sY%lI
zXjf{*;p;D7*)B}}A+)&vD?y)N4Yh<-+2r8pB}2A{ZX7<aUH;^_Ug#RnY29|WY{lAn
z@;VvqvPN8{P`oiEX2%CQZoPD9`S9y8^ht-%m=%)qd$th7G1{2U=A{etqHEi#j`+gn
z_C&$!X3))BYyme<)24_&EJrNX5KZ%DS&D`0U1l3g8w_R@zGmLa32Qv)VObSD-1Ww_
zO*>Iw<?fJLuVFZ&XbSb*;Ex9NDz;0iPd2v|J9{2KTsuBA4B+c>x<qT&>bhc+`QYY`
zode&0W9k#q?Qo0ol?#eZ?zX{A>80J_-00rFx@Xa`XCAZ4qPgpm`a-k$>sz<nG}7_y
zH?Q1ZbLrGG+9~#Vp*vluGvR?w1!&6s{o#(Z4lnJqcdhy0gEfyleUDV5<b*D<XQO-P
zSbOf0G0vE*?=P%vOsi@5$s-+i-9FfN6hCp#BmE=m87>^}uPe$9n$sK2CL4!e?o4}W
zlJmD805`CX)}2dSaKnIO!bcOLLYEadNk<!}QAf?GxH9BG#+N`24TT_ZxR5Qj+LWvU
z3PoUx76o8+)2hx8RR@9>AQ}sK>#9M3OPOO22qwXI5;6$?Ol6ZG4jpv1Y7?@Lp0x>B
z1y~XB?M&G$;KvYtyQ^tKBwIEBAXh<Hf!)Vuh|`DV<rM}1vuY4vf)$&f!J@z>#Ii}i
z>aD;g!1GmRmW_f0PbC#GDlkPL5`eHh9X>NRb>u99iXZ5fCL*PzPs7uClTF_x2T~rB
zdMrcm(2)px0~SAn9G0n5`Qtks>9*cQBgw1&QjGVQUcBYX=;F@Kd@gR=c_N3>Q}5{#
z^?KgrmW<X?sV*&r;d^*bDkyj9f!rZp)9zInjJ(OD#a~(bP}x2g1#)Rqaw3!TWoE2X
z;Z3Z?=?~XQ2lx0}nu;DV9C11(KP(>F=uiZ$(6A7!bZA3}Sm{$sCqIRLB??wLz_{y_
zOA;xDm}&oQS6w#L+i0EqgS9C-u!l1lje50Ubv1-UbvC(d{pz8IZrr~rQSeN?t^FCk
zsV6aEF<)VexLCcB*AhGB-SKQ!v>i-!Xz0gL^hvvGR4Q94O&d(+kkL+in`8OzfJQ7l
zT(Q=o*M$&`ZrakApc$dHrpaXuA%-_8QZ!O8Ic#d9Q?0i17Cq-}3D@+*#bC#1b8g%4
z@)qyT<M|}5zAt0$jdpD!GbI&NaV)-;kUivc3s!@cJ%`xh*ZQ3k)?h{{HY77jSn6U`
zdL{0^p{L>(%!R?8FSlIH(>IqLL*3v=U$gS)zPc3)Q)j4sk4iPI^A`0+enLNm@&}@K
z-sknEBVMR1BA+K@i8Pc#({K@1GRcNwc!`#Vuyz_+lvTS!Iupxn@i^un%e>Ocq8RZx
z%$i}bv8^{A=vmXzL7>DSSVZqc=Y<g_l5tH#OuTR7uIsMr-17XY#}K1Zv9f4LHuZ)I
z&Dhe{G+{7S00k;3v>470G$t1J6cY|Eyl49p570lKoO*TVRQEVR8CoSeoCIj<`qS3-
zk)HP4OEXAA(+nb5^CV(Nr+)eR)W7VQ3pED2)vMKd>|QBgi43--7Otpk+rA{#(7$zk
zbN)^GNmQ7${e18TOApfJnYwy!T7r2xo8%8hqA`dk83It;hY$^<sR0sEhJp3t*M|Zo
zQl9e72Ey1mzx=2QU{=Fi%!($}Wx5ZKi-5_`5T$9<QrjSTX2W~t%O+)BU~X`XAD-`H
zNyJGEx^R|3yFyyCQO9vCJ?4@+`Zndv3$29WoMX@|<fkydz-KZV&I+Azae<E|ktfl)
zrDy3JRJ*lCi&eDgZ|JdFQ#wuG?pZc6SLvuSa;x75!PHZC0o^P!Odg;qg1@)YDX6kg
zPizDbnHzr-K+pXV!cjey?;MU@zdDdI<GOyAq~Y}%H4})bN}neFFPQfQMTG9#+`DH*
zT^*+pLZNgMy_aPzA%_PQcTGN{^w3D9)tfB3L_ArVyzHV;dnFvjZ})R6{zPGt#05ox
zqNzZhYpDA!;0fKTGS|jS27)wb;L<?K>9CV%65JjdD@!B5NxYtg=Xrj+$jhnCPC|#V
zWpSMGM*R4WKvWn;E+!+N4?J!SNiz^Oiq|bnu>O2lz~d`xeX}KQc#H_bwWrIcJwQE5
zy;n&NNq5b6$meGW&O7z<7q6dLyyi{(!f-Nb@?`@3<$Mst|D0z!{@4A>b6;q0q$>aT
ziu&k9qWaTsoPBzr`4`#r#O$WYqf4hx@kGa6RF?V{(xU;;bV7IuQJt=yL){pa>&EAH
zLav`K*VLyg=ecUGAM&9<ErNtMKrNiqx`97Hsas7d<1{`{AH^q@@QW(hnR3z!SURB&
z)vOh{Z<=wCXqQvN56v(mO*I&U#7&tPF;L<sOdM2ZVn*u5_uD$dbBfy2`FuwE*{c^D
zIpytaPMgZ*?p>324%mHy0X?P{s`=EI)?syM2aDsmauM3H0?O1^9JISU*;s4y!UWW%
zEi3R#OB*iLSuIYE)pKCV-d0zAI4UV-BRJZq$=w|9u)Kac-kP}b%Ds2`8WW1B;*E;F
zGf<{5TPq=*;&ZuePF`dyQQgj0-nweP5btpomZ?24A5rv)ilU!YOrEU*1=bj6OSF)+
zovzT53bPoj5i2!jC?~^nd8C?LO~~4k;Rf6IGriMwVClZEB<kiT8a;MYDGW;_t4m5y
z1GuwR*luYxZ@aGl_-Rl)dnDje;7JXwUQGwo4u4baKrBKtEZVSY2Qs{bnwIXr>dy9u
zmkk>nN{y=sks-K$wLTD&!To!^5EdGv`P@KpsA14_VCt30#cxbq2flyhKnm^b&G_>X
zJ2BVT9L<FXNFfdSIB0Gj9+>*O8GHt}1Df!?m2P_yLiiH%1uRvX(HYGZxvpVej?^|3
ze2#!mhxIEw5|rn84Xv}g0-vhCkfruk4yS^=CdqEnsTfXmLHMOZKF%n(%vQy1)1M2#
z7dK&Ljvy)~ycz`2KrNzfqW&ie&p?+oOibtO6eo#@HThg6VZ#3j;+h3E!(ITkMABQA
zxZgI5ZpprsI0xQ7^ZYqvT0y_W+NFDzXCOU33xbdzpOf3Xhd8@`6Oj+k5jlD0^z<pi
z2O#r0ctmm%!4rHHdH^Ya6gV#ku7X)e7OA+PO%Vw8L3{;y0mzFI!oWhp9<tITVNVD{
z(@d&bOH$RS40MD{0fd&bv6Zw_k|sf*axULE-}B63p#D1``z7D$^464MX+BvRr+@d4
zcExY==*`31=x<GGdV9om>x@oUm%j9A+!k~@cnznw@ODxPfXug49|7z#@uU<`$$$Ig
ztoQu%H$11S(;1CCZ_-F1UxQCGmLa4~t0-O#5~ofCFTZ<1IW?7Q9_<K1BzF3jU&xZG
zFjujp5t9(IS;`cK*4Yex-d-UwN|**S8YBe9>WReTkP?%;c8~VF+Cw#|K0GvDd-(Bl
za_X#3Z!jA4I*kgkthzY~ums#N-nZK^wri8;zz?T-rv~pRC#zCRwzrX><cqr7$c*C9
zXPyHBbOmV5B~Znfu3^kk1R4Tf$TuJ!pSh$qJon)~uEc`>6zu4yAUBQPY$~5nl{&jB
z)R|Wx5_W~4K2VXqzCNMDYcH*hpYu>45|n(VCsbTPXwq4-B5c`HCU_Nqo+F9A-M+uR
zGm6ogSn+e7CuGPDbt3FAP2EntOss;iW6)$04G`LFr>Bj8RIUD~y=#5}Y`><)r~o|Y
z;rY}uV|JJwdZN69E&q{n8NQfY(0%YMV`)om1xGGIoN0^KUe>ukNr>*x5#rG$YyX#?
z*+Ol`4=@56#=~EFNR5`EL9`sVY>Q4ba#!xy+TGBVt+u&po3FNoYFn(f9o2STwe767
zUDdX`+V)i1?)qxmP;JxIHdAQ>-PHwjR~OJ-T|jqr0o{e8k8OJc;k`RtXbAs@9Ul9e
R559FPsa($fFPEl={}1nCm>K{8

diff --git a/fonts/VerovioText-1.0.woff b/fonts/VerovioText-1.0.woff
index 610eb15b96ad6d82a5ac5a4289a1279bce7c4f09..2d81ad83338bffcf69ed054fa18167d1751b71c8 100644
GIT binary patch
delta 23669
zcmZsBb8u!)u=X3<wzIKq+qP{xdBcru+uqn4+uUSh+ukHMzkC1t>N|Cw>glI@x~Hd3
z)l|*t?h=rp4iKQHqJ)H^nwla2pf?170{{RZ2nhg?Z~6auL?tAM0RS*D06<F#00OxQ
z<wqwWA)zM!J-6c99sfT>S;QMiiit}A0J<sPI_Wnk0Y3nqimHq(-@&cEb*XO{#k*Mq
znA#fyod5vPoNprW+c?n;7l~qJZfy2FhW_T*zrjJ_O-XF^O@4Di-#YO($cYBAD6H(=
zyuOpPf9u!ZHo8&P^C^2{ukUyuM&BId|3X;_;9zWT{>?Rf>lfd0N!4>!)ydJ-?Yj^r
z06-9c_H7{kngdvP<(L|o85sfge5=lmZvSx@;<R&P3+;$>8e>HCS~eT4ZyN%yqzTbj
zAY8byGlYr&>`w54$^0M$8nl4EC}<o2KnVa)1_1txW6Wxq^ZWP2?|z#pp6H+;WkL~F
zLrW=RR3jrJb5kKuP^pVRwpH|>U^X3&hz+G5vZgu1<I~OHR8!EJ1%S{P0Nw-KR&q1Q
z8;}e1fI0Y;4xTo!88-wpVYn>q>-YWcVYnud0nqDy_cGj*Xbbpqv%4RzNF)GExm$X&
zo~th5g!=q~qM7yIdAkACaEDRE$b;;L1ypu%iwE@Ol;(uxbmU~_ROUqHH0C7c6y^lw
z^j>&W3aZqLZNn-Cc7{X$9vczr-ZO>;0AF4u>AyGVznUxnAzzj_3)tT~$;trA@y%W8
zLwTtUKjmkeB~t_`r4d`nDG4JZ2T5TZETB`r31NvV^`k2F2g6DzGp0ot_}!on6}X{G
zqpK+?t2rn|VIzZs3!}h^)2VHS%Cmgk^Rjw+E&}GuuRn;k1GX>zcBsze0J+`Q*~R2y
znBa?D`m!bd3fvuS)VH5*b%mi&z|V7jX(S3xjS&&10(IR2E;HUzi;>jgq$9DIP4UXs
zJ*ZT;>uz3)+LF&}<m%=pTsx8HPt~c>i*Uo3otIG@CHrT8{cHz)^buEAmd#-}iySEm
zv!a!AZfsY385VL5X&3)X4ZOlYij=!e$)L)^Y8v9Z&GORqBTkFvYZSJ_*pA>g$$ybY
z$6=NTRvxS{U1G<@mXA%7@GXv>A3QPDGuN{$!5fV2ihYj_kNpt?Gh$|%bz5{B)i~$1
zI>xSnlaHH^XNa?nCx{Cb8%%|Qft8A#ik^z^uAx?3aim;(vPxaG3gmCw{9B}6U3XTW
z{ni!n*~!k^SNdjK`l(ah$8lCq|C!}!U-p?*-G_O`DF4x-2CQAqXPDFea90QZRl0Ym
z^5Rsl%cfb4ooumMmiu7W1kx`VX1(ze0qJ$wRDsjWhH#JRWuI<oX=nARZ??6c>lJ;i
zXZ6W%=QW?56@7JQ!0)uCPP%24PYY_k)>S=h%LZ9CjPfn%W$Uu4m!<zNy{ghO_x&d6
zo|K^SRt_mRn0zNQ{NHsg8QMOsN_@1a19O)QEgx6K|6Akc5|L+9@_^ruuvZ1xd;Lx}
z+pT8p#T67e^l?QI?07s=U?gTfo1JOSZOW~pDc}5IUrc$dWlZD<`M!41{BaDOY1D1^
zZ7_4{iF+sWV21S+iv^x*goh!^5iTR%eT*Gh_{od9X>a3iuW7GMuMjJr#M`plwA<Fk
zHLvg!-^km%+uqxt#wDkSm2?~;Tq2ywSd0;wqWAdN<&hr}d5t4lKv}+q87)UY3p*wb
z-0YZHaiWH!%sp7=z6=~*=H0d`&v%AOZ`ayY+k6$vwMtb*)+Eak1J@(h$9&%7sC%1M
z{EYzB@FN0;lN+<}RR+IVzmEGlhiISfg=*pJW1spj$-UI#`q!PeSkWJUJ@)li&0Yxq
zJ<i)G5_(x|KUf}*0(-YUV|lj{qU-z^cl~`&HHo%*_v)6P>t?ijK9bM8i&yv>p5{7l
z^DnoQ90&cgkL<R(TD~+tFBvaS+Dwl*_xpOREhqIEFK|9Y4c~t!PC&(gLEXV2i4j$(
zH=K>76{$BuMM;tqROT3J>2WhO&Lz!bX^BK_r7@MX&!Jw+0tbZ#P-VqrouR~wyR=Cw
z9sCL=GfG(Z(BPh(T8D!URoM3Uut?v9CR{E4nc(=vky<LZhJ#|c{1h_Go%PDP8x~tU
z_qpxw75^-GyN!g%F8%9_hvE1cOno@p$D<;r;8KF$xtg+PCpg?YR;E?!92axtP2a=c
zhFJR19<gBa1az|*J89L_QklY)3NxH4Uj3@EkS2SD_u)TNu41=rz~im0s*@NB5Q|6S
z%<9E`FP+a=k91(}mrnY10wy~#c&&u&7r0TNbzK`r=d<IoNOsuOQW-0cK*fA52fMXp
zS0?p3sBe)|kFxA4Uxq<D+{-nYW-|Q>z95f-{#Q>b7AWum4{>Rs;`Dlnp7V(mY^?OV
zBxaCD%YZsgk7mvg)W)rbB6`)aS;epAX>!k-fbNQVdE<~Gim*G~#*RxHAV5Pe`1w;t
zQoUn1Wq7zRf_ytu?WouQ+#7h-YxhK6TL1DR(5)9e#orgrrcI(da!+j@2T#t1_sBSE
z#X#1+9w=ZoQ9-||MMz!6cV(rP+ZePZ=02eGfW~oX_{dXg;GJOPRfo5{^y^ph+5J_z
zvSb$bf)z*19Mu(zo9AJ6GIWM6o^GXH_T}yHMS77s>|u=`#^dn@MA@Y<67}j8CTQ_&
zPs!Tn$_X(^x@h5u+?9hutfu~<m%r(=?CVE>4^XB(BFe5;yWj_6@z97=VIQp}bX_oH
zZ6S0letcmu6#`XZ%%Ai^WJq;Q&Lt29IiZTi;)S#2W;JV44H@0%qDm+69aw^W<~^N=
zgl=rRx)JardIVM~<<jK~Yw;)3jrfym%Ps&SjiwOG&PG7<610nlj~luiP4wAQc=`EW
zC(wlOMnYFEOn({aC%Pyt5Y7b`1jc2d9&Wul<8ndrA{=pT&czv`AxaQJIA3GA2&J~w
za1jbR+C_CEm9Gr(1!6R#2$f+^(x&xn)GDZ->mMT73dnm0)#oKNLZdi)xxYD$fLaou
zdwkB@zva|ETezZh9<xn8SSy(xV1e)C4?KftBCtH7i*1EYBSxm$`QyQglE*1z1TP=k
zcKxhdm;r~sDE;n8FHexu`UHu!sF&7RJ{lCUSxwFLXpM44@0E`ob>n-gm@;=tsVOvP
z8dbj-p#4DC=(O9MrIEDf6>LBTf>5@eCE(p2LGsWJ3I_{n;c7w}=7<c#Twg>K0aS&|
z9Z@N9sgO>3m)c_&mk_)QQjG?Q9kLl5N9Vn^`H>WpnVx~%H|8;(Vp17}Ni~tGn+0C!
zvXSitj@^|=*v09F9<D)m=Zl7RUqK*xK<mu=2q!6FK4nhR$i}U3LhHxw;pEO-*S)nn
zaW1N8LM6ZxUqyJwpzgjAf|&mD0lf2(gz=ts8^TX}V+@Dkp~DbimTbh5h~YXv-i{!Q
zD-B`VkwLlD`bA1gEgLc^70L5hAXU_v7rVlv(wk!?BA{|(0Hj|(`1eT1LS@fQt=4e^
z8(z5#*G-j~>q!YwFXxmp29b6ts2JUV+Sr2W%>kL(+N<W}AAgmge2r!k4fLRlB8QZP
za~8LjlNq{`A+Exf)gA5#0j<DUs(j!@qeTO#GM6_p88y7n!$I!_3}?f~R~2kH$g)!C
z7{^lRl){$4Y-Z!FXDEfIjQ`B|)tnKmro1G}zuZ|Q(QPERae{UdZndaEGgQ$e+HMoK
zj1f;mk|pcy*J3Sn1RMcf1QPg<6qAz0q3nmWNJEUsaQC1#aBr;Wg#8gc?M_F7Ko12w
zD{ONFUL^t0pchdrk8aCg?b=w(G^=9!L0OspH0bTnq(~2d4Rhc>20^JJpe)LcHsRC9
zjU_Z@Zc;ao@W?<?u|}@VRMQI;;l@+`#?nw>Y6_nN_xt#RDgC9u3pAVmi5=ESPJiVM
z|HT4>vuMUkZq{yI7J&PprrF5sd$Yz`&I)V1)6Sg!9(iqVp`lCbdgQFc5mEyRjqF46
z_kvFT&mKv(ur(9}J_?8Qni1!;p~S=C!&~X)!_n@t$S{2I&!Q*X6l(+hD%T6E{$KL^
zQR1g*16^AG!1!k}ZGa-(cUoF{Vb`3|;y+ADBBlE;*<C><IR}a~i}S`N(G-@;AWZ|w
zdDo!3f9sVvjmIOOxX4hJx(kkmc2xcxV0S+F)QCfcWm7|cH;Mw|x3iY;xz{c{D5y1{
zwsGoZYq6u$m1gEh#OS$POj)EW1pzc@Vlv7S>z1QNia5LDvIA||?B(i)DfeXU;|EE9
zp{(v{Nwc-WlF*|+H&KlA{Cq9G8QiaH&l{7&sUeBHV#-HN{Icngz^ay#z)fa|#!CbI
z#b}NCBUU^>Y@$Ur5n$#HuU?H#@r(+Z$3vddijFfWPhj@wD%9N|l_I&ak11OW|4Ru+
zz%H?;M;i%C8WtFCUZ#ng-b}W@<JCed5T)ravu68=i0yr104I`afY82mkTGrV(~@Q0
z0na89Sn_hmo+2KfClV#(p2R#x`r|LJ1hy?(fEiiLG&9E(bT2ynR!4w^dKK+*TfW*-
zDR{2(mt7L!1p(E0j5>TWNzN4X(GeS_YYcYl1N0wi5;kD=8Nz|F&7NcHFZ>u!BLMQH
z)IONjTBx?DZ%9{B#lW*;OEbvJiXK#NF&e$;)~4kz#q<)HiH+lI=T<@<%H?NA_vYu{
zra>ecrv1#2^mJ$$E=Gqmr@uwwCs|lo=2tGPZB7Z6#}^J{eUe9xO6x19SN$pRWl+l1
zWrTfY{|o~!*elo~c+69UmZ*!v{wz|6)N61|W!1!2&=Tt7Ze>Ra4>Cno|GnrcoUH<(
zARVVGSpSLS$|et%J6GMP!<krgZ}kQ5(C~}7T(c<SF|?9P9)_Y6M}VW{eb9<Z2R1wB
zj~0$OSe>RQxIjKDh6;R0Q4KC3cbxDg_3|JHUJO3aw9}cWXC2-6e4vGkZyg4to_f1N
z9hQwek<Oj<G(cQPtW=*<TTWtW)_{9#{sX@-$Ej3_Nr9$JaxN%Gj3}b2r$%ny>^4z1
zRj2@#R}p-M>FA<9fkT;~3CDynSue*{j{n?>Ofgd(1v0JJcX$NdGm8LnuFwZXVV`ae
z!$1xQ$oOUTY<{p!<<Du+h#7ZxWl;dXHWTHy7Gur;wM$dB9Z)wn5F3)fcx|2+t-40l
zI~Ee4f~d<q74<Lkq-E8jKY8&{cvoq=-hc6y=5zUqcx~w^2cXJmE!Nl*A9<IFJ1c@|
zh|pIDUOc`RB!(vrm5*_l$Q^4e$?_iaCxHXV;Lc(%voDV7Yei9~H((rSVt!lii?99n
z)L1exFhE>sGz}Yl4_tyc{l}SP8$ZR(L>LYZRSvcnxf3r+H}xHq)ck_+eo?ik;|9rz
z0}Ss?1)E0ZgA;O7m~xuT(Ugkb9`v?@zDb?vqa?p=(7!#Z@F__S#-5~bI$@D#UbGS5
z70Gidd<IP#O|*jqwR&Kbg^V%|h1f4q3gqJh82qv~P!&FtC>_gD*?qh!(lf|pT!v44
zbq`MQhR&4J3U97JpE1<_MbM2>XWG20Mm1Dxc|HYKv77v$2^9`7<ORui_v9nw@}jPE
zUK7-3_@DKWHv(1Xexwu1DI8g!NJXhYQrSmG_(*9tcV5&!A))wUNpqQwRp+J;p%Z)v
z-+8qReD)x&f389z`uIG#DJXkOr}I^dG^Pl#!qio|2acDE;(@@9X_S04Gb~oWWl^wD
z(g=AHC{?BIc9K|xT{!=G3}y+_iI`bzexbv71dvp2Y8O4qQ)X%Mh;24;qXu+f80H5K
zxPqlBen)T)w4@l3Hk~QWB30~y)JC`j(70swXnmDz*LDC}G?5g}m2Pf=5pc*$TnP5a
zq#o4|&+VSFUTp!J8v<6hSes#UGKH~^;S#rUQfM@R{we#KV<RKJi9SV!BO?v5t<*LH
zxKj{K^=6x^to^G~HP<e;x~v3Tb*E=}^T(p(mtoKY7ljp%J`ZG^13|5FSU!=8ikTqc
zyVBy&n}{uwvKK+1=N!f$(<vP*vdz@AC|+1D%U~2|4R64=qmKng|M7EKPnwzd9e^q@
zLK`JcI}+ib8O&Vb2hV&ItE;>O`s=D#ne3@O_H$27C4#dg#yL~Mb&MJqu@#~d#4t_e
zk0L81muQ@!y^dPDt;i;rb!r%9I>9nw1CNvul3|X73Ol_pg?dS4@uw_Pe4^Hh9R?@T
z`Y0x^Xe2M(hi6}v1V(JwL}r}bx3ji`Y{tA|XyB)cUwAnPImGO4A#*c&jLkmPdNktS
z(afZh+X}K)2muNZ1u#<JKDd##L<j6hb^)iww2xKB&m@5M#qU|hfIKl-H75on;f6N>
z1*9bzbv--2LG*!v$c!UbY6XawY3!2`^cfuXur6+CRjryMk~ES0y<Js$Cn*e)46BZQ
z6TaTqH3do4X1oALl&y^P9^)sC93=EVs&-)_7;X|w8z{ao#`bVPHVs&@{`QhF1u*bo
z*lX8Ob95D5(n8utKcfbgea*){o*{7*89IuyE*8*i=SW5@tGgt)M`Wpe#G$v00Zvf~
zdJb`y(oAVwrv|$SrHt3PClXqf?X_YR{}3}_r0N4E0*F0_ifV$OOHg^Q7{D8Uc+k^>
z`Dfn(hS(mCY-}%3p*lv3K3#5zI?hUDZ1xuuczw2x)tIJSIz>farl}po9ky>Mq=R9^
zO~+uuU5zSnpM5}U4|c-@iABj;4pXMAb6lm?#!-v#HM(XQFsRBx)QT2_#6=Eyh)rx1
zlo&ug!YkrRG#|+6Y(Bml)M&(a0Soq;R~iFu$d0p^t-=qiM-AFQv#ZT5(o?VNHy^vA
ztVF4}ctrSxqsw7Rle}MC;<dCOR=2bT%_ie=BzGmtBm?78Dj-O~&7u#38dfIyd-~=e
z7|v9-v0S3olyJ3Owh{NY1fsv3=S_FJI+AR`9fHkf>S2kM4b9M*g@rKPnX_SJ9SMGM
z1*mAI^eF_8jW6>lf?7^G`2l(~Y$PiZZve$QBd~HRqH52ImzM7+nG0U*k8e+m;Y$%8
zn_xkntZ0Zd>V~c2-16wJoiZ1L*xq>Q1xt~U1Q=F{NJr3jC-5MbtlY{VvwxhfdX;eY
z<xE#adkrb~BD4Q~F2$@KgCd)EG*1<3qDf=44yA|#wFvkSl&y(0P!XTR(da>>>g10T
zTb3)T8X3(iywSE9!@Y<&TiAJ}MzqqT;=DPjRmq}$nq*&X40n<yur#n2vMEc3MRcMB
z^S09ldc<9s(DP@wvOTlAQv_BJp%O1)UAvV%obuX1l9se8xpfi_zbgTLCR>@(w9pNU
z9gHsk<z-)EsM&1itU~(Lohv{~d6B}%53v;}@n{>WYDnMrb40lJ5zhshg!>Ohg(z+L
z*j8(ibJq~;YG>AziJ?cFDuiO2B;`z;1;e&Yp^I{Fep8hNI`f3x@*AVNjvDxux23WL
zK*-Z#F!Qh`m1*C{HnLu_kaEav#3o+)P7cEZ57^r$c`cGgIg7a;9qSZeRNG{U8el=D
z$$6FFnkPfVY^F;$6-BiS#@Dr#ZyDwK-rcSxd^>*q<B-lQ9$`w3RgO^OV7bSmqY;;t
z!!7B;11~DcfhAJ`>E@Hm#0hlE4M2QaJ{T`hEf3$&W8RI_9wYR(TR9bm$<uB~{yQH5
z^k`O^&*3)~IeasJIZzlqOlAsi0OcYy;D)WXigB?{lMQdy!yP6&S*}V<U<;oX^bL0@
zwwos0r3o+^(BLx17`ov2qjmua&su-0^wV1&YirzvI(StAIsZcf@bT&g8S4fw5UnQD
zl-XO>AyWz87aP~qaZT|;UlV(w@{hwG7)+>s#K{rZEl1&uGLX_nXZ^D?G*&UrfxOBZ
z`8s=^$sjTO7L_7LRN&K0c8IDDtcpKt?L5=rSO(eGipwJGrz!70mGrli0aziTI5#n1
zY*t+w7vyDnJ<l4Q|I#Z_0kE!!86H!abIFT8-9&lt!Jeb|Cy0|Qk*KD3yrOn0&^&Jt
z?#qr<AlP*bMZ*ML<Tme%Bro#{Kg?3^jSr+Xal}6^VtfgWJv46Dw7E%D#F0LR?e@=?
z(WDRTSzWa`4hIFzrhDH#ulp+I4Fg#UKkm`ydqPiqrP&q7w&2=J@>cbll+p`NO*T=j
zWpu`t_g(TaN}ZXJPbTR>+fpzXFsZU@xO6$jpq<T2D7ANjT0e{Hhim6^MQnKV^KP)&
zT9+Ku>@gO5M!uGeFjVnaE$+mQSM&H(2<KL9)I85zweEp6ggrg$2f9^9A}Nyob2+Pi
zI@6;1iYpKHbog3?jex$lJVk7O!s@}}^0E_+VoAcO{IK>3vZnFgkURYV5Rvsb*GTeh
zGWkd@t0b2SG+j>I@cR&9NIaOSv#|M7&j-p;_B%#qXFZvZ;m4qy8BLg|?rQ4kMSHG=
zb-Bjs^j%!oxpf*|wRtMR=@vt#w`?_Z5hk@^Y51O*>N&xx!#{0J0iKv2_Gc<n?z=2F
z+?i<2QY79?df5$hV8&Z-Knu3{?y)EP#RP2cAomE`o-#S<-S9P`!vs%AIOTDLvW#Uu
zYRpzA{V_eb)l@8`U;l!~v$<skV@YBYuypms2G339*b_)MT_~Vrnah^`AU1&&PcFPB
z&MlkFHkGUyWqFE+L;ems1yLOwIw2^&DK&bJ(?>h1fRf)ej?V5k0-jE!_MI(+rs>h0
zW}xtPni7(9ORVW=xww-5W*L9tBy^z(H41kfKnAa0n!fj9MfKpJNc;_^hC=!?T|%Vb
z&AEjrY14e8d<z+tbc3+=I7drk)>H5G1KDJk`$trwQpBlkl-caQv<LN%xXnixkHa^#
zvJ>g@hE4X-BW=y$Y+z;<qc;uPpJC=LFaNKMqSX<jy@nI@#YvQbqL@we74X9-m%2(r
zt(5b-LmcNrDu~qx*C5zGK|o~U(kxP28l(bO5kOdqo;QG?)UeNrrCr3jnu`Oo#|Jj@
z?Ogdt8h?w4xv_JBok_sUr+jVRWY!i*GbM`#3E$<@E^K)!3aF-4=L!*~J|UB{ABwJd
zWKMyhQ5L%$F~;6Ik)=RZwnuu>IwWRj<&v(ZHl&x29wK*Ao9c|BBa<ClQ|XhrZU_H2
zF@<{~SG_`u*DS3V=b>T=$=TL4uh-V4J;vg9w}BQb(@C9&6N0n~m1U<YF&~f3n*w#X
zc^n5Jtr9X56;QHC;MVFUqRcU33Azr$yFI9t5NGF)m%FVLO@oM*eP<DNwOJ`faGH24
zZFmay%+fE%m<4GW=Een*;bx_cm1!@VBpXWP8KmVmnuqvl7oCu^svzzh)8M3TGLc0=
znSaMWhHq+S5nF)+u`FjY?6?s;jhK=f6wCS+p+(ef<v<-kdtRtbd+3;;&){HctwvQf
zh0+DbOlO@~JQ*I+<C_;Q<ESPTLg>@;<RUjx2I+!jMH)WqlaztVYpXF1hMEaY!O)WP
znoFn#jV<@jX4N$pd{qrz@d*PCeA*SIMOj`P9kUd5NZ$A|Xi~mh?_FFOT97S8XEyN!
zZ5dj1XyDX5+u}o%?QL46gtx=!V*MQmtY__BR$2O-qrJ515JZ)4xNF!UH3xgCrb^o%
zk{(Qt5tZcUuOl0dqv2FK-pNH9l<2xd8u~e`H@Y`<gMO1P?wUpDvhWPdP3l)@#+X!`
zGHw}fLq2h(iTAy*Vpu+=Ji=@fMVcO+Q%Wkv8ek2Q#HQ~b)Yp#*FCJ5gjnT{920~rz
z(_Jlde*B|dtbvq4qkeU|^Fy_Qp}3=6q3*b&7!=qVzBY-Cc|I{dZ4Hr3@lFnuMHV|e
z{J|z_+oklZLSyGX(d4zcutYS8MW#`u#<*AXE@=@Df9z1`9*uz(lFbn{*B}pLLX#_}
za$sQGyn;9BhgN`|n4&Bd=M{bI{+vowEjSZKbw)9W>UzHOCij!=wh;2&*1!vWTjeLl
z9*0PL>OPN+rjOU@Oy?1pW7e+qUNHyJ(_a~PkA-<_y2gqowyUzNbnKwB1unQQo2tnQ
zt?+n+!bFC&ld`fCwYfj&=Z}<Rd2M93tw00EteqYH14*{SYXL+8J+k5SefpMjHC&i&
zQ^7jb)f$rFj*gV>GZEM`3#AW1#Nq;uINDkPv$w7NX9!7XFoM3aW-LTu{O5mTMGoeB
z@WL8sXUDvZu<iv?2CR5pJm%pe!RJGtN0E5)@s7kehub<np4Vybb3A#CAgiLWV?bTJ
zYRF{?P3{w#3ywqo(+^71ce^)<!nV6&duD$I$6SNf$Sk|uNqH3nD+&A4&GrZbHk<Iq
zBeYg|2u`v*g_b?kYeucnL8bluXRuiahs*eeHb>chLAVu)#_K?7nIh5nE-vKbiQB@b
z4Ai0O2yRW+gu7ejdTA3Aw4#3&5J0qkysYT%UjA1c=gAVTcqyM5j*Fg7jb!nptmeL8
z+O8eQ`WQmf$j@;I$6<)89d+edzr3*Q^0t#(w!hXDE^u%Ksk~Z?v%1$U=FX%jp$w^Q
zE+m|zZ~Cgrp1(k`sy>>|drZ0J2XhT-R^zoJnplTnJqUD%7&v^^4ufgnpnwU_+<rZI
z7X>s~LL2pS`izl!+j&4ZA6ZgP=OQ{EnD?CUGTjBP90$nI7@xE~6P730S(zWfowTv-
z#6BQT+sU7x4DTv1`yp=lN%m0#A&W!72r6u2MPA`-i=wR#JpKMx=sQHhAD9o6INHgp
z(40Sa+@ys`b)@C@(WIrd#ekcAMYS*NCeR*r$V|iOsx~)OZaKq~qt+eyD;YHDe<j%`
z!KmDbC;gqZ+8JTV`wkbmqbo4DGhHM$A+hI-xfy07#Ywa{PibhqJLylR9Z!VpgNj*h
zz2V7r4@`XsmMLd%sWNall-Xt5D62YRRpB*a8p@J(QXVd3(cY%L1A$hYKAQj`SKLm8
zsma33V>t>NSxzisbo5q|-(qmhOQ2pX?3kzWwR~gb-IZmHX9$wx3&OOPsB)x;FLn`s
zceU8q8E2-03xp4UMRbx}fgtt~fl_B7stj0D1V?-QQtoz?-S@(2!N<EvUJy%iR7`#u
z68eluWa;$I!l^JG%K$!~5}bs-JoLMv(E-?|L<J28E9gakoBHDXbb#wz#IR?SX|oeN
zG|WFjJjV<(h||XTBvD}yW~Z>hMpe!VU(f)ruG$@RTMR^n=nr+{ycG}{UfxU%+viYI
zuNfgbLvvRW-1VtaFl#mhb3+)(_O_<{OML*kJCA%^kMe|^L=BV+ANIY^DQZ+X0HbM)
zo{)&OOe<g>Uryyz5IuBX7*fkkz$az4L9qku5gRyJzn|0nNVQE16ZaDJ8%x!7I2`&3
zk|_JwR*Ir8g!m&UUl{pP#4z*j9Mt_@$+X9<DLSRRJktXbTEvX0UfG~5zg0VJJ9$$6
z4y=cL^|#wKzyxSiWgV>v&*=)RESM#QWgwExRNRK?0Ww}(2mIb`vpQ7AKTWost2UmR
z>(2t;EEEB~NbW_?-k4a(-GYdKV>ZFRP!EEct0CE)8z=S+qy112KDl!yAP1$i`O>YT
zJ+n@LPJ%J!*RN7rQVdN@!uB)33<z_GopMd$CxSQ|uK-G5C*$4Yi(+D+q<W?^Kckjm
ziBIkgKa`z((vAI=VQkNVnC~|cQq#4!rq;St9gRKA#C81F+Dc1JB@w^nHrx)rhoc>s
z69(PMU=xf(^3pCRc43s~5C%a6r%5p_q!c4WQQ>hAR7LCwE$<sT$QEshwc1rGYa^&o
z_)n0u6$vO}`(qAfXhPjqj^0d@$rU)3+LI|>LYH2a*j<DlEFP6|En<<llW<2HGp_D^
zGRsb92PvddCcLHxkq}-I1d%zs9^9IxN`i|oDJ?VXaT&HCLWfnF5k*G_safPQhKeGD
zt7-)hozp7!2BWn?@8=rYO)V3$x+8Xqjrp1^MFZkgd!s=RG&M6x^252oSr)m%KjUaS
z?6Lwjsl_^rNL)07t4u+N>`GzJ8%;`|(AuHN`oWToX|JYk5a-ucGdS4y+C+&OQ8y4l
z5tKIX;2L`VM$nilAw@CmQpc*mus0}xl26gf@G@sMu)&mB4<yq`R&-^}Nqu#cz{!st
zq66idv`F>$miZMud`qM<d2>sKQlnpKtio8q<icp<az(()&jfi1==1v^7eSz!m2RzG
z1~>q0_{F0AQ$2DJ+8=>_HR>JdF<@8T_zS&?o)G;WY-HsMC?2k{e_wafFiv-|m!EiU
zzG$|3xrc{9+H-$zAF)X=KN!Jz`bEt3_y7ZY$6VBxWE$YHNE~h;e@Jn|{;oIOH(|n{
zy(@G`^M2GiY77&B7b~LmjG6;)SR#;$f@!EM?cZl(_`ng$i$eW-q*HL*!-ot}{L?-o
z#FkE;Q2YwJlesYQ+T9s4>6Q|5I~cQ%D*knv8FmkBv)Fv8YmR|zZH&yggE*Z|lmf_J
z$RnD?$*wiH(vFvYY&9ja%ktR*Zy^%7LLQQgGd8pkxkP~eg+|x+qhMy-0S%oiYE8N@
znnctq@WX(<q0iO5YJ~^ibk8(bzU%~)53Y2`)&5$I<A7zYK#F4ehptj&k%P8|QO4!`
zomuR{KeYfdrqHb@^V2lV>h7-g=@FncE=m!#uJKa0E^m{sL{+OX2hFSfFZO-q5jfFN
z$2mmr9t1lLPOg?`5SkM)ow8IG;|l9v)e&(@v!+%zEpC&XA^46%l}Za8x4r7}`~I`J
zSl8L@LX%mTI+{u1MHD<Fi^b~yV9iZ3bTmD7=8Zz<t>l-}xZKUEehpzcy@3MbYe%zT
z58vF0jI^l~4y%YMQl^n-Iacqjt0>Pr`}lrn#gCJ%@vF~+I5A_e5e!5O#8#RLwGDvi
zMxAT-T);-E9J$4mtv=tWeFV?fUjR7FQhvJDN(kx-w-*-X4g@F0jOdhPl9?}wu!)%(
zk^!;a`FmH#B*$FubjjJHpErT?d|S^t(Jw=?WOVx2aSto(1gYjw;gL2i3OXKN&S{&G
zuVmArgb^AH7twMpgKCH3inTl7XXlE#^YyG$T3gAu-v3Bw(Au+2g39R~O<Yvgo!|bn
zXm$oX5n{ySiji{B8z8vO+ue1~{Lrj1?{-wIj`&)6*rwd;tNpYjT#W%j))NdS7g5mf
z2c%89BDYO<*iN_PKY+`y6gdR1h`wsc&)JKf<(nD-97DhQ0uQaP6c}8)4g4XG$Dn=h
z3&A~J<9CNGt@;OA#r&*{&P&u!`kTIbL^hsfj)M^+;tb3P%|h-a*cLPq@c9k+l1wx=
zB^x36sZZjnqfBg+(=36`wL;6h#6yI_HF($pQH0f-(!vvz=j1*LMaSemadCORA}6om
zPV=gpF7vMChehSl`$fkL-}cY&x&72I*FsdNIuz+ksX={Y!yL_O|5IY-j`jM{N_*Ql
zBwO7$BK?iLrC&b|52PP*#Abo)J_=Qdrd5eU2NRQVsv&A!EWjFJE`wf3?n-WjyU+h~
z;_->2#6?T)F^yNH(NI8;72o1k(V+Q!hZ<-*?DL^gP&tDs4quJ07yjLJ$<MvdXA?4}
zTw75OGk;E7(E^rM);Lv=uBmRwVG>r@v86b$I8u_!|0DG!pVX4Zcz9YX{85}O8iUlJ
zuL!c!su_4Q#9JQ-+H&TM`?&0Q&YnLa2le4qE)Rx9$^Hh8hDnFxzm_-h=K+>v9!xn{
z2S<-7)syJt5(cjGhLBXYe&e<mim?CjN=Kj`kj(XuH;@6QF<sbTE(}D0A95&CGAdrx
zZS)c``f80d;tHXAd^p@6uX{JBEk#{bHsfT%I|=w)V<eoFe&%oU9$d;ve!**aqHeWC
zj)kVPpvhcv+xcj)H8MPTqE)A%-yaZ|q#qeWFoMd>ICC!%IlU%Z1bbYa%R~vr61uwn
zXcM;{7_{1r^iy|tVYe1bSD68@CMY|a7pu5{d}k3o*1vD>);(Sag}H1CH&BVS;S9~c
zY6^q`b;N;*|L#_VOIaj0z~oO2i#4$winK2{_^A2uti%IcB$PqAN)!N7aAtFOuWbti
zE#`qhcryBjHdA&&jZmA+Yw|@aagTHvu}pA8FTGoLeK>q{Yu$;+{UbhjwgPbr>&J1?
z`G$qE9Y0TZ3*)c`eQ`5m5w%ulI3be1ushH_U&7JTP_FR_W~>c)taBCKeneg_uGU?x
zPynG`t3neOAN6c}E4-tc+{fYz)|kVE=dg2J_WFHDX}pjtb8a7+-=GOQ!&)}JC#q52
z=*m{j@<vrg&o!vD*MrocUpO2QrXeq-<}cut0Q&MTiMP&5a1o;aPb;jdw>wvqjd);v
zDFK1;F1Cl~c>MytJ!fh8y?wg3!j13+_f6o>z%fNgRi?Jg*XwOpfb+ldOCGKcxb?TM
z2F)WDKl8(=74(vsLew5j<z7nnQ)ewsSX@Cx40v66>*ImsF7v*dG!?8zJDO$Y)L$)>
zCYWFb5I_U3zaF2!U=gl&nu*>$0U4m&wd5m%eCb8{)nU-bdamh-5W~{E-K1?N=;`B)
z{jXtLp&izyP)=rUivX{3k078~KW&hYT>zBLSVhws$&~9uCPuM!=jprjh#nO9knq*G
zoZr3CGUo#yC=rua)L-*IeXOaSn1)haUw{??(@v?>y^l5_BgJQm-yD_;zCa)utihc!
z6GZwA=MX@kDaXv=u<iGdr?PE)-)_p9o1Q80mY;&U$ED)(zZk}srO!M<`CG>|oeT4N
zQ|S3XSNc-NEGh7wS5R1in0^0->dMe(QJQyZj!4SAF0$(55LhVDq8(dijB5mktDsgk
zDyehC+ODMFP=kk7M1jKjb{rtY2V@ZUjdI+}B(qPk4>v{I^XCIOh|}TXk`@ENYAa4C
zJIN|<40F@`MPgXaFZZxI3|($?l~yqKe8=UB#n)-OM|o`TS$AQwR8!T?S+eS8+E-4y
zyC%=OdAj`^#W(cBgQ%w+(8zoZx~i+$Z{!t@`W&K1vpcBQOR%(4X$s6qf&$H%3j(O(
z1yNt(YaE1npxdUvlAa5o`z_@%(XL`DpKiP>*%_y#?!BwXn-5J*yC@LWyc%jy^Hb`{
zX`I9z9`LCZ4Q#3~7U+yBbCYpw-X+AKVWBltn>&*nGSv0^I>yVj$BjH5g0qAR2#QW%
zU8a3~|9Jw_DaCR=Bm&lRF9^^zi#E9*{;7Rd<~*YoA6oQPuCziS?Fl^WDD{LH%==It
zI|({PDboMvJb%?*^g&h*I^QeNV1?Bu+pJ46@9-)7ADv4+PK0u4A=RAygJwOqINHM*
zecs`xSeJU9l^`eiIxDGomt*~-W5QJ#?dG=gMB>$ISV@;V5dQQELRdoP<y@=-bqikF
z%Wo=X$lPc^8K0&8y1?D8ye9XM$9%HZl*hbxb8q%(a!V{tPAh$#5pLEpe<cZEcMr4d
zi`(0^WFhd#^lIW`_YrqWZ~Yt`ld>6Y4rl)C!S-di*25P?viPjEnDbst-M;VUll=vo
z%E~bx?YUJ1+!?Pm`glWshxR>R%@d9{tN|-F`<(eRVJfGgVV7Zg)qyvBzKhmsmeHi2
zm!*YlxCbajH!Z};vOTSxQIaV}L4`_+xz01xj2c~-Iyq=>S#X7cyZJXtbuX$uKe$>M
zv=M=SAi9c1jU{LZ&+aCJXL50TOR@<u9r1?~a{QGM=)(_}uO@3iCdEaI;22gGaV6CE
zXJH3h5%U&2Nk>e^7p|yb!s=|`bCO!se&?$?dJY{4HW}s{GmZu50@zPz0&p<;41L3J
z0x}&qM9$_QO*2lB_F#<k^LX`n5QZm&ar<ayMLoYyV&safVjZDt6yjCvmU4G4M;Srw
zp80_i2=u^gmFt1k&ioh5hL31P&|ZMX!O?MWiFZ;Lo`50WnX?b`mLhQr6ew2mO`1B9
z=YYp8ZiYp}TX1xQ^GdEL_xWFt!=OnL1$znMEeRhv0|)O9t`zcz{y3=d1>)C;Sx|<7
za%DlEP?O|a=T+<34oSI3e8PN7irtK?YDA!4<?cxrWd2t4Y?)OOk<KWRKO3y5Ga?Ua
zjwIJfh@)p6FvMgvS7y1#2dZ=GSTQrQt$lP<&6cmY4`Dmd;8~z2!7|uu>@=;<zM#!f
zsBJiblYW&_MV0xI+8#;!ejwzu1!3)Vs3|4CpW#q7UG9<Tr_~T{l9_oA$$B9M8wJp(
z)`ByKnmR6QW$~2D{s|h9QvmF2u%r+Lflu(3d)V)uisLk&+@R`*=qRc^w&oDZu7o?t
z?!=>PW#XGUm6oQM(~4nu-Ogmv<MaG}UN|*JVutYN4SWCN)FJu?cj|Z1!&cCndz>#?
z#8!=hQuoZ1-0X1UcMEXz1?cLG4?rVmsT(`DmNvFmY)X+YkSZgD-fsWLO|{AH_!pY0
zKi4RFwmkFI&wV2BtHonos)Zl*1L^+nHKpBcyBlS*K#_G3gccFF`rmm`9jXEhqZY`F
z<}ApRp)h#Tez=~<!7B-zQ{~SlSqH0!=yF}LL*na*6Mml|p;ME%JFvuK$Uv#|of<9m
zTxQfI_j~jzGnlifgHy01msXx7*%-Sp%fg;@C}P%CS2hJh7ucQ`6J`k6?UGRlvcQG$
zCb5iEEGrHUZ;qR%Rp^?<fTCx8#^NDkEU;_El6~+5ODpbQ$^^LQ*$(zj6lNe7-Wl!6
z%g$Tf#N2cIe^liorBAsrc7W8fo}l%%_QvTUj~o7W)DBB(l|8?Q+`L@<h7c#`<(eB>
zK-pyyZWNwUI1X&ELc^n>k}yEa6Qk3rHJlrDAi^w9)hF{&l+=T?bzTI1KI`DF3j68s
zD40|;V0|Sa8pl#HStyC{8O3)XhE1C$Gp9;Qz6aRoc`085elU>12?6tybBEpH#C4Y)
zsa%)$>0w{y7=p-`>0up?wLeF_Hs5;P78!@J3vL?eXerhvG+0!YXSOaw3RB;@0PwuN
zAx%ydH!NJ8*v(O0OI&W?8q=XhQX-oo@mw#dEl){vNw+FJjDUx<!xPu(=mzMbP7D`<
za+@#$17Vw~&8lkNdf+9R`_kf)FCHj6oB!W9$Vy+2hB=KoyIZ$rc-L+(f3f2=T7vMb
zF|EPMB}|)PEvt?hXpZGp2uXWsr`#cO{y<f2T=8E9nf;~D)cP;Ec}W?=s>q8XVgx}T
z%f%b1g4c)_`Z-)_y2m8?{WBCqOo*U^T<NfyCET2Idb64hAiyz(F_yqvzWh52K-uXB
z{+kgC?Y|!{?)Z6RDV03;)kn%=2Ptr)JE!Q^N0@;Jn_~macN8sAk4~d{ijki2$S`jm
z^CY4#2P|}q?2myQfk~B>J^-0&Ed!C7VpnF~^{Yoze`mt99|jMZ@|5-hbyF);yL4bB
zS6=0NxjUk>H^8Z-j=$c-fQa~n3Zy07-%EANME`tCKZOkV_=yc<Iq&b6-6mj@w)^Rx
z{%WAAq~$<uij+Cu7Cl$oa`u*GxaJohr9>G*3GqQ|mN(fn*?Cq2syS@7@~S8>uRp8{
zz%xvbRTLQwBq92SJ-xg3SP!c6i#(-6!p<d(1Y_3ce*x1i!~f2IpAxmZD}m4g!&4b>
zE2iFQDg%I>*J_@(@8;iiq!PDmyh-!WW1Ey4cxXNlJCh{k4}A_6xulfWeY@p=TbtI_
zj5n{eNa{+1&eO6+<Zi}UoTAgL?RdCDKLeD!Y=4++h%T+NP-jl{+%63?CFd%lBhc$$
zz1gLk2Oy49<^`eUF<GC?{KN9u5GBO1zEcsbg2W#l<_1k$9#cFc&8(|~f}EX#f6q8D
zEHtpHws)I&ImHU6TBT)fHFGI(RJ_K0;Q9fzSWKCU{bB0VR-v{*wvJ^5Al<<!aL}Fi
zEOK(=syf9fV=#CqSq+U|0}>N*cOwT?j?=|6EWiP54@;csC<`2Mt2C6c?nxR)5NZ5T
zx?*h$kV@)a`T$6~f6i@lrU*}Y$Mx*qg!4Rad?u+NOD%09B3c28jotkx>&uk?%$g2F
z5~z4}p#zufNE{uijar?$PiHVeXSUgOPeLu=hMBQ~&F1@)kB+2W?*)hcrrfzq6$mJ$
z{{ouX6=_8eBRhY&+?=``m&m^w8mk(xr}MP#5+AIpR2`SrV%Fq`lA)|9UObPsddIY)
z>z6?D4m>EU#md74T|MAp&Fyw}cx75(#>pm`3?+lBokN1ps;a|y<Fu!>YJ%`{#18`)
z3qHF)TBQo>y7}|=zAp(Kc%+;H?m>oE_<>T^U5q6;hD(7LA34FXT@_K2Tab!FJXd91
z9PLoC*CzY)(R`wQ3|Tm#5I;FSPHqjA(RmNq-MmBRR#_tLe=o7sOn-`P7R2##B<>_R
zhd%oHsx}QWFqzL6%0fqFJ5Z!;|BWJ^9GUX?%BRBqq=EQu&OY&j+1Ou2D0-1Q$p%W!
zZ=`RPuS*KKHwzG8N0e(xct$-22RI-u^BD^;HE5N9f+bV$Hfb*nQPw~Q+@pXrFeEQ{
zc!ERPsOVf-z;XmAs_Q+aRWjcgaVEI0=2!N|GZD)pM8ztwKJxot1&9Tmy2;KOJbEQT
z)(&#e*!Pl`I5&zicJ>I7ZFsY%C;^pmYj7=o^&6p>z+4b)qw28#c*V;p{g}h;Hpj25
zy$M)pdRVihgh2B|zOde;s+|__aq}@&p4&vd+>LI(DS;P)X2;Z2>bg2qLeN5K1Xvna
zkj0>KI;}v|5!+u(n6>Qi#@nk|n4%U0w2)sA>^(Q^@`y2#R4+o1Yc{-H8UTM{IPa&|
znzJv$Fj{S6>#X-iU;in#Oh4vcTn&udc7((DmnF_~FEvS5?UYk%f4f(DLi5sbQpzq8
zo!{wqy9jQj*HWEt?&LKIJ}O22(!#YiygDDoR0Rc>=ET31CnP2=Grr6RKWhY0tMW|F
zzI2;(^Cu#Wtm0SCVkKF*p*+x9R!4|~!QpHzpw=5JtW{BtA-0pemEvmuFuT9bu;}5l
zG*IoKPIf*nem;9fooc0tmVL1nVYsu7j1FV8L^M313c4=vbO-&&7Hr?`0U3L*7Su^&
zNnGO5$r2k6f+Sc6<y03uG#!91-Dy-M0q$tvfOnVo;=neiR97u)xD3pOlB@M(#|TU4
zkucT@-6V<cvKL8462L|1)Gx>>g0PD@u-OlJWPU~C?Mb-<p{3^XY%kOpwV{QEq1IYg
zruC3hwGtf_v4A&(EyrK=YsH)1T^i44D3D-LrFNFLq`8-ojN<<nvQ|kjj@Lqs9=L`*
z4ljmn{8;aC-rzlYF9*DURDiZ`CnjwUKk=XayOB4QA0jG1bGnFNr`us0>ntM(!_lPj
zcp3h%wU0Wpm0(=uClmHnN|8I`OcL*dk1X$oT~ny3=5?%~M(5dEzaSQMUcwyFsWtX9
z&YU)PY$<d_<d>wj)}$UtiQLn*h{lwJI4Gs=5{_MTC`#b15;PDScaPb_vD1d&VmSme
zol=Ha7^YqSN{3FTF|*441xo*3ujfmw!m-0IJ+HSL{!AwEn#;b%m57}Hxe-Fgnq$gc
zQmwXuX`2q_G6?s0kEo}$1)PDuwR<x%U7$`mddnn8b7P8Plta`P!`EA1hCsf$LRNjv
z!odS0l?ZN+uL;Ph&H|0q;{KceaW#Olp@4RWT92kV7}@_pfILcGS*}}^b@{Pd&uvjS
z6sxuDX{D|JUcjq^5s9<Mr&=%(ZAD>(fvpAf<q^X(^mw{JB;0xUU!C*=DN?peT5BPe
z?Jm(VmMYV|3@qXnTnqw9#6rV_n-c?w>v*it;^P|AoD+~6;_{yQMCweD4YzC>zBi#k
z(YNZMPF(H6GRfb?-yXJA(Bv#y)!X=nwr2mZR8+LFWIGq0>&9YSHih@o6@5fxH%US(
zrh5GIsgg6pClWs(geCL^*3f{ls~r*I{x&x-(X1>22$KD5+BcF)04?rs;3PwO2Wi#A
zng`LBBLTc#l9N}7Sf8yEZxrpRY;6_^TnXG7>62CRx5>_;5wV&ngAZGs>oPP1iv%jf
z-y4*y?NaPKrk^q+X{W6eH!F^tBtmEnXTd0b?tBy!+Xh-(U~+TiXZ0R%#9Te<!%Y0t
z(slSknCk{ujf`X36*i^HvM<N+?fgFG`1?wRngKj-;N?CtJ=-{Pm2cq`ap=o5@on%o
zexFX`#axRZ;>I+CmMIqm-w#nM@qsk|_o^N<Ok8A@v~AH~-~>@wPvMx9H9>qap=*f#
z>jZGs*mnv?65Xa&YU5I++ELv&Z2h8*Zi_A2IFszHI_kcvI+M93d{6bKbFb7>+{VOZ
zc?MWYNsZtZCXYzw(y77?(=g9oeD~9&1z1QuwQ*+cLz{I=YGTo;Q6>S#?tB_L?N>PU
zZwyDF&`gM$b-OLzP42duIR5(z;Lm|K<?-{S#h`l8POA<0zI8wT2#EEZM3>SnRziOm
z_~V~wnD9Y`@`7gwrA(si!bl3A8f9>8&M%-UN~7>44;-3o0nF67ANJ%uPrgzl4bv|y
zetGrW;Nhc|dSwVO#5vQ{rkt<e1S3Tk9BfQF-n=nnlyuYEEl|^RT~L?$fn6B)CN@ax
z0p}IIb2TiQapgui4~VAcYwxpF3ZWRpFI9$zhIyCmpA_z553oi~-4@=T6hq~AjOjq_
zIv~u7#wUdbJk=L!u+D3GEt7*iWM&=kHF*Cm{Wb2~(13d4o^d(>XdU)XHu_@{hUDv)
z{8%4(7WKKIPU%0{8i)_|&r;~ubc?XhQtgR8x41LIs0JX6Y(4_lrD4|S9b=;Ad-@8|
zBV!|6FvdE}OS%U2*TO5_hb-%Xp$L$RXs{3c@HO2_eWY*5_UTyvONA=t4U~YuUHIkp
zHN(IVP$nTBS4Oou|4@W+Xs=V+EnipPJesM}I0_TK2+y4}!%Uzc%bm0GEviEYtqGQQ
z;iq5Yz=cLHopg-D7pZ4=V@k?@A^yl`GBSLQ=gOhbS3Gpei*+gSAVU29{vVuj(X<W-
zGmYXyO+}agHAOtYJ1#LmJO}(xlq6avYMFQ|Rv05<*9W@AQtik4e2IiF!E%?Z5V=Z;
zmx!L>=ZjA4g+-+tC(?$qH5=0}kkBK+^sSPxli{nJzYwT2frc-=ejrlkwTRk$dLvS2
zKChGXEIAV_REM4?Y)#2(0(;`2S4qO;i}4p+J}R;iLAKy@vq}k6wtM4dZh1-_GwM`f
z<5js!UkBV}prBW&#lKQjc}A&EQvxp96{ri`a#dIdsE0L#4^#5?z6rgeI|7nluPv%P
zlibSXOD?$!?_%5vmFlpWD~4AoE1WH=S&X$w3YE~@r50fdl}6=2wuNU$ED=|C308=W
z(F|Z~pETL^TXxyG;~U-Tww$vb&^788MSbanWl}2st|OuKYj`}LI9IMSEt3G(quW?g
zqkz5OM=aE<e>=>6=uC`OAuE~2u%$%JTqer>iKRr`c@3L((k?66Ouo0p5P=3&y~_U?
zo4UUpPo{uUK<BBZg;8&#A$S68W>F{!IehHKzhGo$L#JS5@unq$)<Mdn!@Q&JMq;6e
zF&U*uF@X&6J{fo_&3T4mghy#X6ibC7ML$d6_WcEQ2=>w77D(G6^9!h-Z3$vN#vI+m
zf5}`-6C?Ren!5fvM)0c^{R21`jXr+Jn4p=d_ml<tjrM90_GU-o+`{)5jB1FITql^&
z9x?PJj&DYkp&K7ebQ{r-{Xw{jJnM(V_Ub&5p%GgD<pn_nkkW|W>F{aNG+k{|$yeG{
zt+*h@P#3>p;``ZQ(e3D3?v+U-wlF>P5!!qk+VoGBRAH#AA{(Z@s7P@#A*^&pW#EeD
zF)<V9SSwVR6?%q${Vw4aS)NjNJE6wuaLo8mnZ2=>zeu<HI?xLDdV_i<`q|%6AN~4W
zSTCkp+JT38+!J(eLaU~}N$>A<szF|k+hNhL%RKD3_z!Zd;XY9Y9vy~&>q|nzyR?vx
zE!n+fuxRwc_a{AZug%4To6h5^yPLQF3Dg@a<c*i``hRUh!t0Kg39mbzBfNgo5O|HB
z{@39(p?Mgu$yI(*mpE#>N?$Z)mXSggUW;ahu0^ws?^-my9>kN;N4?7}@?JDc-HT?q
z_oDGtZU5mAGr*y{=e(sZ$yDM)xR)HN1B&K`ox0Jku9Of{LW-p>e}yRW?7Qh6edmiY
zzxS4Nd4Hf&uA;2q@<6BD%L6T?7_G93@lU_{v3#uPO*`dY{YbK*#NCfp=<dg`7_ac|
z$1r1uE_<{}T=vLQY5KB93WoC8f??2!XqV{);{yr`)Zk5jf3(F3C0o?jOIpWuy`(!u
zp*C}=>m}ES+(;t%uci>M%zuU~`U#M<EYSQ)aeph97_)dxBP=9arLttS1N8#KG@ric
zvJ<c7@CG!vw2Ik`vFRnhE6H4qIcc63P+w=`DI4{XxX?5XJM+A!1Ct=(eYi_Qvk_a|
zNf^BcG11*1qL9xQjIzI;7}}T@r{@N>4<E0mu-tvPN;s$&YBnfxxg<l+v@La~M6q8{
zHGdvjDtR?DQ}e3Y$7ksQ<QEj<r4m3t3r3QfSY{d?l~!h%geWt(Men0u?ABELA<m=k
zX{a|js+|E`<1RgQ%~lm=gm`X)7&ce~voz6si3UsEq!2NOCuHcwRCN!C7i19evB0LT
z_}<{%pc#v2vem6!$ES>Qhp5>{J-MT%$$vu^phSLhE;;6*^6lBvLuu_pa*1u)6EWGy
zo{yWTK1-*jq1T6Yj2_F>4O|hjb)86Cw|J&IH&mgmYldxItCX$lMB2J$q^)a}XX~0F
zTi4OH?hMf*p1Rc{UKVUf*Ve9Y><qG;#+qa~jh)do-Zx7`jMusGzBwih(@c|wX@6#2
z8m3uhPqLXRH7(y}dOOWL%1AI~|147~=6!UKYD<o}O_@|5MazV#$7QPGrVwSS;(m}w
zQ+0!IP1VPp6E#(Hqf48rA4OjhFN3Fmj63i$^zS66j8fD@+!r18p8igXS{F?ewI{kH
zMJ+ppC~8>(QPi?ih@#eYDM?Z5Y=5Gtb&ZLl)-@oCTGta475DM)<md=5^#rKLxHwC1
zAol!AQ>AZXWf{NS{Yd4U%FW{`g*%4c-u&lWhU4{(t9<f8od1*yasIly&dj6UhI4{<
zon0r6y%VAE%`B^yZ`?rQ$Z<`GBgYLSj(o9lNsfG}3323{SBN9$yg(fJVt*6j$o$3S
zTnIQ#uWIBk)AK`Y&hh*ZWJaL7?-yxoj@)j;{NntD_X0XDuly=pUNOYUdjbFOy?_;5
z9`%>s3wZoDNB!P=0o6x$qi-Rd-7DU=y*Fv4m|uR+yy>yogRB;mfwtM;Bzt52{%O>a
zdKz`?ADl*=?U?b@r%tRdt$$Mb^2GVy>$9DcGT@{P_<Ll)T!(}}QFQR&&qn@%21$3v
z_H7Wn@XBBnJD6Yx+b_L(pZD(AcY`egHO~ulw*y`6z}Y`Ifo9&s;8!Se<P=?G&XvJ-
zcCe8hd>uvZ;UZ6;7r4$2+++uyRYjgeiR741RFT3eR|fB~gBf;VY=5}O*7E{O?7*jX
zV4W&*?}y1APp<J^;OhLjfvcknh6JuAmfPm1u1w4(+`Wfjwck94F!*G)V_zV}6-e5I
zTcYM6+Yg9cjkLqrPM``QX0jiYG}CWB8>lr?itDqTH>G$7*?LnpF%ZF>oJWPd{Z?}+
z&heYU?%tV17gSKn2Y;zCo{&2qRsW3O#%wDLnm5qoNCyHn2ldX#c7h2~`~&aOQSd?=
z^Ab7PPFpFjMCylBdo?M)p^OdfAjr2q3Z6^Joiz9s;Ns4WrH&Ate1sg25Qu>*?7(SK
z+~zmGkmAd1h_7?-?j8g+DRXt|#iQ9^zL!ycJJKhiSwdf+mVY<Vo@eBD4|Iu^QP*2S
zdiq&dHk8@e+Dm~fw!pDi(k}9oz>fC&y${)i(ZS2?+dZ>!Ef;01vx(lsH_DdcG(1*9
z5RTPC4Kc`4-R~zbPR-7-IZmEtcFr^8W%~Up98cUrFK_i0w}`VZlk!k@&W)7h$NoMQ
ze&X*(cwXT5KY#8Wp1*2t95EiCiptKpibN5r{60G;%MB0WU0rT2jo?m>SrljgOM*bC
zBNT+XNmvLpJF+rxj<Nc!{B41YqF2pIy1QUuTp&7-bLV7|G+(3YkARPF5p2!QzLR)0
zJ4c1rlJxZZd)nT@>tX{Fq!EpFXQS>#{(e&Q#N$l}!hf;)czd(IAAvTUv67B@ziLFO
z{Q%j!e*b4~IA;@8au$YQJhI9;=#k7u!nagFzQ({I2*+09?IZ--Q8Cr-ed}S|e4CxK
zd7cz)07EK*dH|#ig3j4Fn@Ce2aR9ZmiGb>evbz9OOH`VNcj4Hnc)Ms*Kge4KY&>3V
zL@<u}Eq`Ce`zP=ij$Q5d2QLkdl`<*<>opYCgY5%}zCDck8o`$XiGi2n-ms531XBK%
zdAgKGZtnjOsk7UNkq%^hM~1@)9PsV(=K5e_@SDQ!aYq>!uW$eV>d<&A9-GmhC&#=I
zs8*xk%s^WEKoj3OX*9D$pb|-k53_S#C-rEFX@8J;sD3wxzck8u#Jb<QpGE`S+ouu<
zCAX8pLdwof{#TgCRY-aqsfRZCzp?|ps8dgYGn=6UH{k6cf+HLy1&`OaXJ=E+2brsH
z1=!p0>MHc&ZNGoLlwY{GlX=-WIXy`fA)ysu77Y<S)9-(g^d?pA+wo5BEGaJFVK%wS
zOMh610Iw#hSmpPB=!UO1%9&fAdNhMFwuZb`O+tYCBV%j*{n}Aq5uHMfWIsxSdlnk*
z;HU1BT<^!NOL00?o68No#0}dY69BCn<=o3ixXBG`gOXM;Wl<wGsf};^{!7Sa$<FDo
zLV{)kpqYd=ssG-m?(}HcY@p#v2*jp-&wo$|VT(}7OCiuzFL(VJM#E54^qJrPF;lab
z#vRC{oHbB+E|2MA%HIj<l~R^q2tUit>E(v+W@nT2h}2n>%{!R#=WX&&Q)J^!oG~)+
zL!ge4|3jc<bp8*?F%y!CdK5ksm!Es2c2ZHz;@WnwPX0#Q4*n2Gvu(<H6NPnx6n`G6
z?McjwC>^*kP$jycakA&ya?4#v@yVp~?ZD){sG<o46Unsk1SbYBJW@L@*fMy%YC7?r
z&B-x$2U;2hcLW+llRE>2HInt<GQa;V8c^UU$r3l&!>KbrKnUcce+RO2M!R7?Qh%|8
zJ&Lld2Ih%f)0uUp{L$}UNOTT-pMQ_%0=)0U=$^r-e-xD6-0wdOlO)Hh{wOmsTva_X
zYgivjaUohJep}&&O#dw#<qRM*(C@#TNuA{rECB-QmF%3kWXR*WT6PW@N!2kxPoq=~
zYHLTJOa3XgC(C{gB;udU3Q>i)Yg4OAsMvpbzX<fcKZ|7X&wl?X622t-SbxXL!wB-x
zY&f<La2DcmFUX*<lO4RRa0C@D#@j-+Er7E^OFYRLpVZkoHHgxj^9bPZ`2CNO5y4er
zbfU9!o^-=XWO$H;M5&3?(0BIUkp~6`dUf1Qwl?$3<-`w44w6H_2m#zHQ1^RybYtB~
zAcNBuGKp{Jvg=T75}E}icz<0=sgYk4sPb5#0fgfJ9JP3SI|Ac^R|l#DuAUluykz6?
ztvgZ5@$I-K&?i_W*e5t8_AewMl6<A8==Tzl_ZU?4zbS7>!`(n0>4-|TWYjI>*~-M<
z_C66vmc{-+YM>qYr`~V=5@{smmsQ4)Qg50lWz4~cq!_&Z;8Ve5DStkCttE}$K+=B?
zUiOJB{%&^b{~tojCAVfH^2j}`-z-Urf-^Uh+n04W84Dv1Or%=oks)%yy{pNKy%opR
z?rAdl_XF{D%reZ&o!ymysC*Nt{fk#f(Wv$(WR4$+eN)D4NjpSM_sArazxC2reC%S;
zqwRvdW%1khulQ?}1b<ob35O^g`2NMjEI&n)k$Kw-Qf}T7OFZlCF;*7M*cC%i{E|{r
zirBVf)a=_x*`t$RBKEVRkC!bsOs^-!DK+~LdVXmwMbn0}i2OSApf=w7u!@ueS`G+c
zZLjr_<x)J+Vl9nAttY8i(e^XQ=zHa6>f65RWXrGZUIE|!0e`k7|0J#lS)iTCh2DPp
z>Ey%T(UY927UT&fO&d>4ddK}iY4{eTN>RDV{6CE$3*PBUgOf;|&%eAe_4M?&$$k5|
z2KDsZ>j*6!`;+}X@TIRv63*H|PTgrAPNC}LM{TI>n&%+a9I-PII|s4Tj-jd&?^#vw
z(4PF!uNdnCeSh+w3-pYZ(cKAK)rkTx_4|L8qCumaK$IOIS2TGD8^2xH6jxyjwtdgw
z4ScK7iC+;w+Cq#BCx`P(B>arvb9TtGbDo!?yEg8XHz694_vTf9Wc_DnuOh=fJ7<X+
z2Nkr0A6XAUdv@Otgku-uMNI^k<FP8qhRjzy!5ayxu77Ct9kkyc!3aEdL+nZfWPk^+
zrCc>xE-*07z^KF7r6PAPD)e{DrhZpo)(AS{0S<54)bBloB^sHDmdJk~>C*VJ2ralX
z{|LPxXUr0X5Bv>ytyXy}`FNibHCM|RON1=1rr54l#6k^+lFTW1W~h`G7>8NMT+?``
z6tkP3Pk*c?4)`e8zZJ3TDA<>U*vl0B(*KVRjg&p6ZMNZ2@1t&YA<=S66=JlBkGJv4
z;yJ}>Qas+W2`ihQQaegHTMnQi*H79c<)Gw$kWT9HBaN(RO*J(5{`5aIa*4??ivo>}
zz^{SY(MQNv>X}sZWGuVp*Aa6<Mtp_f*X*1TZhyEFqVfYYwo&_(-ud@q!Nl+XlpI;~
zwF#g|22e=|!Z9{w*zbfl?al9Q7oL+GY#XR;=U<fU>EKb|)Cjy5sB&eXw$D)@6+Rmn
zP6poaVAVezv|4xENYt>i8JR~AQ}O3NKrGnqVv<^qtfsN};rb`Yj(sKYYn*RJd5{`^
z3xCd}^uK?aEGpW1r7YglnJD(Q`tz7teyRHkF?IX*q-_876|(4!54#e)QoMHY4jEN<
z{w`_MU0henfA%>Q#4f$HNhS_{;Y%sD?p`jV=G;(^<l%?Oo=P9q2viC*%O4P^AEbZZ
zo`T*#lf>Pk=g#|p2_0y2lV=<de$>c$X@6kuz+5T!0NU<6pFDtP$XohNQVp&B){9cK
z^_warQxG%OO%c%J0x8B|%6Sf+{XpK5O)Af|UiAkiq72I$IjT*sP3q_;lvxc}T-dzB
z3YI3_H5_Pm(lHxhUdMofSFyC%i0W@)iGc)GwxdD~a=S)Y7rBrDZ|ygyzq?S1vwyQ4
z6;dGtK2+3!dvzIy7f^kq=*>4Uzv6g(`&EQ;q7SQ4rF612$S}Lj-Vj(0rk)&c;f;Ng
zat5!Ia%Hyj9i+60**1E)oMFX^!5Tb%ne7ZFLATUz-hugSRGPzBp9*-+23}r67qCJh
zKScB4*fou)mT!Q}VcfM0hI`N^3x5;e^u9Z)=;Y_`*oPiSo&iz+pb|gYdR<{RTDZg#
zBs?$ln<|uYK5D)MSomkQ^EHH=`3}S%Ro@WR^Fqa0sD3}l*ZG*5^_%PMFR0pHsCEZ3
zbU{^wr{!*#oo&6$D<#xPo4Yy_ZG7W5I|DI}3dv>xn%|@hX_Vy+G*}zSynkNP+;8^u
zCJtDb|KP5IF&`PLNF6;K7!WO^Y*JN$q{~Pn<xugce~@E!L7)<PKrGe{HS)Bse3X^q
zluiC?+Mn0{Jfbm61S{FWGbwQb`%_@&8Cccm3_Y{}Y2jFZST~y?Q|@G$o6PoEYIgQ`
zDbCE!dB)4GSQc4!b&$O|IDfr9#KManR(F?^&;Ts&BG{Cj)5Z;XdUz4cNLK6b@g(0m
zNR{`qb8e9GRiu9H_g|Ai2DsmUA12&#?)Of*fyB*iSoRPDva_eNvV1X6>m4;oDlS5B
z1t7T=0loYRe1Ho${r=ZkL91}uL7V5n?LfU7q<Gj8guDM=Xx@AKcz=p6zK5)eWsgwh
zP9AwTN%u<m#mDtXB}BIwDaDEo&qLrEGsn!7@|wQ$;gO6XW3%|5%_(?@$`+3&30wTY
zS_&q3PJDz&P1hk5o;Hgb?Y4I_apo=Lf^~Rr7OANgpOg7AsN(}tj&u@Pq9>%xm*Tox
zE~JX0F1wV1hlwSkdViiq!Q;ddQ5XF{fxYbakMG~A?5<s1B#Y}bUm=UXX&Ei$!)x2I
zvfI6OF+tj#fa%n{yDVC|_6RGxPw$^BqsE-FNg9<Ny;+L8_B3YHG^tL5GJ7<6PV;}U
zWmNJbUwaadOssk2yQGx(=x6K8%9UQK93N;Lzd38t`0<mbK7aFcZsp3W65f2~*~w2Y
zT9}nJ@uPPuS4oMFm6dBGi*`QIEJ_$+l-Oe=8mAj?7`ai2Q3Ik@MVryHqK|kwd#;Ub
z9XmYk{J4>E8@!Krk5sy((zr_7;#1;>Cm0E-3F|7~Re5pMCRJ~%`bqUCs~6Tdw?-FV
zJzu|?Z`b@Gsef_OwMjSEdhe8f)HY@G7)$g|E_f?0aEBDjE#b*qN&4tKpa=^i?86Ci
zSGFzWKYP7*3@3Wn@mwtB_sCEe<MTCQ)e$4_e-0@vJjYq02jO=b6}^HpUvPsrf%wA`
znbWxn&-8Fk<+cvB$B<j*KJi-$bCH0?<a-D{p_+(=5P#)2D=g8C<TIiac=I#jmT@;0
z&e>*r69NahJ9gnsWU|x0Ej{G0k{xV`D{N^Hd0lIJ672ko1IxLTUD(T$5bVp%(EG{E
zxm>QeKjIU0f9>FX>~zeh7uV_+L+#)_oXBXQ7dE1*RpSwI{Q55Q6ee&AKgR{4bWZUd
z$)zZA?0=0HC|lHgH)W`u-&D2lNeJ}SJ!uo{dxa-KMm<Y4XyhGss3ET-#-t379itv)
zz!Z$;R9SR0a`JS6NH9g_q?CEFlQ=qo%cmw}j<!c<j%M6vhKrA}Gi_Z=t-)JVK<+?W
zO-(%}q8?(~DG=wF!aHV?C!sm6W}?KoNNkL{K7U7%X%0GyibOS2OrON@KrQ?5nIv*h
z$!xqj1NrkDm!4Lepn&BZDw^2mh%k+K6Ea7Q;qjnw8{T|px-flViiJ|HM^$O2Xh67@
zQ%#p*3E%)(Xm>F3Gfbi9t?t0Pj)-C3fP$M5Or5qz5ROPH5iFyLkn!C*zI|974_9AE
zQ-3!D9shxJTOC{GF9fLDD)4OpK6ss=FLelCWmgp~sIO%GflnMJ9PPyOc@k#a8B<J#
zSKpqu9gSB)NA{gB^maHLFBdTYo%5*}()b*?x|<p&w2yHFJRIY1Bz%HH>wI#3a~k%4
zabZ5B!Ux;8^VcExt8x74SN@P1@7CKR9Dm&km*$;U08DO0IUWQxD1Y9^1{2h2n~0N8
z`i}WE#806+T5<n;JYPGmK0V9dnf(s8J7FtWirzPPAj?tTu+7jIDonR<o76CU2tyzL
zo5xrE^bH*t;thBDf+1X1)ivG9UEqG&3s>PRh_lscIkj&M$B1;}e1}Fn-+}I)qkqze
z^}f?b*!1-)I_9WzNeTLBU>*08B7LX2I?1#~Y|v+wy1J*!_)7bPzi=0(S@Cg<<2cNY
zVXp8vMuI-NcYBr<rw<<LL$UZ)Gp?Ov4*oSw<m$_ta0${7y~B|xmTHJNm56550Z&DV
z>K3bh`qC)(`!8)nx1J_z#M(Si-hZ9?C<YJOqI5GQL7x`Z=Z4ENTZQL_&Ct1F=lISI
zBUPUpHjn$<u=)yTmgAmuPT+HkdU*7)SasCN)U}s$EVks4STl4a)(H_qg$Go%$V~_x
zPjxCho@$1Ur{YxXmo+GH-4Y76;^LN7tAR9p&~WKm0owk47(q0n7c>|?(0`Kg3}qU4
z_}>aqO|vXSGpsN~_=cf^=u69mXutW_KvXLP(abPJ|8bO=P?9v6*uqEJ{}UlT7Qlb(
zvK1$E*@`H6*~*`(F#quVu&`c^=XlrOuw9)8I0O1?7as_&=u%m4iCyca<?dR)-uds_
zwJ!cA?wbwkeWyabZ<f~kW`7yIZ-w-}RZ8z`wkoCft?)$$W%RxX>3s{}WxnlHa1aFJ
zr1)x@lUm;Qy{zAR5bPY>nKZRGUOz={Y`uN-c=JQh(F2{bU-2q&*>dTxc$GTL5qa6N
z6}oKMDd)0faa7{BPK5ZgoCxAK|77A1AKB>dgoxi_;)huLgNHWuJAdVnzf&RkLx!fb
zvwp`h$At2o9QPwF>_EWf8=|p|(~lngQH&M(J{P5$^jE3s>T4dR>YE`*2~Jg)pDo~Y
zzBCU$1PbN)HP7sFFHTTZ@x^{$>$@Vn+J%Yd&!F_<FD&Bnj9~XveM!eM{=ybpG<Dtk
zM-*Til?UZ$gZeV<NPhrNEoW2e*1PC^<MB|FcLVhw)HW-)Iw8TmU9Pk9yKa|rDt6b8
ze!H9*zFp1=-!5mCbGw{%yjP->bGw`y{G`4{ZED|I-!6C5D^g0{F6V@9mlNgPE*H8c
z<?O4R(Cu<o=yo}UU`$E4lNTa1c>(&prVG?%J--uqU0Z3V&3}my-eyHko9W(_p@nxv
zWZ<os4#;9#kQ?BsfS#HqG)Y5d^S&b%Cw##R3maJ9>h6;|p-<wei;_ZDMr$LIAcjHt
zg!{=%{jJ|6DsVKnl9m`UgooI#zjg)j=83#l#Qh$g=Ew%P23Aj6)W!EYVRQ0FXTkcZ
zc82=iOi{NiD}OKy{xe_U0$)ts?Xod+q0utFaF>18ySUB9`m?6g@ERCjaP@WV>LQ+0
z_v3Ny2SQ;yd(^~%W>`JaDG76_n|^;5NoAaqkaKyZ=S4oE^V+6<LwHx%5O<dt0^T3?
zT6T`zfHJ<d$-k7albv(O4fkM$=N4Y!8Ah4Dp0slM0)OwTyknlwj^zU0Fh2zA7BRd$
ztGAztrdWb_%I^o6eX6&LP_0;^!2U<<Nw?iY5KFK$!Fv?9qTas98IJwjC}$^CJs54o
zlj(;|m^fCT4h>v@ARId%Rh{l`t3<i3sCQ!sq<J`85sH#R#q05mE#9hu^8rutv63eS
zJu!%66Mu5<29|KnN*08IU+{wG-uGgAliNpc!v6uWU9<jpoMT{QU|`?@Vlf6e1||kZ
zAPfLv7N7_d5HmtB01i3;p8x=OoK4QXO9Md=1@L#bo4ZRm#YFu257MNtmRk)3(MGn^
z_SDW!ErV!E8?_d}Qn8ER`O(_i+6wl;PB__p4u5(@c>EY<7>3aR!flw~2PWKsi7$X;
z2~byne)?B4QdeYlC%ez$R{A}0DvrloRx=S?qd$IE&7z~1Ve}?#ZOB}$Ij=e_!WX%F
z!z10|!NLjcOpmtNq)p#xlSkUdF7w1OkH2Z7SLf>wu1vivr`BCLeeQhx<$N>}8fe@D
zlTRc0{|%Vv1L-^v?X#$7EP@XXRK$Va5Wu4N6j^0U%;_@$bgQhQhxT6%kxAOWCfrkE
g000000RR910Nc#HO#lD@0MKVKdH?_b0Nyg7mTX16NdN!<

delta 20952
zcmZsCbyVKW6Yh(aQXGoAzesU+cXxM};tm0dySuwn+)HtHch}-tD02CJf8Kld<jG{7
z$<FTV+2rhGPx{*+I*T9xcLi~A1yxlA5J;I9^ab=${wjhX{*(W25fK+B27#auKp?pn
z5a{~stv1qGTwGP|qwWU}!v7Dzq;!phsF*kiqy+b&lYW2_L<RCvP+?#OfgmhDbg2&*
zN-vo+o7fov4j>R@-Up%iVRWjOZ#lIzGcx_S{;x9oe<1n%o5}Kn{NMyXbm9+?6ZK(H
zTiUsJd^AG$p<jR4IJ;y1pxGIDeE5Sf{NP~!2USIoy^)>S2iN$apMA)A756C>hwsiV
zAMO4HfdoM49|q!gYmoW>qW*}yJ-+pu0W$AB=*xe70D-10n7sazD}CIhug@==ID=?x
zA1WLO^5dMy2SK3y3Dg}8_Yu7!2&4)Ed1RRw8u?Ce1_UGr{8&hH#e{+?<P9?aH5u1S
z{`>du(LsM`=(uGFs~RxECqjJ>XMg&01Kd42dHWIyK_l^2NEl*MXpp}KV(owKe?mM1
z!w@&vJwBKrAYyt@5V2=SC<9?JZ<8<X9nHx^!25d-DHb6GubKz$6%B}#)PlN0=CpfW
zX9l@9F~1}qB+d?N+e-!y0`24A#{JhdbI_0X69g-Sj{&EFhM4~7?z!HVEV+d@1Mi$6
z!(OHW%0lI!ppkz~T?NNN1Qax000Ljq9ZGpKVd850y7UEgtRi!wgc8{GT!|bJRoUw#
ze_tKG$s#LV>wW97WpVRpJkg<J<Ncm1cZ%EQ^8UGc>zQxK29NZcJa&kZ-L`At_qN+-
zoo{UyHEY4BWC%>e@8<D9WV`?k<@@6DOS@yKTI6e!w(cuADo34ThTXq-z&bow0jn!T
z`*LGm+iq6@jnu8z5d&W7M{nyO8|rt3o(Juw{^BwY;uv(-eyM_dOB(I)hhB`X0T@#9
zkT9Em#9ejA)K&%4h@t+(T`MLDIux0Ho84UFreXBV0k`YqWr~NeEwOl13sp92ockzP
zak9d;nbl*{JH|<tXS`G#Km!M7P;$?0&wkHu57i`sX(G*v*P_#sj%}0CDY|L!)1buQ
z(O}D9cT|_SP*j*ylvIpVxKuP3TZxqHSehG?p2=kRiA;9@Q{P4F)3ZLkce5fuzhFRn
zpIY-asSZ>x7~tJ6slPU<0Otz^9QR9lulI@o-+}?dy*twTz4AHmf&b63`w_NP{+o71
zxB4lA-mByFVzqWzcgksP^0SNvz%65Qza;+Jqz0VN8+hL@$-TO20DSWX3inGgua2?W
zrIin}YThRmT`mjy?bZx>O{q1jG8*T_|2Ms)-2_Z)H%({g9GB?3sW5bSGR!S(t(?|2
zJ=+w%tyXlqoz`|e|0#KEuk0o~tu1~2Q~cJNxq)%m0Umc(NxPgW6dOCF&u9tXt+iA~
z@AX(tlQexUGr~)Z8j9-1NenlAx97FzHR83BWy>MGc@2#>ljX=^&tWo00Z%cT<4xf@
zM*(evyrh4QqMru83__Bv4U?c5Skf_L;>kp%Mx}<Yr{dIN*W%XVj72Yn-)Uff$Ni4;
z&Z>@!RM$hZXSYXS(o{F-k*c}NXOeyWE8e1tgB``&mX#fc2sbmDeo);w*=}%XkZKq0
z%HCFXYdLif9etIuQNe@K$UINxw=7K!O#;9};a<MdWd69yJiuwR@cA-p{cS%cn#jtQ
z<L%e=1q*!U-FNK{tsjRAI(ISx`Fhn4v98po%O$txeBBpoR|QD<Tc5fG?y{pg>~Vem
zq;-7DWOPuTnIp59%uHss**xpTN-=E#X7rtAXA=#&o)^k%YkZp=o)&6jJ@z6whF*c&
zzT~0m@!{;72MHUmt|hyTJ<p9>_UdkLk#{*NfYWg-tXi*x3QN}Edpzj|#?y~t%kwbp
zW(+<860uLvzH~+%$kHa&Qpn!)@Wyoa87wl6HDrNXf6#6T;z><%>O~7M!jnV}$#nb^
z_W5PzQ*ZE8$Q^Vkq?T0cShZaEq{{(FRaTV<Yibf@0-6BM?wnpD?djxQ2$gxOIP&P)
zvWPSrS?kunWU4De7&{rt=6Q$lpi_RCAO)B1xWQ<T_CDp>qT${>S&5+cL-oXZ82>mS
zFWWd~g$Tdni-DN5Q9iOLSr*io!uHALVtkRy!MS(+MrG6TH@UbQJ(v40oi6}11YZnM
zBKW|5XzT$h-x=ZS%ZO?kJ_`l$frNihJEw6<5)VqLe5^*cI*yGMg0#{cTEI4;9`xVT
zT<%@6z$%VDjX5G>3?W-D!9n;4ERK>o5}*7_*MdPy;q>eDyia8>btHMrrQ)$;s(h3q
zPsozj5#V(rWen{*3l!cBIY(d{4cyL6`taKcM<Y7KDr#_*u<@D2#P^#<_h*J*<VlR!
z_hv>hFvd?fKYgI+TuQ!`NHIkTmFA#DSf>deZTtVZqbb2{cOH-wp1j5tz>v+I1nvb2
zGG-MyV7?TUiPXaXD)7rjILi*BxwR~sTlHvCEe%L7uFU`SN89vFhfo&qO5<&X3wg$%
zulY16_^F6<qY{^(oWaBiE}lm{I>{*#Je#2;QYq&+a?E~jHj_L~=d5(XtwNVj5G-Qp
z_9$6M6M;Tt-CTqn_e!hZ8A={8Kr<P3t{BKt<O9cK9)qVe4_QArQ-%tx%L3u2$y4~s
zgPyvDTKgWNmx9%TsfR!kM3|bG?2J*6&MJD{mYk?S4vt_j`l!<=Hv)3&k5)4*eT<Ca
zHi|{1^_%iTOmIu#0){DhO*)5PJFYk3saBLiFgeQCF)+pQnO3uTtY~au0+6_i$BRG-
z_JECz$}cvQ<&lWjui}YeDVE$5lJGh8BOZWZC1h3tC8;G<8Upp7olF*O!`!UMKgS%*
zn+jqI$Q4jf^5#kq>pCNMyZ<Qye`C)vgf!X_<-Lu^paMN(A~>tSA4R86c4bw3rW0yF
zk;zBCx(dMLR7MiMDms7}yZ(!7%tIhIt^c=L%+f?3NpxAqk)P32q2(*A+B89ruEZG<
zxk2uWU4Xbu05y=7gtlSxJ5O_m{-Q0aXKm4ACb6BLTsIoE3Pllpw*Zbp9qnEZH+Zst
ze=PA93(FEdQRbde(gef!RSq?a-XtZHv}v>fjO*c0tw1{tSo-CDt#&?Rvg*mN-{!5{
zS5$*^VVGYCAb#AY)D`b}E$MR@LN-KoD5r|-M^7mLy#h73#;&}|s6#vjIEaEN!A2e<
z^G+haEWLDvUMI2)Y2&Dt3)vjJeO8Z<L}nZG0}xuCR*(#*E1q5?>pW4VQ+E+m968Kz
z#gYUz6944pRkX#eNsEW!ql+@3&xC{E1S3XbrV%7vP=3SNQF96Z#EJUH7f-y^m{g5Y
zMY1<p+5%jE37<R%H>)c%<%ln#usF0No;g&)1d7;+r%eox?*GLG6E?C|)1GtSMkh3K
z1$UswDDCQ6%^*u=j4SVo8d(!fvoJU1$q0kLEiAi^i{N^J7a^99XJY?AEn;z;#yeK(
z^<7b0fip7UTiVmPP-47}x5SoE<Q0PgX2y#iVE|U)^oQdUSy`2PVyfr9i91BpaCc~y
zX^RFg<x^hfGZiiuld}zo!S4mtp@*O5odX1N$XlQuF!X#OBfryNO&@#5?)y@TB5E<C
zC!tXNe3Y1>?rvaVi;H^4jG^+*zr`5jQ$0&{3V0s}7uiAzA^T&Gky#)?Wk^;u2$dl8
zWdMdYlCs|2Xf8jQGptAickM7^tE$D-qJ6>M(I=1DPREZ%Dr-$5W?5$8^Q|1p%xpE5
zto#cbf2#jLvOyWCNYA-ODJ;pMMD1>ZwmsWZUGF?5=XjUb6QOol4Wbm?Asf<`EzW=9
zz!?Df$8>ygdx{{;BufjLSGs}3;l$$16yWBwiseNf#HY;4T}625@Qd4n186_F!IX~X
zDrp`k^Zcyvf3CSJ^@i}K#42or+NbJas%PTO>b7UhDA4Gfs(F;Fg{Ae=xsxZ@ftpmz
zj1dfmCGr+N3hAQ=^=q3rmSoXef{W5hQBzTrHj4r1XR;kpdC_t1DyIJyZy2G<5dqjQ
zvT3+PSsMw@90uLtD6JAijK~lZs%zCyHwQwb2Z!;OpZHU@%=oI|o-8PL_}bm~pmeqT
zI+Dhj(9@<UsYPi_(zTFEl0TkV#M#~Gb!@Q3?+jH?ZH(ffreM30K<FpS8`J6XIWoJN
zw5xty(^vuW3$9rG{;7bOeMHHsLO?9?@Di+2k*yx0X79?Y9?tl=GC;&ARk~G-ELo<(
zWwo?;4x6ywe=$C&)YJCMDo>JvnGI67>NV6{voI|!>0zr?$u1{x`bx9}ORs(Vm3)f4
z(iwY(=D9oM@o@w0-K>x%y*Ar~8CvE^c?mNeN6!4GXZ^qfQtpv&15OPk$AFSqiir&M
zZ`A~B3WZ|Mt)p`16|{q6%z})>#J~mxDdl}5UIhkuiclbfVi#i%V&OVt6E8#mNP4<M
z0N?p#=Px9Gg@muPUE6eoJGXJ1xSWCve$Y!3q@w_BACzq&|M3g*6-Z+Sqa@ODn`3jj
zP<x*7k4mOeAIPH^xu7006ewvJWuAU3mRKu^-6eF2N@fkV?c4*xzMFF;UqwsghW2pJ
zVjqRI%JMmi9Ak3{dGk}uFU?w-<YuEb*OeAtz-s5TLGgZdYq=d#TTV4J7zBHBj{n+I
zEa)y5y)5mCTt-L=7+cm=q+Y8f!LFr>OWXGpPAbLxX6Esn-s^6B3jD?!ndjS^wN7DB
z#<k6pHaJZBCO4kQMXPAF7r*=3My&NjxYdLBtQCFqFJ*Ra2m7W@oRRZ-)$i~+^Gt0Z
zjR0+${zml&dv<ydeB*H$!=s+-{8NoY&}GGm6(Pd0udRGjR<Ukbf_eU>FiapKYt|?|
z*fc@KF@>jJGfnpT1&9iRn(!=Lo_V{S_f#phj*a+DQOKm(ms2cL<iS#tuKhy0<v&4l
zRhZEBFz*qYZp6r(-`iog9q#(DE8o}{TKUI3e(2_2bS!eAZZziZi7*{T+U9csCKzj0
z#Id4WE!INlt%#P0s3(!#3w-$GoF0`m4%V)Slf*8M*24V32)O)c$h2}Zm1${XkjgP)
z+x`6WWbV(cNTAMy`+^}g&GiUILk!g@X>-k|bc;V;q<i|9MvQ(eLzb;fMM|V59if)3
z{!!)P%BGq*SB64^N!&|DZiX&e+yeS{jmwDiV6L=7zLR{2E5r7oc}6BLDrz6_@-HK*
zV6IbrmHvkF3Bd5D|G_Ah7i)en))yZ0{+i7+iILiw=9JWR{E?rsH;_^PvfxRUcktPv
zcVt{|c{ihivgM`7uRv-+Ve!TB+l#zK55CuW&Az9I`NZw#*YRA`m`joP3PD?;nx;q*
z#^hMLuxX@hZ#x(rNfJZ9{$X^iTB(%$ktz$jXPY`4(F6u^(lgjRLs%C?Sd<}qB1`^I
zuwZl3`7RVWCv{Sr@QEb}wasSP;9|!gw)=RN=yG}WupIE_`Pf{+K`5_++e>ah+<l*h
zmz)nERHeH87Ly#pl{Ld{nPKme(C#_(alqk{Mqb9z#WsdMS1t;5g%k$A3CqLS<lfq+
zxK_C<gMqKr4ZIv*xGR&YIj62&H4cL*T-8gWw~mjCyR9?i3rh|Qj+^`Ya|O0!v}vp_
z6e98|RhK%#l_I3^Vymj2(^oxQB#KRAu1m0K)KSt8s6X-1ls+M>C6(T0oHG>SGfrVC
zAtAJv67xDIxQv1~ec)naGA31?jgkxHhT&bH$AQu7D&<`^57D_LQCgU(l=UsiwK#+;
zUGj}%8JNY-e`FPKP0p(t<)?RtA4KC5`adS5oT9bV3FRVBQD%zumkt;OHRTED-W9*<
zFZqGCm<zb73h3i|_$o<P1m{yQV8pmwv>_Eio@M9=*3mNBg)%&65BiuE8SBn*YCRQu
z1)vFZ_40Ya;d8lxXCGN|n|ehhh2k08<Y~>vQVQ?U+m|{zb&n|tmXz65H)pkN2xBHk
zBznFz{L_u{XbZ}iWj>lSBt=OA*#jAdiq^jw4Mo&{j>1|nU+Mi;e5y31CTPyBEz6bE
ziO#BIu|%JEzL2sdEkbq96)@|?X-PAw!2z;nqgLtzP0*vNg)c24CmK&6v37Mwxd!R7
z)`ucGw2h2_cwHmUcDaemWYzD@wX3Axw6sqdy1hrESFZIia}U7HWedxe)rUy_(vf<@
zk=nL=67#q{E<|$$9AZQVk#+oiJ`!M}s3UmkC&SJZ)c~TwThqDo^5P}NF04^3THsH(
z(xd)Q(YN2sZ<9gS4<!G%szy`9|8c2n350t7O@}*R)O5fed*=RnTsQiHFS&f3#Uve?
ze6((9lMxzbF(G~2VEKv4+An0{$B(}pW^(_ORoLjR-7V4Z>R7!FEh)`$Y1CPW3^T*O
zZ%7D+Dce!t<12rcWg}=Jb0%^Q<-h`5;@n0PPe0ur7I<k3cRPN!!k0*zwWIJa*Bn!Y
zm9?rJbUt0~@WlzZ>=V1vu~+#)({GnVLpu~Ok90pgn|)6Qw<*_mJCMvybiF0*>Slew
zD*nv6u7ca5vO$Z`Qo<@f5R;j~ObLN!GC%HxEOV!<;!1ODA0g-Ujykm!@4p5Vai}<4
zQQnYg3#?2?<&c>0KoZw`BZAvCcj>LLJ?eVV>fm>m_0x)Dvkk+A%3*3L+Y3E>>G&@<
zij}j1tIknfgr-ATpOl+;oKy@UyQ3_izb)AWj)&QzH^i+Ehaise<Hp_InO;+5we7J%
zv<wAdH0Lm>NHq0NMVP7^+XexA`9X>*Ch3)*B|Y2H*2%uDL{OJj86k95g;U1~useQz
zG(G85I2UxXf%R_d$k4zycAW}AL0a!x*XX$7man(NL8he5k;oWL89Yj9osBX0*7u&*
z>E`!+-T|}zF;XGt#BGN;E$KizdZ^q~m+k-o*$~byC&HYue0NtUOrRX7GYcJJBBL(|
zqIK<s!$ZH|ur5*#j4p#5^8nFTM=(@XsLNetNg690^t)9%AmBI-vgECZZDyjn`8hB6
z`FIE_QN#Rna$gJnq>Gk&mQeL#TTd~d!=bI(eA<Ha)de@Lsfd#$RloLJSm;L`bbq&f
zLEgmylGUNF`IVeJ1E(Nxw|Xz*^*GL7HudXLQ#2?Yso96Mkg)3wA7Ky~+-h7SrWco;
z315@AyE{T}?&AQb)Vnk<x@T2_K@=<U$0KD;ob!4<th27%Iu0Vq>DY`?Duv_I%viu2
zoMC(&%=k@b`6_0^Ay1jtg1U9R-8T*?wmh79$*is@v<w#z*NzszinSi)!8;)>JK5cB
zNOmh*{kZA$zO%^*xAW8!`{hmj=k+#*j_@iz(g3V`a*>wUSAVKvj8DmCYht{f?SkK%
z_gCi7l@5lgm^L?hN>&2pAPUM%Nn-_KSH70jJ21|i4$FB3MpRhB-r7cAcuDQUy1(j7
z>qryt3(!aAOp&1h*zrbECP2suJkBk~z(Au*B0?7eY5Cf0II=O;Tmx|=)G)pvMHFDJ
z3GL{NL74Il^Lt8x66OF;Y3B8QwkgWCh5QhRn6vt8aS^G_sn^Z`N)|a-Qk>T61k;VJ
z*c8?GJ)}8dF>+_wPxLp2f$aCbRI@Z}C>lyY_j`q|6Y>H;2Z-exG;{{N_R3JlWu1a1
z#>&2OMLP|yBVbP(ae=3#1WA?)acC+r7Ic(GFOLQFjL;;dJQ2ut_W7h^tWuBqY144n
z9d%Re<>s$&OR>-7jV6fIs7|=jzPXHQ`5$}VwWInUx*v1bF@&1uu>2UN@6(M^R9ub$
zp;u2U({2MJ^O{9T+@5jLlI8hzxM89r>|(T~D6*uee{G}I<2C8n7$(O9%Y+W<!`ewM
zKuFyLNZD}^+R|7ESWISpMcYHA6eDR1ssZr{-;@J8<Q1g9{q=pwW^OiXKUripUDrv1
z<t7pD;^>1$1|fc#o}$2RQiJobW$2&wjk>rKT^j?K>3Bq+IEuadp6i4ehN|lFca&=c
z*(j{B3Dq(}XVsxAE3`t2(gni<4W&aKo$&K^PwmI*A$8RP2gy#+?-d1hyh8j&EW06(
zaYK?|PAKsW_aS#?P>yP`9vskUWJ3o!ZnFx)mG_}&t_hN()5qzAOcE+-zh}gZ{wa>c
zc@_gI6pZIdmqGnPo!c`Hsao>5OLSi%<Ai;NlXdhD`a^1li=Wr#!oH={$NeUfLGca!
z#eBd4I>pQz48bu+1}jK&oYxV<F{OA$-!Q*6PSp!vx2=;4C|0x)W;C&c1(cWYC1Beh
zz9|d6n_=kk#xv(OqPwl?U8TW7h8h$m2cH0WQTN9Sa^urGtI!+2gdxvfAuuwx24}P1
zkWjFU`#G1ZA<^@+`pEKGQs`uB?(ksphlcL2&={5e8K~$n#r_bz%0O9MDwGy`6~#7X
zUah}!cKI{OOU3p^(2^fz70A@aKE-6JgsS98gyW87<fT<br!Nl{bGHzJRreg+qYDF&
zFrf+txn*Q}aEUne>89pA_U7Ajit@1eV3{%Y(88!JAe=BskK4--&4af0n3d|fJlnrw
z`q1envqA|mK_=&|#($~^Tqj{YM?;#U%i+@n82FU`ExC-oGxR?QTAo952WYmrb(II7
z;hJBxwAE|Whb0}1x+G{MiTsp|zd;0s>Co_%{bHEf=#XFA0)r<EB}ZN0GRHtSS1vz^
z8#KMA)n#Zzf9z39l`q#MDr$!v6kxE#1rKa@l;PKlwt5U<oEpProVr7}BSw>AhjMm)
z)RrTJu8F?}>Rbv;nraL4Y*H`}%Pi{bcQ9OHcKEr*XnmOTcyc5)Sj8`B6aiPd?LIqI
zBR=)2c|T|@BXSSJ!PN+!A=nU`GaK1V+-n0tqB^vHkkF^f8#m}byVe6~_7ssL7<a(Y
z$}ns{<sr$(X{C9X(tomkF16`Rq?0J?$e5OV_bmD%H++C0*PuzNhc?ZpaPL(lna-14
z(4QRobZQyQ0wo(v8$+M~T?(8E@Ile%b`hd;c3bD8)$T+tgQgv#kYHFInGsFzp>FEb
z5A>OlT93j#9_>P?;C>0RI1RcOwagFeLECF3qJ}HkF+jY3iGLn-VL_<)^wwO=5|RH&
z$8%34h;SO}PAa9eU=wD{0d+S-&?6$r1oR@#{w+kQu7LQ|Jbfw7j1bVF?iVC)cPjlN
z2cqo?C`tomYUA?y4HXMO53?u+uC0UaI@3QD7|#DhY;f-?9w{8g6Jelay@4W}6l4xC
zb;oG@%jG%#Jw_>R{~<h?>APS@lsQ>!(7~>5Jwoz)(CHo9ckR}cYDW(6)J$4%ui1+Y
z&Ug@7r4($bZCrRUdO5&D{U)L5ry!I)*GWn3fKityjMW!<3krqQHU#!gRI6P%2m6P(
zGi7H6JTRrhk5&V4Y=@)Gevn49=Gux;M0lBLUC6n0rcnJ!J}kY_@h7=cuNwUcseQ09
zXvZ$M6oxXf0$+I8wVJ*$RAPl^9+|L3sl#$T>S1)u33EQL@CIy{+x>t_dl!AOFEU-F
z{t}{1*$^=dx4;|pkYcLYvog#1)sZG?mKxmJ?5KQ2WI+y-t6L=|M_WxZLOcVR?SNCu
z_JV6>l%}obcGzR+Gh;Y09m08U62jb%b^CANx|z_PCJAp=&)+B?JGnA2PLWasEmK#a
zv@)Y?4eB<_K?Ep?amZyAgB2V=h--{R3C2|!^0y0yV#na9b9<UhEgC<@9v8d{#^DaA
zs~rb5n<NF^Mh&9i3GH9D3eeDDms?h;wR@IEX+?xs9@`uML-q;|pWEO(<^3v?D5ZLo
z<PrmAGAJmHLJR2huw#<W(ql&JfAoniXb;hKbZ42ldjM~eGFwnHqrtxMIBr2zkjLd;
zbA)|g9eJKznPDpbDU%^@Ntms#fe-oZVG>kgzk7!Hxox=f33#VQ3?WdU`j{u+9u~Ci
zd$Lh!oK+QV*I+8W)1P#!%>(Uk7L-d_u(bqzDh4vzgRl6pC&czTPD|R>0w<_RrlNYE
zszYx+X8?I?|4wsF4E+U@-n-KdtS;ogIhX0bYECk-?@s(<SUwO4!xB)J!EB~TcnPRZ
z)zAMl_4bHsw?&)%g`1e$E5<VpanfdH7{umqxBO2&LXSPhIQm(6`iL8w-IaPwC04~@
zom#T)6UrZ$kl6eo+!kd;pwbnAZ)n;XfiJo62nitK!}^TO$3~CL*P>16<;6+pW#15!
ze+0nsL1=Lj(Krr!#XGTEwJu5xc)G48Atk8Tob!m<>3BPdt~qr&*?G&35hf=7&)xgN
zF;|H=QiXVeN@BLiJTcq1XiJos)LNk!s~D5ckB!Em>01p61+xMsE;jHjO0jWMW0)$i
zpG{^~yxR>B2NJz&AP+D}^V!~AJzsx?^Jwm3u+SB>L*c6UdVkN~^(#!9$HWTv4}zDc
z+P&GA6m0F&S8`rE*;TH$G&BJkrxJMe^{8k~1JRFn&Mpj{bzZ3W7lqDScxuH;LJMUB
zk!Jlnt5FxmIQLc78$;zn1xBNugqcv_+$u}176pwDg`zCEXMn}yF<>+2XX~d+lKQ)L
zf=lmh)b;)9gIjpU@V<BGX$le~#^FeB#@|+-0yw$YjQUANFZwUZ>Ur|v>b+Smojx1y
z!Crc7^O>>D<5E65rR>YmYQ`TnJ?E`<8=eq+_MXJ_!pU$S8F;dJrU`NHbm+<i9v!c_
zxfd(d41SX2nHm(B{Hqh6ti0`1F~(z0EbD!;ri~i$M>raA>&hy0GbB#u=yjmg<*t7;
z<{54Cf9*rCUG)$kAh~P~BjnqZ80t8i?5pt76XHZP6hO*9vbGi4<|B(I;brK9Jju!-
zk0c!Hm9M+sy>e5$iCHwsq|SZ^rYT4NUV=Gs^c~MOl4^I1;iEDzSXYCuYrVL|V!zuG
ztfBogV9Jnaq)>NHdn6ZY|COncNmcrXd%u$xp1+9O!z3#!wg%u1HO`#gIftTdcKh1(
zk31zXx#QSzi%L}^H$Cau_j`nEMTCz`Kvjn<z+vxXo#$38>`R%TS*C#l9Dcc<|NXkI
zhQ{X%{9x>G#yn{MCV29?SGEs_FVA@i;?u9gPqR{peT}G7FnmL+V0nS)(%p*RPPb9H
zz;ay7cUDVNkXE-3d2xHK<{?)Y%TS!pM@BstQZw+OH11BjM-KTZiLlnOe{>SVp2f`k
zcXgJR%7=lSp#MjR|L|idpv2f6{B*hH0&?`3ZzjNBgSC4Fmg$^#zGLXlrUW*6s_wot
zCDm#{d3Ba!!N}#7z}ss}Tuuhjy7w`VDoX3IHkPX{v5qdLglQq@!@Zq34TroL2$5v@
z;g}h)#ORwN6nSZsC_Q{}yZ!BVBFEfFK~%xKb`y~!=+%d^(CEVlz`d-{LD)PD46C09
zPG`d~v?H#(x!H`QsjQHVJKyDhE%Xe*c~KhFgMlU&z8H~3vvoSxxZ}+bm*N+HtH+<u
zme%w1-`semZQ}P%kxbmJ)(|p`MJE2;Y^Lm0_8DgC6FBXS{PX%C_HQcn#PR9}nzX;{
z*5^B^*=QXxHi$x_fP|{ql#uF#Lbr<IqmCErK)2C%NB@nO9Z{&s<U7AViK5eM+{#yO
zq~C+|Bq$)itE?dZlwobdJJ4!@Q{_ZJGiy;>IowXUo=$;<Iq}VN-73zr7LcxXhw8Ff
z4Gatr>A|1!XJ!~Yjy^d`THpG&R|x&PI9A1^4U}j03DVB19`NM!cG2LIxVFd?`AS!8
zxTuHW!?@LxiaToC>$|5-61in97f#Dix_nckx<l)pR_~!E(onzAnu+4=Pw+@g;Ua3=
zi}(Bfp@|V&zcjVmU$;V6>J|PX4^|;<JBb%{`!5xwtR3{?<@Qffs>VXiL{=27T-5DC
z{vfTk{4nXQSs>R~#-!@GXKG$oeEo&)Xn7>#-7NVAYaNgZT;K@V6)I0k(tJC~nE!i3
z#=MqWO*>^vAVK}T><&fYa-b+*N%9U7^C)GL62bYwKzI;oBrM@<cbKAMPwK%v3!eO+
zS5Jc83(1K6Q^E$X@W_QnLN@eByrkP)>e=Crv|Fju2=I+2{;Y&yrTT{aU-~aoB0Tz)
zA05@e4+jpuows(C7>DjrtcyjVAa4*f4*hm5+5x=B9M+Y*Z%WEVlJrZRphK;zLvGcN
zgD2C<>L1UhJ(mMBZe#jFDYDq9tMrlM7P-qAAlpa&1@B!kXu}S%`M&whyX6O07RA{!
z7#wf|7BGf6dUkI8*3IbciQzl;XxNa|-LK4eN-jMC#E;_WfOqaSz#c9<n(wR;T~I5(
zc1*oqOv$h*Zjt5H2~BJ2jXUt2r@E*&uh2rzo!H0b5>)o=85{$ZBf_T<>6`wlhf){M
zKr@8K#a$+D2}Xp@PAt#&BQn3~rffeUD;@re0YtD23NY;{z2YAA<QjEfT$og6uFu07
zayLc4W3>?5Z=q3AXx=HOB>z?sB+pI`X?Xz`C>?X^;NtI%kmd*~S4y7L3S+7hDfs?9
zFdkLKg1UO*vW$=jJ_(WtwmNc;gU?0y=lDahUDq!fnqQ`^y10;HT)eNad7`sf6b!-l
z1^6}3Log&UEJ_uy)5a29(DaM+XFH!{9aBqS8xjAfpV8i7xZ1C{U0v1e3opY<{^yrI
z7*{w~q#Oc7tP_drT^9jGK51x_p>Rd=g4<3Bn>VeY*<pH}ge5ptzpj{fv!X2&C%p>u
z_#6cKKhskWuL;MNS5^zc4J8CM(_Ksua{(kRTOu=Np9BMu6>V`(khyM&HgQz=LWe$S
zOL3PRRG=GJbHY|(amFOc%_O1B%frE2A%yHAxR7`HJ4|;o{M|8&&~t@UYjMD6AOED7
z9x3oJ8C$;SA^tu$iDBy#iM9_WCUj~)xXc9Kn^CuL-jp1Km|D}+pm(i_Ep~<t-2toS
zw!XVsqsT_7H+3?U-q@n7#?exZ^}8qp)9@K+uZwkflSxU#%73mA@HxCerFglZd!yOu
zFqj;or!eCl7>vwkjsylam3-51_9z*&a0e4Fe}{vT<oRK%1@N+_s6$ROs@_vp;M~LX
zUd=!713A-=mmQhFKjD$!W@p%e5<t#1X`bFMeF`QJ^HTsTk#T}bLmV9=lp>V0%Do73
z$PZ`*35}^#%G^Ft?B`?}P2h`J`-@wJSr3no_wqW&=bHNs>XYgz)ILP;%>!%M``9X)
z{`2>|P7ZYH-IGTty|R3D%N>ekbVm2lql0Cn-6mPs-XK;Z+VI#tB(Z5sNFem-?wf4l
zOLInGI!9uw<d#tS)UVVyPb0GRRcIW@6SSPfyb6{JXjeUfY#OZqZWhmH|Ng9M`Fk`n
zop`Nd{|AWS`RLlHISqV;&$)D^h6l8Ftsbn3+;%ZxKW~gD1}UdtH|v9bb6-nHUwV>s
zb(V8ny-C8xfGEt9$nX}*>i`IxMRNsVOccN6!RYdEs3Vwi``r1zxYDwtf6+lX%&w(Z
z?TbTaPCo<jhDvrZ<&syw$WHom427QkB%BcaVlq~(78vASU)so}(Lv0s%NtjP`j?>1
zvdtO?t5R*+BSpXY<uioZ!Q@QuBT12sl`isiIu2(<b-V71Gi(rB#%~}^=*zV~-#*t@
z_SlJK9A56#N0q(aNU!djF*Q@j;~(|TX_Ix<mCuNFHC``ukegeSaRu#SJ@mX|?<fqq
zv15!P%CaDMqS5-((6wc0@ru=zj;<wxif+W;KN~pcz6`-L1QkXKRkq5=y|VnYri2#R
zb^pS*yUn4#M*G6Hm+S?YfR5?MW<F)68lj51j=2+9SVj|Q30aSBSm*K7B4W5M&&_Az
zt!roS+Y9}e=i||}q}6Elz|;=m)9(aVIG-iU3(J{S@90|7HW|}3>RLc&T5kmwK9GCF
z7)KEP#-WQY(5fBZR`z-&%ql4*KfJ=|m(49JWX$t&iM%=L3g`l&4dnM1JtdcZx{pvr
z_5Eg)FX_dy8bNHFzx`?pQIA{?Z^%0_)QRJt?j;h+pFR%%jw&zT@0`S}7V5Xa8xfY{
zw1cgiy?faPL;U1zx`WM?s68;~JjAOJ-V%%QIiz)Fr|;>QS(btA-k;q+0msS<BweYg
zFI-jX%*3<0`HBWWIgqAM>E9JWB(mpfm^&vquwxcoK${cGU6ot3nxC3pK%#*9Lm5st
zLL$>wo1TCCsGTPoj--O?Pe5Q1Fpw*)B6%X1G+sK_6CRCd$kQ2S|EB*y$@X@Wis3xS
zWi4O+mjcxP!@(1_l6~x<8UCkr;o&)sw(<30uDG;6m)keszVT6<<}ce*V!;vY>2CWF
zHN9Ed)eD?$n39gR+wEB#$7;-B_x(C9O3zUmj`L0k-PCC+Bgo^eB8ML*r;;5Sym2_-
zgtOCzOTh~RsR8OpGaV<6jYdc$H+v)3X)@@HsirUC&oMKWwoWthy3~Y=8FLP?X+OM^
z@|!IEy5k9~X#CW=A{a}8yD%?HT(X9wQM&Kb#n;Tj6Ch*uh1D(bI$H6Zlmcf!XlE}M
zZ6{z7)&wRpHT#`hEM`pp#rR1p=WeTr<gEDiFA5q5{YM+y(;%CCu`{=NITyiL?i{Ka
z)tN@#n9MUo;uD4oS4<#f>qy%LJ3MX=ZP`|Q9*+%B6%O|FS}O9pi;BLou%*kXi)T*k
zWNLe`X_&PV$L`x?E!3J}Exanl2^e3iy1|U=Cy`~zFvE<?=$7!54~Z5yf%U2y*t{)3
zq*Nf+PF5gSCz93kb|nouXu%l63#rkw?^R%z`34<cKNk#=l*78YXofHOLY2AcLbClL
zG8YWQ2<TBGwWE+nJ`l2S#HMEgsLm>*kxao}3Q(iWZnOj1^r2z@I(}SE^9<RJzQbqU
z)IZJFO?Z=Zt1I(OeQz;*Rh^2h_e1-|*E(U+SbEGXwyabVTVQRg?eI^L**>q&*I9~r
zgDxwHbl_Oxb6ImVT+UDo*?#oEMB^*`ah(|e3G2ahf7G-j>U%nBlL&qzf!<l{f<DrC
zFIpb-KG}HGqduZ)BK8(2FdTDN9SE)sphCm{KBvc{8#I_&cby`ZL&}dnfiM6s(h+d?
z_YpgSpc`6`kp8Yqc2~vFnsU(`D6&@^BFL0<7$EO`);m&Z;BaL%oB8GZIpU8!dCC^B
z7(zTYIRB7G1jcTQ3mh~7ANze<+tWZS{@XCkfn3ls)h*T(8**ytjm8)!T36>wy@>qW
zMxlC}B=-BaQ#>q!Y#|oWWIkoHvD8(iJDh)X`rXC9n%{zUUa1|?f%IF-U$K5!TO+Km
zeKFm*rLw*vK#+9)VZ1jd=c|<4LZoB}@NdjEXdLlL|5$udp|Rs<D4JQz57M8S9(FVM
zM4_65R2h<Pi>(=?37I)0@Srgv^%inuDbR>{i8HjuE}46a!S?{91X8)9oSk$X>vizm
z9pCj;<h4+6=X~GoO=Jd<%xmfjoqH{buo;W>LuPrVM>Bf0r8j(gfVNUmpsW-FwqR@v
zneh@qh~;KGzpoT|@oM_+nd`ar1)X3jw>IrGl{EZTwAER%uL2*M-ew={d}avwym_b6
ze?hxsy_FkW$zYz0lT|lV^-4824@7DdRBj&?94&pJ_rtwfP*BNpTxj-7>4~RD$0v(N
zncdyy`4u}kR7Oar*^B7u4T<^{08=R3GV=CeG)iwI&MO|tkcN_J$Ciw`O%=psxo~yq
z%)r+>dO8mwSxt0|Z}Br#vz{t1r(h5L;ppS-7Cm|W0xIY1h7jxE7X@!rs#JYfurATy
ziMU^v)TD_S^G704L)C|x>j951!466tlQ634h7Asq{FW0(bhN?7gW(qfs>2`Xby0~y
zm*jekB4mLa3@wjcRKM^MS(E;p%m#Zw1(e^{l#mjw{P`Lp)=v=e*eqvx(^J|l)DoGj
z(wG(<uWRS?lb;eWw(#G4NleDb;?Y&AG;#eJ6of%{UPi%F0&dJV`GwQh(hDA9%RLu&
zCU?CVikX)*$Nk76vqw9D<z(Z>cVahdi5qP@_%;+gcV;M5an0At4Q|`bYhLt@0F@Ux
zEYY9`hpx+X@3qt?=d{bh1pbZj=H!;;w6eQILl#;&13>cRnsDdr0a4{Zh32J}?!-m@
zhVN8LkafnWHAP=(C!2@q^ZFBnG&;B@aZvHpm;{eIrP_s51zj7sHH)qPsqP6WnSQqQ
zSA85)43bi3-ed(coEWs1kHXk{#N_tf%bEax`bSFIH)&#_&#jl81DcJ-ENW|4$X<t@
z9~+6?-`jjLb2j;)T#JX@6WABqVl$A!me<)c5S_bF)oAI)IcQ(_6cc%03YVHweisj=
zwD4Td4t=#=(4j*DEHm5omtz+62kiAzl`ZCIPL*Ao({*&k52yk;6}WO~a3ZpWvmMo5
zlZoJ~j^RDvvEZtSMS(8laO1hJ=$G@du51igdM#K+sm=47A#6z`a14*Z@#ccx@2Q-6
zS4aAbOVmN#UB}T^fh($(0`}?e_B0gxMjDf&Zb?5O-W>e^CYULG>7LCF|GFJ$C2sZf
zhe;~K$u3OGc3d7<+}e^n6@C~!sn>8y4l9-)wd7}8;WS-#IA8yTo93>orUo()GTu*=
zcQXFvTD-nt&db;QNa)}><LY-kN3-ux;Z5=##L(#m7tDcwK{m2o;z->>IKn=m47I8E
zH4;6fJ~Z2aJhMvwR=`9@ozdRxWKhA|6ek6$Ct~B~h(dsYd=V>~O5(1{zY|yL=1ZRn
z`Yx0_wu1R04!8<rTNRby*hAY<MGu(b*Jfz)H&niFAB&EE8vaWLc|*LWS}SpzzJi#M
zbiZj98?N>rHxaqpAuR{p;=3ZtPMp6F9_w!;=GjI8O$YJ@5EGFB=2^BqnA|#Tsw`*6
zP)I)ZeVGEJ0d1%qiF=!czwCJCR5Qu;v6fV9u^t$F9J>ypVc2&iVqtIsXK|o=JQ%)~
zbEPo9HKLd>B~fSWx8T@g>x-P)4A2&p45GOmL{ELzx}&wP@4i4Mi4@?EsTe7jI`}q3
zSQ=jnC|5b+540=n=@Dq?$#LZlU}k(8S^PTH9Y6rjHlduD1l!(A8H&oMSDppEe4L@=
zDN?uEJ&k{8H{sHSHQ|B8#3DkgQW&4n>OyM%OVQl#4xv<$IWH-lXkCQ6#Dipb5Ba+)
zyJybGlgZkOLppV9HEfTEF=wcwAa3J`d)Z%fV0c?N@cHf_s4r8#VEZLTG5s?AtsjkV
zktVQ8=Pn>@HQy~cIGkb{`p|V#e%mwqv0T&@du5EUv?6B6_%?(>wP)Mlr0%(V(!e3K
zj=BRGF-m<CX|L?F%q_B=Fw2;|us77U{ZMDxYS2TZ+6g6V<#_hqJ(IjwXr1d7qU8`D
z@R?TdO0Rpgn|I^-Mdmc@_{i7+(%kcnqQCTpK|?DC_`In8M&X7){f-u>{gi6QXn!7(
zkpnzM?LDPF#T*&v(~RCS$Zd5u`n=B?zdJ=-8Z_U&$`qv6zZI*EcK2&f=N=fqZ*{ZM
z-Z4xlzZI*L17OlO3OZl*?MA?gaJ(B3)jv1TmN+#q#)778?7L#9{<!Ow=<YwCK@R+3
z0Qkdyyy{@LDD%JD8~}_V{=;5FVgtp`lHZ*8xOcv6cn0HuI|HJzpi{0gsb%Co`GNC~
z#+hU94y$kI99LPN6*zQ``$Hr<a8^qb$ODs)@*tOCq|&dBoY^<{lYpfc%^!!G&rlDp
zvHd%ACtft6w=PL!P2Sz!q%(bLF&*PP%sqskhs4XCEKtvJ^egq?FJ9$yVru4znns@s
zV=iMeas=A-lddJ8fC3TgC!}&$Q>5}RH_2=fXGyJ2#rPXur-Qg>yu|{7*_*g42?Ax7
zQIaO44H7n52gz)K3m|S+i>K&t##wTta|!7LCgvzkpOQE9&P%_Y``!NvUwN5zl!SgM
zw%wj+`+Rnl?mQ0m(Zv;M0qnbSm!<5HH42`<%2DCg^pFQX*JjOn%1f2r@eMgkLlhq+
zWhlvmo8f6n?>s(;9kk?2xcG_M>{+hK9q!_kqof%01I}VV9c-!%w5xb!lxNTSSS7ni
z2VW*-eB~|<%$~K}>i!XXm=R?T|0~Uq&<;ox-@N6Jo7zIq&gs_Lx_+5B8BOU-paD{<
z_ALPxzeQ9cuZSCN^d&=ohYPD*3iQBL|7YZ!edJx5s6K8s<EK*bstAQ>&9`#Yh8q>K
zP#4V%*%4s49QDXD2lqPU>uTkEIqH}In{kS}b^nb*Gy>WuK04np331u?;jj}T941H8
z{+pPnxUZ$LQM^&{e%)Wi2{<nCXX8<KK8!L%I1qa3UKx1CjYg89xrZqi@TZC-N+Qx7
zMcds~4^kuLjw}Vsum<_y$4G*xx8o@nv0Lfhdms<lXUas!`ep2?TA7<1=Ez+Z-u_P#
z`E4Jx-pqYJ_x!G@^_Add+3mi5!&EP2?eQF)=|=(;_ETHhx9GrTj9yiRGdnTRApD!u
zU5QNsvrDwjUnoyiIbnxX#>Bwxh(W2I?A@rM?H2WxqHW{?o^KDWhgbcBMuN2HKe;D_
z4}esEgsb@+Dpfj6niK|Ae1ozuAXL$@QSpg=nyh@E0HPb(i?X<V3?muZT~FL&V<GLT
z{ZIYP)w7!a)w8Qf@1GbfxLTe!A&=JzrYmi`!Q9ZL3VJdRx$3vVb|@tsiszhf4G3Q}
zJSx);wrI==R;!J@*n&%)XuII)pS77}^Z;6O&!vcKISars49D>Ov{|s6hmt_&JD##T
zbj7Xj;bC^W(&j)P-a^Sg<u(YQpXzzP^@ITb$eW@YG0FKcN2MmEeEWj0biLz|u2`+A
zUi+YID@&7K{VpZd>AO7nisJ66=vX)ROg*xft8q}>YX@32nmfgfXwom*_(0T77T}$d
z8l!RSF7O%xrme|iY(2i2v)DB9*-iXUoV~>zzE9Iv>5a)&{e5xt5r8ci+Vl<G6j>pl
z$SeSJH(O^lzaJla4(`hcyA>UdT}!@q;^Ev8uiI`D%H}VaP(`LpCZ@uD3!L;yrou7(
zrssAX1&^}tRZoe;XYjW%aIz$#Za`hlo$pg@7Z{=I2gAymetz84qqBZ~i|A>3lPK^Q
zaxyjTfhBdk*>7GB&6bMRwalnKrBZ!IiBY$vz;?mFN_Tg}g;}BJkU}UZpNGxB3VP;R
z4yrCOOAi?;O4TwY9z_7E-18Y8t!e!5hT7cO7ImN(+PRnhX6O7pKt49&2ZAkN!;Jcx
z7>7{DG!%c%%Uy?aF=q>XW|^nQg@_ZHZ+Xb@-t~4iY%r(G`K0cyPmsYpNl<fmaW@~9
zVfs*u9R6miW4)_(uog)5bjkhX6n@^*r?hxI<qu~_Z(l_M_59D?n%h0G`!?aXw8>e}
z9qih7k7s^l1D((iyh_K(P#_52Q-x2#XX8+=?zrKLv|IA(cw1&mcZXrh?G1icXzTGT
zU5+7GA1VvIX~lZWw8lK5WYeYd`GRmOqE|WZm@_c{*iV*us%C~Z+-o6feDf7&^$by7
zSD13XKXN!IqqWFJ*+D+KEWjoSBg-8%dZ__x#)EGyaL{H_?C7_LG(flI;YGhuWh#k1
zATd^Q6AEU#FgMfbLZ_{a79h|3%3)8P`SsCObge2g*rI{|48LX~15anw+?T4^A_0L2
z+3RAwvQ0u#u0Ny>K#W+$mceMEZ6+71=FXwER#Ph|QyW4TvpZ8tC}3X|Rl>_e6SK1w
z#b~Nypr$E@<fs*11Y(@-k$!kZZEATDed7v^p!uOwF;Y?MW#FBqQEi3RWi?1xP{{3u
z@h$l?G?f~UTiv+9fpNOP<tSsrtd1Gd?dZ?S{vNEmF9sv^r_fZ0Br#d@QJhY*D7(W)
z70LU<N13P+liu;1PMa+K@l$MMF}zpST#u&{^N~<bm3QP{)&N)D5y<qNhtF?x(RMQ(
z>S+d90@q%ALwm_vK|{15oNis4s0OtfJruIQ^SxK7AJiOCm%f5t4yHHM$=Rk<55seu
zy0q@A1SJvjBq6gO&8Xm-t(!7bZh6~qoBR;D*Ec3SPYe$#l*Vk6myf^A-dJ8(wn$*%
zhe99UO!wbcseyxsAc*K*y>EybEq!X|4yDPdm!H>juEblDb^g({#GXGiZp;A=>zDzi
zkGdFK4xQhaFJ~P-@vQeFbqA5UJH!u7In~y0{IPumtC7E7QYYX({-ROQe4V`_aPz3r
zOG5!SywbS`pZghh;Hjl|Y|2N+PO)veFihoM>J#cPt^-|J9v5>c_Xi`k!kd|Ji^1b8
zaKW+WJZ=);Z#|XOt>u;w^{@WR2Occ~YmSxZ<|V;`(o-ShrR&^N(vGgpw-Fe%WNS}J
zatJ~Wv`0!iPb8Ja7#2a}4!OS@M6p#BN4?9Lau&Jq)ZT-(S8Zt_wSU{W<*@{0{P41{
z;Mu8A)&+tZ5irh-`#PpZ+*V~g!JEJ2ni3@*zna<Fh6;6;=5MFpwP(U^LF%rzh0mjs
zCb`G$K|s!Q^}8t~?H<NGg=6HJ^?l}qvT`RblS{WzW*{7geeCkTG1z`pWtBO0{sWzG
z4kPYI)FM$8)wYVp?3WjuOq(8kUW_qp{Dm&kYyl`hY2&ZUSKQ|BU}X2n_mz3k)kPG;
z`D0g{R7AO=oE0`i14mlNT}FbWWgQ|6J@|Qri+yNBZfw#sP`6Q0GB`0@kNSF0(6LhV
zpD_5*>_}IpR(RQ@r1wz->hn~jNPZ|3+3nJ#0{JAAD$@#AYCN5A@|O9LsppP<5!?3R
z>}TL&zSS)JVT%GTh+8;dORhI?ZTEM_1<qi*#;t(sRJa}w)xkqxakza|rt=?GG&X~R
zQ+NN^T2$Mq$zRE7Y&;Ud8VP?9f}d9ddMnY^!Lwmv9nMOR_0xjj=iO^===fzT$u54@
zI6=G-%@M(_T#oz}D2Nrj{OM4A&hNBpPBcJ>A#?qx=W+b_U}SB%zi#hulCb_wu~SuO
zgFNF3zN^#MR$n$Ai#15_Dntk?G$Mo~5A;TZb8|w)@3EfwNp;8y+EKqxdD?}uyhUQh
zRK%_;ivcLD2+OAAc0!Ed&-4a@&tx7^{ojy-d$EG3q;b%L@3rCo?8w_YIbaq3QvVCU
zaIE-}T$}yN6CpmhOsA6a+<q2%jOXu2$39uA+lu?bj~goM-B}OL!hfsysbEa8hX(g{
z)6LBq5HV!_B2n(h(7|T?HEXxT-6<1>L%J}SVx5MZU~_WPGyJZQ!d&<;|M`;ZrA=xQ
zYH?$6gBAC9lkh%4(dmm7UFS+0+Z`!z+X^ogzjywtI)BQpg~;`k$-(@K%QkKi5(Ouz
z((IMwFAAPar_C{4U$WnC7*eVEShc~znME)Cec9t<lOrcG1#k?jAoCgQ85QCDBS}Z)
zgC2s~qsjOJGUSF4wVW|wXb(1}fmOw0I|iR}smYhQGKmJTiO#Ui0y(q?HFq;W!uk{H
z{_D)iyyU|V*4EO3ok@~Y{*n8D^>z#@rKYy^>D%?6uY?fO%~F$kQ9*w?e}1F3qF2FW
zGfrInOM}6k8kKUEB}7AR$qtoKZkhN@<Z-s>L7$1pstXga%zgD4p2QZF#uE(Pj=NnW
z&|`@m5W$ZSylG;MG~Ei7p45N|&`cdL>B&EJ2zAY7e#P!ZZg76~+`(H}G3DPq#~;PS
z7Js^J4l$>x|4cshYwoqD+G78GyE$g!orKL^T6)Ga_>to9h_EbES+%3JhM*?3d!V^b
zp!K9#POG-?r+!*5l<QvNEr-Nc_m0*DlP?)1g9cjmJ>M`szW#2xm7a?e029<62~nAU
zuM&5@eLAHK(Fv_px1-vsqi4HtYiUwq9JRxcnFO&eW>>*!1Pj;BhCxb!Q(7kprMjLV
zl!=K5UOpygC)VNK`Bci!A;lC|LB4An*xQ<<clh8Gw0x)?i@i3`$p-dT1I{CIV53fm
z@IRx(edu{2Gs+kqdE^N%Ks`*^MQE(w!KO0~C(ku8tH%^B<o^U35#{be7c;H1fPyJN
zK)slqGoMU(JlDw1AuFjSM(A;rszq(>aC_t*Z^viZ{{W4Irm;p;AufE>x)M6}?}1O;
z^Y6|gVf<4lG=`)vNk3MyazBE6G#iQS0i1<++zmP?>}H2=E*wpTi;-H$#sz<HR%nSw
zIpd=`JHHL1H0L}3IO0R0hscWHDls~-**TATVHL7G$V8&I$<)v{_U=1>9p?7y`aN0O
z%rqAhLnuK=E&(G1aIZn#Z{pF5^&yE2R$Iz6{souah-y>NEGQx1QA(}+BDeZOZX-y=
z|2b-j5AJX$g)eujyO+;MI8=YKi4Sf(T*?XVxWerpt{(0mo}Tb0k`Rf$QdIOui70Ro
zD*E4)H>BdOA)j<~l{zx!2J&rX^6$GJaZ_b+$W3!QkcS%h>Q9kIQhru_0%`T;$x_Dc
zy-$i^oAy2yPL<-FC9P@vhL8fh_rmvO@i%kZ{{IkK9=Wv`ok#xRX)S+Jq$oIL8~J@%
zx0AJS=dVvvEepsJ>3G*Va$|4AnW;OPP5a|Od>OY2%Uh@SBp|9?M|!{a8Y!C8eV^>{
z0|~FlxR2BKQPbyT63SnF{&U{@zwE&d;qztjYj>~tbCd*`@>TayIOMI~#4JC?l9hS$
zGg5B*IDvRJaNa~&H2Z(MID+Em`n9D<Xirwno-LF;HuZU8KRfnN*>dx&hEg0~yFa1l
z=eANbZ#;*{uk(4-#+z?fmvV6H!7f(D+8$Uf#UrgY&?wY-l!_I7aWYwbFJ4c5+f$Q_
z`3-$4;M*f$TXIkm&m$AGJNeLGoOBX7@uT{ZSJjGKp_G}EiAjG)-5r)jaB-Rx)tW6j
zY7ANMdQTdhWa@nW#Z9TFC%s1g+fTKqr)OS8Xz4nL4EQ0>e@>Ec&JObGPJDYhRVUwR
zM{U<W1F@Efor2gIh@E&4Rh4|l+JgIb<&S^S*yQ%l|A*T*R>t-rY}F(RydV_%Ns2~I
za@-i(C0{gkI9q?eJ=hjkVJkL%Pv(7a>(Ghc5J1{OjEp3Y^E15o3BgC~k!9yREkz$~
z-79xOG$Hpbp#I4G&(2;;mVI{43N;QYXbnfQA%afqzafakdLyAWf{XEZ9La{v7vsa%
z5>!3W>g#BK5Q5Qo?1k8+2*?5tUrD)Yvs_?cT7XeUvQK|S{$7m#cf;0!mtfimI^rG<
zuiHBCO@$>InI|oge^1J}No5gQaBKbnN+55{5{38t2k=^>+IDjCJ|b$aF?J#mvb>yP
z-?bqYYCM8uPQeo+r0i(yXB~4z)16YxZFx4an)o$H!7tkpyNZH6S%|$r!Ow$^bZDeJ
zZ{{`|F7<yN>Q)aDEjLsrMtkz%b^%#DuQ*+bhg&yeW%FZNS1ISp!BphxsavHSntBoG
zr1SnoBP-fc4UN7%>4-)yIW=yX+thG>bL++)AYZ9(O3|YU?3-Uj%n2FsIfCD^b4GjN
zPKe5XqOmR7sSGT-8~YAIp%2KDMPHi%ic|oVf*^kqV^fA5Pq@>8{62Q!8L8p+Ze2V7
zoYeTv@d}(;?h?29rEcAzqd+Qr${k4t-pKHAM;){}qpl@t*x7>2BZ#S_v+p4m?9iK}
z)&uKkEPlB95wc@nbbm_>&Mps9<3EBkDMN3aD2s}=Un+}tbtj6w`LqR0Ek8GSk(j#E
zn^J#v`tlN4^zz$130^6d^xh$38Z7!w8V!~=kn(T+PXMvYKwXlF!=Cv}itXR8mNE0L
zX-M+$?bP@xZ`X3GxGnMryQhWeKe(&l{GUkTeyk_Y`-2G`XmgXN91y<K#Cd*5?vPw5
zcLCZyJfS?8r^s7}Oi~SPL)LRrv=5moBvXG7Q`XH9(Bon$CScBa9-c!$-ioa%&y@l7
z2PUEntD88g&45kn=tq=U2UtAV0yh<`Ou20&(ClPjI>Nk)0R^v8-c?Pg{#KS4LSSV(
zD%2o%Xo8iIE)00vkU8s(rBa-p?Wm9nAqb+P&fKdDIqXRFk)k(W#srHK2>zlXloNk_
zScfX5ldVC9*=?Q=f#qQC$q5u*+dm~|*t=4`o9%o9DQ#l9jS^QgtXMKwkH^olona*C
zR))+`n9xS0IgIrgfai4JWeK`~B?|dAnvcY;XhOAo1!UgDT^q}A58Y~E=9|*{po(rG
z{+hb~K=KTTx`;~r%hn4E-=l?dEkS?6vrEWSp_GeI^SQvn-?E)AA>_>0A^xcP#;BfG
zDo#c9zkqz5_o&&Bxyk;7s_lnrcOXL#R7H4N?S<Ld)(gB;LY=g^tIwj1uR>;bAjVN4
z*(^ZwE0iIfvb>B2>*6&p*t86peFMpZm*(I5UBQHRjJ2eW?so^r${3qem79NZ9%-Z;
zDjstYIaVFrD(C^RSO?U|^SbguR*KWNhOX#zR;ROw#w-!8Vuw$mms8lE0z1#fvPO64
zp~ZL?i4B5vvkfxkR+hP`Y@elNXHS;ml<b@*0_=)qk!4p8*;|6sPlH%^E}qrh#UwNU
z%Nq!`X6Ll?LY^O91~Zb?`kQ||%eN6y<*n?TYouI=w_k=rSBxbCJQNy-8MmCf15>Xd
zadR`)J;dPb>{+ZVpL6THu4YNaIS4KRBv&G!#LvM8xCJs4dWjXZ3TN)Mc_Q3)8(t&D
z{gxoy{r^Jq?pr2Pbom`*Rjhh|DtGe8yGglA%1_>FNGc(=-JMdb>HL2*1g`PyglDC^
zV!$GJBooNkEdE<d3htw_#gj?G7T>dhf+_KbKSHFY>k$f1oI{QF+P#f9^9FLkI=?xG
z)KsgF$b1>v^&Tnjbdp)3SFOKDimPtuLKVeacmW0X6HCPOJ&}Tki6vsr`GEp^)gK?<
z|ERLNa$S)uuGeynEdGD0b*z;4Z|K0v?)weP3DTAXOt+SOWYNkE2UyvCaQ8GBGvWBH
z(x~#_^-|ont0|+VSxp+0x#P)mTJ*CmV^SaZGCujhleP1ArqoZ0ed;t>t;+M&lH8_A
z+n#xR^5m&Ao_IXBTD7%RUwPuGX^(%FmG$I1Z&a&ZKPf?0tCfE$+6P6`7-5JD#M4H=
zu#B%`I>g=|J2P%f+`{<V<6lh(CcK^4A@PyKyugWpD+3FwbgObzQjMggN%_@pN={F{
zBl*J`f3F!^^X!`E)oNPnir_zkztnD3`?}hrQr@m}>G8c~%u|*~B-aU8-R}@K0*;ta
ze`LZ0^(b9auwQ?fCX22|PWCZHRa0b6t-l~)Do3Yq`LwE;<L&X8<aHKVA~RBaf}LsW
zVru2qq5^UU+G>u<zeP$z#J-?FoMDQ<gsJgWTjEj~dO062o1(6dP-Lcqy|<`H)G)=Y
zsT_Cf*!xc*Iz=UOk#sWh=OKShR*fb$Hmv3l-Y^lAqac6b=RnoWG1T8LEkWU@NcqO}
zVEV)qOQqa|s?tr-$c-UAh{Oh#0@x+BJ_=QevB=Jo9ix!e6)~(fE4UfK)M<M(;fP3?
zU>P5%8u=)=I@hYc?WFEBIrNjXwmNUgcblto_PEuYPmESQ{I85x`gOLdl^xYQOG5Xb
zJl$k?^}T;zU!d_S=*XV4h2DzH-+7M%=$uc*@Qx3_s#|q&wDcfnS0gdL-Ti%>w&f$Y
z+tRUZhzs)p0X~uY1>bAW-@D=uSMn#Ic(?Q};pkSlG;i1eU~)Uk@gS%{IeOnotEx^q
zM4dv>w_~p-e)4aZ#Ld}Bd||TshIn6nPtRiBK~#TV?+pJn%TZt89IG)@m|@`_oSXE%
zcYX9~0bf!wz(1_P`?U1cD7a>)XNHx#*!w6EF7a5LXseS-YP%DTaOlSQ^nViH-t3)W
z(Fdiz(Z`4M#SuE@s52o|^|7pa-t{W_HfVK<WWCs|&x!Q(PWJF++*S3_luiC7^+VqU
zZ<T*KQ{f!`4tOhi2fP)%1K#v@z+;#z+yP%zADg-*%SzOTzVv}ad}S6F<}nBVmM(Jj
zwKKTBWw_oLM-)pnM4bpjv+8i2qC|E7&Om+LjrZk>_Wpg1sT#314^&{M-u=#lwk*S}
zUsa#f)Mqx!GFydbHckJ`rgLa#Ht|-U*))F-`OK#JfMAy6oieS;XU6pK=p%{hbcv~J
zFXu>N$>WHoe;m>AiJ`*7fm-BN^^XQR6&?*V{iA_6k@#6Hdbx201>14u#M*U08a~Cg
za)SVEe|r-_G`k-(7(OjA_6f=~WdFYvB7EbwG(@wl2t@e$nu6#v%Y*0_^Ur~(jt_s)
zvk{2?a+F!MBxy3SMUE5y6(K$tz(;mVgyY{5Axhp7aWoa?5#MYH>*Y{R)cgl_Ir9LI
zh5q`E4`Wtz9cG}!W@pp#HalPK{P%5k7XK4BW&WAwi-?#n&L1~lq7U#{zWHL6HeZ|y
z%@?z@`C^taUo78zu}YaQS~`?6U#x$~S@|;Ni}1}C3s}y4&8grR1jtQ^hnY@Vc^_D^
z{^${+GjM0kjPsHFn2<)pJ@k0}eK0kKIAuShRN}VV(w|W(b(A6cwp+`;?ba#hwp&pt
z4_k-B!&y!g51U7sha(3T201<tTg=0d?niiJ;TNYIE_N#9VyJ@p9jrfaK(2pk`M#R>
zl??WS;JFUh*v7fJc>Ps^HTp^rrD64Ffg0$W0%qvT1&H-#sLQ7o^LxIv46YCg<%TrR
zeCM6LS5@)NYF}n~oU1&sB>oP?K>oxX?q3M^Nz?Z{tm01`v0>K0yTU>NwnaIDT2Qfi
zLkxIoJ(u2Yzm3wHPKLI>9jJf*XI-;`)Av=q+r7FwNB^7fRyntOnUUMQtjO(NW;wTe
zS%-S7Mme{8dBKnBbHJvaBG9*cReH<Dk$)53@^AN22*%8cHwPp9IT+CI6+IyI8-|?d
z>#|Dwo=%kTHY@TyP4Bt|ExaotgFwY}K!)eyT$g7w`f8TYBn_F(dv1SNobVkXENtLJ
zsOvN8`QIc{ckTFh_G(+0AckH1i1*Dx{jt>*DsVKnl9m`goQF81KQ{#N79V{zh4(=+
z&5@0852v1cX@CzV!gS`ZeuDMW?6K;DA4R>gEcYhpQN9HPE~UC2WQ%_%&MLm~lwI)K
zxXq^eyOPxKdf1Rq`MQ60b(c$;_w_FC3ym-b;*|lR8CH*U{i^e+o1st^No5=okn?$!
z<2gQ`vSjPP;k+YixVJ+J0q>1klAU8WqKvO@4Xq^XWasSj!d+P1xPezUZlX+IPJMUQ
z;=n@QE>392R5|Y!AC5WuI9{66TdzcOOus)C3W3Z%(Ay-aR!o1-WA7g}WZT{efEAdQ
z=lyxxQSSicjKqFwlCzVl9)>oO$b!WNMC_?oJLWqgh{VoDRVR5{3Q?{n>fPdlv;Zdy
z{3t0@Bu{2+@iql)j(?QTR6H{Dk)b4;kn?+B35Seifgk*g1WZ@U-PqdW^)XQO{{TTu
z3CDPxV_;-pVBmiNVlf6e1||kZAPfd#7N7_d5HmtB01k5iq5uGRoL$T@O9Md=1>kqL
zn@e&WViY5GmT7|c1F|XvF^y~)J2@3B?9@_3Q`%@L*jOqSfe4;x>u<0X?1P<fvilrl
zL6OJDn;nLYH-U-)^fI9CfcQx)h+8o)`@PU-p-+BWUH*T0U;Voa9bMx{?aI6b6MezN
z+c2t$wqAnKecH;1xmt5xwOPc^^5+eY^%M{0PHAVlw2cOB_DWlOq)m62*BtZeCvEcL
zeEq?dnRn%6&y~{`&R0L2PsTz6={+zp2I@oUK9I?r?6XLlETT6KRKkH?7r>%;7oA{3
z%<6Litb{JCqKno~4$+acz5%*gQ2hV^000000RR910M(=3i~s-t0MKVKdH?_b0NKMj
Er`_(CLjV8(

diff --git a/fonts/generate_woff.sh b/fonts/generate_woff.sh
index 8e83f239fc4..89f69e9f530 100755
--- a/fonts/generate_woff.sh
+++ b/fonts/generate_woff.sh
@@ -4,7 +4,7 @@ font="VerovioText-1.0.sfd"
 
 # Generate bounding boxes for the VerovioText and move to ../data/text
 echo "Generating bounding-box file ..."
-./generate_text_font $font
+./generate_text_font.sh $font
 
 # Generate woff.xml
 fontforge generate_ff.py $font
diff --git a/fonts/vrv-ttf.js b/fonts/vrv-ttf.js
index 77d0bd6cf49..0b0c5feffba 100644
--- a/fonts/vrv-ttf.js
+++ b/fonts/vrv-ttf.js
@@ -1 +1 @@
-var vrvTTF = "AAEAAAANAIAAAwBQRkZUTX/OSq4AAG0AAAAAHEdERUYAKQB8AABs2AAAACZPUy8yStdmEgAAAVgAAABgY21hcLJUuPUAAAL4AAABcmdhc3D//wADAABs0AAAAAhnbHlmQrI3MAAABRwAAGJ4aGVhZCEJwDEAAADcAAAANmhoZWEfwxcqAAABFAAAACRobXR4wjbrDwAAAbgAAAFAbG9jYedt08wAAARsAAAArm1heHAAoAIOAAABOAAAACBuYW1lU3fPUwAAZ5QAAAHUcG9zdIgTC+gAAGloAAADZgABAAAAAQAAo8TfoF8PPPUACwgAAAAAANBnMXoAAAAA2cM6p/35/N0ZxxI2AAAACAACAAAAAAAAAAEAAAZm/mYBmhmC/fn+9xnHAAEAAAAAAAAAAAAAAAAAAABKAAEAAABWAgsACAAAAAAAAgAAAAEAAQAAAEAAAAAAAAAABAXrAZAABQAIBTMFmgAAAR8FMwWaAAAD1wBkAhAAAAUGAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAUGZFZADA4dDswAZm/mYBmgkLAqQAAAABAAAAAAAAAAAAAAAgAAECYAAAAAAAAAKqAAAFPgAABEAAAAOsAAACuwAAAi8AAAKqAAACIAAABGwAAAIgAAAEiwAAAiAAAASBAAACIAAABIEAAAOZAAAEgQAAAiAAAAScAAACIAAABIsAAAIgAAAEiwAAAiAAAAGhAH0DaAAAAmMAPgH7AD4CZAA+AxYALQQ/AD4EWP9QBbP/YgNI/f4DLf+4ArwAAAOp/38EEv90GYL/UBVE/1AREf9QDNf/UAi5/1AKZf9iCP3/Ygf3/1AGxf3+Cbf9+gz+/foQSf36E5H9/gfw/f4G7v3+BgQAAAq0AAAO7gAACbAAAA5YAAAM7gAABnP/uAoW/7gB4P+DAwb/gwRO/4MEAAAwBAAA4wQAAD0EAAA9BAAAWQQAABcEkAAXBAAAQABAAEAAQQBGAEQAKAAoACgAdAA9AD0AKAAAAAMAAAADAAAAHAABAAAAAABsAAMAAQAAABwABABQAAAAEAAQAAMAAAAA4ejiZOU95VLqYuzA//8AAAAA4dDiYOUg5VDqUOzA//8AAB4zHbwbARrvFfITlQABAAAAAAAAAAAAAAAAAAAAAAAAAQYAAAEAAAAAAAAAAQIAAAACAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQA5gEqAWgBaAGGAYYBygHKAlACUAL8AvwD0APQBNAE0AXiBeIHAgcCCFAIUAhoCGgIpAjACPYJHgmICfIKaAriCzILkgvUDDoO5hEeEuYUOhUOFewW4hfWGJwZuhtSHWIgKiEgIfAiziQWJeAnCiigKlIrICw0LE4sbiyQLMYs7C0eLVotoC2+LeYuLC56LswvKi9oL7Yv0i/4MCIwcDC4MRIxPAAAAAYAAACbBT4DTwANAB0AMABLAFsAawAANxQrASI1ETQ2OwEyFhUTFAYrASImNRE0NjsBMhYVBTIeAhUUDgMjIi4CNTQkBwYVFB4BFxYXFhcWMzI3Njc2NTQuASMiDgIBFAYrASImNRE0NjsBMhYVExQrASImNRE0NjsBMh4BFUUUHRQLCR0JC4MNCB4IDQ0IHgcOAeFOo4RVHkZtpmp4tWk0AQgTBRYiFhIcLj0eHSIeVBACSIFJHi81JgL4DggeBw4OBx4IDn8WHQgODggdBgoGqA0NApYGCgoG/WoGBwcGApYGCgoGMytJaTowUUgzHS5QYjl3oIweFSJLPxwZGCsSCAgWWAwdRIlbBhAl/g4GBwcGApYGCgoG/WoNBwYClgYKBQcEAAAAAgAAAAwEQgQNACsAOgAAATIWFREUDgEjIiY9AS4CIyEiDgEdARQGIiY1ETQ2MhYdARYzITI2PQE0NgEVFBYzITI9ATQmIyEiBgQkDREIDQkPEwMLIA/8swsZEhMaFRUaEx0RA1UYJRP8LU5EAqKMTED9VEhABAwUDvxDCQ8JFA1VBhEcER0PSw0UFA0DvQ4UFA5hPSIgXA4U/hpQJS9UXyEpKwACAAABCwOsAzsAEgAsAAABMh4CFRQOAyMiLgI1NCQHBhUUFhcWFxYXFjMyNzY3NjU0LgEjIg4CAeFOo4VVHUZsp2t4tWo0AQcOCCojDiAxOCMYHSdSEAVIgkgfMTQkAzoqSGk5MFFJMx0tUGM6dp6KEicyaCcUICcTCQkWWBQUQoleBhIkAAAAAgAAAOMCuwluABkAKgAANyImNTQ+BTMyFxEzERQOBwMGFRQXFjMyNz4BNTQnJiMi5mWBDiEwTF2BSWtBPQcQGSgzSFRvCdcQHEJUk3hfEBk7TeRoXBxBTkpFNB84BnH4/w4oNjk+ODMmFQGTfFgTHDVhTmEmFxQ0AAAAAAEAAADrAqoJbgARAAABETMRFA4CIyImNTQ+AjMyAmw9VoSlTGB+SHmrXGcC+AZ2+P9GkGlDZ1hKjmtBAAEAAADyBGwJxwAtAAABFhcSExUUBgcGIyInJjU0NzY1NCcCJxEUDgIjIiY1ND4CMzIXETQ2OwEyFgK4L6bUCiYLEhYLAh4FLi5j4FaEpUxgfkh5q1xnPQkLDBEWCaHV5/7Y/tcQSLsYJQMSHxEKaYaFfgETLfqtRo9pQmlYSYxqQTYGtQ4GDgACAAAA8gSLCb8ARQBhAAABFBYVFh0BFAYHBiMiLgEnLgE1NDc2NTQnLgQnERQOAiMiJjU0PgIzMhcRMzIXHgQXHgQXFhUUDgEHBic2NTQnLgIrASIGFRQXHgMXFhcWMzI3PgEETQM6CQURFgQFBwMJEAMOPyFIQUo8JFaEpEtgfkh5q1xnPR4kBQkkNTFLGTMwORkWBwQWFQUDFwI2I1JyNxIJEQMONC1WF0QlBQoTBAYJBa4EDQJzdilHiAgiAgQBAhkSCwVcUqF/RGQ7JQ4C+7hGj2lCaVhJjGpBNgbCFztaQS5AGzc1STNBKBcuNndDCQXCDRpcUjRWQAwGBAM4XTJVGk05BwoJJwAAAwAAAPIEgQtPAEoAZgB+AAABFRQGBwYjIiYjJj0BNjU0Jy4EJxEUDgIjIiY1ND4CMzIXETYzMhYXHgQXHgMXFhUUBxYXFhUUDgMVBhUUFxYDNjU0Jy4CIyIGFR4EHwEWFxYzMjY3PgETNDY1NCcuAyMeBBceAxc+AQSACQQWEgMIAxkSQCFHQEk7I1aEpEtgfkh5q1xnPQoMCx0CCiU1MkkYOzw3GQkCKBsLBQkNDQoDAy5NAjMiUnc+BhQMIy4sPRYKLy4DDAcOAwIFBQUeKVhZUy0JIjIuRhcOJhgcCgQSBLo4P3wIIQMMJwxnR598QmE5Iw0D+7pGj2lCaVhJjGpBNgg4GhsOO1lBLj8bP0ZPRS4UJ25sNEEyFyFHOi4gAgUICwVoAT8PIllLNFM+FgMtSTksPBoKOUAKCQUHIAGsBx0ILTdFYDMVOFdALUEZDykaIA4PPwAEAAAA8gSBDOYAUABtAIQAmwAAARYXFRQOAQcGIyInJj0BNjU0Jy4EJxEUDgIjIiY1ND4CMzIXETYzMhYXHgUXHgMXFhUUBxYXFhUUBxYXFhUUDgIVBhUUJzY1NCcuBCMOARUeAx8BFhcWMzI2Nz4BEzQ2NTQnLgMjHgQXHgIXPgETNDY1NCcuAyMyFR4EFx4CFwRLLgcEBwIXEQkFGRJAIUdASTsjVoSkS2B+SHmrXGc9CgwLHQIIHyMyKzsVPTk4GQkCKh0LAigbCwUODxADHAIzFCw7PUsmBhQPNC9TFwozKgMMBw4DAgUFBR4pWFpSLQkiMi5GFw42IQ0EEgMFHilYWFMuAgohMStIFw03HwwFomx6OilZOwYeAg0kD2dHm39CYjgkDQL7uEaPaUJpWEmMakE2Cc8ZGQwyUDY1JDUXQkJSRS8SJmd9NEcSJ25rNEIyFShbPDQBBQcLzxIhVk4eNTUmGAIVAzdcMlEaCj89CAoECB4BrgcdBys3RWIzFjlXQSxAGg87JRAPPgGjBhsILTdEYDQWCDtYQyxCGA87IxEAAAAABQAAAPIEgQ5jAFUAcgCJAKMAvQAAARYXFRQOAQcGIyInJj0BNjU0Jy4EJxEUDgIjIiY1ND4CMzIXETYzMhYXHgQXHgMXFhUUBxYXFhUUBxYXFhUUBxYXFhUUDgIVBhUUJzY1NCcuBCMOARUeAx8BFhcWMzI2Nz4BEzQ2NTQnLgMjHgQXHgIXPgETNDY1NCcuBCMyFR4GFx4CFxM0NjU0Jy4DIx4EFx4FFz4BBEsuBwQHAhcRCQUZEkAhRz9IOyNWhKVMYH5IeatcZz0KDAsdAgolNTJJGDs8NxkJAiUYCwIqHQsCKBsLBQ4PEAMcAjMULDs9SyYGFA80L1MXCjMqAwwHDgMCBQUFHilYWlItCSIyLkYXDjYhDQQSAwUeIUdDSUQlAwcVHh4pJDATDTcfDBwFHilZWlMuCyMzLkUXChsSFhARBwUQBaJsejopWTsGHgINJA9nR5t/QmA5JA4C+7hGj2lCaVhJjGpBNgtNGBkPOllBLj8bP0ZPRi4UKWJtMz4SJmd9NEcSJ25rNEIyFShbPDQBBQcLzxIhVk4eNTUmGAIVAzdcMlEaCj89CAoECB4BrgcdBys3RWIzFjlXQSxAGg87JRAPPgGjBhsILTc3UzUiDQgqRzYqKiAtFA87IxEB4gcdCCw4RGAzFjZUPSw9GgsdExkSFQoUOgAAAAAGAAAA8gSID7EAXwCAAI8AnwC0AMkAAAEWFRQHFhcWFRQOAQcdARYXFBYVFAYHBiMiJy4BNTQ3NjU0Jy4EJxEUDgIjIiY1ND4CMzIXETQ2MzIeAhUeBB8BHgMXFhUUBxYXFhUUBxYXFhUUBxYDNjU0Jy4EKwEiBhUeBRcWFxYzMjY3PgMTNjU0JyYnHgMXFhc2EzY1NCcmIx4FHwE2ETY1NCcuAyMeBR8BPgITNjU0Jy4DIx4FHwE+AgSACCQOAwkZEQcwCQILCA4XCgYMEAISPSFIQEo7JFaEpUxgfkh5q1xnPRkFCAcLBQslOTBQGCIzLjUYBgYlGQYGJRoFBiUZTAU4Eyw4PEYjDQoNCBwfKyU1FDQwBwoIDgIDAwIBAQgei9IOODNbG04nCwQIHo3QCh8hLyg5FXAUCB4pWlpTLQofIS8oORVwAwkHAQgeKVpaUy0KHyEvKDkVcAMKBghYHiRddSsmKCE1ezMSChNpfQgoCkV5CCQGAhoRCwhrQ5aGRGQ7JQ0D+7xGj2lCaVhJjGpBNgyhBwsBBhANOVxJMUkZJzY3SkEoFCpndTMxFCtpdDUuFC1qcDP96xoSVlMdNzUnGBEKJkEuMiQ1FjhOCAoFBQ4LEQGDExgqN+wFOVsvTRxWNCABlhcXKjfxKkgzNiU4F35LAYITGSo0RmM0FipIMzUmOBd+DCMZAYUXGCszR2I0FipIMzYlOBd9CiIYAAAAAAcAAADyBIsRGwBoAIMAkQCgAK8AvwDPAAABFhcVFAYHBiMiJy4CNTQ3NjU0Jy4EJxEUDgIjIiY1ND4CMzIXETQ2PwEyHgMXHgQfAR4EFxYVFAcWFxYVFAcWFxYVFAcWFxYVFAcWFxYVFAcWFxYVFAciFRQWJzY1NCcuASsBIgYVHgQXFhcWMjY3PgITNjU0JyYnHgMXFhcTNjU0JyYjHgMXFhc2EzY1NCcmIx4DFxYXNhM2NTQnJiMeBBcWFzYTNjU0JyYjHgQXFhc2BFIxBwkFExQJCgYMBwMOPyFIQEs6JFaEpUxgfkh5q1xnPQ8HCAgFCwQFAQomODNKGSArKDUYFgYEJhgKBCYXCwQmFwsEJhcLBCQQBgQuAgIfBTg1mFENCw0LIC8qQhZGIQcPDwEEBAMCBR6QzQ43NFgcUSkPBR6Ozw84M1kaTyESBwUejs8PODNaGVEfEgcFHo7PDCUzL0MXWBgQCQUejs8MJTMvQxdLJRQFh215PEN6ByUGAQwVDAoFXFWcgERlOiQNA/vPRo9pQmlYSYxqQTYODAYJAQIBAwcOCjlbRzNGGiUuK0ItPCEkFWCCMzIjFWR8MTYjGFyCMDQjFWV8MTYjF0qOLiQWNGuLCgML2xkQWVBSdhAKLkk8K0AYTzYHCQYGEBYBgg8fKjjrBTpaMEweVjIBtg4gLTLzPGY5Wh1UJzQBmQ0eLTL0PWY4WRxWKDQBmg8fLDL0MlFAMEIbYR0uAaAMHyc39DJRQDBCGlAuPgAAAAgAAAELBIsSNgB0AJUAowC1AMMA1ADiAPQAAAEUFhUUBgcGIyInLgM1NDc2NTQnLgQnERQOAiMiJjU0PgIzMhcRNDY/ATIeAhceBR8BHgUXFhUUBxYXFhUUBxYXFhUUBxYXFhUUBxYXFhUUBxYXFhUUBxYXFhUUDgEHBhUUFhUWAzY1NCcuAisBIg4DFR4EFxYXFjMyNjU+AxE2NTQnJiceAxcWFxM2NTQnJiMeBRceARc2EzY1NCcmIx4EHwETNjU0JyYjHgUXFhc2EzY1NCcmIx4EHwETNjU0JyYjHgQXHgIXNgSIAgwGEhQLBQYKBwUDDz0iSUBKOiNWhKVMYH5IeapdYkIPBwgJCAsFAQggJTMsPBYeJxw2FB0NBAUnGwcFJxsHBScbBwUnGwcFJxsHBSQRAwgYEQcDAzBQBjkiUXM4DQMGBQQDCiAuKkIWPigICgcOBAQCAggejdINODVZHEYyDggekM8KHyIvKDgVDlASBBIIHpDPDCUzLkYXcBYIHpLNCh8iLyg4FSFPAhQIHpDPDCUzL0UXcBYIII3QDCUzL0UXEC8jDgoEOAgoC0B9CCQEAQkMEAkKB1hXnn5EZTokDQP8UkaPaUJoWEqNakE2DwoGCQICAQYQDTFSOTsoOhggKx9AIDMuHCgTX4IwNyMVYnwwNygTY3wwNyMVX4IwNCMVZXwwNCgWXXk1HicgNns0EQMHBQwBaQFFGRNWUDRWQAIFBwkFLUg8K0EZQkMHCQYFDgoTAYATGSs27AQ5WjBLHE49AbUXGCg39CpJMzYmOBcQWRQMAcISGCo48TJRQC9DGX8BzRYYJzfzKUgzNiU3FiVcBgHHFxglN/UxUUAwQxp+Ac0TGSY88DJRQDBDGhE0KA8cAAAAAQB9AXQBoQKcAAsAABM0NjIWFRQOASMiJn1XdlYnQyc6WAIHO1paOyZDKlkAAAAAAgA+AH0CLgbHABUAJQAAEz4CMzIWFxYfARQHDgQPAREzEyIGBxE2NzY1NDY1NCYvAXAzNFQuLzMlOQsKcQ0nGCIiE9wysDlJLm1FUAIMDxQDRhkWFA0UHkA/Yn0NKxskIRLFBkr8dSIn/htsZnpYDSIDGiARBwAAAgA+/sUBxwWgAAgADAAANxEzESUwESMRLQERBT4uAVsr/tABMP7QXAVE/iI4+ssB0aIrAbgvAAACAD7+4wIrBaoAGwAfAAABETMRNxUHETcVBxEjEQcRIxEHNTcRBzU3ETMRFRE3EQGSK25ubm4rvipsbGxsKr4EBAGm/mYj4yT+ZB7kIP58AXg4/n0BdSHhIwGhIuYgAab+aeb+XzYBpAAAAAABAC0A3ALmA2YAGwAAEzMVFzM3NTMVIwcVFzMVIzUnIwcVIzUzNzUnIy7IKdUpyJ9ERJ/LJtgmyKJGS50DZpIuK5XDTGZXvZQpKZTCUmZPAAMAPgB9BAgGyAAOADYARQAAASIGBxE2NzY1NjU0Ji8BJTIXETMRPgIzMhYXFh8BFAcOAw8BEQ4EBwYPAREzET4CByIGBxE2NzY1NjU0Ji8BAvo4Si1sRVADDA8U/jiVLDIzM1QvLjMlOQsKcA02Gy4X3AkcKh00ByA43DIzM1QLOEotbEZQAgwQFAM8ISf+Gm1lelgXGxogEgdTZwOl/H4ZFxQNFB9APmN8DTwdLxXFAfEULTQiOggnLMUGSvx+GRcUTiEn/hptZXpYFxsaIBIHAAAAAv9P/aYErwOzADEARgAAEyM2EjcyFxYVPwE2MzIWFxQOAQcOASMiJy4BJwMHFhczFSE1MzI3NjcBNS8BIgYPAiUGBwYVFDMyNjc2Nz4BNzQmJyYjIlNTd9GpICEkVlpBRIKeBBYyK0y7ZS9IHTIWyQsOHXP9kksWHRULAawKFi9WKCckAkNBJyRPRFcgNgQZFgMODxxITAG+5wEKBC8kPTIvGcmxS3tWNmFsJBIkIP3HDiQEaGgSFh0EpxYkC1dEPUi0cJSiPYEyL1oLPcIrKDIaMgAB/2H/vwYFA7AATwAAATIWHQEDFBcyNzY3NjE3MwcGBwYHIi8BJjU2Ejc0JiciBwMhATQjIgcGBwMjATU0LgInIgMGByM2NzYzMhYXNjc2MzIWFz4IBL08X+MrLTEgGkgyU1cff0ZgXFQ6EimlHBsbWEbm/wABFT0zHBst5/gBFQQSBRBgjhswT3NzcKw2PAleRDtRNj8JBikSKRkoISgpA69HNxn9bUYFNiQZfpPiUn9GBjM2KhN/ActTFBkCov1xAwIvJyZV/XEC9A4NERADCf75MGfslZBSQVQfIFNABCENHQ8XDA0FAAAAAAH9/fzdBEoGOABPAAABBhYXMjc+AT8BEyM1MzY3Njc+ATMyFx4BFxYfARQGBwYHDgEnLgEnNDY3Njc0JyYGBw4BByEVIQIDAgcGBwYjIicmNTQ3PgEzMh4BFRQOAf64CgckZUQkSBIyn9H8KBknKHD0lDIhECISGQgODiEOMxUzJCAdBzI2GhlBSGU2GUgOARX+zkF3YVpITIWMhUU2KxpIJC46FjMy/XwPFQSUS8Na2wLtiW86YT2irQsFHRckITlPSEEhKxIHBAdBJ0FlJBISLwoISHdB/DaQ/o3+jf7WrY1Wm2lScFpTJyxXSBkySFAAAAAB/7gAAAMqA6UANwAAASImNT8BNCMiDwEGAgcjEzU0IyIOBAcGByc+Ajc2Nz4DMzIVBgcGBz4EMzIWFRQCuiUtAwsdSUA5LYkJ2M0dDRcOFQgZBCkxMgkfGRkHBCE3UlcqTwICAgEVITczRiQ5VwJyOi8nLBlwc3P+KhsCuhI6BgYUCB8FM04dFy4dGwgDITE7IGUMGRoMIC09JRpXOaIAAQAAAAACuwPMAEAAACUyNjc0JyYnJicmJzQ+ATMXFhcWFQ8BBgciJzc0JicmBgcUFxYXFhcWHQEUBwYHIi4BNT8DMhcUFRQGBxQWMwEkOFIGHRIzdzIxBVaOVWU0I1IDFhMqWBAONSExRQgnQR2YBitoYnpVkVoEEiQuVgEaAzMgd0czJygeI0dCQVpXiUcLER4xaSQkIARWRBkiBghPOigoMhl9EzZXJHBSPQs6cEc2LyAPbgEBGz0NFSQAAAAAAf9+/8YDqAOBACoAAAEyHgEVFAcGIyIvAiYjIgcjNQEHDgMHIxMhFQE2MzIWFz4BNSInNDYCbyQ5HVZQt0QdKz5NGy4+cALx5x0uKBUWVmwCqP0IR0YdvQkYGkQLPgGeMU4ueldaDxUkJDI6An0EBBEkFxwBOXP9tSFGAgIkHlMuPgAAAf9z/78EZwOwAEUAAAM+Aj8BPgM3PgEzMhYXPgkzMhYdAQMUFzI3Njc2MTczBwYHBgciLwEmNTYSNzQmJyIHAyEBNCMiBwYDjAMjKAiUFR4JDw8ecSg2PwkHIhIjFiQbJSEmEzxf4ystMSAaSDJTVx9/RmBcVDoSKaUcGxtYRub/AAEVPTMcELYBngNDSgv8EyALCwYQG1NABRsOGQ4WDA8IBUc3Gf1tRgU2JBl+k+JSf0YGMzYqE38By1MUGQKi/XEDAi8nF/6rAAAAB/9P/aYZxwOzABwBWAF1AZcBtgHXAfIAAAE0JiMiBgcGBwYVFhcyNjc+CTc+AQMiJicDBx4BFzMVITUzMjc2NwE1LwEiDgIPAQYHDgEHBiMiJicDBx4BFzMVITUzMjc2NwE1LwEiDgIPAQYHDgEHBiMiLgEnAwcWFzMVITUzMjc+ATcBNS8BIg4CDwEGBw4BBwYjIi4BJwMHFhczFSE1MzI3PgE3ATUvASIOAg8BBgcOAQcGIyImJwMHFhczFSE1MzI3NjcBNS8BIg4EDwEGBw4BBwYjIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQ4BByM2NzY3MhYVPwE2MzIWFz4CNzY3MhYVPwE2MzIWFzY3NjcyHgEVPwE2MzIeBBc2NzY3Mh4BFT8BNjMyFhc+ATc2NzIeAhU/AT4BMzIWFz4FNzY3Mh4DFT8BPgEzMh4DFxQGBwYBNCYjIgYHBgcGFRYXMj4BNz4HNz4CJTQuBSMiBgcGBwYVFhcyNjc+Bzc+AyU0LgMjIgYHBgcGFRYXMjY3Pgc3PgIlNCYjIgcGBwYVFhcyPgU3Pgc3PgMlNCYjIgcGBwYVFhcyNjc+CDc+ARjHP0ImNQ5EJCQBTkRWIQgXChAGCwQGAwUCBAjdOYMgyQsIFQ5z/ZJLFR4UDAGsChYdNiwcEicRHwI2OqPJOYMgyQsIFQ5z/ZJLFR4UDAGsChYdNiwcEicRHwI2OqPJJllJFMkLDxxz/ZJLFR4KEAYBrAoWHTYsHBInER8CNjqjySZZSRTJCw8cc/2SSxUeChAGAawKFh02LBwSJxEfAjY6o8k5gyDJCw8cc/2SSxUeFAwBrAoWFCYgGxsSCycRHwI2OqPJOYMgyQsPHHP9kksVHhQMAawKFh02LBwSJxE4ClNtcmSuJEFWWjxJdZAWEyclEmSuJEFWWjxJdZAWODlkrhgwHVZaPEkoRzovIxkHODlkrhgwHVZaPEl1kBYdORtkrhIlHBJWWiBBJHWQFgoTExMTEglkrg4fGRMMVlogQSQ5X0QvGAE1PqP73j9CJjUORCQkAU4vSC8VCCAHFAQLAwYDAwYE+8kECg8VGiITJjUORCQkAU5EViEIIAcUBAsDBgMCBQMD+8kJEx4sGyY1DkQkJAFORFYhCCAHFAQLAwYDAwYE+8k/Qk0cRCQkAU4VJB8cFxYRCQggBxQECwMGAwIFAwP7yT9CTRxEJCQBTkRWIQgbCRIFCwMHAwMECAJgTFoaGHiMmkWAATEwDSYQGw4XEhkdIRciXf2xTC79xw4SEwNoaBIVHgSnFiQLHDUrHz0gQGqFSM1MLv3HDhITA2hoEhUeBKcWJAscNSsfPSBAaoVIzSU4Hf3HDiIGaGgSCxkPBKcWJAscNSsfPSBAaoVIzSU4Hf3HDiIGaGgSCxkPBKcWJAscNSsfPSBAaoVIzUwu/ccOIgZoaBIVHgSnFiQLDhkcKBwUPSBAaoVIzUwu/ccOIgZoaBIVHgSnFiQLHDUrHz0fdxTWloMGYDAyLxmbfyA7NBiDBmAwMi8Zm39cS4MGL0MeMi8ZEyQzP0gpXEuDBi9DHjIvGZt/L1QkgwYcKjQWMi8NDJt/EB8dHBoZDIMGEh4lKRIyLw0MJ0Vgbz93jk3NAlxMWhoYeIyaRYABGSkfDTMOIxAfHycdGzwpDBUkIhwXDwkaGHiMmkWAATEwDTMOIxAfHycdFi4gHwkdMSodERoYeIyaRYABMTANMw4jEB8fJx0bPCkMTFoyeIyaRYABBAkNEBUVDQ0zDiMQHx8nHRYuIB8JTFoyeIyaRYABMTANLA8fDR0TIyMZIl0AAAAABv9P/aYVjwOzABwBIAFCAWEBggGdAAABNCYjIgYHBgcGFRYXMj4BNz4HNz4CAyImJwMHHgEXMxUhNTMyNzY3ATUvASIOAg8BBgcOAQcGIyIuAScDBxYXMxUhNTMyNz4BNwE1LwEiDgIPAQYHDgEHBiMiLgEnAwcWFzMVITUzMjc+ATcBNS8BIg4CDwEGBw4BBwYjIiYnAwcWFzMVITUzMjc2NwE1LwEiDgQPAQYHDgEHBiMiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BDgEHIzY3NjcyFhU/ATYzMhYXPgI3NjcyFhU/ATYzMhYXNjc2NzIeARU/ATYzMh4EFzY3NjcyHgEVPwE2MzIWFz4BNzY3Mh4CFT8BPgEzMh4EFxQGBwYBNC4FIyIGBwYHBhUWFzI2Nz4HNz4DJTQuAyMiBgcGBwYVFhcyNjc+Bzc+AiU0JiMiBwYHBhUWFzI+BTc+Bzc+AyU0JiMiBwYHBhUWFzI2Nz4INz4BFI8/QiY1DkQkJAFOL0gvFQggBxQECwMGAwMGBN45gyDJCwgVDnP9kksVHhQMAawKFh02LBwSJxEfAjY6o8kmWUkUyQsPHHP9kksVHgoQBgGsChYdNiwcEicRHwI2OqPJJllJFMkLDxxz/ZJLFR4KEAYBrAoWHTYsHBInER8CNjqjyTmDIMkLDxxz/ZJLFR4UDAGsChYUJiAbGxILJxEfAjY6o8k5gyDJCw8cc/2SSxUeFAwBrAoWHTYsHBInETgKU21yZK4kQVZaPEl1kBYTJyUSZK4kQVZaPEl1kBY4OWSuGDAdVlo8SShHOi8jGQc4OWSuGDAdVlo8SXWQFh05G2SuEiUcElZaIEEkMFI/MSARATU+o/veBAoPFRoiEyY1DkQkJAFORFYhCCAHFAQLAwYDAgUDA/vJCRMeLBsmNQ5EJCQBTkRWIQggBxQECwMGAwMGBPvJP0JNHEQkJAFOFSQfHBcWEQkIIAcUBAsDBgMCBQMD+8k/Qk0cRCQkAU5EViEIGwkSBQsDBwMDBAgCYExaGhh4jJpFgAEZKR8NMw4jEB8fJx0bPCn9sEwu/ccOEhMDaGgSFR4EpxYkCxw1Kx89IEBqhUjNJTgd/ccOIgZoaBILGQ8EpxYkCxw1Kx89IEBqhUjNJTgd/ccOIgZoaBILGQ8EpxYkCxw1Kx89IEBqhUjNTC79xw4iBmhoEhUeBKcWJAsOGRwoHBQ9IEBqhUjNTC79xw4iBmhoEhUeBKcWJAscNSsfPR93FNaWgwZgMDIvGZt/IDs0GIMGYDAyLxmbf1xLgwYvQx4yLxkTJDM/SClcS4MGL0MeMi8Zm38vVCSDBhwqNBYyLw0MGzJFVV80d45NzQJcFSQiHBcPCRoYeIyaRYABMTANMw4jEB8fJx0WLiAfCR0xKh0RGhh4jJpFgAExMA0zDiMQHx8nHRs8KQxMWjJ4jJpFgAEECQ0QFRUNDTMOIxAfHycdFi4gHwlMWjJ4jJpFgAExMA0sDx8NHRMjIxkiXQAF/0/9phFXA7MAIQDwAQ8BMAFLAAABNC4FIyIGBwYHBhUWFzI2Nz4HNz4DAyIuAScDBxYXMxUhNTMyNz4BNwE1LwEiDgIPAQYHDgEHBiMiLgEnAwcWFzMVITUzMjc+ATcBNS8BIg4CDwEGBw4BBwYjIiYnAwcWFzMVITUzMjc2NwE1LwEiDgQPAQYHDgEHBiMiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BDgEHIzY3NjcyFhU/ATYzMhYXPgI3NjcyFhU/ATYzMhYXNjc2NzIeARU/ATYzMh4EFzY3NjcyHgEVPwE2MzIeAxcUBgcGATQuAyMiBgcGBwYVFhcyNjc+Bzc+AiU0JiMiBwYHBhUWFzI+BTc+Bzc+AyU0JiMiBwYHBhUWFzI2Nz4INz4BEFcECg8VGiITJjUORCQkAU5EViEIIAcUBAsDBgMCBQMD3iZZSRTJCw8cc/2SSxUeChAGAawKFh02LBwSJxEfAjY6o8kmWUkUyQsPHHP9kksVHgoQBgGsChYdNiwcEicRHwI2OqPJOYMgyQsPHHP9kksVHhQMAawKFhQmIBsbEgsnER8CNjqjyTmDIMkLDxxz/ZJLFR4UDAGsChYdNiwcEicROApTbXJkriRBVlo8SXWQFhMnJRJkriRBVlo8SXWQFjg5ZK4YMB1WWjxJKEc6LyMZBzg5ZK4YMB1WWjxJOV9ELxgBNT6j+94JEx4sGyY1DkQkJAFORFYhCCAHFAQLAwYDAwYE+8k/Qk0cRCQkAU4VJB8cFxYRCQggBxQECwMGAwIFAwP7yT9CTRxEJCQBTkRWIQgbCRIFCwMHAwMECAJgFSQiHBcPCRoYeIyaRYABMTANMw4jEB8fJx0WLiAf/a0lOB39xw4iBmhoEgsZDwSnFiQLHDUrHz0gQGqFSM0lOB39xw4iBmhoEgsZDwSnFiQLHDUrHz0gQGqFSM1MLv3HDiIGaGgSFR4EpxYkCw4ZHCgcFD0gQGqFSM1MLv3HDiIGaGgSFR4EpxYkCxw1Kx89H3cU1paDBmAwMi8Zm38gOzQYgwZgMDIvGZt/XEuDBi9DHjIvGRMkMz9IKVxLgwYvQx4yLxknRWBvP3eOTc0CXB0xKh0RGhh4jJpFgAExMA0zDiMQHx8nHRs8KQxMWjJ4jJpFgAEECQ0QFRUNDTMOIxAfHycdFi4gHwlMWjJ4jJpFgAExMA0sDx8NHRMjIxkiXQAE/0/9pg0fA7MAGgCzANIA8wAAATQmIyIHBgcGFRYXMjY3Pgg3PgEDIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQ4BByM2NzY3MhYVPwE2MzIWFz4CNzY3MhYVPwE2MzIWFzY3NjcyHgEVPwE2MzIeAhcUDgEHBiMiLgEnAwcWFzMVITUzMjc+ATcBNS8BIg4CDwEGBw4BBwYjIiYnAwcWFzMVITUzMjc2NwE1LwEiDgQPAQYHDgEHBgE+Ajc0LgMjIgYHBgcGFRYXMjY3PgclPgM3NCYjIgcGBwYVFhcyPgU3PgcDrz9CTRxEJCQBTkRWIQgbCRIFCwMHAwMECN05gyDJCw8cc/2SSxUeFAwBrAoWHTYsHBInETgKU21yZK4kQVZaPEl1kBYTJyUSZK4kQVZaPEl1kBY4OWSuGDAdVlo8SUdwRiUCHC4po8kmWUkUyQsPHHP9kksVHgoQBgGsChYdNiwcEicRHwI2OqPJOYMgyQsPHHP9kksVHhQMAawKFhQmIBsbEgsnER8CNjqjCHgDBgQBCRMeLBsmNQ5EJCQBTkRWIQggBxQECwMG+8sCBQMDAT9CTRxEJCQBThUkHxwXFhEJCCAHFAQLAwYCYExaMniMmkWAATEwDSwPHw0dEyMjGSJd/bFMLv3HDiIGaGgSFR4EpxYkCxw1Kx89H3cU1paDBmAwMi8Zm38gOzQYgwZgMDIvGZt/XEuDBi9DHjIvGTxoh09SelMzzSU4Hf3HDiIGaGgSCxkPBKcWJAscNSsfPSBAaoVIzUwu/ccOIgZoaBIVHgSnFiQLDhkcKBwUPSBAaoVIzQHQGzwpDB0xKh0RGhh4jJpFgAExMA0zDiMQHx8nHRYuIB8JTFoyeIyaRYABBAkNEBUVDQ0zDiMQHx8nAAAAAAP/T/2mCOcDswAUACkAkQAAAQYHBhUUMzI2NzY3PgE3NCYnJiMiBQYHBhUUMzI2NzY3PgE3NCYnJiMiASM2EjcyFxYVPwE2MzIXFhc2NzY3MhcWFT8BNjMyFhcUDgEHDgEjIicuAScDBxYXMxUhNTMyNzY3ATUvASIHDgEPAwYHDgEHDgEjIicuAScDBxYXMxUhNTMyNzY3ATUvASIGDwIG/UEnJE9EVyA2BBkWAw4PHEhM+6tBJyRPRFcgNgQZFgMODxxITP1xU3fRqSAhJFZaQUSCTzgSOzZpqSAhJFZaQUSCngQWMitMu2UvSB0yFskLDh1z/ZJLFh0VCwGsChYvKxYpFCckDAEJCzIrTLtlL0gdMhbJCw4dc/2SSxYdFQsBrAoWL1YoJyQC1HCUoj2BMi9aCz3CKygyGjIycJSiPYEyL1oLPcIrKDIaMv645wEKBC8kPTIvGWVHbWBGhQQvJD0yLxnJsUt7VjZhbCQSJCD9xw4kBGhoEhYdBKcWJAssFTgiPUgYOzM9VjZhbCQSJCD9xw4kBGhoEhYdBKcWJAtXRD1IAAAC/2H9pgphA7MAgQCcAAAlIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAgYDBgcGByIvASY1NhI3NCYnIgcDIQE0IyIHBgcDIwE1NC4CJyIDBgcjNjc2MzIWFzY3NjMyFhc+CDMyFh0BAxQXMjc2NzYxNz4BNzY3Mh4BFT8BNjMyHgIXFAYHBhM0LgEjIgcGBwYVFDMyPgE3Pgc3NgiCOYQfyQsOHXP9kksWHRULAawKFh00LhsTJyQcaiJ8RmBcVDoSKaUcGxtYRub/AAEVPTMcGy3n+AEVBBIFEGCOGzBPc3NwrDY8CV5EO1E2PwkGKRIpGSghKCkVPF/jKy0xIBpIYTc+O2mpGDAdVlpBREdwRiUCNj2gExk7LUwdQSckTy9HLxYHIQYUAwwEBgMLBE0t/ccOJARoaBIWHQSnFiQLHDcoID1IQv7+VXxGBjM2KhN/ActTFBkCov1xAwIvJyZV/XEC9A4NERADCf75MGfslZBSQVQfIFNABCENHQ8XDA0FRzcZ/W1GBTYkGX7qal9MhQQvQx4yLxk8aYZPdo9NzQJcMkgsMnCUoj2BGSggCzYLJQ8gHigdYQAAAAAC/2H83Qn8BjgAXgCuAAAFMh4BFRQOAgcGBwYeARcyPgU3Njc2NzYSNhI3IzUzPgM3PgEzMhYfARQOAQcOAwcGJy4EJzQ/ATQnJgYHBgIHIRUhCgEHDgQjIiY1ND4CEzIWHQEDFBcyNzY3NjE3MwcGBwYHIi8BJjU2Ejc0JiciBwMhATQjIgcGBwMjATU0LgInIgMGByM2NzYzMhYXNjc2MzIWFz4IBGAkPB4REiMGGQ8KBBMUGTElJxogEA0DASQSGjosPBXR/BcYJiUWcPSUTF0PDgcQGAQWHiYRGiQNFQ4LBgNoM0FIZTYQTRIBFf7ON81vHDxUV2w2dooWKUaJPF/jKy0xIBpIMlNXH39GYFxUOhIppRwbG1hG5v8AARU9MxwbLef4ARUEEgUQYI4bME9zc3CsNjwJXkQ7UTY/CQYpEikZKCEoKfg/UyYZMh0wCigKDREIAhcgOS1LKSUHA2JabgEJ0QEfYYlBQV1GIqKtRkM5PzsuMAsdHxgCBAQDEBQeGRGERiQvCghIdyv+/UWQ/sj9UNU3YmlLMaqBLVdNLwSnRzcZ/W1GBTYkGX6T4lJ/RgYzNioTfwHLUxQZAqL9cQMCLycmVf1xAvQODREQAwn++TBn7JWQUkFUHyBTQAQhDR0PFwwNBQAD/0/83Qj5BjgAXwCTAK8AAAUyHgEVFA4CBwYHBh4BFzI3Njc2NzYaATcjNTM+Azc+ATMyHgYfARQOAwcOBAcGJy4DJzQ/ATQnJgYHBgIHIRUhCgEHDgQjIiY1ND4CJyImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEGByM2EjcyHgEVPwE2MzIeBBcUBgcGEzQuAiMiBwYHBhUUMzI2Nz4INzYDXCU8HRASIwYZDwoDFBRpVBIiJBIhRlIY0fwXGCYlFm/1lBMiHxsXEw8MAw8CBA0NDwQPFxkfDhkkEBgQCARoM0FIZTYRTBMBFv7ON81vHTxUVmw2dooWKUZhOYQfyQsOHXP9kksWHRULAawKFh00LhsTJyAzU3fRqRgwHVZaQUQwUj8xIBEBNj2gEw4fMiJMHUEnJE9EViEIGwgSBAwDBwQDC/g/UyYZMh0wCigKDREIAr4oWmJajQFDAYxsiUFBXUYioq0ECQ4RFhkdETknLCYjHh4IFxkXEAIEBAMWIh8VhEYkLwoISHcr/v1FkP7I/VDVN2JpSzGqgS1XTS/8TS39xw4kBGhoEhYdBKcWJAscNyggPT5s5wEKBC9DHjIvGRsyRVVfNHaPTc0CXCU7LRkycJSiPYExMAwtDSEMHhMjIxlhAAH9/fzdB84GOACLAAABFAYHIic0PgI3NjUnJiMiAyEVIQYKAgcGBwYPASIuATU0PgQ3MhYVFAcUMzITNhM2EjchCgEHAg8BIicmJyYnPgc3NjcyHgEXFA8CFDMyPgM/AhIbASM1MzYSNzYzMh4CFRQGByInNDc2NzY1LgEjIgIHIT4FMzIHzmFTYQsWJi8aEhUaJMlzAQ7+1RRLWmcrU2FXjEVLbjQKFRonJBo+S3MguG8OOipDIP28J8dksdtBcz0dGQ4BAQUBBQMHBwsHJFMnPR8CEjI2JBw0JicXDjI2P1U9zfw4tIeFpipFKxZiVloKJCQ9EhUhJHeXKwJOFUFYc4SiV6IFSmiVFXMmRzgsDg8HIBL9z4l8/rz+xP7dWql3cygHWIxVIzktIyAXD2xFT5sZAfQ4AQnCATeW/vn9V8n+ezYHXiBFaQ0IJwweDBgOEgkvHThOKy8kUkUZGCI1KhuCvgEXAZkBIIm8AR1jWidDVS5qmg5zPUg+HA8HHRX+rthNl5V+YTcAAAH9+fzdCr8GPwDJAAAFMhYXFAYPAQYHFDMyNz4CNzYSNxMhBgIHBgcGDwEiLgE1ND4CNzIXHgEVFAcWFzITNhI2EjchBgIHAg8BIi4ELwE+ATcyFhUUDwIUMzI3PgM/ARITNjcjNTM2NzY3NjMyHgEVFAYHIic0NjcyNScmIyIHBgchPgQzMhcUBwYHIic0NjcyNS4BIyICAyESNzYzMh4BFRQOAQciLgQnND4BNzI1LgEjIgIDIRUhAgcCAwYHDgEPASInJjU+AQUbO0MDEw0kGBckZ0YZJiYSGWEZQf4IKNFWVFVejEFMcDUWLzQpJA8mLHMCH7ZxGzwqQhH+BSTZUrLaRR42KiQeFwsSDkFWO04WMjIkOzEWKRgkCjZwRBULzfgtY1qJhaY5UiVhU10LTjcSFR4je0tPJAIGGlB5kb5oow0uK1thC005EgsoIGWgOAIGUbOn8zpTIytUOA8YFRAMCAElOSAVDichZaA4ARL+zio0Z4deVituQkGnOBYLSvhkRhZEFTYjKRmXPWh3QXABu28BNv39JaGvbXolB1eMVjRMNyUWDw9bOEufGAEB9HABD8QBPFHp/Rio/nw3Bw4aIS4vHXZuZCBuQy0mUkUZNhNCOFwXvgH8AUteK4minpRoWkFqQmmZEHNIfxgWIBKstclfs66AT+1lUz8bc0p1IBYbF/7m/ukBCNPCTG9BQnFMCwcNExofEy1cRBIWGhj+5v7pif78sP5S/umwbDpPFgfDNkBobwAAAf35/N0OAgY/ASQAAAUyFhUUBxYXMhM2EjYSNyEGAgcCDwEiLgQvAT4BNzIWFRQPAhQzMjc+Az8BEhM2NyM1MzYSNzYzMh4BFRQGByInNDY3MjUnJiMiBwYHIT4EMzIXFAcGByInNDY3MjUuASMiAgMhEjc2MzIeARUUDgEHIi4EJzQ+ATcyNS4BIyICAyE+Azc+ATMyFh8BFAYHDgIHBiIuAyc0Nj8BNCYOAQcOAgcGAgchFSEKAQcOBCMiJjU0PgMzMh4CFRQOAgcOAxYXMj4FNzY3Njc2GgE3IQIHAgMGBw4BDwEiJyY1PgE3MhYXFAYPAQYHFDMyNz4CNzYSNxMhBgIHBgcGDwEiLgE1ND4CAds/RnMCH7ZxGzwqQhH+BSTZUrLaRR42KiQeFwsSDkFWO04WMjIkOzEWKRgkCjZwRBULzfgxwYGFpjlSJWFTXQtONxIVHiN7S08kAgYaUHmRvmijDS4rW2ELTTkSCyggZaA4AgZRs6fzOlMjK1Q4DxgVEAwIASU5IBUOJyFloDgCDhcYJiQXb/WUS10PDw4hByAyFxgjGxIOCAM1MzItPj4SESIjEhFMEwEV/s42zm4dPFRWbDd1ig0cKTsjHDEfEhERIwYGGA0HFBYaMCUoGSAQDgICJBIhRVMX/f4qNGeHXlYrbkJBpzgWC0pRO0MDEw0kGBckZ0YZJiYSGWEZQf4IKNFWVFVejEFMcDUWLzT4aUhLnxgBAfRwAQ/EATxR6f0YqP58NwcOGiEuLx12bmQgbkMtJlJFGTYTQjhcF74B/AFLXiuJsAEqYlpBakJpmRBzSH8YFiASrLXJX7OugE/tZVM/G3NKdSAWGxf+5v7pAQjTwkxvQUJxTAsHDRMaHxMtXEQSFhoY/ub+6UFBXUYioq1GQzlYPkIPKCcDAhARHx0UR2EiJBweARAMDCs9Jyv+/UWQ/sj9UNU3YmlLMaqBI0dDMyAlOD8cGTIdMAoJHRIUDAIXIDktSyklBwNiWo0BQwGMbP78sP5S/umwbDpPFgfDNkBobxtkRhZEFTYjKRmXPWh3QXABu28BNv39JaGvbXolB1eMVjRMNyUAAf35/N0RTAY/AYAAAAEUFjMyPgM3NhITITUhNhI3PgEXFhUGBwYVHgM3PgE3PgE1Jy4DJy4CIyIHDgEHBgchEjc2Nz4DMh4CFQcGFR4DNz4BNz4CNScuASMiBgcOAgchGgEzMhYXFCMOAhUeATM+ATU0LgEjIgcGAyEaATMyFhcUIw4BFR4BMzY3NjUuAyMiDgQHITY3NjMyHwEUIw4CFR4BMz4BNTQmIyIHDgIHIxUzBgcCAwcOBAcGIyI1PwE2NTQmIw4BBxceAzM3NhM2EjchBgIGAgcCIyYnNjU0LgEnJiMOAxUUHgEzNzY3Njc2EjchAw4CBwYHBiMiNTY/AT4BNS4BIw4BBxQXHgEzNz4GNzY3EhM+AjchDgUHBgcGBw4GIy4CPgM3PgM1NC4BIyIOAhUUFjMyPgM3NhITIQMHDgEHBiMuAT4CNz4DNTQuASMiDgIK/4p2NmxXVDwcbs43ATL+6xJNEDZlSEEZGmgGDhwvIyBECyEODgQWHSAOCxodEZR6YKU0GSj9600jNjIJGR4gHxsVDDJoBQ8cLyIhRAsYEAcPD11LlPVvHTUgHv3yOKBlIScOFSA5JQUxK1RjI1M686ezUf36OKBlICgLEjlNBjYwWysuAhQnRC9XooNxWEAV/fokT0t7Ix4VEiQ8JQU1LlNhW1WmhVaQbSD4zQsVRHA2CRsUGyASMTskMjIWTjtWQQ4SESY1SS1F2rJS2SQB+xFCKjwbcbYgAXMSJhoPJCk0LxY1cExBjF5VVFbRKAH4QRU0NRUuSUZnJBgXJA0TA0M7UUoLFhpsWUEpTTtAKjgdGwMBh2cTIhsOAgIPJh8lICYREiQCAg4QIBkoJTAaEBMEAgwMEAUGIxERHjwkK0YqFYp1N2xWVDwdbs42AgefMhFGJ0RlFxMGDRgGBiMSER48JCxGKRb+CIGqMUtpYjfUArIBN5BFAQMrd0gICi8SEkaEHycjCwUERBlCPlg5EikjHAQEBQJWRNOAOm8BIlh3JAYLCAMHDRYPJEaEHycjCwUERBkwLjs/OUNGraIscFVWARcBGhgaFhJEXC05OhCUZkFvTMLT/vgBFwEaFxsWIHVKOTobP1NlMlFFJTZhfZaXTsm1rBIgFhBEWzA4OxCZaWeGWkGx1XWJK17+tf4EvhVFMjgtDzYZRVImLUNuIGRudi1AOR0HNwGEqALo6VH+xMT+8XD+DAIXn0slQTIKDxYlN0w0VoxXByV6ba+hAtv9/spd8PBdqbSXGSshNhVEFkZkG29oQDZbaAcNLjBLOF80MgYCARcBrkGSjlNIs5Ovl6lLWmIDByUpSy05IBcCBwsNEA8TBwowHTIZJlM/L01XLYGqMUtpYjfVArABOP0T21PEUZQCDBQSHQkKMB0yGSZTPzBMVwAAAv39/N0UkAY/AGACCgAABTIeARUUDgIHBgcGHgEXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMh4CHwEUDgIHDgEHBi4CJzQ/ATQmDgEHDgYHBQchCgEHDgUjIiY1ND4CARQWMzI+BTc2EhMhNSE+Ajc+Azc+AhYVBw4DFR4DNz4BNz4DNScuAScuBCIjIgcOAQcGByESNzY3PgIeARUHBhUeAzc+ATc+ATUnLgUjIgcOAwcOAwchGgEzMh4BFxQjDgEVHgEzPgE1NC4BIyIHBgMhGgEzMhYXFCMOARUeAjM2NzY1LgMjIg4FByE+ATc2MzIeAx8BFCMOAxUeATM+ATU0JiMiBwYHDgEHIR8BBgcCAwcOAwcGIyI1PwE2NTQmIw4BBxceAzM3NhM2EjchBgIGAgcCIyImNTY1NC4BJy4DIw4DFRQeBDM3Njc2NzYSNyEDBgIHBgcGIyI1Njc+AT8BPgE1LgIjDgIHFBcWMzc+Bjc+AjcSEzYTIQYCBgIHBgcGBw4GIy4BPgI3PgU1NC4BIyIOAhUUHgIzMj4DNzYSEyEDBw4BBwYjLgE+Ajc+AzU0LgEjIg4H/q4kPB4REiMGGQ8KBBMUGTElJxogEA0DASQSIUZTF9H8HyA0HXD0lCY+Lh4IDgILDxMLRCAiLxwPBmgzLT4+EhcqJR0iER8DARcR/t03zW8XMj9HTloudooWKUYPwIt1J09DQzc2KRNvzjYBMv7rCiowCw4aGxkNEj4+LTIZJRwPBg4cLyMgRAsTDwwBDghAHQUMDQ4PDwmTe1+mNBko/etOIjYyDy4zLh4zaAUPHC8iIUQLIQ4PBBEYHyUtGZR6Hzw6ORwWJSYYF/3yOaBkFyEVCRUxTQUxK1VjJFM686eyUf35OaBkIScLEjlMAxstIVsqLwMUJ0QvS412alVHNBL9+hI6J0x6Bw8NDQsGFRIaMSQWBjUuUmJcVaaFiVkqOBz+4AnZChZEcDYKJBgpFjE7JDIzFU47VkEOEhIlNUkuRNqyU9gkAfsRQio8G3G2ERB0EyYaBAsNDgkpNC8WDhspNUQnQIxeVVVV0icB+EAaYRkuSUZnJAICDA8QJA0UAh07KDdFIggWOKdBKU07QCo5HRoBAQIBhmc0KgIDFT0rOhoSJAEDDg8hGScmMBkXEwYNGAYGFA4RCwcdPCUrRikWI0FhOzZsVlQ8HW/NNwIGnjMQRydEZRcTBg0ZBQciEhEePCQUJB4bFRIMCQT4P1MmGTIdMAooCg0RCAIXIDktSyklBwNiWo0BQwGMbIlWVW8toq0SIzMhOTEuMyElGUQEBQshKR+ERiQcHgEQDBA4U0ZyPHgOAof+yP1Q1S1TWkg7IaqBLVdNL/8AgaoZKz1CTkcm1AKyATeQJ5GeHR0yJh0JDBABHhwkESYxPiQfJyMLBQREGSUhMy4xOSVQCQIDAwECVkTTgDpvASFZdyQKDwQHHBckRoQfJyMLBQREGUI+WDkWJh4XEAhWFjQ/RykiRl1BQQEXARoMFREWHX9DOToQlGZBb0zC0/74ARcBGhcbFiB1SiYzGhs/U2UyUUUlKUhkc4KCQ2e+WawBAwUFBCAWDC46RyQ4OxCZaWeGWmiUQpVphwIrXv61/gS+F1w4QhM2GUVSJi1DbiBkbnYtQDkdBzcBhKgC6OlR/sTE/vFw/gwMDZ9LJUEyCgQGAwIWJTdMNCpPRjkqFwclem2voQLb/f7Kb/5FcKm0lxkCBRYXGDYVRBYtSzISQFpGQDbDBw0uMEs4XzQyAgIDAQEXAa6wAQRh/uHR/vduWmIDByUpSy05IBcCDBQSHQkJHBQdGSIRJlM/L01XLT9tUC8xS2liN9UCsAE4/RPbU8RRlAIMFBIdCQowHTIZJlM/ChMZHyMmJygAAAAD/f383QfyBjgAMgBMAK4AACUiLgEnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQYHIzYSNzIWFT8BPgEzMh4CFxQGBwYTNC4BIyIHBgcGFRQzMjY3Pgc3NgEyHgEVFA4CBwYHBh4BFzI+BTc2NzY3NhoBNyM1Mz4CNz4BMzIeAh8BFA4CBw4BBwYnLgYnNDc2NzQnJgYHBgIHIRUhCgEHDgUjIiY1ND4CBhMmWUkTygsPHHT9kUsWHRULAa0LFh00LhsTJx80U3fRqSRBVlohQiJHcEYlAjY9oBMZOy1MHUAoJE9EViEHIQYUBAsEBgML978kPB4REiMGGQ8KBBMUGTElJxogEA0DASQSIUZTF9H8HyA0HXD0lCY+Lh4IDgILDxMLRCAaJAkQDQoHBwQCaBoZQUhlNhBNEgEV/s43zW8XMj9HTloudooWKUYEJTgd/ccOJARoaBIWHQSnFiQLHDcoID0+bOcBCgRhLzIvDQw8aYZPdo9NzQJcMkgsMnCUoj2BMTALNgslDyAeKB1h/NM/UyYZMh0wCigKDREIAhcgOS1LKSUHA2JajQFDAYxsiVZVby2irRIjMyE5MS4zISUZRAQEBAIJDRESFhMLhEYSEi8KCEh3K/79RZD+yP1Q1S1TWkg7IaqBLVdNLwAC/f383QbsBjgAMACSAAABMhYVFAcOASMiJi8CJiMiByM1AQcOAwcjEyEVATYzMhYXPgU1IiYnNDYBMh4BFRQOAgcGBwYeARcyPgU3Njc2NzYaATcjNTM+Ajc+ATMyHgIfARQOAgcOAQcGJy4GJzQ3Njc0JyYGBwYCByEVIQoBBw4FIyImNTQ+AgWyN0NWKINcIi8QKz1OGy4+bwLw5h4tKRQXVmwCqP0JRkYdvQkIDgsIBgMiKAU++SokPB4REiMGGQ8KBBMUGTElJxogEA0DASQSIUZTF9H8HyA0HXD0lCY+Lh4IDgILDxMLRCAaJAkQDQoHBwQCaBoZQUhlNhBNEgEV/s43zW8XMj9HTloudooWKUYBnmZHelctLQcIFSQkMjoCfQQEESQXHAE5c/21IUYCAQUJCw8RCiopLj79aj9TJhkyHTAKKAoNEQgCFyA5LUspJQcDYlqNAUMBjGyJVlVvLaKtEiMzITkxLjMhJRlEBAQEAgkNERIWEwuERhISLwoISHcr/v1FkP7I/VDVLVNaSDshqoEtV00vAAAAAAIAAPzdBwUGOABdAJ4AAAUyHgEVFA4CBwYHBh4BFzI+BTc2NzY3NhoBNyM1Mz4CNz4BMzIWHwEUDgEHDgIHBiYnND8BNCYOAQcOCAchFSEKAQcOBCMiJjU0PgIDMjY3NC4BJyYnJic0PgEzFxYXFhUPAQYHIic3NCYnJgYHFBcWFxYXFh0BFAcGByIuATU/AzIXFBUUBgcUFjMBaCQ8HhESIgcZDgsEFBMaMCUoGSAQDgIBJBIiRVMX0fwfIDQdcPWTTF0PDgYQGAcgMhdANgxpMi0+PhIRIR8ZHBIaCxgDARX+zjbObxw8VFZsN3WKFSpGGThSBh0mH3cyMQVWjlVlNCNSAxYTKlgQDjUhMUUIJ0EdmAYraGJ6VZFaBBIkLlYBGgMzIPg/UyYZMh0wCigKDREIAhcgOS1LKSUHA2JajQFDAYxsiVZVby2irUZDOT87LjAPKCcDCjlAhEYkHB4BEAwNJzg0UDRbKloLkP7I/VDVN2JpSzGqgS1XTS8Bb0czHzclFUdCQVpXiUcLER4xaSQkIARWRBkiBghPOigoMhl9EzZXJHBSPQs6cEc2LyAPbgEBGz0NFSQAAAQAAPzdCrQGOAAwAEwAqgDrAAAlIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQYHIzYSNzIWFT8BNjMyHgIXFAYHBhM0LgIjIgcGBwYVFDMyNjc+CDc2ATIeARUUDgIHBgcGHgEXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMhYfARQOAQcOAgcGJic0PwE0Jg4BBw4IByEVIQoBBw4EIyImNTQ+AgMyNjc0LgEnJicmJzQ+ATMXFhcWFQ8BBgciJzc0JicmBgcUFxYXFhcWHQEUBwYHIi4BNT8DMhcUFRQGBxQWMwjVOYUeyQsOHXP9kUwWHBYLAawLFR01LRwSKB8zU3fQqiRAV1pBREdwRiUCNj6fEw8eMyJLHUEnJE9EViEHHAgSBAwDBwQDCve4JDweERIiBxkOCwQUExowJSgZIBAOAgEkEiJFUxfR/B8gNB1w9ZNMXQ8OBhAYByAyF0A2DGkyLT4+EhEhHxkcEhoLGAMBFf7ONs5vHDxUVmw3dYoVKkYZOFIGHSYfdzIxBVaOVWU0I1IDFhMqWBAONSExRQgnQR2YBitoYnpVkVoEEiQuVgEaAzMgBE0t/ccOJARoaBIWHQSnFiQLHDcoID0+bOcBCgRhLzIvGTxphk92j03NAlwlOy0ZMnCUoj2BMTAMLQ0hDB4TIyMZYfzTP1MmGTIdMAooCg0RCAIXIDktSyklBwNiWo0BQwGMbIlWVW8toq1GQzk/Oy4wDygnAwo5QIRGJBweARAMDSc4NFA0WypaC5D+yP1Q1TdiaUsxqoEtV00vAW9HMx83JRVHQkFaV4lHCxEeMWkkJCAEVkQZIgYITzooKDIZfRM2VyRwUj0LOnBHNi8gD24BARs9DRUkAAAABQAA/N0O7AY4ABoANQCoAQsBTAAAATQmIyIGBwYHBhUWFzI2Nz4HNz4BJTQmIyIGBwYHBhUWFzI2Nz4HNz4BAyIuAicDBx4BFzMVITUzMjc2NwE1LwEiDgQPAQ4DByM+ATc2NzIeAhU/ATYzMhYXPgY3Mh4CFT8BNjMyHgIXFAYHBiMiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BDgEHDgEHBgUyHgEVFA4DBw4EBwYXMj4FNz4CNTY3NhI2EjcjNTM+ATc2NzYzMh4DHwEUBgcOAQcGLgInND8BNCYOAQcOCAchFSEKAQcCIyImNTQ+AgMyNjc0LgEnJicmJzQ+ATMXFhcWFQ8BBgciJzc0JicmBgcUFxYXFhcWHQEUBwYHIi4BNT8DMhcUFRQGBxQWMw3sP0MlNQ5EJCQBTkRWIQggBxQECwMGAwMJ+8o/QyU1DkQkJAFORFYhCCAHFAQLAwYDAwndHUM7Mg/JCwgVDnP9kUwUHhUMAawLFRQmIBsbEgsoCRcSFwlTOXA2ZK4SJRwRV1o8SXSUFBocNSg9O00qEiUcEVdaPElHcEYlAjY+osk5gyDJCw4dc/2RTBQeFQwBrAsVHjUsHREoByAHAzU8ovfKJDweChIRGAcECwcIBgMdPRowJScZIRANAQECJw8bOylBEdH8KT0qdXV9kR40KiEWBQ4NIQtDIiIvHA8GaTItPj4SESEeGhsTGA4WBAEV/s42zm/H3naJFSlGGDhSBhwoHncyMQVWjlVlNCNSAxYTKlgQDjUhMUUIJ0EdmAYraGJ6VZFaBBIkLlYBGgMzIAJgTFoaGHiMmkWAATEwDTMOIxAfHycdIl0NTFoaGHiMmkWAATEwDTMOIxAfHycdIl39sRYjKxb9xw4SEwNoaBIVHgSnFiQLDhkcKBwUPRMuJTETcLVHgwYcKjQWMi8ZnnsqLUkqNBwUARwqNBYyLxk8aIdPd45NzUwu/ccOIgZoaBIVHgSnFiQLHDUrHz0RPRBsgkvN/D9TJhQmIhohCwYQCQsGAiIGFx86LEwoJgIDBAFjWW4BDMMBOlGJdpFAp1JWDBchKxo5WD5CGUQEBgsiKCCERiQdHQEQDA0nNzZMOVUxUw+Q/sf9T9P+gqqBLVhMLwFvRzMfNyYUR0JBWleJRwsRHjFpJCQgBFZEGSIGCE86KCgyGX0TNlckcFI9CzpwRzYvIA9uAQEbPQ0VJAAAAAMAAPzdCa0GOAA3AJUA1gAAATIWFRQHDgUjIi4BLwImIyIHIzUBBw4DByMTIRUBNjMyFhc+ATUiLgMnND4DATIeARUUDgIHBgcGHgEXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMhYfARQOAQcOAgcGJic0PwE0Jg4BBw4IByEVIQoBBw4EIyImNTQ+AgMyNjc0LgEnJicmJzQ+ATMXFhcWFQ8BBgciJzc0JicmBgcUFxYXFhcWHQEUBwYHIi4BNT8DMhcUFRQGBxQWMwh0NkRWDiAmLDE4HhciHgosPU0bLz1wAvHnHi0oFRZXbAKp/QhGRx29CBkaDhcSDggCChQaIvkGJDweERIiBxkOCwQUExowJSgZIBAOAgEkEiJFUxfR/B8gNB1w9ZNMXQ8OBhAYByAyF0A2DGkyLT4+EhEhHxkcEhoLGAMBFf7ONs5vHDxUVmw3dYoVKkYZOFIGHSYfdzIxBVaOVWU0I1IDFhMqWBAONSExRQgnQR2YBitoYnpVkVoEEiQuVgEaAzMgAZ5mR3pXDxkUDwoFAwcFFSQkMjoCfQQEESQXHAE5c/21IUYCAiQeBw0VGhASIRsTC/1qP1MmGTIdMAooCg0RCAIXIDktSyklBwNiWo0BQwGMbIlWVW8toq1GQzk/Oy4wDygnAwo5QIRGJBweARAMDSc4NFA0WypaC5D+yP1Q1TdiaUsxqoEtV00vAW9HMx83JRVHQkFaV4lHCxEeMWkkJCAEVkQZIgYITzooKDIZfRM2VyRwUj0LOnBHNi8gD24BARs9DRUkAAAABQAA/N0OXAY4ADEATgCGAOQBJQAAJSImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEGByM2EjcyFhU/ATYzMh4CFxQOAQcGEzQuAiMiBwYHBhUUMzI+ATc+CDc2BTIWFRQHDgUjIi4BLwImIyIHIzUBBw4DByMTIRUBNjMyFhc+ATUiLgMnND4DATIeARUUDgIHBgcGHgEXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMhYfARQOAQcOAgcGJic0PwE0Jg4BBw4IByEVIQoBBw4EIyImNTQ+AgMyNjc0LgEnJicmJzQ+ATMXFhcWFQ8BBgciJzc0JicmBgcUFxYXFhcWHQEUBwYHIi4BNT8DMhcUFRQGBxQWMwx9OYUeyQsOHXP9kUwWHBYLAawLFR01LRwSKB8zU3fQqiRAV1pBREdwRiUCHS0qnxMPHjMiSx1BJyRPLkgvFgccCBIEDAMHBAMK+xw2RFYOICYsMTgeFyIeCiw9TRsvPXAC8eceLSgVFldsAqn9CEZHHb0IGRoOFxIOCAIKFBoi+QYkPB4REiIHGQ4LBBQTGjAlKBkgEA4CASQSIkVTF9H8HyA0HXD1k0xdDw4GEBgHIDIXQDYMaTItPj4SESEfGRwSGgsYAwEV/s42zm8cPFRWbDd1ihUqRhk4UgYdJh93MjEFVo5VZTQjUgMWEypYEA41ITFFCCdBHZgGK2hielWRWgQSJC5WARoDMyAETS39xw4kBGhoEhYdBKcWJAscNyggPT5s5wEKBGEvMi8ZPGmGT1F6VDPNAlwlOy0ZMnCUoj2BGSggDC0NIQweEyMjGWGXZkd6Vw8ZFA8KBQMHBRUkJDI6An0EBBEkFxwBOXP9tSFGAgIkHgcNFRoQEiEbEwv9aj9TJhkyHTAKKAoNEQgCFyA5LUspJQcDYlqNAUMBjGyJVlVvLaKtRkM5PzsuMA8oJwMKOUCERiQcHgEQDA0nODRQNFsqWguQ/sj9UNU3YmlLMaqBLVdNLwFvRzMfNyUVR0JBWleJRwsRHjFpJCQgBFZEGSIGCE86KCgyGX0TNlckcFI9CzpwRzYvIA9uAQEbPQ0VJAAAAAAEAAD83QzwBjgALQCfAP0BPgAAATIWFRQHBiMiLwIuASMiByM1AQcOBQcjEyEVATYzMh4BFz4BNSInNDYBMh4EFRQOBAcGBwYeARcyPgU3Njc2NzYaATcjNTM+Ajc+ATMyHgYfARQOAwcOCQcGJy4BJzQ/ATQnJgYHDgMHIRUhBgoBBw4EIyIuAjU0PgIhMh4BFRQOAgcGBwYeARcyPgU3Njc2NzYaATcjNTM+Ajc+ATMyFh8BFA4BBw4CBwYmJzQ/ATQmDgEHDggHIRUhCgEHDgQjIiY1ND4CAzI2NzQuAScmJyYnND4BMxcWFxYVDwEGByInNzQmJyYGBxQXFhcWFxYdARQHBgciLgE1PwMyFxQVFAYHFBYzC7c2RFZQt0QdKz4oMg4uPnAC8ecUIR8THAsQVmwCqP0IR0YWYGANGBpECz75KRMjGxcOCAcLEQ4UBhkPCgMUFBkwJicZIQ8OAwEkEiFGUhjR/B4gNR1v9ZQTIh8bFxMPDAMPAgQNDQ8CBQgKCg0NDg4PCBkkHh4IaDNBSGU2CSEhHQgBFv7OI3GVSh08VFZsNjthQSMWKUb84SQ8HhESIgcZDgsEFBMaMCUoGSAQDgIBJBIiRVMX0fwfIDQdcPWTTF0PDgYQGAcgMhdANgxpMi0+PhIRIR8ZHBIaCxgDARX+zjbObxw8VFZsN3WKFSpGGThSBh0mH3cyMQVWjlVlNCNSAxYTKlgQDjUhMUUIJ0EdmAYraGJ6VZFaBBIkLlYBGgMzIAGeZkd6V1oPFSQTETI6An0EAgoTDB8OFAE5c/21ISElAgIkHlMuPv1qEhwmKSkSESIZHRQcCSgKDREIAhcgOS1LKSUHA2JajQFDAYxsiVZVcCyirQQJDhEWGR0ROScsJiMeHgQKCwwNDAsKCAUBBAQGOy6ERiQvCghIdxdoc2UckMj+R/5TjzdiaUsxL1BtPy1XTS8/UyYZMh0wCigKDREIAhcgOS1LKSUHA2JajQFDAYxsiVZVby2irUZDOT87LjAPKCcDCjlAhEYkHB4BEAwNJzg0UDRbKloLkP7I/VDVN2JpSzGqgS1XTS8Bb0czHzclFUdCQVpXiUcLER4xaSQkIARWRBkiBghPOigoMhl9EzZXJHBSPQs6cEc2LyAPbgEBGz0NFSQAAv+4/N0HdAY4AFsAkwAABTIeARUUDgQHBgcGHgEXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMh4CHwEUBgcOAQcGJy4BJzQ/ATQnJgYHDgIHIRUhCgEHDgQjIiY1ND4CASImNT8BNCMiDwEGAgcjEzU0IyIOBAcGByc+Ajc2Nz4DMzIVBgcGBz4EMzIWFRQB2CQ8HggLEA8UBhkPCgQTFBkxJScaIBANAwEkEiFGUxfR/B8gNB1w9JQmPi4eCA4OIQtEIBokHh4IaDNBSGU2CzAqCgEV/s43zW8cPFRXbDZ2ihYpRgEOJS0DCx1JQDktiQnYzR0NFw4VCBkEKTEyCR8ZGQcEITdSVypPAgICARUhNzNGJDlX+D9TJhEiGR0UHAkoCg0RCAIXIDktSyklBwNiWo0BQwGMbIlWVW8toq0SIzMhOVg+QhlEBAQEBjsuhEYkLwoISHcenZEnkP7I/VDVN2JpSzGqgS1XTS8DajovJywZcHNz/iobAroSOgYGFAgfBTNOHRcuHRsIAyExOyBlDBkaDCAtPSUaVzmiAAP/uPzdChYGOAAyAI4AxgAAATIeARUUBgcOBSMiJi8CJiMiByM1AQcOAwcjEyEVATYzMhYXPgI1Iic0NgEyHgEVFA4EBwYHBh4BFzI+BTc2NzY3NhoBNyM1Mz4CNz4BMzIeAh8BFAYHDgEHBicuASc0PwE0JyYGBw4CByEVIQoBBw4EIyImNTQ+AgEiJjU/ATQjIg8BBgIHIxM1NCMiDgQHBgcnPgI3Njc+AzMyFQYHBgc+BDMyFhUUCNwlOB0rKw0hJiwxNx8iLxArPU4bLj5vAvDmHi0pFBdWbAKo/QlGRh29CRAXC0QLPvkqJDweCAsQDxQGGQ8KBBMUGTElJxogEA0DASQSIUZTF9H8HyA0HXD0lCY+Lh4IDg4hC0QgGiQeHghoM0FIZTYLMCoKARX+zjfNbxw8VFdsNnaKFilGAQ4lLQMLHUlAOS2JCdjNHQ0XDhUIGQQpMTIJHxkZBwQhN1JXKk8CAgIBFSE3M0YkOVcBnjFOLj5nLA8ZFA8KBQcIFSQkMjoCfQQEESQXHAE5c/21IUYCAhEdFFMuPv1qP1MmESIZHRQcCSgKDREIAhcgOS1LKSUHA2JajQFDAYxsiVZVby2irRIjMyE5WD5CGUQEBAQGOy6ERiQvCghIdx6dkSeQ/sj9UNU3YmlLMaqBLVdNLwNqOi8nLBlwc3P+KhsCuhI6BgYUCB8FM04dFy4dGwgDITE7IGUMGRoMIC09JRpXOaIAAAH/g/6iAl3/nAANAAAFDgEjIiYnMx4BMzI2NwJdJ8uFh7kjFyLLY2TQKGR0hoN3RlJSRgAB/4P+ogOD/5wAEQAABQ4CIyIuASczHgIzMj4BNwODGazYa2nSpxYWF7XHUVnIsxtkS3U6OXZLL0ghIUgvAAAAAf+D/qIEy/+cABEAAAUOAQQjIiQmJzMeAQQzMiQ2NwTLGtD+3qCX/uTSFxYX5wEQenkBEu0bZEt0Ozp0TC9IISFILwACADD/7APQBWEADQAdAAAkEhE0JwIgAwYVFBcWMwEWFRQHAiEiJyYREDc2ITICnG4hPv6sPyEiQLABYmU+df7gxX+IW3sA/+YlAUIBMfORAQ7+6pTy44j+BErD/cew/rWzvwFIAQK6/QAAAAABAOMAAAMlBV4AFgAAABYVERQWFxUhNT4BNRE0JiMiBgc1JTMCYgFScP3MeUoYKBpTJAFvDAVZBQn7TE0qBBweBjZaA54wMh0QHLsAAQA9AAADywVlABsAADcIATU0JiMiBwYHJz4BMzIWFRQCASEyNjcXAyE9AW4BBqBviVUvKysy74mp0eL+hgHLYE4xGm/84RcBfAFkqZSbZDdyCeaz1Zqk/tD+ey5ZDP7pAAAAAAEAPf7sA8sFZQAjAAA3CAE1NCYjIgcGByc+ATMyFhUUAgEhETMRNjc2NxcDIxEjESE9AW4BBqBviVUvKysy74mp0eL+hgG0ehYOJzEabyd6/YIXAXwBZKmUm2Q3cgnms9WapP7Q/nsBTf68BggXWQz+6f7sARQAAAEAWf/wA3cFawAvAAA2FjMyNjU0JyYjIgYHJz4BNTQmIyIHBgcnPgEzMhYVFAcGBxYXFhUUACEiJjU0NjPWtT+MiDdd3Q0YEAKguJFdblQuNR8o2o+Zp0UnUmA6bf7V/ux7YyElrnK9b2tRiQECGjqWe21yUSxcB5i2qG5hUS45KTdpob7+3kkqGjAAAgAXAAADxwVeAAIADQAACQEhEzMRMxUjESMRITUCVf4VAetCX9HRn/3ABJD9SgOE/HyF/qsBVYUAAAAAAgAXAAAEeAVeABIAFQAAATMRMxEzETMVIxEjESMRIxEhNQkBIQKXX6p5X195qp/9wAI+/hUB6wVe/HwBAP8Ahf79AQP+qwFVhQK2/UoAAAABAED/6QN/BX8ALAAANhYzMjY1ECUmIyImJz4BNxMhMjY3FwcOASMhBxYXFhceARUUACMiJyY1NDYz0rkyc6z+7JmEFgsIAgMC2gGtICMcEE4EJBX+fVWkTH1USEr+xfFiPGQrLbeBy5QBA3I/AwkICwUB3hYeDrkJBa8cGSpSR7Fj3f7YEx9QHi0AAAEAQP/pA38GCAA0AAA2FjMyNjUQJSYjIiYnPgE3EyE1MxUzMjY3FwcOASsBFSM1IwcWFxYXHgEVFAAjIicmNTQ2M9K5MnOs/uyZhBYLCAIDAtoBBnkuICMcEE4EJBUSefhVpEx9VEhK/sXxYjxkKy23gcuUAQNyPwMJCAsFAd69vRYeDrkJBcbGrxwZKlJHsWPd/tgTH1AeLQAAAAEAQP/pA74FfwAzAAA2FjMyNjUQJSYjIiYnPgE3Ey8BFzchMjY3FwcOASsBBRclBxYXFhceARUUACMiJyY1NDYz0rkyc6z+7JmEFgsIAgMCgsUC+yQBrSAjHBBOBCQV4gGqAv2VN6RMfVRISv7F8WI8ZCstt4HLlAEDcj8DCQgLBQEcTYhiTxYeDrkJBaaI8XIcGSpSR7Fj3f7YEx9QHi0AAAAAAwBB/2QDfwYEAAcANAA7AAAlFjMyNjU0JwE2NzY3FwcOASsBAxYXHgEVFAAjIicHIzcmNTQ2MzIXEyYjIiYnPgE3EyE3MwEjBxYXMDMBMFwxc6yyAQAOChEcEE4EJBUMcTktSEr+xfEoIjh+Q0UrLRYb95WBFgsIAgMC2gFJS37+9flVpEwBdT/LlNBzAnUDBgseDrkJBf7sICxHsWPd/tgDiaUgQx4tCQJfPAMJCAsFAd65/qavHBkAAAACAEb/6gO+BXgAFwAlAAAAAiMiABEQJTYhFw4BBw4BBzY3NjMyFhUnJiMiBwYVFBIzMjY1NAO+67yw/t8BGPoBOAV9tUdJgBg+LVBRn9jhRqibMx6LlndsARD+2gFKARIBYf3UIRdPR0jebSYSINzMn6xcNn6j/sjLiIUAAgBE/+oDvgV4AA0ALgAAASYjIgcGFRQSMzI2NTQWAiMiABEQNy8BBTYhFw4BBwYHBRclBgcGBzY3NjMyFhUC3UaomzMei5Z3bLfrvLD+3+zsAgFb4QEQBX21RwECAaMC/gYZGEAYPi1QUZ/YAmasXDZ+o/7Iy4iF7/7aAUoBEgFE8FyIh6EhF09HAQKjiMUkKm9tJhIg3MwAAAAAAQAo/+0DlwVLAAwAAAEVASMBISIGByc+ATcDl/5OhAGV/kxhVUEjQR8ZBUsh+sMEx0BmEKBLQgABACj/7QOXBiQAFAAAARUBIwEhESMRBgcGByc+ATczNTMVA5f+ToQBlf6feUQiKkEjQR8Ze3kFSyH6wwTH/ugBFwYZIGYQoEtC2dkAAQAo/+0DtgVLABQAAAEVAx8BJQMjEy8BBRMhIgYHJz4BNwOX2/gC/t+whMPuAgEYqv5MYVVBI0EfGQVLIf1cYohy/d8CTV6IbgICQGYQoEtCAAAAAwB0/+oDkAVjAAsAGAAzAAAkNjU0JicOARUUFjMTNjU0JiMiBhUUFhc2BSY1NDYzMhYVFAcGBx4BFRQGIyImNTQ3NjcmAn52fcJWTo1tjz51d1x4jXNe/lRK26+hvmE4faqT2baj6VE1g4QigGBth4k2rFCJogNrTW1fhXRTXqFHQg1gdIS4rnN1XTVFfrt/kMS1lH9hP1hqAAAAAgA9/9ADrwVjAA4AKwAAADY3PgE1NAIjIgYVFBYzGgEVFAIHBgcGByc2NzY3PgE3BwYHBiMiJjU0EjMCQ5EKBAaMh2J5cZTA8HJtf8NtpgpoRXxLan8QI0pkNCuqx+25Aj1MGgqBKNABBLKxkvgDJv6h2Jj+xnuORScVKBgbMUdl+VQaOBUM8afVARQAAAAAAgA9/9ADwAVjAA4ANgAAADY3PgE1NAIjIgYVFBYzGgEVFAIHBgcfASUGBwYHJzY3Njc2NyUnBTY3NjcHBgcGIyImNTQSMwJDkQoEBoyHYnlxlMDwcm0DBPUC/qBddW2mCmhFfEsCA/5eAgH9KyBAECNKZDQrqsftuQI9TBoKgSjQAQSysZL4Ayb+odiY/sZ7BARfiIlEKScVKBgbMUcCAqOIxjk/fVQaOBUM8afVARQAAAAAAQAo/+0DvgVLABQAAAEVAzcXBQMjEwcnJRMhIgYHJz4BNwOXr9QC/vbPhL/oAgEfof5MYVVBI0EfGQVLIf3jXYh0/X8CQGWIfQHnQGYQoEtCAAAAAAAOAK4AAQAAAAAAAAAAAAIAAQAAAAAAAQALABsAAQAAAAAAAgAHADcAAQAAAAAAAwAoAJEAAQAAAAAABAALANIAAQAAAAAABQALAPYAAQAAAAAABgALARoAAwABBAkAAAAAAAAAAwABBAkAAQAWAAMAAwABBAkAAgAOACcAAwABBAkAAwBQAD8AAwABBAkABAAWALoAAwABBAkABQAWAN4AAwABBAkABgAWAQIAAAAAVgBlAHIAbwB2AGkAbwBUAGUAeAB0AABWZXJvdmlvVGV4dAAAUgBlAGcAdQBsAGEAcgAAUmVndWxhcgAARgBvAG4AdABGAG8AcgBnAGUAIAAyAC4AMAAgADoAIABWAGUAcgBvAHYAaQBvAFQAZQB4AHQAIAA6ACAAMQA3AC0AMQAwAC0AMgAwADEANAAARm9udEZvcmdlIDIuMCA6IFZlcm92aW9UZXh0IDogMTctMTAtMjAxNAAAVgBlAHIAbwB2AGkAbwBUAGUAeAB0AABWZXJvdmlvVGV4dAAAVgBlAHIAcwBpAG8AbgAgADEALgAwAABWZXJzaW9uIDEuMAAAVgBlAHIAbwB2AGkAbwBUAGUAeAB0AABWZXJvdmlvVGV4dAAAAgAAAAAAAP9nAGYAAAAAAAAAAAAAAAAAAAAAAAAAAABWAAAAAQACAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETARQBFQEWARcBGAEZARoBGwEcAR0BHgEfASABIQEiASMBJAElASYBJwEoASkBKgErASwBLQEuAS8BMAExATIBMwE0ATUBNgE3ATgBOQE6ATsBPAE9AT4BPwFAAUEBQgFDAUQBRQFGAUcBSAFJAUoBSwFMAU0BTgFPAVABUQFSAVMBVAd1bmlFMUQwB3VuaUUxRDEHdW5pRTFEMgd1bmlFMUQzB3VuaUUxRDQHdW5pRTFENQd1bmlFMUQ2B3VuaUUxRDcHdW5pRTFEOAd1bmlFMUQ5B3VuaUUxREEHdW5pRTFEQgd1bmlFMURDB3VuaUUxREQHdW5pRTFERQd1bmlFMURGB3VuaUUxRTAHdW5pRTFFMQd1bmlFMUUyB3VuaUUxRTMHdW5pRTFFNAd1bmlFMUU1B3VuaUUxRTYHdW5pRTFFNwd1bmlFMUU4B3VuaUUyNjAHdW5pRTI2MQd1bmlFMjYyB3VuaUUyNjMHdW5pRTI2NAd1bmlFNTIwB3VuaUU1MjEHdW5pRTUyMgd1bmlFNTIzB3VuaUU1MjQHdW5pRTUyNQd1bmlFNTI2B3VuaUU1MjcHdW5pRTUyOAd1bmlFNTI5B3VuaUU1MkEHdW5pRTUyQgd1bmlFNTJDB3VuaUU1MkQHdW5pRTUyRQd1bmlFNTJGB3VuaUU1MzAHdW5pRTUzMQd1bmlFNTMyB3VuaUU1MzMHdW5pRTUzNAd1bmlFNTM1B3VuaUU1MzYHdW5pRTUzNwd1bmlFNTM4B3VuaUU1MzkHdW5pRTUzQQd1bmlFNTNCB3VuaUU1M0MHdW5pRTUzRAd1bmlFNTUwB3VuaUU1NTEHdW5pRTU1Mgd1bmlFQTUwB3VuaUVBNTEHdW5pRUE1Mgd1bmlFQTUzB3VuaUVBNTQHdW5pRUE1NQd1bmlFQTU2B3VuaUVBNTcHdW5pRUE1OAd1bmlFQTU5B3VuaUVBNUEHdW5pRUE1Qgd1bmlFQTVDB3VuaUVBNUQHdW5pRUE1RQd1bmlFQTVGB3VuaUVBNjAHdW5pRUE2MQd1bmlFQTYyB3VuaUVDQzAAAAAAAAH//wACAAEAAAAMAAAAFgAeAAIAAQADAFUAAQAEAAAAAgAAAAEAAAABAAAAAAAAAAEAAAAA1aPejAAAAADQZzF6AAAAANnDOqc=";
+var vrvTTF = "AAEAAAAOAIAAAwBgRkZUTYpmj14AAG6sAAAAHEdERUYAKQB5AABuhAAAACZPUy8yj3RmXgAAAWgAAABgY21hcLwdiigAAAL8AAABymN2dCAARAURAAAEyAAAAARnYXNw//8AAwAAbnwAAAAIZ2x5ZiXphFYAAAV0AABj7GhlYWQleSYgAAAA7AAAADZoaGVhH8MXJwAAASQAAAAkaG10eMjH7A0AAAHIAAABNGxvY2EIPB9cAAAEzAAAAKhtYXhwAJ0B8AAAAUgAAAAgbmFtZVN3z1MAAGlgAAAB1HBvc3Trc+9cAABrNAAAA0gAAQAAAAEAAKkBXvpfDzz1AAsIAAAAAADQZzF6AAAAAN4yoJb9+fzdGccSNgAAAAgAAgAAAAAAAAABAAAGZv5mAZoZgv35/vcZxwABAAAAAAAAAAAAAAAAAAAARwABAAAAUwG/AAgAAAAAAAIAAAABAAEAAABAAC4AAAAAAAQGNwGQAAUACAUzBZoAAAEfBTMFmgAAA9cAZAIQAAAFBgAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAFBmRWQAwCZt7MAGZv5mAZoJCwKkAAAAAQAAAAAAAAAAAAAAIAABAuwARAAAAAACqgAAAmMAPgH7AD4CZAA+B5IAAAg7AAADngAABLoAAAS6AAAFPgAABEAAAAOsAAACuwAAAqoAAARsAAAEiwAABIEAAASBAAAEgQAABJwAAASLAAAEiwAAAaEAfQJjAD4B+wA+AmQAPgMWAC0EPwA+BFj/UAWz/2IDSP3+Ay3/uAK8AAADqf9/BBL/dBmC/1AVRP9QERH/UAzX/1AIuf9QCmX/Ygj9/2IH9/9QBsX9/gm3/foM/v36EEn9+hOR/f4H8P3+Bu79/gYEAAAKtAAADu4AAAjOAAANfQAADBgAAAZz/7gJPf+4AeD/gwMG/4METv+DBAAAMAQAAOMEAAA9BAAAPQQAAFkEAAAXBJAAFwQAAEAAQABAAEEARgBEACgAKAAoAHQAPQA9ACgAAAADAAAAAwAAABwAAQAAAAAAxAADAAEAAAAcAAQAqAAAACYAIAAEAAYmb+BJ4dPh1eHX4dnh2+Hd4d/h4eHj4eXh5+Jk5T3lUupi7MD//wAAJm3gReHQ4dXh1+HZ4dvh3eHf4eHh4+Hl4efiYOUg5VDqUOzA///Zlh/BHjseOh45HjgeNx42HjUeNB4zHjIeMR25Gv4a7BXvE5IAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBgAAAQAAAAAAAAABAgAAAAIAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQFEQAAACwALAAsAGgAhAC6AXoCGAKWAygDZAP0BEQEiATEBOIFJgWsBlYHJggeCSoKRguKC54L2gv2DCwMVAy+DSgNnA4SDmQOwA8AD2IRwhPAFVoWkhdkGDwZLBoQGsgb1B1SH0IhsCKWI1AkJiViJwwoIimYKyAr6izuLQgtKC1KLYAtpi3YLhQuWi54LqAu5i80L4Yv5DAiMHAwjDCyMNwxKjFyMcwx9gACAEQAAAJkBVUAAwAHAC6xAQAvPLIHBADtMrEGBdw8sgMCAO0yALEDAC88sgUEAO0ysgcGAfw8sgECAO0yMxEhESUhESFEAiD+JAGY/mgFVfqrRATNAAAAAgA+AH0CLgbHABQAJAAAEz4CMzIWFxYfARQHDgMPAREzEyIGBxE2NzY1NDY1NCYvAXAzNFQuLzMlOQsKcQw2Gy8X3DKwOUkubUVQAgwPFANGGRYUDRQeQD9ifQ07Hi4WxQZK/HUiJ/4bbGZ6WA0iAxogEQcAAAAAAgA+/sUBxwWgAAgADAAANxEzESUwESMRLQERBT4uAVsr/tABMP7QXAVE/iI4+ssB0aIrAbgvAAACAD7+4wIrBaoAGwAfAAABETMRNxUHETcVBxEjEQcRIxEHNTcRBzU3ETMRFRE3EQGSK25ubm4rvipsbGxsKr4EBAGm/mYj4yT+ZB7kIP58AXg4/n0BdSHhIwGhIuYgAab+aeb+XzYBpAAAAAAFAAD/4AeUA5AAGAAmAGwAeQCFAAABNC4DJyYnNSEgERQHBgQjITUyNjUTNwU0JiMiBgcDBxYzMj4BASIGFBceARceAhcWFRQHBgcGIyInLgInIgcGByMTMwcUFxYXFjMyNzY1NCcuAScmJyYnJjU0Njc2MzIXFjMyNzMDIzQBIiY1NDYzMhcWFRQGISImJzQ2MzIWFRQGASwKDB4VFwgEAVYBxlhS/tuv/qI1PrIFAg+MlCMqCcsEBl+a2mwC+zxVIiQlIwovJw0oKy06MFYiUQ0pHgoVDw8DGy8iBwsNJTJaUSg3IAsvEBkOSSUkHihBaFQlJCIXIB02F/zpIictHBsUFykDZiEoBjEeISUpAzMPFQ0LBQQCART+iqR9cIgXRDUCgxT2m5gJEP0oGTSD6gHPT3UwKyceDDkwEEFEQlFCHyAgAwgHBRcEGQEwJhY+IyU/NjNJQioMOhAZEEY8K08/QyFBEBYm/vTf/J4nIyIrGw0lHC4iHR0uKCMdIgAFAAD/zgg9A5QAFAAkAFAAXQBrAAA1MjY3Ez8BNCcmJzUhIBEUBwYEIyEBNCYjIgYHAwcWMzI3Njc2ATI2NxcGIyInJicmNTQ3Njc2OwEyHwI3MwMjNCcmIyIHBgcGBwYVFBYXFgUiJjU0NjMyFxYVFAYhIiYnNDc2MzIXFhUUBjU5BbIFAhIPSwFWAcZYV/7hsP6iAzmMlCMqCcsEBl+KbnA7PQK+b5xFEp/jaFM7QStNT4WJjikUDlE/OBcyGDlBX4NYYS8eCw0ZHzn+RiInLRwbFBcqBBEeKQQXEyEbGw8oF0E4AoMUDBgSDw8U/oqkfXGHAjGZmgkQ/SgZNE1Cd2X+hlVRFtkyKGhWapKGgVxPBRASIv7mcz87WFSCRDZINEphKVMXJyMiKxsNJRsvJBsnDRcVEyMcIwAAAwAAAAADnwSFAD8ASwBXAAATIgYVFB4FFxYXATMBFhcWFRQGIyImNTQ2MzIXFjMyNjU0JyYnJicBIwEmJyY1NDc2MzIWFRQGIyIvASYDFAYjIiY1NDYzMhYBNDYzMhYVFAYjIib0JDITGjQoSSspDwcBN1z+t4ZSX6F2RWc7JkQUFDIsMxIfhENE/tJaAT6jU0h5O0hRfD4nPhEQEX0vIigwLiMmMgJPLyQlLzEjJS4ELVAuGS4kKRsmFBMHAwHO/g5FUmJ5c6BiQyQxVU1ENichOUciIv4rAfdMaF1hiV0tZEojLjg0O/2EJDIrJCQ0LgECKC4zISUuMAAABQAA/1sEuwUcAD4ARwBTAFsAZAAAASMUDwIOCQcOAQcVIzUnJicuAS8BNSM1MzQ2NzY/Aj4CNzY3NTMVHgMXFhcWFx4BFTMhJzU0Jy4BIxEjESIHBgcOAQcVFAcFIxEyNzY/AQERIx0BFBYXFgS7kB4fJAEQBA8GDwgOCgwFImhRT1gbGWB1JR2TkwkSFi00Nh0cLyI2G08JNRslCyolMzoaR5D+hQQVC2E2TzE3MwoDCwQGAcm9NTMtDRX++r0uJTMCDTlrWEYBFQUUBxIIDwkLBRolFKWlDgMKNJx+WExbODg0WkREOBYSEgUJB6enAQcECgcQIilTLt03MVQ7R0F2/kIBvjtANRRRFVEUL1v+Rjc0RYz+xAG6L1NHjC43AAAAAAUAAP9bBLsFHAAUABgAHAAgACQAAAEjESEVIzUhETUjNTMRITUzFSERMyERIxEjESMRBSMRMyERIxEEu5D+Wk/+XZOTAaNPAaaQ/oW7T70Byb27/va9Ag3986WlAcFMWwINp6f98wG+/kIBvv5CW/5GAbr+RgAAAAYAAACbBT4DTwANAB0AMABKAFoAaQAANxQrASI1ETQ2OwEyFhUTFAYrASImNRE0NjsBMhYVBTIeAhUUDgMjIi4CNTQkBwYVFBYXFhcWFxYzMjc2NzY1NC4BIyIOAgEUBisBIiY1ETQ2OwEyFhUTFCsBIiY1ETQ2OwEyFhVFFB0UCwkdCQuDDQgeCA0NCB4HDgHhTqOEVR5GbaZqeLVpNAEIEwUsIhIcLj0eHSIeVBACSIFJHi81JgL4DggeBw4OBx4IDn8WHQgODggdCQ2oDQ0ClgYKCgb9agYHBwYClgYKCgYzK0lpOjBRSDMdLlBiOXegjB4VM2ksGRgrEggIFlgMHUSJWwYQJf4OBgcHBgKWBgoKBv1qDQcGApYGCgoGAAIAAAAMBEIEDQApADgAAAEyFhURFAYjIiY9AS4CIyEiBh0BFAYiJjURNDYyFh0BFjMhMjY9ATQ2ARUUFjMhMj0BNCYjISIGBCQNERENDxMDCyAP/LMSJBMaFRUaEx0RA1UYJRP8LU5EAqKMTED9VEhABAwUDvxDDRQUDVUGERwmF0sNFBQNA70OFBQOYT0iIFwOFP4aUCUvVF8hKSsAAAACAAABCwOsAzsAEgAsAAABMh4CFRQOAyMiLgI1NCQHBhUUFhcWFxYXFjMyNzY3NjU0LgEjIg4CAeFOo4VVHUZsp2t4tWo0AQcOCCojDiAxOCMYHSdSEAVIgkgfMTQkAzoqSGk5MFFJMx0tUGM6dp6KEicyaCcUICcTCQkWWBQUQoleBhIkAAAAAgAAAOMCuwluABcAKAAANyImNTQ+BTMyFxEzERQOBQMGFRQXFjMyNz4BNTQnJiMi5mWBDiEwTF2BSWtBPQsdLEteiBrXEBxCVJN4XxAZO03kaFwcQU5KRTQfOAZx+P8TN0xMSzkjAZN8WBMcNWFOYSYXFDQAAAAAAQAAAOsCqgluABEAAAERMxEUDgIjIiY1ND4CMzICbD1WhKVMYH5IeatcZwL4Bnb4/0aQaUNnWEqOa0EAAQAAAPIEbAnHAC0AAAEWFxITFRQGBwYjIicmNTQ3NjU0JwInERQOAiMiJjU0PgIzMhcRNDY7ATIWArgvptQKJgsSFgsCHgUuLmPgVoSlTGB+SHmrXGc9CQsMERYJodXn/tj+1xBIuxglAxIfEQpphoV+ARMt+q1Gj2lCaVhJjGpBNga1DgYOAAIAAADyBIsJvwBFAGEAAAEUFhUWHQEUBgcGIyIuAScuATU0NzY1NCcuBCcRFA4CIyImNTQ+AjMyFxEzMhceBBceBBcWFRQOAQcGJzY1NCcuAisBIgYVFBceAxcWFxYzMjc+AQRNAzoJBREWBAUHAwkQAw4/IUhBSjwkVoSkS2B+SHmrXGc9HiQFCSQ1MUsZMzA5GRYHBBYVBQMXAjYjUnI3EgkRAw40LVYXRCUFChMEBgkFrgQNAnN2KUeICCICBAECGRILBVxSoX9EZDslDgL7uEaPaUJpWEmMakE2BsIXO1pBLkAbNzVJM0EoFy42d0MJBcINGlxSNFZADAYEAzhdMlUaTTkHCgknAAADAAAA8gSBC08ASQBkAHsAAAEVFAYHBiMiJiMmPQE2NTQnLgQnERQOAiMiJjU0PgIzMhcRNjMyFhceBBceAxcWFRQHFhcWFRQOAhUGFRQXFgM2NTQnLgIjIgYVHgMfARYXFjMyNjc+ARM0NjU0Jy4DIx4EFx4CFz4BBIAJBBYSAwgDGRJAIUdASTsjVoSkS2B+SHmrXGc9CgwLHQIKJTUySRg7PDcZCQIoGwsFDg8QAwMuTQIzIlJ3PgYUDzQvUhgKLy4DDAcOAwIFBQUeKVhZUy0JIjIuRhcPNSENBBIEujg/fAghAwwnDGdHn3xCYTkjDQP7ukaPaUJpWEmMakE2CDgaGw47WUEuPxs/Rk9FLhQnbmw0QTIXKFs7MwEFCAsFaAE/DyJZSzRTPhYDOFozTx0KOUAKCQUHIAGsBx0ILTdFYDMVOFdALUEZETglEg8/AAAABAAAAPIEgQzmAE4AagCBAJgAAAEWFxUUBgcGIyInJj0BNjU0Jy4EJxEUDgIjIiY1ND4CMzIXETYzMhYXHgQXHgMXFhUUBxYXFhUUBxYXFhUUDgIVBhUUJzY1NCcuAyMOARUeAx8BFhcWMzI2Nz4BEzQ2NTQnLgMjHgQXHgIXPgETNDY1NCcuAyMyFR4EFx4CFwRLLgcJBBcRCQUZEkAhR0BJOyNWhKRLYH5IeatcZz0KDAsdAgolNjFJGD05OBkJAiodCwIoGwsFDg8QAxwCMxk7S1svBhQPNC9TFwozKgMMBw4DAgUFBR4pWFpSLQkiMi5GFw42IQ0EEgMFHilYWFMuAgohMStIFw03HwwFomx6Oj18Ch4CDSQPZ0ebf0JiOCQNAvu4Ro9pQmlYSYxqQTYJzxkZDDtZQi4/GkJCUkUvEiZnfTRHEiduazRCMhUoWzw0AQUHC88SIVZOJkE8IwIVAzdcMlEaCj89CAoECB4BrgcdBys3RWIzFjlXQSxAGg87JRAPPgGjBhsILTdEYDQWCDtYQyxCGA87IxEAAAAFAAAA8gSBDmMAVABwAIcAngC2AAABFhcVFAYHBiMiJyY9ATY1NCcuBCcRFA4CIyImNTQ+AjMyFxE2MzIWFx4EFx4DFxYVFAcWFxYVFAcWFxYVFAcWFxYVFA4CFQYVFCc2NTQnLgMjDgEVHgMfARYXFjMyNjc+ARM0NjU0Jy4DIx4EFx4CFz4BEzQ2NTQnLgMjMhUeBBceAhcTNDY1NCcuAyMeBBceAxc+AQRLLgcJBBcRCQUZEkAhRz9IOyNWhKVMYH5IeatcZz0KDAsdAgolNTJJGDs8NxkJAiUYCwIqHQsCKBsLBQ4PEAMcAjMZO0tbLwYUDzQvUxcKMyoDDAcOAwIFBQUeKVhaUi0JIjIuRhcONiENBBIDBR4pWFlULwMJIjIsSBcNNx8MHAUeKVlaUy4LIzMuRRcLLRYcCwUQBaJsejo9fAoeAg0kD2dHm39CYDkkDgL7uEaPaUJpWEmMakE2C00YGQ86WUEuPxs/Rk9GLhQpYm0zPhImZ300RxInbms0QjIVKFs8NAEFBwvPEiFWTiZBPCMCFQM3XDJRGgo/PQgKBAgeAa4HHQcrN0ViMxY5V0EsQBoPOyUQDz4BowYbCC03RGA0Fgg7WEMsQhgPOyMRAeIHHQgsOERgMxY2VD0sPRoMMRgiDhQ6AAAABgAAAPIEiA+xAF8AfQCMAJsArwDDAAABFhUUBxYXFhUUDgEHHQEWFxQWFRQGBwYjIicuATU0NzY1NCcuBCcRFA4CIyImNTQ+AjMyFxE0NjMyHgIVHgQfAR4DFxYVFAcWFxYVFAcWFxYVFAcWAzY1NCcuAysBIgYVHgMXFhcWMzI2Nz4DEzY1NCcmJx4DFxYXNhM2NTQnJiMeBB8BNhE2NTQnLgMjHgQfAT4CEzY1NCcuAyMeBB8BPgIEgAgkDgMJGREHMAkCCwgOFwoGDBACEj0hSEBKOyRWhKVMYH5IeatcZz0ZBQgHCwULJTkwUBgiMy41GAYGJRkGBiUaBQYlGUwFOBg6SVYrDQoNDTIuVxg0MAcKCA4CAwMCAQEIHovSDjgzWxtOJwsECB6N0AwkMy5HF3AUCB4pWlpTLQwkMy5HF3ADCQcBCB4pWlpTLQwkMy5HF3ADCgYIWB4kXXUrJighNXszEgoTaX0IKApFeQgkBgIaEQsIa0OWhkRkOyUNA/u8Ro9pQmlYSYxqQTYMoQcLAQYQDTlcSTFJGSc2N0pBKBQqZ3UzMRQraXQ1LhQtanAz/esaElZTJUM8JBEKOFsyVhs4TggKBQUOCxEBgxMYKjfsBTlbL00cVjQgAZYXFyo38TJQQS9EGX5LAYITGSo0RmM0FjFRQS9EGX4MIxkBhRcYKzNHYjQWMlBBL0QZfQoiGAAAAAAHAAAA8gSLERsAZgCBAI8AngCtALwAywAAARYXFRQGBwYjIicuATU0NzY1NCcuBCcRFA4CIyImNTQ+AjMyFxE0Nj8BMh4CFx4EHwEeBBcWFRQHFhcWFRQHFhcWFRQHFhcWFRQHFhcWFRQHFhcWFRQHIhUUFic2NTQnLgErASIGFR4EFxYXFjI2Nz4CEzY1NCcmJx4DFxYXEzY1NCcmIx4DFxYXNhM2NTQnJiMeAxcWFzYTNjU0JyYjHgMXFhc2EzY1NCcmIx4DFxYXNgRSMQcJBRMUCQoKDwMOPyFIQEs6JFaEpUxgfkh5q1xnPQ8HCAkHDAUBCiY4M0oZICsoNRgWBgQmGAoEJhcLBCYXCwQmFwsEJBAGBC4CAh8FODWYUQ0LDQsgLypCFkYhBw8PAQQEAwIFHpDNDjc0WBxRKQ8FHo7PDzgzWRpPIRIHBR6Ozw84M1oZUR8SBwUejs8PODNaGVgYEAkFHo7PDzgzWhlLJRQFh215PEN6ByUGARsSCgVcVZyARGU6JA0D+89Gj2lCaVhJjGpBNg4MBgkBAgEGDw05W0czRholLitCLTwhJBVggjMyIxVkfDE2IxhcgjA0IxVlfDE2IxdKji4kFjRriwoDC9sZEFlQUnYQCi5JPCtAGE82BwkGBhAWAYIPHyo46wU6WjBMHlYyAbYOIC0y8zxmOVodVCc0AZkNHi0y9D1mOFkcVig0AZoPHywy9D1mN1kdYR0uAaAMHyc39D1lOFkcUC4+AAAACAAAAQsEixI2AHEAjwCdAK4AvADMANoA6wAAARQWFRQGBwYjIicuATU0NzY1NCcuBCcRFA4CIyImNTQ+AjMyFxE0Nj8BMh4CFx4EHwEeBRcWFRQHFhcWFRQHFhcWFRQHFhcWFRQHFhcWFRQHFhcWFRQHFhcWFRQOAQcGFRQWFRYDNjU0Jy4CKwEiBhUeBBcWFxYzMjY1PgMRNjU0JyYnHgMXFhcTNjU0JyYjHgQXHgEXNhM2NTQnJiMeBB8BEzY1NCcmIx4EFxYXNhM2NTQnJiMeBB8BEzY1NCcmIx4EFx4BFzYEiAIMBhIUCwULEQMPPSJJQEo6I1aEpUxgfkh5ql1iQg8HCAkICwUBCiY4M0sYHiccNhQdDQQFJxsHBScbBwUnGwcFJxsHBScbBwUkEQMIGBEHAwMwUAY5IlFzOA0IDQogLipCFj4oCAoHDgQEAgIIHo3SDTg1WRxGMg4IHpDPDCUzLkYXDlASBBIIHpDPDCUzLkYXcBYIHpLNDCUzLkYXIU8CFAgekM8MJTMvRRdwFgggjdAMJTMvRRcKVBIKBDgIKAtAfQgkBAIcEQoHWFeefkRlOiQNA/xSRo9pQmhYSo1qQTYPCgYJAgIBBhANOlxHM0YbICsfQCAzLhwoE1+CMDcjFWJ8MDcoE2N8MDcjFV+CMDQjFWV8MDQoFl15NR4nIDZ7NBEDBwUMAWkBRRkTVlA0VkAQDC1IPCtBGUJDBwkGBQ4KEwGAExkrNuwEOVowSxxOPQG1FxgoN/QyUUEwQxoQWRQMAcISGCo48TJRQC9DGX8BzRYYJzfzMVFAL0IZJVwGAccXGCU39TFRQDBDGn4BzRMZJjzwMlFAMEMaDFsVHAAAAQB9AXQBoQKcAAkAABM0NjIWFRQGIiZ9V3ZWVnVYAgc7Wlo7OllZAAIAPgB9Ai4GxwAUACQAABM+AjMyFhcWHwEUBw4DDwERMxMiBgcRNjc2NTQ2NTQmLwFwMzRULi8zJTkLCnEMNhsvF9wysDlJLm1FUAIMDxQDRhkWFA0UHkA/Yn0NOx4uFsUGSvx1Iif+G2xmelgNIgMaIBEHAAAAAAIAPv7FAccFoAAIAAwAADcRMxElMBEjES0BEQU+LgFbK/7QATD+0FwFRP4iOPrLAdGiKwG4LwAAAgA+/uMCKwWqABsAHwAAAREzETcVBxE3FQcRIxEHESMRBzU3EQc1NxEzERURNxEBkitubm5uK74qbGxsbCq+BAQBpv5mI+Mk/mQe5CD+fAF4OP59AXUh4SMBoSLmIAGm/mnm/l82AaQAAAAAAQAtANwC5gNmABsAABMzFRczNzUzFSMHFRczFSM1JyMHFSM1Mzc1JyMuyCnVKcifRESfyybYJsiiRkudA2aSLiuVw0xmV72UKSmUwlJmTwADAD4AfQQIBsgADgA2AEUAAAEiBgcRNjc2NTY1NCYvASUyFxEzET4CMzIWFxYfARQHDgMPAREOBAcGDwERMxE+AgciBgcRNjc2NTY1NCYvAQL6OEotbEVQAwwPFP44lSwyMzNULy4zJTkLCnANNhsuF9wJHCodNAcgONwyMzNUCzhKLWxGUAIMEBQDPCEn/hptZXpYFxsaIBIHU2cDpfx+GRcUDRQfQD5jfA08HS8VxQHxFC00IjoIJyzFBkr8fhkXFE4hJ/4abWV6WBcbGiASBwAAAAL/T/2mBK8DswAxAEYAABMjNhI3MhcWFT8BNjMyFhcUDgEHDgEjIicuAScDBxYXMxUhNTMyNzY3ATUvASIGDwIlBgcGFRQzMjY3Njc+ATc0JicmIyJTU3fRqSAhJFZaQUSCngQWMitMu2UvSB0yFskLDh1z/ZJLFh0VCwGsChYvVignJAJDQSckT0RXIDYEGRYDDg8cSEwBvucBCgQvJD0yLxnJsUt7VjZhbCQSJCD9xw4kBGhoEhYdBKcWJAtXRD1ItHCUoj2BMi9aCz3CKygyGjIAAf9h/78GBQOwAE4AAAEyFh0BAxQXMjc2NzYxNzMHBgcGByIvASY1NhI3NCYnIgcDIQE0IyIHBgcDIwE1NC4CJyIDBgcjNjc2MzIWFzY3NjMyFhc+BwS9PF/jKy0xIBpIMlNXH39GYFxUOhIppRwbG1hG5v8AARU9MxwbLef4ARUEEgUQYI4bME9zc3CsNjwJXkQ7UTY/CQQ0EDIaMSUxA69HNxn9bUYFNiQZfpPiUn9GBjM2KhN/ActTFBkCov1xAwIvJyZV/XEC9A4NERADCf75MGfslZBSQVQfIFNAAikMIw4YCgkAAAH9/fzdBEoGOABNAAABBhYXMjc+AT8BEyM1MzY3Njc+ATMyFhcWHwEUBgcGBw4BJy4BJzQ2NzY3NCcmBgcOAQchFSECAwIHBgcGIyInJjU0Nz4BMzIeARUUDgH+uAoHJGVEJEgSMp/R/CgZJyhw9JQyQSQZCA4OIQ4zFTMkIB0HMjYaGUFIZTYZSA4BFf7OQXdhWkhMhYyFRTYrGkgkLjoWMzL9fA8VBJRLw1rbAu2JbzphPaKtFS8kITlPSEEhKxIHBAdBJ0FlJBISLwoISHdB/DaQ/o3+jf7WrY1Wm2lScFpTJyxXSBkySFAAAf+4AAADKgOlADoAAAEiJjU/ATQjIg8BBgIHIxM1NCMiDgQHBgcnPgg3PgMzMhUOAQc+BDMyFhUUArolLQMLHUlAOS2JCdjNHQ0XDhUIGQQpMTIEBwsHEAYTBhYDITdSVypPAgQBFSE3M0YkOVcCcjovJywZcHNz/iobAroSOgYGFAgfBTJPHQgREQwTCRUGGQIhMTsgZQwzDCAtPSUaVzmiAAABAAAAAAK7A8wAPgAAJTI2NzQnJicmJyYnND4BMxcWFxYVDwEGByInNzQmJyYGBxQXFhcWFxYdARQHBgciLgE1PwMyFRQGBxQWMwEkOFIGHRIzdzIxBVaOVWU0I1IDFhMqWBAONSExRQgnQR2YBitoYnpVkVoEEiQuVxoDMyB3RzMnKB4jR0JBWleJRwsRHjFpJCQgBFZEGSIGCE86KCgyGX0TNlckcFI9CzpwRzYvIA9wGz0NFSQAAf9+/8YDqAOBACkAAAEyFhUUBwYjIi8CJiMiByM1AQcOAwcjEyEVATYzMhYXPgE1Iic0NgJvNkRWULdEHSs+TRsuPnAC8ecdLigVFlZsAqj9CEdGHb0JGBpECz4BnmZHeldaDxUkJDI6An0EBBEkFxwBOXP9tSFGAgIkHlMuPgAB/3P/vwRnA7AAQgAAAz4BPwE+Azc+ATMyFhc+BzMyFh0BAxQXMjc2NzYxNzMHBgcGByIvASY1NhI3NCYnIgcDIQE0IyIHBgOMBEgKlBUeCQ8PHnEoNj8JBDQQMhoxJTEXPF/jKy0xIBpIMlNXH39GYFxUOhIppRwbG1hG5v8AARU9MxwQtgGeBIkO/BMgCwsGEBtTQAIpDCMOGAoJRzcZ/W1GBTYkGX6T4lJ/RgYzNioTfwHLUxQZAqL9cQMCLycX/qsAB/9P/aYZxwOzABkBNwFRAWsBhQGfAbkAAAE0JiMiBwYHBhUUMzI2Nz4HNz4BAyImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEGBw4BBwYjIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQYHDgEHBiMiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BBgcOAQcGIyImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEGBw4BBwYjIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQYHDgEHBiMiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BDgEHIzY3NjcyFhU/ATYzMhYXNjc2NzIWFT8BNjMyFhc2NzY3MhYVPwE2MzIWFzY3NjcyFhU/ATYzMhYXNjc2NzIWFT8BNjMyFhc2NzY3MhYVPwE2MzIeAhcUBgcGATQmIyIHBgcGFRQzMjY3Pgc3PgElNCYjIgcGBwYVFDMyNjc+Bzc+ASU0JiMiBwYHBhUUMzI2Nz4HNz4BJTQmIyIHBgcGFRQzMjY3Pgc3PgElNCYjIgcGBwYVFDMyNjc+Bzc+ARjHP0JNHEQkJE9EViEIIAcUBAsDBgMECN05gyDJCw8cc/2SSxUeFAwBrAoWHTYsHBInER8CNjqjyTmDIMkLDxxz/ZJLFR4UDAGsChYdNiwcEicRHwI2OqPJOYMgyQsPHHP9kksVHhQMAawKFh02LBwSJxEfAjY6o8k5gyDJCw8cc/2SSxUeFAwBrAoWHTYsHBInER8CNjqjyTmDIMkLDxxz/ZJLFR4UDAGsChYdNiwcEicRHwI2OqPJOYMgyQsPHHP9kksVHhQMAawKFh02LBwSJxE4ClNtcmSuJEFWWjxJdZAWODlkriRBVlo8SXWQFjg5ZK4kQVZaPEl1kBY4OWSuJEFWWjxJdZAWODlkriRBVlo8SXWQFjg5ZK4kQVZaPElHcEYlAjU+o/veP0JNHEQkJE9EViEIIAcUBAsDBgMECPvKP0JNHEQkJE9EViEIIAcUBAsDBgMECPvKP0JNHEQkJE9EViEIIAcUBAsDBgMECPvKP0JNHEQkJE9EViEIIAcUBAsDBgMECPvKP0JNHEQkJE9EViEIIAcUBAsDBgMECAJgTFoyeIyaRYExMA0zDiMQHx8nHSJd/bFMLv3HDiIGaGgSFR4EpxYkCxw1Kx89IEBqhUjNTC79xw4iBmhoEhUeBKcWJAscNSsfPSBAaoVIzUwu/ccOIgZoaBIVHgSnFiQLHDUrHz0gQGqFSM1MLv3HDiIGaGgSFR4EpxYkCxw1Kx89IEBqhUjNTC79xw4iBmhoEhUeBKcWJAscNSsfPSBAaoVIzUwu/ccOIgZoaBIVHgSnFiQLHDUrHz0fdxTWloMGYDAyLxmbf1xLgwZgMDIvGZt/XEuDBmAwMi8Zm39cS4MGYDAyLxmbf1xLgwZgMDIvGZt/XEuDBmAwMi8ZPGiHT3eOTc0CXExaMniMmkWBMTANMw4jEB8fJx0iXQ1MWjJ4jJpFgTEwDTMOIxAfHycdIl0NTFoyeIyaRYExMA0zDiMQHx8nHSJdDUxaMniMmkWBMTANMw4jEB8fJx0iXQ1MWjJ4jJpFgTEwDTMOIxAfHycdIl0AAAb/T/2mFY8DswAZAQgBIgE8AVYBcAAAATQmIyIHBgcGFRQzMjY3Pgc3PgEDIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQYHDgEHBiMiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BBgcOAQcGIyImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEGBw4BBwYjIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQYHDgEHBiMiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BDgEHIzY3NjcyFhU/ATYzMhYXNjc2NzIWFT8BNjMyFhc2NzY3MhYVPwE2MzIWFzY3NjcyFhU/ATYzMhYXNjc2NzIWFT8BNjMyHgIXFAYHBgE0JiMiBwYHBhUUMzI2Nz4HNz4BJTQmIyIHBgcGFRQzMjY3Pgc3PgElNCYjIgcGBwYVFDMyNjc+Bzc+ASU0JiMiBwYHBhUUMzI2Nz4HNz4BFI8/Qk0cRCQkT0RWIQggBxQECwMGAwQI3TmDIMkLDxxz/ZJLFR4UDAGsChYdNiwcEicRHwI2OqPJOYMgyQsPHHP9kksVHhQMAawKFh02LBwSJxEfAjY6o8k5gyDJCw8cc/2SSxUeFAwBrAoWHTYsHBInER8CNjqjyTmDIMkLDxxz/ZJLFR4UDAGsChYdNiwcEicRHwI2OqPJOYMgyQsPHHP9kksVHhQMAawKFh02LBwSJxE4ClNtcmSuJEFWWjxJdZAWODlkriRBVlo8SXWQFjg5ZK4kQVZaPEl1kBY4OWSuJEFWWjxJdZAWODlkriRBVlo8SUdwRiUCNT6j+94/Qk0cRCQkT0RWIQggBxQECwMGAwQI+8o/Qk0cRCQkT0RWIQggBxQECwMGAwQI+8o/Qk0cRCQkT0RWIQggBxQECwMGAwQI+8o/Qk0cRCQkT0RWIQggBxQECwMGAwQIAmBMWjJ4jJpFgTEwDTMOIxAfHycdIl39sUwu/ccOIgZoaBIVHgSnFiQLHDUrHz0gQGqFSM1MLv3HDiIGaGgSFR4EpxYkCxw1Kx89IEBqhUjNTC79xw4iBmhoEhUeBKcWJAscNSsfPSBAaoVIzUwu/ccOIgZoaBIVHgSnFiQLHDUrHz0gQGqFSM1MLv3HDiIGaGgSFR4EpxYkCxw1Kx89H3cU1paDBmAwMi8Zm39cS4MGYDAyLxmbf1xLgwZgMDIvGZt/XEuDBmAwMi8Zm39cS4MGYDAyLxk8aIdPd45NzQJcTFoyeIyaRYExMA0zDiMQHx8nHSJdDUxaMniMmkWBMTANMw4jEB8fJx0iXQ1MWjJ4jJpFgTEwDTMOIxAfHycdIl0NTFoyeIyaRYExMA0zDiMQHx8nHSJdAAAAAAX/T/2mEVcDswAZANkA8wENAScAAAE0JiMiBwYHBhUUMzI2Nz4HNz4BAyImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEGBw4BBwYjIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQYHDgEHBiMiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BBgcOAQcGIyImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEOAQcjNjc2NzIWFT8BNjMyFhc2NzY3MhYVPwE2MzIWFzY3NjcyFhU/ATYzMhYXNjc2NzIWFT8BNjMyHgIXFAYHBgE0JiMiBwYHBhUUMzI2Nz4HNz4BJTQmIyIHBgcGFRQzMjY3Pgc3PgElNCYjIgcGBwYVFDMyNjc+Bzc+ARBXP0JNHEQkJE9EViEIIAcUBAsDBgMECN05gyDJCw8cc/2SSxUeFAwBrAoWHTYsHBInER8CNjqjyTmDIMkLDxxz/ZJLFR4UDAGsChYdNiwcEicRHwI2OqPJOYMgyQsPHHP9kksVHhQMAawKFh02LBwSJxEfAjY6o8k5gyDJCw8cc/2SSxUeFAwBrAoWHTYsHBInETgKU21yZK4kQVZaPEl1kBY4OWSuJEFWWjxJdZAWODlkriRBVlo8SXWQFjg5ZK4kQVZaPElHcEYlAjU+o/veP0JNHEQkJE9EViEIIAcUBAsDBgMECPvKP0JNHEQkJE9EViEIIAcUBAsDBgMECPvKP0JNHEQkJE9EViEIIAcUBAsDBgMECAJgTFoyeIyaRYExMA0zDiMQHx8nHSJd/bFMLv3HDiIGaGgSFR4EpxYkCxw1Kx89IEBqhUjNTC79xw4iBmhoEhUeBKcWJAscNSsfPSBAaoVIzUwu/ccOIgZoaBIVHgSnFiQLHDUrHz0gQGqFSM1MLv3HDiIGaGgSFR4EpxYkCxw1Kx89H3cU1paDBmAwMi8Zm39cS4MGYDAyLxmbf1xLgwZgMDIvGZt/XEuDBmAwMi8ZPGiHT3eOTc0CXExaMniMmkWBMTANMw4jEB8fJx0iXQ1MWjJ4jJpFgTEwDTMOIxAfHycdIl0NTFoyeIyaRYExMA0zDiMQHx8nHSJdAAAE/0/9pg0fA7MAGQCqAMQA3gAAATQmIyIHBgcGFRQzMjY3Pgc3PgEDIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQ4BByM2NzY3MhYVPwE2MzIWFzY3NjcyFhU/ATYzMhYXNjc2NzIWFT8BNjMyHgIXFAYHBiMiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BBgcOAQcGIyImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEGBw4BBwYBPgE3NCYjIgcGBwYVFDMyNjc+ByU+ATc0JiMiBwYHBhUUMzI2Nz4HA68/Qk0cRCQkT0RWIQggBxQECwMGAwQI3TmDIMkLDxxz/ZJLFR4UDAGsChYdNiwcEicROApTbXJkriRBVlo8SXWQFjg5ZK4kQVZaPEl1kBY4OWSuJEFWWjxJR3BGJQI1PqPJOYMgyQsPHHP9kksVHhQMAawKFh02LBwSJxEfAjY6o8k5gyDJCw8cc/2SSxUeFAwBrAoWHTYsHBInER8CNjqjCHgECAI/Qk0cRCQkT0RWIQggBxQECwMG+8sECAI/Qk0cRCQkT0RWIQggBxQECwMGAmBMWjJ4jJpFgTEwDTMOIxAfHycdIl39sUwu/ccOIgZoaBIVHgSnFiQLHDUrHz0fdxTWloMGYDAyLxmbf1xLgwZgMDIvGZt/XEuDBmAwMi8ZPGiHT3eOTc1MLv3HDiIGaGgSFR4EpxYkCxw1Kx89IEBqhUjNTC79xw4iBmhoEhUeBKcWJAscNSsfPSBAaoVIzQHQIl0NTFoyeIyaRYExMA0zDiMQHx8nHSJdDUxaMniMmkWBMTANMw4jEB8fJwAAAAAD/0/9pgjnA7MAFAApAI8AAAEGBwYVFDMyNjc2Nz4BNzQmJyYjIgUGBwYVFDMyNjc2Nz4BNzQmJyYjIgEjNhI3MhcWFT8BNjMyFxYXNjc2NzIXFhU/ATYzMhYXFA4BBw4BIyInLgEnAwcWFzMVITUzMjc2NwE1LwEiBg8DBgcOAQcOASMiJy4BJwMHFhczFSE1MzI3NjcBNS8BIgYPAgb9QSckT0RXIDYEGRYDDg8cSEz7q0EnJE9EVyA2BBkWAw4PHEhM/XFTd9GpICEkVlpBRIJPOBI7NmmpICEkVlpBRIKeBBYyK0y7ZS9IHTIWyQsOHXP9kksWHRULAawKFi9WKCckDAEJCzIrTLtlL0gdMhbJCw4dc/2SSxYdFQsBrAoWL1YoJyQC1HCUoj2BMi9aCz3CKygyGjIycJSiPYEyL1oLPcIrKDIaMv645wEKBC8kPTIvGWVHbWBGhQQvJD0yLxnJsUt7VjZhbCQSJCD9xw4kBGhoEhYdBKcWJAtXRD1IGDszPVY2YWwkEiQg/ccOJARoaBIWHQSnFiQLV0Q9SAAAAAAC/2H9pgphA7MAfwCYAAAlIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAgYDBgcGByIvASY1NhI3NCYnIgcDIQE0IyIHBgcDIwE1NC4CJyIDBgcjNjc2MzIWFzY3NjMyFhc+BzMyFh0BAxQXMjc2NzYxNz4BNzY3MhYVPwE2MzIeAhcUBgcGEzQmIyIHBgcGFRQzMjY3Pgc3NgiCOYQfyQsOHXP9kksWHRULAawKFh00LhsTJyQcaiJ8RmBcVDoSKaUcGxtYRub/AAEVPTMcGy3n+AEVBBIFEGCOGzBPc3NwrDY8CV5EO1E2PwkENBAyGjElMRc8X+MrLTEgGkhhNz47aakkQVZaQURHcEYlAjY9oBM/QkwdQSckT0RWIQchBhQDDAQGAwsETS39xw4kBGhoEhYdBKcWJAscNyggPUhC/v5VfEYGMzYqE38By1MUGQKi/XEDAi8nJlX9cQL0Dg0REAMJ/vkwZ+yVkFJBVB8gU0ACKQwjDhgKCUc3Gf1tRgU2JBl+6mpfTIUEYS8yLxk8aYZPdo9NzQJcTFoycJSiPYExMAs2CyUPIB4oHWEAAAAC/2H83Qn8BjgAVQClAAAFMh4BFRQOAgcGBwYWFzI+BTc2NzY3NhoBNyM1Mz4CNz4BMzIWHwEUBgcOAQcGJy4BJzQ/ATQnJgYHBgIHIRUhCgEHDgQjIiY1ND4CEzIWHQEDFBcyNzY3NjEBCwEOAQcGByIvASY1NhI3NCYnIgcDIQE0IyIHBgcDIwE1NC4CJyIDBgcjNjc2MzIWFzY3NjMyFhc+BwRgJDweERIjBhkPDRAeGTElJxogEA0DASQSIUZTF9H8HyA0HXD0lExdDw4OIQtEIBokHh4IaDNBSGU2EE0SARX+zjfNbxw8VFdsNnaKFilGiTxf4ystMSAaSAEDSI0aXiZGYFxUOhIppRwbG1hG5v8AARU9MxwbLef4ARUEEgUQYI4bME9zc3CsNjwJXkQ7UTY/CQQ0EDIaMSUx+D9TJhkyHTAKKAoUEQMXIDktSyklBwNiWo0BQwGMbIlWVXAsoq1GQzlYPkIZRAQEBAY7LoRGJC8KCEh3K/79RZD+yP1Q1TdiaUsxqoEtV00vBKdHNxn9bUYFNiQZfgHt/sr++jF6JkYGMzYqE38By1MUGQKi/XEDAi8nJlX9cQL0Dg0REAMJ/vkwZ+yVkFJBVB8gU0ACKQwjDhgKCQAAAAAD/0/83Qj5BjgAVQCGAJ8AAAUyHgEVFA4CBwYHBhYXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMhYfARQGBw4BBwYnLgEnND8BNCcmBgcGAgchFSEKAQcOBCMiJjU0PgInIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQYHIzYSNzIWFT8BNjMyHgIXFAYHBhM0JiMiBwYHBhUUMzI2Nz4HNzYDXCU8HRASIwYZDw0QHhkwJicZIQ8OAwEkEiFGUhjR/B4gNR1v9ZRMXQ4PDiELRCEZJB4eCGgzQUhlNhFMEwEW/s43zW8dPFRWbDZ2ihYpRmE5hB/JCw4dc/2SSxYdFQsBrAoWHTQuGxMnIDNTd9GpJEFWWkFER3BGJQI2PaATP0JMHUEnJE9EViEHIQYUAwwEBgML+D9TJhkyHTAKKAoUEQMXIDktSyklBwNiWo0BQwGMbIlWVW8toq1GQzlYPkIZRAQEBAY7LoRGJC8KCEh3K/79RZD+yP1Q1TdiaUsxqoEtV00v/E0t/ccOJARoaBIWHQSnFiQLHDcoID0+bOcBCgRhLzIvGTxphk92j03NAlxMWjJwlKI9gTEwCzYLJQ8gHigdYQAAAAAB/f383QfOBjgAgAAAARQGByInNDY3NjUnJiMiAyEVIQoBBwYHBg8BIi4BNTQ+AjcyFhUUBxQzMhM2ExI3IQoBBwIPASInJicmJz4HNzY3MhYXFA8CFDMyPgI/AhIbASM1MzYSNzYzMh4BFRQGByInNDc2NzY1LgEjIgIHIT4EMzIHzmFTYQtNOBIVGiTJcwEO/tUpylhTYVeMRUtuNBYvMic+S3MguG8OOlg1/bwnx2Sx20FzPR0ZDgEBBQEFAwcHCwckUzpHBBIyNiQiPjEfEjI2P1U9zfw4tIeFpjhSJmJWWgokJD0SFSEkd5crAk4ZUnuSv2eiBUpolRVzSnYfDwcgEv3Pif7//T21qXdzKAdYjFUzTDglFmxFT5sZAfQ4AQkBlvn++f1Xyf57NgdeIEVpDQgnDB4MGA4SCS8dbUQvJFJFGSE8NCOCvgEXAZkBIIm8AR1jWkVpP2qaDnM9SD4cDwcdFf6u2F20rYJPAAH9+fzdCr8GPwC8AAAFMhYXFAYPAQYHFDMyNzY3NhI3EyEGAgcGBwYPASIuATU0PgI3MhceARUUBxQzMhM2EjYSNyEGAgcCDwEiLgIvAT4BNzIWFRQPAhQzMjc+Az8BEhM2NyM1MzY3Njc2MzIWFRQGByInNDY3MjUnJiMiBwYHIT4EMzIXFAcGByInNDY3MjUuASMiAgMhEjc2MzIeARUUBgciJzQ2NzI1LgEjIgIDIRUhAgcCAwYHBg8BIicmNT4BBRs7QwMTDSQXGCRnRkkuGWEZQf4IKNFWVFVejEFMcDUWLzQpJA8mLHMhtnEbPCpCEf4FJNlSstpFLUk1JhESDkFWO04WMjIkOzEWKRgkCjZwRBULzfgtY1qJhaZVW2FTXQtONxIVHiN7S08kAgYaUHmRvmijDS4rW2ELTTkSCyggZaA4AgZRs6fzOlMjY1RWC0wyFQ4nIWWgOAES/s4qNGeHXlZYg0GnOBYLSvhkRhZEFTYhKxmXtKlwAbtvATb9/SWhr216JQdXjFY0TDclFg8PWzhLnxkB9HABD8QBPFHp/Rio/nw3Bx05QC12bmQgbkMtJlJFGTYTQjhcF74B/AFLXiuJop6UaFqGZ2mZEHNIfxgWIBKstclfs66AT+1lUz8bc0p1IBYbF/7m/ukBCNPCTG9BZpQQc0N/HRYaGP7m/umJ/vyw/lL+6bBsdSoHwzZAaG8AAf35/N0OAgY/AQ4AAAUyFhUUBxQzMhM2EjYSNyEGAgcCDwEiLgIvAT4BNzIWFRQPAhQzMjc+Az8BEhM2NyM1MzYSNzYzMhYVFAYHIic0NjcyNScmIyIHBgchPgQzMhcUBwYHIic0NjcyNS4BIyICAyESNzYzMh4BFRQGByInNDY3MjUuASMiAgMhPgI3PgEzMhYfARQGBw4BBwYuAic0PwE0Jg4BBwYHBgIHIRUhCgEHDgQjIiY1ND4CMzIeARUUDgIHDgMWFzI+BTc2NzY3NhoBNyECBwIDBgcGDwEiJyY1PgE3MhYXFAYPAQYHFDMyNzY3NhI3EyEGAgcGBwYPASIuATU0PgIB2z9GcyG2cRs8KkIR/gUk2VKy2kUtSTUmERIOQVY7ThYyMiQ7MRYpGCQKNnBEFQvN+DHBgYWmVVthU10LTjcSFR4je0tPJAIGGlB5kb5oow0uK1thC005EgsoIGWgOAIGUbOn8zpTI2NUVgtMMhUOJyFloDgCDh4gNR1v9ZRLXQ8PDiELRCEiLxwPBWgyLT4+EjI2EUwTARX+zjbObh08VFZsN3WKFSpGKyQ8HhERIwYGGA0HFBYaMCUoGSAQDgICJBIhRVMX/f4qNGeHXlZYg0GnOBYLSlE7QwMTDSQXGCRnRkkuGWEZQf4IKNFWVFVejEFMcDUWLzT4aUhLnxkB9HABD8QBPFHp/Rio/nw3Bx05QC12bmQgbkMtJlJFGTYTQjhcF74B/AFLXiuJsAEqYlqGZ2mZEHNIfxgWIBKstclfs66AT+1lUz8bc0p1IBYbF/7m/ukBCNPCTG9BZpQQc0N/HRYaGP7m/ulWVXAsoq1GQzlYPkIZRAQFCyIoH4RGJBweARAMJHcr/v1FkP7I/VDVN2JpSzGqgS1XTS8/UyYZMh0wCgkdEhQMAhcgOS1LKSUHA2JajQFDAYxs/vyw/lL+6bBsdSoHwzZAaG8bZEYWRBU2ISsZl7SpcAG7bwE2/f0loa9teiUHV4xWNEw3JQAAAAAB/fn83RFMBj8BYgAAARQWMzI+Azc2EhMhNSE2Ejc+ARcWFQYHBhUeAzc+ATc+ATUnLgEnJiMiBw4BBwYHIRI3Njc+AhYVBwYVHgM3PgE3PgE1Jy4BIyIGBw4CByEaATMyFhcUIw4BFRYzPgE1NC4BIyIHBgMhGgEzMhYXFCMOARUWMzY3NjUmIyIOAwchNjc2MzIfARQjDgEVFjM+ATU0JiMiBwYCByMVMwYHAgMHDgMHBiMiNT8BNjU0JiMOAQcXHgMzNzYTNhI3IQYCBgIHAiMiNTY1NCYnJiMOAxUUHgEzNzY3Njc2EjchAwYCBwYHBiMiNTY/AT4BNS4BIw4BBxQXFjM3PgY3NjcSEzYTIQYKAQcGBwYHDgYjLgE+Ajc+AzU0LgEjIg4CFRQWMzI+Azc2EhMhAwcOAQcGIy4BPgI3PgM1NC4BIyIOAgr/inY2bFdUPBxuzjcBMv7rEk0QNmVIQRkaaAYOHC8jIEQLIQ4OCEEcITKUemClNBko/etNIzYyEj4+LTJoBQ8cLyIhRAshDg8PXUuU9W8dNSAe/fI4oGUhJw4VMkwLVlRjI1M686ezUf36OKBlICgLEjlNC2FbKy4No2i+kXlQGv36JE9LeyMeFRI3TgtdU2FbVaaFgcEx+M0LFURwNgokGCkWMTskMjIWTjtWQQ4SESY1SS1F2rJS2SQB+xFCKjwbcbYhcywmDyQpNC8WNXBMQYxeVVRW0SgB+EEZYRkuSUZnJBgXJA0TA0M7UUoLFjinQSlNO0AqOB0bAwGHZzQqAgIXU0UhEiQCAg4QIBkoJTAaFhQHDRgGBiMRER48JCtGKhWKdTdsVlQ8HW7ONgIHnzIRRidEZRcTBg0YBgYjEhEePCQsRikW/giBqjFLaWI31AKyATeQRQEDK3dICAovEhJGhB8nIwsFBEQZQj5YOSVQCQtWRNOAOm8BIlh3JAwQAR4cJEaEHycjCwUERBlCPlg5Q0atoixwVVYBFwEaGBoWHX9DcxCUZkFvTMLT/vgBFwEaFxsWIHVKcxs/U2XtT4Cus1/JtawSIBYYf0hzEJlpZ4ZaYv7WsIkrXv61/gS+F1w4QhM2GUVSJi1DbiBkbnYtQDkdBzcBhKgC6OlR/sTE/vFw/gwZn0s4Ww8PFiU3TDRWjFcHJXptr6EC2/3+ym/+RXCptJcZKyE2FUQWRmQbb2hANsMHDS4wSzhfNDIGAgEXAa6wAQRs/nT+vY1aYgMHJSlLLTkgFwIMFBIdCQowHTIZJlM/L01XLYGqMUtpYjfVArABOP0T21PEUZQCDBQSHQkKMB0yGSZTPzBMVwAAAAL9/fzdFJAGPwBYAb4AAAUyHgEVFA4CBwYHBhYXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMhYfARQGBw4BBwYmJzQ/ATQmDgEHDgYHBQchCgEHDgQjIiY1ND4CARQWMzI+Azc2EhMhNSE2Ejc2Nz4CFhUHBhUeAzc+ATc+ATUnLgEnJiMiBw4BBwYHIRI3Njc+AhYVBwYVHgM3PgE3PgE1Jy4BIyIGBw4CByEaATMyFhcUIw4BFRYzPgE1NC4BIyIHBgMhGgEzMhYXFCMOARUWMzY3NjUmIyIOAwchNjc2MzIfARQjDgEVFjM+ATU0JiMiBwYHDgEHIR8BBgcCAwcOAwcGIyI1PwE2NTQmIw4BBxceAzM3NhM2EjchBgIGAgcCIyI1NjU0JicmIw4DFRQeATM3Njc2NzYSNyEDBgIHBgcGIyI1Nj8BPgE1LgEjDgEHFBcWMzc+Bjc2NxITNhMhBgoBBwYHBgcOBiMuAT4CNz4DNTQuASMiDgIVFBYzMj4DNzYSEyEDBw4BBwYjLgE+Ajc+AzU0LgEjIg4C/q4kPB4REiMGGQ8NEB4ZMSUnGiAQDQMBJBIhRlMX0fwfIDQdcPSUTF0PDg4hC0QgQDYMaDMtPj4SFyolHSIRHwMBFxH+3TfNbxw8VFdsNnaKFilGD8CLdTZsV1Q8HG/ONgEy/usSTRA2MxI+Pi0yaQYOHC8jIEQLIQ4OCEAdIDOTe1+mNBko/etOIjYyEj89LjNoBQ8cLyIhRAshDg8OXUyU9W8dNSAe/fI5oGQhJw4VMU0LVlVjJFM686eyUf35OaBkIScLEjlMC2FbKi8Oo2i+kHlRGv36JE9MeiMeFRI3TgteUmJcVaaFiVkqOBz+4AnZChZEcDYKJBgpFjE7JDIzFU47VkEOEhIlNUkuRNqyU9gkAfsRQio8G3G2IXQsJw8kKTQvFjZvTUCMXlVVVdInAfhAGmEZLklGZyQYFyQNFANEO1FJDBY4p0EpTTtAKjkdGgMChmc0KgIDGFJGIRIkAQMODyEZJyYwGRcTBg0YBgYjEhAdPCUrRikWinY2bFZUPB1vzTcCBp4zEEcnRGUXEwYNGQUHIhIRHjwkLEYpFvg/UyYZMh0wCigKFBEDFyA5LUspJQcDYlqNAUMBjGyJVlVvLaKtRkM5WD5CGUQECjlAhEYkHB4BEAwQOFNGcjx4DgKH/sj9UNU3YmlLMaqBLVdNL/8AgaoxS2liN9QCsgE3kEUBAyt3JAwQAR4cJEaEHycjCwUERBlCPlg5JVAJC1ZE04A6bwEhWXckDBABHhwkRoQfJyMLBQREGUI+WDlDRq2iLHBVVgEXARoYGhYdf0NzEJRmQW9MwtP++AEXARoXGxYgdUpzGz9TZe1PgK6zX8m1rBIgFhh/SHMQmWlnhlpolEKVaYcCK17+tf4EvhdcOEITNhlFUiYtQ24gZG52LUA5HQc3AYSoAujpUf7ExP7xcP4MGZ9LOFsPDxYlN0w0VoxXByV6ba+hAtv9/spv/kVwqbSXGSshNhVEFkZkG29oQDbDBw0uMEs4XzQyBgIBFwGusAEEbP50/r2NWmIDByUpSy05IBcCDBQSHQkKMB0yGSZTPy9NVy2BqjFLaWI31QKwATj9E9tTxFGUAgwUEh0JCjAdMhkmUz8wTFcAA/39/N0H8gY4ADAASQCgAAAlIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQYHIzYSNzIWFT8BNjMyHgIXFAYHBhM0JiMiBwYHBhUUMzI2Nz4HNzYBMh4BFRQOAgcGBwYWFzI+BTc2NzY3NhoBNyM1Mz4CNz4BMzIWHwEUBgcOAQcGJy4BJzQ3Njc0JyYGBwYCByEVIQoBBw4EIyImNTQ+AgYTOYQeygsPHHT9kUsWHRULAa0LFh00LhsTJx80U3fRqSRBVlpBREdwRiUCNj2gEz9CTB1AKCRPRFYhByEGFAQLBAYDC/e/JDweERIjBhkPDRAeGTElJxogEA0DASQSIUZTF9H8HyA0HXD0lExdDw4OIQtEIBokHh4IaBoZQUhlNhBNEgEV/s43zW8cPFRXbDZ2ihYpRgRNLf3HDiQEaGgSFh0EpxYkCxw3KCA9PmznAQoEYS8yLxk8aYZPdo9NzQJcTFoycJSiPYExMAs2CyUPIB4oHWH80z9TJhkyHTAKKAoUEQMXIDktSyklBwNiWo0BQwGMbIlWVW8toq1GQzlYPkIZRAQEBAY7LoRGEhIvCghIdyv+/UWQ/sj9UNU3YmlLMaqBLVdNLwAAAAL9/fzdBuwGOAApAIAAAAEyFhUUBwYjIi8CJiMiByM1AQcOAwcjEyEVATYzMhYXPgE1Iic0NgEyHgEVFA4CBwYHBhYXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMhYfARQGBw4BBwYnLgEnNDc2NzQnJgYHBgIHIRUhCgEHDgQjIiY1ND4CBbI3Q1ZPuEQdKz1OGy4+bwLw5h4tKRQXVmwCqP0JRkYdvQkYGkQLPvkqJDweERIjBhkPDRAeGTElJxogEA0DASQSIUZTF9H8HyA0HXD0lExdDw4OIQtEIBokHh4IaBoZQUhlNhBNEgEV/s43zW8cPFRXbDZ2ihYpRgGeZkd6V1oPFSQkMjoCfQQEESQXHAE5c/21IUYCAiQeUy4+/Wo/UyYZMh0wCigKFBEDFyA5LUspJQcDYlqNAUMBjGyJVlVvLaKtRkM5WD5CGUQEBAQGOy6ERhISLwoISHcr/v1FkP7I/VDVN2JpSzGqgS1XTS8AAAIAAPzdBwUGOABaAJgAAAUyHgEVFA4CBwYHBhYXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMhYfARQGBw4BBwYmJzQ/ATQmDgEHDggHIRUhCgEHDgQjIiY1ND4CAzI2NzQmJyYnJic0PgEzFxYXFhUPAQYHIic3NCYnJgYHFBcWFxYXFh0BFAcGByIuATU/AzIVFAYHFBYzAWgkPB4REiIHGQ4NEB0aMCUoGSAQDgIBJBIiRVMX0fwfIDQdcPWTTF0PDg0hDEMhQDYMaTItPj4SESEfGRwSGgsYAwEV/s42zm8cPFRWbDd1ihUqRhk4UgYzL3cyMQVWjlVlNCNSAxYTKlgQDjUhMUUIJ0EdmAYraGJ6VZFaBBIkLlcaAzMg+D9TJhkyHTAKKAoUEQMXIDktSyklBwNiWo0BQwGMbIlWVW8toq1GQzlYPkIZRAQKOUCERiQcHgEQDA0nODRQNFsqWguQ/sj9UNU3YmlLMaqBLVdNLwFvRzMtQiFHQkFaV4lHCxEeMWkkJCAEVkQZIgYITzooKDIZfRM2VyRwUj0LOnBHNi8gD3AbPQ0VJAAABAAA/N0KtAY4ADAASQCkAOIAACUiJicDBxYXMxUhNTMyNzY3ATUvASIOAg8BBgcjNhI3MhYVPwE2MzIeAhcUBgcGEzQmIyIHBgcGFRQzMjY3Pgc3NgEyHgEVFA4CBwYHBhYXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMhYfARQGBw4BBwYmJzQ/ATQmDgEHDggHIRUhCgEHDgQjIiY1ND4CAzI2NzQmJyYnJic0PgEzFxYXFhUPAQYHIic3NCYnJgYHFBcWFxYXFh0BFAcGByIuATU/AzIVFAYHFBYzCNU5hR7JCw4dc/2RTBYcFgsBrAsVHTUtHBIoHzNTd9CqJEBXWkFER3BGJQI2Pp8TP0NLHUEnJE9EViEHIAcUAwwDBgQK97gkPB4REiIHGQ4NEB0aMCUoGSAQDgIBJBIiRVMX0fwfIDQdcPWTTF0PDg0hDEMhQDYMaTItPj4SESEfGRwSGgsYAwEV/s42zm8cPFRWbDd1ihUqRhk4UgYzL3cyMQVWjlVlNCNSAxYTKlgQDjUhMUUIJ0EdmAYraGJ6VZFaBBIkLlcaAzMgBE0t/ccOJARoaBIWHQSnFiQLHDcoID0+bOcBCgRhLzIvGTxphk92j03NAlxMWjJwlKI9gTEwCzYLJQ8gHigdYfzTP1MmGTIdMAooChQRAxcgOS1LKSUHA2JajQFDAYxsiVZVby2irUZDOVg+QhlEBAo5QIRGJBweARAMDSc4NFA0WypaC5D+yP1Q1TdiaUsxqoEtV00vAW9HMy1CIUdCQVpXiUcLER4xaSQkIARWRBkiBghPOigoMhl9EzZXJHBSPQs6cEc2LyAPcBs9DRUkAAAFAAD83Q7sBjgAGQAzAJoA9gE0AAABNCYjIgcGBwYVFDMyNjc+Bzc+ASU0JiMiBwYHBhUUMzI2Nz4HNz4BAyImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEOAQcjNjc2NzIWFT8BNjMyFhc+BjcyFhU/ATYzMh4CFxQGBwYjIiYnAwcWFzMVITUzMjc2NwE1LwEiDgIPAQ4BBw4BBwYFMh4BFRQOAgcOBAcGFzI+BTc2NzY3NhI2EjcjNTM+ATc2NzYzMhYfARQGBw4BBwYuAic0PwE0Jg4BBw4HByEVIQoBBwIjIiY1ND4CAzI2NzQmJyYnJic0PgEzFxYXFhUPAQYHIic3NCYnJgYHFBcWFxYXFh0BFAcGByIuATU/AzIVFAYHFBYzDew/Q0wcRCQkT0RWIQggBxQECwMGAwMJ+8o/Q0wcRCQkT0RWIQggBxQECwMGAwMJ3TmDIMkLDh1z/ZFMFB4VDAGsCxUeNSwdESgQOApTbXJkriRAV1o8SXSUFBocNSg9O00qJEBXWjxJR3BGJQI2PqLJOYMgyQsOHXP9kUwUHhUMAawLFR41LB0RKAcgBwM1PKL3yiQ8HhETIQcECwcIBgMdPRowJScZIRANAwEnDxs7KUER0fwpPSp1dX2RS18ODg0hC0MiIi8cDwZpMi0+PhITJh0iFR8NGwQBFf7ONs5vx952iRUpRhg4UgY0LncyMQVWjlVlNCNSAxYTKlgQDjUhMUUIJ0EdmAYraGJ6VZFaBBIkLlcaAzMgAmBMWjJ4jJpFgTEwDTMOIxAfHycdIl0NTFoyeIyaRYExMA0zDiMQHx8nHSJd/bFMLv3HDiIGaGgSFR4EpxYkCxw1Kx89H3cU1paDBmEvMi8ZnnsqLUkqNBwUAWEvMi8ZPGiHT3eOTc1MLv3HDiIGaGgSFR4EpxYkCxw1Kx89ET0QbIJLzfw/UyYZMh4uCwYQCQsGAiIGFx86LEwoJgcDY1luAQzDATpRiXaRQKdSVkdCOVg+QhlEBAYLIigghEYkHR0BEAwOMzRUPGUxZg2Q/sf9T9P+gqqBLVhMLwFvRzMtRR5HQkFaV4lHCxEeMWkkJCAEVkQZIgYITzooKDIZfRM2VyRwUj0LOnBHNi8gD3AbPQ0VJAADAAD83QjOBjgALACHAMUAAAEyFhUUBwYjIi8CJiMiByM1AQcOAwcjEyEVATYzMgQXNicmJyYnIic0NgEyHgEVFA4CBwYHBhYXMj4FNzY3Njc2GgE3IzUzPgI3PgEzMhYfARQGBw4BBwYmJzQ/ATQmDgEHDggHIRUhCgEHDgQjIiY1ND4CAzI2NzQmJyYnJic0PgEzFxYXFhUPAQYHIic3NCYnJgYHFBcWFxYXFh0BFAcGByIuATU/AzIVFAYHFBYzB5U2RFZQt0UcLD1NGy89cALx5x4tKBUWV2wCqf0IRkcgAVRACQ0GFIABRAs++gEkPB4REiIHGQ4NEB0aMCUoGSAQDgIBJBIiRVMX0fwfIDQdcPWTTF0PDg0hDEMhQDYMaTItPj4SESEfGRwSGgsYAwEV/s42zm8cPFRWbDd1ihUqRhk4UgYzL3cyMQVWjlVlNCNSAxYTKlgQDjUhMUUIJ0EdmAYraGJ6VZFaBBIkLlcaAzMgAZ5mR3pXWg8VJCQyOgJ9BAQRJBccATlz/bUhOw0BBAEFIBlTLj79aj9TJhkyHTAKKAoUEQMXIDktSyklBwNiWo0BQwGMbIlWVW8toq1GQzlYPkIZRAQKOUCERiQcHgEQDA0nODRQNFsqWguQ/sj9UNU3YmlLMaqBLVdNLwFvRzMtQiFHQkFaV4lHCxEeMWkkJCAEVkQZIgYITzooKDIZfRM2VyRwUj0LOnBHNi8gD3AbPQ0VJAAABQAA/N0NfQY4ADAASQBzAM4BDAAAJSImJwMHFhczFSE1MzI3NjcBNS8BIg4CDwEGByM2EjcyFhU/ATYzMh4CFxQGBwYTNCYjIgcGBwYVFDMyNjc+Bzc2BTIWFRQHBiMiLwImIyIHIzUBBw4DByMTIRUBNjMyFhc+ATUiJzQ2ATIeARUUDgIHBgcGFhcyPgU3Njc2NzYaATcjNTM+Ajc+ATMyFh8BFAYHDgEHBiYnND8BNCYOAQcOCAchFSEKAQcOBCMiJjU0PgIDMjY3NCYnJicmJzQ+ATMXFhcWFQ8BBgciJzc0JicmBgcUFxYXFhcWHQEUBwYHIi4BNT8DMhUUBgcUFjMLnjmFHskLDh1z/ZFMFhwWCwGsCxUdNS0cEigfM1N30KokQFdaQURHcEYlAjY+nxM/Q0sdQSckT0RWIQcgBxQDDAMGBAr7HDZEVlC3RRwsPU0bLz1wAvHnHi0oFRZXbAKp/QhGRx29CBkaRAs++gEkPB4REiIHGQ4NEB0aMCUoGSAQDgIBJBIiRVMX0fwfIDQdcPWTTF0PDg0hDEMhQDYMaTItPj4SESEfGRwSGgsYAwEV/s42zm8cPFRWbDd1ihUqRhk4UgYzL3cyMQVWjlVlNCNSAxYTKlgQDjUhMUUIJ0EdmAYraGJ6VZFaBBIkLlcaAzMgBE0t/ccOJARoaBIWHQSnFiQLHDcoID0+bOcBCgRhLzIvGTxphk92j03NAlxMWjJwlKI9gTEwCzYLJQ8gHigdYZdmR3pXWg8VJCQyOgJ9BAQRJBccATlz/bUhRgICJB5TLj79aj9TJhkyHTAKKAoUEQMXIDktSyklBwNiWo0BQwGMbIlWVW8toq1GQzlYPkIZRAQKOUCERiQcHgEQDA0nODRQNFsqWguQ/sj9UNU3YmlLMaqBLVdNLwFvRzMtQiFHQkFaV4lHCxEeMWkkJCAEVkQZIgYITzooKDIZfRM2VyRwUj0LOnBHNi8gD3AbPQ0VJAAAAAQAAPzdDBgGOAApAH8A2gEYAAABMhYVFAcGIyIvAiYjIgcjNQEHDgMHIxMhFQE2MzIWFz4BNSInNDYBMh4BFRQOAgcGBwYWFzI+BTc2NzY3NhoBNyM1Mz4CNz4BMzIWHwEUBgcOAQcGJy4BJzQ/ATQnJgYHBgIHIRUhCgEHDgQjIiY1ND4CITIeARUUDgIHBgcGFhcyPgU3Njc2NzYaATcjNTM+Ajc+ATMyFh8BFAYHDgEHBiYnND8BNCYOAQcOCAchFSEKAQcOBCMiJjU0PgIDMjY3NCYnJicmJzQ+ATMXFhcWFQ8BBgciJzc0JicmBgcUFxYXFhcWHQEUBwYHIi4BNT8DMhUUBgcUFjMK3zZEVlC3RB0rPk0bLj5wAvHnHS4oFRZWbAKo/QhHRh29CRgaRAs++gElPB0QEiMGGQ8NEB4ZMCYnGSEPDgMBJBIhRlIY0fweIDUdb/WUTF0ODw4hC0QhGSQeHghoM0FIZTYRTBMBFv7ON81vHTxUVmw2dooWKUb84SQ8HhESIgcZDg0QHRowJSgZIBAOAgEkEiJFUxfR/B8gNB1w9ZNMXQ8ODSEMQyFANgxpMi0+PhIRIR8ZHBIaCxgDARX+zjbObxw8VFZsN3WKFSpGGThSBjMvdzIxBVaOVWU0I1IDFhMqWBAONSExRQgnQR2YBitoYnpVkVoEEiQuVxoDMyABnmZHeldaDxUkJDI6An0EBBEkFxwBOXP9tSFGAgIkHlMuPv1qP1MmGTIdMAooChQRAxcgOS1LKSUHA2JajQFDAYxsiVZVcCyirUZDOVg+QhlEBAQEBjsuhEYkLwoISHcr/v1FkP7I/VDVN2JpSzGqgS1XTS8/UyYZMh0wCigKFBEDFyA5LUspJQcDYlqNAUMBjGyJVlVvLaKtRkM5WD5CGUQECjlAhEYkHB4BEAwNJzg0UDRbKloLkP7I/VDVN2JpSzGqgS1XTS8Bb0czLUIhR0JBWleJRwsRHjFpJCQgBFZEGSIGCE86KCgyGX0TNlckcFI9CzpwRzYvIA9wGz0NFSQAAAAC/7j83Qd0BjgAVQCQAAAFMh4BFRQOAgcGBwYWFzI+BTc2NzY3NhoBNyM1Mz4CNz4BMzIWHwEUBgcOAQcGJy4BJzQ/ATQnJgYHBgIHIRUhCgEHDgQjIiY1ND4CASImNT8BNCMiDwEGAgcjEzU0IyIOBAcGByc+CDc+AzMyFQ4BBz4EMzIWFRQB2CQ8HhESIwYZDw0QHhkxJScaIBANAwEkEiFGUxfR/B8gNB1w9JRMXQ8ODiELRCAaJB4eCGgzQUhlNhBNEgEV/s43zW8cPFRXbDZ2ihYpRgEOJS0DCx1JQDktiQnYzR0NFw4VCBkEKTEyBAcLBxAGEwYWAyE3UlcqTwIEARUhNzNGJDlX+D9TJhkyHTAKKAoUEQMXIDktSyklBwNiWo0BQwGMbIlWVW8toq1GQzlYPkIZRAQEBAY7LoRGJC8KCEh3K/79RZD+yP1Q1TdiaUsxqoEtV00vA2o6LycsGXBzc/4qGwK6EjoGBhQIHwUyTx0IEREMEwkVBhkCITE7IGUMMwwgLT0lGlc5ogAAAAP/uPzdCT4GOAApAH8AugAAATIWFRQHBiMiLwImIyIHIzUBBw4DByMTJRUBNjMyFhc+ATUiJzQ2ATIeARUUDgIHBgcGFhcyPgU3Njc2NzYaATcjNTM+Ajc+ATMyFh8BFAYHDgEHBicuASc0PwE0JyYGBwYCByEVIQoBBw4EIyImNTQ+AgEiJjU/ATQjIg8BBgIHIxM1NCMiDgQHBgcnPgg3PgMzMhUOAQc+BDMyFhUUCAQ3Q1ZPuEQdKz1OGy4+bwLw5h4tKRQXVmwCqP0JRkYdvQkYGkQLPvoCJDweERIjBhkPDRAeGTElJxogEA0DASQSIUZTF9H8HyA0HXD0lExdDw4OIQtEIBokHh4IaDNBSGU2EE0SARX+zjfNbxw8VFdsNnaKFilGAQ4lLQMLHUlAOS2JCdjNHQ0XDhUIGQQpMTIEBwsHEAYTBhYDITdSVypPAgQBFSE3M0YkOVcBnmZHeldaDxUkJDI6An0EBBEkFxwBOQN2/bUhRgICJB5TLj79aj9TJhkyHTAKKAoUEQMXIDktSyklBwNiWo0BQwGMbIlWVW8toq1GQzlYPkIZRAQEBAY7LoRGJC8KCEh3K/79RZD+yP1Q1TdiaUsxqoEtV00vA2o6LycsGXBzc/4qGwK6EjoGBhQIHwUyTx0IEREMEwkVBhkCITE7IGUMMwwgLT0lGlc5ogAB/4P+ogJd/5wADQAABQ4BIyImJzMeATMyNjcCXSfLhYe5Ixciy2Nk0ChkdIaDd0ZSUkYAAf+D/qIDg/+cABEAAAUOAiMiLgEnMx4CMzI+ATcDgxms2Gtp0qcWFhe1x1FZyLMbZEt1Ojl2Sy9IISFILwAAAAH/g/6iBMv/nAARAAAFDgEEIyIkJiczHgEEMzIkNjcEyxrQ/t6gl/7k0hcWF+cBEHp5ARLtG2RLdDs6dEwvSCEhSC8AAgAw/+wD0AVhAA0AHQAAJBIRNCcCIAMGFRQXFjMBFhUUBwIhIicmERA3NiEyApxuIT7+rD8hIkCwAWJlPnX+4MV/iFt7AP/mJQFCATHzkQEO/uqU8uOI/gRKw/3HsP61s78BSAECuv0AAAAAAQDjAAADJQVeABYAAAAWFREUFhcVITU+ATURNCYjIgYHNSUzAmIBUnD9zHlKGCgaUyQBbwwFWQUJ+0xNKgQcHgY2WgOeMDIdEBy7AAEAPQAAA8sFZQAbAAA3CAE1NCYjIgcGByc+ATMyFhUUAgEhMjY3FwMhPQFuAQagb4lVLysrMu+JqdHi/oYBy2BOMRpv/OEXAXwBZKmUm2Q3cgnms9WapP7Q/nsuWQz+6QAAAAABAD3+7APLBWUAIwAANwgBNTQmIyIHBgcnPgEzMhYVFAIBIREzETY3NjcXAyMRIxEhPQFuAQagb4lVLysrMu+JqdHi/oYBtHoWDicxGm8nev2CFwF8AWSplJtkN3IJ5rPVmqT+0P57AU3+vAYIF1kM/un+7AEUAAABAFn/8AN3BWsALwAANhYzMjY1NCcmIyIGByc+ATU0JiMiBwYHJz4BMzIWFRQHBgcWFxYVFAAhIiY1NDYz1rU/jIg3Xd0NGBACoLiRXW5ULjUfKNqPmadFJ1JgOm3+1f7se2MhJa5yvW9rUYkBAho6lnttclEsXAeYtqhuYVEuOSk3aaG+/t5JKhowAAIAFwAAA8cFXgACAA0AAAkBIRMzETMVIxEjESE1AlX+FQHrQl/R0Z/9wASQ/UoDhPx8hf6rAVWFAAAAAAIAFwAABHgFXgASABUAAAEzETMRMxEzFSMRIxEjESMRITUJASECl1+qeV9feaqf/cACPv4VAesFXvx8AQD/AIX+/QED/qsBVYUCtv1KAAAAAQBA/+kDfwV/ACwAADYWMzI2NRAlJiMiJic+ATcTITI2NxcHDgEjIQcWFxYXHgEVFAAjIicmNTQ2M9K5MnOs/uyZhBYLCAIDAtoBrSAjHBBOBCQV/n1VpEx9VEhK/sXxYjxkKy23gcuUAQNyPwMJCAsFAd4WHg65CQWvHBkqUkexY93+2BMfUB4tAAABAED/6QN/BggANAAANhYzMjY1ECUmIyImJz4BNxMhNTMVMzI2NxcHDgErARUjNSMHFhcWFx4BFRQAIyInJjU0NjPSuTJzrP7smYQWCwgCAwLaAQZ5LiAjHBBOBCQVEnn4VaRMfVRISv7F8WI8ZCstt4HLlAEDcj8DCQgLBQHevb0WHg65CQXGxq8cGSpSR7Fj3f7YEx9QHi0AAAABAED/6QO+BX8AMwAANhYzMjY1ECUmIyImJz4BNxMvARc3ITI2NxcHDgErAQUXJQcWFxYXHgEVFAAjIicmNTQ2M9K5MnOs/uyZhBYLCAIDAoLFAvskAa0gIxwQTgQkFeIBqgL9lTekTH1USEr+xfFiPGQrLbeBy5QBA3I/AwkICwUBHE2IYk8WHg65CQWmiPFyHBkqUkexY93+2BMfUB4tAAAAAAMAQf9kA38GBAAHADQAOwAAJRYzMjY1NCcBNjc2NxcHDgErAQMWFx4BFRQAIyInByM3JjU0NjMyFxMmIyImJz4BNxMhNzMBIwcWFzAzATBcMXOssgEADgoRHBBOBCQVDHE5LUhK/sXxKCI4fkNFKy0WG/eVgRYLCAIDAtoBSUt+/vX5VaRMAXU/y5TQcwJ1AwYLHg65CQX+7CAsR7Fj3f7YA4mlIEMeLQkCXzwDCQgLBQHeuf6mrxwZAAAAAgBG/+oDvgV4ABcAJQAAAAIjIgARECU2IRcOAQcOAQc2NzYzMhYVJyYjIgcGFRQSMzI2NTQDvuu8sP7fARj6ATgFfbVHSYAYPi1QUZ/Y4UaomzMei5Z3bAEQ/toBSgESAWH91CEXT0dI3m0mEiDczJ+sXDZ+o/7Iy4iFAAIARP/qA74FeAANAC4AAAEmIyIHBhUUEjMyNjU0FgIjIgAREDcvAQU2IRcOAQcGBwUXJQYHBgc2NzYzMhYVAt1GqJszHouWd2y367yw/t/s7AIBW+EBEAV9tUcBAgGjAv4GGRhAGD4tUFGf2AJmrFw2fqP+yMuIhe/+2gFKARIBRPBciIehIRdPRwECo4jFJCpvbSYSINzMAAAAAAEAKP/tA5cFSwAMAAABFQEjASEiBgcnPgE3A5f+ToQBlf5MYVVBI0EfGQVLIfrDBMdAZhCgS0IAAQAo/+0DlwYkABQAAAEVASMBIREjEQYHBgcnPgE3MzUzFQOX/k6EAZX+n3lEIipBI0EfGXt5BUsh+sMEx/7oARcGGSBmEKBLQtnZAAEAKP/tA7YFSwAUAAABFQMfASUDIxMvAQUTISIGByc+ATcDl9v4Av7fsITD7gIBGKr+TGFVQSNBHxkFSyH9XGKIcv3fAk1eiG4CAkBmEKBLQgAAAAMAdP/qA5AFYwALABgAMwAAJDY1NCYnDgEVFBYzEzY1NCYjIgYVFBYXNgUmNTQ2MzIWFRQHBgceARUUBiMiJjU0NzY3JgJ+dn3CVk6NbY8+dXdceI1zXv5UStuvob5hOH2qk9m2o+lRNYOEIoBgbYeJNqxQiaIDa01tX4V0U16hR0INYHSEuK5zdV01RX67f5DEtZR/YT9YagAAAAIAPf/QA68FYwAOACsAAAA2Nz4BNTQCIyIGFRQWMxoBFRQCBwYHBgcnNjc2Nz4BNwcGBwYjIiY1NBIzAkORCgQGjIdieXGUwPBybX/DbaYKaEV8S2p/ECNKZDQrqsftuQI9TBoKgSjQAQSysZL4Ayb+odiY/sZ7jkUnFSgYGzFHZflUGjgVDPGn1QEUAAAAAAIAPf/QA8AFYwAOADYAAAA2Nz4BNTQCIyIGFRQWMxoBFRQCBwYHHwElBgcGByc2NzY3NjclJwU2NzY3BwYHBiMiJjU0EjMCQ5EKBAaMh2J5cZTA8HJtAwT1Av6gXXVtpgpoRXxLAgP+XgIB/SsgQBAjSmQ0K6rH7bkCPUwaCoEo0AEEsrGS+AMm/qHYmP7GewQEX4iJRCknFSgYGzFHAgKjiMY5P31UGjgVDPGn1QEUAAAAAAEAKP/tA74FSwAUAAABFQM3FwUDIxMHJyUTISIGByc+ATcDl6/UAv72z4S/6AIBH6H+TGFVQSNBHxkFSyH9412IdP1/AkBliH0B50BmEKBLQgAAAAAADgCuAAEAAAAAAAAAAAACAAEAAAAAAAEACwAbAAEAAAAAAAIABwA3AAEAAAAAAAMAKACRAAEAAAAAAAQACwDSAAEAAAAAAAUACwD2AAEAAAAAAAYACwEaAAMAAQQJAAAAAAAAAAMAAQQJAAEAFgADAAMAAQQJAAIADgAnAAMAAQQJAAMAUAA/AAMAAQQJAAQAFgC6AAMAAQQJAAUAFgDeAAMAAQQJAAYAFgECAAAAAFYAZQByAG8AdgBpAG8AVABlAHgAdAAAVmVyb3Zpb1RleHQAAFIAZQBnAHUAbABhAHIAAFJlZ3VsYXIAAEYAbwBuAHQARgBvAHIAZwBlACAAMgAuADAAIAA6ACAAVgBlAHIAbwB2AGkAbwBUAGUAeAB0ACAAOgAgADEANwAtADEAMAAtADIAMAAxADQAAEZvbnRGb3JnZSAyLjAgOiBWZXJvdmlvVGV4dCA6IDE3LTEwLTIwMTQAAFYAZQByAG8AdgBpAG8AVABlAHgAdAAAVmVyb3Zpb1RleHQAAFYAZQByAHMAaQBvAG4AIAAxAC4AMAAAVmVyc2lvbiAxLjAAAFYAZQByAG8AdgBpAG8AVABlAHgAdAAAVmVyb3Zpb1RleHQAAAIAAAAAAAD/zQBmAAAAAAAAAAAAAAAAAAAAAAAAAAAAUwAAAAEAAgECAQMBBAEFAQYBBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkBOgE7ATwBPQE+AT8BQAFBAUIBQwFEAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEHdW5pMjY2RAd1bmkyNjZFB3VuaTI2NkYHdW5pRTA0NQd1bmlFMDQ2B3VuaUUwNDcHdW5pRTA0OAd1bmlFMDQ5B3VuaUUxRDAHdW5pRTFEMQd1bmlFMUQyB3VuaUUxRDMHdW5pRTFENQd1bmlFMUQ3B3VuaUUxRDkHdW5pRTFEQgd1bmlFMUREB3VuaUUxREYHdW5pRTFFMQd1bmlFMUUzB3VuaUUxRTUHdW5pRTFFNwd1bmlFMjYwB3VuaUUyNjEHdW5pRTI2Mgd1bmlFMjYzB3VuaUUyNjQHdW5pRTUyMAd1bmlFNTIxB3VuaUU1MjIHdW5pRTUyMwd1bmlFNTI0B3VuaUU1MjUHdW5pRTUyNgd1bmlFNTI3B3VuaUU1MjgHdW5pRTUyOQd1bmlFNTJBB3VuaUU1MkIHdW5pRTUyQwd1bmlFNTJEB3VuaUU1MkUHdW5pRTUyRgd1bmlFNTMwB3VuaUU1MzEHdW5pRTUzMgd1bmlFNTMzB3VuaUU1MzQHdW5pRTUzNQd1bmlFNTM2B3VuaUU1MzcHdW5pRTUzOAd1bmlFNTM5B3VuaUU1M0EHdW5pRTUzQgd1bmlFNTNDB3VuaUU1M0QHdW5pRTU1MAd1bmlFNTUxB3VuaUU1NTIHdW5pRUE1MAd1bmlFQTUxB3VuaUVBNTIHdW5pRUE1Mwd1bmlFQTU0B3VuaUVBNTUHdW5pRUE1Ngd1bmlFQTU3B3VuaUVBNTgHdW5pRUE1OQd1bmlFQTVBB3VuaUVBNUIHdW5pRUE1Qwd1bmlFQTVEB3VuaUVBNUUHdW5pRUE1Rgd1bmlFQTYwB3VuaUVBNjEHdW5pRUE2Mgd1bmlFQ0MwAAAAAf//AAIAAQAAAAwAAAAWAB4AAgABAAMAUgABAAQAAAACAAAAAQAAAAEAAAAAAAAAAQAAAADbzL1NAAAAANBnMXoAAAAA3jKglg==";

From 6febb5cafb245001cade90b9206962782417ce0c Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 17 Feb 2022 11:07:26 +0200
Subject: [PATCH 385/403] Intialize values in contructor/reset

---
 include/vrv/beam.h         |  2 +-
 include/vrv/layerelement.h |  3 ++-
 src/beam.cpp               | 10 ++++++++++
 src/layerelement.cpp       |  3 +++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 8e0b2e1d9cb..ce845390c65 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -196,7 +196,7 @@ class BeamSegment {
 // the systems)
 class BeamSpanSegment : public BeamSegment {
 public:
-    BeamSpanSegment() = default;
+    BeamSpanSegment();
     virtual ~BeamSpanSegment(){};
 
     /**
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 7c433e8ece7..7f9e2da8f08 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -483,7 +483,8 @@ class LayerElement : public Object,
     Staff *m_crossStaff;
     Layer *m_crossLayer;
 
-    bool m_isInBeamspan = false;
+    // flag to indicate that layerElement belongs to the beamSpan
+    bool m_isInBeamspan;
 
 protected:
     Alignment *m_alignment;
diff --git a/src/beam.cpp b/src/beam.cpp
index 6b2425f8650..bc4639a5079 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1628,6 +1628,16 @@ bool Beam::IsTabBeam()
 // BeamSpanSegment
 //----------------------------------------------------------------------------
 
+BeamSpanSegment::BeamSpanSegment() 
+{
+    m_measure = NULL;
+    m_staff = NULL;
+    m_layer = NULL;
+    m_begin = NULL;
+    m_end = NULL;
+    m_spanningType = SPANNING_START_END;
+}
+
 void BeamSpanSegment::SetSpanningType(int systemIndex, int systemCount)
 {
     if (0 == systemIndex) {
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index da5ab61ac87..d3760d92ad9 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -130,6 +130,8 @@ void LayerElement::Reset()
 
     m_crossStaff = NULL;
     m_crossLayer = NULL;
+
+    m_isInBeamspan = false;
 }
 
 LayerElement::~LayerElement() {}
@@ -2537,6 +2539,7 @@ int LayerElement::CalcMaxMeasureDuration(FunctorParams *functorParams)
 
 int LayerElement::ResetDrawing(FunctorParams *functorParams)
 {
+    m_isInBeamspan = false;
     m_drawingCueSize = false;
     m_crossStaff = NULL;
     m_crossLayer = NULL;

From f525c7f59b74c68802eb526086124489208c4701 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Thu, 17 Feb 2022 12:33:56 +0200
Subject: [PATCH 386/403] Formatting

---
 src/beam.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beam.cpp b/src/beam.cpp
index bc4639a5079..35d04fc9296 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -1628,7 +1628,7 @@ bool Beam::IsTabBeam()
 // BeamSpanSegment
 //----------------------------------------------------------------------------
 
-BeamSpanSegment::BeamSpanSegment() 
+BeamSpanSegment::BeamSpanSegment()
 {
     m_measure = NULL;
     m_staff = NULL;

From c8c04bac85437f4d70b67d17d958bd826224bdc5 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Mon, 14 Feb 2022 16:09:22 +0100
Subject: [PATCH 387/403] Resolve stem collisions

---
 src/layerelement.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index d3760d92ad9..36f5cae3c38 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1711,11 +1711,13 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
         else if (this->Is(NOTE)) {
             Note *currentNote = vrv_cast<Note *>(this);
             assert(currentNote);
-            if ((currentNote->GetDrawingDur() == DUR_1) && otherElements.at(i)->Is(STEM) && (shift == 0)) {
+            if (otherElements.at(i)->Is(STEM) && (shift == 0)) {
                 const int horizontalMargin = doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
                 Stem *stem = vrv_cast<Stem *>(otherElements.at(i));
-                data_STEMDIRECTION stemDir = stem->GetDrawingStemDir();
-                if (this->HorizontalLeftOverlap(otherElements.at(i), doc, 0, 0) != 0) {
+                const data_STEMDIRECTION stemDir = stem->GetDrawingStemDir();
+                const int leftOverlap = this->HorizontalLeftOverlap(otherElements.at(i), doc, 0, 0);
+                const int rightOverlap = this->HorizontalRightOverlap(otherElements.at(i), doc, 0, 0);
+                if ((leftOverlap != 0) && (rightOverlap != 0)) {
                     shift = 3 * horizontalMargin;
                     if (stemDir == STEMDIRECTION_up) {
                         shift *= -1;

From 4f57ecfd6b6d17483c0b01b3a8cd64f58b86efc5 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 17 Feb 2022 13:44:01 +0100
Subject: [PATCH 388/403] Improve flag shift for dots

---
 include/vrv/functorparams.h |  2 +-
 include/vrv/note.h          |  2 +-
 src/horizontalaligner.cpp   |  2 +-
 src/layerelement.cpp        |  4 ++--
 src/note.cpp                | 10 ++++++----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/include/vrv/functorparams.h b/include/vrv/functorparams.h
index 56d79197ea2..abf62c040e0 100644
--- a/include/vrv/functorparams.h
+++ b/include/vrv/functorparams.h
@@ -283,7 +283,7 @@ class AdjustDotsParams : public FunctorParams {
     }
     std::vector<int> m_staffNs;
     std::vector<LayerElement *> m_elements;
-    std::vector<LayerElement *> m_dots;
+    std::vector<Dots *> m_dots;
     Doc *m_doc;
     Functor *m_functor;
     Functor *m_functorEnd;
diff --git a/include/vrv/note.h b/include/vrv/note.h
index bd247e9f9d1..a3374502c45 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -358,7 +358,7 @@ class Note : public LayerElement,
      * Return whether dots are overlapping with flag. Take into account flag height, its position as well
      * as position of the note and position of the dots
      */
-    bool IsDotOverlappingWithFlag(Doc *doc, const int staffSize, bool isDotShifted);
+    bool IsDotOverlappingWithFlag(Doc *doc, const int staffSize, int dotLocShift);
 
     /**
      * Register deferred notes for MIDI
diff --git a/src/horizontalaligner.cpp b/src/horizontalaligner.cpp
index 97b48b2f1c4..9d45b322a1d 100644
--- a/src/horizontalaligner.cpp
+++ b/src/horizontalaligner.cpp
@@ -1197,7 +1197,7 @@ int Alignment::AdjustDotsEnd(FunctorParams *functorParams)
                     if (diff > max) max = diff;
                 }
                 if (max) dot->SetDrawingXRel(dot->GetDrawingXRel() + max);
-                vrv_cast<Dots *>(dot)->IsAdjusted(true);
+                dot->IsAdjusted(true);
             }
         }
     }
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 36f5cae3c38..cbacc5447b2 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1495,7 +1495,7 @@ int LayerElement::AdjustDots(FunctorParams *functorParams)
 
     if (this->Is(NOTE) && this->GetParent()->Is(CHORD)) return FUNCTOR_SIBLINGS;
     if (this->Is(DOTS)) {
-        params->m_dots.push_back(this);
+        params->m_dots.push_back(vrv_cast<Dots *>(this));
     }
     else {
         params->m_elements.push_back(this);
@@ -1711,7 +1711,7 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
         else if (this->Is(NOTE)) {
             Note *currentNote = vrv_cast<Note *>(this);
             assert(currentNote);
-            if (otherElements.at(i)->Is(STEM) && (shift == 0)) {
+            if (otherElements.at(i)->Is(STEM) && (shift == 0) && areDotsAdjusted) {
                 const int horizontalMargin = doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
                 Stem *stem = vrv_cast<Stem *>(otherElements.at(i));
                 const data_STEMDIRECTION stemDir = stem->GetDrawingStemDir();
diff --git a/src/note.cpp b/src/note.cpp
index dba54fc31f8..ab3cc500507 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -724,7 +724,7 @@ void Note::UpdateFromTransPitch(const TransPitch &tp)
     }
 }
 
-bool Note::IsDotOverlappingWithFlag(Doc *doc, const int staffSize, bool isDotShifted)
+bool Note::IsDotOverlappingWithFlag(Doc *doc, const int staffSize, int dotLocShift)
 {
     Object *stem = this->GetFirst(STEM);
     if (!stem) return false;
@@ -739,7 +739,7 @@ bool Note::IsDotOverlappingWithFlag(Doc *doc, const int staffSize, bool isDotShi
     const int flagHeight = doc->GetGlyphHeight(flagGlyph, staffSize, this->GetDrawingCueSize());
 
     const int dotMargin = flag->GetDrawingY() - this->GetDrawingY() - flagHeight - this->GetDrawingRadius(doc) / 2
-        - (isDotShifted ? doc->GetDrawingUnit(staffSize) : 0);
+        - dotLocShift * doc->GetDrawingUnit(staffSize);
 
     return dotMargin < 0;
 }
@@ -1197,8 +1197,10 @@ int Note::CalcDots(FunctorParams *functorParams)
         dots = vrv_cast<Dots *>(this->FindDescendantByType(DOTS, 1));
         assert(dots);
 
-        dots->SetMapOfDotLocs(this->CalcOptimalDotLocations());
-        const bool isDotShifted = (this->GetDrawingLoc() % 2 == 0);
+        MapOfDotLocs dotLocs = this->CalcOptimalDotLocations();
+        dots->SetMapOfDotLocs(dotLocs);
+
+        const int dotLocShift = *(dotLocs.cbegin()->second.rbegin()) - this->GetDrawingLoc();
 
         // Stem up, shorter than 4th and not in beam
         if (const int shift = dots->GetFlagShift(); shift) {

From cd18d8bb7e2f6f587fcfe570ce52d7d35bd352c2 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 17 Feb 2022 14:04:47 +0100
Subject: [PATCH 389/403] Skip notes with stem.sameas

---
 src/layerelement.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index cbacc5447b2..51305410171 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1712,9 +1712,12 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
             Note *currentNote = vrv_cast<Note *>(this);
             assert(currentNote);
             if (otherElements.at(i)->Is(STEM) && (shift == 0) && areDotsAdjusted) {
-                const int horizontalMargin = doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
                 Stem *stem = vrv_cast<Stem *>(otherElements.at(i));
                 const data_STEMDIRECTION stemDir = stem->GetDrawingStemDir();
+                // Nothing to do if note has same stem
+                if (currentNote->HasStemSameasNote()) continue;
+
+                const int horizontalMargin = doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
                 const int leftOverlap = this->HorizontalLeftOverlap(otherElements.at(i), doc, 0, 0);
                 const int rightOverlap = this->HorizontalRightOverlap(otherElements.at(i), doc, 0, 0);
                 if ((leftOverlap != 0) && (rightOverlap != 0)) {

From e3a215c65e856c3db1ec976dbfa668b3bacc94a1 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 17 Feb 2022 14:42:35 +0100
Subject: [PATCH 390/403] Use existing functionality

---
 src/layerelement.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 51305410171..455855ed8b4 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -1713,19 +1713,10 @@ std::pair<int, bool> LayerElement::CalcElementHorizontalOverlap(Doc *doc,
             assert(currentNote);
             if (otherElements.at(i)->Is(STEM) && (shift == 0) && areDotsAdjusted) {
                 Stem *stem = vrv_cast<Stem *>(otherElements.at(i));
-                const data_STEMDIRECTION stemDir = stem->GetDrawingStemDir();
                 // Nothing to do if note has same stem
                 if (currentNote->HasStemSameasNote()) continue;
 
-                const int horizontalMargin = doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-                const int leftOverlap = this->HorizontalLeftOverlap(otherElements.at(i), doc, 0, 0);
-                const int rightOverlap = this->HorizontalRightOverlap(otherElements.at(i), doc, 0, 0);
-                if ((leftOverlap != 0) && (rightOverlap != 0)) {
-                    shift = 3 * horizontalMargin;
-                    if (stemDir == STEMDIRECTION_up) {
-                        shift *= -1;
-                    }
-                }
+                shift -= stem->CompareToElementPosition(doc, currentNote, 0);
             }
         }
     }

From 2a2f9c6d486b83ac133033430bfc65d99ec59561 Mon Sep 17 00:00:00 2001
From: David Bauer <davidbauer.frg@gmail.com>
Date: Thu, 17 Feb 2022 15:00:09 +0100
Subject: [PATCH 391/403] Resolve rebase conflicts

---
 src/note.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/note.cpp b/src/note.cpp
index ab3cc500507..fee9b52e380 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -1207,7 +1207,7 @@ int Note::CalcDots(FunctorParams *functorParams)
             flagShift += shift;
         }
         else if ((this->GetDrawingStemDir() == STEMDIRECTION_up) && !this->IsInBeam() && (this->GetDrawingStemLen() < 3)
-            && !this->IsInBeamSpan() && (this->IsDotOverlappingWithFlag(params->m_doc, staffSize, isDotShifted))) {
+            && !this->IsInBeamSpan() && (this->IsDotOverlappingWithFlag(params->m_doc, staffSize, dotLocShift))) {
             // HARDCODED
             const int shift = params->m_doc->GetGlyphWidth(SMUFL_E240_flag8thUp, staffSize, drawingCueSize) * 0.8;
             flagShift += shift;

From e1fdd649450830c4f52858736806e91436b3aac7 Mon Sep 17 00:00:00 2001
From: Paul Overell <paul@bayleaf.org.uk>
Date: Fri, 18 Feb 2022 13:09:46 +0000
Subject: [PATCH 392/403] Fix Misplaced repetition dots in tablature #2648

---
 src/view_page.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/view_page.cpp b/src/view_page.cpp
index eb4687dcb5d..774345163c3 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -950,22 +950,26 @@ void View::DrawBarLineDots(DeviceContext *dc, Staff *staff, BarLine *barLine)
     const int x1 = x - barLineWidth / 2 - (dotSeparation + dotWidth);
     const int x2 = x + xShift;
 
-    const int yBottom = staff->GetDrawingY() - staff->m_drawingLines * m_doc->GetDrawingUnit(staffSize);
-    const int yTop = yBottom + m_doc->GetDrawingDoubleUnit(staffSize);
+    const int numDots = 3 - staff->m_drawingLines % 2; // odd => 2 dots, even => 3 dots
+    const int yInc = m_doc->GetDrawingDoubleUnit(staffSize); // vertical distance between dots
+    const int yBottom = staff->GetDrawingY() - (staff->m_drawingLines + numDots % 2) * m_doc->GetDrawingUnit(staffSize);
+    const int yTop = yBottom + (numDots - 1) * yInc;
 
     if (barLine->GetForm() == BARRENDITION_rptstart) {
-        this->DrawSmuflCode(dc, x2 - thickBarLineWidth / 2, yTop, SMUFL_E044_repeatDot, staffSize, false);
-        this->DrawSmuflCode(dc, x2 - thickBarLineWidth / 2, yBottom, SMUFL_E044_repeatDot, staffSize, false);
+        for (int y = yTop; y >= yBottom; y -= yInc) {
+            this->DrawSmuflCode(dc, x2 - thickBarLineWidth / 2, y, SMUFL_E044_repeatDot, staffSize, false);
+        }
     }
     if (barLine->GetForm() == BARRENDITION_rptboth) {
-        this->DrawSmuflCode(
-            dc, x2 + barLineSeparation + barLineWidth / 2, yTop, SMUFL_E044_repeatDot, staffSize, false);
-        this->DrawSmuflCode(
-            dc, x2 + barLineSeparation + barLineWidth / 2, yBottom, SMUFL_E044_repeatDot, staffSize, false);
+        for (int y = yTop; y >= yBottom; y -= yInc) {
+            this->DrawSmuflCode(
+                dc, x2 + barLineSeparation + barLineWidth / 2, y, SMUFL_E044_repeatDot, staffSize, false);
+        }
     }
     if ((barLine->GetForm() == BARRENDITION_rptend) || (barLine->GetForm() == BARRENDITION_rptboth)) {
-        this->DrawSmuflCode(dc, x1, yTop, SMUFL_E044_repeatDot, staffSize, false);
-        this->DrawSmuflCode(dc, x1, yBottom, SMUFL_E044_repeatDot, staffSize, false);
+        for (int y = yTop; y >= yBottom; y -= yInc) {
+            this->DrawSmuflCode(dc, x1, y, SMUFL_E044_repeatDot, staffSize, false);
+        }
     }
 
     return;

From 2db6fb96ccc718532e90e2f6d24b8490ef673dd4 Mon Sep 17 00:00:00 2001
From: Monceber <monceber.am@gmail.com>
Date: Fri, 18 Feb 2022 15:49:43 +0200
Subject: [PATCH 393/403] Return path member variable to track font-specific
 glyph location

---
 include/vrv/glyph.h            | 10 ++++++++++
 include/vrv/svgdevicecontext.h |  4 +++-
 include/vrv/vrv.h              |  4 ----
 src/glyph.cpp                  |  2 ++
 src/svgdevicecontext.cpp       |  8 +++-----
 src/vrv.cpp                    |  5 +----
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/include/vrv/glyph.h b/include/vrv/glyph.h
index 780e8941932..cdf64ce342a 100644
--- a/include/vrv/glyph.h
+++ b/include/vrv/glyph.h
@@ -66,6 +66,14 @@ class Glyph {
     void SetCodeStr(const std::string &codeStr) { m_codeStr = codeStr; }
     ///@}
 
+    /**
+     * @name Setter and getter for the path
+     */
+    ///@{
+    std::string GetPath() { return m_path; }
+    void SetPath(const std::string &path) { m_path = path; }
+    ///@}
+
     /**
      * @name Setter and getter for the horizAdvX
      */
@@ -106,6 +114,8 @@ class Glyph {
     int m_unitsPerEm;
     /** The Unicode code in hexa as string */
     std::string m_codeStr;
+    /** Path to the glyph XML file */
+    std::string m_path;
     /** A map of the available anchors */
     std::map<SMuFLGlyphAnchor, Point> m_anchors;
 };
diff --git a/include/vrv/svgdevicecontext.h b/include/vrv/svgdevicecontext.h
index 11a02437e66..6932f7c7857 100644
--- a/include/vrv/svgdevicecontext.h
+++ b/include/vrv/svgdevicecontext.h
@@ -23,6 +23,8 @@
 
 //----------------------------------------------------------------------------
 
+class Glyph;
+
 namespace vrv {
 
 //----------------------------------------------------------------------------
@@ -284,7 +286,7 @@ class SvgDeviceContext : public DeviceContext {
 
     // holds the list of glyphs from the smufl font used so far
     // they will be added at the end of the file as <defs>
-    std::set<std::string> m_smuflGlyphs;
+    std::set<Glyph *> m_smuflGlyphs;
 
     // pugixml data
     pugi::xml_document m_svgDoc;
diff --git a/include/vrv/vrv.h b/include/vrv/vrv.h
index 5e508a54309..78ecf7d7c9c 100644
--- a/include/vrv/vrv.h
+++ b/include/vrv/vrv.h
@@ -151,8 +151,6 @@ class Resources {
     /** Resource path */
     static std::string GetPath() { return s_path; }
     static void SetPath(const std::string &path) { s_path = path; }
-    /** Font name */
-    static std::string GetSmuflFontName() { return s_smuflFontName; }
     /** Init the SMufL music and text fonts */
     static bool InitFonts();
     /** Init the text font (bounding boxes and ASCII only) */
@@ -181,8 +179,6 @@ class Resources {
 
     /** The path to the resources directory (e.g., for the svg/ subdirectory with fonts as XML */
     static thread_local std::string s_path;
-    /** Name of the font used for SMUFL glyphs*/
-    static thread_local std::string s_smuflFontName;
     /** The loaded SMuFL font */
     static thread_local GlyphTable s_fontGlyphTable;
     /** A text font used for bounding box calculations */
diff --git a/src/glyph.cpp b/src/glyph.cpp
index baad7aac223..dd785fa6784 100644
--- a/src/glyph.cpp
+++ b/src/glyph.cpp
@@ -35,6 +35,7 @@ Glyph::Glyph()
     m_horizAdvX = 0;
     m_unitsPerEm = 20480;
     m_codeStr = "[unset]";
+    m_path = "[unset]";
 }
 
 Glyph::Glyph(std::string path, std::string codeStr)
@@ -81,6 +82,7 @@ Glyph::Glyph(int unitsPerEm)
     m_horizAdvX = 0;
     m_unitsPerEm = unitsPerEm * 10;
     m_codeStr = "[unset]";
+    m_path = "[unset]";
 }
 
 Glyph::~Glyph() {}
diff --git a/src/svgdevicecontext.cpp b/src/svgdevicecontext.cpp
index c5715f3225a..96493e29e7b 100644
--- a/src/svgdevicecontext.cpp
+++ b/src/svgdevicecontext.cpp
@@ -124,11 +124,9 @@ void SvgDeviceContext::Commit(bool xml_declaration)
         pugi::xml_document sourceDoc;
 
         // for each needed glyph
-        std::set<std::string>::const_iterator it;
-        for (it = m_smuflGlyphs.begin(); it != m_smuflGlyphs.end(); ++it) {
+        for (auto it = m_smuflGlyphs.begin(); it != m_smuflGlyphs.end(); ++it) {
             // load the XML file that contains it as a pugi::xml_document
-            const std::string path = Resources::GetPath() + "/" + Resources::GetSmuflFontName() + "/" + *it + ".xml";
-            std::ifstream source(path);
+            std::ifstream source((*it)->GetPath());
             sourceDoc.load(source);
 
             // copy all the nodes inside into the master document
@@ -906,7 +904,7 @@ void SvgDeviceContext::DrawMusicText(const std::wstring &text, int x, int y, boo
         }
 
         // Add the glyph to the array for the <defs>
-        m_smuflGlyphs.insert(glyph->GetCodeStr());
+        m_smuflGlyphs.insert(glyph);
 
         // Write the char in the SVG
         pugi::xml_node useChild = AppendChild("use");
diff --git a/src/vrv.cpp b/src/vrv.cpp
index 9cdf187b800..c3e488aec4e 100644
--- a/src/vrv.cpp
+++ b/src/vrv.cpp
@@ -66,7 +66,6 @@ namespace vrv {
 //----------------------------------------------------------------------------
 
 thread_local std::string Resources::s_path = "/usr/local/share/verovio";
-thread_local std::string Resources::s_smuflFontName = "";
 thread_local Resources::GlyphTextMap Resources::s_textFont;
 thread_local Resources::GlyphTable Resources::s_fontGlyphTable;
 thread_local Resources::GlyphNameTable Resources::s_glyphNameTable;
@@ -167,9 +166,6 @@ Glyph *Resources::GetTextGlyph(wchar_t code)
 
 bool Resources::LoadFont(const std::string &fontName)
 {
-    // set font name
-    s_smuflFontName = fontName;
-
     pugi::xml_document doc;
     const std::string filename = Resources::GetPath() + "/" + fontName + ".xml";
     pugi::xml_parse_result parseResult = doc.load_file(filename.c_str());
@@ -200,6 +196,7 @@ bool Resources::LoadFont(const std::string &fontName)
         if (current.attribute("w")) width = current.attribute("w").as_float();
         if (current.attribute("h")) height = current.attribute("h").as_float();
         glyph.SetBoundingBox(x, y, width, height);
+        glyph.SetPath(Resources::GetPath() + "/" + fontName + "/" + c_attribute.value() + ".xml");
         if (current.attribute("h-a-x")) glyph.SetHorizAdvX(current.attribute("h-a-x").as_float());
 
         // load anchors

From 69fb7811a5347a95792081257008af37ec509618 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Sun, 20 Feb 2022 19:36:06 +0100
Subject: [PATCH 394/403] fix build warning

---
 include/vrv/beamspan.h | 2 +-
 src/beamspan.cpp       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
index 6aaf3057cf5..d776cf0e6a1 100644
--- a/include/vrv/beamspan.h
+++ b/include/vrv/beamspan.h
@@ -105,4 +105,4 @@ class BeamSpan : public ControlElement,
 
 } // namespace vrv
 
-#endif //__VRV_BEAMSPAN_H__
\ No newline at end of file
+#endif //__VRV_BEAMSPAN_H__
diff --git a/src/beamspan.cpp b/src/beamspan.cpp
index 5cd21ef3f53..7dfbbad88a9 100644
--- a/src/beamspan.cpp
+++ b/src/beamspan.cpp
@@ -271,7 +271,7 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
     // found and process it separatelly in the end
     Object *currentSystem = this->GetFirstAncestor(SYSTEM);
     int currentSystemIndex = 0;
-    for (int i = 0; i < elements.size() - 1; ++i) {
+    for (int i = 0; i < (int)elements.size() - 1; ++i) {
         if (elements.at(i).second == currentSystem) {
             currentSystemIndex = i;
             continue;
@@ -283,4 +283,4 @@ int BeamSpan::ResolveSpanningBeamSpans(FunctorParams *functorParams)
     return FUNCTOR_CONTINUE;
 }
 
-} // namespace vrv
\ No newline at end of file
+} // namespace vrv

From a57737479e7d8a46fbf6515261295a401c350db6 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Mon, 21 Feb 2022 11:36:23 +0100
Subject: [PATCH 395/403] update Leland

---
 data/Leland.xml                 |   38 +-
 data/Leland/E000.xml            |    2 +-
 data/Leland/E003.xml            |    2 +-
 data/Leland/E004.xml            |    2 +-
 data/Leland/E047.xml            |    2 +-
 data/Leland/E04B.xml            |    2 +-
 data/Leland/E050.xml            |    2 +-
 data/Leland/E051.xml            |    2 +-
 data/Leland/E052.xml            |    2 +-
 data/Leland/E053.xml            |    2 +-
 data/Leland/E054.xml            |    2 +-
 data/Leland/E055.xml            |    2 +-
 data/Leland/E05C.xml            |    2 +-
 data/Leland/E05D.xml            |    2 +-
 data/Leland/E062.xml            |    2 +-
 data/Leland/E063.xml            |    2 +-
 data/Leland/E064.xml            |    2 +-
 data/Leland/E065.xml            |    2 +-
 data/Leland/E066.xml            |    2 +-
 data/Leland/E06A.xml            |    2 +-
 data/Leland/E06D.xml            |    2 +-
 data/Leland/E06E.xml            |    2 +-
 data/Leland/E082.xml            |    2 +-
 data/Leland/E083.xml            |    2 +-
 data/Leland/E084.xml            |    2 +-
 data/Leland/E085.xml            |    2 +-
 data/Leland/E086.xml            |    2 +-
 data/Leland/E087.xml            |    2 +-
 data/Leland/E088.xml            |    2 +-
 data/Leland/E089.xml            |    2 +-
 data/Leland/E08A.xml            |    2 +-
 data/Leland/E08B.xml            |    2 +-
 data/Leland/E0A0.xml            |    2 +-
 data/Leland/E0A2.xml            |    2 +-
 data/Leland/E0A3.xml            |    2 +-
 data/Leland/E0AF.xml            |    2 +-
 data/Leland/E0D9.xml            |    2 +-
 data/Leland/E0DB.xml            |    2 +-
 data/Leland/E0F5.xml            |    2 +-
 data/Leland/E0F6.xml            |    2 +-
 data/Leland/E240.xml            |    2 +-
 data/Leland/E241.xml            |    2 +-
 data/Leland/E242.xml            |    2 +-
 data/Leland/E243.xml            |    2 +-
 data/Leland/E244.xml            |    2 +-
 data/Leland/E245.xml            |    2 +-
 data/Leland/E246.xml            |    2 +-
 data/Leland/E247.xml            |    2 +-
 data/Leland/E248.xml            |    2 +-
 data/Leland/E249.xml            |    2 +-
 data/Leland/E24A.xml            |    2 +-
 data/Leland/E24B.xml            |    2 +-
 data/Leland/E24C.xml            |    2 +-
 data/Leland/E24D.xml            |    2 +-
 data/Leland/E24E.xml            |    2 +-
 data/Leland/E24F.xml            |    2 +-
 data/Leland/E260.xml            |    2 +-
 data/Leland/E261.xml            |    2 +-
 data/Leland/E262.xml            |    2 +-
 data/Leland/E263.xml            |    2 +-
 data/Leland/E264.xml            |    2 +-
 data/Leland/E265.xml            |    2 +-
 data/Leland/E266.xml            |    2 +-
 data/Leland/E267.xml            |    2 +-
 data/Leland/E268.xml            |    2 +-
 data/Leland/E269.xml            |    2 +-
 data/Leland/E26A.xml            |    2 +-
 data/Leland/E26B.xml            |    2 +-
 data/Leland/E270.xml            |    2 +-
 data/Leland/E271.xml            |    2 +-
 data/Leland/E272.xml            |    2 +-
 data/Leland/E273.xml            |    2 +-
 data/Leland/E274.xml            |    2 +-
 data/Leland/E275.xml            |    2 +-
 data/Leland/E280.xml            |    2 +-
 data/Leland/E281.xml            |    2 +-
 data/Leland/E282.xml            |    2 +-
 data/Leland/E283.xml            |    2 +-
 data/Leland/E440.xml            |    2 +-
 data/Leland/E442.xml            |    2 +-
 data/Leland/E446.xml            |    2 +-
 data/Leland/E447.xml            |    2 +-
 data/Leland/E4A0.xml            |    2 +-
 data/Leland/E4A1.xml            |    2 +-
 data/Leland/E4A2.xml            |    2 +-
 data/Leland/E4A3.xml            |    2 +-
 data/Leland/E4AE.xml            |    2 +-
 data/Leland/E4AF.xml            |    2 +-
 data/Leland/E4B0.xml            |    2 +-
 data/Leland/E4B1.xml            |    2 +-
 data/Leland/E4B2.xml            |    2 +-
 data/Leland/E4B3.xml            |    2 +-
 data/Leland/E4B4.xml            |    2 +-
 data/Leland/E4B5.xml            |    2 +-
 data/Leland/E4B6.xml            |    2 +-
 data/Leland/E4B7.xml            |    2 +-
 data/Leland/E4B8.xml            |    2 +-
 data/Leland/E4B9.xml            |    2 +-
 data/Leland/E4BA.xml            |    2 +-
 data/Leland/E4BB.xml            |    2 +-
 data/Leland/E4BD.xml            |    2 +-
 data/Leland/E4C0.xml            |    2 +-
 data/Leland/E4C1.xml            |    2 +-
 data/Leland/E4C4.xml            |    2 +-
 data/Leland/E4C5.xml            |    2 +-
 data/Leland/E4C8.xml            |    2 +-
 data/Leland/E4C9.xml            |    2 +-
 data/Leland/E4CE.xml            |    2 +-
 data/Leland/E4E1.xml            |    2 +-
 data/Leland/E4E5.xml            |    2 +-
 data/Leland/E4E6.xml            |    2 +-
 data/Leland/E4E7.xml            |    2 +-
 data/Leland/E4E8.xml            |    2 +-
 data/Leland/E4E9.xml            |    2 +-
 data/Leland/E4EA.xml            |    2 +-
 data/Leland/E4EB.xml            |    2 +-
 data/Leland/E4EC.xml            |    2 +-
 data/Leland/E4ED.xml            |    2 +-
 data/Leland/E4F2.xml            |    2 +-
 data/Leland/E4F6.xml            |    2 +-
 data/Leland/E500.xml            |    2 +-
 data/Leland/E501.xml            |    2 +-
 data/Leland/E502.xml            |    2 +-
 data/Leland/E510.xml            |    2 +-
 data/Leland/E511.xml            |    2 +-
 data/Leland/E512.xml            |    2 +-
 data/Leland/E513.xml            |    2 +-
 data/Leland/E515.xml            |    2 +-
 data/Leland/E516.xml            |    2 +-
 data/Leland/E517.xml            |    2 +-
 data/Leland/E518.xml            |    2 +-
 data/Leland/E519.xml            |    2 +-
 data/Leland/E51A.xml            |    2 +-
 data/Leland/E51B.xml            |    2 +-
 data/Leland/E51C.xml            |    2 +-
 data/Leland/E51D.xml            |    2 +-
 data/Leland/E51E.xml            |    2 +-
 data/Leland/E520.xml            |    2 +-
 data/Leland/E521.xml            |    2 +-
 data/Leland/E522.xml            |    2 +-
 data/Leland/E523.xml            |    2 +-
 data/Leland/E525.xml            |    2 +-
 data/Leland/E526.xml            |    2 +-
 data/Leland/E527.xml            |    2 +-
 data/Leland/E528.xml            |    2 +-
 data/Leland/E529.xml            |    2 +-
 data/Leland/E52A.xml            |    2 +-
 data/Leland/E52B.xml            |    2 +-
 data/Leland/E52C.xml            |    2 +-
 data/Leland/E52D.xml            |    2 +-
 data/Leland/E52E.xml            |    2 +-
 data/Leland/E52F.xml            |    2 +-
 data/Leland/E530.xml            |    2 +-
 data/Leland/E531.xml            |    2 +-
 data/Leland/E532.xml            |    2 +-
 data/Leland/E533.xml            |    2 +-
 data/Leland/E534.xml            |    2 +-
 data/Leland/E535.xml            |    2 +-
 data/Leland/E536.xml            |    2 +-
 data/Leland/E537.xml            |    2 +-
 data/Leland/E538.xml            |    2 +-
 data/Leland/E539.xml            |    2 +-
 data/Leland/E53A.xml            |    2 +-
 data/Leland/E53B.xml            |    2 +-
 data/Leland/E53C.xml            |    2 +-
 data/Leland/E53D.xml            |    2 +-
 data/Leland/E566.xml            |    2 +-
 data/Leland/E567.xml            |    2 +-
 data/Leland/E568.xml            |    2 +-
 data/Leland/E56A.xml            |    2 +-
 data/Leland/E56B.xml            |    2 +-
 data/Leland/E56F.xml            |    2 +-
 data/Leland/E587.xml            |    2 +-
 data/Leland/E59D.xml            |    2 +-
 data/Leland/E59E.xml            |    2 +-
 data/Leland/E5B2.xml            |    2 +-
 data/Leland/E5B5.xml            |    2 +-
 data/Leland/E5B8.xml            |    2 +-
 data/Leland/E5BB.xml            |    2 +-
 data/Leland/E5BC.xml            |    2 +-
 data/Leland/E5BD.xml            |    2 +-
 data/Leland/E5BE.xml            |    2 +-
 data/Leland/E5C0.xml            |    2 +-
 data/Leland/E5C3.xml            |    2 +-
 data/Leland/E5C6.xml            |    2 +-
 data/Leland/E5C7.xml            |    2 +-
 data/Leland/E5C8.xml            |    2 +-
 data/Leland/E5E6.xml            |    2 +-
 data/Leland/E612.xml            |    2 +-
 data/Leland/E613.xml            |    2 +-
 data/Leland/E614.xml            |    2 +-
 data/Leland/E630.xml            |    2 +-
 data/Leland/E632.xml            |    2 +-
 data/Leland/E650.xml            |    2 +-
 data/Leland/E651.xml            |    2 +-
 data/Leland/E655.xml            |    2 +-
 data/Leland/E880.xml            |    2 +-
 data/Leland/E883.xml            |    2 +-
 data/Leland/E886.xml            |    2 +-
 data/Leland/E887.xml            |    2 +-
 data/Leland/E888.xml            |    2 +-
 data/Leland/E889.xml            |    2 +-
 data/Leland/E93C.xml            |    2 +-
 data/Leland/E93D.xml            |    2 +-
 data/Leland/EAAD.xml            |    2 +-
 data/Leland/EAAE.xml            |    2 +-
 fonts/Leland.svg                | 1988 ++++++++++++++++---------------
 fonts/json/leland_metadata.json | 1312 +++++++++++---------
 208 files changed, 1987 insertions(+), 1761 deletions(-)

diff --git a/data/Leland.xml b/data/Leland.xml
index c216c2104e1..dddf6940a4f 100644
--- a/data/Leland.xml
+++ b/data/Leland.xml
@@ -69,7 +69,7 @@
   <g c="E53D" x="-12.0" y="-193.0" w="728.0" h="614.0" h-a-x="733" n="dynamicRinforzando2">
     <a n="opticalCenter" x="1.53" y="0.0"/>
   </g>
-  <g c="E000" x="-1.0" y="4.61" w="63.0" h="990.39" h-a-x="62" n="brace"/>
+  <g c="E000" x="-0.41" y="4.61" w="62.41" h="990.39" h-a-x="62" n="brace"/>
   <g c="E003" x="0.0" y="0.0" w="491.0" h="279.0" h-a-x="491" n="bracketTop"/>
   <g c="E004" x="0.0" y="-279.0" w="491.0" h="279.0" h-a-x="491" n="bracketBottom"/>
   <g c="E043" x="0.0" y="322.0" w="104.0" h="356.0" h-a-x="104" n="repeatDots"/>
@@ -77,10 +77,10 @@
   <g c="E047" x="0.0" y="0.0" w="654.0" h="869.0" h-a-x="654" n="segno"/>
   <g c="E048" x="0.0" y="-113.0" w="745.0" h="848.0" h-a-x="745" n="coda"/>
   <g c="E049" x="0.0" y="-113.0" w="738.0" h="848.0" h-a-x="738" n="codaSquare"/>
-  <g c="E04B" x="0.0" y="-281.0" w="554.0" h="1562.0" h-a-x="554" n="segnoSerpent2"/>
+  <g c="E04B" x="0.0" y="-280.0" w="554.0" h="1561.0" h-a-x="554" n="segnoSerpent2"/>
   <g c="E050" x="0.0" y="-666.0" w="640.0" h="1778.0" h-a-x="640" n="gClef"/>
   <g c="E051" x="0.0" y="-898.0" w="640.0" h="2010.0" h-a-x="640" n="gClef15mb"/>
-  <g c="E052" x="0.0" y="-898.0" w="640.0" h="2011.0" h-a-x="640" n="gClef8vb"/>
+  <g c="E052" x="0.0" y="-898.0" w="640.0" h="2010.0" h-a-x="640" n="gClef8vb"/>
   <g c="E053" x="0.0" y="-666.0" w="640.0" h="2003.0" h-a-x="640" n="gClef8va"/>
   <g c="E054" x="0.0" y="-667.0" w="640.0" h="2005.0" h-a-x="640" n="gClef15ma"/>
   <g c="E055" x="0.0" y="-667.0" w="1044.0" h="1779.0" h-a-x="1044" n="gClef8vbOld"/>
@@ -131,7 +131,7 @@
     <a n="stemDownNW" x="0.0" y="-0.17"/>
     <a n="stemUpSE" x="1.3" y="0.16"/>
   </g>
-  <g c="E0A5" x="0.0" y="0.0" w="0" h="0.0" h-a-x="0" n="noteheadNull"/>
+  <g c="E0A5" x="0.0" y="0.0" w="0.0" h="0.0" n="noteheadNull"/>
   <g c="E0A9" x="0.0" y="-132.0" w="325.0" h="264.0" n="noteheadXBlack">
     <a n="stemDownNW" x="0.0" y="-0.42"/>
     <a n="stemUpSE" x="1.3" y="0.42"/>
@@ -154,7 +154,7 @@
   <g c="E223" x="0.0" y="-377.0" w="290.0" h="755.0" h-a-x="290" n="tremolo4"/>
   <g c="E224" x="0.0" y="-471.0" w="290.0" h="944.0" h-a-x="290" n="tremolo5"/>
   <g c="E22A" x="-150.0" y="-140.0" w="300.0" h="280.0" h-a-x="150" n="buzzRoll"/>
-  <g c="E240" x="0.0" y="-817.0" w="289.0" h="829.0" h-a-x="289" n="flag8thUp">
+  <g c="E240" x="0.0" y="-817.0" w="289.04" h="829.0" h-a-x="289" n="flag8thUp">
     <a n="stemUpNW" x="0.0" y="-0.01"/>
   </g>
   <g c="E241" x="0.0" y="-12.0" w="309.0" h="829.0" h-a-x="309" n="flag8thDown">
@@ -184,7 +184,7 @@
   <g c="E249" x="0.0" y="-591.0" w="309.0" h="1394.0" h-a-x="309" n="flag128thDown">
     <a n="stemDownSW" x="0.0" y="-2.3"/>
   </g>
-  <g c="E24A" x="0.0" y="-820.08" w="279.0" h="1580.08" h-a-x="280" n="flag256thUp">
+  <g c="E24A" x="0.0" y="-820.0" w="279.0" h="1580.0" h-a-x="280" n="flag256thUp">
     <a n="stemUpNW" x="0.0" y="2.99"/>
   </g>
   <g c="E24B" x="0.0" y="-779.0" w="309.0" h="1582.0" h-a-x="309" n="flag256thDown">
@@ -331,19 +331,19 @@
   </g>
   <g c="E4A0" x="0.0" y="0.0" w="361.0" h="235.0" h-a-x="360" n="articAccentAbove"/>
   <g c="E4A1" x="0.0" y="-235.0" w="361.0" h="235.0" h-a-x="360" n="articAccentBelow"/>
-  <g c="E4A2" x="-0.25" y="0.0" w="78.5" h="78.0" h-a-x="78" n="articStaccatoAbove"/>
-  <g c="E4A3" x="-0.25" y="-78.0" w="78.5" h="78.0" h-a-x="78" n="articStaccatoBelow"/>
+  <g c="E4A2" x="-0.25" y="-0.25" w="78.5" h="78.25" h-a-x="78" n="articStaccatoAbove"/>
+  <g c="E4A3" x="-0.25" y="-78.25" w="78.5" h="78.25" h-a-x="78" n="articStaccatoBelow"/>
   <g c="E4A4" x="0.0" y="0.0" w="316.0" h="46.0" h-a-x="316" n="articTenutoAbove"/>
   <g c="E4A5" x="0.0" y="-46.0" w="316.0" h="46.0" h-a-x="316" n="articTenutoBelow"/>
   <g c="E4A6" x="0.0" y="0.0" w="127.0" h="248.0" h-a-x="127" n="articStaccatissimoAbove"/>
   <g c="E4A7" x="0.0" y="-248.0" w="127.0" h="248.0" h-a-x="127" n="articStaccatissimoBelow"/>
   <g c="E4AC" x="1.0" y="0.0" w="295.0" h="253.0" h-a-x="295" n="articMarcatoAbove"/>
   <g c="E4AD" x="0.0" y="-253.0" w="295.0" h="253.0" h-a-x="296" n="articMarcatoBelow"/>
-  <g c="E4AE" x="1.0" y="0.0" w="295.0" h="386.0" h-a-x="296" n="articMarcatoStaccatoAbove"/>
-  <g c="E4AF" x="0.0" y="-386.0" w="295.0" h="386.0" h-a-x="296" n="articMarcatoStaccatoBelow"/>
-  <g c="E4B0" x="0.0" y="0.0" w="361.0" h="344.0" h-a-x="360" n="articAccentStaccatoAbove"/>
+  <g c="E4AE" x="1.0" y="-0.25" w="295.0" h="386.25" h-a-x="296" n="articMarcatoStaccatoAbove"/>
+  <g c="E4AF" x="0.0" y="-386.0" w="295.0" h="386.25" h-a-x="296" n="articMarcatoStaccatoBelow"/>
+  <g c="E4B0" x="0.0" y="-0.25" w="361.0" h="344.25" h-a-x="360" n="articAccentStaccatoAbove"/>
   <g c="E4B1" x="0.0" y="-344.0" w="361.0" h="344.0" h-a-x="360" n="articAccentStaccatoBelow"/>
-  <g c="E4B2" x="0.0" y="0.0" w="316.0" h="187.0" h-a-x="316" n="articTenutoStaccatoAbove"/>
+  <g c="E4B2" x="0.0" y="-0.25" w="316.0" h="187.25" h-a-x="316" n="articTenutoStaccatoAbove"/>
   <g c="E4B3" x="0.0" y="-187.0" w="316.0" h="187.0" h-a-x="316" n="articTenutoStaccatoBelow"/>
   <g c="E4B4" x="0.0" y="0.0" w="361.0" h="358.0" h-a-x="360" n="articTenutoAccentAbove"/>
   <g c="E4B5" x="0.0" y="-358.0" w="361.0" h="358.0" h-a-x="360" n="articTenutoAccentBelow"/>
@@ -351,8 +351,8 @@
   <g c="E4B7" x="0.0" y="-212.0" w="212.0" h="212.0" h-a-x="212" n="articStressBelow"/>
   <g c="E4B8" x="0.0" y="-162.0" w="342.0" h="162.0" h-a-x="342" n="articUnstressAbove"/>
   <g c="E4B9" x="0.0" y="0.0" w="342.0" h="162.0" h-a-x="342" n="articUnstressBelow"/>
-  <g c="E4BA" x="0.0" y="0.0" w="488.0" h="122.0" h-a-x="489" n="articLaissezVibrerAbove"/>
-  <g c="E4BB" x="0.0" y="-122.0" w="488.0" h="122.0" h-a-x="489" n="articLaissezVibrerBelow"/>
+  <g c="E4BA" x="0.0" y="0.0" w="573.0" h="137.0" h-a-x="573" n="articLaissezVibrerAbove"/>
+  <g c="E4BB" x="0.0" y="-127.0" w="533.0" h="127.0" h-a-x="533" n="articLaissezVibrerBelow"/>
   <g c="E4BC" x="0.0" y="0.0" w="316.0" h="369.0" h-a-x="316" n="articMarcatoTenutoAbove"/>
   <g c="E4BD" x="0.0" y="-369.0" w="316.0" h="369.0" h-a-x="316" n="articMarcatoTenutoBelow"/>
   <g c="E4C0" x="0.0" y="0.0" w="622.0" h="368.0" h-a-x="622" n="fermataAbove"/>
@@ -374,7 +374,7 @@
   <g c="E4E8" x="0.0" y="-507.0" w="391.0" h="967.0" h-a-x="391" n="rest32nd"/>
   <g c="E4E9" x="0.0" y="-758.0" w="423.0" h="1222.0" h-a-x="423" n="rest64th"/>
   <g c="E4EA" x="-1.0" y="-759.0" w="476.0" h="1476.0" h-a-x="475" n="rest128th"/>
-  <g c="E4EB" x="0.0" y="-998.0" w="527.0" h="1721.0" h-a-x="526" n="rest256th"/>
+  <g c="E4EB" x="0.0" y="-998.0" w="526.44" h="1721.0" h-a-x="526" n="rest256th"/>
   <g c="E4EC" x="0.0" y="-1004.0" w="579.0" h="1971.0" h-a-x="579" n="rest512th"/>
   <g c="E4ED" x="1.0" y="-1004.0" w="633.0" h="2230.0" h-a-x="634" n="rest1024th"/>
   <g c="E4F2" x="0.0" y="-255.0" w="276.0" h="459.0" h-a-x="276" n="restQuarterOld"/>
@@ -408,7 +408,7 @@
   <g c="E524" x="0.0" y="-5.0" w="208.0" h="268.0" h-a-x="208" n="dynamicSforzando">
     <a n="opticalCenter" x="0.48" y="0.0"/>
   </g>
-  <g c="E525" x="-42.0" y="-1.0" w="281.0" h="258.0" h-a-x="256" n="dynamicZ">
+  <g c="E525" x="-42.0" y="-1.0" w="281.0" h="259.0" h-a-x="256" n="dynamicZ">
     <a n="opticalCenter" x="0.6" y="0.0"/>
   </g>
   <g c="E526" x="-12.0" y="-1.0" w="267.0" h="255.0" h-a-x="272" n="dynamicNiente">
@@ -429,8 +429,8 @@
   <g c="E5BB" x="0.0" y="0.0" w="662.0" h="406.0" h-a-x="662" n="ornamentPrecompTrillSuffixDandrieu"/>
   <g c="E5BD" x="0.0" y="-73.0" w="653.0" h="393.0" h-a-x="653" n="ornamentPrecompTrillWithMordent"/>
   <g c="E5C6" x="-1.0" y="0.0" w="703.0" h="389.0" h-a-x="702" n="ornamentPrecompMordentUpperPrefix"/>
-  <g c="E5C7" x="-0.03" y="-72.0" w="703.03" h="461.0" h-a-x="703" n="ornamentPrecompInvertedMordentUpperPrefix"/>
-  <g c="E5C8" x="0.0" y="-172.0" w="565.0" h="421.0" h-a-x="565" n="ornamentPrecompTrillLowerSuffix"/>
+  <g c="E5C7" x="0.0" y="-72.0" w="703.0" h="461.0" h-a-x="703" n="ornamentPrecompInvertedMordentUpperPrefix"/>
+  <g c="E5C8" x="0.0" y="-171.0" w="565.0" h="420.0" h-a-x="565" n="ornamentPrecompTrillLowerSuffix"/>
   <g c="E5E5" x="0.0" y="0.0" w="312.0" h="312.0" h-a-x="312" n="brassMuteClosed"/>
   <g c="E610" x="0.0" y="0.0" w="315.0" h="293.0" h-a-x="315" n="stringsDownBow"/>
   <g c="E611" x="0.0" y="0.0" w="315.0" h="293.0" h-a-x="315" n="stringsDownBowTurned"/>
@@ -441,7 +441,7 @@
   <g c="E631" x="0.0" y="0.0" w="269.0" h="389.0" h-a-x="269" n="pluckedSnapPizzicatoAbove"/>
   <g c="E632" x="0.0" y="0.0" w="389.0" h="269.0" h-a-x="389" n="pluckedBuzzPizzicato"/>
   <g c="E650" x="0.0" y="-10.0" w="981.0" h="555.0" h-a-x="981" n="keyboardPedalPed"/>
-  <g c="E651" x="0.0" y="-10.0" w="450.0" h="555.0" h-a-x="450" n="keyboardPedalP"/>
+  <g c="E651" x="0.0" y="-9.03" w="450.0" h="554.03" h-a-x="450" n="keyboardPedalP"/>
   <g c="E655" x="0.0" y="0.0" w="473.0" h="473.0" h-a-x="473" n="keyboardPedalUp"/>
   <g c="E880" x="0.0" y="-7.0" w="273.0" h="370.0" h-a-x="273" n="tuplet0"/>
   <g c="E881" x="0.0" y="0.0" w="239.0" h="363.0" h-a-x="239" n="tuplet1"/>
diff --git a/data/Leland/E000.xml b/data/Leland/E000.xml
index 261518ed78e..08e0bfd0c2d 100644
--- a/data/Leland/E000.xml
+++ b/data/Leland/E000.xml
@@ -1 +1 @@
-<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 500c18 -19 53 -57 53 -130c0 -91 -39 -183 -39 -240c0 -61 35 -118 37 -120v-2c1 -1 0 -2 -1 -3s-3 0 -4 2c-1 1 -55 56 -55 137c0 88 35 150 35 265c0 22 -9 57 -34 88c-1 1 -2 2 -2 3c1 1 1 3 2 3c25 31 34 66 34 88c0 115 -35 177 -35 265c0 82 54 136 55 137 c1 2 3 2 4 2c1 -1 1 -2 1 -3v-2c-2 -2 -37 -59 -37 -120c0 -57 39 -149 39 -240c0 -72 -35 -111 -53 -130z"/></symbol>
\ No newline at end of file
+<symbol id="E000" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 500c18 -19 53 -57 53 -130c0 -91 -39 -183 -39 -240c0 -61 35 -118 37 -120v-2c1 -1 0 -2 -1 -3s-3 0 -4 2c-1 1 -55 56 -55 137c0 88 35 150 35 265c0 22 -9 57 -34 88v0v0c-1 1 -2 2 -1 3c0 1 0 3 1 3c25 31 34 66 34 88c0 115 -35 177 -35 265c0 82 54 136 55 137 c1 2 3 2 4 2c1 -1 1 -2 1 -3v-2c-2 -2 -37 -59 -37 -120c0 -57 39 -149 39 -240c0 -72 -35 -111 -53 -130z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E003.xml b/data/Leland/E003.xml
index 48d97c3678d..043adad72cc 100644
--- a/data/Leland/E003.xml
+++ b/data/Leland/E003.xml
@@ -1 +1 @@
-<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 277c4 -3 7 -7 7 -12c0 -2 -1 -4 -1 -5c-1 -3 -60 -260 -368 -260h-122v104c0 8 6 13 14 13h159c191 0 291 154 293 157c2 4 7 5 11 5c2 0 5 -1 7 -2z"/></symbol>
\ No newline at end of file
+<symbol id="E003" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 277c4 -3 7 -7 7 -12c0 -2 -1 -4 -1 -5c-1 -3 -60 -260 -368 -260h-122v14v90c0 8 6 13 14 13h159c191 0 291 154 293 157c2 4 7 5 11 5c2 0 5 -1 7 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E004.xml b/data/Leland/E004.xml
index f33648c1f0f..498b0980fbf 100644
--- a/data/Leland/E004.xml
+++ b/data/Leland/E004.xml
@@ -1 +1 @@
-<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 -277c-2 -1 -5 -2 -7 -2c-4 0 -9 1 -11 5c-2 3 -102 157 -293 157h-159c-8 0 -14 5 -14 13v104h122c308 0 367 -257 368 -260c0 -1 1 -3 1 -5c0 -5 -3 -9 -7 -12z"/></symbol>
\ No newline at end of file
+<symbol id="E004" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M484 -277c-2 -1 -5 -2 -7 -2c-4 0 -9 1 -11 5c-2 3 -102 157 -293 157h-159c-8 0 -14 5 -14 13v90v14h122c308 0 367 -257 368 -260c0 -1 1 -3 1 -5c0 -5 -3 -9 -7 -12z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E047.xml b/data/Leland/E047.xml
index 6df2fec4d13..e89c15be5ae 100644
--- a/data/Leland/E047.xml
+++ b/data/Leland/E047.xml
@@ -1 +1 @@
-<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 479l191 -98c56 -29 84 -85 84 -164s-49 -199 -203 -199c-153 0 -167 76 -171 95c-1 3 -1 6 -1 10c0 34 26 59 60 59s67 -24 77 -59c12 -40 38 -63 74 -63c40 0 95 31 95 118c0 43 -43 73 -96 102l-172 89l-205 -362c-2 -3 -6 -6 -9 -7c-4 0 -8 0 -11 2l-15 11 c-3 2 -6 7 -6 11c0 2 0 5 1 7l204 360l-189 99c-58 33 -87 83 -87 162s50 199 204 199c153 0 167 -76 171 -95c1 -3 1 -6 1 -9c0 -36 -26 -61 -61 -61c-34 0 -67 24 -77 59c-12 40 -38 64 -74 64c-40 0 -95 -31 -95 -118c0 -49 33 -68 82 -94l187 -96l204 361c2 4 8 7 12 7 c2 0 6 -1 8 -2l16 -11c3 -2 6 -8 6 -12c0 -2 -1 -4 -2 -6zM573 488c-34 0 -64 30 -64 64c0 35 29 65 64 65s64 -30 64 -65c0 -34 -30 -64 -64 -64zM82 289c-35 0 -65 29 -65 64s30 64 65 64c34 0 64 -30 64 -64s-30 -64 -64 -64z"/></symbol>
\ No newline at end of file
+<symbol id="E047" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 479l191 -98c56 -29 84 -85 84 -164s-49 -199 -203 -199c-153 0 -167 76 -171 95c-1 3 -1 6 -1 10c0 20 11 49 44 57c5 1 11 2 16 2c34 0 67 -24 77 -59c12 -40 38 -63 74 -63c40 0 95 31 95 118c0 43 -43 73 -96 102l-172 89l-205 -362c-2 -3 -6 -6 -9 -7h-3 c-2 0 -6 1 -8 2l-15 11c-3 2 -6 7 -6 11c0 2 0 5 1 7l204 360l-189 99c-58 33 -87 83 -87 162s50 199 204 199c153 0 167 -76 171 -95c1 -3 1 -6 1 -9c0 -21 -11 -51 -45 -59c-5 -1 -11 -2 -16 -2c-34 0 -67 24 -77 59c-12 40 -38 64 -74 64c-40 0 -95 -31 -95 -118 c0 -49 33 -68 82 -94l187 -96l204 361c2 4 8 7 12 7c2 0 6 -1 8 -2l16 -11c3 -2 6 -8 6 -12c0 -2 -1 -4 -2 -6zM36 308c-12 12 -19 29 -19 45s7 33 19 45s30 19 46 19s33 -7 45 -19s19 -29 19 -45s-7 -33 -19 -45s-29 -19 -45 -19s-34 7 -46 19zM528 507 c-12 12 -19 29 -19 45s7 34 19 46s29 19 45 19s33 -7 45 -19s19 -30 19 -46s-7 -33 -19 -45s-29 -19 -45 -19s-33 7 -45 19z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E04B.xml b/data/Leland/E04B.xml
index 972b42ffd3c..f7d852e6c4f 100644
--- a/data/Leland/E04B.xml
+++ b/data/Leland/E04B.xml
@@ -1 +1 @@
-<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M225 101v-97c0 -7 -6 -13 -12 -13h-11c-7 0 -13 6 -13 13v112c-100 42 -189 103 -189 217c0 112 61 165 89 187c-54 46 -89 112 -89 174c0 86 19 127 76 183c-46 43 -76 115 -76 181c0 106 69 223 231 223c175 0 228 -64 251 -106c9 -17 16 -35 16 -53 c0 -46 -31 -64 -73 -64c-48 0 -78 33 -98 89c-16 44 -43 86 -120 86s-127 -46 -127 -105c0 -95 63 -134 109 -159v34c0 6 6 12 13 12h11c7 0 12 -6 12 -12v-54c26 -14 55 -28 104 -49v103c0 6 6 12 13 12h10c7 0 13 -6 13 -12v-118c100 -43 189 -104 189 -218 c0 -108 -57 -161 -86 -184c51 -39 86 -89 86 -161c0 -111 -61 -164 -88 -187c53 -45 88 -121 88 -193c0 -90 -49 -223 -230 -223c-88 0 -265 40 -265 157c0 35 19 68 56 73c74 0 89 -25 113 -95c18 -54 42 -87 119 -87s128 39 128 98c0 95 -63 142 -110 167v-28 c0 -7 -5 -13 -13 -13h-10c-8 0 -13 6 -13 13v48c-26 14 -55 28 -104 49zM189 624v177c-30 15 -59 32 -84 52c-3 -2 -25 -20 -25 -62c0 -95 62 -142 109 -167zM329 555v179c-34 16 -75 36 -104 49v-179c26 -14 55 -28 104 -49zM365 716l1 -177c27 -11 53 -24 77 -39 c3 2 32 18 32 73c0 84 -45 111 -110 143zM79 427c0 -76 50 -112 110 -142v170c-26 14 -52 29 -76 46c-4 -1 -34 -15 -34 -74zM225 438v-171c35 -17 75 -36 104 -50v172c-34 16 -75 36 -104 49zM442 154c3 2 33 24 33 74c0 97 -56 114 -86 131c-5 2 -13 7 -24 12v-171 c27 -13 53 -28 77 -46z"/></symbol>
\ No newline at end of file
+<symbol id="E04B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M442 154c3 2 33 24 33 74c0 97 -56 114 -86 131c-5 2 -13 7 -24 12v-171c27 -13 53 -28 77 -46zM225 438v-171c34 -17 75 -36 104 -50v172c-34 16 -75 36 -104 49zM166 297c5 -3 13 -7 23 -12v170c-27 14 -52 29 -76 46c-4 -1 -34 -15 -34 -74c0 -77 57 -114 87 -130z M189 624v176c-31 16 -59 33 -85 53c-2 -2 -24 -20 -24 -62c0 -95 62 -142 109 -167zM329 555v179c-34 16 -75 36 -104 49v-179c26 -14 55 -28 104 -49zM365 716v-177c28 -11 54 -24 78 -39c3 2 32 18 32 73c0 84 -45 111 -110 143zM225 101v-97c0 -7 -6 -12 -12 -12h-11 c-7 0 -13 5 -13 12v112c-100 42 -189 103 -189 217c0 112 61 164 89 187c-54 46 -89 112 -89 174c0 86 19 127 76 183c-47 43 -76 115 -76 181c0 106 69 223 231 223c175 0 228 -64 251 -106c9 -17 16 -35 16 -53c0 -46 -31 -64 -73 -64c-48 0 -78 33 -98 89 c-16 44 -43 86 -120 86s-127 -46 -127 -105c0 -95 63 -134 109 -160v34c0 7 6 13 13 13h11c7 0 12 -6 12 -13v-53c26 -14 55 -28 104 -49v102c0 7 6 13 13 13h10c7 0 13 -6 13 -13v-118c100 -42 189 -103 189 -217c0 -108 -57 -161 -86 -184c51 -39 86 -89 86 -161 c0 -111 -61 -164 -88 -187c53 -45 88 -121 88 -193c0 -90 -49 -222 -231 -222c-88 0 -264 39 -264 156c0 35 19 68 56 73c74 0 89 -25 113 -95c18 -54 42 -87 119 -87s128 39 128 98c0 95 -64 142 -110 167v-28c0 -7 -5 -12 -13 -12h-10c-8 0 -13 5 -13 12v48 c-26 13 -55 27 -104 49z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E050.xml b/data/Leland/E050.xml
index cb6519ba73f..52d13c49f0a 100644
--- a/data/Leland/E050.xml
+++ b/data/Leland/E050.xml
@@ -1 +1 @@
-<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M123 -513c0 66 44 123 114 123c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 0 -5 -1 -5 -3c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 155 55 155 159c0 53 -12 123 -31 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 322 217 406c21 17 73 70 74 71 c-17 112 -22 161 -22 215c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -178 -395c8 -56 18 -115 28 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141 c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153zM332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 70 -24 118 -39 118c-52 0 -98 -105 -107 -145zM420 -206l-58 329c-58 -14 -104 -63 -104 -124 c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166c0 94 62 190 153 217c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM562 -21c0 89 -65 150 -155 150 c7 -44 34 -203 55 -323c71 29 100 102 100 173z"/></symbol>
\ No newline at end of file
+<symbol id="E050" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M562 -21c0 89 -65 150 -155 150c7 -44 34 -203 55 -323c71 29 100 102 100 173zM420 -206l-58 329c-59 -14 -104 -63 -104 -124c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166c0 94 62 190 153 217c-7 41 -14 88 -23 142 c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 69 -24 118 -39 118c-52 0 -98 -105 -107 -145zM122 -513c0 66 45 123 115 123 c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 154 55 154 159c0 53 -11 123 -30 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215 c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -179 -395c9 -56 19 -115 29 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141c0 -63 -14 -129 -68 -167 c-36 -22 -77 -34 -124 -34c-135 0 -186 87 -186 153z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E051.xml b/data/Leland/E051.xml
index 4595de8156a..fd709d66b03 100644
--- a/data/Leland/E051.xml
+++ b/data/Leland/E051.xml
@@ -1 +1 @@
-<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M269 773c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -178 -395c8 -56 18 -115 28 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141 c0 -63 -14 -129 -68 -167c-43 -26 -87 -34 -136 -34l-48 -179c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19l-3 -23h-139l3 23h18c12 0 19 0 22 2c2 2 3 5 5 12l35 132c2 6 2 9 2 11c0 3 0 5 -11 5h-32l6 22h2c30 0 70 11 84 21c-81 11 -154 65 -154 152c0 66 44 123 114 123 c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 0 -5 -1 -5 -3c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 155 55 155 159c0 53 -12 123 -31 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 322 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215z M332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 70 -24 118 -39 118c-52 0 -98 -105 -107 -145zM420 -206l-58 329c-58 -14 -104 -63 -104 -124c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166 c0 94 62 190 153 217c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM562 -21c0 13 -1 23 -2 32c-9 48 -52 118 -153 118c7 -44 34 -203 55 -323c71 29 100 102 100 173zM329 -867c0 -3 11 -9 24 -9 c27 0 48 29 48 67c0 24 -11 38 -29 38c-8 0 -12 -1 -27 -7c-2 -12 -9 -19 -19 -19c-8 0 -13 6 -13 14c0 7 4 13 13 17l29 103l3 -1c26 -6 48 -9 69 -9c16 0 29 2 43 8c3 1 3 1 4 1c3 0 5 -2 5 -5c0 -39 -47 -54 -77 -54c-14 0 -15 0 -38 5l-10 -34c14 5 24 7 38 7 c35 0 67 -22 67 -60c0 -57 -45 -93 -99 -93c-42 0 -68 21 -68 53c0 21 13 34 32 34c16 0 28 -10 28 -26c0 -13 -10 -25 -21 -27c-2 -1 -2 -1 -2 -3z"/></symbol>
\ No newline at end of file
+<symbol id="E051" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M562 -21c0 13 -1 23 -2 32c-9 48 -52 118 -153 118c7 -44 34 -203 55 -323c71 29 100 102 100 173zM420 -206l-58 329c-59 -14 -104 -63 -104 -124c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166c0 94 62 190 153 217 c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 69 -24 118 -39 118c-52 0 -98 -105 -107 -145zM269 773 c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -179 -395c9 -56 19 -115 29 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141c0 -63 -14 -129 -68 -167 c-36 -22 -80 -34 -124 -34h-12l-48 -179c-3 -11 -4 -17 -4 -20s1 -5 22 -5h19l-3 -23h-139l3 23h18c12 0 19 0 21 2c3 2 4 5 6 12l35 132c2 6 2 9 2 11c0 3 0 6 -11 6h-32l6 21h2c30 0 70 11 84 22c-81 10 -155 64 -155 151c0 66 45 123 115 123c75 0 116 -57 116 -111 c0 -64 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 154 55 154 159c0 53 -11 123 -30 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215zM329 -867c0 -3 11 -9 24 -9 c27 0 48 29 48 67c0 24 -11 38 -29 38c-8 0 -12 -1 -27 -7c-2 -12 -9 -19 -19 -19c-8 0 -13 6 -13 14c0 7 4 13 12 17l30 103l3 -1c26 -6 48 -9 69 -9c16 0 29 2 43 8v0c3 1 3 1 4 1c3 0 5 -2 5 -5c0 -39 -47 -54 -77 -54c-14 0 -15 0 -38 5l-10 -34c14 5 24 7 38 7 c35 0 67 -22 67 -60c0 -56 -45 -93 -99 -93c-42 0 -68 21 -68 53c0 21 13 35 32 35c16 0 28 -11 28 -27c0 -13 -10 -25 -21 -27c-2 -1 -2 -1 -2 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E052.xml b/data/Leland/E052.xml
index 58413ab1758..0648d97bada 100644
--- a/data/Leland/E052.xml
+++ b/data/Leland/E052.xml
@@ -1 +1 @@
-<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M640 3c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89c10 -57 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 114 123c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 4 -2c1 -1 22 -6 47 -6 c100 0 154 55 154 159c0 53 -12 123 -30 219c-24 -4 -51 -7 -80 -7c-186 0 -349 147 -349 335c0 199 126 321 217 405c21 18 73 71 74 71c-17 113 -22 162 -22 216c0 84 18 211 83 287c32 39 64 52 71 52c17 0 46 -36 70 -87c17 -36 45 -109 45 -201 c0 -158 -74 -284 -179 -395c9 -55 18 -115 28 -175c146 0 253 -102 253 -252zM332 822c-7 -31 -11 -64 -11 -102c0 -41 5 -81 11 -121c69 69 147 147 147 250c0 70 -25 118 -40 118c-52 0 -97 -105 -107 -145zM362 -212c20 0 38 2 58 7l-58 328c-58 -14 -104 -63 -104 -124 c0 -48 22 -75 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 216c-6 42 -14 88 -23 142c-15 -14 -31 -29 -48 -43c-87 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 28 101 101 101 173c0 12 -2 23 -3 31 c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322zM423 -717c0 -24 -14 -40 -43 -53c18 -13 28 -32 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 31 27 51 53 61c-15 14 -22 28 -22 47c0 45 41 71 83 71c33 0 67 -16 67 -53zM361 -757c15 12 21 23 21 39 c0 21 -11 33 -31 33s-34 -13 -34 -31c0 -12 5 -19 21 -28l1 -1c3 -2 7 -4 22 -12zM323 -877c22 0 38 15 38 34c0 14 -7 24 -27 35c-2 2 -2 2 -14 8c-3 1 -4 2 -8 4c-17 -10 -26 -27 -26 -46c0 -21 15 -35 37 -35z"/></symbol>
\ No newline at end of file
+<symbol id="E052" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M423 -717c0 -24 -14 -40 -43 -53c18 -13 28 -32 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 31 26 51 52 61c-14 14 -21 28 -21 47c0 45 41 71 83 71c33 0 67 -16 67 -53zM323 -877c22 0 38 15 38 34c0 14 -8 24 -27 35v0c-2 2 -2 2 -14 8c-3 2 -4 2 -8 4 c-17 -10 -26 -26 -26 -46c0 -21 15 -35 37 -35zM361 -757c15 12 21 23 21 39c0 21 -12 33 -31 33c-20 0 -34 -13 -34 -31c0 -12 5 -19 20 -28l2 -1c3 -2 7 -4 22 -12zM640 2c0 -103 -73 -204 -171 -237c7 -38 12 -69 15 -89c10 -57 16 -102 16 -141 c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s44 123 114 123c75 0 116 -57 116 -111c0 -63 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 3 -2c2 -1 23 -6 47 -6c101 0 155 55 155 159c0 53 -12 124 -30 219c-24 -4 -51 -7 -80 -7c-186 0 -349 147 -349 335 c0 199 126 321 217 405c21 18 73 71 74 71c-17 113 -22 162 -22 216c0 84 18 211 83 287c32 39 64 51 71 51c17 0 46 -35 70 -86c17 -36 45 -110 45 -201c0 -158 -74 -284 -179 -395c9 -56 18 -115 28 -175c146 0 253 -102 253 -253zM332 822c-7 -31 -11 -64 -11 -102 c0 -41 5 -81 11 -121c69 69 147 147 147 250c0 70 -25 118 -40 118c-52 0 -97 -105 -107 -145zM362 -212c20 0 38 3 58 7l-58 328c-58 -14 -104 -63 -104 -124c0 -48 22 -75 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 216 c-7 42 -14 88 -23 142c-15 -15 -31 -29 -48 -43c-88 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 29 101 101 101 173c0 12 -2 23 -3 31c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E053.xml b/data/Leland/E053.xml
index 5e1f94ec52e..207c7e7d7df 100644
--- a/data/Leland/E053.xml
+++ b/data/Leland/E053.xml
@@ -1 +1 @@
-<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M640 3c0 -104 -73 -205 -171 -238c6 -38 12 -69 15 -89c10 -56 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s44 123 114 123c75 0 116 -57 116 -110c0 -64 -47 -105 -94 -112c-3 -1 -5 -2 -5 -3c0 -2 2 -3 3 -3c2 -1 23 -6 47 -6 c101 0 155 55 155 159c0 53 -12 124 -31 220c-23 -5 -50 -8 -79 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 70c-17 113 -22 162 -22 216c0 110 29 267 131 330c-39 3 -64 24 -65 54c0 31 27 51 53 62c-15 13 -21 27 -22 46c0 45 41 71 83 71 c33 0 67 -16 67 -53c0 -24 -14 -40 -43 -52c18 -14 28 -33 28 -56c0 -35 -25 -61 -64 -69c17 -13 38 -43 56 -81c16 -36 44 -109 44 -200c0 -159 -73 -285 -178 -396c8 -55 18 -114 28 -175c146 0 253 -102 253 -252zM444 1316c-20 0 -34 -12 -34 -30c0 -13 5 -20 21 -29 l1 -1c3 -2 7 -4 22 -12c15 12 21 23 21 39c0 21 -11 33 -31 33zM379 1160c0 -22 15 -36 37 -36s38 15 38 34c0 14 -7 24 -26 35h-1c-2 2 -2 2 -14 8c-3 2 -4 2 -8 4c-17 -10 -26 -26 -26 -45zM332 822c-8 -31 -11 -64 -11 -102c0 -41 5 -80 11 -121c69 69 146 147 146 251 c0 69 -24 118 -39 118c-52 0 -98 -105 -107 -146zM362 -212c19 0 38 3 58 7l-58 328c-58 -14 -104 -62 -104 -124c0 -48 22 -74 61 -98c12 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-7 41 -14 87 -23 141 c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 29 100 101 100 173c0 12 -1 23 -2 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323z"/></symbol>
\ No newline at end of file
+<symbol id="E053" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M640 3c0 -104 -73 -205 -171 -238c6 -38 12 -69 15 -89c10 -56 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -186 87 -186 153s45 123 115 123c75 0 116 -57 116 -110c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -6 47 -6 c101 0 155 55 155 159c0 53 -12 124 -31 220c-23 -5 -50 -8 -79 -8c-186 0 -349 147 -349 335c0 200 126 321 217 405c21 18 73 71 74 71c-17 113 -22 162 -22 216c0 84 18 211 82 287c18 22 36 35 49 43c-39 3 -65 24 -65 54c0 31 27 51 53 61c-15 14 -21 28 -22 47 c0 45 41 71 83 71c33 0 67 -16 67 -53c0 -24 -14 -40 -43 -52c18 -14 28 -33 28 -56c0 -35 -25 -61 -64 -70c17 -12 38 -42 56 -80c16 -36 44 -109 44 -201c0 -158 -73 -284 -178 -395c8 -55 18 -114 28 -175c146 0 253 -102 253 -252zM444 1316c-20 0 -34 -13 -34 -31 c0 -12 5 -19 21 -28l1 -1c3 -2 7 -4 22 -12c15 12 21 23 21 39c0 21 -11 33 -31 33zM379 1160c0 -22 15 -36 37 -36s38 15 38 34c0 14 -7 24 -27 35v0c-2 2 -2 2 -14 8c-3 2 -4 2 -8 4c-17 -10 -26 -26 -26 -45zM332 822c-8 -31 -11 -64 -11 -102c0 -41 5 -80 11 -121 c69 69 146 147 146 250c0 70 -24 119 -39 119c-52 0 -98 -105 -107 -146zM362 -211c19 0 38 2 58 6l-58 328c-58 -14 -104 -62 -104 -124c0 -48 22 -74 61 -98c12 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 216c-7 42 -14 88 -23 142 c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -308c0 -151 122 -250 265 -250zM462 -193c71 29 100 101 100 173c0 12 -1 23 -2 31c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E054.xml b/data/Leland/E054.xml
index 93f2da49f97..2b0982b58d8 100644
--- a/data/Leland/E054.xml
+++ b/data/Leland/E054.xml
@@ -1 +1 @@
-<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M379 1131l-3 -23h-139l3 23h19c12 0 20 1 22 3c2 1 2 3 4 7c0 1 1 6 4 16l32 120c2 6 2 9 2 11c0 3 0 6 -11 6h-33l6 21h2c31 0 72 12 86 22v1h18l-49 -182c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19zM640 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89 c10 -56 16 -102 16 -141c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153s44 124 114 124c75 0 116 -58 116 -111c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -6 47 -6c101 0 155 55 155 159c0 53 -12 124 -30 220 c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 82 287c27 32 53 46 66 51c-20 8 -31 24 -31 45s13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27c-2 -1 -2 -2 -2 -3c0 -4 10 -9 23 -9 c27 0 49 29 49 67c0 24 -11 38 -30 38c-7 0 -12 -1 -26 -7c-2 -12 -9 -19 -20 -19c-7 0 -13 6 -13 14c0 7 4 13 13 17l30 103l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8c2 1 3 1 4 1c2 0 4 -2 4 -5c0 -11 -8 -27 -19 -37c-14 -12 -31 -17 -58 -17c-14 0 -14 0 -38 5l-9 -34 c14 5 25 7 38 7c37 0 67 -21 67 -60c0 -56 -46 -93 -100 -93c-5 0 -10 1 -15 1c17 -13 37 -42 54 -79c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c8 -55 18 -114 28 -174c146 0 253 -103 253 -253zM332 821c-7 -30 -11 -64 -11 -102c0 -41 5 -80 11 -121 c69 69 147 147 147 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM362 -212c19 0 38 2 58 6l-58 329c-58 -15 -104 -63 -104 -125c0 -48 22 -74 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-7 41 -14 87 -23 141 c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -307c0 -152 122 -251 265 -251zM462 -194c71 29 100 101 100 173c0 12 -1 23 -2 32c-9 47 -52 118 -153 118c7 -45 34 -204 55 -323z"/></symbol>
\ No newline at end of file
+<symbol id="E054" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M462 -194c71 29 100 101 100 173c0 12 -1 23 -2 32c-9 47 -52 118 -153 118c7 -45 34 -204 55 -323zM362 -212c19 0 38 2 58 6l-58 328c-58 -14 -104 -62 -104 -124c0 -48 22 -74 61 -98c12 -8 22 -14 22 -22c0 -10 -9 -13 -17 -13c-80 0 -135 95 -135 166 c0 93 62 190 153 217c-7 41 -14 87 -23 141c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -307c0 -152 122 -251 265 -251zM332 821c-7 -31 -11 -64 -11 -102c0 -41 5 -80 11 -121c69 69 147 147 147 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM640 2 c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89c10 -56 16 -102 16 -141c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153s44 124 114 124c75 0 116 -58 116 -111c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -6 47 -6 c101 0 155 55 155 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 82 287c27 32 53 46 65 50c-19 9 -30 25 -30 46c0 20 13 34 32 34c17 0 28 -10 28 -26 c0 -13 -7 -23 -20 -27c-2 -1 -2 -2 -2 -3c0 -4 10 -9 23 -9c27 0 49 29 49 67c0 24 -11 38 -30 38c-7 0 -12 -1 -26 -7c-2 -12 -9 -19 -20 -19c-7 0 -13 6 -13 14c0 7 4 13 13 17l30 103l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8v0c2 1 3 1 4 1c2 0 4 -2 4 -5 c0 -11 -8 -27 -19 -37c-14 -12 -31 -17 -58 -17c-14 0 -14 0 -38 5l-9 -34c14 5 25 7 38 7c37 0 66 -21 66 -60c0 -56 -45 -93 -99 -93c-5 0 -10 0 -15 1c17 -13 37 -42 54 -79c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c8 -55 18 -114 28 -174 c146 0 253 -103 253 -253zM379 1131l-3 -23h-139l3 23h19c12 0 20 0 22 3v0c1 1 2 3 3 7h1c0 1 1 6 4 16l32 120c1 6 2 9 2 11c0 3 0 5 -11 5h-33l6 22h2c31 0 72 12 86 22v1h18l-49 -182c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E055.xml b/data/Leland/E055.xml
index 50e80c19db0..dd000b9fbec 100644
--- a/data/Leland/E055.xml
+++ b/data/Leland/E055.xml
@@ -1 +1 @@
-<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1044 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 16 -89c9 -57 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -111c0 -63 -47 -104 -94 -111c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6 c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-74 0 -145 24 -203 64c-24 -20 -51 -36 -81 -46c7 -38 12 -69 16 -89c9 -57 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -111 c0 -63 -47 -104 -94 -111c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 83 288 c33 38 64 51 71 51c18 0 47 -36 70 -87c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -174c18 0 35 -2 51 -5c44 105 122 179 183 237c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 83 288c33 38 64 51 71 51c18 0 47 -36 70 -87 c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -174c146 0 253 -103 253 -253zM736 821c-7 -30 -11 -64 -11 -102c0 -41 6 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM332 821c-7 -30 -11 -64 -11 -102 c0 -41 6 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM676 346c-47 -40 -92 -90 -126 -145c27 -21 48 -47 63 -78c25 58 73 107 133 125c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43zM362 -213c20 0 38 3 58 7l-57 328 c-59 -14 -104 -62 -104 -124c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -134 96 -134 167c0 93 61 190 152 217c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43c-88 -77 -175 -186 -175 -308c0 -151 122 -251 265 -251zM462 -194 c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323zM866 -194c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323zM766 -213c20 0 38 3 58 7l-57 328c-59 -14 -104 -62 -104 -124 c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-42 0 -77 27 -100 62c-10 -27 -23 -53 -41 -76c48 -40 111 -63 179 -63z"/></symbol>
\ No newline at end of file
+<symbol id="E055" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1044 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 16 -89c9 -56 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -110c0 -64 -47 -105 -94 -112c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6 c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-74 0 -145 24 -203 64c-24 -20 -51 -36 -81 -46c7 -38 12 -69 16 -89c9 -56 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -110 c0 -64 -47 -105 -94 -112c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 70c-17 113 -22 162 -22 216c0 84 18 211 83 287 c32 39 64 52 71 52c18 0 47 -36 70 -87c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -175c18 0 35 -1 51 -4c44 105 121 179 183 237c21 17 73 70 74 70c-17 113 -22 162 -22 216c0 84 18 211 83 287c32 39 64 52 71 52c18 0 47 -36 70 -87 c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -175c146 0 253 -102 253 -252zM736 821c-7 -31 -11 -64 -11 -102c0 -41 5 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM676 346c-47 -41 -93 -90 -126 -145 c26 -21 48 -47 63 -78c25 58 73 107 133 125c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43zM332 821c-7 -31 -11 -64 -11 -102c0 -41 5 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM362 -213c20 0 38 3 58 7l-57 328 c-59 -14 -104 -62 -104 -124c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43c-88 -77 -175 -186 -175 -308c0 -151 122 -251 265 -251zM462 -194 c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322zM766 -213c20 0 38 3 58 7l-57 328c-59 -14 -104 -62 -104 -124c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-42 0 -77 27 -100 62c-10 -27 -23 -53 -41 -76 c48 -40 111 -63 179 -63zM866 -194c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E05C.xml b/data/Leland/E05C.xml
index c731b84a229..2d8c938c1a9 100644
--- a/data/Leland/E05C.xml
+++ b/data/Leland/E05C.xml
@@ -1 +1 @@
-<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 30 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13 c-11 56 -33 151 -92 175v-436c0 -7 -5 -13 -12 -13s-13 6 -13 13v910c0 7 6 13 13 13s12 -6 12 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73 c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM13 469h72c7 0 13 -6 13 -13v-910 c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13z"/></symbol>
\ No newline at end of file
+<symbol id="E05C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M13 469h72c7 0 13 -6 13 -13v-910c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13zM627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 31 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25 c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13c-11 56 -33 151 -92 175v-436c0 -7 -5 -13 -12 -13s-13 6 -13 13v910c0 7 6 13 13 13s12 -6 12 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14 c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67 c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E05D.xml b/data/Leland/E05D.xml
index f60640ea965..976e2de820a 100644
--- a/data/Leland/E05D.xml
+++ b/data/Leland/E05D.xml
@@ -1 +1 @@
-<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 30 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13 c-11 56 -33 151 -92 175v-436c0 -7 -6 -13 -13 -13s-12 6 -12 13v910c0 7 5 13 12 13s13 -6 13 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73 c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM13 469h72c7 0 13 -6 13 -13v-910 c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13zM368 -559c0 -24 -14 -41 -43 -53c18 -13 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 21 -74 54c0 31 28 50 53 62c-15 14 -22 27 -22 46c0 46 41 72 83 72c31 0 67 -18 67 -53zM283 -587l1 -1l22 -11 c16 12 21 23 21 39c0 21 -11 32 -31 32s-34 -12 -34 -30c0 -13 5 -20 21 -29zM257 -639c-17 -10 -26 -26 -26 -45c0 -21 15 -35 37 -35s38 14 38 33c0 14 -7 25 -26 36h-1l-14 7c-3 2 -4 2 -8 4z"/></symbol>
\ No newline at end of file
+<symbol id="E05D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M13 469h72c7 0 13 -6 13 -13v-910c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13zM627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 31 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25 c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13c-11 56 -33 151 -92 175v-436c0 -7 -6 -13 -13 -13s-12 6 -12 13v910c0 7 5 13 12 13s13 -6 13 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14 c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67 c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM368 -559c0 -24 -14 -41 -43 -53c18 -13 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 21 -74 54c0 31 27 50 53 62c-15 14 -22 27 -22 46c0 46 41 72 83 72c31 0 67 -18 67 -53zM283 -587l1 -1l22 -11 c16 12 21 23 21 39c0 21 -11 32 -31 32s-34 -12 -34 -30c0 -13 5 -20 21 -29zM257 -639c-17 -10 -26 -26 -26 -45c0 -21 15 -35 37 -35s38 14 38 33c0 14 -7 25 -26 36h-1l-14 7c-3 2 -4 2 -8 4z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E062.xml b/data/Leland/E062.xml
index 2e654395f40..e5efbd54072 100644
--- a/data/Leland/E062.xml
+++ b/data/Leland/E062.xml
@@ -1 +1 @@
-<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 251c180 0 274 -112 274 -286c0 -184 -158 -362 -298 -463c-91 -71 -205 -118 -207 -118l-3 -1c-7 0 -16 2 -19 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109 c8 7 25 17 35 21c9 3 20 5 32 5c56 0 106 -47 106 -104c0 -66 -50 -109 -114 -109c-74 0 -116 54 -116 127s38 139 97 182c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51 s-22 -51 -48 -51s-48 23 -48 51z"/></symbol>
\ No newline at end of file
+<symbol id="E062" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 251c93 0 164 -29 211 -85c41 -49 63 -118 63 -201c0 -67 -25 -145 -69 -220c-25 -42 -56 -84 -92 -123c-40 -43 -86 -83 -137 -120c-91 -71 -205 -118 -206 -118s-4 -1 -5 -1c-6 0 -15 2 -18 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140 c39 35 83 98 116 164c30 59 65 148 65 241c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-17 -9 -39 -29 -50 -45s-23 -45 -26 -64c8 7 25 17 35 21c9 3 20 5 32 5c17 0 37 -4 58 -18c30 -19 48 -51 48 -86c0 -39 -19 -75 -50 -92c-19 -11 -42 -17 -64 -17 c-13 0 -26 2 -38 6c-30 10 -53 29 -65 56c-9 19 -13 41 -13 65c0 17 2 35 7 53c9 35 32 86 90 129c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z "/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E063.xml b/data/Leland/E063.xml
index 0ed47a1759e..e858ae572ec 100644
--- a/data/Leland/E063.xml
+++ b/data/Leland/E063.xml
@@ -1 +1 @@
-<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M253 251c180 0 275 -111 275 -286c0 -67 -25 -145 -69 -220c-59 -100 -135 -174 -229 -242c-91 -71 -205 -119 -207 -119l-4 -1c-7 0 -15 2 -18 12c0 2 -1 4 -1 5c0 12 11 19 11 19h1c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250 c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109c8 7 24 17 34 21c9 3 19 5 32 5c57 0 107 -46 107 -104c0 -65 -49 -109 -112 -109c-75 0 -118 52 -118 127c0 73 38 139 97 182c1 0 61 44 137 44zM567 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50z M567 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM259 -710c0 -4 1 -6 22 -6h19l-3 -23h-139l3 23h19c12 0 20 0 22 3v1c1 1 2 1 3 6l1 1c0 1 1 5 4 15l32 120c1 3 2 8 2 11s0 6 -11 6h-33l6 21h2c31 1 72 12 86 22v1h18l-49 -182 c-3 -11 -4 -16 -4 -19zM490 -510c2 0 4 -1 4 -5c0 -11 -9 -27 -19 -36c-14 -12 -32 -18 -58 -18c-14 0 -15 0 -38 5l-9 -34c14 5 25 7 38 7c38 0 66 -20 66 -60c0 -55 -45 -93 -99 -93c-41 0 -68 21 -68 53c0 21 13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27 c-1 0 -2 -1 -2 -1c0 -5 10 -11 23 -11c27 0 49 29 49 67c0 25 -11 39 -30 39c-7 0 -11 -2 -26 -8c-2 -12 -10 -19 -20 -19c-8 0 -13 6 -13 14s4 14 13 18l30 102l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8l1 1h3z"/></symbol>
\ No newline at end of file
+<symbol id="E063" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M567 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM567 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM259 -710c0 -4 1 -6 22 -6h19l-3 -23h-139l3 23h19c12 0 20 0 22 3v1c1 1 2 1 3 6l1 1c0 1 1 5 4 15l32 120 c1 3 2 8 2 11s0 6 -11 6h-33l6 21h2c31 1 72 12 86 22v1h18l-49 -182c-3 -11 -4 -16 -4 -19zM490 -510c2 0 4 -1 4 -5c0 -11 -9 -27 -19 -36c-14 -12 -32 -18 -58 -18c-14 0 -15 0 -38 5l-9 -34c14 5 25 7 38 7c20 0 36 -5 48 -16s18 -26 18 -44c0 -26 -10 -49 -28 -66 s-43 -27 -71 -27c-41 0 -68 21 -68 53c0 21 13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27c-1 0 -2 -1 -2 -1c0 -5 10 -11 23 -11c27 0 49 29 49 67c0 25 -11 39 -30 39c-7 0 -11 -2 -26 -8c-2 -12 -10 -19 -20 -19c-8 0 -13 6 -13 14s4 14 13 18l30 102l2 -1 c26 -6 49 -9 69 -9c17 0 30 2 44 8l1 1h3zM253 251c93 0 165 -29 212 -85c41 -49 63 -118 63 -201c0 -67 -25 -145 -69 -220c-25 -42 -56 -84 -92 -123c-40 -43 -86 -82 -137 -119c-91 -71 -205 -119 -206 -119s-5 -1 -6 -1c-6 0 -14 2 -17 12c0 2 -1 4 -1 5 c0 12 11 19 11 19h1c1 0 99 45 203 140c39 35 83 98 116 164c30 59 65 148 65 241c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-17 -9 -39 -29 -50 -45s-23 -45 -26 -64c8 7 24 17 34 21c9 3 19 5 32 5c17 0 38 -4 59 -18c30 -19 48 -51 48 -86c0 -39 -20 -76 -51 -93 c-18 -11 -40 -16 -61 -16c-14 0 -27 2 -40 6c-30 10 -53 29 -65 56c-9 19 -13 41 -13 65c0 17 2 35 7 53c9 35 32 86 90 129c1 0 61 44 137 44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E064.xml b/data/Leland/E064.xml
index 747bf027371..da341bb5f07 100644
--- a/data/Leland/E064.xml
+++ b/data/Leland/E064.xml
@@ -1 +1 @@
-<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M254 251c180 0 274 -112 274 -286c0 -187 -156 -359 -298 -462c-91 -71 -205 -119 -207 -119l-3 -1c-7 0 -16 2 -19 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109 c8 7 25 17 35 21c9 3 20 5 32 5c56 0 106 -47 106 -104c0 -67 -48 -109 -112 -109c-75 0 -118 52 -118 127c0 73 38 139 97 182c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51 s-22 -51 -48 -51s-48 23 -48 51zM352 -560v-1c0 -24 -14 -41 -43 -53c18 -13 29 -33 29 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 34 25 49 52 61c-15 14 -21 28 -21 47c0 46 40 71 82 71c31 0 67 -16 67 -52zM267 -588l1 -1c4 -2 8 -5 22 -12c16 12 21 23 21 39 c0 21 -11 33 -31 33s-33 -13 -33 -31c0 -13 4 -19 20 -28zM242 -640c-17 -10 -26 -27 -26 -46c0 -21 14 -35 36 -35s39 15 39 34c0 14 -8 24 -27 35c-2 1 -2 2 -14 8c-3 2 -4 2 -8 4z"/></symbol>
\ No newline at end of file
+<symbol id="E064" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM352 -560v-1c0 -24 -14 -41 -43 -53c18 -13 29 -33 29 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55 c0 17 9 34 24 46c8 6 17 10 28 15c-15 14 -21 28 -21 47c0 20 8 38 23 51s36 20 59 20c19 0 36 -5 48 -14c10 -8 19 -25 19 -38zM267 -588l1 -1c4 -2 8 -5 22 -12c16 12 21 23 21 39c0 21 -11 33 -31 33s-33 -13 -33 -31c0 -13 4 -19 20 -28zM242 -640 c-17 -10 -26 -27 -26 -46c0 -21 14 -35 36 -35s39 15 39 34c0 14 -8 24 -27 35c-2 1 -2 2 -14 8c-3 2 -4 2 -8 4zM254 251c93 0 164 -29 211 -85c41 -49 63 -118 63 -201c0 -67 -24 -145 -68 -220c-25 -42 -57 -84 -93 -123c-40 -43 -86 -82 -137 -119 c-91 -71 -205 -119 -206 -119s-4 -1 -5 -1c-6 0 -15 2 -18 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c39 35 83 98 116 164c30 59 65 148 65 241c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-17 -9 -39 -29 -50 -45s-23 -45 -26 -64c8 7 25 17 35 21 c9 3 20 5 32 5c17 0 37 -4 58 -18c30 -19 48 -51 48 -86c0 -39 -19 -76 -50 -93c-18 -11 -40 -16 -62 -16c-14 0 -27 2 -40 6c-30 10 -53 29 -65 56c-9 19 -13 41 -13 65c0 17 2 35 7 53c9 35 32 86 90 129c1 0 62 44 138 44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E065.xml b/data/Leland/E065.xml
index d0950d43648..5a131eeb9a6 100644
--- a/data/Leland/E065.xml
+++ b/data/Leland/E065.xml
@@ -1 +1 @@
-<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M282 248c176 -12 244 -137 244 -284c0 -122 -83 -308 -298 -461c-92 -72 -205 -119 -205 -119c-9 0 -19 0 -22 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140c69 63 182 240 182 406s-48 251 -153 251c-155 0 -169 -133 -169 -133s28 28 69 28c55 0 105 -47 105 -103 c0 -64 -52 -109 -114 -109c-77 0 -115 58 -115 128c0 58 26 127 97 180c0 0 50 36 117 42c-32 7 -53 27 -53 54c0 32 27 53 54 64c-16 15 -22 29 -22 48c0 47 41 74 85 74c20 0 38 -5 50 -15c11 -8 19 -26 19 -39v-1c0 -25 -14 -43 -44 -55c19 -14 29 -34 29 -57 c0 -37 -27 -65 -69 -73zM278 404h2c4 -2 7 -5 22 -13c16 12 23 24 23 41c0 22 -12 34 -33 34c-20 0 -35 -13 -35 -32c0 -13 5 -20 21 -30zM252 351c-17 -11 -27 -27 -27 -47c0 -22 15 -37 38 -37s40 15 40 35c0 15 -8 26 -28 37c-3 2 -3 2 -15 8zM569 124c0 28 22 51 48 51 s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z"/></symbol>
\ No newline at end of file
+<symbol id="E065" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M569 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM282 248c176 -12 244 -137 244 -284c0 -122 -83 -308 -298 -461c-92 -72 -205 -119 -205 -119h-4c-6 0 -15 1 -18 11 c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140c69 63 182 240 182 406s-48 251 -153 251c-155 0 -169 -133 -169 -133s28 28 69 28c17 0 36 -5 57 -18c33 -21 48 -53 48 -85c0 -37 -20 -74 -51 -92c-19 -11 -42 -17 -63 -17c-43 0 -84 22 -102 62c-8 18 -13 41 -13 66 c0 58 26 127 97 180c0 0 50 36 117 42c-32 7 -53 27 -53 54c0 18 10 36 26 48c8 6 16 11 28 16c-16 15 -22 29 -22 48c0 21 9 40 24 53s37 21 61 21c20 0 38 -5 50 -15c11 -8 19 -26 19 -39v-1c0 -25 -14 -43 -44 -55c19 -14 29 -34 29 -57c0 -37 -27 -65 -69 -73zM278 404 h2c4 -2 7 -5 22 -13c16 12 23 24 23 41c0 22 -12 34 -33 34c-20 0 -35 -13 -35 -32c0 -13 5 -20 21 -30zM252 351c-17 -11 -27 -27 -27 -47c0 -22 15 -37 38 -37s40 15 40 35c0 15 -8 26 -28 37c-3 2 -3 2 -15 8z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E066.xml b/data/Leland/E066.xml
index fef97caf1de..1ac38c4d1a0 100644
--- a/data/Leland/E066.xml
+++ b/data/Leland/E066.xml
@@ -1 +1 @@
-<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M225 278h20l-4 -23h-144l4 23h19c12 0 21 1 23 4c1 1 3 2 4 7c0 1 1 7 4 17l33 123c1 3 2 9 2 12s0 6 -12 6h-33l6 22h2c32 1 75 12 89 23h18l-50 -188c-3 -11 -4 -17 -4 -20c0 -4 1 -6 23 -6zM292 285l-2 -1v-1c0 -5 11 -11 25 -11c28 0 50 31 50 70c0 25 -11 40 -30 40 c-8 0 -13 -1 -28 -8c-2 -13 -9 -20 -20 -20c-8 0 -14 6 -14 14s5 15 14 19l30 105h3c27 -6 50 -10 71 -10c17 0 31 3 45 9h3l1 1c3 0 5 -2 5 -6c0 -11 -9 -28 -20 -37c-14 -12 -33 -18 -60 -18c-15 0 -15 0 -39 5l-10 -35c15 5 27 7 40 7c38 0 69 -22 69 -62 c0 -58 -48 -96 -103 -96c-43 0 -70 21 -70 54c0 21 13 36 33 36c17 0 29 -11 29 -27c0 -14 -8 -23 -22 -28zM252 249c198 0 273 -131 273 -285c0 -122 -82 -308 -297 -461c-92 -72 -206 -119 -206 -119c-9 0 -18 0 -21 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140 c69 63 181 240 181 406s-48 251 -153 251c-155 0 -168 -133 -168 -133s27 28 68 28c56 0 105 -48 105 -104c0 -64 -51 -108 -113 -108c-77 0 -116 57 -116 128c0 58 26 127 97 180c0 0 60 43 137 43zM569 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50 zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z"/></symbol>
\ No newline at end of file
+<symbol id="E066" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M569 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM225 278h20l-4 -23h-144l4 23h19c12 0 21 1 23 4c1 1 3 2 4 7c0 1 1 7 4 17l33 123c1 3 2 9 2 12s0 6 -12 6h-33l6 22 h2c32 1 75 12 89 23h18l-50 -188c-3 -11 -4 -17 -4 -20c0 -4 1 -6 23 -6zM292 285l-2 -1v-1c0 -5 11 -11 25 -11c28 0 50 31 50 70c0 25 -11 40 -30 40c-8 0 -13 -1 -28 -8c-2 -13 -9 -20 -20 -20c-8 0 -14 6 -14 14s5 15 14 19l30 105h3c27 -6 50 -10 71 -10 c17 0 31 3 45 9h2c1 0 2 1 3 1c2 0 4 -2 4 -6c0 -11 -9 -28 -20 -37c-14 -12 -33 -18 -60 -18c-15 0 -15 0 -39 5l-10 -35c15 5 27 7 40 7c20 0 38 -6 50 -17s19 -26 19 -45c0 -27 -11 -52 -30 -69s-45 -27 -73 -27c-43 0 -70 21 -70 54c0 21 13 36 33 36 c17 0 29 -11 29 -27c0 -14 -8 -23 -22 -28zM252 249c198 0 273 -131 273 -285c0 -122 -82 -308 -297 -461c-92 -72 -206 -119 -206 -119h-4c-5 0 -14 1 -17 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140c69 63 181 240 181 406s-48 251 -153 251 c-155 0 -168 -133 -168 -133s27 28 68 28c17 0 36 -5 57 -18c34 -21 48 -54 48 -86c0 -37 -19 -73 -50 -91c-19 -11 -41 -17 -63 -17c-43 0 -85 22 -103 62c-8 18 -13 41 -13 66c0 58 26 127 97 180c0 0 60 43 137 43z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E06A.xml b/data/Leland/E06A.xml
index e3090c162d1..bb9726cfe71 100644
--- a/data/Leland/E06A.xml
+++ b/data/Leland/E06A.xml
@@ -1 +1 @@
-<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 -422c0 -9 -7 -16 -16 -16h-272c-9 0 -16 7 -16 16v845c0 8 7 16 16 16h272c9 0 16 -8 16 -16v-845zM40 335v-669c0 -6 5 -10 10 -10h204c5 0 10 4 10 10v669c0 5 -4 10 -10 10h-204c-5 0 -10 -5 -10 -10z"/></symbol>
\ No newline at end of file
+<symbol id="E06A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 -422c0 -9 -7 -16 -16 -16h-272c-9 0 -16 7 -16 16v845c0 8 7 16 16 16h272c9 0 16 -8 16 -16v-845zM40 335v-669c0 -6 4 -10 10 -10h204c5 0 10 4 10 10v669c0 5 -4 10 -10 10h-204c-6 0 -10 -5 -10 -10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E06D.xml b/data/Leland/E06D.xml
index 66282d9fad6..22a15987837 100644
--- a/data/Leland/E06D.xml
+++ b/data/Leland/E06D.xml
@@ -1 +1 @@
-<symbol id="E06D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 746h369v-81h-136v-374h-96v374h-137v81zM0 -231l165 463h110l164 -463h-105l-31 95h-170l-32 -95h-101zM219 126l-60 -182h119zM273 -279c79 -1 141 -37 141 -121c0 -47 -16 -74 -57 -94c50 -19 72 -57 72 -109c0 -27 -7 -52 -21 -74c-35 -54 -85 -66 -148 -66h-211 v464h224zM242 -360h-101v-102h113c37 0 68 10 68 52c0 49 -42 50 -80 50zM255 -539h-114v-123h113c46 0 77 14 77 66c0 47 -37 57 -76 57z"/></symbol>
\ No newline at end of file
+<symbol id="E06D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 746h369v-81h-136v-374h-96v374h-137v81zM0 -231l165 463h110l164 -463h-105l-31 95h-170l-32 -95h-101zM219 126l-60 -182h119zM393 -329c14 -20 21 -43 21 -71s-7 -51 -21 -68c-8 -10 -20 -18 -36 -26c24 -9 42 -22 54 -41s18 -41 18 -68s-7 -52 -21 -74 c-9 -14 -19 -26 -32 -36c-15 -11 -33 -20 -53 -24c-21 -4 -42 -6 -63 -6h-2h-209v464h224c57 -1 96 -18 120 -50zM242 -360h-101v-102h113c20 0 36 3 49 11s19 21 19 41c0 22 -8 36 -25 43c-14 5 -33 7 -55 7zM255 -539h-114v-123h113c20 0 36 3 47 8c20 10 30 29 30 58 c0 24 -9 40 -29 49c-11 5 -27 8 -47 8z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E06E.xml b/data/Leland/E06E.xml
index a413619e975..24fd1695520 100644
--- a/data/Leland/E06E.xml
+++ b/data/Leland/E06E.xml
@@ -1 +1 @@
-<symbol id="E06E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 500h247v-54h-91v-250h-64v250h-92v54zM0 -154l111 310h73l110 -310h-70l-21 63h-114l-21 -63h-68zM147 85l-40 -122h79zM183 -186c53 -1 94 -26 94 -82c0 -18 -4 -34 -14 -45c-5 -7 -13 -12 -24 -18c34 -13 48 -37 48 -73c0 -26 -13 -58 -35 -73 c-10 -8 -22 -14 -36 -16c-14 -3 -28 -4 -42 -4h-141v311h150zM162 -241h-67v-68h75c14 0 24 2 33 7c9 6 13 14 13 28s-6 24 -17 29c-9 3 -22 4 -37 4zM171 -361h-76v-82h75c14 0 24 2 32 5c13 7 20 20 20 39c0 32 -25 38 -51 38z"/></symbol>
\ No newline at end of file
+<symbol id="E06E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M24 500h247v-54h-91v-251h-64v251h-92v54zM0 -154l111 310h73l110 -310h-70l-21 63h-114l-21 -63h-68zM147 85l-40 -122h79zM263 -220c10 -13 14 -29 14 -48c0 -18 -4 -34 -14 -45c-5 -7 -13 -12 -24 -17c16 -7 28 -15 36 -28s12 -27 12 -46c0 -18 -4 -34 -14 -49 c-6 -9 -12 -18 -21 -24c-10 -8 -22 -14 -36 -16c-14 -3 -28 -4 -42 -4h-1h-140v311h150c38 -1 64 -12 80 -34zM162 -241h-68v-68h76c14 0 24 2 33 7c9 6 13 14 13 28c0 15 -6 24 -17 29c-9 3 -22 4 -37 4zM171 -361h-77v-82h76c14 0 24 2 32 5c13 7 20 20 20 39 c0 16 -6 27 -20 33c-7 3 -18 5 -31 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E082.xml b/data/Leland/E082.xml
index c358ac2d291..d130ea48ded 100644
--- a/data/Leland/E082.xml
+++ b/data/Leland/E082.xml
@@ -1 +1 @@
-<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M342 -39c4 10 11 14 18 14c9 0 17 -6 17 -19c0 -27 -23 -102 -41 -139s-61 -60 -93 -60s-60 16 -78 42s-29 60 -58 60c-24 0 -32 -10 -33 -16c-1 -3 -1 -6 -1 -9c0 -8 2 -19 8 -33c2 -5 3 -9 3 -13c0 -18 -17 -31 -33 -31c-12 0 -36 3 -36 50s30 89 30 89 c58 87 197 112 197 229c0 51 -11 86 -68 86c-15 0 -29 -3 -34 -5c-18 -5 -23 -12 -23 -18c0 -5 4 -10 7 -11c26 -10 46 -41 46 -69c0 -41 -33 -74 -74 -74s-75 33 -75 74c0 46 28 137 179 137s170 -83 170 -125c0 -60 -27 -112 -133 -145s-131 -71 -131 -71c10 2 18 3 26 3 c54 0 68 -40 133 -40c49 0 69 72 77 94z"/></symbol>
\ No newline at end of file
+<symbol id="E082" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M342 -39c4 10 11 14 18 14c9 0 17 -6 17 -19c0 -27 -23 -102 -41 -139s-61 -60 -93 -60s-60 16 -78 42s-29 60 -58 60c-24 0 -32 -10 -33 -16c-1 -3 -1 -6 -1 -9c0 -8 2 -19 8 -33c2 -5 3 -9 3 -13c0 -18 -17 -31 -33 -31c-12 0 -36 3 -36 50s30 89 30 89 c58 87 197 112 197 229c0 45 -7 63 -26 75c-12 8 -28 11 -42 11c-15 0 -29 -3 -34 -5c-18 -5 -23 -12 -23 -18c0 -5 4 -10 7 -11c26 -10 46 -41 46 -69c0 -41 -33 -74 -74 -74s-75 33 -75 74c0 46 28 137 179 137s170 -83 170 -125c0 -60 -27 -112 -133 -145 s-131 -71 -131 -71c10 2 18 3 26 3c54 0 68 -40 133 -40c49 0 69 72 77 94z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E083.xml b/data/Leland/E083.xml
index 36bdba64dd7..6a469f449e4 100644
--- a/data/Leland/E083.xml
+++ b/data/Leland/E083.xml
@@ -1 +1 @@
-<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M272 16h-2c44 -14 94 -45 94 -118c0 -109 -104 -142 -200 -142c-74 0 -149 41 -149 123c0 36 29 65 65 65s64 -29 64 -65c0 -33 -27 -62 -60 -64c11 -8 37 -16 65 -16c42 0 87 18 87 85c0 70 -23 100 -67 106c-32 5 -55 5 -72 6c-11 1 -13 12 -13 12v20s1 14 13 14 s68 4 80 6s59 11 59 74c0 54 -45 79 -87 79c-19 0 -38 -5 -52 -15l-3 -3c28 -6 50 -34 50 -63c0 -36 -28 -64 -64 -64s-65 28 -65 64l1 2h-1s-5 122 167 122s175 -113 175 -122c0 -55 -35 -87 -85 -106z"/></symbol>
\ No newline at end of file
+<symbol id="E083" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M272 16h-2c44 -14 94 -45 94 -118c0 -109 -104 -142 -200 -142c-22 0 -71 1 -110 37c-36 33 -39 69 -39 82v4c0 36 29 65 65 65s64 -29 64 -65c0 -33 -27 -62 -60 -64c11 -8 37 -16 65 -16c42 0 87 18 87 85c0 70 -23 100 -67 106c-32 5 -55 5 -72 6c-11 1 -13 12 -13 12 v20s1 14 13 14s68 4 80 6s59 11 59 74c0 54 -45 79 -87 79c-19 0 -38 -5 -52 -15l-3 -3c28 -6 50 -34 50 -63c0 -36 -28 -64 -64 -64s-65 28 -65 64l1 2h-1s-5 122 167 122s175 -113 175 -122v-5c0 -18 -5 -70 -85 -101z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E084.xml b/data/Leland/E084.xml
index 83809dbd7b2..0eb7a6bc690 100644
--- a/data/Leland/E084.xml
+++ b/data/Leland/E084.xml
@@ -1 +1 @@
-<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 -127h-172c-9 0 -11 6 -11 6s-6 11 -10 18c-1 2 -1 4 -1 6c0 6 3 11 3 11c26 37 56 87 82 168s31 155 31 155c1 6 6 12 14 12h148c4 0 8 -2 10 -4l22 -22c1 -1 3 -5 3 -10c0 -4 -1 -9 -5 -14c-118 -158 -229 -278 -229 -278h115v82c0 4 1 8 4 11l91 83c2 2 6 3 9 4 c2 0 5 -1 7 -2l12 -6c5 -2 8 -7 8 -13v-159h89c8 0 14 -7 14 -14v-19c0 -8 -6 -15 -14 -15h-89v-74h89c8 0 14 -6 14 -14v-19c0 -8 -6 -14 -14 -14h-303c-7 0 -14 6 -14 14v19c0 8 7 14 14 14h83v74z"/></symbol>
\ No newline at end of file
+<symbol id="E084" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M208 -127h-172c-9 0 -11 6 -11 6s-7 11 -10 18c-1 2 -1 4 -1 6c0 6 3 11 3 11c26 37 56 87 82 168s31 155 31 155c1 6 6 12 13 12h149c4 0 7 -2 10 -4l22 -22c1 -1 3 -5 3 -10c0 -4 -1 -9 -5 -14c-118 -158 -230 -278 -230 -278h116v82c0 4 1 8 4 11l91 83c2 2 6 3 9 3h2 c2 0 3 0 5 -1l12 -6c4 -2 7 -7 7 -13v-159h90c8 0 14 -7 14 -14v-19c0 -8 -6 -15 -14 -15h-90v-74h90c8 0 14 -6 14 -14v-19c0 -8 -6 -14 -14 -14h-303c-7 0 -14 6 -14 14v19c0 8 7 14 14 14h83v74z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E085.xml b/data/Leland/E085.xml
index 8ace81d6da4..715ffe1a9ed 100644
--- a/data/Leland/E085.xml
+++ b/data/Leland/E085.xml
@@ -1 +1 @@
-<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 218c0 16 7 21 22 21c7 0 12 -1 12 -1c43 -6 78 -10 114 -10c37 0 75 4 124 16c6 1 10 2 14 2c13 0 18 -6 18 -14c0 -3 -1 -7 -2 -10c-28 -74 -82 -89 -154 -89c-35 0 -68 4 -83 5h-1c-6 0 -11 -5 -11 -11v-63c0 -4 3 -7 7 -7c1 0 3 0 4 1c29 20 64 28 97 28 c100 0 174 -56 174 -162c0 -107 -85 -168 -187 -168c-77 0 -160 37 -160 125c0 34 27 70 66 70s73 -19 73 -68s-31 -60 -40 -66c-3 -2 -4 -4 -4 -7c0 -2 2 -5 5 -6c6 -4 19 -7 42 -7c71 0 90 66 90 125c0 48 -13 109 -84 109c-63 0 -74 -52 -79 -65c-2 -6 -6 -8 -10 -8 c-2 0 -3 1 -5 1c-5 1 -26 6 -35 8c-6 1 -7 8 -7 13v3c3 45 5 90 5 135c0 52 -5 100 -5 100z"/></symbol>
\ No newline at end of file
+<symbol id="E085" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M27 218v4c0 14 12 17 22 17c7 0 12 -1 12 -1c43 -6 78 -10 114 -10c37 0 75 4 124 16c6 1 10 2 14 2c13 0 18 -6 18 -14c0 -3 -1 -7 -2 -10c-8 -21 -24 -58 -71 -77c-22 -9 -53 -12 -83 -12c-35 0 -68 4 -83 5h-1c-6 0 -11 -5 -11 -11v-63c0 -4 3 -7 7 -7c1 0 3 0 4 1 c29 20 64 28 97 28c45 0 88 -14 113 -31c37 -25 61 -77 61 -131c0 -40 -13 -82 -45 -115c-36 -37 -91 -53 -142 -53c-37 0 -73 9 -98 23c-52 30 -62 68 -62 102s27 70 66 70s73 -19 73 -68s-31 -60 -40 -66c-3 -2 -4 -4 -4 -7c0 -2 2 -5 5 -6c6 -4 19 -7 42 -7h8 c66 3 82 75 82 125c0 48 -13 109 -84 109c-63 0 -74 -52 -79 -65c-2 -6 -6 -7 -10 -7h-5c-5 1 -26 6 -35 8c-6 1 -7 9 -7 13v3s4 66 5 122v13c0 52 -5 100 -5 100z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E086.xml b/data/Leland/E086.xml
index 2be5ee80de5..45474d54774 100644
--- a/data/Leland/E086.xml
+++ b/data/Leland/E086.xml
@@ -1 +1 @@
-<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 48c63 0 140 -37 140 -135c0 -116 -131 -157 -166 -157s-72 2 -130 46c-59 52 -76 121 -76 182c0 56 15 105 25 129c20 46 85 132 175 132c100 0 142 -53 155 -89c4 -8 6 -23 6 -32v-3c0 -36 -29 -64 -65 -64s-64 28 -64 64c0 23 17 50 38 59c-10 11 -25 19 -50 19 c-70 0 -90 -74 -90 -131c0 -16 2 -32 5 -53c14 15 36 33 97 33zM210 -202c33 0 61 45 61 101s-28 102 -61 102s-60 -46 -60 -102s27 -101 60 -101z"/></symbol>
\ No newline at end of file
+<symbol id="E086" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M247 48c63 0 140 -37 140 -135c0 -116 -131 -157 -166 -157s-72 2 -130 46c-59 52 -76 121 -76 182c0 56 15 105 25 129c20 46 85 132 175 132c100 0 142 -53 155 -89c4 -8 6 -23 6 -32v-1v-2c0 -36 -29 -64 -65 -64s-64 28 -64 64c0 23 17 50 38 59 c-10 11 -25 19 -50 19c-54 0 -79 -46 -85 -83c-3 -18 -5 -32 -5 -48s2 -32 5 -53c14 15 36 33 97 33zM210 -202c33 0 61 45 61 101s-28 102 -61 102s-60 -46 -60 -102s27 -101 60 -101z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E087.xml b/data/Leland/E087.xml
index b8e036d4f51..6d03c31623b 100644
--- a/data/Leland/E087.xml
+++ b/data/Leland/E087.xml
@@ -1 +1 @@
-<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 -123c23 33 125 207 133 222c-10 -9 -47 -13 -67 -13c-80 0 -83 38 -118 38s-50 -31 -50 -54v-32c0 -6 -5 -11 -11 -11h-23c-6 0 -11 5 -11 11v185c0 6 5 11 11 11h23c6 0 11 -5 11 -11v-48c3 6 41 69 103 69c65 0 77 -85 119 -85c40 0 42 68 42 78c0 11 7 14 12 14 h18c6 0 10 -4 11 -14c1 -9 1 -14 1 -23c0 -22 -6 -78 -17 -109c-22 -63 -54 -148 -66 -195c-6 -22 -8 -46 -8 -67c0 -37 6 -68 6 -70v-3c1 -9 -16 -20 -25 -20c-7 0 -34 7 -62 6h-11c-32 -2 -42 -6 -58 -6c-11 0 -14 6 -14 17c0 37 29 77 51 110z"/></symbol>
\ No newline at end of file
+<symbol id="E087" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M162 -123c23 33 125 206 133 222c-10 -10 -47 -13 -67 -13c-80 0 -83 38 -118 38s-50 -31 -50 -54v-32c0 -6 -5 -11 -11 -11h-23c-6 0 -11 5 -11 11v185c0 6 5 11 11 11h23c6 0 11 -5 11 -11v-48c3 6 41 69 103 69c65 0 77 -86 119 -86c40 0 42 69 42 79s7 14 12 14h18 c6 0 10 -4 11 -14s1 -14 1 -23c0 -23 -6 -78 -17 -109c-22 -63 -54 -148 -66 -195c-6 -22 -8 -46 -8 -67c0 -37 6 -68 6 -70v-3c1 -9 -16 -20 -25 -20c-7 0 -34 7 -63 7c-3 0 -7 -1 -10 -1c-32 -2 -42 -6 -58 -6c-11 0 -14 6 -14 17c0 37 29 77 51 110z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E088.xml b/data/Leland/E088.xml
index 724845e996c..4b569d77eeb 100644
--- a/data/Leland/E088.xml
+++ b/data/Leland/E088.xml
@@ -1 +1 @@
-<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 18c52 -27 69 -72 69 -120c0 -81 -85 -146 -189 -146s-189 65 -189 146c0 48 25 85 70 111c-47 30 -57 66 -57 106c0 72 79 131 176 131s176 -59 176 -131c0 -40 -23 -72 -56 -97zM268 45c18 9 40 32 40 80c0 46 -42 75 -104 75c-43 0 -79 -16 -79 -55 c0 -45 75 -78 143 -100zM204 -192c64 0 98 35 98 62c0 55 -97 89 -165 112c0 0 -52 -16 -52 -83c0 -56 55 -91 119 -91z"/></symbol>
\ No newline at end of file
+<symbol id="E088" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M324 18c52 -27 69 -72 69 -120c0 -81 -85 -146 -189 -146s-189 65 -189 146c0 48 25 85 70 111c-47 30 -57 66 -57 106c0 72 79 131 176 131s176 -59 176 -131c0 -40 -23 -72 -56 -97zM204 -192c63 0 98 35 98 62c0 55 -97 89 -165 112c0 0 -52 -16 -52 -83 c0 -56 55 -91 119 -91zM268 45c18 9 40 32 40 80c0 46 -42 75 -104 75c-43 0 -79 -16 -79 -55c0 -45 75 -78 143 -100z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E089.xml b/data/Leland/E089.xml
index bfb916e647d..b6d62ffb846 100644
--- a/data/Leland/E089.xml
+++ b/data/Leland/E089.xml
@@ -1 +1 @@
-<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 -47c-63 0 -140 37 -140 135c0 116 131 157 166 157s72 -2 130 -46c59 -52 76 -121 76 -182c0 -56 -15 -105 -25 -129c-20 -46 -85 -132 -175 -132c-100 0 -142 53 -155 89c-4 8 -6 23 -6 32v3c0 36 29 64 65 64s64 -28 64 -64c0 -23 -17 -50 -38 -59 c10 -11 25 -19 50 -19c70 0 90 74 90 131c0 16 -2 32 -5 53c-14 -15 -36 -33 -97 -33zM192 204c-33 0 -61 -46 -61 -102s28 -101 61 -101s60 45 60 101s-27 102 -60 102z"/></symbol>
\ No newline at end of file
+<symbol id="E089" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M155 -47c-63 0 -140 37 -140 135c0 116 131 157 166 157s72 -2 130 -46c59 -52 76 -121 76 -182c0 -56 -15 -105 -25 -129c-20 -46 -85 -132 -175 -132c-100 0 -142 53 -155 89c-4 8 -6 23 -6 32v1v2c0 36 29 64 65 64s64 -28 64 -64c0 -23 -17 -50 -38 -59 c10 -11 25 -19 50 -19c54 0 79 46 85 83c3 18 5 32 5 48s-2 32 -5 53c-14 -15 -36 -33 -97 -33zM192 204c-33 0 -61 -46 -61 -102s28 -101 61 -101s60 45 60 101s-27 102 -60 102z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E08A.xml b/data/Leland/E08A.xml
index e47d42fd35b..7879af0b57f 100644
--- a/data/Leland/E08A.xml
+++ b/data/Leland/E08A.xml
@@ -1 +1 @@
-<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M325 179c2 1 2 3 2 4c0 2 0 3 -1 5c-11 17 -32 34 -79 34c-89 0 -111 -64 -111 -120v-191c0 -88 42 -135 129 -135c88 0 147 50 151 133c0 4 4 8 8 8h13c5 0 8 -3 8 -8c-4 -107 -81 -165 -180 -165c-250 0 -265 149 -265 268c0 65 25 246 243 246c170 0 209 -92 218 -135 c2 -7 2 -14 2 -21c0 -50 -40 -90 -90 -90h-11c-41 5 -74 37 -79 78c-1 4 -1 8 -1 12c0 32 18 61 43 77z"/></symbol>
\ No newline at end of file
+<symbol id="E08A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M325 179c2 1 2 3 2 4c0 2 0 3 -1 5c-11 17 -32 34 -79 34c-89 0 -111 -64 -111 -120v-191c0 -88 42 -135 129 -135c88 0 147 50 151 133c0 4 4 8 8 8h13c5 0 8 -3 8 -8c-4 -107 -81 -165 -180 -165c-250 0 -265 149 -265 268c0 65 25 246 243 246c170 0 209 -92 218 -135 c1 -4 2 -11 2 -15v-6c0 -50 -40 -90 -90 -90h-11c-41 5 -74 37 -79 78c-1 4 -1 8 -1 12c0 32 18 61 43 77z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E08B.xml b/data/Leland/E08B.xml
index d42a715325c..79e07c02173 100644
--- a/data/Leland/E08B.xml
+++ b/data/Leland/E08B.xml
@@ -1 +1 @@
-<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M424 -83h13c5 0 8 -3 8 -8c-4 -112 -84 -165 -189 -165v-109c0 -6 -5 -11 -11 -11h-27c-6 0 -11 5 -11 11v112c-195 21 -207 156 -207 265c0 61 22 225 207 244v121c0 6 5 11 11 11h27c6 0 11 -5 11 -11v-120c159 -4 196 -93 205 -134c2 -7 2 -14 2 -21 c0 -50 -40 -90 -90 -90h-10c-41 5 -75 37 -80 78c-1 4 -1 8 -1 12c0 32 18 61 43 77c2 1 2 2 2 4c0 1 0 2 -1 4c-10 16 -29 33 -70 35v-446c87 0 155 39 160 133c0 4 4 8 8 8zM136 102v-191c0 -66 23 -109 71 -126v432c-57 -16 -71 -68 -71 -115z"/></symbol>
\ No newline at end of file
+<symbol id="E08B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M424 -83h13c5 0 8 -3 8 -8c-4 -107 -81 -165 -180 -165h-9v-109c0 -6 -5 -11 -11 -11h-27c-6 0 -11 5 -11 11v112c-195 21 -207 156 -207 265c0 61 22 225 207 244v121c0 6 5 11 11 11h27c6 0 11 -5 11 -11v-120c159 -4 196 -93 205 -134c1 -4 2 -11 2 -15v-6 c0 -50 -40 -90 -90 -90h-10c-41 5 -75 37 -80 78c-1 4 -1 8 -1 12c0 32 18 61 43 77c2 1 2 2 2 4c0 1 0 2 -1 4c-10 16 -29 33 -70 35v-446h9c88 0 147 50 151 133c0 4 4 8 8 8zM136 102v-191c0 -66 23 -109 71 -126v432c-57 -16 -71 -68 -71 -115z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A0.xml b/data/Leland/E0A0.xml
index 73fa6026100..83f15d626f1 100644
--- a/data/Leland/E0A0.xml
+++ b/data/Leland/E0A0.xml
@@ -1 +1 @@
-<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM451 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v79c-30 -30 -81 -50 -158 -50c-78 0 -129 20 -159 50v-79c0 -6 -7 -14 -14 -14c-10 0 -23 0 -23 14v329 s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 159 49c77 0 128 -20 158 -49v78c0 8 6 14 14 14h9zM524 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM321 -97c24 8 33 25 33 51s-19 90 -33 117s-32 33 -59 33c-16 0 -32 -3 -44 -6 c-22 -7 -32 -21 -32 -45c0 -31 18 -96 32 -123c13 -24 32 -33 60 -33c15 0 31 3 43 6z"/></symbol>
\ No newline at end of file
+<symbol id="E0A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M23 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329s6 14 14 14h9zM451 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v79c-30 -30 -81 -50 -158 -50c-78 0 -129 20 -159 50v-79c0 -6 -7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329 s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 159 49c77 0 128 -20 158 -49v78c0 8 6 14 14 14h9zM321 -97c24 8 33 25 33 51s-19 90 -33 117c-14 26 -32 33 -59 33c-16 0 -32 -3 -44 -6c-22 -8 -32 -22 -32 -45v-6c1 -27 19 -92 32 -117c13 -24 32 -33 60 -33 c15 0 31 3 43 6zM524 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329s6 14 14 14h9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A2.xml b/data/Leland/E0A2.xml
index c02f172cc05..3dde1d424f0 100644
--- a/data/Leland/E0A2.xml
+++ b/data/Leland/E0A2.xml
@@ -1 +1 @@
-<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 136c138 0 186 -70 186 -135s-48 -135 -186 -135s-187 70 -187 135s49 135 187 135zM195 -102c40 0 76 8 76 57c0 25 -19 90 -33 116c-14 27 -32 33 -59 33c-16 0 -32 -2 -44 -6c-24 -8 -34 -24 -32 -51c1 -26 19 -91 32 -116s32 -33 60 -33z"/></symbol>
\ No newline at end of file
+<symbol id="E0A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M187 136c138 0 186 -70 186 -135s-48 -135 -186 -135s-187 70 -187 135s49 135 187 135zM238 -96c24 7 32 25 32 51c0 25 -18 89 -32 116s-32 33 -60 33c-15 0 -31 -2 -43 -6c-24 -8 -34 -24 -32 -51c1 -27 19 -91 32 -116s32 -33 60 -33c15 0 31 2 43 6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0A3.xml b/data/Leland/E0A3.xml
index e9fa6ec157b..adc86767f12 100644
--- a/data/Leland/E0A3.xml
+++ b/data/Leland/E0A3.xml
@@ -1 +1 @@
-<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M213 132c62 0 112 -33 112 -92c0 -88 -109 -173 -213 -173c-81 0 -112 48 -112 91c0 93 116 174 213 174zM75 -86c46 0 215 85 215 135c0 22 -16 36 -40 36c-47 0 -215 -86 -215 -135c0 -9 7 -36 40 -36z"/></symbol>
\ No newline at end of file
+<symbol id="E0A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M213 132c62 0 112 -33 112 -92c0 -88 -109 -173 -213 -173c-81 0 -112 48 -112 91c0 93 116 174 213 174zM186 -44c3 2 104 50 104 93c0 22 -16 36 -40 36c-36 0 -107 -40 -111 -42s-104 -51 -104 -93c0 -9 7 -36 40 -36c35 0 108 40 111 42z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0AF.xml b/data/Leland/E0AF.xml
index 189e1a86ee5..58febfa1747 100644
--- a/data/Leland/E0AF.xml
+++ b/data/Leland/E0AF.xml
@@ -1 +1 @@
-<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M186 23h128c6 0 11 -6 11 -14v-19c0 -7 -5 -13 -11 -13h-128v-101c0 -4 -6 -8 -14 -8h-19c-7 0 -13 4 -13 8v101h-129c-6 0 -11 6 -11 13v19c0 8 5 14 11 14h129v100c0 5 6 9 13 9h19c8 0 14 -4 14 -9v-100z"/></symbol>
\ No newline at end of file
+<symbol id="E0AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M186 23h128c6 0 11 -6 11 -14v-19c0 -7 -5 -13 -11 -13h-128v-101c0 -4 -6 -8 -14 -8h-19c-7 0 -13 4 -13 8v101h-129c-6 0 -11 6 -11 13v19c0 8 5 14 11 14h128v100c0 5 6 9 14 9h19c8 0 14 -4 14 -9v-100z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0D9.xml b/data/Leland/E0D9.xml
index 11cac9c92f2..ba20b3d21d3 100644
--- a/data/Leland/E0D9.xml
+++ b/data/Leland/E0D9.xml
@@ -1 +1 @@
-<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -9l-154 -120c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -8zM198 -80l73 57l-133 104l-74 -58z"/></symbol>
\ No newline at end of file
+<symbol id="E0D9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -9l-154 -120c-2 -2 -5 -3 -9 -3c-3 0 -6 1 -8 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c3 -2 5 -6 5 -9c0 -4 -2 -7 -5 -9zM197 -80l74 57l-133 104l-74 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0DB.xml b/data/Leland/E0DB.xml
index fbf25eb58d4..caec0fe8e08 100644
--- a/data/Leland/E0DB.xml
+++ b/data/Leland/E0DB.xml
@@ -1 +1 @@
-<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -10l-154 -119c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z"/></symbol>
\ No newline at end of file
+<symbol id="E0DB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -10l-154 -119c-2 -2 -5 -3 -9 -3c-3 0 -6 1 -8 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c3 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0F5.xml b/data/Leland/E0F5.xml
index 55e5f3507cf..b54d70c4ddf 100644
--- a/data/Leland/E0F5.xml
+++ b/data/Leland/E0F5.xml
@@ -1 +1 @@
-<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1z"/></symbol>
\ No newline at end of file
+<symbol id="E0F5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 2 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -208c1 -2 1 -3 1 -4c0 -2 -1 -4 -3 -5c-1 -1 -2 -1 -4 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E0F6.xml b/data/Leland/E0F6.xml
index 8ece1c15d6f..7c38adcefec 100644
--- a/data/Leland/E0F6.xml
+++ b/data/Leland/E0F6.xml
@@ -1 +1 @@
-<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1z"/></symbol>
\ No newline at end of file
+<symbol id="E0F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -46 207 -46 208c-1 2 -1 3 -1 4c0 2 1 4 3 5c1 1 2 1 4 2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E240.xml b/data/Leland/E240.xml
index 0d01092cf13..3d25b65fd6b 100644
--- a/data/Leland/E240.xml
+++ b/data/Leland/E240.xml
@@ -1 +1 @@
-<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -227v226c0 7 6 13 13 13c6 0 11 -4 12 -8c0 0 9 -36 10 -39c2 -4 19 -61 56 -118c27 -42 122 -165 119 -165c0 0 74 -95 79 -224c0 -91 -17 -184 -62 -264c-4 -7 -9 -11 -15 -11c-7 0 -11 3 -11 10c0 4 1 9 3 15c27 72 45 146 45 218c0 83 -29 126 -47 157 c-65 111 -151 165 -194 179c-7 2 -8 8 -8 11z"/></symbol>
\ No newline at end of file
+<symbol id="E240" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -227v226c0 7 6 13 13 13c6 0 11 -4 12 -8c0 0 9 -36 10 -39c2 -4 19 -61 56 -118c27 -42 122 -165 119 -165c0 0 74 -95 79 -224v-12c1 -63 -15 -169 -62 -252c-4 -7 -9 -11 -16 -11c-1 0 -3 0 -5 1c-4 2 -5 5 -5 9c-1 4 1 9 3 15c26 72 45 146 45 218 c0 83 -29 126 -47 157c-65 111 -151 165 -194 179c-7 3 -8 8 -8 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E241.xml b/data/Leland/E241.xml
index 55675716aa4..0afffd3056c 100644
--- a/data/Leland/E241.xml
+++ b/data/Leland/E241.xml
@@ -1 +1 @@
-<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 1v226c0 3 1 9 8 11c42 14 147 68 212 179c18 31 47 74 47 157c0 72 -16 125 -56 218c-2 5 -3 9 -3 12c0 6 2 10 7 12c1 1 3 1 5 1c6 0 12 -4 15 -11c54 -97 74 -173 74 -264c0 -88 -29 -154 -79 -224s-110 -117 -149 -182c-36 -59 -45 -97 -46 -101 c-1 -3 -10 -38 -10 -39c-1 -4 -7 -8 -12 -8c-7 0 -13 6 -13 13z"/></symbol>
\ No newline at end of file
+<symbol id="E241" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 1v226c0 3 1 8 8 11c42 14 147 68 212 179c18 31 47 74 47 157c0 72 -16 125 -56 218c-2 4 -3 9 -3 12c0 6 2 10 7 12c1 1 3 1 5 1c6 0 12 -4 15 -11c53 -97 74 -173 74 -264c0 -88 -30 -154 -79 -224c-50 -70 -110 -117 -149 -182c-36 -59 -45 -97 -46 -101 c-1 -3 -10 -38 -10 -39c-1 -4 -7 -8 -12 -8c-7 0 -13 6 -13 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E242.xml b/data/Leland/E242.xml
index b3c6c123912..979341e4a19 100644
--- a/data/Leland/E242.xml
+++ b/data/Leland/E242.xml
@@ -1 +1 @@
-<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v381c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158c38 -56 89 -107 136 -169c34 -45 48 -92 48 -144c0 -49 -8 -86 -19 -123c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16 c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM209 -473c8 -11 17 -24 25 -40c1 10 2 20 2 30c0 37 -9 78 -48 129c-36 47 -101 115 -152 116c1 -8 2 -15 4 -20c6 -26 24 -60 63 -99c49 -49 79 -81 106 -116z"/></symbol>
\ No newline at end of file
+<symbol id="E242" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M209 -473c8 -11 17 -24 25 -40c1 10 2 20 2 30c0 38 -9 78 -48 129c-36 47 -101 116 -152 116c1 -8 2 -15 3 -20c7 -26 25 -60 64 -99c49 -49 79 -81 106 -116zM0 -381v381c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169 c34 -45 48 -92 48 -144c0 -49 -9 -86 -19 -123c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E243.xml b/data/Leland/E243.xml
index 6dc27840c8a..c5eeba0897b 100644
--- a/data/Leland/E243.xml
+++ b/data/Leland/E243.xml
@@ -1 +1 @@
-<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -10v398c0 2 8 24 15 27c77 17 223 106 244 190l2 3c3 12 4 25 4 38c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -26 -2 -44 -5 -57c5 -37 8 -74 8 -107c0 -185 -139 -262 -193 -313c-40 -38 -71 -68 -86 -171 c-2 -8 -7 -16 -15 -16s-15 8 -15 16zM37 240c48 13 122 34 183 109c27 34 45 82 47 159c-27 -48 -96 -104 -154 -149s-67 -82 -73 -107c-1 -3 -2 -7 -3 -12z"/></symbol>
\ No newline at end of file
+<symbol id="E243" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M37 240c48 13 122 34 183 109c26 34 45 82 47 159c-27 -48 -96 -104 -154 -149c-59 -45 -67 -82 -74 -107c0 -3 -1 -7 -2 -12zM0 -10v398c0 2 8 24 15 27c45 10 142 52 212 133c16 18 27 37 32 57v0l1 3c4 12 5 25 5 38c0 67 -26 101 -61 138c-4 4 -10 8 -10 11 c0 2 1 3 5 5s8 3 12 3c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -26 -2 -44 -6 -57c6 -37 9 -74 9 -107c0 -185 -140 -262 -193 -313c-40 -38 -71 -68 -86 -171c-2 -8 -7 -16 -15 -16s-15 8 -15 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E244.xml b/data/Leland/E244.xml
index d69694acf21..845817092a7 100644
--- a/data/Leland/E244.xml
+++ b/data/Leland/E244.xml
@@ -1 +1 @@
-<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -382v556c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158c38 -56 89 -107 136 -169c34 -45 48 -92 48 -144c0 -32 -4 -63 -11 -94c7 -23 11 -48 11 -73c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1 c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 -180c-36 47 -102 116 -153 116c5 -22 13 -47 28 -69c38 -55 121 -125 168 -187c1 -2 3 -4 4 -6c0 5 1 10 1 16c0 38 -9 79 -48 130z M209 -474c8 -11 17 -24 25 -39c1 12 2 24 2 36c0 37 -9 78 -48 130c-36 47 -101 109 -152 109c1 -8 2 -16 4 -21c6 -26 24 -60 63 -99c49 -50 79 -81 106 -116z"/></symbol>
\ No newline at end of file
+<symbol id="E244" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M209 -474c8 -11 17 -23 25 -39c1 12 2 24 2 36c0 38 -9 78 -48 130c-36 47 -101 109 -153 109c2 -8 3 -16 4 -21c7 -26 25 -60 64 -99c49 -50 79 -81 106 -116zM188 -180c-36 47 -102 116 -153 116c5 -22 13 -47 28 -69c38 -55 121 -125 168 -187c1 -2 3 -4 4 -6 c0 5 1 10 1 16c0 38 -9 79 -48 130zM0 -382v556c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169c34 -45 48 -92 48 -144v-9c0 -32 -5 -59 -11 -85c7 -23 11 -48 11 -73c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138 c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E245.xml b/data/Leland/E245.xml
index 12af41b863f..14c4aeeee15 100644
--- a/data/Leland/E245.xml
+++ b/data/Leland/E245.xml
@@ -1 +1 @@
-<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -200v588c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 3 5 5c4 3 9 3 13 3c6 0 11 -2 15 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-1 -17 -4 -33 -7 -51 c6 -40 10 -80 10 -117c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM36 51 c49 14 127 39 189 115c26 33 42 75 42 149c-7 -13 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -27 -68z"/></symbol>
\ No newline at end of file
+<symbol id="E245" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M35 51c50 14 128 39 190 115c26 33 42 75 42 149c-7 -13 -16 -25 -26 -36c-52 -59 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM113 359c-57 -47 -67 -81 -74 -107c0 -3 -1 -8 -2 -14c87 33 142 65 181 113c31 39 48 80 48 130c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16 c-27 -35 -82 -72 -141 -122zM0 -200v588c0 2 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 3 5 5s9 3 13 3c6 0 11 -2 15 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -25 11 -54 11 -84v-8v-17 c-1 -17 -4 -34 -7 -51c6 -40 10 -80 10 -117c0 -185 -140 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E246.xml b/data/Leland/E246.xml
index 04ee4c66230..290a001537c 100644
--- a/data/Leland/E246.xml
+++ b/data/Leland/E246.xml
@@ -1 +1 @@
-<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -383v744c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169c34 -45 48 -92 48 -144c0 -35 -5 -67 -13 -101c9 -26 13 -52 13 -80c0 -34 -4 -67 -11 -100c7 -23 11 -48 11 -73c0 -50 -9 -94 -19 -131c3 -21 5 -46 5 -74c0 -56 -26 -110 -44 -139 c-4 -6 -8 -13 -14 -14c-2 0 -4 1 -6 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 5 1 11 1 16c-1 35 -8 71 -42 122c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9zM188 7c-37 47 -102 116 -153 116h-2c4 -24 13 -53 30 -78c38 -56 121 -130 168 -192c1 -1 2 -3 3 -4 c1 9 2 19 2 29c0 38 -9 78 -48 129zM231 -320c1 -2 3 -4 4 -6c0 7 1 15 1 22c0 38 -9 79 -48 130c-36 47 -101 110 -153 110c5 -23 14 -48 28 -69c38 -55 121 -126 168 -187zM209 -474c8 -11 17 -24 25 -39c1 12 2 23 2 35c0 38 -9 79 -48 130c-36 47 -101 110 -153 110 c2 -9 3 -17 5 -22c6 -25 24 -60 63 -99c49 -49 79 -80 106 -115z"/></symbol>
\ No newline at end of file
+<symbol id="E246" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M231 -320c1 -2 3 -4 4 -6c0 7 1 15 1 22c0 38 -9 79 -48 130c-36 47 -101 110 -153 110c5 -23 13 -48 28 -69c38 -55 121 -125 168 -187zM209 -474c8 -11 17 -24 25 -39c1 12 2 23 2 35c0 38 -9 79 -48 130c-36 47 -101 110 -153 110c2 -9 3 -16 4 -22 c7 -25 25 -60 64 -99c49 -49 79 -80 106 -115zM188 7c-37 47 -102 116 -153 116h-2c4 -24 13 -53 30 -78c38 -56 121 -130 168 -192c1 -1 2 -3 3 -4c1 9 2 19 2 29c0 38 -9 78 -48 129zM0 -383v744c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169 c34 -45 48 -92 48 -144v-8c0 -36 -6 -65 -13 -93c9 -26 13 -52 13 -79v-10c0 -33 -5 -63 -11 -91c7 -23 11 -48 11 -73c0 -50 -9 -94 -19 -131c3 -21 5 -46 5 -74c0 -56 -26 -110 -44 -139c-4 -6 -8 -13 -15 -14c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s3 11 4 16 c15 40 22 90 22 115c1 6 1 11 1 17c-1 34 -8 70 -42 121c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E247.xml b/data/Leland/E247.xml
index 48fc4bdf0d0..8f7fd7a6605 100644
--- a/data/Leland/E247.xml
+++ b/data/Leland/E247.xml
@@ -1 +1 @@
-<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -387v775c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 -1 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -23 -6 -48 -12 -73 c7 -32 12 -64 12 -97v-20c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 43 229 109 229 243c0 6 0 11 -1 17 c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM35 48c112 42 231 109 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM36 -136c50 14 127 39 189 115c26 32 42 74 42 146c-7 -12 -16 -24 -26 -36 c-51 -58 -140 -105 -178 -160c-14 -20 -22 -44 -27 -65z"/></symbol>
\ No newline at end of file
+<symbol id="E247" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 -136c50 14 127 39 189 115c26 32 42 74 42 146c-7 -12 -16 -24 -26 -36c-52 -58 -140 -105 -178 -160c-14 -20 -22 -44 -27 -65zM113 359c-57 -47 -67 -81 -74 -107c0 -3 -1 -8 -2 -14c87 33 142 66 181 113c31 39 48 80 48 130c0 6 0 11 -1 17c-3 -6 -7 -11 -11 -17 c-27 -34 -82 -72 -141 -122zM218 161c31 39 48 81 48 131c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-52 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71c89 33 144 65 183 113zM0 -387v775c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138 c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 -1 11 -3 15 -6c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -25 11 -54 11 -83v-9v-17c-2 -23 -6 -48 -12 -73c6 -27 12 -57 12 -89v-8v-20c-1 -16 -3 -32 -7 -49c6 -40 10 -80 10 -116c0 -184 -140 -262 -193 -312 c-40 -38 -71 -68 -86 -172c-2 -7 -7 -16 -15 -16s-15 9 -15 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E248.xml b/data/Leland/E248.xml
index 4fe9bbe48f7..d7327e47e93 100644
--- a/data/Leland/E248.xml
+++ b/data/Leland/E248.xml
@@ -1 +1 @@
-<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -382v943c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -9 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -13 -100c9 -25 13 -50 13 -78c0 -37 -4 -72 -13 -109c9 -26 13 -52 13 -80c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79 c0 -50 -8 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -139c-4 -6 -8 -14 -15 -14c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9zM188 215c-37 47 -102 111 -153 111 h-2c4 -24 13 -53 30 -78c38 -55 121 -129 168 -191c1 -2 2 -4 4 -6c0 9 1 17 1 26c0 41 -8 86 -48 138zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -5 c1 11 2 23 2 34c0 38 -9 79 -48 130c-37 48 -102 110 -153 110h-2c4 -26 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c10 -55 28 -84 69 -125c49 -49 79 -75 106 -110z"/></symbol>
\ No newline at end of file
+<symbol id="E248" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -382v943c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -10 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -13 -100c9 -24 13 -50 13 -77c0 -38 -4 -73 -14 -110c10 -26 14 -52 14 -80c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79 c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -139c-4 -5 -8 -14 -15 -14c-2 1 -3 1 -5 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 2 -15 7 -15 9zM188 215c-37 47 -102 111 -153 111 h-2c4 -24 13 -53 30 -78c38 -56 121 -130 168 -192c1 -1 2 -3 4 -5c0 9 1 17 1 26c0 41 -8 86 -48 138zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 5 -28c7 -26 25 -57 64 -97c49 -49 79 -75 106 -110z M231 -320c1 -2 2 -3 3 -5c1 11 2 23 2 34c0 38 -9 79 -48 130c-37 48 -102 110 -153 110h-2v0c4 -26 13 -56 30 -82c38 -55 121 -125 168 -187zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 38 -9 80 -48 131c-37 47 -102 110 -153 110h-2v0c4 -25 12 -55 30 -81 c38 -55 121 -129 168 -191z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E249.xml b/data/Leland/E249.xml
index 86aa7fdd4a6..c22e1078559 100644
--- a/data/Leland/E249.xml
+++ b/data/Leland/E249.xml
@@ -1 +1 @@
-<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -575v963c0 2 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -24 -6 -48 -12 -73c7 -32 12 -64 12 -97v-20 c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-41 -34 -67 -68 -76 -121c110 42 229 109 229 243c0 5 0 11 -1 16 c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 48c112 42 231 108 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -23 -24 -48 -28 -71zM35 -139c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33 c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM36 -324c49 14 127 39 189 115c26 32 40 74 42 147c-7 -13 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z"/></symbol>
\ No newline at end of file
+<symbol id="E249" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -575v963c0 2 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 2 1 3 5 5s8 3 12 3c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -25 11 -54 11 -84v-8v-18c-2 -23 -6 -47 -12 -72 c6 -27 12 -57 12 -89v-8v-20c-2 -23 -5 -47 -12 -71c6 -27 12 -57 12 -89v-7v-20c-1 -16 -3 -33 -7 -50c6 -40 10 -80 10 -116c0 -185 -140 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM218 -26c31 39 48 81 48 131c0 6 0 11 -1 17 c-7 -11 -15 -23 -24 -33c-52 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68c89 33 144 65 183 113zM218 161c31 39 48 80 48 131c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -71c89 33 144 65 183 113zM113 359 c-57 -47 -67 -82 -74 -107c0 -4 -1 -9 -2 -14c87 33 142 65 181 113c31 38 47 80 48 130c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM36 -324c49 14 127 39 189 115c26 32 40 74 42 147c-7 -13 -16 -25 -26 -36c-52 -58 -140 -105 -178 -160 c-14 -21 -22 -44 -27 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24A.xml b/data/Leland/E24A.xml
index 99ca160d871..fa7856f4a72 100644
--- a/data/Leland/E24A.xml
+++ b/data/Leland/E24A.xml
@@ -1 +1 @@
-<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1129c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -9 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -12 -99c8 -25 12 -50 12 -77c0 -37 -4 -73 -13 -109c9 -25 13 -52 13 -79c0 -38 -4 -73 -13 -110c9 -25 13 -52 13 -80 c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79c0 -50 -8 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -138c-4 -6 -8 -15 -15 -14c-7 0 -12 5 -12 12c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10 zM188 402c-37 47 -102 111 -153 111h-2c5 -23 13 -52 30 -77c38 -55 121 -129 168 -191c1 -2 2 -4 4 -6c0 9 1 17 1 26c0 40 -8 85 -48 137zM231 57c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -25 13 -54 30 -79 c38 -55 121 -129 168 -191zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2 c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -26 24 -57 63 -96c49 -50 79 -76 106 -111z"/></symbol>
\ No newline at end of file
+<symbol id="E24A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1129c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -10 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -13 -99c9 -25 13 -50 13 -77c0 -37 -4 -73 -13 -109c9 -25 13 -52 13 -79c0 -38 -4 -73 -14 -110c10 -25 14 -52 14 -80 c0 -37 -4 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -9 -93 -19 -131c3 -20 5 -45 5 -73c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14s-12 5 -12 12c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10z M188 402c-37 47 -102 111 -153 111h-2c4 -24 13 -52 30 -77c38 -56 121 -130 168 -192c1 -1 2 -3 4 -5c0 9 1 17 1 26c0 40 -8 85 -48 137zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 5 -28 c7 -26 25 -57 64 -96c49 -50 79 -76 106 -111zM231 -320c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM231 -133c1 -2 2 -3 3 -4c1 12 2 23 2 35c0 39 -9 80 -48 131 c-37 48 -102 110 -153 110h-2v0c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 110 -153 110h-2c4 -25 13 -54 30 -79c38 -55 121 -129 168 -191z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24B.xml b/data/Leland/E24B.xml
index 0fc5434fbe8..187f103f29d 100644
--- a/data/Leland/E24B.xml
+++ b/data/Leland/E24B.xml
@@ -1 +1 @@
-<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -763v1151c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -60 11 -92v-18c-2 -23 -6 -48 -12 -72c7 -32 12 -64 12 -97v-20 c-2 -23 -5 -47 -12 -72c8 -31 12 -63 12 -95v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-43 -37 -65 -67 -76 -121 c111 42 229 108 229 243c0 5 0 11 -1 16c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 47c111 42 231 109 231 244c0 7 0 14 -1 20c-7 -11 -15 -22 -24 -32c-51 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72zM35 -140c112 43 231 109 231 245c0 5 0 11 -1 17 c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-14 -22 -23 -46 -28 -69zM35 -327c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM36 -512c49 14 127 39 189 115c26 32 40 74 42 147 c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z"/></symbol>
\ No newline at end of file
+<symbol id="E24B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -763v1151c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 137c-4 5 -10 9 -10 12c0 1 1 3 5 5s8 3 12 3c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -26 11 -54 11 -84v-8v-18c-2 -23 -6 -48 -12 -72 c6 -27 12 -57 12 -89v-8v-20c-2 -23 -5 -47 -12 -72c6 -26 12 -56 12 -88v-7v-21c-2 -22 -5 -47 -12 -71c6 -27 12 -57 12 -89v-7v-20c-1 -16 -3 -33 -7 -50c6 -40 10 -80 10 -116c0 -185 -140 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16z M218 -214c31 39 48 81 48 132c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69c89 33 144 65 183 113zM218 -26c31 39 48 80 48 131c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160 c-14 -22 -23 -46 -28 -68c89 33 144 65 183 113zM218 161c31 39 48 80 48 130c0 7 0 14 -1 20c-7 -11 -15 -22 -24 -32c-52 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72c89 34 144 66 183 114zM113 359c-57 -48 -67 -82 -74 -107c0 -4 -1 -9 -2 -14 c87 33 142 65 181 112c31 39 47 81 48 131c0 5 0 11 -1 16c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM36 -512c49 14 127 39 189 115c26 32 40 74 42 147c-7 -13 -16 -25 -26 -36c-52 -58 -140 -105 -178 -160c-14 -21 -22 -44 -27 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24C.xml b/data/Leland/E24C.xml
index 6411bf4c56c..fa67920c2a7 100644
--- a/data/Leland/E24C.xml
+++ b/data/Leland/E24C.xml
@@ -1 +1 @@
-<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1312c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -33 -4 -65 -12 -97c8 -24 12 -49 12 -75c0 -37 -5 -72 -13 -108c9 -25 13 -52 13 -79c0 -37 -5 -73 -13 -109c9 -25 13 -51 13 -79c0 -38 -4 -73 -13 -110 c9 -25 13 -52 13 -80c0 -37 -5 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -8 -93 -19 -130c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121 c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 585c-37 47 -102 111 -153 111h-1c5 -23 13 -50 29 -73c38 -55 121 -129 168 -191c1 -2 3 -4 4 -6c0 8 1 15 1 23c0 41 -9 85 -48 136zM231 245c1 -2 2 -3 3 -5c1 11 2 23 2 34c0 38 -9 79 -48 130 c-37 48 -102 110 -153 110h-2c5 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2c4 -24 13 -54 30 -79c38 -55 121 -129 168 -191zM231 -133c1 -2 2 -3 3 -4c1 12 2 23 2 36 c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39 c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -26 24 -57 63 -96c49 -49 79 -76 106 -111z"/></symbol>
\ No newline at end of file
+<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1312c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152v-8c0 -34 -5 -62 -12 -89c8 -24 12 -49 12 -75v-9c0 -36 -6 -69 -13 -99c9 -25 13 -52 13 -79v-9c0 -37 -6 -70 -13 -100c9 -25 13 -51 13 -79v-9 c0 -37 -6 -70 -14 -101c10 -25 14 -52 14 -80v-9c0 -36 -6 -69 -13 -99c9 -25 13 -51 13 -79c0 -49 -9 -93 -19 -130c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17 c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 585c-37 47 -102 111 -153 111h-1c4 -23 13 -50 29 -73c38 -56 121 -130 168 -192c1 -1 3 -3 4 -5c0 8 1 15 1 23c0 40 -9 85 -48 136zM209 -473c8 -11 17 -23 25 -39c1 11 2 22 2 34 c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 5 -28c7 -26 25 -57 64 -96c49 -49 79 -76 106 -111zM231 -320c1 -1 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM231 -133 c1 -1 2 -3 3 -4c1 12 2 23 2 36c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -24 13 -54 30 -79c38 -55 121 -129 168 -191 zM231 245c1 -2 2 -3 3 -5c1 11 2 23 2 34c0 38 -9 79 -48 130c-37 47 -102 110 -153 110h-2c4 -24 13 -53 30 -78c38 -55 121 -129 168 -191z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24D.xml b/data/Leland/E24D.xml
index 27c115a5ad1..bca27e4a870 100644
--- a/data/Leland/E24D.xml
+++ b/data/Leland/E24D.xml
@@ -1 +1 @@
-<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -950v1338c0 3 8 25 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 0 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -23 -6 -48 -12 -73 c7 -32 12 -64 12 -97v-20c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -71c7 -32 12 -64 12 -97v-20c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312 c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 43 229 109 229 243c0 6 0 11 -1 17c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM35 48c112 42 231 109 231 244c0 6 0 13 -1 20 c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM35 -139c112 42 231 109 231 244c0 6 0 12 -1 18c-7 -12 -15 -23 -24 -34c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM35 -327c113 42 231 109 231 245c0 6 0 11 -1 17 c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -515c113 43 231 108 231 245c0 6 0 12 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -21 -23 -46 -28 -69zM36 -699c49 14 127 39 189 115c26 32 42 74 42 147 c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z"/></symbol>
\ No newline at end of file
+<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -950v1338c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 -1 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c6 -25 11 -54 11 -83v-9v-17c-2 -23 -6 -48 -12 -73 c6 -27 12 -57 12 -89v-8v-20c-2 -23 -5 -47 -12 -71c6 -27 12 -57 12 -88v-8v-20c-2 -23 -5 -47 -12 -72c6 -26 12 -56 12 -88v-8v-20c-2 -23 -5 -47 -12 -71c6 -27 12 -57 12 -89v-8v-20c-1 -16 -3 -32 -7 -49c6 -40 10 -80 10 -116c0 -185 -140 -262 -193 -312 c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM218 -401c31 39 48 80 48 131c0 6 0 12 -1 17c-7 -11 -15 -22 -24 -33c-52 -58 -140 -104 -178 -160c-15 -21 -23 -46 -28 -69c89 34 144 66 183 114zM218 -214c31 39 48 81 48 132c0 6 0 11 -1 17 c-7 -11 -15 -22 -24 -33c-52 -58 -140 -105 -178 -160c-15 -21 -23 -47 -28 -69c89 34 144 66 183 113zM218 -26c31 39 48 81 48 131c0 6 0 12 -1 17c-7 -11 -15 -22 -24 -33c-52 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68c89 33 144 66 183 113zM218 161 c31 39 48 81 48 131c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-52 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71c89 33 144 65 183 113zM113 359c-57 -47 -67 -81 -74 -107c0 -3 -1 -8 -2 -14c87 33 142 66 181 113c31 39 48 80 48 130c0 6 0 11 -1 17 c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM36 -699c49 14 127 39 189 115c26 32 42 74 42 147c-7 -13 -16 -25 -26 -36c-52 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24E.xml b/data/Leland/E24E.xml
index d26bb98225b..595f4b811a5 100644
--- a/data/Leland/E24E.xml
+++ b/data/Leland/E24E.xml
@@ -1 +1 @@
-<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1495c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -33 -4 -65 -12 -97c8 -24 12 -49 12 -75c0 -36 -4 -71 -12 -106c8 -25 12 -50 12 -77c0 -37 -5 -72 -13 -108c9 -25 13 -52 13 -79c0 -37 -4 -72 -13 -108 c9 -26 13 -52 13 -80c0 -38 -5 -73 -13 -110c9 -25 13 -52 13 -80c0 -37 -5 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -8 -93 -19 -130c3 -21 5 -45 5 -73c0 -57 -26 -111 -44 -139c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c16 41 23 88 23 132 c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 768c-37 47 -102 111 -153 111l-1 1c4 -23 13 -50 29 -74c38 -55 121 -129 168 -191c1 -2 3 -4 4 -6c0 8 1 15 1 23c0 41 -9 85 -48 136zM231 432c1 -2 2 -3 3 -5c1 10 2 21 2 31c0 38 -9 78 -48 129 c-37 48 -102 110 -153 110h-1c5 -23 13 -50 29 -74c38 -55 121 -129 168 -191zM231 245c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c5 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 57c1 -1 2 -3 3 -4c1 11 2 22 2 34 c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 13 -53 30 -79c38 -55 121 -129 168 -191zM231 -133c1 -1 2 -3 3 -4c1 12 2 24 2 36c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -1 2 -3 3 -4 c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -23 25 -39c1 11 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -25 24 -57 63 -96 c49 -49 79 -76 106 -111z"/></symbol>
\ No newline at end of file
+<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -381v1495c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152v-8c0 -34 -5 -62 -12 -89c8 -24 12 -49 12 -75v-9c0 -35 -5 -68 -13 -97c9 -25 13 -50 13 -77v-9c0 -36 -6 -69 -13 -99c9 -25 13 -52 13 -79v-9 c0 -36 -6 -70 -13 -99c9 -26 13 -52 13 -80v-9c0 -37 -6 -70 -14 -100c10 -26 14 -53 14 -81v-9c0 -36 -6 -69 -13 -99c9 -25 13 -51 13 -79c0 -49 -9 -93 -19 -130c3 -21 5 -45 5 -73c0 -57 -26 -111 -44 -139c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11 c0 5 3 11 4 16c15 41 23 88 23 132c0 34 -8 70 -42 122c-60 88 -138 138 -164 147c-7 3 -15 7 -15 10zM188 768c-37 47 -102 111 -153 111l-1 1c4 -23 13 -51 29 -74c38 -56 121 -130 168 -192c1 -1 3 -3 4 -5c0 8 1 15 1 23c0 40 -9 85 -48 136zM209 -473 c8 -11 17 -23 25 -39c1 11 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 5 -28c7 -25 25 -57 64 -96c49 -49 79 -76 106 -111zM231 -320c1 -1 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -25 13 -56 30 -82 c38 -55 121 -125 168 -187zM231 -133c1 -1 2 -3 3 -4c1 12 2 24 2 36c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2 c4 -24 13 -54 30 -79c38 -55 121 -129 168 -191zM231 245c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 79 -48 130c-37 48 -102 110 -153 110h-2c4 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 432c1 -2 2 -4 3 -5c1 10 2 21 2 31c0 38 -9 78 -48 129 c-37 47 -102 110 -153 110h-1c4 -24 13 -51 29 -74c38 -55 121 -129 168 -191z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E24F.xml b/data/Leland/E24F.xml
index 1e376380303..6c952e89485 100644
--- a/data/Leland/E24F.xml
+++ b/data/Leland/E24F.xml
@@ -1 +1 @@
-<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -1126v1514c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -60 11 -92v-18c-2 -23 -6 -47 -12 -72c7 -32 12 -64 12 -97v-20 c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -72c7 -32 12 -63 12 -96v-20c-1 -16 -4 -34 -7 -51c6 -41 10 -81 10 -118c0 -185 -139 -262 -193 -312 c-40 -38 -68 -83 -86 -156c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM113 359c-44 -37 -65 -67 -76 -121c111 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 47c112 43 231 109 231 245c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33 c-51 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72zM35 -139c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-14 -22 -23 -46 -28 -68zM35 -327c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33 c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -515c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -703c113 42 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33 c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -891c50 14 128 38 190 115c26 33 42 75 42 150c-7 -12 -16 -24 -26 -36c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69z"/></symbol>
\ No newline at end of file
+<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -1126v1514c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 2 1 3 5 5s8 3 12 3c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -26 11 -54 11 -84v-8v-18c-2 -23 -6 -47 -12 -72 c6 -27 12 -57 12 -89v-8v-20c-2 -23 -5 -47 -12 -72c6 -26 12 -56 12 -88v-7v-20c-2 -23 -5 -48 -12 -72c6 -27 12 -57 12 -89v-7v-20c-2 -23 -5 -48 -12 -72c6 -26 12 -57 12 -88v-8v-20c-2 -23 -5 -47 -12 -72c6 -26 12 -56 12 -88v-8v-20c-1 -16 -4 -34 -7 -51 c6 -40 10 -81 10 -118c0 -185 -140 -262 -193 -312c-40 -38 -68 -83 -86 -156c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM218 -590c31 39 48 81 48 132c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-52 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69c89 33 144 66 183 113z M218 -402c31 39 48 81 48 132c0 5 0 11 -1 17c-7 -11 -15 -23 -24 -33c-52 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69c89 33 144 65 183 113zM218 -214c31 39 48 81 48 132c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160 c-15 -22 -23 -47 -28 -69c89 33 144 65 183 113zM218 -26c31 39 48 80 48 131c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160c-14 -22 -23 -46 -28 -68c89 33 144 65 183 113zM218 161c31 39 48 80 48 130c0 7 0 14 -1 21c-7 -12 -15 -23 -24 -33 c-52 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72c89 34 144 66 183 114zM113 359c-57 -48 -67 -82 -74 -107c0 -4 -1 -9 -2 -14c87 33 142 65 181 113c31 38 47 80 48 130c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 -891 c50 14 128 39 190 115c26 33 42 75 42 150c-7 -12 -16 -24 -26 -36c-52 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E260.xml b/data/Leland/E260.xml
index 0fb26990265..e5d5024e3aa 100644
--- a/data/Leland/E260.xml
+++ b/data/Leland/E260.xml
@@ -1 +1 @@
-<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
+<symbol id="E260" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M201 79c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -119 -93 -123 -95c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c51 0 75 -37 81 -76zM132 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38 l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E261.xml b/data/Leland/E261.xml
index 288ec457346..1c87ae68aec 100644
--- a/data/Leland/E261.xml
+++ b/data/Leland/E261.xml
@@ -1 +1 @@
-<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1c4 0 7 -1 9 -3zM28 -97l116 32v165l-116 -33v-164z"/></symbol>
\ No newline at end of file
+<symbol id="E261" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35h-4c-8 0 -14 5 -14 13v495h28v-175l126 35c1 0 3 1 4 1c3 0 6 -1 8 -3zM28 -97l116 32v165l-116 -33v-164z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E262.xml b/data/Leland/E262.xml
index 985e2ea46cd..510ff0047c0 100644
--- a/data/Leland/E262.xml
+++ b/data/Leland/E262.xml
@@ -1 +1 @@
-<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z"/></symbol>
\ No newline at end of file
+<symbol id="E262" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 105l-38 -7v-165l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3c-8 0 -14 6 -14 14v-2v58v2c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149 l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E263.xml b/data/Leland/E263.xml
index 7fca3023681..5486182cff7 100644
--- a/data/Leland/E263.xml
+++ b/data/Leland/E263.xml
@@ -1 +1 @@
-<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M86 -70v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h53l49 50v3l-49 49h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-53l-50 -50v-2 l50 -50h53c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 48h-3z"/></symbol>
\ No newline at end of file
+<symbol id="E263" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M250 51h-42l-50 -50v-2l50 -50h42h1h10c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v10v1v42l-49 48h-3l-50 -48v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h10h1h42l49 50v3l-49 49h-42h-1h-10c-8 0 -14 6 -14 14v59 c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v41v12c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E264.xml b/data/Leland/E264.xml
index a0f67d5bd76..2fcce5d32c0 100644
--- a/data/Leland/E264.xml
+++ b/data/Leland/E264.xml
@@ -1 +1 @@
-<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 155c59 0 83 -48 83 -100c0 -103 -90 -185 -176 -228c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-36 -54 -87 -96 -145 -125c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301 c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -320c5 6 34 36 84 36zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM201 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
+<symbol id="E264" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M369 80c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -119 -93 -123 -95c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-6 -9 -15 -23 -22 -31c-54 -61 -119 -92 -123 -94c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321 c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -320c5 6 34 36 84 36c51 0 75 -36 81 -75zM132 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99zM300 40v11c0 21 -3 55 -39 55 c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E265.xml b/data/Leland/E265.xml
index 7c30c262653..94f2734e036 100644
--- a/data/Leland/E265.xml
+++ b/data/Leland/E265.xml
@@ -1 +1 @@
-<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM397 -70v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h53l49 50v3l-49 49h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59 c0 -8 -6 -14 -14 -14h-53l-50 -50v-2l50 -50h53c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 48h-3zM78 74v-166l89 19v165z"/></symbol>
\ No newline at end of file
+<symbol id="E265" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M561 51h-42l-50 -50v-2l50 -50h42h1h10c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v10v1v42l-49 48h-3l-50 -48v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h10h1h42l49 50v3l-49 49h-42h-1h-10c-8 0 -14 6 -14 14v59 c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v41v12c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-11zM233 105l-38 -7v-165l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3 c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3c-8 0 -14 6 -14 14v-2v58v2c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E266.xml b/data/Leland/E266.xml
index 17d1ab77b49..9081790a10c 100644
--- a/data/Leland/E266.xml
+++ b/data/Leland/E266.xml
@@ -1 +1 @@
-<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M456 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114c-36 -54 -87 -97 -145 -126c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114s0 -1 -1 -2l-3 -5l-2 -2l-1 -2s0 -1 -1 -1l-1 -3l-1 -1l-4 -4c-1 -1 -1 -2 -2 -3v-1l-1 -1 l-2 -1s0 -1 -1 -1l-1 -3c-55 -62 -120 -94 -124 -96h-1h-1l-1 -1h-2l-2 -1c-9 0 -15 6 -15 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37h10h1l1 -1h1h4c2 -1 2 -1 3 -1c3 -1 4 -1 6 -1l1 -1h1l1 -1h2l1 -1s1 0 2 -1h1h1l1 -1h1v-1 c4 -2 10 -5 13 -8l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM201 -127 c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM369 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
+<symbol id="E266" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M537 79c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -119 -93 -123 -95c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114c-6 -9 -15 -23 -22 -31c-54 -61 -119 -93 -123 -95c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114c0 -1 -1 -1 -1 -2l-2 -3l-1 -2l-2 -2l-1 -2 c-1 -1 -2 -4 -3 -5l-1 -1l-3 -3c0 -1 -1 -1 -1 -2c-1 -1 -1 -2 -2 -3l-2 -1c-1 -1 -2 -4 -3 -5c-54 -61 -119 -93 -123 -95h-1c-1 0 -2 -1 -3 -1s-3 -1 -4 -1c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37h4h2h2h2c1 0 2 -1 3 -1 h1h3s0 -1 1 -1h2s1 -1 2 -1h3s2 -1 3 -1l1 -1h2l1 -1c1 0 1 -1 2 -1h1c1 0 2 -1 3 -1v-1c4 -2 10 -5 13 -8l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37 c51 0 75 -37 81 -76zM132 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99zM300 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99zM468 40v11c0 21 -3 55 -39 55 c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E267.xml b/data/Leland/E267.xml
index ce56cbd44d6..ebf22416f3a 100644
--- a/data/Leland/E267.xml
+++ b/data/Leland/E267.xml
@@ -1 +1 @@
-<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M357 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1 c4 0 7 -1 9 -3zM270 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM28 -97l116 32v165l-116 -33v-164z"/></symbol>
\ No newline at end of file
+<symbol id="E267" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35h-4c-8 0 -14 5 -14 13v495h28v-175l126 35c1 0 3 1 4 1c3 0 6 -1 8 -3zM28 -97l116 32v165l-116 -33v-164zM438 79c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -119 -93 -123 -95c-2 -1 -6 -2 -8 -2 c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c51 0 75 -37 81 -76zM369 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E268.xml b/data/Leland/E268.xml
index 5ff999df08e..64bf2e6c8a9 100644
--- a/data/Leland/E268.xml
+++ b/data/Leland/E268.xml
@@ -1 +1 @@
-<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M467 107l-38 -7v-165l33 7c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1c4 0 7 -1 9 -3zM28 -97l116 32v165l-116 -33v-164zM312 76v-165l89 18v165z"/></symbol>
\ No newline at end of file
+<symbol id="E268" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M467 107l-38 -7v-165l33 7h3c8 0 13 -6 13 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 h3c8 0 13 -6 13 -14v-59c0 -6 -5 -13 -11 -14zM312 76v-165l89 18v165zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35h-4c-8 0 -14 5 -14 13v495h28v-175l126 35c1 0 3 1 4 1c3 0 6 -1 8 -3zM28 -97l116 32v165l-116 -33v-164z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E269.xml b/data/Leland/E269.xml
index 28e1328e738..cd5882451a3 100644
--- a/data/Leland/E269.xml
+++ b/data/Leland/E269.xml
@@ -1 +1 @@
-<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M524 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7 c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147 h28v-141l89 18v155h28v-149l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM369 74v-166l89 19v165zM78 74v-166l89 19v165z"/></symbol>
\ No newline at end of file
+<symbol id="E269" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M524 105l-38 -7v-165l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3c-8 0 -14 6 -14 14v-2v58v2c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149 l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14zM369 74v-166l89 19v165zM233 105l-38 -7v-165l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3 c-8 0 -14 6 -14 14v-2v58v2c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26A.xml b/data/Leland/E26A.xml
index c7e8c32fcc4..446681f566a 100644
--- a/data/Leland/E26A.xml
+++ b/data/Leland/E26A.xml
@@ -1 +1 @@
-<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1z"/></symbol>
\ No newline at end of file
+<symbol id="E26A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 2 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -208c1 -2 1 -3 1 -4c0 -2 -1 -4 -3 -5c-1 -1 -2 -1 -4 -2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E26B.xml b/data/Leland/E26B.xml
index 7024793a36f..8b1859a65bc 100644
--- a/data/Leland/E26B.xml
+++ b/data/Leland/E26B.xml
@@ -1 +1 @@
-<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1z"/></symbol>
\ No newline at end of file
+<symbol id="E26B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -46 207 -46 208c-1 2 -1 3 -1 4c0 2 1 4 3 5c1 1 2 1 4 2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E270.xml b/data/Leland/E270.xml
index e5f3b9a42c7..f469edcc9e7 100644
--- a/data/Leland/E270.xml
+++ b/data/Leland/E270.xml
@@ -1 +1 @@
-<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M197 166c59 0 83 -49 83 -101c0 -102 -90 -185 -175 -228c-2 -1 -5 -2 -8 -2h-1c-7 0 -13 6 -13 13l-5 506l-56 -42c-2 -2 -5 -3 -8 -3c-8 0 -14 6 -14 14c0 2 2 6 3 8l83 117c2 3 7 6 11 6s10 -3 12 -6l83 -117c1 -2 2 -6 2 -8c0 -8 -5 -14 -13 -14c-3 0 -7 1 -9 3 l-56 42l-2 -225c5 6 33 37 83 37zM111 -117c65 51 99 89 99 176c0 20 -3 57 -40 57c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
+<symbol id="E270" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M278 90c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -118 -93 -122 -95c-2 -1 -5 -2 -8 -2h-1c-7 0 -13 6 -13 13l-5 506l-56 -42c-2 -2 -5 -3 -8 -3c-8 0 -14 6 -14 14c0 2 2 6 3 8l83 117c2 3 7 6 11 6s10 -3 12 -6l83 -117c1 -2 2 -6 2 -8c0 -8 -5 -14 -13 -14 c-3 0 -7 1 -9 3l-56 42l-2 -225c5 6 33 37 83 37c51 0 75 -37 81 -76zM210 50v9c0 20 -3 57 -40 57c-40 0 -55 -29 -57 -38l-2 -195c19 15 53 42 70 68c25 38 29 84 29 99z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E271.xml b/data/Leland/E271.xml
index 93217248bce..131c1f561ec 100644
--- a/data/Leland/E271.xml
+++ b/data/Leland/E271.xml
@@ -1 +1 @@
-<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M197 166c59 0 83 -49 83 -101c0 -41 -15 -90 -53 -133c-46 -52 -98 -83 -116 -92v-192l61 47c2 2 6 2 9 2c8 0 13 -5 13 -13c0 -2 -1 -6 -2 -8l-84 -118c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-83 118c-1 2 -3 6 -3 8c0 8 6 13 14 13c3 0 6 0 8 -2l61 -47v201l-6 600v1 c0 8 6 13 14 13h12c8 0 14 -5 14 -13v-1l-3 -320c5 6 33 37 83 37zM111 -117c65 51 98 91 98 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z"/></symbol>
\ No newline at end of file
+<symbol id="E271" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M278 90c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-46 -52 -98 -83 -116 -92v-192l61 47c2 2 6 2 9 2c8 0 13 -5 13 -13c0 -2 -1 -6 -2 -8l-84 -118c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-83 118c-1 2 -3 6 -3 8c0 8 6 13 14 13c3 0 6 0 8 -2l61 -47v201l-6 600v1 c0 8 6 13 14 13h12c8 0 14 -5 14 -13v-1l-3 -320c5 6 33 37 83 37c51 0 75 -37 81 -76zM118 -381l-1 -1zM209 50v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-2 -195c19 15 52 42 69 68c25 38 29 84 29 99z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E272.xml b/data/Leland/E272.xml
index 38fc3f9841b..a6ff6982bb2 100644
--- a/data/Leland/E272.xml
+++ b/data/Leland/E272.xml
@@ -1 +1 @@
-<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 183c3 -2 6 -7 6 -11v-495h-28v175l-126 -35c-9 0 -18 2 -18 13v523l-61 -46c-2 -2 -5 -2 -8 -2c-8 0 -14 5 -14 13c0 2 2 6 3 8l83 118c2 3 7 6 11 6s10 -3 12 -6l83 -118c1 -2 2 -6 2 -8c0 -8 -5 -13 -13 -13c-3 0 -7 0 -9 2l-61 47v-204l126 35h1l2 1 c4 0 7 -1 9 -3zM111 -97l116 32v165l-116 -33v-164z"/></symbol>
\ No newline at end of file
+<symbol id="E272" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 183c3 -2 6 -7 6 -11v-495h-28v175l-126 -35h-4c-8 0 -14 5 -14 13v523l-61 -46c-2 -2 -5 -2 -8 -2c-8 0 -14 5 -14 13c0 2 2 6 3 8l83 118c2 3 7 6 11 6s10 -3 12 -6l83 -118c1 -2 2 -6 2 -8c0 -8 -5 -13 -13 -13c-3 0 -7 0 -9 2l-61 47v-204l126 35c1 0 3 1 4 1 c3 0 6 -1 8 -3zM111 -97l116 32v165l-116 -33v-164z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E273.xml b/data/Leland/E273.xml
index 8e10b111a90..96b584ac7aa 100644
--- a/data/Leland/E273.xml
+++ b/data/Leland/E273.xml
@@ -1 +1 @@
-<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 -303c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8l-83 -118c-2 -3 -7 -5 -11 -5s-10 2 -12 5l-83 118c-1 2 -3 6 -3 8c0 8 6 14 14 14c3 0 7 -1 9 -3l61 -47v204l-126 -35c-9 0 -18 2 -18 13v496h28v-176l126 35h1l2 1c9 0 14 -6 14 -14v-523l62 46c2 2 5 3 8 3zM144 99 l-116 -33v-164l116 32v165z"/></symbol>
\ No newline at end of file
+<symbol id="E273" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M251 -307c2 -2 4 -7 4 -10c0 -2 -2 -6 -3 -8l-83 -118c-2 -3 -7 -5 -11 -5s-10 2 -12 5l-83 118c-1 2 -3 6 -3 8c0 8 6 14 14 14c3 0 7 -1 9 -3l61 -47v204l-126 -35h-4c-8 0 -14 5 -14 13v496h28v-176l126 35c1 0 3 1 4 1c8 0 13 -6 13 -14v-523l62 46c2 2 5 3 8 3 s8 -2 10 -4zM144 99l-116 -33v-164l116 32v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E274.xml b/data/Leland/E274.xml
index fa4c0c1e8c1..ecdd466b56c 100644
--- a/data/Leland/E274.xml
+++ b/data/Leland/E274.xml
@@ -1 +1 @@
-<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M192 454l84 -118c1 -2 2 -5 2 -8c0 -8 -6 -14 -14 -14c-3 1 -5 2 -8 3l-61 47v-180l33 7c9 0 16 -4 16 -14v-59c0 -6 -4 -12 -11 -13l-38 -8v-165l33 7c4 0 8 0 11 -3c3 -2 5 -6 5 -10v-59c0 -7 -4 -13 -11 -14l-38 -8v-149h-28v144l-89 -18v-155h-28v149l-33 -7 c-5 0 -8 0 -12 3c-3 3 -5 7 -5 11v58c0 6 5 12 11 13l39 8v166l-33 -7c-8 0 -17 3 -17 13v58c0 7 5 13 11 14l39 8v123h28v-117l89 18v185l-61 -46c-2 -1 -5 -2 -8 -2c-4 -1 -7 1 -10 3c-3 3 -4 7 -4 11c0 2 1 5 2 7l84 118c2 3 7 5 11 5c5 0 9 -2 11 -5zM78 -92l89 19v164 l-89 -18v-165z"/></symbol>
\ No newline at end of file
+<symbol id="E274" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M192 454l84 -118c1 -2 2 -5 2 -8s-1 -7 -4 -10c-3 -2 -6 -4 -10 -4c-3 1 -5 1 -8 3l-61 47v-180l33 7h2c3 0 7 -1 9 -3c3 -3 5 -7 5 -11v-59c0 -6 -4 -12 -11 -13l-38 -8v-165l33 7h3c3 0 6 -1 8 -3c3 -2 5 -6 5 -10v-59c0 -7 -4 -13 -11 -14l-38 -8v-149h-28v144 l-89 -18v-155h-28v149l-33 -7h-3c-3 0 -6 1 -9 3c-3 3 -5 7 -5 11v58c0 6 5 12 11 13l39 8v166l-33 -7c-1 0 -2 -1 -3 -1c-3 0 -6 2 -9 4s-5 6 -5 10v58c0 7 5 12 11 14l39 8v123h28v-117l89 18v185l-61 -46c-2 -2 -5 -2 -8 -3c-4 0 -7 2 -10 4c-3 3 -4 7 -4 11c0 2 1 5 2 7 l84 118c2 3 7 5 11 5c5 0 9 -2 11 -5zM78 -92l89 19v164l-89 -18v-165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E275.xml b/data/Leland/E275.xml
index ff3550efadf..d7de7a97580 100644
--- a/data/Leland/E275.xml
+++ b/data/Leland/E275.xml
@@ -1 +1 @@
-<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M86 -452l-83 117c-2 3 -3 5 -3 8c0 4 2 7 4 10c3 2 6 4 9 4c4 0 7 -1 9 -3l61 -47v180l-32 -6c-8 0 -17 2 -17 13v59c0 7 5 13 11 14l38 8v164l-32 -7c-4 0 -9 1 -12 3c-3 3 -5 7 -5 11v59c0 7 5 12 11 14l38 7v150h28v-144l89 18v154h28v-149l34 7c1 0 1 1 2 1 c4 0 7 -2 9 -4c3 -2 5 -6 5 -10v-58c0 -7 -4 -12 -11 -14l-39 -8v-165l34 7h2c8 0 14 -6 14 -14v-58c0 -6 -4 -12 -11 -13l-39 -8v-123h-27v117l-90 -19v-185l61 46c3 2 6 3 9 3s7 -1 9 -4c3 -2 4 -5 4 -8c0 -1 1 -2 1 -2c-1 -3 -1 -6 -3 -8l-83 -117c-3 -4 -7 -6 -12 -6 c-4 0 -8 2 -11 6zM201 93l-90 -18v-165l90 18v165z"/></symbol>
\ No newline at end of file
+<symbol id="E275" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M86 -452l-83 117c-2 3 -3 5 -3 8c0 4 2 7 4 10c3 2 6 4 9 4s7 -1 9 -3l61 -47v181l-32 -7c-1 0 -2 -1 -3 -1c-3 1 -7 2 -9 4c-3 2 -5 6 -5 10v59c0 7 5 13 11 14l38 8v164l-32 -7c-4 0 -9 1 -12 3c-3 3 -5 7 -5 11v59c0 7 5 12 11 14l38 7v150h28v-144l89 18v154h28v-149 l34 7h2c4 0 7 -1 9 -3c3 -2 5 -6 5 -10v-58c0 -7 -4 -12 -11 -14l-39 -8v-165l34 7h2c4 0 7 -1 9 -3c3 -3 5 -7 5 -11v-58c0 -6 -4 -12 -11 -13l-39 -8v-123h-28v117l-89 -19v-185l61 46c3 2 6 3 9 3s7 -1 9 -4c3 -2 4 -5 4 -8v-2c0 -3 0 -5 -2 -8l-83 -117 c-3 -4 -7 -6 -12 -6c-4 0 -8 2 -11 6zM200 93l-89 -18v-165l89 18v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E280.xml b/data/Leland/E280.xml
index ae243dec532..cd8da24a778 100644
--- a/data/Leland/E280.xml
+++ b/data/Leland/E280.xml
@@ -1 +1 @@
-<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c-84 50 -170 124 -170 231zM103 107c-36 0 -39 -34 -39 -55c0 -80 41 -127 99 -176l-1 198c0 -3 -1 -5 -1 -3c0 9 -14 36 -58 36z"/></symbol>
\ No newline at end of file
+<symbol id="E280" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c0 0 -55 33 -96 72c-29 28 -74 83 -74 159zM103 107c-36 0 -39 -34 -39 -55v-12c0 -15 4 -52 29 -90c18 -27 51 -58 70 -74l-1 198 c0 -3 -1 -5 -1 -3c0 9 -14 36 -58 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E281.xml b/data/Leland/E281.xml
index 2553ff5c588..006c246f2ac 100644
--- a/data/Leland/E281.xml
+++ b/data/Leland/E281.xml
@@ -1 +1 @@
-<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M422 58c0 -76 -45 -131 -74 -159c-41 -39 -96 -72 -96 -72c-2 -1 -3 -3 -6 -3c-7 0 -13 6 -13 13l-4 602c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-2 -318c6 8 28 30 74 30c50 0 87 -31 87 -93zM0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8 c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c-84 50 -170 124 -170 231zM319 107c-44 0 -58 -27 -58 -36c0 -2 -1 0 -1 3l-1 -198c58 49 99 96 99 176c0 21 -3 55 -39 55zM103 107c-36 0 -39 -34 -39 -55c0 -80 41 -127 99 -176l-1 198c0 -3 -1 -5 -1 -3 c0 9 -14 36 -58 36z"/></symbol>
\ No newline at end of file
+<symbol id="E281" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M422 58c0 -76 -45 -131 -74 -159c-41 -39 -96 -72 -96 -72c-2 -1 -3 -3 -6 -3c-7 0 -13 6 -13 13l-4 602c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-2 -318c6 8 28 30 74 30c50 0 87 -31 87 -93zM319 107c-44 0 -58 -27 -58 -36c0 -2 -1 0 -1 3l-1 -198c19 16 52 47 70 74 c25 38 29 75 29 90v12c0 21 -3 55 -39 55zM0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c0 0 -55 33 -96 72c-29 28 -74 83 -74 159zM103 107c-36 0 -39 -34 -39 -55v-12 c0 -15 4 -52 29 -90c18 -27 51 -58 70 -74l-1 198c0 -3 -1 -5 -1 -3c0 9 -14 36 -58 36z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E282.xml b/data/Leland/E282.xml
index 0b249204a13..9ec6d8d9a3d 100644
--- a/data/Leland/E282.xml
+++ b/data/Leland/E282.xml
@@ -1 +1 @@
-<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M169 100l-65 -13v-165l59 12c9 0 17 -2 17 -13v-59c0 -6 -5 -13 -11 -14l-65 -13v-151h-28v145l-59 -12c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l65 14v165l-59 -12c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l65 14v152h28v-146l59 12h1l1 1c9 0 15 -6 15 -14v-59 c0 -6 -5 -13 -11 -14z"/></symbol>
\ No newline at end of file
+<symbol id="E282" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M169 100l-65 -13v-165l59 12h3c8 0 14 -5 14 -13v-59c0 -6 -5 -13 -11 -14l-65 -13v-151h-28v145l-59 -12h-3c-8 0 -14 6 -14 14v58c0 6 5 12 11 13l65 14v165l-59 -12h-3c-8 0 -14 6 -14 14v58c0 6 5 12 11 13l65 14v152h28v-146l59 12c1 0 2 1 3 1c8 0 14 -6 14 -14 v-59c0 -6 -5 -13 -11 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E283.xml b/data/Leland/E283.xml
index 373acb42340..d41c93e4e9e 100644
--- a/data/Leland/E283.xml
+++ b/data/Leland/E283.xml
@@ -1 +1 @@
-<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M278 110l-36 -7v-165l31 7c9 0 17 -3 17 -14v-59c0 -6 -6 -13 -12 -14l-36 -7v-147h-28v141l-59 -12v-146h-27v141l-53 -11v-145h-27v139l-31 -6c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l37 8v166l-31 -7c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l37 8v157h27v-151l53 11v156 h27v-151l59 12v155h28v-149l31 7c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14zM155 85v-165l59 12v165zM128 -85v165l-53 -11v-165z"/></symbol>
\ No newline at end of file
+<symbol id="E283" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M278 110l-36 -7v-165l31 7h3c8 0 14 -6 14 -14v-59c0 -6 -6 -13 -12 -14l-36 -7v-147h-28v141l-59 -12v-146h-27v141l-53 -11v-145h-27v139l-31 -6h-3c-8 0 -14 6 -14 14v58c0 6 5 12 11 13l37 8v166l-31 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 12 11 13l37 8v157h27v-151 l53 11v156h27v-151l59 12v155h28v-149l31 7h3c8 0 13 -6 13 -14v-59c0 -6 -5 -13 -11 -14zM128 -85v165l-53 -11v-165zM155 85v-165l59 12v165z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E440.xml b/data/Leland/E440.xml
index da75b5f727a..78e410f78a3 100644
--- a/data/Leland/E440.xml
+++ b/data/Leland/E440.xml
@@ -1 +1 @@
-<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M194 156c60 0 83 -49 83 -101c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-3 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 362l-76 -45v44l76 45l-1 74l-75 -44v44l75 44l-1 79c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-1 -57l120 71v-44l-121 -71v-75l121 71v-44 l-122 -71l-1 -101c4 5 32 37 84 37zM107 -128c65 52 99 91 99 179c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39z"/></symbol>
\ No newline at end of file
+<symbol id="E440" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M275 80c1 -8 2 -16 2 -25c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-3 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 362l-76 -45v44l76 45l-1 74l-75 -44v44l75 44l-1 79c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-1 -57l120 71v-44l-121 -71v-75l121 71v-44l-122 -71 l-1 -101c4 5 32 37 84 37s75 -36 81 -76zM206 40v11c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39l-3 -195c19 15 53 43 70 69c25 38 29 84 29 99z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E442.xml b/data/Leland/E442.xml
index c5c03840dbc..002e52bc194 100644
--- a/data/Leland/E442.xml
+++ b/data/Leland/E442.xml
@@ -1 +1 @@
-<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M194 156c60 0 83 -49 83 -101c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-2 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 384l-76 -44v44l76 44l-2 175c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-2 -153l121 71v-44l-121 -72l-2 -123c4 5 32 37 84 37zM108 -128 c65 51 98 93 98 179c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39z"/></symbol>
\ No newline at end of file
+<symbol id="E442" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M275 80c1 -8 2 -16 2 -25c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-2 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 384l-76 -44v44l76 44l-2 175c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-2 -153l121 71v-44l-121 -72l-2 -123c4 5 32 37 84 37s75 -36 81 -76zM206 40 v11c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39l-2 -195c19 15 52 43 69 69c25 38 29 84 29 99z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E446.xml b/data/Leland/E446.xml
index 3f0ae1a1351..9e39462f21c 100644
--- a/data/Leland/E446.xml
+++ b/data/Leland/E446.xml
@@ -1 +1 @@
-<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 84c3 -2 5 -6 5 -10v-59c0 -6 -4 -10 -10 -12l-151 -41v-41l92 25h1l1 1c4 0 7 -1 9 -3c3 -2 5 -6 5 -10v-59c0 -6 -3 -11 -9 -13l-99 -26v-152h-26v145l-92 -25h-3c-3 0 -6 0 -8 2c-3 2 -5 7 -5 11v58c0 6 3 10 9 12l99 27v40l-145 -39c-4 0 -8 0 -11 3 c-3 2 -5 6 -5 10v58c0 6 4 10 10 12l151 42v40l-92 -24h-1l-1 -1c-4 0 -7 1 -9 3c-3 2 -5 6 -5 10v58c0 6 3 11 9 13l99 27v152h26v-145l92 25h3c3 0 6 0 8 -2c3 -2 5 -7 5 -11v-59c0 -6 -3 -10 -9 -12l-99 -26v-41l145 39h1l1 1c4 0 7 -1 9 -3z"/></symbol>
\ No newline at end of file
+<symbol id="E446" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 84c3 -2 5 -6 5 -10v-59c0 -6 -4 -10 -10 -12l-151 -41v-41l92 25c1 0 2 1 3 1c3 0 6 -1 8 -3c3 -2 5 -6 5 -10v-59c0 -6 -3 -11 -9 -13l-99 -26v-152h-26v145l-92 -25h-3c-3 0 -6 0 -8 2c-3 2 -5 7 -5 11v58c0 6 3 10 9 12l99 27v40l-145 -39h-3c-3 0 -6 1 -8 3 c-3 2 -5 6 -5 10v58c0 6 4 10 10 12l151 42v40l-92 -24c-1 0 -2 -1 -3 -1c-3 0 -6 1 -8 3c-3 2 -5 6 -5 10v58c0 6 3 11 9 13l99 27v152h26v-145l92 25h3c3 0 6 0 8 -2c3 -2 5 -7 5 -11v-59c0 -6 -3 -10 -9 -12l-99 -26v-41l145 39c1 0 2 1 3 1c3 0 6 -1 8 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E447.xml b/data/Leland/E447.xml
index 3760e3b2549..3e296cb9b8e 100644
--- a/data/Leland/E447.xml
+++ b/data/Leland/E447.xml
@@ -1 +1 @@
-<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 84c3 -2 5 -6 5 -10v-59c0 -5 -4 -11 -9 -12l-93 -25v-41l33 9h1l1 1c3 0 7 -2 9 -3c3 -2 5 -6 5 -10v-60c0 -5 -4 -11 -9 -12l-40 -11v-152h-26v145l-91 -24v-152h-26v145l-34 -9c-8 0 -16 3 -16 12v59c0 5 4 11 9 12l41 11v41l-87 -23h-1l-1 -1c-3 0 -7 2 -9 3 c-3 2 -5 6 -5 10v58c0 5 5 12 10 13l93 25v41l-34 -9c-4 0 -8 0 -11 2s-5 6 -5 10v59c0 5 4 11 9 12l41 11v153h26v-146l91 25v152h26v-145l33 9h1l2 1c8 0 13 -6 13 -13v-59c0 -5 -4 -12 -9 -13l-40 -11v-40l86 24h3c2 0 6 -2 8 -3zM220 96l-91 -24v-41l91 25v40zM129 -95 l91 25v41l-91 -25v-41z"/></symbol>
\ No newline at end of file
+<symbol id="E447" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 84c3 -2 5 -6 5 -10v-59c0 -5 -4 -11 -9 -12l-93 -25v-41l33 9c1 0 2 1 3 1c2 0 6 -2 8 -3c3 -2 5 -6 5 -10v-60c0 -5 -4 -11 -9 -12l-40 -11v-152h-26v145l-91 -24v-152h-26v145l-34 -9h-3c-7 0 -13 5 -13 12v58v1c0 5 4 11 9 12l41 11v41l-87 -23c-1 0 -2 -1 -3 -1 c-2 0 -6 2 -8 3c-3 2 -5 6 -5 10v58c0 5 5 12 10 13l93 25v41l-34 -9h-3c-2 0 -6 1 -8 2c-3 2 -5 6 -5 10v59c0 5 4 11 9 12l41 11v153h26v-146l91 25v152h26v-145l33 9c1 0 3 1 4 1c7 0 12 -6 12 -13v-59c0 -5 -4 -12 -9 -13l-40 -11v-40l86 24h3c2 0 6 -2 8 -3zM220 96 l-91 -24v-41l91 25v40zM129 -95l91 25v41l-91 -25v-41z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A0.xml b/data/Leland/E4A0.xml
index afb02ccbd6e..b7ae5ca1c09 100644
--- a/data/Leland/E4A0.xml
+++ b/data/Leland/E4A0.xml
@@ -1 +1 @@
-<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 234l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1z"/></symbol>
\ No newline at end of file
+<symbol id="E4A0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 234l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A1.xml b/data/Leland/E4A1.xml
index b68f2c33050..a77a22cffb1 100644
--- a/data/Leland/E4A1.xml
+++ b/data/Leland/E4A1.xml
@@ -1 +1 @@
-<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -1l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1z"/></symbol>
\ No newline at end of file
+<symbol id="E4A1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -1l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A2.xml b/data/Leland/E4A2.xml
index 31f221ae094..21520314903 100644
--- a/data/Leland/E4A2.xml
+++ b/data/Leland/E4A2.xml
@@ -1 +1 @@
-<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z"/></symbol>
\ No newline at end of file
+<symbol id="E4A2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4A3.xml b/data/Leland/E4A3.xml
index 048a9208202..f54442541e7 100644
--- a/data/Leland/E4A3.xml
+++ b/data/Leland/E4A3.xml
@@ -1 +1 @@
-<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11z"/></symbol>
\ No newline at end of file
+<symbol id="E4A3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M11 -67c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AE.xml b/data/Leland/E4AE.xml
index c1a26420070..594be8d43cc 100644
--- a/data/Leland/E4AE.xml
+++ b/data/Leland/E4AE.xml
@@ -1 +1 @@
-<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M25 140l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159zM120 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z"/></symbol>
\ No newline at end of file
+<symbol id="E4AE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM25 140l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4AF.xml b/data/Leland/E4AF.xml
index 16fe991df87..48eea4323db 100644
--- a/data/Leland/E4AF.xml
+++ b/data/Leland/E4AF.xml
@@ -1 +1 @@
-<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M176 -11c15 -16 15 -40 0 -56c-8 -8 -18 -11 -28 -11s-20 3 -28 11c-15 16 -15 40 0 56c8 7 18 11 28 11s20 -4 28 -11zM271 -140l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z"/></symbol>
\ No newline at end of file
+<symbol id="E4AF" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M176 -11c15 -16 15 -40 0 -55c-16 -16 -40 -16 -56 0c-15 15 -15 39 0 55c16 15 40 15 56 0zM271 -140l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B0.xml b/data/Leland/E4B0.xml
index 5325ee699a8..14200786e43 100644
--- a/data/Leland/E4B0.xml
+++ b/data/Leland/E4B0.xml
@@ -1 +1 @@
-<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 343l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1zM152 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56 c-8 -7 -18 -11 -28 -11s-20 4 -28 11z"/></symbol>
\ No newline at end of file
+<symbol id="E4B0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM18 343l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14 c1 0 3 -1 4 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B1.xml b/data/Leland/E4B1.xml
index 40eef847928..802d61d9147 100644
--- a/data/Leland/E4B1.xml
+++ b/data/Leland/E4B1.xml
@@ -1 +1 @@
-<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M152 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11zM18 -110l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13 v23c0 8 6 14 15 14l2 -1h1z"/></symbol>
\ No newline at end of file
+<symbol id="E4B1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -110l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1zM152 -67c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55 c-16 -15 -40 -15 -56 0z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B2.xml b/data/Leland/E4B2.xml
index c3afd0b6c84..65edc9fa390 100644
--- a/data/Leland/E4B2.xml
+++ b/data/Leland/E4B2.xml
@@ -1 +1 @@
-<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 187h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM130 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z"/></symbol>
\ No newline at end of file
+<symbol id="E4B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 187h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM130 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B3.xml b/data/Leland/E4B3.xml
index 818f45a7de3..46c244385de 100644
--- a/data/Leland/E4B3.xml
+++ b/data/Leland/E4B3.xml
@@ -1 +1 @@
-<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M130 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11zM14 -141h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
+<symbol id="E4B3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 -141h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM130 -67c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B4.xml b/data/Leland/E4B4.xml
index c8e502340f0..dc3fec920d6 100644
--- a/data/Leland/E4B4.xml
+++ b/data/Leland/E4B4.xml
@@ -1 +1 @@
-<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 357l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1zM36 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18 c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
+<symbol id="E4B4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 357l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1zM36 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288 c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B5.xml b/data/Leland/E4B5.xml
index 7143013a19a..45bda49b133 100644
--- a/data/Leland/E4B5.xml
+++ b/data/Leland/E4B5.xml
@@ -1 +1 @@
-<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M36 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM18 -124l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14 l2 -1h1z"/></symbol>
\ No newline at end of file
+<symbol id="E4B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M18 -124l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1zM36 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288 c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B6.xml b/data/Leland/E4B6.xml
index dc4f51ed13c..404857a2a07 100644
--- a/data/Leland/E4B6.xml
+++ b/data/Leland/E4B6.xml
@@ -1 +1 @@
-<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M7 0c-4 0 -7 3 -7 7c0 36 140 199 140 199c3 3 9 6 14 6s11 -3 14 -6l38 -38c3 -3 6 -9 6 -14s-3 -11 -6 -14s-163 -140 -199 -140z"/></symbol>
\ No newline at end of file
+<symbol id="E4B6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 2c-1 1 -2 3 -2 5c0 36 140 199 140 199c3 3 9 6 14 6s11 -3 14 -6l38 -38c3 -3 6 -9 6 -14s-3 -11 -6 -14s-163 -140 -199 -140c-2 0 -4 1 -5 2z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B7.xml b/data/Leland/E4B7.xml
index 7d6546b71c9..f68e50775e9 100644
--- a/data/Leland/E4B7.xml
+++ b/data/Leland/E4B7.xml
@@ -1 +1 @@
-<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 -7c0 4 3 7 7 7c36 0 196 -137 199 -140s6 -9 6 -14s-3 -11 -6 -14l-38 -38c-3 -3 -9 -6 -14 -6s-11 3 -14 6c0 0 -140 163 -140 199z"/></symbol>
\ No newline at end of file
+<symbol id="E4B7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M2 -2c1 1 3 2 5 2c36 0 196 -137 199 -140s6 -9 6 -14s-3 -11 -6 -14l-38 -38c-3 -3 -9 -6 -14 -6s-11 3 -14 6c0 0 -140 163 -140 199c0 2 1 4 2 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B8.xml b/data/Leland/E4B8.xml
index f4860216a22..8e3eedea5b3 100644
--- a/data/Leland/E4B8.xml
+++ b/data/Leland/E4B8.xml
@@ -1 +1 @@
-<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M332 0c9 -2 10 -9 10 -17c-1 -5 -25 -145 -171 -145s-170 140 -171 145c0 8 1 15 10 17c10 0 14 -3 17 -12c2 -6 17 -93 144 -93s142 87 144 93c3 9 7 12 17 12z"/></symbol>
\ No newline at end of file
+<symbol id="E4B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M332 0c8 -2 10 -9 10 -14v-3c-1 -5 -25 -145 -171 -145s-170 140 -171 145v3c0 5 2 12 10 14h3c8 0 12 -7 14 -12c2 -6 17 -93 144 -93s142 87 144 93c2 5 6 12 14 12h3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4B9.xml b/data/Leland/E4B9.xml
index d521cd1f442..291ca41b50e 100644
--- a/data/Leland/E4B9.xml
+++ b/data/Leland/E4B9.xml
@@ -1 +1 @@
-<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M332 0c-10 0 -14 3 -17 12c-2 6 -17 93 -144 93s-142 -87 -144 -93c-3 -9 -7 -12 -17 -12c-9 2 -10 9 -10 17c1 5 25 145 171 145s170 -140 171 -145c0 -8 -1 -15 -10 -17z"/></symbol>
\ No newline at end of file
+<symbol id="E4B9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M332 0h-3c-8 0 -12 7 -14 12c-2 6 -17 93 -144 93s-142 -87 -144 -93c-2 -5 -6 -12 -14 -12h-3c-8 2 -10 9 -10 14v3c1 5 25 145 171 145s170 -140 171 -145v-3c0 -5 -2 -12 -10 -14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BA.xml b/data/Leland/E4BA.xml
index 6205d216400..a9b3c0476b0 100644
--- a/data/Leland/E4BA.xml
+++ b/data/Leland/E4BA.xml
@@ -1 +1 @@
-<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M368 48c-42 15 -82 21 -124 21s-80 -7 -124 -21c-40 -12 -94 -41 -100 -45c-4 -2 -7 -3 -10 -3c-5 0 -10 5 -10 10c0 3 1 6 4 9c0 1 21 26 61 52c37 23 97 51 179 51s143 -28 179 -51c40 -26 61 -51 61 -52c3 -3 4 -6 4 -9c0 -5 -5 -10 -10 -10c-3 0 -6 1 -10 3 c-6 4 -59 31 -100 45z"/></symbol>
\ No newline at end of file
+<symbol id="E4BA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M570 14c3 -4 3 -5 3 -6c0 -2 -1 -4 -3 -6c-1 -1 -3 -2 -6 -2c0 0 -4 0 -8 3s-31 23 -73 42c-38 17 -94 36 -196 36c-103 0 -159 -19 -197 -36c-42 -19 -69 -39 -73 -42s-8 -3 -8 -3c-2 0 -5 0 -7 2s-2 4 -2 5c0 2 1 5 3 7c3 4 33 38 74 63c34 20 62 34 89 42 c38 12 78 18 121 18c42 0 82 -6 120 -18c27 -8 55 -22 89 -42c41 -25 72 -60 74 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BB.xml b/data/Leland/E4BB.xml
index 398303d4844..bb49b2ccf5e 100644
--- a/data/Leland/E4BB.xml
+++ b/data/Leland/E4BB.xml
@@ -1 +1 @@
-<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M120 -48c42 -15 82 -21 124 -21s80 7 124 21c40 12 94 41 100 45c4 2 7 3 10 3c6 0 10 -5 10 -10c0 -3 -1 -6 -4 -9c0 -1 -21 -26 -61 -52c-36 -23 -97 -51 -179 -51s-142 28 -179 51c-40 26 -61 51 -61 52c-3 3 -4 6 -4 9c0 5 5 10 10 10c3 0 6 -1 10 -3 c6 -4 59 -31 100 -45z"/></symbol>
\ No newline at end of file
+<symbol id="E4BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M530 -13c-2 -3 -31 -36 -69 -59c-31 -19 -57 -31 -83 -39c-34 -11 -72 -16 -111 -16c-40 0 -78 5 -112 16c-26 8 -52 20 -83 39c-38 23 -66 55 -69 59c-2 2 -3 4 -3 6c0 1 0 3 2 5s4 2 6 2c0 0 4 0 8 -3s29 -21 68 -39c35 -15 87 -33 183 -33c95 0 147 18 182 33 c40 18 64 36 68 39s8 3 8 3c2 0 4 -1 5 -2c2 -2 3 -4 3 -5c0 -2 0 -3 -3 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4BD.xml b/data/Leland/E4BD.xml
index fb559f3cc36..c4c28bc3307 100644
--- a/data/Leland/E4BD.xml
+++ b/data/Leland/E4BD.xml
@@ -1 +1 @@
-<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM280 -123l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z"/></symbol>
\ No newline at end of file
+<symbol id="E4BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M280 -123l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159zM14 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C0.xml b/data/Leland/E4C0.xml
index c2ef454df64..ca313483417 100644
--- a/data/Leland/E4C0.xml
+++ b/data/Leland/E4C0.xml
@@ -1 +1 @@
-<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M540 260c49 -53 82 -161 82 -215c0 -20 -4 -32 -14 -32c-28 0 -14 86 -98 171c-74 74 -173 75 -197 75h-4c-24 0 -123 -1 -197 -75c-84 -85 -70 -171 -98 -171c-10 0 -14 13 -14 32c0 54 34 161 83 215c94 102 176 108 228 108s135 -6 229 -108zM242 69c0 38 31 69 69 69 s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
+<symbol id="E4C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M540 260c49 -53 82 -161 82 -215c0 -20 -4 -32 -14 -32c-28 0 -14 86 -98 171c-74 74 -173 75 -197 75h-2h-2c-24 0 -123 -1 -197 -75c-84 -85 -70 -171 -98 -171c-10 0 -14 13 -14 32c0 54 34 161 83 215c94 102 176 108 228 108s135 -6 229 -108zM242 69 c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C1.xml b/data/Leland/E4C1.xml
index 8ad00deb3b7..e1505de999c 100644
--- a/data/Leland/E4C1.xml
+++ b/data/Leland/E4C1.xml
@@ -1 +1 @@
-<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M242 -69c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM540 -260c-94 -102 -177 -108 -229 -108s-134 6 -228 108c-49 54 -83 161 -83 215c0 19 4 32 14 32c28 0 14 -86 98 -171c74 -74 173 -75 197 -75h4c24 0 123 1 197 75c84 85 70 171 98 171 c10 0 14 -12 14 -32c0 -54 -33 -162 -82 -215z"/></symbol>
\ No newline at end of file
+<symbol id="E4C1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M540 -260c-94 -102 -177 -108 -229 -108s-134 6 -228 108c-49 54 -83 161 -83 215c0 19 4 32 14 32c28 0 14 -86 98 -171c74 -74 173 -75 197 -75h2h2c24 0 123 1 197 75c84 85 70 171 98 171c10 0 14 -12 14 -32c0 -54 -33 -162 -82 -215zM242 -69c0 38 31 69 69 69 s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C4.xml b/data/Leland/E4C4.xml
index ef2a3046f28..c391af560c3 100644
--- a/data/Leland/E4C4.xml
+++ b/data/Leland/E4C4.xml
@@ -1 +1 @@
-<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M331 448l308 -426c1 -2 3 -6 3 -8c0 -8 -6 -14 -14 -14h-43c-4 0 -9 3 -11 6l-254 351l-252 -351c-2 -3 -7 -6 -11 -6h-43c-8 0 -14 6 -14 14c0 2 2 6 3 8l306 426c2 3 7 6 11 6s9 -3 11 -6zM252 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
+<symbol id="E4C4" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M252 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM331 448l308 -426c1 -2 3 -6 3 -8c0 -8 -6 -14 -14 -14h-43c-4 0 -9 3 -11 6l-254 351l-252 -351c-2 -3 -7 -6 -11 -6h-43c-8 0 -14 6 -14 14c0 2 2 6 3 8l306 426c2 3 7 6 11 6s9 -3 11 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C5.xml b/data/Leland/E4C5.xml
index 28fb5569997..d36636254db 100644
--- a/data/Leland/E4C5.xml
+++ b/data/Leland/E4C5.xml
@@ -1 +1 @@
-<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M639 -22l-308 -426c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-306 426c-1 2 -3 6 -3 8c0 8 6 14 14 14h43c4 0 9 -3 11 -6l252 -351l254 351c2 3 7 6 11 6h43c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8zM252 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
+<symbol id="E4C5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M252 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM639 -22l-308 -426c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-306 426c-1 2 -3 6 -3 8c0 8 6 14 14 14h43c4 0 9 -3 11 -6l252 -351l254 351c2 3 7 6 11 6h43c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C8.xml b/data/Leland/E4C8.xml
index 0b91d5f12d1..b50d8716a3e 100644
--- a/data/Leland/E4C8.xml
+++ b/data/Leland/E4C8.xml
@@ -1 +1 @@
-<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M28 0h-28v536c0 8 6 13 14 13h814c8 0 14 -5 14 -13v-536h-28v459h-786v-459zM192 0h-28v354c0 8 6 14 14 14h486c8 0 14 -6 14 -14v-354h-28v277h-458v-277zM352 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
+<symbol id="E4C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M192 0h-28v354c0 8 6 14 14 14h486c8 0 14 -6 14 -14v-354h-28v277h-458v-277zM352 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM28 0h-28v536c0 8 6 13 14 13h814c8 0 14 -5 14 -13v-536h-28v459h-786v-459z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4C9.xml b/data/Leland/E4C9.xml
index 59b70b18995..446ac914e84 100644
--- a/data/Leland/E4C9.xml
+++ b/data/Leland/E4C9.xml
@@ -1 +1 @@
-<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 -354v354h28v-277h458v277h28v-354c0 -8 -6 -14 -14 -14h-486c-8 0 -14 6 -14 14zM0 -536v536h28v-459h786v459h28v-536c0 -8 -6 -13 -14 -13h-814c-8 0 -14 5 -14 13zM352 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z"/></symbol>
\ No newline at end of file
+<symbol id="E4C9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M164 -354v354h28v-277h458v277h28v-354c0 -8 -6 -14 -14 -14h-486c-8 0 -14 6 -14 14zM352 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM0 -536v536h28v-459h786v459h28v-536c0 -8 -6 -13 -14 -13h-814c-8 0 -14 5 -14 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4CE.xml b/data/Leland/E4CE.xml
index 50f7ae09b47..087bf5c5de1 100644
--- a/data/Leland/E4CE.xml
+++ b/data/Leland/E4CE.xml
@@ -1 +1 @@
-<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M57 0l-24 30c69 48 108 97 108 140c0 6 -1 9 -3 10c-1 1 -3 1 -4 1c-3 0 -5 -1 -8 -2s-17 -8 -46 -8c-43 0 -80 33 -80 76c0 40 32 74 80 74c67 0 111 -46 111 -122c0 -72 -42 -135 -134 -199z"/></symbol>
\ No newline at end of file
+<symbol id="E4CE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M57 0l-24 30c69 48 108 97 108 140c0 6 -1 9 -3 10s-3 1 -5 1s-5 -1 -7 -2c-3 -1 -17 -8 -46 -8c-43 0 -80 33 -80 76c0 40 32 74 80 74c67 0 111 -46 111 -123c0 -71 -42 -134 -134 -198z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E1.xml b/data/Leland/E4E1.xml
index f6021bf214a..a37c00199a3 100644
--- a/data/Leland/E4E1.xml
+++ b/data/Leland/E4E1.xml
@@ -1 +1 @@
-<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -250h-95c-8 0 -15 6 -15 15v470c0 8 7 15 15 15h95c8 0 15 -7 15 -15v-470c0 -9 -7 -15 -15 -15z"/></symbol>
\ No newline at end of file
+<symbol id="E4E1" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M110 -250h-95c-8 0 -15 7 -15 15v470c0 8 7 15 15 15h95c8 0 15 -7 15 -15v-470c0 -8 -7 -15 -15 -15z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E5.xml b/data/Leland/E4E5.xml
index 89101fafafa..cf55502e71a 100644
--- a/data/Leland/E4E5.xml
+++ b/data/Leland/E4E5.xml
@@ -1 +1 @@
-<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M230 -166l2 -3c2 -3 3 -5 3 -8s-1 -6 -3 -9c-3 -4 -6 -5 -10 -5s-8 2 -8 2l-39 25c-8 5 -19 9 -32 9c-32 0 -56 -26 -56 -58c0 -18 7 -32 7 -32s32 -58 35 -63c1 -2 3 -5 3 -9s-2 -8 -7 -12c-2 -2 -4 -2 -6 -2c-7 0 -12 6 -12 6s-75 95 -96 127c-8 11 -11 25 -11 39 c0 51 40 93 91 93c12 0 21 -2 25 -3l-112 139c-2 2 -3 5 -3 8v9c0 2 1 6 2 8l101 154c2 3 3 8 3 12c0 5 -1 9 -3 12l-76 104s-3 5 -3 11c0 3 1 7 5 10c3 3 5 3 8 3c6 0 10 -6 10 -6l162 -219c2 -2 3 -5 3 -8v-9c0 -2 -1 -5 -2 -7l-102 -154c-1 -2 -2 -6 -2 -9 c0 -2 1 -5 2 -6l115 -142c3 -4 5 -6 6 -7z"/></symbol>
\ No newline at end of file
+<symbol id="E4E5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M230 -166l2 -3c2 -3 3 -5 3 -8s-1 -5 -3 -9c-3 -4 -6 -5 -10 -5s-8 2 -8 2l-39 25c-8 5 -19 9 -32 9s-27 -4 -39 -16c-13 -13 -17 -29 -17 -42c0 -18 7 -32 7 -32s32 -58 35 -63c1 -2 3 -5 3 -9s-2 -8 -7 -12c-2 -2 -4 -2 -6 -2c-7 0 -12 6 -12 6s-75 95 -96 127 c-8 11 -11 25 -11 39c0 25 12 53 34 73c18 16 40 20 57 20c12 0 21 -2 25 -3l-112 139c-2 2 -3 5 -3 8v9c0 2 1 6 2 8l101 154c2 3 3 8 3 12c0 5 -1 9 -3 12l-76 104s-3 5 -3 11c0 3 1 7 5 10c3 2 5 3 8 3c6 0 10 -6 10 -6l162 -219c2 -2 3 -5 3 -8v-9c0 -2 -1 -5 -2 -7 l-102 -154c-1 -2 -2 -6 -2 -9c0 -2 1 -5 2 -6l115 -142c3 -4 5 -6 6 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E6.xml b/data/Leland/E4E6.xml
index 627b8f41a9c..aa1442932cf 100644
--- a/data/Leland/E4E6.xml
+++ b/data/Leland/E4E6.xml
@@ -1 +1 @@
-<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M267 203c6 -3 9 -7 9 -12c0 -2 0 -4 -1 -5l-140 -441l-27 8l114 356c-34 -37 -69 -62 -122 -62c-47 0 -100 25 -100 79c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -19 -7 -35 -18 -48c54 10 102 72 125 118c2 5 7 8 13 8c1 0 3 -1 4 -1z"/></symbol>
\ No newline at end of file
+<symbol id="E4E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M267 203c6 -3 9 -7 9 -12c0 -2 0 -4 -1 -5l-140 -441l-27 8l114 356c-11 -12 -23 -24 -35 -33c-27 -20 -58 -29 -87 -29c-20 0 -40 5 -55 12c-26 11 -45 36 -45 67c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -19 -7 -35 -18 -48c16 3 32 10 45 20c45 33 76 92 80 98 c2 5 7 8 13 8c1 0 3 -1 4 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E7.xml b/data/Leland/E4E7.xml
index 07c82100825..8298b4828bc 100644
--- a/data/Leland/E4E7.xml
+++ b/data/Leland/E4E7.xml
@@ -1 +1 @@
-<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 186l-195 -693l-27 7l102 365c-30 -39 -69 -65 -119 -66c-20 0 -37 2 -56 10c-26 9 -47 34 -47 64c0 40 30 74 70 74c39 0 73 -29 73 -69c0 -17 -6 -34 -17 -48c51 13 108 77 122 125l45 159c-30 -39 -69 -64 -119 -66c-47 0 -101 19 -103 75c0 39 30 72 69 74 c39 0 74 -30 74 -69c0 -18 -5 -34 -17 -48c55 14 95 68 119 116c3 5 7 8 13 8c1 0 3 0 5 -1c6 -2 9 -7 9 -12c0 -2 0 -3 -1 -5z"/></symbol>
\ No newline at end of file
+<symbol id="E4E7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M343 186l-195 -693l-27 7l102 365c-30 -39 -69 -64 -119 -66c-20 0 -37 2 -56 10c-26 9 -47 34 -47 64c0 40 30 74 70 74c39 0 73 -29 73 -69c0 -17 -6 -34 -17 -48c51 13 108 78 122 125l45 159v0c-30 -39 -69 -64 -119 -66c-19 0 -38 2 -56 10c-26 10 -46 35 -47 65 c0 39 29 72 69 74c39 0 74 -30 74 -69c0 -18 -5 -34 -17 -48c55 14 95 68 119 116c3 5 7 8 13 8c1 0 3 0 5 -1c6 -2 9 -7 9 -12c0 -2 0 -3 -1 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E8.xml b/data/Leland/E4E8.xml
index 63e2a6ec7a2..3d4f18c7810 100644
--- a/data/Leland/E4E8.xml
+++ b/data/Leland/E4E8.xml
@@ -1 +1 @@
-<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M151 49c-45 0 -90 29 -90 76c0 40 31 71 70 71s72 -27 72 -67c0 -18 -3 -33 -15 -48c56 14 99 84 119 134l39 161c-28 -39 -68 -67 -117 -70c-5 -1 -9 -1 -13 -1c-45 3 -92 23 -92 76c0 42 33 72 72 72s70 -29 70 -67c0 -18 -3 -33 -15 -48c49 12 94 71 113 113 c3 5 7 9 13 9c1 0 3 0 4 -1c6 -2 10 -6 10 -12c0 -1 0 -3 -1 -4l-232 -950l-27 6l91 371c-30 -41 -72 -70 -125 -70s-97 25 -97 77c0 40 32 70 71 70s71 -26 71 -66c0 -18 -3 -34 -14 -48c58 16 96 83 118 134l37 152c-4 -7 -41 -70 -132 -70z"/></symbol>
\ No newline at end of file
+<symbol id="E4E8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M151 49c-45 0 -90 29 -90 76c0 40 31 71 70 71s72 -27 72 -67c0 -18 -3 -33 -15 -48c56 14 99 84 119 134l39 161c-28 -39 -68 -67 -117 -70c-5 -1 -9 -1 -13 -1c-16 1 -30 3 -43 8c-27 9 -49 38 -49 68c0 42 33 72 72 72s70 -29 70 -67c0 -18 -3 -33 -15 -48 c48 12 94 71 113 113c3 5 7 9 13 9c1 0 3 0 4 -1c6 -2 10 -6 10 -12c0 -1 0 -3 -1 -4l-232 -950l-27 6l91 372c-30 -42 -72 -71 -125 -71s-97 25 -97 77c0 40 32 70 71 70s71 -26 71 -66c0 -18 -3 -34 -14 -48c58 16 96 83 118 135l37 151c-4 -7 -41 -70 -132 -70z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4E9.xml b/data/Leland/E4E9.xml
index 5afe6949ece..b30c06ab230 100644
--- a/data/Leland/E4E9.xml
+++ b/data/Leland/E4E9.xml
@@ -1 +1 @@
-<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M144 -752l78 377c-3 -8 -37 -75 -130 -75c-75 0 -92 48 -92 75s20 71 71 71c50 0 71 -44 71 -71c0 -16 -5 -30 -13 -41c15 5 30 12 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -75 -129 -75s-93 56 -93 76c0 19 16 71 72 71c55 0 71 -48 71 -71c0 -22 -5 -30 -13 -42 c59 20 90 83 112 136l33 159c-4 -8 -41 -75 -129 -75c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-29 -45 -73 -75 -129 -75c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72 c0 -14 -5 -29 -14 -41c16 5 31 13 43 24c39 36 62 85 66 92s6 10 15 10c1 0 2 0 3 -1c6 -1 10 -6 10 -12c0 -1 0 -2 -1 -3c-2 -8 -226 -1086 -251 -1206z"/></symbol>
\ No newline at end of file
+<symbol id="E4E9" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M144 -752l78 377c-3 -8 -37 -75 -130 -75c-75 0 -92 48 -92 75s20 71 71 71c50 0 71 -44 71 -71c0 -16 -5 -30 -13 -41c15 5 30 13 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -75 -129 -75s-93 57 -93 76s16 71 71 71c56 0 72 -48 72 -71c0 -22 -5 -30 -13 -42 c15 5 30 13 43 25c35 32 62 94 69 111l33 159c-4 -8 -41 -75 -129 -75c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -14 -13 -19 -31 -37c-19 -19 -57 -38 -98 -38c-42 0 -93 19 -93 75 c0 43 34 72 71 72s72 -30 72 -72c0 -14 -5 -30 -14 -41c16 5 31 13 43 24c39 36 62 85 66 92s6 10 14 10c2 0 3 0 4 -1c6 -1 10 -6 10 -12c0 -1 -1 -2 -1 -4c-2 -7 -226 -1085 -251 -1205z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4EA.xml b/data/Leland/E4EA.xml
index f810aeaa9c1..33946307f58 100644
--- a/data/Leland/E4EA.xml
+++ b/data/Leland/E4EA.xml
@@ -1 +1 @@
-<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M470 714c4 -3 5 -6 5 -9c0 -1 -1 -4 -1 -5c-2 -8 -279 -1339 -304 -1459l-27 6l78 374c-8 -15 -43 -72 -129 -72c-75 0 -93 48 -93 75s21 72 72 72c50 0 71 -44 71 -72c0 -16 -5 -29 -13 -41c15 5 30 13 43 24c24 23 57 73 69 109l33 162c-3 -8 -37 -75 -130 -75 c-75 0 -92 48 -92 75s20 72 71 72c50 0 71 -45 71 -72c0 -16 -5 -30 -13 -41c15 5 30 13 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -74 -129 -74s-93 56 -93 75s16 71 72 71c55 0 71 -48 71 -70c0 -23 -5 -30 -13 -42c59 20 90 81 112 135l33 159c-4 -8 -41 -75 -129 -75 c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-29 -45 -73 -75 -129 -75c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72c0 -14 -5 -29 -14 -41c53 17 86 70 109 117c4 6 7 9 15 9c1 0 5 -1 8 -3 z"/></symbol>
\ No newline at end of file
+<symbol id="E4EA" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M470 714c4 -3 5 -6 5 -9c0 -1 -1 -4 -1 -5c-2 -8 -279 -1339 -304 -1459l-27 6l78 374c-8 -15 -43 -72 -129 -72c-75 0 -93 48 -93 75s21 72 72 72c50 0 71 -44 71 -72c0 -16 -5 -29 -13 -41c15 5 30 13 43 24c24 23 57 73 69 109l33 162c-3 -8 -37 -75 -130 -75 c-75 0 -92 48 -92 75s20 72 71 72c50 0 71 -45 71 -72c0 -16 -5 -30 -13 -41c15 5 30 13 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -74 -129 -74s-93 56 -93 75s16 71 71 71c56 0 72 -48 72 -71c0 -22 -5 -30 -13 -41c15 4 30 12 43 24c35 33 62 94 69 111l33 159 c-4 -8 -41 -75 -129 -75c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -14 -13 -19 -31 -37c-19 -19 -57 -38 -98 -38c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72c0 -14 -5 -29 -14 -41 c16 5 31 13 43 24c39 36 62 85 66 92s7 10 14 10c2 0 6 -1 9 -3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4EB.xml b/data/Leland/E4EB.xml
index a1f40726b86..e3a8ed50673 100644
--- a/data/Leland/E4EB.xml
+++ b/data/Leland/E4EB.xml
@@ -1 +1 @@
-<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M516 723c6 -1 10 -7 11 -13c0 -1 -1 -2 -1 -3l-356 -1705l-27 6l79 375c-31 -40 -61 -67 -115 -73c-5 0 -10 -1 -15 -1c-42 0 -87 21 -92 68c0 41 21 74 64 79c40 0 73 -22 78 -64c0 -19 -2 -33 -13 -49c55 18 95 84 112 136l33 157c-27 -40 -64 -69 -114 -74 c-48 0 -101 9 -107 68c-1 3 -1 5 -1 8c1 36 28 66 64 70c39 0 75 -22 78 -64c1 -2 1 -5 1 -7c0 -15 -5 -30 -14 -41c16 4 31 12 43 24c37 33 65 96 70 112l33 155v3c-28 -40 -65 -69 -115 -74c-5 0 -10 -1 -15 -1c-43 0 -87 21 -92 68c-1 3 -1 5 -1 8c0 36 28 67 64 71 c41 0 74 -21 79 -64c0 -19 -2 -32 -13 -49c57 19 92 83 113 135c0 1 1 5 1 5l31 150c-28 -40 -63 -68 -114 -73c-4 -1 -9 -1 -13 -1c-15 0 -29 2 -43 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 36 27 67 64 71c3 1 5 1 7 1c37 0 68 -27 72 -64c0 -19 -2 -33 -13 -49 c15 5 30 13 43 24c35 33 61 89 68 107l33 158c-28 -40 -63 -68 -114 -73c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -49 31 -52 61c0 39 22 75 64 78c2 1 5 1 7 1c36 0 68 -27 71 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c58 18 93 84 113 137l33 154l-1 -1 c-9 -13 -20 -26 -31 -37c-25 -22 -55 -34 -83 -37c-5 0 -10 -1 -15 -1c-42 0 -88 21 -93 68c0 40 21 74 64 79c40 0 73 -22 78 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c16 5 31 13 43 25c39 35 63 81 66 92c3 8 9 9 17 9z"/></symbol>
\ No newline at end of file
+<symbol id="E4EB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M515 723c7 -1 11 -7 11 -13c1 -1 0 -2 0 -3l-356 -1705l-27 6l78 375c-9 -13 -19 -26 -30 -36c-25 -22 -55 -34 -84 -37c-5 0 -10 -1 -15 -1c-14 0 -28 3 -40 7c-28 8 -49 31 -52 61v8c0 36 27 67 63 71h8c36 0 67 -27 71 -64v-8c0 -15 -5 -29 -13 -41c15 5 30 13 43 25 c36 32 63 93 69 111l33 157c-9 -13 -20 -26 -31 -36c-25 -23 -55 -35 -83 -37c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 6c-27 8 -48 32 -51 62c-1 3 -1 6 -1 8c1 36 28 66 64 70h7c36 1 68 -27 71 -63c1 -3 1 -6 1 -8c0 -15 -5 -30 -14 -41c16 5 31 13 43 24 c37 33 64 97 70 113l32 154l1 3c-9 -13 -20 -26 -32 -37c-25 -22 -55 -34 -83 -37c-5 0 -10 -1 -15 -1c-15 0 -29 3 -41 7c-27 8 -48 31 -51 61c-1 3 -1 5 -1 8c0 36 28 67 64 71h8c36 0 67 -27 71 -64v-4v-5c0 -14 -5 -28 -13 -40c15 5 30 13 43 25c39 35 66 100 69 110 c1 1 2 5 2 5l31 150c-9 -13 -20 -26 -31 -36c-25 -23 -55 -34 -83 -37c-4 -1 -9 -1 -13 -1h-6c-13 0 -26 3 -37 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 36 27 67 64 71c3 0 5 1 7 1c37 0 68 -28 71 -64c1 -3 1 -6 1 -8c0 -15 -5 -30 -13 -41c15 5 30 13 43 24 c35 33 61 89 68 107l33 158c-9 -13 -20 -26 -31 -36c-25 -23 -55 -34 -83 -37c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-28 7 -49 31 -52 61v7c0 36 27 67 64 71c2 1 5 1 7 1c36 0 67 -27 71 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c16 5 31 13 43 24c37 34 64 97 70 113 l33 154l-1 -1c-9 -13 -20 -26 -31 -37c-25 -23 -55 -34 -83 -37c-5 -1 -10 -1 -15 -1c-15 0 -29 3 -41 7c-27 8 -49 31 -52 61v7c0 37 27 68 64 72h7c36 0 67 -27 71 -64c0 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c15 5 30 13 43 25c39 35 63 81 66 92c2 5 7 9 12 9h4z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4EC.xml b/data/Leland/E4EC.xml
index c47824799cf..865d0a1c15d 100644
--- a/data/Leland/E4EC.xml
+++ b/data/Leland/E4EC.xml
@@ -1 +1 @@
-<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M566 967c10 0 13 -8 13 -16c-2 -7 -384 -1835 -409 -1955l-27 6l77 371c-10 -18 -46 -69 -127 -69c-75 0 -93 48 -93 75c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c52 17 91 77 109 126l34 161c-10 -17 -46 -70 -128 -70c-75 0 -93 48 -93 75 c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c52 17 92 79 110 128l34 163c-8 -14 -43 -72 -129 -72c-75 0 -93 48 -93 75c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c53 18 95 83 112 133l33 156c-3 -7 -37 -75 -130 -75 c-75 0 -93 48 -93 75c0 28 21 72 72 72c50 0 71 -44 71 -72c0 -15 -5 -29 -13 -41c53 18 101 89 114 140l31 147c-4 -7 -45 -74 -129 -74s-93 56 -93 75c0 20 15 72 71 72s72 -49 72 -71s-5 -30 -13 -42c15 5 30 13 43 24c35 33 62 94 69 112l33 158c-4 -7 -41 -74 -129 -74 c-71 0 -93 42 -93 76c0 35 27 70 71 70s72 -37 72 -72c0 -21 -7 -34 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -13 -13 -18 -31 -37c-19 -18 -57 -38 -98 -38c-42 0 -93 19 -93 75c0 44 34 72 71 72s72 -29 72 -72c0 -13 -5 -29 -14 -41 c52 17 86 71 109 117c4 6 7 9 14 9z"/></symbol>
\ No newline at end of file
+<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M566 967c10 0 13 -9 13 -12v-4c-2 -8 -384 -1835 -409 -1955l-27 6l77 371c-11 -18 -46 -69 -127 -69c-75 0 -93 48 -93 76c0 27 21 71 71 71c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c15 5 30 13 43 25c22 21 52 66 66 101l34 161c-10 -17 -46 -70 -128 -70 c-75 0 -93 48 -93 76c0 27 21 71 71 71c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c15 5 30 13 43 25c23 21 54 68 67 103l34 163c-8 -14 -43 -72 -129 -72c-75 0 -93 48 -93 76c0 27 21 71 71 71c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c15 5 30 13 43 25 c24 22 57 73 68 108l34 156c-3 -8 -37 -75 -130 -75c-75 0 -93 48 -93 75s21 72 72 72c50 0 71 -44 71 -72c0 -16 -5 -29 -13 -41c15 5 30 13 43 24c26 24 62 81 71 116l31 147c-5 -8 -45 -74 -129 -74s-93 56 -93 75s15 72 71 72s72 -49 72 -71c0 -23 -5 -30 -13 -42 c15 5 30 13 43 24c35 33 62 94 69 112l33 158c-4 -7 -41 -74 -129 -74c-71 0 -93 42 -93 76s27 70 71 70s72 -37 72 -72c0 -21 -7 -34 -14 -41c16 5 30 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -14 -13 -19 -31 -37c-19 -19 -57 -38 -98 -38c-42 0 -93 19 -93 75 c0 43 34 72 71 72s71 -30 71 -72c0 -14 -5 -29 -13 -41c15 5 30 13 43 25c39 35 62 84 66 92c3 6 7 9 14 9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4ED.xml b/data/Leland/E4ED.xml
index 71d9cbd21c2..fef35fb8198 100644
--- a/data/Leland/E4ED.xml
+++ b/data/Leland/E4ED.xml
@@ -1 +1 @@
-<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M558 986l33 156c-27 -41 -65 -70 -115 -75c-4 -1 -9 -1 -13 -1c-45 0 -88 17 -95 68c0 40 22 73 64 78c39 0 75 -21 78 -63c1 -3 1 -6 1 -8c0 -15 -5 -30 -14 -41c16 5 31 13 43 24c39 36 63 82 66 92c2 6 7 9 13 10h4c6 -2 10 -7 11 -13c0 -1 0 -2 -1 -4l-462 -2213 l-27 6l79 376c-28 -41 -64 -68 -115 -73c-5 -1 -10 -1 -16 -1c-14 0 -28 2 -39 6c-28 8 -49 32 -52 62c0 40 22 73 64 78c39 0 73 -21 78 -63c0 -18 -2 -34 -13 -49c59 20 92 83 113 138l32 152c-28 -40 -64 -68 -114 -73h-13c-14 0 -29 1 -42 6c-28 8 -49 31 -52 61 c0 3 -1 5 -1 8c0 36 28 67 64 71c41 0 74 -21 79 -64c0 -19 -2 -33 -13 -49c56 19 94 85 112 137l33 155c-10 -14 -20 -26 -31 -37c-25 -22 -55 -34 -83 -37h-13c-15 0 -29 1 -43 6c-27 8 -49 32 -52 61c0 41 21 74 64 79c40 0 73 -22 78 -64c0 -19 -2 -33 -13 -49 c57 19 93 83 113 136l32 158c-27 -41 -64 -69 -114 -74c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 37 27 68 64 71c3 1 5 1 8 1c36 0 67 -27 71 -64c0 -19 -2 -33 -13 -49c15 5 30 13 43 24c36 34 64 97 69 113l33 158 c-27 -42 -65 -69 -115 -74c-4 -1 -8 -1 -13 -1c-44 0 -89 18 -94 68c0 39 21 73 63 78c40 0 74 -20 79 -63c0 -18 -2 -34 -13 -49c52 17 102 84 113 135c9 39 32 155 32 155c-26 -41 -64 -69 -114 -74c-5 0 -10 -1 -15 -1c-42 0 -87 21 -92 68c0 3 -1 5 -1 8 c0 36 28 67 64 71c41 0 74 -21 79 -64c0 -19 -2 -33 -13 -49c55 18 95 84 112 136l33 159c-27 -41 -64 -69 -114 -74c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 3 -1 6 -1 9c1 35 28 66 64 69c3 1 5 1 8 1c36 0 67 -27 71 -64c0 -19 -2 -33 -13 -49 c15 5 30 13 43 24c36 34 64 97 69 113z"/></symbol>
\ No newline at end of file
+<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M558 986l33 156s-14 -21 -32 -38c-18 -18 -55 -35 -83 -38h-13c-16 0 -30 2 -43 6c-27 8 -48 32 -52 62v7c0 36 27 67 64 71h7c36 0 67 -27 71 -64c1 -2 1 -5 1 -7c0 -16 -5 -30 -14 -41c16 4 31 13 43 24c39 36 63 82 66 92c2 6 7 9 12 10h5c6 -2 10 -7 11 -13 c0 -1 -1 -2 -1 -4l-462 -2213l-27 6l79 376c-10 -13 -20 -26 -31 -36c-25 -23 -55 -34 -84 -37c-5 -1 -10 -1 -16 -1c-14 0 -28 2 -39 7c-28 7 -49 31 -52 61v7c0 36 27 67 63 71h8c36 1 67 -27 71 -63v-8c0 -15 -5 -30 -13 -41c15 5 30 13 43 24c37 34 65 101 70 114 l32 152c-9 -13 -19 -25 -31 -36c-24 -22 -54 -34 -83 -37h-13h-6c-13 0 -26 2 -37 6c-27 8 -48 32 -51 61c0 3 -1 5 -1 8c0 36 28 67 64 71h8c36 0 67 -27 71 -64v-7c0 -15 -5 -30 -13 -42c15 5 30 13 43 25c35 32 63 95 69 112l33 155c-10 -14 -20 -26 -31 -37 c-25 -22 -55 -34 -84 -37h-12h-6c-14 0 -26 2 -37 6c-28 8 -49 32 -52 61v8c0 36 27 67 64 71h7c36 0 67 -27 71 -64v-7c0 -16 -5 -30 -13 -42c15 5 30 13 43 25c36 32 63 93 69 111l33 158c-9 -14 -19 -27 -31 -37c-25 -23 -55 -34 -83 -37c-5 -1 -10 -1 -15 -1 c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 36 27 67 64 71c3 1 5 1 8 1c36 0 67 -28 70 -64c1 -2 1 -3 1 -5v-3c0 -15 -5 -29 -14 -41c16 5 31 13 43 24c37 34 65 97 70 113l33 158c-9 -14 -20 -27 -31 -37c-25 -23 -55 -35 -84 -37c-4 -1 -8 -1 -13 -1 c-15 0 -30 2 -42 6c-28 8 -49 32 -52 62v7c-1 36 27 67 63 71h8c36 0 67 -27 71 -63v-8c0 -15 -5 -30 -13 -41c15 5 30 12 43 24c39 35 65 87 70 111c9 39 32 155 32 155c-9 -14 -19 -27 -31 -37c-24 -22 -54 -34 -83 -37c-5 0 -10 -1 -15 -1c-15 0 -28 3 -40 7 c-28 8 -49 31 -52 61c0 3 -1 5 -1 8c0 36 28 67 64 71h8c36 0 67 -27 71 -64v-7c0 -15 -5 -30 -13 -42c15 5 30 13 43 25c36 32 63 93 69 111l33 159c-9 -14 -19 -27 -31 -37c-25 -23 -55 -34 -83 -37c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61 c-1 3 -1 6 -1 9c1 35 28 66 64 69c3 1 5 1 8 1c36 0 67 -28 71 -64v-5v-3c0 -15 -5 -29 -13 -41c15 5 30 13 43 24c36 34 64 97 69 113z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4F2.xml b/data/Leland/E4F2.xml
index 83db4811739..42bcd44c3c9 100644
--- a/data/Leland/E4F2.xml
+++ b/data/Leland/E4F2.xml
@@ -1 +1 @@
-<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 203c1 0 3 1 4 1c6 0 11 -3 13 -8c4 -6 35 -65 80 -98c14 -10 29 -17 45 -20c-11 13 -18 29 -18 48c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -54 -53 -79 -100 -79c-52 0 -89 26 -122 62l114 -356l-26 -8l-141 441c-1 1 -1 3 -1 5c0 5 3 9 9 12z"/></symbol>
\ No newline at end of file
+<symbol id="E4F2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M9 203c1 0 3 1 4 1c6 0 11 -3 13 -8c4 -6 35 -65 80 -98c14 -10 29 -17 45 -20c-11 13 -18 29 -18 48c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -31 -19 -56 -45 -67c-15 -7 -34 -12 -55 -12c-28 0 -60 9 -87 29c-12 9 -24 21 -35 33l114 -356l-27 -8l-140 440 c-1 2 -1 4 -1 6c0 5 3 9 9 12z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E4F6.xml b/data/Leland/E4F6.xml
index 57d40d0e5b9..a49d48ac350 100644
--- a/data/Leland/E4F6.xml
+++ b/data/Leland/E4F6.xml
@@ -1 +1 @@
-<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 -180l-7 9c-36 44 -80 92 -140 96c14 -12 23 -28 25 -47c1 -3 1 -6 1 -9c-1 -34 -25 -64 -60 -70c-4 -1 -8 -1 -12 -1c-35 0 -65 26 -71 61c0 32 6 56 35 73c21 14 51 21 76 21c17 0 34 -3 52 -10l-184 222c-2 3 -3 6 -3 8c0 5 2 8 6 11c2 1 5 1 7 2c1 0 2 -1 2 -1 c5 0 9 -2 12 -6c35 -44 81 -94 140 -98c-13 11 -22 27 -25 46c0 38 18 72 59 79c4 1 9 1 13 1c34 0 65 -25 70 -61c1 -3 1 -7 1 -10c0 -26 -14 -50 -36 -62c-14 -10 -32 -17 -52 -20c-7 -1 -14 -1 -22 -2c-18 0 -38 4 -56 12l194 -231c3 -4 4 -7 4 -10c0 -4 -2 -7 -5 -9 c-2 -1 -5 -2 -7 -2c-6 0 -13 3 -17 8z"/></symbol>
\ No newline at end of file
+<symbol id="E4F6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M288 -180l-7 9c-5 6 -43 57 -92 83c-15 8 -32 12 -48 13c14 -12 23 -28 25 -47c1 -3 1 -6 1 -9c-1 -34 -25 -64 -60 -70c-4 0 -8 -1 -12 -1c-35 0 -65 26 -71 61v10c-1 26 13 50 35 63c14 9 33 16 53 19c7 1 15 2 23 2c17 0 34 -3 52 -10l-184 222c-2 3 -3 6 -3 8 c0 4 2 8 6 11c2 1 5 1 7 1h2c5 0 9 -3 12 -6c4 -5 44 -59 93 -85c15 -8 31 -12 47 -13c-13 11 -22 27 -25 46v8c-1 34 24 65 59 71c4 1 9 1 13 1c34 0 65 -25 70 -61c1 -3 1 -7 1 -10c0 -26 -14 -50 -36 -62c-14 -10 -32 -17 -52 -20c-7 -1 -14 -2 -22 -2 c-18 0 -38 4 -57 12l195 -231c3 -4 4 -7 4 -10c0 -4 -2 -7 -5 -9c-2 -1 -5 -2 -7 -2c-6 0 -13 3 -17 8z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E500.xml b/data/Leland/E500.xml
index 1506ca3e653..f0387d75200 100644
--- a/data/Leland/E500.xml
+++ b/data/Leland/E500.xml
@@ -1 +1 @@
-<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
+<symbol id="E500" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 250l-355 -500h-126l355 500h126zM481 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E501.xml b/data/Leland/E501.xml
index 782b11b261b..99c84028d71 100644
--- a/data/Leland/E501.xml
+++ b/data/Leland/E501.xml
@@ -1 +1 @@
-<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM735 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
+<symbol id="E501" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M735 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E502.xml b/data/Leland/E502.xml
index f30101c370e..d1e2aea837a 100644
--- a/data/Leland/E502.xml
+++ b/data/Leland/E502.xml
@@ -1 +1 @@
-<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM989 250l-355 -500h-126l355 500h126zM1243 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM1243 -126 c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
+<symbol id="E502" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM989 250l-355 -500h-126l355 500h126zM1243 250l-355 -500h-126l355 500h126zM1243 -126 c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E510.xml b/data/Leland/E510.xml
index d86ffccda1c..3f78237c088 100644
--- a/data/Leland/E510.xml
+++ b/data/Leland/E510.xml
@@ -1 +1 @@
-<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z"/></symbol>
\ No newline at end of file
+<symbol id="E510" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69 c0 29 -16 50 -54 72c-5 3 -5 3 -28 14c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E511.xml b/data/Leland/E511.xml
index b55c43e64a7..d18b9057475 100644
--- a/data/Leland/E511.xml
+++ b/data/Leland/E511.xml
@@ -1 +1 @@
-<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM496 425l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28 c41 0 79 81 79 116c0 10 -1 12 -21 31c-10 9 -15 17 -15 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -75 -55 -198 -142 -198c-43 0 -76 28 -76 72c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM825 418h77l-48 -164c-5 -18 -5 -19 -5 -22 c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-27 0 -42 17 -42 42c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25 c32 24 45 46 45 80zM773 397c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145c0 21 -12 35 -30 35zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z"/></symbol>
\ No newline at end of file
+<symbol id="E511" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M496 425l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c16 0 33 12 49 36c19 30 30 58 30 80c0 10 -1 12 -21 31c-10 9 -15 17 -15 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -36 -15 -85 -36 -123c-28 -49 -65 -75 -106 -75c-20 0 -40 7 -55 20 c-14 12 -21 30 -21 52c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM825 418h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-1 4 -2 4 -2 15 c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM720 351c-14 -30 -24 -69 -24 -95c0 -24 11 -39 30 -39s37 16 51 48c15 32 26 72 26 97c0 21 -12 35 -30 35c-21 0 -38 -14 -53 -46zM304 133c0 -78 -69 -133 -169 -133 c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 29 -16 50 -54 72c-5 3 -5 3 -28 14 c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E512.xml b/data/Leland/E512.xml
index e56de61b91a..4c0ad927697 100644
--- a/data/Leland/E512.xml
+++ b/data/Leland/E512.xml
@@ -1 +1 @@
-<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM479 244l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c40 0 79 83 79 117c0 10 -2 12 -22 31c-10 9 -14 16 -14 27c0 19 13 32 34 32c23 0 39 -17 39 -43c0 -74 -56 -199 -142 -199c-43 0 -76 28 -76 72c0 11 3 28 6 38 l16 54c5 18 7 28 7 33c0 12 -6 15 -30 15h-12l3 23zM808 237h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153 c29 0 50 -10 62 -30zM756 217c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144c0 21 -12 36 -30 36zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z"/></symbol>
\ No newline at end of file
+<symbol id="E512" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M479 244l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c16 0 33 13 49 37c19 30 30 58 30 80c0 10 -2 12 -22 31c-10 9 -14 16 -14 27c0 19 13 32 34 32c23 0 39 -17 39 -43c0 -36 -15 -85 -36 -123c-28 -49 -65 -76 -106 -76c-20 0 -40 7 -55 20 c-14 12 -21 30 -21 52c0 11 3 28 6 38l16 54c5 18 7 28 7 33c0 12 -6 15 -30 15h-12l3 23zM808 237h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16 c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153c29 0 50 -10 62 -30zM703 170c-14 -29 -24 -69 -24 -95c0 -24 11 -38 30 -38s37 15 51 47c15 32 26 72 26 97c0 21 -12 36 -30 36c-21 0 -38 -15 -53 -47zM304 133c0 -78 -69 -133 -169 -133 c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 29 -16 50 -54 72c-5 3 -5 3 -28 14 c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E513.xml b/data/Leland/E513.xml
index 965c83bf969..4509c50c9bc 100644
--- a/data/Leland/E513.xml
+++ b/data/Leland/E513.xml
@@ -1 +1 @@
-<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM506 371l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -86 -77 -158 -161 -158c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM851 237h77l-48 -163c-5 -18 -5 -20 -5 -23 c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-30 0 -42 17 -42 43c-23 -30 -46 -43 -80 -43c-50 0 -86 37 -86 89c0 79 68 153 141 153c29 0 50 -10 62 -30zM798 217c-50 0 -76 -104 -76 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144 c0 21 -13 36 -31 36zM496 209c-48 0 -78 -111 -78 -148c0 -22 13 -38 32 -38c48 0 77 113 77 150c0 21 -13 36 -31 36zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z"/></symbol>
\ No newline at end of file
+<symbol id="E513" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M506 371l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -41 -21 -86 -55 -117c-30 -28 -66 -41 -106 -41c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM446 164c-15 -31 -28 -78 -28 -103c0 -22 13 -38 32 -38 s38 19 54 55c12 27 23 73 23 95c0 21 -13 36 -31 36c-19 0 -35 -14 -50 -45zM851 237h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -37 11 -41 27c-1 4 -1 5 -1 16 c-23 -30 -46 -43 -80 -43c-50 0 -86 37 -86 89c0 79 68 153 141 153c29 0 50 -10 62 -30zM746 170c-14 -29 -24 -69 -24 -95c0 -24 11 -38 30 -38s37 15 51 47c15 32 26 72 26 97c0 21 -13 36 -31 36c-21 0 -37 -15 -52 -47zM304 133c0 -78 -69 -133 -169 -133 c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 29 -16 50 -54 72c-5 3 -5 3 -28 14 c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E515.xml b/data/Leland/E515.xml
index b4b487e3870..01073265a14 100644
--- a/data/Leland/E515.xml
+++ b/data/Leland/E515.xml
@@ -1 +1 @@
-<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM782 416l-14 -60c31 40 61 60 92 60c36 0 55 -22 55 -55c32 38 58 55 87 55c33 0 54 -21 54 -51 c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -69h-77l47 158c5 17 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM1321 409h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8 c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 4 -2 15c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM1269 388c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145 c0 21 -12 35 -30 35z"/></symbol>
\ No newline at end of file
+<symbol id="E515" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM782 416l-14 -60c31 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -6 2 -21c32 38 58 55 87 55 c33 0 54 -21 54 -51c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -69h-77l47 158c5 17 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM1321 409h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8 c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-2 4 -2 4 -2 15c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM1216 342c-14 -30 -24 -69 -24 -95c0 -24 11 -39 30 -39 s37 16 51 48c15 32 26 72 26 97c0 21 -12 35 -30 35c-21 0 -38 -14 -53 -46z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E516.xml b/data/Leland/E516.xml
index 2c14e4d61d1..e8413226a1a 100644
--- a/data/Leland/E516.xml
+++ b/data/Leland/E516.xml
@@ -1 +1 @@
-<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM758 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 58 54 87 54c32 0 54 -20 54 -51 c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1297 228h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8 c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153c29 0 50 -10 62 -30zM1245 208c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144 c0 21 -12 36 -30 36z"/></symbol>
\ No newline at end of file
+<symbol id="E516" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM758 235l-14 -60c30 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -5 2 -20c32 38 58 54 87 54 c32 0 54 -20 54 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1297 228h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8 c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153c29 0 50 -10 62 -30zM1192 161c-14 -29 -24 -69 -24 -95c0 -24 11 -38 30 -38 s37 15 51 47c15 32 26 72 26 97c0 21 -12 36 -30 36c-21 0 -38 -15 -53 -47z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E517.xml b/data/Leland/E517.xml
index 224ff7ddf4d..84d8ea868eb 100644
--- a/data/Leland/E517.xml
+++ b/data/Leland/E517.xml
@@ -1 +1 @@
-<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z"/></symbol>
\ No newline at end of file
+<symbol id="E517" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E518.xml b/data/Leland/E518.xml
index 0fa35ac3044..aeb7f7a28aa 100644
--- a/data/Leland/E518.xml
+++ b/data/Leland/E518.xml
@@ -1 +1 @@
-<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM842 416l-14 -60c30 40 61 60 92 60c36 0 55 -22 55 -55 c32 38 59 55 88 55c32 0 53 -21 53 -51c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12 c-11 0 -26 -11 -41 -29c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM1381 409h77l-48 -164c-5 -18 -5 -19 -5 -22 c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-22 -35 -59 -84 -104 -84c-27 0 -42 17 -42 42c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 68 153 141 153c29 0 49 -10 61 -30zM1329 388c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145 c0 21 -12 35 -30 35z"/></symbol>
\ No newline at end of file
+<symbol id="E518" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M842 416l-14 -60c30 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -6 2 -21c32 38 59 55 88 55c32 0 53 -21 53 -51c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80 c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 27 7 32 c0 12 -6 15 -30 15h-12l4 24zM1381 409h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-8 -13 -23 -33 -33 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-1 4 -2 4 -2 15c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88 c0 79 68 153 141 153c29 0 49 -10 61 -30zM1276 342c-14 -30 -24 -69 -24 -95c0 -24 11 -39 30 -39s37 16 51 48c15 32 26 72 26 97c0 21 -12 35 -30 35c-21 0 -38 -14 -53 -46zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91 c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57 zM300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E519.xml b/data/Leland/E519.xml
index 132400e3076..5d335cfc4c7 100644
--- a/data/Leland/E519.xml
+++ b/data/Leland/E519.xml
@@ -1 +1 @@
-<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM842 235l-14 -60c31 40 61 60 92 60c33 0 56 -22 56 -54 c32 38 58 54 87 54c33 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12 c-11 0 -26 -11 -41 -29c-19 -23 -32 -51 -49 -110l-17 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-11l3 23zM1381 228h77l-48 -163c-5 -18 -5 -20 -5 -23 c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-22 -35 -59 -84 -104 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 68 153 141 153c29 0 49 -10 61 -30zM1329 208c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38 c48 0 77 107 77 144c0 21 -12 36 -30 36z"/></symbol>
\ No newline at end of file
+<symbol id="E519" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M842 235l-14 -60c31 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 3 -5 3 -20c32 38 58 54 87 54c33 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80 c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29c-19 -23 -32 -51 -49 -110l-17 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33 c0 12 -6 15 -30 15h-11l3 23zM1381 228h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-8 -13 -23 -33 -33 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89 c0 79 68 153 141 153c29 0 49 -10 61 -30zM1276 161c-14 -29 -24 -69 -24 -95c0 -24 11 -38 30 -38s37 15 51 47c15 32 26 72 26 97c0 21 -12 36 -30 36c-21 0 -38 -15 -53 -47zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91 c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57 zM300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51A.xml b/data/Leland/E51A.xml
index 3fb900b3833..fdaae99b73b 100644
--- a/data/Leland/E51A.xml
+++ b/data/Leland/E51A.xml
@@ -1 +1 @@
-<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M160 -13v-30c-44 23 -71 45 -99 81c-34 43 -61 122 -61 176v1c0 112 63 206 160 257v-31c-33 -23 -47 -41 -61 -77c-16 -40 -24 -90 -24 -149c0 -66 10 -122 29 -162c13 -29 27 -45 56 -66z"/></symbol>
\ No newline at end of file
+<symbol id="E51A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M160 -13v-30c-44 23 -71 45 -99 81c-34 43 -61 122 -61 176v1c0 69 25 134 70 187c27 31 50 49 90 70v-31c-33 -23 -47 -41 -61 -77c-16 -40 -24 -90 -24 -149c0 -66 10 -122 29 -162c13 -29 27 -45 56 -66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51B.xml b/data/Leland/E51B.xml
index 0b572f8becd..a0b58845bfb 100644
--- a/data/Leland/E51B.xml
+++ b/data/Leland/E51B.xml
@@ -1 +1 @@
-<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 442v30c44 -23 71 -45 99 -82c34 -43 61 -121 61 -175c0 -112 -62 -207 -160 -258v30c33 23 47 42 61 78c16 40 24 90 24 150c0 66 -10 121 -29 161c-13 29 -27 45 -56 66z"/></symbol>
\ No newline at end of file
+<symbol id="E51B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M0 442v30c44 -23 71 -45 99 -82c34 -43 61 -121 61 -175c0 -69 -25 -135 -70 -188c-27 -31 -50 -49 -90 -70v30c33 23 47 42 61 78c16 40 24 90 24 150c0 66 -10 121 -29 161c-13 29 -27 45 -56 66z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51C.xml b/data/Leland/E51C.xml
index 9364df1e2f2..0e5b5ba6b24 100644
--- a/data/Leland/E51C.xml
+++ b/data/Leland/E51C.xml
@@ -1 +1 @@
-<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59 c8 -5 14 -8 47 -25c32 24 45 46 45 80zM765 348l-45 -153c23 19 39 26 63 26c47 0 83 -37 83 -85c0 -86 -75 -157 -160 -157c-61 0 -100 31 -100 78c0 16 1 17 11 52l48 161c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 23zM479 221l-36 -122c-11 -45 -12 -47 -12 -57 c0 -15 14 -28 28 -28c41 0 79 81 79 116c0 10 -2 12 -22 31c-10 9 -14 17 -14 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -75 -55 -198 -142 -198c-43 0 -76 28 -76 72c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 16 -30 16h-12l4 23zM73 101c0 -43 29 -72 74 -72 s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM755 186c-50 0 -79 -111 -79 -149c0 -22 14 -37 33 -37c48 0 77 113 77 150c0 21 -13 36 -31 36z"/></symbol>
\ No newline at end of file
+<symbol id="E51C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M479 221l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c16 0 33 12 49 36c19 30 30 58 30 80c0 10 -2 12 -22 31c-10 9 -14 17 -14 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -36 -15 -85 -36 -123c-28 -49 -65 -75 -106 -75c-20 0 -40 7 -55 20 c-14 12 -21 30 -21 52c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 16 -30 16h-12l4 23zM765 348l-45 -153c23 19 39 26 63 26c47 0 83 -37 83 -85c0 -41 -20 -85 -54 -116c-30 -28 -66 -41 -106 -41c-61 0 -100 31 -100 78c0 16 1 17 11 52l48 161c6 23 7 28 7 33 c0 12 -5 15 -30 15h-12l4 23zM704 141c-15 -31 -28 -79 -28 -104c0 -22 14 -37 33 -37s38 19 54 55c12 27 23 73 23 95c0 21 -13 36 -31 36c-19 0 -36 -14 -51 -45zM304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31 c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 29 -16 50 -54 72c-5 3 -5 3 -28 14c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67 s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51D.xml b/data/Leland/E51D.xml
index a8abdc9dc5d..6e8a8c4b236 100644
--- a/data/Leland/E51D.xml
+++ b/data/Leland/E51D.xml
@@ -1 +1 @@
-<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47 c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM1253 362l-45 -152c23 19 39 25 63 25c47 0 83 -36 83 -84c0 -86 -75 -158 -160 -158 c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 24zM758 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 58 54 87 54c32 0 54 -20 54 -51c0 -15 -4 -31 -11 -52l-29 -82c-2 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7 c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12 c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1243 200c-49 0 -79 -110 -79 -148c0 -22 14 -38 33 -38c48 0 77 113 77 150c0 21 -13 36 -31 36z"/></symbol>
\ No newline at end of file
+<symbol id="E51D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M758 235l-14 -60c30 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -5 2 -20c32 38 58 54 87 54c32 0 54 -20 54 -51c0 -15 -4 -31 -11 -52l-29 -82c-2 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80 c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33 c0 12 -6 15 -30 15h-12l4 23zM1253 362l-45 -152c23 19 39 25 63 25c47 0 83 -36 83 -84c0 -41 -20 -86 -54 -117c-30 -28 -66 -41 -106 -41c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 24zM1192 155c-15 -31 -28 -78 -28 -103 c0 -22 14 -38 33 -38s38 19 54 55c12 27 23 73 23 95c0 21 -13 36 -31 36c-19 0 -36 -14 -51 -45zM279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16 h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170 c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E51E.xml b/data/Leland/E51E.xml
index df0a0b52312..22638a6fae5 100644
--- a/data/Leland/E51E.xml
+++ b/data/Leland/E51E.xml
@@ -1 +1 @@
-<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109 c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM1337 362l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84 c0 -85 -76 -158 -160 -158c-61 0 -101 31 -101 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM842 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 59 54 88 54c32 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11 c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 56 15 66 c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1327 200c-48 0 -78 -111 -78 -148c0 -22 13 -38 32 -38c48 0 77 113 77 150c0 21 -13 36 -31 36z"/></symbol>
\ No newline at end of file
+<symbol id="E51E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M842 235l-14 -60c30 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -5 2 -20c32 38 59 54 88 54c32 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80 c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33 c0 12 -6 15 -30 15h-12l4 23zM1337 362l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -41 -21 -86 -55 -117c-30 -28 -65 -41 -105 -41c-61 0 -101 31 -101 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM1277 155c-15 -31 -28 -78 -28 -103 c0 -22 13 -38 32 -38s38 19 54 55c12 27 23 73 23 95c0 21 -13 36 -31 36c-19 0 -35 -14 -50 -45zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126 c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72 c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E520.xml b/data/Leland/E520.xml
index ad0205e542f..e65c838017c 100644
--- a/data/Leland/E520.xml
+++ b/data/Leland/E520.xml
@@ -1 +1 @@
-<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
+<symbol id="E520" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88 c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E521.xml b/data/Leland/E521.xml
index 1454017e6ed..ada2b08b637 100644
--- a/data/Leland/E521.xml
+++ b/data/Leland/E521.xml
@@ -1 +1 @@
-<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4 c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8 c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z"/></symbol>
\ No newline at end of file
+<symbol id="E521" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M339 44c7 12 18 39 18 39l17 -8c-1 -2 -1 -4 -2 -6c-13 -35 -30 -71 -75 -71c-14 0 -32 6 -40 18c-7 10 -10 22 -10 36s3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c-1 0 -1 1 -2 1h-1c-1 0 -2 -1 -3 -1c-23 -10 -55 -52 -75 -192c0 -3 -1 -6 -1 -7 c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-34 0 -71 -131 -75 -146c-4 -14 -9 -32 -14 -54c-4 -16 -9 -16 -11 -16h-38h-15c-4 0 -6 2 -8 4c-1 2 -2 4 -2 6s1 3 1 5c3 9 40 120 40 121 c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 22 23 47 23c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14 c0 -27 -7 -68 -13 -86c-2 -5 -7 -25 -9 -31c-4 -13 -8 -25 -8 -33c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E522.xml b/data/Leland/E522.xml
index 817d30b256c..a429bbaa619 100644
--- a/data/Leland/E522.xml
+++ b/data/Leland/E522.xml
@@ -1 +1 @@
-<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z"/></symbol>
\ No newline at end of file
+<symbol id="E522" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132 c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E523.xml b/data/Leland/E523.xml
index 03ab82570e5..1f9d28fb239 100644
--- a/data/Leland/E523.xml
+++ b/data/Leland/E523.xml
@@ -1 +1 @@
-<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109 c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z"/></symbol>
\ No newline at end of file
+<symbol id="E523" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M189 253c22 0 41 -16 41 -39s-8 -37 -19 -46c-6 -5 -17 -9 -29 -9c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4 l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 21 24 46 24c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c6 8 13 16 22 22c8 5 27 16 50 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E525.xml b/data/Leland/E525.xml
index 95d2aaa77e9..607a5e5df5d 100644
--- a/data/Leland/E525.xml
+++ b/data/Leland/E525.xml
@@ -1 +1 @@
-<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M159 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5 c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24 s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z"/></symbol>
\ No newline at end of file
+<symbol id="E525" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M159 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5 c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16 c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E526.xml b/data/Leland/E526.xml
index a922525e42a..7e89ea63399 100644
--- a/data/Leland/E526.xml
+++ b/data/Leland/E526.xml
@@ -1 +1 @@
-<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 211l3 4c13 18 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -41 -10 -79 -23 -117c-4 -12 -8 -24 -8 -33c0 -6 2 -10 8 -12c2 -1 3 -1 5 -1c5 0 10 2 15 11c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -36 -32 -73 -77 -73c-34 0 -50 26 -50 57 c0 13 3 28 9 43c10 26 27 77 27 106c-1 4 -2 6 -5 7l-1 1h-2l-1 -1c-25 -10 -57 -52 -77 -193c0 -3 -1 -6 -1 -7c-2 -11 -6 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77 c5 0 10 -1 15 -2c29 -7 38 -41 38 -41z"/></symbol>
\ No newline at end of file
+<symbol id="E526" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 211l3 4c13 18 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-2 -6 -8 -25 -10 -31c-4 -12 -8 -24 -8 -33c0 -6 2 -10 8 -12c2 -1 3 -1 5 -1c5 0 10 2 15 11c7 12 18 39 18 39l17 -8c-1 -2 -1 -3 -2 -5c-13 -35 -31 -72 -76 -72 c-14 0 -31 6 -39 18c-7 10 -11 24 -11 39c0 13 3 28 9 43c21 54 27 94 27 104v2c-1 4 -2 6 -4 7c-1 0 -2 1 -3 1s-2 -1 -3 -1c-24 -10 -56 -52 -76 -193c0 -3 -1 -6 -1 -7c-2 -11 -6 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16 c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 21 24 46 24c5 0 10 -1 15 -2c29 -7 38 -41 38 -41z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E527.xml b/data/Leland/E527.xml
index 68f276ad5f8..7d6a3638c32 100644
--- a/data/Leland/E527.xml
+++ b/data/Leland/E527.xml
@@ -1 +1 @@
-<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1867 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26 c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2 c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43 c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1 c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43z M168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM554 112h1c6 18 16 54 16 81c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3c25 12 49 59 62 98zM816 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2 c3 0 9 1 12 3zM1140 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1464 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9 c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1788 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43 c2 -1 5 -2 7 -2c3 0 9 1 12 3z"/></symbol>
\ No newline at end of file
+<symbol id="E527" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1880 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 11 -5 18 -15 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90 c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 11 -5 18 -15 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2 c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 11 -5 18 -15 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21 c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2 c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63 c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43c4 0 9 -1 13 -2zM231 112c6 18 16 54 16 81c0 9 -1 17 -4 23 c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM554 112h1c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1 c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3c25 12 49 59 62 98zM878 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98zM1202 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -13 -2 -20 -6c-26 -15 -54 -57 -63 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43 c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98zM1526 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -13 -2 -20 -6c-26 -15 -54 -57 -63 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98z M1850 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -13 -2 -20 -6c-26 -15 -54 -57 -63 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E528.xml b/data/Leland/E528.xml
index dec067dd401..49f591e054b 100644
--- a/data/Leland/E528.xml
+++ b/data/Leland/E528.xml
@@ -1 +1 @@
-<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1543 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136 c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26 c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 105 96 105 c4 0 7 0 11 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3 c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179 c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43 c2 -1 6 -2 8 -2c3 0 8 1 11 3zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM1140 14c42 20 79 133 79 180 c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1464 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3z"/></symbol>
\ No newline at end of file
+<symbol id="E528" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1556 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90 c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2 c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15 c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 105 96 105c4 0 7 0 11 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3 c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -17 55 -64c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -17 55 -64c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43 c4 0 9 -1 13 -2c13 -3 46 -17 55 -64c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2zM231 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM555 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43 c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98z M1202 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98zM1526 112c6 18 17 55 17 82c0 9 -1 17 -4 22 c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E529.xml b/data/Leland/E529.xml
index 90f6d9cc323..a7ed3b681f6 100644
--- a/data/Leland/E529.xml
+++ b/data/Leland/E529.xml
@@ -1 +1 @@
-<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1219 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136 c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62 l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4 c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65 c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1 c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3z M816 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1140 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1 c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3z"/></symbol>
\ No newline at end of file
+<symbol id="E529" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1232 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90 c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2 c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61 l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66 c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1 c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2zM231 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3 c25 12 50 59 63 98zM555 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3c25 12 50 59 63 98zM878 112c6 18 17 55 17 82 c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98zM1202 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1 c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52A.xml b/data/Leland/E52A.xml
index e113b8e373b..e0460b2a116 100644
--- a/data/Leland/E52A.xml
+++ b/data/Leland/E52A.xml
@@ -1 +1 @@
-<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M895 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136 c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61 l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1 c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69 c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22 c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1c3 0 9 0 12 2c25 12 50 59 63 98z"/></symbol>
\ No newline at end of file
+<symbol id="E52A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M908 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90 c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2 c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43 c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2z M231 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM555 112c6 18 16 54 16 81c0 9 -1 17 -4 23 c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1 c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1c3 0 9 0 12 2c25 12 50 59 63 98z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52B.xml b/data/Leland/E52B.xml
index 056b684b8bc..a475999251e 100644
--- a/data/Leland/E52B.xml
+++ b/data/Leland/E52B.xml
@@ -1 +1 @@
-<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M571 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43 c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z M492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z"/></symbol>
\ No newline at end of file
+<symbol id="E52B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M584 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90 c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1 c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2zM231 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1 c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM555 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52C.xml b/data/Leland/E52C.xml
index b0db6b10ee7..3ce8d975980 100644
--- a/data/Leland/E52C.xml
+++ b/data/Leland/E52C.xml
@@ -1 +1 @@
-<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M508 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193 c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192 c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70 c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86 c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11zM536 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
+<symbol id="E52C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M508 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88 c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM536 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1zM339 44c7 12 18 39 18 39l17 -8c-1 -2 -1 -4 -2 -6c-13 -35 -30 -71 -75 -71c-14 0 -32 6 -40 18c-7 10 -10 22 -10 36s3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c-1 0 -1 1 -2 1h-1c-1 0 -2 -1 -3 -1 c-23 -10 -55 -52 -75 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-34 0 -71 -131 -75 -146c-4 -14 -9 -32 -14 -54c-4 -16 -9 -16 -11 -16h-38h-15c-4 0 -6 2 -8 4 c-1 2 -2 4 -2 6s1 3 1 5c3 9 40 120 40 121c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 22 23 47 23c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4 c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-2 -5 -7 -25 -9 -31c-4 -13 -8 -25 -8 -33c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52D.xml b/data/Leland/E52D.xml
index 5ee19cde423..d6f7ae1be40 100644
--- a/data/Leland/E52D.xml
+++ b/data/Leland/E52D.xml
@@ -1 +1 @@
-<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M289 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45 c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200 c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35 l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z"/></symbol>
\ No newline at end of file
+<symbol id="E52D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M289 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132 c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM339 44c7 12 18 39 18 39 l17 -8c-1 -2 -1 -4 -2 -6c-13 -35 -30 -71 -75 -71c-14 0 -32 6 -40 18c-7 10 -10 22 -10 36s3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c-1 0 -1 1 -2 1h-1c-1 0 -2 -1 -3 -1c-23 -10 -55 -52 -75 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3 s-2 6 -2 9v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-34 0 -71 -131 -75 -146c-4 -14 -9 -32 -14 -54c-4 -16 -9 -16 -11 -16h-38h-15c-4 0 -6 2 -8 4c-1 2 -2 4 -2 6s1 3 1 5c3 9 40 120 40 121c11 32 19 56 19 70c0 8 -2 13 -8 15 c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 22 23 47 23c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86 c-2 -5 -7 -25 -9 -31c-4 -13 -8 -25 -8 -33c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52E.xml b/data/Leland/E52E.xml
index dd713d433f4..35517c6510a 100644
--- a/data/Leland/E52E.xml
+++ b/data/Leland/E52E.xml
@@ -1 +1 @@
-<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M277 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c44 21 79 131 79 179 c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
+<symbol id="E52E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88 c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1zM277 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62 c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14 c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35 c-46 0 -81 29 -81 81c0 27 25 52 52 52z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E52F.xml b/data/Leland/E52F.xml
index 7aae392f1cd..ae820c17f65 100644
--- a/data/Leland/E52F.xml
+++ b/data/Leland/E52F.xml
@@ -1 +1 @@
-<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 253l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1 c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53 c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170 c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133z"/></symbol>
\ No newline at end of file
+<symbol id="E52F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M181 253l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34 c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82 c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279 c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10 v22c0 6 4 10 10 10h76l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34 c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E530.xml b/data/Leland/E530.xml
index 77e53a9c5fd..420be585cb1 100644
--- a/data/Leland/E530.xml
+++ b/data/Leland/E530.xml
@@ -1 +1 @@
-<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M837 357v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c5 4 6 7 6 13c0 4 -2 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11 v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 20 -16c3 0 5 0 7 1c3 1 7 2 9 4 c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 16 69 24 99l34 134h-159v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40 c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h156l1 2 c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h157v2 c25 75 66 171 160 171c41 0 84 -21 90 -66z"/></symbol>
\ No newline at end of file
+<symbol id="E530" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M837 357v-1c0 -3 1 -7 1 -10c0 -5 -1 -12 -2 -17c-3 -11 -14 -24 -24 -29c-9 -5 -17 -6 -24 -6h-5c-4 0 -10 2 -13 3c-6 2 -13 9 -17 14c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c5 4 6 7 6 13c0 4 -2 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10 c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-5 0 -13 0 -18 1c-37 6 -64 34 -64 80c0 27 25 52 52 52c36 0 46 -26 46 -40 c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 19 -16c4 0 5 0 8 1s7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 16 69 24 99l34 134h-159v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52 c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36 c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76 l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5 c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -14 -24 -24 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3 c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h156l1 2c22 66 45 109 71 133c21 20 42 30 61 35c8 2 20 3 28 3c5 0 12 0 17 -1 c32 -5 56 -23 64 -38c4 -7 8 -19 9 -27z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E531.xml b/data/Leland/E531.xml
index 861853b3c00..aef32012bb2 100644
--- a/data/Leland/E531.xml
+++ b/data/Leland/E531.xml
@@ -1 +1 @@
-<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1018 381c0 1 -1 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81 c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 20 -16c3 0 5 0 7 1c3 1 7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 3h-156v-2c-7 -23 -16 -55 -25 -87 c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122 c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5 c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19 c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2 c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2 c24 75 67 171 160 171c41 0 84 -21 90 -66v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 8 6 13z"/></symbol>
\ No newline at end of file
+<symbol id="E531" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1018 381c0 1 -1 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-5 0 -13 0 -18 1 c-37 6 -64 34 -64 80c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 19 -16c4 0 5 0 8 1s7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c1 6 3 13 4 19c6 28 13 57 21 89l1 3h-156v-2 c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12 c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4 c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3 h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5 c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -14 -24 -24 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3 c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c21 66 45 109 71 133c21 20 42 30 61 35c8 2 20 3 28 3c5 0 12 0 17 -1 c32 -5 56 -23 64 -38c4 -7 8 -19 9 -27v-1c0 -3 1 -7 1 -10c0 -5 -1 -12 -2 -17c-3 -11 -14 -24 -24 -29c-9 -5 -17 -6 -24 -6h-5c-4 0 -10 2 -13 3c-6 2 -13 9 -17 14c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 13z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E532.xml b/data/Leland/E532.xml
index f3ffff8d861..dbaad590445 100644
--- a/data/Leland/E532.xml
+++ b/data/Leland/E532.xml
@@ -1 +1 @@
-<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M947 -174c3 0 5 0 7 1c3 1 7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81 c0 27 25 53 52 53c36 0 46 -27 46 -41c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279 c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2 c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12 c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5 c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-63c-6 0 -10 4 -10 10v22c0 6 4 11 10 11h76l1 1c25 74 66 171 159 171c28 0 68 -13 82 -39c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4 c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c25 74 67 171 159 171c28 0 68 -13 82 -39c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19 c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c25 74 67 171 159 171c28 0 68 -13 82 -39 c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1 c25 74 67 171 159 171c46 0 92 -26 92 -77c0 -6 0 -12 -2 -17c-5 -20 -28 -36 -49 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1 c25 75 66 171 160 171c41 0 84 -21 90 -66v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 8 6 13c0 2 0 3 -1 5c-1 3 -5 6 -8 7c-4 1 -6 1 -8 1c-3 0 -7 0 -9 -1c-7 -2 -15 -10 -19 -16 c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-1 0 -9 -2 -9 -9s5 -16 20 -16z"/></symbol>
\ No newline at end of file
+<symbol id="E532" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M946 -174c4 0 5 0 8 1s7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c1 6 3 13 4 19c6 28 13 57 21 89l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81 c0 27 25 53 52 53c36 0 46 -27 46 -41c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279 c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2 c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 31 46 52 128l3 12 c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5 c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-63c-6 0 -10 4 -10 10v22c0 6 4 11 10 11h76l1 1c22 66 45 110 71 133c33 30 64 38 88 38c6 0 12 0 17 -1c32 -5 57 -23 65 -38c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19 c-3 -11 -13 -24 -23 -29s-18 -7 -25 -7s-13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 13c0 1 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c22 66 45 109 71 133 c33 30 64 38 88 38c6 0 12 0 17 -1c32 -5 57 -23 65 -38c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-18 -7 -25 -7s-13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 13c0 1 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1 c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c22 66 45 109 71 133c33 30 64 38 88 38c6 0 12 0 17 -1c32 -5 57 -23 65 -38c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-18 -7 -25 -7s-13 2 -17 4c-10 4 -18 13 -21 22 c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 13c0 1 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c22 66 45 109 71 133c33 30 64 38 88 38c6 0 12 0 17 -1c32 -5 57 -23 65 -38c7 -12 10 -25 10 -38 c0 -6 0 -12 -2 -17c-3 -11 -14 -24 -24 -29s-18 -7 -25 -7s-13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 13c0 1 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1 c22 66 45 109 71 133c21 20 42 30 61 35c8 2 20 3 28 3c5 0 12 0 17 -1c32 -5 56 -23 64 -38c4 -7 8 -19 9 -27v-1c0 -3 1 -7 1 -10c0 -5 -1 -12 -2 -17c-3 -11 -14 -24 -24 -29c-9 -5 -17 -6 -24 -6h-5c-4 0 -10 2 -13 3c-6 2 -13 9 -17 14c-2 2 -3 5 -4 8 c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 13c0 1 0 3 -1 5c-1 3 -5 6 -8 7c-1 0 -1 1 -2 1h-6c-3 0 -7 0 -9 -1c-3 -1 -7 -4 -10 -6s-7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87 c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-5 0 -13 0 -18 1c-37 6 -64 34 -64 80c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 19 -16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E533.xml b/data/Leland/E533.xml
index 5b632cee412..8f319e85c64 100644
--- a/data/Leland/E533.xml
+++ b/data/Leland/E533.xml
@@ -1 +1 @@
-<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1177 -155c0 -10 9 -15 18 -15c5 0 14 1 18 5c9 6 16 14 22 26c10 20 17 50 30 101l3 12c9 37 17 70 24 100c2 8 3 15 5 22c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36 c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87 c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122 c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5 c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40 c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39 c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2 c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8 c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8 c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 75 66 170 159 170c45 0 92 -25 92 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1v1c25 75 67 171 160 171c40 0 85 -24 90 -67v-3l1 -5c0 -6 -1 -13 -2 -19c-6 -20 -28 -36 -49 -36c-15 0 -25 5 -34 17c-2 2 -3 6 -4 9c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 12 c0 2 0 3 -1 5c-1 3 -5 6 -8 7c-1 1 -2 1 -3 1l-3 1c-4 0 -8 0 -11 -2c-7 -2 -15 -10 -19 -16c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36 c-48 0 -82 31 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -3 -9 -10z"/></symbol>
\ No newline at end of file
+<symbol id="E533" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1182 -166c3 -3 8 -4 13 -4c3 0 6 0 9 1s7 2 9 4c9 6 16 14 22 26c10 20 17 50 30 101l3 12c9 37 17 70 24 100c2 8 3 15 5 22c1 6 3 13 4 19c6 28 13 57 21 89l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36 c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87 c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122 c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5 c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40 c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1 c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8 c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15 c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17 c-3 -11 -14 -24 -24 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133 c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133c32 30 64 37 88 37c7 0 13 0 18 -1c32 -5 56 -23 64 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -14 -24 -24 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3 c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1v1c22 66 45 109 71 133c21 20 41 29 60 34c8 2 21 4 29 4c5 0 12 -1 17 -2 c32 -5 56 -23 64 -38c4 -7 8 -19 9 -27c0 -3 1 -8 1 -11c0 -5 -1 -11 -2 -16c-3 -11 -14 -24 -24 -29c-9 -5 -18 -7 -25 -7h-4c-4 0 -10 2 -13 3c-6 2 -13 9 -17 14c-2 2 -3 6 -4 9c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 12c0 2 0 3 -1 5c-1 3 -5 6 -8 7 c-1 0 -1 1 -2 1c-2 0 -4 1 -6 1c-3 0 -7 -1 -9 -2c-3 -1 -7 -4 -10 -6s-7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36 c-5 0 -13 1 -18 2c-37 6 -64 33 -64 79c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -3 -9 -10c0 -4 2 -8 5 -11z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E534.xml b/data/Leland/E534.xml
index 6a2831e75e3..37d638bc014 100644
--- a/data/Leland/E534.xml
+++ b/data/Leland/E534.xml
@@ -1 +1 @@
-<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-84 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM393 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM421 12c3 0 8 0 11 2c44 21 79 131 79 179 c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
+<symbol id="E534" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M393 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88 c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM421 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1zM-84 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62 c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14 c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35 c-46 0 -81 29 -81 81c0 27 25 52 52 52z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E535.xml b/data/Leland/E535.xml
index d72f3ddcd77..221dca6ef05 100644
--- a/data/Leland/E535.xml
+++ b/data/Leland/E535.xml
@@ -1 +1 @@
-<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM383 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11 c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23 c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21 c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z"/></symbol>
\ No newline at end of file
+<symbol id="E535" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M383 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5 c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16 c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2 c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37 c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E536.xml b/data/Leland/E536.xml
index acb35a5cfbe..a1410be235a 100644
--- a/data/Leland/E536.xml
+++ b/data/Leland/E536.xml
@@ -1 +1 @@
-<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68 c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28 c0 7 3 19 17 27z"/></symbol>
\ No newline at end of file
+<symbol id="E536" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132 c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13 s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83 c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E537.xml b/data/Leland/E537.xml
index f17fcaa8979..6d6f01d35e1 100644
--- a/data/Leland/E537.xml
+++ b/data/Leland/E537.xml
@@ -1 +1 @@
-<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM619 -159h-225v21h62l99 275c5 10 22 52 22 77c0 7 -1 13 -5 16c-2 2 -4 2 -7 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 32 -44 32l-2 6l-59 -160h76v-21zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38 s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58 c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM646 16c3 0 9 0 12 2c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1z"/></symbol>
\ No newline at end of file
+<symbol id="E537" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M619 -159h-225v21h62l99 275c5 10 22 52 22 77c0 7 -1 13 -5 16c-2 1 -4 2 -7 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88 c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -44 32 -44 32l-2 6l-59 -160h76v-21zM646 16c3 0 9 0 12 2c25 12 49 59 62 98c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1zM148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62 c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14 c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35 c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44 s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E538.xml b/data/Leland/E538.xml
index 7fd5c34085f..38e5a99d431 100644
--- a/data/Leland/E538.xml
+++ b/data/Leland/E538.xml
@@ -1 +1 @@
-<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM1061 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20 h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4 c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 228c0 0 -8 13 -34 13 s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83 c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM658 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM982 14 c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z"/></symbol>
\ No newline at end of file
+<symbol id="E538" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M1074 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90 c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1 c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2zM721 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1 c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM1045 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121 c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22 c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278 c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15 c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E539.xml b/data/Leland/E539.xml
index a99ebb621a5..4f71be726b0 100644
--- a/data/Leland/E539.xml
+++ b/data/Leland/E539.xml
@@ -1 +1 @@
-<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68 c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28 c0 7 3 19 17 27zM618 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6 c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25 c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z"/></symbol>
\ No newline at end of file
+<symbol id="E539" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M618 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5 c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16 c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89 s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8 c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10 v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12 c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z "/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53A.xml b/data/Leland/E53A.xml
index 834bbd83f19..fe31ee4eafd 100644
--- a/data/Leland/E53A.xml
+++ b/data/Leland/E53A.xml
@@ -1 +1 @@
-<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 -65c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM824 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19 c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM168 223c0 0 -8 13 -34 13s-45 -21 -45 -38 s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58 c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM618 198c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3 c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34 c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6zM852 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32 c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z"/></symbol>
\ No newline at end of file
+<symbol id="E53A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M824 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88 c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM852 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95 c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1zM618 198c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3 c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28 c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM168 223 c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60 c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM148 -65c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12 c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4 c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86 c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53B.xml b/data/Leland/E53B.xml
index e8017be21c5..ff59674c521 100644
--- a/data/Leland/E53B.xml
+++ b/data/Leland/E53B.xml
@@ -1 +1 @@
-<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M414 253l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1 c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43 c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53 c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170 c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133zM168 228 c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60 c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM870 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18 c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27 c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z"/></symbol>
\ No newline at end of file
+<symbol id="E53B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M870 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5 c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16 c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM414 253l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1 c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8 c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9 c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40 c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1 c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8 c-15 -12 -23 -30 -51 -133zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34 s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53C.xml b/data/Leland/E53C.xml
index d8279a406ef..7a48b2f33c2 100644
--- a/data/Leland/E53C.xml
+++ b/data/Leland/E53C.xml
@@ -1 +1 @@
-<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4 c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2 c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z"/></symbol>
\ No newline at end of file
+<symbol id="E53C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132 c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8 c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM189 253c22 0 41 -16 41 -39 s-8 -37 -19 -46c-6 -5 -17 -9 -29 -9c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4l34 109c11 35 20 64 20 81 c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 21 24 46 24c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c6 8 13 16 22 22c8 5 27 16 50 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E53D.xml b/data/Leland/E53D.xml
index f4dfb47caa2..120d05b4e6a 100644
--- a/data/Leland/E53D.xml
+++ b/data/Leland/E53D.xml
@@ -1 +1 @@
-<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169 c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM636 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11 c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23 c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21 c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6zM189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12 h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z"/></symbol>
\ No newline at end of file
+<symbol id="E53D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M636 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5 c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16 c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2 c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37 c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22 c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM189 253c22 0 41 -16 41 -39s-8 -37 -19 -46c-6 -5 -17 -9 -29 -9c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2 s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 21 24 46 24 c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c6 8 13 16 22 22c8 5 27 16 50 16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E566.xml b/data/Leland/E566.xml
index 270523050c4..48847c2b06d 100644
--- a/data/Leland/E566.xml
+++ b/data/Leland/E566.xml
@@ -1 +1 @@
-<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M322 275c39 0 61 -30 61 -61s-12 -52 -46 -52c-27 0 -40 26 -40 38s3 27 17 36c-1 1 -3 1 -4 1c-6 0 -15 -4 -24 -11c-11 -10 -21 -29 -21 -29l-42 -95s-16 -50 -16 -72v-19s-2 -11 -15 -11h-45s-9 1 -12 9s-6 15 -6 15s-34 -24 -65 -24s-64 11 -64 59 c0 22 24 100 46 166h-44s-14 1 -14 12v13s2 12 14 12h56c13 37 23 65 23 65s1 5 5 8s50 41 52 43s7 5 10 5h9c7 0 14 -7 14 -14v-2l-34 -105h103s8 0 13 -5l8 -8s22 26 61 26zM154 99c9 31 40 123 40 123s0 3 -3 3h-66l-30 -93s-11 -29 -11 -52c0 -13 4 -26 18 -26 c17 0 44 18 52 45z"/></symbol>
\ No newline at end of file
+<symbol id="E566" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M322 275c39 0 61 -30 61 -61s-12 -52 -46 -52c-27 0 -40 26 -40 38s3 27 17 36c-1 1 -3 1 -4 1c-6 0 -15 -4 -24 -11c-11 -10 -21 -29 -21 -29l-42 -95s-16 -50 -16 -72v-19s-2 -11 -15 -11h-45s-9 1 -12 9s-6 15 -6 15s-34 -24 -65 -24s-64 11 -64 59 c0 22 24 100 46 166h-44s-14 1 -14 12v13s2 12 14 12h56c13 37 23 65 23 65s1 5 5 8s50 41 52 43s7 5 10 5h9c7 0 14 -7 14 -14v-2l-34 -105h103s8 0 13 -5l8 -8s22 26 61 26zM154 99c9 31 40 123 40 123s0 3 -3 3h-66l-30 -93s-11 -29 -11 -52c0 -11 3 -21 11 -25 c2 -1 4 -1 7 -1c17 0 44 18 52 45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E567.xml b/data/Leland/E567.xml
index 51a3ef8430a..0a1f7de17f7 100644
--- a/data/Leland/E567.xml
+++ b/data/Leland/E567.xml
@@ -1 +1 @@
-<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M366 232c51 0 90 -47 90 -118c0 -75 -64 -114 -121 -114c-34 0 -60 12 -85 35l-105 98c-26 23 -41 31 -70 31c-25 0 -45 -20 -45 -45v-1c0 -28 11 -43 30 -43c21 0 26 15 48 15c23 0 41 -16 41 -45c0 -30 -31 -45 -58 -45c-51 0 -91 47 -91 118c0 75 64 114 121 114 c34 0 61 -12 86 -35l104 -98c26 -23 42 -31 71 -31c25 0 44 20 44 45v1c0 28 -11 43 -30 43c-21 0 -26 -15 -48 -15c-23 0 -41 16 -41 45c0 30 32 45 59 45z"/></symbol>
\ No newline at end of file
+<symbol id="E567" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M366 232c51 0 90 -47 90 -118c0 -75 -64 -114 -121 -114c-34 0 -60 12 -85 35l-22 20l-83 78c-26 23 -41 31 -70 31c-25 0 -45 -20 -45 -45v-1c0 -28 11 -43 30 -43c21 0 26 15 48 15c23 0 41 -16 41 -45c0 -30 -31 -45 -58 -45c-51 0 -91 47 -91 118 c0 75 64 114 121 114c34 0 61 -12 86 -35l21 -20l83 -78c26 -23 42 -31 71 -31c25 0 44 20 44 45v1c0 28 -11 43 -30 43c-21 0 -26 -15 -48 -15c-23 0 -41 16 -41 45c0 30 32 45 59 45z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E568.xml b/data/Leland/E568.xml
index fd8958ea916..82f8507d3dc 100644
--- a/data/Leland/E568.xml
+++ b/data/Leland/E568.xml
@@ -1 +1 @@
-<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 232c27 0 59 -15 59 -45c0 -29 -18 -45 -41 -45c-22 0 -27 15 -48 15c-19 0 -30 -15 -30 -43v-1c0 -25 19 -45 44 -45c29 0 45 8 71 31l104 98c25 23 52 35 86 35c57 0 121 -39 121 -114c0 -71 -40 -118 -91 -118c-27 0 -58 15 -58 45c0 29 18 45 41 45 c22 0 27 -15 48 -15c19 0 30 15 30 43v1c0 25 -20 45 -45 45c-29 0 -44 -8 -70 -31l-105 -98c-25 -23 -51 -35 -85 -35c-57 0 -121 39 -121 114c0 71 39 118 90 118z"/></symbol>
\ No newline at end of file
+<symbol id="E568" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M90 232c27 0 59 -15 59 -45c0 -29 -18 -45 -41 -45c-22 0 -27 15 -48 15c-19 0 -30 -15 -30 -43v-1c0 -25 19 -45 44 -45c29 0 45 8 71 31l83 78l21 20c25 23 52 35 86 35c57 0 121 -39 121 -114c0 -71 -40 -118 -91 -118c-27 0 -58 15 -58 45c0 29 18 45 41 45 c22 0 27 -15 48 -15c19 0 30 15 30 43v1c0 25 -20 45 -45 45c-29 0 -44 -8 -70 -31l-83 -78l-22 -20c-25 -23 -51 -35 -85 -35c-57 0 -121 39 -121 114c0 71 39 118 90 118z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56A.xml b/data/Leland/E56A.xml
index 44c7fd491f8..9494af55d50 100644
--- a/data/Leland/E56A.xml
+++ b/data/Leland/E56A.xml
@@ -1 +1 @@
-<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 91c0 -51 -47 -91 -118 -91c-75 0 -114 64 -114 121c0 34 12 61 35 86l98 104c23 26 31 42 31 71c0 25 -20 44 -45 44h-1c-28 0 -43 -11 -43 -30c0 -21 15 -26 15 -48c0 -23 -16 -41 -45 -41c-30 0 -45 32 -45 59c0 51 47 90 118 90c75 0 114 -64 114 -121 c0 -34 -12 -60 -35 -85l-98 -105c-23 -26 -31 -41 -31 -70c0 -25 20 -45 45 -45h1c28 0 43 11 43 30c0 21 -15 26 -15 48c0 23 16 41 45 41c30 0 45 -31 45 -58z"/></symbol>
\ No newline at end of file
+<symbol id="E56A" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 91c0 -51 -47 -91 -118 -91c-75 0 -114 64 -114 121c0 34 12 61 35 86l20 21l78 83c23 26 31 42 31 71c0 25 -20 44 -45 44h-1c-28 0 -43 -11 -43 -30c0 -21 15 -26 15 -48c0 -23 -16 -41 -45 -41c-30 0 -45 32 -45 59c0 51 47 90 118 90c75 0 114 -64 114 -121 c0 -34 -12 -60 -35 -85l-20 -22l-78 -83c-23 -26 -31 -41 -31 -70c0 -25 20 -45 45 -45h1c28 0 43 11 43 30c0 21 -15 26 -15 48c0 23 16 41 45 41c30 0 45 -31 45 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56B.xml b/data/Leland/E56B.xml
index 5d96d85ef34..39b68f07d64 100644
--- a/data/Leland/E56B.xml
+++ b/data/Leland/E56B.xml
@@ -1 +1 @@
-<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 366c0 -27 -15 -59 -45 -59c-29 0 -45 18 -45 41c0 22 15 27 15 48c0 19 -15 30 -43 30h-1c-25 0 -45 -19 -45 -44c0 -29 8 -45 31 -71l98 -104c23 -25 35 -52 35 -86c0 -57 -39 -121 -114 -121c-71 0 -118 40 -118 91c0 27 15 58 45 58c29 0 45 -18 45 -41 c0 -22 -15 -27 -15 -48c0 -19 15 -30 43 -30h1c25 0 45 20 45 45c0 29 -8 44 -31 70l-98 105c-23 25 -35 51 -35 85c0 57 39 121 114 121c71 0 118 -39 118 -90z"/></symbol>
\ No newline at end of file
+<symbol id="E56B" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M232 366c0 -27 -15 -59 -45 -59c-29 0 -45 18 -45 41c0 22 15 27 15 48c0 19 -15 30 -43 30h-1c-25 0 -45 -19 -45 -44c0 -29 8 -45 31 -71l78 -83l20 -21c23 -25 35 -52 35 -86c0 -57 -39 -121 -114 -121c-71 0 -118 40 -118 91c0 27 15 58 45 58c29 0 45 -18 45 -41 c0 -22 -15 -27 -15 -48c0 -19 15 -30 43 -30h1c25 0 45 20 45 45c0 29 -8 44 -31 70l-78 83l-20 22c-23 25 -35 51 -35 85c0 57 39 121 114 121c71 0 118 -39 118 -90z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E56F.xml b/data/Leland/E56F.xml
index 0aa20110f39..6120311e375 100644
--- a/data/Leland/E56F.xml
+++ b/data/Leland/E56F.xml
@@ -1 +1 @@
-<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M499 192c3 -16 4 -31 4 -44c0 -106 -68 -148 -125 -148c-56 0 -89 16 -115 39l-28 29l-64 -75c-3 -4 -8 -6 -12 -6s-7 1 -10 4c-4 3 -6 7 -6 12c0 4 1 7 4 11l65 77l-21 20c-20 20 -52 52 -91 52c-47 0 -64 -51 -64 -107c0 -9 0 -18 1 -26c0 -9 -3 -14 -16 -14 c-14 0 -17 14 -17 16c-3 15 -4 28 -4 41c0 108 68 151 125 151c56 0 89 -16 115 -40l28 -28l64 75c3 4 7 6 12 6c4 0 7 -1 11 -4c3 -3 5 -8 5 -12s-1 -8 -4 -11l-65 -77l21 -20c20 -20 52 -52 91 -52c47 0 64 51 64 107c0 9 0 17 -1 26c0 9 5 14 16 14c14 0 17 -15 17 -16z "/></symbol>
\ No newline at end of file
+<symbol id="E56F" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M499 192c3 -16 4 -31 4 -44c0 -106 -69 -148 -125 -148s-89 16 -115 39l-28 28l-64 -74c-3 -4 -8 -6 -12 -6s-7 1 -11 4c-3 3 -5 7 -5 12c0 4 1 7 4 11l65 76l-21 21c-20 20 -52 52 -91 52c-47 0 -64 -51 -64 -107c0 -9 0 -18 1 -27c0 -8 -4 -13 -16 -13 c-14 0 -17 14 -17 16c-3 15 -4 28 -4 41c0 108 68 151 125 151c56 0 89 -16 115 -40l28 -28l64 75c3 4 7 6 12 6c4 0 7 -1 10 -4c4 -3 6 -8 6 -13c0 -3 -1 -7 -4 -10l-65 -77l21 -20c20 -20 52 -52 91 -52c47 0 64 51 64 107c0 9 0 17 -1 26c0 9 5 14 15 14 c15 0 18 -15 18 -16z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E587.xml b/data/Leland/E587.xml
index 49247f8c72e..55a6f637815 100644
--- a/data/Leland/E587.xml
+++ b/data/Leland/E587.xml
@@ -1 +1 @@
-<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M737 473c8 0 14 -6 14 -14s-6 -14 -14 -14c-36 0 -80 -29 -133 -88s-156 -218 -239 -351c-2 -4 -6 -6 -12 -6c-2 0 -4 0 -6 2c-2 1 -4 3 -5 4l-79 127l-78 -126c-2 -4 -7 -7 -11 -7c-6 0 -10 2 -12 7l-79 126l-59 -95l-24 15l117 189h1c2 4 6 6 11 6s9 -2 12 -6l79 -126 l78 126c2 4 6 6 11 6s9 -2 12 -6l78 -124c75 119 134 202 184 258c60 66 109 97 154 97z"/></symbol>
\ No newline at end of file
+<symbol id="E587" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M737 473c8 0 14 -6 14 -14s-6 -14 -14 -14c-36 0 -80 -29 -133 -88s-156 -218 -239 -351c-2 -4 -6 -6 -12 -6c-2 0 -4 0 -7 2c-2 1 -3 2 -4 4l-79 127l-59 -95v0l-19 -31c-2 -4 -7 -7 -12 -7s-9 2 -11 6l-79 127l-59 -95l-24 15l117 189h1c2 4 6 6 11 6v0c5 0 9 -2 12 -6 l78 -126l78 126c3 4 7 6 12 6v0c5 0 9 -2 12 -6l78 -124c75 119 134 201 184 258c60 66 109 97 154 97z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E59D.xml b/data/Leland/E59D.xml
index a4d825d59ae..8eaf36ddba9 100644
--- a/data/Leland/E59D.xml
+++ b/data/Leland/E59D.xml
@@ -1 +1 @@
-<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 240l90 -148l-50 -85c-3 -4 -5 -7 -12 -7c-6 0 -9 3 -12 7s-67 112 -74 124l-59 -98l-24 14c11 19 114 188 117 193s7 7 12 7c4 0 9 -2 12 -7z"/></symbol>
\ No newline at end of file
+<symbol id="E59D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M98 240l90 -149l-50 -84c-3 -4 -5 -7 -12 -7c-6 0 -9 3 -12 7s-67 112 -74 124l-59 -98l-24 14c11 19 114 188 117 193s7 7 12 7c4 0 9 -3 12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E59E.xml b/data/Leland/E59E.xml
index a8080db2af7..424010304c0 100644
--- a/data/Leland/E59E.xml
+++ b/data/Leland/E59E.xml
@@ -1 +1 @@
-<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 89l-16 26l78 126c2 4 7 7 11 7c6 0 10 -2 12 -6l79 -127l59 95l24 -15l-117 -189h-1c-2 -4 -6 -6 -11 -6s-9 2 -12 6l-79 126z"/></symbol>
\ No newline at end of file
+<symbol id="E59E" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M14 89l-16 26l59 95v0l18 31c3 4 7 7 12 7c6 0 10 -2 12 -6l79 -127l59 95l24 -15l-118 -189v0c-2 -4 -6 -6 -11 -6v0c-5 0 -9 2 -12 6l-79 126z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5B2.xml b/data/Leland/E5B2.xml
index 6df5b6b5fa5..8fb74e95542 100644
--- a/data/Leland/E5B2.xml
+++ b/data/Leland/E5B2.xml
@@ -1 +1 @@
-<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M597 118l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-79 -126c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-75 125l-76 -126c-3 -5 -9 -9 -16 -9l-3 1c-8 2 -14 10 -14 17v358c1 7 7 12 14 12s13 -5 14 -12 v-323l115 192c2 4 6 6 12 6c4 0 10 -2 12 -6l75 -123l72 122c2 4 8 7 12 7s10 -2 12 -6l79 -127l78 126c2 4 7 7 11 7c6 0 10 -2 12 -6z"/></symbol>
\ No newline at end of file
+<symbol id="E5B2" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M597 118l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-79 -126c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-75 125l-59 -99l-17 -27c-3 -5 -9 -9 -15 -9c-1 0 -4 1 -5 1c-7 2 -13 10 -13 17v358 c1 7 7 12 14 12s13 -5 14 -12v-323l115 192c2 4 6 6 12 6c4 0 10 -2 12 -6l75 -123l72 122c2 4 8 7 12 7c2 0 6 -1 8 -2s3 -2 4 -4l79 -127l59 95l19 31c2 4 7 7 11 7c6 0 10 -2 12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5B5.xml b/data/Leland/E5B5.xml
index 18554711c0f..8a6f2c2e25b 100644
--- a/data/Leland/E5B5.xml
+++ b/data/Leland/E5B5.xml
@@ -1 +1 @@
-<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M579 115l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-9 3 -12 7l-78 126l-78 -126c-3 -4 -8 -7 -12 -7s-10 3 -12 7l-78 124l-73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7l-75 125l-19 -33c-29 -48 -44 -92 -44 -135c0 -35 10 -68 30 -101c1 -2 2 -5 2 -7 c0 -5 -3 -10 -7 -12c-2 -2 -5 -2 -7 -2c-5 0 -10 3 -12 6c-23 39 -34 77 -34 117c0 47 16 96 48 149l77 126v1c3 4 5 7 10 7h2c2 0 6 -1 8 -2l1 -1h1l1 -1v-1c1 0 1 -1 1 -2l75 -122l73 123c2 3 7 6 12 6c2 0 5 -1 7 -2l4 -4l79 -127l59 95h1l18 32c2 3 7 6 12 6 c6 0 9 -2 12 -6z"/></symbol>
\ No newline at end of file
+<symbol id="E5B5" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M579 115l59 95l24 -14l-117 -189v0c-2 -4 -8 -7 -12 -7v0c-4 0 -9 3 -12 7l-78 126l-78 -126c-3 -4 -8 -7 -12 -7v0v0c-4 0 -10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7v0c-5 0 -10 3 -12 7l-75 125l-19 -33c-29 -48 -44 -92 -44 -135c0 -35 10 -68 30 -101 c1 -2 2 -5 2 -7c0 -5 -3 -10 -7 -12c-2 -1 -5 -2 -7 -2c-5 0 -10 3 -12 6c-23 39 -34 77 -34 117c0 47 16 96 48 149l77 126v1c2 4 5 7 10 7h2v0c2 0 6 -1 7 -2h1l1 -1v0h1v-1h1v-1v0c1 0 1 -1 1 -2l75 -122l73 122c2 4 7 7 11 7c3 0 6 -1 8 -2l4 -4l79 -127l59 95h1l18 32 c2 3 7 6 12 6c6 0 9 -2 11 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5B8.xml b/data/Leland/E5B8.xml
index 4e665d51f7b..fcebe7d110f 100644
--- a/data/Leland/E5B8.xml
+++ b/data/Leland/E5B8.xml
@@ -1 +1 @@
-<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M579 115l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-4 -6v-185c0 -8 -6 -14 -14 -14h-9c-8 0 -14 6 -14 14v126l-37 -61c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 125l-73 -125c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-75 125l-19 -32 c-29 -48 -43 -92 -43 -135c0 -35 10 -69 29 -102c1 -2 2 -5 2 -7c0 -7 -7 -14 -14 -14c-4 0 -10 3 -12 7c-22 38 -34 77 -34 117c0 47 16 96 48 148l77 128c2 4 6 6 12 6c2 0 5 -1 7 -2h2v-1h1l1 -1v-1s1 -1 1 -2l75 -122l73 123c2 4 8 7 12 7c5 0 9 -3 11 -7l79 -127l3 5 v187c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-127l19 30v1l19 31c2 4 8 6 12 6c6 0 8 -2 11 -6z"/></symbol>
\ No newline at end of file
+<symbol id="E5B8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M579 115l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-4 -6v-185c0 -8 -6 -14 -14 -14h-9c-8 0 -14 6 -14 14v126l-37 -61c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 125l-73 -125c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-75 125l-19 -32 c-29 -48 -43 -92 -43 -135c0 -35 10 -68 29 -102c1 -2 2 -5 2 -7c0 -4 -3 -10 -7 -12c-2 -1 -5 -2 -7 -2c-4 0 -10 3 -12 7c-22 38 -34 77 -34 117c0 47 16 95 48 148l76 126l1 2c2 4 6 6 12 6c2 0 5 -1 7 -2h2v-1h1l1 -1v-1s1 -1 1 -2l75 -122l73 123c2 4 8 7 12 7 c2 0 5 -1 7 -2s3 -3 4 -5l79 -127l3 5v187c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-127l19 30v1l19 31c2 4 8 6 12 6c6 0 8 -2 11 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BB.xml b/data/Leland/E5BB.xml
index be98da33f6f..36dadee8b04 100644
--- a/data/Leland/E5BB.xml
+++ b/data/Leland/E5BB.xml
@@ -1 +1 @@
-<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M628 399c23 -38 34 -77 34 -117c0 -47 -16 -95 -48 -148l-77 -128c-2 -4 -8 -6 -12 -6c-6 0 -11 4 -13 9l-74 120l-73 -122c-2 -4 -8 -7 -12 -7s-9 2 -11 6l-79 127l-78 -126c-2 -4 -8 -7 -12 -7c-6 0 -8 3 -11 7l-79 126l-59 -95l-24 15l117 189c2 4 8 6 12 6 s10 -2 12 -6l78 -126l78 126c2 4 8 6 12 6s10 -2 12 -6l78 -125l73 125c2 4 8 6 12 6s10 -2 12 -6l75 -126l19 32c29 48 43 92 43 135c0 35 -9 69 -29 102c-1 2 -2 5 -2 7c0 7 7 14 14 14c4 0 10 -3 12 -7z"/></symbol>
\ No newline at end of file
+<symbol id="E5BB" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M628 399c22 -38 34 -77 34 -117c0 -47 -16 -95 -48 -148l-77 -128c-2 -4 -8 -6 -12 -6c-2 0 -5 1 -7 2s-5 5 -6 7l-74 120l-73 -122c-2 -4 -8 -7 -12 -7c-2 0 -5 1 -7 2s-3 2 -4 4l-79 127l-59 -95l-19 -31c-2 -4 -8 -7 -12 -7c-6 0 -8 3 -11 7l-79 126l-59 -95l-24 15 l117 189c2 4 8 6 12 6s10 -2 12 -6l78 -126l78 126c2 4 8 6 12 6s10 -2 12 -6l78 -125l73 125c2 4 8 6 12 6s10 -2 12 -6l75 -126l19 32c29 48 43 92 43 135c0 35 -10 68 -29 102c-1 2 -2 5 -2 7c0 4 3 10 7 12c2 1 5 2 7 2c4 0 10 -3 12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BC.xml b/data/Leland/E5BC.xml
index d0f645f17b4..73128597461 100644
--- a/data/Leland/E5BC.xml
+++ b/data/Leland/E5BC.xml
@@ -1 +1 @@
-<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M289 34c-3 -5 -6 -7 -12 -7c-10 0 -14 8 -15 15s-1 37 -16 70c-21 45 -55 68 -103 68c-47 0 -81 -23 -99 -68c-16 -37 -15 -66 -16 -72c0 -9 -5 -13 -15 -13s-13 9 -13 14s1 41 18 82c23 55 67 85 125 85c59 0 103 -30 129 -85c6 -15 11 -29 14 -42l96 161c2 3 5 6 9 6 c6 0 11 -1 14 -6l75 -123l73 123c2 3 7 6 12 6c2 0 5 0 7 -2c2 0 4 -3 5 -4l79 -127l4 7v185c0 8 6 14 13 14h9c8 0 14 -6 14 -14v-126l37 61c2 3 8 6 12 6c6 0 9 -2 12 -6l79 -127l59 95l23 -14l-117 -189c-2 -4 -7 -7 -11 -7h-1c-4 0 -9 3 -11 7l-79 126l-3 -5v-187 c0 -7 -6 -13 -14 -13h-9c-7 0 -13 6 -13 13v128c-4 -6 -36 -58 -39 -62c-3 -5 -8 -7 -12 -7s-9 2 -12 7c-2 4 -70 112 -77 124l-74 -124c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-74 124c-6 -9 -56 -92 -59 -97z"/></symbol>
\ No newline at end of file
+<symbol id="E5BC" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M289 34c-3 -5 -6 -7 -12 -7c-10 0 -14 8 -15 15s-1 37 -16 70c-21 45 -55 68 -103 68c-47 0 -81 -23 -99 -68c-16 -37 -15 -66 -16 -72c-1 -9 -5 -13 -15 -13s-13 9 -13 14s1 41 18 82c23 55 67 85 125 85c59 0 103 -30 129 -85c6 -15 11 -29 14 -42l3 7l93 153 c2 4 5 7 9 7c6 0 11 -1 14 -6l75 -123l73 122c2 4 7 7 12 7c2 0 5 -1 7 -2c1 -1 4 -3 5 -4l79 -127l4 7v185c0 8 6 14 13 14h9c8 0 14 -7 14 -14v-126l37 60c2 4 8 7 12 7c6 0 9 -2 12 -6l79 -127l59 95l23 -14l-117 -189v0c-2 -4 -7 -7 -12 -7v0c-4 0 -9 3 -11 7l-79 126 l-3 -5v-186c0 -8 -6 -14 -14 -14h-9c-7 0 -13 6 -13 14v127c-4 -6 -36 -58 -39 -62c-3 -5 -8 -7 -12 -7s-9 2 -12 7c-2 4 -70 112 -77 124l-74 -124v0c-2 -4 -8 -7 -12 -7v0c-4 0 -10 3 -12 7l-74 124c-6 -9 -56 -92 -59 -97z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BD.xml b/data/Leland/E5BD.xml
index 63bcf3effd7..d324d25f1a5 100644
--- a/data/Leland/E5BD.xml
+++ b/data/Leland/E5BD.xml
@@ -1 +1 @@
-<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M570 115l59 95l24 -15l-117 -189c-2 -3 -8 -6 -12 -6s-9 3 -12 6l-78 126l-3 -4v-187c0 -7 -6 -14 -14 -14h-9c-7 0 -14 7 -14 14v128l-38 -62c-3 -4 -8 -7 -12 -7s-10 3 -12 6l-78 125l-73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7l-74 124l-59 -98l-24 14l116 194 c3 4 6 7 12 7c5 0 10 -3 12 -7l75 -122l73 122c2 4 7 7 12 7c2 0 5 -1 7 -2l4 -4l79 -127l4 6v186c0 7 7 13 14 13h9c8 0 14 -6 14 -13v-127l18 30h1l18 31c2 4 7 7 12 7c6 0 9 -2 12 -6z"/></symbol>
\ No newline at end of file
+<symbol id="E5BD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M570 115l59 95l24 -15l-117 -189c-2 -3 -8 -6 -12 -6v0v0c-4 0 -10 3 -12 6l-78 126l-3 -4v-187c0 -7 -6 -14 -14 -14h-9c-8 0 -14 7 -14 14v0v128l-38 -63c-3 -3 -8 -6 -12 -6v0v0c-4 0 -10 3 -12 6l-78 125l-74 -124c-2 -4 -7 -7 -11 -7v0v0c-5 0 -10 3 -12 7l-74 124 l-59 -98l-24 14l85 142l31 52c3 4 6 7 12 7v0c5 0 10 -3 12 -7l75 -122l73 122c2 4 7 7 12 7c2 0 5 -1 7 -2l4 -4l79 -127l4 6v186v0c0 7 6 13 14 13h9c8 0 14 -6 14 -14v-126l18 30h1l18 31c2 4 7 7 12 7c6 0 9 -2 12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5BE.xml b/data/Leland/E5BE.xml
index 061b422b057..80b87913b21 100644
--- a/data/Leland/E5BE.xml
+++ b/data/Leland/E5BE.xml
@@ -1 +1 @@
-<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M704 196l-117 -189c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -77 125c-8 -13 -72 -121 -74 -125c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -97c-2 -4 -6 -7 -13 -7c-6 0 -13 6 -14 13c0 1 -1 37 -17 72c-21 45 -55 68 -103 68 c-35 0 -63 -13 -83 -39c-3 -3 -7 -5 -11 -5c-3 0 -6 1 -8 3c-4 2 -6 6 -6 11c0 2 1 6 3 8c25 33 61 50 105 50c59 0 103 -29 129 -85c6 -15 11 -30 14 -43c25 41 95 159 97 162c1 3 5 6 11 6s10 -3 12 -6c2 -4 68 -111 75 -122c7 11 70 117 73 122c2 4 7 6 12 6 c4 0 9 -2 12 -6c2 -5 71 -114 79 -127l58 95z"/></symbol>
\ No newline at end of file
+<symbol id="E5BE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M704 196l-117 -189c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -77 124c-8 -12 -72 -120 -74 -124c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -97c-2 -4 -6 -7 -13 -7s-13 6 -14 13c0 1 -1 37 -17 72c-21 45 -55 68 -103 68 c-35 0 -63 -13 -83 -39c-3 -3 -7 -5 -11 -5c-3 0 -6 1 -8 3c-4 2 -6 6 -6 11c0 2 1 6 3 8c25 33 61 50 105 50c59 0 103 -29 128 -85c7 -15 12 -30 15 -43c24 41 95 159 97 162c1 3 5 6 11 6s10 -3 12 -6c2 -4 68 -111 75 -123c7 12 70 118 73 123c2 4 7 6 12 6 c4 0 9 -2 11 -6c3 -5 72 -114 79 -127l59 95z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C0.xml b/data/Leland/E5C0.xml
index add821710b9..850ec206d2f 100644
--- a/data/Leland/E5C0.xml
+++ b/data/Leland/E5C0.xml
@@ -1 +1 @@
-<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M255 33c-2 -3 -6 -6 -13 -6s-14 6 -14 13c0 1 -1 37 -17 72c-21 45 -56 68 -103 68c-35 0 -63 -13 -83 -39c-3 -4 -7 -6 -11 -6c-3 1 -6 1 -9 3c-3 3 -5 7 -5 11c0 3 1 6 3 9c25 33 60 50 105 50c79 0 126 -56 143 -128c24 41 95 158 96 161c2 4 6 7 12 7s10 -3 12 -7 c2 -3 68 -110 75 -122c7 12 70 118 73 122c2 5 7 7 11 7c5 0 9 -2 12 -7c3 -4 72 -114 79 -126l78 126c2 4 7 7 11 7c6 0 10 -2 12 -7l79 -126l59 95l24 -14l-117 -189c-3 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126c-8 -13 -76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7 s-70 112 -78 124c-7 -12 -71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -98z"/></symbol>
\ No newline at end of file
+<symbol id="E5C0" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M255 33c-2 -3 -6 -7 -13 -7s-14 6 -14 14c0 1 -1 37 -18 72c-20 45 -55 67 -102 67c-35 0 -63 -12 -83 -38c-3 -4 -7 -6 -11 -6c-3 0 -6 1 -9 3c-3 3 -5 7 -5 11c0 3 1 6 3 9c25 33 60 50 105 50c59 0 103 -30 128 -85c7 -15 12 -30 15 -43c24 41 95 158 96 161 c2 4 6 7 12 7s10 -3 12 -7c2 -3 68 -110 75 -122c7 12 70 118 73 122c2 5 7 7 11 7c5 0 9 -2 12 -7c3 -4 72 -114 79 -126l78 126c2 4 7 7 11 7c6 0 10 -2 12 -7l79 -126l59 95l24 -15l-117 -188v0c-3 -4 -8 -7 -12 -7v0c-4 0 -10 3 -12 7l-78 126c-8 -13 -76 -123 -78 -126 c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 112 -78 124c-7 -12 -71 -120 -74 -124c-2 -4 -7 -7 -11 -7c-5 0 -10 3 -12 7c-3 4 -67 112 -74 124c-6 -10 -57 -94 -59 -98z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C3.xml b/data/Leland/E5C3.xml
index 312478e95af..0502391f4fa 100644
--- a/data/Leland/E5C3.xml
+++ b/data/Leland/E5C3.xml
@@ -1 +1 @@
-<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M267 97c-27 -45 -61 -70 -119 -70s-103 29 -128 85c-18 40 -20 80 -20 81c0 8 6 15 14 15c7 0 14 -6 14 -14c0 -3 2 -36 18 -72c20 -44 53 -67 102 -67s74 22 100 65c25 43 71 120 72 122c2 3 6 6 12 6s10 -3 12 -6c2 -4 68 -111 75 -122c7 11 70 117 73 122 c2 4 7 6 12 6c4 0 8 -2 11 -6c3 -5 72 -114 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-2 -3 -8 -6 -12 -7c-4 0 -9 3 -12 7l-78 126c-8 -12 -76 -122 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -78 125c-7 -13 -71 -121 -73 -125 c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-1 -1 -10 -16 -20 -34z"/></symbol>
\ No newline at end of file
+<symbol id="E5C3" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M266 97c-26 -46 -60 -70 -118 -70s-103 29 -128 85c-18 40 -20 80 -20 81c0 8 6 15 14 15c7 0 14 -6 14 -14c0 -3 2 -36 18 -72c20 -44 53 -67 102 -67s74 22 100 65c25 43 71 120 72 122c2 3 6 6 12 6s10 -3 12 -6c2 -4 68 -111 75 -123c7 12 70 118 73 123 c2 4 7 6 12 6c4 0 8 -2 11 -6c3 -5 72 -115 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189v0c-2 -4 -8 -6 -12 -7v0c-4 0 -9 3 -12 7l-78 126c-8 -12 -76 -122 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -78 124 c-7 -12 -71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7c-3 4 -67 112 -74 124c-1 -1 -10 -16 -21 -34z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C6.xml b/data/Leland/E5C6.xml
index e0a63d6f9a7..e60971f84ec 100644
--- a/data/Leland/E5C6.xml
+++ b/data/Leland/E5C6.xml
@@ -1 +1 @@
-<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M360 242c3 -5 79 -127 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-9 3 -12 7l-78 126s-76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-78 124 -78 124s-71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7 c-3 4 -74 124 -74 124s-57 -93 -59 -98c-3 -4 -8 -6 -12 -6c-5 0 -8 2 -11 5s-51 64 -51 168c0 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134c0 0 103 172 105 176c2 3 6 6 12 6s10 -3 12 -6 c2 -4 75 -123 75 -123s70 118 73 123c2 4 7 6 12 6c4 0 8 -2 11 -6z"/></symbol>
\ No newline at end of file
+<symbol id="E5C6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M360 242c3 -5 79 -127 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189v0c-2 -4 -8 -7 -12 -7v0c-4 0 -9 3 -12 7l-78 126s-76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-78 124 -78 124s-71 -120 -74 -124c-2 -4 -7 -7 -11 -7 c-5 0 -10 3 -12 7c-3 4 -74 124 -74 124s-57 -93 -59 -98c-3 -4 -8 -6 -12 -6c-5 0 -8 2 -11 5s-51 64 -51 168c0 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134c0 0 103 172 105 176c2 3 6 6 12 6 s10 -3 12 -6c2 -4 75 -123 75 -123s70 118 73 123c2 4 7 6 11 6c5 0 9 -2 12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C7.xml b/data/Leland/E5C7.xml
index e8ac5f34c22..a8d167db299 100644
--- a/data/Leland/E5C7.xml
+++ b/data/Leland/E5C7.xml
@@ -1 +1 @@
-<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M574 0c-5 0 -9 3 -12 7l-78 126l-3 -5v-187c0 -7 -6 -13 -14 -13h-9c-7 0 -14 6 -14 13v128c-3 -6 -35 -58 -38 -62c-4 -5 -8 -7 -12 -7s-9 2 -12 7c-3 4 -70 112 -78 124l-73 -124c-1 -1 -5 -7 -12 -7c-6 0 -10 3 -12 7l-74 124l-59 -97c-1 -1 -2 -3 -4 -4 c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -11 5c-33 41 -51 104 -51 168c-1 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134l105 176c3 3 6 6 11 6s10 -1 13 -6l75 -123l73 123c2 3 6 6 10 6c5 0 7 0 9 -2 c1 0 3 -3 4 -4l79 -127l4 7v185c0 8 7 14 14 14h9c8 0 14 -6 14 -14v-126l37 61c2 3 7 6 12 6c4 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-1 -1 -4 -7 -12 -7z"/></symbol>
\ No newline at end of file
+<symbol id="E5C7" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M574 0c-5 0 -9 3 -12 7l-78 126l-3 -5v-187c0 -7 -6 -13 -14 -13h-9c-8 0 -14 6 -14 13v128c-3 -6 -35 -58 -38 -62c-4 -5 -8 -7 -12 -7s-9 2 -12 7c-3 4 -70 112 -78 124l-73 -124c-1 -1 -5 -7 -12 -7c-6 0 -10 3 -12 7l-74 124l-59 -97c-1 -1 -2 -3 -4 -4 c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -11 5c-33 41 -51 104 -51 168c0 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134l105 176c2 3 6 6 11 6s10 -1 13 -6l75 -123l73 123c2 3 6 6 10 6c5 0 7 -1 9 -2l4 -4 l79 -127l4 7v185c0 8 6 14 14 14h9c8 0 14 -7 14 -14v-126l37 61c2 3 7 6 11 6c5 0 10 -2 13 -6l78 -127l59 95l24 -14l-117 -189c-1 -1 -4 -7 -12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5C8.xml b/data/Leland/E5C8.xml
index afc2f27c7ee..14467130eb3 100644
--- a/data/Leland/E5C8.xml
+++ b/data/Leland/E5C8.xml
@@ -1 +1 @@
-<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 117c7 12 72 121 74 125c2 3 7 7 12 7s9 -3 12 -7l74 -125c5 9 53 89 59 98c3 6 8 7 11 7c4 0 8 -2 11 -5c43 -49 71 -125 71 -203c0 -62 -17 -125 -56 -180c-3 -3 -7 -6 -11 -6c-3 1 -6 1 -8 3c-4 3 -7 8 -7 11s2 6 3 9c36 49 52 107 52 164c0 63 -21 125 -53 169 l-106 -177c-2 -4 -6 -7 -12 -7c-5 0 -9 3 -12 7l-75 122l-73 -122c-2 -4 -6 -7 -11 -7c-7 0 -10 4 -12 7s-72 114 -79 126l-79 -127c-2 -4 -6 -6 -11 -6c-8 0 -15 6 -15 14s123 204 139 228c3 3 6 7 12 7s9 -3 12 -7z"/></symbol>
\ No newline at end of file
+<symbol id="E5C8" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M241 117c7 12 71 121 74 125c2 3 7 7 12 7s9 -3 12 -7l74 -125c5 9 53 89 59 98c3 6 8 7 11 7s8 -2 11 -5c43 -49 71 -125 71 -203c0 -62 -17 -125 -56 -180c-3 -3 -7 -5 -11 -5c-3 0 -6 0 -9 2c-3 3 -6 8 -6 12c0 3 1 5 3 8c36 49 52 107 52 164c0 63 -21 125 -53 169 l-106 -177c-3 -4 -6 -7 -12 -7c-5 0 -9 3 -12 7l-75 122l-73 -122c-2 -5 -6 -7 -12 -7s-9 4 -11 7c-2 2 -72 114 -79 126l-79 -127c-2 -4 -7 -6 -11 -6c-8 0 -15 6 -15 14c0 3 0 4 2 7s135 218 137 221s6 7 12 7s9 -3 12 -7z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E5E6.xml b/data/Leland/E5E6.xml
index 1b83fd24541..832c2b0a5c5 100644
--- a/data/Leland/E5E6.xml
+++ b/data/Leland/E5E6.xml
@@ -1 +1 @@
-<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140s-140 63 -140 140s63 140 140 140zM251 154c-6 50 -47 91 -97 97v-97h97zM61 219c-18 -17 -29 -40 -33 -65h98v97c-25 -3 -48 -14 -65 -32zM28 126c8 -50 47 -91 98 -97v97h-98zM154 29c50 6 91 47 97 97h-97v-97z"/></symbol>
\ No newline at end of file
+<symbol id="E5E6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140s-140 63 -140 140s63 140 140 140zM251 154c-3 25 -14 48 -32 65c-18 18 -40 29 -65 32v-97h97zM60 219c-17 -17 -29 -40 -32 -65h98v97c-25 -3 -48 -14 -66 -32zM28 126c3 -25 15 -48 32 -65c18 -18 41 -29 66 -32v97 h-98zM219 61c18 17 29 40 32 65h-97v-97c25 3 47 14 65 32z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E612.xml b/data/Leland/E612.xml
index 5601b0f499d..eb4b8491d37 100644
--- a/data/Leland/E612.xml
+++ b/data/Leland/E612.xml
@@ -1 +1 @@
-<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 337c1 -2 2 -6 2 -9l-1 -3v-1l-117 -315c-2 -5 -8 -9 -13 -9s-11 4 -13 9l-117 315v1l-1 3c0 9 6 15 14 15h14c5 0 11 -4 13 -9l90 -252l90 252c2 5 8 9 13 9h14c4 0 10 -3 12 -6z"/></symbol>
\ No newline at end of file
+<symbol id="E612" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 337c1 -2 2 -6 2 -8c0 -1 -1 -4 -1 -5l-117 -315c-2 -5 -8 -9 -13 -9s-11 4 -13 9l-117 315c0 1 -1 4 -1 5c0 8 6 14 14 14h14c5 0 11 -4 13 -9l90 -252l90 252c2 5 8 9 13 9h14c4 0 10 -3 12 -6z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E613.xml b/data/Leland/E613.xml
index 26df9057438..e6ce8bd7191 100644
--- a/data/Leland/E613.xml
+++ b/data/Leland/E613.xml
@@ -1 +1 @@
-<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 43c-2 -3 -8 -6 -12 -6h-14c-5 0 -11 4 -13 9l-90 252l-90 -252c-2 -5 -8 -9 -13 -9h-14c-8 0 -14 6 -14 15l1 3v1l117 315c2 5 8 9 13 9s11 -4 13 -9l117 -315v-1l1 -3c0 -3 -1 -7 -2 -9z"/></symbol>
\ No newline at end of file
+<symbol id="E613" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 43c-2 -3 -8 -6 -12 -6h-14c-5 0 -11 4 -13 9l-90 252l-90 -252c-2 -5 -8 -9 -13 -9h-14c-8 0 -14 6 -14 14c0 1 1 4 1 5l117 315c2 5 8 9 13 9s11 -4 13 -9l117 -315c0 -1 1 -4 1 -5c0 -2 -1 -6 -2 -8z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E614.xml b/data/Leland/E614.xml
index 7ff474d5354..cc19c9aa8cd 100644
--- a/data/Leland/E614.xml
+++ b/data/Leland/E614.xml
@@ -1 +1 @@
-<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M91 181c50 0 90 -40 90 -90s-40 -91 -90 -91s-91 41 -91 91s41 90 91 90zM91 153c-35 0 -63 -27 -63 -62s28 -63 63 -63s62 28 62 63s-27 62 -62 62z"/></symbol>
\ No newline at end of file
+<symbol id="E614" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M91 153c-35 0 -63 -27 -63 -62s28 -63 63 -63s62 28 62 63s-27 62 -62 62zM91 181c50 0 90 -40 90 -90s-40 -91 -90 -91s-91 41 -91 91s41 90 91 90z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E630.xml b/data/Leland/E630.xml
index 7f3ab6b6b67..b9812a0c490 100644
--- a/data/Leland/E630.xml
+++ b/data/Leland/E630.xml
@@ -1 +1 @@
-<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 121v-107c0 -8 -6 -14 -13 -14c-8 0 -14 6 -14 14v107c-68 7 -121 64 -121 134c0 74 60 134 135 134c74 0 134 -60 134 -134c0 -70 -53 -127 -121 -134zM135 361c-59 0 -107 -47 -107 -106c0 -54 40 -99 93 -106v106c0 8 6 14 14 14c7 0 13 -6 13 -14v-106 c53 7 93 52 93 106c0 59 -48 106 -106 106z"/></symbol>
\ No newline at end of file
+<symbol id="E630" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M148 121v-107c0 -8 -6 -14 -13 -14c-8 0 -14 6 -14 14v107c-68 7 -121 64 -121 134c0 74 60 134 134 134c75 0 135 -60 135 -134c0 -70 -53 -127 -121 -134zM135 361c-59 0 -107 -47 -107 -106c0 -54 40 -99 93 -106v106c0 7 6 14 14 14c7 0 13 -7 13 -14v-106 c53 7 93 52 93 106c0 59 -48 106 -106 106z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E632.xml b/data/Leland/E632.xml
index 3fb6f9caedd..df268640f88 100644
--- a/data/Leland/E632.xml
+++ b/data/Leland/E632.xml
@@ -1 +1 @@
-<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M375 121h-107c-7 -68 -64 -121 -134 -121c-74 0 -134 60 -134 135c0 74 60 134 134 134c70 0 127 -53 134 -121h107c8 0 14 -6 14 -13c0 -8 -6 -14 -14 -14zM28 135c0 -59 48 -107 106 -107c54 0 99 40 106 93h-106c-7 0 -14 6 -14 14c0 7 7 13 14 13h106 c-7 53 -52 93 -106 93c-58 0 -106 -47 -106 -106z"/></symbol>
\ No newline at end of file
+<symbol id="E632" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M375 121h-107c-7 -68 -64 -121 -134 -121c-74 0 -134 60 -134 135c0 74 60 134 134 134c70 0 127 -53 134 -121h107c8 0 14 -6 14 -13c0 -8 -6 -14 -14 -14zM28 135c0 -59 47 -107 106 -107c54 0 99 40 106 93h-106c-7 0 -14 6 -14 14c0 7 7 13 14 13h106 c-7 53 -52 93 -106 93c-59 0 -106 -48 -106 -106z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E650.xml b/data/Leland/E650.xml
index 4e9cab7471b..8d35b286b52 100644
--- a/data/Leland/E650.xml
+++ b/data/Leland/E650.xml
@@ -1 +1 @@
-<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M171 352c0 -54 -42 -98 -83 -98s-88 23 -88 98s90 193 244 193c88 0 206 -45 206 -148c0 -45 -28 -79 -74 -79c-34 0 -70 20 -92 66c-3 6 -7 14 -7 21c0 11 6 21 18 21c9 0 18 -9 24 -15c7 -6 25 -23 44 -23c14 0 24 9 24 23c0 25 -25 67 -89 84 c-19 -10 -52 -84 -52 -106c0 -7 1 -13 5 -19c15 -21 56 -79 61 -85c2 -4 23 -36 23 -69c0 -34 -34 -69 -59 -88c1 0 11 3 43 -31c14 -15 37 -29 56 -29c6 0 11 1 16 4c22 13 31 25 32 26c-4 16 -7 35 -7 56c0 74 32 163 110 163c40 0 74 -32 74 -74c0 -26 -13 -55 -45 -83 c-40 -34 -61 -53 -63 -55c1 -5 12 -51 54 -51c40 0 78 34 86 44c-1 7 -1 17 -1 28c0 52 15 142 113 176c-33 58 -136 104 -198 127c-2 1 -19 8 -20 22c0 1 0 2 1 3c1 8 7 10 14 11c2 0 3 -1 4 -1c7 0 14 -2 21 -3c64 -11 287 -83 311 -289c1 -8 1 -16 1 -24 c0 -71 -44 -156 -124 -156c-47 0 -94 34 -109 74c-7 -7 -71 -73 -131 -73c-51 0 -79 67 -82 74c-44 -37 -66 -74 -100 -74c-30 0 -43 8 -62 34c-11 15 -22 41 -39 41c-21 0 -36 -28 -47 -40c-15 -16 -42 -38 -64 -38c-11 0 -20 5 -26 18c-4 7 -5 13 -5 19c0 37 60 63 71 70 c15 10 49 28 83 57c18 16 26 30 26 43c0 10 -4 19 -10 27c-16 22 -53 65 -70 90c-6 9 -8 20 -8 30c0 23 9 43 10 45c15 39 48 98 56 112c-61 0 -113 -24 -149 -75c-20 -26 -27 -50 -27 -68c0 -20 10 -34 22 -35c2 -1 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25 c15 0 20 -14 20 -27zM522 273c-26 0 -44 -32 -44 -90c0 -13 1 -27 3 -42c3 3 31 32 54 57c12 13 17 28 17 41c0 19 -11 34 -30 34zM758 61c27 6 40 20 40 84c0 54 -14 88 -29 116c-7 -1 -72 -11 -72 -120c0 -45 23 -81 53 -81c3 0 6 0 8 1zM940 8c-23 0 -42 21 -42 46 c0 26 19 47 42 47c22 0 41 -21 41 -47c0 -25 -19 -46 -41 -46z"/></symbol>
\ No newline at end of file
+<symbol id="E650" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M940 8c-23 0 -42 21 -42 46c0 26 19 47 42 47c22 0 41 -21 41 -47c0 -25 -19 -46 -41 -46zM758 61c27 5 40 20 40 84c0 54 -14 88 -29 116c-7 -1 -72 -11 -72 -120c0 -46 23 -81 53 -81c3 0 6 0 8 1zM522 273c-26 0 -44 -32 -44 -90c0 -13 1 -27 3 -42c3 3 31 32 54 57 c12 13 17 28 17 41c0 19 -11 34 -30 34zM170 352c0 -54 -41 -98 -82 -98s-88 23 -88 98s90 193 244 193c17 0 35 -2 54 -5c111 -20 152 -89 152 -143c0 -28 -11 -52 -28 -64c-14 -10 -30 -15 -46 -15c-34 0 -70 20 -92 65c-3 7 -7 15 -7 22c0 1 -1 1 0 2c0 6 2 11 7 15 c4 3 7 4 11 4c9 0 18 -9 24 -15c7 -6 25 -23 44 -23c6 0 12 2 18 7c4 3 6 9 6 16c0 25 -25 67 -89 84c-2 -2 -17 -14 -30 -43c-10 -20 -23 -44 -22 -63c0 -7 1 -13 5 -19c15 -21 56 -79 61 -85c2 -4 23 -36 23 -69c0 -8 -2 -15 -5 -22c-15 -37 -50 -63 -54 -66 c1 0 11 3 43 -31c14 -15 37 -29 56 -29c6 0 11 1 16 4c22 13 31 25 32 26c-5 16 -7 35 -7 56c0 74 31 163 110 163c40 0 74 -32 74 -74c0 -26 -13 -55 -45 -83c-40 -34 -61 -53 -63 -55c1 -5 12 -51 54 -51c40 0 78 34 86 44c-1 7 -1 16 -1 28c0 52 15 142 113 176 c-4 7 -45 69 -176 119c-7 3 -15 5 -22 8c-2 1 -19 8 -20 22v3c2 8 8 10 15 10h4c7 0 14 -2 21 -3c64 -12 287 -83 311 -289c0 -8 1 -16 1 -24c0 -71 -36 -136 -100 -153c-8 -2 -16 -3 -24 -3c-47 0 -94 34 -109 74c-8 -7 -71 -73 -131 -73c-51 0 -79 67 -82 74 c-44 -37 -66 -74 -100 -74c-30 0 -43 8 -62 34c-11 15 -22 41 -39 41c-21 0 -36 -28 -48 -40c-14 -16 -41 -38 -63 -38c-11 0 -20 5 -27 18c-3 7 -4 13 -4 19c0 37 60 63 71 70c15 10 49 28 83 57c18 16 26 30 26 43c0 10 -4 19 -10 27c-16 22 -53 65 -70 90 c-6 9 -9 19 -9 30c0 23 10 43 11 45c15 39 48 98 56 112h-6c-22 0 -94 -7 -143 -75c-20 -26 -27 -50 -27 -68c0 -20 10 -34 22 -35c2 -1 4 -1 6 -1c14 0 25 10 30 32c4 19 14 25 22 24h2c10 0 17 -8 17 -26z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E651.xml b/data/Leland/E651.xml
index 8aa64f74e69..55d7a681959 100644
--- a/data/Leland/E651.xml
+++ b/data/Leland/E651.xml
@@ -1 +1 @@
-<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 407c0 9 9 19 18 19c10 0 19 -9 25 -15c7 -6 25 -22 43 -22c16 0 25 7 25 23c0 24 -25 67 -89 83c-2 -1 -17 -14 -30 -42c-10 -21 -23 -44 -22 -64c0 -7 1 -13 5 -18c15 -22 56 -79 61 -86c2 -3 23 -35 23 -69c0 -32 -35 -70 -59 -88c1 0 11 3 43 -31 c14 -15 37 -29 56 -29c6 0 16 2 21 5c10 7 23 17 31 23c3 3 7 5 11 5c7 0 12 -4 12 -11c0 -4 -1 -7 -3 -12c-21 -34 -81 -85 -115 -85c-30 0 -43 8 -62 34c-11 16 -22 41 -39 41c-21 0 -36 -27 -48 -40c-15 -16 -41 -38 -63 -38c-11 0 -20 5 -27 18c-3 7 -4 13 -4 19 c0 38 60 63 71 70c15 10 49 28 83 57c18 16 26 30 26 44c0 9 -4 18 -10 27c-16 21 -53 64 -70 89c-6 9 -9 20 -9 30c0 23 10 43 11 45c15 40 48 98 56 112c-76 0 -176 -59 -176 -143c0 -20 10 -33 22 -35c2 0 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25 c16 0 19 -12 19 -26c0 -54 -41 -99 -82 -99s-88 23 -88 98c0 76 90 193 243 193c89 0 207 -43 207 -148c0 -46 -29 -79 -75 -79c-33 0 -69 21 -91 66c-1 1 -8 14 -8 23z"/></symbol>
\ No newline at end of file
+<symbol id="E651" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M276 407c0 7 3 11 8 15c4 3 7 4 10 4c10 0 19 -9 25 -15c7 -6 25 -22 43 -22c7 0 13 1 19 6c4 3 6 9 6 17c0 24 -25 67 -89 83c-2 -1 -17 -14 -30 -42c-10 -21 -23 -45 -22 -64c0 -7 1 -13 5 -18c15 -22 56 -79 61 -86c2 -3 23 -36 23 -69c0 -7 -2 -15 -5 -22 c-15 -37 -50 -63 -54 -66c1 0 11 3 43 -31c14 -15 36 -29 56 -29c6 0 16 2 21 5c10 7 23 17 31 23c3 3 7 5 11 5c7 0 12 -4 12 -11c0 -4 -1 -7 -3 -12c-21 -34 -81 -85 -115 -85c-30 0 -43 8 -62 34c-11 16 -22 41 -39 41c-21 0 -36 -28 -48 -40c-15 -16 -41 -38 -63 -37 c-11 0 -20 4 -27 17c-3 7 -4 13 -4 19c0 37 60 63 71 70c15 10 49 28 83 57c18 16 26 30 26 44c0 9 -4 18 -10 27c-16 21 -53 64 -70 89c-6 9 -9 20 -9 30c0 23 10 43 11 45c15 40 48 98 56 112h-6h-4c-26 0 -93 -10 -140 -75c-19 -26 -26 -50 -26 -68c0 -20 10 -33 22 -35 c2 -1 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25h2c10 -1 17 -9 17 -27c0 -54 -41 -98 -82 -98s-88 23 -88 98s90 193 243 193c18 0 36 -1 55 -5c111 -20 152 -88 152 -143c0 -28 -11 -52 -28 -64c-14 -10 -30 -15 -47 -15c-33 0 -69 21 -92 66c0 1 -7 14 -7 23z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E655.xml b/data/Leland/E655.xml
index fdf68e70a6c..13bafb34637 100644
--- a/data/Leland/E655.xml
+++ b/data/Leland/E655.xml
@@ -1 +1 @@
-<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M114 48c-32 0 -66 34 -66 66c0 19 12 32 31 32c6 0 11 -1 16 -3c6 -2 12 -4 16 -4s8 2 13 7l25 24c7 7 3 19 -1 28v1c-5 10 -12 22 -21 22h-34c-15 0 -15 -7 -22 -19s-18 -23 -31 -23c-22 0 -40 25 -40 57s18 58 40 58c13 0 24 -11 31 -23s7 -20 22 -20h34 c9 0 16 12 20 21c0 0 0 1 1 2c4 9 8 22 1 29l-24 24c-5 5 -9 6 -13 6c-5 0 -10 -2 -17 -4c-5 -1 -10 -2 -15 -2c-20 0 -32 12 -32 32c0 32 34 66 66 66c19 0 32 -12 32 -31c0 -6 -1 -11 -3 -16c-2 -6 -4 -11 -4 -16s2 -9 7 -14l24 -24c3 -3 6 -4 10 -4c6 0 13 3 18 5h1l1 1 c9 4 21 11 21 20v34c0 15 -7 15 -19 22s-23 18 -23 31c0 22 25 40 57 40s58 -18 58 -40c0 -13 -11 -24 -23 -31s-20 -7 -20 -22v-34c0 -9 12 -16 21 -20c0 0 1 0 2 -1c5 -2 12 -5 18 -5c4 0 8 1 11 4l24 24c5 5 6 9 6 13c0 5 -2 10 -4 17c-1 5 -2 10 -2 15c0 19 11 32 31 32 c32 0 67 -35 67 -67c0 -20 -13 -31 -32 -31c-5 0 -10 1 -15 2c-7 2 -12 4 -17 4c-4 0 -8 -1 -13 -6l-24 -24c-7 -7 -3 -20 1 -29c5 -11 12 -23 21 -23h34c15 0 15 8 22 20s18 23 31 23c22 0 40 -26 40 -58s-18 -57 -40 -57c-13 0 -24 11 -31 23s-7 19 -22 19h-34 c-9 0 -16 -12 -21 -22v-1c-4 -9 -8 -21 -1 -28l24 -24c5 -5 9 -7 14 -7s10 2 16 4c5 2 10 3 16 3c19 0 31 -13 31 -32c0 -32 -34 -66 -66 -66c-20 0 -32 12 -32 32c0 5 1 10 2 15c2 7 4 12 4 17c0 4 -1 7 -6 12l-24 25c-3 3 -7 4 -11 4c-12 0 -41 -13 -41 -26v-34 c0 -15 8 -15 20 -22s23 -18 23 -31c0 -22 -26 -40 -58 -40s-57 18 -57 40c0 13 11 24 23 31s19 7 19 22v34c0 9 -12 16 -21 20l-1 1h-1c-5 2 -12 5 -18 5c-4 0 -7 -1 -10 -4l-24 -25c-5 -5 -7 -9 -7 -13s2 -10 4 -16c2 -5 3 -10 3 -16c0 -19 -13 -31 -32 -31zM173 236 c0 -32 31 -63 63 -63c33 0 64 30 64 63c0 35 -29 64 -64 64s-63 -29 -63 -64z"/></symbol>
\ No newline at end of file
+<symbol id="E655" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M69 69c-14 14 -21 30 -21 45c0 9 3 18 9 24c5 5 14 8 22 8c6 0 11 -1 16 -3c6 -2 12 -4 16 -4s8 2 13 7l25 24c7 7 3 19 -1 28v1c0 1 -1 0 -1 1c-4 9 -11 21 -20 21h-34c-15 0 -15 -7 -22 -19s-18 -23 -31 -23c-22 0 -40 25 -40 57s18 58 40 58c13 0 24 -11 31 -23 s7 -20 22 -20h34c9 0 16 12 20 21c0 1 1 1 1 2c4 9 8 22 1 29l-24 24c-5 5 -9 6 -13 6c-5 0 -10 -2 -17 -4c-5 -1 -10 -2 -15 -2c-9 0 -17 2 -23 8s-9 15 -9 24c0 15 7 31 21 45s30 21 45 21c9 0 18 -3 24 -9c5 -5 8 -14 8 -22c0 -6 -1 -11 -3 -16c-2 -6 -4 -11 -4 -16 s2 -9 7 -14l24 -24c7 -7 19 -3 28 1h1l1 1c9 4 21 11 21 20v34c0 15 -7 15 -19 22s-23 18 -23 31c0 22 25 40 57 40s58 -18 58 -40c0 -13 -11 -24 -23 -31s-20 -7 -20 -22v-34c0 -9 12 -16 21 -20c1 0 1 -1 2 -1c9 -4 22 -8 29 -1l24 24c5 5 6 9 6 13c0 5 -2 10 -4 17 c-1 5 -2 10 -2 15c0 9 2 17 8 23s14 9 23 9c15 0 32 -8 46 -22s21 -31 21 -45c0 -9 -3 -17 -9 -23s-14 -8 -23 -8c-5 0 -10 1 -15 2c-7 2 -12 4 -17 4c-4 0 -8 -1 -13 -6l-24 -24c-7 -7 -3 -20 1 -29c0 -1 1 -1 1 -2c4 -9 11 -21 20 -21h34c15 0 15 8 22 20s18 23 31 23 c22 0 40 -26 40 -58s-18 -57 -40 -57c-13 0 -24 11 -31 23s-7 19 -22 19h-34c-9 0 -16 -12 -20 -21c0 -1 -1 -1 -1 -1v-1c-4 -9 -8 -21 -1 -28l24 -24c5 -5 9 -7 14 -7s10 2 16 4c5 2 10 3 16 3c8 0 17 -3 22 -8c6 -6 9 -15 9 -24c0 -15 -7 -31 -21 -45s-30 -21 -45 -21 c-9 0 -18 3 -24 9s-8 14 -8 23c0 5 1 10 2 15c2 7 4 12 4 17c0 4 -1 7 -6 12l-24 25c-7 7 -20 3 -29 -1c-1 0 -1 -1 -2 -1c-9 -4 -21 -11 -21 -20v-34c0 -15 8 -15 20 -22s23 -18 23 -31c0 -22 -26 -40 -58 -40s-57 18 -57 40c0 13 11 24 23 31s19 7 19 22v34 c0 9 -12 16 -21 20l-1 1h-1c-9 4 -21 8 -28 1l-24 -25c-5 -5 -7 -9 -7 -13s2 -10 4 -16c2 -5 3 -10 3 -16c0 -8 -3 -17 -8 -22c-6 -6 -15 -9 -24 -9c-15 0 -31 7 -45 21zM192 192c10 -10 30 -19 44 -19s35 9 45 19s19 30 19 44c0 35 -29 64 -64 64s-63 -29 -63 -64 c0 -14 9 -34 19 -44z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E880.xml b/data/Leland/E880.xml
index bb47ef425ac..1480762eaca 100644
--- a/data/Leland/E880.xml
+++ b/data/Leland/E880.xml
@@ -1 +1 @@
-<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 233c0 -128 -79 -240 -170 -240c-62 0 -103 51 -103 129c0 94 62 241 173 241c61 0 100 -50 100 -130zM170 337c-61 0 -96 -236 -96 -282c0 -22 12 -36 30 -36c24 0 40 23 60 89c18 58 34 146 34 186c0 27 -11 43 -28 43z"/></symbol>
\ No newline at end of file
+<symbol id="E880" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M273 233c0 -128 -79 -240 -170 -240c-62 0 -103 51 -103 129c0 60 21 125 54 170c35 47 75 71 119 71c61 0 100 -50 100 -130zM107 241c-17 -61 -33 -150 -33 -186c0 -22 12 -36 30 -36c24 0 40 23 60 89c18 58 34 146 34 186c0 27 -11 43 -28 43c-24 0 -45 -32 -63 -96z "/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E883.xml b/data/Leland/E883.xml
index daa786bc38d..a474291b38b 100644
--- a/data/Leland/E883.xml
+++ b/data/Leland/E883.xml
@@ -1 +1 @@
-<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M179 185c42 -10 74 -27 74 -77c0 -66 -60 -116 -142 -116c-68 0 -111 32 -111 83c0 31 19 52 47 52c25 0 41 -16 41 -39c0 -18 -9 -30 -26 -36c-9 -3 -11 -4 -11 -10c0 -12 22 -24 44 -24c56 0 74 62 74 108c0 31 -11 48 -34 48c-5 0 -5 0 -16 -3c-3 -1 -9 -2 -12 -2 c-11 0 -18 6 -18 17s7 18 17 18c4 0 7 -1 13 -3c7 -3 11 -3 17 -3c40 0 63 53 63 87c0 31 -17 50 -45 50c-21 0 -42 -10 -42 -21c0 -3 0 -3 9 -10c11 -9 16 -19 16 -31c0 -21 -17 -37 -39 -37c-25 0 -42 18 -42 45c0 46 50 81 114 81c65 0 109 -34 109 -83 c0 -60 -50 -83 -100 -94z"/></symbol>
\ No newline at end of file
+<symbol id="E883" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M224 168c17 -12 29 -36 29 -60c0 -66 -60 -116 -142 -116c-68 0 -111 32 -111 83c0 31 19 52 47 52c25 0 41 -16 41 -39c0 -18 -9 -30 -26 -36c-9 -3 -11 -4 -11 -10c0 -12 22 -24 44 -24s44 12 55 31c12 21 19 50 19 77c0 31 -11 48 -34 48c-5 0 -5 0 -16 -3 c-3 -1 -9 -2 -12 -2c-11 0 -18 6 -18 17s7 18 17 18c4 0 7 -1 13 -3c7 -3 11 -3 17 -3c15 0 25 5 36 18c18 20 27 44 27 69c0 31 -17 50 -45 50c-21 0 -42 -10 -42 -21c0 -3 0 -3 9 -10c11 -9 16 -19 16 -31c0 -21 -17 -37 -39 -37c-25 0 -42 18 -42 45c0 46 50 81 114 81 c65 0 109 -34 109 -83c0 -27 -14 -54 -37 -70c-17 -12 -32 -17 -63 -24c25 -6 35 -10 45 -17z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E886.xml b/data/Leland/E886.xml
index d901b1d8b38..17a85934502 100644
--- a/data/Leland/E886.xml
+++ b/data/Leland/E886.xml
@@ -1 +1 @@
-<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 224c55 0 94 -37 94 -91c0 -75 -64 -138 -142 -138c-67 0 -110 48 -110 126c0 108 71 244 193 244c50 0 86 -27 86 -64c0 -26 -17 -43 -43 -43c-23 0 -41 15 -41 36c0 10 4 19 12 28c3 4 4 5 4 8c0 5 -8 9 -18 9c-55 0 -82 -96 -93 -136c20 16 34 21 58 21zM136 193 c-50 0 -58 -83 -58 -119s11 -55 33 -55c47 0 58 89 58 123c0 33 -12 51 -33 51z"/></symbol>
\ No newline at end of file
+<symbol id="E886" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M158 224c55 0 94 -37 94 -91c0 -75 -64 -138 -142 -138c-67 0 -110 48 -110 126c0 60 22 125 59 173s81 71 134 71c50 0 86 -27 86 -64c0 -26 -17 -43 -43 -43c-23 0 -41 15 -41 36c0 10 4 19 12 28c3 4 4 5 4 8c0 5 -8 9 -18 9c-19 0 -38 -13 -55 -39 c-13 -20 -24 -46 -38 -97c20 16 34 21 58 21zM90 152c-8 -20 -12 -51 -12 -78c0 -36 11 -55 33 -55c17 0 32 12 41 34c10 26 17 59 17 89c0 33 -12 51 -33 51c-20 0 -36 -13 -46 -41z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E887.xml b/data/Leland/E887.xml
index adf9b51fdb9..c547a89c945 100644
--- a/data/Leland/E887.xml
+++ b/data/Leland/E887.xml
@@ -1 +1 @@
-<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M271 365l1 -19c-95 -163 -117 -209 -131 -289c-7 -32 -13 -62 -54 -62c-27 0 -46 17 -46 42c0 34 13 52 149 228l19 25h-113c-29 0 -43 -12 -64 -50l-8 -15l-24 7l53 133c42 -5 63 -5 97 -5c36 0 64 1 121 5z"/></symbol>
\ No newline at end of file
+<symbol id="E887" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M271 365l1 -19c-95 -163 -117 -209 -131 -289c-5 -24 -6 -30 -12 -40c-8 -13 -24 -22 -42 -22c-27 0 -46 17 -46 42c0 34 13 52 149 228l19 25h-109h-4c-29 0 -43 -12 -64 -50l-8 -15l-24 7l53 133c42 -5 63 -5 97 -5c36 0 64 1 121 5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E888.xml b/data/Leland/E888.xml
index 4d0f7fee246..513f5744103 100644
--- a/data/Leland/E888.xml
+++ b/data/Leland/E888.xml
@@ -1 +1 @@
-<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 109c0 -67 -60 -114 -145 -114c-69 0 -115 34 -115 84c0 51 45 82 88 98c-27 24 -38 46 -38 77c0 65 53 111 129 111c62 0 104 -33 104 -82c0 -39 -23 -65 -74 -84c33 -21 51 -53 51 -90zM226 282c0 36 -21 57 -55 57s-58 -23 -58 -54c0 -22 9 -34 35 -50 c7 -4 12 -8 40 -22c28 21 38 40 38 69zM62 81c0 -37 26 -61 64 -61s67 26 67 59c0 25 -14 43 -46 61c-4 3 -4 2 -24 12c-6 3 -7 4 -15 8c-30 -17 -46 -46 -46 -79z"/></symbol>
\ No newline at end of file
+<symbol id="E888" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M260 109c0 -67 -60 -114 -145 -114c-69 0 -115 34 -115 84c0 27 14 53 38 71c13 10 28 19 50 27c-27 24 -38 46 -38 77c0 65 53 111 129 111c62 0 104 -33 104 -82c0 -39 -23 -65 -74 -84c33 -21 51 -53 51 -90zM62 81c0 -37 26 -61 64 -61s67 26 67 59 c0 25 -14 43 -46 61c-4 3 -4 2 -24 12c-6 3 -7 4 -15 8c-30 -17 -46 -46 -46 -79zM226 282c0 36 -21 57 -55 57s-58 -23 -58 -54c0 -22 9 -34 35 -50c7 -4 12 -8 40 -22c28 21 38 40 38 69z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E889.xml b/data/Leland/E889.xml
index 692b7c3dc23..a1f54457cd5 100644
--- a/data/Leland/E889.xml
+++ b/data/Leland/E889.xml
@@ -1 +1 @@
-<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M121 141c-55 0 -94 37 -94 91c0 75 65 138 143 138c67 0 109 -48 109 -126c0 -108 -72 -244 -193 -244c-50 0 -86 27 -86 64c0 26 18 43 44 43c23 0 40 -15 40 -36c0 -10 -4 -18 -12 -27c-3 -4 -4 -6 -4 -9c0 -5 8 -9 18 -9c55 0 82 96 93 136c-20 -16 -34 -21 -58 -21z M169 347c-49 0 -58 -88 -58 -123c0 -33 11 -52 32 -52c50 0 59 84 59 120s-11 55 -33 55z"/></symbol>
\ No newline at end of file
+<symbol id="E889" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M121 141c-55 0 -94 37 -94 91c0 75 65 138 143 138c67 0 109 -48 109 -126c0 -60 -22 -125 -59 -173s-82 -71 -134 -71c-50 0 -86 27 -86 64c0 26 18 43 44 43c23 0 40 -15 40 -36c0 -10 -4 -18 -12 -27c-3 -4 -4 -6 -4 -9c0 -5 8 -9 18 -9c19 0 38 13 55 39 c13 20 24 46 38 97c-20 -16 -34 -21 -58 -21zM127 313c-10 -25 -16 -59 -16 -89c0 -33 11 -52 32 -52c20 0 36 13 46 41c8 20 13 52 13 79c0 36 -11 55 -33 55c-18 0 -33 -12 -42 -34z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E93C.xml b/data/Leland/E93C.xml
index 45c33675a94..d3e4be52f4c 100644
--- a/data/Leland/E93C.xml
+++ b/data/Leland/E93C.xml
@@ -1 +1 @@
-<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -9l-154 -120c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -8zM198 -80l73 57l-133 104l-74 -58z"/></symbol>
\ No newline at end of file
+<symbol id="E93C" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -9l-154 -120c-2 -2 -5 -3 -9 -3c-3 0 -6 1 -8 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c3 -2 5 -6 5 -9c0 -4 -2 -7 -5 -9zM197 -80l74 57l-133 104l-74 -58z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/E93D.xml b/data/Leland/E93D.xml
index b97be880543..b542103f0f2 100644
--- a/data/Leland/E93D.xml
+++ b/data/Leland/E93D.xml
@@ -1 +1 @@
-<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -10l-154 -119c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z"/></symbol>
\ No newline at end of file
+<symbol id="E93D" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M330 -10l-154 -119c-2 -2 -5 -3 -9 -3c-3 0 -6 1 -8 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c3 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAAD.xml b/data/Leland/EAAD.xml
index b79eb6ef0f4..d60210a2c76 100644
--- a/data/Leland/EAAD.xml
+++ b/data/Leland/EAAD.xml
@@ -1 +1 @@
-<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 255l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20l-208 -147c-4 -2 -10 -4 -14 -4c-13 0 -24 11 -24 24c0 5 2 11 5 15l54 71c3 4 5 9 5 14c0 16 -16 30 -34 30c-8 0 -16 -3 -23 -10c-2 -1 -4 -2 -7 -2s-6 1 -10 4s-10 10 -14 14c0 0 -3 2 -3 7c0 2 1 6 3 9 c27 32 50 42 93 42l-65 85c-3 4 -4 11 -4 15c0 14 10 25 24 25c4 0 10 -3 14 -5z"/></symbol>
\ No newline at end of file
+<symbol id="EAAD" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M41 255l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20l-208 -147c-4 -2 -10 -4 -14 -4c-13 0 -24 11 -24 24c0 5 2 11 5 15l54 71c3 4 5 9 5 14c0 16 -16 30 -34 30c-8 0 -16 -3 -23 -10c-2 -1 -4 -2 -7 -2s-6 1 -10 4s-10 10 -14 14c0 0 -3 2 -3 7c0 2 1 6 3 9 c5 6 15 16 21 21c13 11 35 21 62 21h10l-65 85c-3 4 -4 11 -4 15c0 14 10 25 24 25c4 0 10 -3 14 -5z"/></symbol>
\ No newline at end of file
diff --git a/data/Leland/EAAE.xml b/data/Leland/EAAE.xml
index ac30ea1a826..92772109a15 100644
--- a/data/Leland/EAAE.xml
+++ b/data/Leland/EAAE.xml
@@ -1 +1 @@
-<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 68l-208 -147c-4 -2 -10 -5 -14 -5c-14 0 -24 11 -24 25c0 4 1 11 4 15l65 85c-42 0 -66 9 -93 42c-2 3 -3 7 -3 9c0 5 3 7 3 7c4 4 10 11 14 14s7 4 10 4s5 -1 7 -2c7 -7 15 -10 23 -10c18 0 34 14 34 30c0 5 -2 10 -5 14l-54 71c-3 4 -5 10 -5 15c0 13 11 24 24 24 c4 0 10 -2 14 -4l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20z"/></symbol>
\ No newline at end of file
+<symbol id="EAAE" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M249 68l-208 -147c-4 -2 -10 -5 -14 -5c-14 0 -24 11 -24 25c0 4 1 11 4 15l65 85h-10c-27 0 -49 10 -62 21c-6 5 -16 15 -21 21c-2 3 -3 7 -3 9c0 5 3 7 3 7c4 4 10 11 14 14s7 4 10 4s5 -1 7 -2c7 -7 15 -10 23 -10c18 0 34 14 34 30c0 5 -2 10 -5 14l-54 71 c-3 4 -5 10 -5 15c0 13 11 24 24 24c4 0 10 -2 14 -4l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20z"/></symbol>
\ No newline at end of file
diff --git a/fonts/Leland.svg b/fonts/Leland.svg
index a8132279fa2..8e4d4c63fdf 100644
--- a/fonts/Leland.svg
+++ b/fonts/Leland.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20201107 at Thu Nov 25 15:58:24 2021
+Created by FontForge 20201107 at Sun Feb 20 09:14:11 2022
  By Klaus Rettinghaus
 Copyright \(c\) 2021, MuseScore BVBA \(http://www.musescore.org/\)
 </metadata>
@@ -19,209 +19,230 @@ Copyright \(c\) 2021, MuseScore BVBA \(http://www.musescore.org/\)
     bbox="-273 -2005 2276 2004"
     underline-thickness="50"
     underline-position="-125"
-    stemh="32"
+    stemh="30"
     stemv="28"
     unicode-range="U+000D-F630"
   />
 <missing-glyph horiz-adv-x="500" 
  />
     <glyph glyph-name="uniE527" unicode="&#xe520;&#xe520;&#xe520;&#xe520;&#xe520;&#xe520;" horiz-adv-x="1970" 
-d="M1867 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136
-c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62
-l99 276c12 32 23 58 23 75c0 15 -9 22 -23 22c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26
-c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2
-c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43
-c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1
-c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43z
-M168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM554 112h1c6 18 16 54 16 81c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101
-c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3c25 12 49 59 62 98zM816 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2
-c3 0 9 1 12 3zM1140 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1464 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9
-c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1788 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-39 0 -76 -70 -83 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43
-c2 -1 5 -2 7 -2c3 0 9 1 12 3z" />
+d="M1880 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 11 -5 18 -15 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90
+c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 11 -5 18 -15 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2
+c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 11 -5 18 -15 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62
+l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21
+c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19
+c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2
+c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63
+c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l2 3c17 17 49 43 80 43c4 0 9 -1 13 -2zM231 112c6 18 16 54 16 81c0 9 -1 17 -4 23
+c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM554 112h1c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1
+c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3c25 12 49 59 62 98zM878 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98zM1202 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -13 -2 -20 -6c-26 -15 -54 -57 -63 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43
+c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98zM1526 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -13 -2 -20 -6c-26 -15 -54 -57 -63 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98z
+M1850 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -13 -2 -20 -6c-26 -15 -54 -57 -63 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98z" />
     <glyph glyph-name="uniE528" unicode="&#xe520;&#xe520;&#xe520;&#xe520;&#xe520;" horiz-adv-x="1646" 
-d="M1543 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136
-c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62
-l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26
-c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 105 96 105
-c4 0 7 0 11 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3
-c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -33 68 -66c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179
-c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43
-c2 -1 6 -2 8 -2c3 0 8 1 11 3zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM1140 14c42 20 79 133 79 180
-c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1464 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101
-c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3z" />
+d="M1556 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90
+c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2
+c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62
+l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15
+c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 105 96 105c4 0 7 0 11 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3
+c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -17 55 -64c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -17 55 -64c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43
+c4 0 9 -1 13 -2c13 -3 46 -17 55 -64c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2zM231 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM555 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43
+c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3c25 12 50 59 63 98z
+M1202 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98zM1526 112c6 18 17 55 17 82c0 9 -1 17 -4 22
+c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98z" />
     <glyph glyph-name="uniE529" unicode="&#xe520;&#xe520;&#xe520;&#xe520;" horiz-adv-x="1322" 
-d="M1219 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136
-c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62
-l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4
-c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65
-c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1
-c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3z
-M816 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3zM1140 14c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1
-c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3z" />
+d="M1232 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-2 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90
+c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-17 0 -36 -13 -44 -26c-10 -17 -22 -40 -37 -90c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2
+c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61
+l99 276c5 10 23 53 23 77c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -47 -26 -60l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66
+c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 53 66 66 100 66c6 0 11 0 16 -1
+c35 -5 56 -43 56 -43l2 -3l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2zM231 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -2 8 -2c3 0 8 1 11 3
+c25 12 50 59 63 98zM555 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2h1c3 0 8 1 11 3c25 12 50 59 63 98zM878 112c6 18 17 55 17 82
+c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98zM1202 112c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1
+c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -2 7 -2c3 0 9 1 12 3c25 12 49 59 62 98z" />
     <glyph glyph-name="uniE52A" unicode="&#xe520;&#xe520;&#xe520;" horiz-adv-x="998" 
-d="M895 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -77 -136 -132 -136
-c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61
-l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1
-c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69
-c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22
-c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1c3 0 9 0 12 2c25 12 50 59 63 98z" />
+d="M908 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-59 -161h76v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90
+c-21 -80 -77 -136 -132 -136c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2
+c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43
+c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2z
+M231 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM555 112c6 18 16 54 16 81c0 9 -1 17 -4 23
+c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM879 112h-1c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1
+c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1c3 0 9 0 12 2c25 12 50 59 63 98z" />
     <glyph glyph-name="uniE52B" unicode="&#xe520;&#xe520;" horiz-adv-x="674" 
-d="M571 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136
-c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43
-c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z
-M492 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z" />
+d="M584 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90
+c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1
+c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2zM231 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1
+c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM555 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98z" />
     <glyph glyph-name="uniE52C" unicode="&#xe521;&#xe520;" horiz-adv-x="729" 
-d="M508 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193
-c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192
-c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70
-c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86
-c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11zM536 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" />
+d="M508 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88
+c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM536 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1zM339 44c7 12 18 39 18 39l17 -8c-1 -2 -1 -4 -2 -6c-13 -35 -30 -71 -75 -71c-14 0 -32 6 -40 18c-7 10 -10 22 -10 36s3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c-1 0 -1 1 -2 1h-1c-1 0 -2 -1 -3 -1
+c-23 -10 -55 -52 -75 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-34 0 -71 -131 -75 -146c-4 -14 -9 -32 -14 -54c-4 -16 -9 -16 -11 -16h-38h-15c-4 0 -6 2 -8 4
+c-1 2 -2 4 -2 6s1 3 1 5c3 9 40 120 40 121c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 22 23 47 23c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4
+c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-2 -5 -7 -25 -9 -31c-4 -13 -8 -25 -8 -33c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z" />
     <glyph glyph-name="uniE52D" unicode="&#xe521;&#xe522;" horiz-adv-x="741" 
-d="M289 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45
-c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200
-c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35
-l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z" />
+d="M289 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132
+c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8
+c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM339 44c7 12 18 39 18 39
+l17 -8c-1 -2 -1 -4 -2 -6c-13 -35 -30 -71 -75 -71c-14 0 -32 6 -40 18c-7 10 -10 22 -10 36s3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c-1 0 -1 1 -2 1h-1c-1 0 -2 -1 -3 -1c-23 -10 -55 -52 -75 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3
+s-2 6 -2 9v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-34 0 -71 -131 -75 -146c-4 -14 -9 -32 -14 -54c-4 -16 -9 -16 -11 -16h-38h-15c-4 0 -6 2 -8 4c-1 2 -2 4 -2 6s1 3 1 5c3 9 40 120 40 121c11 32 19 56 19 70c0 8 -2 13 -8 15
+c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 22 23 47 23c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86
+c-2 -5 -7 -25 -9 -31c-4 -13 -8 -25 -8 -33c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z" />
     <glyph glyph-name="uniE52E" unicode="&#xe520;&#xe522;" horiz-adv-x="719" 
-d="M277 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19
-c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c44 21 79 131 79 179
-c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" />
+d="M129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88
+c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1zM277 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62
+c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14
+c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35
+c-46 0 -81 29 -81 81c0 27 25 52 52 52z" />
     <glyph glyph-name="uniE52F" unicode="&#xe522;&#xe522;" horiz-adv-x="621" 
-d="M181 253l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1
-c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43
-c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53
-c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170
-c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133z" />
+d="M181 253l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34
+c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82
+c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279
+c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10
+v22c0 6 4 10 10 10h76l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34
+c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133z" />
     <glyph glyph-name="uniE530" unicode="&#xe522;&#xe522;&#xe522;" horiz-adv-x="871" 
-d="M837 357v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c5 4 6 7 6 13c0 4 -2 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11
-v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 20 -16c3 0 5 0 7 1c3 1 7 2 9 4
-c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 16 69 24 99l34 134h-159v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9
-c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40
-c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39
-c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h156l1 2
-c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h157v2
-c25 75 66 171 160 171c41 0 84 -21 90 -66z" />
+d="M837 357v-1c0 -3 1 -7 1 -10c0 -5 -1 -12 -2 -17c-3 -11 -14 -24 -24 -29c-9 -5 -17 -6 -24 -6h-5c-4 0 -10 2 -13 3c-6 2 -13 9 -17 14c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c5 4 6 7 6 13c0 4 -2 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10
+c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-5 0 -13 0 -18 1c-37 6 -64 34 -64 80c0 27 25 52 52 52c36 0 46 -26 46 -40
+c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 19 -16c4 0 5 0 8 1s7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 16 69 24 99l34 134h-159v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52
+c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36
+c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76
+l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5
+c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -14 -24 -24 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3
+c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -29 -51 -132l-1 -4h156l1 2c22 66 45 109 71 133c21 20 42 30 61 35c8 2 20 3 28 3c5 0 12 0 17 -1
+c32 -5 56 -23 64 -38c4 -7 8 -19 9 -27z" />
     <glyph glyph-name="uniE531" unicode="&#xe522;&#xe522;&#xe522;&#xe522;" horiz-adv-x="1121" 
-d="M1018 381c0 1 -1 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81
-c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 20 -16c3 0 5 0 7 1c3 1 7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 3h-156v-2c-7 -23 -16 -55 -25 -87
-c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122
-c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5
-c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9
-c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19
-c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39
-c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2
-c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2
-c24 75 67 171 160 171c41 0 84 -21 90 -66v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 8 6 13z" />
+d="M1018 381c0 1 -1 13 -16 13c-11 0 -16 -4 -20 -7c-2 -2 -7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-5 0 -13 0 -18 1
+c-37 6 -64 34 -64 80c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 19 -16c4 0 5 0 8 1s7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c1 6 3 13 4 19c6 28 13 57 21 89l1 3h-156v-2
+c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12
+c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4
+c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43
+c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38
+c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3
+h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5
+c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -14 -24 -24 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3
+c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c21 66 45 109 71 133c21 20 42 30 61 35c8 2 20 3 28 3c5 0 12 0 17 -1
+c32 -5 56 -23 64 -38c4 -7 8 -19 9 -27v-1c0 -3 1 -7 1 -10c0 -5 -1 -12 -2 -17c-3 -11 -14 -24 -24 -29c-9 -5 -17 -6 -24 -6h-5c-4 0 -10 2 -13 3c-6 2 -13 9 -17 14c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 13z" />
     <glyph glyph-name="uniE532" unicode="&#xe522;&#xe522;&#xe522;&#xe522;&#xe522;" horiz-adv-x="1371" 
-d="M947 -174c3 0 5 0 7 1c3 1 7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81
-c0 27 25 53 52 53c36 0 46 -27 46 -41c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279
-c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2
-c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 32 46 52 128l3 12
+d="M946 -174c4 0 5 0 8 1s7 2 9 4c9 6 16 14 22 26c10 20 17 51 30 102l3 12c9 37 17 69 24 99c2 8 3 16 5 23c1 6 3 13 4 19c6 28 13 57 21 89l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81
+c0 27 25 53 52 53c36 0 46 -27 46 -41c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279
+c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2
+c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5c6 0 11 2 16 5c24 16 31 46 52 128l3 12
 c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-46 0 -82 28 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -34 -25 -42c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 9 -5 14 -5
-c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-63c-6 0 -10 4 -10 10v22c0 6 4 11 10 11h76l1 1c25 74 66 171 159 171c28 0 68 -13 82 -39c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4
-c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c25 74 67 171 159 171c28 0 68 -13 82 -39c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19
-c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c25 74 67 171 159 171c28 0 68 -13 82 -39
-c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-6 -21 -27 -36 -48 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1
-c25 74 67 171 159 171c46 0 92 -26 92 -77c0 -6 0 -12 -2 -17c-5 -20 -28 -36 -49 -36c-7 0 -13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 8 6 13c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1
-c25 75 66 171 160 171c41 0 84 -21 90 -66v-1v-2l1 -6c0 -6 -1 -13 -2 -19c-6 -21 -27 -35 -48 -35c-16 0 -25 5 -35 17c-2 2 -3 5 -4 8c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 8 6 13c0 2 0 3 -1 5c-1 3 -5 6 -8 7c-4 1 -6 1 -8 1c-3 0 -7 0 -9 -1c-7 -2 -15 -10 -19 -16
-c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-49 0 -82 29 -82 81c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43
-c-1 0 -9 -2 -9 -9s5 -16 20 -16z" />
+c6 0 11 2 16 5c24 16 31 46 52 128l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 3h-63c-6 0 -10 4 -10 10v22c0 6 4 11 10 11h76l1 1c22 66 45 110 71 133c33 30 64 38 88 38c6 0 12 0 17 -1c32 -5 57 -23 65 -38c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19
+c-3 -11 -13 -24 -23 -29s-18 -7 -25 -7s-13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 13c0 1 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c22 66 45 109 71 133
+c33 30 64 38 88 38c6 0 12 0 17 -1c32 -5 57 -23 65 -38c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-18 -7 -25 -7s-13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 13c0 1 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1
+c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c22 66 45 109 71 133c33 30 64 38 88 38c6 0 12 0 17 -1c32 -5 57 -23 65 -38c7 -11 10 -24 10 -36c0 -7 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-18 -7 -25 -7s-13 2 -17 4c-10 4 -18 13 -21 22
+c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 13c0 1 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1c22 66 45 109 71 133c33 30 64 38 88 38c6 0 12 0 17 -1c32 -5 57 -23 65 -38c7 -12 10 -25 10 -38
+c0 -6 0 -12 -2 -17c-3 -11 -14 -24 -24 -29s-18 -7 -25 -7s-13 2 -17 4c-10 4 -18 13 -21 22c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 13c0 1 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1
+c22 66 45 109 71 133c21 20 42 30 61 35c8 2 20 3 28 3c5 0 12 0 17 -1c32 -5 56 -23 64 -38c4 -7 8 -19 9 -27v-1c0 -3 1 -7 1 -10c0 -5 -1 -12 -2 -17c-3 -11 -14 -24 -24 -29c-9 -5 -17 -6 -24 -6h-5c-4 0 -10 2 -13 3c-6 2 -13 9 -17 14c-2 2 -3 5 -4 8
+c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 13c0 1 0 3 -1 5c-1 3 -5 6 -8 7c-1 0 -1 1 -2 1h-6c-3 0 -7 0 -9 -1c-3 -1 -7 -4 -10 -6s-7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -5 10 -11v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87
+c-25 -85 -73 -235 -117 -279c-25 -25 -48 -35 -80 -35c-5 0 -13 0 -18 1c-37 6 -64 34 -64 80c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -2 -9 -9s5 -16 19 -16z" />
     <glyph glyph-name="uniE533" unicode="&#xe522;&#xe522;&#xe522;&#xe522;&#xe522;&#xe522;" horiz-adv-x="1621" 
-d="M1177 -155c0 -10 9 -15 18 -15c5 0 14 1 18 5c9 6 16 14 22 26c10 20 17 50 30 101l3 12c9 37 17 70 24 100c2 8 3 15 5 22c0 2 1 3 1 5l2 9c7 32 14 63 22 94l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36
-c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87
-c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122
+d="M1182 -166c3 -3 8 -4 13 -4c3 0 6 0 9 1s7 2 9 4c9 6 16 14 22 26c10 20 17 50 30 101l3 12c9 37 17 70 24 100c2 8 3 15 5 22c1 6 3 13 4 19c6 28 13 57 21 89l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36
+c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87
+c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122
 c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5
-c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9
-c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 32 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40
-c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39
-c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2
-c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8
-c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c45 0 93 -25 93 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8
-c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13
-c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c25 75 66 170 159 170c45 0 92 -25 92 -76c0 -6 0 -12 -2 -17c-6 -21 -29 -36 -50 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13
-c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1v1c25 75 67 171 160 171c40 0 85 -24 90 -67v-3l1 -5c0 -6 -1 -13 -2 -19c-6 -20 -28 -36 -49 -36c-15 0 -25 5 -34 17c-2 2 -3 6 -4 9c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 12
-c0 2 0 3 -1 5c-1 3 -5 6 -8 7c-1 1 -2 1 -3 1l-3 1c-4 0 -8 0 -11 -2c-7 -2 -15 -10 -19 -16c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36
-c-48 0 -82 31 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -3 -9 -10z" />
+c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9
+c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40
+c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1
+c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8
+c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15
+c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17
+c-3 -11 -14 -24 -24 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133
+c32 30 63 37 87 37c7 0 13 0 18 -1c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8
+c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 2c22 66 45 109 71 133c32 30 64 37 88 37c7 0 13 0 18 -1c32 -5 56 -23 64 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -14 -24 -24 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3
+c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h156l1 1v1c22 66 45 109 71 133c21 20 41 29 60 34c8 2 21 4 29 4c5 0 12 -1 17 -2
+c32 -5 56 -23 64 -38c4 -7 8 -19 9 -27c0 -3 1 -8 1 -11c0 -5 -1 -11 -2 -16c-3 -11 -14 -24 -24 -29c-9 -5 -18 -7 -25 -7h-4c-4 0 -10 2 -13 3c-6 2 -13 9 -17 14c-2 2 -3 6 -4 9c-2 5 -2 11 -2 16c0 13 5 25 15 33c4 2 6 7 6 12c0 2 0 3 -1 5c-1 3 -5 6 -8 7
+c-1 0 -1 1 -2 1c-2 0 -4 1 -6 1c-3 0 -7 -1 -9 -2c-3 -1 -7 -4 -10 -6s-7 -7 -9 -10c-10 -14 -20 -43 -42 -123l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72l-1 -1v-1c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36
+c-5 0 -13 1 -18 2c-37 6 -64 33 -64 79c0 27 25 53 52 53c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-1 0 -9 -3 -9 -10c0 -4 2 -8 5 -11z" />
     <glyph glyph-name="uniE534" unicode="&#xe522;&#xe520;" horiz-adv-x="614" 
-d="M-84 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM393 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19
-c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM421 12c3 0 8 0 11 2c44 21 79 131 79 179
-c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" />
+d="M393 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88
+c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM421 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1zM-84 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62
+c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14
+c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35
+c-46 0 -81 29 -81 81c0 27 25 52 52 52z" />
     <glyph glyph-name="uniE535" unicode="&#xe522;&#xe525;" horiz-adv-x="480" 
-d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM383 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11
-c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23
-c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21
-c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z" />
+d="M383 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5
+c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16
+c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2
+c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37
+c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
+c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z" />
     <glyph glyph-name="uniE536" unicode="&#xe524;&#xe522;" horiz-adv-x="600" 
-d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68
-c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28
-c0 7 3 19 17 27z" />
+d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132
+c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8
+c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13
+s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83
+c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z" />
     <glyph glyph-name="uniE537" unicode="&#xe524;&#xe522;&#xe520;" horiz-adv-x="840" 
-d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM619 -159h-225v21h62l99 275c5 10 22 52 22 77c0 7 -1 13 -5 16c-2 2 -4 2 -7 2h-4c-9 -2 -21 -10 -27 -19
-c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -44 32 -44 32l-2 6l-59 -160h76v-21zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38
-s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58
-c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM646 16c3 0 9 0 12 2c42 20 79 133 79 180c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1z" />
+d="M619 -159h-225v21h62l99 275c5 10 22 52 22 77c0 7 -1 13 -5 16c-2 1 -4 2 -7 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88
+c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -44 32 -44 32l-2 6l-59 -160h76v-21zM646 16c3 0 9 0 12 2c25 12 49 59 62 98c6 18 17 55 17 82c0 9 -1 17 -4 22c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 5 -1 7 -1zM148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62
+c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14
+c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35
+c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44
+s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z" />
     <glyph glyph-name="uniE538" unicode="&#xe524;&#xe522;&#xe520;&#xe520;" horiz-adv-x="1164" 
-d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM1061 261c46 0 70 -49 70 -90c0 -76 -55 -193 -140 -193c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20
-h-225v20h62l99 276c12 32 23 58 23 75c0 14 -8 22 -22 22c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4
-c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c36 0 62 -32 68 -65c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43zM168 228c0 0 -8 13 -34 13
-s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83
-c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM658 14c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2zM982 14
-c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2z" />
+d="M1074 259c15 -4 57 -21 57 -88c0 -16 -2 -34 -8 -56c-21 -81 -77 -137 -132 -137c-6 0 -13 0 -19 2c-34 9 -43 31 -43 31l-3 7l-58 -161h75v-20h-225v20h62l99 276c12 32 23 58 23 75c0 10 -4 18 -14 21c-3 1 -5 1 -8 1c-16 0 -35 -13 -43 -26c-10 -17 -23 -40 -38 -90
+c-21 -80 -76 -136 -131 -136c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -20 -10 -26 -19c-12 -16 -23 -48 -27 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1
+c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c13 -3 46 -16 55 -63c23 54 67 67 101 67c5 0 10 0 15 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2zM721 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1
+c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM1045 112c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1c3 0 8 0 11 2c25 12 50 59 63 98zM148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121
+c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22
+c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278
+c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15
+c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z" />
     <glyph glyph-name="uniE539" unicode="&#xe524;&#xe522;&#xe525;" horiz-adv-x="715" 
-d="M148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68
-c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28
-c0 7 3 19 17 27zM618 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6
-c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25
-c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z" />
+d="M618 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5
+c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16
+c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89
+s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8
+c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM148 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10
+v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12
+c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z
+" />
     <glyph glyph-name="uniE53A" unicode="&#xe524;&#xe522;&#xe525;&#xe520;" horiz-adv-x="1045" 
-d="M148 -65c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM824 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19
-c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM168 223c0 0 -8 13 -34 13s-45 -21 -45 -38
-s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58
-c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM618 198c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3
-c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34
-c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6zM852 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32
-c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" />
-    <glyph glyph-name="uniE53B" unicode="&#xe524;&#xe522;&#xe522;&#xe525;" horiz-adv-x="967" 
-d="M414 253l-1 -3h156l1 2c25 74 66 170 158 170c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1
-c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43
-c-5 -2 -8 -5 -9 -9c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53
-c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c25 74 66 170 158 170
-c29 0 69 -12 83 -39c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-6 -21 -27 -36 -49 -36c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -133zM168 228
+d="M824 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88
+c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM852 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1zM618 198c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3
+c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28
+c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM168 223
 c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25c-28 16 -35 39 -35 60
-c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM870 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18
-c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27
-c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z" />
+c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27zM148 -65c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12
+c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4
+c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86
+c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z" />
+    <glyph glyph-name="uniE53B" unicode="&#xe524;&#xe522;&#xe522;&#xe525;" horiz-adv-x="967" 
+d="M870 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5
+c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16
+c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM414 253l-1 -3h156l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1
+c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8
+c-15 -12 -23 -30 -51 -133l-1 -3h60c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-73v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 29 -82 82c0 27 25 52 52 52c36 0 46 -26 46 -40c0 -16 -6 -35 -25 -43c-5 -2 -8 -5 -9 -9
+c-1 -5 3 -10 6 -12c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-156v-2c-7 -23 -16 -55 -25 -87c-25 -85 -73 -235 -117 -279c-25 -25 -48 -36 -80 -36c-46 0 -82 28 -82 81c0 27 25 53 52 53c36 0 46 -26 46 -40
+c0 -16 -6 -35 -25 -43c-5 -2 -8 -6 -9 -10c-1 -5 3 -9 6 -11c4 -3 8 -4 13 -4c6 0 12 2 17 5c24 16 31 45 52 127l3 12c12 46 21 85 29 122c7 33 15 68 25 108l1 4h-63c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76l1 2c22 66 45 109 71 133c32 30 63 37 87 37c7 0 13 0 18 -1
+c32 -5 57 -23 65 -38c7 -11 10 -23 10 -35c0 -6 -1 -13 -3 -19c-3 -11 -13 -24 -23 -29s-19 -7 -26 -7c-6 0 -12 1 -16 3c-10 4 -18 14 -21 23c-1 5 -2 10 -2 15c0 13 5 26 15 34c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8
+c-15 -12 -23 -30 -51 -133zM168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34
+s-33 18 -45 25c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z" />
     <glyph glyph-name="uniE53C" unicode="&#xe523;&#xe522;" horiz-adv-x="619" 
-d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4
-c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2
-c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z" />
+d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132
+c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8
+c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM189 253c22 0 41 -16 41 -39
+s-8 -37 -19 -46c-6 -5 -17 -9 -29 -9c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4l34 109c11 35 20 64 20 81
+c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 21 24 46 24c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c6 8 13 16 22 22c8 5 27 16 50 16z" />
     <glyph glyph-name="uniE53D" unicode="&#xe523;&#xe522;&#xe525;" horiz-adv-x="733" 
-d="M167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM636 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11
-c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23
-c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21
-c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6zM189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12
-h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z" />
+d="M636 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5
+c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16
+c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3zM167 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2
+c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37
+c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
+c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52zM189 253c22 0 41 -16 41 -39s-8 -37 -19 -46c-6 -5 -17 -9 -29 -9c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2
+s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 21 24 46 24
+c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c6 8 13 16 22 22c8 5 27 16 50 16z" />
     <glyph glyph-name=".notdef" horiz-adv-x="500" 
  />
     <glyph glyph-name="uni0000" horiz-adv-x="0" 
@@ -233,39 +254,40 @@ h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1
     <glyph glyph-name="space" unicode=" " horiz-adv-x="250" 
  />
     <glyph glyph-name="uniE000" unicode="&#xe000;" horiz-adv-x="62" 
-d="M9 500c18 -19 53 -57 53 -130c0 -91 -39 -183 -39 -240c0 -61 35 -118 37 -120v-2c1 -1 0 -2 -1 -3s-3 0 -4 2c-1 1 -55 56 -55 137c0 88 35 150 35 265c0 22 -9 57 -34 88c-1 1 -2 2 -2 3c1 1 1 3 2 3c25 31 34 66 34 88c0 115 -35 177 -35 265c0 82 54 136 55 137
+d="M9 500c18 -19 53 -57 53 -130c0 -91 -39 -183 -39 -240c0 -61 35 -118 37 -120v-2c1 -1 0 -2 -1 -3s-3 0 -4 2c-1 1 -55 56 -55 137c0 88 35 150 35 265c0 22 -9 57 -34 88v0v0c-1 1 -2 2 -1 3c0 1 0 3 1 3c25 31 34 66 34 88c0 115 -35 177 -35 265c0 82 54 136 55 137
 c1 2 3 2 4 2c1 -1 1 -2 1 -3v-2c-2 -2 -37 -59 -37 -120c0 -57 39 -149 39 -240c0 -72 -35 -111 -53 -130z" />
     <glyph glyph-name="uniE001" unicode="&#xe001;" horiz-adv-x="62" 
-d="M53 500c-18 19 -53 58 -53 130c0 91 39 183 39 240c0 61 -35 118 -36 120c-1 1 -1 2 -1 2c0 1 0 2 1 3c1 0 3 0 4 -2c1 -1 55 -55 55 -137c0 -88 -35 -150 -35 -265c0 -22 9 -57 34 -88c1 0 1 -2 2 -3c0 -1 -1 -2 -2 -3c-25 -31 -34 -66 -34 -88c0 -115 35 -177 35 -265
+d="M53 500c-18 19 -53 58 -53 130c0 91 39 183 39 240c0 61 -35 118 -36 120c-1 1 -1 1 -1 2s0 2 1 3c1 0 3 0 4 -2c1 -1 55 -56 55 -137c0 -88 -35 -150 -35 -265c0 -22 9 -57 34 -88c1 -1 1 -2 1 -3c1 -1 0 -2 -1 -3v0v0c-25 -31 -34 -66 -34 -88c0 -115 35 -177 35 -265
 c0 -81 -54 -136 -55 -137c-1 -2 -3 -3 -4 -2s-1 1 -1 2s0 2 1 3c1 2 36 59 36 120c0 57 -39 149 -39 240c0 73 35 111 53 130z" />
     <glyph glyph-name="uniE002" unicode="&#xe002;" horiz-adv-x="528" 
 d="M210 -269h-196c-8 0 -14 6 -14 14v1511c0 8 6 14 14 14h196c191 0 292 154 293 156c3 3 7 5 11 5c2 0 5 0 7 -1c5 -2 7 -7 7 -12c0 -2 0 -3 -1 -5c-1 -3 -61 -260 -368 -260h-51v-1305h51c308 0 367 -257 368 -260c1 -2 1 -3 1 -5c0 -5 -2 -10 -7 -12c-2 -1 -5 -2 -7 -2
 c-4 0 -7 2 -10 5c-1 2 -103 157 -294 157z" />
     <glyph glyph-name="uniE003" unicode="&#xe003;" horiz-adv-x="491" 
-d="M484 277c4 -3 7 -7 7 -12c0 -2 -1 -4 -1 -5c-1 -3 -60 -260 -368 -260h-122v104c0 8 6 13 14 13h159c191 0 291 154 293 157c2 4 7 5 11 5c2 0 5 -1 7 -2z" />
+d="M484 277c4 -3 7 -7 7 -12c0 -2 -1 -4 -1 -5c-1 -3 -60 -260 -368 -260h-122v14v90c0 8 6 13 14 13h159c191 0 291 154 293 157c2 4 7 5 11 5c2 0 5 -1 7 -2z" />
     <glyph glyph-name="uniE004" unicode="&#xe004;" horiz-adv-x="491" 
-d="M484 -277c-2 -1 -5 -2 -7 -2c-4 0 -9 1 -11 5c-2 3 -102 157 -293 157h-159c-8 0 -14 5 -14 13v104h122c308 0 367 -257 368 -260c0 -1 1 -3 1 -5c0 -5 -3 -9 -7 -12z" />
+d="M484 -277c-2 -1 -5 -2 -7 -2c-4 0 -9 1 -11 5c-2 3 -102 157 -293 157h-159c-8 0 -14 5 -14 13v90v14h122c308 0 367 -257 368 -260c0 -1 1 -3 1 -5c0 -5 -3 -9 -7 -12z" />
     <glyph glyph-name="uniE005" unicode="&#xe005;" horiz-adv-x="491" 
-d="M7 277c2 1 5 2 7 2c4 0 9 -1 11 -5c2 -3 102 -157 293 -157h159c8 0 14 -5 14 -13v-104h-122c-308 0 -367 257 -368 260c0 1 -1 3 -1 5c0 5 3 9 7 12z" />
+d="M7 277c2 1 5 2 7 2c4 0 9 -1 11 -5c2 -3 102 -157 293 -157h159c8 0 14 -5 14 -13v-90v-14h-122c-308 0 -367 257 -368 260c0 1 -1 3 -1 5c0 5 3 9 7 12z" />
     <glyph glyph-name="uniE006" unicode="&#xe006;" horiz-adv-x="491" 
-d="M7 -277c-4 3 -7 7 -7 12c0 2 1 4 1 5c1 3 60 260 368 260h122v-104c0 -8 -6 -13 -14 -13h-159c-191 0 -291 -154 -293 -157c-2 -4 -7 -5 -11 -5c-2 0 -5 1 -7 2z" />
+d="M7 -277c-4 3 -7 7 -7 12c0 2 1 4 1 5c1 3 60 260 368 260h122v-14v-90c0 -8 -6 -13 -14 -13h-159c-191 0 -291 -154 -293 -157c-2 -4 -7 -5 -11 -5c-2 0 -5 1 -7 2z" />
     <glyph glyph-name="uniE007" unicode="&#xe007;" horiz-adv-x="1042" 
-d="M14 653l994 463c3 2 7 3 10 3c13 0 24 -11 24 -24v-205c0 -8 -6 -18 -14 -21l-994 -464c-3 -1 -7 -2 -10 -2c-13 0 -24 11 -24 24v204c0 9 6 18 14 22zM14 153l994 463c3 2 7 3 10 3c13 0 24 -11 24 -24v-205c0 -8 -6 -18 -14 -21l-994 -464c-3 -1 -7 -2 -10 -2
-c-13 0 -24 10 -24 23v205c0 9 6 18 14 22z" />
+d="M14 653l994 463c3 2 7 3 10 3c13 0 24 -11 24 -24v0v-205v0c0 -8 -6 -18 -14 -21l-994 -464c-3 -1 -7 -2 -10 -2c-13 0 -24 10 -24 24v0v204v0c0 9 6 18 14 22zM14 153l994 463c3 2 7 3 10 3c13 0 24 -11 24 -24v0v-205v0c0 -8 -6 -18 -14 -21l-994 -464
+c-3 -1 -7 -2 -10 -2c-13 0 -24 10 -24 24v0v204v0c0 9 6 18 14 22z" />
     <glyph glyph-name="uniE008" unicode="&#xe008;" horiz-adv-x="1539" 
-d="M17 639l1491 470c2 1 5 1 7 1c13 0 24 -10 24 -23v-195c0 -10 -7 -20 -17 -23l-1491 -470c-2 0 -5 -1 -7 -1c-13 0 -24 11 -24 24v195c0 9 8 19 17 22zM17 151l1491 470c2 0 5 1 7 1c13 0 24 -11 24 -24v-195c0 -9 -7 -20 -17 -22l-1491 -471c-2 0 -5 -1 -7 -1
-c-13 0 -24 11 -24 24v195c0 10 8 20 17 23z" />
+d="M17 639l1491 470c2 1 5 1 7 1c13 0 24 -10 24 -23v-195v0c0 -10 -7 -20 -17 -23l-1491 -470c-2 0 -5 -1 -7 -1c-13 0 -24 11 -24 24v195c0 9 8 19 17 22zM17 151l1491 470c2 0 5 1 7 1c13 0 24 -11 24 -24v-195c0 -9 -8 -20 -17 -22l-1491 -470c-2 -1 -5 -2 -7 -2
+c-13 0 -24 11 -24 24v195v0c0 9 7 20 17 23z" />
     <glyph glyph-name="uniE009" unicode="&#xe009;" horiz-adv-x="2276" 
-d="M20 661l2228 392c14 0 28 -7 28 -23v-189c0 -11 -9 -21 -20 -23l-2228 -393c-15 0 -28 8 -28 24v188c0 11 9 22 20 24zM20 186l2228 392c1 1 3 1 4 1c13 0 24 -11 24 -24v-188c0 -11 -9 -22 -20 -24l-2228 -392c-1 -1 -3 -1 -4 -1c-13 0 -24 11 -24 24v189
-c0 11 9 21 20 23z" />
+d="M20 661l2228 392h4c13 0 24 -10 24 -24v0v-188v0c0 -11 -9 -21 -20 -23l-2228 -393h-4c-13 0 -24 10 -24 24v0v188v0c0 11 9 22 20 24zM20 186l2228 392c1 1 3 1 4 1c13 0 24 -11 24 -24v0v-188v0c0 -11 -9 -22 -20 -24l-2228 -392c-1 -1 -3 -1 -4 -1
+c-13 0 -24 11 -24 24v0v189v0c0 11 9 21 20 23z" />
     <glyph glyph-name="uniE043" unicode="&#xe043;" horiz-adv-x="104" 
 d="M104 625c0 -29 -23 -53 -52 -53s-52 24 -52 53s23 53 52 53s52 -24 52 -53zM104 375c0 -29 -23 -53 -52 -53s-52 24 -52 53s23 53 52 53s52 -24 52 -53z" />
     <glyph glyph-name="uniE044" unicode="&#xe044;" horiz-adv-x="104" 
 d="M104 0c0 -29 -23 -53 -52 -53s-52 24 -52 53s23 53 52 53s52 -24 52 -53z" />
     <glyph glyph-name="uniE047" unicode="&#xe047;" horiz-adv-x="654" 
-d="M379 479l191 -98c56 -29 84 -85 84 -164s-49 -199 -203 -199c-153 0 -167 76 -171 95c-1 3 -1 6 -1 10c0 34 26 59 60 59s67 -24 77 -59c12 -40 38 -63 74 -63c40 0 95 31 95 118c0 43 -43 73 -96 102l-172 89l-205 -362c-2 -3 -6 -6 -9 -7c-4 0 -8 0 -11 2l-15 11
-c-3 2 -6 7 -6 11c0 2 0 5 1 7l204 360l-189 99c-58 33 -87 83 -87 162s50 199 204 199c153 0 167 -76 171 -95c1 -3 1 -6 1 -9c0 -36 -26 -61 -61 -61c-34 0 -67 24 -77 59c-12 40 -38 64 -74 64c-40 0 -95 -31 -95 -118c0 -49 33 -68 82 -94l187 -96l204 361c2 4 8 7 12 7
-c2 0 6 -1 8 -2l16 -11c3 -2 6 -8 6 -12c0 -2 -1 -4 -2 -6zM573 488c-34 0 -64 30 -64 64c0 35 29 65 64 65s64 -30 64 -65c0 -34 -30 -64 -64 -64zM82 289c-35 0 -65 29 -65 64s30 64 65 64c34 0 64 -30 64 -64s-30 -64 -64 -64z" />
+d="M379 479l191 -98c56 -29 84 -85 84 -164s-49 -199 -203 -199c-153 0 -167 76 -171 95c-1 3 -1 6 -1 10c0 20 11 49 44 57c5 1 11 2 16 2c34 0 67 -24 77 -59c12 -40 38 -63 74 -63c40 0 95 31 95 118c0 43 -43 73 -96 102l-172 89l-205 -362c-2 -3 -6 -6 -9 -7h-3
+c-2 0 -6 1 -8 2l-15 11c-3 2 -6 7 -6 11c0 2 0 5 1 7l204 360l-189 99c-58 33 -87 83 -87 162s50 199 204 199c153 0 167 -76 171 -95c1 -3 1 -6 1 -9c0 -21 -11 -51 -45 -59c-5 -1 -11 -2 -16 -2c-34 0 -67 24 -77 59c-12 40 -38 64 -74 64c-40 0 -95 -31 -95 -118
+c0 -49 33 -68 82 -94l187 -96l204 361c2 4 8 7 12 7c2 0 6 -1 8 -2l16 -11c3 -2 6 -8 6 -12c0 -2 -1 -4 -2 -6zM36 308c-12 12 -19 29 -19 45s7 33 19 45s30 19 46 19s33 -7 45 -19s19 -29 19 -45s-7 -33 -19 -45s-29 -19 -45 -19s-34 7 -46 19zM528 507
+c-12 12 -19 29 -19 45s7 34 19 46s29 19 45 19s33 -7 45 -19s19 -30 19 -46s-7 -33 -19 -45s-29 -19 -45 -19s-33 7 -45 19z" />
     <glyph glyph-name="uniE048" unicode="&#xe048;" horiz-adv-x="745" 
 d="M642 324h90c8 0 13 -6 13 -14v-10c0 -8 -5 -14 -13 -14h-91c-11 -154 -118 -277 -252 -286v-99c0 -8 -6 -14 -14 -14h-11c-8 0 -13 6 -13 14v99c-131 12 -236 134 -247 286h-90c-8 0 -14 6 -14 14v10c0 8 6 14 14 14h90c6 157 112 285 247 298v99c0 8 5 14 13 14h11
 c8 0 14 -6 14 -14v-99c137 -10 247 -138 253 -298zM389 324h148c0 142 -40 257 -148 268v-268zM351 324v267c-103 -14 -142 -127 -142 -267h142zM351 286h-142c0 -134 45 -241 142 -255v255zM389 286v-255c101 11 147 118 147 255h-147z" />
@@ -273,309 +295,315 @@ c8 0 14 -6 14 -14v-99c137 -10 247 -138 253 -298zM389 324h148c0 142 -40 257 -148
 d="M632 324h93c8 0 13 -5 13 -13v-12c0 -8 -5 -13 -13 -13h-93v-256c0 -17 -13 -30 -30 -30h-213v-99c0 -8 -6 -14 -14 -14h-11c-8 0 -14 6 -14 14v99h-214c-17 0 -30 13 -30 30v256h-92c-8 0 -14 5 -14 13v12c0 8 6 13 14 13h92v268c0 17 13 30 30 30h214v99
 c0 8 6 14 14 14h11c8 0 14 -6 14 -14v-99h213c17 0 30 -13 30 -30v-268zM526 324v268h-137v-268h137zM350 324v268h-137v-268h137zM213 286v-256h137v256h-137zM389 286v-256h137v256h-137z" />
     <glyph glyph-name="uniE04A" unicode="&#xe04a;" horiz-adv-x="554" 
-d="M366 32l-177 85c-100 42 -189 103 -189 217c0 111 61 164 89 187c-54 45 -89 111 -89 173c0 87 18 127 75 183c-46 43 -75 116 -75 181c0 107 69 223 231 223c175 0 227 -64 251 -106c10 -17 16 -38 16 -56c0 -43 -36 -60 -74 -60c-47 0 -77 33 -97 88
+d="M366 32l-177 85c-100 42 -189 103 -189 217c0 111 61 164 89 187c-54 45 -89 111 -89 173c0 87 18 127 75 183c-46 43 -75 116 -75 181c0 107 69 223 231 223c175 0 227 -64 251 -106c10 -17 16 -38 16 -56c0 -44 -36 -60 -74 -60c-47 0 -77 33 -97 88
 c-16 45 -43 87 -120 87s-128 -46 -128 -105c0 -95 63 -135 110 -160l176 -84c100 -42 189 -103 189 -217c0 -108 -57 -161 -86 -185c51 -38 86 -89 86 -161c0 -111 -61 -163 -89 -186c54 -45 89 -122 89 -193c0 -90 -49 -223 -231 -223c-89 0 -264 38 -264 156
 c0 47 27 74 73 74c55 0 75 -37 95 -96c18 -54 43 -86 120 -86s128 38 128 97c0 95 -63 142 -109 167zM188 624l177 -84c27 -11 54 -25 78 -40c26 20 31 69 32 74c0 85 -43 112 -110 142l-176 85c-31 15 -60 33 -85 52c-16 -16 -25 -37 -25 -62c0 -95 63 -142 109 -167z
 M189 285l176 -84c22 -11 57 -32 77 -47c27 19 32 69 33 75c0 85 -43 112 -110 142l-176 85c-22 11 -57 32 -77 46c-27 -19 -32 -68 -33 -74c0 -97 57 -114 87 -131c5 -3 13 -7 23 -12z" />
     <glyph glyph-name="uniE04B" unicode="&#xe04b;" horiz-adv-x="554" 
-d="M225 101v-97c0 -7 -6 -13 -12 -13h-11c-7 0 -13 6 -13 13v112c-100 42 -189 103 -189 217c0 112 61 165 89 187c-54 46 -89 112 -89 174c0 86 19 127 76 183c-46 43 -76 115 -76 181c0 106 69 223 231 223c175 0 228 -64 251 -106c9 -17 16 -35 16 -53
-c0 -46 -31 -64 -73 -64c-48 0 -78 33 -98 89c-16 44 -43 86 -120 86s-127 -46 -127 -105c0 -95 63 -134 109 -159v34c0 6 6 12 13 12h11c7 0 12 -6 12 -12v-54c26 -14 55 -28 104 -49v103c0 6 6 12 13 12h10c7 0 13 -6 13 -12v-118c100 -43 189 -104 189 -218
-c0 -108 -57 -161 -86 -184c51 -39 86 -89 86 -161c0 -111 -61 -164 -88 -187c53 -45 88 -121 88 -193c0 -90 -49 -223 -230 -223c-88 0 -265 40 -265 157c0 35 19 68 56 73c74 0 89 -25 113 -95c18 -54 42 -87 119 -87s128 39 128 98c0 95 -63 142 -110 167v-28
-c0 -7 -5 -13 -13 -13h-10c-8 0 -13 6 -13 13v48c-26 14 -55 28 -104 49zM189 624v177c-30 15 -59 32 -84 52c-3 -2 -25 -20 -25 -62c0 -95 62 -142 109 -167zM329 555v179c-34 16 -75 36 -104 49v-179c26 -14 55 -28 104 -49zM365 716l1 -177c27 -11 53 -24 77 -39
-c3 2 32 18 32 73c0 84 -45 111 -110 143zM79 427c0 -76 50 -112 110 -142v170c-26 14 -52 29 -76 46c-4 -1 -34 -15 -34 -74zM225 438v-171c35 -17 75 -36 104 -50v172c-34 16 -75 36 -104 49zM442 154c3 2 33 24 33 74c0 97 -56 114 -86 131c-5 2 -13 7 -24 12v-171
-c27 -13 53 -28 77 -46z" />
+d="M442 154c3 2 33 24 33 74c0 97 -56 114 -86 131c-5 2 -13 7 -24 12v-171c27 -13 53 -28 77 -46zM225 438v-171c34 -17 75 -36 104 -50v172c-34 16 -75 36 -104 49zM166 297c5 -3 13 -7 23 -12v170c-27 14 -52 29 -76 46c-4 -1 -34 -15 -34 -74c0 -77 57 -114 87 -130z
+M189 624v176c-31 16 -59 33 -85 53c-2 -2 -24 -20 -24 -62c0 -95 62 -142 109 -167zM329 555v179c-34 16 -75 36 -104 49v-179c26 -14 55 -28 104 -49zM365 716v-177c28 -11 54 -24 78 -39c3 2 32 18 32 73c0 84 -45 111 -110 143zM225 101v-97c0 -7 -6 -12 -12 -12h-11
+c-7 0 -13 5 -13 12v112c-100 42 -189 103 -189 217c0 112 61 164 89 187c-54 46 -89 112 -89 174c0 86 19 127 76 183c-47 43 -76 115 -76 181c0 106 69 223 231 223c175 0 228 -64 251 -106c9 -17 16 -35 16 -53c0 -46 -31 -64 -73 -64c-48 0 -78 33 -98 89
+c-16 44 -43 86 -120 86s-127 -46 -127 -105c0 -95 63 -134 109 -160v34c0 7 6 13 13 13h11c7 0 12 -6 12 -13v-53c26 -14 55 -28 104 -49v102c0 7 6 13 13 13h10c7 0 13 -6 13 -13v-118c100 -42 189 -103 189 -217c0 -108 -57 -161 -86 -184c51 -39 86 -89 86 -161
+c0 -111 -61 -164 -88 -187c53 -45 88 -121 88 -193c0 -90 -49 -222 -231 -222c-88 0 -264 39 -264 156c0 35 19 68 56 73c74 0 89 -25 113 -95c18 -54 42 -87 119 -87s128 39 128 98c0 95 -64 142 -110 167v-28c0 -7 -5 -12 -13 -12h-10c-8 0 -13 5 -13 12v48
+c-26 13 -55 27 -104 49z" />
     <glyph glyph-name="uniE050" unicode="&#xe050;" horiz-adv-x="640" 
-d="M123 -513c0 66 44 123 114 123c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 0 -5 -1 -5 -3c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 155 55 155 159c0 53 -12 123 -31 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 322 217 406c21 17 73 70 74 71
-c-17 112 -22 161 -22 215c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -178 -395c8 -56 18 -115 28 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141
-c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153zM332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 70 -24 118 -39 118c-52 0 -98 -105 -107 -145zM420 -206l-58 329c-58 -14 -104 -63 -104 -124
-c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166c0 94 62 190 153 217c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM562 -21c0 89 -65 150 -155 150
-c7 -44 34 -203 55 -323c71 29 100 102 100 173z" />
+d="M562 -21c0 89 -65 150 -155 150c7 -44 34 -203 55 -323c71 29 100 102 100 173zM420 -206l-58 329c-59 -14 -104 -63 -104 -124c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166c0 94 62 190 153 217c-7 41 -14 88 -23 142
+c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 69 -24 118 -39 118c-52 0 -98 -105 -107 -145zM122 -513c0 66 45 123 115 123
+c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 154 55 154 159c0 53 -11 123 -30 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215
+c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -179 -395c9 -56 19 -115 29 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141c0 -63 -14 -129 -68 -167
+c-36 -22 -77 -34 -124 -34c-135 0 -186 87 -186 153z" />
     <glyph glyph-name="uniE051" unicode="&#xe051;" horiz-adv-x="640" 
-d="M269 773c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -178 -395c8 -56 18 -115 28 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141
-c0 -63 -14 -129 -68 -167c-43 -26 -87 -34 -136 -34l-48 -179c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19l-3 -23h-139l3 23h18c12 0 19 0 22 2c2 2 3 5 5 12l35 132c2 6 2 9 2 11c0 3 0 5 -11 5h-32l6 22h2c30 0 70 11 84 21c-81 11 -154 65 -154 152c0 66 44 123 114 123
-c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 0 -5 -1 -5 -3c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 155 55 155 159c0 53 -12 123 -31 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 322 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215z
-M332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 70 -24 118 -39 118c-52 0 -98 -105 -107 -145zM420 -206l-58 329c-58 -14 -104 -63 -104 -124c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166
-c0 94 62 190 153 217c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM562 -21c0 13 -1 23 -2 32c-9 48 -52 118 -153 118c7 -44 34 -203 55 -323c71 29 100 102 100 173zM329 -867c0 -3 11 -9 24 -9
-c27 0 48 29 48 67c0 24 -11 38 -29 38c-8 0 -12 -1 -27 -7c-2 -12 -9 -19 -19 -19c-8 0 -13 6 -13 14c0 7 4 13 13 17l29 103l3 -1c26 -6 48 -9 69 -9c16 0 29 2 43 8c3 1 3 1 4 1c3 0 5 -2 5 -5c0 -39 -47 -54 -77 -54c-14 0 -15 0 -38 5l-10 -34c14 5 24 7 38 7
-c35 0 67 -22 67 -60c0 -57 -45 -93 -99 -93c-42 0 -68 21 -68 53c0 21 13 34 32 34c16 0 28 -10 28 -26c0 -13 -10 -25 -21 -27c-2 -1 -2 -1 -2 -3z" />
+d="M562 -21c0 13 -1 23 -2 32c-9 48 -52 118 -153 118c7 -44 34 -203 55 -323c71 29 100 102 100 173zM420 -206l-58 329c-59 -14 -104 -63 -104 -124c0 -49 22 -75 61 -99c12 -8 22 -13 22 -22s-9 -13 -17 -13c-80 0 -135 96 -135 166c0 94 62 190 153 217
+c-7 41 -14 88 -23 142c-15 -15 -31 -29 -48 -44c-88 -76 -174 -185 -174 -307c0 -151 122 -251 265 -251c19 0 38 2 58 6zM332 822c-8 -31 -11 -65 -11 -102c0 -42 5 -81 11 -121c69 68 146 146 146 250c0 69 -24 118 -39 118c-52 0 -98 -105 -107 -145zM269 773
+c0 84 18 212 82 288c33 39 64 51 71 51c18 0 47 -35 71 -86c16 -36 44 -110 44 -201c0 -159 -73 -284 -179 -395c9 -56 19 -115 29 -175c146 0 253 -102 253 -253c0 -103 -73 -205 -171 -237c6 -39 12 -69 15 -89c10 -57 16 -102 16 -141c0 -63 -14 -129 -68 -167
+c-36 -22 -80 -34 -124 -34h-12l-48 -179c-3 -11 -4 -17 -4 -20s1 -5 22 -5h19l-3 -23h-139l3 23h18c12 0 19 0 21 2c3 2 4 5 6 12l35 132c2 6 2 9 2 11c0 3 0 6 -11 6h-32l6 21h2c30 0 70 11 84 22c-81 10 -155 64 -155 151c0 66 45 123 115 123c75 0 116 -57 116 -111
+c0 -64 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 3 -3c2 0 23 -5 47 -5c101 0 154 55 154 159c0 53 -11 123 -30 219c-23 -4 -50 -7 -79 -7c-186 0 -349 147 -349 334c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215zM329 -867c0 -3 11 -9 24 -9
+c27 0 48 29 48 67c0 24 -11 38 -29 38c-8 0 -12 -1 -27 -7c-2 -12 -9 -19 -19 -19c-8 0 -13 6 -13 14c0 7 4 13 12 17l30 103l3 -1c26 -6 48 -9 69 -9c16 0 29 2 43 8v0c3 1 3 1 4 1c3 0 5 -2 5 -5c0 -39 -47 -54 -77 -54c-14 0 -15 0 -38 5l-10 -34c14 5 24 7 38 7
+c35 0 67 -22 67 -60c0 -56 -45 -93 -99 -93c-42 0 -68 21 -68 53c0 21 13 35 32 35c16 0 28 -11 28 -27c0 -13 -10 -25 -21 -27c-2 -1 -2 -1 -2 -3z" />
     <glyph glyph-name="uniE052" unicode="&#xe052;" horiz-adv-x="640" 
-d="M640 3c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89c10 -57 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 114 123c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 4 -2c1 -1 22 -6 47 -6
-c100 0 154 55 154 159c0 53 -12 123 -30 219c-24 -4 -51 -7 -80 -7c-186 0 -349 147 -349 335c0 199 126 321 217 405c21 18 73 71 74 71c-17 113 -22 162 -22 216c0 84 18 211 83 287c32 39 64 52 71 52c17 0 46 -36 70 -87c17 -36 45 -109 45 -201
-c0 -158 -74 -284 -179 -395c9 -55 18 -115 28 -175c146 0 253 -102 253 -252zM332 822c-7 -31 -11 -64 -11 -102c0 -41 5 -81 11 -121c69 69 147 147 147 250c0 70 -25 118 -40 118c-52 0 -97 -105 -107 -145zM362 -212c20 0 38 2 58 7l-58 328c-58 -14 -104 -63 -104 -124
-c0 -48 22 -75 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 216c-6 42 -14 88 -23 142c-15 -14 -31 -29 -48 -43c-87 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 28 101 101 101 173c0 12 -2 23 -3 31
-c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322zM423 -717c0 -24 -14 -40 -43 -53c18 -13 28 -32 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 31 27 51 53 61c-15 14 -22 28 -22 47c0 45 41 71 83 71c33 0 67 -16 67 -53zM361 -757c15 12 21 23 21 39
-c0 21 -11 33 -31 33s-34 -13 -34 -31c0 -12 5 -19 21 -28l1 -1c3 -2 7 -4 22 -12zM323 -877c22 0 38 15 38 34c0 14 -7 24 -27 35c-2 2 -2 2 -14 8c-3 1 -4 2 -8 4c-17 -10 -26 -27 -26 -46c0 -21 15 -35 37 -35z" />
+d="M423 -717c0 -24 -14 -40 -43 -53c18 -13 28 -32 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 31 26 51 52 61c-14 14 -21 28 -21 47c0 45 41 71 83 71c33 0 67 -16 67 -53zM323 -877c22 0 38 15 38 34c0 14 -8 24 -27 35v0c-2 2 -2 2 -14 8c-3 2 -4 2 -8 4
+c-17 -10 -26 -26 -26 -46c0 -21 15 -35 37 -35zM361 -757c15 12 21 23 21 39c0 21 -12 33 -31 33c-20 0 -34 -13 -34 -31c0 -12 5 -19 20 -28l2 -1c3 -2 7 -4 22 -12zM640 2c0 -103 -73 -204 -171 -237c7 -38 12 -69 15 -89c10 -57 16 -102 16 -141
+c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s44 123 114 123c75 0 116 -57 116 -111c0 -63 -47 -104 -94 -111c-3 -1 -5 -2 -5 -4c0 -1 2 -2 3 -2c2 -1 23 -6 47 -6c101 0 155 55 155 159c0 53 -12 124 -30 219c-24 -4 -51 -7 -80 -7c-186 0 -349 147 -349 335
+c0 199 126 321 217 405c21 18 73 71 74 71c-17 113 -22 162 -22 216c0 84 18 211 83 287c32 39 64 51 71 51c17 0 46 -35 70 -86c17 -36 45 -110 45 -201c0 -158 -74 -284 -179 -395c9 -56 18 -115 28 -175c146 0 253 -102 253 -253zM332 822c-7 -31 -11 -64 -11 -102
+c0 -41 5 -81 11 -121c69 69 147 147 147 250c0 70 -25 118 -40 118c-52 0 -97 -105 -107 -145zM362 -212c20 0 38 3 58 7l-58 328c-58 -14 -104 -63 -104 -124c0 -48 22 -75 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 216
+c-7 42 -14 88 -23 142c-15 -15 -31 -29 -48 -43c-88 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 29 101 101 101 173c0 12 -2 23 -3 31c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322z" />
     <glyph glyph-name="uniE053" unicode="&#xe053;" horiz-adv-x="640" 
-d="M640 3c0 -104 -73 -205 -171 -238c6 -38 12 -69 15 -89c10 -56 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s44 123 114 123c75 0 116 -57 116 -110c0 -64 -47 -105 -94 -112c-3 -1 -5 -2 -5 -3c0 -2 2 -3 3 -3c2 -1 23 -6 47 -6
-c101 0 155 55 155 159c0 53 -12 124 -31 220c-23 -5 -50 -8 -79 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 70c-17 113 -22 162 -22 216c0 110 29 267 131 330c-39 3 -64 24 -65 54c0 31 27 51 53 62c-15 13 -21 27 -22 46c0 45 41 71 83 71
-c33 0 67 -16 67 -53c0 -24 -14 -40 -43 -52c18 -14 28 -33 28 -56c0 -35 -25 -61 -64 -69c17 -13 38 -43 56 -81c16 -36 44 -109 44 -200c0 -159 -73 -285 -178 -396c8 -55 18 -114 28 -175c146 0 253 -102 253 -252zM444 1316c-20 0 -34 -12 -34 -30c0 -13 5 -20 21 -29
-l1 -1c3 -2 7 -4 22 -12c15 12 21 23 21 39c0 21 -11 33 -31 33zM379 1160c0 -22 15 -36 37 -36s38 15 38 34c0 14 -7 24 -26 35h-1c-2 2 -2 2 -14 8c-3 2 -4 2 -8 4c-17 -10 -26 -26 -26 -45zM332 822c-8 -31 -11 -64 -11 -102c0 -41 5 -80 11 -121c69 69 146 147 146 251
-c0 69 -24 118 -39 118c-52 0 -98 -105 -107 -146zM362 -212c19 0 38 3 58 7l-58 328c-58 -14 -104 -62 -104 -124c0 -48 22 -74 61 -98c12 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-7 41 -14 87 -23 141
-c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -308c0 -151 122 -251 265 -251zM462 -193c71 29 100 101 100 173c0 12 -1 23 -2 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323z" />
+d="M640 3c0 -104 -73 -205 -171 -238c6 -38 12 -69 15 -89c10 -56 16 -102 16 -141c0 -128 -63 -201 -192 -201c-135 0 -186 87 -186 153s45 123 115 123c75 0 116 -57 116 -110c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -6 47 -6
+c101 0 155 55 155 159c0 53 -12 124 -31 220c-23 -5 -50 -8 -79 -8c-186 0 -349 147 -349 335c0 200 126 321 217 405c21 18 73 71 74 71c-17 113 -22 162 -22 216c0 84 18 211 82 287c18 22 36 35 49 43c-39 3 -65 24 -65 54c0 31 27 51 53 61c-15 14 -21 28 -22 47
+c0 45 41 71 83 71c33 0 67 -16 67 -53c0 -24 -14 -40 -43 -52c18 -14 28 -33 28 -56c0 -35 -25 -61 -64 -70c17 -12 38 -42 56 -80c16 -36 44 -109 44 -201c0 -158 -73 -284 -178 -395c8 -55 18 -114 28 -175c146 0 253 -102 253 -252zM444 1316c-20 0 -34 -13 -34 -31
+c0 -12 5 -19 21 -28l1 -1c3 -2 7 -4 22 -12c15 12 21 23 21 39c0 21 -11 33 -31 33zM379 1160c0 -22 15 -36 37 -36s38 15 38 34c0 14 -7 24 -27 35v0c-2 2 -2 2 -14 8c-3 2 -4 2 -8 4c-17 -10 -26 -26 -26 -45zM332 822c-8 -31 -11 -64 -11 -102c0 -41 5 -80 11 -121
+c69 69 146 147 146 250c0 70 -24 119 -39 119c-52 0 -98 -105 -107 -146zM362 -211c19 0 38 2 58 6l-58 328c-58 -14 -104 -62 -104 -124c0 -48 22 -74 61 -98c12 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 216c-7 42 -14 88 -23 142
+c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -308c0 -151 122 -250 265 -250zM462 -193c71 29 100 101 100 173c0 12 -1 23 -2 31c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322z" />
     <glyph glyph-name="uniE054" unicode="&#xe054;" horiz-adv-x="640" 
-d="M379 1131l-3 -23h-139l3 23h19c12 0 20 1 22 3c2 1 2 3 4 7c0 1 1 6 4 16l32 120c2 6 2 9 2 11c0 3 0 6 -11 6h-33l6 21h2c31 0 72 12 86 22v1h18l-49 -182c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19zM640 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89
-c10 -56 16 -102 16 -141c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153s44 124 114 124c75 0 116 -58 116 -111c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -6 47 -6c101 0 155 55 155 159c0 53 -12 124 -30 220
-c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 82 287c27 32 53 46 66 51c-20 8 -31 24 -31 45s13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27c-2 -1 -2 -2 -2 -3c0 -4 10 -9 23 -9
-c27 0 49 29 49 67c0 24 -11 38 -30 38c-7 0 -12 -1 -26 -7c-2 -12 -9 -19 -20 -19c-7 0 -13 6 -13 14c0 7 4 13 13 17l30 103l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8c2 1 3 1 4 1c2 0 4 -2 4 -5c0 -11 -8 -27 -19 -37c-14 -12 -31 -17 -58 -17c-14 0 -14 0 -38 5l-9 -34
-c14 5 25 7 38 7c37 0 67 -21 67 -60c0 -56 -46 -93 -100 -93c-5 0 -10 1 -15 1c17 -13 37 -42 54 -79c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c8 -55 18 -114 28 -174c146 0 253 -103 253 -253zM332 821c-7 -30 -11 -64 -11 -102c0 -41 5 -80 11 -121
-c69 69 147 147 147 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM362 -212c19 0 38 2 58 6l-58 329c-58 -15 -104 -63 -104 -125c0 -48 22 -74 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-7 41 -14 87 -23 141
-c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -307c0 -152 122 -251 265 -251zM462 -194c71 29 100 101 100 173c0 12 -1 23 -2 32c-9 47 -52 118 -153 118c7 -45 34 -204 55 -323z" />
+d="M462 -194c71 29 100 101 100 173c0 12 -1 23 -2 32c-9 47 -52 118 -153 118c7 -45 34 -204 55 -323zM362 -212c19 0 38 2 58 6l-58 328c-58 -14 -104 -62 -104 -124c0 -48 22 -74 61 -98c12 -8 22 -14 22 -22c0 -10 -9 -13 -17 -13c-80 0 -135 95 -135 166
+c0 93 62 190 153 217c-7 41 -14 87 -23 141c-15 -14 -31 -29 -48 -43c-88 -77 -174 -186 -174 -307c0 -152 122 -251 265 -251zM332 821c-7 -31 -11 -64 -11 -102c0 -41 5 -80 11 -121c69 69 147 147 147 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM640 2
+c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89c10 -56 16 -102 16 -141c0 -63 -14 -129 -68 -167c-36 -22 -77 -34 -124 -34c-135 0 -185 87 -185 153s44 124 114 124c75 0 116 -58 116 -111c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -6 47 -6
+c101 0 155 55 155 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 82 287c27 32 53 46 65 50c-19 9 -30 25 -30 46c0 20 13 34 32 34c17 0 28 -10 28 -26
+c0 -13 -7 -23 -20 -27c-2 -1 -2 -2 -2 -3c0 -4 10 -9 23 -9c27 0 49 29 49 67c0 24 -11 38 -30 38c-7 0 -12 -1 -26 -7c-2 -12 -9 -19 -20 -19c-7 0 -13 6 -13 14c0 7 4 13 13 17l30 103l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8v0c2 1 3 1 4 1c2 0 4 -2 4 -5
+c0 -11 -8 -27 -19 -37c-14 -12 -31 -17 -58 -17c-14 0 -14 0 -38 5l-9 -34c14 5 25 7 38 7c37 0 66 -21 66 -60c0 -56 -45 -93 -99 -93c-5 0 -10 0 -15 1c17 -13 37 -42 54 -79c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c8 -55 18 -114 28 -174
+c146 0 253 -103 253 -253zM379 1131l-3 -23h-139l3 23h19c12 0 20 0 22 3v0c1 1 2 3 3 7h1c0 1 1 6 4 16l32 120c1 6 2 9 2 11c0 3 0 5 -11 5h-33l6 22h2c31 0 72 12 86 22v1h18l-49 -182c-3 -11 -4 -17 -4 -20c0 -4 1 -5 22 -5h19z" />
     <glyph glyph-name="uniE055" unicode="&#xe055;" horiz-adv-x="1044" 
-d="M1044 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 16 -89c9 -57 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -111c0 -63 -47 -104 -94 -111c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6
-c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-74 0 -145 24 -203 64c-24 -20 -51 -36 -81 -46c7 -38 12 -69 16 -89c9 -57 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -111
-c0 -63 -47 -104 -94 -111c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 83 288
-c33 38 64 51 71 51c18 0 47 -36 70 -87c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -174c18 0 35 -2 51 -5c44 105 122 179 183 237c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 83 288c33 38 64 51 71 51c18 0 47 -36 70 -87
-c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -174c146 0 253 -103 253 -253zM736 821c-7 -30 -11 -64 -11 -102c0 -41 6 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM332 821c-7 -30 -11 -64 -11 -102
-c0 -41 6 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM676 346c-47 -40 -92 -90 -126 -145c27 -21 48 -47 63 -78c25 58 73 107 133 125c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43zM362 -213c20 0 38 3 58 7l-57 328
-c-59 -14 -104 -62 -104 -124c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -134 96 -134 167c0 93 61 190 152 217c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43c-88 -77 -175 -186 -175 -308c0 -151 122 -251 265 -251zM462 -194
-c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323zM866 -194c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 119 -153 119c7 -45 34 -204 55 -323zM766 -213c20 0 38 3 58 7l-57 328c-59 -14 -104 -62 -104 -124
-c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-42 0 -77 27 -100 62c-10 -27 -23 -53 -41 -76c48 -40 111 -63 179 -63z" />
+d="M1044 2c0 -104 -73 -205 -171 -238c7 -38 12 -69 16 -89c9 -56 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -110c0 -64 -47 -105 -94 -112c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6
+c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-74 0 -145 24 -203 64c-24 -20 -51 -36 -81 -46c7 -38 12 -69 16 -89c9 -56 15 -102 15 -141c0 -128 -63 -201 -192 -201c-135 0 -185 87 -185 153s45 123 115 123c75 0 115 -57 115 -110
+c0 -64 -47 -105 -94 -112c-3 -1 -4 -2 -4 -4c0 -1 1 -2 3 -2c2 -1 22 -6 47 -6c100 0 154 55 154 159c0 53 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406c21 17 73 70 74 70c-17 113 -22 162 -22 216c0 84 18 211 83 287
+c32 39 64 52 71 52c18 0 47 -36 70 -87c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -175c18 0 35 -1 51 -4c44 105 121 179 183 237c21 17 73 70 74 70c-17 113 -22 162 -22 216c0 84 18 211 83 287c32 39 64 52 71 52c18 0 47 -36 70 -87
+c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c9 -55 18 -114 28 -175c146 0 253 -102 253 -252zM736 821c-7 -31 -11 -64 -11 -102c0 -41 5 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM676 346c-47 -41 -93 -90 -126 -145
+c26 -21 48 -47 63 -78c25 58 73 107 133 125c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43zM332 821c-7 -31 -11 -64 -11 -102c0 -41 5 -80 12 -121c68 69 146 147 146 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -146zM362 -213c20 0 38 3 58 7l-57 328
+c-59 -14 -104 -62 -104 -124c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-80 0 -135 96 -135 167c0 93 62 190 153 217c-6 41 -14 87 -23 141c-15 -14 -31 -29 -47 -43c-88 -77 -175 -186 -175 -308c0 -151 122 -251 265 -251zM462 -194
+c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322zM766 -213c20 0 38 3 58 7l-57 328c-59 -14 -104 -62 -104 -124c0 -48 22 -74 60 -98c13 -8 22 -14 22 -22c0 -10 -9 -14 -17 -14c-42 0 -77 27 -100 62c-10 -27 -23 -53 -41 -76
+c48 -40 111 -63 179 -63zM866 -194c71 29 101 101 101 173c0 12 -1 23 -3 31c-9 48 -52 118 -153 118c7 -44 34 -203 55 -322z" />
     <glyph glyph-name="uniE057" unicode="&#xe057;" horiz-adv-x="640" 
-d="M387 255c146 0 253 -103 253 -253c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89c10 -56 16 -102 16 -140c0 -129 -63 -202 -192 -202c-29 0 -55 4 -77 11v-7l-1 -1c-38 -26 -43 -74 -43 -117c0 -44 6 -92 43 -119l1 -1v-21l-4 2c-52 28 -85 78 -85 139
-c0 56 28 103 74 131c-67 29 -93 88 -93 136c0 66 44 124 114 124c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -5 47 -5c101 0 155 55 155 158c0 54 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335
-c0 200 126 321 217 406c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 82 288c33 38 64 51 72 51c17 0 46 -36 70 -87c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c8 -55 18 -114 28 -174zM332 822c-7 -31 -11 -65 -11 -103c0 -41 5 -80 11 -121
-c69 69 147 147 147 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -145zM362 -212c19 0 38 2 58 6l-58 329c-58 -15 -104 -63 -104 -125c0 -48 22 -74 61 -98c13 -8 22 -14 22 -22c0 -10 -9 -13 -17 -13c-80 0 -135 95 -135 166c0 93 62 190 153 217c-7 41 -14 87 -23 141
-c-15 -14 -31 -28 -48 -43c-88 -77 -174 -186 -174 -307c0 -152 122 -251 265 -251zM462 -194c71 29 100 101 100 173c0 12 -1 23 -2 32c-9 48 -52 118 -153 118c7 -45 34 -204 55 -323zM440 -641l4 -3c53 -27 86 -76 86 -137s-33 -111 -86 -139l-4 -2v22l1 1
-c38 28 44 73 44 118c0 44 -6 90 -44 117l-1 1v22zM423 -718c0 -24 -14 -41 -43 -53c18 -14 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 54c0 31 26 51 52 62c-15 14 -21 27 -21 46c0 45 41 72 83 72c33 0 67 -16 67 -53zM360 -758c16 11 22 22 22 39
-c0 20 -12 32 -31 32c-20 0 -34 -12 -34 -30c0 -13 5 -19 20 -29l7 -4c3 -2 8 -4 16 -8zM323 -878c22 0 38 14 38 33c0 15 -8 25 -27 36l-22 11c-17 -10 -26 -26 -26 -45c0 -21 15 -35 37 -35z" />
+d="M360 -758c16 12 22 22 22 39c0 20 -12 32 -31 32c-20 0 -34 -12 -34 -30c0 -13 5 -19 20 -29l7 -4c3 -2 8 -4 16 -8zM323 -878c22 0 38 14 38 33c0 15 -8 25 -27 36l-22 11c-17 -10 -26 -26 -26 -45c0 -21 15 -35 37 -35zM422 -718c0 -24 -13 -41 -42 -53
+c18 -14 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 54c0 31 26 51 52 62c-15 14 -21 28 -21 46c0 45 41 72 83 72c33 0 66 -16 66 -53zM440 -641l4 -3c53 -27 86 -76 86 -137s-33 -111 -86 -139l-4 -2v22l1 1c38 28 44 73 44 118c0 44 -6 90 -44 117l-1 1v22z
+M462 -194c71 29 100 101 100 173c0 12 -1 23 -2 32c-9 47 -52 118 -153 118c7 -45 34 -204 55 -323zM362 -212c19 0 38 2 58 6l-58 329c-58 -15 -104 -63 -104 -125c0 -48 22 -74 61 -98c12 -8 22 -14 22 -22c0 -10 -9 -13 -17 -13c-80 0 -135 95 -135 166
+c0 93 62 190 153 217c-7 41 -14 87 -23 141c-15 -14 -31 -28 -48 -43c-88 -77 -174 -186 -174 -307c0 -152 122 -251 265 -251zM332 822c-7 -31 -11 -65 -11 -103c0 -41 5 -80 11 -121c69 69 147 147 147 251c0 69 -25 118 -40 118c-52 0 -97 -105 -107 -145zM387 255
+c146 0 253 -103 253 -253c0 -104 -73 -205 -171 -238c7 -38 12 -69 15 -89c10 -56 16 -102 16 -140c0 -129 -63 -202 -192 -202c-29 0 -55 4 -77 12v-8l-1 -1c-38 -26 -43 -74 -43 -117c0 -44 5 -92 43 -119l1 -1v-21l-4 2c-52 28 -85 78 -85 139c0 56 28 103 74 131
+c-67 29 -93 88 -93 136c0 66 44 124 114 124c75 0 116 -57 116 -111c0 -64 -47 -104 -94 -112c-3 -1 -5 -1 -5 -3c0 -1 2 -3 3 -3c2 -1 23 -5 47 -5c101 0 155 55 155 158c0 54 -12 124 -30 220c-24 -5 -51 -8 -80 -8c-186 0 -349 147 -349 335c0 200 126 321 217 406
+c21 17 73 70 74 71c-17 112 -22 161 -22 215c0 84 18 211 82 288c33 38 64 51 72 51c17 0 46 -36 70 -87c17 -36 45 -109 45 -200c0 -159 -74 -285 -179 -396c8 -55 18 -114 28 -174z" />
     <glyph glyph-name="uniE05C" unicode="&#xe05c;" horiz-adv-x="627" 
-d="M627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 30 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13
-c-11 56 -33 151 -92 175v-436c0 -7 -5 -13 -12 -13s-13 6 -13 13v910c0 7 6 13 13 13s12 -6 12 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73
-c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM13 469h72c7 0 13 -6 13 -13v-910
-c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13z" />
+d="M13 469h72c7 0 13 -6 13 -13v-910c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13zM627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 31 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25
+c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13c-11 56 -33 151 -92 175v-436c0 -7 -5 -13 -12 -13s-13 6 -13 13v910c0 7 6 13 13 13s12 -6 12 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14
+c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67
+c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221z" />
     <glyph glyph-name="uniE05D" unicode="&#xe05d;" horiz-adv-x="627" 
-d="M627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 30 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13
-c-11 56 -33 151 -92 175v-436c0 -7 -6 -13 -13 -13s-12 6 -12 13v910c0 7 5 13 12 13s13 -6 13 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73
-c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM13 469h72c7 0 13 -6 13 -13v-910
-c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13zM368 -559c0 -24 -14 -41 -43 -53c18 -13 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 21 -74 54c0 31 28 50 53 62c-15 14 -22 27 -22 46c0 46 41 72 83 72c31 0 67 -18 67 -53zM283 -587l1 -1l22 -11
+d="M13 469h72c7 0 13 -6 13 -13v-910c0 -7 -6 -13 -13 -13h-72c-7 0 -13 6 -13 13v910c0 7 6 13 13 13zM627 -261c0 -140 -103 -219 -224 -219c-75 0 -182 31 -182 123c0 49 34 81 83 81c44 0 75 -32 75 -76c0 -43 -29 -74 -73 -74c-6 0 -10 1 -11 1c23 -16 54 -25 85 -25
+c105 0 122 84 122 174c0 77 -2 189 -90 189s-106 -95 -108 -106c0 -1 0 -13 -14 -13s-15 12 -15 13c-11 56 -33 151 -92 175v-436c0 -7 -6 -13 -13 -13s-12 6 -12 13v910c0 7 5 13 12 13s13 -6 13 -13v-436c56 23 83 119 92 174c0 1 1 14 15 14s14 -13 14 -14
+c2 -10 20 -105 108 -105s90 112 90 189c0 90 -17 174 -122 174c-31 0 -62 -9 -85 -25c48 0 84 -18 84 -73c0 -44 -31 -76 -75 -76c-49 0 -83 32 -83 81c0 92 107 123 182 123c121 0 224 -79 224 -219c0 -108 -60 -221 -182 -221c-43 0 -56 3 -94 26c-2 -4 -22 -44 -55 -67
+c33 -23 53 -63 55 -67c39 24 56 26 79 26c131 0 197 -97 197 -221zM368 -559c0 -24 -14 -41 -43 -53c18 -13 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -74 21 -74 54c0 31 27 50 53 62c-15 14 -22 27 -22 46c0 46 41 72 83 72c31 0 67 -18 67 -53zM283 -587l1 -1l22 -11
 c16 12 21 23 21 39c0 21 -11 32 -31 32s-34 -12 -34 -30c0 -13 5 -20 21 -29zM257 -639c-17 -10 -26 -26 -26 -45c0 -21 15 -35 37 -35s38 14 38 33c0 14 -7 25 -26 36h-1l-14 7c-3 2 -4 2 -8 4z" />
     <glyph glyph-name="uniE062" unicode="&#xe062;" horiz-adv-x="663" 
-d="M254 251c180 0 274 -112 274 -286c0 -184 -158 -362 -298 -463c-91 -71 -205 -118 -207 -118l-3 -1c-7 0 -16 2 -19 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109
-c8 7 25 17 35 21c9 3 20 5 32 5c56 0 106 -47 106 -104c0 -66 -50 -109 -114 -109c-74 0 -116 54 -116 127s38 139 97 182c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51
-s-22 -51 -48 -51s-48 23 -48 51z" />
+d="M254 251c93 0 164 -29 211 -85c41 -49 63 -118 63 -201c0 -67 -25 -145 -69 -220c-25 -42 -56 -84 -92 -123c-40 -43 -86 -83 -137 -120c-91 -71 -205 -118 -206 -118s-4 -1 -5 -1c-6 0 -15 2 -18 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140
+c39 35 83 98 116 164c30 59 65 148 65 241c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-17 -9 -39 -29 -50 -45s-23 -45 -26 -64c8 7 25 17 35 21c9 3 20 5 32 5c17 0 37 -4 58 -18c30 -19 48 -51 48 -86c0 -39 -19 -75 -50 -92c-19 -11 -42 -17 -64 -17
+c-13 0 -26 2 -38 6c-30 10 -53 29 -65 56c-9 19 -13 41 -13 65c0 17 2 35 7 53c9 35 32 86 90 129c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z
+" />
     <glyph glyph-name="uniE063" unicode="&#xe063;" horiz-adv-x="662" 
-d="M253 251c180 0 275 -111 275 -286c0 -67 -25 -145 -69 -220c-59 -100 -135 -174 -229 -242c-91 -71 -205 -119 -207 -119l-4 -1c-7 0 -15 2 -18 12c0 2 -1 4 -1 5c0 12 11 19 11 19h1c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250
-c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109c8 7 24 17 34 21c9 3 19 5 32 5c57 0 107 -46 107 -104c0 -65 -49 -109 -112 -109c-75 0 -118 52 -118 127c0 73 38 139 97 182c1 0 61 44 137 44zM567 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50z
-M567 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM259 -710c0 -4 1 -6 22 -6h19l-3 -23h-139l3 23h19c12 0 20 0 22 3v1c1 1 2 1 3 6l1 1c0 1 1 5 4 15l32 120c1 3 2 8 2 11s0 6 -11 6h-33l6 21h2c31 1 72 12 86 22v1h18l-49 -182
-c-3 -11 -4 -16 -4 -19zM490 -510c2 0 4 -1 4 -5c0 -11 -9 -27 -19 -36c-14 -12 -32 -18 -58 -18c-14 0 -15 0 -38 5l-9 -34c14 5 25 7 38 7c38 0 66 -20 66 -60c0 -55 -45 -93 -99 -93c-41 0 -68 21 -68 53c0 21 13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27
-c-1 0 -2 -1 -2 -1c0 -5 10 -11 23 -11c27 0 49 29 49 67c0 25 -11 39 -30 39c-7 0 -11 -2 -26 -8c-2 -12 -10 -19 -20 -19c-8 0 -13 6 -13 14s4 14 13 18l30 102l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8l1 1h3z" />
+d="M567 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM567 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM259 -710c0 -4 1 -6 22 -6h19l-3 -23h-139l3 23h19c12 0 20 0 22 3v1c1 1 2 1 3 6l1 1c0 1 1 5 4 15l32 120
+c1 3 2 8 2 11s0 6 -11 6h-33l6 21h2c31 1 72 12 86 22v1h18l-49 -182c-3 -11 -4 -16 -4 -19zM490 -510c2 0 4 -1 4 -5c0 -11 -9 -27 -19 -36c-14 -12 -32 -18 -58 -18c-14 0 -15 0 -38 5l-9 -34c14 5 25 7 38 7c20 0 36 -5 48 -16s18 -26 18 -44c0 -26 -10 -49 -28 -66
+s-43 -27 -71 -27c-41 0 -68 21 -68 53c0 21 13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27c-1 0 -2 -1 -2 -1c0 -5 10 -11 23 -11c27 0 49 29 49 67c0 25 -11 39 -30 39c-7 0 -11 -2 -26 -8c-2 -12 -10 -19 -20 -19c-8 0 -13 6 -13 14s4 14 13 18l30 102l2 -1
+c26 -6 49 -9 69 -9c17 0 30 2 44 8l1 1h3zM253 251c93 0 165 -29 212 -85c41 -49 63 -118 63 -201c0 -67 -25 -145 -69 -220c-25 -42 -56 -84 -92 -123c-40 -43 -86 -82 -137 -119c-91 -71 -205 -119 -206 -119s-5 -1 -6 -1c-6 0 -14 2 -17 12c0 2 -1 4 -1 5
+c0 12 11 19 11 19h1c1 0 99 45 203 140c39 35 83 98 116 164c30 59 65 148 65 241c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-17 -9 -39 -29 -50 -45s-23 -45 -26 -64c8 7 24 17 34 21c9 3 19 5 32 5c17 0 38 -4 59 -18c30 -19 48 -51 48 -86c0 -39 -20 -76 -51 -93
+c-18 -11 -40 -16 -61 -16c-14 0 -27 2 -40 6c-30 10 -53 29 -65 56c-9 19 -13 41 -13 65c0 17 2 35 7 53c9 35 32 86 90 129c1 0 61 44 137 44z" />
     <glyph glyph-name="uniE064" unicode="&#xe064;" horiz-adv-x="663" 
-d="M254 251c180 0 274 -112 274 -286c0 -187 -156 -359 -298 -462c-91 -71 -205 -119 -207 -119l-3 -1c-7 0 -16 2 -19 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c98 88 181 275 181 405c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-39 -21 -69 -65 -76 -109
-c8 7 25 17 35 21c9 3 20 5 32 5c56 0 106 -47 106 -104c0 -67 -48 -109 -112 -109c-75 0 -118 52 -118 127c0 73 38 139 97 182c1 0 62 44 138 44zM568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51
-s-22 -51 -48 -51s-48 23 -48 51zM352 -560v-1c0 -24 -14 -41 -43 -53c18 -13 29 -33 29 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55c0 34 25 49 52 61c-15 14 -21 28 -21 47c0 46 40 71 82 71c31 0 67 -16 67 -52zM267 -588l1 -1c4 -2 8 -5 22 -12c16 12 21 23 21 39
-c0 21 -11 33 -31 33s-33 -13 -33 -31c0 -13 4 -19 20 -28zM242 -640c-17 -10 -26 -27 -26 -46c0 -21 14 -35 36 -35s39 15 39 34c0 14 -8 24 -27 35c-2 1 -2 2 -14 8c-3 2 -4 2 -8 4z" />
+d="M568 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM568 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM352 -560v-1c0 -24 -14 -41 -43 -53c18 -13 29 -33 29 -55c0 -43 -38 -73 -92 -73c-44 0 -74 22 -74 55
+c0 17 9 34 24 46c8 6 17 10 28 15c-15 14 -21 28 -21 47c0 20 8 38 23 51s36 20 59 20c19 0 36 -5 48 -14c10 -8 19 -25 19 -38zM267 -588l1 -1c4 -2 8 -5 22 -12c16 12 21 23 21 39c0 21 -11 33 -31 33s-33 -13 -33 -31c0 -13 4 -19 20 -28zM242 -640
+c-17 -10 -26 -27 -26 -46c0 -21 14 -35 36 -35s39 15 39 34c0 14 -8 24 -27 35c-2 1 -2 2 -14 8c-3 2 -4 2 -8 4zM254 251c93 0 164 -29 211 -85c41 -49 63 -118 63 -201c0 -67 -24 -145 -68 -220c-25 -42 -57 -84 -93 -123c-40 -43 -86 -82 -137 -119
+c-91 -71 -205 -119 -206 -119s-4 -1 -5 -1c-6 0 -15 2 -18 12c0 2 -1 3 -1 5c0 12 12 19 12 19c1 0 99 45 203 140c39 35 83 98 116 164c30 59 65 148 65 241c0 168 -50 250 -152 250c-35 0 -67 -6 -92 -20c-17 -9 -39 -29 -50 -45s-23 -45 -26 -64c8 7 25 17 35 21
+c9 3 20 5 32 5c17 0 37 -4 58 -18c30 -19 48 -51 48 -86c0 -39 -19 -76 -50 -93c-18 -11 -40 -16 -62 -16c-14 0 -27 2 -40 6c-30 10 -53 29 -65 56c-9 19 -13 41 -13 65c0 17 2 35 7 53c9 35 32 86 90 129c1 0 62 44 138 44z" />
     <glyph glyph-name="uniE065" unicode="&#xe065;" horiz-adv-x="664" 
-d="M282 248c176 -12 244 -137 244 -284c0 -122 -83 -308 -298 -461c-92 -72 -205 -119 -205 -119c-9 0 -19 0 -22 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140c69 63 182 240 182 406s-48 251 -153 251c-155 0 -169 -133 -169 -133s28 28 69 28c55 0 105 -47 105 -103
-c0 -64 -52 -109 -114 -109c-77 0 -115 58 -115 128c0 58 26 127 97 180c0 0 50 36 117 42c-32 7 -53 27 -53 54c0 32 27 53 54 64c-16 15 -22 29 -22 48c0 47 41 74 85 74c20 0 38 -5 50 -15c11 -8 19 -26 19 -39v-1c0 -25 -14 -43 -44 -55c19 -14 29 -34 29 -57
-c0 -37 -27 -65 -69 -73zM278 404h2c4 -2 7 -5 22 -13c16 12 23 24 23 41c0 22 -12 34 -33 34c-20 0 -35 -13 -35 -32c0 -13 5 -20 21 -30zM252 351c-17 -11 -27 -27 -27 -47c0 -22 15 -37 38 -37s40 15 40 35c0 15 -8 26 -28 37c-3 2 -3 2 -15 8zM569 124c0 28 22 51 48 51
-s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z" />
+d="M569 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM282 248c176 -12 244 -137 244 -284c0 -122 -83 -308 -298 -461c-92 -72 -205 -119 -205 -119h-4c-6 0 -15 1 -18 11
+c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140c69 63 182 240 182 406s-48 251 -153 251c-155 0 -169 -133 -169 -133s28 28 69 28c17 0 36 -5 57 -18c33 -21 48 -53 48 -85c0 -37 -20 -74 -51 -92c-19 -11 -42 -17 -63 -17c-43 0 -84 22 -102 62c-8 18 -13 41 -13 66
+c0 58 26 127 97 180c0 0 50 36 117 42c-32 7 -53 27 -53 54c0 18 10 36 26 48c8 6 16 11 28 16c-16 15 -22 29 -22 48c0 21 9 40 24 53s37 21 61 21c20 0 38 -5 50 -15c11 -8 19 -26 19 -39v-1c0 -25 -14 -43 -44 -55c19 -14 29 -34 29 -57c0 -37 -27 -65 -69 -73zM278 404
+h2c4 -2 7 -5 22 -13c16 12 23 24 23 41c0 22 -12 34 -33 34c-20 0 -35 -13 -35 -32c0 -13 5 -20 21 -30zM252 351c-17 -11 -27 -27 -27 -47c0 -22 15 -37 38 -37s40 15 40 35c0 15 -8 26 -28 37c-3 2 -3 2 -15 8z" />
     <glyph glyph-name="uniE066" unicode="&#xe066;" horiz-adv-x="664" 
-d="M225 278h20l-4 -23h-144l4 23h19c12 0 21 1 23 4c1 1 3 2 4 7c0 1 1 7 4 17l33 123c1 3 2 9 2 12s0 6 -12 6h-33l6 22h2c32 1 75 12 89 23h18l-50 -188c-3 -11 -4 -17 -4 -20c0 -4 1 -6 23 -6zM292 285l-2 -1v-1c0 -5 11 -11 25 -11c28 0 50 31 50 70c0 25 -11 40 -30 40
-c-8 0 -13 -1 -28 -8c-2 -13 -9 -20 -20 -20c-8 0 -14 6 -14 14s5 15 14 19l30 105h3c27 -6 50 -10 71 -10c17 0 31 3 45 9h3l1 1c3 0 5 -2 5 -6c0 -11 -9 -28 -20 -37c-14 -12 -33 -18 -60 -18c-15 0 -15 0 -39 5l-10 -35c15 5 27 7 40 7c38 0 69 -22 69 -62
-c0 -58 -48 -96 -103 -96c-43 0 -70 21 -70 54c0 21 13 36 33 36c17 0 29 -11 29 -27c0 -14 -8 -23 -22 -28zM252 249c198 0 273 -131 273 -285c0 -122 -82 -308 -297 -461c-92 -72 -206 -119 -206 -119c-9 0 -18 0 -21 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140
-c69 63 181 240 181 406s-48 251 -153 251c-155 0 -168 -133 -168 -133s27 28 68 28c56 0 105 -48 105 -104c0 -64 -51 -108 -113 -108c-77 0 -116 57 -116 128c0 58 26 127 97 180c0 0 60 43 137 43zM569 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50
-zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51z" />
+d="M569 124c0 28 22 51 48 51s48 -23 48 -51s-22 -50 -48 -50s-48 22 -48 50zM569 -123c0 28 22 51 48 51s48 -23 48 -51s-22 -51 -48 -51s-48 23 -48 51zM225 278h20l-4 -23h-144l4 23h19c12 0 21 1 23 4c1 1 3 2 4 7c0 1 1 7 4 17l33 123c1 3 2 9 2 12s0 6 -12 6h-33l6 22
+h2c32 1 75 12 89 23h18l-50 -188c-3 -11 -4 -17 -4 -20c0 -4 1 -6 23 -6zM292 285l-2 -1v-1c0 -5 11 -11 25 -11c28 0 50 31 50 70c0 25 -11 40 -30 40c-8 0 -13 -1 -28 -8c-2 -13 -9 -20 -20 -20c-8 0 -14 6 -14 14s5 15 14 19l30 105h3c27 -6 50 -10 71 -10
+c17 0 31 3 45 9h2c1 0 2 1 3 1c2 0 4 -2 4 -6c0 -11 -9 -28 -20 -37c-14 -12 -33 -18 -60 -18c-15 0 -15 0 -39 5l-10 -35c15 5 27 7 40 7c20 0 38 -6 50 -17s19 -26 19 -45c0 -27 -11 -52 -30 -69s-45 -27 -73 -27c-43 0 -70 21 -70 54c0 21 13 36 33 36
+c17 0 29 -11 29 -27c0 -14 -8 -23 -22 -28zM252 249c198 0 273 -131 273 -285c0 -122 -82 -308 -297 -461c-92 -72 -206 -119 -206 -119h-4c-5 0 -14 1 -17 11c0 2 -1 3 -1 5c0 11 11 18 11 18s97 44 203 140c69 63 181 240 181 406s-48 251 -153 251
+c-155 0 -168 -133 -168 -133s27 28 68 28c17 0 36 -5 57 -18c34 -21 48 -54 48 -86c0 -37 -19 -73 -50 -91c-19 -11 -41 -17 -63 -17c-43 0 -85 22 -103 62c-8 18 -13 41 -13 66c0 58 26 127 97 180c0 0 60 43 137 43z" />
     <glyph glyph-name="uniE069" unicode="&#xe069;" horiz-adv-x="352" 
 d="M13 252h110c7 0 13 -6 13 -13v-478c0 -7 -6 -13 -13 -13h-110c-7 0 -13 6 -13 13v478c0 7 6 13 13 13zM229 252h110c7 0 13 -6 13 -13v-478c0 -7 -6 -13 -13 -13h-110c-7 0 -13 6 -13 13v478c0 7 6 13 13 13z" />
     <glyph glyph-name="uniE06D" unicode="&#xe06d;" horiz-adv-x="439" 
-d="M36 746h369v-81h-136v-374h-96v374h-137v81zM0 -231l165 463h110l164 -463h-105l-31 95h-170l-32 -95h-101zM219 126l-60 -182h119zM273 -279c79 -1 141 -37 141 -121c0 -47 -16 -74 -57 -94c50 -19 72 -57 72 -109c0 -27 -7 -52 -21 -74c-35 -54 -85 -66 -148 -66h-211
-v464h224zM242 -360h-101v-102h113c37 0 68 10 68 52c0 49 -42 50 -80 50zM255 -539h-114v-123h113c46 0 77 14 77 66c0 47 -37 57 -76 57z" />
+d="M36 746h369v-81h-136v-374h-96v374h-137v81zM0 -231l165 463h110l164 -463h-105l-31 95h-170l-32 -95h-101zM219 126l-60 -182h119zM393 -329c14 -20 21 -43 21 -71s-7 -51 -21 -68c-8 -10 -20 -18 -36 -26c24 -9 42 -22 54 -41s18 -41 18 -68s-7 -52 -21 -74
+c-9 -14 -19 -26 -32 -36c-15 -11 -33 -20 -53 -24c-21 -4 -42 -6 -63 -6h-2h-209v464h224c57 -1 96 -18 120 -50zM242 -360h-101v-102h113c20 0 36 3 49 11s19 21 19 41c0 22 -8 36 -25 43c-14 5 -33 7 -55 7zM255 -539h-114v-123h113c20 0 36 3 47 8c20 10 30 29 30 58
+c0 24 -9 40 -29 49c-11 5 -27 8 -47 8z" />
     <glyph glyph-name="uniE06E" unicode="&#xe06e;" horiz-adv-x="294" 
-d="M24 500h247v-54h-91v-250h-64v250h-92v54zM0 -154l111 310h73l110 -310h-70l-21 63h-114l-21 -63h-68zM147 85l-40 -122h79zM183 -186c53 -1 94 -26 94 -82c0 -18 -4 -34 -14 -45c-5 -7 -13 -12 -24 -18c34 -13 48 -37 48 -73c0 -26 -13 -58 -35 -73
-c-10 -8 -22 -14 -36 -16c-14 -3 -28 -4 -42 -4h-141v311h150zM162 -241h-67v-68h75c14 0 24 2 33 7c9 6 13 14 13 28s-6 24 -17 29c-9 3 -22 4 -37 4zM171 -361h-76v-82h75c14 0 24 2 32 5c13 7 20 20 20 39c0 32 -25 38 -51 38z" />
+d="M24 500h247v-54h-91v-251h-64v251h-92v54zM0 -154l111 310h73l110 -310h-70l-21 63h-114l-21 -63h-68zM147 85l-40 -122h79zM263 -220c10 -13 14 -29 14 -48c0 -18 -4 -34 -14 -45c-5 -7 -13 -12 -24 -17c16 -7 28 -15 36 -28s12 -27 12 -46c0 -18 -4 -34 -14 -49
+c-6 -9 -12 -18 -21 -24c-10 -8 -22 -14 -36 -16c-14 -3 -28 -4 -42 -4h-1h-140v311h150c38 -1 64 -12 80 -34zM162 -241h-68v-68h76c14 0 24 2 33 7c9 6 13 14 13 28c0 15 -6 24 -17 29c-9 3 -22 4 -37 4zM171 -361h-77v-82h76c14 0 24 2 32 5c13 7 20 20 20 39
+c0 16 -6 27 -20 33c-7 3 -18 5 -31 5z" />
     <glyph glyph-name="uniE07A" unicode="&#xe07a;" horiz-adv-x="480" 
-d="M92 -381c0 49 33 92 86 92c56 0 86 -42 86 -83c0 -48 -35 -78 -70 -83c-2 -1 -3 -1 -3 -3c0 -4 33 -6 37 -6c76 0 116 41 116 119c0 40 -9 93 -23 165c-18 -4 -38 -6 -59 -6c-140 0 -262 110 -262 251c0 150 94 241 162 304c16 13 55 53 56 54c-13 84 -17 121 -17 161
-c0 63 14 158 63 216c24 29 48 38 53 38c13 0 35 -27 53 -65c12 -27 33 -82 33 -150c0 -119 -55 -213 -134 -297c7 -41 14 -86 21 -131c110 0 190 -77 190 -189c0 -78 -55 -154 -128 -179c5 -28 8 -51 11 -66c7 -43 12 -77 12 -106c0 -96 -47 -151 -144 -151
-c-101 0 -139 66 -139 115zM249 620c-6 -23 -8 -48 -8 -76c0 -31 4 -61 8 -91c51 52 110 110 110 188c0 52 -19 88 -30 88c-39 0 -73 -78 -80 -109zM315 -150l-43 246c-44 -11 -78 -47 -78 -93c0 -36 16 -56 45 -74c10 -6 16 -10 16 -16c0 -8 -6 -10 -12 -10
-c-60 0 -101 71 -101 125c0 69 46 142 114 162c-5 31 -10 66 -17 106c-11 -10 -23 -21 -36 -32c-66 -58 -130 -140 -130 -231c0 -113 91 -188 198 -188c15 0 29 2 44 5zM422 -12c0 67 -50 113 -117 113c5 -34 26 -153 41 -242c53 21 76 76 76 129z" />
+d="M92 -381c0 49 33 93 86 93c56 0 86 -43 86 -84c0 -48 -35 -78 -70 -83c-2 -1 -3 -1 -3 -3c0 -1 1 -2 2 -2s17 -4 35 -4c76 0 116 41 116 119c0 40 -9 93 -23 165c-18 -4 -38 -6 -59 -6c-140 0 -262 110 -262 251c0 150 94 241 162 304c16 13 55 53 56 54
+c-13 84 -17 121 -17 161c0 63 14 158 62 216c25 29 48 38 54 38c13 0 35 -27 53 -65c12 -27 33 -82 33 -150c0 -119 -55 -213 -134 -297c6 -41 14 -86 21 -131c110 0 190 -77 190 -189c0 -78 -55 -154 -128 -179c5 -28 8 -51 11 -66c7 -43 12 -77 12 -106
+c0 -96 -47 -151 -144 -151c-101 0 -139 66 -139 115zM249 620c-6 -23 -8 -48 -8 -76c0 -31 3 -61 8 -91c51 52 110 110 110 188c0 52 -19 88 -30 88c-39 0 -73 -78 -80 -109zM315 -150l-43 246c-44 -11 -78 -47 -78 -93c0 -36 16 -56 45 -74c9 -6 16 -10 16 -16
+c0 -8 -6 -10 -12 -10c-60 0 -101 71 -101 125c0 69 46 142 114 162c-5 31 -10 66 -17 106c-11 -11 -23 -21 -36 -32c-66 -58 -130 -140 -130 -231c0 -113 91 -188 198 -188c15 0 29 2 44 5zM422 -11c0 66 -50 112 -117 112c5 -34 26 -153 41 -242c53 21 76 76 76 130z" />
     <glyph glyph-name="uniE07B" unicode="&#xe07b;" horiz-adv-x="471" 
-d="M471 -192c0 -105 -77 -165 -168 -165c-83 0 -114 38 -118 42c-13 17 -20 34 -20 51c0 36 27 61 63 61c32 0 56 -26 56 -58c0 -10 -3 -20 -8 -30c-12 -21 -33 -24 -55 -24c17 -12 41 -18 64 -18c79 0 91 62 91 130c0 58 -1 141 -67 141s-79 -71 -81 -79
-c0 -1 0 -10 -11 -10s-11 9 -11 10c-1 4 -6 39 -26 85c-12 28 -29 41 -42 46v-327c0 -5 -5 -10 -10 -10s-10 5 -10 10v683c0 5 5 9 10 9s10 -4 10 -9v-328c41 16 62 92 68 131c0 1 0 11 11 11s11 -10 11 -11c2 -8 15 -79 81 -79s67 85 67 142c0 68 -12 130 -91 130
-c-23 0 -47 -6 -64 -18c22 0 43 -3 55 -24c5 -10 8 -20 8 -30c0 -32 -23 -59 -56 -59c-37 0 -63 26 -63 62c0 17 7 34 20 51c4 4 35 41 118 41c91 0 168 -59 168 -164c0 -81 -45 -166 -137 -166c-28 0 -47 4 -71 19c-2 -3 -16 -33 -41 -50c25 -17 39 -47 41 -50
-c28 17 49 19 62 19c97 0 146 -74 146 -165zM10 355h54c5 0 9 -4 9 -9v-683c0 -5 -4 -10 -9 -10h-54c-5 0 -10 5 -10 10v683c0 5 5 9 10 9z" />
+d="M10 355h54c5 0 9 -4 9 -9v-683c0 -5 -4 -10 -9 -10h-54c-5 0 -10 5 -10 10v683c0 5 5 9 10 9zM471 -192c0 -105 -77 -165 -168 -165c-83 0 -114 38 -118 42c-13 17 -20 34 -20 51c0 36 27 61 63 61c32 0 56 -26 56 -58c0 -10 -3 -20 -8 -30c-12 -21 -33 -24 -55 -24
+c17 -12 41 -18 64 -18c79 0 91 62 91 130c0 58 -1 141 -67 141s-79 -71 -81 -79c0 -1 0 -10 -11 -10s-11 9 -11 10c-1 4 -6 39 -26 85c-12 28 -29 41 -42 46v-327c0 -5 -5 -10 -10 -10s-10 5 -10 10v683c0 5 5 9 10 9s10 -4 10 -9v-328c41 16 62 92 68 131c0 1 0 11 11 11
+s11 -10 11 -11c2 -8 15 -79 81 -79s67 85 67 142c0 68 -12 130 -91 130c-23 0 -47 -6 -64 -18c22 0 43 -3 55 -24c5 -10 8 -20 8 -30c0 -32 -23 -59 -56 -59c-37 0 -63 26 -63 62c0 17 7 34 20 51c4 4 35 41 118 41c91 0 168 -59 168 -164c0 -81 -45 -166 -137 -166
+c-28 0 -47 4 -71 19c-2 -3 -16 -33 -41 -50c25 -17 39 -47 41 -50c28 17 49 19 62 19c97 0 146 -74 146 -165z" />
     <glyph glyph-name="uniE07C" unicode="&#xe07c;" horiz-adv-x="497" 
-d="M323 154c54 -40 73 -109 73 -174c0 -135 -120 -273 -224 -346c-68 -53 -153 -89 -155 -89l-2 -1c-5 0 -12 2 -14 9v4c0 9 8 14 8 14c1 0 74 34 152 105c65 59 127 186 134 274v2l1 6v2v5l1 10c0 79 -10 193 -114 193c-60 0 -117 -34 -126 -97c9 9 27 19 49 19
-c42 0 81 -34 81 -77c0 -49 -38 -83 -86 -83c-8 0 -20 3 -28 5c-43 14 -59 50 -59 92c0 54 30 103 73 135c0 0 46 33 103 33c36 0 67 -7 95 -19h1c10 -5 25 -12 33 -18zM462 61c-20 0 -36 17 -36 38s16 38 36 38s36 -17 36 -38s-16 -38 -36 -38zM462 -55c20 0 36 -17 36 -38
-s-16 -38 -36 -38s-36 17 -36 38s16 38 36 38z" />
+d="M348 131c1 -1 0 -1 1 -2c30 -36 47 -86 47 -149c0 -50 -19 -108 -52 -164c-39 -66 -98 -130 -172 -182c-68 -53 -153 -89 -154 -89s-3 -1 -4 -1c-4 0 -11 2 -13 9c0 1 -1 3 -1 4c0 9 9 14 9 14c1 0 74 34 152 105c23 21 57 63 87 123c14 27 29 64 39 105c3 13 7 33 8 46
+c0 3 1 7 1 10c0 7 1 13 1 20c0 126 -37 188 -114 188c-60 0 -91 -27 -107 -50c-8 -12 -17 -33 -19 -47c9 9 27 19 49 19c14 0 29 -4 45 -14c23 -14 36 -37 36 -63c0 -30 -15 -57 -38 -70c-12 -7 -34 -13 -48 -13c-8 0 -20 3 -28 5c-22 7 -40 22 -49 42c-7 15 -10 32 -10 50
+c0 12 2 25 5 38c7 26 24 64 68 97c0 0 46 33 103 33c36 0 67 -7 94 -18c1 -1 2 -1 3 -2c9 -4 24 -11 32 -17l4 -4c8 -6 19 -16 25 -23zM341 137l-2 2zM365 106c-1 1 -2 3 -3 4c1 -1 2 -3 3 -4zM381 70c0 1 -1 1 -1 2c0 -1 1 -1 1 -2zM462 61c-20 0 -36 17 -36 38
+s16 38 36 38s36 -17 36 -38s-16 -38 -36 -38zM462 -55c20 0 36 -17 36 -38s-16 -38 -36 -38s-36 17 -36 38s16 38 36 38z" />
     <glyph glyph-name="uniE07D" unicode="&#xe07d;" horiz-adv-x="180" 
-d="M137 128c18 -13 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -73 21 -73 54c0 34 25 50 52 62c-15 14 -21 27 -21 46c0 46 39 72 82 72c31 0 67 -18 67 -53c0 -24 -14 -41 -43 -53zM95 153h1c4 -2 8 -5 22 -12c16 12 21 23 21 39c0 21 -11 33 -31 33s-34 -13 -34 -31
-c0 -13 5 -20 21 -29zM69 101c-17 -10 -26 -26 -26 -45c0 -21 15 -35 37 -35s39 14 39 33c0 14 -8 25 -27 36c-2 1 -3 1 -15 7c-3 2 -4 2 -8 4z" />
+d="M137 128c18 -13 28 -33 28 -55c0 -43 -38 -73 -92 -73c-44 0 -73 21 -73 54c0 17 9 35 24 47c8 6 17 10 28 15c-15 14 -21 27 -21 46c0 20 8 39 23 52s36 20 59 20c19 0 36 -6 48 -15c10 -8 19 -25 19 -38c0 -24 -14 -41 -43 -53zM95 153h1c4 -2 8 -5 22 -12
+c16 12 21 23 21 39c0 21 -11 33 -31 33s-34 -13 -34 -31c0 -13 5 -20 21 -29zM69 101c-17 -10 -26 -26 -26 -45c0 -21 15 -35 37 -35s39 14 39 33c0 14 -8 25 -27 36c-2 1 -3 1 -15 7c-3 2 -4 2 -8 4z" />
     <glyph glyph-name="uniE07E" unicode="&#xe07e;" horiz-adv-x="336" 
-d="M101 28c0 -4 1 -5 22 -5h19l-3 -23h-139l3 23h19c12 0 20 0 22 3c1 1 3 2 4 7c0 1 1 6 4 16l32 120c1 3 2 8 2 11s0 6 -11 6h-33l6 21h2c31 1 72 12 86 22v1h18l-49 -182c-3 -11 -4 -17 -4 -20zM331 229c3 0 5 -1 5 -5c0 -11 -9 -27 -19 -36c-14 -12 -32 -18 -58 -18
-c-14 0 -15 0 -38 5l-9 -34c14 5 25 7 38 7c38 0 66 -20 66 -60c0 -57 -44 -93 -99 -93c-41 0 -68 21 -68 53c0 21 13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27l-2 -1c0 -5 10 -11 23 -11c27 0 49 29 49 67c0 25 -11 38 -30 38c-7 0 -11 -1 -26 -7
-c-2 -12 -10 -19 -20 -19c-8 0 -13 6 -13 14s4 13 13 17l30 103l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8h1h1z" />
+d="M101 28c0 -4 1 -5 22 -5h19l-3 -23h-139l3 23h19c12 0 20 0 22 3c1 1 3 2 4 7c0 1 1 6 4 16l32 120c1 3 2 8 2 11s0 6 -11 6h-33l6 21h2c31 1 72 12 86 22v1h18l-49 -182c-3 -11 -4 -17 -4 -20zM332 229c2 0 4 -1 4 -5c0 -11 -9 -27 -19 -36c-14 -12 -32 -18 -58 -18
+c-14 0 -15 0 -38 5l-9 -34c14 5 25 7 38 7c20 0 36 -5 48 -16s18 -26 18 -44c0 -26 -10 -50 -28 -67s-43 -26 -71 -26c-41 0 -68 21 -68 53c0 21 13 35 32 35c17 0 28 -11 28 -27c0 -13 -7 -23 -20 -27l-2 -1c0 -5 10 -11 23 -11c27 0 49 29 49 67c0 25 -11 38 -30 38
+c-7 0 -11 -1 -26 -7c-2 -12 -10 -19 -20 -19c-8 0 -13 6 -13 14s4 13 13 17l30 103l2 -1c26 -6 49 -9 69 -9c17 0 30 2 44 8h1c1 0 2 1 3 1z" />
     <glyph glyph-name="uniE080" unicode="&#xe080;" horiz-adv-x="404" 
 d="M202 255c106 0 187 -110 187 -255s-81 -254 -187 -254s-187 109 -187 254s81 255 187 255zM261 -139v278c0 36 -16 75 -59 75s-59 -39 -59 -75v-278c0 -36 16 -75 59 -75s59 39 59 75z" />
     <glyph glyph-name="uniE081" unicode="&#xe081;" horiz-adv-x="351" 
 d="M249 -197h76c7 0 11 -5 11 -12v-22c0 -7 -4 -12 -11 -12h-274c-7 0 -12 5 -12 12v22c0 7 5 12 12 12h76v341l-71 -122c-2 -3 -6 -6 -10 -6c-2 0 -4 1 -6 2l-19 11c-3 2 -6 6 -6 10c0 2 0 4 1 6l112 194l4 4c2 1 4 2 6 2h99c7 0 12 -5 12 -12v-430z" />
     <glyph glyph-name="uniE082" unicode="&#xe082;" horiz-adv-x="392" 
 d="M342 -39c4 10 11 14 18 14c9 0 17 -6 17 -19c0 -27 -23 -102 -41 -139s-61 -60 -93 -60s-60 16 -78 42s-29 60 -58 60c-24 0 -32 -10 -33 -16c-1 -3 -1 -6 -1 -9c0 -8 2 -19 8 -33c2 -5 3 -9 3 -13c0 -18 -17 -31 -33 -31c-12 0 -36 3 -36 50s30 89 30 89
-c58 87 197 112 197 229c0 51 -11 86 -68 86c-15 0 -29 -3 -34 -5c-18 -5 -23 -12 -23 -18c0 -5 4 -10 7 -11c26 -10 46 -41 46 -69c0 -41 -33 -74 -74 -74s-75 33 -75 74c0 46 28 137 179 137s170 -83 170 -125c0 -60 -27 -112 -133 -145s-131 -71 -131 -71c10 2 18 3 26 3
-c54 0 68 -40 133 -40c49 0 69 72 77 94z" />
+c58 87 197 112 197 229c0 45 -7 63 -26 75c-12 8 -28 11 -42 11c-15 0 -29 -3 -34 -5c-18 -5 -23 -12 -23 -18c0 -5 4 -10 7 -11c26 -10 46 -41 46 -69c0 -41 -33 -74 -74 -74s-75 33 -75 74c0 46 28 137 179 137s170 -83 170 -125c0 -60 -27 -112 -133 -145
+s-131 -71 -131 -71c10 2 18 3 26 3c54 0 68 -40 133 -40c49 0 69 72 77 94z" />
     <glyph glyph-name="uniE083" unicode="&#xe083;" horiz-adv-x="379" 
-d="M272 16h-2c44 -14 94 -45 94 -118c0 -109 -104 -142 -200 -142c-74 0 -149 41 -149 123c0 36 29 65 65 65s64 -29 64 -65c0 -33 -27 -62 -60 -64c11 -8 37 -16 65 -16c42 0 87 18 87 85c0 70 -23 100 -67 106c-32 5 -55 5 -72 6c-11 1 -13 12 -13 12v20s1 14 13 14
-s68 4 80 6s59 11 59 74c0 54 -45 79 -87 79c-19 0 -38 -5 -52 -15l-3 -3c28 -6 50 -34 50 -63c0 -36 -28 -64 -64 -64s-65 28 -65 64l1 2h-1s-5 122 167 122s175 -113 175 -122c0 -55 -35 -87 -85 -106z" />
+d="M272 16h-2c44 -14 94 -45 94 -118c0 -109 -104 -142 -200 -142c-22 0 -71 1 -110 37c-36 33 -39 69 -39 82v4c0 36 29 65 65 65s64 -29 64 -65c0 -33 -27 -62 -60 -64c11 -8 37 -16 65 -16c42 0 87 18 87 85c0 70 -23 100 -67 106c-32 5 -55 5 -72 6c-11 1 -13 12 -13 12
+v20s1 14 13 14s68 4 80 6s59 11 59 74c0 54 -45 79 -87 79c-19 0 -38 -5 -52 -15l-3 -3c28 -6 50 -34 50 -63c0 -36 -28 -64 -64 -64s-65 28 -65 64l1 2h-1s-5 122 167 122s175 -113 175 -122v-5c0 -18 -5 -70 -85 -101z" />
     <glyph glyph-name="uniE084" unicode="&#xe084;" horiz-adv-x="457" 
-d="M208 -127h-172c-9 0 -11 6 -11 6s-6 11 -10 18c-1 2 -1 4 -1 6c0 6 3 11 3 11c26 37 56 87 82 168s31 155 31 155c1 6 6 12 14 12h148c4 0 8 -2 10 -4l22 -22c1 -1 3 -5 3 -10c0 -4 -1 -9 -5 -14c-118 -158 -229 -278 -229 -278h115v82c0 4 1 8 4 11l91 83c2 2 6 3 9 4
-c2 0 5 -1 7 -2l12 -6c5 -2 8 -7 8 -13v-159h89c8 0 14 -7 14 -14v-19c0 -8 -6 -15 -14 -15h-89v-74h89c8 0 14 -6 14 -14v-19c0 -8 -6 -14 -14 -14h-303c-7 0 -14 6 -14 14v19c0 8 7 14 14 14h83v74z" />
+d="M208 -127h-172c-9 0 -11 6 -11 6s-7 11 -10 18c-1 2 -1 4 -1 6c0 6 3 11 3 11c26 37 56 87 82 168s31 155 31 155c1 6 6 12 13 12h149c4 0 7 -2 10 -4l22 -22c1 -1 3 -5 3 -10c0 -4 -1 -9 -5 -14c-118 -158 -230 -278 -230 -278h116v82c0 4 1 8 4 11l91 83c2 2 6 3 9 3h2
+c2 0 3 0 5 -1l12 -6c4 -2 7 -7 7 -13v-159h90c8 0 14 -7 14 -14v-19c0 -8 -6 -15 -14 -15h-90v-74h90c8 0 14 -6 14 -14v-19c0 -8 -6 -14 -14 -14h-303c-7 0 -14 6 -14 14v19c0 8 7 14 14 14h83v74z" />
     <glyph glyph-name="uniE085" unicode="&#xe085;" horiz-adv-x="377" 
-d="M27 218c0 16 7 21 22 21c7 0 12 -1 12 -1c43 -6 78 -10 114 -10c37 0 75 4 124 16c6 1 10 2 14 2c13 0 18 -6 18 -14c0 -3 -1 -7 -2 -10c-28 -74 -82 -89 -154 -89c-35 0 -68 4 -83 5h-1c-6 0 -11 -5 -11 -11v-63c0 -4 3 -7 7 -7c1 0 3 0 4 1c29 20 64 28 97 28
-c100 0 174 -56 174 -162c0 -107 -85 -168 -187 -168c-77 0 -160 37 -160 125c0 34 27 70 66 70s73 -19 73 -68s-31 -60 -40 -66c-3 -2 -4 -4 -4 -7c0 -2 2 -5 5 -6c6 -4 19 -7 42 -7c71 0 90 66 90 125c0 48 -13 109 -84 109c-63 0 -74 -52 -79 -65c-2 -6 -6 -8 -10 -8
-c-2 0 -3 1 -5 1c-5 1 -26 6 -35 8c-6 1 -7 8 -7 13v3c3 45 5 90 5 135c0 52 -5 100 -5 100z" />
+d="M27 218v4c0 14 12 17 22 17c7 0 12 -1 12 -1c43 -6 78 -10 114 -10c37 0 75 4 124 16c6 1 10 2 14 2c13 0 18 -6 18 -14c0 -3 -1 -7 -2 -10c-8 -21 -24 -58 -71 -77c-22 -9 -53 -12 -83 -12c-35 0 -68 4 -83 5h-1c-6 0 -11 -5 -11 -11v-63c0 -4 3 -7 7 -7c1 0 3 0 4 1
+c29 20 64 28 97 28c45 0 88 -14 113 -31c37 -25 61 -77 61 -131c0 -40 -13 -82 -45 -115c-36 -37 -91 -53 -142 -53c-37 0 -73 9 -98 23c-52 30 -62 68 -62 102s27 70 66 70s73 -19 73 -68s-31 -60 -40 -66c-3 -2 -4 -4 -4 -7c0 -2 2 -5 5 -6c6 -4 19 -7 42 -7h8
+c66 3 82 75 82 125c0 48 -13 109 -84 109c-63 0 -74 -52 -79 -65c-2 -6 -6 -7 -10 -7h-5c-5 1 -26 6 -35 8c-6 1 -7 9 -7 13v3s4 66 5 122v13c0 52 -5 100 -5 100z" />
     <glyph glyph-name="uniE086" unicode="&#xe086;" horiz-adv-x="402" 
-d="M247 48c63 0 140 -37 140 -135c0 -116 -131 -157 -166 -157s-72 2 -130 46c-59 52 -76 121 -76 182c0 56 15 105 25 129c20 46 85 132 175 132c100 0 142 -53 155 -89c4 -8 6 -23 6 -32v-3c0 -36 -29 -64 -65 -64s-64 28 -64 64c0 23 17 50 38 59c-10 11 -25 19 -50 19
-c-70 0 -90 -74 -90 -131c0 -16 2 -32 5 -53c14 15 36 33 97 33zM210 -202c33 0 61 45 61 101s-28 102 -61 102s-60 -46 -60 -102s27 -101 60 -101z" />
+d="M247 48c63 0 140 -37 140 -135c0 -116 -131 -157 -166 -157s-72 2 -130 46c-59 52 -76 121 -76 182c0 56 15 105 25 129c20 46 85 132 175 132c100 0 142 -53 155 -89c4 -8 6 -23 6 -32v-1v-2c0 -36 -29 -64 -65 -64s-64 28 -64 64c0 23 17 50 38 59
+c-10 11 -25 19 -50 19c-54 0 -79 -46 -85 -83c-3 -18 -5 -32 -5 -48s2 -32 5 -53c14 15 36 33 97 33zM210 -202c33 0 61 45 61 101s-28 102 -61 102s-60 -46 -60 -102s27 -101 60 -101z" />
     <glyph glyph-name="uniE087" unicode="&#xe087;" horiz-adv-x="381" 
-d="M162 -123c23 33 125 207 133 222c-10 -9 -47 -13 -67 -13c-80 0 -83 38 -118 38s-50 -31 -50 -54v-32c0 -6 -5 -11 -11 -11h-23c-6 0 -11 5 -11 11v185c0 6 5 11 11 11h23c6 0 11 -5 11 -11v-48c3 6 41 69 103 69c65 0 77 -85 119 -85c40 0 42 68 42 78c0 11 7 14 12 14
-h18c6 0 10 -4 11 -14c1 -9 1 -14 1 -23c0 -22 -6 -78 -17 -109c-22 -63 -54 -148 -66 -195c-6 -22 -8 -46 -8 -67c0 -37 6 -68 6 -70v-3c1 -9 -16 -20 -25 -20c-7 0 -34 7 -62 6h-11c-32 -2 -42 -6 -58 -6c-11 0 -14 6 -14 17c0 37 29 77 51 110z" />
+d="M162 -123c23 33 125 206 133 222c-10 -10 -47 -13 -67 -13c-80 0 -83 38 -118 38s-50 -31 -50 -54v-32c0 -6 -5 -11 -11 -11h-23c-6 0 -11 5 -11 11v185c0 6 5 11 11 11h23c6 0 11 -5 11 -11v-48c3 6 41 69 103 69c65 0 77 -86 119 -86c40 0 42 69 42 79s7 14 12 14h18
+c6 0 10 -4 11 -14s1 -14 1 -23c0 -23 -6 -78 -17 -109c-22 -63 -54 -148 -66 -195c-6 -22 -8 -46 -8 -67c0 -37 6 -68 6 -70v-3c1 -9 -16 -20 -25 -20c-7 0 -34 7 -63 7c-3 0 -7 -1 -10 -1c-32 -2 -42 -6 -58 -6c-11 0 -14 6 -14 17c0 37 29 77 51 110z" />
     <glyph glyph-name="uniE088" unicode="&#xe088;" horiz-adv-x="408" 
-d="M324 18c52 -27 69 -72 69 -120c0 -81 -85 -146 -189 -146s-189 65 -189 146c0 48 25 85 70 111c-47 30 -57 66 -57 106c0 72 79 131 176 131s176 -59 176 -131c0 -40 -23 -72 -56 -97zM268 45c18 9 40 32 40 80c0 46 -42 75 -104 75c-43 0 -79 -16 -79 -55
-c0 -45 75 -78 143 -100zM204 -192c64 0 98 35 98 62c0 55 -97 89 -165 112c0 0 -52 -16 -52 -83c0 -56 55 -91 119 -91z" />
+d="M324 18c52 -27 69 -72 69 -120c0 -81 -85 -146 -189 -146s-189 65 -189 146c0 48 25 85 70 111c-47 30 -57 66 -57 106c0 72 79 131 176 131s176 -59 176 -131c0 -40 -23 -72 -56 -97zM204 -192c63 0 98 35 98 62c0 55 -97 89 -165 112c0 0 -52 -16 -52 -83
+c0 -56 55 -91 119 -91zM268 45c18 9 40 32 40 80c0 46 -42 75 -104 75c-43 0 -79 -16 -79 -55c0 -45 75 -78 143 -100z" />
     <glyph glyph-name="uniE089" unicode="&#xe089;" horiz-adv-x="402" 
-d="M155 -47c-63 0 -140 37 -140 135c0 116 131 157 166 157s72 -2 130 -46c59 -52 76 -121 76 -182c0 -56 -15 -105 -25 -129c-20 -46 -85 -132 -175 -132c-100 0 -142 53 -155 89c-4 8 -6 23 -6 32v3c0 36 29 64 65 64s64 -28 64 -64c0 -23 -17 -50 -38 -59
-c10 -11 25 -19 50 -19c70 0 90 74 90 131c0 16 -2 32 -5 53c-14 -15 -36 -33 -97 -33zM192 204c-33 0 -61 -46 -61 -102s28 -101 61 -101s60 45 60 101s-27 102 -60 102z" />
+d="M155 -47c-63 0 -140 37 -140 135c0 116 131 157 166 157s72 -2 130 -46c59 -52 76 -121 76 -182c0 -56 -15 -105 -25 -129c-20 -46 -85 -132 -175 -132c-100 0 -142 53 -155 89c-4 8 -6 23 -6 32v1v2c0 36 29 64 65 64s64 -28 64 -64c0 -23 -17 -50 -38 -59
+c10 -11 25 -19 50 -19c54 0 79 46 85 83c3 18 5 32 5 48s-2 32 -5 53c-14 -15 -36 -33 -97 -33zM192 204c-33 0 -61 -46 -61 -102s28 -101 61 -101s60 45 60 101s-27 102 -60 102z" />
     <glyph glyph-name="uniE08A" unicode="&#xe08a;" horiz-adv-x="463" 
 d="M325 179c2 1 2 3 2 4c0 2 0 3 -1 5c-11 17 -32 34 -79 34c-89 0 -111 -64 -111 -120v-191c0 -88 42 -135 129 -135c88 0 147 50 151 133c0 4 4 8 8 8h13c5 0 8 -3 8 -8c-4 -107 -81 -165 -180 -165c-250 0 -265 149 -265 268c0 65 25 246 243 246c170 0 209 -92 218 -135
-c2 -7 2 -14 2 -21c0 -50 -40 -90 -90 -90h-11c-41 5 -74 37 -79 78c-1 4 -1 8 -1 12c0 32 18 61 43 77z" />
+c1 -4 2 -11 2 -15v-6c0 -50 -40 -90 -90 -90h-11c-41 5 -74 37 -79 78c-1 4 -1 8 -1 12c0 32 18 61 43 77z" />
     <glyph glyph-name="uniE08B" unicode="&#xe08b;" horiz-adv-x="463" 
-d="M424 -83h13c5 0 8 -3 8 -8c-4 -112 -84 -165 -189 -165v-109c0 -6 -5 -11 -11 -11h-27c-6 0 -11 5 -11 11v112c-195 21 -207 156 -207 265c0 61 22 225 207 244v121c0 6 5 11 11 11h27c6 0 11 -5 11 -11v-120c159 -4 196 -93 205 -134c2 -7 2 -14 2 -21
-c0 -50 -40 -90 -90 -90h-10c-41 5 -75 37 -80 78c-1 4 -1 8 -1 12c0 32 18 61 43 77c2 1 2 2 2 4c0 1 0 2 -1 4c-10 16 -29 33 -70 35v-446c87 0 155 39 160 133c0 4 4 8 8 8zM136 102v-191c0 -66 23 -109 71 -126v432c-57 -16 -71 -68 -71 -115z" />
+d="M424 -83h13c5 0 8 -3 8 -8c-4 -107 -81 -165 -180 -165h-9v-109c0 -6 -5 -11 -11 -11h-27c-6 0 -11 5 -11 11v112c-195 21 -207 156 -207 265c0 61 22 225 207 244v121c0 6 5 11 11 11h27c6 0 11 -5 11 -11v-120c159 -4 196 -93 205 -134c1 -4 2 -11 2 -15v-6
+c0 -50 -40 -90 -90 -90h-10c-41 5 -75 37 -80 78c-1 4 -1 8 -1 12c0 32 18 61 43 77c2 1 2 2 2 4c0 1 0 2 -1 4c-10 16 -29 33 -70 35v-446h9c88 0 147 50 151 133c0 4 4 8 8 8zM136 102v-191c0 -66 23 -109 71 -126v432c-57 -16 -71 -68 -71 -115z" />
     <glyph glyph-name="uniE08C" unicode="&#xe08c;" horiz-adv-x="408" 
 d="M227 23h167c7 0 14 -6 14 -13v-19c0 -7 -7 -14 -14 -14h-167v-167c0 -7 -6 -14 -13 -14h-20c-7 0 -13 7 -13 14v167h-168c-7 0 -13 7 -13 14v19c0 7 6 13 13 13h168v168c0 7 6 13 13 13h20c7 0 13 -6 13 -13v-168z" />
     <glyph glyph-name="uniE0A0" unicode="&#xe0a0;" horiz-adv-x="539" 
-d="M23 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM451 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v79c-30 -30 -81 -50 -158 -50c-78 0 -129 20 -159 50v-79c0 -6 -7 -14 -14 -14c-10 0 -23 0 -23 14v329
-s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 159 49c77 0 128 -20 158 -49v78c0 8 6 14 14 14h9zM524 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM321 -97c24 8 33 25 33 51s-19 90 -33 117s-32 33 -59 33c-16 0 -32 -3 -44 -6
-c-22 -7 -32 -21 -32 -45c0 -31 18 -96 32 -123c13 -24 32 -33 60 -33c15 0 31 3 43 6z" />
+d="M23 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329s6 14 14 14h9zM451 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v79c-30 -30 -81 -50 -158 -50c-78 0 -129 20 -159 50v-79c0 -6 -7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329
+s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 159 49c77 0 128 -20 158 -49v78c0 8 6 14 14 14h9zM321 -97c24 8 33 25 33 51s-19 90 -33 117c-14 26 -32 33 -59 33c-16 0 -32 -3 -44 -6c-22 -8 -32 -22 -32 -45v-6c1 -27 19 -92 32 -117c13 -24 32 -33 60 -33
+c15 0 31 3 43 6zM524 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329s6 14 14 14h9z" />
     <glyph glyph-name="uniE0A1" unicode="&#xe0a1;" horiz-adv-x="432" 
 d="M410 177h9c8 0 13 -6 13 -14v-328c0 -8 -5 -14 -13 -14h-9c-8 0 -14 6 -14 14v26h-359v-21c0 -8 -6 -14 -14 -14h-9c-8 0 -14 6 -14 14v323c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-22h359v22c0 8 6 14 14 14zM396 -70v143h-359v-143h359z" />
     <glyph glyph-name="uniE0A2" unicode="&#xe0a2;" horiz-adv-x="373" 
-d="M187 136c138 0 186 -70 186 -135s-48 -135 -186 -135s-187 70 -187 135s49 135 187 135zM195 -102c40 0 76 8 76 57c0 25 -19 90 -33 116c-14 27 -32 33 -59 33c-16 0 -32 -2 -44 -6c-24 -8 -34 -24 -32 -51c1 -26 19 -91 32 -116s32 -33 60 -33z" />
+d="M187 136c138 0 186 -70 186 -135s-48 -135 -186 -135s-187 70 -187 135s49 135 187 135zM238 -96c24 7 32 25 32 51c0 25 -18 89 -32 116s-32 33 -60 33c-15 0 -31 -2 -43 -6c-24 -8 -34 -24 -32 -51c1 -27 19 -91 32 -116s32 -33 60 -33c15 0 31 2 43 6z" />
     <glyph glyph-name="uniE0A3" unicode="&#xe0a3;" 
-d="M213 132c62 0 112 -33 112 -92c0 -88 -109 -173 -213 -173c-81 0 -112 48 -112 91c0 93 116 174 213 174zM75 -86c46 0 215 85 215 135c0 22 -16 36 -40 36c-47 0 -215 -86 -215 -135c0 -9 7 -36 40 -36z" />
+d="M213 132c62 0 112 -33 112 -92c0 -88 -109 -173 -213 -173c-81 0 -112 48 -112 91c0 93 116 174 213 174zM186 -44c3 2 104 50 104 93c0 22 -16 36 -40 36c-36 0 -107 -40 -111 -42s-104 -51 -104 -93c0 -9 7 -36 40 -36c35 0 108 40 111 42z" />
     <glyph glyph-name="uniE0A4" unicode="&#xe0a4;" 
 d="M0 -42c0 92 116 174 213 174c62 0 112 -33 112 -92c0 -88 -109 -173 -213 -173c-81 0 -112 48 -112 91z" />
-    <glyph glyph-name="uniE0A5" unicode="&#xe0a5;" horiz-adv-x="0" 
+    <glyph glyph-name="uniE0A5" unicode="&#xe0a5;" 
  />
     <glyph glyph-name="uniE0A9" unicode="&#xe0a9;" 
 d="M320 96l-122 -96l122 -96c3 -2 5 -6 5 -10c0 -3 -2 -7 -4 -9l-12 -13c-2 -3 -6 -4 -10 -4c-3 0 -7 1 -9 3l-127 101l-128 -101c-2 -2 -6 -3 -9 -3c-4 0 -8 1 -10 4l-12 13c-2 2 -4 6 -4 9c0 4 2 8 5 10l122 96l-122 96c-3 2 -5 6 -5 10s2 8 4 10l13 12c3 2 5 4 9 4
 c3 0 7 -1 9 -3l128 -101l127 101c2 2 6 3 9 3c4 0 7 -2 10 -4l12 -12c2 -2 4 -5 4 -9v-1c0 -4 -2 -8 -5 -10z" />
     <glyph glyph-name="uniE0AF" unicode="&#xe0af;" 
-d="M186 23h128c6 0 11 -6 11 -14v-19c0 -7 -5 -13 -11 -13h-128v-101c0 -4 -6 -8 -14 -8h-19c-7 0 -13 4 -13 8v101h-129c-6 0 -11 6 -11 13v19c0 8 5 14 11 14h129v100c0 5 6 9 13 9h19c8 0 14 -4 14 -9v-100z" />
+d="M186 23h128c6 0 11 -6 11 -14v-19c0 -7 -5 -13 -11 -13h-128v-101c0 -4 -6 -8 -14 -8h-19c-7 0 -13 4 -13 8v101h-129c-6 0 -11 6 -11 13v19c0 8 5 14 11 14h128v100c0 5 6 9 14 9h19c8 0 14 -4 14 -9v-100z" />
     <glyph glyph-name="uniE0B3" unicode="&#xe0b3;" 
-d="M162 163c90 0 163 -73 163 -163s-73 -162 -163 -162s-162 72 -162 162s72 163 162 163zM163 20l93 76c-24 24 -58 38 -94 38c-33 0 -64 -13 -87 -33zM140 1l-84 79c-17 -22 -27 -50 -27 -80c0 -27 8 -52 22 -73zM184 0l85 -80c17 22 27 50 27 80c0 27 -8 52 -22 73z
-M162 -19l-93 -76c24 -24 58 -38 94 -38c33 0 64 12 87 32z" />
+d="M184 0l85 -80c17 22 27 50 27 80c0 27 -8 52 -22 73zM162 -19l-93 -76c24 -24 58 -38 94 -38c33 0 64 12 87 32zM140 1l-84 79c-17 -22 -27 -50 -27 -80c0 -27 8 -52 22 -73zM163 20l93 76c-24 24 -58 38 -94 38c-33 0 -64 -13 -87 -33zM162 163c90 0 163 -73 163 -163
+s-73 -162 -163 -162s-162 72 -162 162s72 163 162 163z" />
     <glyph glyph-name="uniE0D7" unicode="&#xe0d7;" horiz-adv-x="373" 
-d="M350 179h9c8 0 14 -6 14 -14v-329c0 -8 -6 -14 -14 -14h-9c-7 0 -13 6 -13 14v133c-50 -34 -139 -97 -141 -98c-2 -2 -6 -3 -9 -3c-4 0 -8 1 -14 6l-136 95v-133c0 -8 -7 -14 -14 -14h-9c-8 0 -14 6 -14 14v329c0 8 6 14 14 14h9c7 0 14 -6 14 -14v-134l140 99
-c2 2 5 3 10 3c4 0 7 -1 9 -3c2 -1 92 -64 141 -98v133c0 8 6 14 13 14zM153 -80l149 104l-82 57l-149 -104z" />
+d="M350 179h9c8 0 14 -7 14 -14v-329c0 -8 -6 -14 -14 -14h-9c-7 0 -14 6 -14 14v134c-49 -35 -138 -98 -140 -99c-2 -2 -6 -3 -10 -3c-3 0 -7 1 -13 6l-137 95v-133c0 -8 -6 -14 -13 -14h-9c-8 0 -14 6 -14 14v329c0 7 6 14 14 14h9c7 0 13 -7 13 -14v-134l141 99
+c2 2 5 3 9 3c5 0 8 -1 10 -3c2 -1 92 -64 140 -98v133c0 7 7 14 14 14zM153 -80l149 104l-82 57l-149 -104z" />
     <glyph glyph-name="uniE0D8" unicode="&#xe0d8;" horiz-adv-x="373" 
-d="M196 -130c-2 -2 -6 -3 -9 -3c-4 0 -8 1 -14 6l-170 118c-2 2 -3 5 -3 8c0 4 2 7 5 9l172 121c2 2 5 3 10 3c4 0 7 -1 9 -3c3 -2 172 -120 172 -120c3 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9c0 0 -170 -119 -172 -120zM153 -81l149 104l-82 57l-149 -104z" />
+d="M196 -130c-2 -2 -6 -3 -10 -3c-3 0 -7 1 -13 6l-170 118c-2 2 -3 5 -3 8c0 4 2 7 5 9l172 121c2 2 5 3 9 3c5 0 8 -1 10 -3c3 -2 172 -120 172 -120c3 -2 5 -6 5 -9c0 -4 -2 -7 -5 -9c0 0 -170 -120 -172 -121zM153 -81l149 104l-82 57l-149 -104z" />
     <glyph glyph-name="uniE0D9" unicode="&#xe0d9;" horiz-adv-x="335" 
-d="M330 -9l-154 -120c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -8zM198 -80l73 57l-133 104l-74 -58z" />
+d="M330 -9l-154 -120c-2 -2 -5 -3 -9 -3c-3 0 -6 1 -8 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c3 -2 5 -6 5 -9c0 -4 -2 -7 -5 -9zM197 -80l74 57l-133 104l-74 -58z" />
     <glyph glyph-name="uniE0DB" unicode="&#xe0db;" horiz-adv-x="335" 
-d="M330 -10l-154 -119c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z" />
+d="M330 -10l-154 -119c-2 -2 -5 -3 -9 -3c-3 0 -6 1 -8 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c3 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z" />
     <glyph glyph-name="uniE0EC" unicode="&#xe0ec;" horiz-adv-x="460" 
-d="M230 230c127 0 230 -103 230 -230s-103 -230 -230 -230s-230 103 -230 230s103 230 230 230zM230 -206c115 0 206 92 206 206c0 113 -92 206 -206 206c-113 0 -206 -92 -206 -206c0 -113 92 -206 206 -206zM388 96l-122 -96l122 -96c3 -2 5 -6 5 -10c0 -3 -2 -7 -4 -9
-l-12 -13c-2 -3 -6 -4 -10 -4c-3 0 -7 1 -9 3l-127 101l-128 -101c-2 -2 -6 -3 -9 -3c-4 0 -8 1 -10 4l-12 13c-2 2 -4 6 -4 9c0 4 2 8 5 10l122 96l-122 96c-3 2 -5 6 -5 10s2 8 4 10l13 12c3 2 5 4 9 4c3 0 7 -1 9 -3l128 -101l127 101c2 2 6 3 9 3c4 0 7 -2 10 -4l12 -12
-c2 -2 4 -5 4 -9v-1c0 -4 -2 -8 -5 -10z" />
+d="M230 230c127 0 230 -103 230 -230s-103 -230 -230 -230s-230 103 -230 230s103 230 230 230zM376 -146c19 19 34 41 44 66s16 52 16 80s-6 55 -16 80c-21 49 -61 89 -110 110c-25 10 -52 16 -80 16s-55 -6 -80 -16c-49 -21 -89 -61 -110 -110c-10 -25 -16 -52 -16 -80
+s6 -55 16 -80c21 -49 61 -89 110 -110c25 -10 52 -16 80 -16s55 6 80 16s47 25 66 44zM388 96l-122 -96l122 -96c3 -2 5 -6 5 -10c0 -3 -2 -7 -4 -9l-12 -13c-2 -3 -6 -4 -10 -4c-3 0 -7 1 -9 3l-127 101l-128 -101c-2 -2 -6 -3 -9 -3c-4 0 -8 1 -10 4l-12 13
+c-2 2 -4 6 -4 9c0 4 2 8 5 10l122 96l-122 96c-3 2 -5 6 -5 10s2 8 4 10l13 12c3 2 5 4 9 4c3 0 7 -1 9 -3l128 -101l127 101c2 2 6 3 9 3c4 0 7 -2 10 -4l12 -12c2 -2 4 -5 4 -9v-1c0 -4 -2 -8 -5 -10z" />
     <glyph glyph-name="uniE1D0" unicode="&#xe1d0;" horiz-adv-x="538" 
-d="M23 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM451 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v79c-30 -30 -81 -50 -158 -50c-78 0 -129 20 -159 50v-79c0 -6 -7 -14 -14 -14c-10 0 -23 0 -23 14v329
-s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 159 49c77 0 128 -20 158 -49v78c0 8 6 14 14 14h9zM524 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9zM321 -97c24 8 33 25 33 51s-19 90 -33 117s-32 33 -59 33c-16 0 -32 -3 -44 -6
-c-22 -7 -32 -21 -32 -45c0 -31 18 -96 32 -123c13 -24 32 -33 60 -33c15 0 31 3 43 6z" />
+d="M23 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329s6 14 14 14h9zM451 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v79c-30 -30 -81 -50 -158 -50c-78 0 -129 20 -159 50v-79c0 -6 -7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329
+s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 159 49c77 0 128 -20 158 -49v78c0 8 6 14 14 14h9zM321 -97c24 8 33 25 33 51s-19 90 -33 117c-14 26 -32 33 -59 33c-16 0 -32 -3 -44 -6c-22 -8 -32 -22 -32 -45v-6c1 -27 19 -92 32 -117c13 -24 32 -33 60 -33
+c15 0 31 3 43 6zM524 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329s6 14 14 14h9z" />
     <glyph glyph-name="uniE1D1" unicode="&#xe1d1;" horiz-adv-x="432" 
 d="M410 177h9c8 0 13 -6 13 -14v-328c0 -8 -5 -14 -13 -14h-9c-8 0 -14 6 -14 14v26h-359v-21c0 -8 -6 -14 -14 -14h-9c-8 0 -14 6 -14 14v323c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-22h359v22c0 8 6 14 14 14zM396 -70v143h-359v-143h359z" />
     <glyph glyph-name="uniE1D2" unicode="&#xe1d2;" horiz-adv-x="373" 
-d="M187 136c138 0 186 -70 186 -135s-48 -135 -186 -135s-187 70 -187 135s49 135 187 135zM195 -102c40 0 76 8 76 57c0 25 -19 90 -33 116c-14 27 -32 33 -59 33c-16 0 -32 -2 -44 -6c-24 -8 -34 -24 -32 -51c1 -26 19 -91 32 -116s32 -33 60 -33z" />
+d="M187 136c138 0 186 -70 186 -135s-48 -135 -186 -135s-187 70 -187 135s49 135 187 135zM238 -96c24 7 32 25 32 51c0 25 -18 89 -32 116s-32 33 -60 33c-15 0 -31 -2 -43 -6c-24 -8 -34 -24 -32 -51c1 -27 19 -91 32 -116s32 -33 60 -33c15 0 31 2 43 6z" />
     <glyph glyph-name="uniE1D3" unicode="&#xe1d3;" 
 d="M296 865h29v-824c0 -99 -122 -173 -213 -173c-57 0 -112 29 -112 91c0 98 123 174 213 174c33 0 63 -9 83 -27v759zM74 -86c49 0 215 85 215 135c0 23 -18 36 -40 36c-39 0 -215 -82 -215 -135c0 -22 19 -36 40 -36z" />
     <glyph glyph-name="uniE1D4" unicode="&#xe1d4;" 
-d="M0 -865v823c0 93 116 174 213 174c62 0 112 -34 112 -92c0 -89 -109 -173 -213 -173c-38 0 -65 10 -83 26v-758h-29zM75 -86c46 0 215 85 215 135c0 21 -16 36 -40 36c-47 0 -215 -86 -215 -135c0 -9 7 -36 40 -36z" />
+d="M0 -865v823c0 93 116 174 213 174c62 0 112 -34 112 -92c0 -88 -109 -173 -213 -173c-38 0 -65 10 -83 26v-758h-29zM186 -44c3 2 104 50 104 93c0 21 -16 36 -40 36c-36 0 -107 -40 -111 -42s-104 -51 -104 -93c0 -9 7 -36 40 -36c35 0 108 40 111 42z" />
     <glyph glyph-name="uniE1D5" unicode="&#xe1d5;" 
-d="M325 865v-825c0 -73 -98 -171 -215 -171c-68 0 -110 39 -110 85c0 85 101 178 215 178c15 0 54 -2 81 -24v757h29z" />
+d="M325 865v-825c0 -73 -98 -171 -215 -171c-69 0 -110 39 -110 85c0 85 101 178 215 178c15 0 54 -2 81 -24v757h29z" />
     <glyph glyph-name="uniE1D6" unicode="&#xe1d6;" 
-d="M0 -864v822c0 93 116 174 213 174c62 0 112 -34 112 -92c0 -89 -109 -173 -213 -173c-38 0 -65 10 -83 26v-757h-29z" />
+d="M0 -864v822c0 93 116 174 213 174c62 0 112 -34 112 -92c0 -88 -109 -173 -213 -173c-38 0 -65 10 -83 26v-757h-29z" />
     <glyph glyph-name="uniE1D7" unicode="&#xe1d7;" horiz-adv-x="585" 
-d="M325 631v-591c0 -73 -98 -171 -215 -171c-68 0 -110 39 -110 85c0 85 101 178 215 178c15 0 54 -2 81 -24v769c0 7 6 13 13 13c5 0 11 -3 12 -8c0 -1 9 -36 10 -39c2 -4 19 -61 56 -118c27 -42 107 -146 119 -165s79 -95 79 -224c0 -61 -12 -175 -62 -264
-c-4 -7 -10 -11 -16 -11s-11 4 -11 10c0 4 2 9 4 15c26 72 45 146 45 218c0 129 -107 273 -220 327z" />
+d="M325 631v-591c0 -73 -98 -171 -215 -171c-69 0 -110 39 -110 85c0 85 101 178 215 178c15 0 54 -2 81 -24v769c0 7 6 13 13 13c5 0 11 -4 12 -8c0 -1 9 -36 10 -39c1 -4 18 -61 56 -118c27 -42 107 -146 119 -165s79 -95 79 -224c0 -61 -12 -175 -62 -264
+c-4 -7 -10 -11 -16 -11c-2 0 -3 0 -5 1c-4 2 -6 5 -6 9s2 9 4 15c26 72 45 146 45 218c0 129 -107 273 -220 327z" />
     <glyph glyph-name="uniE1D8" unicode="&#xe1d8;" 
-d="M0 -877v835c0 93 116 174 213 174c62 0 112 -33 112 -92c0 -49 -33 -96 -80 -129c46 -89 64 -162 64 -247c0 -88 -29 -154 -79 -224s-110 -117 -149 -182c-36 -59 -44 -97 -46 -101c-1 -3 -10 -38 -10 -39c-1 -5 -7 -8 -12 -8c-7 0 -13 6 -13 13zM267 -304
+d="M0 -877v835c0 93 116 174 213 174c62 0 112 -33 112 -92c0 -49 -33 -96 -80 -129c46 -89 64 -162 64 -247c0 -88 -30 -154 -79 -224c-50 -70 -110 -117 -149 -182c-36 -59 -45 -97 -46 -101c-1 -3 -10 -38 -10 -39c-1 -5 -7 -8 -12 -8c-7 0 -13 6 -13 13zM267 -304
 c0 67 -13 117 -48 199c-33 -17 -70 -28 -107 -28c-38 0 -64 11 -82 26v-525c49 22 134 76 190 171c18 31 47 73 47 157z" />
     <glyph glyph-name="uniE1D9" unicode="&#xe1d9;" horiz-adv-x="575" 
-d="M296 107v771c0 7 3 13 15 13c11 0 13 -5 14 -13c3 -10 28 -103 66 -158s89 -106 136 -168c34 -45 48 -92 48 -144c0 -50 -9 -87 -19 -124c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -15 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 2 11 4 16
-c14 39 23 85 23 126c0 108 -103 222 -192 269v-442c0 -73 -98 -170 -215 -170c-68 0 -110 38 -110 85c0 84 101 178 215 178c15 0 54 -2 81 -25zM530 365c1 10 2 20 1 30c0 38 -8 78 -47 129c-36 47 -101 117 -152 117c7 -49 33 -86 67 -120c49 -49 79 -81 106 -116
-c8 -11 17 -24 25 -40z" />
+d="M530 365c1 10 1 20 1 30c0 37 -8 78 -48 129c-35 47 -100 117 -151 117c7 -49 33 -86 67 -120c49 -49 79 -81 106 -116c8 -11 17 -24 25 -40zM296 107v771c0 7 3 13 15 13c11 0 13 -5 14 -13c3 -10 28 -103 66 -158s88 -106 136 -168c34 -45 48 -93 48 -145
+c0 -49 -9 -86 -19 -123c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -15 -15 -14c-2 0 -4 0 -5 1c-5 3 -7 7 -7 11c0 5 2 11 4 16c15 40 21 91 22 115c0 4 0 8 1 11c0 108 -103 221 -192 269v-442c0 -73 -98 -170 -215 -170c-69 0 -110 38 -110 85
+c0 84 101 178 215 178c15 0 54 -2 81 -25z" />
     <glyph glyph-name="uniE1DA" unicode="&#xe1da;" 
-d="M0 -875v833c0 93 116 174 213 174c62 0 112 -33 112 -92c0 -47 -31 -94 -77 -127c29 -30 58 -77 58 -140c0 -26 -2 -43 -5 -57c5 -37 8 -74 8 -107c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM112 -133
-c-38 0 -65 11 -83 26v-339c75 22 208 105 232 186v4c3 12 4 24 4 37c0 54 -17 87 -41 117c-34 -19 -74 -31 -112 -31zM37 -624c48 12 122 33 183 109c27 33 47 81 47 159c-27 -49 -96 -105 -154 -150s-67 -81 -73 -107c-1 -3 -2 -7 -3 -11z" />
+d="M0 -875v833c0 93 116 174 213 174c62 0 112 -33 112 -92c0 -47 -31 -94 -77 -127c29 -30 58 -77 58 -139c0 -27 -2 -44 -6 -58c6 -37 9 -73 9 -107c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM112 -133
+c-38 0 -65 11 -83 26v-339c49 15 135 56 198 129c16 18 28 37 33 57l1 4c3 12 4 24 4 37c0 54 -17 87 -41 117c-35 -19 -74 -31 -112 -31zM37 -624c48 12 122 33 183 109c26 33 47 81 47 159c-27 -49 -96 -105 -154 -150c-59 -44 -67 -81 -74 -107c0 -3 -1 -7 -2 -11z" />
     <glyph glyph-name="uniE1DB" unicode="&#xe1db;" horiz-adv-x="575" 
-d="M296 107v947c0 7 3 12 15 12c11 0 13 -5 14 -12c3 -10 28 -103 66 -158s88 -107 136 -169c34 -45 48 -92 48 -144c0 -36 -4 -66 -11 -94c7 -23 11 -48 11 -73c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -74c0 -24 -29 -149 -59 -153c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11
-s2 11 4 16c15 41 22 86 22 130c0 105 -103 218 -191 264v-442c0 -73 -98 -170 -215 -170c-68 0 -110 38 -110 85c0 84 101 178 215 178c15 0 54 -2 81 -25zM483 700c-36 47 -101 116 -152 116c5 -22 13 -47 28 -69c38 -55 120 -125 168 -187c1 -2 3 -4 4 -6
-c0 62 -9 95 -48 146zM505 406c8 -11 17 -24 25 -39c1 11 1 21 1 32c0 39 -7 81 -48 134c-35 46 -100 109 -152 109c8 -49 33 -85 68 -121c49 -49 79 -80 106 -115z" />
+d="M296 107v947c0 7 3 12 15 12c11 0 13 -5 14 -12c3 -10 28 -103 66 -158c38 -56 88 -107 136 -169c34 -45 48 -92 48 -144c0 -36 -4 -66 -11 -94c7 -23 11 -48 11 -73c0 -50 -9 -93 -19 -131c3 -21 5 -46 5 -74c0 -24 -29 -149 -59 -153c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11
+s2 11 4 16c15 41 22 86 22 130c0 105 -104 218 -191 264v-442c0 -73 -98 -170 -215 -170c-69 0 -110 38 -110 85c0 84 101 178 215 178c15 0 54 -2 81 -25zM483 700c-36 47 -101 116 -152 116c5 -22 13 -47 28 -69c38 -55 120 -125 168 -187c1 -2 3 -4 4 -6v14
+c0 39 -8 80 -48 132zM504 406c9 -11 18 -24 26 -39c1 11 1 21 1 32c0 39 -7 81 -48 134c-36 46 -100 109 -152 109c8 -49 33 -85 68 -121c49 -49 79 -80 105 -115z" />
     <glyph glyph-name="uniE1DC" unicode="&#xe1dc;" 
-d="M0 -1064v1022c0 93 116 174 213 174c62 0 112 -33 112 -92c0 -47 -31 -93 -76 -126c28 -30 57 -77 57 -140c0 -29 -4 -55 -10 -77c8 -36 10 -71 10 -109c-1 -16 -3 -33 -7 -50c7 -41 10 -81 10 -118c0 -184 -139 -262 -193 -312c-40 -38 -71 -68 -86 -171
-c-2 -8 -7 -17 -15 -17s-15 9 -15 16zM112 -133c-38 0 -65 11 -83 26v-338c92 27 236 117 236 227c0 54 -16 86 -41 116c-34 -19 -73 -31 -112 -31zM37 -626c110 42 229 109 229 243c0 6 0 11 -1 17c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123
-c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14zM36 -813c140 40 231 112 231 264c-7 -12 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -27 -68z" />
+d="M0 -1064v1022c0 93 116 174 213 174c62 0 112 -33 112 -92c0 -47 -31 -93 -76 -126c28 -30 57 -77 57 -139c0 -30 -4 -56 -11 -78c9 -36 11 -71 11 -109c-1 -16 -4 -33 -7 -50c6 -41 10 -81 10 -118c0 -184 -139 -262 -193 -312c-40 -38 -71 -68 -86 -171
+c-2 -8 -7 -16 -15 -16s-15 8 -15 15zM37 -626c110 42 229 109 229 243c0 6 0 11 -1 17c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123c-56 -47 -67 -81 -74 -107c0 -3 -1 -8 -2 -14zM112 -133c-38 0 -65 11 -83 26v-338c92 27 236 117 236 227c0 54 -16 86 -41 116
+c-34 -19 -73 -31 -112 -31zM35 -813c141 40 232 112 232 264c-7 -12 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68z" />
     <glyph glyph-name="uniE1DD" unicode="&#xe1dd;" horiz-adv-x="575" 
-d="M296 107v1134c0 7 3 13 15 13c11 0 13 -5 14 -13c3 -10 28 -103 66 -158s88 -106 136 -168c34 -45 48 -92 48 -144c0 -40 -5 -72 -13 -102c8 -25 12 -52 13 -79c1 -37 -5 -70 -12 -100c8 -24 12 -48 12 -74c0 -48 -9 -93 -19 -131c3 -21 5 -45 5 -74
-c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 2 11 4 16c15 40 22 90 22 115c0 118 -90 226 -191 279v-442c0 -73 -98 -170 -215 -170c-68 0 -110 38 -110 85c0 84 101 178 215 178c15 0 54 -4 81 -25zM483 887
-c-36 48 -101 117 -153 117h-1c4 -24 13 -54 30 -79c38 -55 120 -129 168 -191c1 -2 2 -3 3 -5c1 9 1 18 1 27c0 39 -8 80 -48 131zM527 560c1 -2 2 -4 4 -6c0 64 -7 100 -48 153c-36 47 -101 109 -152 109c5 -23 13 -47 28 -69c38 -55 120 -125 168 -187zM504 406
-c9 -11 18 -24 26 -39c1 11 1 21 1 32c0 39 -7 81 -48 134c-36 47 -100 109 -152 109c8 -49 33 -85 68 -120c49 -50 79 -81 105 -116z" />
+d="M527 560c1 -2 2 -4 4 -6v19c0 39 -7 81 -48 134c-36 46 -101 109 -152 109c5 -23 13 -47 28 -69c38 -55 120 -125 168 -187zM504 406c9 -11 18 -24 26 -39c0 11 1 21 1 32c0 39 -7 81 -48 134c-36 47 -101 109 -152 109c8 -49 33 -85 68 -121c49 -49 79 -80 105 -115z
+M483 887c-36 48 -101 117 -153 117h-1c4 -24 13 -54 30 -79c38 -55 120 -129 168 -191c1 -2 2 -4 3 -5c1 9 1 18 1 27c0 39 -8 80 -48 131zM296 107v1134c0 7 3 13 15 13c11 0 13 -5 14 -13c3 -10 28 -103 66 -158s88 -106 136 -168c34 -45 48 -92 48 -144
+c0 -40 -5 -72 -13 -102c8 -25 12 -52 13 -79c0 -37 -5 -70 -12 -100c8 -24 12 -49 12 -74c0 -48 -9 -93 -20 -131c4 -21 6 -45 6 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -15 -15 -14c-2 0 -4 0 -5 1c-5 3 -7 6 -7 11s2 11 4 16c15 40 22 90 22 115c0 117 -90 226 -191 279
+v-442c0 -73 -98 -170 -215 -170c-69 0 -110 38 -110 85c0 84 101 178 215 178c15 0 54 -4 81 -25z" />
     <glyph glyph-name="uniE1DE" unicode="&#xe1de;" 
-d="M0 -1251v1210c0 92 116 173 213 173c62 0 112 -33 112 -92c0 -47 -31 -93 -76 -126c28 -30 57 -77 57 -139c0 -30 -4 -56 -10 -77c8 -37 10 -72 10 -110c-2 -23 -5 -48 -12 -72c10 -40 12 -77 12 -118c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116
-c0 -184 -139 -261 -193 -312c-40 -38 -71 -68 -86 -171c-2 -8 -7 -16 -15 -16s-15 8 -15 15zM112 -133c-38 0 -65 11 -83 27v-339c93 28 236 117 236 228c0 53 -16 85 -41 115c-34 -19 -73 -31 -112 -31zM37 -626c111 43 229 109 229 243c0 6 0 11 -1 17
-c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -123c-42 -35 -67 -67 -76 -121zM35 -816c112 42 231 108 231 244c0 7 0 13 -1 20c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -48 -28 -71zM36 -1000c138 39 231 111 231 261c-7 -12 -16 -24 -26 -35
-c-51 -59 -140 -105 -178 -161c-14 -20 -22 -43 -27 -65z" />
+d="M0 -1251v1210c0 92 116 173 213 173c62 0 112 -33 112 -92c0 -47 -31 -93 -76 -126c28 -30 57 -77 57 -139c0 -30 -4 -56 -11 -77c9 -37 11 -72 11 -110c-2 -23 -6 -48 -12 -72c10 -40 12 -77 12 -118c-1 -16 -3 -32 -7 -49c7 -40 10 -79 10 -115
+c0 -185 -139 -262 -193 -313c-40 -38 -71 -68 -86 -171c-2 -8 -7 -16 -15 -16s-15 8 -15 15zM35 -816c112 42 231 108 231 244c0 7 0 13 -1 20c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM37 -626c111 43 229 109 229 244
+c0 5 0 10 -1 16c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -123c-56 -47 -67 -81 -74 -106c0 -4 -1 -9 -2 -15zM112 -133c-38 0 -65 11 -83 27v-339c93 28 236 117 236 228c0 53 -16 85 -41 115c-34 -19 -73 -31 -112 -31zM36 -1000c138 39 231 111 231 261
+c-7 -12 -16 -24 -26 -35c-51 -59 -140 -105 -178 -160c-14 -21 -22 -44 -27 -66z" />
     <glyph glyph-name="uniE1DF" unicode="&#xe1df;" horiz-adv-x="575" 
-d="M296 107v1333c0 7 3 12 15 12c11 0 13 -5 14 -12c3 -9 28 -95 66 -150s88 -107 136 -169c34 -45 48 -100 48 -152c0 -39 -5 -70 -13 -100c9 -24 13 -50 13 -77c0 -41 -6 -77 -14 -110c9 -26 14 -52 14 -80c0 -40 -5 -76 -13 -108c8 -25 13 -52 13 -79
-c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -73c0 -24 -29 -149 -59 -153c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s2 11 4 16c15 41 22 86 22 130c0 105 -103 218 -191 264v-442c0 -73 -98 -170 -215 -170c-68 0 -110 38 -110 85c0 84 101 178 215 178c15 0 54 -2 81 -25zM483 1094
-c-36 47 -101 111 -153 111h-1c4 -24 13 -53 30 -78c38 -56 120 -130 168 -192c1 -1 2 -3 3 -5c1 9 1 18 1 27c0 41 -8 86 -48 137zM527 746c1 -2 2 -3 3 -4c1 11 1 22 1 34c0 38 -7 80 -48 132c-36 47 -101 110 -153 110h-1c4 -25 12 -55 30 -81c38 -55 120 -129 168 -191z
-M527 559c1 -2 2 -3 3 -5c1 11 1 21 1 32c0 39 -7 80 -48 132c-36 48 -101 110 -153 110h-1c4 -26 12 -56 30 -82c38 -55 120 -125 168 -187zM505 406c8 -11 17 -24 25 -39c1 10 1 21 1 32c0 38 -7 80 -48 133c-36 47 -101 109 -153 109c8 -54 30 -85 69 -125
-c49 -49 79 -75 106 -110z" />
+d="M296 107v1333c0 7 3 12 15 12c11 0 13 -5 14 -12c3 -9 28 -95 66 -150s88 -107 136 -169c34 -45 48 -100 48 -152c0 -39 -5 -70 -13 -100c9 -25 13 -50 13 -78c0 -40 -6 -76 -14 -109c9 -26 14 -52 14 -80c0 -40 -5 -76 -13 -108c8 -25 13 -52 13 -79
+c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -73c0 -24 -29 -149 -59 -153c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s2 11 4 16c15 41 22 86 22 130c0 105 -104 218 -191 264v-442c0 -73 -98 -170 -215 -170c-69 0 -110 38 -110 85c0 84 101 178 215 178c15 0 54 -2 81 -25zM483 1094
+c-36 47 -101 111 -153 111h-1c4 -24 13 -53 30 -78c38 -56 120 -130 168 -192c1 -1 2 -3 3 -5c1 9 1 18 1 27c0 41 -8 85 -48 137zM504 406c9 -11 18 -24 26 -39c1 10 1 21 1 32c0 38 -7 80 -48 132c-36 48 -101 110 -153 110v0c8 -54 30 -86 69 -125
+c49 -49 79 -75 105 -110zM527 559c1 -2 2 -3 3 -5c1 11 1 21 1 32c0 39 -7 80 -48 132c-36 48 -101 110 -153 110h-1v0c4 -26 12 -56 30 -82c38 -55 120 -125 168 -187zM527 746c1 -2 2 -3 3 -4c0 11 1 22 1 34c0 38 -7 80 -48 132c-36 47 -101 110 -153 110h-1v0
+c4 -25 12 -55 30 -81c38 -55 120 -129 168 -191z" />
     <glyph glyph-name="uniE1E0" unicode="&#xe1e0;" 
-d="M0 -1439v1398c0 92 116 173 213 173c62 0 112 -33 112 -92c0 -47 -31 -93 -76 -126c41 -44 57 -91 57 -151c0 -25 -4 -47 -10 -69c8 -35 10 -70 10 -106c-2 -23 -5 -48 -12 -73c10 -39 12 -76 12 -117c-2 -23 -5 -47 -12 -71c10 -39 12 -76 12 -116c-1 -16 -3 -32 -7 -49
-c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -313c-40 -38 -71 -68 -86 -171c-2 -8 -7 -16 -15 -16s-15 8 -15 15zM29 -445c84 25 225 112 235 210v5c0 66 -26 92 -48 124c-32 -17 -68 -27 -104 -27c-38 0 -65 11 -83 26v-338zM37 -626c121 46 229 109 229 254
-c-31 -48 -75 -86 -119 -118c-62 -45 -90 -78 -102 -102c-2 -7 -4 -14 -5 -20c-1 -3 -2 -8 -3 -14zM63 -745c-15 -22 -23 -48 -28 -71c112 42 231 108 231 244c0 7 0 13 -1 20c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160zM63 -935c-14 -21 -23 -46 -28 -68
+d="M0 -1439v1398c0 92 116 173 213 173c62 0 112 -33 112 -92c0 -47 -31 -93 -76 -126c41 -44 57 -91 57 -151c0 -25 -4 -47 -10 -69c8 -35 10 -70 10 -106c-2 -23 -6 -48 -12 -72c9 -40 12 -77 12 -118c-2 -23 -5 -47 -12 -71c10 -39 12 -76 12 -116c-1 -16 -3 -32 -7 -49
+c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -313c-40 -38 -71 -68 -86 -171c-2 -8 -7 -16 -15 -16s-15 8 -15 15zM37 -626c121 46 229 109 229 254c-31 -48 -75 -86 -119 -118c-62 -45 -90 -78 -102 -102c-2 -7 -4 -14 -6 -19c0 -4 -1 -9 -2 -15zM29 -445
+c84 25 225 112 235 210v5c0 66 -26 92 -48 124c-32 -17 -68 -27 -104 -27c-38 0 -65 11 -83 26v-338zM63 -745c-15 -22 -24 -48 -28 -71c112 42 231 108 231 244c0 7 0 13 -1 20c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160zM63 -935c-14 -21 -23 -46 -28 -68
 c112 42 231 108 231 244c0 6 0 12 -1 18c-7 -12 -15 -23 -24 -34c-51 -58 -140 -104 -178 -160zM36 -1188c138 39 231 112 231 262c-7 -12 -16 -24 -26 -36c-51 -58 -140 -104 -178 -160c-14 -20 -22 -44 -27 -66z" />
     <glyph glyph-name="uniE1E1" unicode="&#xe1e1;" horiz-adv-x="575" 
-d="M296 107v1520c0 7 3 12 15 12c11 0 13 -5 14 -12c3 -9 28 -95 66 -150s88 -107 136 -169c34 -45 48 -100 48 -152c0 -38 -5 -70 -13 -99c9 -25 13 -51 13 -78c0 -39 -5 -76 -13 -108c8 -25 13 -52 13 -79c0 -41 -6 -77 -14 -110c9 -26 14 -52 14 -80
-c0 -40 -5 -76 -13 -108c8 -25 13 -52 13 -79c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -73c0 -24 -29 -149 -59 -153c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s2 11 4 16c15 41 22 86 22 130c0 105 -103 218 -191 264v-442c0 -73 -98 -170 -215 -170c-68 0 -110 38 -110 85
-c0 84 101 178 215 178c15 0 54 -2 81 -25zM483 1281c-36 47 -101 111 -153 111h-1c4 -24 13 -52 30 -77c38 -56 120 -130 168 -192c1 -1 2 -3 3 -5c1 9 1 18 1 27c0 40 -8 85 -48 136zM527 936c1 -2 2 -3 3 -5c1 11 1 22 1 32c0 39 -7 81 -48 133c-36 47 -101 110 -153 110
-h-1c4 -25 13 -54 30 -79c38 -55 120 -129 168 -191zM527 746c1 -2 2 -3 3 -4c1 11 1 22 1 34c0 38 -7 80 -48 132c-36 48 -101 110 -153 110h-1c4 -25 12 -55 30 -81c38 -55 120 -129 168 -191zM527 559c1 -2 2 -3 3 -5c1 11 1 22 1 32c0 39 -7 80 -48 133
-c-36 47 -101 109 -153 109h-1c4 -25 12 -56 30 -82c38 -55 120 -125 168 -187zM505 406c8 -11 17 -24 25 -39c1 10 1 21 1 32c0 38 -7 80 -48 133c-36 47 -101 109 -153 109c8 -54 30 -85 69 -125c49 -49 79 -75 106 -110z" />
+d="M296 107v1520c0 7 3 12 15 12c11 0 13 -5 14 -12c3 -9 28 -95 66 -150s88 -107 136 -169c34 -45 48 -100 48 -152c0 -38 -5 -70 -13 -99c9 -25 13 -51 13 -78c0 -40 -5 -76 -13 -108c8 -25 13 -52 13 -79c0 -41 -6 -77 -14 -110c9 -26 14 -52 14 -80
+c0 -40 -5 -76 -13 -108c8 -25 13 -52 13 -79c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -73c0 -24 -29 -149 -59 -153c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s2 11 4 16c15 41 22 86 22 130c0 105 -104 218 -191 264v-442c0 -73 -98 -170 -215 -170c-69 0 -110 38 -110 85
+c0 84 101 178 215 178c15 0 54 -2 81 -25zM483 1281c-36 47 -101 111 -153 111h-1c4 -24 13 -52 30 -77c38 -56 120 -130 168 -192c1 -1 2 -3 3 -5c1 9 1 18 1 27c0 40 -8 85 -48 136zM504 406c9 -11 18 -24 26 -39c1 10 1 21 1 32c0 38 -7 80 -48 133
+c-36 47 -101 109 -153 109v0c8 -54 29 -85 69 -125c49 -49 79 -75 105 -110zM527 559c1 -2 2 -3 3 -5c1 11 1 21 1 32c0 39 -7 80 -48 132c-36 48 -101 110 -153 110h-1v0c4 -26 12 -56 30 -82c38 -55 120 -125 168 -187zM527 746c1 -2 2 -3 3 -4c0 11 1 22 1 34
+c0 38 -7 80 -48 132c-36 48 -101 110 -153 110h-1v0c4 -25 12 -55 30 -81c38 -55 120 -129 168 -191zM527 935c1 -1 2 -2 3 -4c1 11 1 22 1 32c0 39 -7 81 -48 133c-36 47 -101 110 -153 110h-1c4 -25 13 -54 30 -79c38 -55 120 -130 168 -192z" />
     <glyph glyph-name="uniE1E2" unicode="&#xe1e2;" 
-d="M0 -1626v1585c0 92 116 173 213 173c62 0 112 -33 112 -92c0 -47 -31 -93 -76 -126c28 -30 57 -77 57 -139c0 -30 -4 -55 -10 -77c8 -37 10 -72 10 -110c-2 -23 -5 -48 -12 -72c10 -40 12 -77 12 -118c-2 -22 -5 -47 -12 -71c10 -39 12 -76 12 -116
-c-2 -22 -5 -47 -12 -71c10 -39 12 -76 12 -116c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM112 -133c-38 0 -65 11 -83 27v-339c92 28 236 118 236 228c0 53 -16 86 -41 115
-c-34 -19 -73 -31 -112 -31zM37 -625c111 42 229 108 229 243c0 5 0 10 -1 16c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -123c-43 -36 -65 -66 -76 -120zM35 -816c111 42 231 109 231 244c0 7 0 14 -1 20c-7 -11 -15 -22 -24 -33c-51 -58 -140 -104 -178 -160
-c-15 -22 -23 -48 -28 -71zM35 -1003c112 43 231 109 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-14 -22 -23 -46 -28 -69zM35 -1191c113 43 231 109 231 245c0 6 0 12 -1 18c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160
-c-15 -22 -23 -47 -28 -70zM36 -1375c139 39 231 111 231 262c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z" />
+d="M0 -1626v1585c0 92 116 173 213 173c62 0 112 -33 112 -92c0 -47 -31 -93 -76 -126c28 -30 57 -77 57 -139c0 -30 -4 -55 -11 -77c9 -37 11 -72 11 -110c-2 -23 -6 -48 -12 -72c10 -40 12 -77 12 -118c-2 -22 -5 -46 -12 -71c10 -39 12 -76 12 -116
+c-2 -22 -5 -47 -12 -71c10 -39 12 -76 12 -116c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM35 -1190c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33
+c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -1003c112 43 231 109 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-14 -22 -23 -46 -28 -69zM35 -816c111 42 231 109 231 244c0 7 0 14 -1 20c-7 -11 -15 -22 -24 -32
+c-51 -59 -140 -105 -178 -161c-15 -22 -24 -48 -28 -71zM37 -625c111 42 229 108 229 243c0 5 0 10 -1 16c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -123c-56 -47 -67 -81 -74 -106c0 -4 -1 -9 -2 -14zM112 -133c-38 0 -65 11 -83 27v-339c92 28 236 118 236 228
+c0 53 -16 86 -41 115c-34 -19 -73 -31 -112 -31zM36 -1375c139 39 231 111 231 262c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z" />
     <glyph glyph-name="uniE1E3" unicode="&#xe1e3;" horiz-adv-x="575" 
-d="M296 107v1702c0 7 3 13 15 13c11 0 13 -5 14 -13c3 -9 28 -95 66 -150s88 -106 136 -168c34 -45 48 -100 48 -152c0 -38 -5 -69 -12 -97c8 -25 12 -50 12 -76c0 -40 -5 -76 -13 -108c8 -25 13 -51 13 -79c0 -40 -5 -76 -13 -108c8 -26 13 -52 13 -80
-c0 -40 -6 -77 -14 -109c9 -26 14 -53 14 -81c0 -40 -5 -76 -13 -108c8 -25 13 -51 13 -79c0 -49 -9 -93 -19 -130c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 2 11 4 16c15 42 22 87 22 131
-c0 104 -104 218 -191 264v-442c0 -73 -98 -170 -215 -170c-68 0 -110 38 -110 85c0 84 101 178 215 178c15 0 54 -2 81 -25zM483 1464c-36 47 -101 111 -153 111c4 -23 13 -50 29 -74c38 -55 120 -129 168 -191c1 -2 2 -4 4 -6c0 65 -6 106 -48 160zM527 1123
-c1 -2 2 -3 3 -4c1 10 1 21 1 32c0 38 -7 79 -48 132c-36 47 -101 109 -153 109h-1c4 -24 13 -53 30 -78c38 -55 120 -129 168 -191zM527 935c1 -1 2 -3 3 -4c1 10 1 21 1 32c0 38 -7 80 -48 133c-36 47 -101 109 -153 109h-1c4 -24 13 -53 30 -79c38 -55 120 -129 168 -191z
-M527 745c1 -1 2 -3 3 -4c1 11 1 23 1 34c0 39 -7 80 -48 133c-36 47 -101 109 -153 109h-1c4 -24 12 -55 30 -81c38 -55 120 -129 168 -191zM527 558c1 -1 2 -3 3 -4c1 10 1 21 1 32c0 38 -7 80 -48 132c-36 47 -101 109 -153 109h-1c4 -25 12 -56 30 -82
-c38 -55 120 -125 168 -187zM505 405c8 -11 17 -23 25 -39c1 11 1 21 1 32c0 39 -7 80 -48 133c-36 47 -101 109 -153 109c8 -53 30 -85 69 -124c49 -49 79 -76 106 -111z" />
+d="M296 107v1702c0 7 3 13 15 13c11 0 13 -5 14 -13c3 -9 28 -95 66 -150s88 -106 136 -168c34 -45 48 -100 48 -152c0 -38 -5 -69 -12 -98c8 -24 12 -49 12 -75c0 -40 -5 -76 -13 -108c8 -25 13 -52 13 -79c0 -40 -5 -76 -13 -108c8 -26 13 -52 13 -80
+c0 -41 -6 -77 -14 -110c9 -25 14 -52 14 -80c0 -40 -5 -76 -13 -108c8 -25 13 -51 13 -79c0 -49 -9 -93 -19 -130c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 2 11 4 16c15 42 22 87 22 131
+c0 103 -104 218 -191 264v-442c0 -73 -98 -170 -215 -170c-69 0 -110 38 -110 85c0 84 101 178 215 178c15 0 54 -2 81 -25zM483 1463c-36 48 -101 112 -153 112v0c4 -23 13 -50 29 -74c38 -55 120 -129 168 -191c1 -2 2 -4 4 -6v20c0 41 -7 87 -48 139zM504 405
+c9 -11 18 -23 26 -39c1 11 1 21 1 32c0 39 -7 80 -48 133c-36 47 -101 109 -153 109v0c8 -53 30 -85 69 -124c49 -49 79 -76 105 -111zM527 558c1 -1 2 -3 3 -4c1 10 1 21 1 32c0 38 -7 80 -48 132c-36 47 -101 109 -153 109h-1v0c4 -25 12 -56 30 -82
+c38 -55 120 -125 168 -187zM527 745c1 -1 2 -3 3 -4c0 11 1 23 1 34c0 39 -7 80 -48 133c-36 47 -101 109 -153 109h-1v0c4 -24 12 -55 30 -81c38 -55 120 -129 168 -191zM527 935c1 -2 2 -3 3 -4c1 10 1 21 1 32c0 38 -7 80 -48 133c-36 47 -101 109 -153 109h-1
+c4 -24 13 -53 30 -79c38 -55 120 -129 168 -191zM527 1123c1 -2 2 -3 3 -4c1 10 1 21 1 31c0 39 -7 80 -48 133c-36 47 -101 109 -153 109h-1c4 -24 13 -53 30 -78c38 -55 120 -129 168 -191z" />
     <glyph glyph-name="uniE1E4" unicode="&#xe1e4;" 
-d="M0 -1814v1772c0 93 116 174 213 174c62 0 112 -34 112 -92c0 -47 -31 -94 -76 -126c28 -30 57 -78 57 -140c0 -30 -4 -55 -10 -77c8 -36 10 -72 10 -109c-2 -24 -5 -48 -12 -73c10 -39 12 -76 12 -117c-2 -23 -5 -47 -12 -71c10 -39 12 -76 12 -116
-c-2 -23 -5 -47 -12 -72c10 -39 12 -76 12 -116c-2 -23 -5 -47 -12 -72c10 -39 12 -76 12 -116c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM112 -133c-38 0 -65 10 -83 26v-339
-c92 28 236 118 236 228c0 54 -16 86 -41 116c-34 -20 -73 -31 -112 -31zM37 -626c110 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14zM35 -816c112 42 231 108 231 244c0 6 0 13 -1 20
-c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -22 -23 -48 -28 -71zM35 -1003c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM35 -1191c113 43 231 108 231 245c0 6 0 11 -1 17
-c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -1379c113 43 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -21 -23 -46 -28 -69zM36 -1563c138 39 231 111 231 261c-7 -12 -16 -24 -26 -36
-c-51 -58 -140 -104 -178 -160c-14 -20 -22 -44 -27 -65z" />
+d="M0 -1814v1772c0 93 116 174 213 174c62 0 112 -34 112 -92c0 -47 -31 -94 -76 -126c28 -30 57 -78 57 -140c0 -30 -4 -55 -11 -77c9 -36 11 -72 11 -109c-2 -23 -6 -48 -12 -73c9 -39 12 -76 12 -117c-2 -23 -5 -47 -12 -71c10 -39 12 -76 12 -116c-2 -23 -5 -47 -12 -72
+c10 -39 12 -76 12 -116c-2 -23 -5 -47 -12 -71c10 -40 12 -77 12 -117c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM35 -1379c113 43 231 108 231 245c0 6 0 11 -1 17
+c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -21 -23 -46 -28 -69zM35 -1191c113 43 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -1003c112 42 231 108 231 244c0 6 0 11 -1 17
+c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM35 -816c112 42 231 108 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM37 -626c110 42 229 109 229 243c0 5 0 11 -1 16
+c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122c-56 -47 -67 -81 -74 -107c0 -3 -1 -8 -2 -14zM112 -133c-38 0 -65 10 -83 26v-338c92 27 236 117 236 227c0 54 -16 86 -41 116c-34 -20 -73 -31 -112 -31zM36 -1563c138 39 231 111 231 261c-7 -12 -16 -24 -26 -35
+c-51 -59 -140 -105 -178 -161c-14 -20 -22 -44 -27 -65z" />
     <glyph glyph-name="uniE1E5" unicode="&#xe1e5;" horiz-adv-x="575" 
-d="M296 107v1885c0 7 3 12 15 12c11 0 13 -5 14 -12c3 -9 28 -95 66 -150s88 -107 136 -169c34 -44 48 -100 48 -151c0 -38 -5 -69 -12 -98c8 -24 12 -49 12 -75c0 -39 -5 -74 -13 -106c9 -24 13 -50 13 -77c0 -40 -5 -76 -13 -108c8 -25 13 -51 13 -79
-c0 -40 -5 -76 -13 -108c8 -26 13 -52 13 -80c0 -40 -6 -77 -14 -109c9 -26 14 -52 14 -81c0 -39 -5 -75 -13 -107c8 -26 13 -52 13 -79c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -73c0 -24 -29 -149 -59 -153c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s2 11 4 16c15 41 22 86 22 130
-c0 105 -103 218 -191 264v-442c0 -73 -98 -170 -215 -170c-68 0 -110 38 -110 85c0 84 101 178 215 178c19 0 56 -3 81 -25zM483 1646c-36 47 -101 112 -153 112c4 -23 13 -50 29 -74c38 -55 120 -129 168 -191c1 -2 2 -4 4 -6c0 65 -6 106 -48 159zM527 1310
-c1 -2 2 -3 3 -5c1 10 1 21 1 31c0 38 -8 79 -48 130c-36 47 -101 109 -153 109c4 -23 13 -50 29 -74c38 -55 120 -129 168 -191zM527 1123c1 -1 2 -3 3 -4c1 10 1 21 1 32c0 38 -7 79 -48 132c-36 47 -101 109 -153 109h-1c4 -24 13 -53 30 -78c38 -55 120 -129 168 -191z
-M527 935c1 -1 2 -3 3 -4c1 11 1 21 1 32c0 39 -7 80 -48 133c-36 47 -101 109 -153 109h-1c4 -24 13 -53 30 -79c38 -55 120 -129 168 -191zM527 745c1 -1 2 -2 3 -4c1 12 1 23 1 35c0 38 -7 80 -48 132c-36 47 -101 109 -153 109h-1c4 -24 12 -54 30 -80
-c38 -56 120 -130 168 -192zM527 558c1 -1 2 -2 3 -4c1 11 1 21 1 32c0 39 -7 80 -48 132c-36 47 -101 109 -153 109h-1v1c4 -26 12 -57 30 -82c38 -56 120 -126 168 -188zM505 406c8 -11 17 -24 25 -39c1 10 1 21 1 32c0 38 -7 80 -48 132c-36 47 -101 110 -153 110
-c8 -54 30 -86 69 -125c49 -49 79 -75 106 -110z" />
+d="M296 107v1885c0 7 3 12 15 12c11 0 13 -5 14 -12c3 -9 28 -95 66 -150s88 -107 136 -169c34 -44 48 -100 48 -152c0 -37 -5 -68 -12 -97c8 -24 12 -49 12 -75c0 -39 -5 -74 -13 -106c9 -24 13 -50 13 -77c0 -40 -5 -76 -13 -108c8 -25 13 -51 13 -79
+c0 -40 -5 -76 -13 -108c8 -26 13 -52 13 -80c0 -40 -6 -77 -14 -109c9 -26 14 -53 14 -81c0 -39 -5 -75 -13 -107c8 -26 13 -52 13 -79c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -73c0 -24 -29 -149 -59 -153c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s2 11 4 16c15 41 22 86 22 130
+c0 105 -103 218 -191 264v-442c0 -73 -98 -170 -215 -170c-69 0 -110 38 -110 85c0 84 101 178 215 178c19 0 56 -3 81 -25zM483 1646c-36 47 -101 112 -153 112v0c4 -23 13 -50 29 -74c38 -55 120 -129 168 -191c1 -2 2 -4 4 -6v20c0 41 -7 87 -48 139zM504 406
+c9 -11 18 -24 26 -39c1 10 1 21 1 32c0 38 -7 80 -48 132c-36 47 -101 110 -153 110v0c8 -54 30 -86 69 -125c49 -49 79 -75 105 -110zM527 558c1 -1 2 -2 3 -4c1 11 1 21 1 32c0 38 -7 80 -48 132c-36 47 -101 109 -153 109h-1v0c4 -25 12 -56 30 -81
+c38 -56 120 -126 168 -188zM527 745c1 -1 2 -2 3 -4c0 12 1 23 1 35c0 38 -7 80 -48 132c-36 47 -101 109 -153 109h-1v0c4 -24 12 -54 30 -81c38 -55 120 -129 168 -191zM527 935c1 -1 2 -3 3 -4c1 11 1 21 1 32c0 39 -7 80 -48 133c-36 47 -101 109 -153 109h-1
+c4 -24 13 -53 30 -79c38 -55 120 -129 168 -191zM527 1123c1 -1 2 -3 3 -4c1 10 1 21 1 32c0 38 -8 79 -48 132c-36 47 -101 109 -153 109h-1c4 -24 13 -53 30 -78c38 -55 120 -129 168 -191zM527 1310c1 -2 2 -3 3 -5c1 10 1 21 1 31c0 38 -8 78 -48 129
+c-36 48 -101 110 -153 110v0c4 -23 13 -50 29 -74c38 -55 120 -129 168 -191z" />
     <glyph glyph-name="uniE1E6" unicode="&#xe1e6;" 
-d="M0 -1990v1948c0 93 116 174 213 174c62 0 112 -34 112 -92c0 -47 -31 -94 -76 -126c28 -30 57 -78 57 -140c0 -30 -4 -55 -10 -77c8 -36 10 -72 10 -109c-2 -24 -5 -48 -12 -73c10 -39 12 -76 12 -117c-2 -23 -5 -47 -12 -71c10 -39 12 -76 12 -116
-c-2 -23 -5 -47 -12 -72c10 -39 12 -76 12 -116c-2 -23 -5 -47 -12 -72c10 -39 12 -76 12 -116c-2 -23 -5 -47 -12 -71c10 -40 12 -77 12 -117c-1 -16 -4 -33 -7 -51c6 -40 10 -81 10 -118c0 -184 -139 -262 -193 -312c-40 -38 -68 -83 -86 -155c-2 -8 -7 -16 -15 -16
-s-15 8 -15 15zM112 -133c-38 0 -65 10 -83 26v-339c92 28 236 118 236 228c0 54 -16 86 -41 116c-34 -20 -73 -31 -112 -31zM37 -626c110 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14z
-M35 -816c112 42 231 108 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -22 -23 -48 -28 -71zM35 -1003c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM35 -1191
-c113 43 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -1379c113 43 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -21 -23 -46 -28 -69zM35 -1567
-c113 43 231 108 231 245c0 6 0 12 -1 18c-7 -12 -15 -23 -24 -34c-51 -58 -140 -104 -178 -160c-15 -21 -23 -46 -28 -69zM35 -1755c143 40 232 112 232 266c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -161c-15 -21 -23 -47 -28 -69z" />
+d="M0 -1990v1948c0 93 116 174 213 174c62 0 112 -34 112 -92c0 -47 -31 -94 -76 -126c28 -30 57 -78 57 -140c0 -30 -4 -55 -11 -77c9 -36 11 -72 11 -109c-2 -23 -6 -48 -12 -73c9 -39 12 -76 12 -117c-2 -23 -5 -47 -12 -71c10 -39 12 -76 12 -116c-2 -23 -5 -47 -12 -72
+c10 -39 12 -76 12 -116c-2 -23 -5 -47 -12 -71c10 -40 12 -77 12 -117c-2 -23 -5 -47 -12 -71c10 -40 12 -77 12 -117c-1 -16 -4 -33 -7 -51c6 -40 10 -81 10 -118c0 -184 -139 -262 -193 -312c-40 -38 -68 -83 -86 -155c-2 -8 -7 -16 -15 -16s-15 8 -15 15zM35 -1567
+c113 43 231 108 231 245c0 6 0 12 -1 18c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -161c-15 -21 -23 -46 -28 -69zM35 -1379c113 43 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -21 -23 -46 -28 -69zM35 -1191
+c113 43 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -1003c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM35 -816
+c112 42 231 108 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM37 -626c110 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122c-56 -47 -67 -81 -74 -107c0 -3 -1 -8 -2 -14z
+M112 -133c-38 0 -65 10 -83 26v-338c92 27 236 117 236 227c0 54 -16 86 -41 116c-34 -20 -73 -31 -112 -31zM35 -1755c143 40 232 112 232 266c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -70z" />
     <glyph glyph-name="uniE1E7" unicode="&#xe1e7;" horiz-adv-x="100" 
 d="M0 0c0 28 22 50 50 50s50 -22 50 -50s-22 -50 -50 -50s-50 22 -50 50z" />
     <glyph glyph-name="uniE220" unicode="&#xe220;" horiz-adv-x="290" 
@@ -601,104 +629,107 @@ d="M0 410l290 63v-126l-290 -63v126zM0 221l290 63v-126l-290 -63v126zM0 32l290 63v
     <glyph glyph-name="uniE22A" unicode="&#xe22a;" horiz-adv-x="150" 
 d="M-76 -85h226v-55h-300v68l226 157h-226v55h300v-65z" />
     <glyph glyph-name="uniE22E" unicode="&#xe22e;" horiz-adv-x="246" 
-d="M179 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM11 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" />
+d="M179 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM11 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z" />
     <glyph glyph-name="uniE22F" unicode="&#xe22f;" horiz-adv-x="417" 
-d="M350 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM179 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM11 11c-15 16 -15 40 0 56
-c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" />
+d="M350 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM179 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM11 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55
+c-16 -15 -40 -15 -56 0z" />
     <glyph glyph-name="uniE230" unicode="&#xe230;" horiz-adv-x="585" 
-d="M518 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM350 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM179 11c-15 16 -15 40 0 56
-c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM11 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" />
+d="M518 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM350 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM179 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55
+c-16 -15 -40 -15 -56 0zM11 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z" />
     <glyph glyph-name="uniE231" unicode="&#xe231;" horiz-adv-x="417" 
-d="M350 179c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM179 179c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM11 179c-15 16 -15 40 0 56
-c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM350 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM179 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11
-c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11zM11 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" />
+d="M350 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM179 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM11 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55
+c-16 -15 -40 -15 -56 0zM350 179c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM179 179c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM11 179c-15 16 -15 40 0 55c16 16 40 16 56 0
+c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z" />
     <glyph glyph-name="uniE233" unicode="&#xe233;" horiz-adv-x="273" 
-d="M0 0c-64 0 -273 20 -273 114c0 33 30 63 86 84c50 20 116 30 187 30s137 -10 187 -30c56 -21 86 -51 86 -84c0 -94 -209 -114 -273 -114zM0 195c-67 0 -129 -10 -176 -27c-40 -16 -64 -36 -64 -54s24 -38 64 -54c47 -17 109 -27 176 -27s129 10 176 27c40 16 64 36 64 54
-s-24 38 -64 54c-47 17 -109 27 -176 27z" />
+d="M0 0c-71 0 -137 11 -187 30c-56 21 -86 51 -86 84s30 63 86 84c50 20 116 30 187 30s137 -10 187 -30c56 -21 86 -51 86 -84s-30 -63 -86 -84c-50 -19 -116 -30 -187 -30zM0 195c-67 0 -129 -10 -176 -27c-40 -16 -64 -36 -64 -54s24 -38 64 -54c47 -17 109 -27 176 -27
+s129 10 176 27c40 16 64 36 64 54s-24 38 -64 54c-47 17 -109 27 -176 27z" />
     <glyph glyph-name="uniE234" unicode="&#xe234;" horiz-adv-x="126" 
-d="M0 0c-47 0 -96 18 -128 54l38 34c5 -5 10 -9 15 -13c17 -12 39 -20 61 -23c5 0 9 -1 14 -1c37 0 74 16 74 58c0 19 -6 31 -21 42s-39 19 -62 27c-54 17 -111 39 -111 107c0 65 52 104 115 104c40 0 81 -16 111 -46l-37 -37c-22 22 -49 31 -74 31c-12 0 -23 -2 -32 -5
-c-15 -6 -32 -19 -32 -47s23 -40 76 -58c60 -20 119 -43 119 -118c0 -71 -59 -109 -126 -109z" />
+d="M0 0c-37 0 -75 11 -105 33c-8 6 -16 13 -23 21l38 34c5 -5 10 -9 15 -13c17 -12 39 -20 61 -23c5 0 9 -1 14 -1c17 0 32 4 45 10c20 10 29 26 29 48c0 19 -6 31 -21 42s-39 19 -62 27c-25 8 -51 17 -71 31c-27 19 -40 44 -40 76c0 22 6 42 18 59c12 16 26 27 45 35
+c16 7 34 10 52 10c40 0 81 -16 111 -46l-37 -37c-22 22 -50 31 -74 31c-12 0 -23 -2 -32 -5c-14 -6 -32 -19 -32 -47s24 -40 76 -58c27 -9 54 -18 77 -34c28 -21 42 -49 42 -84c0 -21 -5 -41 -16 -57c-11 -17 -24 -28 -42 -37c-20 -10 -44 -15 -68 -15z" />
     <glyph glyph-name="uniE240" unicode="&#xe240;" horiz-adv-x="289" 
-d="M0 -227v226c0 7 6 13 13 13c6 0 11 -4 12 -8c0 0 9 -36 10 -39c2 -4 19 -61 56 -118c27 -42 122 -165 119 -165c0 0 74 -95 79 -224c0 -91 -17 -184 -62 -264c-4 -7 -9 -11 -15 -11c-7 0 -11 3 -11 10c0 4 1 9 3 15c27 72 45 146 45 218c0 83 -29 126 -47 157
-c-65 111 -151 165 -194 179c-7 2 -8 8 -8 11z" />
+d="M0 -227v226c0 7 6 13 13 13c6 0 11 -4 12 -8c0 0 9 -36 10 -39c2 -4 19 -61 56 -118c27 -42 122 -165 119 -165c0 0 74 -95 79 -224v-12c1 -63 -15 -169 -62 -252c-4 -7 -9 -11 -16 -11c-1 0 -3 0 -5 1c-4 2 -5 5 -5 9c-1 4 1 9 3 15c26 72 45 146 45 218
+c0 83 -29 126 -47 157c-65 111 -151 165 -194 179c-7 3 -8 8 -8 11z" />
     <glyph glyph-name="uniE241" unicode="&#xe241;" horiz-adv-x="309" 
-d="M0 1v226c0 3 1 9 8 11c42 14 147 68 212 179c18 31 47 74 47 157c0 72 -16 125 -56 218c-2 5 -3 9 -3 12c0 6 2 10 7 12c1 1 3 1 5 1c6 0 12 -4 15 -11c54 -97 74 -173 74 -264c0 -88 -29 -154 -79 -224s-110 -117 -149 -182c-36 -59 -45 -97 -46 -101
+d="M0 1v226c0 3 1 8 8 11c42 14 147 68 212 179c18 31 47 74 47 157c0 72 -16 125 -56 218c-2 4 -3 9 -3 12c0 6 2 10 7 12c1 1 3 1 5 1c6 0 12 -4 15 -11c53 -97 74 -173 74 -264c0 -88 -30 -154 -79 -224c-50 -70 -110 -117 -149 -182c-36 -59 -45 -97 -46 -101
 c-1 -3 -10 -38 -10 -39c-1 -4 -7 -8 -12 -8c-7 0 -13 6 -13 13z" />
     <glyph glyph-name="uniE242" unicode="&#xe242;" horiz-adv-x="280" 
-d="M0 -381v381c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158c38 -56 89 -107 136 -169c34 -45 48 -92 48 -144c0 -49 -8 -86 -19 -123c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16
-c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM209 -473c8 -11 17 -24 25 -40c1 10 2 20 2 30c0 37 -9 78 -48 129c-36 47 -101 115 -152 116c1 -8 2 -15 4 -20c6 -26 24 -60 63 -99c49 -49 79 -81 106 -116z" />
+d="M209 -473c8 -11 17 -24 25 -40c1 10 2 20 2 30c0 38 -9 78 -48 129c-36 47 -101 116 -152 116c1 -8 2 -15 3 -20c7 -26 25 -60 64 -99c49 -49 79 -81 106 -116zM0 -381v381c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169
+c34 -45 48 -92 48 -144c0 -49 -9 -86 -19 -123c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10z" />
     <glyph glyph-name="uniE243" unicode="&#xe243;" horiz-adv-x="309" 
-d="M0 -10v398c0 2 8 24 15 27c77 17 223 106 244 190l2 3c3 12 4 25 4 38c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -26 -2 -44 -5 -57c5 -37 8 -74 8 -107c0 -185 -139 -262 -193 -313c-40 -38 -71 -68 -86 -171
-c-2 -8 -7 -16 -15 -16s-15 8 -15 16zM37 240c48 13 122 34 183 109c27 34 45 82 47 159c-27 -48 -96 -104 -154 -149s-67 -82 -73 -107c-1 -3 -2 -7 -3 -12z" />
+d="M37 240c48 13 122 34 183 109c26 34 45 82 47 159c-27 -48 -96 -104 -154 -149c-59 -45 -67 -82 -74 -107c0 -3 -1 -7 -2 -12zM0 -10v398c0 2 8 24 15 27c45 10 142 52 212 133c16 18 27 37 32 57v0l1 3c4 12 5 25 5 38c0 67 -26 101 -61 138c-4 4 -10 8 -10 11
+c0 2 1 3 5 5s8 3 12 3c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -26 -2 -44 -6 -57c6 -37 9 -74 9 -107c0 -185 -140 -262 -193 -313c-40 -38 -71 -68 -86 -171c-2 -8 -7 -16 -15 -16s-15 8 -15 16z" />
     <glyph glyph-name="uniE244" unicode="&#xe244;" horiz-adv-x="279" 
-d="M0 -382v556c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158c38 -56 89 -107 136 -169c34 -45 48 -92 48 -144c0 -32 -4 -63 -11 -94c7 -23 11 -48 11 -73c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1
-c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 -180c-36 47 -102 116 -153 116c5 -22 13 -47 28 -69c38 -55 121 -125 168 -187c1 -2 3 -4 4 -6c0 5 1 10 1 16c0 38 -9 79 -48 130z
-M209 -474c8 -11 17 -24 25 -39c1 12 2 24 2 36c0 37 -9 78 -48 130c-36 47 -101 109 -152 109c1 -8 2 -16 4 -21c6 -26 24 -60 63 -99c49 -50 79 -81 106 -116z" />
+d="M209 -474c8 -11 17 -23 25 -39c1 12 2 24 2 36c0 38 -9 78 -48 130c-36 47 -101 109 -153 109c2 -8 3 -16 4 -21c7 -26 25 -60 64 -99c49 -50 79 -81 106 -116zM188 -180c-36 47 -102 116 -153 116c5 -22 13 -47 28 -69c38 -55 121 -125 168 -187c1 -2 3 -4 4 -6
+c0 5 1 10 1 16c0 38 -9 79 -48 130zM0 -382v556c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169c34 -45 48 -92 48 -144v-9c0 -32 -5 -59 -11 -85c7 -23 11 -48 11 -73c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138
+c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10z" />
     <glyph glyph-name="uniE245" unicode="&#xe245;" horiz-adv-x="309" 
-d="M0 -200v588c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 3 5 5c4 3 9 3 13 3c6 0 11 -2 15 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-1 -17 -4 -33 -7 -51
-c6 -40 10 -80 10 -117c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM36 51
-c49 14 127 39 189 115c26 33 42 75 42 149c-7 -13 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -27 -68z" />
+d="M35 51c50 14 128 39 190 115c26 33 42 75 42 149c-7 -13 -16 -25 -26 -36c-52 -59 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM113 359c-57 -47 -67 -81 -74 -107c0 -3 -1 -8 -2 -14c87 33 142 65 181 113c31 39 48 80 48 130c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16
+c-27 -35 -82 -72 -141 -122zM0 -200v588c0 2 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 3 5 5s9 3 13 3c6 0 11 -2 15 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -25 11 -54 11 -84v-8v-17
+c-1 -17 -4 -34 -7 -51c6 -40 10 -80 10 -117c0 -185 -140 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16z" />
     <glyph glyph-name="uniE246" unicode="&#xe246;" horiz-adv-x="279" 
-d="M0 -383v744c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169c34 -45 48 -92 48 -144c0 -35 -5 -67 -13 -101c9 -26 13 -52 13 -80c0 -34 -4 -67 -11 -100c7 -23 11 -48 11 -73c0 -50 -9 -94 -19 -131c3 -21 5 -46 5 -74c0 -56 -26 -110 -44 -139
-c-4 -6 -8 -13 -14 -14c-2 0 -4 1 -6 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 5 1 11 1 16c-1 35 -8 71 -42 122c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9zM188 7c-37 47 -102 116 -153 116h-2c4 -24 13 -53 30 -78c38 -56 121 -130 168 -192c1 -1 2 -3 3 -4
-c1 9 2 19 2 29c0 38 -9 78 -48 129zM231 -320c1 -2 3 -4 4 -6c0 7 1 15 1 22c0 38 -9 79 -48 130c-36 47 -101 110 -153 110c5 -23 14 -48 28 -69c38 -55 121 -126 168 -187zM209 -474c8 -11 17 -24 25 -39c1 12 2 23 2 35c0 38 -9 79 -48 130c-36 47 -101 110 -153 110
-c2 -9 3 -17 5 -22c6 -25 24 -60 63 -99c49 -49 79 -80 106 -115z" />
+d="M231 -320c1 -2 3 -4 4 -6c0 7 1 15 1 22c0 38 -9 79 -48 130c-36 47 -101 110 -153 110c5 -23 13 -48 28 -69c38 -55 121 -125 168 -187zM209 -474c8 -11 17 -24 25 -39c1 12 2 23 2 35c0 38 -9 79 -48 130c-36 47 -101 110 -153 110c2 -9 3 -16 4 -22
+c7 -25 25 -60 64 -99c49 -49 79 -80 106 -115zM188 7c-37 47 -102 116 -153 116h-2c4 -24 13 -53 30 -78c38 -56 121 -130 168 -192c1 -1 2 -3 3 -4c1 9 2 19 2 29c0 38 -9 78 -48 129zM0 -383v744c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -103 66 -158s89 -107 136 -169
+c34 -45 48 -92 48 -144v-8c0 -36 -6 -65 -13 -93c9 -26 13 -52 13 -79v-10c0 -33 -5 -63 -11 -91c7 -23 11 -48 11 -73c0 -50 -9 -94 -19 -131c3 -21 5 -46 5 -74c0 -56 -26 -110 -44 -139c-4 -6 -8 -13 -15 -14c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s3 11 4 16
+c15 40 22 90 22 115c1 6 1 11 1 17c-1 34 -8 70 -42 121c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9z" />
     <glyph glyph-name="uniE247" unicode="&#xe247;" horiz-adv-x="309" 
-d="M0 -387v775c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 -1 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -23 -6 -48 -12 -73
-c7 -32 12 -64 12 -97v-20c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 43 229 109 229 243c0 6 0 11 -1 17
-c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM35 48c112 42 231 109 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM36 -136c50 14 127 39 189 115c26 32 42 74 42 146c-7 -12 -16 -24 -26 -36
-c-51 -58 -140 -105 -178 -160c-14 -20 -22 -44 -27 -65z" />
+d="M36 -136c50 14 127 39 189 115c26 32 42 74 42 146c-7 -12 -16 -24 -26 -36c-52 -58 -140 -105 -178 -160c-14 -20 -22 -44 -27 -65zM113 359c-57 -47 -67 -81 -74 -107c0 -3 -1 -8 -2 -14c87 33 142 66 181 113c31 39 48 80 48 130c0 6 0 11 -1 17c-3 -6 -7 -11 -11 -17
+c-27 -34 -82 -72 -141 -122zM218 161c31 39 48 81 48 131c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-52 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71c89 33 144 65 183 113zM0 -387v775c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138
+c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 -1 11 -3 15 -6c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -25 11 -54 11 -83v-9v-17c-2 -23 -6 -48 -12 -73c6 -27 12 -57 12 -89v-8v-20c-1 -16 -3 -32 -7 -49c6 -40 10 -80 10 -116c0 -184 -140 -262 -193 -312
+c-40 -38 -71 -68 -86 -172c-2 -7 -7 -16 -15 -16s-15 9 -15 16z" />
     <glyph glyph-name="uniE248" unicode="&#xe248;" horiz-adv-x="280" 
-d="M0 -382v943c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -9 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -13 -100c9 -25 13 -50 13 -78c0 -37 -4 -72 -13 -109c9 -26 13 -52 13 -80c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79
-c0 -50 -8 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -139c-4 -6 -8 -14 -15 -14c-1 0 -3 1 -5 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 138 -164 148c-7 2 -15 7 -15 9zM188 215c-37 47 -102 111 -153 111
-h-2c4 -24 13 -53 30 -78c38 -55 121 -129 168 -191c1 -2 2 -4 4 -6c0 9 1 17 1 26c0 41 -8 86 -48 138zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -5
-c1 11 2 23 2 34c0 38 -9 79 -48 130c-37 48 -102 110 -153 110h-2c4 -26 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c10 -55 28 -84 69 -125c49 -49 79 -75 106 -110z" />
+d="M0 -382v943c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -10 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -13 -100c9 -24 13 -50 13 -77c0 -38 -4 -73 -14 -110c10 -26 14 -52 14 -80c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79
+c0 -50 -9 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -139c-4 -5 -8 -14 -15 -14c-2 1 -3 1 -5 2c-5 2 -7 6 -7 11s3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 2 -15 7 -15 9zM188 215c-37 47 -102 111 -153 111
+h-2c4 -24 13 -53 30 -78c38 -56 121 -130 168 -192c1 -1 2 -3 4 -5c0 9 1 17 1 26c0 41 -8 86 -48 138zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 5 -28c7 -26 25 -57 64 -97c49 -49 79 -75 106 -110z
+M231 -320c1 -2 2 -3 3 -5c1 11 2 23 2 34c0 38 -9 79 -48 130c-37 48 -102 110 -153 110h-2v0c4 -26 13 -56 30 -82c38 -55 121 -125 168 -187zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 38 -9 80 -48 131c-37 47 -102 110 -153 110h-2v0c4 -25 12 -55 30 -81
+c38 -55 121 -129 168 -191z" />
     <glyph glyph-name="uniE249" unicode="&#xe249;" horiz-adv-x="309" 
-d="M0 -575v963c0 2 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -24 -6 -48 -12 -73c7 -32 12 -64 12 -97v-20
-c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-41 -34 -67 -68 -76 -121c110 42 229 109 229 243c0 5 0 11 -1 16
-c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 48c112 42 231 108 231 244c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -23 -24 -48 -28 -71zM35 -139c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33
-c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM36 -324c49 14 127 39 189 115c26 32 40 74 42 147c-7 -13 -16 -25 -26 -36c-51 -58 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z" />
+d="M0 -575v963c0 2 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 2 1 3 5 5s8 3 12 3c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -25 11 -54 11 -84v-8v-18c-2 -23 -6 -47 -12 -72
+c6 -27 12 -57 12 -89v-8v-20c-2 -23 -5 -47 -12 -71c6 -27 12 -57 12 -89v-7v-20c-1 -16 -3 -33 -7 -50c6 -40 10 -80 10 -116c0 -185 -140 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM218 -26c31 39 48 81 48 131c0 6 0 11 -1 17
+c-7 -11 -15 -23 -24 -33c-52 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68c89 33 144 65 183 113zM218 161c31 39 48 80 48 131c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -71c89 33 144 65 183 113zM113 359
+c-57 -47 -67 -82 -74 -107c0 -4 -1 -9 -2 -14c87 33 142 65 181 113c31 38 47 80 48 130c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM36 -324c49 14 127 39 189 115c26 32 40 74 42 147c-7 -13 -16 -25 -26 -36c-52 -58 -140 -105 -178 -160
+c-14 -21 -22 -44 -27 -66z" />
     <glyph glyph-name="uniE24A" unicode="&#xe24a;" horiz-adv-x="280" 
-d="M0 -381v1129c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -9 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -12 -99c8 -25 12 -50 12 -77c0 -37 -4 -73 -13 -109c9 -25 13 -52 13 -79c0 -38 -4 -73 -13 -110c9 -25 13 -52 13 -80
-c0 -37 -4 -72 -13 -108c9 -25 13 -52 13 -79c0 -50 -8 -93 -19 -131c3 -21 5 -45 5 -73c0 -56 -26 -110 -44 -138c-4 -6 -8 -15 -15 -14c-7 0 -12 5 -12 12c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10
-zM188 402c-37 47 -102 111 -153 111h-2c5 -23 13 -52 30 -77c38 -55 121 -129 168 -191c1 -2 2 -4 4 -6c0 9 1 17 1 26c0 40 -8 85 -48 137zM231 57c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -25 13 -54 30 -79
-c38 -55 121 -129 168 -191zM231 -133c1 -2 2 -3 3 -4c1 11 2 23 2 35c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2
-c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -26 24 -57 63 -96c49 -50 79 -76 106 -111z" />
+d="M0 -381v1129c0 7 3 12 15 12c11 0 12 -5 14 -12c3 -10 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -34 -4 -66 -13 -99c9 -25 13 -50 13 -77c0 -37 -4 -73 -13 -109c9 -25 13 -52 13 -79c0 -38 -4 -73 -14 -110c10 -25 14 -52 14 -80
+c0 -37 -4 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -9 -93 -19 -131c3 -20 5 -45 5 -73c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14s-12 5 -12 12c0 5 3 11 4 16c15 40 22 90 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10z
+M188 402c-37 47 -102 111 -153 111h-2c4 -24 13 -52 30 -77c38 -56 121 -130 168 -192c1 -1 2 -3 4 -5c0 9 1 17 1 26c0 40 -8 85 -48 137zM209 -473c8 -11 17 -24 25 -39c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 5 -28
+c7 -26 25 -57 64 -96c49 -50 79 -76 106 -111zM231 -320c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM231 -133c1 -2 2 -3 3 -4c1 12 2 23 2 35c0 39 -9 80 -48 131
+c-37 48 -102 110 -153 110h-2v0c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 110 -153 110h-2c4 -25 13 -54 30 -79c38 -55 121 -129 168 -191z" />
     <glyph glyph-name="uniE24B" unicode="&#xe24b;" horiz-adv-x="309" 
-d="M0 -763v1151c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -60 11 -92v-18c-2 -23 -6 -48 -12 -72c7 -32 12 -64 12 -97v-20
-c-2 -23 -5 -47 -12 -72c8 -31 12 -63 12 -95v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-1 -16 -3 -33 -7 -50c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-43 -37 -65 -67 -76 -121
-c111 42 229 108 229 243c0 5 0 11 -1 16c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 47c111 42 231 109 231 244c0 7 0 14 -1 20c-7 -11 -15 -22 -24 -32c-51 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72zM35 -140c112 43 231 109 231 245c0 5 0 11 -1 17
-c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-14 -22 -23 -46 -28 -69zM35 -327c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM36 -512c49 14 127 39 189 115c26 32 40 74 42 147
-c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z" />
+d="M0 -763v1151c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 137c-4 5 -10 9 -10 12c0 1 1 3 5 5s8 3 12 3c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -26 11 -54 11 -84v-8v-18c-2 -23 -6 -48 -12 -72
+c6 -27 12 -57 12 -89v-8v-20c-2 -23 -5 -47 -12 -72c6 -26 12 -56 12 -88v-7v-21c-2 -22 -5 -47 -12 -71c6 -27 12 -57 12 -89v-7v-20c-1 -16 -3 -33 -7 -50c6 -40 10 -80 10 -116c0 -185 -140 -262 -193 -312c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16z
+M218 -214c31 39 48 81 48 132c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69c89 33 144 65 183 113zM218 -26c31 39 48 80 48 131c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160
+c-14 -22 -23 -46 -28 -68c89 33 144 65 183 113zM218 161c31 39 48 80 48 130c0 7 0 14 -1 20c-7 -11 -15 -22 -24 -32c-52 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72c89 34 144 66 183 114zM113 359c-57 -48 -67 -82 -74 -107c0 -4 -1 -9 -2 -14
+c87 33 142 65 181 112c31 39 47 81 48 131c0 5 0 11 -1 16c-3 -6 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM36 -512c49 14 127 39 189 115c26 32 40 74 42 147c-7 -13 -16 -25 -26 -36c-52 -58 -140 -105 -178 -160c-14 -21 -22 -44 -27 -66z" />
     <glyph glyph-name="uniE24C" unicode="&#xe24c;" horiz-adv-x="279" 
-d="M0 -381v1312c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -33 -4 -65 -12 -97c8 -24 12 -49 12 -75c0 -37 -5 -72 -13 -108c9 -25 13 -52 13 -79c0 -37 -5 -73 -13 -109c9 -25 13 -51 13 -79c0 -38 -4 -73 -13 -110
-c9 -25 13 -52 13 -80c0 -37 -5 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -8 -93 -19 -130c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-1 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17c0 34 -8 70 -42 121
-c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 585c-37 47 -102 111 -153 111h-1c5 -23 13 -50 29 -73c38 -55 121 -129 168 -191c1 -2 3 -4 4 -6c0 8 1 15 1 23c0 41 -9 85 -48 136zM231 245c1 -2 2 -3 3 -5c1 11 2 23 2 34c0 38 -9 79 -48 130
-c-37 48 -102 110 -153 110h-2c5 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2c4 -24 13 -54 30 -79c38 -55 121 -129 168 -191zM231 -133c1 -2 2 -3 3 -4c1 12 2 23 2 36
-c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -24 25 -39
-c1 11 2 22 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -26 24 -57 63 -96c49 -49 79 -76 106 -111z" />
+d="M0 -381v1312c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152v-8c0 -34 -5 -62 -12 -89c8 -24 12 -49 12 -75v-9c0 -36 -6 -69 -13 -99c9 -25 13 -52 13 -79v-9c0 -37 -6 -70 -13 -100c9 -25 13 -51 13 -79v-9
+c0 -37 -6 -70 -14 -101c10 -25 14 -52 14 -80v-9c0 -36 -6 -69 -13 -99c9 -25 13 -51 13 -79c0 -49 -9 -93 -19 -130c3 -21 5 -45 5 -74c0 -56 -26 -110 -44 -138c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c15 40 22 91 22 115c1 6 1 11 1 17
+c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 585c-37 47 -102 111 -153 111h-1c4 -23 13 -50 29 -73c38 -56 121 -130 168 -192c1 -1 3 -3 4 -5c0 8 1 15 1 23c0 40 -9 85 -48 136zM209 -473c8 -11 17 -23 25 -39c1 11 2 22 2 34
+c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 5 -28c7 -26 25 -57 64 -96c49 -49 79 -76 106 -111zM231 -320c1 -1 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM231 -133
+c1 -1 2 -3 3 -4c1 12 2 23 2 36c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -25 12 -55 30 -81c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 80 -48 131c-37 48 -102 110 -153 110h-2c4 -24 13 -54 30 -79c38 -55 121 -129 168 -191
+zM231 245c1 -2 2 -3 3 -5c1 11 2 23 2 34c0 38 -9 79 -48 130c-37 47 -102 110 -153 110h-2c4 -24 13 -53 30 -78c38 -55 121 -129 168 -191z" />
     <glyph glyph-name="uniE24D" unicode="&#xe24d;" horiz-adv-x="309" 
-d="M0 -950v1338c0 3 8 25 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 0 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c7 -31 11 -61 11 -92v-17c-2 -23 -6 -48 -12 -73
-c7 -32 12 -64 12 -97v-20c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -71c7 -32 12 -64 12 -97v-20c-1 -16 -3 -32 -7 -49c7 -40 10 -80 10 -116c0 -185 -139 -262 -193 -312
-c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM113 359c-56 -47 -67 -81 -73 -107c-1 -3 -2 -8 -3 -14c110 43 229 109 229 243c0 6 0 11 -1 17c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM35 48c112 42 231 109 231 244c0 6 0 13 -1 20
-c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71zM35 -139c112 42 231 109 231 244c0 6 0 12 -1 18c-7 -12 -15 -23 -24 -34c-51 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68zM35 -327c113 42 231 109 231 245c0 6 0 11 -1 17
-c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -515c113 43 231 108 231 245c0 6 0 12 -1 17c-7 -11 -15 -22 -24 -33c-51 -58 -140 -105 -178 -160c-15 -21 -23 -46 -28 -69zM36 -699c49 14 127 39 189 115c26 32 42 74 42 147
-c-7 -13 -16 -25 -26 -36c-51 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z" />
+d="M0 -950v1338c0 3 8 24 15 27c45 10 142 52 212 133c26 30 38 61 38 98c0 67 -26 101 -61 138c-4 5 -10 8 -10 11c0 2 1 4 5 5c4 3 9 4 13 4c6 -1 11 -3 15 -6c33 -26 79 -81 79 -160c0 -29 -4 -55 -11 -77c6 -25 11 -54 11 -83v-9v-17c-2 -23 -6 -48 -12 -73
+c6 -27 12 -57 12 -89v-8v-20c-2 -23 -5 -47 -12 -71c6 -27 12 -57 12 -88v-8v-20c-2 -23 -5 -47 -12 -72c6 -26 12 -56 12 -88v-8v-20c-2 -23 -5 -47 -12 -71c6 -27 12 -57 12 -89v-8v-20c-1 -16 -3 -32 -7 -49c6 -40 10 -80 10 -116c0 -185 -140 -262 -193 -312
+c-40 -38 -71 -68 -86 -172c-2 -8 -7 -16 -15 -16s-15 9 -15 16zM218 -401c31 39 48 80 48 131c0 6 0 12 -1 17c-7 -11 -15 -22 -24 -33c-52 -58 -140 -104 -178 -160c-15 -21 -23 -46 -28 -69c89 34 144 66 183 114zM218 -214c31 39 48 81 48 132c0 6 0 11 -1 17
+c-7 -11 -15 -22 -24 -33c-52 -58 -140 -105 -178 -160c-15 -21 -23 -47 -28 -69c89 34 144 66 183 113zM218 -26c31 39 48 81 48 131c0 6 0 12 -1 17c-7 -11 -15 -22 -24 -33c-52 -58 -140 -105 -178 -160c-14 -21 -23 -46 -28 -68c89 33 144 66 183 113zM218 161
+c31 39 48 81 48 131c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33c-52 -58 -140 -105 -178 -160c-15 -22 -24 -48 -28 -71c89 33 144 65 183 113zM113 359c-57 -47 -67 -81 -74 -107c0 -3 -1 -8 -2 -14c87 33 142 66 181 113c31 39 48 80 48 130c0 6 0 11 -1 17
+c-3 -6 -7 -11 -11 -16c-27 -35 -82 -73 -141 -123zM36 -699c49 14 127 39 189 115c26 32 42 74 42 147c-7 -13 -16 -25 -26 -36c-52 -59 -140 -105 -178 -160c-14 -21 -22 -45 -27 -66z" />
     <glyph glyph-name="uniE24E" unicode="&#xe24e;" horiz-adv-x="279" 
-d="M0 -381v1495c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152c0 -33 -4 -65 -12 -97c8 -24 12 -49 12 -75c0 -36 -4 -71 -12 -106c8 -25 12 -50 12 -77c0 -37 -5 -72 -13 -108c9 -25 13 -52 13 -79c0 -37 -4 -72 -13 -108
-c9 -26 13 -52 13 -80c0 -38 -5 -73 -13 -110c9 -25 13 -52 13 -80c0 -37 -5 -72 -13 -108c9 -25 13 -51 13 -79c0 -49 -8 -93 -19 -130c3 -21 5 -45 5 -73c0 -57 -26 -111 -44 -139c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11c0 5 3 11 4 16c16 41 23 88 23 132
-c0 34 -8 70 -42 121c-60 89 -138 139 -164 148c-7 3 -15 7 -15 10zM188 768c-37 47 -102 111 -153 111l-1 1c4 -23 13 -50 29 -74c38 -55 121 -129 168 -191c1 -2 3 -4 4 -6c0 8 1 15 1 23c0 41 -9 85 -48 136zM231 432c1 -2 2 -3 3 -5c1 10 2 21 2 31c0 38 -9 78 -48 129
-c-37 48 -102 110 -153 110h-1c5 -23 13 -50 29 -74c38 -55 121 -129 168 -191zM231 245c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c5 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 57c1 -1 2 -3 3 -4c1 11 2 22 2 34
-c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 13 -53 30 -79c38 -55 121 -129 168 -191zM231 -133c1 -1 2 -3 3 -4c1 12 2 24 2 36c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 -320c1 -1 2 -3 3 -4
-c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2c4 -25 13 -56 30 -82c38 -55 121 -125 168 -187zM209 -473c8 -11 17 -23 25 -39c1 11 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 6 -28c6 -25 24 -57 63 -96
-c49 -49 79 -76 106 -111z" />
+d="M0 -381v1495c0 7 3 12 15 12c11 0 12 -5 14 -12c0 0 28 -95 66 -150s89 -107 136 -169c34 -45 48 -100 48 -152v-8c0 -34 -5 -62 -12 -89c8 -24 12 -49 12 -75v-9c0 -35 -5 -68 -13 -97c9 -25 13 -50 13 -77v-9c0 -36 -6 -69 -13 -99c9 -25 13 -52 13 -79v-9
+c0 -36 -6 -70 -13 -99c9 -26 13 -52 13 -80v-9c0 -37 -6 -70 -14 -100c10 -26 14 -53 14 -81v-9c0 -36 -6 -69 -13 -99c9 -25 13 -51 13 -79c0 -49 -9 -93 -19 -130c3 -21 5 -45 5 -73c0 -57 -26 -111 -44 -139c-4 -6 -8 -14 -15 -14c-2 0 -3 0 -5 1c-5 3 -7 7 -7 11
+c0 5 3 11 4 16c15 41 23 88 23 132c0 34 -8 70 -42 122c-60 88 -138 138 -164 147c-7 3 -15 7 -15 10zM188 768c-37 47 -102 111 -153 111l-1 1c4 -23 13 -51 29 -74c38 -56 121 -130 168 -192c1 -1 3 -3 4 -5c0 8 1 15 1 23c0 40 -9 85 -48 136zM209 -473
+c8 -11 17 -23 25 -39c1 11 2 23 2 34c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-1c2 -11 4 -22 5 -28c7 -25 25 -57 64 -96c49 -49 79 -76 106 -111zM231 -320c1 -1 2 -3 3 -4c1 11 2 22 2 33c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -25 13 -56 30 -82
+c38 -55 121 -125 168 -187zM231 -133c1 -1 2 -3 3 -4c1 12 2 24 2 36c0 38 -9 79 -48 131c-37 47 -102 109 -153 109h-2v0c4 -24 12 -55 30 -81c38 -55 121 -129 168 -191zM231 57c1 -2 2 -3 3 -4c1 11 2 22 2 33c0 39 -9 80 -48 132c-37 47 -102 109 -153 109h-2
+c4 -24 13 -54 30 -79c38 -55 121 -129 168 -191zM231 245c1 -2 2 -3 3 -5c1 12 2 23 2 34c0 38 -9 79 -48 130c-37 48 -102 110 -153 110h-2c4 -24 13 -53 30 -78c38 -55 121 -129 168 -191zM231 432c1 -2 2 -4 3 -5c1 10 2 21 2 31c0 38 -9 78 -48 129
+c-37 47 -102 110 -153 110h-1c4 -24 13 -51 29 -74c38 -55 121 -129 168 -191z" />
     <glyph glyph-name="uniE24F" unicode="&#xe24f;" horiz-adv-x="309" 
-d="M0 -1126v1514c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 5 13 8 17 8c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c7 -31 11 -60 11 -92v-18c-2 -23 -6 -47 -12 -72c7 -32 12 -64 12 -97v-20
-c-2 -23 -5 -47 -12 -71c8 -32 12 -63 12 -96v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -48 -12 -72c7 -32 12 -63 12 -96v-20c-2 -23 -5 -47 -12 -72c7 -32 12 -63 12 -96v-20c-1 -16 -4 -34 -7 -51c6 -41 10 -81 10 -118c0 -185 -139 -262 -193 -312
-c-40 -38 -68 -83 -86 -156c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM113 359c-44 -37 -65 -67 -76 -121c111 42 229 109 229 243c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 47c112 43 231 109 231 245c0 6 0 13 -1 20c-7 -12 -15 -23 -24 -33
-c-51 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72zM35 -139c112 42 231 108 231 244c0 6 0 11 -1 17c-7 -11 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-14 -22 -23 -46 -28 -68zM35 -327c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33
-c-51 -59 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -515c113 42 231 108 231 245c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -703c113 42 231 108 231 245c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33
-c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69zM35 -891c50 14 128 38 190 115c26 33 42 75 42 150c-7 -12 -16 -24 -26 -36c-51 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69z" />
+d="M0 -1126v1514c0 2 8 24 15 26c45 11 142 52 212 133c26 31 38 62 38 99c0 67 -26 101 -61 138c-4 4 -10 8 -10 11c0 2 1 3 5 5s8 3 12 3c6 0 12 -2 16 -5c33 -26 79 -81 79 -160c0 -30 -4 -55 -11 -77c6 -26 11 -54 11 -84v-8v-18c-2 -23 -6 -47 -12 -72
+c6 -27 12 -57 12 -89v-8v-20c-2 -23 -5 -47 -12 -72c6 -26 12 -56 12 -88v-7v-20c-2 -23 -5 -48 -12 -72c6 -27 12 -57 12 -89v-7v-20c-2 -23 -5 -48 -12 -72c6 -26 12 -57 12 -88v-8v-20c-2 -23 -5 -47 -12 -72c6 -26 12 -56 12 -88v-8v-20c-1 -16 -4 -34 -7 -51
+c6 -40 10 -81 10 -118c0 -185 -140 -262 -193 -312c-40 -38 -68 -83 -86 -156c-2 -7 -7 -16 -15 -16s-15 9 -15 16zM218 -590c31 39 48 81 48 132c0 6 0 11 -1 17c-7 -11 -15 -22 -24 -33c-52 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69c89 33 144 66 183 113z
+M218 -402c31 39 48 81 48 132c0 5 0 11 -1 17c-7 -11 -15 -23 -24 -33c-52 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69c89 33 144 65 183 113zM218 -214c31 39 48 81 48 132c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160
+c-15 -22 -23 -47 -28 -69c89 33 144 65 183 113zM218 -26c31 39 48 80 48 131c0 5 0 11 -1 17c-7 -12 -15 -23 -24 -33c-52 -59 -140 -105 -178 -160c-14 -22 -23 -46 -28 -68c89 33 144 65 183 113zM218 161c31 39 48 80 48 130c0 7 0 14 -1 21c-7 -12 -15 -23 -24 -33
+c-52 -59 -140 -105 -178 -160c-15 -23 -24 -49 -28 -72c89 34 144 66 183 114zM113 359c-57 -48 -67 -82 -74 -107c0 -4 -1 -9 -2 -14c87 33 142 65 181 113c31 38 47 80 48 130c0 5 0 11 -1 16c-3 -5 -7 -11 -11 -16c-27 -35 -82 -72 -141 -122zM35 -891
+c50 14 128 39 190 115c26 33 42 75 42 150c-7 -12 -16 -24 -26 -36c-52 -58 -140 -105 -178 -160c-15 -22 -23 -47 -28 -69z" />
     <glyph glyph-name="uniE250" unicode="&#xe250;" horiz-adv-x="284" 
 d="M39 -267h-39v255c0 7 3 12 15 12s14 -5 15 -12c0 0 15 -107 53 -162s101 -87 149 -149c35 -45 52 -104 52 -162c0 -41 -9 -77 -17 -103c-6 -16 -10 -23 -21 -23c-2 0 -6 0 -9 1c-10 2 -13 10 -13 18c0 6 2 12 3 16l8 38c2 12 5 27 5 44c0 35 -11 81 -57 132
 c-40 44 -99 91 -144 95z" />
@@ -706,124 +737,129 @@ c-40 44 -99 91 -144 95z" />
 d="M0 12v254l39 1c45 4 104 51 144 95c46 51 57 97 57 132c0 17 -3 32 -5 44l-8 38c-1 4 -3 10 -3 16c0 8 3 16 13 18c3 1 7 1 9 1c11 0 15 -7 21 -23c8 -26 17 -62 17 -103c0 -58 -17 -118 -52 -163c-48 -62 -111 -93 -149 -148s-53 -162 -53 -162c-1 -7 -3 -12 -15 -12
 s-15 5 -15 12z" />
     <glyph glyph-name="uniE260" unicode="&#xe260;" horiz-adv-x="212" 
-d="M120 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" />
+d="M201 79c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -119 -93 -123 -95c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c51 0 75 -37 81 -76zM132 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38
+l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99z" />
     <glyph glyph-name="uniE261" unicode="&#xe261;" horiz-adv-x="171" 
-d="M166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1c4 0 7 -1 9 -3zM28 -97l116 32v165l-116 -33v-164z" />
+d="M166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35h-4c-8 0 -14 5 -14 13v495h28v-175l126 35c1 0 3 1 4 1c3 0 6 -1 8 -3zM28 -97l116 32v165l-116 -33v-164z" />
     <glyph glyph-name="uniE262" unicode="&#xe262;" horiz-adv-x="244" 
-d="M233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7
-c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z" />
+d="M233 105l-38 -7v-165l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3c-8 0 -14 6 -14 14v-2v58v2c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149
+l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z" />
     <glyph glyph-name="uniE263" unicode="&#xe263;" horiz-adv-x="275" 
-d="M86 -70v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h53l49 50v3l-49 49h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-53l-50 -50v-2
-l50 -50h53c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 48h-3z" />
+d="M250 51h-42l-50 -50v-2l50 -50h42h1h10c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v10v1v42l-49 48h-3l-50 -48v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h10h1h42l49 50v3l-49 49h-42h-1h-10c-8 0 -14 6 -14 14v59
+c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v41v12c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-11z" />
     <glyph glyph-name="uniE264" unicode="&#xe264;" horiz-adv-x="371" 
-d="M288 155c59 0 83 -48 83 -100c0 -103 -90 -185 -176 -228c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-36 -54 -87 -96 -145 -125c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301
-c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -320c5 6 34 36 84 36zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM201 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" />
+d="M369 80c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -119 -93 -123 -95c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-6 -9 -15 -23 -22 -31c-54 -61 -119 -92 -123 -94c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321
+c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -320c5 6 34 36 84 36c51 0 75 -36 81 -75zM132 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99zM300 40v11c0 21 -3 55 -39 55
+c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99z" />
     <glyph glyph-name="uniE265" unicode="&#xe265;" horiz-adv-x="586" 
-d="M233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7
-c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM397 -70v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h53l49 50v3l-49 49h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59
-c0 -8 -6 -14 -14 -14h-53l-50 -50v-2l50 -50h53c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 48h-3zM78 74v-166l89 19v165z" />
+d="M561 51h-42l-50 -50v-2l50 -50h42h1h10c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v10v1v42l-49 48h-3l-50 -48v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h10h1h42l49 50v3l-49 49h-42h-1h-10c-8 0 -14 6 -14 14v59
+c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v41v12c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-11zM233 105l-38 -7v-165l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3
+c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3c-8 0 -14 6 -14 14v-2v58v2c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z" />
     <glyph glyph-name="uniE266" unicode="&#xe266;" horiz-adv-x="539" 
-d="M456 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114c-36 -54 -87 -97 -145 -126c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114s0 -1 -1 -2l-3 -5l-2 -2l-1 -2s0 -1 -1 -1l-1 -3l-1 -1l-4 -4c-1 -1 -1 -2 -2 -3v-1l-1 -1
-l-2 -1s0 -1 -1 -1l-1 -3c-55 -62 -120 -94 -124 -96h-1h-1l-1 -1h-2l-2 -1c-9 0 -15 6 -15 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37h10h1l1 -1h1h4c2 -1 2 -1 3 -1c3 -1 4 -1 6 -1l1 -1h1l1 -1h2l1 -1s1 0 2 -1h1h1l1 -1h1v-1
-c4 -2 10 -5 13 -8l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM33 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM201 -127
-c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM369 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" />
+d="M537 79c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -119 -93 -123 -95c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114c-6 -9 -15 -23 -22 -31c-54 -61 -119 -93 -123 -95c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-1 114c0 -1 -1 -1 -1 -2l-2 -3l-1 -2l-2 -2l-1 -2
+c-1 -1 -2 -4 -3 -5l-1 -1l-3 -3c0 -1 -1 -1 -1 -2c-1 -1 -1 -2 -2 -3l-2 -1c-1 -1 -2 -4 -3 -5c-54 -61 -119 -93 -123 -95h-1c-1 0 -2 -1 -3 -1s-3 -1 -4 -1c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37h4h2h2h2c1 0 2 -1 3 -1
+h1h3s0 -1 1 -1h2s1 -1 2 -1h3s2 -1 3 -1l1 -1h2l1 -1c1 0 1 -1 2 -1h1c1 0 2 -1 3 -1v-1c4 -2 10 -5 13 -8l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37
+c51 0 75 -37 81 -76zM132 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99zM300 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99zM468 40v11c0 21 -3 55 -39 55
+c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99z" />
     <glyph glyph-name="uniE267" unicode="&#xe267;" horiz-adv-x="440" 
-d="M357 155c59 0 83 -49 83 -101c0 -103 -90 -185 -176 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1
-c4 0 7 -1 9 -3zM270 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM28 -97l116 32v165l-116 -33v-164z" />
+d="M166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35h-4c-8 0 -14 5 -14 13v495h28v-175l126 35c1 0 3 1 4 1c3 0 6 -1 8 -3zM28 -97l116 32v165l-116 -33v-164zM438 79c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -119 -93 -123 -95c-2 -1 -6 -2 -8 -2
+c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c51 0 75 -37 81 -76zM369 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99z" />
     <glyph glyph-name="uniE268" unicode="&#xe268;" horiz-adv-x="478" 
-d="M467 107l-38 -7v-165l33 7c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7
-c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1c4 0 7 -1 9 -3zM28 -97l116 32v165l-116 -33v-164zM312 76v-165l89 18v165z" />
+d="M467 107l-38 -7v-165l33 7h3c8 0 13 -6 13 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7
+h3c8 0 13 -6 13 -14v-59c0 -6 -5 -13 -11 -14zM312 76v-165l89 18v165zM166 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35h-4c-8 0 -14 5 -14 13v495h28v-175l126 35c1 0 3 1 4 1c3 0 6 -1 8 -3zM28 -97l116 32v165l-116 -33v-164z" />
     <glyph glyph-name="uniE269" unicode="&#xe269;" horiz-adv-x="535" 
-d="M524 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7
-c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM233 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147
-h28v-141l89 18v155h28v-149l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM369 74v-166l89 19v165zM78 74v-166l89 19v165z" />
+d="M524 105l-38 -7v-165l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3c-8 0 -14 6 -14 14v-2v58v2c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149
+l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14zM369 74v-166l89 19v165zM233 105l-38 -7v-165l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3
+c-8 0 -14 6 -14 14v-2v58v2c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14zM78 74v-166l89 19v165z" />
     <glyph glyph-name="uniE26A" unicode="&#xe26a;" horiz-adv-x="75" 
-d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1z" />
+d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 2 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -208c1 -2 1 -3 1 -4c0 -2 -1 -4 -3 -5c-1 -1 -2 -1 -4 -2z" />
     <glyph glyph-name="uniE26B" unicode="&#xe26b;" horiz-adv-x="75" 
-d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1z" />
+d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -46 207 -46 208c-1 2 -1 3 -1 4c0 2 1 4 3 5c1 1 2 1 4 2z" />
     <glyph glyph-name="uniE26C" unicode="&#xe26c;" horiz-adv-x="73" 
 d="M73 -181v-24h-61c-7 0 -12 5 -12 12v387c0 7 5 12 12 12h61v-24h-49v-363h49z" />
     <glyph glyph-name="uniE26D" unicode="&#xe26d;" horiz-adv-x="73" 
 d="M61 -205h-61v24h49v363h-49v24h61c7 0 12 -5 12 -12v-387c0 -7 -5 -12 -12 -12z" />
     <glyph glyph-name="uniE270" unicode="&#xe270;" horiz-adv-x="280" 
-d="M197 166c59 0 83 -49 83 -101c0 -102 -90 -185 -175 -228c-2 -1 -5 -2 -8 -2h-1c-7 0 -13 6 -13 13l-5 506l-56 -42c-2 -2 -5 -3 -8 -3c-8 0 -14 6 -14 14c0 2 2 6 3 8l83 117c2 3 7 6 11 6s10 -3 12 -6l83 -117c1 -2 2 -6 2 -8c0 -8 -5 -14 -13 -14c-3 0 -7 1 -9 3
-l-56 42l-2 -225c5 6 33 37 83 37zM111 -117c65 51 99 89 99 176c0 20 -3 57 -40 57c-40 0 -55 -29 -57 -38z" />
+d="M278 90c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-54 -61 -118 -93 -122 -95c-2 -1 -5 -2 -8 -2h-1c-7 0 -13 6 -13 13l-5 506l-56 -42c-2 -2 -5 -3 -8 -3c-8 0 -14 6 -14 14c0 2 2 6 3 8l83 117c2 3 7 6 11 6s10 -3 12 -6l83 -117c1 -2 2 -6 2 -8c0 -8 -5 -14 -13 -14
+c-3 0 -7 1 -9 3l-56 42l-2 -225c5 6 33 37 83 37c51 0 75 -37 81 -76zM210 50v9c0 20 -3 57 -40 57c-40 0 -55 -29 -57 -38l-2 -195c19 15 53 42 70 68c25 38 29 84 29 99z" />
     <glyph glyph-name="uniE271" unicode="&#xe271;" horiz-adv-x="280" 
-d="M197 166c59 0 83 -49 83 -101c0 -41 -15 -90 -53 -133c-46 -52 -98 -83 -116 -92v-192l61 47c2 2 6 2 9 2c8 0 13 -5 13 -13c0 -2 -1 -6 -2 -8l-84 -118c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-83 118c-1 2 -3 6 -3 8c0 8 6 13 14 13c3 0 6 0 8 -2l61 -47v201l-6 600v1
-c0 8 6 13 14 13h12c8 0 14 -5 14 -13v-1l-3 -320c5 6 33 37 83 37zM111 -117c65 51 98 91 98 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" />
+d="M278 90c1 -8 2 -16 2 -25c0 -41 -15 -90 -53 -133c-46 -52 -98 -83 -116 -92v-192l61 47c2 2 6 2 9 2c8 0 13 -5 13 -13c0 -2 -1 -6 -2 -8l-84 -118c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-83 118c-1 2 -3 6 -3 8c0 8 6 13 14 13c3 0 6 0 8 -2l61 -47v201l-6 600v1
+c0 8 6 13 14 13h12c8 0 14 -5 14 -13v-1l-3 -320c5 6 33 37 83 37c51 0 75 -37 81 -76zM118 -381l-1 -1zM209 50v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-2 -195c19 15 52 42 69 68c25 38 29 84 29 99z" />
     <glyph glyph-name="uniE272" unicode="&#xe272;" horiz-adv-x="255" 
-d="M249 183c3 -2 6 -7 6 -11v-495h-28v175l-126 -35c-9 0 -18 2 -18 13v523l-61 -46c-2 -2 -5 -2 -8 -2c-8 0 -14 5 -14 13c0 2 2 6 3 8l83 118c2 3 7 6 11 6s10 -3 12 -6l83 -118c1 -2 2 -6 2 -8c0 -8 -5 -13 -13 -13c-3 0 -7 0 -9 2l-61 47v-204l126 35h1l2 1
-c4 0 7 -1 9 -3zM111 -97l116 32v165l-116 -33v-164z" />
+d="M249 183c3 -2 6 -7 6 -11v-495h-28v175l-126 -35h-4c-8 0 -14 5 -14 13v523l-61 -46c-2 -2 -5 -2 -8 -2c-8 0 -14 5 -14 13c0 2 2 6 3 8l83 118c2 3 7 6 11 6s10 -3 12 -6l83 -118c1 -2 2 -6 2 -8c0 -8 -5 -13 -13 -13c-3 0 -7 0 -9 2l-61 47v-204l126 35c1 0 3 1 4 1
+c3 0 6 -1 8 -3zM111 -97l116 32v165l-116 -33v-164z" />
     <glyph glyph-name="uniE273" unicode="&#xe273;" horiz-adv-x="255" 
-d="M241 -303c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8l-83 -118c-2 -3 -7 -5 -11 -5s-10 2 -12 5l-83 118c-1 2 -3 6 -3 8c0 8 6 14 14 14c3 0 7 -1 9 -3l61 -47v204l-126 -35c-9 0 -18 2 -18 13v496h28v-176l126 35h1l2 1c9 0 14 -6 14 -14v-523l62 46c2 2 5 3 8 3zM144 99
-l-116 -33v-164l116 32v165z" />
+d="M251 -307c2 -2 4 -7 4 -10c0 -2 -2 -6 -3 -8l-83 -118c-2 -3 -7 -5 -11 -5s-10 2 -12 5l-83 118c-1 2 -3 6 -3 8c0 8 6 14 14 14c3 0 7 -1 9 -3l61 -47v204l-126 -35h-4c-8 0 -14 5 -14 13v496h28v-176l126 35c1 0 3 1 4 1c8 0 13 -6 13 -14v-523l62 46c2 2 5 3 8 3
+s8 -2 10 -4zM144 99l-116 -33v-164l116 32v165z" />
     <glyph glyph-name="uniE274" unicode="&#xe274;" horiz-adv-x="278" 
-d="M192 454l84 -118c1 -2 2 -5 2 -8c0 -8 -6 -14 -14 -14c-3 1 -5 2 -8 3l-61 47v-180l33 7c9 0 16 -4 16 -14v-59c0 -6 -4 -12 -11 -13l-38 -8v-165l33 7c4 0 8 0 11 -3c3 -2 5 -6 5 -10v-59c0 -7 -4 -13 -11 -14l-38 -8v-149h-28v144l-89 -18v-155h-28v149l-33 -7
-c-5 0 -8 0 -12 3c-3 3 -5 7 -5 11v58c0 6 5 12 11 13l39 8v166l-33 -7c-8 0 -17 3 -17 13v58c0 7 5 13 11 14l39 8v123h28v-117l89 18v185l-61 -46c-2 -1 -5 -2 -8 -2c-4 -1 -7 1 -10 3c-3 3 -4 7 -4 11c0 2 1 5 2 7l84 118c2 3 7 5 11 5c5 0 9 -2 11 -5zM78 -92l89 19v164
-l-89 -18v-165z" />
+d="M192 454l84 -118c1 -2 2 -5 2 -8s-1 -7 -4 -10c-3 -2 -6 -4 -10 -4c-3 1 -5 1 -8 3l-61 47v-180l33 7h2c3 0 7 -1 9 -3c3 -3 5 -7 5 -11v-59c0 -6 -4 -12 -11 -13l-38 -8v-165l33 7h3c3 0 6 -1 8 -3c3 -2 5 -6 5 -10v-59c0 -7 -4 -13 -11 -14l-38 -8v-149h-28v144
+l-89 -18v-155h-28v149l-33 -7h-3c-3 0 -6 1 -9 3c-3 3 -5 7 -5 11v58c0 6 5 12 11 13l39 8v166l-33 -7c-1 0 -2 -1 -3 -1c-3 0 -6 2 -9 4s-5 6 -5 10v58c0 7 5 12 11 14l39 8v123h28v-117l89 18v185l-61 -46c-2 -2 -5 -2 -8 -3c-4 0 -7 2 -10 4c-3 3 -4 7 -4 11c0 2 1 5 2 7
+l84 118c2 3 7 5 11 5c5 0 9 -2 11 -5zM78 -92l89 19v164l-89 -18v-165z" />
     <glyph glyph-name="uniE275" unicode="&#xe275;" horiz-adv-x="277" 
-d="M86 -452l-83 117c-2 3 -3 5 -3 8c0 4 2 7 4 10c3 2 6 4 9 4c4 0 7 -1 9 -3l61 -47v180l-32 -6c-8 0 -17 2 -17 13v59c0 7 5 13 11 14l38 8v164l-32 -7c-4 0 -9 1 -12 3c-3 3 -5 7 -5 11v59c0 7 5 12 11 14l38 7v150h28v-144l89 18v154h28v-149l34 7c1 0 1 1 2 1
-c4 0 7 -2 9 -4c3 -2 5 -6 5 -10v-58c0 -7 -4 -12 -11 -14l-39 -8v-165l34 7h2c8 0 14 -6 14 -14v-58c0 -6 -4 -12 -11 -13l-39 -8v-123h-27v117l-90 -19v-185l61 46c3 2 6 3 9 3s7 -1 9 -4c3 -2 4 -5 4 -8c0 -1 1 -2 1 -2c-1 -3 -1 -6 -3 -8l-83 -117c-3 -4 -7 -6 -12 -6
-c-4 0 -8 2 -11 6zM201 93l-90 -18v-165l90 18v165z" />
+d="M86 -452l-83 117c-2 3 -3 5 -3 8c0 4 2 7 4 10c3 2 6 4 9 4s7 -1 9 -3l61 -47v181l-32 -7c-1 0 -2 -1 -3 -1c-3 1 -7 2 -9 4c-3 2 -5 6 -5 10v59c0 7 5 13 11 14l38 8v164l-32 -7c-4 0 -9 1 -12 3c-3 3 -5 7 -5 11v59c0 7 5 12 11 14l38 7v150h28v-144l89 18v154h28v-149
+l34 7h2c4 0 7 -1 9 -3c3 -2 5 -6 5 -10v-58c0 -7 -4 -12 -11 -14l-39 -8v-165l34 7h2c4 0 7 -1 9 -3c3 -3 5 -7 5 -11v-58c0 -6 -4 -12 -11 -13l-39 -8v-123h-28v117l-89 -19v-185l61 46c3 2 6 3 9 3s7 -1 9 -4c3 -2 4 -5 4 -8v-2c0 -3 0 -5 -2 -8l-83 -117
+c-3 -4 -7 -6 -12 -6c-4 0 -8 2 -11 6zM200 93l-89 -18v-165l89 18v165z" />
     <glyph glyph-name="uniE276" unicode="&#xe276;" horiz-adv-x="331" 
-d="M67 -51l50 50v3l-50 49h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-53l49 -50h3l49 50v53c0 8 7 14 14 14h18v222l-61 -46c-2 -2 -5 -3 -7 -3c-7 0 -15 5 -15 13c0 3 1 6 3 9l83 117c3 4 7 6 11 6c5 0 9 -2 12 -6l83 -117c1 -3 2 -5 2 -8
-c0 -4 -1 -8 -4 -10c-3 -3 -6 -4 -10 -4c-3 0 -5 1 -8 3l-61 46v-222h13c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-53l-50 -49v-3l50 -50h53c8 0 14 -6 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-7 0 -14 6 -14 14v53l-49 48h-3l-49 -48v-53c0 -8 -6 -14 -14 -14h-59
-c-8 0 -14 6 -14 14v59c0 7 6 13 14 13h53z" />
+d="M67 -51l50 50v3l-50 49h-42v0h-11c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-53l49 -50h3l49 50v41v0v12c0 8 7 14 14 14h18v221l-61 -46c-2 -1 -5 -2 -7 -2c-4 0 -8 1 -11 4c-2 2 -4 5 -4 9c0 3 1 6 3 9l83 117c2 4 7 6 11 6c5 0 9 -2 11 -6l84 -117
+c1 -3 2 -5 2 -8c0 -4 -1 -8 -4 -10c-3 -3 -6 -4 -10 -4c-3 0 -5 1 -8 3l-61 46v-222h13c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-11v0h-42l-50 -49v-3l50 -50h42v0h11c8 0 14 -6 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-7 0 -14 6 -14 14v11v0v42l-49 48h-3l-49 -48v-53
+c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v59c0 7 6 13 14 13h11v0h42z" />
     <glyph glyph-name="uniE277" unicode="&#xe277;" horiz-adv-x="332" 
-d="M265 52l-50 -50v-3l50 -49h53c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 50h-3l-49 -50v-53c0 -8 -6 -14 -14 -14h-18v-222l61 46c2 2 5 3 7 3c7 0 15 -5 15 -13c0 -3 -1 -6 -3 -9l-83 -117c-2 -4 -7 -6 -11 -6c-5 0 -9 2 -11 6l-84 117
-c-1 3 -2 5 -2 8c0 4 1 8 4 10c3 3 6 4 10 4c3 0 6 -1 8 -3l61 -46v222h-13c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h53l50 49v3l-50 50h-53c-8 0 -14 6 -14 13v59c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-53l49 -48h3l49 48v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59
-c0 -7 -6 -13 -14 -13h-53z" />
+d="M265 52l-50 -50v-3l50 -49h42v0h11c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 50h-3l-49 -50v-41v0v-12c0 -8 -7 -14 -14 -14h-18v-221l61 46c2 1 5 2 7 2c4 0 8 -1 11 -4c2 -2 4 -5 4 -9c0 -3 -1 -6 -3 -9l-83 -117c-2 -4 -7 -6 -11 -6
+c-5 0 -9 2 -11 6l-84 117c-1 3 -2 5 -2 8c0 4 1 8 4 10c3 3 6 4 10 4c3 0 5 -1 8 -3l61 -46v222h-13c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h11v0h42l50 49v3l-50 50h-42v0h-11c-8 0 -14 6 -14 13v59c0 8 6 14 14 14h59c7 0 14 -6 14 -14v-11v0v-42l49 -48h3l49 48v53
+c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -7 -6 -13 -14 -13h-11v0h-42z" />
     <glyph glyph-name="uniE278" unicode="&#xe278;" horiz-adv-x="372" 
-d="M197 -173c0 0 -5 -3 -11 -3c-5 0 -11 6 -11 14l-1 115c-32 -51 -93 -101 -146 -127c0 0 -5 -2 -10 -2c-7 0 -12 6 -12 14l-6 588c0 8 7 14 14 14h12c8 0 14 -7 14 -14l-3 -308c5 6 33 37 83 37c22 0 39 -7 52 -18l-2 220l-56 -42c-2 -2 -5 -3 -8 -3s-6 1 -8 3
-c-4 2 -6 7 -6 11c0 3 1 6 2 8l84 118c2 3 7 5 11 5c5 0 9 -2 11 -5l84 -118c1 -2 2 -5 2 -8s-1 -6 -3 -8c-2 -4 -7 -6 -11 -6c-3 0 -6 1 -8 3l-56 43l-3 -240c5 6 34 37 84 37c59 0 83 -48 83 -100c0 -103 -89 -185 -175 -228zM203 -127c66 48 98 94 98 178
-c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM133 40c0 29 -2 66 -40 66c-40 0 -55 -29 -57 -38l-2 -195c63 47 94 86 99 167z" />
+d="M196 -173c0 0 -4 -3 -10 -3c-5 0 -11 6 -11 14l-1 115c-7 -11 -15 -22 -24 -32c-54 -61 -118 -93 -122 -94c0 0 -5 -3 -10 -3c-7 0 -12 6 -12 14l-6 588v0c0 8 7 14 14 14h12v0c8 0 14 -7 14 -14l-3 -308c5 6 33 37 83 37c22 0 39 -7 52 -18l-2 220l-56 -42
+c-2 -2 -5 -3 -8 -3s-6 1 -8 3c-4 2 -6 7 -6 11c0 3 1 6 2 8l84 118c2 3 7 5 11 5s9 -2 11 -5l84 -118c1 -2 2 -5 2 -8s-1 -6 -3 -8c-2 -4 -7 -6 -11 -6c-3 0 -6 1 -8 3l-56 43l-3 -240c5 6 34 37 84 37c51 0 75 -36 81 -76c1 -7 2 -16 2 -24c0 -41 -15 -90 -53 -134
+c-55 -61 -119 -92 -123 -94zM132 40c0 3 1 7 1 13c-1 20 -5 52 -40 53c-40 0 -55 -29 -57 -38l-2 -195c19 14 52 42 69 68c26 37 29 84 29 99zM301 40v11c0 20 -3 55 -39 55c-40 0 -55 -29 -57 -38l-2 -195c19 14 52 42 69 68c26 38 29 84 29 99z" />
     <glyph glyph-name="uniE279" unicode="&#xe279;" horiz-adv-x="449" 
-d="M366 156c58 0 83 -49 83 -100c0 -102 -91 -185 -176 -228c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-34 -51 -85 -96 -140 -123v-184l62 46c2 2 5 3 8 3c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8l-83 -117c-2 -3 -7 -6 -11 -6s-10 3 -12 6l-83 117c-1 2 -2 6 -2 8
-c0 8 5 14 13 14c3 0 7 -1 9 -3l60 -46v192l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 39 -6 52 -17l-3 302c0 8 6 14 14 14h11c8 0 14 -6 14 -14l-3 -321c5 6 34 37 84 37zM279 -126c66 52 99 89 99 178c0 21 -3 55 -39 55
-c-40 0 -56 -29 -58 -38zM110 -127c66 52 99 89 99 178c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" />
+d="M447 80c1 -7 2 -16 2 -24c0 -41 -16 -91 -54 -134c-54 -61 -118 -92 -122 -94c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-6 -9 -16 -23 -23 -31c-46 -52 -99 -83 -117 -92v-184l62 46c2 2 5 3 8 3c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8l-83 -117c-2 -3 -7 -6 -11 -6
+s-10 3 -12 6l-83 117c-1 2 -2 6 -2 8c0 8 5 14 13 14c3 0 7 -1 9 -3l60 -46v192l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 39 -6 52 -17l-3 302c0 8 6 14 14 14h11c8 0 14 -6 14 -14l-3 -321c5 6 34 37 84 37c51 0 75 -37 81 -76zM209 40
+v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -195c19 15 53 42 70 68c25 38 29 84 29 99zM378 41v11c0 21 -3 55 -39 55c-40 0 -56 -29 -58 -38l-2 -195c19 15 53 42 70 68c25 38 29 84 29 99z" />
     <glyph glyph-name="uniE27A" unicode="&#xe27a;" horiz-adv-x="195" 
 d="M109 319l83 -117c1 -2 3 -6 3 -8c0 -8 -6 -14 -14 -14c-3 0 -7 1 -9 3l-61 46v-353h-28v353l-61 -46c-2 -2 -5 -3 -8 -3c-8 0 -14 6 -14 14c0 2 2 6 3 8l83 117c2 3 7 6 11 6s10 -3 12 -6z" />
     <glyph glyph-name="uniE27B" unicode="&#xe27b;" horiz-adv-x="194" 
 d="M86 -68l-83 117c-1 2 -3 6 -3 8c0 8 6 14 14 14c3 0 6 -1 8 -3l61 -46v366h28v-365l61 46c2 2 6 2 9 2c8 0 13 -6 13 -14c0 -2 -1 -6 -2 -8l-83 -117c-2 -3 -8 -6 -12 -6s-9 3 -11 6z" />
     <glyph glyph-name="uniE280" unicode="&#xe280;" horiz-adv-x="193" 
-d="M0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c-84 50 -170 124 -170 231zM103 107c-36 0 -39 -34 -39 -55c0 -80 41 -127 99 -176l-1 198c0 -3 -1 -5 -1 -3c0 9 -14 36 -58 36z" />
+d="M0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c0 0 -55 33 -96 72c-29 28 -74 83 -74 159zM103 107c-36 0 -39 -34 -39 -55v-12c0 -15 4 -52 29 -90c18 -27 51 -58 70 -74l-1 198
+c0 -3 -1 -5 -1 -3c0 9 -14 36 -58 36z" />
     <glyph glyph-name="uniE281" unicode="&#xe281;" horiz-adv-x="422" 
-d="M422 58c0 -76 -45 -131 -74 -159c-41 -39 -96 -72 -96 -72c-2 -1 -3 -3 -6 -3c-7 0 -13 6 -13 13l-4 602c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-2 -318c6 8 28 30 74 30c50 0 87 -31 87 -93zM0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8
-c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c-84 50 -170 124 -170 231zM319 107c-44 0 -58 -27 -58 -36c0 -2 -1 0 -1 3l-1 -198c58 49 99 96 99 176c0 21 -3 55 -39 55zM103 107c-36 0 -39 -34 -39 -55c0 -80 41 -127 99 -176l-1 198c0 -3 -1 -5 -1 -3
-c0 9 -14 36 -58 36z" />
+d="M422 58c0 -76 -45 -131 -74 -159c-41 -39 -96 -72 -96 -72c-2 -1 -3 -3 -6 -3c-7 0 -13 6 -13 13l-4 602c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-2 -318c6 8 28 30 74 30c50 0 87 -31 87 -93zM319 107c-44 0 -58 -27 -58 -36c0 -2 -1 0 -1 3l-1 -198c19 16 52 47 70 74
+c25 38 29 75 29 90v12c0 21 -3 55 -39 55zM0 58c0 62 37 93 87 93c46 0 68 -22 74 -30l-2 318c0 7 6 13 13 13h8c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -4 2 -6 3c0 0 -55 33 -96 72c-29 28 -74 83 -74 159zM103 107c-36 0 -39 -34 -39 -55v-12
+c0 -15 4 -52 29 -90c18 -27 51 -58 70 -74l-1 198c0 -3 -1 -5 -1 -3c0 9 -14 36 -58 36z" />
     <glyph glyph-name="uniE282" unicode="&#xe282;" horiz-adv-x="180" 
-d="M169 100l-65 -13v-165l59 12c9 0 17 -2 17 -13v-59c0 -6 -5 -13 -11 -14l-65 -13v-151h-28v145l-59 -12c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l65 14v165l-59 -12c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l65 14v152h28v-146l59 12h1l1 1c9 0 15 -6 15 -14v-59
-c0 -6 -5 -13 -11 -14z" />
+d="M169 100l-65 -13v-165l59 12h3c8 0 14 -5 14 -13v-59c0 -6 -5 -13 -11 -14l-65 -13v-151h-28v145l-59 -12h-3c-8 0 -14 6 -14 14v58c0 6 5 12 11 13l65 14v165l-59 -12h-3c-8 0 -14 6 -14 14v58c0 6 5 12 11 13l65 14v152h28v-146l59 12c1 0 2 1 3 1c8 0 14 -6 14 -14
+v-59c0 -6 -5 -13 -11 -14z" />
     <glyph glyph-name="uniE283" unicode="&#xe283;" horiz-adv-x="290" 
-d="M278 110l-36 -7v-165l31 7c9 0 17 -3 17 -14v-59c0 -6 -6 -13 -12 -14l-36 -7v-147h-28v141l-59 -12v-146h-27v141l-53 -11v-145h-27v139l-31 -6c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l37 8v166l-31 -7c-9 0 -17 3 -17 14v58c0 6 5 12 11 13l37 8v157h27v-151l53 11v156
-h27v-151l59 12v155h28v-149l31 7c9 0 16 -3 16 -14v-59c0 -6 -5 -13 -11 -14zM155 85v-165l59 12v165zM128 -85v165l-53 -11v-165z" />
+d="M278 110l-36 -7v-165l31 7h3c8 0 14 -6 14 -14v-59c0 -6 -6 -13 -12 -14l-36 -7v-147h-28v141l-59 -12v-146h-27v141l-53 -11v-145h-27v139l-31 -6h-3c-8 0 -14 6 -14 14v58c0 6 5 12 11 13l37 8v166l-31 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 12 11 13l37 8v157h27v-151
+l53 11v156h27v-151l59 12v155h28v-149l31 7h3c8 0 13 -6 13 -14v-59c0 -6 -5 -13 -11 -14zM128 -85v165l-53 -11v-165zM155 85v-165l59 12v165z" />
     <glyph glyph-name="uniE284" unicode="&#xe284;" horiz-adv-x="160" 
-d="M0 58c0 62 37 93 87 93c32 0 41 -9 41 -9l-3 297c0 7 6 13 13 13h9c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -5 2 -7 3c0 0 -30 22 -66 67c-25 32 -70 88 -70 164zM101 107c-44 0 -44 -52 -44 -67c0 -57 33 -124 73 -164l-2 198c0 9 -2 33 -27 33z" />
-    <glyph glyph-name="uniE285" unicode="&#xe285;" horiz-adv-x="416" 
-d="M321 151c50 0 95 -31 95 -93c0 -76 -45 -126 -74 -154c-41 -39 -120 -77 -120 -77c-2 -1 -5 -3 -8 -3c-7 0 -13 6 -13 13l-4 602c0 7 6 13 13 13h9c7 0 13 -6 13 -13l-3 -318c6 5 31 30 92 30zM0 58c0 62 37 93 87 93c32 0 41 -9 41 -9l-3 297c0 7 6 13 13 13h9
-c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -5 2 -7 3c0 0 -30 22 -66 67c-25 32 -70 88 -70 164zM348 40c0 15 1 67 -55 67c-44 0 -64 -20 -64 -44v-4l-2 -183c22 10 72 47 92 74c27 37 29 75 29 90zM101 107c-44 0 -44 -52 -44 -67c0 -57 33 -124 73 -164l-2 198
+d="M0 58c0 62 37 93 87 93c32 0 41 -9 41 -9l-3 297c0 7 6 13 13 13h9c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -5 2 -7 3c0 0 -30 22 -66 67c-25 32 -70 88 -70 164zM101 107c-44 0 -44 -52 -44 -67s3 -49 22 -90c13 -28 37 -60 51 -74l-2 198
 c0 9 -2 33 -27 33z" />
+    <glyph glyph-name="uniE285" unicode="&#xe285;" horiz-adv-x="416" 
+d="M321 151c50 0 95 -31 95 -93c0 -76 -45 -126 -74 -154c-41 -39 -120 -77 -120 -77c-2 -1 -5 -3 -8 -3c-7 0 -13 6 -13 13l-4 602c0 7 6 13 13 13h9c7 0 13 -6 13 -13l-3 -318c6 5 31 30 92 30zM348 40c0 15 1 67 -55 67c-44 0 -64 -20 -64 -44v-4l-2 -183
+c22 10 72 47 92 74c27 37 29 75 29 90zM0 58c0 62 37 93 87 93c32 0 41 -9 41 -9l-3 297c0 7 6 13 13 13h9c7 0 13 -6 13 -13l-4 -602c0 -7 -6 -13 -13 -13c-3 0 -5 2 -7 3c0 0 -30 22 -66 67c-25 32 -70 88 -70 164zM101 107c-44 0 -44 -52 -44 -67s3 -49 22 -90
+c13 -28 37 -60 51 -74l-2 198c0 9 -2 33 -27 33z" />
     <glyph glyph-name="uniE440" unicode="&#xe440;" horiz-adv-x="277" 
-d="M194 156c60 0 83 -49 83 -101c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-3 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 362l-76 -45v44l76 45l-1 74l-75 -44v44l75 44l-1 79c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-1 -57l120 71v-44l-121 -71v-75l121 71v-44
-l-122 -71l-1 -101c4 5 32 37 84 37zM107 -128c65 52 99 91 99 179c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39z" />
+d="M275 80c1 -8 2 -16 2 -25c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-3 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 362l-76 -45v44l76 45l-1 74l-75 -44v44l75 44l-1 79c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-1 -57l120 71v-44l-121 -71v-75l121 71v-44l-122 -71
+l-1 -101c4 5 32 37 84 37s75 -36 81 -76zM206 40v11c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39l-3 -195c19 15 53 43 70 69c25 38 29 84 29 99z" />
     <glyph glyph-name="uniE442" unicode="&#xe442;" horiz-adv-x="277" 
-d="M194 156c60 0 83 -49 83 -101c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-2 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 384l-76 -44v44l76 44l-2 175c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-2 -153l121 71v-44l-121 -72l-2 -123c4 5 32 37 84 37zM108 -128
-c65 51 98 93 98 179c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39z" />
+d="M275 80c1 -8 2 -16 2 -25c0 -41 -15 -91 -53 -134c-56 -63 -123 -95 -123 -95c-2 -1 -5 -2 -8 -2c-8 0 -14 5 -14 13l-3 384l-76 -44v44l76 44l-2 175c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-2 -153l121 71v-44l-121 -72l-2 -123c4 5 32 37 84 37s75 -36 81 -76zM206 40
+v11c0 21 -3 55 -39 55c-41 0 -55 -30 -57 -39l-2 -195c19 15 52 43 69 69c25 38 29 84 29 99z" />
     <glyph glyph-name="uniE446" unicode="&#xe446;" horiz-adv-x="348" 
-d="M343 84c3 -2 5 -6 5 -10v-59c0 -6 -4 -10 -10 -12l-151 -41v-41l92 25h1l1 1c4 0 7 -1 9 -3c3 -2 5 -6 5 -10v-59c0 -6 -3 -11 -9 -13l-99 -26v-152h-26v145l-92 -25h-3c-3 0 -6 0 -8 2c-3 2 -5 7 -5 11v58c0 6 3 10 9 12l99 27v40l-145 -39c-4 0 -8 0 -11 3
-c-3 2 -5 6 -5 10v58c0 6 4 10 10 12l151 42v40l-92 -24h-1l-1 -1c-4 0 -7 1 -9 3c-3 2 -5 6 -5 10v58c0 6 3 11 9 13l99 27v152h26v-145l92 25h3c3 0 6 0 8 -2c3 -2 5 -7 5 -11v-59c0 -6 -3 -10 -9 -12l-99 -26v-41l145 39h1l1 1c4 0 7 -1 9 -3z" />
+d="M343 84c3 -2 5 -6 5 -10v-59c0 -6 -4 -10 -10 -12l-151 -41v-41l92 25c1 0 2 1 3 1c3 0 6 -1 8 -3c3 -2 5 -6 5 -10v-59c0 -6 -3 -11 -9 -13l-99 -26v-152h-26v145l-92 -25h-3c-3 0 -6 0 -8 2c-3 2 -5 7 -5 11v58c0 6 3 10 9 12l99 27v40l-145 -39h-3c-3 0 -6 1 -8 3
+c-3 2 -5 6 -5 10v58c0 6 4 10 10 12l151 42v40l-92 -24c-1 0 -2 -1 -3 -1c-3 0 -6 1 -8 3c-3 2 -5 6 -5 10v58c0 6 3 11 9 13l99 27v152h26v-145l92 25h3c3 0 6 0 8 -2c3 -2 5 -7 5 -11v-59c0 -6 -3 -10 -9 -12l-99 -26v-41l145 39c1 0 2 1 3 1c3 0 6 -1 8 -3z" />
     <glyph glyph-name="uniE447" unicode="&#xe447;" horiz-adv-x="348" 
-d="M343 84c3 -2 5 -6 5 -10v-59c0 -5 -4 -11 -9 -12l-93 -25v-41l33 9h1l1 1c3 0 7 -2 9 -3c3 -2 5 -6 5 -10v-60c0 -5 -4 -11 -9 -12l-40 -11v-152h-26v145l-91 -24v-152h-26v145l-34 -9c-8 0 -16 3 -16 12v59c0 5 4 11 9 12l41 11v41l-87 -23h-1l-1 -1c-3 0 -7 2 -9 3
-c-3 2 -5 6 -5 10v58c0 5 5 12 10 13l93 25v41l-34 -9c-4 0 -8 0 -11 2s-5 6 -5 10v59c0 5 4 11 9 12l41 11v153h26v-146l91 25v152h26v-145l33 9h1l2 1c8 0 13 -6 13 -13v-59c0 -5 -4 -12 -9 -13l-40 -11v-40l86 24h3c2 0 6 -2 8 -3zM220 96l-91 -24v-41l91 25v40zM129 -95
-l91 25v41l-91 -25v-41z" />
+d="M343 84c3 -2 5 -6 5 -10v-59c0 -5 -4 -11 -9 -12l-93 -25v-41l33 9c1 0 2 1 3 1c2 0 6 -2 8 -3c3 -2 5 -6 5 -10v-60c0 -5 -4 -11 -9 -12l-40 -11v-152h-26v145l-91 -24v-152h-26v145l-34 -9h-3c-7 0 -13 5 -13 12v58v1c0 5 4 11 9 12l41 11v41l-87 -23c-1 0 -2 -1 -3 -1
+c-2 0 -6 2 -8 3c-3 2 -5 6 -5 10v58c0 5 5 12 10 13l93 25v41l-34 -9h-3c-2 0 -6 1 -8 2c-3 2 -5 6 -5 10v59c0 5 4 11 9 12l41 11v153h26v-146l91 25v152h26v-145l33 9c1 0 3 1 4 1c7 0 12 -6 12 -13v-59c0 -5 -4 -12 -9 -13l-40 -11v-40l86 24h3c2 0 6 -2 8 -3zM220 96
+l-91 -24v-41l91 25v40zM129 -95l91 25v41l-91 -25v-41z" />
     <glyph glyph-name="uniE4A0" unicode="&#xe4a0;" horiz-adv-x="360" 
-d="M18 234l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1z" />
+d="M18 234l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1z" />
     <glyph glyph-name="uniE4A1" unicode="&#xe4a1;" horiz-adv-x="360" 
-d="M18 -1l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1z" />
+d="M18 -1l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1z" />
     <glyph glyph-name="uniE4A2" unicode="&#xe4a2;" horiz-adv-x="78" 
-d="M11 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" />
+d="M11 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z" />
     <glyph glyph-name="uniE4A3" unicode="&#xe4a3;" horiz-adv-x="78" 
-d="M11 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11z" />
+d="M11 -67c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z" />
     <glyph glyph-name="uniE4A4" unicode="&#xe4a4;" horiz-adv-x="316" 
 d="M14 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" />
     <glyph glyph-name="uniE4A5" unicode="&#xe4a5;" horiz-adv-x="316" 
@@ -837,71 +873,71 @@ d="M25 7l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -
     <glyph glyph-name="uniE4AD" unicode="&#xe4ad;" horiz-adv-x="296" 
 d="M271 -7l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z" />
     <glyph glyph-name="uniE4AE" unicode="&#xe4ae;" horiz-adv-x="296" 
-d="M25 140l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159zM120 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" />
+d="M120 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM25 140l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159z" />
     <glyph glyph-name="uniE4AF" unicode="&#xe4af;" horiz-adv-x="296" 
-d="M176 -11c15 -16 15 -40 0 -56c-8 -8 -18 -11 -28 -11s-20 3 -28 11c-15 16 -15 40 0 56c8 7 18 11 28 11s20 -4 28 -11zM271 -140l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z" />
+d="M176 -11c15 -16 15 -40 0 -55c-16 -16 -40 -16 -56 0c-15 15 -15 39 0 55c16 15 40 15 56 0zM271 -140l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z" />
     <glyph glyph-name="uniE4B0" unicode="&#xe4b0;" horiz-adv-x="360" 
-d="M18 343l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1zM152 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56
-c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" />
+d="M152 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0zM18 343l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14
+c1 0 3 -1 4 -1z" />
     <glyph glyph-name="uniE4B1" unicode="&#xe4b1;" horiz-adv-x="360" 
-d="M152 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11zM18 -110l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13
-v23c0 8 6 14 15 14l2 -1h1z" />
+d="M18 -110l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1zM152 -67c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55
+c-16 -15 -40 -15 -56 0z" />
     <glyph glyph-name="uniE4B2" unicode="&#xe4b2;" horiz-adv-x="316" 
-d="M14 187h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM130 11c-15 16 -15 40 0 56c8 8 18 11 28 11s20 -3 28 -11c15 -16 15 -40 0 -56c-8 -7 -18 -11 -28 -11s-20 4 -28 11z" />
+d="M14 187h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM130 11c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z" />
     <glyph glyph-name="uniE4B3" unicode="&#xe4b3;" horiz-adv-x="316" 
-d="M130 -67c-15 16 -15 40 0 55c8 8 18 12 28 12s20 -4 28 -12c15 -15 15 -39 0 -55c-8 -8 -18 -11 -28 -11s-20 3 -28 11zM14 -141h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" />
+d="M14 -141h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM130 -67c-15 16 -15 40 0 55c16 16 40 16 56 0c15 -15 15 -39 0 -55c-16 -15 -40 -15 -56 0z" />
     <glyph glyph-name="uniE4B4" unicode="&#xe4b4;" horiz-adv-x="360" 
-d="M18 357l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14l2 -1h1zM36 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18
-c0 8 6 14 14 14z" />
+d="M18 357l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1zM36 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288
+c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" />
     <glyph glyph-name="uniE4B5" unicode="&#xe4b5;" horiz-adv-x="360" 
-d="M36 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM18 -124l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103h-1l-2 -1c-9 0 -15 6 -15 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 15 14
-l2 -1h1z" />
+d="M18 -124l333 -103c5 -2 10 -7 10 -13s-5 -12 -10 -14l-333 -103c-1 0 -3 -1 -4 -1c-8 0 -14 6 -14 14v23c0 6 5 11 10 13l214 68l-214 67c-5 2 -10 7 -10 13v23c0 8 6 14 14 14c1 0 3 -1 4 -1zM36 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288
+c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" />
     <glyph glyph-name="uniE4B6" unicode="&#xe4b6;" horiz-adv-x="212" 
-d="M7 0c-4 0 -7 3 -7 7c0 36 140 199 140 199c3 3 9 6 14 6s11 -3 14 -6l38 -38c3 -3 6 -9 6 -14s-3 -11 -6 -14s-163 -140 -199 -140z" />
+d="M2 2c-1 1 -2 3 -2 5c0 36 140 199 140 199c3 3 9 6 14 6s11 -3 14 -6l38 -38c3 -3 6 -9 6 -14s-3 -11 -6 -14s-163 -140 -199 -140c-2 0 -4 1 -5 2z" />
     <glyph glyph-name="uniE4B7" unicode="&#xe4b7;" horiz-adv-x="212" 
-d="M0 -7c0 4 3 7 7 7c36 0 196 -137 199 -140s6 -9 6 -14s-3 -11 -6 -14l-38 -38c-3 -3 -9 -6 -14 -6s-11 3 -14 6c0 0 -140 163 -140 199z" />
+d="M2 -2c1 1 3 2 5 2c36 0 196 -137 199 -140s6 -9 6 -14s-3 -11 -6 -14l-38 -38c-3 -3 -9 -6 -14 -6s-11 3 -14 6c0 0 -140 163 -140 199c0 2 1 4 2 5z" />
     <glyph glyph-name="uniE4B8" unicode="&#xe4b8;" horiz-adv-x="342" 
-d="M332 0c9 -2 10 -9 10 -17c-1 -5 -25 -145 -171 -145s-170 140 -171 145c0 8 1 15 10 17c10 0 14 -3 17 -12c2 -6 17 -93 144 -93s142 87 144 93c3 9 7 12 17 12z" />
+d="M332 0c8 -2 10 -9 10 -14v-3c-1 -5 -25 -145 -171 -145s-170 140 -171 145v3c0 5 2 12 10 14h3c8 0 12 -7 14 -12c2 -6 17 -93 144 -93s142 87 144 93c2 5 6 12 14 12h3z" />
     <glyph glyph-name="uniE4B9" unicode="&#xe4b9;" horiz-adv-x="342" 
-d="M332 0c-10 0 -14 3 -17 12c-2 6 -17 93 -144 93s-142 -87 -144 -93c-3 -9 -7 -12 -17 -12c-9 2 -10 9 -10 17c1 5 25 145 171 145s170 -140 171 -145c0 -8 -1 -15 -10 -17z" />
-    <glyph glyph-name="uniE4BA" unicode="&#xe4ba;" horiz-adv-x="489" 
-d="M368 48c-42 15 -82 21 -124 21s-80 -7 -124 -21c-40 -12 -94 -41 -100 -45c-4 -2 -7 -3 -10 -3c-5 0 -10 5 -10 10c0 3 1 6 4 9c0 1 21 26 61 52c37 23 97 51 179 51s143 -28 179 -51c40 -26 61 -51 61 -52c3 -3 4 -6 4 -9c0 -5 -5 -10 -10 -10c-3 0 -6 1 -10 3
-c-6 4 -59 31 -100 45z" />
-    <glyph glyph-name="uniE4BB" unicode="&#xe4bb;" horiz-adv-x="489" 
-d="M120 -48c42 -15 82 -21 124 -21s80 7 124 21c40 12 94 41 100 45c4 2 7 3 10 3c6 0 10 -5 10 -10c0 -3 -1 -6 -4 -9c0 -1 -21 -26 -61 -52c-36 -23 -97 -51 -179 -51s-142 28 -179 51c-40 26 -61 51 -61 52c-3 3 -4 6 -4 9c0 5 5 10 10 10c3 0 6 -1 10 -3
-c6 -4 59 -31 100 -45z" />
+d="M332 0h-3c-8 0 -12 7 -14 12c-2 6 -17 93 -144 93s-142 -87 -144 -93c-2 -5 -6 -12 -14 -12h-3c-8 2 -10 9 -10 14v3c1 5 25 145 171 145s170 -140 171 -145v-3c0 -5 -2 -12 -10 -14z" />
+    <glyph glyph-name="uniE4BA" unicode="&#xe4ba;" horiz-adv-x="573" 
+d="M570 14c3 -4 3 -5 3 -6c0 -2 -1 -4 -3 -6c-1 -1 -3 -2 -6 -2c0 0 -4 0 -8 3s-31 23 -73 42c-38 17 -94 36 -196 36c-103 0 -159 -19 -197 -36c-42 -19 -69 -39 -73 -42s-8 -3 -8 -3c-2 0 -5 0 -7 2s-2 4 -2 5c0 2 1 5 3 7c3 4 33 38 74 63c34 20 62 34 89 42
+c38 12 78 18 121 18c42 0 82 -6 120 -18c27 -8 55 -22 89 -42c41 -25 72 -60 74 -63z" />
+    <glyph glyph-name="uniE4BB" unicode="&#xe4bb;" horiz-adv-x="533" 
+d="M530 -13c-2 -3 -31 -36 -69 -59c-31 -19 -57 -31 -83 -39c-34 -11 -72 -16 -111 -16c-40 0 -78 5 -112 16c-26 8 -52 20 -83 39c-38 23 -66 55 -69 59c-2 2 -3 4 -3 6c0 1 0 3 2 5s4 2 6 2c0 0 4 0 8 -3s29 -21 68 -39c35 -15 87 -33 183 -33c95 0 147 18 182 33
+c40 18 64 36 68 39s8 3 8 3c2 0 4 -1 5 -2c2 -2 3 -4 3 -5c0 -2 0 -3 -3 -6z" />
     <glyph glyph-name="uniE4BC" unicode="&#xe4bc;" horiz-adv-x="316" 
 d="M36 123l-24 14l135 226c2 4 8 6 12 6c6 -1 9 -2 12 -6l135 -226c1 -2 1 -5 1 -7c0 -8 -5 -14 -13 -14h-63c-5 0 -11 3 -13 7l-87 159zM14 46h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" />
     <glyph glyph-name="uniE4BD" unicode="&#xe4bd;" horiz-adv-x="316" 
-d="M14 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14zM280 -123l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159z" />
+d="M280 -123l24 -14l-135 -226c-2 -4 -8 -6 -12 -6c-6 1 -9 2 -12 6l-135 226c-1 2 -1 5 -1 7c0 8 5 14 13 14h63c5 0 11 -3 13 -7l87 -159zM14 0h288c8 0 14 -6 14 -14v-18c0 -8 -6 -14 -14 -14h-288c-8 0 -14 6 -14 14v18c0 8 6 14 14 14z" />
     <glyph glyph-name="uniE4C0" unicode="&#xe4c0;" horiz-adv-x="622" 
-d="M540 260c49 -53 82 -161 82 -215c0 -20 -4 -32 -14 -32c-28 0 -14 86 -98 171c-74 74 -173 75 -197 75h-4c-24 0 -123 -1 -197 -75c-84 -85 -70 -171 -98 -171c-10 0 -14 13 -14 32c0 54 34 161 83 215c94 102 176 108 228 108s135 -6 229 -108zM242 69c0 38 31 69 69 69
-s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" />
+d="M540 260c49 -53 82 -161 82 -215c0 -20 -4 -32 -14 -32c-28 0 -14 86 -98 171c-74 74 -173 75 -197 75h-2h-2c-24 0 -123 -1 -197 -75c-84 -85 -70 -171 -98 -171c-10 0 -14 13 -14 32c0 54 34 161 83 215c94 102 176 108 228 108s135 -6 229 -108zM242 69
+c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" />
     <glyph glyph-name="uniE4C1" unicode="&#xe4c1;" horiz-adv-x="622" 
-d="M242 -69c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM540 -260c-94 -102 -177 -108 -229 -108s-134 6 -228 108c-49 54 -83 161 -83 215c0 19 4 32 14 32c28 0 14 -86 98 -171c74 -74 173 -75 197 -75h4c24 0 123 1 197 75c84 85 70 171 98 171
-c10 0 14 -12 14 -32c0 -54 -33 -162 -82 -215z" />
+d="M540 -260c-94 -102 -177 -108 -229 -108s-134 6 -228 108c-49 54 -83 161 -83 215c0 19 4 32 14 32c28 0 14 -86 98 -171c74 -74 173 -75 197 -75h2h2c24 0 123 1 197 75c84 85 70 171 98 171c10 0 14 -12 14 -32c0 -54 -33 -162 -82 -215zM242 -69c0 38 31 69 69 69
+s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" />
     <glyph glyph-name="uniE4C4" unicode="&#xe4c4;" horiz-adv-x="642" 
-d="M331 448l308 -426c1 -2 3 -6 3 -8c0 -8 -6 -14 -14 -14h-43c-4 0 -9 3 -11 6l-254 351l-252 -351c-2 -3 -7 -6 -11 -6h-43c-8 0 -14 6 -14 14c0 2 2 6 3 8l306 426c2 3 7 6 11 6s9 -3 11 -6zM252 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" />
+d="M252 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM331 448l308 -426c1 -2 3 -6 3 -8c0 -8 -6 -14 -14 -14h-43c-4 0 -9 3 -11 6l-254 351l-252 -351c-2 -3 -7 -6 -11 -6h-43c-8 0 -14 6 -14 14c0 2 2 6 3 8l306 426c2 3 7 6 11 6s9 -3 11 -6z" />
     <glyph glyph-name="uniE4C5" unicode="&#xe4c5;" horiz-adv-x="642" 
-d="M639 -22l-308 -426c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-306 426c-1 2 -3 6 -3 8c0 8 6 14 14 14h43c4 0 9 -3 11 -6l252 -351l254 351c2 3 7 6 11 6h43c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8zM252 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" />
+d="M252 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM639 -22l-308 -426c-2 -3 -7 -6 -11 -6s-9 3 -11 6l-306 426c-1 2 -3 6 -3 8c0 8 6 14 14 14h43c4 0 9 -3 11 -6l252 -351l254 351c2 3 7 6 11 6h43c8 0 14 -6 14 -14c0 -2 -2 -6 -3 -8z" />
     <glyph glyph-name="uniE4C6" unicode="&#xe4c6;" horiz-adv-x="623" 
 d="M28 0h-28v354c0 8 6 14 14 14h595c8 0 14 -6 14 -14v-354h-27v277h-568v-277zM243 103c0 38 31 69 69 69s68 -31 68 -69s-30 -69 -68 -69s-69 31 -69 69z" />
     <glyph glyph-name="uniE4C7" unicode="&#xe4c7;" horiz-adv-x="623" 
 d="M0 -354v354h28v-277h568v277h27v-354c0 -8 -6 -14 -14 -14h-595c-8 0 -14 6 -14 14zM243 -103c0 38 31 69 69 69s68 -31 68 -69s-30 -69 -68 -69s-69 31 -69 69z" />
     <glyph glyph-name="uniE4C8" unicode="&#xe4c8;" horiz-adv-x="842" 
-d="M28 0h-28v536c0 8 6 13 14 13h814c8 0 14 -5 14 -13v-536h-28v459h-786v-459zM192 0h-28v354c0 8 6 14 14 14h486c8 0 14 -6 14 -14v-354h-28v277h-458v-277zM352 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" />
+d="M192 0h-28v354c0 8 6 14 14 14h486c8 0 14 -6 14 -14v-354h-28v277h-458v-277zM352 103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM28 0h-28v536c0 8 6 13 14 13h814c8 0 14 -5 14 -13v-536h-28v459h-786v-459z" />
     <glyph glyph-name="uniE4C9" unicode="&#xe4c9;" horiz-adv-x="842" 
-d="M164 -354v354h28v-277h458v277h28v-354c0 -8 -6 -14 -14 -14h-486c-8 0 -14 6 -14 14zM0 -536v536h28v-459h786v459h28v-536c0 -8 -6 -13 -14 -13h-814c-8 0 -14 5 -14 13zM352 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69z" />
+d="M164 -354v354h28v-277h458v277h28v-354c0 -8 -6 -14 -14 -14h-486c-8 0 -14 6 -14 14zM352 -103c0 38 31 69 69 69s69 -31 69 -69s-31 -69 -69 -69s-69 31 -69 69zM0 -536v536h28v-459h786v459h28v-536c0 -8 -6 -13 -14 -13h-814c-8 0 -14 5 -14 13z" />
     <glyph glyph-name="uniE4D1" unicode="&#xe4d1;" horiz-adv-x="380" 
-d="M198 490h24c6 0 11 -5 11 -11c0 -1 -1 -3 -1 -4l-187 -468c-2 -4 -6 -7 -10 -7h-24c-6 0 -11 5 -11 11c0 1 0 3 1 4l187 468c2 4 6 7 10 7zM148 15l187 468c2 4 6 7 10 7h24c6 0 11 -5 11 -11c0 -1 0 -3 -1 -4l-187 -468c-2 -4 -6 -7 -10 -7h-24c-6 0 -11 5 -11 11
+d="M198 490h24c6 0 11 -5 11 -11c0 -1 -1 -3 -1 -4l-187 -468c-2 -4 -6 -7 -10 -7h-24c-6 0 -11 5 -11 11c0 1 0 3 1 4l187 468c2 4 6 7 10 7v0zM148 15l187 468c2 4 6 7 10 7h24c6 0 11 -5 11 -11c0 -1 0 -3 -1 -4l-187 -468c-2 -4 -6 -7 -10 -7h-24c-6 0 -11 5 -11 11
 c0 1 1 3 1 4z" />
     <glyph glyph-name="uniE4D4" unicode="&#xe4d4;" horiz-adv-x="368" 
-d="M182 491h27c8 0 12 -7 12 -14c-10 -59 -41 -240 -200 -472c-2 -3 -6 -5 -10 -5c-7 0 -11 6 -11 12c0 2 0 4 1 6c122 224 161 401 169 463c1 6 6 10 12 10zM329 491h28c8 0 11 -7 11 -14c-10 -59 -40 -240 -199 -472c-2 -3 -6 -5 -10 -5c-7 0 -12 6 -12 13c0 1 0 3 1 5
-c122 224 162 401 170 463c1 6 5 10 11 10z" />
+d="M182 491h27c6 0 12 -6 12 -12v-2c-10 -59 -41 -240 -200 -472c-2 -3 -6 -5 -10 -5c-7 0 -11 6 -11 12c0 2 0 4 1 6c122 224 161 401 169 463c1 6 6 10 12 10zM329 491h28c6 0 11 -6 11 -12v-2c-10 -59 -40 -240 -199 -472c-2 -3 -6 -5 -10 -5c-7 0 -12 6 -12 13
+c0 1 0 3 1 5c122 224 162 401 170 463c1 6 5 10 11 10z" />
     <glyph glyph-name="uniE4E0" unicode="&#xe4e0;" horiz-adv-x="450" 
 d="M110 -250h-95c-9 0 -15 7 -15 15v470c0 8 6 15 15 15h95c8 0 15 -7 15 -15v-470c0 -8 -7 -15 -15 -15zM435 -250h-95c-9 0 -15 7 -15 15v470c0 8 6 15 15 15h95c8 0 15 -7 15 -15v-470c0 -8 -7 -15 -15 -15z" />
     <glyph glyph-name="uniE4E1" unicode="&#xe4e1;" horiz-adv-x="125" 
-d="M110 -250h-95c-8 0 -15 6 -15 15v470c0 8 7 15 15 15h95c8 0 15 -7 15 -15v-470c0 -9 -7 -15 -15 -15z" />
+d="M110 -250h-95c-8 0 -15 7 -15 15v470c0 8 7 15 15 15h95c8 0 15 -7 15 -15v-470c0 -8 -7 -15 -15 -15z" />
     <glyph glyph-name="uniE4E2" unicode="&#xe4e2;" horiz-adv-x="125" 
 d="M110 -11h-95c-8 0 -15 7 -15 15v243c0 8 7 15 15 15h95c9 0 15 -7 15 -15v-243c0 -8 -6 -15 -15 -15z" />
     <glyph glyph-name="uniE4E3" unicode="&#xe4e3;" 
@@ -909,72 +945,79 @@ d="M14 5h297c8 0 14 -6 14 -14v-108c0 -8 -6 -14 -14 -14h-297c-8 0 -14 6 -14 14v10
     <glyph glyph-name="uniE4E4" unicode="&#xe4e4;" 
 d="M0 10v108c0 14 0 14 14 14h297c14 0 14 0 14 -14v-108c0 -14 0 -14 -14 -14h-297c-14 0 -14 0 -14 14z" />
     <glyph glyph-name="uniE4E5" unicode="&#xe4e5;" horiz-adv-x="235" 
-d="M230 -166l2 -3c2 -3 3 -5 3 -8s-1 -6 -3 -9c-3 -4 -6 -5 -10 -5s-8 2 -8 2l-39 25c-8 5 -19 9 -32 9c-32 0 -56 -26 -56 -58c0 -18 7 -32 7 -32s32 -58 35 -63c1 -2 3 -5 3 -9s-2 -8 -7 -12c-2 -2 -4 -2 -6 -2c-7 0 -12 6 -12 6s-75 95 -96 127c-8 11 -11 25 -11 39
-c0 51 40 93 91 93c12 0 21 -2 25 -3l-112 139c-2 2 -3 5 -3 8v9c0 2 1 6 2 8l101 154c2 3 3 8 3 12c0 5 -1 9 -3 12l-76 104s-3 5 -3 11c0 3 1 7 5 10c3 3 5 3 8 3c6 0 10 -6 10 -6l162 -219c2 -2 3 -5 3 -8v-9c0 -2 -1 -5 -2 -7l-102 -154c-1 -2 -2 -6 -2 -9
-c0 -2 1 -5 2 -6l115 -142c3 -4 5 -6 6 -7z" />
+d="M230 -166l2 -3c2 -3 3 -5 3 -8s-1 -5 -3 -9c-3 -4 -6 -5 -10 -5s-8 2 -8 2l-39 25c-8 5 -19 9 -32 9s-27 -4 -39 -16c-13 -13 -17 -29 -17 -42c0 -18 7 -32 7 -32s32 -58 35 -63c1 -2 3 -5 3 -9s-2 -8 -7 -12c-2 -2 -4 -2 -6 -2c-7 0 -12 6 -12 6s-75 95 -96 127
+c-8 11 -11 25 -11 39c0 25 12 53 34 73c18 16 40 20 57 20c12 0 21 -2 25 -3l-112 139c-2 2 -3 5 -3 8v9c0 2 1 6 2 8l101 154c2 3 3 8 3 12c0 5 -1 9 -3 12l-76 104s-3 5 -3 11c0 3 1 7 5 10c3 2 5 3 8 3c6 0 10 -6 10 -6l162 -219c2 -2 3 -5 3 -8v-9c0 -2 -1 -5 -2 -7
+l-102 -154c-1 -2 -2 -6 -2 -9c0 -2 1 -5 2 -6l115 -142c3 -4 5 -6 6 -7z" />
     <glyph glyph-name="uniE4E6" unicode="&#xe4e6;" horiz-adv-x="276" 
-d="M267 203c6 -3 9 -7 9 -12c0 -2 0 -4 -1 -5l-140 -441l-27 8l114 356c-34 -37 -69 -62 -122 -62c-47 0 -100 25 -100 79c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -19 -7 -35 -18 -48c54 10 102 72 125 118c2 5 7 8 13 8c1 0 3 -1 4 -1z" />
+d="M267 203c6 -3 9 -7 9 -12c0 -2 0 -4 -1 -5l-140 -441l-27 8l114 356c-11 -12 -23 -24 -35 -33c-27 -20 -58 -29 -87 -29c-20 0 -40 5 -55 12c-26 11 -45 36 -45 67c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -19 -7 -35 -18 -48c16 3 32 10 45 20c45 33 76 92 80 98
+c2 5 7 8 13 8c1 0 3 -1 4 -1z" />
     <glyph glyph-name="uniE4E7" unicode="&#xe4e7;" horiz-adv-x="344" 
-d="M343 186l-195 -693l-27 7l102 365c-30 -39 -69 -65 -119 -66c-20 0 -37 2 -56 10c-26 9 -47 34 -47 64c0 40 30 74 70 74c39 0 73 -29 73 -69c0 -17 -6 -34 -17 -48c51 13 108 77 122 125l45 159c-30 -39 -69 -64 -119 -66c-47 0 -101 19 -103 75c0 39 30 72 69 74
-c39 0 74 -30 74 -69c0 -18 -5 -34 -17 -48c55 14 95 68 119 116c3 5 7 8 13 8c1 0 3 0 5 -1c6 -2 9 -7 9 -12c0 -2 0 -3 -1 -5z" />
+d="M343 186l-195 -693l-27 7l102 365c-30 -39 -69 -64 -119 -66c-20 0 -37 2 -56 10c-26 9 -47 34 -47 64c0 40 30 74 70 74c39 0 73 -29 73 -69c0 -17 -6 -34 -17 -48c51 13 108 78 122 125l45 159v0c-30 -39 -69 -64 -119 -66c-19 0 -38 2 -56 10c-26 10 -46 35 -47 65
+c0 39 29 72 69 74c39 0 74 -30 74 -69c0 -18 -5 -34 -17 -48c55 14 95 68 119 116c3 5 7 8 13 8c1 0 3 0 5 -1c6 -2 9 -7 9 -12c0 -2 0 -3 -1 -5z" />
     <glyph glyph-name="uniE4E8" unicode="&#xe4e8;" horiz-adv-x="391" 
-d="M151 49c-45 0 -90 29 -90 76c0 40 31 71 70 71s72 -27 72 -67c0 -18 -3 -33 -15 -48c56 14 99 84 119 134l39 161c-28 -39 -68 -67 -117 -70c-5 -1 -9 -1 -13 -1c-45 3 -92 23 -92 76c0 42 33 72 72 72s70 -29 70 -67c0 -18 -3 -33 -15 -48c49 12 94 71 113 113
-c3 5 7 9 13 9c1 0 3 0 4 -1c6 -2 10 -6 10 -12c0 -1 0 -3 -1 -4l-232 -950l-27 6l91 371c-30 -41 -72 -70 -125 -70s-97 25 -97 77c0 40 32 70 71 70s71 -26 71 -66c0 -18 -3 -34 -14 -48c58 16 96 83 118 134l37 152c-4 -7 -41 -70 -132 -70z" />
+d="M151 49c-45 0 -90 29 -90 76c0 40 31 71 70 71s72 -27 72 -67c0 -18 -3 -33 -15 -48c56 14 99 84 119 134l39 161c-28 -39 -68 -67 -117 -70c-5 -1 -9 -1 -13 -1c-16 1 -30 3 -43 8c-27 9 -49 38 -49 68c0 42 33 72 72 72s70 -29 70 -67c0 -18 -3 -33 -15 -48
+c48 12 94 71 113 113c3 5 7 9 13 9c1 0 3 0 4 -1c6 -2 10 -6 10 -12c0 -1 0 -3 -1 -4l-232 -950l-27 6l91 372c-30 -42 -72 -71 -125 -71s-97 25 -97 77c0 40 32 70 71 70s71 -26 71 -66c0 -18 -3 -34 -14 -48c58 16 96 83 118 135l37 151c-4 -7 -41 -70 -132 -70z" />
     <glyph glyph-name="uniE4E9" unicode="&#xe4e9;" horiz-adv-x="423" 
-d="M144 -752l78 377c-3 -8 -37 -75 -130 -75c-75 0 -92 48 -92 75s20 71 71 71c50 0 71 -44 71 -71c0 -16 -5 -30 -13 -41c15 5 30 12 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -75 -129 -75s-93 56 -93 76c0 19 16 71 72 71c55 0 71 -48 71 -71c0 -22 -5 -30 -13 -42
-c59 20 90 83 112 136l33 159c-4 -8 -41 -75 -129 -75c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-29 -45 -73 -75 -129 -75c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72
-c0 -14 -5 -29 -14 -41c16 5 31 13 43 24c39 36 62 85 66 92s6 10 15 10c1 0 2 0 3 -1c6 -1 10 -6 10 -12c0 -1 0 -2 -1 -3c-2 -8 -226 -1086 -251 -1206z" />
+d="M144 -752l78 377c-3 -8 -37 -75 -130 -75c-75 0 -92 48 -92 75s20 71 71 71c50 0 71 -44 71 -71c0 -16 -5 -30 -13 -41c15 5 30 13 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -75 -129 -75s-93 57 -93 76s16 71 71 71c56 0 72 -48 72 -71c0 -22 -5 -30 -13 -42
+c15 5 30 13 43 25c35 32 62 94 69 111l33 159c-4 -8 -41 -75 -129 -75c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -14 -13 -19 -31 -37c-19 -19 -57 -38 -98 -38c-42 0 -93 19 -93 75
+c0 43 34 72 71 72s72 -30 72 -72c0 -14 -5 -30 -14 -41c16 5 31 13 43 24c39 36 62 85 66 92s6 10 14 10c2 0 3 0 4 -1c6 -1 10 -6 10 -12c0 -1 -1 -2 -1 -4c-2 -7 -226 -1085 -251 -1205z" />
     <glyph glyph-name="uniE4EA" unicode="&#xe4ea;" horiz-adv-x="475" 
 d="M470 714c4 -3 5 -6 5 -9c0 -1 -1 -4 -1 -5c-2 -8 -279 -1339 -304 -1459l-27 6l78 374c-8 -15 -43 -72 -129 -72c-75 0 -93 48 -93 75s21 72 72 72c50 0 71 -44 71 -72c0 -16 -5 -29 -13 -41c15 5 30 13 43 24c24 23 57 73 69 109l33 162c-3 -8 -37 -75 -130 -75
-c-75 0 -92 48 -92 75s20 72 71 72c50 0 71 -45 71 -72c0 -16 -5 -30 -13 -41c15 5 30 13 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -74 -129 -74s-93 56 -93 75s16 71 72 71c55 0 71 -48 71 -70c0 -23 -5 -30 -13 -42c59 20 90 81 112 135l33 159c-4 -8 -41 -75 -129 -75
-c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-29 -45 -73 -75 -129 -75c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72c0 -14 -5 -29 -14 -41c53 17 86 70 109 117c4 6 7 9 15 9c1 0 5 -1 8 -3
-z" />
+c-75 0 -92 48 -92 75s20 72 71 72c50 0 71 -45 71 -72c0 -16 -5 -30 -13 -41c15 5 30 13 43 24c26 24 62 80 71 116l31 150c-4 -8 -45 -74 -129 -74s-93 56 -93 75s16 71 71 71c56 0 72 -48 72 -71c0 -22 -5 -30 -13 -41c15 4 30 12 43 24c35 33 62 94 69 111l33 159
+c-4 -8 -41 -75 -129 -75c-71 0 -93 43 -93 77s27 70 71 70s72 -37 72 -72s-5 -29 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -14 -13 -19 -31 -37c-19 -19 -57 -38 -98 -38c-42 0 -93 19 -93 75c0 43 34 72 71 72s72 -30 72 -72c0 -14 -5 -29 -14 -41
+c16 5 31 13 43 24c39 36 62 85 66 92s7 10 14 10c2 0 6 -1 9 -3z" />
     <glyph glyph-name="uniE4EB" unicode="&#xe4eb;" horiz-adv-x="526" 
-d="M516 723c6 -1 10 -7 11 -13c0 -1 -1 -2 -1 -3l-356 -1705l-27 6l79 375c-31 -40 -61 -67 -115 -73c-5 0 -10 -1 -15 -1c-42 0 -87 21 -92 68c0 41 21 74 64 79c40 0 73 -22 78 -64c0 -19 -2 -33 -13 -49c55 18 95 84 112 136l33 157c-27 -40 -64 -69 -114 -74
-c-48 0 -101 9 -107 68c-1 3 -1 5 -1 8c1 36 28 66 64 70c39 0 75 -22 78 -64c1 -2 1 -5 1 -7c0 -15 -5 -30 -14 -41c16 4 31 12 43 24c37 33 65 96 70 112l33 155v3c-28 -40 -65 -69 -115 -74c-5 0 -10 -1 -15 -1c-43 0 -87 21 -92 68c-1 3 -1 5 -1 8c0 36 28 67 64 71
-c41 0 74 -21 79 -64c0 -19 -2 -32 -13 -49c57 19 92 83 113 135c0 1 1 5 1 5l31 150c-28 -40 -63 -68 -114 -73c-4 -1 -9 -1 -13 -1c-15 0 -29 2 -43 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 36 27 67 64 71c3 1 5 1 7 1c37 0 68 -27 72 -64c0 -19 -2 -33 -13 -49
-c15 5 30 13 43 24c35 33 61 89 68 107l33 158c-28 -40 -63 -68 -114 -73c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -49 31 -52 61c0 39 22 75 64 78c2 1 5 1 7 1c36 0 68 -27 71 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c58 18 93 84 113 137l33 154l-1 -1
-c-9 -13 -20 -26 -31 -37c-25 -22 -55 -34 -83 -37c-5 0 -10 -1 -15 -1c-42 0 -88 21 -93 68c0 40 21 74 64 79c40 0 73 -22 78 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c16 5 31 13 43 25c39 35 63 81 66 92c3 8 9 9 17 9z" />
+d="M515 723c7 -1 11 -7 11 -13c1 -1 0 -2 0 -3l-356 -1705l-27 6l78 375c-9 -13 -19 -26 -30 -36c-25 -22 -55 -34 -84 -37c-5 0 -10 -1 -15 -1c-14 0 -28 3 -40 7c-28 8 -49 31 -52 61v8c0 36 27 67 63 71h8c36 0 67 -27 71 -64v-8c0 -15 -5 -29 -13 -41c15 5 30 13 43 25
+c36 32 63 93 69 111l33 157c-9 -13 -20 -26 -31 -36c-25 -23 -55 -35 -83 -37c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 6c-27 8 -48 32 -51 62c-1 3 -1 6 -1 8c1 36 28 66 64 70h7c36 1 68 -27 71 -63c1 -3 1 -6 1 -8c0 -15 -5 -30 -14 -41c16 5 31 13 43 24
+c37 33 64 97 70 113l32 154l1 3c-9 -13 -20 -26 -32 -37c-25 -22 -55 -34 -83 -37c-5 0 -10 -1 -15 -1c-15 0 -29 3 -41 7c-27 8 -48 31 -51 61c-1 3 -1 5 -1 8c0 36 28 67 64 71h8c36 0 67 -27 71 -64v-4v-5c0 -14 -5 -28 -13 -40c15 5 30 13 43 25c39 35 66 100 69 110
+c1 1 2 5 2 5l31 150c-9 -13 -20 -26 -31 -36c-25 -23 -55 -34 -83 -37c-4 -1 -9 -1 -13 -1h-6c-13 0 -26 3 -37 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 36 27 67 64 71c3 0 5 1 7 1c37 0 68 -28 71 -64c1 -3 1 -6 1 -8c0 -15 -5 -30 -13 -41c15 5 30 13 43 24
+c35 33 61 89 68 107l33 158c-9 -13 -20 -26 -31 -36c-25 -23 -55 -34 -83 -37c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-28 7 -49 31 -52 61v7c0 36 27 67 64 71c2 1 5 1 7 1c36 0 67 -27 71 -64c1 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c16 5 31 13 43 24c37 34 64 97 70 113
+l33 154l-1 -1c-9 -13 -20 -26 -31 -37c-25 -23 -55 -34 -83 -37c-5 -1 -10 -1 -15 -1c-15 0 -29 3 -41 7c-27 8 -49 31 -52 61v7c0 37 27 68 64 72h7c36 0 67 -27 71 -64c0 -3 1 -5 1 -8c0 -15 -5 -29 -14 -41c15 5 30 13 43 25c39 35 63 81 66 92c2 5 7 9 12 9h4z" />
     <glyph glyph-name="uniE4EC" unicode="&#xe4ec;" horiz-adv-x="579" 
-d="M566 967c10 0 13 -8 13 -16c-2 -7 -384 -1835 -409 -1955l-27 6l77 371c-10 -18 -46 -69 -127 -69c-75 0 -93 48 -93 75c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c52 17 91 77 109 126l34 161c-10 -17 -46 -70 -128 -70c-75 0 -93 48 -93 75
-c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c52 17 92 79 110 128l34 163c-8 -14 -43 -72 -129 -72c-75 0 -93 48 -93 75c0 28 21 72 71 72c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c53 18 95 83 112 133l33 156c-3 -7 -37 -75 -130 -75
-c-75 0 -93 48 -93 75c0 28 21 72 72 72c50 0 71 -44 71 -72c0 -15 -5 -29 -13 -41c53 18 101 89 114 140l31 147c-4 -7 -45 -74 -129 -74s-93 56 -93 75c0 20 15 72 71 72s72 -49 72 -71s-5 -30 -13 -42c15 5 30 13 43 24c35 33 62 94 69 112l33 158c-4 -7 -41 -74 -129 -74
-c-71 0 -93 42 -93 76c0 35 27 70 71 70s72 -37 72 -72c0 -21 -7 -34 -14 -41c16 5 31 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -13 -13 -18 -31 -37c-19 -18 -57 -38 -98 -38c-42 0 -93 19 -93 75c0 44 34 72 71 72s72 -29 72 -72c0 -13 -5 -29 -14 -41
-c52 17 86 71 109 117c4 6 7 9 14 9z" />
+d="M566 967c10 0 13 -9 13 -12v-4c-2 -8 -384 -1835 -409 -1955l-27 6l77 371c-11 -18 -46 -69 -127 -69c-75 0 -93 48 -93 76c0 27 21 71 71 71c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c15 5 30 13 43 25c22 21 52 66 66 101l34 161c-10 -17 -46 -70 -128 -70
+c-75 0 -93 48 -93 76c0 27 21 71 71 71c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c15 5 30 13 43 25c23 21 54 68 67 103l34 163c-8 -14 -43 -72 -129 -72c-75 0 -93 48 -93 76c0 27 21 71 71 71c51 0 72 -44 72 -72c0 -15 -5 -29 -13 -41c15 5 30 13 43 25
+c24 22 57 73 68 108l34 156c-3 -8 -37 -75 -130 -75c-75 0 -93 48 -93 75s21 72 72 72c50 0 71 -44 71 -72c0 -16 -5 -29 -13 -41c15 5 30 13 43 24c26 24 62 81 71 116l31 147c-5 -8 -45 -74 -129 -74s-93 56 -93 75s15 72 71 72s72 -49 72 -71c0 -23 -5 -30 -13 -42
+c15 5 30 13 43 24c35 33 62 94 69 112l33 158c-4 -7 -41 -74 -129 -74c-71 0 -93 42 -93 76s27 70 71 70s72 -37 72 -72c0 -21 -7 -34 -14 -41c16 5 30 13 43 25c37 33 64 96 70 112l33 156l-1 -1c-9 -14 -13 -19 -31 -37c-19 -19 -57 -38 -98 -38c-42 0 -93 19 -93 75
+c0 43 34 72 71 72s71 -30 71 -72c0 -14 -5 -29 -13 -41c15 5 30 13 43 25c39 35 62 84 66 92c3 6 7 9 14 9z" />
     <glyph glyph-name="uniE4ED" unicode="&#xe4ed;" horiz-adv-x="634" 
-d="M558 986l33 156c-27 -41 -65 -70 -115 -75c-4 -1 -9 -1 -13 -1c-45 0 -88 17 -95 68c0 40 22 73 64 78c39 0 75 -21 78 -63c1 -3 1 -6 1 -8c0 -15 -5 -30 -14 -41c16 5 31 13 43 24c39 36 63 82 66 92c2 6 7 9 13 10h4c6 -2 10 -7 11 -13c0 -1 0 -2 -1 -4l-462 -2213
-l-27 6l79 376c-28 -41 -64 -68 -115 -73c-5 -1 -10 -1 -16 -1c-14 0 -28 2 -39 6c-28 8 -49 32 -52 62c0 40 22 73 64 78c39 0 73 -21 78 -63c0 -18 -2 -34 -13 -49c59 20 92 83 113 138l32 152c-28 -40 -64 -68 -114 -73h-13c-14 0 -29 1 -42 6c-28 8 -49 31 -52 61
-c0 3 -1 5 -1 8c0 36 28 67 64 71c41 0 74 -21 79 -64c0 -19 -2 -33 -13 -49c56 19 94 85 112 137l33 155c-10 -14 -20 -26 -31 -37c-25 -22 -55 -34 -83 -37h-13c-15 0 -29 1 -43 6c-27 8 -49 32 -52 61c0 41 21 74 64 79c40 0 73 -22 78 -64c0 -19 -2 -33 -13 -49
-c57 19 93 83 113 136l32 158c-27 -41 -64 -69 -114 -74c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 37 27 68 64 71c3 1 5 1 8 1c36 0 67 -27 71 -64c0 -19 -2 -33 -13 -49c15 5 30 13 43 24c36 34 64 97 69 113l33 158
-c-27 -42 -65 -69 -115 -74c-4 -1 -8 -1 -13 -1c-44 0 -89 18 -94 68c0 39 21 73 63 78c40 0 74 -20 79 -63c0 -18 -2 -34 -13 -49c52 17 102 84 113 135c9 39 32 155 32 155c-26 -41 -64 -69 -114 -74c-5 0 -10 -1 -15 -1c-42 0 -87 21 -92 68c0 3 -1 5 -1 8
-c0 36 28 67 64 71c41 0 74 -21 79 -64c0 -19 -2 -33 -13 -49c55 18 95 84 112 136l33 159c-27 -41 -64 -69 -114 -74c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 3 -1 6 -1 9c1 35 28 66 64 69c3 1 5 1 8 1c36 0 67 -27 71 -64c0 -19 -2 -33 -13 -49
-c15 5 30 13 43 24c36 34 64 97 69 113z" />
+d="M558 986l33 156s-14 -21 -32 -38c-18 -18 -55 -35 -83 -38h-13c-16 0 -30 2 -43 6c-27 8 -48 32 -52 62v7c0 36 27 67 64 71h7c36 0 67 -27 71 -64c1 -2 1 -5 1 -7c0 -16 -5 -30 -14 -41c16 4 31 13 43 24c39 36 63 82 66 92c2 6 7 9 12 10h5c6 -2 10 -7 11 -13
+c0 -1 -1 -2 -1 -4l-462 -2213l-27 6l79 376c-10 -13 -20 -26 -31 -36c-25 -23 -55 -34 -84 -37c-5 -1 -10 -1 -16 -1c-14 0 -28 2 -39 7c-28 7 -49 31 -52 61v7c0 36 27 67 63 71h8c36 1 67 -27 71 -63v-8c0 -15 -5 -30 -13 -41c15 5 30 13 43 24c37 34 65 101 70 114
+l32 152c-9 -13 -19 -25 -31 -36c-24 -22 -54 -34 -83 -37h-13h-6c-13 0 -26 2 -37 6c-27 8 -48 32 -51 61c0 3 -1 5 -1 8c0 36 28 67 64 71h8c36 0 67 -27 71 -64v-7c0 -15 -5 -30 -13 -42c15 5 30 13 43 25c35 32 63 95 69 112l33 155c-10 -14 -20 -26 -31 -37
+c-25 -22 -55 -34 -84 -37h-12h-6c-14 0 -26 2 -37 6c-28 8 -49 32 -52 61v8c0 36 27 67 64 71h7c36 0 67 -27 71 -64v-7c0 -16 -5 -30 -13 -42c15 5 30 13 43 25c36 32 63 93 69 111l33 158c-9 -14 -19 -27 -31 -37c-25 -23 -55 -34 -83 -37c-5 -1 -10 -1 -15 -1
+c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61c-1 2 -1 5 -1 7c0 36 27 67 64 71c3 1 5 1 8 1c36 0 67 -28 70 -64c1 -2 1 -3 1 -5v-3c0 -15 -5 -29 -14 -41c16 5 31 13 43 24c37 34 65 97 70 113l33 158c-9 -14 -20 -27 -31 -37c-25 -23 -55 -35 -84 -37c-4 -1 -8 -1 -13 -1
+c-15 0 -30 2 -42 6c-28 8 -49 32 -52 62v7c-1 36 27 67 63 71h8c36 0 67 -27 71 -63v-8c0 -15 -5 -30 -13 -41c15 5 30 12 43 24c39 35 65 87 70 111c9 39 32 155 32 155c-9 -14 -19 -27 -31 -37c-24 -22 -54 -34 -83 -37c-5 0 -10 -1 -15 -1c-15 0 -28 3 -40 7
+c-28 8 -49 31 -52 61c0 3 -1 5 -1 8c0 36 28 67 64 71h8c36 0 67 -27 71 -64v-7c0 -15 -5 -30 -13 -42c15 5 30 13 43 25c36 32 63 93 69 111l33 159c-9 -14 -19 -27 -31 -37c-25 -23 -55 -34 -83 -37c-5 -1 -10 -1 -15 -1c-15 0 -29 2 -41 7c-27 7 -48 31 -51 61
+c-1 3 -1 6 -1 9c1 35 28 66 64 69c3 1 5 1 8 1c36 0 67 -28 71 -64v-5v-3c0 -15 -5 -29 -13 -41c15 5 30 13 43 24c36 34 64 97 69 113z" />
     <glyph glyph-name="uniE4F2" unicode="&#xe4f2;" horiz-adv-x="276" 
-d="M9 203c1 0 3 1 4 1c6 0 11 -3 13 -8c4 -6 35 -65 80 -98c14 -10 29 -17 45 -20c-11 13 -18 29 -18 48c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -54 -53 -79 -100 -79c-52 0 -89 26 -122 62l114 -356l-26 -8l-141 441c-1 1 -1 3 -1 5c0 5 3 9 9 12z" />
+d="M9 203c1 0 3 1 4 1c6 0 11 -3 13 -8c4 -6 35 -65 80 -98c14 -10 29 -17 45 -20c-11 13 -18 29 -18 48c0 39 32 71 72 71c39 0 71 -32 71 -71c0 -31 -19 -56 -45 -67c-15 -7 -34 -12 -55 -12c-28 0 -60 9 -87 29c-12 9 -24 21 -35 33l114 -356l-27 -8l-140 440
+c-1 2 -1 4 -1 6c0 5 3 9 9 12z" />
     <glyph glyph-name="uniE4F3" unicode="&#xe4f3;" horiz-adv-x="229" 
-d="M229 264v-28h-62v-222h62v-28h-229v28h63v222h-63v28h229z" />
+d="M229 264v-28h-62v-222h62v-28h-76h-77h-76v28h63v222h-63v28h76h77h76z" />
     <glyph glyph-name="uniE4F4" unicode="&#xe4f4;" 
-d="M-139 -14v28h603v-28h-139v-94c0 -8 -5 -14 -13 -14h-299c-8 0 -13 6 -13 14v94h-139z" />
+d="M312 14h152v-28h-139v-94c0 -8 -5 -14 -13 -14h-299c-8 0 -13 6 -13 14v94h-139v28h152h299z" />
     <glyph glyph-name="uniE4F5" unicode="&#xe4f5;" 
-d="M464 14v-28h-603v28h139v94c0 8 5 14 13 14h299c8 0 13 -6 13 -14v-94h139z" />
+d="M464 14v-28h-152h-299h-152v28h139v94c0 8 5 14 13 14h299c8 0 13 -6 13 -14v-94h139z" />
     <glyph glyph-name="uniE510" unicode="&#xe510;" horiz-adv-x="332" 
-d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59
-c8 -5 14 -8 47 -25c32 24 45 46 45 80zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z" />
+d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69
+c0 29 -16 50 -54 72c-5 3 -5 3 -28 14c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z" />
     <glyph glyph-name="uniE511" unicode="&#xe511;" horiz-adv-x="926" 
-d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM496 425l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28
-c41 0 79 81 79 116c0 10 -1 12 -21 31c-10 9 -15 17 -15 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -75 -55 -198 -142 -198c-43 0 -76 28 -76 72c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM825 418h77l-48 -164c-5 -18 -5 -19 -5 -22
-c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-27 0 -42 17 -42 42c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25
-c32 24 45 46 45 80zM773 397c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145c0 21 -12 35 -30 35zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z" />
+d="M496 425l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c16 0 33 12 49 36c19 30 30 58 30 80c0 10 -1 12 -21 31c-10 9 -15 17 -15 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -36 -15 -85 -36 -123c-28 -49 -65 -75 -106 -75c-20 0 -40 7 -55 20
+c-14 12 -21 30 -21 52c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM825 418h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-1 4 -2 4 -2 15
+c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM720 351c-14 -30 -24 -69 -24 -95c0 -24 11 -39 30 -39s37 16 51 48c15 32 26 72 26 97c0 21 -12 35 -30 35c-21 0 -38 -14 -53 -46zM304 133c0 -78 -69 -133 -169 -133
+c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 29 -16 50 -54 72c-5 3 -5 3 -28 14
+c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z" />
     <glyph glyph-name="uniE512" unicode="&#xe512;" horiz-adv-x="909" 
-d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59
-c8 -5 14 -8 47 -25c32 24 45 46 45 80zM479 244l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c40 0 79 83 79 117c0 10 -2 12 -22 31c-10 9 -14 16 -14 27c0 19 13 32 34 32c23 0 39 -17 39 -43c0 -74 -56 -199 -142 -199c-43 0 -76 28 -76 72c0 11 3 28 6 38
-l16 54c5 18 7 28 7 33c0 12 -6 15 -30 15h-12l3 23zM808 237h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153
-c29 0 50 -10 62 -30zM756 217c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144c0 21 -12 36 -30 36zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z" />
+d="M479 244l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c16 0 33 13 49 37c19 30 30 58 30 80c0 10 -2 12 -22 31c-10 9 -14 16 -14 27c0 19 13 32 34 32c23 0 39 -17 39 -43c0 -36 -15 -85 -36 -123c-28 -49 -65 -76 -106 -76c-20 0 -40 7 -55 20
+c-14 12 -21 30 -21 52c0 11 3 28 6 38l16 54c5 18 7 28 7 33c0 12 -6 15 -30 15h-12l3 23zM808 237h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16
+c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153c29 0 50 -10 62 -30zM703 170c-14 -29 -24 -69 -24 -95c0 -24 11 -38 30 -38s37 15 51 47c15 32 26 72 26 97c0 21 -12 36 -30 36c-21 0 -38 -15 -53 -47zM304 133c0 -78 -69 -133 -169 -133
+c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 29 -16 50 -54 72c-5 3 -5 3 -28 14
+c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z" />
     <glyph glyph-name="uniE513" unicode="&#xe513;" horiz-adv-x="952" 
-d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59
-c8 -5 14 -8 47 -25c32 24 45 46 45 80zM506 371l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -86 -77 -158 -161 -158c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM851 237h77l-48 -163c-5 -18 -5 -20 -5 -23
-c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-30 0 -42 17 -42 43c-23 -30 -46 -43 -80 -43c-50 0 -86 37 -86 89c0 79 68 153 141 153c29 0 50 -10 62 -30zM798 217c-50 0 -76 -104 -76 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144
-c0 21 -13 36 -31 36zM496 209c-48 0 -78 -111 -78 -148c0 -22 13 -38 32 -38c48 0 77 113 77 150c0 21 -13 36 -31 36zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92z" />
+d="M506 371l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -41 -21 -86 -55 -117c-30 -28 -66 -41 -106 -41c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM446 164c-15 -31 -28 -78 -28 -103c0 -22 13 -38 32 -38
+s38 19 54 55c12 27 23 73 23 95c0 21 -13 36 -31 36c-19 0 -35 -14 -50 -45zM851 237h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -37 11 -41 27c-1 4 -1 5 -1 16
+c-23 -30 -46 -43 -80 -43c-50 0 -86 37 -86 89c0 79 68 153 141 153c29 0 50 -10 62 -30zM746 170c-14 -29 -24 -69 -24 -95c0 -24 11 -38 30 -38s37 15 51 47c15 32 26 72 26 97c0 21 -13 36 -31 36c-21 0 -37 -15 -52 -47zM304 133c0 -78 -69 -133 -169 -133
+c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 29 -16 50 -54 72c-5 3 -5 3 -28 14
+c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z" />
     <glyph glyph-name="uniE514" unicode="&#xe514;" horiz-adv-x="627" 
 d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15
 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47
@@ -982,135 +1025,140 @@ c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16
     <glyph glyph-name="uniE515" unicode="&#xe515;" horiz-adv-x="1422" 
 d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15
 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47
-c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM782 416l-14 -60c31 40 61 60 92 60c36 0 55 -22 55 -55c32 38 58 55 87 55c33 0 54 -21 54 -51
-c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29
+c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM782 416l-14 -60c31 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -6 2 -21c32 38 58 55 87 55
+c33 0 54 -21 54 -51c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29
 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -69h-77l47 158c5 17 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM1321 409h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8
-c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 4 -2 15c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM1269 388c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145
-c0 21 -12 35 -30 35z" />
+c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-2 4 -2 4 -2 15c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 67 153 140 153c29 0 50 -10 62 -30zM1216 342c-14 -30 -24 -69 -24 -95c0 -24 11 -39 30 -39
+s37 16 51 48c15 32 26 72 26 97c0 21 -12 35 -30 35c-21 0 -38 -14 -53 -46z" />
     <glyph glyph-name="uniE516" unicode="&#xe516;" horiz-adv-x="1398" 
 d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15
 c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47
-c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM758 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 58 54 87 54c32 0 54 -20 54 -51
-c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28
+c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM758 235l-14 -60c30 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -5 2 -20c32 38 58 54 87 54
+c32 0 54 -20 54 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28
 c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1297 228h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8
-c8 0 33 27 51 55l19 -12c-22 -36 -57 -84 -103 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153c29 0 50 -10 62 -30zM1245 208c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38c48 0 77 107 77 144
-c0 21 -12 36 -30 36z" />
+c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 67 153 140 153c29 0 50 -10 62 -30zM1192 161c-14 -29 -24 -69 -24 -95c0 -24 11 -38 30 -38
+s37 15 51 47c15 32 26 72 26 97c0 21 -12 36 -30 36c-21 0 -38 -15 -53 -47z" />
     <glyph glyph-name="uniE517" unicode="&#xe517;" horiz-adv-x="681" 
-d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109
-c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21
+d="M633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109
+c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21
 c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z" />
     <glyph glyph-name="uniE518" unicode="&#xe518;" horiz-adv-x="1483" 
-d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109
-c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21
-c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM842 416l-14 -60c30 40 61 60 92 60c36 0 55 -22 55 -55
-c32 38 59 55 88 55c32 0 53 -21 53 -51c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12
-c-11 0 -26 -11 -41 -29c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 27 7 32c0 12 -6 15 -30 15h-12l4 24zM1381 409h77l-48 -164c-5 -18 -5 -19 -5 -22
-c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-22 -35 -59 -84 -104 -84c-27 0 -42 17 -42 42c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88c0 79 68 153 141 153c29 0 49 -10 61 -30zM1329 388c-51 0 -77 -101 -77 -141c0 -24 11 -39 30 -39c47 0 77 108 77 145
-c0 21 -12 35 -30 35z" />
+d="M842 416l-14 -60c30 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -6 2 -21c32 38 59 55 88 55c32 0 53 -21 53 -51c0 -15 -4 -32 -11 -53l-29 -81c-1 -4 -3 -10 -3 -12c0 -3 5 -6 9 -6c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80
+c-27 0 -48 18 -48 41c0 11 3 24 12 49l24 69c4 12 7 24 7 30c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 57 15 67c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 27 7 32
+c0 12 -6 15 -30 15h-12l4 24zM1381 409h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-8 -13 -23 -33 -33 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-1 4 -2 4 -2 15c-23 -30 -46 -42 -80 -42c-50 0 -85 36 -85 88
+c0 79 68 153 141 153c29 0 49 -10 61 -30zM1276 342c-14 -30 -24 -69 -24 -95c0 -24 11 -39 30 -39s37 16 51 48c15 32 26 72 26 97c0 21 -12 35 -30 35c-21 0 -38 -14 -53 -46zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91
+c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57
+zM300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109
+c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z" />
     <glyph glyph-name="uniE519" unicode="&#xe519;" horiz-adv-x="1483" 
-d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109
-c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21
-c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM842 235l-14 -60c31 40 61 60 92 60c33 0 56 -22 56 -54
-c32 38 58 54 87 54c33 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12
-c-11 0 -26 -11 -41 -29c-19 -23 -32 -51 -49 -110l-17 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-11l3 23zM1381 228h77l-48 -163c-5 -18 -5 -20 -5 -23
-c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-22 -35 -59 -84 -104 -84c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 68 153 141 153c29 0 49 -10 61 -30zM1329 208c-51 0 -77 -103 -77 -142c0 -24 11 -38 30 -38
-c48 0 77 107 77 144c0 21 -12 36 -30 36z" />
+d="M842 235l-14 -60c31 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 3 -5 3 -20c32 38 58 54 87 54c33 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80
+c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -11 -41 -29c-19 -23 -32 -51 -49 -110l-17 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33
+c0 12 -6 15 -30 15h-11l3 23zM1381 228h77l-48 -163c-5 -18 -5 -20 -5 -23c0 -4 4 -8 7 -8c8 0 33 27 51 55l20 -12c-8 -13 -23 -33 -33 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-2 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89
+c0 79 68 153 141 153c29 0 49 -10 61 -30zM1276 161c-14 -29 -24 -69 -24 -95c0 -24 11 -38 30 -38s37 15 51 47c15 32 26 72 26 97c0 21 -12 36 -30 36c-21 0 -38 -15 -53 -47zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91
+c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57
+zM300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109
+c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z" />
     <glyph glyph-name="uniE51A" unicode="&#xe51a;" horiz-adv-x="160" 
-d="M160 -13v-30c-44 23 -71 45 -99 81c-34 43 -61 122 -61 176v1c0 112 63 206 160 257v-31c-33 -23 -47 -41 -61 -77c-16 -40 -24 -90 -24 -149c0 -66 10 -122 29 -162c13 -29 27 -45 56 -66z" />
+d="M160 -13v-30c-44 23 -71 45 -99 81c-34 43 -61 122 -61 176v1c0 69 25 134 70 187c27 31 50 49 90 70v-31c-33 -23 -47 -41 -61 -77c-16 -40 -24 -90 -24 -149c0 -66 10 -122 29 -162c13 -29 27 -45 56 -66z" />
     <glyph glyph-name="uniE51B" unicode="&#xe51b;" horiz-adv-x="160" 
-d="M0 442v30c44 -23 71 -45 99 -82c34 -43 61 -121 61 -175c0 -112 -62 -207 -160 -258v30c33 23 47 42 61 78c16 40 24 90 24 150c0 66 -10 121 -29 161c-13 29 -27 45 -56 66z" />
+d="M0 442v30c44 -23 71 -45 99 -82c34 -43 61 -121 61 -175c0 -69 -25 -135 -70 -188c-27 -31 -50 -49 -90 -70v30c33 23 47 42 61 78c16 40 24 90 24 150c0 66 -10 121 -29 161c-13 29 -27 45 -56 66z" />
     <glyph glyph-name="uniE51C" unicode="&#xe51c;" horiz-adv-x="866" 
-d="M304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 62 53 95 104 115c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM265 336c0 42 -25 67 -65 67s-68 -26 -68 -63c0 -26 10 -40 41 -59
-c8 -5 14 -8 47 -25c32 24 45 46 45 80zM765 348l-45 -153c23 19 39 26 63 26c47 0 83 -37 83 -85c0 -86 -75 -157 -160 -157c-61 0 -100 31 -100 78c0 16 1 17 11 52l48 161c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 23zM479 221l-36 -122c-11 -45 -12 -47 -12 -57
-c0 -15 14 -28 28 -28c41 0 79 81 79 116c0 10 -2 12 -22 31c-10 9 -14 17 -14 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -75 -55 -198 -142 -198c-43 0 -76 28 -76 72c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 16 -30 16h-12l4 23zM73 101c0 -43 29 -72 74 -72
-s79 30 79 69c0 47 -46 69 -82 86c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM755 186c-50 0 -79 -111 -79 -149c0 -22 14 -37 33 -37c48 0 77 113 77 150c0 21 -13 36 -31 36z" />
+d="M479 221l-36 -122c-11 -45 -12 -47 -12 -57c0 -15 14 -28 28 -28c16 0 33 12 49 36c19 30 30 58 30 80c0 10 -2 12 -22 31c-10 9 -14 17 -14 28c0 19 13 32 34 32c23 0 39 -18 39 -44c0 -36 -15 -85 -36 -123c-28 -49 -65 -75 -106 -75c-20 0 -40 7 -55 20
+c-14 12 -21 30 -21 52c0 11 3 28 6 38l16 54c5 18 7 27 7 32c0 12 -6 16 -30 16h-12l4 23zM765 348l-45 -153c23 19 39 26 63 26c47 0 83 -37 83 -85c0 -41 -20 -85 -54 -116c-30 -28 -66 -41 -106 -41c-61 0 -100 31 -100 78c0 16 1 17 11 52l48 161c6 23 7 28 7 33
+c0 12 -5 15 -30 15h-12l4 23zM704 141c-15 -31 -28 -79 -28 -104c0 -22 14 -37 33 -37s38 19 54 55c12 27 23 73 23 95c0 21 -13 36 -31 36c-19 0 -36 -14 -51 -45zM304 133c0 -78 -69 -133 -169 -133c-81 0 -135 39 -135 98c0 31 17 63 45 84c16 12 34 21 59 31
+c-32 28 -45 53 -45 90c0 76 63 130 151 130c72 0 122 -38 122 -95c0 -45 -28 -77 -88 -99c39 -25 60 -63 60 -106zM73 101c0 -43 29 -72 74 -72s79 30 79 69c0 29 -16 50 -54 72c-5 3 -5 3 -28 14c-7 4 -8 4 -17 9c-35 -20 -54 -53 -54 -92zM265 336c0 42 -25 67 -65 67
+s-68 -26 -68 -63c0 -26 10 -40 41 -59c8 -5 14 -8 47 -25c32 24 45 46 45 80z" />
     <glyph glyph-name="uniE51D" unicode="&#xe51d;" horiz-adv-x="1354" 
-d="M279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15
-c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47
-c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30zM1253 362l-45 -152c23 19 39 25 63 25c47 0 83 -36 83 -84c0 -86 -75 -158 -160 -158
-c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 24zM758 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 58 54 87 54c32 0 54 -20 54 -51c0 -15 -4 -31 -11 -52l-29 -82c-2 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7
-c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12
-c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1243 200c-49 0 -79 -110 -79 -148c0 -22 14 -38 33 -38c48 0 77 113 77 150c0 21 -13 36 -31 36z" />
+d="M758 235l-14 -60c30 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -5 2 -20c32 38 58 54 87 54c32 0 54 -20 54 -51c0 -15 -4 -31 -11 -52l-29 -82c-2 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80
+c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -33 -52 -50 -111l-16 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -25 -12 -42 -34c-20 -26 -32 -53 -44 -92l-20 -68h-77l47 157c5 17 7 28 7 33
+c0 12 -6 15 -30 15h-12l4 23zM1253 362l-45 -152c23 19 39 25 63 25c47 0 83 -36 83 -84c0 -41 -20 -86 -54 -117c-30 -28 -66 -41 -106 -41c-61 0 -100 31 -100 78c0 16 1 18 11 53l48 160c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 24zM1192 155c-15 -31 -28 -78 -28 -103
+c0 -22 14 -38 33 -38s38 19 54 55c12 27 23 73 23 95c0 21 -13 36 -31 36c-19 0 -36 -14 -51 -45zM279 425l-91 -338c-5 -20 -7 -32 -7 -38c0 -13 8 -17 47 -17h30l-5 -32h-253l5 32h30c28 1 41 3 46 9c4 3 6 7 8 16c1 2 3 12 8 30l61 227c3 10 4 17 4 22c0 12 -7 16 -27 16
+h-54l8 30c61 2 139 23 166 43h24zM345 233l56 191c49 -11 92 -17 132 -17c32 0 58 4 84 15c4 1 5 2 6 2c2 0 4 -2 4 -5c0 -19 -16 -49 -35 -65c-25 -22 -58 -31 -106 -31c-27 0 -28 0 -76 10l-23 -78c31 11 53 16 80 16c73 0 122 -44 122 -110c0 -98 -78 -170 -183 -170
+c-76 0 -124 36 -124 94c0 37 21 61 55 61c29 0 49 -18 49 -45c0 -23 -12 -39 -36 -47c-5 -2 -7 -3 -7 -7c0 -13 24 -25 50 -25c54 0 97 58 97 132c0 49 -22 78 -61 78c-16 0 -25 -2 -55 -15c-3 -23 -15 -35 -32 -35c-11 0 -20 9 -20 21c0 13 7 23 23 30z" />
     <glyph glyph-name="uniE51E" unicode="&#xe51e;" horiz-adv-x="1439" 
-d="M300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109
-c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21
-c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM1337 362l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84
-c0 -85 -76 -158 -160 -158c-61 0 -101 31 -101 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM842 235l-14 -60c30 40 61 60 92 60c35 0 55 -21 55 -54c32 38 59 54 88 54c32 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11
-c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 56 15 66
-c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33c0 12 -6 15 -30 15h-12l4 23zM1327 200c-48 0 -78 -111 -78 -148c0 -22 13 -38 32 -38c48 0 77 113 77 150c0 21 -13 36 -31 36z" />
+d="M842 235l-14 -60c30 40 61 60 92 60c24 0 46 -14 53 -34c2 -6 2 -5 2 -20c32 38 59 54 88 54c32 0 53 -20 53 -51c0 -15 -4 -31 -11 -52l-29 -82c-1 -4 -3 -9 -3 -11c0 -3 5 -7 9 -7c5 0 11 5 23 17c3 4 3 4 22 29c4 6 5 6 7 9l19 -14c-35 -55 -69 -80 -104 -80
+c-27 0 -48 18 -48 41c0 11 3 25 12 50l24 69c4 12 7 23 7 29c0 7 -5 12 -13 12c-11 0 -26 -10 -41 -28c-19 -23 -32 -52 -49 -111l-17 -55h-78l35 116c10 34 15 56 15 66c0 7 -4 12 -9 12c-10 0 -24 -12 -41 -34c-20 -26 -33 -53 -45 -92l-20 -68h-77l47 157c5 17 7 28 7 33
+c0 12 -6 15 -30 15h-12l4 23zM1337 362l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -41 -21 -86 -55 -117c-30 -28 -65 -41 -105 -41c-61 0 -101 31 -101 78c0 16 1 18 11 53l48 160c6 23 8 28 8 33c0 12 -6 15 -31 15h-12l4 24zM1277 155c-15 -31 -28 -78 -28 -103
+c0 -22 13 -38 32 -38s38 19 54 55c12 27 23 73 23 95c0 21 -13 36 -31 36c-19 0 -35 -14 -50 -45zM633 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21
+c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57zM300 150l26 -9l-51 -141h-275v3c0 25 29 59 106 126
+c59 51 89 80 107 103c23 28 36 62 36 91c0 38 -26 64 -65 64c-32 0 -64 -21 -64 -42c0 -9 4 -12 24 -21c22 -10 31 -23 31 -43c0 -29 -20 -49 -49 -49c-34 0 -59 27 -59 66c0 72 64 126 151 126c67 0 130 -35 130 -109c0 -42 -25 -83 -73 -120c-11 -9 -11 -9 -115 -72
+c-34 -21 -51 -33 -60 -42h118c42 0 53 8 76 57z" />
     <glyph glyph-name="uniE51F" unicode="&#xe51f;" horiz-adv-x="1397" 
-d="M159 369l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -86 -77 -158 -161 -158c-61 0 -100 31 -100 78c0 16 1 17 11 52l48 161c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 23zM504 235h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12
-c-22 -36 -57 -84 -103 -84c-20 0 -37 11 -41 27c-1 2 -1 3 -1 5v11c-23 -30 -46 -43 -80 -43c-50 0 -86 37 -86 89c0 79 68 153 141 153c29 0 50 -10 62 -30zM832 188c0 -21 -14 -35 -34 -35s-34 13 -34 30c0 8 2 11 9 20c2 3 3 5 3 6c0 5 -12 10 -27 10
-c-26 0 -44 -12 -44 -29c0 -13 9 -22 38 -34c54 -24 71 -42 71 -76c0 -48 -43 -80 -108 -80c-52 0 -88 23 -88 57c0 21 14 35 35 35c20 0 35 -14 35 -31c0 -10 -3 -14 -13 -23c-1 -1 -3 -3 -3 -5c0 -7 13 -12 31 -12c27 0 47 15 47 34c0 13 -7 22 -28 30
-c-29 12 -32 13 -42 19c-25 15 -35 34 -35 60c0 48 38 78 100 78c51 0 87 -22 87 -54zM1063 188c0 -21 -14 -35 -34 -35s-34 13 -34 30c0 8 2 11 9 20c2 3 3 5 3 6c0 5 -12 10 -27 10c-26 0 -44 -12 -44 -29c0 -13 9 -22 38 -34c54 -24 71 -42 71 -76c0 -48 -44 -80 -108 -80
-c-52 0 -88 23 -88 57c0 21 14 35 35 35c20 0 35 -14 35 -31c0 -10 -3 -14 -13 -23c-1 -1 -3 -2 -3 -4v-1c0 -7 13 -12 31 -12c27 0 47 15 47 34c0 13 -7 22 -28 30c-29 12 -32 13 -42 19c-25 15 -35 34 -35 60c0 48 38 78 100 78c51 0 87 -22 87 -54zM1295 235h78l-49 -164
-c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8c8 0 34 27 52 55l19 -12c-22 -35 -59 -84 -104 -84c-28 0 -42 17 -42 43c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89c0 79 68 153 141 153c29 0 49 -10 61 -30zM452 215c-51 0 -77 -103 -77 -142c0 -24 11 -39 30 -39
-c47 0 77 108 77 145c0 21 -12 36 -30 36zM1243 215c-51 0 -77 -103 -77 -142c0 -24 11 -39 30 -39c47 0 77 108 77 145c0 21 -12 36 -30 36zM149 207c-48 0 -78 -111 -78 -148c0 -22 13 -38 32 -38c48 0 77 113 77 150c0 21 -13 36 -31 36z" />
+d="M159 369l-45 -152c23 19 39 25 63 25c47 0 84 -36 84 -84c0 -41 -21 -86 -55 -117c-30 -28 -66 -41 -106 -41c-61 0 -100 31 -100 78c0 16 1 17 11 52l48 161c6 23 7 28 7 33c0 12 -5 15 -30 15h-12l4 23zM99 162c-15 -31 -28 -78 -28 -103c0 -22 13 -38 32 -38
+s38 19 54 55c12 27 23 73 23 95c0 21 -13 36 -31 36c-19 0 -35 -14 -50 -45zM504 235h77l-48 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8c8 0 33 27 51 55l19 -12c-8 -13 -22 -33 -32 -44c-24 -28 -46 -40 -71 -40c-20 0 -37 11 -41 27c-1 2 -1 3 -1 5v11
+c-23 -30 -46 -43 -80 -43c-50 0 -86 37 -86 89c0 79 68 153 141 153c29 0 50 -10 62 -30zM399 168c-14 -29 -24 -69 -24 -95c0 -24 11 -39 30 -39s37 16 51 48c15 32 26 72 26 97c0 21 -12 36 -30 36c-21 0 -38 -15 -53 -47zM832 188c0 -21 -14 -35 -34 -35s-34 13 -34 30
+c0 8 2 11 9 20c2 3 3 5 3 6c0 5 -12 10 -27 10c-26 0 -44 -12 -44 -29c0 -13 9 -22 38 -34c54 -24 71 -42 71 -76c0 -48 -43 -80 -108 -80c-52 0 -88 23 -88 57c0 21 14 35 35 35c20 0 35 -14 35 -31c0 -10 -3 -14 -13 -23c-1 -1 -3 -3 -3 -5c0 -7 13 -12 31 -12
+c27 0 47 15 47 34c0 13 -7 22 -28 30c-29 12 -32 13 -42 19c-25 15 -35 34 -35 60c0 48 38 78 100 78c51 0 87 -22 87 -54zM1063 188c0 -21 -14 -35 -34 -35s-34 13 -34 30c0 8 2 11 9 20c2 3 3 5 3 6c0 5 -12 10 -27 10c-26 0 -44 -12 -44 -29c0 -13 9 -22 38 -34
+c54 -24 71 -42 71 -76c0 -48 -44 -80 -108 -80c-52 0 -88 23 -88 57c0 21 14 35 35 35c20 0 35 -14 35 -31c0 -10 -3 -14 -13 -23c-1 -1 -3 -2 -3 -4v-1c0 -7 13 -12 31 -12c27 0 47 15 47 34c0 13 -7 22 -28 30c-29 12 -32 13 -42 19c-25 15 -35 34 -35 60
+c0 48 38 78 100 78c51 0 87 -22 87 -54zM1295 235h78l-49 -164c-5 -18 -5 -19 -5 -22c0 -4 4 -8 7 -8c8 0 34 27 52 55l19 -12c-8 -13 -23 -33 -33 -44c-24 -28 -46 -40 -71 -40c-20 0 -36 11 -40 27c-1 4 -2 5 -2 16c-23 -30 -46 -43 -80 -43c-50 0 -85 37 -85 89
+c0 79 68 153 141 153c29 0 49 -10 61 -30zM1190 168c-14 -29 -24 -69 -24 -95c0 -24 11 -39 30 -39s37 16 51 48c15 32 26 72 26 97c0 21 -12 36 -30 36c-21 0 -38 -15 -53 -47z" />
     <glyph glyph-name="uniE520" unicode="&#xe520;" horiz-adv-x="350" 
-d="M129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 2 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c16 46 42 106 99 106l5 -1h3c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c46 0 70 -49 70 -90c0 -76 -54 -193 -139 -193
-c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c44 21 79 131 79 179c0 10 -2 29 -14 32c-2 1 -5 1 -7 1c-39 0 -77 -70 -84 -101c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" />
+d="M129 -163h-224v20h61l99 276c5 10 23 54 23 78c0 7 -1 12 -5 15c-2 1 -5 2 -8 2h-4c-9 -2 -21 -10 -27 -19c-12 -16 -22 -48 -26 -61l-18 9c29 83 63 106 96 106c4 0 7 -1 11 -1c35 -5 56 -43 56 -43l2 -4l3 3c17 17 48 43 79 43c4 0 9 -1 13 -2c15 -4 57 -21 57 -88
+c0 -16 -2 -34 -8 -56c-21 -81 -76 -137 -131 -137c-6 0 -13 0 -19 2c-34 9 -44 31 -44 31l-3 7l-58 -161h75v-20zM157 12c3 0 8 0 11 2c25 12 50 59 63 98c6 18 16 54 16 81c0 9 -1 17 -4 23c-2 4 -6 8 -10 9c-2 1 -5 1 -8 1c-6 0 -12 -2 -19 -6c-26 -15 -55 -57 -64 -95
+c-1 -2 -12 -38 -12 -69c0 -19 4 -37 19 -43c2 -1 6 -1 8 -1z" />
     <glyph glyph-name="uniE521" unicode="&#xe521;" horiz-adv-x="391" 
-d="M339 44c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -37 -31 -73 -76 -73c-34 0 -50 23 -50 54c0 14 3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c0 0 -1 0 -2 1h-1h-1l-1 -1c-24 -10 -56 -52 -76 -192c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4
-c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-37 0 -79 -154 -89 -200c-4 -16 -9 -16 -11 -16h-53c-4 0 -6 2 -8 4c-1 2 -2 4 -2 7l1 3c3 10 40 121 40 122c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8
-c11 34 33 76 74 76c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-4 -9 -17 -56 -17 -64c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z" />
+d="M339 44c7 12 18 39 18 39l17 -8c-1 -2 -1 -4 -2 -6c-13 -35 -30 -71 -75 -71c-14 0 -32 6 -40 18c-7 10 -10 22 -10 36s3 29 9 45c21 54 27 94 27 104c0 5 -3 8 -5 9c-1 0 -1 1 -2 1h-1c-1 0 -2 -1 -3 -1c-23 -10 -55 -52 -75 -192c0 -3 -1 -6 -1 -7
+c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4c0 0 15 47 30 96c12 41 22 73 22 90c0 5 -1 9 -3 11c-1 2 -4 3 -6 3c-34 0 -71 -131 -75 -146c-4 -14 -9 -32 -14 -54c-4 -16 -9 -16 -11 -16h-38h-15c-4 0 -6 2 -8 4c-1 2 -2 4 -2 6s1 3 1 5c3 9 40 120 40 121
+c11 32 19 56 19 70c0 8 -2 13 -8 15c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 22 23 47 23c4 0 9 0 14 -1c25 -5 38 -34 38 -34l1 -5l3 4c17 23 38 34 66 34c27 0 43 -35 43 -35l2 -5l2 4c13 17 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14
+c0 -27 -7 -68 -13 -86c-2 -5 -7 -25 -9 -31c-4 -13 -8 -25 -8 -33c0 -5 2 -9 7 -11c2 -1 3 -1 5 -1c5 0 10 2 15 11z" />
     <glyph glyph-name="uniE522" unicode="&#xe522;" horiz-adv-x="367" 
-d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10c0 -5 1 -8 5 -11s9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c25 74 66 169 159 169
-c45 0 90 -26 90 -76c0 -6 0 -12 -2 -17c-5 -20 -26 -36 -47 -36c-7 0 -14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 6 -5 12 -11 13c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22
-c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z" />
+d="M-85 -60c36 0 45 -26 45 -40c0 -16 -6 -34 -25 -42c-5 -2 -7 -6 -8 -10v-2c0 -4 2 -7 5 -9c4 -3 9 -5 14 -5c6 0 12 2 17 5c24 16 30 45 51 127l3 12c12 46 21 84 29 121c7 33 15 67 25 107v4h-62c-6 0 -10 4 -10 10v22c0 6 4 10 10 10h76v2c22 65 45 109 71 132
+c33 29 64 37 88 37c6 0 12 0 17 -1c32 -5 55 -23 63 -38c7 -12 10 -25 10 -37c0 -6 0 -12 -2 -17c-3 -11 -13 -24 -23 -29c-9 -5 -17 -7 -24 -7s-14 2 -18 4c-10 4 -18 13 -21 22c-1 5 -2 9 -2 14c0 14 5 27 15 35c4 2 6 7 6 12c0 2 0 3 -1 5c-2 4 -5 7 -10 8
+c-1 0 -3 1 -5 1c-5 0 -12 -2 -20 -8c-15 -12 -23 -30 -51 -132v-3h59c6 0 10 -4 10 -10v-22c0 -6 -4 -10 -10 -10h-72v-2c-7 -23 -16 -54 -25 -86c-24 -85 -72 -234 -116 -278c-25 -25 -48 -35 -80 -35c-46 0 -81 29 -81 81c0 27 25 52 52 52z" />
     <glyph glyph-name="uniE523" unicode="&#xe523;" horiz-adv-x="247" 
-d="M189 253c22 0 41 -16 41 -39c0 -31 -16 -55 -48 -55c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109
-c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c17 23 43 38 72 38z" />
+d="M189 253c22 0 41 -16 41 -39s-8 -37 -19 -46c-6 -5 -17 -9 -29 -9c-9 0 -19 2 -26 10c-4 4 -6 11 -6 17c0 8 3 16 12 23v2s0 2 -3 4c-1 1 -2 1 -3 1c-3 0 -7 -2 -11 -6c-16 -16 -48 -50 -68 -191c0 -3 -1 -6 -1 -7c-2 -11 -7 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4
+l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 21 24 46 24c5 0 10 -1 15 -2c29 -7 38 -41 38 -41l3 4c6 8 13 16 22 22c8 5 27 16 50 16z" />
     <glyph glyph-name="uniE524" unicode="&#xe524;" horiz-adv-x="208" 
 d="M168 228c0 0 -8 13 -34 13s-45 -21 -45 -38s5 -23 30 -37s77 -29 77 -89s-58 -82 -110 -82s-86 23 -86 68c0 30 20 41 35 41s32 -11 32 -37c0 -24 -13 -31 -16 -33c-1 0 -1 -1 -1 -2c0 -5 7 -15 36 -15c37 0 49 34 49 44s-4 24 -21 34s-33 18 -45 25
 c-28 16 -35 39 -35 60c0 39 30 83 97 83c58 0 77 -35 77 -58c0 -3 0 -6 -1 -8c-2 -10 -9 -24 -28 -24s-28 17 -28 28c0 7 3 19 17 27z" />
     <glyph glyph-name="uniE525" unicode="&#xe525;" horiz-adv-x="256" 
-d="M159 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-6 0 -9 4 -9 10c3 7 24 30 34 85c2 11 8 16 14 18c12 0 22 -1 34 -3c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5
-c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c17 0 27 22 27 36v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34c0 -53 -38 -103 -93 -103c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24
-s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 3 -2 6 -5 6z" />
+d="M159 203c-5 -1 -19 -2 -33 -2h-10c-16 1 -29 4 -34 5c-4 0 -5 0 -7 -4s-16 -39 -19 -46s-4 -12 -10 -12h-11c-5 0 -9 4 -9 8v2c3 7 24 30 34 85c2 11 8 16 14 18c1 0 3 1 5 1c8 0 23 -3 29 -4c13 -2 26 -3 43 -3c9 0 19 0 31 1l48 4h1c2 0 7 -1 8 -9v-6c0 -1 -1 -4 -2 -5
+c-4 -9 -12 -17 -20 -25c-7 -7 -143 -122 -143 -122s-1 -1 -1 -2s0 -1 2 -2c4 -2 22 -9 38 -21s22 -20 27 -23c2 -2 5 -2 7 -2c8 0 17 8 22 16c4 6 5 13 5 20v6c-1 4 -17 8 -17 27c0 13 9 28 26 28c21 0 28 -14 28 -34s-11 -63 -42 -87c-14 -11 -32 -16 -51 -16
+c-23 0 -46 8 -56 25c-6 11 -10 24 -27 24s-23 -18 -29 -28c-5 -7 -16 -20 -30 -20c-4 0 -7 1 -11 3c0 0 -7 5 -7 14c0 6 3 13 13 21c26 21 190 154 191 155s2 2 2 4c0 1 0 1 -1 3s-2 3 -4 3z" />
     <glyph glyph-name="uniE526" unicode="&#xe526;" horiz-adv-x="272" 
-d="M114 211l3 4c13 18 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -41 -10 -79 -23 -117c-4 -12 -8 -24 -8 -33c0 -6 2 -10 8 -12c2 -1 3 -1 5 -1c5 0 10 2 15 11c7 12 18 39 18 39l17 -8s0 -1 -1 -1v-3c-14 -36 -32 -73 -77 -73c-34 0 -50 26 -50 57
-c0 13 3 28 9 43c10 26 27 77 27 106c-1 4 -2 6 -5 7l-1 1h-2l-1 -1c-25 -10 -57 -52 -77 -193c0 -3 -1 -6 -1 -7c-2 -11 -6 -12 -11 -12h-55c-8 0 -10 5 -10 12v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c10 33 33 77 73 77
-c5 0 10 -1 15 -2c29 -7 38 -41 38 -41z" />
+d="M114 211l3 4c13 18 41 36 67 36c21 0 33 -13 38 -40c1 -4 1 -9 1 -14c0 -27 -7 -68 -13 -86c-2 -6 -8 -25 -10 -31c-4 -12 -8 -24 -8 -33c0 -6 2 -10 8 -12c2 -1 3 -1 5 -1c5 0 10 2 15 11c7 12 18 39 18 39l17 -8c-1 -2 -1 -3 -2 -5c-13 -35 -31 -72 -76 -72
+c-14 0 -31 6 -39 18c-7 10 -11 24 -11 39c0 13 3 28 9 43c21 54 27 94 27 104v2c-1 4 -2 6 -4 7c-1 0 -2 1 -3 1s-2 -1 -3 -1c-24 -10 -56 -52 -76 -193c0 -3 -1 -6 -1 -7c-2 -11 -6 -12 -11 -12h-55c-3 0 -6 1 -8 3s-2 6 -2 9v4l34 109c11 35 20 64 20 81c0 8 -2 14 -7 16
+c-2 1 -3 1 -5 1c-22 0 -39 -54 -39 -54l-15 8c7 22 21 46 27 53c7 8 21 24 46 24c5 0 10 -1 15 -2c29 -7 38 -41 38 -41z" />
     <glyph glyph-name="uniE541" unicode="&#xe541;" horiz-adv-x="142" 
 d="M0 0c0 39 32 71 71 71s71 -32 71 -71s-32 -71 -71 -71s-71 32 -71 71zM30 0c0 -23 18 -41 41 -41s41 18 41 41s-18 41 -41 41s-41 -18 -41 -41z" />
     <glyph glyph-name="uniE560" unicode="&#xe560;" horiz-adv-x="403" 
-d="M390 418c7 0 13 -6 13 -13c0 -4 -4 -9 -7 -11l-70 -40c12 -18 42 -70 44 -133c0 -55 -13 -117 -39 -165c-2 -4 -6 -7 -9 -7c-1 0 -3 1 -4 1c-2 1 -3 3 -3 6c0 2 1 6 2 9c17 45 28 91 28 136c0 53 -22 93 -53 133l-85 -49v-258c0 -62 -80 -110 -137 -110
-c-37 0 -70 17 -70 57c0 62 78 111 135 111c22 0 42 -6 55 -18v208l-74 -43c-2 -1 -5 -2 -7 -2c-7 0 -13 6 -13 13c0 4 3 9 7 11l87 50v255c0 4 4 8 8 8c8 0 14 -24 14 -29c1 -2 11 -38 34 -74c13 -19 49 -66 66 -89l72 41c2 1 4 2 6 2zM207 406v-92l68 40
-c-25 27 -50 43 -68 52z" />
+d="M401 412c1 -2 2 -5 2 -7c0 -4 -4 -9 -7 -11l-70 -40c12 -18 42 -70 44 -133v-6c0 -39 -10 -106 -39 -159c-2 -4 -6 -7 -9 -7c-2 0 -3 1 -4 1c-2 1 -3 3 -3 6c0 2 1 6 2 9c17 45 28 91 28 136c0 52 -18 79 -29 98c-6 10 -17 26 -24 35l-85 -49v-258c0 -33 -26 -69 -68 -92
+c-23 -12 -48 -18 -69 -18c-29 0 -53 10 -64 31c-4 8 -6 17 -6 26c0 33 26 70 68 93c23 12 46 18 67 18c22 0 42 -6 55 -18v208l-74 -43c-2 -1 -5 -2 -7 -2c-7 0 -13 6 -13 13c0 4 3 9 7 11l87 50v251v4c0 4 4 8 8 8c3 0 6 -2 7 -5c0 0 1 -3 2 -7c2 -7 5 -16 5 -17
+c1 -2 11 -38 34 -74c13 -19 49 -66 66 -89l72 41c2 1 4 2 6 2c4 0 9 -2 11 -6zM207 406v-92l68 40c-25 27 -50 43 -68 52z" />
     <glyph glyph-name="uniE561" unicode="&#xe561;" horiz-adv-x="305" 
-d="M225 -342l74 -42c3 -2 6 -7 6 -11c0 -7 -6 -12 -13 -12c-2 0 -5 0 -6 1l-75 43c-13 -18 -56 -75 -70 -97c-23 -36 -34 -72 -35 -74c0 -1 -3 -10 -5 -17c-1 -4 -1 -7 -1 -7c-1 -3 -5 -5 -8 -5c-4 0 -8 4 -8 8v266l-78 45c-4 2 -6 7 -6 11c0 7 5 13 12 13c2 0 5 -1 7 -2
-l65 -38v237c0 62 80 110 137 110c37 0 70 -17 70 -57c0 -31 -23 -66 -62 -89c26 -51 35 -115 35 -152c0 -46 -15 -92 -39 -131zM101 -63v-207l91 -52c28 38 48 76 48 125c0 43 -11 87 -26 130c-20 -9 -40 -14 -59 -14c-22 0 -41 6 -54 18zM101 -299v-103c20 9 48 29 75 60z
-" />
+d="M225 -342l74 -42c3 -2 6 -7 6 -11c0 -7 -6 -12 -13 -12c-2 0 -5 0 -6 1l-75 43c-13 -18 -56 -75 -70 -97c-23 -36 -34 -72 -35 -74c0 -1 -3 -10 -5 -17c-1 -4 -1 -7 -1 -7c-1 -3 -5 -5 -8 -5c-4 0 -8 4 -8 8v4v262l-78 45c-4 2 -6 7 -6 11c0 7 5 13 12 13c2 0 5 -1 7 -2
+l65 -38v237c0 33 26 69 68 92c23 12 48 18 69 18c29 0 53 -10 64 -31c4 -8 6 -17 6 -26c0 -31 -23 -66 -62 -89c26 -51 35 -115 35 -152v-6c-2 -56 -25 -102 -39 -125zM101 -63v-207l91 -52c6 8 12 17 18 27c11 19 30 46 30 98c0 43 -11 87 -26 130c-20 -9 -40 -14 -59 -14
+c-22 0 -41 6 -54 18zM101 -299v-103c20 9 48 29 75 60z" />
     <glyph glyph-name="uniE562" unicode="&#xe562;" horiz-adv-x="370" 
-d="M321 361c29 -38 49 -99 49 -146c0 -39 -10 -106 -39 -159c-2 -4 -6 -7 -9 -7c-1 0 -3 1 -4 1c-2 1 -3 3 -3 6c0 2 1 6 2 9c17 45 28 91 28 136c0 82 -67 171 -138 205v-379c0 -62 -80 -110 -137 -110c-37 0 -70 17 -70 57c0 62 78 111 135 111c22 0 42 -6 55 -18v492
-c0 4 4 8 8 8c3 0 6 -1 7 -4l2 -8c2 -7 5 -16 5 -17c1 -2 11 -38 34 -74c17 -26 77 -103 75 -103z" />
+d="M370 221v-6c0 -39 -10 -106 -39 -159c-2 -4 -6 -7 -9 -7c-2 0 -3 1 -4 1c-2 1 -3 3 -3 6c0 2 1 6 2 9c17 45 28 91 28 136c0 52 -18 79 -29 98c-35 60 -80 93 -109 107v-379c0 -33 -26 -69 -68 -92c-23 -12 -48 -18 -69 -18c-29 0 -53 10 -64 31c-4 8 -6 17 -6 26
+c0 33 26 70 68 93c23 12 46 18 67 18c22 0 42 -6 55 -18v488v4c0 4 4 8 8 8c3 0 6 -1 7 -4l2 -8c2 -7 5 -16 5 -17c1 -2 11 -38 34 -74c17 -26 77 -103 75 -103c0 0 46 -60 49 -140z" />
     <glyph glyph-name="uniE563" unicode="&#xe563;" horiz-adv-x="207" 
-d="M137 87c37 0 70 -17 70 -57c0 -31 -23 -66 -62 -89c24 -47 35 -106 35 -158c-3 -80 -49 -140 -49 -140c2 0 -57 -77 -74 -103c-23 -36 -34 -72 -35 -74c0 -1 -3 -10 -5 -17c-1 -4 -1 -7 -1 -7c-1 -3 -5 -5 -8 -5c-4 0 -8 4 -8 8v532c0 62 80 110 137 110zM17 -402
-c70 34 139 124 139 205c0 43 -11 87 -26 130c-20 -9 -40 -14 -59 -14c-22 0 -41 6 -54 18v-339z" />
+d="M201 56c4 -8 6 -17 6 -26c0 -31 -23 -66 -62 -89c26 -51 35 -115 35 -152v-6c-3 -80 -49 -140 -49 -140c2 0 -57 -77 -74 -103c-23 -36 -34 -72 -35 -74c0 -1 -3 -10 -5 -17c-1 -4 -1 -7 -1 -7c-1 -3 -5 -5 -8 -5c-4 0 -8 4 -8 8v4v528c0 33 26 69 68 92
+c23 12 48 18 69 18c29 0 53 -10 64 -31zM126 -295c11 19 30 46 30 98c0 43 -11 87 -26 130c-20 -9 -40 -14 -59 -14c-22 0 -41 6 -54 18v-339c29 14 74 47 109 107z" />
     <glyph glyph-name="uniE564" unicode="&#xe564;" horiz-adv-x="489" 
 d="M20 0c-11 0 -20 9 -20 20c0 6 4 15 10 18l448 259c3 1 7 2 10 2c11 0 21 -9 21 -20c0 -6 -5 -14 -10 -17l-449 -259c-3 -2 -7 -3 -10 -3z" />
     <glyph glyph-name="uniE565" unicode="&#xe565;" horiz-adv-x="489" 
 d="M468 -299c-3 0 -7 0 -10 2l-448 259c-5 3 -10 12 -10 18c0 11 9 20 20 20c3 0 7 -2 10 -3l449 -258c6 -3 10 -12 10 -18c0 -11 -10 -20 -21 -20z" />
     <glyph glyph-name="uniE566" unicode="&#xe566;" horiz-adv-x="433" 
 d="M322 275c39 0 61 -30 61 -61s-12 -52 -46 -52c-27 0 -40 26 -40 38s3 27 17 36c-1 1 -3 1 -4 1c-6 0 -15 -4 -24 -11c-11 -10 -21 -29 -21 -29l-42 -95s-16 -50 -16 -72v-19s-2 -11 -15 -11h-45s-9 1 -12 9s-6 15 -6 15s-34 -24 -65 -24s-64 11 -64 59
-c0 22 24 100 46 166h-44s-14 1 -14 12v13s2 12 14 12h56c13 37 23 65 23 65s1 5 5 8s50 41 52 43s7 5 10 5h9c7 0 14 -7 14 -14v-2l-34 -105h103s8 0 13 -5l8 -8s22 26 61 26zM154 99c9 31 40 123 40 123s0 3 -3 3h-66l-30 -93s-11 -29 -11 -52c0 -13 4 -26 18 -26
-c17 0 44 18 52 45z" />
+c0 22 24 100 46 166h-44s-14 1 -14 12v13s2 12 14 12h56c13 37 23 65 23 65s1 5 5 8s50 41 52 43s7 5 10 5h9c7 0 14 -7 14 -14v-2l-34 -105h103s8 0 13 -5l8 -8s22 26 61 26zM154 99c9 31 40 123 40 123s0 3 -3 3h-66l-30 -93s-11 -29 -11 -52c0 -11 3 -21 11 -25
+c2 -1 4 -1 7 -1c17 0 44 18 52 45z" />
     <glyph glyph-name="uniE567" unicode="&#xe567;" horiz-adv-x="456" 
-d="M366 232c51 0 90 -47 90 -118c0 -75 -64 -114 -121 -114c-34 0 -60 12 -85 35l-105 98c-26 23 -41 31 -70 31c-25 0 -45 -20 -45 -45v-1c0 -28 11 -43 30 -43c21 0 26 15 48 15c23 0 41 -16 41 -45c0 -30 -31 -45 -58 -45c-51 0 -91 47 -91 118c0 75 64 114 121 114
-c34 0 61 -12 86 -35l104 -98c26 -23 42 -31 71 -31c25 0 44 20 44 45v1c0 28 -11 43 -30 43c-21 0 -26 -15 -48 -15c-23 0 -41 16 -41 45c0 30 32 45 59 45z" />
+d="M366 232c51 0 90 -47 90 -118c0 -75 -64 -114 -121 -114c-34 0 -60 12 -85 35l-22 20l-83 78c-26 23 -41 31 -70 31c-25 0 -45 -20 -45 -45v-1c0 -28 11 -43 30 -43c21 0 26 15 48 15c23 0 41 -16 41 -45c0 -30 -31 -45 -58 -45c-51 0 -91 47 -91 118
+c0 75 64 114 121 114c34 0 61 -12 86 -35l21 -20l83 -78c26 -23 42 -31 71 -31c25 0 44 20 44 45v1c0 28 -11 43 -30 43c-21 0 -26 -15 -48 -15c-23 0 -41 16 -41 45c0 30 32 45 59 45z" />
     <glyph glyph-name="uniE568" unicode="&#xe568;" horiz-adv-x="456" 
-d="M90 232c27 0 59 -15 59 -45c0 -29 -18 -45 -41 -45c-22 0 -27 15 -48 15c-19 0 -30 -15 -30 -43v-1c0 -25 19 -45 44 -45c29 0 45 8 71 31l104 98c25 23 52 35 86 35c57 0 121 -39 121 -114c0 -71 -40 -118 -91 -118c-27 0 -58 15 -58 45c0 29 18 45 41 45
-c22 0 27 -15 48 -15c19 0 30 15 30 43v1c0 25 -20 45 -45 45c-29 0 -44 -8 -70 -31l-105 -98c-25 -23 -51 -35 -85 -35c-57 0 -121 39 -121 114c0 71 39 118 90 118z" />
+d="M90 232c27 0 59 -15 59 -45c0 -29 -18 -45 -41 -45c-22 0 -27 15 -48 15c-19 0 -30 -15 -30 -43v-1c0 -25 19 -45 44 -45c29 0 45 8 71 31l83 78l21 20c25 23 52 35 86 35c57 0 121 -39 121 -114c0 -71 -40 -118 -91 -118c-27 0 -58 15 -58 45c0 29 18 45 41 45
+c22 0 27 -15 48 -15c19 0 30 15 30 43v1c0 25 -20 45 -45 45c-29 0 -44 -8 -70 -31l-83 -78l-22 -20c-25 -23 -51 -35 -85 -35c-57 0 -121 39 -121 114c0 71 39 118 90 118z" />
     <glyph glyph-name="uniE569" unicode="&#xe569;" horiz-adv-x="456" 
 d="M366 232c51 0 90 -47 90 -118c0 -75 -64 -114 -121 -114c-34 0 -60 12 -85 35l-4 3v-105c0 -8 -5 -13 -13 -13h-9c-8 0 -14 5 -14 13v139l-65 61c-26 23 -41 31 -70 31c-25 0 -45 -20 -45 -45v-1c0 -28 11 -43 30 -43c21 0 26 15 48 15c23 0 41 -16 41 -45
 c0 -30 -31 -45 -58 -45c-51 0 -91 47 -91 118c0 75 64 114 121 114c34 0 61 -12 86 -35l3 -3v105c0 8 6 14 14 14h9c8 0 13 -6 13 -14v-139l65 -61c26 -23 42 -31 71 -31c25 0 44 20 44 45v1c0 28 -11 43 -30 43c-21 0 -26 -15 -48 -15c-23 0 -41 16 -41 45
 c0 30 32 45 59 45z" />
     <glyph glyph-name="uniE56A" unicode="&#xe56a;" horiz-adv-x="232" 
-d="M232 91c0 -51 -47 -91 -118 -91c-75 0 -114 64 -114 121c0 34 12 61 35 86l98 104c23 26 31 42 31 71c0 25 -20 44 -45 44h-1c-28 0 -43 -11 -43 -30c0 -21 15 -26 15 -48c0 -23 -16 -41 -45 -41c-30 0 -45 32 -45 59c0 51 47 90 118 90c75 0 114 -64 114 -121
-c0 -34 -12 -60 -35 -85l-98 -105c-23 -26 -31 -41 -31 -70c0 -25 20 -45 45 -45h1c28 0 43 11 43 30c0 21 -15 26 -15 48c0 23 16 41 45 41c30 0 45 -31 45 -58z" />
+d="M232 91c0 -51 -47 -91 -118 -91c-75 0 -114 64 -114 121c0 34 12 61 35 86l20 21l78 83c23 26 31 42 31 71c0 25 -20 44 -45 44h-1c-28 0 -43 -11 -43 -30c0 -21 15 -26 15 -48c0 -23 -16 -41 -45 -41c-30 0 -45 32 -45 59c0 51 47 90 118 90c75 0 114 -64 114 -121
+c0 -34 -12 -60 -35 -85l-20 -22l-78 -83c-23 -26 -31 -41 -31 -70c0 -25 20 -45 45 -45h1c28 0 43 11 43 30c0 21 -15 26 -15 48c0 23 16 41 45 41c30 0 45 -31 45 -58z" />
     <glyph glyph-name="uniE56B" unicode="&#xe56b;" horiz-adv-x="232" 
-d="M232 366c0 -27 -15 -59 -45 -59c-29 0 -45 18 -45 41c0 22 15 27 15 48c0 19 -15 30 -43 30h-1c-25 0 -45 -19 -45 -44c0 -29 8 -45 31 -71l98 -104c23 -25 35 -52 35 -86c0 -57 -39 -121 -114 -121c-71 0 -118 40 -118 91c0 27 15 58 45 58c29 0 45 -18 45 -41
-c0 -22 -15 -27 -15 -48c0 -19 15 -30 43 -30h1c25 0 45 20 45 45c0 29 -8 44 -31 70l-98 105c-23 25 -35 51 -35 85c0 57 39 121 114 121c71 0 118 -39 118 -90z" />
+d="M232 366c0 -27 -15 -59 -45 -59c-29 0 -45 18 -45 41c0 22 15 27 15 48c0 19 -15 30 -43 30h-1c-25 0 -45 -19 -45 -44c0 -29 8 -45 31 -71l78 -83l20 -21c23 -25 35 -52 35 -86c0 -57 -39 -121 -114 -121c-71 0 -118 40 -118 91c0 27 15 58 45 58c29 0 45 -18 45 -41
+c0 -22 -15 -27 -15 -48c0 -19 15 -30 43 -30h1c25 0 45 20 45 45c0 29 -8 44 -31 70l-78 83l-20 22c-23 25 -35 51 -35 85c0 57 39 121 114 121c71 0 118 -39 118 -90z" />
     <glyph glyph-name="uniE56C" unicode="&#xe56c;" horiz-adv-x="473" 
 d="M449 210l24 -15l-117 -188c-2 -4 -8 -7 -12 -7s-10 2 -12 6l-78 125l-73 -124c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-74 124l-59 -98l-24 15l117 193c3 4 8 7 12 7s10 -3 12 -7l74 -122l72 122c2 4 8 7 12 7s9 -3 11 -7l80 -126z" />
     <glyph glyph-name="uniE56D" unicode="&#xe56d;" horiz-adv-x="473" 
@@ -1120,33 +1168,33 @@ c8 0 14 -6 14 -14v-120l35 59c2 4 7 7 11 7s10 -3 12 -7l80 -126z" />
 d="M630 210l24 -14l-118 -189c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-79 126l-78 -126c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7h-1c-4 0 -10 3 -12 7l-74 125l-59 -99l-24 15l117 193v1c2 4 6 6 12 6c4 0 10 -2 12 -6l75 -123l72 121v1
 c2 4 8 7 12 7s10 -2 12 -6l79 -127l59 95l18 31c2 4 8 7 12 7c7 0 9 -2 12 -6l79 -127z" />
     <glyph glyph-name="uniE5B2" unicode="&#xe5b2;" horiz-adv-x="680" 
-d="M597 118l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-79 -126c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-75 125l-76 -126c-3 -5 -9 -9 -16 -9l-3 1c-8 2 -14 10 -14 17v358c1 7 7 12 14 12s13 -5 14 -12
-v-323l115 192c2 4 6 6 12 6c4 0 10 -2 12 -6l75 -123l72 122c2 4 8 7 12 7s10 -2 12 -6l79 -127l78 126c2 4 7 7 11 7c6 0 10 -2 12 -6z" />
+d="M597 118l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-79 -126c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7s-10 3 -12 7l-75 125l-59 -99l-17 -27c-3 -5 -9 -9 -15 -9c-1 0 -4 1 -5 1c-7 2 -13 10 -13 17v358
+c1 7 7 12 14 12s13 -5 14 -12v-323l115 192c2 4 6 6 12 6c4 0 10 -2 12 -6l75 -123l72 122c2 4 8 7 12 7c2 0 6 -1 8 -2s3 -2 4 -4l79 -127l59 95l19 31c2 4 7 7 11 7c6 0 10 -2 12 -6z" />
     <glyph glyph-name="uniE5B5" unicode="&#xe5b5;" horiz-adv-x="662" 
-d="M579 115l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-9 3 -12 7l-78 126l-78 -126c-3 -4 -8 -7 -12 -7s-10 3 -12 7l-78 124l-73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7l-75 125l-19 -33c-29 -48 -44 -92 -44 -135c0 -35 10 -68 30 -101c1 -2 2 -5 2 -7
-c0 -5 -3 -10 -7 -12c-2 -2 -5 -2 -7 -2c-5 0 -10 3 -12 6c-23 39 -34 77 -34 117c0 47 16 96 48 149l77 126v1c3 4 5 7 10 7h2c2 0 6 -1 8 -2l1 -1h1l1 -1v-1c1 0 1 -1 1 -2l75 -122l73 123c2 3 7 6 12 6c2 0 5 -1 7 -2l4 -4l79 -127l59 95h1l18 32c2 3 7 6 12 6
-c6 0 9 -2 12 -6z" />
+d="M579 115l59 95l24 -14l-117 -189v0c-2 -4 -8 -7 -12 -7v0c-4 0 -9 3 -12 7l-78 126l-78 -126c-3 -4 -8 -7 -12 -7v0v0c-4 0 -10 3 -12 7l-78 124l-74 -124c-2 -4 -7 -7 -11 -7v0c-5 0 -10 3 -12 7l-75 125l-19 -33c-29 -48 -44 -92 -44 -135c0 -35 10 -68 30 -101
+c1 -2 2 -5 2 -7c0 -5 -3 -10 -7 -12c-2 -1 -5 -2 -7 -2c-5 0 -10 3 -12 6c-23 39 -34 77 -34 117c0 47 16 96 48 149l77 126v1c2 4 5 7 10 7h2v0c2 0 6 -1 7 -2h1l1 -1v0h1v-1h1v-1v0c1 0 1 -1 1 -2l75 -122l73 122c2 4 7 7 11 7c3 0 6 -1 8 -2l4 -4l79 -127l59 95h1l18 32
+c2 3 7 6 12 6c6 0 9 -2 11 -6z" />
     <glyph glyph-name="uniE5B8" unicode="&#xe5b8;" horiz-adv-x="662" 
 d="M579 115l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126l-4 -6v-185c0 -8 -6 -14 -14 -14h-9c-8 0 -14 6 -14 14v126l-37 -61c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-78 125l-73 -125c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-75 125l-19 -32
-c-29 -48 -43 -92 -43 -135c0 -35 10 -69 29 -102c1 -2 2 -5 2 -7c0 -7 -7 -14 -14 -14c-4 0 -10 3 -12 7c-22 38 -34 77 -34 117c0 47 16 96 48 148l77 128c2 4 6 6 12 6c2 0 5 -1 7 -2h2v-1h1l1 -1v-1s1 -1 1 -2l75 -122l73 123c2 4 8 7 12 7c5 0 9 -3 11 -7l79 -127l3 5
-v187c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-127l19 30v1l19 31c2 4 8 6 12 6c6 0 8 -2 11 -6z" />
+c-29 -48 -43 -92 -43 -135c0 -35 10 -68 29 -102c1 -2 2 -5 2 -7c0 -4 -3 -10 -7 -12c-2 -1 -5 -2 -7 -2c-4 0 -10 3 -12 7c-22 38 -34 77 -34 117c0 47 16 95 48 148l76 126l1 2c2 4 6 6 12 6c2 0 5 -1 7 -2h2v-1h1l1 -1v-1s1 -1 1 -2l75 -122l73 123c2 4 8 7 12 7
+c2 0 5 -1 7 -2s3 -3 4 -5l79 -127l3 5v187c0 8 6 14 14 14h9c8 0 14 -6 14 -14v-127l19 30v1l19 31c2 4 8 6 12 6c6 0 8 -2 11 -6z" />
     <glyph glyph-name="uniE5BB" unicode="&#xe5bb;" horiz-adv-x="662" 
-d="M628 399c23 -38 34 -77 34 -117c0 -47 -16 -95 -48 -148l-77 -128c-2 -4 -8 -6 -12 -6c-6 0 -11 4 -13 9l-74 120l-73 -122c-2 -4 -8 -7 -12 -7s-9 2 -11 6l-79 127l-78 -126c-2 -4 -8 -7 -12 -7c-6 0 -8 3 -11 7l-79 126l-59 -95l-24 15l117 189c2 4 8 6 12 6
-s10 -2 12 -6l78 -126l78 126c2 4 8 6 12 6s10 -2 12 -6l78 -125l73 125c2 4 8 6 12 6s10 -2 12 -6l75 -126l19 32c29 48 43 92 43 135c0 35 -9 69 -29 102c-1 2 -2 5 -2 7c0 7 7 14 14 14c4 0 10 -3 12 -7z" />
+d="M628 399c22 -38 34 -77 34 -117c0 -47 -16 -95 -48 -148l-77 -128c-2 -4 -8 -6 -12 -6c-2 0 -5 1 -7 2s-5 5 -6 7l-74 120l-73 -122c-2 -4 -8 -7 -12 -7c-2 0 -5 1 -7 2s-3 2 -4 4l-79 127l-59 -95l-19 -31c-2 -4 -8 -7 -12 -7c-6 0 -8 3 -11 7l-79 126l-59 -95l-24 15
+l117 189c2 4 8 6 12 6s10 -2 12 -6l78 -126l78 126c2 4 8 6 12 6s10 -2 12 -6l78 -125l73 125c2 4 8 6 12 6s10 -2 12 -6l75 -126l19 32c29 48 43 92 43 135c0 35 -10 68 -29 102c-1 2 -2 5 -2 7c0 4 3 10 7 12c2 1 5 2 7 2c4 0 10 -3 12 -7z" />
     <glyph glyph-name="uniE5BD" unicode="&#xe5bd;" horiz-adv-x="653" 
-d="M570 115l59 95l24 -15l-117 -189c-2 -3 -8 -6 -12 -6s-9 3 -12 6l-78 126l-3 -4v-187c0 -7 -6 -14 -14 -14h-9c-7 0 -14 7 -14 14v128l-38 -62c-3 -4 -8 -7 -12 -7s-10 3 -12 6l-78 125l-73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7l-74 124l-59 -98l-24 14l116 194
-c3 4 6 7 12 7c5 0 10 -3 12 -7l75 -122l73 122c2 4 7 7 12 7c2 0 5 -1 7 -2l4 -4l79 -127l4 6v186c0 7 7 13 14 13h9c8 0 14 -6 14 -13v-127l18 30h1l18 31c2 4 7 7 12 7c6 0 9 -2 12 -6z" />
+d="M570 115l59 95l24 -15l-117 -189c-2 -3 -8 -6 -12 -6v0v0c-4 0 -10 3 -12 6l-78 126l-3 -4v-187c0 -7 -6 -14 -14 -14h-9c-8 0 -14 7 -14 14v0v128l-38 -63c-3 -3 -8 -6 -12 -6v0v0c-4 0 -10 3 -12 6l-78 125l-74 -124c-2 -4 -7 -7 -11 -7v0v0c-5 0 -10 3 -12 7l-74 124
+l-59 -98l-24 14l85 142l31 52c3 4 6 7 12 7v0c5 0 10 -3 12 -7l75 -122l73 122c2 4 7 7 12 7c2 0 5 -1 7 -2l4 -4l79 -127l4 6v186v0c0 7 6 13 14 13h9c8 0 14 -6 14 -14v-126l18 30h1l18 31c2 4 7 7 12 7c6 0 9 -2 12 -6z" />
     <glyph glyph-name="uniE5C6" unicode="&#xe5c6;" horiz-adv-x="702" 
-d="M360 242c3 -5 79 -127 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-2 -4 -8 -7 -12 -7s-9 3 -12 7l-78 126s-76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-78 124 -78 124s-71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7
-c-3 4 -74 124 -74 124s-57 -93 -59 -98c-3 -4 -8 -6 -12 -6c-5 0 -8 2 -11 5s-51 64 -51 168c0 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134c0 0 103 172 105 176c2 3 6 6 12 6s10 -3 12 -6
-c2 -4 75 -123 75 -123s70 118 73 123c2 4 7 6 12 6c4 0 8 -2 11 -6z" />
+d="M360 242c3 -5 79 -127 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189v0c-2 -4 -8 -7 -12 -7v0c-4 0 -9 3 -12 7l-78 126s-76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-78 124 -78 124s-71 -120 -74 -124c-2 -4 -7 -7 -11 -7
+c-5 0 -10 3 -12 7c-3 4 -74 124 -74 124s-57 -93 -59 -98c-3 -4 -8 -6 -12 -6c-5 0 -8 2 -11 5s-51 64 -51 168c0 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134c0 0 103 172 105 176c2 3 6 6 12 6
+s10 -3 12 -6c2 -4 75 -123 75 -123s70 118 73 123c2 4 7 6 11 6c5 0 9 -2 12 -6z" />
     <glyph glyph-name="uniE5C7" unicode="&#xe5c7;" horiz-adv-x="703" 
-d="M574 0c-5 0 -9 3 -12 7l-78 126l-3 -5v-187c0 -7 -6 -13 -14 -13h-9c-7 0 -14 6 -14 13v128c-3 -6 -35 -58 -38 -62c-4 -5 -8 -7 -12 -7s-9 2 -12 7c-3 4 -70 112 -78 124l-73 -124c-1 -1 -5 -7 -12 -7c-6 0 -10 3 -12 7l-74 124l-59 -97c-1 -1 -2 -3 -4 -4
-c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -11 5c-33 41 -51 104 -51 168c-1 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134l105 176c3 3 6 6 11 6s10 -1 13 -6l75 -123l73 123c2 3 6 6 10 6c5 0 7 0 9 -2
-c1 0 3 -3 4 -4l79 -127l4 7v185c0 8 7 14 14 14h9c8 0 14 -6 14 -14v-126l37 61c2 3 7 6 12 6c4 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-1 -1 -4 -7 -12 -7z" />
+d="M574 0c-5 0 -9 3 -12 7l-78 126l-3 -5v-187c0 -7 -6 -13 -14 -13h-9c-8 0 -14 6 -14 13v128c-3 -6 -35 -58 -38 -62c-4 -5 -8 -7 -12 -7s-9 2 -12 7c-3 4 -70 112 -78 124l-73 -124c-1 -1 -5 -7 -12 -7c-6 0 -10 3 -12 7l-74 124l-59 -97c-1 -1 -2 -3 -4 -4
+c-2 -2 -5 -3 -8 -3c-4 0 -9 2 -11 5c-33 41 -51 104 -51 168c0 67 20 136 65 185c2 2 6 4 9 4c8 0 14 -6 14 -14c0 -3 -1 -7 -3 -9c-40 -44 -58 -106 -58 -166c0 -49 12 -98 34 -134l105 176c2 3 6 6 11 6s10 -1 13 -6l75 -123l73 123c2 3 6 6 10 6c5 0 7 -1 9 -2l4 -4
+l79 -127l4 7v185c0 8 6 14 14 14h9c8 0 14 -7 14 -14v-126l37 61c2 3 7 6 11 6c5 0 10 -2 13 -6l78 -127l59 95l24 -14l-117 -189c-1 -1 -4 -7 -12 -7z" />
     <glyph glyph-name="uniE5C8" unicode="&#xe5c8;" horiz-adv-x="565" 
-d="M241 117c7 12 72 121 74 125c2 3 7 7 12 7s9 -3 12 -7l74 -125c5 9 53 89 59 98c3 6 8 7 11 7c4 0 8 -2 11 -5c43 -49 71 -125 71 -203c0 -62 -17 -125 -56 -180c-3 -3 -7 -6 -11 -6c-3 1 -6 1 -8 3c-4 3 -7 8 -7 11s2 6 3 9c36 49 52 107 52 164c0 63 -21 125 -53 169
-l-106 -177c-2 -4 -6 -7 -12 -7c-5 0 -9 3 -12 7l-75 122l-73 -122c-2 -4 -6 -7 -11 -7c-7 0 -10 4 -12 7s-72 114 -79 126l-79 -127c-2 -4 -6 -6 -11 -6c-8 0 -15 6 -15 14s123 204 139 228c3 3 6 7 12 7s9 -3 12 -7z" />
+d="M241 117c7 12 71 121 74 125c2 3 7 7 12 7s9 -3 12 -7l74 -125c5 9 53 89 59 98c3 6 8 7 11 7s8 -2 11 -5c43 -49 71 -125 71 -203c0 -62 -17 -125 -56 -180c-3 -3 -7 -5 -11 -5c-3 0 -6 0 -9 2c-3 3 -6 8 -6 12c0 3 1 5 3 8c36 49 52 107 52 164c0 63 -21 125 -53 169
+l-106 -177c-3 -4 -6 -7 -12 -7c-5 0 -9 3 -12 7l-75 122l-73 -122c-2 -5 -6 -7 -12 -7s-9 4 -11 7c-2 2 -72 114 -79 126l-79 -127c-2 -4 -7 -6 -11 -6c-8 0 -15 6 -15 14c0 3 0 4 2 7s135 218 137 221s6 7 12 7s9 -3 12 -7z" />
     <glyph glyph-name="uniE5E5" unicode="&#xe5e5;" horiz-adv-x="312" 
 d="M15 178h119v119c0 10 11 15 22 15s22 -5 22 -15v-119h119c10 0 15 -11 15 -22s-5 -22 -15 -22h-119v-119c0 -10 -11 -15 -22 -15s-22 5 -22 15v119h-119c-10 0 -15 11 -15 22s5 22 15 22z" />
     <glyph glyph-name="uniE610" unicode="&#xe610;" horiz-adv-x="315" 
@@ -1154,84 +1202,86 @@ d="M28 0h-28v279s6 14 14 14h287c8 0 14 -6 14 -14v-279h-28v202h-259v-202z" />
     <glyph glyph-name="uniE611" unicode="&#xe611;" horiz-adv-x="315" 
 d="M0 14v279h28v-202h259v202h28v-279c0 -8 -6 -14 -14 -14h-287c-8 0 -14 14 -14 14z" />
     <glyph glyph-name="uniE612" unicode="&#xe612;" horiz-adv-x="262" 
-d="M260 337c1 -2 2 -6 2 -9l-1 -3v-1l-117 -315c-2 -5 -8 -9 -13 -9s-11 4 -13 9l-117 315v1l-1 3c0 9 6 15 14 15h14c5 0 11 -4 13 -9l90 -252l90 252c2 5 8 9 13 9h14c4 0 10 -3 12 -6z" />
+d="M260 337c1 -2 2 -6 2 -8c0 -1 -1 -4 -1 -5l-117 -315c-2 -5 -8 -9 -13 -9s-11 4 -13 9l-117 315c0 1 -1 4 -1 5c0 8 6 14 14 14h14c5 0 11 -4 13 -9l90 -252l90 252c2 5 8 9 13 9h14c4 0 10 -3 12 -6z" />
     <glyph glyph-name="uniE613" unicode="&#xe613;" horiz-adv-x="262" 
-d="M260 43c-2 -3 -8 -6 -12 -6h-14c-5 0 -11 4 -13 9l-90 252l-90 -252c-2 -5 -8 -9 -13 -9h-14c-8 0 -14 6 -14 15l1 3v1l117 315c2 5 8 9 13 9s11 -4 13 -9l117 -315v-1l1 -3c0 -3 -1 -7 -2 -9z" />
+d="M260 43c-2 -3 -8 -6 -12 -6h-14c-5 0 -11 4 -13 9l-90 252l-90 -252c-2 -5 -8 -9 -13 -9h-14c-8 0 -14 6 -14 14c0 1 1 4 1 5l117 315c2 5 8 9 13 9s11 -4 13 -9l117 -315c0 -1 1 -4 1 -5c0 -2 -1 -6 -2 -8z" />
     <glyph glyph-name="uniE614" unicode="&#xe614;" horiz-adv-x="181" 
-d="M91 181c50 0 90 -40 90 -90s-40 -91 -90 -91s-91 41 -91 91s41 90 91 90zM91 153c-35 0 -63 -27 -63 -62s28 -63 63 -63s62 28 62 63s-27 62 -62 62z" />
+d="M91 153c-35 0 -63 -27 -63 -62s28 -63 63 -63s62 28 62 63s-27 62 -62 62zM91 181c50 0 90 -40 90 -90s-40 -91 -90 -91s-91 41 -91 91s41 90 91 90z" />
     <glyph glyph-name="uniE615" unicode="&#xe615;" horiz-adv-x="181" 
-d="M91 181c50 0 90 -40 90 -90s-40 -91 -90 -91s-91 41 -91 91s41 90 91 90zM91 153v-125c35 0 62 28 62 63s-27 62 -62 62z" />
+d="M91 153v-125c35 0 62 28 62 63s-27 62 -62 62zM91 181c50 0 90 -40 90 -90s-40 -91 -90 -91s-91 41 -91 91s41 90 91 90z" />
     <glyph glyph-name="uniE630" unicode="&#xe630;" horiz-adv-x="269" 
-d="M148 121v-107c0 -8 -6 -14 -13 -14c-8 0 -14 6 -14 14v107c-68 7 -121 64 -121 134c0 74 60 134 135 134c74 0 134 -60 134 -134c0 -70 -53 -127 -121 -134zM135 361c-59 0 -107 -47 -107 -106c0 -54 40 -99 93 -106v106c0 8 6 14 14 14c7 0 13 -6 13 -14v-106
+d="M148 121v-107c0 -8 -6 -14 -13 -14c-8 0 -14 6 -14 14v107c-68 7 -121 64 -121 134c0 74 60 134 134 134c75 0 135 -60 135 -134c0 -70 -53 -127 -121 -134zM135 361c-59 0 -107 -47 -107 -106c0 -54 40 -99 93 -106v106c0 7 6 14 14 14c7 0 13 -7 13 -14v-106
 c53 7 93 52 93 106c0 59 -48 106 -106 106z" />
     <glyph glyph-name="uniE631" unicode="&#xe631;" horiz-adv-x="269" 
 d="M148 375v-107c68 -7 121 -64 121 -134c0 -74 -60 -134 -134 -134c-75 0 -135 60 -135 134c0 70 53 127 121 134v107c0 8 6 14 14 14c7 0 13 -6 13 -14zM135 28c58 0 106 48 106 106c0 54 -40 99 -93 106v-106c0 -7 -6 -14 -13 -14c-8 0 -14 7 -14 14v106
 c-53 -7 -93 -52 -93 -106c0 -58 48 -106 107 -106z" />
     <glyph glyph-name="uniE632" unicode="&#xe632;" horiz-adv-x="389" 
-d="M375 121h-107c-7 -68 -64 -121 -134 -121c-74 0 -134 60 -134 135c0 74 60 134 134 134c70 0 127 -53 134 -121h107c8 0 14 -6 14 -13c0 -8 -6 -14 -14 -14zM28 135c0 -59 48 -107 106 -107c54 0 99 40 106 93h-106c-7 0 -14 6 -14 14c0 7 7 13 14 13h106
-c-7 53 -52 93 -106 93c-58 0 -106 -47 -106 -106z" />
+d="M375 121h-107c-7 -68 -64 -121 -134 -121c-74 0 -134 60 -134 135c0 74 60 134 134 134c70 0 127 -53 134 -121h107c8 0 14 -6 14 -13c0 -8 -6 -14 -14 -14zM28 135c0 -59 47 -107 106 -107c54 0 99 40 106 93h-106c-7 0 -14 6 -14 14c0 7 7 13 14 13h106
+c-7 53 -52 93 -106 93c-59 0 -106 -48 -106 -106z" />
     <glyph glyph-name="uniE650" unicode="&#xe650;" horiz-adv-x="981" 
-d="M171 352c0 -54 -42 -98 -83 -98s-88 23 -88 98s90 193 244 193c88 0 206 -45 206 -148c0 -45 -28 -79 -74 -79c-34 0 -70 20 -92 66c-3 6 -7 14 -7 21c0 11 6 21 18 21c9 0 18 -9 24 -15c7 -6 25 -23 44 -23c14 0 24 9 24 23c0 25 -25 67 -89 84
-c-19 -10 -52 -84 -52 -106c0 -7 1 -13 5 -19c15 -21 56 -79 61 -85c2 -4 23 -36 23 -69c0 -34 -34 -69 -59 -88c1 0 11 3 43 -31c14 -15 37 -29 56 -29c6 0 11 1 16 4c22 13 31 25 32 26c-4 16 -7 35 -7 56c0 74 32 163 110 163c40 0 74 -32 74 -74c0 -26 -13 -55 -45 -83
-c-40 -34 -61 -53 -63 -55c1 -5 12 -51 54 -51c40 0 78 34 86 44c-1 7 -1 17 -1 28c0 52 15 142 113 176c-33 58 -136 104 -198 127c-2 1 -19 8 -20 22c0 1 0 2 1 3c1 8 7 10 14 11c2 0 3 -1 4 -1c7 0 14 -2 21 -3c64 -11 287 -83 311 -289c1 -8 1 -16 1 -24
-c0 -71 -44 -156 -124 -156c-47 0 -94 34 -109 74c-7 -7 -71 -73 -131 -73c-51 0 -79 67 -82 74c-44 -37 -66 -74 -100 -74c-30 0 -43 8 -62 34c-11 15 -22 41 -39 41c-21 0 -36 -28 -47 -40c-15 -16 -42 -38 -64 -38c-11 0 -20 5 -26 18c-4 7 -5 13 -5 19c0 37 60 63 71 70
-c15 10 49 28 83 57c18 16 26 30 26 43c0 10 -4 19 -10 27c-16 22 -53 65 -70 90c-6 9 -8 20 -8 30c0 23 9 43 10 45c15 39 48 98 56 112c-61 0 -113 -24 -149 -75c-20 -26 -27 -50 -27 -68c0 -20 10 -34 22 -35c2 -1 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25
-c15 0 20 -14 20 -27zM522 273c-26 0 -44 -32 -44 -90c0 -13 1 -27 3 -42c3 3 31 32 54 57c12 13 17 28 17 41c0 19 -11 34 -30 34zM758 61c27 6 40 20 40 84c0 54 -14 88 -29 116c-7 -1 -72 -11 -72 -120c0 -45 23 -81 53 -81c3 0 6 0 8 1zM940 8c-23 0 -42 21 -42 46
-c0 26 19 47 42 47c22 0 41 -21 41 -47c0 -25 -19 -46 -41 -46z" />
+d="M940 8c-23 0 -42 21 -42 46c0 26 19 47 42 47c22 0 41 -21 41 -47c0 -25 -19 -46 -41 -46zM758 61c27 5 40 20 40 84c0 54 -14 88 -29 116c-7 -1 -72 -11 -72 -120c0 -46 23 -81 53 -81c3 0 6 0 8 1zM522 273c-26 0 -44 -32 -44 -90c0 -13 1 -27 3 -42c3 3 31 32 54 57
+c12 13 17 28 17 41c0 19 -11 34 -30 34zM170 352c0 -54 -41 -98 -82 -98s-88 23 -88 98s90 193 244 193c17 0 35 -2 54 -5c111 -20 152 -89 152 -143c0 -28 -11 -52 -28 -64c-14 -10 -30 -15 -46 -15c-34 0 -70 20 -92 65c-3 7 -7 15 -7 22c0 1 -1 1 0 2c0 6 2 11 7 15
+c4 3 7 4 11 4c9 0 18 -9 24 -15c7 -6 25 -23 44 -23c6 0 12 2 18 7c4 3 6 9 6 16c0 25 -25 67 -89 84c-2 -2 -17 -14 -30 -43c-10 -20 -23 -44 -22 -63c0 -7 1 -13 5 -19c15 -21 56 -79 61 -85c2 -4 23 -36 23 -69c0 -8 -2 -15 -5 -22c-15 -37 -50 -63 -54 -66
+c1 0 11 3 43 -31c14 -15 37 -29 56 -29c6 0 11 1 16 4c22 13 31 25 32 26c-5 16 -7 35 -7 56c0 74 31 163 110 163c40 0 74 -32 74 -74c0 -26 -13 -55 -45 -83c-40 -34 -61 -53 -63 -55c1 -5 12 -51 54 -51c40 0 78 34 86 44c-1 7 -1 16 -1 28c0 52 15 142 113 176
+c-4 7 -45 69 -176 119c-7 3 -15 5 -22 8c-2 1 -19 8 -20 22v3c2 8 8 10 15 10h4c7 0 14 -2 21 -3c64 -12 287 -83 311 -289c0 -8 1 -16 1 -24c0 -71 -36 -136 -100 -153c-8 -2 -16 -3 -24 -3c-47 0 -94 34 -109 74c-8 -7 -71 -73 -131 -73c-51 0 -79 67 -82 74
+c-44 -37 -66 -74 -100 -74c-30 0 -43 8 -62 34c-11 15 -22 41 -39 41c-21 0 -36 -28 -48 -40c-14 -16 -41 -38 -63 -38c-11 0 -20 5 -27 18c-3 7 -4 13 -4 19c0 37 60 63 71 70c15 10 49 28 83 57c18 16 26 30 26 43c0 10 -4 19 -10 27c-16 22 -53 65 -70 90
+c-6 9 -9 19 -9 30c0 23 10 43 11 45c15 39 48 98 56 112h-6c-22 0 -94 -7 -143 -75c-20 -26 -27 -50 -27 -68c0 -20 10 -34 22 -35c2 -1 4 -1 6 -1c14 0 25 10 30 32c4 19 14 25 22 24h2c10 0 17 -8 17 -26z" />
     <glyph glyph-name="uniE651" unicode="&#xe651;" horiz-adv-x="450" 
-d="M276 407c0 9 9 19 18 19c10 0 19 -9 25 -15c7 -6 25 -22 43 -22c16 0 25 7 25 23c0 24 -25 67 -89 83c-2 -1 -17 -14 -30 -42c-10 -21 -23 -44 -22 -64c0 -7 1 -13 5 -18c15 -22 56 -79 61 -86c2 -3 23 -35 23 -69c0 -32 -35 -70 -59 -88c1 0 11 3 43 -31
-c14 -15 37 -29 56 -29c6 0 16 2 21 5c10 7 23 17 31 23c3 3 7 5 11 5c7 0 12 -4 12 -11c0 -4 -1 -7 -3 -12c-21 -34 -81 -85 -115 -85c-30 0 -43 8 -62 34c-11 16 -22 41 -39 41c-21 0 -36 -27 -48 -40c-15 -16 -41 -38 -63 -38c-11 0 -20 5 -27 18c-3 7 -4 13 -4 19
-c0 38 60 63 71 70c15 10 49 28 83 57c18 16 26 30 26 44c0 9 -4 18 -10 27c-16 21 -53 64 -70 89c-6 9 -9 20 -9 30c0 23 10 43 11 45c15 40 48 98 56 112c-76 0 -176 -59 -176 -143c0 -20 10 -33 22 -35c2 0 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25
-c16 0 19 -12 19 -26c0 -54 -41 -99 -82 -99s-88 23 -88 98c0 76 90 193 243 193c89 0 207 -43 207 -148c0 -46 -29 -79 -75 -79c-33 0 -69 21 -91 66c-1 1 -8 14 -8 23z" />
+d="M276 407c0 7 3 11 8 15c4 3 7 4 10 4c10 0 19 -9 25 -15c7 -6 25 -22 43 -22c7 0 13 1 19 6c4 3 6 9 6 17c0 24 -25 67 -89 83c-2 -1 -17 -14 -30 -42c-10 -21 -23 -45 -22 -64c0 -7 1 -13 5 -18c15 -22 56 -79 61 -86c2 -3 23 -36 23 -69c0 -7 -2 -15 -5 -22
+c-15 -37 -50 -63 -54 -66c1 0 11 3 43 -31c14 -15 36 -29 56 -29c6 0 16 2 21 5c10 7 23 17 31 23c3 3 7 5 11 5c7 0 12 -4 12 -11c0 -4 -1 -7 -3 -12c-21 -34 -81 -85 -115 -85c-30 0 -43 8 -62 34c-11 16 -22 41 -39 41c-21 0 -36 -28 -48 -40c-15 -16 -41 -38 -63 -37
+c-11 0 -20 4 -27 17c-3 7 -4 13 -4 19c0 37 60 63 71 70c15 10 49 28 83 57c18 16 26 30 26 44c0 9 -4 18 -10 27c-16 21 -53 64 -70 89c-6 9 -9 20 -9 30c0 23 10 43 11 45c15 40 48 98 56 112h-6h-4c-26 0 -93 -10 -140 -75c-19 -26 -26 -50 -26 -68c0 -20 10 -33 22 -35
+c2 -1 4 -1 6 -1c14 1 25 10 30 32c4 19 14 25 22 25h2c10 -1 17 -9 17 -27c0 -54 -41 -98 -82 -98s-88 23 -88 98s90 193 243 193c18 0 36 -1 55 -5c111 -20 152 -88 152 -143c0 -28 -11 -52 -28 -64c-14 -10 -30 -15 -47 -15c-33 0 -69 21 -92 66c0 1 -7 14 -7 23z" />
     <glyph glyph-name="uniE652" unicode="&#xe652;" horiz-adv-x="227" 
 d="M215 98l12 -32s-65 -73 -130 -73s-91 105 -91 105c-4 16 -7 35 -7 56c0 74 31 163 110 163c40 0 74 -33 74 -75c0 -25 -13 -55 -45 -82c-40 -34 -63 -55 -63 -55s12 -51 54 -51c40 0 78 33 86 44zM105 273c-26 0 -44 -32 -44 -90c0 -13 1 -27 3 -42c0 0 31 31 54 57
-c12 13 17 28 17 41c0 19 -11 34 -30 34z" />
+c11 13 17 28 17 41c0 19 -11 34 -30 34z" />
     <glyph glyph-name="uniE653" unicode="&#xe653;" horiz-adv-x="350" 
-d="M222 -9c-60 0 -113 56 -116 115c-1 5 -1 13 -1 23c0 48 13 139 113 173c-33 51 -139 112 -199 127c0 0 -21 9 -19 25c1 8 7 11 15 11c7 0 16 -2 24 -4c64 -11 287 -82 311 -289c1 -8 1 -16 1 -24c0 -75 -46 -157 -129 -157zM232 61c26 5 39 20 39 84c0 54 -14 88 -29 116
-c0 0 -72 -11 -72 -120c0 -45 24 -81 53 -81c3 0 6 0 9 1z" />
+d="M134 36c-19 24 -27 50 -28 70c-1 5 -1 13 -1 23c0 48 13 139 113 173c0 0 -45 69 -176 119c-7 3 -15 6 -23 8c0 0 -21 9 -19 25c1 8 7 11 15 11c7 0 16 -2 24 -4c64 -11 287 -82 311 -289c1 -8 1 -16 1 -24c0 -71 -36 -136 -100 -153c-10 -3 -20 -4 -29 -4
+c-40 0 -70 22 -88 45zM232 61c26 5 39 20 39 84c0 54 -14 88 -29 116c0 0 -72 -11 -72 -120c0 -46 24 -81 53 -81c3 0 6 0 9 1z" />
     <glyph glyph-name="uniE654" unicode="&#xe654;" horiz-adv-x="83" 
 d="M41 8c-23 0 -41 20 -41 46s18 47 41 47s42 -21 42 -47s-19 -46 -42 -46z" />
     <glyph glyph-name="uniE655" unicode="&#xe655;" horiz-adv-x="473" 
-d="M114 48c-32 0 -66 34 -66 66c0 19 12 32 31 32c6 0 11 -1 16 -3c6 -2 12 -4 16 -4s8 2 13 7l25 24c7 7 3 19 -1 28v1c-5 10 -12 22 -21 22h-34c-15 0 -15 -7 -22 -19s-18 -23 -31 -23c-22 0 -40 25 -40 57s18 58 40 58c13 0 24 -11 31 -23s7 -20 22 -20h34
-c9 0 16 12 20 21c0 0 0 1 1 2c4 9 8 22 1 29l-24 24c-5 5 -9 6 -13 6c-5 0 -10 -2 -17 -4c-5 -1 -10 -2 -15 -2c-20 0 -32 12 -32 32c0 32 34 66 66 66c19 0 32 -12 32 -31c0 -6 -1 -11 -3 -16c-2 -6 -4 -11 -4 -16s2 -9 7 -14l24 -24c3 -3 6 -4 10 -4c6 0 13 3 18 5h1l1 1
-c9 4 21 11 21 20v34c0 15 -7 15 -19 22s-23 18 -23 31c0 22 25 40 57 40s58 -18 58 -40c0 -13 -11 -24 -23 -31s-20 -7 -20 -22v-34c0 -9 12 -16 21 -20c0 0 1 0 2 -1c5 -2 12 -5 18 -5c4 0 8 1 11 4l24 24c5 5 6 9 6 13c0 5 -2 10 -4 17c-1 5 -2 10 -2 15c0 19 11 32 31 32
-c32 0 67 -35 67 -67c0 -20 -13 -31 -32 -31c-5 0 -10 1 -15 2c-7 2 -12 4 -17 4c-4 0 -8 -1 -13 -6l-24 -24c-7 -7 -3 -20 1 -29c5 -11 12 -23 21 -23h34c15 0 15 8 22 20s18 23 31 23c22 0 40 -26 40 -58s-18 -57 -40 -57c-13 0 -24 11 -31 23s-7 19 -22 19h-34
-c-9 0 -16 -12 -21 -22v-1c-4 -9 -8 -21 -1 -28l24 -24c5 -5 9 -7 14 -7s10 2 16 4c5 2 10 3 16 3c19 0 31 -13 31 -32c0 -32 -34 -66 -66 -66c-20 0 -32 12 -32 32c0 5 1 10 2 15c2 7 4 12 4 17c0 4 -1 7 -6 12l-24 25c-3 3 -7 4 -11 4c-12 0 -41 -13 -41 -26v-34
-c0 -15 8 -15 20 -22s23 -18 23 -31c0 -22 -26 -40 -58 -40s-57 18 -57 40c0 13 11 24 23 31s19 7 19 22v34c0 9 -12 16 -21 20l-1 1h-1c-5 2 -12 5 -18 5c-4 0 -7 -1 -10 -4l-24 -25c-5 -5 -7 -9 -7 -13s2 -10 4 -16c2 -5 3 -10 3 -16c0 -19 -13 -31 -32 -31zM173 236
-c0 -32 31 -63 63 -63c33 0 64 30 64 63c0 35 -29 64 -64 64s-63 -29 -63 -64z" />
+d="M69 69c-14 14 -21 30 -21 45c0 9 3 18 9 24c5 5 14 8 22 8c6 0 11 -1 16 -3c6 -2 12 -4 16 -4s8 2 13 7l25 24c7 7 3 19 -1 28v1c0 1 -1 0 -1 1c-4 9 -11 21 -20 21h-34c-15 0 -15 -7 -22 -19s-18 -23 -31 -23c-22 0 -40 25 -40 57s18 58 40 58c13 0 24 -11 31 -23
+s7 -20 22 -20h34c9 0 16 12 20 21c0 1 1 1 1 2c4 9 8 22 1 29l-24 24c-5 5 -9 6 -13 6c-5 0 -10 -2 -17 -4c-5 -1 -10 -2 -15 -2c-9 0 -17 2 -23 8s-9 15 -9 24c0 15 7 31 21 45s30 21 45 21c9 0 18 -3 24 -9c5 -5 8 -14 8 -22c0 -6 -1 -11 -3 -16c-2 -6 -4 -11 -4 -16
+s2 -9 7 -14l24 -24c7 -7 19 -3 28 1h1l1 1c9 4 21 11 21 20v34c0 15 -7 15 -19 22s-23 18 -23 31c0 22 25 40 57 40s58 -18 58 -40c0 -13 -11 -24 -23 -31s-20 -7 -20 -22v-34c0 -9 12 -16 21 -20c1 0 1 -1 2 -1c9 -4 22 -8 29 -1l24 24c5 5 6 9 6 13c0 5 -2 10 -4 17
+c-1 5 -2 10 -2 15c0 9 2 17 8 23s14 9 23 9c15 0 32 -8 46 -22s21 -31 21 -45c0 -9 -3 -17 -9 -23s-14 -8 -23 -8c-5 0 -10 1 -15 2c-7 2 -12 4 -17 4c-4 0 -8 -1 -13 -6l-24 -24c-7 -7 -3 -20 1 -29c0 -1 1 -1 1 -2c4 -9 11 -21 20 -21h34c15 0 15 8 22 20s18 23 31 23
+c22 0 40 -26 40 -58s-18 -57 -40 -57c-13 0 -24 11 -31 23s-7 19 -22 19h-34c-9 0 -16 -12 -20 -21c0 -1 -1 -1 -1 -1v-1c-4 -9 -8 -21 -1 -28l24 -24c5 -5 9 -7 14 -7s10 2 16 4c5 2 10 3 16 3c8 0 17 -3 22 -8c6 -6 9 -15 9 -24c0 -15 -7 -31 -21 -45s-30 -21 -45 -21
+c-9 0 -18 3 -24 9s-8 14 -8 23c0 5 1 10 2 15c2 7 4 12 4 17c0 4 -1 7 -6 12l-24 25c-7 7 -20 3 -29 -1c-1 0 -1 -1 -2 -1c-9 -4 -21 -11 -21 -20v-34c0 -15 8 -15 20 -22s23 -18 23 -31c0 -22 -26 -40 -58 -40s-57 18 -57 40c0 13 11 24 23 31s19 7 19 22v34
+c0 9 -12 16 -21 20l-1 1h-1c-9 4 -21 8 -28 1l-24 -25c-5 -5 -7 -9 -7 -13s2 -10 4 -16c2 -5 3 -10 3 -16c0 -8 -3 -17 -8 -22c-6 -6 -15 -9 -24 -9c-15 0 -31 7 -45 21zM192 192c10 -10 30 -19 44 -19s35 9 45 19s19 30 19 44c0 35 -29 64 -64 64s-63 -29 -63 -64
+c0 -14 9 -34 19 -44z" />
     <glyph glyph-name="uniE880" unicode="&#xe880;" horiz-adv-x="273" 
-d="M273 233c0 -128 -79 -240 -170 -240c-62 0 -103 51 -103 129c0 94 62 241 173 241c61 0 100 -50 100 -130zM170 337c-61 0 -96 -236 -96 -282c0 -22 12 -36 30 -36c24 0 40 23 60 89c18 58 34 146 34 186c0 27 -11 43 -28 43z" />
+d="M273 233c0 -128 -79 -240 -170 -240c-62 0 -103 51 -103 129c0 60 21 125 54 170c35 47 75 71 119 71c61 0 100 -50 100 -130zM107 241c-17 -61 -33 -150 -33 -186c0 -22 12 -36 30 -36c24 0 40 23 60 89c18 58 34 146 34 186c0 27 -11 43 -28 43c-24 0 -45 -32 -63 -96z
+" />
     <glyph glyph-name="uniE881" unicode="&#xe881;" horiz-adv-x="239" 
 d="M239 363l-78 -289c-5 -17 -7 -27 -7 -32c0 -11 8 -14 41 -14h26l-5 -28h-216l4 28h26c24 1 34 2 39 7c3 3 5 5 7 13c1 2 3 11 7 26l52 194c3 8 3 14 3 19c0 10 -4 14 -22 14h-47l7 25c52 2 118 20 141 37h22z" />
     <glyph glyph-name="uniE882" unicode="&#xe882;" horiz-adv-x="297" 
 d="M256 128l22 -8l-44 -120h-234v4c0 21 25 49 90 106c50 44 77 68 92 88c20 24 31 53 31 78c0 32 -23 55 -56 55c-28 0 -55 -18 -55 -36c0 -8 3 -10 20 -18c18 -8 27 -20 27 -37c0 -25 -17 -42 -42 -42c-29 0 -50 24 -50 57c0 62 54 107 129 107c32 0 61 -9 80 -24
 c18 -16 31 -43 31 -69c0 -35 -21 -71 -62 -102c-10 -8 -10 -9 -99 -62c-29 -18 -43 -28 -51 -36h101c36 1 45 7 65 49z" />
     <glyph glyph-name="uniE883" unicode="&#xe883;" horiz-adv-x="279" 
-d="M179 185c42 -10 74 -27 74 -77c0 -66 -60 -116 -142 -116c-68 0 -111 32 -111 83c0 31 19 52 47 52c25 0 41 -16 41 -39c0 -18 -9 -30 -26 -36c-9 -3 -11 -4 -11 -10c0 -12 22 -24 44 -24c56 0 74 62 74 108c0 31 -11 48 -34 48c-5 0 -5 0 -16 -3c-3 -1 -9 -2 -12 -2
-c-11 0 -18 6 -18 17s7 18 17 18c4 0 7 -1 13 -3c7 -3 11 -3 17 -3c40 0 63 53 63 87c0 31 -17 50 -45 50c-21 0 -42 -10 -42 -21c0 -3 0 -3 9 -10c11 -9 16 -19 16 -31c0 -21 -17 -37 -39 -37c-25 0 -42 18 -42 45c0 46 50 81 114 81c65 0 109 -34 109 -83
-c0 -60 -50 -83 -100 -94z" />
+d="M224 168c17 -12 29 -36 29 -60c0 -66 -60 -116 -142 -116c-68 0 -111 32 -111 83c0 31 19 52 47 52c25 0 41 -16 41 -39c0 -18 -9 -30 -26 -36c-9 -3 -11 -4 -11 -10c0 -12 22 -24 44 -24s44 12 55 31c12 21 19 50 19 77c0 31 -11 48 -34 48c-5 0 -5 0 -16 -3
+c-3 -1 -9 -2 -12 -2c-11 0 -18 6 -18 17s7 18 17 18c4 0 7 -1 13 -3c7 -3 11 -3 17 -3c15 0 25 5 36 18c18 20 27 44 27 69c0 31 -17 50 -45 50c-21 0 -42 -10 -42 -21c0 -3 0 -3 9 -10c11 -9 16 -19 16 -31c0 -21 -17 -37 -39 -37c-25 0 -42 18 -42 45c0 46 50 81 114 81
+c65 0 109 -34 109 -83c0 -27 -14 -54 -37 -70c-17 -12 -32 -17 -63 -24c25 -6 35 -10 45 -17z" />
     <glyph glyph-name="uniE884" unicode="&#xe884;" horiz-adv-x="286" 
 d="M282 128l-6 -33h-62l-5 -21c-5 -17 -7 -27 -7 -32c0 -11 8 -14 41 -14h9l-4 -28h-186l3 28h13c24 1 34 2 39 7c3 3 5 5 7 13c2 5 2 10 7 26l5 21h-136v28l237 240h49l-63 -235h59zM145 129l39 141l-138 -141h99z" />
     <glyph glyph-name="uniE885" unicode="&#xe885;" horiz-adv-x="295" 
 d="M54 201l47 163c42 -10 79 -15 113 -15c28 0 49 5 72 14c3 1 5 1 6 1c2 0 3 -1 3 -4c0 -16 -14 -42 -30 -56c-22 -19 -50 -27 -91 -27c-23 0 -23 0 -64 9l-20 -67c26 10 45 14 68 14c63 0 104 -36 104 -93c0 -84 -66 -146 -156 -146c-65 0 -106 32 -106 81
 c0 31 18 52 47 52c25 0 41 -16 41 -39c0 -20 -10 -33 -30 -40c-5 -2 -6 -3 -6 -6c0 -11 20 -22 43 -22c46 0 82 50 82 113c0 42 -19 67 -52 67c-13 0 -21 -2 -47 -13c-3 -20 -12 -30 -27 -30c-10 0 -17 8 -17 18c0 11 7 20 20 26z" />
     <glyph glyph-name="uniE886" unicode="&#xe886;" horiz-adv-x="279" 
-d="M158 224c55 0 94 -37 94 -91c0 -75 -64 -138 -142 -138c-67 0 -110 48 -110 126c0 108 71 244 193 244c50 0 86 -27 86 -64c0 -26 -17 -43 -43 -43c-23 0 -41 15 -41 36c0 10 4 19 12 28c3 4 4 5 4 8c0 5 -8 9 -18 9c-55 0 -82 -96 -93 -136c20 16 34 21 58 21zM136 193
-c-50 0 -58 -83 -58 -119s11 -55 33 -55c47 0 58 89 58 123c0 33 -12 51 -33 51z" />
+d="M158 224c55 0 94 -37 94 -91c0 -75 -64 -138 -142 -138c-67 0 -110 48 -110 126c0 60 22 125 59 173s81 71 134 71c50 0 86 -27 86 -64c0 -26 -17 -43 -43 -43c-23 0 -41 15 -41 36c0 10 4 19 12 28c3 4 4 5 4 8c0 5 -8 9 -18 9c-19 0 -38 -13 -55 -39
+c-13 -20 -24 -46 -38 -97c20 16 34 21 58 21zM90 152c-8 -20 -12 -51 -12 -78c0 -36 11 -55 33 -55c17 0 32 12 41 34c10 26 17 59 17 89c0 33 -12 51 -33 51c-20 0 -36 -13 -46 -41z" />
     <glyph glyph-name="uniE887" unicode="&#xe887;" horiz-adv-x="272" 
-d="M271 365l1 -19c-95 -163 -117 -209 -131 -289c-7 -32 -13 -62 -54 -62c-27 0 -46 17 -46 42c0 34 13 52 149 228l19 25h-113c-29 0 -43 -12 -64 -50l-8 -15l-24 7l53 133c42 -5 63 -5 97 -5c36 0 64 1 121 5z" />
+d="M271 365l1 -19c-95 -163 -117 -209 -131 -289c-5 -24 -6 -30 -12 -40c-8 -13 -24 -22 -42 -22c-27 0 -46 17 -46 42c0 34 13 52 149 228l19 25h-109h-4c-29 0 -43 -12 -64 -50l-8 -15l-24 7l53 133c42 -5 63 -5 97 -5c36 0 64 1 121 5z" />
     <glyph glyph-name="uniE888" unicode="&#xe888;" horiz-adv-x="283" 
-d="M260 109c0 -67 -60 -114 -145 -114c-69 0 -115 34 -115 84c0 51 45 82 88 98c-27 24 -38 46 -38 77c0 65 53 111 129 111c62 0 104 -33 104 -82c0 -39 -23 -65 -74 -84c33 -21 51 -53 51 -90zM226 282c0 36 -21 57 -55 57s-58 -23 -58 -54c0 -22 9 -34 35 -50
-c7 -4 12 -8 40 -22c28 21 38 40 38 69zM62 81c0 -37 26 -61 64 -61s67 26 67 59c0 25 -14 43 -46 61c-4 3 -4 2 -24 12c-6 3 -7 4 -15 8c-30 -17 -46 -46 -46 -79z" />
+d="M260 109c0 -67 -60 -114 -145 -114c-69 0 -115 34 -115 84c0 27 14 53 38 71c13 10 28 19 50 27c-27 24 -38 46 -38 77c0 65 53 111 129 111c62 0 104 -33 104 -82c0 -39 -23 -65 -74 -84c33 -21 51 -53 51 -90zM62 81c0 -37 26 -61 64 -61s67 26 67 59
+c0 25 -14 43 -46 61c-4 3 -4 2 -24 12c-6 3 -7 4 -15 8c-30 -17 -46 -46 -46 -79zM226 282c0 36 -21 57 -55 57s-58 -23 -58 -54c0 -22 9 -34 35 -50c7 -4 12 -8 40 -22c28 21 38 40 38 69z" />
     <glyph glyph-name="uniE889" unicode="&#xe889;" horiz-adv-x="279" 
-d="M121 141c-55 0 -94 37 -94 91c0 75 65 138 143 138c67 0 109 -48 109 -126c0 -108 -72 -244 -193 -244c-50 0 -86 27 -86 64c0 26 18 43 44 43c23 0 40 -15 40 -36c0 -10 -4 -18 -12 -27c-3 -4 -4 -6 -4 -9c0 -5 8 -9 18 -9c55 0 82 96 93 136c-20 -16 -34 -21 -58 -21z
-M169 347c-49 0 -58 -88 -58 -123c0 -33 11 -52 32 -52c50 0 59 84 59 120s-11 55 -33 55z" />
+d="M121 141c-55 0 -94 37 -94 91c0 75 65 138 143 138c67 0 109 -48 109 -126c0 -60 -22 -125 -59 -173s-82 -71 -134 -71c-50 0 -86 27 -86 64c0 26 18 43 44 43c23 0 40 -15 40 -36c0 -10 -4 -18 -12 -27c-3 -4 -4 -6 -4 -9c0 -5 8 -9 18 -9c19 0 38 13 55 39
+c13 20 24 46 38 97c-20 -16 -34 -21 -58 -21zM127 313c-10 -25 -16 -59 -16 -89c0 -33 11 -52 32 -52c20 0 36 13 46 41c8 20 13 52 13 79c0 36 -11 55 -33 55c-18 0 -33 -12 -42 -34z" />
     <glyph glyph-name="uniE88A" unicode="&#xe88a;" horiz-adv-x="111" 
 d="M70 186c-23 0 -37 18 -37 39c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44zM37 58c-23 0 -37 18 -37 39c0 25 18 43 41 43c22 0 37 -18 37 -38c0 -26 -19 -44 -41 -44z" />
     <glyph glyph-name="uniE93C" unicode="&#xe93c;" 
-d="M330 -9l-154 -120c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -8zM198 -80l73 57l-133 104l-74 -58z" />
+d="M330 -9l-154 -120c-2 -2 -5 -3 -9 -3c-3 0 -6 1 -8 3l-154 120c-3 2 -5 6 -5 9c0 4 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c3 -2 5 -6 5 -9c0 -4 -2 -7 -5 -9zM197 -80l74 57l-133 104l-74 -58z" />
     <glyph glyph-name="uniE93D" unicode="&#xe93d;" 
-d="M330 -10l-154 -119c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c4 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z" />
+d="M330 -10l-154 -119c-2 -2 -5 -3 -9 -3c-3 0 -6 1 -8 3l-154 119c-3 3 -5 6 -5 10c0 3 2 7 5 9l154 121c2 2 5 3 8 3c4 0 7 -1 9 -3l154 -121c3 -2 5 -6 5 -10c0 -3 -2 -6 -5 -9z" />
     <glyph glyph-name="uniEAA4" unicode="&#xeaa4;" horiz-adv-x="220" 
 d="M233 202c0 0 4 -3 4 -8c0 -2 -1 -5 -4 -8l-48 -48c-8 -9 -27 -21 -48 -21c-10 0 -21 3 -32 11c-10 9 -74 63 -74 63s-3 3 -7 3c-2 0 -4 -1 -6 -3l-11 -11s-4 -3 -7 -3s-6 1 -9 4c-8 7 -14 14 -14 14s-4 4 -4 9c0 3 1 5 4 8l48 48c8 9 27 21 48 21c10 0 21 -3 32 -11
 c10 -9 74 -64 74 -64s2 -3 6 -3c2 0 4 1 6 3l11 11s4 3 7 3s7 -1 10 -4c8 -7 14 -14 14 -14z" />
@@ -1243,260 +1293,266 @@ d="M-18 85c0 0 6 7 14 14c3 3 7 4 10 4s5 -1 7 -3l11 -11c2 -2 4 -3 6 -3c4 0 6 3 6
 s-64 -54 -74 -63c-11 -8 -22 -11 -32 -11c-21 0 -40 12 -48 21l-48 48c-3 3 -4 6 -4 8c0 5 4 8 4 8z" />
     <glyph glyph-name="uniEAAD" unicode="&#xeaad;" horiz-adv-x="259" 
 d="M41 255l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20l-208 -147c-4 -2 -10 -4 -14 -4c-13 0 -24 11 -24 24c0 5 2 11 5 15l54 71c3 4 5 9 5 14c0 16 -16 30 -34 30c-8 0 -16 -3 -23 -10c-2 -1 -4 -2 -7 -2s-6 1 -10 4s-10 10 -14 14c0 0 -3 2 -3 7c0 2 1 6 3 9
-c27 32 50 42 93 42l-65 85c-3 4 -4 11 -4 15c0 14 10 25 24 25c4 0 10 -3 14 -5z" />
+c5 6 15 16 21 21c13 11 35 21 62 21h10l-65 85c-3 4 -4 11 -4 15c0 14 10 25 24 25c4 0 10 -3 14 -5z" />
     <glyph glyph-name="uniEAAE" unicode="&#xeaae;" horiz-adv-x="259" 
-d="M249 68l-208 -147c-4 -2 -10 -5 -14 -5c-14 0 -24 11 -24 25c0 4 1 11 4 15l65 85c-42 0 -66 9 -93 42c-2 3 -3 7 -3 9c0 5 3 7 3 7c4 4 10 11 14 14s7 4 10 4s5 -1 7 -2c7 -7 15 -10 23 -10c18 0 34 14 34 30c0 5 -2 10 -5 14l-54 71c-3 4 -5 10 -5 15c0 13 11 24 24 24
-c4 0 10 -2 14 -4l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20z" />
+d="M249 68l-208 -147c-4 -2 -10 -5 -14 -5c-14 0 -24 11 -24 25c0 4 1 11 4 15l65 85h-10c-27 0 -49 10 -62 21c-6 5 -16 15 -21 21c-2 3 -3 7 -3 9c0 5 3 7 3 7c4 4 10 11 14 14s7 4 10 4s5 -1 7 -2c7 -7 15 -10 23 -10c18 0 34 14 34 30c0 5 -2 10 -5 14l-54 71
+c-3 4 -5 10 -5 15c0 13 11 24 24 24c4 0 10 -2 14 -4l208 -147c6 -4 10 -13 10 -20s-4 -16 -10 -20z" />
     <glyph glyph-name="uniECA3" unicode="&#xeca3;" horiz-adv-x="425" 
-d="M425 863v-809c-4 -125 -164 -226 -281 -226c-8 0 -15 1 -23 1c-66 8 -121 45 -121 116c0 66 54 143 140 190c46 25 95 38 141 38c31 0 62 -6 89 -21v712zM357 26c13 12 21 29 21 45c0 27 -22 48 -49 48c-7 0 -14 -1 -21 -3c0 -1 -1 -1 -2 -1c-63 -16 -259 -119 -259 -185
-c0 -8 2 -16 6 -23c10 -15 27 -23 46 -23c61 0 218 98 258 142z" />
+d="M425 863v-809v0c-2 -66 -55 -141 -140 -187c-46 -25 -95 -39 -141 -39c-8 0 -15 1 -23 2c-51 5 -89 26 -108 62c-9 17 -13 34 -13 53c0 66 54 143 140 190c46 25 95 38 141 38c8 0 15 -1 22 -1c26 -3 49 -10 67 -20v711h55zM357 26c13 12 21 29 21 45c0 8 -2 16 -6 23
+c-10 17 -25 25 -44 25c-6 0 -13 -1 -20 -3c0 -1 -1 -1 -3 -1c-31 -8 -78 -30 -125 -58c-47 -27 -91 -58 -112 -82c-14 -15 -21 -30 -21 -45c0 -8 2 -16 6 -23c10 -15 27 -23 46 -23c7 0 14 1 21 3c30 8 78 30 126 57c47 28 90 59 111 82z" />
     <glyph glyph-name="uniECA5" unicode="&#xeca5;" horiz-adv-x="425" 
-d="M425 863v-809c-2 -126 -162 -227 -280 -227c-74 0 -146 40 -146 120c6 128 163 226 280 226c31 0 64 -6 91 -22v712h55z" />
+d="M424 862v-808v0c0 -66 -53 -143 -139 -189c-47 -25 -96 -37 -140 -37c-59 0 -109 22 -132 64c-9 17 -14 35 -14 55c1 23 7 48 20 73c24 45 67 86 120 115c46 25 95 38 140 38c8 0 15 -1 22 -1c27 -3 50 -10 69 -21v712z" />
     <glyph glyph-name="uniECA7" unicode="&#xeca7;" horiz-adv-x="712" 
-d="M551 608c98 -123 160 -202 160 -370c0 -67 -8 -176 -53 -287v-1c-4 -9 -8 -20 -18 -20c-2 0 -4 1 -6 2c-8 3 -10 9 -10 16c0 6 1 12 3 18c22 86 33 155 33 258c0 190 -162 314 -235 360v-530c0 -127 -161 -226 -279 -226c-74 0 -146 36 -146 117c0 128 166 227 280 227
-c7 0 15 -1 22 -1c26 -3 49 -10 68 -21v730c0 9 7 19 18 20c2 1 3 1 4 1c15 0 19 -10 20 -14c0 0 1 -3 2 -7c2 -11 9 -38 10 -41c0 0 1 -1 1 -2c17 -51 24 -72 49 -115c23 -39 35 -62 77 -114z" />
+d="M711 263v-25c0 -67 -8 -176 -53 -287v-1c-4 -9 -8 -20 -18 -20c-2 0 -4 1 -6 2c-8 3 -10 9 -10 16c0 6 1 12 3 18c22 86 33 155 33 258c0 189 -162 314 -235 360v-530v0v0v0c0 -66 -53 -143 -139 -189c-47 -25 -96 -37 -140 -37c-60 0 -110 22 -133 64
+c-9 17 -13 34 -13 53c0 24 7 49 20 74c24 46 67 87 120 115c45 25 94 38 140 38c7 0 15 -1 22 -1c26 -3 49 -10 68 -21v495v47v171v15v2c0 9 7 19 18 20c2 1 3 1 4 1c15 0 19 -10 20 -14c0 -1 1 -3 1 -7c3 -11 10 -38 11 -41c0 0 1 -1 1 -3c17 -50 24 -71 49 -114
+c22 -39 35 -62 77 -114c0 0 36 -45 68 -88c32 -44 86 -121 92 -257z" />
     <glyph glyph-name="uniECA9" unicode="&#xeca9;" horiz-adv-x="712" 
-d="M700 126c10 -35 11 -64 11 -89c0 -69 -7 -113 -29 -171c0 -2 -5 -18 -20 -18c-2 0 -5 0 -7 1c-10 3 -12 11 -12 19c0 6 1 11 2 14c12 41 18 78 18 111c0 66 -22 117 -54 163c-41 58 -124 134 -183 159v-261c0 -123 -155 -226 -280 -226c-26 0 -146 7 -146 118
-c0 110 144 226 280 226c57 0 87 -20 91 -22c0 75 -1 747 -1 756c0 8 7 20 20 20c14 0 20 -6 22 -14c20 -92 59 -184 139 -279s160 -201 160 -345c0 -117 -10 -158 -11 -162zM563 320c33 -31 67 -67 97 -111c0 251 -168 352 -234 400c0 -50 16 -174 137 -289z" />
+d="M563 320c33 -31 67 -67 97 -111c0 251 -168 352 -235 400c0 -50 17 -174 138 -289zM700 126c10 -35 11 -64 11 -89c0 -69 -7 -113 -29 -171c0 -1 -5 -18 -20 -18c-2 0 -5 0 -7 1c-10 3 -12 12 -12 19c0 6 1 11 2 14c12 41 17 78 17 111c0 66 -21 117 -53 163
+c-42 58 -124 134 -184 159v-261c0 -123 -154 -226 -279 -226c-26 0 -146 7 -146 118c0 110 144 226 280 226c57 0 87 -20 91 -22c0 74 -1 747 -1 756c0 8 7 20 20 20c14 0 20 -6 22 -14c20 -92 59 -184 139 -279s160 -201 160 -345c0 -117 -10 -158 -11 -162z" />
     <glyph glyph-name="uniECB7" unicode="&#xecb7;" horiz-adv-x="155" 
 d="M78 78c43 0 77 -35 77 -78s-34 -78 -77 -78s-78 35 -78 78s35 78 78 78z" />
     <glyph glyph-name="uniED10" unicode="&#xed10;" horiz-adv-x="187" 
-d="M94 255c67 0 93 -76 93 -132c0 -73 -40 -128 -93 -128s-94 55 -94 130s40 130 94 130zM68 214c-3 -12 -6 -51 -6 -89c0 -43 3 -81 8 -93c4 -12 12 -18 23 -18s21 7 25 22c3 12 6 51 6 88c0 45 -3 82 -7 94c-5 12 -13 18 -24 18c-12 0 -21 -7 -25 -22z" />
+d="M156 224c21 -27 31 -58 31 -101c0 -73 -40 -128 -93 -128s-94 55 -94 130s40 130 94 130c24 0 45 -11 62 -31zM68 214c-3 -12 -6 -51 -6 -89c0 -43 3 -81 8 -93c4 -12 12 -18 23 -18s21 7 25 22c3 12 6 51 6 88c0 45 -3 82 -7 94c-5 12 -13 18 -24 18
+c-12 0 -21 -7 -25 -22z" />
     <glyph glyph-name="uniED11" unicode="&#xed11;" horiz-adv-x="147" 
-d="M104 255v-203c0 -22 0 -23 2 -27c3 -4 10 -5 30 -5h11v-20h-144v20h12c19 0 26 1 30 5c2 2 2 4 2 9v18v128v10c0 20 -4 20 -32 20h-15v20c43 1 69 8 91 25h13z" />
+d="M104 255v-203c0 -22 0 -24 2 -27c3 -4 10 -6 30 -6h11v-19h-144v20h12c19 0 26 1 30 5c2 2 2 3 2 9v18v128v10c0 19 -4 20 -32 20h-15v20c43 1 69 8 91 25h13z" />
     <glyph glyph-name="uniED12" unicode="&#xed12;" horiz-adv-x="184" 
-d="M165 96h19l-8 -97c-11 1 -15 1 -22 1h-135c-5 0 -14 -1 -19 -1v17c18 25 32 42 72 84c38 41 50 62 50 92c0 27 -15 42 -40 42c-18 0 -37 -12 -37 -24c0 -2 2 -5 6 -6c16 -8 23 -17 23 -33c0 -18 -12 -30 -30 -30c-22 0 -36 16 -36 41c0 41 38 73 87 73
+d="M165 96h19l-8 -97c-11 1 -15 1 -22 1h-135c-5 0 -14 -1 -19 -1v17c18 25 32 42 72 84c38 41 50 62 50 92c0 27 -15 42 -40 42c-18 0 -37 -12 -37 -24c0 -3 2 -5 6 -7c16 -7 23 -16 23 -32c0 -19 -12 -30 -30 -30c-22 0 -36 16 -36 41c0 41 38 73 87 73
 c50 0 88 -29 88 -68c0 -17 -7 -36 -19 -52c-11 -13 -21 -21 -72 -54c-14 -9 -23 -16 -36 -27h69c23 0 24 0 27 3c4 2 5 6 9 21z" />
     <glyph glyph-name="uniED13" unicode="&#xed13;" horiz-adv-x="182" 
-d="M118 133c37 -6 64 -20 64 -63c0 -23 -11 -45 -27 -57c-17 -11 -42 -18 -68 -18c-52 0 -87 25 -87 61c0 20 13 34 32 34c18 0 31 -12 31 -29c0 -11 -2 -16 -13 -26c-2 -2 -3 -4 -3 -6c0 -8 16 -15 31 -15c26 0 41 20 41 57c0 34 -11 51 -33 51c-2 0 -5 -1 -13 -1
-c-6 -1 -8 -1 -11 -1c-7 0 -13 5 -13 13c0 9 5 12 14 12c4 0 6 0 14 -2c3 -1 9 -2 12 -2c18 0 28 19 28 51c0 28 -13 44 -36 44c-14 0 -27 -7 -27 -13c0 -2 1 -3 3 -5c10 -9 14 -17 14 -27c0 -17 -12 -28 -30 -28c-17 0 -32 14 -32 33c0 42 47 59 82 59c51 0 85 -26 85 -64
-c0 -37 -27 -51 -58 -58z" />
+d="M155 122c17 -10 27 -30 27 -52c0 -23 -11 -45 -27 -57c-17 -11 -42 -18 -68 -18c-52 0 -87 25 -87 61c0 20 13 34 32 34c18 0 31 -12 31 -29c0 -11 -2 -16 -13 -26c-2 -2 -3 -4 -3 -6c0 -8 16 -15 31 -15c26 0 41 20 41 57c0 33 -11 51 -33 51c-2 0 -5 -1 -13 -1
+c-6 -1 -8 -1 -11 -1c-7 0 -13 5 -13 13c0 9 5 12 14 12c4 0 6 0 14 -2c3 -1 9 -2 12 -2c18 0 28 19 28 51c0 28 -13 44 -36 44c-14 0 -27 -7 -27 -13c0 -2 1 -3 3 -5c10 -9 14 -17 14 -27c0 -17 -12 -28 -30 -28c-17 0 -32 14 -32 33c0 13 7 28 19 39c15 13 36 20 63 20
+c51 0 84 -26 84 -64c0 -21 -10 -39 -29 -49c-8 -4 -14 -6 -28 -9c19 -3 27 -5 37 -11z" />
     <glyph glyph-name="uniED14" unicode="&#xed14;" horiz-adv-x="190" 
-d="M154 89h36v-24h-36v-13c0 -22 0 -23 3 -27c2 -4 10 -5 25 -5h4v-20h-123v20h4c17 0 25 1 28 5c2 2 2 3 2 9v18v13h-97v27l131 163h25c-1 -26 -2 -49 -2 -55v-111zM97 89v90l-71 -90h71z" />
+d="M154 89h36v-24h-36v-13c0 -22 0 -23 3 -27c2 -4 10 -5 25 -6h4v-19h-123v20h4c17 0 25 1 28 4c2 3 2 4 2 10v18v13h-97v27l131 163h25c-1 -26 -2 -49 -2 -55v-111zM97 89v90l-71 -90h71z" />
     <glyph glyph-name="uniED15" unicode="&#xed15;" horiz-adv-x="181" 
-d="M19 137l2 26c4 59 4 62 6 92c22 -5 40 -6 70 -6s52 2 65 5c2 0 4 1 6 1s3 -1 3 -4c0 -8 -6 -21 -13 -30c-13 -18 -38 -28 -67 -28c-14 0 -28 2 -46 6l-5 -47c24 11 35 14 52 14c51 0 89 -35 89 -82c0 -53 -40 -89 -99 -89c-50 0 -82 23 -82 59c0 23 14 37 35 37
-c18 0 30 -11 30 -29c0 -13 -5 -19 -19 -26c-4 -2 -5 -3 -5 -5c0 -8 16 -15 32 -15c29 0 44 23 44 67c0 38 -14 58 -40 58h-1c-12 0 -30 -6 -39 -13c0 -10 -2 -21 -14 -21h-1c-7 0 -13 6 -13 13v1c0 5 1 7 10 16z" />
+d="M19 137l2 26c4 59 4 62 6 92c22 -5 40 -6 70 -6s52 2 65 5c2 0 4 1 6 1s3 -1 3 -4c0 -8 -6 -21 -13 -30c-13 -18 -38 -28 -67 -28c-14 0 -28 2 -46 5l-5 -46c24 11 35 14 52 14c51 0 89 -35 89 -82c0 -53 -40 -89 -99 -89c-50 0 -82 23 -82 59c0 23 14 37 35 37
+c18 0 30 -11 30 -29c0 -13 -5 -19 -19 -26c-4 -2 -5 -3 -5 -5c0 -8 16 -16 32 -16c29 0 44 24 44 67c0 39 -14 59 -40 59h-1c-12 0 -30 -6 -39 -13v-6c0 -8 -6 -15 -14 -15v0h-1c-7 0 -13 6 -13 13v1c0 5 1 7 10 16z" />
     <glyph glyph-name="uniED24" unicode="&#xed24;" horiz-adv-x="187" 
-d="M115 154c43 0 72 -30 72 -74c0 -49 -38 -85 -91 -85c-68 0 -96 54 -96 115c0 69 34 145 113 145c41 0 67 -19 67 -50c0 -20 -13 -33 -33 -33c-19 0 -32 12 -32 28c0 6 3 16 7 21c3 3 3 5 3 7c0 5 -6 8 -15 8c-19 0 -32 -16 -41 -45c-3 -15 -7 -44 -7 -61
-c15 17 29 24 53 24zM67 102c-2 -8 -3 -19 -3 -32c0 -37 12 -58 31 -58s29 23 29 64c0 33 -9 50 -28 51c-14 1 -25 -9 -29 -25z" />
+d="M115 154c42 0 72 -30 72 -74c0 -49 -38 -85 -91 -85c-30 0 -54 11 -72 33c-17 21 -24 46 -24 82c0 43 10 76 31 104s47 41 82 41c41 0 67 -19 67 -50c0 -20 -13 -33 -33 -33c-19 0 -32 12 -32 28c0 6 3 16 7 21c3 3 3 5 3 7c0 5 -6 8 -15 8c-19 0 -32 -16 -41 -45
+c-3 -15 -7 -44 -7 -61c15 17 29 24 53 24zM67 102c-2 -8 -3 -19 -3 -32c0 -37 11 -58 31 -58c19 0 29 23 29 64c0 33 -9 50 -28 51c-14 1 -25 -9 -29 -25z" />
     <glyph glyph-name="uniED25" unicode="&#xed25;" horiz-adv-x="180" 
-d="M180 255v-15c-51 -108 -60 -136 -60 -196c0 -26 -4 -49 -36 -49c-20 0 -33 14 -33 35c0 12 3 23 10 39c9 20 9 20 37 64l42 64h-14l-33 -1c-9 0 -31 1 -41 1c-2 1 -4 1 -6 1c-13 0 -16 -5 -23 -37l-3 -16l-20 2l12 108c39 -4 52 -5 87 -5c37 0 57 1 81 5z" />
+d="M180 255v-15c-51 -109 -60 -136 -60 -196v-9c0 -26 -13 -40 -36 -40c-20 0 -33 14 -33 35c0 12 3 23 10 39c9 20 9 20 37 64l18 28l24 36h-14l-33 -1c-9 0 -31 1 -41 1c-2 1 -4 1 -6 1v0c-13 0 -16 -5 -23 -37l-3 -16l-20 2l12 108c39 -4 52 -5 87 -5c37 0 57 1 81 5z
+" />
     <glyph glyph-name="uniED26" unicode="&#xed26;" horiz-adv-x="187" 
-d="M187 78c0 -50 -39 -83 -97 -83c-55 0 -90 25 -90 64c0 36 22 45 50 55c-29 15 -42 36 -42 64c0 47 36 77 92 77c47 0 78 -22 78 -55c0 -17 -8 -32 -22 -42c-5 -3 -10 -6 -20 -10c34 -14 51 -37 51 -70zM133 195c0 25 -15 41 -39 41c-23 0 -39 -14 -39 -34
-c0 -16 11 -31 27 -37c7 -2 18 -6 33 -9c12 9 18 23 18 39zM47 60c0 -29 18 -46 47 -46s48 17 48 42c0 18 -8 28 -31 36c-9 3 -27 8 -42 12c-16 -13 -22 -25 -22 -44z" />
+d="M187 78c0 -50 -39 -83 -97 -83c-55 0 -90 25 -90 64c0 21 10 37 28 47c6 3 11 4 22 8c-29 15 -42 36 -42 64c0 47 36 77 92 77c47 0 78 -22 78 -55c0 -17 -8 -32 -22 -42c-5 -3 -10 -6 -20 -10c34 -14 51 -37 51 -70zM47 60c0 -29 18 -46 47 -46s48 17 48 42
+c0 18 -8 28 -31 36c-9 3 -27 8 -42 12c-16 -13 -22 -25 -22 -44zM133 195c0 25 -15 41 -39 41c-23 0 -39 -15 -39 -34c0 -16 11 -31 27 -37c7 -2 18 -6 33 -9c12 9 18 23 18 39z" />
     <glyph glyph-name="uniED27" unicode="&#xed27;" horiz-adv-x="187" 
-d="M71 95c-41 0 -71 31 -71 74c0 50 38 86 90 86c66 0 97 -57 97 -116c0 -71 -31 -144 -113 -144c-41 0 -67 18 -67 46c0 21 15 36 34 36c18 0 31 -12 31 -29c0 -8 -1 -10 -8 -21c-1 -1 -2 -4 -2 -6c0 -5 5 -7 12 -7c49 0 50 71 50 105c-15 -17 -30 -24 -53 -24zM62 177
-c0 -20 2 -55 30 -55c19 0 30 20 30 52c0 17 -3 36 -8 46c-4 11 -12 16 -21 16c-20 0 -31 -20 -31 -59z" />
+d="M71 95c-41 0 -71 31 -71 74c0 50 38 86 90 86c30 0 56 -13 75 -38c15 -20 22 -45 22 -78c0 -40 -9 -74 -27 -100c-19 -29 -49 -44 -86 -44c-41 0 -67 18 -67 46c0 21 15 36 34 36c18 0 31 -12 31 -29c0 -8 -1 -10 -8 -21c-1 -1 -2 -4 -2 -6c0 -5 4 -7 12 -7
+c21 0 34 12 43 38c5 17 7 35 7 67c-15 -17 -31 -24 -53 -24zM62 177c0 -18 2 -31 6 -40c4 -8 15 -15 24 -15c19 0 30 20 30 52c0 17 -3 36 -8 46c-4 11 -12 16 -21 16c-20 0 -31 -20 -31 -59z" />
     <glyph glyph-name="uniED80" unicode="&#xed80;" horiz-adv-x="191" 
-d="M191 163c0 -90 -55 -168 -119 -168c-44 0 -72 36 -72 90c0 66 43 169 121 169c43 0 70 -35 70 -91zM119 236c-43 0 -67 -165 -67 -197c0 -16 8 -26 21 -26c42 0 65 162 65 193c0 19 -7 30 -19 30z" />
+d="M191 163c0 -90 -55 -168 -119 -168c-44 0 -72 36 -72 90c0 42 15 88 38 119c25 34 52 50 83 50c43 0 70 -35 70 -91zM75 169c-12 -43 -23 -105 -23 -131c0 -15 8 -25 21 -25c16 0 27 16 41 63c13 40 24 102 24 130c0 19 -7 30 -19 30c-17 0 -31 -22 -44 -67z" />
     <glyph glyph-name="uniED81" unicode="&#xed81;" horiz-adv-x="167" 
-d="M167 254l-54 -202c-4 -12 -5 -19 -5 -23c0 -8 5 -10 28 -10h18l-2 -19h-152l3 19h18c17 1 24 2 28 5c2 2 3 4 4 10c1 1 2 7 5 18l36 135c2 4 3 10 3 14c0 7 -4 9 -16 9h-32l4 18c37 2 83 14 99 26h15z" />
+d="M167 254l-54 -202c-4 -12 -5 -19 -5 -23c0 -8 5 -10 28 -10h18l-3 -19h-151l3 19h18c17 1 24 2 28 5c2 2 3 4 4 10c1 1 2 7 5 18l36 135c2 4 3 10 3 14c0 7 -4 9 -16 9h-32l4 18c37 2 83 14 99 26h15z" />
     <glyph glyph-name="uniED82" unicode="&#xed82;" horiz-adv-x="208" 
-d="M179 90l16 -6l-31 -84h-164v3c0 14 17 34 63 74c35 31 54 48 64 62c14 17 22 37 22 55c0 22 -16 38 -39 38c-20 0 -38 -13 -38 -25c0 -6 2 -7 14 -13c11 -5 18 -13 18 -26c0 -17 -11 -29 -29 -29c-20 0 -35 17 -35 40c0 43 38 75 90 75c41 0 78 -21 78 -66
-c0 -25 -15 -49 -44 -71c-6 -6 -6 -6 -69 -43c-20 -13 -30 -20 -36 -25h71c25 0 32 5 46 34z" />
+d="M179 90l16 -6l-31 -84h-164v3c0 14 17 34 63 74c35 31 54 48 64 62c14 17 22 37 22 55c0 22 -16 38 -39 38c-20 0 -38 -13 -38 -25c0 -6 2 -7 14 -13c11 -5 18 -14 18 -26c0 -17 -11 -29 -29 -29c-20 0 -35 17 -35 40c0 43 38 75 90 75c23 0 43 -6 56 -17s22 -31 22 -49
+c0 -25 -15 -49 -44 -71c-7 -6 -7 -6 -69 -43c-20 -13 -30 -20 -36 -25h71c25 0 32 5 46 34z" />
     <glyph glyph-name="uniED83" unicode="&#xed83;" horiz-adv-x="195" 
-d="M125 129c28 -6 52 -19 52 -53c0 -47 -42 -81 -100 -81c-48 0 -77 22 -77 58c0 21 13 36 33 36c17 0 29 -11 29 -27c0 -13 -7 -22 -19 -25c-6 -2 -7 -3 -7 -7c0 -9 15 -17 30 -17c14 0 31 10 39 22c8 14 13 34 13 53c0 22 -8 34 -24 34c-3 0 -3 0 -11 -2
-c-2 -1 -6 -2 -8 -2c-8 0 -13 5 -13 12c0 8 5 13 12 13c3 0 7 -1 9 -2c3 -1 8 -2 11 -2h1c10 0 18 3 25 12c11 11 19 33 19 48c0 22 -11 35 -31 35c-15 0 -30 -7 -30 -15c0 -2 0 -2 6 -7c7 -5 12 -13 12 -21c0 -15 -12 -26 -28 -26c-17 0 -29 13 -29 31c0 32 35 57 80 57
-c44 0 76 -23 76 -58c0 -42 -35 -58 -70 -66z" />
+d="M156 118c12 -9 21 -26 21 -42c0 -47 -42 -81 -100 -81c-48 0 -77 22 -77 58c0 21 13 36 33 36c17 0 29 -11 29 -27c0 -13 -7 -22 -19 -25c-6 -2 -7 -3 -7 -7c0 -9 15 -17 30 -17c14 0 31 10 39 22c8 14 13 34 13 53c0 22 -8 34 -24 34c-3 0 -3 0 -11 -2
+c-2 -1 -6 -2 -8 -2v0c-8 0 -13 5 -13 12c0 8 5 12 12 12v0c3 0 7 0 9 -1c3 -1 8 -2 11 -2h1c10 0 18 3 25 12c11 11 19 33 19 48c0 22 -11 35 -31 35c-15 0 -30 -7 -30 -15c0 -2 0 -2 6 -7c7 -5 12 -13 12 -21c0 -15 -12 -26 -28 -26c-17 0 -29 13 -29 31c0 32 35 57 80 57
+c44 0 76 -23 76 -58c0 -19 -10 -38 -26 -49c-12 -8 -22 -12 -44 -17c18 -4 24 -6 31 -11z" />
     <glyph glyph-name="uniED84" unicode="&#xed84;" horiz-adv-x="200" 
 d="M197 90l-4 -24h-43l-4 -14c-3 -12 -5 -19 -5 -23c0 -8 5 -10 29 -10h6l-3 -19h-130l3 19h9c16 1 24 2 27 5c3 4 3 4 5 10c1 3 1 7 5 18l3 14h-95v20l166 168h34l-44 -164h41zM102 90l26 99l-96 -99h70z" />
     <glyph glyph-name="uniED85" unicode="&#xed85;" horiz-adv-x="206" 
-d="M38 140l33 114c29 -7 55 -10 79 -10c19 0 34 2 50 9c2 1 3 1 4 1s2 -1 2 -3c0 -11 -10 -29 -21 -39c-15 -13 -35 -19 -63 -19c-17 0 -17 0 -45 6l-14 -46c18 6 32 9 48 9c44 0 72 -26 72 -65c0 -59 -46 -102 -109 -102c-45 0 -74 22 -74 57c0 21 13 36 33 36
+d="M38 140l33 114c29 -7 55 -10 79 -10c19 0 34 2 50 9c2 1 3 1 4 1s2 -1 2 -3c0 -11 -10 -29 -21 -39c-15 -13 -35 -19 -63 -19c-17 0 -17 0 -45 6l-14 -46c18 6 31 9 48 9c44 0 72 -26 72 -65c0 -59 -46 -102 -109 -102c-45 0 -74 22 -74 57c0 21 13 36 33 36
 c17 0 29 -11 29 -27c0 -14 -7 -23 -21 -28c-4 -1 -5 -2 -5 -4c0 -8 14 -16 30 -16c33 0 58 35 58 80c0 29 -13 46 -36 46c-10 0 -15 -1 -33 -9c-2 -14 -9 -21 -19 -21c-7 0 -12 5 -12 13c0 7 4 13 14 18z" />
     <glyph glyph-name="uniED86" unicode="&#xed86;" horiz-adv-x="195" 
-d="M111 155c38 0 65 -26 65 -64c0 -52 -45 -96 -99 -96c-48 0 -77 34 -77 88c0 76 50 171 135 171c35 0 60 -19 60 -45c0 -18 -13 -30 -30 -30s-28 11 -28 25c0 8 2 13 7 19c3 3 3 4 3 6c0 4 -5 7 -12 7c-38 0 -57 -67 -65 -95c14 11 24 14 41 14zM95 134
-c-35 0 -41 -59 -41 -84s8 -38 23 -38c34 0 41 62 41 86c0 23 -8 36 -23 36z" />
+d="M111 155c38 0 65 -26 65 -64c0 -52 -45 -96 -99 -96c-48 0 -77 34 -77 88c0 42 15 87 41 121s57 50 94 50c34 0 60 -19 60 -45c0 -18 -13 -30 -30 -30s-29 11 -29 25c0 7 3 13 8 19c2 3 3 4 3 6c0 4 -5 7 -12 7c-14 0 -27 -9 -38 -27c-9 -14 -17 -33 -27 -68
+c14 11 24 14 41 14zM63 105c-5 -14 -9 -36 -9 -55c0 -25 8 -38 23 -38c12 0 23 8 29 23c8 18 12 42 12 63c0 23 -8 36 -23 36s-25 -9 -32 -29z" />
     <glyph glyph-name="uniED87" unicode="&#xed87;" horiz-adv-x="190" 
-d="M190 254v-14c-66 -113 -81 -146 -91 -201c-3 -17 -5 -22 -9 -29c-6 -9 -17 -15 -29 -15c-19 0 -32 12 -32 29c0 24 8 37 104 160l13 18h-76c-22 0 -32 -8 -48 -35l-5 -11l-17 5l37 93c30 -3 44 -4 68 -4c25 0 45 1 85 4z" />
+d="M190 254v-14c-66 -113 -81 -146 -91 -201c-4 -17 -5 -22 -9 -29c-6 -9 -17 -15 -29 -15c-19 0 -32 12 -32 29c0 24 8 37 103 160l14 18h-76c-22 0 -32 -8 -48 -35l-6 -11l-16 5l37 93c30 -3 44 -4 68 -4c25 0 45 1 85 4z" />
     <glyph glyph-name="uniED88" unicode="&#xed88;" horiz-adv-x="198" 
-d="M182 75c0 -47 -42 -80 -101 -80c-49 0 -81 23 -81 59c0 35 32 58 62 68c-19 17 -27 32 -27 54c0 46 38 78 90 78c44 0 73 -23 73 -57c0 -27 -16 -46 -52 -59c23 -15 36 -38 36 -63zM158 196c0 25 -14 40 -38 40s-41 -16 -41 -38c0 -15 6 -24 24 -35c5 -3 9 -5 28 -15
-c20 14 27 28 27 48zM44 55c0 -25 17 -43 44 -43s47 18 47 42c0 17 -10 30 -32 42c-3 2 -3 2 -17 9c-4 2 -5 3 -10 6c-21 -13 -32 -32 -32 -56z" />
+d="M182 75c0 -47 -42 -80 -101 -80c-49 0 -81 23 -81 59c0 18 10 37 27 50c9 7 20 13 35 18c-19 17 -27 32 -27 54c0 46 38 78 90 78c44 0 73 -23 73 -57c0 -27 -16 -46 -52 -59c23 -15 36 -38 36 -63zM44 55c0 -25 17 -43 44 -43s47 18 47 42c0 17 -10 30 -32 42
+c-3 2 -3 2 -17 9c-4 2 -5 3 -10 6c-21 -13 -32 -32 -32 -56zM158 196c0 25 -14 40 -38 40s-41 -16 -41 -38c0 -15 6 -24 24 -35c5 -3 9 -5 28 -15c20 14 27 28 27 48z" />
     <glyph glyph-name="uniED89" unicode="&#xed89;" horiz-adv-x="195" 
-d="M84 94c-38 0 -65 26 -65 64c0 52 45 96 100 96c47 0 76 -34 76 -88c0 -76 -50 -171 -135 -171c-34 0 -60 19 -60 45c0 18 13 30 31 30c16 0 28 -11 28 -25c0 -7 -3 -13 -8 -19c-2 -3 -3 -4 -3 -6c0 -4 5 -7 12 -7c38 0 57 67 65 95c-14 -11 -24 -14 -41 -14zM118 238
-c-33 0 -41 -62 -41 -86s9 -37 23 -37c34 0 41 59 41 84s-8 39 -23 39z" />
+d="M84 94c-38 0 -65 26 -65 64c0 52 45 96 100 96c47 0 76 -34 76 -88c0 -42 -15 -87 -41 -121s-57 -50 -94 -50c-34 0 -60 19 -60 45c0 18 13 30 31 30c16 0 28 -11 28 -25c0 -7 -3 -13 -8 -19c-2 -3 -3 -4 -3 -6c0 -4 5 -7 12 -7c14 0 26 9 38 27c9 14 17 33 27 68
+c-14 -11 -24 -14 -41 -14zM89 214c-7 -18 -12 -42 -12 -63c0 -23 9 -36 23 -36c15 0 25 9 32 29c5 14 9 36 9 55c0 25 -8 39 -23 39c-12 0 -23 -9 -29 -24z" />
     <glyph glyph-name="uniF400" unicode="&#xf400;" horiz-adv-x="90" 
-d="M31 500c26 -19 59 -58 59 -130c0 -90 -49 -183 -49 -239c0 -75 43 -116 45 -119c1 -1 2 -3 2 -4s0 -2 -1 -2c-1 -1 -1 -1 -2 -1s-3 1 -4 2c-2 2 -80 56 -80 137c0 89 45 150 45 266c0 21 -8 57 -44 87c-1 1 -2 2 -2 3s1 2 2 3c36 30 44 66 44 87c0 116 -45 177 -45 266
-c0 81 78 135 80 137c1 1 3 2 4 2s1 0 2 -1c1 0 1 -1 1 -2s-1 -3 -2 -4c-2 -2 -45 -44 -45 -119c0 -56 49 -149 49 -239c0 -72 -33 -111 -59 -130z" />
+d="M31 500c26 -19 59 -58 59 -130c0 -90 -49 -183 -49 -239c0 -75 43 -117 45 -119c1 -1 1 -3 2 -4c0 -1 0 -2 -1 -2c-1 -1 -1 -1 -2 -1s-3 1 -5 2c-1 1 -79 56 -79 137c0 89 45 150 45 266c0 21 -8 57 -44 87c-1 1 -2 2 -2 3s1 2 2 3c36 30 44 66 44 87
+c0 116 -45 177 -45 266c0 81 78 135 79 137c2 1 4 2 5 2s1 0 2 -1c0 0 1 -1 1 -2s-1 -3 -2 -4c-2 -2 -45 -44 -45 -119c0 -56 49 -149 49 -239c0 -72 -33 -111 -59 -130z" />
     <glyph glyph-name="uniF401" unicode="&#xf401;" horiz-adv-x="51" 
 d="M8 500c15 -19 43 -57 43 -130c0 -91 -32 -184 -32 -240c0 -61 29 -118 30 -120c1 -1 1 -2 1 -3s0 -1 -1 -2s-3 0 -4 1s-45 57 -45 138c0 89 29 150 29 265c0 22 -8 57 -28 87c-1 1 -2 2 -2 4c0 1 1 2 2 3c20 30 28 66 28 88c0 115 -29 176 -29 265c0 81 44 135 45 137
 l2 2c1 0 2 -1 2 -1c1 0 1 -1 1 -2c0 0 0 -1 -1 -2c-1 -2 -30 -59 -30 -120c0 -56 32 -149 32 -240c0 -72 -28 -111 -43 -130z" />
     <glyph glyph-name="uniF402" unicode="&#xf402;" horiz-adv-x="44" 
-d="M7 500c13 -19 37 -57 37 -130c0 -91 -28 -184 -28 -240c0 -61 26 -118 27 -120c1 -1 1 -2 1 -3s0 -1 -1 -2s-3 0 -4 1s-39 57 -39 138c0 89 25 150 25 265c0 22 -6 57 -24 87v7c18 30 24 66 24 88c0 115 -25 176 -25 265c0 81 38 135 39 137l2 2c1 0 2 -1 2 -1
-c1 0 1 -1 1 -2c0 0 0 -1 -1 -2c-1 -2 -27 -59 -27 -120c0 -56 28 -149 28 -240c0 -72 -24 -111 -37 -130z" />
+d="M7 500c13 -19 37 -57 37 -130c0 -91 -28 -184 -28 -240c0 -61 26 -118 27 -120c1 -1 1 -2 1 -3s0 -1 -1 -2s-3 0 -4 1s-39 57 -39 138c0 89 25 150 25 265c0 22 -6 57 -24 87c0 1 -1 2 -1 4c0 1 1 2 1 3c18 30 24 66 24 88c0 115 -25 176 -25 265c0 81 38 135 39 137l2 2
+c1 0 2 -1 2 -1c1 0 1 -1 1 -2c0 0 0 -1 -1 -2c-1 -2 -27 -59 -27 -120c0 -56 28 -149 28 -240c0 -72 -24 -111 -37 -130z" />
     <glyph glyph-name="uniF403" unicode="&#xf403;" horiz-adv-x="38" 
-d="M36 14c1 -1 2 -3 2 -4s0 -2 -1 -3c0 -1 -2 -2 -3 -2s-2 0 -2 1c-1 1 -18 17 -18 60v347c0 22 -1 57 -13 85h-1v2v1v1h1c12 29 13 63 13 85v347c0 43 16 59 18 60c0 1 1 1 2 1s3 -1 3 -2c1 -1 1 -2 1 -3s-1 -3 -2 -4c0 0 -14 -15 -14 -52v-347c0 -2 1 -5 0 -10
-c0 -17 -1 -48 -13 -77c12 -29 13 -60 13 -77c1 -5 0 -8 0 -10v-347c0 -37 14 -51 14 -52z" />
+d="M36 14c1 -1 2 -3 2 -4s0 -2 -1 -3c0 -1 -2 -2 -3 -2s-2 0 -2 1c-1 1 -18 17 -18 60v347c0 22 -1 56 -13 85h-1v0v1v0v1v1v0v0v1v0h1c12 29 13 63 13 85v347c0 43 16 59 18 60c0 1 1 1 2 1s2 -1 3 -2s1 -2 1 -3s-1 -3 -2 -4c0 0 -14 -15 -14 -52v-347v-10
+c0 -17 -1 -48 -13 -77c12 -29 13 -60 13 -77v-10v-347c0 -37 14 -51 14 -52z" />
     <glyph glyph-name="uniF5DD" unicode="&#xf5dd;" horiz-adv-x="390" 
-d="M227 155c58 0 82 -50 82 -101c0 -102 -89 -185 -174 -228c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 33 37 83 37zM322 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1
-s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1zM68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193
-c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1zM141 -127c65 51 98 91 98 178c0 21 -3 55 -39 55c-39 0 -54 -29 -56 -38z" />
+d="M322 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -46 207 -46 208c-1 2 -1 3 -1 4c0 2 1 4 3 5c1 1 2 1 4 2zM307 79c1 -8 2 -16 2 -25c0 -41 -15 -90 -52 -133
+c-54 -61 -118 -93 -122 -95c-2 -1 -6 -2 -8 -2c-8 0 -14 6 -14 14l-5 601c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 33 37 83 37s74 -37 80 -76zM239 40v11c0 21 -3 55 -39 55c-40 0 -54 -29 -56 -38l-3 -195c18 15 52 42 69 68c25 38 29 84 29 99zM68 -212
+c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 2 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -208c1 -2 1 -3 1 -4c0 -2 -1 -4 -3 -5c-1 -1 -2 -1 -4 -2z" />
     <glyph glyph-name="uniF5DE" unicode="&#xf5de;" horiz-adv-x="386" 
-d="M274 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35c-9 0 -18 2 -18 13v495h28v-175l126 35h1l2 1c4 0 7 -1 9 -3zM318 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193
-c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1zM68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6
-c-1 0 -2 -1 -4 -1zM136 -97l116 32v165l-116 -33v-164z" />
+d="M274 183c3 -2 5 -7 5 -11v-495h-27v175l-126 -35h-4c-8 0 -14 5 -14 13v495h28v-175l126 35c1 0 3 1 4 1c3 0 6 -1 8 -3zM136 -97l116 32v165l-116 -33v-164zM318 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5
+c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -46 207 -46 208c-1 2 -1 3 -1 4c0 2 1 4 3 5c1 1 2 1 4 2zM68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 2 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -208
+c1 -2 1 -3 1 -4c0 -2 -1 -4 -3 -5c-1 -1 -2 -1 -4 -2z" />
     <glyph glyph-name="uniF5DF" unicode="&#xf5df;" horiz-adv-x="458" 
-d="M340 105l-38 -7v-165l33 7c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v165l-33 -7c-9 0 -17 3 -17 14v58c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149l33 7
-c9 0 16 -4 16 -14v-59c0 -6 -5 -13 -11 -14zM390 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1zM68 -212
-c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1zM185 74v-166l89 19v165z" />
+d="M340 105l-38 -7v-165l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14l-38 -7v-147h-28v141l-89 -18v-155h-28v149l-33 -7h-3c-8 0 -14 6 -14 14v58c0 6 5 13 11 14l39 8v165l-33 -7h-3c-8 0 -14 6 -14 14v-2v58v2c0 6 5 13 11 14l39 8v147h28v-141l89 18v155h28v-149
+l33 7h2c8 0 14 -6 14 -14v-59c0 -6 -5 -13 -11 -14zM185 74v-166l89 19v165zM390 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -46 207 -46 208c-1 2 -1 3 -1 4
+c0 2 1 4 3 5c1 1 2 1 4 2zM68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 2 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -208c1 -2 1 -3 1 -4c0 -2 -1 -4 -3 -5c-1 -1 -2 -1 -4 -2z" />
     <glyph glyph-name="uniF5E0" unicode="&#xf5e0;" horiz-adv-x="384" 
-d="M389 213c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1zM68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209
-s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1zM177 -70v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h53l49 50v3l-49 49
-h-53c-8 0 -14 6 -14 14v59c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v53c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-53l-50 -50v-2l50 -50h53c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v53l-49 48h-3z" />
+d="M341 51h-42l-50 -50v-2l50 -50h42h1h10c8 0 14 -5 14 -13v-59c0 -8 -6 -14 -14 -14h-59c-8 0 -14 6 -14 14v10v1v42l-49 48h-3l-50 -48v-53c0 -8 -5 -14 -13 -14h-59c-8 0 -14 6 -14 14v59c0 8 6 13 14 13h10h1h42l49 50v3l-49 49h-42h-1h-10c-8 0 -14 6 -14 14v59
+c0 8 6 14 14 14h59c8 0 13 -6 13 -14v-53l50 -50h3l49 50v41v12c0 8 6 14 14 14h59c8 0 14 -6 14 -14v-59c0 -8 -6 -14 -14 -14h-11zM389 213c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3
+c34 67 46 134 46 193c0 118 -46 207 -46 208c-1 2 -1 3 -1 4c0 2 1 4 3 5c1 1 2 1 4 2zM68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 2 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -208c1 -2 1 -3 1 -4
+c0 -2 -1 -4 -3 -5c-1 -1 -2 -1 -4 -2z" />
     <glyph glyph-name="uniF5E1" unicode="&#xf5e1;" horiz-adv-x="560" 
-d="M396 155c59 0 83 -48 83 -100c0 -103 -90 -186 -176 -229c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-36 -54 -87 -96 -145 -125c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-5 602c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301
-c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -320c5 6 34 36 84 36zM492 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6
-c1 0 3 1 4 1zM68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1zM141 -128c67 53 99 89 99 179
-c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38zM309 -128c67 53 99 89 99 179c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38z" />
+d="M477 80c1 -8 2 -16 2 -25c0 -41 -15 -91 -53 -134c-54 -61 -119 -93 -123 -95c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-1 114c-6 -9 -15 -23 -22 -31c-54 -61 -119 -92 -123 -94c-2 -1 -6 -3 -8 -3c-8 0 -14 6 -14 14l-5 602c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -321
+c5 6 34 37 84 37c22 0 38 -7 51 -17l-3 301c0 8 6 14 14 14h12c8 0 14 -6 14 -14l-4 -320c5 6 34 36 84 36c51 0 75 -36 81 -75zM240 40v11c0 21 -3 55 -39 55c-40 0 -55 -29 -57 -38l-3 -196c19 15 53 42 70 68c25 38 29 85 29 100zM408 40v11c0 21 -3 55 -39 55
+c-40 0 -55 -29 -57 -38l-3 -196c19 15 53 42 70 68c25 38 29 85 29 100zM492 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -46 207 -46 208c-1 2 -1 3 -1 4c0 2 1 4 3 5
+c1 1 2 1 4 2zM68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 2 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -208c1 -2 1 -3 1 -4c0 -2 -1 -4 -3 -5c-1 -1 -2 -1 -4 -2z" />
     <glyph glyph-name="uniF630" unicode="&#xf630;" horiz-adv-x="151" 
-d="M-149 253h300v-65l-226 -160h226v-65l-226 -160h226v-56h-300v68l226 157h-226v69l226 157h-226v55z" />
+d="M-149 253h300v-65l-226 -160h226v-56v-9l-226 -160h226v-56h-300v68l226 157h-226v56v13l226 157h-226v55z" />
     <glyph glyph-name="uniF40F" unicode="&#xf40f;" horiz-adv-x="289" 
 d="M0 -125v125l289 -75v-125z" />
     <glyph glyph-name="uniF412" unicode="&#xf412;" horiz-adv-x="289" 
 d="M0 -125v125l289 -75v-125zM0 -313v125l289 -75v-125z" />
     <glyph glyph-name="uniF415" unicode="&#xf415;" horiz-adv-x="289" 
-d="M0 63v125l289 -76v-125zM0 -125v125l289 -75v-125zM0 -313v125l289 -75v-125z" />
+d="M0 -125v125l289 -75v-125zM0 -313v125l289 -75v-125zM0 63v125l289 -76v-125z" />
     <glyph glyph-name="uniF411" unicode="&#xf411;" horiz-adv-x="306" 
 d="M306 204v-125l-306 -79v125z" />
     <glyph glyph-name="uniF414" unicode="&#xf414;" horiz-adv-x="306" 
-d="M306 392v-125l-306 -79v125zM306 204v-125l-306 -79v125z" />
+d="M306 204v-125l-306 -79v125zM306 392v-125l-306 -79v125z" />
     <glyph glyph-name="uniF417" unicode="&#xf417;" horiz-adv-x="306" 
-d="M306 392v-125l-306 -79v125zM306 204v-125l-306 -79v125zM306 17v-125l-306 -80v125z" />
+d="M306 204v-125l-306 -79v125zM306 392v-125l-306 -79v125zM306 204v-125l-306 -79v125zM306 17v-125l-306 -80v125z" />
     <glyph glyph-name="uniE0B8" unicode="&#xe0b8;" horiz-adv-x="310" 
-d="M310 125v-250h-310v250h310zM274 89h-238v-178h238v178z" />
+d="M274 89h-238v-178h238v178zM310 125v-250h-310v250h310z" />
     <glyph glyph-name="uniE0B9" unicode="&#xe0b9;" horiz-adv-x="310" 
 d="M310 125v-250h-310v250h310z" />
     <glyph glyph-name="uniE0BD" unicode="&#xe0bd;" horiz-adv-x="310" 
-d="M155 122l155 -258h-310zM233 -77c5 0 8 4 8 8c0 1 -1 3 -1 4l-79 130c-1 2 -4 4 -6 4s-5 -2 -6 -4l-78 -130c-1 -1 -2 -3 -2 -4c0 -4 3 -8 8 -8h156z" />
+d="M155 122l155 -258h-310zM233 -77c5 0 8 4 8 8c0 1 -1 3 -1 4l-79 130c-1 2 -4 4 -6 4s-5 -2 -6 -4l-79 -130c0 -1 -1 -3 -1 -4c0 -4 3 -8 8 -8h156z" />
     <glyph glyph-name="uniE0BE" unicode="&#xe0be;" horiz-adv-x="310" 
 d="M155 122l155 -258h-310z" />
     <glyph glyph-name="uniE0BF" unicode="&#xe0bf;" horiz-adv-x="339" 
-d="M0 122l339 -258h-339v258zM204 -65l-168 128c-1 1 -2 1 -4 1c-3 0 -7 -3 -7 -7v-128c0 -4 3 -7 7 -7h168c4 0 7 4 7 8c0 2 -1 3 -3 5z" />
+d="M204 -65l-168 128c-1 1 -2 1 -4 1c-3 0 -7 -3 -7 -7v-128c0 -3 3 -7 7 -7h168c4 0 7 4 7 8c0 2 -1 4 -3 5zM0 122l339 -258h-339v258z" />
     <glyph glyph-name="uniE0C0" unicode="&#xe0c0;" horiz-adv-x="339" 
 d="M0 122l339 -258h-339v258z" />
     <glyph glyph-name="uniE0F5" unicode="&#xe0f5;" horiz-adv-x="75" 
-d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 3 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -209c1 -1 1 -2 1 -3c0 -2 -1 -4 -3 -6c-1 0 -2 -1 -4 -1z" />
+d="M68 -212c-2 0 -4 1 -5 3c-3 4 -63 88 -63 209s60 203 63 207c1 1 2 2 4 2c2 1 3 0 5 -1s3 -3 3 -5c0 -1 0 -2 -1 -3c-34 -67 -46 -134 -46 -193c0 -118 46 -207 46 -208c1 -2 1 -3 1 -4c0 -2 -1 -4 -3 -5c-1 -1 -2 -1 -4 -2z" />
     <glyph glyph-name="uniE0F6" unicode="&#xe0f6;" horiz-adv-x="75" 
-d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -45 207 -46 209c-1 1 -1 2 -1 3c0 2 1 4 3 6c1 0 3 1 4 1z" />
+d="M7 212c2 0 4 -1 5 -3c3 -4 63 -88 63 -209s-60 -203 -63 -207c-1 -1 -2 -2 -4 -2c-2 -1 -3 0 -5 1s-3 3 -3 5c0 1 0 2 1 3c34 67 46 134 46 193c0 118 -46 207 -46 208c-1 2 -1 3 -1 4c0 2 1 4 3 5c1 1 2 1 4 2z" />
     <glyph glyph-name="uniF418" unicode="&#xf418;" horiz-adv-x="289" 
-d="M0 249v125l289 -75v-125zM0 62v125l289 -75v-125zM0 -125v125l289 -75v-125zM0 -313v125l289 -75v-125z" />
+d="M0 -125v125l289 -75v-125zM0 62v125l289 -75v-125zM0 249v125l289 -75v-125zM0 -313v125l289 -75v-125z" />
     <glyph glyph-name="uniF41A" unicode="&#xf41a;" horiz-adv-x="306" 
 d="M306 391v-125l-306 -79v125zM306 204v-125l-306 -80v126zM306 16v-125l-306 -79v125zM306 -171v-125l-306 -80v125z" />
     <glyph glyph-name="uniF41B" unicode="&#xf41b;" horiz-adv-x="289" 
-d="M0 436v125l289 -75v-125zM0 249v125l289 -75v-125zM0 62v125l289 -75v-125zM0 -126v125l289 -75v-125zM0 -313v125l289 -75v-125z" />
+d="M0 -125v125l289 -76v-125zM0 62v125l289 -75v-125zM0 249v125l289 -75v-125zM0 -313v125l289 -75v-125zM0 436v125l289 -75v-125z" />
     <glyph glyph-name="uniF41D" unicode="&#xf41d;" horiz-adv-x="306" 
 d="M306 392v-125l-306 -79v125zM306 204v-125l-306 -79v125zM306 17v-125l-306 -80v125zM306 -171v-125l-306 -79v125zM306 -358v-125l-306 -80v125z" />
     <glyph glyph-name="uniF41E" unicode="&#xf41e;" horiz-adv-x="289" 
-d="M0 624v125l289 -76v-125zM0 436v125l289 -75v-125zM0 249v125l289 -75v-125zM0 62v125l289 -75v-126zM0 -126v125l289 -75v-125zM0 -313v125l289 -75v-125z" />
+d="M0 -126v125l289 -75v-125zM0 62v125l289 -75v-125zM0 249v125l289 -75v-125zM0 -313v125l289 -75v-125zM0 436v125l289 -75v-125zM0 623v125l289 -75v-125z" />
     <glyph glyph-name="uniF420" unicode="&#xf420;" horiz-adv-x="306" 
 d="M306 392v-125l-306 -79v125zM306 205v-125l-306 -79v125zM306 17v-125l-306 -79v125zM306 -170v-125l-306 -80v125zM306 -358v-125l-306 -79v125zM306 -545v-125l-306 -80v125z" />
     <glyph glyph-name="uniF421" unicode="&#xf421;" horiz-adv-x="289" 
-d="M0 811v125l289 -75v-125zM0 624v125l289 -76v-125zM0 436v125l289 -75v-125zM0 249v125l289 -75v-125zM0 62v125l289 -75v-126zM0 -126v125l289 -75v-125zM0 -313v125l289 -75v-125z" />
+d="M0 -126v125l289 -75v-125zM0 62v125l289 -75v-125zM0 249v125l289 -75v-125zM0 -313v125l289 -75v-125zM0 436v125l289 -75v-125zM0 623v125l289 -75v-125zM0 811v125l289 -75v-125z" />
     <glyph glyph-name="uniF423" unicode="&#xf423;" horiz-adv-x="306" 
 d="M306 392v-125l-306 -79v125zM306 204v-125l-306 -79v125zM306 17v-125l-306 -80v125zM306 -171v-125l-306 -79v125zM306 -358v-125l-306 -80v125zM306 -546v-125l-306 -79v125zM306 -733v-125l-306 -80v125z" />
     <glyph glyph-name="uniF424" unicode="&#xf424;" horiz-adv-x="289" 
-d="M0 998v125l289 -75v-125zM0 811v125l289 -75v-125zM0 624v125l289 -76v-125zM0 436v125l289 -75v-125zM0 249v125l289 -75v-125zM0 62v125l289 -75v-126zM0 -126v125l289 -75v-125zM0 -313v125l289 -75v-125z" />
+d="M0 -126v125l289 -75v-125zM0 62v125l289 -75v-125zM0 249v125l289 -75v-125zM0 -313v125l289 -75v-125zM0 436v125l289 -75v-125zM0 623v125l289 -75v-125zM0 811v125l289 -75v-125zM0 998v125l289 -75v-125z" />
     <glyph glyph-name="uniF426" unicode="&#xf426;" horiz-adv-x="306" 
 d="M306 392v-125l-306 -79v125zM306 205v-125l-306 -79v125zM306 17v-125l-306 -79v125zM306 -170v-125l-306 -80v125zM306 -358v-125l-306 -79v125zM306 -545v-125l-306 -80v125zM306 -733v-125l-306 -79v125zM306 -920v-125l-306 -80v125z" />
     <glyph glyph-name="uniE0C1" unicode="&#xe0c1;" horiz-adv-x="339" 
-d="M339 122v-258h-339zM303 63l-168 -128c-2 -2 -3 -3 -3 -5c0 -4 3 -8 7 -8h168c4 0 7 3 7 7v128c0 4 -4 7 -7 7c-2 0 -3 0 -4 -1z" />
+d="M303 63l-168 -128c-2 -1 -3 -3 -3 -5c0 -4 3 -8 7 -8h168c4 0 7 4 7 7v128c0 4 -4 7 -7 7c-2 0 -3 0 -4 -1zM339 122v-258h-339z" />
     <glyph glyph-name="uniE0C2" unicode="&#xe0c2;" horiz-adv-x="339" 
 d="M339 122v-258h-339z" />
     <glyph glyph-name="uniE0CA" unicode="&#xe0ca;" horiz-adv-x="310" 
-d="M0 125h310v-125c0 -69 -69 -125 -155 -125s-155 56 -155 125v125zM155 -89c51 0 119 31 119 89v89h-238v-89c0 -58 69 -89 119 -89z" />
+d="M0 125h310v-125c0 -69 -69 -125 -155 -125s-155 56 -155 125v125zM242 -60c21 16 32 38 32 60v89h-238v-89c0 -22 11 -44 32 -60c11 -9 24 -16 38 -21c16 -5 32 -8 49 -8s33 3 49 8c14 5 27 12 38 21z" />
     <glyph glyph-name="uniE0CB" unicode="&#xe0cb;" horiz-adv-x="310" 
 d="M0 125h310v-125c0 -69 -69 -125 -155 -125s-155 56 -155 125v125z" />
     <glyph glyph-name="uniE0CC" unicode="&#xe0cc;" horiz-adv-x="310" 
-d="M157 -136l-157 180s47 78 157 78s153 -78 153 -78zM157 74c-62 0 -97 -32 -110 -47l110 -126l107 126c-26 32 -67 47 -107 47z" />
+d="M157 -136l-157 180s47 78 157 78s153 -78 153 -78zM157 74c-62 0 -97 -32 -110 -47l110 -126l107 126c-4 5 -12 13 -22 21c-23 17 -52 26 -85 26z" />
     <glyph glyph-name="uniE0CD" unicode="&#xe0cd;" horiz-adv-x="310" 
 d="M157 -136l-157 180s47 78 157 78s153 -78 153 -78z" />
     <glyph glyph-name="uniE0CF" unicode="&#xe0cf;" 
-d="M421 207c2 -3 3 -6 3 -8c0 -4 -2 -8 -5 -11l-116 -90c14 -15 22 -35 22 -58c0 -89 -108 -173 -213 -173c-31 0 -55 7 -73 18l-116 -96c-2 -2 -5 -2 -8 -2c-8 0 -13 5 -13 13c0 3 2 7 5 10l115 90c-15 17 -22 38 -22 58c0 92 117 174 213 174c28 0 53 -7 73 -20l117 97
+d="M421 207c2 -3 3 -6 3 -9s-2 -7 -5 -10l-116 -90c14 -15 22 -35 22 -58c0 -89 -109 -173 -213 -173c-31 0 -55 7 -73 19l-116 -97c-2 -2 -5 -2 -8 -2c-4 0 -8 1 -10 4s-3 6 -3 9s2 7 5 10l115 90c-15 17 -22 38 -22 58c0 92 116 174 213 174c28 0 53 -7 73 -20l117 97
 c2 2 5 3 8 3c4 0 7 -2 10 -5z" />
     <glyph glyph-name="uniE0D0" unicode="&#xe0d0;" 
-d="M267 -71l152 -119c3 -2 5 -6 5 -10c0 -7 -6 -13 -13 -13c-3 0 -6 1 -9 3l-151 125c-40 -29 -90 -48 -139 -48c-81 0 -112 48 -112 91c0 42 24 81 58 112l-152 119c-3 2 -4 6 -5 10c0 1 0 1 1 2c0 2 1 5 2 6c3 4 7 5 10 5s6 -1 9 -3l152 -125c41 29 92 48 138 48
-c62 0 112 -33 112 -92c0 -40 -23 -80 -58 -111z" />
+d="M267 -71l152 -119c3 -2 4 -6 5 -10c0 -3 -1 -6 -3 -8c-3 -3 -7 -5 -11 -5c-2 0 -5 1 -8 3l-151 125c-40 -29 -90 -48 -139 -48c-81 0 -112 48 -112 91c0 42 24 81 58 112l-152 119c-3 2 -4 6 -4 10c-1 1 0 1 0 2c0 2 1 4 2 6c3 3 7 5 10 5s6 -1 9 -3l152 -125
+c41 29 91 48 138 48c62 0 112 -33 112 -92c0 -40 -23 -80 -58 -111z" />
     <glyph glyph-name="uniE0D1" unicode="&#xe0d1;" 
-d="M421 207c2 -2 3 -5 3 -8c0 -4 -2 -8 -5 -10l-116 -91c15 -15 22 -38 22 -58c0 -99 -122 -173 -213 -173c-28 0 -53 6 -73 19l-116 -96c-2 -2 -5 -3 -8 -3c-4 0 -8 2 -10 5c-2 2 -3 5 -3 8c0 4 2 8 5 10l115 91c-4 5 -8 10 -12 16c-7 13 -10 27 -10 41
-c0 97 123 174 213 174c28 0 53 -7 73 -19l117 96c2 2 5 3 8 3c4 0 8 -2 10 -5zM39 -68c3 -4 6 -8 9 -11l108 85l95 78c-48 0 -165 -66 -199 -100c-11 -11 -18 -24 -18 -35c0 -6 2 -12 5 -17zM285 65c-2 5 -5 9 -10 12l-105 -83l-98 -81h2c45 0 167 69 198 100
-c11 12 17 24 17 35c0 6 -1 12 -4 17z" />
+d="M421 207c2 -2 3 -5 3 -8c0 -4 -2 -8 -5 -10l-116 -91c5 -5 9 -11 12 -17c7 -13 10 -27 10 -41c0 -51 -40 -110 -106 -145c-36 -19 -73 -28 -107 -28c-28 0 -53 7 -73 19l-116 -96c-2 -2 -5 -3 -8 -3c-4 0 -8 2 -10 5c-2 2 -3 5 -3 8c0 4 2 8 5 10l115 91
+c-4 5 -8 10 -12 16c-7 13 -10 27 -10 41c0 51 40 110 106 145c36 19 73 29 107 29c28 0 53 -7 73 -19l117 96c2 2 5 3 8 3c4 0 7 -2 10 -5zM39 -68c3 -4 6 -8 9 -11l108 85l95 78h-2c-5 0 -10 -1 -15 -2c-24 -5 -60 -20 -96 -40s-69 -41 -86 -58c-11 -11 -18 -24 -18 -35
+c0 -6 2 -12 5 -17zM285 65c-2 5 -6 9 -10 12l-105 -83l-98 -81h2c5 0 10 1 15 2c24 5 60 20 96 40s70 41 87 58c11 12 17 24 17 35c0 6 -1 12 -4 17z" />
     <glyph glyph-name="uniE0D2" unicode="&#xe0d2;" 
-d="M268 -71l151 -119c3 -3 5 -6 5 -10c0 -3 -1 -6 -3 -8c-2 -3 -6 -5 -10 -5c-3 0 -6 1 -8 3l-152 125c-38 -29 -92 -48 -139 -48c-57 0 -112 29 -112 91c0 37 22 79 59 112l-152 119c-4 2 -5 6 -5 10c0 3 1 6 3 8c2 3 6 5 10 5c3 0 6 -1 8 -3l153 -126c33 29 94 49 137 49
-c46 0 85 -18 102 -51c8 -13 10 -27 10 -41c0 -37 -21 -78 -57 -111zM138 42c-2 -1 -5 -3 -7 -4l39 -33l44 -34c25 15 46 30 58 42c11 12 17 24 17 35c0 23 -18 36 -40 36c-29 0 -86 -28 -111 -42zM185 -45c4 2 7 4 11 6l-40 33l-43 33c-26 -15 -48 -30 -61 -43
-c-11 -11 -18 -24 -18 -35c0 -22 19 -36 40 -36c29 0 86 28 111 42z" />
+d="M268 -71l151 -119c3 -2 5 -6 5 -10c0 -3 -1 -6 -3 -8c-3 -3 -6 -5 -10 -5c-3 0 -6 1 -8 3l-152 125c-10 -7 -20 -14 -32 -20c-36 -19 -73 -28 -107 -28c-46 0 -84 17 -102 50c-7 13 -10 27 -10 41c0 37 22 79 59 112l-152 119c-3 2 -5 6 -5 10c0 3 1 6 3 8c2 3 6 5 10 5
+c3 0 6 -1 8 -3l152 -126c10 7 20 14 31 20c36 19 73 29 107 29c46 0 84 -18 102 -51c7 -13 10 -27 10 -41c0 -37 -21 -78 -57 -111zM138 42c-2 -2 -5 -3 -7 -4l39 -33l44 -34c24 15 46 29 58 42c11 12 17 24 17 35c0 6 -1 12 -4 17c-7 13 -20 19 -36 19c-5 0 -10 -1 -15 -2
+c-24 -5 -60 -20 -96 -40zM185 -45c4 2 7 4 11 6l-40 33l-43 33c-26 -15 -48 -30 -61 -43c-11 -11 -18 -24 -18 -35c0 -6 2 -12 5 -17c7 -13 19 -19 35 -19c5 0 10 1 15 2c24 5 60 20 96 40z" />
     <glyph glyph-name="uniE0D3" unicode="&#xe0d3;" horiz-adv-x="373" 
-d="M445 209c2 -3 3 -5 3 -8c0 -4 -2 -8 -5 -11l-118 -92c34 -26 48 -62 48 -97c0 -65 -48 -135 -186 -135c-51 0 -91 10 -119 25l-121 -100c-3 -2 -6 -3 -9 -3s-7 2 -10 5c-2 3 -3 5 -3 8c0 4 2 8 5 11l118 92c-34 26 -48 62 -48 97c0 65 49 135 187 135
-c51 0 90 -10 119 -25l120 100c3 2 5 3 8 3c4 0 8 -2 11 -5zM103 47c1 -18 10 -55 20 -85l120 98c-1 4 -3 8 -5 11c-14 27 -32 33 -59 33c-42 0 -76 -7 -76 -57zM271 -45c0 18 -10 56 -20 85l-121 -97c2 -5 3 -9 5 -12c13 -25 32 -33 60 -33c40 0 76 8 76 57z" />
+d="M445 209c2 -3 2 -6 3 -8c0 -4 -2 -8 -5 -11l-118 -92c34 -26 48 -62 48 -97c0 -65 -48 -135 -186 -135c-52 0 -91 10 -119 25l-121 -100c-3 -2 -6 -2 -8 -2c-4 0 -8 1 -11 4c-2 3 -2 5 -3 8c0 4 2 8 5 11l118 92c-34 26 -48 62 -48 97c0 65 49 135 187 135
+c51 0 90 -10 118 -25l121 100c3 2 5 2 8 3c4 0 8 -2 11 -5zM103 47c1 -18 10 -55 20 -85l120 98c-1 4 -3 8 -5 11c-14 27 -32 33 -60 33c-15 0 -31 -2 -43 -6c-22 -7 -32 -21 -32 -44v-7zM270 -45c0 18 -9 56 -19 85l-57 -44l-64 -53c2 -5 3 -9 5 -12c13 -25 32 -33 60 -33
+c15 0 31 2 43 6c24 7 32 25 32 51z" />
     <glyph glyph-name="uniE0D4" unicode="&#xe0d4;" horiz-adv-x="373" 
-d="M325 -96l118 -92c3 -3 5 -7 5 -11c0 -3 -1 -5 -3 -8c-3 -3 -7 -5 -10 -5s-6 1 -9 3l-120 100c-29 -15 -68 -25 -119 -25c-138 0 -187 70 -187 135c0 35 14 71 48 97l-118 92c-3 3 -5 7 -5 11c0 3 1 5 3 8c3 3 7 5 11 5c3 0 5 -1 8 -3l121 -100c29 15 68 25 119 25
-c138 0 186 -70 186 -135c0 -35 -14 -71 -48 -97zM179 104c-23 0 -58 -3 -71 -26l86 -71l76 -60c0 2 1 5 1 8c0 25 -19 90 -33 116c-14 27 -32 33 -59 33zM195 -102c23 0 58 4 70 27l-85 70l-77 61c0 -33 17 -96 32 -125c13 -25 32 -33 60 -33z" />
+d="M325 -96l118 -92c3 -3 5 -7 5 -11c-1 -3 -1 -5 -3 -8c-3 -3 -7 -5 -11 -5c-2 0 -5 1 -8 3l-120 100c-29 -15 -68 -25 -119 -25c-138 0 -187 70 -187 135c0 35 14 71 48 97l-118 92c-3 3 -5 7 -5 11c1 2 1 5 3 8c3 3 7 5 11 5c3 -1 5 -1 8 -3l121 -100c29 15 68 25 119 25
+c138 0 186 -70 186 -135c0 -35 -14 -71 -48 -97zM135 98c-13 -4 -22 -11 -27 -20l86 -71l76 -60v8c0 25 -18 89 -32 116s-32 33 -60 33c-15 0 -31 -2 -43 -6zM238 -96c13 4 22 11 27 21l-86 71l-76 60v-3v-6c1 -27 19 -91 32 -116s32 -33 60 -33c15 0 31 2 43 6z" />
     <glyph glyph-name="uniE0D5" unicode="&#xe0d5;" horiz-adv-x="390" 
-d="M443 212c7 0 13 -4 13 -12c0 -4 -1 -8 -5 -11l-60 -47v-307c0 -12 -14 -14 -23 -14c-8 0 -14 7 -14 14v79c-30 -29 -81 -50 -159 -50c-52 0 -91 9 -121 24l-37 -31v-22c0 -12 -14 -14 -23 -14c-6 0 -10 3 -12 7l-47 -38c-2 -2 -5 -3 -8 -3c-4 0 -7 2 -10 5
-c-2 3 -3 6 -3 8c0 4 2 8 5 10l61 48v307s6 13 14 13c2 0 4 1 6 0c9 0 17 -2 17 -13v-79c30 29 81 49 158 49c52 0 92 -9 121 -23l38 30v23c0 7 6 13 14 13h9c5 0 10 -2 12 -6l46 38c2 1 5 2 8 2zM354 86v27l-17 -13c6 -5 12 -9 17 -14zM187 103c-42 0 -76 -8 -76 -57
-c1 -18 11 -56 20 -85l121 98c-2 4 -4 8 -5 11c-15 27 -32 33 -60 33zM279 -47c0 19 -9 56 -19 86l-122 -97c2 -5 4 -9 6 -12c13 -25 31 -34 59 -34c41 1 76 8 76 57zM37 -113l16 13c-6 4 -11 9 -16 14v-27z" />
+d="M453 207c2 -2 3 -5 3 -7c0 -4 -1 -8 -5 -11l-60 -47v-307c0 -12 -14 -14 -23 -14c-8 0 -14 7 -14 14v79c-31 -29 -81 -50 -159 -50c-52 0 -92 9 -121 24l-37 -31v-22c-1 -12 -14 -14 -23 -14c-6 0 -10 3 -12 7l-47 -38c-2 -2 -5 -3 -8 -3c-4 0 -7 2 -10 5c-2 3 -3 6 -3 8
+c0 4 2 8 5 11l61 47v306c0 8 6 14 14 14h6c9 0 17 -2 17 -14v-78c30 29 80 49 158 49c52 0 92 -9 121 -23l38 30v22c0 8 6 14 14 14h9c5 0 10 -2 12 -6l46 37c2 2 5 3 8 3c4 0 8 -1 10 -5zM111 52v-6c1 -18 10 -56 20 -85l121 98c-2 4 -4 8 -5 11c-15 27 -32 33 -60 33
+c-35 0 -76 -7 -76 -51zM37 -113l16 13c-6 4 -11 9 -16 14v-27zM279 -47c0 19 -9 56 -20 86l-121 -97c2 -5 4 -9 6 -12c13 -25 31 -34 59 -33c41 0 76 7 76 56zM354 86v27l-17 -13c6 -5 12 -9 17 -14z" />
     <glyph glyph-name="uniE0D6" unicode="&#xe0d6;" horiz-adv-x="390" 
-d="M391 -142l61 -48c3 -2 4 -6 4 -10c0 -3 -1 -6 -2 -8c-3 -3 -6 -5 -11 -5c-3 0 -5 1 -8 3l-46 39c-3 -4 -7 -8 -12 -8c-10 0 -23 0 -23 14v22l-37 31c-30 -15 -70 -24 -122 -24c-77 0 -128 21 -158 50v-79c0 -6 -7 -14 -14 -14c-10 0 -23 0 -23 14v307l-61 47
-c-3 3 -5 6 -5 10c0 3 1 6 3 9c3 3 7 4 10 4s6 0 9 -2l46 -38c2 4 7 6 12 6h9c8 0 14 -5 14 -13v-23l37 -30c30 14 70 23 121 23c78 0 129 -20 159 -49v79c0 7 6 13 14 13h9c8 0 14 -5 14 -13v-307zM54 100l-17 13v-27c5 5 11 9 17 14zM187 103c-23 0 -58 -4 -70 -27l86 -70
-l76 -60c0 35 -16 93 -32 124c-14 27 -32 33 -60 33zM247 -98c13 5 22 12 27 22l-162 131c0 -33 16 -96 32 -125c13 -25 32 -34 60 -34c15 0 31 3 43 6zM337 -100l17 -13v27c-5 -5 -11 -10 -17 -14z" />
+d="M391 -142l61 -47c3 -3 4 -7 4 -11c0 -3 -1 -5 -2 -8c-3 -3 -6 -5 -11 -5c-3 0 -5 1 -8 3l-46 39c-3 -4 -8 -8 -12 -8h-9c-8 0 -14 7 -14 14v22l-37 31c-30 -15 -70 -24 -122 -24c-77 0 -128 21 -158 50v-79c0 -6 -7 -14 -14 -14h-9c-8 0 -14 7 -14 14v307l-61 47
+c-3 3 -5 6 -5 10c0 3 1 6 3 8c3 4 7 5 10 5s6 -1 9 -3l46 -38c2 5 6 7 12 7h9c8 0 14 -5 14 -14v-22l37 -30c30 14 70 23 121 23c78 0 129 -20 159 -49v78c0 8 6 14 14 14h9c8 0 14 -5 14 -14v-306zM144 97c-13 -4 -22 -11 -27 -21l86 -70l76 -60v7c0 26 -18 90 -32 117
+s-32 33 -60 33c-15 0 -31 -3 -43 -6zM54 100l-17 13v-27c5 5 11 9 17 14zM247 -98c13 5 22 12 27 22l-86 70l-76 60c-1 -1 -1 -2 -1 -4c0 -1 1 -2 1 -4c1 -27 19 -92 32 -116c13 -25 32 -33 60 -33c15 0 31 2 43 5zM337 -100l17 -13v27c-5 -5 -11 -10 -17 -14z" />
     <glyph glyph-name="uniE11C" unicode="&#xe11c;" horiz-adv-x="265" 
-d="M337 204c2 -2 3 -5 3 -8s-1 -6 -3 -9l-92 -92l85 -85c2 -2 4 -5 4 -8c0 -7 -6 -12 -12 -12c-3 0 -7 1 -9 3l-58 59c6 -16 10 -34 10 -52c0 -73 -59 -133 -132 -133c-19 0 -36 4 -52 11l58 -59c3 -2 4 -5 4 -8c0 -7 -5 -12 -12 -12c-3 0 -6 1 -9 3l-85 86l-92 -92
-c-2 -3 -5 -4 -8 -4s-7 1 -9 4c-2 2 -3 5 -3 8s1 6 3 9l92 92l-85 85c-2 2 -4 5 -4 8c0 7 6 12 12 12c3 0 7 -1 9 -3l58 -59c-6 16 -10 34 -10 52c0 73 59 133 133 133c18 0 35 -4 51 -11l-58 59c-3 2 -4 5 -4 8c0 7 5 12 12 12c3 0 6 -1 9 -3l85 -86l92 92c2 3 5 4 8 4
-s7 -1 9 -4z" />
+d="M337 204c2 -2 3 -5 3 -8s-1 -6 -3 -9l-92 -92l85 -85c2 -2 4 -5 4 -8s-2 -6 -4 -9c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-58 59c6 -16 10 -34 10 -52c0 -73 -59 -133 -132 -133c-19 0 -36 4 -52 11l58 -59c3 -2 4 -5 4 -8s-1 -6 -4 -9c-2 -2 -5 -3 -8 -3s-6 1 -9 3l-85 86
+l-92 -92c-2 -3 -5 -4 -8 -4s-7 1 -9 4c-2 2 -3 5 -3 8s1 6 3 9l92 92l-85 85c-2 2 -4 5 -4 8s2 6 4 9c2 2 5 3 8 3c4 0 7 -1 9 -3l58 -59c-6 16 -10 34 -10 52c0 73 59 133 132 133c19 0 36 -4 52 -11l-58 59c-3 2 -4 5 -4 8s1 6 4 9c2 2 5 3 8 3s6 -1 9 -3l85 -86l92 92
+c2 3 5 4 8 4s7 -1 9 -4z" />
     <glyph glyph-name="uniE11D" unicode="&#xe11d;" horiz-adv-x="265" 
-d="M337 204c2 -2 3 -5 3 -8s-1 -6 -3 -9l-92 -92l85 -85c2 -2 4 -5 4 -8c0 -7 -6 -12 -12 -12c-3 0 -7 1 -9 3l-58 59c6 -16 10 -34 10 -52c0 -73 -59 -133 -132 -133c-19 0 -36 4 -52 11l58 -59c3 -2 4 -5 4 -8c0 -7 -5 -12 -12 -12c-3 0 -6 1 -9 3l-85 86l-92 -92
-c-2 -3 -5 -4 -8 -4s-7 1 -9 4c-2 2 -3 5 -3 8s1 6 3 9l92 92l-85 85c-2 2 -4 5 -4 8c0 7 6 12 12 12c3 0 7 -1 9 -3l59 -59c-7 16 -11 34 -11 52c0 73 59 133 133 133c18 0 35 -4 51 -11l-58 59c-3 2 -4 5 -4 8c0 7 5 12 12 12c3 0 6 -1 9 -3l85 -86l92 92c2 3 5 4 8 4
-s7 -1 9 -4zM133 101c-56 0 -101 -46 -101 -101c0 -23 8 -45 22 -62l141 141c-18 14 -39 22 -62 22zM133 -101c55 0 100 46 100 101c0 23 -8 45 -21 62l-141 -141c17 -14 38 -22 62 -22z" />
+d="M337 204c2 -2 3 -5 3 -8s-1 -6 -3 -9l-92 -92l85 -85c2 -2 4 -5 4 -8s-2 -6 -4 -9c-2 -2 -5 -3 -8 -3c-4 0 -7 1 -9 3l-58 59c6 -16 10 -34 10 -52c0 -73 -59 -133 -132 -133c-19 0 -36 4 -52 11l58 -59c3 -2 4 -5 4 -8s-1 -6 -4 -9c-2 -2 -5 -3 -8 -3s-6 1 -9 3l-85 86
+l-92 -92c-2 -3 -5 -4 -8 -4s-7 1 -9 4c-2 2 -3 5 -3 8s1 6 3 9l92 92l-85 85c-2 2 -4 5 -4 8s2 6 4 9c2 2 5 3 8 3c4 0 7 -1 9 -3l58 -59c-6 16 -10 34 -10 52c0 73 59 133 133 133c18 0 35 -4 51 -11l-58 59c-3 2 -4 5 -4 8s1 6 4 9c2 2 5 3 8 3s6 -1 9 -3l85 -86l92 92
+c2 3 5 4 8 4s7 -1 9 -4zM133 101c-56 0 -101 -46 -101 -101c0 -23 8 -45 21 -62l142 141c-18 13 -39 22 -62 22zM133 -101c55 0 100 46 100 101c0 23 -8 45 -21 62l-142 -141c18 -13 39 -22 63 -22z" />
     <glyph glyph-name="uniECAB" unicode="&#xecab;" horiz-adv-x="712" 
-d="M426 285v-231c-1 -124 -155 -227 -280 -227c-26 0 -146 8 -146 118s144 226 280 226c57 0 87 -20 91 -22v974c0 13 10 20 22 20c14 0 18 -8 21 -20s9 -39 10 -41c1 -1 1 -2 1 -3c28 -86 70 -159 126 -229c4 -4 36 -45 68 -88c65 -87 92 -168 92 -277
-c0 -42 -2 -84 -8 -126c8 -30 8 -56 8 -80c0 -56 -4 -95 -18 -139c17 -41 18 -74 18 -104c0 -69 -6 -113 -29 -170c0 -2 -5 -19 -21 -19c-2 0 -4 0 -6 1c-9 3 -12 11 -12 19c0 6 1 11 2 14c12 42 18 78 18 110c0 128 -121 256 -237 294zM426 828c5 -45 28 -164 137 -266
-c45 -41 76 -78 98 -112c0 171 -91 295 -235 378zM661 200c1 12 2 25 2 37c0 67 -21 120 -54 167c-41 58 -123 130 -183 154c5 -40 28 -147 137 -249c45 -42 76 -78 98 -109z" />
+d="M426 285v-232c-1 -123 -155 -226 -280 -226c-26 0 -146 8 -146 118s144 226 280 226c57 0 87 -20 91 -22v974c0 13 10 20 22 20c14 0 18 -8 21 -20s9 -39 10 -41c1 -1 1 -2 1 -3c28 -86 70 -159 126 -229c4 -4 36 -45 68 -88c65 -87 92 -168 92 -277
+c0 -42 -2 -84 -8 -126c8 -30 8 -56 8 -80c0 -56 -4 -95 -18 -139c17 -41 18 -74 18 -104c0 -69 -6 -112 -29 -170c0 -2 -5 -19 -21 -19c-2 0 -4 0 -6 1c-9 3 -12 11 -12 19c0 6 1 12 2 14c12 42 18 78 18 110c0 128 -121 256 -237 294zM426 828c5 -45 28 -164 137 -266
+c45 -41 76 -78 98 -112c0 171 -91 295 -235 378zM661 200c1 12 2 25 2 37c0 67 -21 120 -54 167c-41 58 -123 130 -183 153c5 -39 28 -146 137 -248c45 -42 76 -78 98 -109z" />
     <glyph glyph-name="uniECA2" unicode="&#xeca2;" horiz-adv-x="475" 
-d="M238 172c176 0 237 -89 237 -172s-61 -172 -237 -172s-238 89 -238 172s62 172 238 172zM131 71c0 -33 20 -100 31 -132c17 -55 43 -70 84 -70c30 0 72 4 89 33c5 10 7 24 7 39c0 22 -5 50 -15 83l-4 13c-14 48 -30 96 -81 96h-1c-32 0 -81 -4 -102 -32
-c-5 -9 -8 -19 -8 -30z" />
+d="M132 56c12 -56 14 -70 30 -117c17 -55 43 -70 84 -70c15 0 33 2 47 5c21 5 34 14 42 28c5 10 7 24 7 39c0 22 -5 50 -15 83l-4 13c-14 48 -30 96 -81 96h-1c-34 0 -42 -3 -59 -7c-19 -4 -34 -13 -43 -25c-5 -9 -8 -19 -8 -30c0 -5 0 -10 1 -15zM238 172
+c176 0 237 -89 237 -172s-61 -172 -237 -172s-238 89 -238 172s62 172 238 172z" />
     <glyph glyph-name="uniECA0" unicode="&#xeca0;" horiz-adv-x="672" 
-d="M18 224c14 0 28 0 28 -18v-411s-9 -17 -17 -17c-12 0 -29 0 -29 17v411s7 18 18 18zM563 224c11 0 18 -8 18 -18v-411c0 -16 -18 -17 -29 -17c-10 0 -17 8 -17 17v98c-38 -36 -101 -62 -198 -62s-161 26 -198 62v-98c0 -16 -18 -17 -29 -17c-10 0 -17 8 -17 17v411
-c0 18 14 18 28 18c11 0 18 -8 18 -18v-98c37 36 101 62 198 62s160 -26 198 -62v98c0 18 14 18 28 18zM655 224c10 0 17 -8 17 -18v-411c0 -17 -18 -17 -29 -17c-10 0 -17 8 -17 17v411s7 18 17 18h12zM347 -129c51 0 95 11 95 72c0 32 -23 112 -41 145
-c-18 34 -40 42 -74 42c-19 0 -39 -4 -54 -8c-33 -11 -41 -31 -41 -63c2 -34 25 -115 41 -146s39 -42 74 -42z" />
+d="M29 224c10 0 17 -8 17 -18v-411s-9 -17 -17 -17h-11c-11 0 -18 8 -18 17v411s7 18 18 18h11zM563 224c11 0 18 -8 18 -18v-411s-9 -17 -18 -17h-11c-10 0 -17 8 -17 17v98c-38 -36 -101 -62 -198 -62s-161 26 -198 62v-98c0 -8 -9 -17 -18 -17h-11c-10 0 -18 8 -18 17
+v411s8 18 18 18h11c11 0 18 -8 18 -18v-98c37 36 101 62 198 62s160 -26 198 -62v98c0 10 7 18 17 18h11zM401 -121c30 10 41 31 41 64c0 32 -23 112 -41 145c-18 34 -40 42 -74 42c-19 0 -39 -4 -54 -8c-28 -9 -41 -27 -41 -57v-6c2 -34 25 -115 41 -146s39 -42 74 -42
+c19 0 39 4 54 8zM655 224c10 0 17 -8 17 -18v-411s-9 -17 -17 -17h-12c-10 0 -17 8 -17 17v411s7 18 17 18h12z" />
     <glyph glyph-name="uniE870" unicode="&#xe870;" horiz-adv-x="501" 
-d="M251 501c138 0 250 -112 250 -250c0 -139 -112 -251 -250 -251c-139 0 -251 112 -251 251c0 138 112 250 251 250zM251 57c107 0 193 87 193 194c0 106 -87 193 -193 193c-107 0 -194 -86 -194 -193s87 -194 194 -194z" />
+d="M251 501c138 0 250 -112 250 -250c0 -139 -112 -251 -250 -251c-139 0 -251 112 -251 251c0 138 112 250 251 250zM387 114c36 36 57 85 57 137s-20 100 -57 136c-36 37 -84 57 -136 57s-101 -20 -137 -57c-37 -36 -57 -84 -57 -136s20 -101 57 -137
+c36 -37 85 -57 137 -57c51 0 100 20 136 57z" />
     <glyph glyph-name="uniE871" unicode="&#xe871;" horiz-adv-x="501" 
 d="M502 475l-62 -61c38 -44 61 -101 61 -163c0 -139 -112 -251 -250 -251c-63 0 -120 23 -164 61l-62 -62l-26 26l62 62c-38 44 -61 101 -61 164c0 138 112 250 251 250c62 0 119 -23 163 -61l61 62zM57 251c0 -46 16 -89 44 -123l272 272c-34 28 -77 44 -122 44
-c-107 0 -194 -86 -194 -193zM444 251c0 45 -16 88 -44 122l-272 -272c34 -28 77 -44 123 -44c107 0 193 87 193 194z" />
+c-52 0 -101 -20 -137 -57c-37 -36 -57 -84 -57 -136zM444 251c0 45 -16 88 -44 122l-272 -272c34 -28 77 -44 123 -44c51 0 100 20 136 57c36 36 57 85 57 137z" />
     <glyph glyph-name="uniE873" unicode="&#xe873;" horiz-adv-x="501" 
-d="M250 490l251 -480h-501zM250 367l-156 -300h313z" />
+d="M250 367l-156 -300h312zM250 490l250 -480h-500z" />
     <glyph glyph-name="uniE872" unicode="&#xe872;" horiz-adv-x="321" 
 d="M321 278v-56h-132v-132h-56v132h-132v56h132v132h56v-132h132z" />
     <glyph glyph-name="uniE4F6" unicode="&#xe4f6;" horiz-adv-x="317" 
-d="M288 -180l-7 9c-36 44 -80 92 -140 96c14 -12 23 -28 25 -47c1 -3 1 -6 1 -9c-1 -34 -25 -64 -60 -70c-4 -1 -8 -1 -12 -1c-35 0 -65 26 -71 61c0 32 6 56 35 73c21 14 51 21 76 21c17 0 34 -3 52 -10l-184 222c-2 3 -3 6 -3 8c0 5 2 8 6 11c2 1 5 1 7 2c1 0 2 -1 2 -1
-c5 0 9 -2 12 -6c35 -44 81 -94 140 -98c-13 11 -22 27 -25 46c0 38 18 72 59 79c4 1 9 1 13 1c34 0 65 -25 70 -61c1 -3 1 -7 1 -10c0 -26 -14 -50 -36 -62c-14 -10 -32 -17 -52 -20c-7 -1 -14 -1 -22 -2c-18 0 -38 4 -56 12l194 -231c3 -4 4 -7 4 -10c0 -4 -2 -7 -5 -9
-c-2 -1 -5 -2 -7 -2c-6 0 -13 3 -17 8z" />
+d="M288 -180l-7 9c-5 6 -43 57 -92 83c-15 8 -32 12 -48 13c14 -12 23 -28 25 -47c1 -3 1 -6 1 -9c-1 -34 -25 -64 -60 -70c-4 0 -8 -1 -12 -1c-35 0 -65 26 -71 61v10c-1 26 13 50 35 63c14 9 33 16 53 19c7 1 15 2 23 2c17 0 34 -3 52 -10l-184 222c-2 3 -3 6 -3 8
+c0 4 2 8 6 11c2 1 5 1 7 1h2c5 0 9 -3 12 -6c4 -5 44 -59 93 -85c15 -8 31 -12 47 -13c-13 11 -22 27 -25 46v8c-1 34 24 65 59 71c4 1 9 1 13 1c34 0 65 -25 70 -61c1 -3 1 -7 1 -10c0 -26 -14 -50 -36 -62c-14 -10 -32 -17 -52 -20c-7 -1 -14 -2 -22 -2
+c-18 0 -38 4 -57 12l195 -231c3 -4 4 -7 4 -10c0 -4 -2 -7 -5 -9c-2 -1 -5 -2 -7 -2c-6 0 -13 3 -17 8z" />
     <glyph glyph-name="uniE06A" unicode="&#xe06a;" horiz-adv-x="304" 
-d="M304 -422c0 -9 -7 -16 -16 -16h-272c-9 0 -16 7 -16 16v845c0 8 7 16 16 16h272c9 0 16 -8 16 -16v-845zM40 335v-669c0 -6 5 -10 10 -10h204c5 0 10 4 10 10v669c0 5 -4 10 -10 10h-204c-5 0 -10 -5 -10 -10z" />
+d="M304 -422c0 -9 -7 -16 -16 -16h-272c-9 0 -16 7 -16 16v845c0 8 7 16 16 16h272c9 0 16 -8 16 -16v-845zM40 335v-669c0 -6 4 -10 10 -10h204c5 0 10 4 10 10v669c0 5 -4 10 -10 10h-204c-6 0 -10 -5 -10 -10z" />
     <glyph glyph-name="uniE4CE" unicode="&#xe4ce;" horiz-adv-x="191" 
-d="M57 0l-24 30c69 48 108 97 108 140c0 6 -1 9 -3 10c-1 1 -3 1 -4 1c-3 0 -5 -1 -8 -2s-17 -8 -46 -8c-43 0 -80 33 -80 76c0 40 32 74 80 74c67 0 111 -46 111 -122c0 -72 -42 -135 -134 -199z" />
+d="M57 0l-24 30c69 48 108 97 108 140c0 6 -1 9 -3 10s-3 1 -5 1s-5 -1 -7 -2c-3 -1 -17 -8 -46 -8c-43 0 -80 33 -80 76c0 40 32 74 80 74c67 0 111 -46 111 -123c0 -71 -42 -134 -134 -198z" />
     <glyph glyph-name="uniE4D3" unicode="&#xe4d3;" horiz-adv-x="184" 
-d="M38 -1h-30c-4 0 -8 4 -8 9v483c0 5 5 10 10 10h26c6 0 10 -5 10 -10v-483c0 -5 -4 -9 -8 -9zM176 -1h-30c-4 0 -8 4 -8 9v483c0 5 5 10 10 10h26c6 0 10 -5 10 -10v-483c0 -5 -4 -9 -8 -9z" />
+d="M38 -1h-30c-4 0 -8 4 -8 9v482c0 6 4 10 10 10h26c6 0 10 -4 10 -10v-482c0 -5 -4 -9 -8 -9zM176 -1h-30c-4 0 -8 4 -8 9v482c0 6 4 10 10 10h26c6 0 10 -4 10 -10v-482c0 -5 -4 -9 -8 -9z" />
     <glyph glyph-name="uniE500" unicode="&#xe500;" horiz-adv-x="481" 
-d="M481 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" />
+d="M127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 250l-355 -500h-126l355 500h126zM481 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" />
     <glyph glyph-name="uniE501" unicode="&#xe501;" horiz-adv-x="735" 
-d="M481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM735 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" />
+d="M735 -126c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126z" />
     <glyph glyph-name="uniE502" unicode="&#xe502;" horiz-adv-x="1243" 
-d="M481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM989 250l-355 -500h-126l355 500h126zM1243 250l-355 -500h-126l355 500h126zM127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM1243 -126
+d="M127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63zM481 250l-355 -500h-126l355 500h126zM735 250l-355 -500h-126l355 500h126zM989 250l-355 -500h-126l355 500h126zM1243 250l-355 -500h-126l355 500h126zM1243 -126
 c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" />
     <glyph glyph-name="uniE4A8" unicode="&#xe4a8;" horiz-adv-x="122" 
 d="M118 254c2 0 4 -1 4 -5s-2 -12 -5 -21c-31 -101 -46 -220 -46 -220c-2 -5 -6 -8 -10 -8s-8 3 -10 8c0 0 -15 119 -46 220c-3 9 -5 17 -5 21s1 5 4 5c9 0 35 -23 57 -23c21 0 47 23 57 23z" />
     <glyph glyph-name="uniE4A9" unicode="&#xe4a9;" horiz-adv-x="122" 
 d="M4 -254c-2 0 -4 1 -4 5s2 12 5 21c31 101 46 220 46 220c2 5 6 8 10 8s8 -3 10 -8c0 0 15 -119 46 -220c3 -9 5 -17 5 -21s-2 -5 -4 -5c-10 0 -35 23 -57 23s-47 -23 -57 -23z" />
     <glyph glyph-name="uniE56F" unicode="&#xe56f;" horiz-adv-x="503" 
-d="M499 192c3 -16 4 -31 4 -44c0 -106 -68 -148 -125 -148c-56 0 -89 16 -115 39l-28 29l-64 -75c-3 -4 -8 -6 -12 -6s-7 1 -10 4c-4 3 -6 7 -6 12c0 4 1 7 4 11l65 77l-21 20c-20 20 -52 52 -91 52c-47 0 -64 -51 -64 -107c0 -9 0 -18 1 -26c0 -9 -3 -14 -16 -14
-c-14 0 -17 14 -17 16c-3 15 -4 28 -4 41c0 108 68 151 125 151c56 0 89 -16 115 -40l28 -28l64 75c3 4 7 6 12 6c4 0 7 -1 11 -4c3 -3 5 -8 5 -12s-1 -8 -4 -11l-65 -77l21 -20c20 -20 52 -52 91 -52c47 0 64 51 64 107c0 9 0 17 -1 26c0 9 5 14 16 14c14 0 17 -15 17 -16z
-" />
+d="M499 192c3 -16 4 -31 4 -44c0 -106 -69 -148 -125 -148s-89 16 -115 39l-28 28l-64 -74c-3 -4 -8 -6 -12 -6s-7 1 -11 4c-3 3 -5 7 -5 12c0 4 1 7 4 11l65 76l-21 21c-20 20 -52 52 -91 52c-47 0 -64 -51 -64 -107c0 -9 0 -18 1 -27c0 -8 -4 -13 -16 -13
+c-14 0 -17 14 -17 16c-3 15 -4 28 -4 41c0 108 68 151 125 151c56 0 89 -16 115 -40l28 -28l64 75c3 4 7 6 12 6c4 0 7 -1 10 -4c4 -3 6 -8 6 -13c0 -3 -1 -7 -4 -10l-65 -77l21 -20c20 -20 52 -52 91 -52c47 0 64 51 64 107c0 9 0 17 -1 26c0 9 5 14 15 14
+c15 0 18 -15 18 -16z" />
     <glyph glyph-name="uniE570" unicode="&#xe570;" horiz-adv-x="425" 
-d="M353 465c2 7 8 11 14 11h41c9 0 16 -8 16 -15c0 -2 0 -5 -1 -7l-173 -445c-2 -6 -8 -10 -14 -10h-48c-6 0 -12 4 -15 10l-172 445c-1 2 -2 4 -2 7c0 7 7 15 16 15h42c6 0 12 -4 14 -11l141 -361z" />
+d="M352 465c3 6 9 11 15 11h41c9 0 16 -8 16 -15c0 -2 0 -5 -1 -7l-173 -445c-2 -6 -8 -10 -14 -10h-48c-6 0 -12 4 -15 10l-172 445c-1 2 -1 4 -1 7c0 7 6 15 15 15h42c6 0 12 -5 14 -11l141 -361z" />
     <glyph glyph-name="uniE582" unicode="&#xe582;" horiz-adv-x="305" 
-d="M295 175c6 0 10 -5 10 -10v-24c0 -6 -4 -10 -10 -10h-120v-121c0 -5 -5 -10 -10 -10h-24c-6 0 -10 5 -10 10v121h-121c-5 0 -10 4 -10 10v24c0 5 5 10 10 10h121v120c0 6 4 10 10 10h24c5 0 10 -4 10 -10v-120h120z" />
+d="M295 175c5 0 10 -5 10 -10v-24c0 -6 -5 -10 -10 -10h-121v-121c0 -5 -4 -10 -10 -10h-24c-5 0 -10 5 -10 10v121h-120c-6 0 -10 4 -10 10v24c0 5 4 10 10 10h120v120c0 6 5 10 10 10h24c6 0 10 -4 10 -10v-120h121z" />
     <glyph glyph-name="uniE587" unicode="&#xe587;" horiz-adv-x="591" 
-d="M737 473c8 0 14 -6 14 -14s-6 -14 -14 -14c-36 0 -80 -29 -133 -88s-156 -218 -239 -351c-2 -4 -6 -6 -12 -6c-2 0 -4 0 -6 2c-2 1 -4 3 -5 4l-79 127l-78 -126c-2 -4 -7 -7 -11 -7c-6 0 -10 2 -12 7l-79 126l-59 -95l-24 15l117 189h1c2 4 6 6 11 6s9 -2 12 -6l79 -126
-l78 126c2 4 6 6 11 6s9 -2 12 -6l78 -124c75 119 134 202 184 258c60 66 109 97 154 97z" />
+d="M737 473c8 0 14 -6 14 -14s-6 -14 -14 -14c-36 0 -80 -29 -133 -88s-156 -218 -239 -351c-2 -4 -6 -6 -12 -6c-2 0 -4 0 -7 2c-2 1 -3 2 -4 4l-79 127l-59 -95v0l-19 -31c-2 -4 -7 -7 -12 -7s-9 2 -11 6l-79 127l-59 -95l-24 15l117 189h1c2 4 6 6 11 6v0c5 0 9 -2 12 -6
+l78 -126l78 126c3 4 7 6 12 6v0c5 0 9 -2 12 -6l78 -124c75 119 134 201 184 258c60 66 109 97 154 97z" />
     <glyph glyph-name="uniE53E" unicode="&#xe53e;" horiz-adv-x="751" 
 d="M739 98l-6 -29l-728 144v30l728 144l6 -29l-654 -130z" />
     <glyph glyph-name="uniE53F" unicode="&#xe53f;" horiz-adv-x="751" 
@@ -1504,83 +1560,87 @@ d="M2 357l6 29l728 -144v-29l-728 -145l-6 30l654 129z" />
     <glyph glyph-name="uniE540" unicode="&#xe540;" horiz-adv-x="1555" 
 d="M739 98l-6 -29l-728 144v30l728 144l6 -29l-654 -130zM817 357l6 29l728 -144v-29l-728 -145l-6 30l654 129z" />
     <glyph glyph-name="uniE588" unicode="&#xe588;" horiz-adv-x="528" 
-d="M528 143c0 0 1 -15 -13 -18c-13 0 -16 4 -20 16c-20 67 -43 75 -82 75c-112 0 -130 -153 -131 -194v-8c0 -8 -6 -14 -14 -14h-9c-7 0 -13 6 -13 14v15c-3 49 -25 187 -131 187c-39 0 -62 -8 -82 -75c-4 -12 -7 -16 -20 -16c-14 3 -13 18 -13 18s5 127 120 127
+d="M528 143c0 0 1 -15 -13 -18h-4c-11 0 -14 9 -16 16c-20 67 -43 75 -82 75c-112 0 -130 -153 -131 -194v-8c0 -8 -6 -14 -14 -14h-9c-7 0 -13 6 -13 14v15c-3 49 -25 187 -131 187c-39 0 -62 -8 -82 -75c-2 -7 -5 -16 -16 -16h-4c-14 3 -13 18 -13 18s5 127 120 127
 c57 0 104 -30 126 -75v198c0 8 6 14 13 14h9c8 0 14 -6 14 -14v-199c21 46 68 76 126 76c115 0 120 -127 120 -127z" />
     <glyph glyph-name="uniE5E6" unicode="&#xe5e6;" horiz-adv-x="280" 
-d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140s-140 63 -140 140s63 140 140 140zM251 154c-6 50 -47 91 -97 97v-97h97zM61 219c-18 -17 -29 -40 -33 -65h98v97c-25 -3 -48 -14 -65 -32zM28 126c8 -50 47 -91 98 -97v97h-98zM154 29c50 6 91 47 97 97h-97v-97z" />
+d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140s-140 63 -140 140s63 140 140 140zM251 154c-3 25 -14 48 -32 65c-18 18 -40 29 -65 32v-97h97zM60 219c-17 -17 -29 -40 -32 -65h98v97c-25 -3 -48 -14 -66 -32zM28 126c3 -25 15 -48 32 -65c18 -18 41 -29 66 -32v97
+h-98zM219 61c18 17 29 40 32 65h-97v-97c25 3 47 14 65 32z" />
     <glyph glyph-name="uniE5E7" unicode="&#xe5e7;" horiz-adv-x="280" 
 d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140s-140 63 -140 140s63 140 140 140zM140 28c62 0 112 50 112 112s-50 112 -112 112s-112 -50 -112 -112s50 -112 112 -112z" />
     <glyph glyph-name="uniE5E8" unicode="&#xe5e8;" horiz-adv-x="279" 
-d="M339 153v-28h-60c-7 -66 -59 -118 -126 -125v-61h-28v61c-66 7 -118 59 -125 125h-61v28h61c7 66 59 119 125 126v60h28v-60c67 -7 119 -60 126 -126h60z" />
+d="M339 153v-28h-60c-7 -66 -60 -118 -126 -125v-61h-28v61c-66 7 -118 59 -125 125h-61v28h61c7 66 59 119 125 126v60h28v-60c66 -7 119 -60 126 -126h60z" />
     <glyph glyph-name="uniE5E9" unicode="&#xe5e9;" horiz-adv-x="279" 
-d="M339 153v-28h-60c-7 -66 -59 -118 -126 -125v-61h-28v61c-66 7 -118 59 -125 125h-61v28h61c7 66 59 119 125 126v60h28v-60c67 -7 119 -60 126 -126h60zM251 153c-7 51 -47 91 -98 97v-97h98zM153 28c51 7 91 47 98 97h-98v-97z" />
+d="M339 153v-28h-60c-7 -66 -60 -118 -126 -125v-61h-28v61c-66 7 -118 59 -125 125h-61v28h61c7 66 59 119 125 126v60h28v-60c66 -7 119 -60 126 -126h60zM250 153c-6 51 -46 91 -97 97v-97h97zM153 28c51 6 91 47 97 97h-97v-97z" />
     <glyph glyph-name="uniE5EA" unicode="&#xe5ea;" horiz-adv-x="279" 
-d="M339 153v-28h-60c-7 -66 -59 -118 -126 -125v-61h-28v61c-66 7 -118 59 -125 125h-61v28h61c7 66 59 119 125 126v60h28v-60c67 -7 119 -60 126 -126h60zM125 250c-50 -6 -90 -46 -97 -97h97v97zM28 125c7 -50 47 -90 97 -97v97h-97z" />
+d="M339 153v-28h-60c-7 -66 -60 -118 -126 -125v-61h-28v61c-66 7 -118 59 -125 125h-61v28h61c7 66 59 119 125 126v60h28v-60c66 -7 119 -60 126 -126h60zM125 250c-50 -6 -90 -46 -97 -97h97v97zM28 125c7 -50 47 -91 97 -97v97h-97z" />
     <glyph glyph-name="uniE5EB" unicode="&#xe5eb;" horiz-adv-x="279" 
-d="M339 153v-28h-60c-7 -66 -59 -118 -126 -125v-61h-28v61c-66 7 -118 59 -125 125h-61v28h61c7 66 59 119 125 126v60h28v-60c67 -7 119 -60 126 -126h60zM251 153c-6 51 -47 92 -98 98v-98h98zM125 251c-51 -6 -91 -47 -97 -98h97v98zM28 125c6 -50 47 -91 97 -97v97h-97
-zM153 28c51 6 92 46 98 97h-98v-97z" />
+d="M339 153v-28h-60c-7 -66 -60 -118 -126 -125v-61h-28v61c-66 7 -118 59 -125 125h-61v28h61c7 66 59 119 125 126v60h28v-60c66 -7 119 -60 126 -126h60zM219 219c-18 18 -41 29 -66 32v-98h98c-3 25 -14 48 -32 66zM60 219c-18 -18 -29 -41 -32 -66h97v98
+c-24 -3 -47 -14 -65 -32zM60 60c18 -18 41 -29 65 -32v97h-97c3 -24 14 -47 32 -65zM219 60c18 18 29 41 32 65h-98v-97c25 3 48 14 66 32z" />
     <glyph glyph-name="uniE5EF" unicode="&#xe5ef;" horiz-adv-x="280" 
-d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140c-78 0 -140 63 -140 140s62 140 140 140zM27 140c0 -25 9 -49 24 -69l157 158c-19 15 -43 23 -68 23c-62 0 -113 -50 -113 -112zM140 28c62 0 112 50 112 112c0 25 -8 49 -24 69l-157 -158c19 -15 43 -23 69 -23z" />
+d="M140 280c77 0 140 -63 140 -140s-63 -140 -140 -140c-78 0 -140 63 -140 140s62 140 140 140zM27 140c0 -25 9 -49 24 -69l157 158c-19 15 -43 23 -68 23c-30 0 -59 -11 -80 -33c-21 -21 -33 -49 -33 -79zM219 61c21 21 33 49 33 79c0 25 -8 49 -24 69l-157 -158
+c19 -15 43 -23 69 -23c30 0 58 11 79 33z" />
     <glyph glyph-name="uniE573" unicode="&#xe573;" horiz-adv-x="222" 
-d="M180 0c-11 0 -28 6 -37 12c-98 53 -141 141 -141 249c0 7 0 15 1 24c5 92 64 177 66 180c3 5 7 7 12 7c7 0 12 -4 12 -11c0 -2 -1 -4 -2 -7c-35 -65 -50 -124 -50 -171c0 -131 106 -188 145 -208c2 -1 4 -2 5 -3c6 -3 22 -13 26 -29c1 -2 1 -5 1 -8
-c0 -19 -20 -35 -38 -35z" />
+d="M180 0c-11 0 -28 6 -37 12c-55 30 -95 73 -118 126c-16 37 -23 77 -23 122c0 8 0 16 1 25c5 92 64 177 66 180c3 5 7 7 12 7c2 0 4 0 6 -1c4 -2 6 -6 6 -10c0 -2 -1 -4 -2 -7c-35 -65 -50 -124 -50 -171c0 -131 106 -188 145 -208c2 -1 3 -3 5 -3c6 -3 22 -13 26 -29
+c1 -2 1 -5 1 -8c0 -7 -3 -13 -8 -20c-8 -11 -19 -15 -30 -15z" />
     <glyph glyph-name="uniE574" unicode="&#xe574;" horiz-adv-x="222" 
-d="M12 14c-5 7 -8 14 -8 21c0 2 0 5 1 8c4 16 20 25 26 28c85 43 150 110 150 211c0 48 -15 107 -50 172c-1 2 -2 5 -2 7c0 7 5 11 12 11c5 0 9 -2 12 -7c2 -3 61 -88 66 -181c1 -8 1 -16 1 -24c0 -108 -44 -195 -141 -248c-9 -6 -26 -12 -37 -12s-22 4 -30 14z" />
+d="M12 14c-5 7 -8 14 -8 21c0 2 0 5 1 8c4 16 20 25 26 28c1 1 3 2 5 3c39 21 145 78 145 208c0 48 -15 107 -50 172c-1 2 -2 5 -2 7c0 4 2 8 6 10c2 1 4 1 6 1c5 0 9 -3 12 -7c2 -3 61 -88 66 -181c1 -8 1 -16 1 -24c0 -45 -7 -86 -23 -122c-23 -53 -63 -96 -118 -126
+c-9 -6 -26 -12 -37 -12s-22 4 -30 14z" />
     <glyph glyph-name="uniE575" unicode="&#xe575;" horiz-adv-x="375" 
-d="M372 32c-4 -25 -37 -32 -58 -32c-180 0 -314 122 -314 305c0 21 2 36 2 37c2 8 6 13 14 13s13 -5 13 -12c0 -184 104 -272 289 -272c16 0 34 0 46 -12c6 -5 9 -11 9 -19c0 -2 0 -5 -1 -8z" />
+d="M351 7c-9 -5 -26 -7 -37 -7h-5c-69 0 -130 18 -180 52c-40 27 -72 65 -97 111c-27 49 -32 105 -32 141c0 22 2 37 2 38c1 5 4 10 8 12c2 1 4 1 6 1c8 0 13 -5 13 -12c0 -70 15 -126 41 -164c71 -107 200 -108 248 -108h6c7 0 28 0 40 -12c5 -5 9 -11 9 -19
+c0 -2 0 -5 -1 -8c-2 -12 -11 -20 -21 -25z" />
     <glyph glyph-name="uniE576" unicode="&#xe576;" horiz-adv-x="500" 
-d="M496 316c1 -3 3 -17 3 -38s-7 -82 -33 -127c-85 -146 -209 -151 -366 -151h-57c-24 0 -42 13 -42 35s25 31 40 31h65c192 0 363 23 363 250c0 6 5 12 14 12c8 0 11 -4 13 -12z" />
+d="M496 316c1 -3 3 -17 3 -38s-7 -82 -33 -127c-25 -43 -57 -78 -96 -103c-50 -31 -101 -48 -270 -48h-58c-23 0 -41 13 -41 35s25 31 39 31h66c113 0 252 1 323 99c25 36 40 87 40 151c0 6 5 12 14 12c8 0 11 -4 13 -12z" />
     <glyph glyph-name="uniE579" unicode="&#xe579;" horiz-adv-x="189" 
-d="M184 265l-149 -258c-3 -4 -7 -7 -12 -7c-2 0 -5 1 -7 2l-8 4c-4 3 -7 8 -7 12c0 3 0 5 2 8l149 257c2 4 7 7 12 7c2 0 5 0 7 -2l8 -4c5 -3 7 -8 7 -13c0 -2 -1 -4 -2 -6z" />
+d="M184 264l-149 -257c-3 -4 -7 -7 -12 -7c-2 0 -5 1 -7 2l-8 4c-5 3 -7 7 -7 12c0 3 0 5 2 8l149 257c2 4 7 7 12 7c2 0 5 -1 7 -2l8 -4c4 -3 7 -8 7 -13c0 -2 -1 -4 -2 -7z" />
     <glyph glyph-name="uniE57A" unicode="&#xe57a;" horiz-adv-x="189" 
-d="M151 7l-149 258c-1 2 -2 4 -2 7c0 5 3 9 7 12l8 4c2 1 4 2 7 2c5 0 10 -2 12 -7l149 -257c2 -3 2 -5 2 -7c0 -5 -2 -10 -7 -13l-8 -4c-2 -1 -4 -2 -6 -2h-2c-4 0 -8 3 -11 7z" />
-    <glyph glyph-name="uniE57D" unicode="&#xe57d;" horiz-adv-x="501" 
-d="M301 434l-245 -422c-4 -8 -12 -12 -21 -12c-3 0 -7 1 -11 3l-12 8c-8 4 -12 11 -12 19c0 4 1 8 3 12l245 423c4 7 12 11 20 11c4 0 8 -1 12 -3l13 -7c7 -5 11 -12 11 -20c0 -5 0 -8 -3 -12zM516 434l-245 -422c-4 -8 -12 -12 -21 -12c-3 0 -7 1 -11 3l-12 8
-c-8 4 -12 11 -12 19c0 4 1 8 3 12l245 423c4 7 12 11 20 11c4 0 8 -1 12 -3l13 -7c7 -5 11 -12 11 -20c0 -5 0 -8 -3 -12z" />
+d="M151 7l-149 257c-1 3 -2 5 -2 8c0 5 3 9 7 12l8 4c2 1 4 2 7 2c5 0 9 -2 12 -7l149 -257c1 -3 2 -5 2 -7c0 -5 -2 -10 -7 -13l-8 -4c-2 -1 -4 -2 -6 -2h-2c-4 0 -9 3 -11 7z" />
     <glyph glyph-name="uniE57E" unicode="&#xe57e;" horiz-adv-x="519" 
-d="M463 12l-245 422c-2 4 -3 8 -3 12c0 8 5 15 12 20l13 7c3 2 7 3 11 3c8 0 16 -4 20 -11l245 -423c2 -4 3 -7 3 -11c0 -8 -4 -16 -11 -21l-13 -7c-4 -2 -8 -3 -12 -3c-8 0 -15 4 -20 12zM248 12l-245 422c-2 4 -3 8 -3 12c0 8 5 15 12 20l13 7c3 2 7 3 11 3
-c8 0 16 -4 20 -11l245 -423c2 -4 3 -7 3 -11c0 -8 -4 -16 -11 -21l-13 -7c-4 -2 -8 -3 -12 -3c-8 0 -15 4 -20 12z" />
+d="M463 11l-245 423c-2 4 -3 8 -3 12c0 8 4 15 12 20l13 7c3 2 7 3 11 3c8 0 16 -4 20 -11l245 -423c2 -4 3 -7 3 -11c0 -8 -4 -16 -11 -21l-13 -7c-4 -2 -8 -3 -12 -3c-8 0 -15 4 -20 11zM248 11l-245 423c-2 4 -3 8 -3 12c0 8 4 15 12 20l13 7c3 2 7 3 11 3
+c8 0 16 -4 20 -11l245 -423c2 -4 3 -7 3 -11c0 -8 -4 -16 -11 -21l-13 -7c-4 -2 -8 -3 -12 -3c-8 0 -15 4 -20 11z" />
     <glyph glyph-name="uniE57B" unicode="&#xe57b;" horiz-adv-x="304" 
-d="M301 434l-245 -422c-4 -8 -12 -12 -20 -12c-4 0 -8 1 -12 3l-12 7c-8 5 -12 12 -12 20c0 4 1 8 3 12l245 423c4 7 13 11 21 11c3 0 7 -1 11 -3l13 -7c7 -5 11 -13 11 -21c0 -4 -1 -7 -3 -11z" />
+d="M301 434l-245 -423c-4 -7 -12 -11 -20 -11c-4 0 -8 1 -12 3l-12 7c-8 5 -12 12 -12 20c0 4 1 8 3 12l245 423c4 7 12 11 21 11c3 0 7 -1 11 -3l12 -7c8 -5 12 -13 12 -21c0 -4 -1 -7 -3 -11z" />
     <glyph glyph-name="uniE57C" unicode="&#xe57c;" horiz-adv-x="304" 
-d="M248 12l-245 422c-2 4 -3 8 -3 12c0 8 4 15 12 20l12 7c4 2 8 3 11 3c9 0 17 -4 21 -11l245 -423c2 -4 3 -7 3 -11c0 -8 -4 -16 -12 -21l-12 -7c-4 -2 -8 -3 -12 -3c-8 0 -16 4 -20 12z" />
+d="M248 11l-245 423c-2 4 -3 8 -3 12c0 8 4 15 12 20l12 7c4 2 8 3 11 3c9 0 17 -4 21 -11l245 -423c2 -4 3 -7 3 -11c0 -8 -4 -16 -12 -21l-12 -7c-4 -2 -8 -3 -12 -3c-8 0 -16 4 -20 11z" />
     <glyph glyph-name="uniF4BA" unicode="&#xf4ba;" horiz-adv-x="391" 
-d="M377 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14c-10 0 -23 0 -23 14v79c-30 -30 -81 -50 -158 -50c-78 0 -129 20 -159 50v-79c0 -6 -7 -14 -14 -14c-10 0 -23 0 -23 14v329s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 159 49c77 0 128 -20 158 -49v78
-c0 8 6 14 14 14h9zM247 -97c24 8 33 25 33 51s-19 90 -33 117s-32 33 -60 33c-15 0 -31 -3 -43 -6c-22 -8 -32 -22 -32 -46c0 -30 18 -95 32 -122c13 -24 32 -33 60 -33c15 0 31 3 43 6z" />
+d="M247 -97c24 8 32 25 32 51s-18 90 -32 117c-14 26 -32 33 -60 33c-15 0 -31 -3 -43 -6c-22 -8 -32 -22 -32 -46v-5c1 -27 19 -92 32 -117c13 -24 32 -33 60 -33c15 0 31 3 43 6zM377 179c8 0 14 -6 14 -14v-329s-7 -14 -14 -14h-9c-8 0 -14 7 -14 14v79
+c-30 -30 -81 -50 -159 -50c-77 0 -128 20 -158 50v-79c0 -6 -7 -14 -14 -14h-9c-8 0 -14 7 -14 14v329s6 14 14 14h9c8 0 14 -6 14 -14v-78c30 29 81 49 158 49c78 0 129 -20 159 -49v78c0 8 6 14 14 14h9z" />
     <glyph glyph-name="uniF40E" unicode="&#xf40e;" horiz-adv-x="488" 
-d="M471 224c10 0 18 -7 18 -18v-411s-9 -17 -18 -17c-12 0 -29 0 -29 17v98c-37 -36 -101 -62 -197 -62c-97 0 -161 26 -198 62v-98c0 -16 -18 -17 -29 -17c-10 0 -17 8 -17 17v411c0 18 14 18 28 18c11 0 18 -7 18 -18v-98c37 36 101 62 198 62c96 0 160 -26 197 -62v98
-c0 18 16 18 29 18zM309 -121c30 10 40 31 40 64c0 32 -22 112 -40 145c-18 34 -40 42 -74 42c-20 0 -39 -4 -55 -8c-32 -11 -40 -31 -40 -63c2 -34 24 -115 40 -146c17 -31 40 -42 75 -42c19 0 39 4 54 8z" />
+d="M471 224c10 0 17 -8 17 -18v-411s-8 -17 -17 -17h-11c-10 0 -18 8 -18 17v98c-37 -36 -101 -62 -198 -62c-96 0 -160 26 -197 62v-98c0 -8 -9 -17 -18 -17h-11c-10 0 -18 8 -18 17v411s8 18 18 18h11c11 0 18 -8 18 -18v-98c37 36 101 62 197 62c97 0 161 -26 198 -62v98
+c0 10 8 18 18 18h11zM309 -121c30 10 40 31 40 64c0 32 -22 112 -40 145c-18 34 -40 42 -75 42c-19 0 -38 -4 -54 -8c-27 -9 -40 -27 -40 -57v-6c2 -34 24 -115 40 -146s40 -41 75 -41c19 0 39 3 54 7z" />
     <glyph glyph-name="uniE59D" unicode="&#xe59d;" horiz-adv-x="172" 
-d="M98 240l90 -148l-50 -85c-3 -4 -5 -7 -12 -7c-6 0 -9 3 -12 7s-67 112 -74 124l-59 -98l-24 14c11 19 114 188 117 193s7 7 12 7c4 0 9 -2 12 -7z" />
+d="M98 240l90 -149l-50 -84c-3 -4 -5 -7 -12 -7c-6 0 -9 3 -12 7s-67 112 -74 124l-59 -98l-24 14c11 19 114 188 117 193s7 7 12 7c4 0 9 -3 12 -7z" />
     <glyph glyph-name="uniE598" unicode="&#xe598;" horiz-adv-x="289" 
-d="M28 41c-1 -7 -6 -14 -14 -14s-14 7 -14 14c0 2 1 42 18 82c23 56 67 85 125 85c85 0 136 -66 146 -145l-26 -22c0 1 -1 37 -17 72c-21 45 -55 67 -103 67c-47 0 -80 -22 -99 -67c-15 -35 -15 -64 -16 -72z" />
+d="M28 41c-1 -7 -6 -14 -14 -14s-14 7 -14 14c0 2 1 42 18 82c23 56 66 85 125 85s103 -29 128 -84c11 -23 16 -45 18 -61l-26 -22c0 1 -1 37 -17 72c-21 45 -55 67 -103 67c-47 0 -80 -22 -99 -67c-15 -35 -15 -64 -16 -72z" />
+    <glyph glyph-name="uniE57D" unicode="&#xe57d;" horiz-adv-x="501" 
+d="M301 434l-245 -422c-4 -8 -12 -12 -21 -12c-3 0 -7 1 -11 3l-12 7c-8 5 -12 12 -12 20c0 4 1 8 3 12l245 423c4 7 12 11 20 11c4 0 8 -1 12 -3l12 -7c8 -5 12 -12 12 -20v-3c-1 -3 -1 -6 -3 -9zM516 434l-245 -422c-4 -8 -12 -12 -21 -12c-3 0 -7 1 -11 3l-12 7
+c-8 5 -12 12 -12 20c0 4 1 8 3 12l245 423c4 7 12 11 20 11c4 0 8 -1 12 -3l12 -7c8 -5 12 -12 12 -20v-3c-1 -3 -1 -6 -3 -9z" />
     <glyph glyph-name="uniE5BC" unicode="&#xe5bc;" horiz-adv-x="918" 
-d="M289 34c-3 -5 -6 -7 -12 -7c-10 0 -14 8 -15 15s-1 37 -16 70c-21 45 -55 68 -103 68c-47 0 -81 -23 -99 -68c-16 -37 -15 -66 -16 -72c0 -9 -5 -13 -15 -13s-13 9 -13 14s1 41 18 82c23 55 67 85 125 85c59 0 103 -30 129 -85c6 -15 11 -29 14 -42l96 161c2 3 5 6 9 6
-c6 0 11 -1 14 -6l75 -123l73 123c2 3 7 6 12 6c2 0 5 0 7 -2c2 0 4 -3 5 -4l79 -127l4 7v185c0 8 6 14 13 14h9c8 0 14 -6 14 -14v-126l37 61c2 3 8 6 12 6c6 0 9 -2 12 -6l79 -127l59 95l23 -14l-117 -189c-2 -4 -7 -7 -11 -7h-1c-4 0 -9 3 -11 7l-79 126l-3 -5v-187
-c0 -7 -6 -13 -14 -13h-9c-7 0 -13 6 -13 13v128c-4 -6 -36 -58 -39 -62c-3 -5 -8 -7 -12 -7s-9 2 -12 7c-2 4 -70 112 -77 124l-74 -124c-2 -4 -8 -7 -12 -7s-10 3 -12 7l-74 124c-6 -9 -56 -92 -59 -97z" />
+d="M289 34c-3 -5 -6 -7 -12 -7c-10 0 -14 8 -15 15s-1 37 -16 70c-21 45 -55 68 -103 68c-47 0 -81 -23 -99 -68c-16 -37 -15 -66 -16 -72c-1 -9 -5 -13 -15 -13s-13 9 -13 14s1 41 18 82c23 55 67 85 125 85c59 0 103 -30 129 -85c6 -15 11 -29 14 -42l3 7l93 153
+c2 4 5 7 9 7c6 0 11 -1 14 -6l75 -123l73 122c2 4 7 7 12 7c2 0 5 -1 7 -2c1 -1 4 -3 5 -4l79 -127l4 7v185c0 8 6 14 13 14h9c8 0 14 -7 14 -14v-126l37 60c2 4 8 7 12 7c6 0 9 -2 12 -6l79 -127l59 95l23 -14l-117 -189v0c-2 -4 -7 -7 -12 -7v0c-4 0 -9 3 -11 7l-79 126
+l-3 -5v-186c0 -8 -6 -14 -14 -14h-9c-7 0 -13 6 -13 14v127c-4 -6 -36 -58 -39 -62c-3 -5 -8 -7 -12 -7s-9 2 -12 7c-2 4 -70 112 -77 124l-74 -124v0c-2 -4 -8 -7 -12 -7v0c-4 0 -10 3 -12 7l-74 124c-6 -9 -56 -92 -59 -97z" />
     <glyph glyph-name="uniE59E" unicode="&#xe59e;" horiz-adv-x="261" 
-d="M14 89l-16 26l78 126c2 4 7 7 11 7c6 0 10 -2 12 -6l79 -127l59 95l24 -15l-117 -189h-1c-2 -4 -6 -6 -11 -6s-9 2 -12 6l-79 126z" />
+d="M14 89l-16 26l59 95v0l18 31c3 4 7 7 12 7c6 0 10 -2 12 -6l79 -127l59 95l24 -15l-118 -189v0c-2 -4 -6 -6 -11 -6v0c-5 0 -9 2 -12 6l-79 126z" />
     <glyph glyph-name="uniE584" unicode="&#xe584;" horiz-adv-x="256" 
-d="M102 176c-1 -7 -1 -13 -1 -19c0 -32 14 -54 54 -54c47 0 78 76 79 77c1 4 6 8 10 8c2 0 3 0 4 -1c5 -1 8 -6 8 -11c0 -15 -16 -46 -23 -58c-23 -37 -55 -56 -95 -56c-60 0 -94 43 -94 100c0 7 1 15 2 23c5 32 13 74 23 126h-59c-5 0 -10 4 -10 10v24c0 5 5 10 10 10h67
-c9 53 14 94 14 98c1 5 4 9 9 11l61 14c7 0 15 -3 15 -11v-5c-9 -29 -20 -67 -32 -107h67c6 0 10 -5 10 -10v-24c0 -6 -4 -10 -10 -10h-79c-16 -60 -25 -98 -30 -135z" />
+d="M102 176c-1 -7 -1 -13 -1 -19c0 -32 14 -54 54 -54c47 0 78 76 79 77c1 4 5 7 10 8c2 0 3 0 4 -1c5 -1 8 -6 8 -11v-3s-6 -28 -23 -55c-23 -37 -56 -56 -95 -56c-29 0 -53 10 -70 29c-16 18 -24 42 -24 71c0 7 1 15 2 22c5 33 13 75 23 127h-59c-6 0 -10 4 -10 10v24
+c0 5 4 10 10 10h67c9 52 14 94 14 98c1 5 4 9 9 10l61 14c1 1 2 1 3 1c4 0 7 -2 9 -4s3 -5 3 -7s0 -3 -1 -5c-8 -29 -19 -67 -31 -107h67c6 0 10 -5 10 -10v-24c0 -6 -4 -10 -10 -10h-79c-16 -60 -25 -98 -30 -135z" />
     <glyph glyph-name="uniE578" unicode="&#xe578;" horiz-adv-x="420" 
-d="M210 1c-87 0 -167 47 -208 124c-1 2 -2 4 -2 7c0 7 6 14 14 14c5 0 10 -3 12 -8c37 -67 107 -109 184 -109s147 42 184 109c2 5 7 7 11 8c3 0 5 -1 8 -2c4 -3 7 -7 7 -12c0 -3 -1 -5 -2 -7c-41 -77 -121 -124 -208 -124z" />
+d="M210 1c-87 0 -167 47 -208 124c-1 2 -2 4 -2 6c0 6 3 10 7 13c2 1 5 2 7 2c5 0 10 -3 12 -8c37 -67 107 -109 184 -109s147 42 184 109c2 5 7 7 11 8c3 0 5 -1 8 -2c4 -3 7 -7 7 -12c0 -3 -1 -5 -2 -7c-41 -77 -121 -124 -208 -124z" />
     <glyph glyph-name="uniE5C0" unicode="&#xe5c0;" horiz-adv-x="884" 
-d="M255 33c-2 -3 -6 -6 -13 -6s-14 6 -14 13c0 1 -1 37 -17 72c-21 45 -56 68 -103 68c-35 0 -63 -13 -83 -39c-3 -4 -7 -6 -11 -6c-3 1 -6 1 -9 3c-3 3 -5 7 -5 11c0 3 1 6 3 9c25 33 60 50 105 50c79 0 126 -56 143 -128c24 41 95 158 96 161c2 4 6 7 12 7s10 -3 12 -7
-c2 -3 68 -110 75 -122c7 12 70 118 73 122c2 5 7 7 11 7c5 0 9 -2 12 -7c3 -4 72 -114 79 -126l78 126c2 4 7 7 11 7c6 0 10 -2 12 -7l79 -126l59 95l24 -14l-117 -189c-3 -4 -8 -7 -12 -7s-10 3 -12 7l-78 126c-8 -13 -76 -123 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7
-s-70 112 -78 124c-7 -12 -71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -98z" />
+d="M255 33c-2 -3 -6 -7 -13 -7s-14 6 -14 14c0 1 -1 37 -18 72c-20 45 -55 67 -102 67c-35 0 -63 -12 -83 -38c-3 -4 -7 -6 -11 -6c-3 0 -6 1 -9 3c-3 3 -5 7 -5 11c0 3 1 6 3 9c25 33 60 50 105 50c59 0 103 -30 128 -85c7 -15 12 -30 15 -43c24 41 95 158 96 161
+c2 4 6 7 12 7s10 -3 12 -7c2 -3 68 -110 75 -122c7 12 70 118 73 122c2 5 7 7 11 7c5 0 9 -2 12 -7c3 -4 72 -114 79 -126l78 126c2 4 7 7 11 7c6 0 10 -2 12 -7l79 -126l59 95l24 -15l-117 -188v0c-3 -4 -8 -7 -12 -7v0c-4 0 -10 3 -12 7l-78 126c-8 -13 -76 -123 -78 -126
+c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 112 -78 124c-7 -12 -71 -120 -74 -124c-2 -4 -7 -7 -11 -7c-5 0 -10 3 -12 7c-3 4 -67 112 -74 124c-6 -10 -57 -94 -59 -98z" />
     <glyph glyph-name="uniE572" unicode="&#xe572;" horiz-adv-x="145" 
-d="M145 210c0 -87 -48 -167 -124 -208c-3 -2 -5 -2 -7 -2c-7 0 -14 6 -14 14c0 5 3 10 7 12c68 37 110 107 110 184s-42 147 -110 184c-4 2 -7 7 -7 12c0 8 7 14 14 14c3 0 5 -1 7 -2c76 -41 124 -121 124 -208z" />
+d="M145 210c0 -87 -48 -167 -124 -208c-3 -2 -5 -2 -7 -2c-5 0 -10 3 -12 7c-1 2 -2 5 -2 7c0 5 3 10 7 12c68 37 110 107 110 184s-42 147 -110 184c-4 2 -7 7 -7 12c0 2 1 4 2 7c2 4 7 7 12 7c3 0 5 -1 7 -2c76 -41 124 -121 124 -208z" />
     <glyph glyph-name="uniE571" unicode="&#xe571;" horiz-adv-x="145" 
-d="M0 210c0 87 48 167 124 208c3 2 5 2 8 2c4 0 9 -3 11 -7c2 -2 2 -5 2 -7c0 -5 -3 -10 -7 -12c-68 -37 -110 -107 -110 -184s42 -147 110 -184c4 -2 7 -7 7 -12c0 -8 -7 -14 -14 -14c-3 0 -5 1 -7 2c-76 41 -124 121 -124 208z" />
+d="M0 210c0 87 48 167 124 208c3 2 5 2 7 2c5 0 10 -3 12 -7c1 -3 2 -5 2 -7c0 -5 -3 -10 -7 -12c-68 -37 -110 -107 -110 -184s42 -147 110 -184c4 -2 7 -7 7 -12c0 -2 -1 -5 -2 -7c-2 -4 -7 -7 -12 -7c-3 0 -5 1 -7 2c-76 41 -124 121 -124 208z" />
     <glyph glyph-name="uniE5C3" unicode="&#xe5c3;" horiz-adv-x="857" 
-d="M267 97c-27 -45 -61 -70 -119 -70s-103 29 -128 85c-18 40 -20 80 -20 81c0 8 6 15 14 15c7 0 14 -6 14 -14c0 -3 2 -36 18 -72c20 -44 53 -67 102 -67s74 22 100 65c25 43 71 120 72 122c2 3 6 6 12 6s10 -3 12 -6c2 -4 68 -111 75 -122c7 11 70 117 73 122
-c2 4 7 6 12 6c4 0 8 -2 11 -6c3 -5 72 -114 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189c-2 -3 -8 -6 -12 -7c-4 0 -9 3 -12 7l-78 126c-8 -12 -76 -122 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -78 125c-7 -13 -71 -121 -73 -125
-c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-1 -1 -10 -16 -20 -34z" />
+d="M266 97c-26 -46 -60 -70 -118 -70s-103 29 -128 85c-18 40 -20 80 -20 81c0 8 6 15 14 15c7 0 14 -6 14 -14c0 -3 2 -36 18 -72c20 -44 53 -67 102 -67s74 22 100 65c25 43 71 120 72 122c2 3 6 6 12 6s10 -3 12 -6c2 -4 68 -111 75 -123c7 12 70 118 73 123
+c2 4 7 6 12 6c4 0 8 -2 11 -6c3 -5 72 -115 79 -127l78 127c2 3 7 6 12 6c6 0 9 -2 12 -6l78 -127l59 95l24 -14l-117 -189v0c-2 -4 -8 -6 -12 -7v0c-4 0 -9 3 -12 7l-78 126c-8 -12 -76 -122 -78 -126c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -78 124
+c-7 -12 -71 -120 -73 -124c-3 -4 -8 -7 -12 -7c-5 0 -10 3 -12 7c-3 4 -67 112 -74 124c-1 -1 -10 -16 -21 -34z" />
     <glyph glyph-name="uniE5BE" unicode="&#xe5be;" horiz-adv-x="704" 
-d="M704 196l-117 -189c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -77 125c-8 -13 -72 -121 -74 -125c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -97c-2 -4 -6 -7 -13 -7c-6 0 -13 6 -14 13c0 1 -1 37 -17 72c-21 45 -55 68 -103 68
-c-35 0 -63 -13 -83 -39c-3 -3 -7 -5 -11 -5c-3 0 -6 1 -8 3c-4 2 -6 6 -6 11c0 2 1 6 3 8c25 33 61 50 105 50c59 0 103 -29 129 -85c6 -15 11 -30 14 -43c25 41 95 159 97 162c1 3 5 6 11 6s10 -3 12 -6c2 -4 68 -111 75 -122c7 11 70 117 73 122c2 4 7 6 12 6
-c4 0 9 -2 12 -6c2 -5 71 -114 79 -127l58 95z" />
+d="M704 196l-117 -189c-3 -4 -7 -7 -11 -7s-9 1 -13 7s-70 113 -77 124c-8 -12 -72 -120 -74 -124c-3 -4 -7 -7 -12 -7s-10 3 -12 7c-3 4 -67 112 -74 124c-6 -9 -57 -94 -59 -97c-2 -4 -6 -7 -13 -7s-13 6 -14 13c0 1 -1 37 -17 72c-21 45 -55 68 -103 68
+c-35 0 -63 -13 -83 -39c-3 -3 -7 -5 -11 -5c-3 0 -6 1 -8 3c-4 2 -6 6 -6 11c0 2 1 6 3 8c25 33 61 50 105 50c59 0 103 -29 128 -85c7 -15 12 -30 15 -43c24 41 95 159 97 162c1 3 5 6 11 6s10 -3 12 -6c2 -4 68 -111 75 -123c7 12 70 118 73 123c2 4 7 6 12 6
+c4 0 9 -2 11 -6c3 -5 72 -114 79 -127l59 95z" />
     <glyph glyph-name="uniE583" unicode="&#xe583;" horiz-adv-x="37" 
 d="M0 123v252c0 8 6 14 14 14h9c7 0 14 -6 14 -14v-252c0 -8 -7 -14 -14 -14h-9c-8 0 -14 6 -14 14z" />
     <glyph glyph-name="uniE57F" unicode="&#xe57f;" horiz-adv-x="469" 
@@ -1588,14 +1648,20 @@ d="M469 159v-34l-469 -125v34z" />
     <glyph glyph-name="uniE580" unicode="&#xe580;" horiz-adv-x="469" 
 d="M0 125v34l469 -125v-34z" />
     <glyph glyph-name="uniEA21" unicode="&#xea21;" horiz-adv-x="503" 
-d="M240 184l72 -71c20 -20 52 -52 91 -52c47 0 64 51 64 107c0 9 0 17 -1 26c0 9 5 14 16 14c14 0 17 -15 17 -16c3 -16 4 -31 4 -44c0 -106 -68 -148 -125 -148c-56 0 -89 16 -115 39l-72 72c-20 20 -52 52 -91 52c-47 0 -64 -51 -64 -107c0 -9 0 -18 1 -27
-c0 -8 -3 -13 -16 -13c-14 0 -17 14 -17 16c-3 15 -4 28 -4 41c0 108 68 151 125 151c56 0 89 -16 115 -40z" />
+d="M240 184l72 -71c20 -20 52 -52 91 -52c47 0 64 51 64 107c0 8 0 17 -1 26c0 9 5 14 15 14c15 0 18 -15 18 -16c3 -16 4 -31 4 -44c0 -106 -69 -148 -125 -148s-89 16 -115 39l-72 72c-20 20 -52 52 -91 52c-47 0 -64 -51 -64 -107c0 -9 0 -18 1 -27c0 -8 -4 -14 -16 -14
+c-14 0 -17 15 -17 17c-3 14 -4 28 -4 41c0 108 68 151 125 151c56 0 89 -16 115 -40z" />
     <glyph glyph-name="uniE503" unicode="&#xe503;" horiz-adv-x="127" 
 d="M127 125c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" />
     <glyph glyph-name="uniE504" unicode="&#xe504;" horiz-adv-x="481" 
 d="M481 250l-355 -500h-126l355 500h126z" />
     <glyph glyph-name="uniE505" unicode="&#xe505;" horiz-adv-x="127" 
 d="M127 -127c0 -35 -29 -63 -63 -63c-35 0 -63 28 -63 63s28 63 63 63c34 0 63 -28 63 -63z" />
+    <glyph glyph-name="uniEA20" unicode="&#xea20;" horiz-adv-x="661" 
+d="M620 508c1 1 5 14 21 14c2 0 4 0 6 -1c9 -3 14 -11 14 -20c0 -2 0 -5 -1 -7c-1 -1 -37 -104 -83 -210c-24 -56 -47 -102 -67 -140c-42 -80 -90 -144 -140 -144c-64 0 -70 55 -71 61c-3 -6 -33 -61 -93 -61c-42 0 -47 43 -47 59c0 3 0 5 1 6c-23 -32 -55 -65 -103 -65
+c-23 0 -57 13 -57 52s36 88 57 125c12 20 21 24 27 24c7 0 9 -3 9 -9c0 -5 -2 -11 -4 -17c-4 -10 -24 -59 -24 -87c0 -12 4 -20 14 -20c34 0 104 135 147 135c5 0 8 -4 8 -11v-3c0 -21 -15 -63 -15 -90c0 -15 5 -26 19 -26c52 0 76 134 129 134c9 0 12 -8 12 -19
+c0 -20 -7 -52 -7 -76c0 -20 5 -35 25 -35c3 0 7 1 10 2c23 8 54 44 131 221c46 105 82 207 82 208z" />
+    <glyph glyph-name="uniE4D7" unicode="&#xe4d7;" horiz-adv-x="46" 
+d="M38 -1h-30c-4 0 -8 4 -8 9v482c0 6 4 10 10 10h26c6 0 10 -4 10 -10v-482c0 -5 -4 -9 -8 -9z" />
     <hkern u1="&#xe520;" u2="&#xe520;" k="31" />
     <hkern u1="&#xe522;" g2="uniE52B" k="100" />
     <hkern u1="&#xe522;" g2="uniE52A" k="100" />
diff --git a/fonts/json/leland_metadata.json b/fonts/json/leland_metadata.json
index 4cd85e2bb0a..41cbb35efe0 100644
--- a/fonts/json/leland_metadata.json
+++ b/fonts/json/leland_metadata.json
@@ -14,7 +14,7 @@
         "lyricLineThickness": 0.1,
         "octaveLineThickness": 0.11,
         "pedalLineThickness": 0.11,
-        "repeatBarlineDotSeparation": 0.7,
+        "repeatBarlineDotSeparation": 0.37,
         "repeatEndingLineThickness": 0.11,
         "slurEndpointThickness": 0.07,
         "slurMidpointThickness": 0.21,
@@ -33,16 +33,16 @@
         "tupletBracketThickness": 0.1
     },
     "fontName": "Leland",
-    "fontVersion": "0.73",
+    "fontVersion": "0.75",
     "glyphBBoxes": {
         "4stringTabClef": {
             "bBoxNE": [
-                1.176,
-                2.0
+                1.177,
+                2.001
             ],
             "bBoxSW": [
                 0.0,
-                -1.988
+                -1.989
             ]
         },
         "6stringTabClef": {
@@ -138,11 +138,11 @@
         "accidentalDoubleFlatParens": {
             "bBoxNE": [
                 2.24,
-                1.808
+                1.81
             ],
             "bBoxSW": [
                 0.0,
-                -0.844
+                -0.846
             ]
         },
         "accidentalDoubleSharp": {
@@ -158,11 +158,11 @@
         "accidentalDoubleSharpParens": {
             "bBoxNE": [
                 1.828,
-                0.848
+                0.85
             ],
             "bBoxSW": [
                 0.0,
-                -0.844
+                -0.846
             ]
         },
         "accidentalFiveQuarterTonesFlatArrowDown": {
@@ -177,11 +177,11 @@
         },
         "accidentalFiveQuarterTonesSharpArrowUp": {
             "bBoxNE": [
-                1.324,
+                1.325,
                 1.824
             ],
             "bBoxSW": [
-                0.0,
+                0.001,
                 -0.548
             ]
         },
@@ -202,7 +202,7 @@
             ],
             "bBoxSW": [
                 0.0,
-                -0.844
+                -0.846
             ]
         },
         "accidentalKucukMucennebSharp": {
@@ -277,22 +277,22 @@
         },
         "accidentalParensLeft": {
             "bBoxNE": [
-                0.296,
-                0.836
+                0.3,
+                0.838
             ],
             "bBoxSW": [
                 0.0,
-                -0.844
+                -0.846
             ]
         },
         "accidentalParensRight": {
             "bBoxNE": [
                 0.3,
-                0.844
+                0.846
             ],
             "bBoxSW": [
                 0.0,
-                -0.836
+                -0.838
             ]
         },
         "accidentalQuarterToneFlatArrowUp": {
@@ -327,12 +327,12 @@
         },
         "accidentalQuarterToneSharpArrowDown": {
             "bBoxNE": [
-                1.112,
+                1.113,
                 1.336
             ],
             "bBoxSW": [
-                0.0,
-                -1.828
+                0.001,
+                -1.832
             ]
         },
         "accidentalQuarterToneSharpNaturalArrowUp": {
@@ -397,11 +397,11 @@
         },
         "accidentalThreeQuarterTonesFlatArrowUp": {
             "bBoxNE": [
-                1.484,
-                1.828
+                1.488,
+                1.83
             ],
             "bBoxSW": [
-                0.0,
+                0.002,
                 -0.704
             ]
         },
@@ -417,22 +417,22 @@
         },
         "accidentalThreeQuarterTonesSharpArrowDown": {
             "bBoxNE": [
-                1.324,
+                1.327,
                 0.552
             ],
             "bBoxSW": [
-                0.0,
+                0.003,
                 -1.82
             ]
         },
         "accidentalThreeQuarterTonesSharpArrowUp": {
             "bBoxNE": [
                 1.112,
-                1.836
+                1.838
             ],
             "bBoxSW": [
                 0.0,
-                -1.328
+                -1.33
             ]
         },
         "accidentalThreeQuarterTonesSharpStein": {
@@ -492,13 +492,13 @@
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.0
             ]
         },
         "articAccentStaccatoBelow": {
             "bBoxNE": [
                 1.444,
-                0.0
+                -0.0
             ],
             "bBoxSW": [
                 0.0,
@@ -507,22 +507,22 @@
         },
         "articLaissezVibrerAbove": {
             "bBoxNE": [
-                1.952,
-                0.484
+                2.292,
+                0.547
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                -0.0,
+                -0.001
             ]
         },
         "articLaissezVibrerBelow": {
             "bBoxNE": [
-                1.952,
+                2.132,
                 0.0
             ],
             "bBoxSW": [
                 0.0,
-                -0.484
+                -0.509
             ]
         },
         "articMarcatoAbove": {
@@ -552,7 +552,7 @@
             ],
             "bBoxSW": [
                 0.004,
-                0.0
+                -0.0
             ]
         },
         "articMarcatoStaccatoBelow": {
@@ -587,7 +587,7 @@
         },
         "articStaccatissimoAbove": {
             "bBoxNE": [
-                0.504,
+                0.508,
                 0.992
             ],
             "bBoxSW": [
@@ -597,7 +597,7 @@
         },
         "articStaccatissimoBelow": {
             "bBoxNE": [
-                0.504,
+                0.507,
                 0.0
             ],
             "bBoxSW": [
@@ -607,38 +607,38 @@
         },
         "articStaccatissimoWedgeAbove": {
             "bBoxNE": [
-                0.484,
-                1.012
+                0.487,
+                1.016
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                -0.001,
+                -0.0
             ]
         },
         "articStaccatissimoWedgeBelow": {
             "bBoxNE": [
                 0.488,
-                0.0
+                -0.0
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 -1.016
             ]
         },
         "articStaccatoAbove": {
             "bBoxNE": [
-                0.308,
-                0.308
+                0.312,
+                0.312
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.0
             ]
         },
         "articStaccatoBelow": {
             "bBoxNE": [
-                0.308,
-                0.0
+                0.312,
+                -0.0
             ],
             "bBoxSW": [
                 0.0,
@@ -712,13 +712,13 @@
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.0
             ]
         },
         "articTenutoStaccatoBelow": {
             "bBoxNE": [
                 1.264,
-                0.0
+                -0.0
             ],
             "bBoxSW": [
                 0.0,
@@ -727,22 +727,22 @@
         },
         "articUnstressAbove": {
             "bBoxNE": [
-                1.368,
-                0.0
+                1.369,
+                0.001
             ],
             "bBoxSW": [
-                0.0,
+                -0.001,
                 -0.648
             ]
         },
         "articUnstressBelow": {
             "bBoxNE": [
-                1.368,
+                1.369,
                 0.648
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                -0.001,
+                -0.001
             ]
         },
         "augmentationDot": {
@@ -752,22 +752,22 @@
             ],
             "bBoxSW": [
                 0.0,
-                -0.196
+                -0.2
             ]
         },
         "brace": {
             "bBoxNE": [
                 0.248,
-                3.976
+                3.98
             ],
             "bBoxSW": [
-                0.0,
-                0.016
+                -0.002,
+                0.019
             ]
         },
         "braceFlat": {
             "bBoxNE": [
-                0.148,
+                0.152,
                 3.98
             ],
             "bBoxSW": [
@@ -778,21 +778,21 @@
         "braceLarge": {
             "bBoxNE": [
                 0.204,
-                3.976
+                3.979
             ],
             "bBoxSW": [
-                0.0,
-                0.016
+                -0.002,
+                0.018
             ]
         },
         "braceLarger": {
             "bBoxNE": [
                 0.176,
-                3.976
+                3.979
             ],
             "bBoxSW": [
                 0.0,
-                0.016
+                0.018
             ]
         },
         "braceSmall": {
@@ -807,7 +807,7 @@
         },
         "bracket": {
             "bBoxNE": [
-                2.108,
+                2.111,
                 5.724
             ],
             "bBoxSW": [
@@ -837,42 +837,42 @@
         },
         "brassHarmonMuteClosed": {
             "bBoxNE": [
-                1.356,
-                1.356
+                1.357,
+                1.357
             ],
             "bBoxSW": [
-                -0.24,
-                -0.24
+                -0.243,
+                -0.243
             ]
         },
         "brassHarmonMuteStemHalfLeft": {
             "bBoxNE": [
-                1.356,
-                1.356
+                1.357,
+                1.357
             ],
             "bBoxSW": [
-                -0.24,
-                -0.24
+                -0.243,
+                -0.243
             ]
         },
         "brassHarmonMuteStemHalfRight": {
             "bBoxNE": [
-                1.356,
-                1.356
+                1.357,
+                1.357
             ],
             "bBoxSW": [
-                -0.24,
-                -0.24
+                -0.243,
+                -0.243
             ]
         },
         "brassHarmonMuteStemOpen": {
             "bBoxNE": [
-                1.356,
-                1.356
+                1.357,
+                1.357
             ],
             "bBoxSW": [
-                -0.24,
-                -0.24
+                -0.243,
+                -0.243
             ]
         },
         "brassMuteClosed": {
@@ -887,42 +887,42 @@
         },
         "brassMuteHalfClosed": {
             "bBoxNE": [
-                1.116,
+                1.119,
                 1.12
             ],
             "bBoxSW": [
-                0.0,
+                -0.001,
                 0.0
             ]
         },
         "brassMuteOpen": {
             "bBoxNE": [
-                1.116,
+                1.12,
                 1.12
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 0.0
             ]
         },
         "brassValveTrill": {
             "bBoxNE": [
-                1.116,
+                1.118,
                 1.12
             ],
             "bBoxSW": [
-                0.0,
+                -0.002,
                 0.0
             ]
         },
         "breathMarkComma": {
             "bBoxNE": [
-                0.76,
-                1.284
+                0.764,
+                1.285
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                -0.0,
+                0.001
             ]
         },
         "buzzRoll": {
@@ -967,7 +967,7 @@
         },
         "caesura": {
             "bBoxNE": [
-                1.516,
+                1.52,
                 1.96
             ],
             "bBoxSW": [
@@ -981,18 +981,28 @@
                 1.964
             ],
             "bBoxSW": [
-                0.0,
+                -0.002,
                 0.0
             ]
         },
         "caesuraShort": {
             "bBoxNE": [
                 0.736,
-                2.0
+                2.002
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.002
+            ]
+        },
+        "caesuraSingleStroke": {
+            "bBoxNE": [
+                0.184,
+                2.002
+            ],
+            "bBoxSW": [
+                0.0,
+                -0.002
             ]
         },
         "clef15": {
@@ -1037,18 +1047,18 @@
         },
         "csymAugmented": {
             "bBoxNE": [
-                1.28,
+                1.284,
                 1.64
             ],
             "bBoxSW": [
-                0.0,
+                0.004,
                 0.36
             ]
         },
         "csymDiminished": {
             "bBoxNE": [
-                2.0,
-                2.0
+                2.002,
+                2.002
             ],
             "bBoxSW": [
                 0.0,
@@ -1057,18 +1067,18 @@
         },
         "csymHalfDiminished": {
             "bBoxNE": [
-                2.004,
-                2.004
+                2.007,
+                2.007
             ],
             "bBoxSW": [
-                -0.004,
-                -0.004
+                -0.005,
+                -0.005
             ]
         },
         "csymMajorSeventh": {
             "bBoxNE": [
-                2.0,
-                1.956
+                2.002,
+                1.96
             ],
             "bBoxSW": [
                 0.0,
@@ -1078,7 +1088,7 @@
         "doubleLateralRollStevens": {
             "bBoxNE": [
                 0.504,
-                1.552
+                1.556
             ],
             "bBoxSW": [
                 -0.512,
@@ -1087,22 +1097,22 @@
         },
         "dynamicCrescendoHairpin": {
             "bBoxNE": [
-                2.956,
-                1.548
+                2.957,
+                1.549
             ],
             "bBoxSW": [
-                0.016,
+                0.018,
                 0.276
             ]
         },
         "dynamicDiminuendoHairpin": {
             "bBoxNE": [
-                2.944,
-                1.544
+                2.945,
+                1.546
             ],
             "bBoxSW": [
-                0.004,
-                0.272
+                0.007,
+                0.273
             ]
         },
         "dynamicFF": {
@@ -1207,12 +1217,12 @@
         },
         "dynamicMessaDiVoce": {
             "bBoxNE": [
-                6.204,
-                1.548
+                6.205,
+                1.549
             ],
             "bBoxSW": [
-                0.016,
-                0.272
+                0.018,
+                0.273
             ]
         },
         "dynamicMezzo": {
@@ -1431,7 +1441,7 @@
                 1.004
             ],
             "bBoxSW": [
-                0.0,
+                0.001,
                 -2.468
             ]
         },
@@ -1441,8 +1451,8 @@
                 1.968
             ],
             "bBoxSW": [
-                0.0,
-                -2.464
+                0.001,
+                -2.465
             ]
         },
         "fClef15mb": {
@@ -1451,7 +1461,7 @@
                 1.004
             ],
             "bBoxSW": [
-                0.0,
+                0.001,
                 -2.976
             ]
         },
@@ -1461,8 +1471,8 @@
                 1.952
             ],
             "bBoxSW": [
-                0.0,
-                -2.464
+                0.001,
+                -2.465
             ]
         },
         "fClef8vb": {
@@ -1471,7 +1481,7 @@
                 1.004
             ],
             "bBoxSW": [
-                0.0,
+                0.001,
                 -2.968
             ]
         },
@@ -1481,7 +1491,7 @@
                 0.78
             ],
             "bBoxSW": [
-                0.0,
+                0.002,
                 -1.824
             ]
         },
@@ -1591,8 +1601,8 @@
                 1.02
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                -0.0,
+                -0.0
             ]
         },
         "fingering1Italic": {
@@ -1601,18 +1611,18 @@
                 1.016
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 0.0
             ]
         },
         "fingering2": {
             "bBoxNE": [
                 0.736,
-                1.016
+                1.018
             ],
             "bBoxSW": [
                 0.0,
-                -0.004
+                -0.006
             ]
         },
         "fingering2Italic": {
@@ -1621,7 +1631,7 @@
                 1.016
             ],
             "bBoxSW": [
-                0.0,
+                -0.001,
                 0.0
             ]
         },
@@ -1638,7 +1648,7 @@
         "fingering3Italic": {
             "bBoxNE": [
                 0.78,
-                1.008
+                1.012
             ],
             "bBoxSW": [
                 0.0,
@@ -1652,7 +1662,7 @@
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.0
             ]
         },
         "fingering4Italic": {
@@ -1711,7 +1721,7 @@
                 1.02
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 -0.02
             ]
         },
@@ -1767,78 +1777,78 @@
         },
         "flag1024thDown": {
             "bBoxNE": [
-                1.232,
-                3.212
+                1.235,
+                3.213
             ],
             "bBoxSW": [
-                0.0,
-                -4.564
+                -0.0,
+                -4.567
             ]
         },
         "flag1024thDownStraight": {
             "bBoxNE": [
-                1.22,
-                1.568
+                1.223,
+                1.57
             ],
             "bBoxSW": [
                 0.0,
-                -4.496
+                -4.498
             ]
         },
         "flag1024thUp": {
             "bBoxNE": [
-                1.116,
-                4.504
+                1.117,
+                4.505
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 -3.28
             ]
         },
         "flag1024thUpStraight": {
             "bBoxNE": [
-                1.156,
-                4.488
+                1.157,
+                4.491
             ],
             "bBoxSW": [
-                0.0,
-                -1.552
+                0.001,
+                -1.553
             ]
         },
         "flag128thDown": {
             "bBoxNE": [
-                1.232,
-                3.212
+                1.235,
+                3.213
             ],
             "bBoxSW": [
-                0.0,
-                -2.36
+                -0.0,
+                -2.363
             ]
         },
         "flag128thDownStraight": {
             "bBoxNE": [
-                1.22,
-                1.564
+                1.223,
+                1.568
             ],
             "bBoxSW": [
                 0.0,
-                -2.248
+                -2.25
             ]
         },
         "flag128thUp": {
             "bBoxNE": [
                 1.116,
-                2.292
+                2.293
             ],
             "bBoxSW": [
-                0.0,
-                -3.28
+                -0.0,
+                -3.282
             ]
         },
         "flag128thUpStraight": {
             "bBoxNE": [
-                1.152,
-                2.244
+                1.156,
+                2.245
             ],
             "bBoxSW": [
                 0.0,
@@ -1847,18 +1857,18 @@
         },
         "flag16thDown": {
             "bBoxNE": [
-                1.232,
-                3.212
+                1.235,
+                3.213
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 -0.104
             ]
         },
         "flag16thDownStraight": {
             "bBoxNE": [
-                1.22,
-                1.564
+                1.223,
+                1.568
             ],
             "bBoxSW": [
                 0.0,
@@ -1868,197 +1878,197 @@
         "flag16thUp": {
             "bBoxNE": [
                 1.116,
-                0.048
+                0.049
             ],
             "bBoxSW": [
-                0.0,
-                -3.28
+                -0.0,
+                -3.281
             ]
         },
         "flag16thUpStraight": {
             "bBoxNE": [
-                1.152,
+                1.156,
                 0.0
             ],
             "bBoxSW": [
                 0.0,
-                -1.548
+                -1.55
             ]
         },
         "flag256thDown": {
             "bBoxNE": [
-                1.232,
+                1.235,
                 3.212
             ],
             "bBoxSW": [
-                0.0,
-                -3.112
+                -0.0,
+                -3.115
             ]
         },
         "flag256thDownStraight": {
             "bBoxNE": [
-                1.22,
-                1.568
+                1.223,
+                1.57
             ],
             "bBoxSW": [
                 0.0,
-                -2.996
+                -2.998
             ]
         },
         "flag256thUp": {
             "bBoxNE": [
                 1.116,
-                3.04
+                3.041
             ],
             "bBoxSW": [
-                0.0,
-                -3.28
+                -0.0,
+                -3.281
             ]
         },
         "flag256thUpStraight": {
             "bBoxNE": [
-                1.156,
-                2.992
+                1.157,
+                2.994
             ],
             "bBoxSW": [
-                0.0,
-                -1.552
+                0.001,
+                -1.553
             ]
         },
         "flag32ndDown": {
             "bBoxNE": [
-                1.232,
-                3.212
+                1.235,
+                3.214
             ],
             "bBoxSW": [
-                0.0,
-                -0.86
+                -0.0,
+                -0.863
             ]
         },
         "flag32ndDownStraight": {
             "bBoxNE": [
-                1.22,
-                1.564
+                1.223,
+                1.568
             ],
             "bBoxSW": [
                 0.0,
-                -0.748
+                -0.75
             ]
         },
         "flag32ndUp": {
             "bBoxNE": [
-                1.116,
-                0.744
+                1.117,
+                0.745
             ],
             "bBoxSW": [
                 0.0,
-                -3.284
+                -3.285
             ]
         },
         "flag32ndUpStraight": {
             "bBoxNE": [
-                1.152,
-                0.748
+                1.156,
+                0.75
             ],
             "bBoxSW": [
                 0.0,
-                -1.548
+                -1.55
             ]
         },
         "flag512thDown": {
             "bBoxNE": [
-                1.232,
-                3.212
+                1.235,
+                3.214
             ],
             "bBoxSW": [
-                0.0,
-                -3.86
+                -0.0,
+                -3.863
             ]
         },
         "flag512thDownStraight": {
             "bBoxNE": [
-                1.22,
-                1.564
+                1.223,
+                1.568
             ],
             "bBoxSW": [
                 0.0,
-                -3.748
+                -3.75
             ]
         },
         "flag512thUp": {
             "bBoxNE": [
-                1.116,
-                3.772
+                1.117,
+                3.773
             ],
             "bBoxSW": [
-                0.0,
-                -3.28
+                -0.0,
+                -3.281
             ]
         },
         "flag512thUpStraight": {
             "bBoxNE": [
-                1.156,
-                3.74
+                1.157,
+                3.742
             ],
             "bBoxSW": [
-                0.0,
-                -1.552
+                0.001,
+                -1.553
             ]
         },
         "flag64thDown": {
             "bBoxNE": [
-                1.232,
-                3.212
+                1.235,
+                3.214
             ],
             "bBoxSW": [
-                0.0,
-                -1.608
+                -0.0,
+                -1.61
             ]
         },
         "flag64thDownStraight": {
             "bBoxNE": [
-                1.22,
-                1.564
+                1.223,
+                1.566
             ],
             "bBoxSW": [
                 0.0,
-                -1.5
+                -1.502
             ]
         },
         "flag64thUp": {
             "bBoxNE": [
-                1.116,
-                1.492
+                1.117,
+                1.493
             ],
             "bBoxSW": [
-                0.0,
-                -3.284
+                -0.0,
+                -3.287
             ]
         },
         "flag64thUpStraight": {
             "bBoxNE": [
-                1.152,
-                1.496
+                1.156,
+                1.497
             ],
             "bBoxSW": [
                 0.0,
-                -1.548
+                -1.55
             ]
         },
         "flag8thDown": {
             "bBoxNE": [
-                1.232,
+                1.235,
                 3.268
             ],
             "bBoxSW": [
-                0.0,
-                -0.044
+                -0.0,
+                -0.048
             ]
         },
         "flag8thDownStraight": {
             "bBoxNE": [
-                1.22,
-                0.816
+                1.223,
+                0.818
             ],
             "bBoxSW": [
                 0.0,
@@ -2067,17 +2077,17 @@
         },
         "flag8thUp": {
             "bBoxNE": [
-                1.156,
-                0.044
+                1.157,
+                0.048
             ],
             "bBoxSW": [
-                0.0,
+                0.001,
                 -3.268
             ]
         },
         "flag8thUpStraight": {
             "bBoxNE": [
-                1.152,
+                1.156,
                 0.0
             ],
             "bBoxSW": [
@@ -2107,82 +2117,82 @@
         },
         "gClef": {
             "bBoxNE": [
-                2.556,
-                4.448
+                2.56,
+                4.449
             ],
             "bBoxSW": [
-                0.0,
-                -2.664
+                -0.0,
+                -2.666
             ]
         },
         "gClef15ma": {
             "bBoxNE": [
                 2.56,
-                5.348
+                5.351
             ],
             "bBoxSW": [
                 0.0,
-                -2.664
+                -2.668
             ]
         },
         "gClef15mb": {
             "bBoxNE": [
-                2.556,
-                4.448
+                2.56,
+                4.449
             ],
             "bBoxSW": [
-                0.0,
-                -3.588
+                -0.0,
+                -3.591
             ]
         },
         "gClef8va": {
             "bBoxNE": [
-                2.556,
-                5.348
+                2.56,
+                5.35
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 -2.664
             ]
         },
         "gClef8vb": {
             "bBoxNE": [
                 2.56,
-                4.448
+                4.45
             ],
             "bBoxSW": [
                 0.0,
-                -3.588
+                -3.59
             ]
         },
         "gClef8vbOld": {
             "bBoxNE": [
-                4.176,
-                4.444
+                4.178,
+                4.447
             ],
             "bBoxSW": [
-                0.0,
-                -2.668
+                0.002,
+                -2.669
             ]
         },
         "gClef8vbParens": {
             "bBoxNE": [
-                2.556,
-                4.444
+                2.56,
+                4.448
             ],
             "bBoxSW": [
-                0.0,
-                -3.684
+                -0.0,
+                -3.687
             ]
         },
         "gClefChange": {
             "bBoxNE": [
-                1.916,
-                3.352
+                1.92,
+                3.353
             ],
             "bBoxSW": [
-                0.0,
-                -1.98
+                -0.0,
+                -1.983
             ]
         },
         "graceNoteAcciaccaturaStemDown": {
@@ -2247,12 +2257,12 @@
         },
         "keyboardPedalD": {
             "bBoxNE": [
-                1.404,
-                1.856
+                1.405,
+                1.859
             ],
             "bBoxSW": [
-                0.0,
-                -0.032
+                -0.001,
+                -0.036
             ]
         },
         "keyboardPedalDot": {
@@ -2271,18 +2281,18 @@
                 1.268
             ],
             "bBoxSW": [
-                0.0,
+                -0.002,
                 -0.028
             ]
         },
         "keyboardPedalP": {
             "bBoxNE": [
-                1.8,
-                2.18
+                1.801,
+                2.181
             ],
             "bBoxSW": [
-                0.0,
-                -0.036
+                -0.0,
+                -0.038
             ]
         },
         "keyboardPedalPed": {
@@ -2292,7 +2302,7 @@
             ],
             "bBoxSW": [
                 0.0,
-                -0.036
+                -0.039
             ]
         },
         "keyboardPedalUp": {
@@ -2307,122 +2317,122 @@
         },
         "mensuralNoteheadMinimaWhite": {
             "bBoxNE": [
-                1.336,
-                0.528
+                1.34,
+                0.532
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 -0.528
             ]
         },
         "mensuralNoteheadSemiminimaWhite": {
             "bBoxNE": [
-                1.336,
-                0.528
+                1.34,
+                0.531
             ],
             "bBoxSW": [
-                0.0,
-                -0.528
+                -0.0,
+                -0.529
             ]
         },
         "metAugmentationDot": {
             "bBoxNE": [
-                0.62,
-                0.308
+                0.621,
+                0.31
             ],
             "bBoxSW": [
-                0.0,
-                -0.308
+                0.001,
+                -0.31
             ]
         },
         "metNote16thUp": {
             "bBoxNE": [
                 2.844,
-                3.7
+                3.704
             ],
             "bBoxSW": [
-                0.0,
+                0.001,
                 -0.688
             ]
         },
         "metNote32ndUp": {
             "bBoxNE": [
-                2.844,
-                4.572
+                2.846,
+                4.573
             ],
             "bBoxSW": [
-                0.0,
-                -0.688
+                0.001,
+                -0.691
             ]
         },
         "metNote8thUp": {
             "bBoxNE": [
                 2.844,
-                3.6
+                3.603
             ],
             "bBoxSW": [
                 0.0,
-                -0.688
+                -0.689
             ]
         },
         "metNoteDoubleWhole": {
             "bBoxNE": [
                 2.688,
-                0.892
+                0.894
             ],
             "bBoxSW": [
                 0.0,
-                -0.888
+                -0.89
             ]
         },
         "metNoteHalfUp": {
             "bBoxNE": [
-                1.696,
-                3.452
+                1.7,
+                3.454
             ],
             "bBoxSW": [
-                0.0,
-                -0.684
+                -0.0,
+                -0.686
             ]
         },
         "metNoteQuarterUp": {
             "bBoxNE": [
-                1.696,
-                3.448
+                1.698,
+                3.45
             ],
             "bBoxSW": [
-                0.0,
-                -0.688
+                -0.002,
+                -0.69
             ]
         },
         "metNoteWhole": {
             "bBoxNE": [
-                1.896,
+                1.899,
                 0.688
             ],
             "bBoxSW": [
-                0.0,
+                -0.001,
                 -0.688
             ]
         },
         "note1024thDown": {
             "bBoxNE": [
                 1.3,
-                0.524
+                0.527
             ],
             "bBoxSW": [
                 0.0,
-                -8.02
+                -8.022
             ]
         },
         "note1024thUp": {
             "bBoxNE": [
-                2.296,
-                8.016
+                2.3,
+                8.017
             ],
             "bBoxSW": [
                 0.0,
-                -0.524
+                -0.525
             ]
         },
         "note128thDown": {
@@ -2432,17 +2442,17 @@
             ],
             "bBoxSW": [
                 0.0,
-                -5.816
+                -5.817
             ]
         },
         "note128thUp": {
             "bBoxNE": [
-                2.296,
-                5.808
+                2.3,
+                5.809
             ],
             "bBoxSW": [
                 0.0,
-                -0.524
+                -0.525
             ]
         },
         "note16thDown": {
@@ -2452,37 +2462,37 @@
             ],
             "bBoxSW": [
                 0.0,
-                -3.56
+                -3.563
             ]
         },
         "note16thUp": {
             "bBoxNE": [
-                2.296,
-                3.56
+                2.3,
+                3.563
             ],
             "bBoxSW": [
                 0.0,
-                -0.524
+                -0.525
             ]
         },
         "note256thDown": {
             "bBoxNE": [
                 1.3,
-                0.528
+                0.53
             ],
             "bBoxSW": [
                 0.0,
-                -6.564
+                -6.567
             ]
         },
         "note256thUp": {
             "bBoxNE": [
-                2.296,
-                6.556
+                2.3,
+                6.557
             ],
             "bBoxSW": [
                 0.0,
-                -0.524
+                -0.525
             ]
         },
         "note32ndDown": {
@@ -2492,57 +2502,57 @@
             ],
             "bBoxSW": [
                 0.0,
-                -4.316
+                -4.318
             ]
         },
         "note32ndUp": {
             "bBoxNE": [
-                2.296,
-                4.264
+                2.3,
+                4.265
             ],
             "bBoxSW": [
                 0.0,
-                -0.524
+                -0.525
             ]
         },
         "note512thDown": {
             "bBoxNE": [
                 1.3,
-                0.524
+                0.527
             ],
             "bBoxSW": [
                 0.0,
-                -7.316
+                -7.319
             ]
         },
         "note512thUp": {
             "bBoxNE": [
-                2.296,
-                7.284
+                2.3,
+                7.287
             ],
             "bBoxSW": [
                 0.0,
-                -0.524
+                -0.525
             ]
         },
         "note64thDown": {
             "bBoxNE": [
                 1.3,
-                0.528
+                0.529
             ],
             "bBoxSW": [
                 0.0,
-                -5.064
+                -5.065
             ]
         },
         "note64thUp": {
             "bBoxNE": [
-                2.296,
-                5.012
+                2.3,
+                5.014
             ],
             "bBoxSW": [
                 0.0,
-                -0.524
+                -0.525
             ]
         },
         "note8thDown": {
@@ -2557,7 +2567,7 @@
         },
         "note8thUp": {
             "bBoxNE": [
-                2.336,
+                2.339,
                 3.56
             ],
             "bBoxSW": [
@@ -2572,17 +2582,17 @@
             ],
             "bBoxSW": [
                 0.0,
-                -0.708
+                -0.712
             ]
         },
         "noteDoubleWholeAlt": {
             "bBoxNE": [
-                1.952,
-                0.892
+                1.954,
+                0.894
             ],
             "bBoxSW": [
-                0.0,
-                -0.888
+                0.002,
+                -0.89
             ]
         },
         "noteDoubleWholeSquare": {
@@ -2598,37 +2608,37 @@
         "noteHalfDown": {
             "bBoxNE": [
                 1.3,
-                0.524
+                0.527
             ],
             "bBoxSW": [
                 0.0,
-                -3.46
+                -3.461
             ]
         },
         "noteHalfUp": {
             "bBoxNE": [
                 1.3,
-                3.456
+                3.459
             ],
             "bBoxSW": [
                 0.0,
-                -0.524
+                -0.527
             ]
         },
         "noteQuarterDown": {
             "bBoxNE": [
                 1.3,
-                0.524
+                0.527
             ],
             "bBoxSW": [
                 0.0,
-                -3.452
+                -3.455
             ]
         },
         "noteQuarterUp": {
             "bBoxNE": [
-                1.296,
-                3.456
+                1.3,
+                3.459
             ],
             "bBoxSW": [
                 0.0,
@@ -2677,41 +2687,41 @@
         },
         "noteheadDiamondBlack": {
             "bBoxNE": [
-                1.336,
-                0.528
+                1.34,
+                0.531
             ],
             "bBoxSW": [
-                0.0,
-                -0.528
+                -0.0,
+                -0.529
             ]
         },
         "noteheadDiamondDoubleWhole": {
             "bBoxNE": [
-                1.488,
-                0.712
+                1.492,
+                0.715
             ],
             "bBoxSW": [
-                0.0,
-                -0.708
+                -0.0,
+                -0.711
             ]
         },
         "noteheadDiamondHalf": {
             "bBoxNE": [
-                1.336,
-                0.528
+                1.34,
+                0.532
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 -0.528
             ]
         },
         "noteheadDiamondWhole": {
             "bBoxNE": [
-                1.488,
-                0.524
+                1.492,
+                0.528
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 -0.532
             ]
         },
@@ -2722,17 +2732,17 @@
             ],
             "bBoxSW": [
                 0.0,
-                -0.708
+                -0.712
             ]
         },
         "noteheadDoubleWholeAlt": {
             "bBoxNE": [
-                1.56,
+                1.564,
                 0.716
             ],
             "bBoxSW": [
-                0.0,
-                -0.708
+                -0.0,
+                -0.712
             ]
         },
         "noteheadDoubleWholeSquare": {
@@ -2752,7 +2762,7 @@
             ],
             "bBoxSW": [
                 0.0,
-                -0.528
+                -0.532
             ]
         },
         "noteheadMoonBlack": {
@@ -2787,108 +2797,108 @@
         },
         "noteheadParenthesisLeft": {
             "bBoxNE": [
-                0.296,
-                0.836
+                0.3,
+                0.838
             ],
             "bBoxSW": [
                 0.0,
-                -0.844
+                -0.846
             ]
         },
         "noteheadParenthesisRight": {
             "bBoxNE": [
                 0.3,
-                0.844
+                0.846
             ],
             "bBoxSW": [
                 0.0,
-                -0.836
+                -0.838
             ]
         },
         "noteheadPlusBlack": {
             "bBoxNE": [
                 1.3,
-                0.524
+                0.527
             ],
             "bBoxSW": [
                 0.0,
-                -0.528
+                -0.529
             ]
         },
         "noteheadRoundBlackDoubleSlashed": {
             "bBoxNE": [
-                1.36,
-                0.828
+                1.361,
+                0.831
             ],
             "bBoxSW": [
-                -0.3,
-                -0.828
+                -0.301,
+                -0.831
             ]
         },
         "noteheadRoundWhiteDoubleSlashed": {
             "bBoxNE": [
-                1.36,
-                0.828
+                1.361,
+                0.831
             ],
             "bBoxSW": [
-                -0.3,
-                -0.828
+                -0.301,
+                -0.831
             ]
         },
         "noteheadSlashedBlack1": {
             "bBoxNE": [
-                1.692,
-                0.844
+                1.696,
+                0.846
             ],
             "bBoxSW": [
                 -0.392,
-                -0.852
+                -0.854
             ]
         },
         "noteheadSlashedBlack2": {
             "bBoxNE": [
-                1.692,
-                0.848
+                1.694,
+                0.849
             ],
             "bBoxSW": [
-                -0.392,
-                -0.848
+                -0.394,
+                -0.851
             ]
         },
         "noteheadSlashedDoubleWhole1": {
             "bBoxNE": [
-                1.824,
-                0.848
+                1.825,
+                0.85
             ],
             "bBoxSW": [
-                -0.26,
-                -0.848
+                -0.263,
+                -0.851
             ]
         },
         "noteheadSlashedDoubleWhole2": {
             "bBoxNE": [
-                1.824,
-                0.848
+                1.826,
+                0.849
             ],
             "bBoxSW": [
-                -0.26,
-                -0.848
+                -0.262,
+                -0.851
             ]
         },
         "noteheadSlashedHalf1": {
             "bBoxNE": [
-                1.692,
-                0.848
+                1.696,
+                0.849
             ],
             "bBoxSW": [
                 -0.392,
-                -0.848
+                -0.852
             ]
         },
         "noteheadSlashedHalf2": {
             "bBoxNE": [
-                1.692,
-                0.844
+                1.696,
+                0.848
             ],
             "bBoxSW": [
                 -0.392,
@@ -2897,22 +2907,22 @@
         },
         "noteheadSlashedWhole1": {
             "bBoxNE": [
-                1.788,
-                0.852
+                1.79,
+                0.854
             ],
             "bBoxSW": [
-                -0.296,
-                -0.844
+                -0.298,
+                -0.846
             ]
         },
         "noteheadSlashedWhole2": {
             "bBoxNE": [
-                1.788,
-                0.852
+                1.79,
+                0.854
             ],
             "bBoxSW": [
-                -0.296,
-                -0.844
+                -0.298,
+                -0.846
             ]
         },
         "noteheadSquareBlack": {
@@ -2938,27 +2948,27 @@
         "noteheadTriangleLeftBlack": {
             "bBoxNE": [
                 1.356,
-                0.484
+                0.487
             ],
             "bBoxSW": [
                 0.0,
-                -0.544
+                -0.545
             ]
         },
         "noteheadTriangleLeftWhite": {
             "bBoxNE": [
                 1.356,
-                0.484
+                0.487
             ],
             "bBoxSW": [
                 0.0,
-                -0.544
+                -0.545
             ]
         },
         "noteheadTriangleRightBlack": {
             "bBoxNE": [
                 1.356,
-                0.484
+                0.488
             ],
             "bBoxSW": [
                 0.0,
@@ -2968,11 +2978,11 @@
         "noteheadTriangleRightWhite": {
             "bBoxNE": [
                 1.356,
-                0.484
+                0.487
             ],
             "bBoxSW": [
                 0.0,
-                -0.544
+                -0.545
             ]
         },
         "noteheadTriangleRoundDownBlack": {
@@ -2981,7 +2991,7 @@
                 0.488
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 -0.544
             ]
         },
@@ -3077,72 +3087,92 @@
         },
         "ornamentDoubleObliqueLinesAfterNote": {
             "bBoxNE": [
-                2.076,
-                1.9
+                2.077,
+                1.904
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                0.001,
+                -0.0
             ]
         },
         "ornamentDoubleObliqueLinesBeforeNote": {
             "bBoxNE": [
-                2.072,
+                2.076,
                 1.904
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 0.0
             ]
         },
+        "ornamentDownCurve": {
+            "bBoxNE": [
+                1.68,
+                0.583
+            ],
+            "bBoxSW": [
+                -0.0,
+                0.003
+            ]
+        },
         "ornamentHaydn": {
             "bBoxNE": [
-                2.008,
-                1.0
+                2.012,
+                0.947
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.053
             ]
         },
         "ornamentHookAfterNote": {
             "bBoxNE": [
-                1.992,
+                1.995,
                 1.312
             ],
             "bBoxSW": [
-                0.0,
+                0.003,
                 0.0
             ]
         },
         "ornamentHookBeforeNote": {
             "bBoxNE": [
-                1.488,
-                1.416
+                1.492,
+                1.42
+            ],
+            "bBoxSW": [
+                -0.0,
+                -0.0
+            ]
+        },
+        "ornamentLeftFacingHalfCircle": {
+            "bBoxNE": [
+                0.58,
+                1.68
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.0
             ]
         },
         "ornamentLeftFacingHook": {
             "bBoxNE": [
                 0.88,
-                1.884
+                1.887
             ],
             "bBoxSW": [
                 0.016,
-                0.0
+                -0.001
             ]
         },
         "ornamentLowLeftConcaveStroke": {
             "bBoxNE": [
-                1.172,
-                0.984
+                1.156,
+                0.833
             ],
             "bBoxSW": [
-                0.0,
-                0.108
+                0.001,
+                0.109
             ]
         },
         "ornamentMordent": {
@@ -3157,41 +3187,71 @@
         },
         "ornamentObliqueLineAfterNote": {
             "bBoxNE": [
-                1.212,
-                1.9
+                1.216,
+                1.904
+            ],
+            "bBoxSW": [
+                -0.0,
+                -0.0
+            ]
+        },
+        "ornamentObliqueLineBeforeNote": {
+            "bBoxNE": [
+                1.216,
+                1.904
+            ],
+            "bBoxSW": [
+                -0.0,
+                -0.0
+            ]
+        },
+        "ornamentObliqueLineHorizAfterNote": {
+            "bBoxNE": [
+                1.876,
+                0.636
             ],
             "bBoxSW": [
                 0.0,
                 0.0
             ]
         },
-        "ornamentObliqueLineBeforeNote": {
+        "ornamentObliqueLineHorizBeforeNote": {
             "bBoxNE": [
-                1.212,
-                1.9
+                1.876,
+                0.636
             ],
             "bBoxSW": [
                 0.0,
                 0.0
             ]
         },
-        "ornamentPinceCouperin": {
+        "ornamentOriscus": {
             "bBoxNE": [
-                2.108,
-                1.624
+                2.012,
+                0.894
             ],
             "bBoxSW": [
                 0.0,
+                -0.0
+            ]
+        },
+        "ornamentPinceCouperin": {
+            "bBoxNE": [
+                2.112,
+                1.628
+            ],
+            "bBoxSW": [
+                -0.0,
                 0.0
             ]
         },
         "ornamentPortDeVoixV": {
             "bBoxNE": [
                 1.696,
-                1.9
+                1.902
             ],
             "bBoxSW": [
-                0.0,
+                -0.002,
                 -0.004
             ]
         },
@@ -3205,34 +3265,64 @@
                 0.0
             ]
         },
+        "ornamentPrecompCadence": {
+            "bBoxNE": [
+                2.816,
+                0.993
+            ],
+            "bBoxSW": [
+                0.0,
+                0.001
+            ]
+        },
+        "ornamentPrecompDoubleCadenceLowerPrefix": {
+            "bBoxNE": [
+                3.535,
+                0.992
+            ],
+            "bBoxSW": [
+                -0.001,
+                0.0
+            ]
+        },
+        "ornamentPrecompDoubleCadenceUpperPrefix": {
+            "bBoxNE": [
+                3.428,
+                0.993
+            ],
+            "bBoxSW": [
+                -0.0,
+                0.001
+            ]
+        },
         "ornamentPrecompInvertedMordentUpperPrefix": {
             "bBoxNE": [
                 2.812,
-                1.552
+                1.556
             ],
             "bBoxSW": [
-                0.0,
-                -0.288
+                -0.002,
+                -0.289
             ]
         },
         "ornamentPrecompMordentUpperPrefix": {
             "bBoxNE": [
                 2.808,
-                1.552
+                1.556
             ],
             "bBoxSW": [
-                -0.004,
+                -0.005,
                 0.0
             ]
         },
         "ornamentPrecompPortDeVoixMordent": {
             "bBoxNE": [
-                3.68,
-                1.28
+                3.673,
+                1.283
             ],
             "bBoxSW": [
-                0.0,
-                -0.288
+                0.002,
+                -0.289
             ]
         },
         "ornamentPrecompSlideTrillBach": {
@@ -3241,33 +3331,33 @@
                 1.284
             ],
             "bBoxSW": [
-                0.0,
+                0.001,
                 -0.632
             ]
         },
         "ornamentPrecompSlideTrillDAnglebert": {
             "bBoxNE": [
                 2.648,
-                0.992
+                0.993
             ],
             "bBoxSW": [
-                0.0,
-                -0.632
+                0.001,
+                -0.633
             ]
         },
         "ornamentPrecompTrillLowerSuffix": {
             "bBoxNE": [
-                2.256,
-                0.992
+                2.26,
+                0.994
             ],
             "bBoxSW": [
-                0.0,
-                -0.684
+                -0.0,
+                -0.686
             ]
         },
         "ornamentPrecompTrillSuffixDandrieu": {
             "bBoxNE": [
-                2.644,
+                2.647,
                 1.624
             ],
             "bBoxSW": [
@@ -3278,20 +3368,40 @@
         "ornamentPrecompTrillWithMordent": {
             "bBoxNE": [
                 2.612,
-                1.28
+                1.282
+            ],
+            "bBoxSW": [
+                -0.0,
+                -0.29
+            ]
+        },
+        "ornamentQuilisma": {
+            "bBoxNE": [
+                2.644,
+                2.088
+            ],
+            "bBoxSW": [
+                -0.0,
+                -0.001
+            ]
+        },
+        "ornamentRightFacingHalfCircle": {
+            "bBoxNE": [
+                0.58,
+                1.68
             ],
             "bBoxSW": [
                 0.0,
-                -0.288
+                -0.0
             ]
         },
         "ornamentRightFacingHook": {
             "bBoxNE": [
-                0.868,
+                0.872,
                 1.888
             ],
             "bBoxSW": [
-                0.004,
+                0.008,
                 0.0
             ]
         },
@@ -3307,18 +3417,28 @@
         },
         "ornamentShake3": {
             "bBoxNE": [
-                1.216,
+                1.22,
                 1.22
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 0.0
             ]
         },
+        "ornamentShakeMuffat1": {
+            "bBoxNE": [
+                1.024,
+                1.911
+            ],
+            "bBoxSW": [
+                -0.0,
+                0.247
+            ]
+        },
         "ornamentShortObliqueLineAfterNote": {
             "bBoxNE": [
                 0.74,
-                1.156
+                1.16
             ],
             "bBoxSW": [
                 0.0,
@@ -3327,11 +3447,11 @@
         },
         "ornamentShortObliqueLineBeforeNote": {
             "bBoxNE": [
-                0.74,
+                0.744,
                 1.16
             ],
             "bBoxSW": [
-                0.0,
+                0.004,
                 0.0
             ]
         },
@@ -3415,24 +3535,34 @@
                 0.0
             ]
         },
+        "ornamentVerticalLine": {
+            "bBoxNE": [
+                0.146,
+                1.556
+            ],
+            "bBoxSW": [
+                0.0,
+                0.435
+            ]
+        },
         "ornamentZigZagLineNoRightEnd": {
             "bBoxNE": [
                 0.752,
-                0.984
+                0.988
             ],
             "bBoxSW": [
                 -0.172,
-                0.0
+                -0.0
             ]
         },
         "ornamentZigZagLineWithRightEnd": {
             "bBoxNE": [
-                1.04,
+                1.043,
                 0.992
             ],
             "bBoxSW": [
                 -0.008,
-                0.0
+                -0.001
             ]
         },
         "ottava": {
@@ -3491,7 +3621,7 @@
                 1.076
             ],
             "bBoxSW": [
-                0.0,
+                -0.0,
                 0.0
             ]
         },
@@ -3558,7 +3688,7 @@
         "repeat1Bar": {
             "bBoxNE": [
                 1.924,
-                0.996
+                1.0
             ],
             "bBoxSW": [
                 0.0,
@@ -3568,7 +3698,7 @@
         "repeat2Bars": {
             "bBoxNE": [
                 2.94,
-                0.996
+                1.0
             ],
             "bBoxSW": [
                 0.0,
@@ -3578,11 +3708,41 @@
         "repeat4Bars": {
             "bBoxNE": [
                 4.972,
-                0.996
+                1.0
+            ],
+            "bBoxSW": [
+                0.0,
+                -1.0
+            ]
+        },
+        "repeatBarLowerDot": {
+            "bBoxNE": [
+                0.506,
+                -0.256
+            ],
+            "bBoxSW": [
+                0.002,
+                -0.76
+            ]
+        },
+        "repeatBarSlash": {
+            "bBoxNE": [
+                1.924,
+                1.0
             ],
             "bBoxSW": [
                 0.0,
-                -0.996
+                -1.0
+            ]
+        },
+        "repeatBarUpperDot": {
+            "bBoxNE": [
+                0.506,
+                0.752
+            ],
+            "bBoxSW": [
+                0.002,
+                0.248
             ]
         },
         "repeatDot": {
@@ -3607,91 +3767,91 @@
         },
         "rest1024th": {
             "bBoxNE": [
-                2.532,
-                4.9
+                2.534,
+                4.903
             ],
             "bBoxSW": [
-                0.0,
+                0.002,
                 -4.016
             ]
         },
         "rest128th": {
             "bBoxNE": [
-                1.896,
-                2.864
+                1.899,
+                2.867
             ],
             "bBoxSW": [
-                0.0,
-                -3.032
+                -0.002,
+                -3.036
             ]
         },
         "rest16th": {
             "bBoxNE": [
-                1.372,
-                0.812
+                1.376,
+                0.815
             ],
             "bBoxSW": [
                 0.004,
-                -2.028
+                -2.029
             ]
         },
         "rest256th": {
             "bBoxNE": [
-                2.104,
-                2.892
+                2.106,
+                2.893
             ],
             "bBoxSW": [
-                0.0,
-                -3.988
+                -0.002,
+                -3.99
             ]
         },
         "rest32nd": {
             "bBoxNE": [
-                1.56,
-                1.836
+                1.563,
+                1.839
             ],
             "bBoxSW": [
                 0.0,
-                -2.028
+                -2.029
             ]
         },
         "rest512th": {
             "bBoxNE": [
-                2.316,
+                2.318,
                 3.868
             ],
             "bBoxSW": [
-                0.0,
-                -4.012
+                0.001,
+                -4.015
             ]
         },
         "rest64th": {
             "bBoxNE": [
-                1.688,
-                1.852
+                1.69,
+                1.855
             ],
             "bBoxSW": [
-                0.0,
+                -0.002,
                 -3.032
             ]
         },
         "rest8th": {
             "bBoxNE": [
                 1.104,
-                0.812
+                0.814
             ],
             "bBoxSW": [
                 0.0,
-                -1.02
+                -1.022
             ]
         },
         "restDoubleWhole": {
             "bBoxNE": [
-                0.5,
+                0.501,
                 1.048
             ],
             "bBoxSW": [
-                0.0,
+                0.001,
                 -0.044
             ]
         },
@@ -3728,51 +3888,51 @@
         "restLonga": {
             "bBoxNE": [
                 0.5,
-                0.996
+                0.999
             ],
             "bBoxSW": [
                 0.0,
-                -1.0
+                -1.001
             ]
         },
         "restMaxima": {
             "bBoxNE": [
-                1.796,
+                1.799,
                 1.0
             ],
             "bBoxSW": [
-                0.0,
+                -0.001,
                 -1.0
             ]
         },
         "restQuarter": {
             "bBoxNE": [
                 0.94,
-                1.604
+                1.605
             ],
             "bBoxSW": [
                 0.0,
-                -1.324
+                -1.325
             ]
         },
         "restQuarterOld": {
             "bBoxNE": [
                 1.104,
-                0.812
+                0.814
             ],
             "bBoxSW": [
-                0.0,
-                -1.02
+                -0.0,
+                -1.022
             ]
         },
         "restQuarterZ": {
             "bBoxNE": [
-                1.264,
-                0.828
+                1.268,
+                0.829
             ],
             "bBoxSW": [
-                0.0,
-                -0.804
+                -0.0,
+                -0.807
             ]
         },
         "restWhole": {
@@ -3797,12 +3957,12 @@
         },
         "reversedBrace": {
             "bBoxNE": [
-                0.248,
-                3.976
+                0.25,
+                3.98
             ],
             "bBoxSW": [
                 0.0,
-                0.016
+                0.019
             ]
         },
         "reversedBracketBottom": {
@@ -3847,12 +4007,12 @@
         },
         "segnoSerpent2": {
             "bBoxNE": [
-                2.216,
+                2.217,
                 5.124
             ],
             "bBoxSW": [
-                0.0,
-                -1.12
+                0.001,
+                -1.122
             ]
         },
         "stringsDownBow": {
@@ -3928,31 +4088,31 @@
         "systemDivider": {
             "bBoxNE": [
                 4.168,
-                4.472
+                4.475
             ],
             "bBoxSW": [
                 0.0,
-                -0.388
+                -0.389
             ]
         },
         "systemDividerExtraLong": {
             "bBoxNE": [
                 9.104,
-                4.212
+                4.213
             ],
             "bBoxSW": [
                 0.0,
-                -0.196
+                -0.199
             ]
         },
         "systemDividerLong": {
             "bBoxNE": [
                 6.156,
-                4.44
+                4.442
             ],
             "bBoxSW": [
-                0.0,
-                -0.36
+                -0.0,
+                -0.362
             ]
         },
         "timeSig0": {
@@ -3987,7 +4147,7 @@
         },
         "timeSig3": {
             "bBoxNE": [
-                1.456,
+                1.457,
                 0.976
             ],
             "bBoxSW": [
@@ -3998,10 +4158,10 @@
         "timeSig4": {
             "bBoxNE": [
                 1.768,
-                0.992
+                0.996
             ],
             "bBoxSW": [
-                0.052,
+                0.055,
                 -0.992
             ]
         },
@@ -4027,11 +4187,11 @@
         },
         "timeSig7": {
             "bBoxNE": [
-                1.46,
+                1.462,
                 1.004
             ],
             "bBoxSW": [
-                0.056,
+                0.058,
                 -1.0
             ]
         },
@@ -4088,11 +4248,11 @@
         "tremolo1": {
             "bBoxNE": [
                 1.16,
-                0.384
+                0.386
             ],
             "bBoxSW": [
                 0.0,
-                -0.368
+                -0.37
             ]
         },
         "tremolo2": {
@@ -4108,7 +4268,7 @@
         "tremolo3": {
             "bBoxNE": [
                 1.16,
-                1.128
+                1.132
             ],
             "bBoxSW": [
                 0.0,
@@ -4128,7 +4288,7 @@
         "tremolo5": {
             "bBoxNE": [
                 1.16,
-                1.888
+                1.892
             ],
             "bBoxSW": [
                 0.0,
@@ -4137,52 +4297,52 @@
         },
         "tremoloDivisiDots2": {
             "bBoxNE": [
-                0.98,
-                0.308
+                0.984,
+                0.312
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.0
             ]
         },
         "tremoloDivisiDots3": {
             "bBoxNE": [
-                1.664,
-                0.308
+                1.668,
+                0.312
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.0
             ]
         },
         "tremoloDivisiDots4": {
             "bBoxNE": [
-                2.336,
-                0.308
+                2.34,
+                0.312
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.0
             ]
         },
         "tremoloDivisiDots6": {
             "bBoxNE": [
-                1.664,
-                0.98
+                1.668,
+                0.984
             ],
             "bBoxSW": [
                 0.0,
-                0.0
+                -0.0
             ]
         },
         "tremoloFingered1": {
             "bBoxNE": [
                 1.16,
-                0.384
+                0.386
             ],
             "bBoxSW": [
                 0.0,
-                -0.368
+                -0.37
             ]
         },
         "tremoloFingered2": {
@@ -4198,7 +4358,7 @@
         "tremoloFingered3": {
             "bBoxNE": [
                 1.16,
-                1.128
+                1.132
             ],
             "bBoxSW": [
                 0.0,
@@ -4218,7 +4378,7 @@
         "tremoloFingered5": {
             "bBoxNE": [
                 1.16,
-                1.888
+                1.892
             ],
             "bBoxSW": [
                 0.0,
@@ -4251,7 +4411,7 @@
                 1.448
             ],
             "bBoxSW": [
-                0.0,
+                -0.001,
                 0.0
             ]
         },
@@ -4347,12 +4507,12 @@
         },
         "unpitchedPercussionClef2": {
             "bBoxNE": [
-                1.212,
-                1.752
+                1.216,
+                1.754
             ],
             "bBoxSW": [
-                0.0,
-                -1.752
+                -0.0,
+                -1.754
             ]
         },
         "ventiduesima": {
@@ -4361,8 +4521,8 @@
                 1.696
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                -0.001,
+                -0.001
             ]
         },
         "ventiduesimaAlta": {
@@ -4371,8 +4531,8 @@
                 1.696
             ],
             "bBoxSW": [
-                0.0,
-                0.0
+                -0.001,
+                -0.001
             ]
         },
         "ventiduesimaBassa": {
@@ -4381,7 +4541,7 @@
                 1.696
             ],
             "bBoxSW": [
-                0.0,
+                -0.001,
                 -0.028
             ]
         },
@@ -4391,7 +4551,7 @@
                 1.696
             ],
             "bBoxSW": [
-                0.0,
+                -0.001,
                 -0.028
             ]
         },

From 192a4d7c08914941cec683c2b0dcb454451117d8 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 21 Feb 2022 15:01:56 +0100
Subject: [PATCH 396/403] Use Python3 by default

* Specific Python version can be selected with -DPYTHON_VERSION=X.X (e.g. -DPYTHON_VERSION=2.7)
* Require CMake 3.12 or later
---
 cmake/CMakeLists.txt | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 2a37718f715..3cc83dae8c9 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -19,7 +19,7 @@ option(NO_MXL_SUPPORT           "Disable compressed MusicXML support"          O
 option(NO_HUMDRUM_SUPPORT       "Disable Humdrum support"                      OFF)
 option(MUSICXML_DEFAULT_HUMDRUM "Enable MusicXML to Humdrum by default"        OFF)
 option(NO_RUNTIME               "Disable runtime clock support"                ON)
-option(BUILD_AS_LIBRARY         "Build verovio as library"                     OFF)
+option(BUILD_AS_LIBRARY         "Build Verovio as library"                     OFF)
 
 if (NO_HUMDRUM_SUPPORT AND MUSICXML_DEFAULT_HUMDRUM)
     message(SEND_ERROR "Default MusicXML to Humdrum cannot be enabled by default without Humdrum support")
@@ -203,7 +203,10 @@ elseif (BUILD_AS_PYTHON)
     include(${SWIG_USE_FILE})
     set(CMAKE_SWIG_FLAGS "")
 
-    if(Python_VERSION VERSION_GREATER_EQUAL 3)
+    set(PYTHON_VERSION "3" CACHE STRING "Python Version to use")
+    find_package(Python EXACT ${PYTHON_VERSION} MODULE REQUIRED)
+
+    if(PYTHON_VERSION VERSION_GREATER_EQUAL 3)
       list(APPEND CMAKE_SWIG_FLAGS "-py3;-DPY3")
     endif()
 
@@ -212,20 +215,13 @@ elseif (BUILD_AS_PYTHON)
     # needed for static build on linux
     add_definitions(-fPIC)
 
-    ### For building for specific version of Python (example for 3.4 on OS X with MacPorts installation)
-    #set(PYTHON_INCLUDE_DIR /opt/local/Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m)
-    #set(PYTHON_LIBRARY /opt/local/Library/Frameworks/Python.framework/Versions/3.4/lib/libpython3.4.dylib)
-    #include_directories(${PYTHON_INCLUDE_DIR})
-    #swig_add_library(verovio_module_custom LANGUAGE python TYPE MODULE SOURCES ../bindings/python/verovio.i)
-    #swig_link_libraries(verovio_module_custom verovio ${PYTHON_LIBRARY})
-
     ### For building for found version of Python (comment when specific version is set)
-    find_package(PythonLibs)
-    include_directories(${PYTHON_INCLUDE_PATH})
-    message(STATUS "***** Building for Python ${PYTHONLIBS_VERSION_STRING} *****")
-    string(REPLACE "." "_" OUTPUT_VERSION_STRING ${PYTHONLIBS_VERSION_STRING})
+    find_package(Python COMPONENTS Interpreter Development)
+    include_directories(${Python_INCLUDE_DIRS})
+    message(STATUS "***** Building for Python ${Python_VERSION} *****")
+    string(REPLACE "." "_" OUTPUT_VERSION_STRING ${Python_VERSION})
     swig_add_library(verovio_module_${OUTPUT_VERSION_STRING} LANGUAGE python TYPE MODULE SOURCES ../bindings/python/verovio.i)
-    swig_link_libraries(verovio_module_${OUTPUT_VERSION_STRING} verovio ${PYTHON_LIBRARIES})
+    swig_link_libraries(verovio_module_${OUTPUT_VERSION_STRING} verovio ${Python_LIBRARIES})
 
     add_library(verovio STATIC ../tools/c_wrapper.cpp ${all_SRC})
 

From 8671755a3a7ee55229c15b4ba0948d3875184c6a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 21 Feb 2022 16:16:22 +0100
Subject: [PATCH 397/403] Make sure redoLayout with encoded break option
 happens only with encoded layout

* Expects a `<pb>`
---
 src/toolkit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index c7969421804..9347f6bd81e 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -1201,7 +1201,7 @@ void Toolkit::RedoLayout(const std::string &jsonOptions)
     if (m_options->m_breaks.GetValue() == BREAKS_line) {
         m_doc.CastOffLineDoc();
     }
-    else if (m_options->m_breaks.GetValue() == BREAKS_encoded) {
+    else if (m_options->m_breaks.GetValue() == BREAKS_encoded && m_doc.FindDescendantByType(PB)) {
         m_doc.CastOffEncodingDoc();
     }
     else if (m_options->m_breaks.GetValue() == BREAKS_smart) {

From 80d821eaa79c1fa3f732b038de876f174068ccbd Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 21 Feb 2022 18:00:56 +0100
Subject: [PATCH 398/403] Add option to include an additional CSS to the SVG

---
 include/vrv/options.h          | 1 +
 include/vrv/svgdevicecontext.h | 7 +++++++
 src/options.cpp                | 6 +++++-
 src/svgdevicecontext.cpp       | 7 +++++++
 src/toolkit.cpp                | 5 +++++
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/include/vrv/options.h b/include/vrv/options.h
index 61dcdf1cc7b..9da64cb0cdd 100644
--- a/include/vrv/options.h
+++ b/include/vrv/options.h
@@ -616,6 +616,7 @@ class Options {
     OptionBool m_shrinkToFit;
     OptionBool m_staccatoCenter;
     OptionBool m_svgBoundingBoxes;
+    OptionString m_svgCss;
     OptionBool m_svgViewBox;
     OptionBool m_svgHtml5;
     OptionBool m_svgFormatRaw;
diff --git a/include/vrv/svgdevicecontext.h b/include/vrv/svgdevicecontext.h
index 6932f7c7857..2ac72d7674c 100644
--- a/include/vrv/svgdevicecontext.h
+++ b/include/vrv/svgdevicecontext.h
@@ -217,6 +217,11 @@ class SvgDeviceContext : public DeviceContext {
      */
     void SetRemoveXlink(bool removeXlink) { m_removeXlink = removeXlink; }
 
+    /**
+     * Setter for an additional CSS
+     */
+    void SetCss(std::string css) { m_css = css; }
+
     /**
      *  Copies additional attributes of defined elements to the SVG, each string in the form "elementName@attribute"
      * (e.g., "note@pname")
@@ -304,6 +309,8 @@ class SvgDeviceContext : public DeviceContext {
     bool m_svgViewBox;
     // output HTML5 data-* attributes
     bool m_html5;
+    // additional CSS
+    std::string m_css;
     // copy additional attributes of given elements to the SVG, in the form "note@pname; layer@n"
     std::multimap<ClassId, std::string> m_svgAdditionalAttributes;
     // format output as raw, stripping extraneous whitespace and non-content newlines
diff --git a/src/options.cpp b/src/options.cpp
index 65691da05a9..248c1f7bf6b 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1066,6 +1066,10 @@ Options::Options()
     m_svgBoundingBoxes.Init(false);
     this->Register(&m_svgBoundingBoxes, "svgBoundingBoxes", &m_general);
 
+    m_svgCss.SetInfo("SVG additional CSS", "CSS (as a string) to be added to the SVG output");
+    m_svgCss.Init("");
+    this->Register(&m_svgCss, "svgCss", &m_general);
+
     m_svgViewBox.SetInfo("Use viewbox on svg root", "Use viewBox on svg root element for easy scaling of document");
     m_svgViewBox.Init(false);
     this->Register(&m_svgViewBox, "svgViewBox", &m_general);
@@ -1258,7 +1262,7 @@ Options::Options()
     this->Register(&m_lyricVerseCollapse, "lyricVerseCollapse", &m_generalLayout);
 
     m_measureMinWidth.SetInfo("Measure min width", "The minimal measure width in MEI units");
-    m_measureMinWidth.Init(15, 1, 30);
+    m_measureMinWidth.Init(1, 1, 30);
     this->Register(&m_measureMinWidth, "minMeasureWidth", &m_generalLayout);
 
     m_mnumInterval.SetInfo("Measure Number Interval", "How frequently to place measure numbers");
diff --git a/src/svgdevicecontext.cpp b/src/svgdevicecontext.cpp
index 96493e29e7b..d6efc667304 100644
--- a/src/svgdevicecontext.cpp
+++ b/src/svgdevicecontext.cpp
@@ -405,6 +405,13 @@ void SvgDeviceContext::StartPage()
         m_currentNode = m_svgNodeStack.back();
     }
 
+    if (!m_css.empty()) {
+        m_currentNode = m_currentNode.append_child("style");
+        m_currentNode.append_attribute("type") = "text/css";
+        m_currentNode.append_child(pugi::node_pcdata).set_value(m_css.c_str());
+        m_currentNode = m_svgNodeStack.back();
+    }
+
     // a graphic for definition scaling
     m_currentNode = m_currentNode.append_child("svg");
     m_svgNodeStack.push_back(m_currentNode);
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index 9347f6bd81e..50d8863deaa 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -1303,6 +1303,11 @@ std::string Toolkit::RenderToSVG(int pageNo, bool xmlDeclaration)
         svg.SetSvgBoundingBoxes(true);
     }
 
+    // set the additional CSS if any
+    if (!m_options->m_svgCss.GetValue().empty()) {
+        svg.SetCss(m_options->m_svgCss.GetValue());
+    }
+
     if (m_options->m_svgViewBox.GetValue()) {
         svg.SetSvgViewBox(true);
     }

From 342411176fd3cc4a9d209a237639d359381231b7 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 21 Feb 2022 18:58:16 +0100
Subject: [PATCH 399/403] Revert overlooked change in default measure min width

---
 src/options.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/options.cpp b/src/options.cpp
index 248c1f7bf6b..1d642b06676 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1262,7 +1262,7 @@ Options::Options()
     this->Register(&m_lyricVerseCollapse, "lyricVerseCollapse", &m_generalLayout);
 
     m_measureMinWidth.SetInfo("Measure min width", "The minimal measure width in MEI units");
-    m_measureMinWidth.Init(1, 1, 30);
+    m_measureMinWidth.Init(15, 1, 30);
     this->Register(&m_measureMinWidth, "minMeasureWidth", &m_generalLayout);
 
     m_mnumInterval.SetInfo("Measure Number Interval", "How frequently to place measure numbers");

From f59abf51b00376057dd320f0fe43e6832e48397b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 21 Feb 2022 20:04:21 +0100
Subject: [PATCH 400/403] Fix measureMinWidth option registration name
 [skip-ci]

---
 src/options.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/options.cpp b/src/options.cpp
index 1d642b06676..1579ccf6f07 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1263,7 +1263,7 @@ Options::Options()
 
     m_measureMinWidth.SetInfo("Measure min width", "The minimal measure width in MEI units");
     m_measureMinWidth.Init(15, 1, 30);
-    this->Register(&m_measureMinWidth, "minMeasureWidth", &m_generalLayout);
+    this->Register(&m_measureMinWidth, "measureMinWidth", &m_generalLayout);
 
     m_mnumInterval.SetInfo("Measure Number Interval", "How frequently to place measure numbers");
     m_mnumInterval.Init(0, 0, 64, false);

From 250c634138a4fc802a49acaae0e10e0453d17783 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 21 Feb 2022 20:56:25 +0100
Subject: [PATCH 401/403] Update changelog [skip-ci]

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17afede4864..dfa0b66bdc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,18 @@
 * Support for `@stem.sameas` on notes for orchestra scores
 * Support for MIDI output of arpeggios (@eNote-GmBH)
 * Support for tuplets in ABC importer (@eNote-GmBH)
+* Support for `beamSpan` (@eNote-GmBH)
+* Support for lyrics, tuplets and multiple tunes (`mdiv`) in ABC import (@eNote-GmBH)
 * Improved double stemmed beams (@eNote-GmBH)
 * Improved tablature MIDI output (@paul-bayleaf)
 * Improved PAE importer (nested beams, mensural dots, stemless notes)
+* Improved vertical positioning with half staff spacing above and below the systems
+* Improved justification (@eNote-GmBH)
+* Improved handling of the SMUFL fonts (@eNote-GmBH)
 * Additional parameters to the redoLayout method for faster cached layout redoing
 * Additional parameters to the renderToTimemap method for including rests and measure
 * Additional ids for rests and measure added to the getElementsAtTime methods
+* Option --svg-css for passing an additional CSS to be included in the SVG output
 * Preliminary support for stems and beam for guitar tablature
 * Preliminary support for tablature MusicXML import (@paul-bayleaf)
 

From 40bb1a6bdee3f7a8dd9626de80794519f14b7acd Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 22 Feb 2022 12:23:27 +0100
Subject: [PATCH 402/403] Adjust emscripten build script to support
 verovio-humdrum NPM package

---
 emscripten/buildToolkit                      | 11 +++---
 emscripten/npm-dev/README.md                 | 35 --------------------
 emscripten/npm-hum/README.md                 | 27 +++++++++++++++
 emscripten/{npm-dev => npm-hum}/package.json | 13 ++++----
 emscripten/npm/README.md                     | 12 +------
 emscripten/npm/package.json                  |  4 +--
 6 files changed, 44 insertions(+), 58 deletions(-)
 delete mode 100644 emscripten/npm-dev/README.md
 create mode 100644 emscripten/npm-hum/README.md
 rename emscripten/{npm-dev => npm-hum}/package.json (60%)

diff --git a/emscripten/buildToolkit b/emscripten/buildToolkit
index e1d0928ac25..167895776e7 100755
--- a/emscripten/buildToolkit
+++ b/emscripten/buildToolkit
@@ -88,8 +88,10 @@ $LFLAGS .= " -s TOTAL_STACK=128MB";
 $LFLAGS .= " -s WASM=0";
 $LFLAGS .= " --memory-init-file 0";
 
-# Process command-line options:
+# Check that -w and -l and not enabled together
+die "ERROR: option -w cannot be enabled with -l.\n" if ($wasmQ && $lightQ);
 
+# Process command-line options:
 if ($wasmQ) {
 	print "Creating WASM toolkit version\n";
 	# We can try to find the cause of integer overflow runtime errors with
@@ -117,6 +119,7 @@ if ($chattyQ) {
 }
 
 if (!$nohumdrum) {
+	print "Creating toolkit version with humdrum\n";
     $FLAGS_NAME .= "-hum";
 }
 
@@ -131,7 +134,7 @@ my $DATA_DIR  = "data";
 my $BUILD_DIR = "build";
 $BUILD_DIR .= "/$VERSION" if $VERSION;
 my $NPM = "npm";
-$NPM .= "-dev" if not($VERSION);
+$NPM .= "-hum" if !$nohumdrum;
 
 print "Compiled files will be written to $BUILD_DIR\n";
 
@@ -222,8 +225,8 @@ if ($? == 0) {
 	# the wrapper is necessary with closure 1 for avoiding to conflict with globals
 	`cat $BUILD_DIR/verovio.js verovio-js-start.js verovio-proxy.js > $BUILD_DIR/$FILENAME`;
 
-	# wrap the npm package (but not with wasm build and without humdrum for now)
-	if ($wasmQ && !$lightQ && $nohumdrum) {
+	# wrap the npm package (only for wasm builds)
+	if ($wasmQ) {
 		print "Building $NPM package\n";
 		# the cat order is different for the npm package because we want to wrap the Module in the init function
 		`cat verovio-npm-start.js $BUILD_DIR/verovio.js verovio-proxy.js verovio-npm-end.js > $NPM/index.js`;
diff --git a/emscripten/npm-dev/README.md b/emscripten/npm-dev/README.md
deleted file mode 100644
index a1313fd57ac..00000000000
--- a/emscripten/npm-dev/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-** Please use the [verovio](https://www.npmjs.com/package/verovio) package instead **
-
-***
-
-This is an NPM of the development version of the Verovio JavaScript toolkit.
-
-Verovio is a fast, portable and lightweight library for engraving [Music Encoding Initiative (MEI)](http://www.music-encoding.org) music scores into SVG.
-
-See it running in the [MEI Viewer](http://www.verovio.org/mei-viewer.xhtml) and check out the [tutorial](http://www.verovio.org/tutorial.xhtml) for its web integration and for enabling user interaction.
-
-## Usage
-
-```javascript
-var verovio = require('verovio-dev');
-
-var vrvToolkit = new verovio.toolkit();
-
-mei = fs.readFileSync("hello.mei");
-
-vrvToolkit.loadData(mei.toString());
-
-svg = vrvToolkit.renderPage(1, {});
-
-fs.writeFileSync("hello.svg", svg);
-```
-
-### Memory allocation
-
-The memory available for Verovio can be increased during import by passing a MB value to the `init` function.
-
-```javascript
-var verovio = require('verovio-dev').init(512);
-```
-
-The value has to be less than 1024MB.
diff --git a/emscripten/npm-hum/README.md b/emscripten/npm-hum/README.md
new file mode 100644
index 00000000000..92572354daf
--- /dev/null
+++ b/emscripten/npm-hum/README.md
@@ -0,0 +1,27 @@
+This is an NPM of the stable version of the Verovio JavaScript toolkit with Humdrum support.
+
+[Verovio](https://www.verovio.org/) is a fast, portable and lightweight library for engraving [Music Encoding Initiative (MEI)](http://www.music-encoding.org) music scores into SVG.
+
+This version of the toolkit includes Humdrum support. See it running in the [Verovio Humdrum Viewer](http://verovio.humdrum.org/).
+
+## Usage
+
+```javascript
+var verovio = require( 'verovio-humdrum' );
+var fs = require( 'fs' );
+
+/* Wait for verovio to load */
+verovio.module.onRuntimeInitialized = function ()
+{
+    /* create the toolkit instance */
+    var vrvToolkit = new verovio.toolkit();
+    /* read the Humdrum file */
+	krn = fs.readFileSync("hello.krn");
+    /* load the Humdrum data as string into the toolkit */
+	vrvToolkit.loadData(krn.toString());
+    /* render the fist page as SVG */
+	svg = vrvToolkit.renderToSVG(1, {});
+    /* save the SVG into a file */
+	fs.writeFileSync("hello.svg", svg);
+}
+```
\ No newline at end of file
diff --git a/emscripten/npm-dev/package.json b/emscripten/npm-hum/package.json
similarity index 60%
rename from emscripten/npm-dev/package.json
rename to emscripten/npm-hum/package.json
index 25b984019be..3620ebace27 100644
--- a/emscripten/npm-dev/package.json
+++ b/emscripten/npm-hum/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "verovio-dev",
-  "version": "2.2.0-6",
-  "description": "This is the development version of the verovio package",
+  "name": "verovio-humdrum",
+  "version": "3.9.0",
+  "description": "This is the stable version of the verovio package with humdrum support",
   "main": "index.js",
   "keywords": [
     "music",
@@ -9,9 +9,10 @@
     "music engraving",
     "mei",
     "music encoding",
-    "svg"
+    "svg",
+    "humdrum"
   ],
-  "author": "Laurent Pugin",
+  "author": "Laurent Pugin and others",
   "license": "LGPL 3",
   "repository": {
     "type": "git",
@@ -20,7 +21,7 @@
   "bugs": {
     "url": "https://github.com/rism-digital/verovio/issues"
   },
-  "homepage": "http://www.verovio.org",
+  "homepage": "https://www.verovio.org",
   "engines": {
     "node": ">= 7.0.0"
   }
diff --git a/emscripten/npm/README.md b/emscripten/npm/README.md
index 64ed6f539e4..eac818ee7aa 100644
--- a/emscripten/npm/README.md
+++ b/emscripten/npm/README.md
@@ -24,14 +24,4 @@ verovio.module.onRuntimeInitialized = function ()
     /* save the SVG into a file */
 	fs.writeFileSync("hello.svg", svg);
 }
-```
-
-### Memory allocation
-
-The memory available for Verovio can be increased during import by passing a MB value to the `init` function.
-
-```javascript
-var verovio = require('verovio').init(512);
-```
-
-The value has to be less than 1024MB.
+```
\ No newline at end of file
diff --git a/emscripten/npm/package.json b/emscripten/npm/package.json
index c95f25acb33..23c7a0a7e30 100644
--- a/emscripten/npm/package.json
+++ b/emscripten/npm/package.json
@@ -11,7 +11,7 @@
     "music encoding",
     "svg"
   ],
-  "author": "Laurent Pugin",
+  "author": "Laurent Pugin and others",
   "license": "LGPL 3",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   "bugs": {
     "url": "https://github.com/rism-digital/verovio/issues"
   },
-  "homepage": "http://www.verovio.org",
+  "homepage": "https://www.verovio.org",
   "engines": {
     "node": ">= 7.0.0"
   }

From 340e0a215f4998b218cc262d934ab0b74916e9c7 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 22 Feb 2022 12:33:02 +0100
Subject: [PATCH 403/403] Adjust README for npm [skip-ci]

---
 emscripten/npm-hum/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/emscripten/npm-hum/README.md b/emscripten/npm-hum/README.md
index 92572354daf..221bce25107 100644
--- a/emscripten/npm-hum/README.md
+++ b/emscripten/npm-hum/README.md
@@ -2,7 +2,9 @@ This is an NPM of the stable version of the Verovio JavaScript toolkit with Humd
 
 [Verovio](https://www.verovio.org/) is a fast, portable and lightweight library for engraving [Music Encoding Initiative (MEI)](http://www.music-encoding.org) music scores into SVG.
 
-This version of the toolkit includes Humdrum support. See it running in the [Verovio Humdrum Viewer](http://verovio.humdrum.org/).
+You can see Verovio with Humdrum support running in the [Verovio Humdrum Viewer](http://verovio.humdrum.org/).
+
+This version of the toolkit is the same as the [Verovio NPM](https://www.npmjs.com/package/verovio) package except that it includes Humdrum support.
 
 ## Usage